From 3e2439afd935d7f98592a1857a1e9c6b3a1afa32 Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Fri, 24 Apr 2026 18:12:51 +0200
Subject: [PATCH 01/76] fix build id for tauri builds, fixed oauth/auth on
 tauri app, tweaked visual on empty project page

---
 .github/actions/compute-version/action.yml    |   4 +
 .github/workflows/deploy-release.yaml         |   3 +
 .github/workflows/deploy-staging.yaml         |   3 +
 components/dashboard/AboutSettings.module.css | 105 ++++++++++++++++--
 components/dashboard/AboutSettings.tsx        |  34 ++++--
 .../dashboard/account/DashboardAuth.tsx       |  21 +++-
 components/dashboard/account/OAuthButtons.tsx |  19 +++-
 components/home/HomeClient.tsx                |   2 +-
 .../projects/EmptyProjectPage.module.css      |  41 ++++---
 components/projects/EmptyProjectPage.tsx      |   4 +-
 messages/de.json                              |   2 +
 messages/en.json                              |   2 +
 messages/es.json                              |   2 +
 messages/fr.json                              |   2 +
 messages/ja.json                              |   2 +
 messages/ko.json                              |   2 +
 messages/pl.json                              |   2 +
 messages/zh.json                              |   2 +
 next.config.ts                                |  13 +++
 scripts/build-tauri.ts                        |   2 +-
 src-tauri/Cargo.lock                          |   2 +-
 src-tauri/Cargo.toml                          |   2 +-
 src-tauri/tauri.conf.json                     |   3 +-
 src/lib/desktop-auth.ts                       |  18 ++-
 src/lib/utils/requests.ts                     |   4 +-
 src/proxy.ts                                  |  10 ++
 26 files changed, 253 insertions(+), 53 deletions(-)

diff --git a/.github/actions/compute-version/action.yml b/.github/actions/compute-version/action.yml
index 4bd4fd57..61438b3f 100644
--- a/.github/actions/compute-version/action.yml
+++ b/.github/actions/compute-version/action.yml
@@ -14,6 +14,9 @@ outputs:
     git_tag:
         description: Tag to create on release (e.g. 2.0.1). Empty on other branches.
         value: ${{ steps.compute.outputs.git_tag }}
+    commit_sha:
+        description: Short git commit SHA.
+        value: ${{ steps.compute.outputs.commit_sha }}
 
 runs:
     using: composite
@@ -69,3 +72,4 @@ runs:
               echo "short_version=$SHORT_VERSION" >> $GITHUB_OUTPUT
               echo "revision=$REVISION" >> $GITHUB_OUTPUT
               echo "git_tag=$GIT_TAG" >> $GITHUB_OUTPUT
+              echo "commit_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index bdc92cf6..ff30f207 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -16,6 +16,7 @@ jobs:
             short_version: ${{ steps.version.outputs.short_version }}
             revision: ${{ steps.version.outputs.revision }}
             git_tag: ${{ steps.version.outputs.git_tag }}
+            commit_sha: ${{ steps.version.outputs.commit_sha }}
         steps:
             - uses: actions/checkout@v6
               with:
@@ -72,6 +73,7 @@ jobs:
                   APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
                   NEXT_PUBLIC_API_URL: https://scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
+                  NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
             - name: Build signed .pkg installer
               run: |
@@ -112,6 +114,7 @@ jobs:
               env:
                   NEXT_PUBLIC_API_URL: https://scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
+                  NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
             - name: Rename output to fixed name
               run: |
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index a3d31760..b58593a3 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -15,6 +15,7 @@ jobs:
             version: ${{ steps.version.outputs.version }}
             short_version: ${{ steps.version.outputs.short_version }}
             revision: ${{ steps.version.outputs.revision }}
+            commit_sha: ${{ steps.version.outputs.commit_sha }}
         steps:
             - uses: actions/checkout@v6
               with:
@@ -73,6 +74,7 @@ jobs:
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
                   NEXT_PUBLIC_STAGING_BASIC_AUTH: ${{ secrets.STAGING_BASIC_AUTH }}
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
+                  NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
             - name: Build signed .pkg installer
               run: |
@@ -115,6 +117,7 @@ jobs:
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
                   NEXT_PUBLIC_STAGING_BASIC_AUTH: ${{ secrets.STAGING_BASIC_AUTH }}
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
+                  NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
             - name: Rename output to fixed name
               run: |
diff --git a/components/dashboard/AboutSettings.module.css b/components/dashboard/AboutSettings.module.css
index 3e4699bf..c6cebf89 100644
--- a/components/dashboard/AboutSettings.module.css
+++ b/components/dashboard/AboutSettings.module.css
@@ -1,7 +1,67 @@
 .container {
     display: flex;
     flex-direction: column;
-    gap: 12px;
+    align-items: center;
+    justify-content: center;
+    gap: 40px;
+    padding: 60px 0;
+    height: 100%;
+}
+
+.brandSection {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 16px;
+    animation: fade-in-up 0.5s ease-out forwards;
+}
+
+.logoWrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 80px;
+    height: 80px;
+    background: var(--secondary);
+    border: 1px solid var(--separator);
+    border-radius: 20px;
+    box-shadow: 0 8px 24px -8px rgba(0, 0, 0, 0.2);
+}
+
+.logo {
+    width: 44px;
+    height: 44px;
+    color: var(--primary-text);
+}
+
+.title {
+    font-size: 2.2rem;
+    font-weight: 700;
+    color: var(--primary-text);
+    margin: 0;
+    line-height: 1;
+    letter-spacing: -0.02em;
+    font-family: var(--font-inter), sans-serif;
+}
+
+.copyright {
+    font-size: 0.9rem;
+    color: var(--secondary-text);
+    margin: 0;
+}
+
+.infoSection {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    max-width: 420px;
+    background-color: var(--secondary);
+    border: 1px solid var(--separator);
+    border-radius: 12px;
+    overflow: hidden;
+    box-shadow: 0 4px 12px -4px rgba(0, 0, 0, 0.1);
+    animation: fade-in-up 0.5s ease-out 0.1s forwards;
+    opacity: 0;
 }
 
 .row {
@@ -9,19 +69,48 @@
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    padding: 10px 14px;
-    border-radius: 8px;
-    background-color: var(--secondary);
+    padding: 16px 20px;
+    background-color: transparent;
+    transition: background-color 0.2s;
+}
+
+.row:hover {
+    background-color: var(--tertiary);
+}
+
+.row:not(:last-child) {
+    border-bottom: 1px solid var(--separator);
+}
+
+.labelGroup {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.icon {
+    color: var(--secondary-text);
 }
 
 .label {
-    font-size: 0.9rem;
-    font-weight: 600;
+    font-size: 0.95rem;
+    font-weight: 500;
     color: var(--secondary-text);
 }
 
 .value {
-    font-size: 0.9rem;
+    font-size: 0.95rem;
     color: var(--primary-text);
-    font-family: monospace;
+    font-weight: 600;
 }
+
+@keyframes fade-in-up {
+    from {
+        opacity: 0;
+        transform: translateY(10px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
\ No newline at end of file
diff --git a/components/dashboard/AboutSettings.tsx b/components/dashboard/AboutSettings.tsx
index 68c9992b..01fe15c5 100644
--- a/components/dashboard/AboutSettings.tsx
+++ b/components/dashboard/AboutSettings.tsx
@@ -1,3 +1,5 @@
+import ScriptioLogo from "@public/images/scriptio.svg";
+import { Tag, GitCommit } from "lucide-react";
 import styles from "./AboutSettings.module.css";
 
 const AboutSettings = () => {
@@ -6,16 +8,34 @@ const AboutSettings = () => {
 
     return (
         <div className={styles.container}>
-            <div className={styles.row}>
-                <span className={styles.label}>Version</span>
-                <span className={styles.value}>v{version}</span>
+            <div className={styles.brandSection}>
+                <div className={styles.logoWrapper}>
+                    <ScriptioLogo className={styles.logo} />
+                </div>
+                <h1 className={styles.title}>Scriptio</h1>
+                <p className={styles.copyright}>© {new Date().getFullYear()} Arko Logic</p>
             </div>
-            <div className={styles.row}>
-                <span className={styles.label}>Build</span>
-                <span className={styles.value}>{buildId}</span>
+
+            <div className={styles.infoSection}>
+                <div className={styles.row}>
+                    <div className={styles.labelGroup}>
+                        <Tag size={18} className={styles.icon} />
+                        <span className={styles.label}>Version</span>
+                    </div>
+                    <span className={styles.value}>v{version}</span>
+                </div>
+                <div className={styles.row}>
+                    <div className={styles.labelGroup}>
+                        <GitCommit size={18} className={styles.icon} />
+                        <span className={styles.label}>Build</span>
+                    </div>
+                    <span className={styles.value} style={{ fontFamily: "monospace", letterSpacing: "0.05em" }}>
+                        {buildId}
+                    </span>
+                </div>
             </div>
         </div>
     );
 };
 
-export default AboutSettings;
+export default AboutSettings;
\ No newline at end of file
diff --git a/components/dashboard/account/DashboardAuth.tsx b/components/dashboard/account/DashboardAuth.tsx
index 7a38e7e1..6dfe49e4 100644
--- a/components/dashboard/account/DashboardAuth.tsx
+++ b/components/dashboard/account/DashboardAuth.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useState, useRef, useEffect } from "react";
 import { useTranslations } from "next-intl";
 import { isTauri } from "@tauri-apps/api/core";
 import { useSWRConfig } from "swr";
@@ -28,6 +28,11 @@ const DashboardAuth = () => {
     // Desktop-only: poll the bridge after the email is sent so the user is signed in
     // here as soon as they click the magic link in their browser.
     const [pollingDesktop, setPollingDesktop] = useState(false);
+    const pollAbortRef = useRef<AbortController | null>(null);
+
+    useEffect(() => {
+        return () => { pollAbortRef.current?.abort(); };
+    }, []);
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault();
@@ -58,11 +63,17 @@ const DashboardAuth = () => {
                 setSubmitted(true);
                 setPollingDesktop(true);
 
-                const token = await pollBridgeToken(nonce);
+                pollAbortRef.current?.abort();
+                const controller = new AbortController();
+                pollAbortRef.current = controller;
+
+                const token = await pollBridgeToken(nonce, { signal: controller.signal });
                 if (!token) {
-                    setMessage({ type: "error", text: tAuth("desktopTimeout") });
-                    setPollingDesktop(false);
-                    setSubmitted(false);
+                    if (!controller.signal.aborted) {
+                        setMessage({ type: "error", text: tAuth("desktopTimeout") });
+                        setPollingDesktop(false);
+                        setSubmitted(false);
+                    }
                     return;
                 }
                 await setDesktopToken(token);
diff --git a/components/dashboard/account/OAuthButtons.tsx b/components/dashboard/account/OAuthButtons.tsx
index 54afea77..ea9eed1d 100644
--- a/components/dashboard/account/OAuthButtons.tsx
+++ b/components/dashboard/account/OAuthButtons.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useState, useRef, useEffect } from "react";
 import { useSWRConfig } from "swr";
 import { signIn } from "next-auth/react";
 import { isTauri } from "@tauri-apps/api/core";
@@ -23,6 +23,11 @@ const OAuthButtons = ({ callbackUrl = "/projects" }: Props) => {
     const t = useTranslations("oauth");
     const [pendingProvider, setPendingProvider] = useState<Provider | null>(null);
     const [error, setError] = useState<string | null>(null);
+    const pollAbortRef = useRef<AbortController | null>(null);
+
+    useEffect(() => {
+        return () => { pollAbortRef.current?.abort(); };
+    }, []);
 
     const startOAuth = async (provider: Provider) => {
         setError(null);
@@ -32,19 +37,24 @@ const OAuthButtons = ({ callbackUrl = "/projects" }: Props) => {
             return;
         }
 
+        // Cancel any in-progress poll before starting a new one
+        pollAbortRef.current?.abort();
+        const controller = new AbortController();
+        pollAbortRef.current = controller;
+
         setPendingProvider(provider);
         try {
             const { generateBridgeNonce, pollBridgeToken, setDesktopToken } = await import("@src/lib/desktop-auth");
             const { openUrl } = await import("@tauri-apps/plugin-opener");
 
             const nonce = generateBridgeNonce();
-            const apiBase = process.env.NEXT_PUBLIC_API_URL || window.location.origin;
+            const apiBase = process.env.NEXT_PUBLIC_API_URL || "http://localhost:3000";
             const bridgeUrl = `${apiBase}/desktop-oauth/start?provider=${provider}&nonce=${encodeURIComponent(nonce)}`;
             await openUrl(bridgeUrl);
 
-            const token = await pollBridgeToken(nonce);
+            const token = await pollBridgeToken(nonce, { signal: controller.signal });
             if (!token) {
-                setError(t("timeout"));
+                if (!controller.signal.aborted) setError(t("timeout"));
                 return;
             }
 
@@ -52,6 +62,7 @@ const OAuthButtons = ({ callbackUrl = "/projects" }: Props) => {
             await mutate("/api/users/cookie");
             await mutate("/api/users");
         } catch (err) {
+            if (controller.signal.aborted) return;
             console.error("[OAuthButtons] Desktop OAuth failed:", err);
             setError(t("error"));
         } finally {
diff --git a/components/home/HomeClient.tsx b/components/home/HomeClient.tsx
index 6d007a05..b690db36 100644
--- a/components/home/HomeClient.tsx
+++ b/components/home/HomeClient.tsx
@@ -19,7 +19,7 @@ export default function HomeClient() {
         }
     }, [setTheme, router]);
 
-    if (isTauri()) {
+    if (process.env.NEXT_PUBLIC_TAURI_BUILD === "true" || isTauri()) {
         return null;
     }
 
diff --git a/components/projects/EmptyProjectPage.module.css b/components/projects/EmptyProjectPage.module.css
index 501f215f..779ad52f 100644
--- a/components/projects/EmptyProjectPage.module.css
+++ b/components/projects/EmptyProjectPage.module.css
@@ -4,25 +4,23 @@
     justify-content: center;
     align-items: center;
     flex: 1;
-    background: none;
-    border: none;
+    padding-bottom: 60px;
 }
 
 .cards {
     display: flex;
     flex-direction: row;
-    gap: 20px;
-    padding-bottom: 70px;
+    gap: 24px;
 }
 
 .card {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
-    gap: 12px;
+    gap: 18px;
 
-    width: 220px;
-    padding: 28px 24px;
+    width: 280px;
+    padding: 36px 32px;
 
     border-radius: 18px;
     border: 3px solid var(--tertiary);
@@ -31,11 +29,14 @@
     cursor: pointer;
     text-align: left;
 
-    transition: border-color 0.2s, transform 0.2s;
+    box-shadow: var(--project-item-shadow);
+    transition: border-color 0.2s, box-shadow 0.2s, transform 0.2s;
 }
 
 .card:hover {
     border-color: var(--tertiary-hover);
+    box-shadow: var(--project-item-shadow-hover);
+    transform: translate(-3px, -3px);
 }
 
 .card:active {
@@ -46,32 +47,40 @@
 .card:disabled {
     opacity: 0.5;
     cursor: not-allowed;
+    transform: none;
+    box-shadow: var(--project-item-shadow);
 }
 
 .cardIcon {
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 40px;
-    height: 40px;
-    border-radius: 10px;
+    width: 52px;
+    height: 52px;
+    border-radius: 14px;
     background-color: var(--tertiary);
     color: var(--primary-text);
     flex-shrink: 0;
+    transition: background-color 0.2s;
+}
+
+.card:hover .cardIcon {
+    background-color: var(--tertiary-hover);
 }
 
 .cardTitle {
-    font-family: var(--font-inter), sans-serif;
+    font-family: var(--font-josefin), sans-serif;
     font-style: italic;
-    font-size: 1.2rem;
-    font-weight: 400;
+    font-size: 1.25rem;
+    font-weight: 700;
     color: var(--primary-text);
     margin: 0;
+    letter-spacing: 0.01em;
 }
 
 .cardDesc {
-    font-size: 0.8rem;
+    font-size: 0.85rem;
     color: var(--secondary-text);
     margin: 0;
-    line-height: 1.4;
+    line-height: 1.5;
 }
diff --git a/components/projects/EmptyProjectPage.tsx b/components/projects/EmptyProjectPage.tsx
index 35d2a3d4..393ea0da 100644
--- a/components/projects/EmptyProjectPage.tsx
+++ b/components/projects/EmptyProjectPage.tsx
@@ -58,7 +58,7 @@ const EmptyProjectPage = ({ setIsCreating }: Props) => {
             <div className={styles.cards}>
                 <button className={styles.card} onClick={() => setIsCreating(true)}>
                     <div className={styles.cardIcon}>
-                        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
                             <path d="M12 5v14M5 12h14" />
                         </svg>
                     </div>
@@ -67,7 +67,7 @@ const EmptyProjectPage = ({ setIsCreating }: Props) => {
                 </button>
                 <button className={styles.card} onClick={handleImportClick} disabled={isImporting}>
                     <div className={styles.cardIcon}>
-                        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
                             <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
                             <polyline points="17 8 12 3 7 8" />
                             <line x1="12" y1="3" x2="12" y2="15" />
diff --git a/messages/de.json b/messages/de.json
index a285e336..dce8e7f5 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -159,6 +159,8 @@
     "importing": "Importieren...",
     "createBtn": "Erstellen",
     "empty": {
+      "title": "Deine Geschichte Beginnt Hier",
+      "subtitle": "Erstelle ein neues Drehbuch oder importiere ein vorhandenes Skript",
       "createFirst": "Neues Projekt",
       "createDesc": "Mit einer leeren Seite beginnen",
       "importExisting": "Importieren",
diff --git a/messages/en.json b/messages/en.json
index 3260dcec..39d3bb9e 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -158,6 +158,8 @@
     "importing": "Importing...",
     "createBtn": "Create",
     "empty": {
+      "title": "Your Story Starts Here",
+      "subtitle": "Create a new screenplay or import an existing script",
       "createFirst": "New project",
       "createDesc": "Start from a blank page",
       "importExisting": "Import",
diff --git a/messages/es.json b/messages/es.json
index 2bce49a9..ab41adb9 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -158,6 +158,8 @@
     "importing": "Importando...",
     "createBtn": "Crear",
     "empty": {
+      "title": "Tu Historia Empieza Aquí",
+      "subtitle": "Crea un nuevo guión o importa un script existente",
       "createFirst": "Nuevo proyecto",
       "createDesc": "Empezar desde una página en blanco",
       "importExisting": "Importar",
diff --git a/messages/fr.json b/messages/fr.json
index a845875a..dc30105a 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -159,6 +159,8 @@
     "importing": "Importation...",
     "createBtn": "Créer",
     "empty": {
+      "title": "Votre Histoire Commence Ici",
+      "subtitle": "Créez un nouveau scénario ou importez un script existant",
       "createFirst": "Nouveau projet",
       "createDesc": "Partir d'une page blanche",
       "importExisting": "Importer",
diff --git a/messages/ja.json b/messages/ja.json
index 438ceaaa..84f66eee 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -158,6 +158,8 @@
     "importing": "インポート中...",
     "createBtn": "作成",
     "empty": {
+      "title": "あなたの物語はここから始まる",
+      "subtitle": "新しい脚本を作成するか、既存のスクリプトをインポートしてください",
       "createFirst": "新規プロジェクト",
       "createDesc": "白紙から始める",
       "importExisting": "インポート",
diff --git a/messages/ko.json b/messages/ko.json
index b91e0516..c9eb3baf 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -158,6 +158,8 @@
     "importing": "가져오는 중...",
     "createBtn": "생성",
     "empty": {
+      "title": "당신의 이야기가 여기서 시작됩니다",
+      "subtitle": "새 각본을 만들거나 기존 스크립트를 가져오세요",
       "createFirst": "새 프로젝트",
       "createDesc": "빈 페이지에서 시작하기",
       "importExisting": "가져오기",
diff --git a/messages/pl.json b/messages/pl.json
index 5d37fe47..0b3aeb35 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -158,6 +158,8 @@
     "importing": "Importowanie...",
     "createBtn": "Utwórz",
     "empty": {
+      "title": "Twoja Historia Zaczyna Się Tutaj",
+      "subtitle": "Stwórz nowy scenariusz lub zaimportuj istniejący skrypt",
       "createFirst": "Nowy projekt",
       "createDesc": "Zacznij od pustej strony",
       "importExisting": "Importuj",
diff --git a/messages/zh.json b/messages/zh.json
index 3ece7a97..fc85ce77 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -158,6 +158,8 @@
     "importing": "正在导入...",
     "createBtn": "创建",
     "empty": {
+      "title": "你的故事从这里开始",
+      "subtitle": "创建新剧本或导入现有脚本",
       "createFirst": "新建项目",
       "createDesc": "从空白页面开始",
       "importExisting": "导入",
diff --git a/next.config.ts b/next.config.ts
index 6f17229b..28775aaf 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -4,6 +4,7 @@ const isTauriBuild = process.env.TAURI_BUILD === "true";
 
 const config: NextConfig = {
     reactStrictMode: true,
+    serverExternalPackages: ["@prisma/client", "prisma"],
     turbopack: {
         rules: {
             "*.svg": {
@@ -20,6 +21,18 @@ const config: NextConfig = {
         // Tauri needs unoptimized images; web can use Next.js optimization
         unoptimized: isTauriBuild,
     },
+    async headers() {
+        return [
+            {
+                source: "/api/:path*",
+                headers: [
+                    { key: "Access-Control-Allow-Origin", value: "*" },
+                    { key: "Access-Control-Allow-Methods", value: "GET, POST, PUT, PATCH, DELETE, OPTIONS" },
+                    { key: "Access-Control-Allow-Headers", value: "Content-Type, Authorization, x-client-type, X-Staging-Auth" },
+                ],
+            },
+        ];
+    },
 };
 
 export default config;
diff --git a/scripts/build-tauri.ts b/scripts/build-tauri.ts
index b4a57872..59abd157 100644
--- a/scripts/build-tauri.ts
+++ b/scripts/build-tauri.ts
@@ -19,7 +19,7 @@ if (existsSync(adminDir)) {
 }
 
 try {
-    execSync("npx cross-env TAURI_BUILD=true next build", { stdio: "inherit" });
+    execSync("npx cross-env TAURI_BUILD=true NEXT_PUBLIC_TAURI_BUILD=true next build", { stdio: "inherit" });
 } finally {
     if (existsSync(hiddenApiDir)) {
         renameSync(hiddenApiDir, apiDir);
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 211f6a79..00590328 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "Scriptio"
-version = "2.0.1"
+version = "0.0.0"
 dependencies = [
  "log",
  "serde",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 2018e0c7..d00433d1 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "Scriptio"
-version = "2.0.1"
+version = "0.0.0"
 description = "Screenwriting Software"
 authors = ["Arko Logic"]
 license = ""
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index c8cbc7a6..2dedf9cc 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -5,7 +5,7 @@
     "version": "../package.json",
     "build": {
         "frontendDist": "../out",
-        "devUrl": "http://localhost:3000",
+        "devUrl": "http://localhost:3000/projects",
         "beforeDevCommand": "npm run dev",
         "beforeBuildCommand": "npm run build:tauri"
     },
@@ -15,6 +15,7 @@
         },
         "windows": [
             {
+                "url": "projects.html",
                 "title": "Scriptio",
                 "width": 1350,
                 "height": 900,
diff --git a/src/lib/desktop-auth.ts b/src/lib/desktop-auth.ts
index 31397ce0..249b5caa 100644
--- a/src/lib/desktop-auth.ts
+++ b/src/lib/desktop-auth.ts
@@ -84,26 +84,34 @@ export function generateBridgeNonce(): string {
  */
 export async function pollBridgeToken(
     nonce: string,
-    options: { intervalMs?: number; timeoutMs?: number } = {},
+    options: { intervalMs?: number; timeoutMs?: number; signal?: AbortSignal } = {},
 ): Promise<string | null> {
     const intervalMs = options.intervalMs ?? 2000;
     const timeoutMs = options.timeoutMs ?? 5 * 60 * 1000;
-    const apiBase = process.env.NEXT_PUBLIC_API_URL || "";
+    const { signal } = options;
+
+    const apiBase = process.env.NEXT_PUBLIC_API_URL || "http://localhost:3000";
     const url = `${apiBase}/api/desktop/token/poll?nonce=${encodeURIComponent(nonce)}`;
     const deadline = Date.now() + timeoutMs;
 
     while (Date.now() < deadline) {
+        if (signal?.aborted) return null;
         try {
-            const res = await fetch(url, { headers: { "x-client-type": "desktop" } });
+            const res = await fetch(url, { headers: { "x-client-type": "desktop" }, signal });
             if (res.ok) {
                 const json = (await res.json()) as { data?: { token?: string | null } };
                 const token = json.data?.token;
                 if (token) return token;
             }
-        } catch {
+        } catch (err) {
+            if (signal?.aborted) return null;
             // network blip — keep polling
         }
-        await new Promise((r) => setTimeout(r, intervalMs));
+        if (signal?.aborted) return null;
+        await new Promise<void>((resolve, reject) => {
+            const t = setTimeout(resolve, intervalMs);
+            signal?.addEventListener("abort", () => { clearTimeout(t); reject(new DOMException("Aborted", "AbortError")); }, { once: true });
+        }).catch(() => null);
     }
     return null;
 }
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index 165cdec3..c3417dee 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -21,7 +21,9 @@ const request = async (url: string, method: RESTMethod, body?: object) => {
     let fullUrl = url;
     if (isTauri()) {
         headers["x-client-type"] = "desktop";
-        fullUrl = url.startsWith("http") ? url : `${API_BASE_URL}${url}`;
+        
+        const base = API_BASE_URL || "http://localhost:3000";
+        fullUrl = url.startsWith("http") ? url : `${base}${url}`;
 
         // Add auth token if available (dynamic import to avoid SSR issues)
         const { getDesktopToken } = await import("@src/lib/desktop-auth");
diff --git a/src/proxy.ts b/src/proxy.ts
index 4398c0e5..c56bcdb1 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -4,6 +4,7 @@ import { NextRequest, NextResponse } from "next/server";
 // Routes that handle their own auth or are intentionally public
 const PUBLIC_API_PREFIXES = [
     "/api/auth/", // NextAuth internals
+    "/api/desktop/", // Desktop OAuth bridge endpoints
     "/api/users/cookie", // Session probe — returns null for unauthenticated callers
     "/api/webhooks/", // External webhooks (Stripe, etc.)
     "/api/projects/accept-invite", // Accessible to unauthenticated users via invite link
@@ -21,6 +22,15 @@ function isAdminPageRoute(pathname: string): boolean {
 
 export async function proxy(request: NextRequest) {
     const { pathname } = request.nextUrl;
+
+    // CORS preflights must never be blocked — the actual request that follows will be
+    // auth-checked. Returning 401 here strips the CORS headers (middleware responses
+    // bypass next.config.ts headers()) and causes the preflight to fail, which in
+    // Tauri (origin: http://tauri.localhost) breaks every cross-origin API call.
+    if (request.method === "OPTIONS") {
+        return NextResponse.next();
+    }
+
     const token = await getToken({ req: request, secret: process.env.AUTH_SECRET });
 
     // Admin pages: proxy only checks authentication.

From f56477209bd07a3302bda78aa7bfc7043fa9541b Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Fri, 24 Apr 2026 22:38:20 +0200
Subject: [PATCH 02/76] fixed missing initial migration and workflows

---
 .github/workflows/deploy-release.yaml         |   6 +-
 .github/workflows/deploy-staging.yaml         |   4 +-
 .../20260424202833_init/migration.sql         | 172 ++++++++++++++++++
 prisma/migrations/migration_lock.toml         |   3 +
 4 files changed, 180 insertions(+), 5 deletions(-)
 create mode 100644 prisma/migrations/20260424202833_init/migration.sql
 create mode 100644 prisma/migrations/migration_lock.toml

diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index ff30f207..7908674d 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -28,7 +28,7 @@ jobs:
 
     publish-macos:
         runs-on: macos-latest
-        needs: prepare
+        needs: [prepare, deploy-web]
         env:
             APP_PATH: src-tauri/target/universal-apple-darwin/release/bundle/macos/Scriptio.app
             PKG_PATH: Scriptio.pkg
@@ -93,7 +93,7 @@ jobs:
 
     publish-windows:
         runs-on: windows-latest
-        needs: prepare
+        needs: [prepare, deploy-web]
         env:
             APP_PATH: src-tauri/target/msix/Scriptio.msixbundle
         steps:
@@ -193,7 +193,7 @@ jobs:
 
     tag-release:
         runs-on: ubuntu-latest
-        needs: [prepare, publish-macos, publish-windows, deploy-web]
+        needs: [prepare, deploy-web]
         steps:
             - uses: actions/checkout@v6
               with:
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index b58593a3..a06b25cf 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -27,7 +27,7 @@ jobs:
 
     publish-macos:
         runs-on: macos-latest
-        needs: prepare
+        needs: [prepare, deploy-web]
         env:
             APP_PATH: src-tauri/target/universal-apple-darwin/release/bundle/macos/Scriptio (Staging).app
             PKG_PATH: Scriptio.pkg
@@ -94,7 +94,7 @@ jobs:
 
     publish-windows:
         runs-on: windows-latest
-        needs: prepare
+        needs: [prepare, deploy-web]
         env:
             APP_PATH: src-tauri/target/msix/Scriptio_${{ needs.prepare.outputs.version }}.msixbundle
         steps:
diff --git a/prisma/migrations/20260424202833_init/migration.sql b/prisma/migrations/20260424202833_init/migration.sql
new file mode 100644
index 00000000..ffa93ccf
--- /dev/null
+++ b/prisma/migrations/20260424202833_init/migration.sql
@@ -0,0 +1,172 @@
+-- CreateEnum
+CREATE TYPE "ProjectRole" AS ENUM ('OWNER', 'ADMIN', 'EDITOR', 'VIEWER');
+
+-- CreateEnum
+CREATE TYPE "UserRole" AS ENUM ('USER', 'ADMIN');
+
+-- CreateEnum
+CREATE TYPE "SubscriptionProvider" AS ENUM ('STRIPE', 'APPLE');
+
+-- CreateTable
+CREATE TABLE "User" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "email" TEXT NOT NULL,
+    "emailVerified" TIMESTAMP(3),
+    "username" TEXT,
+    "color" TEXT,
+    "role" "UserRole" NOT NULL DEFAULT 'USER',
+    "isProUntil" TIMESTAMP(3),
+    "isSubscriptionCancelled" BOOLEAN NOT NULL DEFAULT false,
+    "subscriptionProvider" "SubscriptionProvider",
+    "settings" JSONB,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Account" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "provider" TEXT NOT NULL,
+    "providerAccountId" TEXT NOT NULL,
+    "refresh_token" TEXT,
+    "access_token" TEXT,
+    "expires_at" INTEGER,
+    "token_type" TEXT,
+    "scope" TEXT,
+    "id_token" TEXT,
+    "session_state" TEXT,
+
+    CONSTRAINT "Account_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" TEXT NOT NULL,
+    "sessionToken" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "expires" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Session_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "VerificationToken" (
+    "identifier" TEXT NOT NULL,
+    "token" TEXT NOT NULL,
+    "expires" TIMESTAMP(3) NOT NULL
+);
+
+-- CreateTable
+CREATE TABLE "MagicLinkToken" (
+    "id" SERIAL NOT NULL,
+    "email" TEXT NOT NULL,
+    "tokenHash" TEXT NOT NULL,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "desktopNonce" TEXT,
+    "inviteToken" TEXT,
+
+    CONSTRAINT "MagicLinkToken_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Transaction" (
+    "id" SERIAL NOT NULL,
+    "userId" TEXT NOT NULL,
+    "provider" "SubscriptionProvider" NOT NULL,
+    "transactionId" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Transaction_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Project" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "title" TEXT NOT NULL,
+    "description" TEXT,
+    "author" TEXT,
+    "hasPoster" BOOLEAN NOT NULL DEFAULT false,
+
+    CONSTRAINT "Project_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "ProjectMember" (
+    "id" SERIAL NOT NULL,
+    "role" "ProjectRole" NOT NULL DEFAULT 'VIEWER',
+    "userId" TEXT NOT NULL,
+    "projectId" TEXT NOT NULL,
+
+    CONSTRAINT "ProjectMember_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "ProjectInvitation" (
+    "id" SERIAL NOT NULL,
+    "token" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "projectId" TEXT NOT NULL,
+
+    CONSTRAINT "ProjectInvitation_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Account_provider_providerAccountId_key" ON "Account"("provider", "providerAccountId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session_sessionToken_key" ON "Session"("sessionToken");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "VerificationToken_token_key" ON "VerificationToken"("token");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "VerificationToken_identifier_token_key" ON "VerificationToken"("identifier", "token");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "MagicLinkToken_tokenHash_key" ON "MagicLinkToken"("tokenHash");
+
+-- CreateIndex
+CREATE INDEX "MagicLinkToken_email_createdAt_idx" ON "MagicLinkToken"("email", "createdAt");
+
+-- CreateIndex
+CREATE INDEX "Transaction_userId_idx" ON "Transaction"("userId");
+
+-- CreateIndex
+CREATE INDEX "Transaction_transactionId_idx" ON "Transaction"("transactionId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ProjectMember_userId_projectId_key" ON "ProjectMember"("userId", "projectId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ProjectInvitation_token_key" ON "ProjectInvitation"("token");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ProjectInvitation_email_projectId_key" ON "ProjectInvitation"("email", "projectId");
+
+-- AddForeignKey
+ALTER TABLE "Account" ADD CONSTRAINT "Account_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Session" ADD CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Transaction" ADD CONSTRAINT "Transaction_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ProjectMember" ADD CONSTRAINT "ProjectMember_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ProjectMember" ADD CONSTRAINT "ProjectMember_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ProjectInvitation" ADD CONSTRAINT "ProjectInvitation_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml
new file mode 100644
index 00000000..044d57cd
--- /dev/null
+++ b/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"

From 334de98768e181b96603e70af3178f7704e61704 Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Fri, 24 Apr 2026 23:33:01 +0200
Subject: [PATCH 03/76] added benchmark run to github actions workflow

---
 .github/workflows/checks.yaml |  50 +++++++++
 scripts/compare-bench.mjs     | 193 ++++++++++++++++++++++++++++++++++
 2 files changed, 243 insertions(+)
 create mode 100644 scripts/compare-bench.mjs

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index 7bb72205..a14de016 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -59,3 +59,53 @@ jobs:
 
             - name: Build Docker image
               run: docker compose build app-prod
+
+    benchmark:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v6
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v6
+              with:
+                  node-version: "25.2.1"
+                  cache: "npm"
+
+            - name: Install dependencies
+              run: npm install
+
+            - name: Install Playwright browsers
+              run: npx playwright install --with-deps chromium webkit
+
+            - name: Download previous benchmark results
+              id: download-baseline
+              uses: dawidd6/action-download-artifact@v9
+              continue-on-error: true
+              with:
+                  name: bench-results
+                  path: bench-baseline
+                  workflow: checks.yaml
+                  branch: ${{ github.ref_name }}
+                  if_no_artifact_found: warn
+
+            - name: Run benchmarks
+              run: npm run bench
+
+            - name: Compare and report
+              run: |
+                  if [ -f bench-baseline/bench-results.json ]; then
+                    node scripts/compare-bench.mjs bench-baseline/bench-results.json bench-results.json >> $GITHUB_STEP_SUMMARY
+                  else
+                    echo "## Benchmark Results" >> $GITHUB_STEP_SUMMARY
+                    echo "" >> $GITHUB_STEP_SUMMARY
+                    echo "No baseline found — results uploaded as the new baseline." >> $GITHUB_STEP_SUMMARY
+                  fi
+              continue-on-error: true
+
+            - name: Upload benchmark results
+              uses: actions/upload-artifact@v4
+              with:
+                  name: bench-results
+                  path: bench-results.json
+                  retention-days: 90
+                  overwrite: true
diff --git a/scripts/compare-bench.mjs b/scripts/compare-bench.mjs
new file mode 100644
index 00000000..72541535
--- /dev/null
+++ b/scripts/compare-bench.mjs
@@ -0,0 +1,193 @@
+#!/usr/bin/env node
+/**
+ * Compare two bench-results.json files and output an HTML regression report.
+ * Usage: node scripts/compare-bench.mjs <baseline.json> <current.json>
+ * Exit code 1 if regressions are found, 0 otherwise.
+ * Pipe stdout to $GITHUB_STEP_SUMMARY to render in GitHub Actions.
+ */
+
+import { readFileSync } from "node:fs";
+
+const REGRESSION_THRESHOLD = 0.20;
+const WARNING_THRESHOLD = 0.10;
+const IMPROVEMENT_THRESHOLD = 0.10;
+
+const [, , baselinePath, currentPath] = process.argv;
+if (!baselinePath || !currentPath) {
+    console.error("Usage: compare-bench.mjs <baseline.json> <current.json>");
+    process.exit(1);
+}
+
+const baseline = JSON.parse(readFileSync(baselinePath, "utf-8"));
+const current  = JSON.parse(readFileSync(currentPath,  "utf-8"));
+
+function flatten(data) {
+    const map = new Map();
+    for (const [groupKey, entries] of Object.entries(data.grouped)) {
+        for (const entry of entries) {
+            map.set(`${groupKey} > ${entry.name}`, entry);
+        }
+    }
+    return map;
+}
+
+const baseMap = flatten(baseline);
+const currMap = flatten(current);
+
+const rows = [];
+for (const [key, curr] of currMap) {
+    const base = baseMap.get(key);
+    if (!base) { rows.push({ key, kind: "new",  curr, base: null, pct: null }); continue; }
+    const pct = (curr.meanMs - base.meanMs) / base.meanMs;
+    const kind =
+        pct >= REGRESSION_THRESHOLD   ? "regression" :
+        pct >= WARNING_THRESHOLD      ? "warning"    :
+        pct <= -IMPROVEMENT_THRESHOLD ? "improvement": "stable";
+    rows.push({ key, kind, curr, base, pct });
+}
+
+const regressions  = rows.filter(r => r.kind === "regression");
+const warnings     = rows.filter(r => r.kind === "warning");
+const improvements = rows.filter(r => r.kind === "improvement");
+const stable       = rows.filter(r => r.kind === "stable");
+const newTests     = rows.filter(r => r.kind === "new");
+
+// ── Formatting helpers ────────────────────────────────────────────────────────
+
+function esc(s) {
+    return String(s)
+        .replace(/&/g, "&amp;")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;");
+}
+
+function fmtMs(ms) {
+    return ms < 1 ? `${(ms * 1000).toFixed(0)} µs` : `${ms.toFixed(2)} ms`;
+}
+
+function fmtPct(pct) {
+    if (pct === null) return "—";
+    const sign = pct >= 0 ? "+" : "";
+    return `${sign}${(pct * 100).toFixed(1)}%`;
+}
+
+// ── Style constants ───────────────────────────────────────────────────────────
+
+const COLORS = {
+    regression:  { row: "#3d0000", border: "#ff4444", badge: "#ff4444", text: "#ff9999" },
+    warning:     { row: "#2d1a00", border: "#ff9500", badge: "#ff9500", text: "#ffcc66" },
+    improvement: { row: "#002200", border: "#22c55e", badge: "#22c55e", text: "#86efac" },
+    stable:      { row: "transparent", border: "transparent", badge: "#555", text: "#aaa" },
+    new:         { row: "#001a2d", border: "#38bdf8", badge: "#38bdf8", text: "#7dd3fc" },
+};
+
+const LABELS = {
+    regression:  "REGRESSION",
+    warning:     "SLOW",
+    improvement: "FASTER",
+    stable:      "OK",
+    new:         "NEW",
+};
+
+function badge(kind) {
+    const c = COLORS[kind];
+    return `<span style="display:inline-block;padding:2px 7px;border-radius:4px;font-size:11px;font-weight:700;background:${c.badge};color:#000;">${LABELS[kind]}</span>`;
+}
+
+const TH = (label) =>
+    `<th style="padding:6px 10px;text-align:left;font-size:12px;color:#8b949e;font-weight:600;border-bottom:1px solid #30363d;white-space:nowrap;">${label}</th>`;
+
+function tableRow(row) {
+    const { kind, curr, base, pct } = row;
+    const c = COLORS[kind];
+    const rowStyle = `background:${c.row};border-left:3px solid ${c.border};`;
+    const td = (val, mono = false) =>
+        `<td style="padding:5px 10px;font-size:12px;${mono ? "font-family:monospace;" : ""}color:#e6edf3;white-space:nowrap;">${val}</td>`;
+    const deltaStyle = `padding:5px 10px;font-size:12px;font-family:monospace;color:${c.text};font-weight:600;white-space:nowrap;`;
+
+    return [
+        `<tr style="${rowStyle}">`,
+        td(badge(kind)),
+        td(esc(curr.browser)),
+        td(esc(curr.suite)),
+        td(esc(curr.name)),
+        td(base ? fmtMs(base.meanMs) : "—", true),
+        td(fmtMs(curr.meanMs), true),
+        `<td style="${deltaStyle}">${fmtPct(pct)}</td>`,
+        `</tr>`,
+    ].join("");
+}
+
+function table(rows) {
+    return `
+<table style="width:100%;border-collapse:collapse;background:#0d1117;border:1px solid #30363d;border-radius:6px;overflow:hidden;">
+  <thead>
+    <tr style="background:#161b22;">
+      ${["", "Browser", "Suite", "Test", "Baseline", "Current", "Δ"].map(TH).join("")}
+    </tr>
+  </thead>
+  <tbody>
+    ${rows.map(tableRow).join("\n    ")}
+  </tbody>
+</table>`;
+}
+
+function statPill(count, label, color) {
+    return `<span style="display:inline-flex;align-items:center;gap:5px;padding:4px 12px;border-radius:20px;border:1px solid ${color};font-size:13px;color:${color};font-weight:600;">`
+        + `<strong>${count}</strong> ${label}</span>`;
+}
+
+// ── Build HTML ────────────────────────────────────────────────────────────────
+
+const hasIssues = regressions.length > 0 || warnings.length > 0;
+
+const bannerBg    = regressions.length ? "#3d0000" : warnings.length ? "#2d1a00" : "#002200";
+const bannerBorder= regressions.length ? "#ff4444" : warnings.length ? "#ff9500" : "#22c55e";
+const bannerText  = regressions.length
+    ? `🚨 ${regressions.length} regression${regressions.length > 1 ? "s" : ""} detected`
+    : warnings.length
+    ? `⚠️ ${warnings.length} warning${warnings.length > 1 ? "s" : ""} — no hard regressions`
+    : "✅ No regressions detected";
+
+const allSorted = [...regressions, ...warnings, ...stable, ...improvements, ...newTests];
+
+const html = `
+<h2 style="font-size:18px;margin-bottom:8px;">Benchmark Results</h2>
+
+<p style="font-size:12px;color:#8b949e;margin:0 0 12px;">
+  Baseline: <code>${esc(baseline.generated)}</code> &rarr; Current: <code>${esc(current.generated)}</code><br>
+  Thresholds: regression &gt;${REGRESSION_THRESHOLD * 100}%  &middot;  warning &gt;${WARNING_THRESHOLD * 100}%  &middot;  improvement &gt;${IMPROVEMENT_THRESHOLD * 100}% faster
+</p>
+
+<div style="padding:10px 16px;margin-bottom:16px;border-radius:6px;border-left:4px solid ${bannerBorder};background:${bannerBg};font-size:14px;font-weight:700;color:#e6edf3;">
+  ${bannerText}
+</div>
+
+<div style="display:flex;flex-wrap:wrap;gap:8px;margin-bottom:20px;">
+  ${statPill(regressions.length,  "regression(s)",  "#ff4444")}
+  ${statPill(warnings.length,     "warning(s)",     "#ff9500")}
+  ${statPill(improvements.length, "improvement(s)", "#22c55e")}
+  ${statPill(stable.length,       "stable",         "#555")}
+  ${statPill(newTests.length,     "new",            "#38bdf8")}
+</div>
+
+${hasIssues ? `
+<h3 style="font-size:14px;margin:0 0 8px;color:#e6edf3;">Regressions &amp; Warnings</h3>
+${table([...regressions, ...warnings])}
+<br>` : ""}
+
+${improvements.length > 0 ? `
+<h3 style="font-size:14px;margin:0 0 8px;color:#e6edf3;">Improvements</h3>
+${table(improvements)}
+<br>` : ""}
+
+<details>
+<summary style="cursor:pointer;font-size:13px;color:#8b949e;margin-bottom:8px;">
+  All results (${rows.length} benchmarks)
+</summary>
+${table(allSorted)}
+</details>
+`.trim();
+
+console.log(html);
+process.exit(regressions.length > 0 ? 1 : 0);

From ffdaad0736baed01b0de95f0a243ce8f8b3ef393 Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Fri, 24 Apr 2026 23:53:09 +0200
Subject: [PATCH 04/76] improved perf of benchmark workflow

---
 .github/workflows/checks.yaml | 73 +++++++++++++++++++++++++++++------
 scripts/merge-bench.mjs       | 23 +++++++++++
 2 files changed, 85 insertions(+), 11 deletions(-)
 create mode 100644 scripts/merge-bench.mjs

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index a14de016..88e9fbaa 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -62,6 +62,9 @@ jobs:
 
     benchmark:
         runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                browser: [chromium, webkit]
         steps:
             - uses: actions/checkout@v6
 
@@ -74,11 +77,64 @@ jobs:
             - name: Install dependencies
               run: npm install
 
-            - name: Install Playwright browsers
-              run: npx playwright install --with-deps chromium webkit
+            - name: Get Playwright version
+              id: pw-version
+              run: echo "version=$(node -e "console.log(require('./node_modules/playwright-core/package.json').version)")" >> $GITHUB_OUTPUT
 
-            - name: Download previous benchmark results
-              id: download-baseline
+            - name: Cache Playwright browser
+              uses: actions/cache@v4
+              id: pw-cache
+              with:
+                  path: ~/.cache/ms-playwright
+                  key: playwright-${{ matrix.browser }}-${{ steps.pw-version.outputs.version }}
+
+            - name: Install Playwright browser and system deps
+              if: steps.pw-cache.outputs.cache-hit != 'true'
+              run: npx playwright install --with-deps ${{ matrix.browser }}
+
+            - name: Install Playwright system deps only
+              if: steps.pw-cache.outputs.cache-hit == 'true'
+              run: npx playwright install-deps ${{ matrix.browser }}
+
+            - name: Run benchmarks
+              run: npx vitest bench --project ${{ matrix.browser }}
+
+            - name: Upload benchmark results
+              uses: actions/upload-artifact@v4
+              with:
+                  name: bench-results-${{ matrix.browser }}
+                  path: bench-results.json
+                  retention-days: 90
+                  overwrite: true
+
+    benchmark-compare:
+        runs-on: ubuntu-latest
+        needs: benchmark
+        steps:
+            - uses: actions/checkout@v6
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v6
+              with:
+                  node-version: "25.2.1"
+                  cache: "npm"
+
+            - name: Download chromium results
+              uses: actions/download-artifact@v4
+              with:
+                  name: bench-results-chromium
+                  path: bench-current-chromium
+
+            - name: Download webkit results
+              uses: actions/download-artifact@v4
+              with:
+                  name: bench-results-webkit
+                  path: bench-current-webkit
+
+            - name: Merge current results
+              run: node scripts/merge-bench.mjs bench-current-chromium/bench-results.json bench-current-webkit/bench-results.json > bench-results.json
+
+            - name: Download previous benchmark baseline
               uses: dawidd6/action-download-artifact@v9
               continue-on-error: true
               with:
@@ -88,21 +144,16 @@ jobs:
                   branch: ${{ github.ref_name }}
                   if_no_artifact_found: warn
 
-            - name: Run benchmarks
-              run: npm run bench
-
             - name: Compare and report
               run: |
                   if [ -f bench-baseline/bench-results.json ]; then
                     node scripts/compare-bench.mjs bench-baseline/bench-results.json bench-results.json >> $GITHUB_STEP_SUMMARY
                   else
-                    echo "## Benchmark Results" >> $GITHUB_STEP_SUMMARY
-                    echo "" >> $GITHUB_STEP_SUMMARY
-                    echo "No baseline found — results uploaded as the new baseline." >> $GITHUB_STEP_SUMMARY
+                    echo "<h2>Benchmark Results</h2><p>No baseline found — results uploaded as the new baseline.</p>" >> $GITHUB_STEP_SUMMARY
                   fi
               continue-on-error: true
 
-            - name: Upload benchmark results
+            - name: Upload merged benchmark results as new baseline
               uses: actions/upload-artifact@v4
               with:
                   name: bench-results
diff --git a/scripts/merge-bench.mjs b/scripts/merge-bench.mjs
new file mode 100644
index 00000000..9380b3c0
--- /dev/null
+++ b/scripts/merge-bench.mjs
@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+/**
+ * Merge multiple bench-results.json files into one.
+ * Usage: node scripts/merge-bench.mjs <file1> <file2> ... > merged.json
+ * Later files overwrite keys from earlier ones (last-writer-wins per group key).
+ */
+
+import { readFileSync } from "node:fs";
+
+const files = process.argv.slice(2);
+if (files.length < 2) {
+    console.error("Usage: merge-bench.mjs <file1> <file2> ...");
+    process.exit(1);
+}
+
+const merged = { generated: new Date().toISOString(), grouped: {} };
+
+for (const file of files) {
+    const data = JSON.parse(readFileSync(file, "utf-8"));
+    Object.assign(merged.grouped, data.grouped);
+}
+
+console.log(JSON.stringify(merged, null, 2));

From 927c289b6acdced6ca831ecb1a4549df0b0867fe Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Sat, 25 Apr 2026 03:02:31 +0200
Subject: [PATCH 05/76] fixed cors for staging deployment, started migration
 logic for local store and project version

---
 .../ProjectMigrationErrorDialog.module.css    |  89 +++++++
 .../projects/ProjectMigrationErrorDialog.tsx  | 101 ++++++++
 docker-compose.yml                            |   6 +
 package.json                                  |   2 +
 src/app/projects/layout.tsx                   |  12 +-
 src/context/ProjectContext.tsx                |   8 +-
 src/lib/import/import-project.ts              |   9 +-
 .../indexeddb-storage-provider.ts             | 105 ++++++--
 .../storage-provider/migrations/errors.ts     |  32 +++
 .../migrations/store-migration-runner.ts      |  41 ++++
 .../migrations/store-migrations.ts            |  71 ++++++
 .../storage-provider/storage-provider.ts      |   6 +
 .../migrations/project-migration-runner.ts    | 147 ++++++++++++
 .../project/migrations/project-migrations.ts  |  50 ++++
 src/lib/project/project-state.ts              |  22 +-
 .../project-migration-runner.test.ts          | 227 ++++++++++++++++++
 .../migrations/store-migration-runner.test.ts | 172 +++++++++++++
 src/tests/setup.ts                            |   6 +
 18 files changed, 1084 insertions(+), 22 deletions(-)
 create mode 100644 components/projects/ProjectMigrationErrorDialog.module.css
 create mode 100644 components/projects/ProjectMigrationErrorDialog.tsx
 create mode 100644 src/lib/persistence/storage-provider/migrations/errors.ts
 create mode 100644 src/lib/persistence/storage-provider/migrations/store-migration-runner.ts
 create mode 100644 src/lib/persistence/storage-provider/migrations/store-migrations.ts
 create mode 100644 src/lib/project/migrations/project-migration-runner.ts
 create mode 100644 src/lib/project/migrations/project-migrations.ts
 create mode 100644 src/tests/migrations/project-migration-runner.test.ts
 create mode 100644 src/tests/migrations/store-migration-runner.test.ts

diff --git a/components/projects/ProjectMigrationErrorDialog.module.css b/components/projects/ProjectMigrationErrorDialog.module.css
new file mode 100644
index 00000000..49fbd355
--- /dev/null
+++ b/components/projects/ProjectMigrationErrorDialog.module.css
@@ -0,0 +1,89 @@
+.overlay {
+    position: fixed;
+    inset: 0;
+    background: rgba(0, 0, 0, 0.6);
+    backdrop-filter: blur(3px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+}
+
+.modal {
+    width: 460px;
+    max-width: 90vw;
+    display: flex;
+    flex-direction: column;
+    border-radius: 16px;
+    overflow: hidden;
+    box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
+    background: var(--main-bg);
+    padding: 32px;
+}
+
+.title {
+    font-size: 1.2rem;
+    color: var(--primary-text);
+    margin: 0 0 8px 0;
+}
+
+.description {
+    font-size: 0.9rem;
+    color: var(--secondary-text);
+    margin: 0 0 24px 0;
+    line-height: 1.5;
+}
+
+.versionDetails {
+    font-size: 0.8rem;
+    color: var(--secondary-text);
+    background: var(--separator);
+    border-radius: 6px;
+    padding: 8px 12px;
+    margin: 0 0 20px 0;
+    font-family: monospace;
+}
+
+.actions {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    padding: 10px 16px;
+    border-radius: 8px;
+    border: none;
+    font-size: 0.9rem;
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.btn:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+}
+
+.primaryBtn {
+    background: var(--editor-tab-active);
+    color: var(--primary-text);
+}
+
+.primaryBtn:hover:not(:disabled) {
+    opacity: 0.85;
+}
+
+.secondaryBtn {
+    background: transparent;
+    color: var(--secondary-text);
+    border: 1px solid var(--separator);
+}
+
+.secondaryBtn:hover:not(:disabled) {
+    color: var(--primary-text);
+    border-color: var(--primary-text);
+}
diff --git a/components/projects/ProjectMigrationErrorDialog.tsx b/components/projects/ProjectMigrationErrorDialog.tsx
new file mode 100644
index 00000000..a369a793
--- /dev/null
+++ b/components/projects/ProjectMigrationErrorDialog.tsx
@@ -0,0 +1,101 @@
+"use client";
+
+import { useCallback, useState } from "react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { ArrowLeft, RotateCcw } from "lucide-react";
+
+import type { ProjectMigrationOutcome } from "@src/lib/project/migrations/project-migration-runner";
+
+import styles from "./ProjectMigrationErrorDialog.module.css";
+
+interface Props {
+    outcome: Extract<ProjectMigrationOutcome, { kind: "future-version" | "failed" }>;
+}
+
+const ProjectMigrationErrorDialog = ({ outcome }: Props) => {
+    const router = useRouter();
+    const params = useSearchParams();
+    const projectId = params.get("projectId");
+    const [busy, setBusy] = useState(false);
+
+    const goBack = useCallback(() => {
+        router.replace("/projects");
+    }, [router]);
+
+    const handleRestore = useCallback(async () => {
+        if (!projectId) return;
+        setBusy(true);
+        try {
+            const { restoreProjectFromBackup } = await import(
+                "@src/lib/project/migrations/project-migration-runner"
+            );
+            const ok = await restoreProjectFromBackup(projectId);
+            if (ok) {
+                window.location.reload();
+                return;
+            }
+            console.error("[ProjectMigrationErrorDialog] No backup available to restore");
+        } catch (e) {
+            console.error("[ProjectMigrationErrorDialog] Restore failed:", e);
+        }
+        setBusy(false);
+    }, [projectId]);
+
+    if (outcome.kind === "future-version") {
+        return (
+            <div className={styles.overlay}>
+                <div className={styles.modal}>
+                    <h2 className={styles.title}>Project from a newer version</h2>
+                    <p className={styles.description}>
+                        This project was created or last edited in a newer version of Scriptio. Update the
+                        app to open it safely.
+                    </p>
+                    <p className={styles.versionDetails}>
+                        Project version: {outcome.storedVersion} — App expects: {outcome.expected}
+                    </p>
+                    <div className={styles.actions}>
+                        <button className={`${styles.btn} ${styles.secondaryBtn}`} onClick={goBack}>
+                            <ArrowLeft size={16} />
+                            Back to projects
+                        </button>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+
+    return (
+        <div className={styles.overlay}>
+            <div className={styles.modal}>
+                <h2 className={styles.title}>Could not upgrade this project</h2>
+                <p className={styles.description}>
+                    Scriptio tried to upgrade this project to the latest version but a step failed. Your
+                    original data is safe — restore from the pre-upgrade backup, or open another project.
+                </p>
+                <p className={styles.versionDetails}>
+                    Failed at version {outcome.failedAt}: {outcome.error.message}
+                </p>
+                <div className={styles.actions}>
+                    <button
+                        className={`${styles.btn} ${styles.primaryBtn}`}
+                        onClick={handleRestore}
+                        disabled={busy}
+                    >
+                        <RotateCcw size={16} />
+                        Restore from backup
+                    </button>
+                    <button
+                        className={`${styles.btn} ${styles.secondaryBtn}`}
+                        onClick={goBack}
+                        disabled={busy}
+                    >
+                        <ArrowLeft size={16} />
+                        Back to projects
+                    </button>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default ProjectMigrationErrorDialog;
diff --git a/docker-compose.yml b/docker-compose.yml
index ab348deb..5db6cc70 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,12 @@ services:
             - traefik.http.routers.scriptio-app-auth.priority=100
             - traefik.http.routers.scriptio-app-auth.middlewares=prod-auth
             - traefik.http.middlewares.prod-auth.basicauth.users=${PROD_AUTH_USERS}
+            # Allow CORS OPTIONS preflight to bypass basic auth
+            - traefik.http.routers.scriptio-app-auth-options.rule=Host(`scriptio.app`) && (PathPrefix(`/projects`) || PathPrefix(`/api`)) && Method(`OPTIONS`)
+            - traefik.http.routers.scriptio-app-auth-options.entrypoints=secure
+            - traefik.http.routers.scriptio-app-auth-options.tls=true
+            - traefik.http.routers.scriptio-app-auth-options.tls.certresolver=letsencrypt
+            - traefik.http.routers.scriptio-app-auth-options.priority=200
 
     app-staging:
         image: ghcr.io/lycoon/scriptio-app:staging
diff --git a/package.json b/package.json
index 61e0385b..51128eeb 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,8 @@
         "lint": "eslint .",
         "bench": "vitest bench",
         "bench:watch": "vitest bench --watch",
+        "test": "vitest run",
+        "test:watch": "vitest",
         "gen:apple:jwt": "node --env-file=.env --import tsx scripts/generate-apple-jwt.ts"
     },
     "dependencies": {
diff --git a/src/app/projects/layout.tsx b/src/app/projects/layout.tsx
index c7762080..127b9fa6 100644
--- a/src/app/projects/layout.tsx
+++ b/src/app/projects/layout.tsx
@@ -3,6 +3,7 @@
 import Loading from "@components/utils/Loading";
 import DashboardModal from "@components/dashboard/DashboardModal";
 import ProjectUnavailableDialog from "@components/projects/ProjectUnavailableDialog";
+import ProjectMigrationErrorDialog from "@components/projects/ProjectMigrationErrorDialog";
 import { redirect, useSearchParams } from "next/navigation";
 import { ProjectProvider, useProjectReady } from "@src/context/ProjectContext";
 import { ViewProvider } from "@src/context/ViewContext";
@@ -49,13 +50,22 @@ interface ProjectLayoutInnerProps {
 }
 
 const ProjectLayoutInner = ({ children }: ProjectLayoutInnerProps) => {
-    const { isYjsReady, isProjectUnavailable } = useProjectReady();
+    const { isYjsReady, isProjectUnavailable, migrationOutcome } = useProjectReady();
     const { membership, isLoading: isMembershipLoading, isLocalOnly: isBrowserLocalOnly } = useProjectMembership();
 
     // Desktop (Tauri) and browser local-only projects skip the cloud membership requirement
     const isDesktop = isTauri();
     const isLocalAccess = isDesktop || isBrowserLocalOnly;
 
+    // Migration blocked the project from loading: show a dedicated error dialog
+    // before any other gating logic, so the user always gets a clear message.
+    if (
+        migrationOutcome &&
+        (migrationOutcome.kind === "future-version" || migrationOutcome.kind === "failed")
+    ) {
+        return <ProjectMigrationErrorDialog outcome={migrationOutcome} />;
+    }
+
     // Wait for membership to resolve for potential cloud projects
     if (!isLocalAccess && isMembershipLoading) {
         return <Loading />;
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index 84511436..2980b2bf 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -25,6 +25,7 @@ import {
     DEFAULT_PAGE_MARGINS,
     ShelfEntry,
 } from "@src/lib/project/project-state";
+import type { ProjectMigrationOutcome } from "@src/lib/project/migrations/project-migration-runner";
 import { Screenplay } from "@src/lib/utils/types";
 import { ScreenplayElement, TitlePageElement, Style, PageFormat } from "@src/lib/utils/enums";
 import { SearchMatch } from "@src/lib/screenplay/extensions/search-highlight-extension";
@@ -216,11 +217,13 @@ export const ProjectContext = createContext<ProjectContextType>(defaultContextVa
 interface ProjectReadyContextType {
     isYjsReady: boolean;
     isProjectUnavailable: boolean;
+    migrationOutcome: ProjectMigrationOutcome | null;
 }
 
 const ProjectReadyContext = createContext<ProjectReadyContextType>({
     isYjsReady: false,
     isProjectUnavailable: false,
+    migrationOutcome: null,
 });
 
 export const useProjectReady = () => useContext(ProjectReadyContext);
@@ -250,6 +253,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         connectionStatus: yjsConnectionStatus,
         users: yjsUsers,
         isProjectUnavailable,
+        migrationOutcome,
     } = useProjectYjs({
         projectId,
         userName,
@@ -841,8 +845,8 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
     );
 
     const readyValue = useMemo(
-        () => ({ isYjsReady, isProjectUnavailable }),
-        [isYjsReady, isProjectUnavailable],
+        () => ({ isYjsReady, isProjectUnavailable, migrationOutcome }),
+        [isYjsReady, isProjectUnavailable, migrationOutcome],
     );
 
     return (
diff --git a/src/lib/import/import-project.ts b/src/lib/import/import-project.ts
index fc89bede..ea134c6b 100644
--- a/src/lib/import/import-project.ts
+++ b/src/lib/import/import-project.ts
@@ -4,6 +4,7 @@
  */
 
 import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState } from "@src/lib/project/project-state";
+import { CURRENT_PROJECT_VERSION } from "@src/lib/project/migrations/project-migrations";
 import { getAdapterByFilename } from "@src/lib/adapters/registry";
 import { createCachedProject, createCachedProjectWithId } from "@src/lib/persistence/storage-provider/local-persistence";
 import { writeYjsDocumentLocally } from "@src/lib/persistence/y-local-provider";
@@ -88,10 +89,16 @@ async function createLocalYjsDocument(projectId: string, projectData: ProjectDat
         }
 
         // Maps
+        const metadataMap = ydoc.metadata();
         if (projectData.metadata) {
-            const metadataMap = ydoc.metadata();
             Object.entries(projectData.metadata).forEach(([key, value]) => metadataMap.set(key as keyof ProjectMetadata, value));
         }
+        // Stamp the schema version: preserves the imported file's version if it
+        // had one (so future-version files surface a migration error on open),
+        // otherwise marks the doc as current so it skips migration on first load.
+        if (metadataMap.get("version") === undefined) {
+            metadataMap.set("version", CURRENT_PROJECT_VERSION);
+        }
 
         if (projectData.characters) {
             const charactersMap = ydoc.characters();
diff --git a/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts b/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
index 7a5a970b..5ac71cec 100644
--- a/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
+++ b/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
@@ -1,16 +1,22 @@
 /**
  * IndexedDB storage provider for browser environments.
  * Stores project metadata and settings in IndexedDB.
+ *
+ * Schema versioning is delegated to the migrations/ module; bumping
+ * CURRENT_STORE_VERSION there is what triggers `onupgradeneeded`.
  */
 
 import type { InstalledDictionary, UserSettings } from "@src/lib/utils/types";
 import { CachedProject, ProjectEntryInput, StorageProvider } from "./storage-provider";
+import { CURRENT_STORE_VERSION, STORE_NAMES } from "./migrations/store-migrations";
+import { runStoreMigrations } from "./migrations/store-migration-runner";
+import { StoreVersionTooNewError } from "./migrations/errors";
 
 const BROWSER_DB_NAME = "scriptio-local";
-const BROWSER_DB_VERSION = 1;
-const PROJECTS_STORE = "cached_projects";
-const SETTINGS_STORE = "settings";
-const DICTIONARIES_STORE = "dictionaries";
+const PROJECTS_STORE = STORE_NAMES.PROJECTS;
+const SETTINGS_STORE = STORE_NAMES.SETTINGS;
+const DICTIONARIES_STORE = STORE_NAMES.DICTIONARIES;
+const MIGRATION_BACKUPS_STORE = STORE_NAMES.MIGRATION_BACKUPS;
 const SETTINGS_KEY = "global";
 
 interface BrowserStoredProject {
@@ -23,24 +29,41 @@ interface BrowserStoredProject {
     is_synced: number; // 0 = local-only, 1 = cloud-synced
 }
 
+interface MigrationBackupRecord {
+    projectId: string;
+    snapshot: Uint8Array;
+    fromVersion: number;
+    createdAt: number;
+}
+
 let browserDbInstance: IDBDatabase | null = null;
 
 async function getBrowserDb(): Promise<IDBDatabase> {
     if (browserDbInstance) return browserDbInstance;
 
     return new Promise((resolve, reject) => {
-        const request = indexedDB.open(BROWSER_DB_NAME, BROWSER_DB_VERSION);
+        const request = indexedDB.open(BROWSER_DB_NAME, CURRENT_STORE_VERSION);
+        // Holds a migration error from inside onupgradeneeded so onerror can surface it
+        // instead of the generic AbortError that fires when we manually abort the tx.
+        let upgradeError: unknown = null;
 
         request.onupgradeneeded = (event) => {
-            const db = (event.target as IDBOpenDBRequest).result;
-            if (!db.objectStoreNames.contains(PROJECTS_STORE)) {
-                db.createObjectStore(PROJECTS_STORE, { keyPath: "id" });
-            }
-            if (!db.objectStoreNames.contains(SETTINGS_STORE)) {
-                db.createObjectStore(SETTINGS_STORE);
+            const req = event.target as IDBOpenDBRequest;
+            const tx = req.transaction;
+            if (!tx) {
+                upgradeError = new Error("upgrade transaction missing");
+                return;
             }
-            if (!db.objectStoreNames.contains(DICTIONARIES_STORE)) {
-                db.createObjectStore(DICTIONARIES_STORE, { keyPath: "code" });
+            try {
+                runStoreMigrations({
+                    db: req.result,
+                    tx,
+                    oldVersion: event.oldVersion,
+                    newVersion: event.newVersion ?? CURRENT_STORE_VERSION,
+                });
+            } catch (err) {
+                upgradeError = err;
+                tx.abort();
             }
         };
 
@@ -48,7 +71,20 @@ async function getBrowserDb(): Promise<IDBDatabase> {
             browserDbInstance = request.result;
             resolve(browserDbInstance);
         };
-        request.onerror = () => reject(request.error);
+        request.onerror = () => {
+            if (upgradeError) {
+                reject(upgradeError);
+                return;
+            }
+            const err = request.error;
+            // VersionError fires when the on-disk DB has a higher version than
+            // what we're requesting (user installed a newer build, then downgraded).
+            if (err && err.name === "VersionError") {
+                reject(new StoreVersionTooNewError(0, CURRENT_STORE_VERSION));
+            } else {
+                reject(err);
+            }
+        };
     });
 }
 
@@ -257,4 +293,45 @@ export class IndexedDBStorageProvider implements StorageProvider {
             req.onerror = () => reject(req.error);
         });
     }
+
+    async saveMigrationBackup(projectId: string, snapshot: Uint8Array, fromVersion: number): Promise<void> {
+        const db = await getBrowserDb();
+        const record: MigrationBackupRecord = {
+            projectId,
+            snapshot,
+            fromVersion,
+            createdAt: Date.now(),
+        };
+        return new Promise((resolve, reject) => {
+            const tx = db.transaction(MIGRATION_BACKUPS_STORE, "readwrite");
+            tx.objectStore(MIGRATION_BACKUPS_STORE).put(record);
+            tx.oncomplete = () => resolve();
+            tx.onerror = () => reject(tx.error);
+        });
+    }
+
+    async loadMigrationBackup(projectId: string): Promise<{ snapshot: Uint8Array; fromVersion: number } | null> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const req = db
+                .transaction(MIGRATION_BACKUPS_STORE, "readonly")
+                .objectStore(MIGRATION_BACKUPS_STORE)
+                .get(projectId);
+            req.onsuccess = () => {
+                const result = req.result as MigrationBackupRecord | undefined;
+                resolve(result ? { snapshot: result.snapshot, fromVersion: result.fromVersion } : null);
+            };
+            req.onerror = () => reject(req.error);
+        });
+    }
+
+    async clearMigrationBackup(projectId: string): Promise<void> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const tx = db.transaction(MIGRATION_BACKUPS_STORE, "readwrite");
+            tx.objectStore(MIGRATION_BACKUPS_STORE).delete(projectId);
+            tx.oncomplete = () => resolve();
+            tx.onerror = () => reject(tx.error);
+        });
+    }
 }
diff --git a/src/lib/persistence/storage-provider/migrations/errors.ts b/src/lib/persistence/storage-provider/migrations/errors.ts
new file mode 100644
index 00000000..4a6965f5
--- /dev/null
+++ b/src/lib/persistence/storage-provider/migrations/errors.ts
@@ -0,0 +1,32 @@
+/**
+ * Typed errors for storage-level migrations. Surfaced to the UI so users
+ * see actionable messages instead of opaque IndexedDB exceptions.
+ */
+
+export class StoreVersionTooNewError extends Error {
+    readonly storedVersion: number;
+    readonly expectedVersion: number;
+
+    constructor(storedVersion: number, expectedVersion: number) {
+        super(
+            `Stored IndexedDB schema version (${storedVersion}) is newer than the app expects (${expectedVersion}). Update the app to open this data.`,
+        );
+        this.name = "StoreVersionTooNewError";
+        this.storedVersion = storedVersion;
+        this.expectedVersion = expectedVersion;
+    }
+}
+
+export class StoreMigrationFailedError extends Error {
+    readonly fromVersion: number;
+    readonly failedAt: number;
+    readonly cause: unknown;
+
+    constructor(fromVersion: number, failedAt: number, cause: unknown) {
+        super(`IndexedDB schema migration ${fromVersion} → ${failedAt} failed: ${String(cause)}`);
+        this.name = "StoreMigrationFailedError";
+        this.fromVersion = fromVersion;
+        this.failedAt = failedAt;
+        this.cause = cause;
+    }
+}
diff --git a/src/lib/persistence/storage-provider/migrations/store-migration-runner.ts b/src/lib/persistence/storage-provider/migrations/store-migration-runner.ts
new file mode 100644
index 00000000..c2184f6e
--- /dev/null
+++ b/src/lib/persistence/storage-provider/migrations/store-migration-runner.ts
@@ -0,0 +1,41 @@
+/**
+ * Walks the StoreMigration registry inside an IndexedDB versionchange
+ * transaction. Called from `onupgradeneeded`.
+ */
+
+import { StoreMigrationFailedError } from "./errors";
+import { STORE_MIGRATIONS, type StoreMigration } from "./store-migrations";
+
+export interface RunStoreMigrationsArgs {
+    db: IDBDatabase;
+    tx: IDBTransaction;
+    oldVersion: number;
+    newVersion: number;
+    migrations?: StoreMigration[];
+}
+
+/**
+ * Apply every migration whose `from >= oldVersion && to <= newVersion`,
+ * in order. The IDB transaction is shared with the caller — if any step
+ * throws, the browser aborts the transaction automatically and the on-disk
+ * schema is left at `oldVersion`.
+ */
+export function runStoreMigrations({
+    db,
+    tx,
+    oldVersion,
+    newVersion,
+    migrations = STORE_MIGRATIONS,
+}: RunStoreMigrationsArgs): void {
+    const steps = migrations
+        .filter((m) => m.from >= oldVersion && m.to <= newVersion)
+        .sort((a, b) => a.from - b.from);
+
+    for (const step of steps) {
+        try {
+            step.run(db, tx);
+        } catch (cause) {
+            throw new StoreMigrationFailedError(step.from, step.to, cause);
+        }
+    }
+}
diff --git a/src/lib/persistence/storage-provider/migrations/store-migrations.ts b/src/lib/persistence/storage-provider/migrations/store-migrations.ts
new file mode 100644
index 00000000..c82909ef
--- /dev/null
+++ b/src/lib/persistence/storage-provider/migrations/store-migrations.ts
@@ -0,0 +1,71 @@
+/**
+ * Registry of IndexedDB schema migrations for the app-wide `scriptio-local` database.
+ *
+ * Each entry is `{ from, to, run }`. `run` executes inside the IndexedDB
+ * `versionchange` transaction, so it must be synchronous and only use IDB
+ * operations available in upgrade transactions (createObjectStore /
+ * deleteObjectStore / cursors over existing stores).
+ *
+ * Adding a new migration:
+ *   1. Append a new step with `from = previous .to` and `to = previous.to + 1`.
+ *   2. The runner derives `CURRENT_STORE_VERSION` from the last `to`.
+ *   3. Existing users will run the new step on next app launch via `onupgradeneeded`.
+ */
+
+export interface StoreMigration {
+    from: number;
+    to: number;
+    description: string;
+    run: (db: IDBDatabase, tx: IDBTransaction) => void;
+}
+
+/** Object store names — kept in sync with IndexedDBStorageProvider. */
+export const STORE_NAMES = {
+    PROJECTS: "cached_projects",
+    SETTINGS: "settings",
+    DICTIONARIES: "dictionaries",
+    MIGRATION_BACKUPS: "migration_backups",
+} as const;
+
+/**
+ * v0 → v1: baseline. Creates the three original stores. This is the schema
+ * shipped before the migration framework existed; users already on v1 skip
+ * this step.
+ */
+const baselineV1: StoreMigration = {
+    from: 0,
+    to: 1,
+    description: "Baseline: create cached_projects, settings, dictionaries",
+    run: (db) => {
+        if (!db.objectStoreNames.contains(STORE_NAMES.PROJECTS)) {
+            db.createObjectStore(STORE_NAMES.PROJECTS, { keyPath: "id" });
+        }
+        if (!db.objectStoreNames.contains(STORE_NAMES.SETTINGS)) {
+            db.createObjectStore(STORE_NAMES.SETTINGS);
+        }
+        if (!db.objectStoreNames.contains(STORE_NAMES.DICTIONARIES)) {
+            db.createObjectStore(STORE_NAMES.DICTIONARIES, { keyPath: "code" });
+        }
+    },
+};
+
+/**
+ * v1 → v2: add a `migration_backups` store. The project-doc migration runner
+ * snapshots a Y.Doc here before mutating it, so a failed migration can be
+ * rolled back from the backup.
+ */
+const addMigrationBackupsStore: StoreMigration = {
+    from: 1,
+    to: 2,
+    description: "Add migration_backups store for project doc rollback snapshots",
+    run: (db) => {
+        if (!db.objectStoreNames.contains(STORE_NAMES.MIGRATION_BACKUPS)) {
+            db.createObjectStore(STORE_NAMES.MIGRATION_BACKUPS, { keyPath: "projectId" });
+        }
+    },
+};
+
+export const STORE_MIGRATIONS: StoreMigration[] = [baselineV1, addMigrationBackupsStore];
+
+export const CURRENT_STORE_VERSION =
+    STORE_MIGRATIONS.length === 0 ? 1 : STORE_MIGRATIONS[STORE_MIGRATIONS.length - 1].to;
diff --git a/src/lib/persistence/storage-provider/storage-provider.ts b/src/lib/persistence/storage-provider/storage-provider.ts
index 4ce89296..69a4ca8c 100644
--- a/src/lib/persistence/storage-provider/storage-provider.ts
+++ b/src/lib/persistence/storage-provider/storage-provider.ts
@@ -47,6 +47,12 @@ export interface StorageProvider {
     loadDictionary(code: string): Promise<{ aff: Uint8Array; dic: Uint8Array } | null>;
     deleteDictionary(code: string): Promise<void>;
     listInstalledDictionaries(): Promise<InstalledDictionary[]>;
+
+    // Migration backups: pre-migration Yjs document snapshots (one per project).
+    // Used by the project-doc migration runner to roll back if a step throws.
+    saveMigrationBackup(projectId: string, snapshot: Uint8Array, fromVersion: number): Promise<void>;
+    loadMigrationBackup(projectId: string): Promise<{ snapshot: Uint8Array; fromVersion: number } | null>;
+    clearMigrationBackup(projectId: string): Promise<void>;
 }
 
 // Singleton cache
diff --git a/src/lib/project/migrations/project-migration-runner.ts b/src/lib/project/migrations/project-migration-runner.ts
new file mode 100644
index 00000000..e8550fd4
--- /dev/null
+++ b/src/lib/project/migrations/project-migration-runner.ts
@@ -0,0 +1,147 @@
+/**
+ * Drives `PROJECT_MIGRATIONS` against a single `ProjectState`. Called from
+ * `useLocalPersistence` after `y-indexeddb` has fully synced and **before**
+ * the cloud `WebsocketProvider` connects, to avoid concurrent migrations
+ * across clients producing duplicated effects.
+ */
+
+import * as Y from "yjs";
+import type { ProjectState } from "../project-state";
+import {
+    CURRENT_PROJECT_VERSION,
+    LEGACY_PROJECT_VERSION,
+    PROJECT_MIGRATIONS,
+    type ProjectMigration,
+} from "./project-migrations";
+
+export type ProjectMigrationOutcome =
+    | { kind: "up-to-date"; version: number }
+    | { kind: "migrated"; from: number; to: number; appliedSteps: string[] }
+    | { kind: "future-version"; storedVersion: number; expected: number }
+    | { kind: "failed"; from: number; failedAt: number; error: Error };
+
+const MIGRATION_ORIGIN = "migration";
+
+interface BackupStore {
+    saveMigrationBackup(projectId: string, snapshot: Uint8Array, fromVersion: number): Promise<void>;
+}
+
+export interface MigrateProjectDocArgs {
+    ydoc: ProjectState;
+    projectId: string;
+    /** Override for tests; defaults to `getStorageProvider()`. */
+    backupStore?: BackupStore;
+    /** Override for tests; defaults to `PROJECT_MIGRATIONS`. */
+    migrations?: ProjectMigration[];
+    /** Override for tests; defaults to `CURRENT_PROJECT_VERSION`. */
+    currentVersion?: number;
+}
+
+async function defaultBackupStore(): Promise<BackupStore> {
+    const { getStorageProvider } = await import("../../persistence/storage-provider/storage-provider");
+    return getStorageProvider();
+}
+
+function readVersion(ydoc: ProjectState): number {
+    const stored = ydoc.metadata().get("version");
+    return typeof stored === "number" ? stored : LEGACY_PROJECT_VERSION;
+}
+
+/**
+ * Migrate a project Y.Doc to `CURRENT_PROJECT_VERSION`.
+ *
+ * Returns an outcome describing what happened. The caller decides UI
+ * (block load on `future-version`/`failed`, show the doc on `up-to-date`/`migrated`).
+ */
+export async function migrateProjectDoc({
+    ydoc,
+    projectId,
+    backupStore,
+    migrations = PROJECT_MIGRATIONS,
+    currentVersion = CURRENT_PROJECT_VERSION,
+}: MigrateProjectDocArgs): Promise<ProjectMigrationOutcome> {
+    const stored = readVersion(ydoc);
+
+    if (stored === currentVersion) {
+        return { kind: "up-to-date", version: stored };
+    }
+    if (stored > currentVersion) {
+        return { kind: "future-version", storedVersion: stored, expected: currentVersion };
+    }
+
+    const steps = migrations
+        .filter((m) => m.from >= stored && m.to <= currentVersion)
+        .sort((a, b) => a.from - b.from);
+
+    if (steps.length === 0) {
+        // Nothing to run, but the version field is stale — bring it forward.
+        ydoc.transact(() => {
+            ydoc.metadata().set("version", currentVersion);
+        }, MIGRATION_ORIGIN);
+        return { kind: "migrated", from: stored, to: currentVersion, appliedSteps: [] };
+    }
+
+    // Snapshot the doc before mutating so a failed step can be rolled back.
+    const snapshot = Y.encodeStateAsUpdate(ydoc);
+    const store = backupStore ?? (await defaultBackupStore());
+    await store.saveMigrationBackup(projectId, snapshot, stored);
+
+    const applied: string[] = [];
+    for (const step of steps) {
+        try {
+            ydoc.transact(() => step.run(ydoc), MIGRATION_ORIGIN);
+            applied.push(step.description);
+        } catch (cause) {
+            return {
+                kind: "failed",
+                from: stored,
+                failedAt: step.to,
+                error: cause instanceof Error ? cause : new Error(String(cause)),
+            };
+        }
+    }
+
+    ydoc.transact(() => {
+        ydoc.metadata().set("version", currentVersion);
+    }, MIGRATION_ORIGIN);
+
+    return { kind: "migrated", from: stored, to: currentVersion, appliedSteps: applied };
+}
+
+/**
+ * Replay a stored backup snapshot into a fresh Y.Doc, then write that doc
+ * back to local persistence. Used when the user picks "Restore from backup"
+ * after a failed migration.
+ */
+export async function restoreProjectFromBackup(projectId: string): Promise<boolean> {
+    const { getStorageProvider } = await import("../../persistence/storage-provider/storage-provider");
+    const provider = await getStorageProvider();
+    const backup = await provider.loadMigrationBackup(projectId);
+    if (!backup) return false;
+
+    const { yjsDbKey } = await import("../../persistence/y-local-provider");
+    const { IndexeddbPersistence } = await import("y-indexeddb");
+
+    // Wipe the current Yjs DB by clearing the existing persistence.
+    const wipeDoc = new Y.Doc();
+    const wipePersistence = new IndexeddbPersistence(yjsDbKey(projectId), wipeDoc);
+    await new Promise<void>((resolve) => wipePersistence.on("synced", () => resolve()));
+    const clearable = wipePersistence as unknown as { clearData?: () => Promise<void> };
+    if (typeof clearable.clearData === "function") {
+        await clearable.clearData();
+    }
+    wipePersistence.destroy();
+    wipeDoc.destroy();
+
+    // Replay the snapshot into a fresh doc and write it back.
+    const restoredDoc = new Y.Doc();
+    Y.applyUpdate(restoredDoc, backup.snapshot);
+    const writePersistence = new IndexeddbPersistence(yjsDbKey(projectId), restoredDoc);
+    await new Promise<void>((resolve) => writePersistence.on("synced", () => resolve()));
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    writePersistence.destroy();
+    restoredDoc.destroy();
+
+    await provider.clearMigrationBackup(projectId);
+    return true;
+}
diff --git a/src/lib/project/migrations/project-migrations.ts b/src/lib/project/migrations/project-migrations.ts
new file mode 100644
index 00000000..972bd0cb
--- /dev/null
+++ b/src/lib/project/migrations/project-migrations.ts
@@ -0,0 +1,50 @@
+/**
+ * Registry of per-project Yjs document migrations.
+ *
+ * Each migration mutates a `ProjectState` (Y.Doc) in place. The runner wraps
+ * the call in a single Y transaction with origin "migration".
+ *
+ * Hard requirements for `run`:
+ *   - **Idempotent**. A cloud-synced project may receive concurrent migrations
+ *     from multiple clients; CRDT merge must produce the same state regardless
+ *     of how many times the migration ran. In practice: only set keys, don't
+ *     append blindly to lists, don't re-derive existing data.
+ *   - **Synchronous**. The runner does the transact wrapping.
+ *   - **No I/O**. Migrations operate purely on the Y.Doc.
+ *
+ * Adding a new migration:
+ *   1. Append a new step with `from = previous.to`, `to = previous.to + 1`.
+ *   2. The runner derives `CURRENT_PROJECT_VERSION` from the last `to`.
+ *   3. Existing projects upgrade lazily on first open.
+ */
+
+import type { ProjectState } from "../project-state";
+
+export interface ProjectMigration {
+    from: number;
+    to: number;
+    description: string;
+    run: (ydoc: ProjectState) => void;
+}
+
+export const PROJECT_MIGRATIONS: ProjectMigration[] = [
+    // Example for the next breaking change:
+    // {
+    //     from: 1,
+    //     to: 2,
+    //     description: "Move legacy comments from screenplay marks into the comments map",
+    //     run: (ydoc) => { ... },
+    // },
+];
+
+/**
+ * Version every project should be at after migration. Legacy projects (no
+ * version field in metadata) are treated as version 1, matching the schema
+ * shipped before the migration framework existed.
+ */
+export const LEGACY_PROJECT_VERSION = 1;
+
+export const CURRENT_PROJECT_VERSION =
+    PROJECT_MIGRATIONS.length === 0
+        ? LEGACY_PROJECT_VERSION
+        : PROJECT_MIGRATIONS[PROJECT_MIGRATIONS.length - 1].to;
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 572c298c..0150b54f 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -16,6 +16,7 @@ import type { LocationItem, LocationMap } from "../screenplay/locations";
 import type { PersistentScene, PersistentSceneMap } from "../screenplay/scenes";
 import type { Comment } from "../utils/types";
 import type { YjsLocalProvider } from "../persistence/y-local-provider";
+import type { ProjectMigrationOutcome } from "./migrations/project-migration-runner";
 
 // Lazy re-export repository for convenient access (avoid loading yjs at module level)
 export const getProjectRepository = async () => {
@@ -58,6 +59,7 @@ export interface ProjectYjsState {
     isLockedByServer: boolean;
     isSessionReplaced: boolean;
     isProjectUnavailable: boolean;
+    migrationOutcome: ProjectMigrationOutcome | null;
 }
 
 export interface CollaboratorInfo {
@@ -352,12 +354,14 @@ export const getBoardMap = (ydoc: ProjectState): TypedMap<BoardData> => {
 export const useLocalPersistence = (projectId: string | null) => {
     const [ydoc, setYdoc] = useState<ProjectState | null>(null);
     const [isLocalReady, setIsLocalReady] = useState(false);
+    const [migrationOutcome, setMigrationOutcome] = useState<ProjectMigrationOutcome | null>(null);
     const persistenceRef = useRef<YjsLocalProvider | null>(null);
 
     useEffect(() => {
         if (!projectId || typeof window === "undefined") {
             setYdoc(null);
             setIsLocalReady(false);
+            setMigrationOutcome(null);
             return;
         }
 
@@ -367,8 +371,16 @@ export const useLocalPersistence = (projectId: string | null) => {
             const { createLocalYjsProvider } = await import("../persistence/y-local-provider");
             const localProvider = await createLocalYjsProvider(projectId, state);
 
-            localProvider.on("synced", () => {
+            localProvider.on("synced", async () => {
                 if (isDestroyed) return;
+                const { migrateProjectDoc } = await import("./migrations/project-migration-runner");
+                const outcome = await migrateProjectDoc({ ydoc: state, projectId });
+                if (isDestroyed) return;
+                setMigrationOutcome(outcome);
+                if (outcome.kind === "future-version" || outcome.kind === "failed") {
+                    // Block UI from rendering the project; layout shows error dialog instead.
+                    return;
+                }
                 setIsLocalReady(true);
             });
 
@@ -392,10 +404,11 @@ export const useLocalPersistence = (projectId: string | null) => {
                 return null;
             });
             setIsLocalReady(false);
+            setMigrationOutcome(null);
         };
     }, [projectId]);
 
-    return { ydoc, isLocalReady };
+    return { ydoc, isLocalReady, migrationOutcome };
 };
 
 // -------------------------------- //
@@ -700,7 +713,7 @@ export const useProjectYjs = ({
         [userName, userColor, userId, fallback.name, fallback.color],
     );
 
-    const { ydoc, isLocalReady } = useLocalPersistence(projectId);
+    const { ydoc, isLocalReady, migrationOutcome } = useLocalPersistence(projectId);
     const {
         provider,
         users,
@@ -710,7 +723,7 @@ export const useProjectYjs = ({
         isLockedByServer,
         isSessionReplaced,
         isProjectUnavailable,
-    } = useCloudSync(projectId, ydoc, userInfo);
+    } = useCloudSync(projectId, isLocalReady ? ydoc : null, userInfo);
 
     // isReady: project is ready when ydoc exists and local storage is synced
     // Cloud sync happens in the background and will merge data when it arrives
@@ -730,6 +743,7 @@ export const useProjectYjs = ({
         isLockedByServer,
         isSessionReplaced,
         isProjectUnavailable,
+        migrationOutcome,
     };
 };
 
diff --git a/src/tests/migrations/project-migration-runner.test.ts b/src/tests/migrations/project-migration-runner.test.ts
new file mode 100644
index 00000000..cf5bb410
--- /dev/null
+++ b/src/tests/migrations/project-migration-runner.test.ts
@@ -0,0 +1,227 @@
+import { describe, expect, it } from "vitest";
+import * as Y from "yjs";
+
+import { ProjectState } from "@src/lib/project/project-state";
+import { migrateProjectDoc } from "@src/lib/project/migrations/project-migration-runner";
+import type { ProjectMigration } from "@src/lib/project/migrations/project-migrations";
+
+interface FakeBackupStore {
+    saveMigrationBackup: (projectId: string, snapshot: Uint8Array, fromVersion: number) => Promise<void>;
+    saved: Array<{ projectId: string; snapshot: Uint8Array; fromVersion: number }>;
+}
+
+function makeBackupStore(): FakeBackupStore {
+    const saved: FakeBackupStore["saved"] = [];
+    return {
+        saved,
+        async saveMigrationBackup(projectId, snapshot, fromVersion) {
+            saved.push({ projectId, snapshot, fromVersion });
+        },
+    };
+}
+
+describe("migrateProjectDoc", () => {
+    it("returns up-to-date and writes nothing when version equals current", async () => {
+        const ydoc = new ProjectState();
+        ydoc.metadata().set("version", 3);
+        const before = Y.encodeStateAsUpdate(ydoc);
+
+        const backup = makeBackupStore();
+        const outcome = await migrateProjectDoc({
+            ydoc,
+            projectId: "p",
+            backupStore: backup,
+            migrations: [],
+            currentVersion: 3,
+        });
+
+        expect(outcome.kind).toBe("up-to-date");
+        expect(backup.saved).toHaveLength(0);
+
+        const after = Y.encodeStateAsUpdate(ydoc);
+        // No mutations: byte-identical state.
+        expect(after).toEqual(before);
+        ydoc.destroy();
+    });
+
+    it("treats a missing version field as legacy v1", async () => {
+        const ydoc = new ProjectState();
+        const backup = makeBackupStore();
+
+        const outcome = await migrateProjectDoc({
+            ydoc,
+            projectId: "p",
+            backupStore: backup,
+            migrations: [],
+            currentVersion: 1,
+        });
+
+        expect(outcome.kind).toBe("up-to-date");
+        if (outcome.kind === "up-to-date") {
+            expect(outcome.version).toBe(1);
+        }
+        ydoc.destroy();
+    });
+
+    it("blocks future-version projects without mutating", async () => {
+        const ydoc = new ProjectState();
+        ydoc.metadata().set("version", 99);
+        const before = Y.encodeStateAsUpdate(ydoc);
+
+        const backup = makeBackupStore();
+        const outcome = await migrateProjectDoc({
+            ydoc,
+            projectId: "p",
+            backupStore: backup,
+            migrations: [],
+            currentVersion: 2,
+        });
+
+        expect(outcome.kind).toBe("future-version");
+        if (outcome.kind === "future-version") {
+            expect(outcome.storedVersion).toBe(99);
+            expect(outcome.expected).toBe(2);
+        }
+        expect(backup.saved).toHaveLength(0);
+        expect(Y.encodeStateAsUpdate(ydoc)).toEqual(before);
+        ydoc.destroy();
+    });
+
+    it("applies a chain of steps in order and bumps version atomically", async () => {
+        const ydoc = new ProjectState();
+        // Stored version = 1 (legacy default).
+        const ran: string[] = [];
+        const migrations: ProjectMigration[] = [
+            {
+                from: 1,
+                to: 2,
+                description: "bump-author",
+                run: (doc) => {
+                    ran.push("v2");
+                    doc.metadata().set("author", "migrated-author");
+                },
+            },
+            {
+                from: 2,
+                to: 3,
+                description: "bump-title",
+                run: (doc) => {
+                    ran.push("v3");
+                    doc.metadata().set("title", "migrated-title");
+                },
+            },
+        ];
+
+        const outcome = await migrateProjectDoc({
+            ydoc,
+            projectId: "p",
+            backupStore: makeBackupStore(),
+            migrations,
+            currentVersion: 3,
+        });
+
+        expect(outcome.kind).toBe("migrated");
+        if (outcome.kind === "migrated") {
+            expect(outcome.from).toBe(1);
+            expect(outcome.to).toBe(3);
+            expect(outcome.appliedSteps).toEqual(["bump-author", "bump-title"]);
+        }
+        expect(ran).toEqual(["v2", "v3"]);
+        expect(ydoc.metadata().get("version")).toBe(3);
+        expect(ydoc.metadata().get("author")).toBe("migrated-author");
+        expect(ydoc.metadata().get("title")).toBe("migrated-title");
+        ydoc.destroy();
+    });
+
+    it("saves a pre-migration backup before mutating", async () => {
+        const ydoc = new ProjectState();
+        ydoc.metadata().set("title", "before");
+        const beforeSnapshot = Y.encodeStateAsUpdate(ydoc);
+
+        const backup = makeBackupStore();
+        const migrations: ProjectMigration[] = [
+            {
+                from: 1,
+                to: 2,
+                description: "rewrite",
+                run: (doc) => doc.metadata().set("title", "after"),
+            },
+        ];
+
+        await migrateProjectDoc({
+            ydoc,
+            projectId: "proj-42",
+            backupStore: backup,
+            migrations,
+            currentVersion: 2,
+        });
+
+        expect(backup.saved).toHaveLength(1);
+        expect(backup.saved[0].projectId).toBe("proj-42");
+        expect(backup.saved[0].fromVersion).toBe(1);
+        expect(backup.saved[0].snapshot).toEqual(beforeSnapshot);
+        ydoc.destroy();
+    });
+
+    it("returns failed and does not advance version when a step throws", async () => {
+        const ydoc = new ProjectState();
+        ydoc.metadata().set("title", "T");
+
+        const migrations: ProjectMigration[] = [
+            { from: 1, to: 2, description: "ok", run: (doc) => doc.metadata().set("author", "A") },
+            { from: 2, to: 3, description: "bad", run: () => { throw new Error("boom"); } },
+        ];
+
+        const outcome = await migrateProjectDoc({
+            ydoc,
+            projectId: "p",
+            backupStore: makeBackupStore(),
+            migrations,
+            currentVersion: 3,
+        });
+
+        expect(outcome.kind).toBe("failed");
+        if (outcome.kind === "failed") {
+            expect(outcome.from).toBe(1);
+            expect(outcome.failedAt).toBe(3);
+            expect(outcome.error.message).toBe("boom");
+        }
+        // Step 1 ran (its mutation is visible) but version was NOT advanced.
+        expect(ydoc.metadata().get("author")).toBe("A");
+        expect(ydoc.metadata().get("version")).toBeUndefined();
+        ydoc.destroy();
+    });
+
+    it("running the same migration chain twice is idempotent", async () => {
+        const ydoc = new ProjectState();
+        const migrations: ProjectMigration[] = [
+            {
+                from: 1,
+                to: 2,
+                description: "set-flag",
+                run: (doc) => doc.metadata().set("titlepageInitialized", true),
+            },
+        ];
+
+        await migrateProjectDoc({
+            ydoc,
+            projectId: "p",
+            backupStore: makeBackupStore(),
+            migrations,
+            currentVersion: 2,
+        });
+        const stateAfterFirst = Y.encodeStateAsUpdate(ydoc);
+
+        // Second invocation: stored is now 2, equals current → up-to-date, no writes.
+        const outcome = await migrateProjectDoc({
+            ydoc,
+            projectId: "p",
+            backupStore: makeBackupStore(),
+            migrations,
+            currentVersion: 2,
+        });
+        expect(outcome.kind).toBe("up-to-date");
+        expect(Y.encodeStateAsUpdate(ydoc)).toEqual(stateAfterFirst);
+        ydoc.destroy();
+    });
+});
diff --git a/src/tests/migrations/store-migration-runner.test.ts b/src/tests/migrations/store-migration-runner.test.ts
new file mode 100644
index 00000000..0bba24ca
--- /dev/null
+++ b/src/tests/migrations/store-migration-runner.test.ts
@@ -0,0 +1,172 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+import { runStoreMigrations } from "@src/lib/persistence/storage-provider/migrations/store-migration-runner";
+import {
+    STORE_MIGRATIONS,
+    STORE_NAMES,
+    type StoreMigration,
+} from "@src/lib/persistence/storage-provider/migrations/store-migrations";
+import { StoreMigrationFailedError } from "@src/lib/persistence/storage-provider/migrations/errors";
+
+let dbName: string;
+
+function uniqueName() {
+    return `scriptio-test-${Math.random().toString(36).slice(2)}`;
+}
+
+function openWithMigrations(
+    name: string,
+    version: number,
+    migrations: StoreMigration[],
+): Promise<IDBDatabase> {
+    return new Promise((resolve, reject) => {
+        const req = indexedDB.open(name, version);
+        let upgradeError: unknown = null;
+        req.onupgradeneeded = (event) => {
+            const r = event.target as IDBOpenDBRequest;
+            const tx = r.transaction;
+            if (!tx) {
+                upgradeError = new Error("missing tx");
+                return;
+            }
+            try {
+                runStoreMigrations({
+                    db: r.result,
+                    tx,
+                    oldVersion: event.oldVersion,
+                    newVersion: event.newVersion ?? version,
+                    migrations,
+                });
+            } catch (err) {
+                upgradeError = err;
+                tx.abort();
+            }
+        };
+        req.onsuccess = () => resolve(req.result);
+        req.onerror = () => reject(upgradeError ?? req.error);
+    });
+}
+
+function deleteDb(name: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const req = indexedDB.deleteDatabase(name);
+        req.onsuccess = () => resolve();
+        req.onerror = () => reject(req.error);
+        req.onblocked = () => resolve();
+    });
+}
+
+beforeEach(() => {
+    dbName = uniqueName();
+});
+
+afterEach(async () => {
+    await deleteDb(dbName);
+});
+
+describe("runStoreMigrations", () => {
+    it("applies the full registry on a fresh database", async () => {
+        const db = await openWithMigrations(dbName, 2, STORE_MIGRATIONS);
+        expect(Array.from(db.objectStoreNames).sort()).toEqual(
+            [
+                STORE_NAMES.PROJECTS,
+                STORE_NAMES.SETTINGS,
+                STORE_NAMES.DICTIONARIES,
+                STORE_NAMES.MIGRATION_BACKUPS,
+            ].sort(),
+        );
+        db.close();
+    });
+
+    it("only runs steps within [oldVersion, newVersion]", async () => {
+        const ran: string[] = [];
+        const m: StoreMigration[] = [
+            { from: 0, to: 1, description: "v1", run: () => ran.push("v1") },
+            { from: 1, to: 2, description: "v2", run: () => ran.push("v2") },
+            { from: 2, to: 3, description: "v3", run: () => ran.push("v3") },
+        ];
+        const db = await openWithMigrations(dbName, 2, m);
+        expect(ran).toEqual(["v1", "v2"]);
+        db.close();
+    });
+
+    it("walks multi-step chains in order from oldVersion to newVersion", async () => {
+        const ran: number[] = [];
+        const m: StoreMigration[] = [
+            { from: 0, to: 1, description: "v1", run: (db) => { ran.push(1); db.createObjectStore("a"); } },
+            { from: 1, to: 2, description: "v2", run: (db) => { ran.push(2); db.createObjectStore("b"); } },
+            { from: 2, to: 3, description: "v3", run: (db) => { ran.push(3); db.createObjectStore("c"); } },
+        ];
+        const db = await openWithMigrations(dbName, 3, m);
+        expect(ran).toEqual([1, 2, 3]);
+        expect(Array.from(db.objectStoreNames).sort()).toEqual(["a", "b", "c"]);
+        db.close();
+    });
+
+    it("aborts the upgrade transaction when a step throws and leaves the schema unchanged", async () => {
+        const m: StoreMigration[] = [
+            { from: 0, to: 1, description: "v1", run: (db) => { db.createObjectStore("a"); } },
+            { from: 1, to: 2, description: "v2 (throws)", run: () => { throw new Error("boom"); } },
+        ];
+
+        let caught: unknown;
+        try {
+            const db = await openWithMigrations(dbName, 2, m);
+            db.close();
+        } catch (e) {
+            caught = e;
+        }
+        // Either the runner throws StoreMigrationFailedError, or the IDB transaction
+        // aborts with an AbortError after the throw bubbles up.
+        const isExpected =
+            caught instanceof StoreMigrationFailedError ||
+            (caught instanceof DOMException && (caught.name === "AbortError" || caught.name === "InvalidStateError"));
+        expect(isExpected).toBe(true);
+
+        // Re-opening with version=1 should succeed and store "a" should not exist
+        // (the upgrade transaction was rolled back).
+        const reopen = await new Promise<IDBDatabase>((resolve, reject) => {
+            const req = indexedDB.open(dbName);
+            req.onsuccess = () => resolve(req.result);
+            req.onerror = () => reject(req.error);
+        });
+        expect(reopen.version).toBe(0 < reopen.version ? reopen.version : 0);
+        // Browser may keep the DB at version 0 (never opened) or at 1 (partial open).
+        // Either way, store "a" must NOT exist because the throwing tx aborted.
+        if (reopen.version >= 1) {
+            expect(reopen.objectStoreNames.contains("a")).toBe(false);
+        }
+        reopen.close();
+    });
+
+    it("upgrade from v1 to v2 adds only the new store and preserves existing data", async () => {
+        // Step 1: open at v1 with only the baseline.
+        const db1 = await openWithMigrations(dbName, 1, [STORE_MIGRATIONS[0]]);
+        await new Promise<void>((resolve, reject) => {
+            const tx = db1.transaction(STORE_NAMES.PROJECTS, "readwrite");
+            tx.objectStore(STORE_NAMES.PROJECTS).put({
+                id: "p1",
+                title: "T",
+                description: null,
+                author: null,
+                createdAt: 0,
+                updatedAt: 0,
+                is_synced: 0,
+            });
+            tx.oncomplete = () => resolve();
+            tx.onerror = () => reject(tx.error);
+        });
+        db1.close();
+
+        // Step 2: re-open at v2 — only addMigrationBackupsStore should run.
+        const db2 = await openWithMigrations(dbName, 2, STORE_MIGRATIONS);
+        expect(db2.objectStoreNames.contains(STORE_NAMES.MIGRATION_BACKUPS)).toBe(true);
+        const persisted = await new Promise<unknown>((resolve, reject) => {
+            const req = db2.transaction(STORE_NAMES.PROJECTS, "readonly").objectStore(STORE_NAMES.PROJECTS).get("p1");
+            req.onsuccess = () => resolve(req.result);
+            req.onerror = () => reject(req.error);
+        });
+        expect((persisted as { id: string }).id).toBe("p1");
+        db2.close();
+    });
+});
diff --git a/src/tests/setup.ts b/src/tests/setup.ts
index 84e9b174..8f3c83bb 100644
--- a/src/tests/setup.ts
+++ b/src/tests/setup.ts
@@ -7,6 +7,12 @@ class StubWorker {
 }
 (globalThis as Record<string, unknown>).Worker = StubWorker;
 
+// Browser test runtime has no `process` — shim it so modules that read
+// `process.env.NEXT_PUBLIC_*` at top level can load without crashing.
+if (typeof (globalThis as Record<string, unknown>).process === "undefined") {
+    (globalThis as Record<string, unknown>).process = { env: {} };
+}
+
 // Suppress per-transaction console output from extensions globally.
 // beforeEach does not cover bench() cases in vitest browser mode.
 console.log = () => {};

From 1fc2252cb2a5731f07819b77d8f81f199429f3ef Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sat, 25 Apr 2026 21:18:54 +0200
Subject: [PATCH 06/76] fixed tauri plugin iap

---
 src-tauri/.cargo/config.toml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src-tauri/.cargo/config.toml

diff --git a/src-tauri/.cargo/config.toml b/src-tauri/.cargo/config.toml
new file mode 100644
index 00000000..5b109c79
--- /dev/null
+++ b/src-tauri/.cargo/config.toml
@@ -0,0 +1,2 @@
+[env]
+MACOSX_DEPLOYMENT_TARGET = "13.0"

From aa20ca4563a099b5e1b83189f7106d4cb759fbe3 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 26 Apr 2026 00:28:36 +0200
Subject: [PATCH 07/76] fixed apple build

---
 src-tauri/.cargo/config.toml | 2 --
 src-tauri/tauri.conf.json    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 src-tauri/.cargo/config.toml

diff --git a/src-tauri/.cargo/config.toml b/src-tauri/.cargo/config.toml
deleted file mode 100644
index 5b109c79..00000000
--- a/src-tauri/.cargo/config.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[env]
-MACOSX_DEPLOYMENT_TARGET = "13.0"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 2dedf9cc..2d310606 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -30,6 +30,9 @@
         "active": true,
         "targets": "all",
         "publisher": "Arko Logic",
+        "macOS": {
+            "minimumSystemVersion": "13.0"
+        },
         "icon": [
             "icons/32x32.png",
             "icons/128x128.png",

From 0c382823112d4fbf5e35e465f1a2beb725677fdd Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 26 Apr 2026 02:42:40 +0200
Subject: [PATCH 08/76] trying to fix staging tauri app

---
 components/dashboard/DashboardModal.tsx       | 19 +++++--
 components/dashboard/DashboardSidebar.tsx     |  7 ++-
 .../home/desktop-oauth/DesktopOAuthStart.tsx  | 13 +++--
 components/navbar/HomeNavbar.tsx              | 14 ++++-
 src/app/api/auth/magic-link/verify/route.ts   | 52 ++++++++-----------
 src/app/api/desktop/token/route.ts            |  4 +-
 src/auth.ts                                   | 33 ++++++++++++
 src/lib/auth-cookies.ts                       | 33 ++++++++++++
 src/lib/session.ts                            | 13 ++---
 9 files changed, 140 insertions(+), 48 deletions(-)
 create mode 100644 src/lib/auth-cookies.ts

diff --git a/components/dashboard/DashboardModal.tsx b/components/dashboard/DashboardModal.tsx
index b42496de..0266148b 100644
--- a/components/dashboard/DashboardModal.tsx
+++ b/components/dashboard/DashboardModal.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useContext, useEffect, useMemo, useState, Suspense } from "react";
+import { useContext, useEffect, useMemo, useRef, useState, Suspense } from "react";
 import { DashboardContext } from "@src/context/DashboardContext";
 import { ProjectContext } from "@src/context/ProjectContext";
 import { useCookieUser } from "@src/lib/utils/hooks";
@@ -71,17 +71,28 @@ const DashboardModal = () => {
         return sections;
     }, [isInProject, isSignedIn, PROJECT_MENU, PREFERENCES_MENU, ACCOUNT_MENU]);
 
-    // If active tab is a project tab but we're not in a project, or an account tab but not signed in, switch to first available tab
+    // Auto-switch active tab when the surrounding context changes:
+    //  - leave a project tab when there's no longer a project to talk about
+    //  - leave an account tab when the user signs out
+    //  - on a real signed-out → signed-in *transition* while on the Auth form,
+    //    jump to Profile so the user lands somewhere meaningful after sign-in.
+    //
+    // The transition guard (prevSignedInRef) is critical: without it, isSignedIn
+    // arriving as `true` for the first time after the SWR resolves looks identical
+    // to a real sign-in event, and clicking "Sign in" while user data is still
+    // loading would silently bounce the user to Profile.
+    const prevSignedInRef = useRef(isSignedIn);
     useEffect(() => {
         const projectTabIds = PROJECT_MENU.items.map((item) => item.id);
         const accountTabIds = ACCOUNT_MENU.items.map((item) => item.id);
         if ((!isInProject && projectTabIds.includes(activeTab)) || (!isSignedIn && accountTabIds.includes(activeTab))) {
             setActiveTab(PREFERENCES_MENU.items[0].id);
         }
-        // If user just signed in while on the Auth tab, switch to Profile
-        if (isSignedIn && activeTab === "Auth") {
+        const justSignedIn = isSignedIn && !prevSignedInRef.current;
+        if (justSignedIn && activeTab === "Auth") {
             setActiveTab("Profile");
         }
+        prevSignedInRef.current = isSignedIn;
     }, [isInProject, isSignedIn, activeTab, setActiveTab, ACCOUNT_MENU, PREFERENCES_MENU, PROJECT_MENU]);
 
     const [prevActiveTab, setPrevActiveTab] = useState(activeTab);
diff --git a/components/dashboard/DashboardSidebar.tsx b/components/dashboard/DashboardSidebar.tsx
index ac69cdb5..54db8fa9 100644
--- a/components/dashboard/DashboardSidebar.tsx
+++ b/components/dashboard/DashboardSidebar.tsx
@@ -45,7 +45,7 @@ interface SidebarMenuProps {
 
 const SidebarMenu = ({ structure, activeTab, onTabChange }: SidebarMenuProps) => {
     const { closeDashboard } = useContext(DashboardContext);
-    const { user } = useCookieUser();
+    const { user, isLoading: isUserLoading } = useCookieUser();
     const t = useTranslations("sidebar");
     const tModal = useTranslations("modal");
     const [showLogOutConfirm, setShowLogOutConfirm] = useState(false);
@@ -107,7 +107,10 @@ const SidebarMenu = ({ structure, activeTab, onTabChange }: SidebarMenuProps) =>
                     ))}
                 </nav>
                 <div className={styles.navMenu} style={{ marginTop: "auto" }}>
-                    {user ? (
+                    {/* While the user query is in flight, leave the slot empty rather than
+                        rendering a "Sign in" button against an unknown auth state — clicking
+                        it during loading races the SWR resolution and ends up on Profile. */}
+                    {isUserLoading ? null : user ? (
                         <button className={styles.navItem} onClick={() => setShowLogOutConfirm(true)}>
                             <LogOut size={18} />
                             {t("logOut")}
diff --git a/components/home/desktop-oauth/DesktopOAuthStart.tsx b/components/home/desktop-oauth/DesktopOAuthStart.tsx
index 1b776c61..c7ae4657 100644
--- a/components/home/desktop-oauth/DesktopOAuthStart.tsx
+++ b/components/home/desktop-oauth/DesktopOAuthStart.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect } from "react";
 import { useSearchParams } from "next/navigation";
-import { signIn } from "next-auth/react";
+import { signIn, signOut } from "next-auth/react";
 
 import ScriptioLogo from "@public/images/scriptio.svg";
 import layout from "../../utils/Layout.module.css";
@@ -25,8 +25,15 @@ const DesktopOAuthStart = () => {
 
     useEffect(() => {
         if (!provider || !nonce || !ALLOWED_PROVIDERS.has(provider)) return;
-        const callbackUrl = `/desktop-oauth/complete?nonce=${encodeURIComponent(nonce)}`;
-        signIn(provider, { callbackUrl });
+        // Drop any pre-existing browser session before starting OAuth. If the browser
+        // was previously signed in as user A and the OAuth account being linked here
+        // resolves to user B, handle-login.ts throws OAuthAccountNotLinked because
+        // sessionToken.user.id !== getUserByAccount().id. Starting clean avoids that.
+        (async () => {
+            const callbackUrl = `/desktop-oauth/complete?nonce=${encodeURIComponent(nonce)}`;
+            await signOut({ redirect: false });
+            await signIn(provider, { callbackUrl });
+        })();
     }, [provider, nonce]);
 
     const invalid = !provider || !nonce || !ALLOWED_PROVIDERS.has(provider);
diff --git a/components/navbar/HomeNavbar.tsx b/components/navbar/HomeNavbar.tsx
index d4f0f9d7..af3e5b1a 100644
--- a/components/navbar/HomeNavbar.tsx
+++ b/components/navbar/HomeNavbar.tsx
@@ -4,6 +4,7 @@ import { useContext } from "react";
 import { DashboardContext } from "@src/context/DashboardContext";
 import { Settings } from "lucide-react";
 import { join } from "@src/lib/utils/misc";
+import { useCookieUser } from "@src/lib/utils/hooks";
 
 import Logo from "@public/images/scriptio.svg"
 
@@ -12,6 +13,17 @@ import navBtn from "@components/utils/NavbarIconButton.module.css";
 
 const HomeNavbar = () => {
     const { openDashboard } = useContext(DashboardContext);
+    const { user, isLoading } = useCookieUser();
+
+    // Pick a tab the user can actually see: Profile only renders when signed in,
+    // Auth only when signed out. Defaulting to "Profile" unconditionally would
+    // make the dashboard's auto-switch bounce signed-out visitors to Keybinds.
+    // While the auth state is still loading, omit the tab arg so the modal
+    // opens on its current activeTab instead of guessing wrong.
+    const onOpen = () => {
+        if (isLoading) openDashboard();
+        else openDashboard(user ? "Profile" : "Auth");
+    };
 
     return (
         <nav className={join(navbar.container)}>
@@ -25,7 +37,7 @@ const HomeNavbar = () => {
 
             {/* Right side - settings */}
             <div className={navbar.right_btns}>
-                <div className={navBtn.button} onClick={() => openDashboard("Profile")}>
+                <div className={navBtn.button} onClick={onOpen}>
                     <Settings size={18} />
                 </div>
             </div>
diff --git a/src/app/api/auth/magic-link/verify/route.ts b/src/app/api/auth/magic-link/verify/route.ts
index 056447b9..43fa70c9 100644
--- a/src/app/api/auth/magic-link/verify/route.ts
+++ b/src/app/api/auth/magic-link/verify/route.ts
@@ -10,29 +10,13 @@ import * as ProjectService from "@src/server/service/project-service";
 import * as MagicLinkService from "@src/server/service/magic-link-service";
 import * as Misc from "@src/lib/utils/misc";
 import { putBridgeToken } from "@src/lib/desktop-bridge";
+import { DESKTOP_BEARER_SALT, getWebSessionCookie } from "@src/lib/auth-cookies";
 
 import { VerifyMagicLinkBodySchema } from "@src/lib/utils/api-bodies";
 export type { VerifyMagicLinkBody } from "@src/lib/utils/api-bodies";
 
-const SESSION_COOKIE_SALT = "authjs.session-token";
 const SESSION_TTL_SECONDS = 30 * 24 * 60 * 60; // mirrors auth.ts maxAge
 
-/**
- * Cookie name NextAuth/Auth.js expects when verifying the JWT session.
- * Must stay in sync with Auth.js's internal default for the credentials/JWT cookie:
- *   https → "__Secure-authjs.session-token", http → "authjs.session-token".
- */
-function getSessionCookieName(): { name: string; secure: boolean } {
-    const useSecure =
-        process.env.NEXTAUTH_URL?.startsWith("https://") === true ||
-        process.env.AUTH_URL?.startsWith("https://") === true ||
-        process.env.NODE_ENV === "production";
-    return {
-        name: useSecure ? "__Secure-authjs.session-token" : "authjs.session-token",
-        secure: useSecure,
-    };
-}
-
 /**
  * POST `/api/auth/magic-link/verify`
  *
@@ -88,34 +72,42 @@ async function verifyMagicLinkRoute(req: NextRequest) {
         }
     }
 
-    const jwe = await encode({
-        token: {
-            id: user.id,
-            email: user.email,
-            createdAt: user.createdAt.toISOString(),
-        },
-        secret,
-        salt: SESSION_COOKIE_SALT,
-        maxAge: SESSION_TTL_SECONDS,
-    });
+    const tokenPayload = {
+        id: user.id,
+        email: user.email,
+        createdAt: user.createdAt.toISOString(),
+    };
 
     if (record.desktopNonce) {
         // Desktop flow: hand the JWE to the bridge for the polling client to pick up.
         // Do NOT set a session cookie on whichever browser opened the magic link, since
         // it may not be the same machine running the desktop app.
-        putBridgeToken(record.desktopNonce, jwe);
+        const desktopJwe = await encode({
+            token: tokenPayload,
+            secret,
+            salt: DESKTOP_BEARER_SALT,
+            maxAge: SESSION_TTL_SECONDS,
+        });
+        putBridgeToken(record.desktopNonce, desktopJwe);
         return Success({ mode: "desktop" });
     }
 
     // Web flow: set the NextAuth session cookie directly so the browser is signed in.
-    const { name, secure } = getSessionCookieName();
+    // The salt MUST equal the cookie name — that's what Auth.js's internal decoder uses.
+    const { name, secure } = getWebSessionCookie();
+    const webJwe = await encode({
+        token: tokenPayload,
+        secret,
+        salt: name,
+        maxAge: SESSION_TTL_SECONDS,
+    });
     const response = NextResponse.json(
         { status: "success", data: { mode: "web" } },
         { status: 200 },
     );
     response.cookies.set({
         name,
-        value: jwe,
+        value: webJwe,
         httpOnly: true,
         sameSite: "lax",
         secure,
diff --git a/src/app/api/desktop/token/route.ts b/src/app/api/desktop/token/route.ts
index b9c17c23..b08face6 100644
--- a/src/app/api/desktop/token/route.ts
+++ b/src/app/api/desktop/token/route.ts
@@ -6,8 +6,8 @@ import { auth } from "@src/auth";
 import { apiHandler } from "@src/lib/utils/api-handler";
 import { ForbiddenError, BodyFieldError, Success, validate } from "@src/lib/utils/api-utils";
 import { putBridgeToken } from "@src/lib/desktop-bridge";
+import { DESKTOP_BEARER_SALT } from "@src/lib/auth-cookies";
 
-const SESSION_COOKIE_SALT = "authjs.session-token";
 const DESKTOP_TOKEN_TTL_SECONDS = 30 * 24 * 60 * 60; // 30 days, mirrors auth.ts maxAge.
 
 const BodySchema = z.object({
@@ -47,7 +47,7 @@ async function desktopTokenRoute(req: NextRequest) {
                     : (user.createdAt ?? new Date().toISOString()),
         },
         secret,
-        salt: SESSION_COOKIE_SALT,
+        salt: DESKTOP_BEARER_SALT,
         maxAge: DESKTOP_TOKEN_TTL_SECONDS,
     });
 
diff --git a/src/auth.ts b/src/auth.ts
index d0bd650d..bf0c5037 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -1,3 +1,19 @@
+/**
+ * NextAuth (Auth.js v5) configuration.
+ *
+ * This file is the spine of four cooperating auth flows:
+ *   1. Browser magic link  — verify route mints a JWE and sets the session cookie.
+ *   2. Browser OAuth       — Google/Apple, handled end-to-end by NextAuth.
+ *   3. Desktop magic link  — verify route puts a JWE on the bridge for Tauri.
+ *   4. Desktop OAuth       — browser OAuth here, then /api/desktop/token mints
+ *                            a fresh JWE for Tauri to pick up via the bridge.
+ *
+ * The desktop bearer JWEs all use `DESKTOP_BEARER_SALT` (lib/auth-cookies.ts)
+ * so lib/session.ts can decrypt them in middleware. The web cookie uses Auth.js's
+ * default salt (= cookie name) and is never encoded by us directly except in the
+ * magic-link verify route, which uses `getWebSessionCookie()` to stay aligned.
+ */
+
 import NextAuth from "next-auth";
 import Google from "next-auth/providers/google";
 import Apple from "next-auth/providers/apple";
@@ -23,6 +39,19 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
         }),
     ],
     callbacks: {
+        // Apple uses response_mode=form_post; the cross-site POST back from
+        // appleid.apple.com drops the `callbackUrl` cookie (Auth.js promotes state/nonce
+        // to SameSite=None for form_post but not callbackUrl), so NextAuth otherwise falls
+        // back to baseUrl ("/") and the user lands on the homepage instead of where they
+        // started. Treat that fallback as "send them to the projects page."
+        redirect: async ({ url, baseUrl }) => {
+            if (url === baseUrl || url === `${baseUrl}/`) return `${baseUrl}/projects`;
+            if (url.startsWith("/")) return `${baseUrl}${url}`;
+            try {
+                if (new URL(url).origin === baseUrl) return url;
+            } catch {}
+            return `${baseUrl}/projects`;
+        },
         jwt: async ({ token, user }) => {
             if (user) {
                 token.id = user.id;
@@ -35,11 +64,15 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
             }
             // Always sync from DB so role changes (e.g. granting admin) are reflected
             // without requiring a sign-out. Called on every auth() invocation.
+            // Email is also re-synced — Apple omits it on subsequent sign-ins, so the
+            // initial `user.email` may be undefined on a re-sign-in if PrismaAdapter
+            // routed through profile() rather than the existing User row.
             if (token.id) {
                 const dbUser = await UserService.getUserFromId(token.id as string);
                 if (dbUser) {
                     if (!token.createdAt) token.createdAt = dbUser.createdAt.toISOString();
                     token.role = dbUser.role;
+                    token.email = dbUser.email;
                 }
             }
             return token;
diff --git a/src/lib/auth-cookies.ts b/src/lib/auth-cookies.ts
new file mode 100644
index 00000000..a3cfea9c
--- /dev/null
+++ b/src/lib/auth-cookies.ts
@@ -0,0 +1,33 @@
+/**
+ * Centralized cookie + salt helpers for the auth surface.
+ *
+ * All sites that encode or decode NextAuth JWEs MUST import from here so the
+ * salts stay in lockstep across flows.
+ *
+ * Two salts are in play:
+ *
+ *  - **Web cookie salt**: Auth.js uses the cookie *name* as the JWE salt by
+ *    default. The name differs by environment ("__Secure-authjs.session-token"
+ *    on HTTPS, "authjs.session-token" otherwise). Use `getWebSessionCookie()`
+ *    and pass `name` as both the cookie name and the JWE salt — anything else
+ *    and Auth.js's middleware (`getToken`) and `auth()` cannot decrypt the
+ *    cookie we just set.
+ *
+ *  - **Desktop bearer salt**: a single constant (`DESKTOP_BEARER_SALT`) shared
+ *    by the encoder (api/desktop/token, api/auth/magic-link/verify) and the
+ *    decoder (lib/session.ts). Changing it invalidates every Tauri-side bearer
+ *    token in circulation, so any rotation needs a forced sign-out.
+ */
+
+export const DESKTOP_BEARER_SALT = "authjs.session-token";
+
+export function getWebSessionCookie(): { name: string; secure: boolean } {
+    const useSecure =
+        process.env.NEXTAUTH_URL?.startsWith("https://") === true ||
+        process.env.AUTH_URL?.startsWith("https://") === true ||
+        process.env.NODE_ENV === "production";
+    return {
+        name: useSecure ? "__Secure-authjs.session-token" : "authjs.session-token",
+        secure: useSecure,
+    };
+}
diff --git a/src/lib/session.ts b/src/lib/session.ts
index 6c177649..80c2da5a 100644
--- a/src/lib/session.ts
+++ b/src/lib/session.ts
@@ -3,16 +3,17 @@ import { headers } from "next/headers";
 import { decode } from "next-auth/jwt";
 import { UserRole } from "../generated/client/client";
 import { auth } from "@src/auth";
-
-const SESSION_COOKIE_SALT = "authjs.session-token";
+import { DESKTOP_BEARER_SALT } from "@src/lib/auth-cookies";
 
 /**
  * Resolve the current user from either:
  * 1. A NextAuth-encoded JWT in the `Authorization: Bearer <token>` header (desktop clients)
- * 2. The NextAuth web session cookie
+ * 2. The NextAuth web session cookie (handled by `auth()`)
  *
- * Both paths verify against the same `AUTH_SECRET`, so the desktop bearer flow and the
- * cookie flow share a single signing/encryption scheme.
+ * Both paths verify against the same `AUTH_SECRET`. The desktop bearer JWE is
+ * encoded by api/desktop/token and api/auth/magic-link/verify with
+ * `DESKTOP_BEARER_SALT` — see lib/auth-cookies.ts for why the salts differ
+ * between the cookie path and the bearer path.
  */
 export const getCookieUser = async (): Promise<CookieUser | undefined> => {
     const headersList = await headers();
@@ -24,7 +25,7 @@ export const getCookieUser = async (): Promise<CookieUser | undefined> => {
             const decoded = await decode({
                 token,
                 secret: process.env.AUTH_SECRET!,
-                salt: SESSION_COOKIE_SALT,
+                salt: DESKTOP_BEARER_SALT,
             });
             if (decoded?.id) {
                 return {

From 56eaa5f7bfbdb903cf674acfe9c7933ef3870db2 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 26 Apr 2026 11:34:49 +0200
Subject: [PATCH 09/76] debug build for tauri app on macos

---
 .github/workflows/deploy-staging.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index a06b25cf..cc6baca9 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: macos-latest
         needs: [prepare, deploy-web]
         env:
-            APP_PATH: src-tauri/target/universal-apple-darwin/release/bundle/macos/Scriptio (Staging).app
+            APP_PATH: src-tauri/target/universal-apple-darwin/debug/bundle/macos/Scriptio (Staging).app
             PKG_PATH: Scriptio.pkg
         steps:
             - uses: actions/checkout@v6
@@ -68,7 +68,7 @@ jobs:
                   staging: "true"
 
             - name: Build and sign .app with Tauri
-              run: npm run tauri build -- --bundles app --target universal-apple-darwin --config src-tauri/tauri.appstore.conf.json --config "{\"bundle\":{\"macOS\":{\"bundleVersion\":\"${{ needs.prepare.outputs.revision }}\"}}}"
+              run: npm run tauri build -- --debug --bundles app --target universal-apple-darwin --config src-tauri/tauri.appstore.conf.json --config "{\"bundle\":{\"macOS\":{\"bundleVersion\":\"${{ needs.prepare.outputs.revision }}\"}}}"
               env:
                   APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app

From 3b96c27e7d649d8997921a5ef41c016f89c44da0 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 26 Apr 2026 12:32:03 +0200
Subject: [PATCH 10/76] updated github action packages

---
 .github/workflows/deploy-release.yaml | 5 ++---
 .github/workflows/deploy-staging.yaml | 7 +++----
 docker-compose.yml                    | 8 ++++++++
 package.json                          | 8 +++++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index 7908674d..84b9f0b0 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -42,7 +42,7 @@ jobs:
                   p12-password: ${{ secrets.APPLE_CERT_PASSWORD }}
 
             - name: Download provisioning profile
-              uses: apple-actions/download-provisioning-profiles@v5
+              uses: apple-actions/download-provisioning-profiles@v6
               with:
                   bundle-id: "app.scriptio"
                   profile-type: "MAC_APP_STORE"
@@ -53,7 +53,6 @@ jobs:
             - name: Copy provisioning profile to known path
               run: |
                   PROFILE=$(ls "$HOME/Library/MobileDevice/Provisioning Profiles/"*.provisionprofile \
-                               "$HOME/Library/MobileDevice/Provisioning Profiles/"*.mobileprovision \
                              2>/dev/null | head -n 1)
                   cp "$PROFILE" src-tauri/embedded.provisionprofile
 
@@ -83,7 +82,7 @@ jobs:
                     "$PKG_PATH"
 
             - name: Upload to App Store Connect
-              uses: apple-actions/upload-testflight-build@v3
+              uses: apple-actions/upload-testflight-build@v5
               with:
                   app-path: ${{ env.PKG_PATH }}
                   issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index cc6baca9..12752f19 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -41,7 +41,7 @@ jobs:
                   p12-password: ${{ secrets.APPLE_CERT_PASSWORD }}
 
             - name: Download provisioning profile
-              uses: apple-actions/download-provisioning-profiles@v5
+              uses: apple-actions/download-provisioning-profiles@v6
               with:
                   bundle-id: "app.scriptio.staging"
                   profile-type: "MAC_APP_STORE"
@@ -52,7 +52,6 @@ jobs:
             - name: Copy provisioning profile to known path
               run: |
                   PROFILE=$(ls "$HOME/Library/MobileDevice/Provisioning Profiles/"*.provisionprofile \
-                               "$HOME/Library/MobileDevice/Provisioning Profiles/"*.mobileprovision \
                              2>/dev/null | head -n 1)
                   cp "$PROFILE" src-tauri/embedded.provisionprofile
 
@@ -84,7 +83,7 @@ jobs:
                     "$PKG_PATH"
 
             - name: Upload to App Store Connect
-              uses: apple-actions/upload-testflight-build@v3
+              uses: apple-actions/upload-testflight-build@v5
               with:
                   app-path: ${{ env.PKG_PATH }}
                   issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
@@ -112,7 +111,7 @@ jobs:
                   staging: "true"
 
             - name: Build MSIX bundle
-              run: npm run build:windows
+              run: npm run debug:windows
               env:
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
                   NEXT_PUBLIC_STAGING_BASIC_AUTH: ${{ secrets.STAGING_BASIC_AUTH }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 5db6cc70..0c28095d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,6 +62,14 @@ services:
             - traefik.http.routers.scriptio-staging.middlewares=staging-auth
             - traefik.http.middlewares.staging-auth.basicauth.users=${STAGING_AUTH_USERS}
             - traefik.http.middlewares.staging-auth.basicauth.headerField=X-Staging-Auth
+            # Allow CORS OPTIONS preflight to bypass basic auth (browsers never send
+            # custom headers like X-Staging-Auth in a preflight, so the auth check
+            # would 401 every cross-origin request from the Tauri app)
+            - traefik.http.routers.scriptio-staging-options.rule=Host(`staging.scriptio.app`) && Method(`OPTIONS`)
+            - traefik.http.routers.scriptio-staging-options.entrypoints=secure
+            - traefik.http.routers.scriptio-staging-options.tls=true
+            - traefik.http.routers.scriptio-staging-options.tls.certresolver=letsencrypt
+            - traefik.http.routers.scriptio-staging-options.priority=200
 
     # Production Database
     db-prod:
diff --git a/package.json b/package.json
index 51128eeb..4b134dec 100644
--- a/package.json
+++ b/package.json
@@ -14,11 +14,13 @@
         "tauri": "tauri",
         "tauri:dev": "tauri dev",
         "build:standalone": "next build && tauri dev --no-watch",
-        "build:windows": "tauri-windows-bundle build --arch x64,arm64 --verbose --runner npm",
+        "build:windows": "tauri-windows-bundle build --arch x64,arm64 --runner npm",
+        "debug:windows": "tauri-windows-bundle build --arch x64,arm64 --debug --runner npm",
         "debug:windows:x64": "tauri-windows-bundle build --arch x64 --debug --runner npm",
-        "build:windows:x64": "tauri-windows-bundle build --arch x64 --verbose --runner npm",
-        "build:windows:arm64": "tauri-windows-bundle build --arch arm64 --verbose --runner npm",
+        "build:windows:x64": "tauri-windows-bundle build --arch x64 --runner npm",
+        "build:windows:arm64": "tauri-windows-bundle build --arch arm64 --runner npm",
         "build:macos": "npm run tauri build -- --bundles app --target universal-apple-darwin",
+        "debug:macos": "npm run tauri build -- --bundles app --target universal-apple-darwin --debug",
         "build:macos:appstore": "npm run tauri build -- --bundles app --target universal-apple-darwin --config src-tauri/tauri.appstore.conf.json",
         "export": "next export",
         "start": "next start",

From 82b1e8cd332bc735f96fff3a4fd886701c0dda33 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Sun, 26 Apr 2026 12:46:40 +0200
Subject: [PATCH 11/76] updated backend to upload macos pkg to transporter

---
 .github/workflows/deploy-release.yaml | 1 +
 .github/workflows/deploy-staging.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index 84b9f0b0..5e85816f 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -88,6 +88,7 @@ jobs:
                   issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
                   api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
                   api-private-key: ${{ secrets.APPSTORE_API_KEY_P8 }}
+                  backend: "transporter"
                   app-type: "macos"
 
     publish-windows:
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index 12752f19..7ec47752 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -89,6 +89,7 @@ jobs:
                   issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
                   api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
                   api-private-key: ${{ secrets.APPSTORE_API_KEY_P8 }}
+                  backend: "transporter"
                   app-type: "macos"
 
     publish-windows:

From 17fe660b9c06f9c30e607ccdf161510ad4d0ac4c Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Sun, 26 Apr 2026 13:15:26 +0200
Subject: [PATCH 12/76] fixed debug build in tauri-windows-bundle package

---
 ...ochmeque+tauri-windows-bundle+0.1.15.patch | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/patches/@choochmeque+tauri-windows-bundle+0.1.15.patch b/patches/@choochmeque+tauri-windows-bundle+0.1.15.patch
index 40536cfa..d65cd593 100644
--- a/patches/@choochmeque+tauri-windows-bundle+0.1.15.patch
+++ b/patches/@choochmeque+tauri-windows-bundle+0.1.15.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@choochmeque/tauri-windows-bundle/dist/cli.js b/node_modules/@choochmeque/tauri-windows-bundle/dist/cli.js
-index 42b3955..42e5ff1 100644
+index 42b3955..439214b 100644
 --- a/node_modules/@choochmeque/tauri-windows-bundle/dist/cli.js
 +++ b/node_modules/@choochmeque/tauri-windows-bundle/dist/cli.js
 @@ -426,7 +426,7 @@ function generateManifest(config, arch, minVersion, windowsDir) {
@@ -20,7 +20,17 @@ index 42b3955..42e5ff1 100644
          for (const alias of config.extensions.appExecutionAliases) {
              const result = replaceTemplateVariables(template, {
                  ALIAS: alias.alias.endsWith('.exe') ? alias.alias : `${alias.alias}.exe`,
-@@ -717,7 +717,7 @@ function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion,
+@@ -709,15 +709,15 @@ function jsonMergePatch(target, patch) {
+     return result;
+ }
+ 
+-function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir) {
++function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir, isDebug) {
+     const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
+     const srcTauriDir = path.join(projectRoot, 'src-tauri');
+-    const buildDir = path.join(srcTauriDir, 'target', target, 'release');
++    const buildDir = path.join(srcTauriDir, 'target', target, isDebug ? 'debug' : 'release');
+     const appxDir = path.join(srcTauriDir, 'target', 'appx', arch);
      // Create directories
      fs.mkdirSync(path.join(appxDir, 'Assets'), { recursive: true });
      // Copy exe
@@ -29,3 +39,12 @@ index 42b3955..42e5ff1 100644
      const srcExe = path.join(buildDir, exeName);
      if (!fs.existsSync(srcExe)) {
          throw new Error(`Executable not found: ${srcExe}`);
+@@ -1016,7 +1016,7 @@ async function build(options) {
+         }
+         // Prepare AppxContent directory
+         console.log(`  Preparing AppxContent for ${arch}...`);
+-        const appxDir = prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir);
++        const appxDir = prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir, options.debug);
+         appxDirs.push({ arch, dir: appxDir });
+         console.log(`  AppxContent ready: ${appxDir}`);
+     }

From 5f839eefb58e4899693e7a0eca54a6cf27dbb2de Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Sun, 26 Apr 2026 13:33:16 +0200
Subject: [PATCH 13/76] trying ci/cd for macos with altool

---
 .github/workflows/deploy-release.yaml | 2 +-
 .github/workflows/deploy-staging.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index 5e85816f..b802b0c9 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -88,7 +88,7 @@ jobs:
                   issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
                   api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
                   api-private-key: ${{ secrets.APPSTORE_API_KEY_P8 }}
-                  backend: "transporter"
+                  backend: "altool"
                   app-type: "macos"
 
     publish-windows:
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index 7ec47752..f4323018 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -89,7 +89,7 @@ jobs:
                   issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
                   api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
                   api-private-key: ${{ secrets.APPSTORE_API_KEY_P8 }}
-                  backend: "transporter"
+                  backend: "altool"
                   app-type: "macos"
 
     publish-windows:

From 79b8ba95072f8717533631ead4643d0fd7e77ee9 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 26 Apr 2026 23:07:45 +0200
Subject: [PATCH 14/76] trying to fix cors

---
 components/dashboard/account/ProfileSettings.tsx | 4 ++--
 src/lib/desktop-auth.ts                          | 5 ++++-
 src/lib/utils/requests.ts                        | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/components/dashboard/account/ProfileSettings.tsx b/components/dashboard/account/ProfileSettings.tsx
index f0054dd7..9d0f7446 100644
--- a/components/dashboard/account/ProfileSettings.tsx
+++ b/components/dashboard/account/ProfileSettings.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { editUserInfo } from "@src/lib/utils/requests";
+import { editUserInfo, deleteUser } from "@src/lib/utils/requests";
 import { signOut } from "next-auth/react";
 import { isTauri } from "@tauri-apps/api/core";
 import { useRouter } from "next/navigation";
@@ -67,7 +67,7 @@ const ProfileSettings = ({ dangerOpen, onDangerToggle }: { dangerOpen: boolean;
     const handleDeleteAccount = async () => {
         setDeleteLoading(true);
         try {
-            const res = await fetch("/api/users", { method: "DELETE" });
+            const res = await deleteUser();
             if (res.ok) {
                 if (isTauri()) {
                     const { clearDesktopToken } = await import("@src/lib/desktop-auth");
diff --git a/src/lib/desktop-auth.ts b/src/lib/desktop-auth.ts
index 249b5caa..0a327a10 100644
--- a/src/lib/desktop-auth.ts
+++ b/src/lib/desktop-auth.ts
@@ -97,7 +97,10 @@ export async function pollBridgeToken(
     while (Date.now() < deadline) {
         if (signal?.aborted) return null;
         try {
-            const res = await fetch(url, { headers: { "x-client-type": "desktop" }, signal });
+            const reqHeaders: Record<string, string> = { "x-client-type": "desktop" };
+            const stagingAuth = process.env.NEXT_PUBLIC_STAGING_BASIC_AUTH;
+            if (stagingAuth) reqHeaders["X-Staging-Auth"] = `Basic ${stagingAuth}`;
+            const res = await fetch(url, { headers: reqHeaders, signal });
             if (res.ok) {
                 const json = (await res.json()) as { data?: { token?: string | null } };
                 const token = json.data?.token;
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index c3417dee..7f219b5c 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -146,6 +146,10 @@ export const editUserInfo = (body: UpdateUserBody) => {
     return request(`/api/users`, "PATCH", body);
 };
 
+export const deleteUser = () => {
+    return request(`/api/users`, "DELETE");
+};
+
 /* Auth */
 
 export const requestMagicLink = (body: RequestMagicLinkBody) => {

From abdf086bd81491086d0d0a769bfa9f26adf8e736 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 26 Apr 2026 23:45:34 +0200
Subject: [PATCH 15/76] removed staging basic auth

---
 .env.template                         |  1 -
 .github/workflows/deploy-staging.yaml |  3 ---
 docker-compose.yml                    | 11 -----------
 next.config.ts                        |  2 +-
 src/lib/desktop-auth.ts               |  5 +----
 src/lib/fetcher.ts                    |  5 -----
 src/lib/utils/requests.ts             |  5 -----
 7 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/.env.template b/.env.template
index ea20fd71..cc30051c 100644
--- a/.env.template
+++ b/.env.template
@@ -18,7 +18,6 @@ DB_NAME=scriptio
 
 # Basic Auth (htpasswd format, escape $ as $$ in this file)
 PROD_AUTH_USERS=
-STAGING_AUTH_USERS=
 MONITORING_AUTH_USERS=
 
 # Monitoring
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index f4323018..ce4c5fef 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -71,7 +71,6 @@ jobs:
               env:
                   APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
-                  NEXT_PUBLIC_STAGING_BASIC_AUTH: ${{ secrets.STAGING_BASIC_AUTH }}
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -115,7 +114,6 @@ jobs:
               run: npm run debug:windows
               env:
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
-                  NEXT_PUBLIC_STAGING_BASIC_AUTH: ${{ secrets.STAGING_BASIC_AUTH }}
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -167,7 +165,6 @@ jobs:
                       ${{ env.IMAGE_NAME }}:staging-${{ needs.prepare.outputs.version }}
                   build-args: |
                       NEXT_PUBLIC_API_URL=https://staging.scriptio.app
-                      NEXT_PUBLIC_STAGING_BASIC_AUTH=${{ secrets.STAGING_BASIC_AUTH }}
                       NEXT_PUBLIC_COMMIT_SHA=${{ env.COMMIT_SHA }}
                       NEXT_PUBLIC_APP_VERSION=${{ needs.prepare.outputs.version }}
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 0c28095d..4be0fa87 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,17 +59,6 @@ services:
             - traefik.http.routers.scriptio-staging.entrypoints=secure
             - traefik.http.routers.scriptio-staging.tls=true
             - traefik.http.routers.scriptio-staging.tls.certresolver=letsencrypt
-            - traefik.http.routers.scriptio-staging.middlewares=staging-auth
-            - traefik.http.middlewares.staging-auth.basicauth.users=${STAGING_AUTH_USERS}
-            - traefik.http.middlewares.staging-auth.basicauth.headerField=X-Staging-Auth
-            # Allow CORS OPTIONS preflight to bypass basic auth (browsers never send
-            # custom headers like X-Staging-Auth in a preflight, so the auth check
-            # would 401 every cross-origin request from the Tauri app)
-            - traefik.http.routers.scriptio-staging-options.rule=Host(`staging.scriptio.app`) && Method(`OPTIONS`)
-            - traefik.http.routers.scriptio-staging-options.entrypoints=secure
-            - traefik.http.routers.scriptio-staging-options.tls=true
-            - traefik.http.routers.scriptio-staging-options.tls.certresolver=letsencrypt
-            - traefik.http.routers.scriptio-staging-options.priority=200
 
     # Production Database
     db-prod:
diff --git a/next.config.ts b/next.config.ts
index 28775aaf..2dd2e3d8 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -28,7 +28,7 @@ const config: NextConfig = {
                 headers: [
                     { key: "Access-Control-Allow-Origin", value: "*" },
                     { key: "Access-Control-Allow-Methods", value: "GET, POST, PUT, PATCH, DELETE, OPTIONS" },
-                    { key: "Access-Control-Allow-Headers", value: "Content-Type, Authorization, x-client-type, X-Staging-Auth" },
+                    { key: "Access-Control-Allow-Headers", value: "Content-Type, Authorization, x-client-type" },
                 ],
             },
         ];
diff --git a/src/lib/desktop-auth.ts b/src/lib/desktop-auth.ts
index 0a327a10..249b5caa 100644
--- a/src/lib/desktop-auth.ts
+++ b/src/lib/desktop-auth.ts
@@ -97,10 +97,7 @@ export async function pollBridgeToken(
     while (Date.now() < deadline) {
         if (signal?.aborted) return null;
         try {
-            const reqHeaders: Record<string, string> = { "x-client-type": "desktop" };
-            const stagingAuth = process.env.NEXT_PUBLIC_STAGING_BASIC_AUTH;
-            if (stagingAuth) reqHeaders["X-Staging-Auth"] = `Basic ${stagingAuth}`;
-            const res = await fetch(url, { headers: reqHeaders, signal });
+            const res = await fetch(url, { headers: { "x-client-type": "desktop" }, signal });
             if (res.ok) {
                 const json = (await res.json()) as { data?: { token?: string | null } };
                 const token = json.data?.token;
diff --git a/src/lib/fetcher.ts b/src/lib/fetcher.ts
index 49c391ca..e186ae9f 100644
--- a/src/lib/fetcher.ts
+++ b/src/lib/fetcher.ts
@@ -35,11 +35,6 @@ async function fetchFromDesktop<JSON = unknown>(
         Authorization: `Bearer ${token}`,
     };
 
-    const stagingAuth = process.env.NEXT_PUBLIC_STAGING_BASIC_AUTH;
-    if (stagingAuth) {
-        headers["X-Staging-Auth"] = `Basic ${stagingAuth}`;
-    }
-
     if (init?.headers) {
         Object.assign(headers, init.headers as Record<string, string>);
     }
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index 7f219b5c..e1b59b34 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -31,11 +31,6 @@ const request = async (url: string, method: RESTMethod, body?: object) => {
         if (token) {
             headers["Authorization"] = `Bearer ${token}`;
         }
-
-        const stagingAuth = process.env.NEXT_PUBLIC_STAGING_BASIC_AUTH;
-        if (stagingAuth) {
-            headers["X-Staging-Auth"] = `Basic ${stagingAuth}`;
-        }
     }
 
     return fetch(fullUrl, {

From 044e334d1422b98b040e4652ba940b0ebcdaecaf Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 27 Apr 2026 00:15:36 +0200
Subject: [PATCH 16/76] fixed apple oauth for desktop app

---
 .../desktop-oauth/DesktopOAuthComplete.tsx    | 41 +++++++++++--------
 .../home/desktop-oauth/DesktopOAuthStart.tsx  |  3 ++
 src/auth.ts                                   | 10 +++--
 src/lib/utils/requests.ts                     |  4 ++
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/components/home/desktop-oauth/DesktopOAuthComplete.tsx b/components/home/desktop-oauth/DesktopOAuthComplete.tsx
index 8659a7a1..62998f43 100644
--- a/components/home/desktop-oauth/DesktopOAuthComplete.tsx
+++ b/components/home/desktop-oauth/DesktopOAuthComplete.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { useSearchParams } from "next/navigation";
+import { useSearchParams, useRouter } from "next/navigation";
+import { submitDesktopToken } from "@src/lib/utils/requests";
 
 import ScriptioLogo from "@public/images/scriptio.svg";
 import layout from "../../utils/Layout.module.css";
@@ -16,27 +17,33 @@ type Status = "working" | "done" | "error";
  * After NextAuth has signed the user in (cookie set in this browser), we POST the
  * nonce to /api/desktop/token. The server reads the session, mints a NextAuth JWE,
  * and stows it under the nonce so the desktop poller can pick it up.
+ *
+ * The nonce comes from the URL for Google (callbackUrl cookie survives the redirect)
+ * or from sessionStorage for Apple (response_mode=form_post drops the cookie, so
+ * DesktopOAuthStart stored the nonce there before the handoff). If neither source
+ * has a nonce the visitor is a web user who signed in with Apple — send them to /projects.
  */
 const DesktopOAuthComplete = () => {
     const searchParams = useSearchParams();
-    const nonce = searchParams.get("nonce");
-    const [status, setStatus] = useState<Status>(nonce ? "working" : "error");
+    const router = useRouter();
+    const urlNonce = searchParams.get("nonce");
+    const [status, setStatus] = useState<Status>("working");
 
     useEffect(() => {
-        if (!nonce) return;
-        (async () => {
-            try {
-                const res = await fetch("/api/desktop/token", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ nonce }),
-                });
-                setStatus(res.ok ? "done" : "error");
-            } catch {
-                setStatus("error");
-            }
-        })();
-    }, [nonce]);
+        const nonce = urlNonce ?? sessionStorage.getItem("desktop-oauth-nonce");
+
+        if (!nonce) {
+            // Web user signed in with Apple — no desktop bridge needed.
+            router.replace("/projects");
+            return;
+        }
+
+        sessionStorage.removeItem("desktop-oauth-nonce");
+
+        submitDesktopToken(nonce)
+            .then(res => setStatus(res.ok ? "done" : "error"))
+            .catch(() => setStatus("error"));
+    }, [urlNonce, router]);
 
     const message =
         status === "working"
diff --git a/components/home/desktop-oauth/DesktopOAuthStart.tsx b/components/home/desktop-oauth/DesktopOAuthStart.tsx
index c7ae4657..45705045 100644
--- a/components/home/desktop-oauth/DesktopOAuthStart.tsx
+++ b/components/home/desktop-oauth/DesktopOAuthStart.tsx
@@ -31,6 +31,9 @@ const DesktopOAuthStart = () => {
         // sessionToken.user.id !== getUserByAccount().id. Starting clean avoids that.
         (async () => {
             const callbackUrl = `/desktop-oauth/complete?nonce=${encodeURIComponent(nonce)}`;
+            // Persist the nonce in sessionStorage so /desktop-oauth/complete can recover
+            // it even when Apple's response_mode=form_post drops the callbackUrl cookie.
+            sessionStorage.setItem("desktop-oauth-nonce", nonce);
             await signOut({ redirect: false });
             await signIn(provider, { callbackUrl });
         })();
diff --git a/src/auth.ts b/src/auth.ts
index bf0c5037..cf08a9d5 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -41,11 +41,13 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
     callbacks: {
         // Apple uses response_mode=form_post; the cross-site POST back from
         // appleid.apple.com drops the `callbackUrl` cookie (Auth.js promotes state/nonce
-        // to SameSite=None for form_post but not callbackUrl), so NextAuth otherwise falls
-        // back to baseUrl ("/") and the user lands on the homepage instead of where they
-        // started. Treat that fallback as "send them to the projects page."
+        // to SameSite=None for form_post but not callbackUrl), so NextAuth falls back to
+        // baseUrl. Send those cases to /desktop-oauth/complete, which recovers the nonce
+        // from sessionStorage (set by DesktopOAuthStart before the OAuth handoff) and
+        // finishes the desktop bridge. Web users who signed in with Apple and have no
+        // nonce are redirected to /projects from within that page.
         redirect: async ({ url, baseUrl }) => {
-            if (url === baseUrl || url === `${baseUrl}/`) return `${baseUrl}/projects`;
+            if (url === baseUrl || url === `${baseUrl}/`) return `${baseUrl}/desktop-oauth/complete`;
             if (url.startsWith("/")) return `${baseUrl}${url}`;
             try {
                 if (new URL(url).origin === baseUrl) return url;
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index e1b59b34..48b1d9cd 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -151,6 +151,10 @@ export const requestMagicLink = (body: RequestMagicLinkBody) => {
     return request(`/api/auth/magic-link`, "POST", body);
 };
 
+export const submitDesktopToken = (nonce: string) => {
+    return request(`/api/desktop/token`, "POST", { nonce });
+};
+
 export const cancelStripeSubscription = async (): Promise<boolean> => {
     const res = await request("/api/stripe/cancel", "POST");
     return res.ok;

From 2a92f76f68a07133d0eaabe71be24fc97aa8f5e2 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 27 Apr 2026 13:41:33 +0200
Subject: [PATCH 17/76] fixing apple oauth on desktop app

---
 src/auth.ts | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/auth.ts b/src/auth.ts
index cf08a9d5..21fa6406 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -35,19 +35,34 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
         }),
         Apple({
             allowDangerousEmailAccountLinking: true,
-            profile: (profile) => ({ id: profile.sub, email: profile.email }),
+            // Explicitly request email on first consent. Apple only returns it once —
+            // subsequent sign-ins omit it, so the adapter links via providerAccountId
+            // and we re-sync email from the DB in the jwt callback instead.
+            authorization: { params: { scope: "name email" } },
+            profile: (profile) => {
+                if (!profile.email) {
+                    // This only runs on first sign-in. If Apple didn't return an email
+                    // (e.g. user denied the scope), fail early rather than creating a
+                    // User row with a missing email field.
+                    throw new Error("Apple did not return an email address. Ensure the email scope is granted.");
+                }
+                return { id: profile.sub, email: profile.email };
+            },
         }),
     ],
     callbacks: {
         // Apple uses response_mode=form_post; the cross-site POST back from
         // appleid.apple.com drops the `callbackUrl` cookie (Auth.js promotes state/nonce
         // to SameSite=None for form_post but not callbackUrl), so NextAuth falls back to
-        // baseUrl. Send those cases to /desktop-oauth/complete, which recovers the nonce
-        // from sessionStorage (set by DesktopOAuthStart before the OAuth handoff) and
-        // finishes the desktop bridge. Web users who signed in with Apple and have no
-        // nonce are redirected to /projects from within that page.
+        // the homepage — passed to this callback as either the absolute baseUrl or the
+        // relative "/". Send those cases to /desktop-oauth/complete, which recovers the
+        // nonce from sessionStorage (set by DesktopOAuthStart before the OAuth handoff)
+        // and finishes the desktop bridge. Web users who signed in with Apple and have
+        // no nonce are redirected to /projects from within that page.
         redirect: async ({ url, baseUrl }) => {
-            if (url === baseUrl || url === `${baseUrl}/`) return `${baseUrl}/desktop-oauth/complete`;
+            const isHomepage =
+                url === baseUrl || url === `${baseUrl}/` || url === "/" || url === "";
+            if (isHomepage) return `${baseUrl}/desktop-oauth/complete`;
             if (url.startsWith("/")) return `${baseUrl}${url}`;
             try {
                 if (new URL(url).origin === baseUrl) return url;

From 270207357b2cfc62baebc986737f16dff529ff99 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 27 Apr 2026 14:28:01 +0200
Subject: [PATCH 18/76] trying to fix apple oauth on desktop app again

---
 Dockerfile                              |  5 ++-
 scripts/launch.sh                       |  8 -----
 src/app/api/auth/[...nextauth]/route.ts | 44 ++++++++++++++++++++++++-
 src/auth.ts                             | 18 +++++-----
 4 files changed, 53 insertions(+), 22 deletions(-)
 delete mode 100644 scripts/launch.sh

diff --git a/Dockerfile b/Dockerfile
index 35a5f10c..22009666 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,11 +21,10 @@ ENV NEXT_PUBLIC_COMMIT_SHA=$NEXT_PUBLIC_COMMIT_SHA
 ENV NEXT_PUBLIC_APP_VERSION=$NEXT_PUBLIC_APP_VERSION
 
 RUN chown -R node:node .
+USER node
 RUN npm run build
 
 EXPOSE 3000
-USER node
 ENV NEXT_TELEMETRY_DISABLED 1
 
-ENTRYPOINT ["./scripts/launch.sh"]
-CMD [ "npm", "start" ]
\ No newline at end of file
+CMD npx prisma migrate deploy && npm start
\ No newline at end of file
diff --git a/scripts/launch.sh b/scripts/launch.sh
deleted file mode 100644
index a47c0c8c..00000000
--- a/scripts/launch.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-echo "Running Prisma migrations..."
-npx prisma migrate deploy
-
-echo "Launching app..."
-exec "$@"
\ No newline at end of file
diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts
index 377c3e14..3ac1d822 100644
--- a/src/app/api/auth/[...nextauth]/route.ts
+++ b/src/app/api/auth/[...nextauth]/route.ts
@@ -1,3 +1,45 @@
 import { handlers } from "@src/auth";
+import { type NextRequest } from "next/server";
 
-export const { GET, POST } = handlers;
+export const GET = handlers.GET;
+
+/**
+ * Wrap the Auth.js POST handler to fix Apple Sign In's redirect after OAuth.
+ *
+ * Apple uses response_mode=form_post, which is a cross-site POST. The browser
+ * does not send SameSite=Lax cookies with cross-site POSTs, so Auth.js never
+ * sees the callbackUrl cookie and falls back to url.origin (homepage). The
+ * redirect callback in auth.ts is NOT called in this path — it only runs when
+ * Auth.js has a callbackUrl value to validate, which it doesn't here.
+ *
+ * We intercept the 302 response before it leaves the server: if it would send
+ * the user to the bare homepage (no ?error param, meaning sign-in succeeded),
+ * we rewrite the Location to /desktop-oauth/complete. That page recovers the
+ * nonce from sessionStorage (stored by DesktopOAuthStart) for the Tauri flow,
+ * or redirects to /projects for plain web users.
+ */
+export async function POST(req: NextRequest, context: unknown) {
+    const response = await handlers.POST(req, context as never);
+
+    if (new URL(req.url).pathname === "/api/auth/callback/apple") {
+        const location = response.headers.get("Location");
+        if (location) {
+            try {
+                const dest = new URL(location);
+                const isHomepageFallback =
+                    dest.pathname === "/" && !dest.searchParams.has("error");
+                if (isHomepageFallback) {
+                    const headers = new Headers(response.headers);
+                    headers.set("Location", `${dest.origin}/desktop-oauth/complete`);
+                    return new Response(response.body, {
+                        status: response.status,
+                        statusText: response.statusText,
+                        headers,
+                    });
+                }
+            } catch {}
+        }
+    }
+
+    return response;
+}
diff --git a/src/auth.ts b/src/auth.ts
index 21fa6406..18b64de3 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -52,17 +52,15 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
     ],
     callbacks: {
         // Apple uses response_mode=form_post; the cross-site POST back from
-        // appleid.apple.com drops the `callbackUrl` cookie (Auth.js promotes state/nonce
-        // to SameSite=None for form_post but not callbackUrl), so NextAuth falls back to
-        // the homepage — passed to this callback as either the absolute baseUrl or the
-        // relative "/". Send those cases to /desktop-oauth/complete, which recovers the
-        // nonce from sessionStorage (set by DesktopOAuthStart before the OAuth handoff)
-        // and finishes the desktop bridge. Web users who signed in with Apple and have
-        // no nonce are redirected to /projects from within that page.
+        // appleid.apple.com drops the `callbackUrl` cookie, so Auth.js falls back to
+        // url.origin and never calls this callback for that case. The actual Apple
+        // redirect fix lives in /api/auth/[...nextauth]/route.ts which intercepts
+        // the 302 response before it leaves the server.
+        //
+        // This callback still runs for explicit callbackUrl values (e.g. Google OAuth,
+        // magic-link flows). Apple form_post with no callbackUrl bypasses it entirely.
         redirect: async ({ url, baseUrl }) => {
-            const isHomepage =
-                url === baseUrl || url === `${baseUrl}/` || url === "/" || url === "";
-            if (isHomepage) return `${baseUrl}/desktop-oauth/complete`;
+            if (url === baseUrl || url === `${baseUrl}/`) return `${baseUrl}/projects`;
             if (url.startsWith("/")) return `${baseUrl}${url}`;
             try {
                 if (new URL(url).origin === baseUrl) return url;

From dd7549278b07fcf21cc46ebf1b1c8af2b2420498 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 27 Apr 2026 14:31:05 +0200
Subject: [PATCH 19/76] fixed dockerfile

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 22009666..ddf35734 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,6 @@ WORKDIR /usr/app
 COPY ./package*.json ./
 RUN npm install
 COPY ./ ./
-RUN chmod +x ./scripts/launch.sh
 
 ENV DATABASE_URL="postgresql://dummy:dummy@localhost:5432/dummy"
 
@@ -25,6 +24,6 @@ USER node
 RUN npm run build
 
 EXPOSE 3000
-ENV NEXT_TELEMETRY_DISABLED 1
+ENV NEXT_TELEMETRY_DISABLED=1
 
 CMD npx prisma migrate deploy && npm start
\ No newline at end of file

From a794bcd40462fac512a515e32188a5d7ba99978b Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 27 Apr 2026 14:36:30 +0200
Subject: [PATCH 20/76] fixed compilation

---
 src/app/api/auth/[...nextauth]/route.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts
index 3ac1d822..1dbfb4df 100644
--- a/src/app/api/auth/[...nextauth]/route.ts
+++ b/src/app/api/auth/[...nextauth]/route.ts
@@ -1,5 +1,5 @@
 import { handlers } from "@src/auth";
-import { type NextRequest } from "next/server";
+import type { NextRequest } from "next/server";
 
 export const GET = handlers.GET;
 
@@ -18,8 +18,8 @@ export const GET = handlers.GET;
  * nonce from sessionStorage (stored by DesktopOAuthStart) for the Tauri flow,
  * or redirects to /projects for plain web users.
  */
-export async function POST(req: NextRequest, context: unknown) {
-    const response = await handlers.POST(req, context as never);
+export async function POST(req: NextRequest) {
+    const response = await handlers.POST(req);
 
     if (new URL(req.url).pathname === "/api/auth/callback/apple") {
         const location = response.headers.get("Location");

From bd3ff3a7aee7781209ebcfd8ffd2a1975c7a3ecc Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 27 Apr 2026 17:13:59 +0200
Subject: [PATCH 21/76] tweaked transaction api for payments, fixed db seeding

---
 Dockerfile                                    |  2 +-
 prisma/schema.prisma                          |  3 +--
 src/app/api/apple/verify/route.ts             | 10 ++--------
 .../api/projects/[projectId]/saves/route.ts   |  4 ++++
 src/app/api/webhooks/apple/route.ts           | 20 +++++++++----------
 src/generated/client/internal/class.ts        |  4 ++--
 src/generated/client/models/Transaction.ts    |  4 ++--
 .../repository/transaction-repository.ts      | 16 +++++++++++++++
 src/server/service/transaction-service.ts     | 13 ++++++++++++
 9 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ddf35734..a6df5d08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,4 +26,4 @@ RUN npm run build
 EXPOSE 3000
 ENV NEXT_TELEMETRY_DISABLED=1
 
-CMD npx prisma migrate deploy && npm start
\ No newline at end of file
+CMD npx prisma migrate deploy && npx prisma db seed && npm start
\ No newline at end of file
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 8ee20c7e..098130fc 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -100,13 +100,12 @@ model Transaction {
   id            Int                  @id @default(autoincrement())
   userId        String
   provider      SubscriptionProvider
-  transactionId String
+  transactionId String               @unique
   createdAt     DateTime             @default(now())
 
   user          User                 @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@index([userId])
-  @@index([transactionId])
 }
 
 model Project {
diff --git a/src/app/api/apple/verify/route.ts b/src/app/api/apple/verify/route.ts
index 33cf6ae1..3817569b 100644
--- a/src/app/api/apple/verify/route.ts
+++ b/src/app/api/apple/verify/route.ts
@@ -1,9 +1,9 @@
 import { NextRequest } from "next/server";
 import { decodeJwt } from "jose";
-import prisma from "@src/server/db";
 import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
 import { BodyFieldError, ForbiddenError, Success } from "@src/lib/utils/api-utils";
 import * as UserService from "@src/server/service/user-service";
+import * as TransactionService from "@src/server/service/transaction-service";
 
 const APPLE_PRODUCT_ID = "app.scriptio.pro.monthly";
 const APPLE_BUNDLE_IDS = ["app.scriptio", "app.scriptio.staging"];
@@ -46,13 +46,7 @@ async function verifyApplePurchase(req: NextRequest, { user }: AuthApiContext) {
         isSubscriptionCancelled: false,
     });
 
-    await prisma.transaction.create({
-        data: {
-            userId: user.id,
-            provider: "APPLE",
-            transactionId: payload.transactionId,
-        },
-    });
+    await TransactionService.createTransactionIfNotExists(user.id, "APPLE", payload.transactionId);
 
     return Success(null);
 }
diff --git a/src/app/api/projects/[projectId]/saves/route.ts b/src/app/api/projects/[projectId]/saves/route.ts
index b329c024..54d390b1 100644
--- a/src/app/api/projects/[projectId]/saves/route.ts
+++ b/src/app/api/projects/[projectId]/saves/route.ts
@@ -59,6 +59,10 @@ async function listSaves(req: NextRequest, { routeParams, user }: AuthApiContext
     }
 
     const res = await forwardToWorker(projectId, "GET", "/saves");
+    if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`Worker error listing saves: ${text}`);
+    }
     const data = await res.json();
     return Success(data);
 }
diff --git a/src/app/api/webhooks/apple/route.ts b/src/app/api/webhooks/apple/route.ts
index 1bf02e13..39ee350b 100644
--- a/src/app/api/webhooks/apple/route.ts
+++ b/src/app/api/webhooks/apple/route.ts
@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { decodeJwt } from "jose";
-import prisma from "@src/server/db";
 import * as UserService from "@src/server/service/user-service";
+import * as TransactionService from "@src/server/service/transaction-service";
 
 interface AppleNotificationPayload {
     notificationType: string;
@@ -27,9 +27,13 @@ interface AppleRenewalInfo {
 }
 
 async function findUser(transaction: AppleTransactionInfo): Promise<{ id: string } | null> {
-    if (!transaction.appAccountToken) return null;
-    const user = await UserService.getUserFromId(transaction.appAccountToken);
-    return user ? { id: user.id } : null;
+    if (transaction.appAccountToken) {
+        const user = await UserService.getUserFromId(transaction.appAccountToken);
+        if (user) return { id: user.id };
+    }
+    // Fallback: look up via the transaction stored during initial purchase verification
+    const tx = await TransactionService.findUserByTransactionId(transaction.transactionId);
+    return tx ? { id: tx.userId } : null;
 }
 
 export async function POST(req: NextRequest) {
@@ -59,13 +63,7 @@ export async function POST(req: NextRequest) {
                 subscriptionProvider: "APPLE",
                 isSubscriptionCancelled: false,
             });
-            await prisma.transaction.create({
-                data: {
-                    userId: user.id,
-                    provider: "APPLE",
-                    transactionId: transaction.transactionId,
-                },
-            });
+            await TransactionService.createTransactionIfNotExists(user.id, "APPLE", transaction.transactionId);
             break;
         }
 
diff --git a/src/generated/client/internal/class.ts b/src/generated/client/internal/class.ts
index 2c766b49..e46d9c76 100644
--- a/src/generated/client/internal/class.ts
+++ b/src/generated/client/internal/class.ts
@@ -20,7 +20,7 @@ const config: runtime.GetPrismaClientConfig = {
   "clientVersion": "7.7.0",
   "engineVersion": "75cbdc1eb7150937890ad5465d861175c6624711",
   "activeProvider": "postgresql",
-  "inlineSchema": "// This is your Prisma schema file,\n// learn more about it in the docs: https://pris.ly/d/prisma-schema\n\ngenerator client {\n  provider = \"prisma-client\"\n  output   = \"../src/generated/client\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n}\n\nenum ProjectRole {\n  OWNER\n  ADMIN\n  EDITOR\n  VIEWER\n}\n\nenum UserRole {\n  USER\n  ADMIN\n}\n\nenum SubscriptionProvider {\n  STRIPE\n  APPLE\n}\n\nmodel User {\n  id            String    @id @default(uuid(7))\n  createdAt     DateTime  @default(now())\n  email         String    @unique\n  emailVerified DateTime?\n  username      String?\n  color         String?\n  role          UserRole  @default(USER)\n\n  isProUntil              DateTime?\n  isSubscriptionCancelled Boolean               @default(false)\n  subscriptionProvider    SubscriptionProvider?\n\n  settings Json?\n\n  accounts     Account[]\n  sessions     Session[]\n  projects     ProjectMember[]\n  transactions Transaction[]\n}\n\nmodel Account {\n  id                String  @id @default(cuid())\n  userId            String\n  type              String\n  provider          String\n  providerAccountId String\n  refresh_token     String? @db.Text\n  access_token      String? @db.Text\n  expires_at        Int?\n  token_type        String?\n  scope             String?\n  id_token          String? @db.Text\n  session_state     String?\n\n  user User @relation(fields: [userId], references: [id], onDelete: Cascade)\n\n  @@unique([provider, providerAccountId])\n}\n\nmodel Session {\n  id           String   @id @default(cuid())\n  sessionToken String   @unique\n  userId       String\n  expires      DateTime\n  user         User     @relation(fields: [userId], references: [id], onDelete: Cascade)\n}\n\nmodel VerificationToken {\n  identifier String\n  token      String   @unique\n  expires    DateTime\n\n  @@unique([identifier, token])\n}\n\nmodel MagicLinkToken {\n  id        Int      @id @default(autoincrement())\n  email     String\n  tokenHash String   @unique\n  expiresAt DateTime\n  createdAt DateTime @default(now())\n\n  desktopNonce String?\n  inviteToken  String?\n\n  @@index([email, createdAt])\n}\n\nmodel Transaction {\n  id            Int                  @id @default(autoincrement())\n  userId        String\n  provider      SubscriptionProvider\n  transactionId String\n  createdAt     DateTime             @default(now())\n\n  user User @relation(fields: [userId], references: [id], onDelete: Cascade)\n\n  @@index([userId])\n  @@index([transactionId])\n}\n\nmodel Project {\n  id        String   @id @default(uuid(7))\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  title       String\n  description String?\n  author      String?\n  hasPoster   Boolean @default(false)\n\n  members     ProjectMember[]\n  invitations ProjectInvitation[]\n}\n\nmodel ProjectMember {\n  id   Int         @id @default(autoincrement())\n  role ProjectRole @default(VIEWER)\n\n  user      User    @relation(fields: [userId], references: [id])\n  userId    String\n  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)\n  projectId String\n\n  @@unique([userId, projectId])\n}\n\nmodel ProjectInvitation {\n  id        Int      @id @default(autoincrement())\n  token     String   @unique\n  email     String\n  createdAt DateTime @default(now())\n\n  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)\n  projectId String\n\n  @@unique([email, projectId])\n}\n",
+  "inlineSchema": "// This is your Prisma schema file,\n// learn more about it in the docs: https://pris.ly/d/prisma-schema\n\ngenerator client {\n  provider = \"prisma-client\"\n  output   = \"../src/generated/client\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n}\n\nenum ProjectRole {\n  OWNER\n  ADMIN\n  EDITOR\n  VIEWER\n}\n\nenum UserRole {\n  USER\n  ADMIN\n}\n\nenum SubscriptionProvider {\n  STRIPE\n  APPLE\n}\n\nmodel User {\n  id            String    @id @default(uuid(7))\n  createdAt     DateTime  @default(now())\n  email         String    @unique\n  emailVerified DateTime?\n  username      String?\n  color         String?\n  role          UserRole  @default(USER)\n\n  isProUntil              DateTime?\n  isSubscriptionCancelled Boolean               @default(false)\n  subscriptionProvider    SubscriptionProvider?\n\n  settings Json?\n\n  accounts     Account[]\n  sessions     Session[]\n  projects     ProjectMember[]\n  transactions Transaction[]\n}\n\nmodel Account {\n  id                String  @id @default(cuid())\n  userId            String\n  type              String\n  provider          String\n  providerAccountId String\n  refresh_token     String? @db.Text\n  access_token      String? @db.Text\n  expires_at        Int?\n  token_type        String?\n  scope             String?\n  id_token          String? @db.Text\n  session_state     String?\n\n  user User @relation(fields: [userId], references: [id], onDelete: Cascade)\n\n  @@unique([provider, providerAccountId])\n}\n\nmodel Session {\n  id           String   @id @default(cuid())\n  sessionToken String   @unique\n  userId       String\n  expires      DateTime\n  user         User     @relation(fields: [userId], references: [id], onDelete: Cascade)\n}\n\nmodel VerificationToken {\n  identifier String\n  token      String   @unique\n  expires    DateTime\n\n  @@unique([identifier, token])\n}\n\nmodel MagicLinkToken {\n  id        Int      @id @default(autoincrement())\n  email     String\n  tokenHash String   @unique\n  expiresAt DateTime\n  createdAt DateTime @default(now())\n\n  desktopNonce String?\n  inviteToken  String?\n\n  @@index([email, createdAt])\n}\n\nmodel Transaction {\n  id            Int                  @id @default(autoincrement())\n  userId        String\n  provider      SubscriptionProvider\n  transactionId String               @unique\n  createdAt     DateTime             @default(now())\n\n  user User @relation(fields: [userId], references: [id], onDelete: Cascade)\n\n  @@index([userId])\n}\n\nmodel Project {\n  id        String   @id @default(uuid(7))\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  title       String\n  description String?\n  author      String?\n  hasPoster   Boolean @default(false)\n\n  members     ProjectMember[]\n  invitations ProjectInvitation[]\n}\n\nmodel ProjectMember {\n  id   Int         @id @default(autoincrement())\n  role ProjectRole @default(VIEWER)\n\n  user      User    @relation(fields: [userId], references: [id])\n  userId    String\n  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)\n  projectId String\n\n  @@unique([userId, projectId])\n}\n\nmodel ProjectInvitation {\n  id        Int      @id @default(autoincrement())\n  token     String   @unique\n  email     String\n  createdAt DateTime @default(now())\n\n  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)\n  projectId String\n\n  @@unique([email, projectId])\n}\n",
   "runtimeDataModel": {
     "models": {},
     "enums": {},
@@ -35,7 +35,7 @@ const config: runtime.GetPrismaClientConfig = {
 config.runtimeDataModel = JSON.parse("{\"models\":{\"User\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"email\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"emailVerified\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"username\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"color\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"role\",\"kind\":\"enum\",\"type\":\"UserRole\"},{\"name\":\"isProUntil\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"isSubscriptionCancelled\",\"kind\":\"scalar\",\"type\":\"Boolean\"},{\"name\":\"subscriptionProvider\",\"kind\":\"enum\",\"type\":\"SubscriptionProvider\"},{\"name\":\"settings\",\"kind\":\"scalar\",\"type\":\"Json\"},{\"name\":\"accounts\",\"kind\":\"object\",\"type\":\"Account\",\"relationName\":\"AccountToUser\"},{\"name\":\"sessions\",\"kind\":\"object\",\"type\":\"Session\",\"relationName\":\"SessionToUser\"},{\"name\":\"projects\",\"kind\":\"object\",\"type\":\"ProjectMember\",\"relationName\":\"ProjectMemberToUser\"},{\"name\":\"transactions\",\"kind\":\"object\",\"type\":\"Transaction\",\"relationName\":\"TransactionToUser\"}],\"dbName\":null},\"Account\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"type\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"provider\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"providerAccountId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"refresh_token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"access_token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expires_at\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"token_type\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"scope\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"id_token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"session_state\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"AccountToUser\"}],\"dbName\":null},\"Session\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"sessionToken\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expires\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"SessionToUser\"}],\"dbName\":null},\"VerificationToken\":{\"fields\":[{\"name\":\"identifier\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expires\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"MagicLinkToken\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"email\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"tokenHash\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expiresAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"desktopNonce\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"inviteToken\",\"kind\":\"scalar\",\"type\":\"String\"}],\"dbName\":null},\"Transaction\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"provider\",\"kind\":\"enum\",\"type\":\"SubscriptionProvider\"},{\"name\":\"transactionId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"TransactionToUser\"}],\"dbName\":null},\"Project\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"title\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"description\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"author\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"hasPoster\",\"kind\":\"scalar\",\"type\":\"Boolean\"},{\"name\":\"members\",\"kind\":\"object\",\"type\":\"ProjectMember\",\"relationName\":\"ProjectToProjectMember\"},{\"name\":\"invitations\",\"kind\":\"object\",\"type\":\"ProjectInvitation\",\"relationName\":\"ProjectToProjectInvitation\"}],\"dbName\":null},\"ProjectMember\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"role\",\"kind\":\"enum\",\"type\":\"ProjectRole\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"ProjectMemberToUser\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"project\",\"kind\":\"object\",\"type\":\"Project\",\"relationName\":\"ProjectToProjectMember\"},{\"name\":\"projectId\",\"kind\":\"scalar\",\"type\":\"String\"}],\"dbName\":null},\"ProjectInvitation\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"email\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"project\",\"kind\":\"object\",\"type\":\"Project\",\"relationName\":\"ProjectToProjectInvitation\"},{\"name\":\"projectId\",\"kind\":\"scalar\",\"type\":\"String\"}],\"dbName\":null}},\"enums\":{},\"types\":{}}")
 config.parameterizationSchema = {
   strings: JSON.parse("[\"where\",\"orderBy\",\"cursor\",\"user\",\"accounts\",\"sessions\",\"members\",\"project\",\"invitations\",\"_count\",\"projects\",\"transactions\",\"User.findUnique\",\"User.findUniqueOrThrow\",\"User.findFirst\",\"User.findFirstOrThrow\",\"User.findMany\",\"data\",\"User.createOne\",\"User.createMany\",\"User.createManyAndReturn\",\"User.updateOne\",\"User.updateMany\",\"User.updateManyAndReturn\",\"create\",\"update\",\"User.upsertOne\",\"User.deleteOne\",\"User.deleteMany\",\"having\",\"_min\",\"_max\",\"User.groupBy\",\"User.aggregate\",\"Account.findUnique\",\"Account.findUniqueOrThrow\",\"Account.findFirst\",\"Account.findFirstOrThrow\",\"Account.findMany\",\"Account.createOne\",\"Account.createMany\",\"Account.createManyAndReturn\",\"Account.updateOne\",\"Account.updateMany\",\"Account.updateManyAndReturn\",\"Account.upsertOne\",\"Account.deleteOne\",\"Account.deleteMany\",\"_avg\",\"_sum\",\"Account.groupBy\",\"Account.aggregate\",\"Session.findUnique\",\"Session.findUniqueOrThrow\",\"Session.findFirst\",\"Session.findFirstOrThrow\",\"Session.findMany\",\"Session.createOne\",\"Session.createMany\",\"Session.createManyAndReturn\",\"Session.updateOne\",\"Session.updateMany\",\"Session.updateManyAndReturn\",\"Session.upsertOne\",\"Session.deleteOne\",\"Session.deleteMany\",\"Session.groupBy\",\"Session.aggregate\",\"VerificationToken.findUnique\",\"VerificationToken.findUniqueOrThrow\",\"VerificationToken.findFirst\",\"VerificationToken.findFirstOrThrow\",\"VerificationToken.findMany\",\"VerificationToken.createOne\",\"VerificationToken.createMany\",\"VerificationToken.createManyAndReturn\",\"VerificationToken.updateOne\",\"VerificationToken.updateMany\",\"VerificationToken.updateManyAndReturn\",\"VerificationToken.upsertOne\",\"VerificationToken.deleteOne\",\"VerificationToken.deleteMany\",\"VerificationToken.groupBy\",\"VerificationToken.aggregate\",\"MagicLinkToken.findUnique\",\"MagicLinkToken.findUniqueOrThrow\",\"MagicLinkToken.findFirst\",\"MagicLinkToken.findFirstOrThrow\",\"MagicLinkToken.findMany\",\"MagicLinkToken.createOne\",\"MagicLinkToken.createMany\",\"MagicLinkToken.createManyAndReturn\",\"MagicLinkToken.updateOne\",\"MagicLinkToken.updateMany\",\"MagicLinkToken.updateManyAndReturn\",\"MagicLinkToken.upsertOne\",\"MagicLinkToken.deleteOne\",\"MagicLinkToken.deleteMany\",\"MagicLinkToken.groupBy\",\"MagicLinkToken.aggregate\",\"Transaction.findUnique\",\"Transaction.findUniqueOrThrow\",\"Transaction.findFirst\",\"Transaction.findFirstOrThrow\",\"Transaction.findMany\",\"Transaction.createOne\",\"Transaction.createMany\",\"Transaction.createManyAndReturn\",\"Transaction.updateOne\",\"Transaction.updateMany\",\"Transaction.updateManyAndReturn\",\"Transaction.upsertOne\",\"Transaction.deleteOne\",\"Transaction.deleteMany\",\"Transaction.groupBy\",\"Transaction.aggregate\",\"Project.findUnique\",\"Project.findUniqueOrThrow\",\"Project.findFirst\",\"Project.findFirstOrThrow\",\"Project.findMany\",\"Project.createOne\",\"Project.createMany\",\"Project.createManyAndReturn\",\"Project.updateOne\",\"Project.updateMany\",\"Project.updateManyAndReturn\",\"Project.upsertOne\",\"Project.deleteOne\",\"Project.deleteMany\",\"Project.groupBy\",\"Project.aggregate\",\"ProjectMember.findUnique\",\"ProjectMember.findUniqueOrThrow\",\"ProjectMember.findFirst\",\"ProjectMember.findFirstOrThrow\",\"ProjectMember.findMany\",\"ProjectMember.createOne\",\"ProjectMember.createMany\",\"ProjectMember.createManyAndReturn\",\"ProjectMember.updateOne\",\"ProjectMember.updateMany\",\"ProjectMember.updateManyAndReturn\",\"ProjectMember.upsertOne\",\"ProjectMember.deleteOne\",\"ProjectMember.deleteMany\",\"ProjectMember.groupBy\",\"ProjectMember.aggregate\",\"ProjectInvitation.findUnique\",\"ProjectInvitation.findUniqueOrThrow\",\"ProjectInvitation.findFirst\",\"ProjectInvitation.findFirstOrThrow\",\"ProjectInvitation.findMany\",\"ProjectInvitation.createOne\",\"ProjectInvitation.createMany\",\"ProjectInvitation.createManyAndReturn\",\"ProjectInvitation.updateOne\",\"ProjectInvitation.updateMany\",\"ProjectInvitation.updateManyAndReturn\",\"ProjectInvitation.upsertOne\",\"ProjectInvitation.deleteOne\",\"ProjectInvitation.deleteMany\",\"ProjectInvitation.groupBy\",\"ProjectInvitation.aggregate\",\"AND\",\"OR\",\"NOT\",\"id\",\"token\",\"email\",\"createdAt\",\"projectId\",\"equals\",\"in\",\"notIn\",\"lt\",\"lte\",\"gt\",\"gte\",\"not\",\"contains\",\"startsWith\",\"endsWith\",\"ProjectRole\",\"role\",\"userId\",\"updatedAt\",\"title\",\"description\",\"author\",\"hasPoster\",\"every\",\"some\",\"none\",\"SubscriptionProvider\",\"provider\",\"transactionId\",\"tokenHash\",\"expiresAt\",\"desktopNonce\",\"inviteToken\",\"identifier\",\"expires\",\"identifier_token\",\"sessionToken\",\"type\",\"providerAccountId\",\"refresh_token\",\"access_token\",\"expires_at\",\"token_type\",\"scope\",\"id_token\",\"session_state\",\"emailVerified\",\"username\",\"color\",\"UserRole\",\"isProUntil\",\"isSubscriptionCancelled\",\"subscriptionProvider\",\"settings\",\"string_contains\",\"string_starts_with\",\"string_ends_with\",\"array_starts_with\",\"array_ends_with\",\"array_contains\",\"email_projectId\",\"userId_projectId\",\"provider_providerAccountId\",\"is\",\"isNot\",\"connectOrCreate\",\"upsert\",\"createMany\",\"set\",\"disconnect\",\"delete\",\"connect\",\"updateMany\",\"deleteMany\",\"increment\",\"decrement\",\"multiply\",\"divide\"]"),
-  graph: "9ANVkAESBAAArAIAIAUAAK0CACAKAACKAgAgCwAArgIAIKQBAACnAgAwpQEAAB8AEKYBAACnAgAwpwEBAAAAAakBAQAAAAGqAUAAhwIAIbgBAACpAtoBItYBQACoAgAh1wEBAIgCACHYAQEAiAIAIdoBQACoAgAh2wEgAIkCACHcAQAAqgLDASPdAQAAqwIAIAEAAAABACAQAwAAsQIAIKQBAAC6AgAwpQEAAAMAEKYBAAC6AgAwpwEBAIYCACG5AQEAhgIAIcMBAQCGAgAhzQEBAIYCACHOAQEAhgIAIc8BAQCIAgAh0AEBAIgCACHRAQIAuwIAIdIBAQCIAgAh0wEBAIgCACHUAQEAiAIAIdUBAQCIAgAhCAMAAM8DACDPAQAA0AIAINABAADQAgAg0QEAANACACDSAQAA0AIAINMBAADQAgAg1AEAANACACDVAQAA0AIAIBEDAACxAgAgpAEAALoCADClAQAAAwAQpgEAALoCADCnAQEAAAABuQEBAIYCACHDAQEAhgIAIc0BAQCGAgAhzgEBAIYCACHPAQEAiAIAIdABAQCIAgAh0QECALsCACHSAQEAiAIAIdMBAQCIAgAh1AEBAIgCACHVAQEAiAIAIeYBAAC5AgAgAwAAAAMAIAEAAAQAMAIAAAUAIAgDAACxAgAgpAEAALgCADClAQAABwAQpgEAALgCADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQEDAADPAwAgCAMAALECACCkAQAAuAIAMKUBAAAHABCmAQAAuAIAMKcBAQAAAAG5AQEAhgIAIcoBQACHAgAhzAEBAAAAAQMAAAAHACABAAAIADACAAAJACAJAwAAsQIAIAcAALQCACCkAQAAtgIAMKUBAAALABCmAQAAtgIAMKcBAgCSAgAhqwEBAIYCACG4AQAAtwK4ASK5AQEAhgIAIQIDAADPAwAgBwAA0AMAIAoDAACxAgAgBwAAtAIAIKQBAAC2AgAwpQEAAAsAEKYBAAC2AgAwpwECAAAAAasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACHlAQAAtQIAIAMAAAALACABAAAMADACAAANACADAAAACwAgAQAADAAwAgAADQAgCQcAALQCACCkAQAAswIAMKUBAAAQABCmAQAAswIAMKcBAgCSAgAhqAEBAIYCACGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACEBBwAA0AMAIAoHAAC0AgAgpAEAALMCADClAQAAEAAQpgEAALMCADCnAQIAAAABqAEBAAAAAakBAQCGAgAhqgFAAIcCACGrAQEAhgIAIeQBAACyAgAgAwAAABAAIAEAABEAMAIAABIAIAEAAAALACABAAAAEAAgCQMAALECACCkAQAArwIAMKUBAAAWABCmAQAArwIAMKcBAgCSAgAhqgFAAIcCACG5AQEAhgIAIcMBAACwAsMBIsQBAQCGAgAhAQMAAM8DACAJAwAAsQIAIKQBAACvAgAwpQEAABYAEKYBAACvAgAwpwECAAAAAaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQMAAAAWACABAAAXADACAAAYACABAAAAAwAgAQAAAAcAIAEAAAALACABAAAAFgAgAQAAAAEAIBIEAACsAgAgBQAArQIAIAoAAIoCACALAACuAgAgpAEAAKcCADClAQAAHwAQpgEAAKcCADCnAQEAhgIAIakBAQCGAgAhqgFAAIcCACG4AQAAqQLaASLWAUAAqAIAIdcBAQCIAgAh2AEBAIgCACHaAUAAqAIAIdsBIACJAgAh3AEAAKoCwwEj3QEAAKsCACAKBAAAzAMAIAUAAM0DACAKAADyAgAgCwAAzgMAINYBAADQAgAg1wEAANACACDYAQAA0AIAINoBAADQAgAg3AEAANACACDdAQAA0AIAIAMAAAAfACABAAAgADACAAABACADAAAAHwAgAQAAIAAwAgAAAQAgAwAAAB8AIAEAACAAMAIAAAEAIA8EAADIAwAgBQAAyQMAIAoAAMoDACALAADLAwAgpwEBAAAAAakBAQAAAAGqAUAAAAABuAEAAADaAQLWAUAAAAAB1wEBAAAAAdgBAQAAAAHaAUAAAAAB2wEgAAAAAdwBAAAAwwED3QGAAAAAAQERAAAkACALpwEBAAAAAakBAQAAAAGqAUAAAAABuAEAAADaAQLWAUAAAAAB1wEBAAAAAdgBAQAAAAHaAUAAAAAB2wEgAAAAAdwBAAAAwwED3QGAAAAAAQERAAAmADABEQAAJgAwDwQAAJcDACAFAACYAwAgCgAAmQMAIAsAAJoDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQIAAAABACARAAApACALpwEBAMECACGpAQEAwQIAIaoBQADCAgAhuAEAAJUD2gEi1gFAAJQDACHXAQEA1AIAIdgBAQDUAgAh2gFAAJQDACHbASAA1QIAIdwBAACWA8MBI90BgAAAAAECAAAAHwAgEQAAKwAgAgAAAB8AIBEAACsAIAMAAAABACAYAAAkACAZAAApACABAAAAAQAgAQAAAB8AIAkJAACRAwAgHgAAkwMAIB8AAJIDACDWAQAA0AIAINcBAADQAgAg2AEAANACACDaAQAA0AIAINwBAADQAgAg3QEAANACACAOpAEAAJsCADClAQAAMgAQpgEAAJsCADCnAQEA8AEAIakBAQDwAQAhqgFAAPEBACG4AQAAnQLaASLWAUAAnAIAIdcBAQD-AQAh2AEBAP4BACHaAUAAnAIAIdsBIAD_AQAh3AEAAJ4CwwEj3QEAAJ8CACADAAAAHwAgAQAAMQAwHQAAMgAgAwAAAB8AIAEAACAAMAIAAAEAIAEAAAAFACABAAAABQAgAwAAAAMAIAEAAAQAMAIAAAUAIAMAAAADACABAAAEADACAAAFACADAAAAAwAgAQAABAAwAgAABQAgDQMAAJADACCnAQEAAAABuQEBAAAAAcMBAQAAAAHNAQEAAAABzgEBAAAAAc8BAQAAAAHQAQEAAAAB0QECAAAAAdIBAQAAAAHTAQEAAAAB1AEBAAAAAdUBAQAAAAEBEQAAOgAgDKcBAQAAAAG5AQEAAAABwwEBAAAAAc0BAQAAAAHOAQEAAAABzwEBAAAAAdABAQAAAAHRAQIAAAAB0gEBAAAAAdMBAQAAAAHUAQEAAAAB1QEBAAAAAQERAAA8ADABEQAAPAAwDQMAAI8DACCnAQEAwQIAIbkBAQDBAgAhwwEBAMECACHNAQEAwQIAIc4BAQDBAgAhzwEBANQCACHQAQEA1AIAIdEBAgCOAwAh0gEBANQCACHTAQEA1AIAIdQBAQDUAgAh1QEBANQCACECAAAABQAgEQAAPwAgDKcBAQDBAgAhuQEBAMECACHDAQEAwQIAIc0BAQDBAgAhzgEBAMECACHPAQEA1AIAIdABAQDUAgAh0QECAI4DACHSAQEA1AIAIdMBAQDUAgAh1AEBANQCACHVAQEA1AIAIQIAAAADACARAABBACACAAAAAwAgEQAAQQAgAwAAAAUAIBgAADoAIBkAAD8AIAEAAAAFACABAAAAAwAgDAkAAIkDACAeAACMAwAgHwAAiwMAIDAAAIoDACAxAACNAwAgzwEAANACACDQAQAA0AIAINEBAADQAgAg0gEAANACACDTAQAA0AIAINQBAADQAgAg1QEAANACACAPpAEAAJcCADClAQAASAAQpgEAAJcCADCnAQEA8AEAIbkBAQDwAQAhwwEBAPABACHNAQEA8AEAIc4BAQDwAQAhzwEBAP4BACHQAQEA_gEAIdEBAgCYAgAh0gEBAP4BACHTAQEA_gEAIdQBAQD-AQAh1QEBAP4BACEDAAAAAwAgAQAARwAwHQAASAAgAwAAAAMAIAEAAAQAMAIAAAUAIAEAAAAJACABAAAACQAgAwAAAAcAIAEAAAgAMAIAAAkAIAMAAAAHACABAAAIADACAAAJACADAAAABwAgAQAACAAwAgAACQAgBQMAAIgDACCnAQEAAAABuQEBAAAAAcoBQAAAAAHMAQEAAAABAREAAFAAIASnAQEAAAABuQEBAAAAAcoBQAAAAAHMAQEAAAABAREAAFIAMAERAABSADAFAwAAhwMAIKcBAQDBAgAhuQEBAMECACHKAUAAwgIAIcwBAQDBAgAhAgAAAAkAIBEAAFUAIASnAQEAwQIAIbkBAQDBAgAhygFAAMICACHMAQEAwQIAIQIAAAAHACARAABXACACAAAABwAgEQAAVwAgAwAAAAkAIBgAAFAAIBkAAFUAIAEAAAAJACABAAAABwAgAwkAAIQDACAeAACGAwAgHwAAhQMAIAekAQAAlgIAMKUBAABeABCmAQAAlgIAMKcBAQDwAQAhuQEBAPABACHKAUAA8QEAIcwBAQDwAQAhAwAAAAcAIAEAAF0AMB0AAF4AIAMAAAAHACABAAAIADACAAAJACAHpAEAAJQCADClAQAAZAAQpgEAAJQCADCoAQEAAAAByQEBAIYCACHKAUAAhwIAIcsBAACVAgAgAQAAAGEAIAEAAABhACAGpAEAAJQCADClAQAAZAAQpgEAAJQCADCoAQEAhgIAIckBAQCGAgAhygFAAIcCACEAAwAAAGQAIAEAAGUAMAIAAGEAIAMAAABkACABAABlADACAABhACADAAAAZAAgAQAAZQAwAgAAYQAgA6gBAQAAAAHJAQEAAAABygFAAAAAAQERAABpACADqAEBAAAAAckBAQAAAAHKAUAAAAABAREAAGsAMAERAABrADADqAEBAMECACHJAQEAwQIAIcoBQADCAgAhAgAAAGEAIBEAAG4AIAOoAQEAwQIAIckBAQDBAgAhygFAAMICACECAAAAZAAgEQAAcAAgAgAAAGQAIBEAAHAAIAMAAABhACAYAABpACAZAABuACABAAAAYQAgAQAAAGQAIAMJAACBAwAgHgAAgwMAIB8AAIIDACAGpAEAAJMCADClAQAAdwAQpgEAAJMCADCoAQEA8AEAIckBAQDwAQAhygFAAPEBACEDAAAAZAAgAQAAdgAwHQAAdwAgAwAAAGQAIAEAAGUAMAIAAGEAIAqkAQAAkQIAMKUBAAB9ABCmAQAAkQIAMKcBAgAAAAGpAQEAhgIAIaoBQACHAgAhxQEBAAAAAcYBQACHAgAhxwEBAIgCACHIAQEAiAIAIQEAAAB6ACABAAAAegAgCqQBAACRAgAwpQEAAH0AEKYBAACRAgAwpwECAJICACGpAQEAhgIAIaoBQACHAgAhxQEBAIYCACHGAUAAhwIAIccBAQCIAgAhyAEBAIgCACECxwEAANACACDIAQAA0AIAIAMAAAB9ACABAAB-ADACAAB6ACADAAAAfQAgAQAAfgAwAgAAegAgAwAAAH0AIAEAAH4AMAIAAHoAIAenAQIAAAABqQEBAAAAAaoBQAAAAAHFAQEAAAABxgFAAAAAAccBAQAAAAHIAQEAAAABAREAAIIBACAHpwECAAAAAakBAQAAAAGqAUAAAAABxQEBAAAAAcYBQAAAAAHHAQEAAAAByAEBAAAAAQERAACEAQAwAREAAIQBADAHpwECAMMCACGpAQEAwQIAIaoBQADCAgAhxQEBAMECACHGAUAAwgIAIccBAQDUAgAhyAEBANQCACECAAAAegAgEQAAhwEAIAenAQIAwwIAIakBAQDBAgAhqgFAAMICACHFAQEAwQIAIcYBQADCAgAhxwEBANQCACHIAQEA1AIAIQIAAAB9ACARAACJAQAgAgAAAH0AIBEAAIkBACADAAAAegAgGAAAggEAIBkAAIcBACABAAAAegAgAQAAAH0AIAcJAAD8AgAgHgAA_wIAIB8AAP4CACAwAAD9AgAgMQAAgAMAIMcBAADQAgAgyAEAANACACAKpAEAAJACADClAQAAkAEAEKYBAACQAgAwpwECAO8BACGpAQEA8AEAIaoBQADxAQAhxQEBAPABACHGAUAA8QEAIccBAQD-AQAhyAEBAP4BACEDAAAAfQAgAQAAjwEAMB0AAJABACADAAAAfQAgAQAAfgAwAgAAegAgAQAAABgAIAEAAAAYACADAAAAFgAgAQAAFwAwAgAAGAAgAwAAABYAIAEAABcAMAIAABgAIAMAAAAWACABAAAXADACAAAYACAGAwAA-wIAIKcBAgAAAAGqAUAAAAABuQEBAAAAAcMBAAAAwwECxAEBAAAAAQERAACYAQAgBacBAgAAAAGqAUAAAAABuQEBAAAAAcMBAAAAwwECxAEBAAAAAQERAACaAQAwAREAAJoBADAGAwAA-gIAIKcBAgDDAgAhqgFAAMICACG5AQEAwQIAIcMBAAD5AsMBIsQBAQDBAgAhAgAAABgAIBEAAJ0BACAFpwECAMMCACGqAUAAwgIAIbkBAQDBAgAhwwEAAPkCwwEixAEBAMECACECAAAAFgAgEQAAnwEAIAIAAAAWACARAACfAQAgAwAAABgAIBgAAJgBACAZAACdAQAgAQAAABgAIAEAAAAWACAFCQAA9AIAIB4AAPcCACAfAAD2AgAgMAAA9QIAIDEAAPgCACAIpAEAAIwCADClAQAApgEAEKYBAACMAgAwpwECAO8BACGqAUAA8QEAIbkBAQDwAQAhwwEAAI0CwwEixAEBAPABACEDAAAAFgAgAQAApQEAMB0AAKYBACADAAAAFgAgAQAAFwAwAgAAGAAgDAYAAIoCACAIAACLAgAgpAEAAIUCADClAQAArAEAEKYBAACFAgAwpwEBAAAAAaoBQACHAgAhugFAAIcCACG7AQEAhgIAIbwBAQCIAgAhvQEBAIgCACG-ASAAiQIAIQEAAACpAQAgAQAAAKkBACAMBgAAigIAIAgAAIsCACCkAQAAhQIAMKUBAACsAQAQpgEAAIUCADCnAQEAhgIAIaoBQACHAgAhugFAAIcCACG7AQEAhgIAIbwBAQCIAgAhvQEBAIgCACG-ASAAiQIAIQQGAADyAgAgCAAA8wIAILwBAADQAgAgvQEAANACACADAAAArAEAIAEAAK0BADACAACpAQAgAwAAAKwBACABAACtAQAwAgAAqQEAIAMAAACsAQAgAQAArQEAMAIAAKkBACAJBgAA8AIAIAgAAPECACCnAQEAAAABqgFAAAAAAboBQAAAAAG7AQEAAAABvAEBAAAAAb0BAQAAAAG-ASAAAAABAREAALEBACAHpwEBAAAAAaoBQAAAAAG6AUAAAAABuwEBAAAAAbwBAQAAAAG9AQEAAAABvgEgAAAAAQERAACzAQAwAREAALMBADAJBgAA1gIAIAgAANcCACCnAQEAwQIAIaoBQADCAgAhugFAAMICACG7AQEAwQIAIbwBAQDUAgAhvQEBANQCACG-ASAA1QIAIQIAAACpAQAgEQAAtgEAIAenAQEAwQIAIaoBQADCAgAhugFAAMICACG7AQEAwQIAIbwBAQDUAgAhvQEBANQCACG-ASAA1QIAIQIAAACsAQAgEQAAuAEAIAIAAACsAQAgEQAAuAEAIAMAAACpAQAgGAAAsQEAIBkAALYBACABAAAAqQEAIAEAAACsAQAgBQkAANECACAeAADTAgAgHwAA0gIAILwBAADQAgAgvQEAANACACAKpAEAAP0BADClAQAAvwEAEKYBAAD9AQAwpwEBAPABACGqAUAA8QEAIboBQADxAQAhuwEBAPABACG8AQEA_gEAIb0BAQD-AQAhvgEgAP8BACEDAAAArAEAIAEAAL4BADAdAAC_AQAgAwAAAKwBACABAACtAQAwAgAAqQEAIAEAAAANACABAAAADQAgAwAAAAsAIAEAAAwAMAIAAA0AIAMAAAALACABAAAMADACAAANACADAAAACwAgAQAADAAwAgAADQAgBgMAAM4CACAHAADPAgAgpwECAAAAAasBAQAAAAG4AQAAALgBArkBAQAAAAEBEQAAxwEAIASnAQIAAAABqwEBAAAAAbgBAAAAuAECuQEBAAAAAQERAADJAQAwAREAAMkBADAGAwAAzAIAIAcAAM0CACCnAQIAwwIAIasBAQDBAgAhuAEAAMsCuAEiuQEBAMECACECAAAADQAgEQAAzAEAIASnAQIAwwIAIasBAQDBAgAhuAEAAMsCuAEiuQEBAMECACECAAAACwAgEQAAzgEAIAIAAAALACARAADOAQAgAwAAAA0AIBgAAMcBACAZAADMAQAgAQAAAA0AIAEAAAALACAFCQAAxgIAIB4AAMkCACAfAADIAgAgMAAAxwIAIDEAAMoCACAHpAEAAPkBADClAQAA1QEAEKYBAAD5AQAwpwECAO8BACGrAQEA8AEAIbgBAAD6AbgBIrkBAQDwAQAhAwAAAAsAIAEAANQBADAdAADVAQAgAwAAAAsAIAEAAAwAMAIAAA0AIAEAAAASACABAAAAEgAgAwAAABAAIAEAABEAMAIAABIAIAMAAAAQACABAAARADACAAASACADAAAAEAAgAQAAEQAwAgAAEgAgBgcAAMUCACCnAQIAAAABqAEBAAAAAakBAQAAAAGqAUAAAAABqwEBAAAAAQERAADdAQAgBacBAgAAAAGoAQEAAAABqQEBAAAAAaoBQAAAAAGrAQEAAAABAREAAN8BADABEQAA3wEAMAYHAADEAgAgpwECAMMCACGoAQEAwQIAIakBAQDBAgAhqgFAAMICACGrAQEAwQIAIQIAAAASACARAADiAQAgBacBAgDDAgAhqAEBAMECACGpAQEAwQIAIaoBQADCAgAhqwEBAMECACECAAAAEAAgEQAA5AEAIAIAAAAQACARAADkAQAgAwAAABIAIBgAAN0BACAZAADiAQAgAQAAABIAIAEAAAAQACAFCQAAvAIAIB4AAL8CACAfAAC-AgAgMAAAvQIAIDEAAMACACAIpAEAAO4BADClAQAA6wEAEKYBAADuAQAwpwECAO8BACGoAQEA8AEAIakBAQDwAQAhqgFAAPEBACGrAQEA8AEAIQMAAAAQACABAADqAQAwHQAA6wEAIAMAAAAQACABAAARADACAAASACAIpAEAAO4BADClAQAA6wEAEKYBAADuAQAwpwECAO8BACGoAQEA8AEAIakBAQDwAQAhqgFAAPEBACGrAQEA8AEAIQ0JAADzAQAgHgAA8wEAIB8AAPMBACAwAAD4AQAgMQAA8wEAIKwBAgAAAAGtAQIAAAAErgECAAAABK8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIA9wEAIQ4JAADzAQAgHgAA9gEAIB8AAPYBACCsAQEAAAABrQEBAAAABK4BAQAAAASvAQEAAAABsAEBAAAAAbEBAQAAAAGyAQEAAAABswEBAPUBACG0AQEAAAABtQEBAAAAAbYBAQAAAAELCQAA8wEAIB4AAPQBACAfAAD0AQAgrAFAAAAAAa0BQAAAAASuAUAAAAAErwFAAAAAAbABQAAAAAGxAUAAAAABsgFAAAAAAbMBQADyAQAhCwkAAPMBACAeAAD0AQAgHwAA9AEAIKwBQAAAAAGtAUAAAAAErgFAAAAABK8BQAAAAAGwAUAAAAABsQFAAAAAAbIBQAAAAAGzAUAA8gEAIQisAQIAAAABrQECAAAABK4BAgAAAASvAQIAAAABsAECAAAAAbEBAgAAAAGyAQIAAAABswECAPMBACEIrAFAAAAAAa0BQAAAAASuAUAAAAAErwFAAAAAAbABQAAAAAGxAUAAAAABsgFAAAAAAbMBQAD0AQAhDgkAAPMBACAeAAD2AQAgHwAA9gEAIKwBAQAAAAGtAQEAAAAErgEBAAAABK8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEA9QEAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQusAQEAAAABrQEBAAAABK4BAQAAAASvAQEAAAABsAEBAAAAAbEBAQAAAAGyAQEAAAABswEBAPYBACG0AQEAAAABtQEBAAAAAbYBAQAAAAENCQAA8wEAIB4AAPMBACAfAADzAQAgMAAA-AEAIDEAAPMBACCsAQIAAAABrQECAAAABK4BAgAAAASvAQIAAAABsAECAAAAAbEBAgAAAAGyAQIAAAABswECAPcBACEIrAEIAAAAAa0BCAAAAASuAQgAAAAErwEIAAAAAbABCAAAAAGxAQgAAAABsgEIAAAAAbMBCAD4AQAhB6QBAAD5AQAwpQEAANUBABCmAQAA-QEAMKcBAgDvAQAhqwEBAPABACG4AQAA-gG4ASK5AQEA8AEAIQcJAADzAQAgHgAA_AEAIB8AAPwBACCsAQAAALgBAq0BAAAAuAEIrgEAAAC4AQizAQAA-wG4ASIHCQAA8wEAIB4AAPwBACAfAAD8AQAgrAEAAAC4AQKtAQAAALgBCK4BAAAAuAEIswEAAPsBuAEiBKwBAAAAuAECrQEAAAC4AQiuAQAAALgBCLMBAAD8AbgBIgqkAQAA_QEAMKUBAAC_AQAQpgEAAP0BADCnAQEA8AEAIaoBQADxAQAhugFAAPEBACG7AQEA8AEAIbwBAQD-AQAhvQEBAP4BACG-ASAA_wEAIQ4JAACDAgAgHgAAhAIAIB8AAIQCACCsAQEAAAABrQEBAAAABa4BAQAAAAWvAQEAAAABsAEBAAAAAbEBAQAAAAGyAQEAAAABswEBAIICACG0AQEAAAABtQEBAAAAAbYBAQAAAAEFCQAA8wEAIB4AAIECACAfAACBAgAgrAEgAAAAAbMBIACAAgAhBQkAAPMBACAeAACBAgAgHwAAgQIAIKwBIAAAAAGzASAAgAIAIQKsASAAAAABswEgAIECACEOCQAAgwIAIB4AAIQCACAfAACEAgAgrAEBAAAAAa0BAQAAAAWuAQEAAAAFrwEBAAAAAbABAQAAAAGxAQEAAAABsgEBAAAAAbMBAQCCAgAhtAEBAAAAAbUBAQAAAAG2AQEAAAABCKwBAgAAAAGtAQIAAAAFrgECAAAABa8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIAgwIAIQusAQEAAAABrQEBAAAABa4BAQAAAAWvAQEAAAABsAEBAAAAAbEBAQAAAAGyAQEAAAABswEBAIQCACG0AQEAAAABtQEBAAAAAbYBAQAAAAEMBgAAigIAIAgAAIsCACCkAQAAhQIAMKUBAACsAQAQpgEAAIUCADCnAQEAhgIAIaoBQACHAgAhugFAAIcCACG7AQEAhgIAIbwBAQCIAgAhvQEBAIgCACG-ASAAiQIAIQusAQEAAAABrQEBAAAABK4BAQAAAASvAQEAAAABsAEBAAAAAbEBAQAAAAGyAQEAAAABswEBAPYBACG0AQEAAAABtQEBAAAAAbYBAQAAAAEIrAFAAAAAAa0BQAAAAASuAUAAAAAErwFAAAAAAbABQAAAAAGxAUAAAAABsgFAAAAAAbMBQAD0AQAhC6wBAQAAAAGtAQEAAAAFrgEBAAAABa8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEAhAIAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQKsASAAAAABswEgAIECACEDvwEAAAsAIMABAAALACDBAQAACwAgA78BAAAQACDAAQAAEAAgwQEAABAAIAikAQAAjAIAMKUBAACmAQAQpgEAAIwCADCnAQIA7wEAIaoBQADxAQAhuQEBAPABACHDAQAAjQLDASLEAQEA8AEAIQcJAADzAQAgHgAAjwIAIB8AAI8CACCsAQAAAMMBAq0BAAAAwwEIrgEAAADDAQizAQAAjgLDASIHCQAA8wEAIB4AAI8CACAfAACPAgAgrAEAAADDAQKtAQAAAMMBCK4BAAAAwwEIswEAAI4CwwEiBKwBAAAAwwECrQEAAADDAQiuAQAAAMMBCLMBAACPAsMBIgqkAQAAkAIAMKUBAACQAQAQpgEAAJACADCnAQIA7wEAIakBAQDwAQAhqgFAAPEBACHFAQEA8AEAIcYBQADxAQAhxwEBAP4BACHIAQEA_gEAIQqkAQAAkQIAMKUBAAB9ABCmAQAAkQIAMKcBAgCSAgAhqQEBAIYCACGqAUAAhwIAIcUBAQCGAgAhxgFAAIcCACHHAQEAiAIAIcgBAQCIAgAhCKwBAgAAAAGtAQIAAAAErgECAAAABK8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIA8wEAIQakAQAAkwIAMKUBAAB3ABCmAQAAkwIAMKgBAQDwAQAhyQEBAPABACHKAUAA8QEAIQakAQAAlAIAMKUBAABkABCmAQAAlAIAMKgBAQCGAgAhyQEBAIYCACHKAUAAhwIAIQKoAQEAAAAByQEBAAAAAQekAQAAlgIAMKUBAABeABCmAQAAlgIAMKcBAQDwAQAhuQEBAPABACHKAUAA8QEAIcwBAQDwAQAhD6QBAACXAgAwpQEAAEgAEKYBAACXAgAwpwEBAPABACG5AQEA8AEAIcMBAQDwAQAhzQEBAPABACHOAQEA8AEAIc8BAQD-AQAh0AEBAP4BACHRAQIAmAIAIdIBAQD-AQAh0wEBAP4BACHUAQEA_gEAIdUBAQD-AQAhDQkAAIMCACAeAACDAgAgHwAAgwIAIDAAAJoCACAxAACDAgAgrAECAAAAAa0BAgAAAAWuAQIAAAAFrwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgCZAgAhDQkAAIMCACAeAACDAgAgHwAAgwIAIDAAAJoCACAxAACDAgAgrAECAAAAAa0BAgAAAAWuAQIAAAAFrwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgCZAgAhCKwBCAAAAAGtAQgAAAAFrgEIAAAABa8BCAAAAAGwAQgAAAABsQEIAAAAAbIBCAAAAAGzAQgAmgIAIQ6kAQAAmwIAMKUBAAAyABCmAQAAmwIAMKcBAQDwAQAhqQEBAPABACGqAUAA8QEAIbgBAACdAtoBItYBQACcAgAh1wEBAP4BACHYAQEA_gEAIdoBQACcAgAh2wEgAP8BACHcAQAAngLDASPdAQAAnwIAIAsJAACDAgAgHgAApgIAIB8AAKYCACCsAUAAAAABrQFAAAAABa4BQAAAAAWvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAKUCACEHCQAA8wEAIB4AAKQCACAfAACkAgAgrAEAAADaAQKtAQAAANoBCK4BAAAA2gEIswEAAKMC2gEiBwkAAIMCACAeAACiAgAgHwAAogIAIKwBAAAAwwEDrQEAAADDAQmuAQAAAMMBCbMBAAChAsMBIw8JAACDAgAgHgAAoAIAIB8AAKACACCsAYAAAAABrwGAAAAAAbABgAAAAAGxAYAAAAABsgGAAAAAAbMBgAAAAAHeAQEAAAAB3wEBAAAAAeABAQAAAAHhAYAAAAAB4gGAAAAAAeMBgAAAAAEMrAGAAAAAAa8BgAAAAAGwAYAAAAABsQGAAAAAAbIBgAAAAAGzAYAAAAAB3gEBAAAAAd8BAQAAAAHgAQEAAAAB4QGAAAAAAeIBgAAAAAHjAYAAAAABBwkAAIMCACAeAACiAgAgHwAAogIAIKwBAAAAwwEDrQEAAADDAQmuAQAAAMMBCbMBAAChAsMBIwSsAQAAAMMBA60BAAAAwwEJrgEAAADDAQmzAQAAogLDASMHCQAA8wEAIB4AAKQCACAfAACkAgAgrAEAAADaAQKtAQAAANoBCK4BAAAA2gEIswEAAKMC2gEiBKwBAAAA2gECrQEAAADaAQiuAQAAANoBCLMBAACkAtoBIgsJAACDAgAgHgAApgIAIB8AAKYCACCsAUAAAAABrQFAAAAABa4BQAAAAAWvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAKUCACEIrAFAAAAAAa0BQAAAAAWuAUAAAAAFrwFAAAAAAbABQAAAAAGxAUAAAAABsgFAAAAAAbMBQACmAgAhEgQAAKwCACAFAACtAgAgCgAAigIAIAsAAK4CACCkAQAApwIAMKUBAAAfABCmAQAApwIAMKcBAQCGAgAhqQEBAIYCACGqAUAAhwIAIbgBAACpAtoBItYBQACoAgAh1wEBAIgCACHYAQEAiAIAIdoBQACoAgAh2wEgAIkCACHcAQAAqgLDASPdAQAAqwIAIAisAUAAAAABrQFAAAAABa4BQAAAAAWvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAKYCACEErAEAAADaAQKtAQAAANoBCK4BAAAA2gEIswEAAKQC2gEiBKwBAAAAwwEDrQEAAADDAQmuAQAAAMMBCbMBAACiAsMBIwysAYAAAAABrwGAAAAAAbABgAAAAAGxAYAAAAABsgGAAAAAAbMBgAAAAAHeAQEAAAAB3wEBAAAAAeABAQAAAAHhAYAAAAAB4gGAAAAAAeMBgAAAAAEDvwEAAAMAIMABAAADACDBAQAAAwAgA78BAAAHACDAAQAABwAgwQEAAAcAIAO_AQAAFgAgwAEAABYAIMEBAAAWACAJAwAAsQIAIKQBAACvAgAwpQEAABYAEKYBAACvAgAwpwECAJICACGqAUAAhwIAIbkBAQCGAgAhwwEAALACwwEixAEBAIYCACEErAEAAADDAQKtAQAAAMMBCK4BAAAAwwEIswEAAI8CwwEiFAQAAKwCACAFAACtAgAgCgAAigIAIAsAAK4CACCkAQAApwIAMKUBAAAfABCmAQAApwIAMKcBAQCGAgAhqQEBAIYCACGqAUAAhwIAIbgBAACpAtoBItYBQACoAgAh1wEBAIgCACHYAQEAiAIAIdoBQACoAgAh2wEgAIkCACHcAQAAqgLDASPdAQAAqwIAIOcBAAAfACDoAQAAHwAgAqkBAQAAAAGrAQEAAAABCQcAALQCACCkAQAAswIAMKUBAAAQABCmAQAAswIAMKcBAgCSAgAhqAEBAIYCACGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACEOBgAAigIAIAgAAIsCACCkAQAAhQIAMKUBAACsAQAQpgEAAIUCADCnAQEAhgIAIaoBQACHAgAhugFAAIcCACG7AQEAhgIAIbwBAQCIAgAhvQEBAIgCACG-ASAAiQIAIecBAACsAQAg6AEAAKwBACACqwEBAAAAAbkBAQAAAAEJAwAAsQIAIAcAALQCACCkAQAAtgIAMKUBAAALABCmAQAAtgIAMKcBAgCSAgAhqwEBAIYCACG4AQAAtwK4ASK5AQEAhgIAIQSsAQAAALgBAq0BAAAAuAEIrgEAAAC4AQizAQAA_AG4ASIIAwAAsQIAIKQBAAC4AgAwpQEAAAcAEKYBAAC4AgAwpwEBAIYCACG5AQEAhgIAIcoBQACHAgAhzAEBAIYCACECwwEBAAAAAc4BAQAAAAEQAwAAsQIAIKQBAAC6AgAwpQEAAAMAEKYBAAC6AgAwpwEBAIYCACG5AQEAhgIAIcMBAQCGAgAhzQEBAIYCACHOAQEAhgIAIc8BAQCIAgAh0AEBAIgCACHRAQIAuwIAIdIBAQCIAgAh0wEBAIgCACHUAQEAiAIAIdUBAQCIAgAhCKwBAgAAAAGtAQIAAAAFrgECAAAABa8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIAgwIAIQAAAAAAAewBAQAAAAEB7AFAAAAAAQXsAQIAAAAB8gECAAAAAfMBAgAAAAH0AQIAAAAB9QECAAAAAQUYAADwAwAgGQAA8wMAIOkBAADxAwAg6gEAAPIDACDvAQAAqQEAIAMYAADwAwAg6QEAAPEDACDvAQAAqQEAIAAAAAAAAewBAAAAuAECBRgAAOgDACAZAADuAwAg6QEAAOkDACDqAQAA7QMAIO8BAAABACAFGAAA5gMAIBkAAOsDACDpAQAA5wMAIOoBAADqAwAg7wEAAKkBACADGAAA6AMAIOkBAADpAwAg7wEAAAEAIAMYAADmAwAg6QEAAOcDACDvAQAAqQEAIAAAAAAB7AEBAAAAAQHsASAAAAABCxgAAOQCADAZAADpAgAw6QEAAOUCADDqAQAA5gIAMOsBAADnAgAg7AEAAOgCADDtAQAA6AIAMO4BAADoAgAw7wEAAOgCADDwAQAA6gIAMPEBAADrAgAwCxgAANgCADAZAADdAgAw6QEAANkCADDqAQAA2gIAMOsBAADbAgAg7AEAANwCADDtAQAA3AIAMO4BAADcAgAw7wEAANwCADDwAQAA3gIAMPEBAADfAgAwBKcBAgAAAAGoAQEAAAABqQEBAAAAAaoBQAAAAAECAAAAEgAgGAAA4wIAIAMAAAASACAYAADjAgAgGQAA4gIAIAERAADlAwAwCgcAALQCACCkAQAAswIAMKUBAAAQABCmAQAAswIAMKcBAgAAAAGoAQEAAAABqQEBAIYCACGqAUAAhwIAIasBAQCGAgAh5AEAALICACACAAAAEgAgEQAA4gIAIAIAAADgAgAgEQAA4QIAIAikAQAA3wIAMKUBAADgAgAQpgEAAN8CADCnAQIAkgIAIagBAQCGAgAhqQEBAIYCACGqAUAAhwIAIasBAQCGAgAhCKQBAADfAgAwpQEAAOACABCmAQAA3wIAMKcBAgCSAgAhqAEBAIYCACGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACEEpwECAMMCACGoAQEAwQIAIakBAQDBAgAhqgFAAMICACEEpwECAMMCACGoAQEAwQIAIakBAQDBAgAhqgFAAMICACEEpwECAAAAAagBAQAAAAGpAQEAAAABqgFAAAAAAQQDAADOAgAgpwECAAAAAbgBAAAAuAECuQEBAAAAAQIAAAANACAYAADvAgAgAwAAAA0AIBgAAO8CACAZAADuAgAgAREAAOQDADAKAwAAsQIAIAcAALQCACCkAQAAtgIAMKUBAAALABCmAQAAtgIAMKcBAgAAAAGrAQEAhgIAIbgBAAC3ArgBIrkBAQCGAgAh5QEAALUCACACAAAADQAgEQAA7gIAIAIAAADsAgAgEQAA7QIAIAekAQAA6wIAMKUBAADsAgAQpgEAAOsCADCnAQIAkgIAIasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACEHpAEAAOsCADClAQAA7AIAEKYBAADrAgAwpwECAJICACGrAQEAhgIAIbgBAAC3ArgBIrkBAQCGAgAhA6cBAgDDAgAhuAEAAMsCuAEiuQEBAMECACEEAwAAzAIAIKcBAgDDAgAhuAEAAMsCuAEiuQEBAMECACEEAwAAzgIAIKcBAgAAAAG4AQAAALgBArkBAQAAAAEEGAAA5AIAMOkBAADlAgAw6wEAAOcCACDvAQAA6AIAMAQYAADYAgAw6QEAANkCADDrAQAA2wIAIO8BAADcAgAwAAAAAAAAAAHsAQAAAMMBAgUYAADfAwAgGQAA4gMAIOkBAADgAwAg6gEAAOEDACDvAQAAAQAgAxgAAN8DACDpAQAA4AMAIO8BAAABACAAAAAAAAAAAAAAAAUYAADaAwAgGQAA3QMAIOkBAADbAwAg6gEAANwDACDvAQAAAQAgAxgAANoDACDpAQAA2wMAIO8BAAABACAAAAAAAAXsAQIAAAAB8gECAAAAAfMBAgAAAAH0AQIAAAAB9QECAAAAAQUYAADVAwAgGQAA2AMAIOkBAADWAwAg6gEAANcDACDvAQAAAQAgAxgAANUDACDpAQAA1gMAIO8BAAABACAAAAAB7AFAAAAAAQHsAQAAANoBAgHsAQAAAMMBAwsYAAC8AwAwGQAAwQMAMOkBAAC9AwAw6gEAAL4DADDrAQAAvwMAIOwBAADAAwAw7QEAAMADADDuAQAAwAMAMO8BAADAAwAw8AEAAMIDADDxAQAAwwMAMAsYAACwAwAwGQAAtQMAMOkBAACxAwAw6gEAALIDADDrAQAAswMAIOwBAAC0AwAw7QEAALQDADDuAQAAtAMAMO8BAAC0AwAw8AEAALYDADDxAQAAtwMAMAsYAACnAwAwGQAAqwMAMOkBAACoAwAw6gEAAKkDADDrAQAAqgMAIOwBAADoAgAw7QEAAOgCADDuAQAA6AIAMO8BAADoAgAw8AEAAKwDADDxAQAA6wIAMAsYAACbAwAwGQAAoAMAMOkBAACcAwAw6gEAAJ0DADDrAQAAngMAIOwBAACfAwAw7QEAAJ8DADDuAQAAnwMAMO8BAACfAwAw8AEAAKEDADDxAQAAogMAMASnAQIAAAABqgFAAAAAAcMBAAAAwwECxAEBAAAAAQIAAAAYACAYAACmAwAgAwAAABgAIBgAAKYDACAZAAClAwAgAREAANQDADAJAwAAsQIAIKQBAACvAgAwpQEAABYAEKYBAACvAgAwpwECAAAAAaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQIAAAAYACARAAClAwAgAgAAAKMDACARAACkAwAgCKQBAACiAwAwpQEAAKMDABCmAQAAogMAMKcBAgCSAgAhqgFAAIcCACG5AQEAhgIAIcMBAACwAsMBIsQBAQCGAgAhCKQBAACiAwAwpQEAAKMDABCmAQAAogMAMKcBAgCSAgAhqgFAAIcCACG5AQEAhgIAIcMBAACwAsMBIsQBAQCGAgAhBKcBAgDDAgAhqgFAAMICACHDAQAA-QLDASLEAQEAwQIAIQSnAQIAwwIAIaoBQADCAgAhwwEAAPkCwwEixAEBAMECACEEpwECAAAAAaoBQAAAAAHDAQAAAMMBAsQBAQAAAAEEBwAAzwIAIKcBAgAAAAGrAQEAAAABuAEAAAC4AQICAAAADQAgGAAArwMAIAMAAAANACAYAACvAwAgGQAArgMAIAERAADTAwAwAgAAAA0AIBEAAK4DACACAAAA7AIAIBEAAK0DACADpwECAMMCACGrAQEAwQIAIbgBAADLArgBIgQHAADNAgAgpwECAMMCACGrAQEAwQIAIbgBAADLArgBIgQHAADPAgAgpwECAAAAAasBAQAAAAG4AQAAALgBAgOnAQEAAAABygFAAAAAAcwBAQAAAAECAAAACQAgGAAAuwMAIAMAAAAJACAYAAC7AwAgGQAAugMAIAERAADSAwAwCAMAALECACCkAQAAuAIAMKUBAAAHABCmAQAAuAIAMKcBAQAAAAG5AQEAhgIAIcoBQACHAgAhzAEBAAAAAQIAAAAJACARAAC6AwAgAgAAALgDACARAAC5AwAgB6QBAAC3AwAwpQEAALgDABCmAQAAtwMAMKcBAQCGAgAhuQEBAIYCACHKAUAAhwIAIcwBAQCGAgAhB6QBAAC3AwAwpQEAALgDABCmAQAAtwMAMKcBAQCGAgAhuQEBAIYCACHKAUAAhwIAIcwBAQCGAgAhA6cBAQDBAgAhygFAAMICACHMAQEAwQIAIQOnAQEAwQIAIcoBQADCAgAhzAEBAMECACEDpwEBAAAAAcoBQAAAAAHMAQEAAAABC6cBAQAAAAHDAQEAAAABzQEBAAAAAc4BAQAAAAHPAQEAAAAB0AEBAAAAAdEBAgAAAAHSAQEAAAAB0wEBAAAAAdQBAQAAAAHVAQEAAAABAgAAAAUAIBgAAMcDACADAAAABQAgGAAAxwMAIBkAAMYDACABEQAA0QMAMBEDAACxAgAgpAEAALoCADClAQAAAwAQpgEAALoCADCnAQEAAAABuQEBAIYCACHDAQEAhgIAIc0BAQCGAgAhzgEBAIYCACHPAQEAiAIAIdABAQCIAgAh0QECALsCACHSAQEAiAIAIdMBAQCIAgAh1AEBAIgCACHVAQEAiAIAIeYBAAC5AgAgAgAAAAUAIBEAAMYDACACAAAAxAMAIBEAAMUDACAPpAEAAMMDADClAQAAxAMAEKYBAADDAwAwpwEBAIYCACG5AQEAhgIAIcMBAQCGAgAhzQEBAIYCACHOAQEAhgIAIc8BAQCIAgAh0AEBAIgCACHRAQIAuwIAIdIBAQCIAgAh0wEBAIgCACHUAQEAiAIAIdUBAQCIAgAhD6QBAADDAwAwpQEAAMQDABCmAQAAwwMAMKcBAQCGAgAhuQEBAIYCACHDAQEAhgIAIc0BAQCGAgAhzgEBAIYCACHPAQEAiAIAIdABAQCIAgAh0QECALsCACHSAQEAiAIAIdMBAQCIAgAh1AEBAIgCACHVAQEAiAIAIQunAQEAwQIAIcMBAQDBAgAhzQEBAMECACHOAQEAwQIAIc8BAQDUAgAh0AEBANQCACHRAQIAjgMAIdIBAQDUAgAh0wEBANQCACHUAQEA1AIAIdUBAQDUAgAhC6cBAQDBAgAhwwEBAMECACHNAQEAwQIAIc4BAQDBAgAhzwEBANQCACHQAQEA1AIAIdEBAgCOAwAh0gEBANQCACHTAQEA1AIAIdQBAQDUAgAh1QEBANQCACELpwEBAAAAAcMBAQAAAAHNAQEAAAABzgEBAAAAAc8BAQAAAAHQAQEAAAAB0QECAAAAAdIBAQAAAAHTAQEAAAAB1AEBAAAAAdUBAQAAAAEEGAAAvAMAMOkBAAC9AwAw6wEAAL8DACDvAQAAwAMAMAQYAACwAwAw6QEAALEDADDrAQAAswMAIO8BAAC0AwAwBBgAAKcDADDpAQAAqAMAMOsBAACqAwAg7wEAAOgCADAEGAAAmwMAMOkBAACcAwAw6wEAAJ4DACDvAQAAnwMAMAAAAAoEAADMAwAgBQAAzQMAIAoAAPICACALAADOAwAg1gEAANACACDXAQAA0AIAINgBAADQAgAg2gEAANACACDcAQAA0AIAIN0BAADQAgAgBAYAAPICACAIAADzAgAgvAEAANACACC9AQAA0AIAIAunAQEAAAABwwEBAAAAAc0BAQAAAAHOAQEAAAABzwEBAAAAAdABAQAAAAHRAQIAAAAB0gEBAAAAAdMBAQAAAAHUAQEAAAAB1QEBAAAAAQOnAQEAAAABygFAAAAAAcwBAQAAAAEDpwECAAAAAasBAQAAAAG4AQAAALgBAgSnAQIAAAABqgFAAAAAAcMBAAAAwwECxAEBAAAAAQ4FAADJAwAgCgAAygMAIAsAAMsDACCnAQEAAAABqQEBAAAAAaoBQAAAAAG4AQAAANoBAtYBQAAAAAHXAQEAAAAB2AEBAAAAAdoBQAAAAAHbASAAAAAB3AEAAADDAQPdAYAAAAABAgAAAAEAIBgAANUDACADAAAAHwAgGAAA1QMAIBkAANkDACAQAAAAHwAgBQAAmAMAIAoAAJkDACALAACaAwAgEQAA2QMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABDgUAAJgDACAKAACZAwAgCwAAmgMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABDgQAAMgDACAKAADKAwAgCwAAywMAIKcBAQAAAAGpAQEAAAABqgFAAAAAAbgBAAAA2gEC1gFAAAAAAdcBAQAAAAHYAQEAAAAB2gFAAAAAAdsBIAAAAAHcAQAAAMMBA90BgAAAAAECAAAAAQAgGAAA2gMAIAMAAAAfACAYAADaAwAgGQAA3gMAIBAAAAAfACAEAACXAwAgCgAAmQMAIAsAAJoDACARAADeAwAgpwEBAMECACGpAQEAwQIAIaoBQADCAgAhuAEAAJUD2gEi1gFAAJQDACHXAQEA1AIAIdgBAQDUAgAh2gFAAJQDACHbASAA1QIAIdwBAACWA8MBI90BgAAAAAEOBAAAlwMAIAoAAJkDACALAACaAwAgpwEBAMECACGpAQEAwQIAIaoBQADCAgAhuAEAAJUD2gEi1gFAAJQDACHXAQEA1AIAIdgBAQDUAgAh2gFAAJQDACHbASAA1QIAIdwBAACWA8MBI90BgAAAAAEOBAAAyAMAIAUAAMkDACAKAADKAwAgpwEBAAAAAakBAQAAAAGqAUAAAAABuAEAAADaAQLWAUAAAAAB1wEBAAAAAdgBAQAAAAHaAUAAAAAB2wEgAAAAAdwBAAAAwwED3QGAAAAAAQIAAAABACAYAADfAwAgAwAAAB8AIBgAAN8DACAZAADjAwAgEAAAAB8AIAQAAJcDACAFAACYAwAgCgAAmQMAIBEAAOMDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQ4EAACXAwAgBQAAmAMAIAoAAJkDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQOnAQIAAAABuAEAAAC4AQK5AQEAAAABBKcBAgAAAAGoAQEAAAABqQEBAAAAAaoBQAAAAAEICAAA8QIAIKcBAQAAAAGqAUAAAAABugFAAAAAAbsBAQAAAAG8AQEAAAABvQEBAAAAAb4BIAAAAAECAAAAqQEAIBgAAOYDACAOBAAAyAMAIAUAAMkDACALAADLAwAgpwEBAAAAAakBAQAAAAGqAUAAAAABuAEAAADaAQLWAUAAAAAB1wEBAAAAAdgBAQAAAAHaAUAAAAAB2wEgAAAAAdwBAAAAwwED3QGAAAAAAQIAAAABACAYAADoAwAgAwAAAKwBACAYAADmAwAgGQAA7AMAIAoAAACsAQAgCAAA1wIAIBEAAOwDACCnAQEAwQIAIaoBQADCAgAhugFAAMICACG7AQEAwQIAIbwBAQDUAgAhvQEBANQCACG-ASAA1QIAIQgIAADXAgAgpwEBAMECACGqAUAAwgIAIboBQADCAgAhuwEBAMECACG8AQEA1AIAIb0BAQDUAgAhvgEgANUCACEDAAAAHwAgGAAA6AMAIBkAAO8DACAQAAAAHwAgBAAAlwMAIAUAAJgDACALAACaAwAgEQAA7wMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABDgQAAJcDACAFAACYAwAgCwAAmgMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABCAYAAPACACCnAQEAAAABqgFAAAAAAboBQAAAAAG7AQEAAAABvAEBAAAAAb0BAQAAAAG-ASAAAAABAgAAAKkBACAYAADwAwAgAwAAAKwBACAYAADwAwAgGQAA9AMAIAoAAACsAQAgBgAA1gIAIBEAAPQDACCnAQEAwQIAIaoBQADCAgAhugFAAMICACG7AQEAwQIAIbwBAQDUAgAhvQEBANQCACG-ASAA1QIAIQgGAADWAgAgpwEBAMECACGqAUAAwgIAIboBQADCAgAhuwEBAMECACG8AQEA1AIAIb0BAQDUAgAhvgEgANUCACEFBAYCBQoDCQAJCg4ECxkIAQMAAQEDAAECAwABBwAFAwYPBAgTBgkABwEHAAUCBhQACBUAAQMAAQQEGgAFGwAKHAALHQAAAAADCQAOHgAPHwAQAAAAAwkADh4ADx8AEAEDAAEBAwABBQkAFR4AGB8AGTAAFjEAFwAAAAAABQkAFR4AGB8AGTAAFjEAFwEDAAEBAwABAwkAHh4AHx8AIAAAAAMJAB4eAB8fACAAAAADCQAmHgAnHwAoAAAAAwkAJh4AJx8AKAAAAAUJAC4eADEfADIwAC8xADAAAAAAAAUJAC4eADEfADIwAC8xADABAwABAQMAAQUJADceADofADswADgxADkAAAAAAAUJADceADofADswADgxADkAAAMJAEAeAEEfAEIAAAADCQBAHgBBHwBCAgMAAQcABQIDAAEHAAUFCQBHHgBKHwBLMABIMQBJAAAAAAAFCQBHHgBKHwBLMABIMQBJAQcABQEHAAUFCQBQHgBTHwBUMABRMQBSAAAAAAAFCQBQHgBTHwBUMABRMQBSDAIBDR4BDiEBDyIBECMBEiUBEycKFCgLFSoBFiwKFy0MGi4BGy8BHDAKIDMNITQRIjUCIzYCJDcCJTgCJjkCJzsCKD0KKT4SKkACK0IKLEMTLUQCLkUCL0YKMkkUM0oaNEsDNUwDNk0DN04DOE8DOVEDOlMKO1QbPFYDPVgKPlkcP1oDQFsDQVwKQl8dQ2AhRGIiRWMiRmYiR2ciSGgiSWoiSmwKS20jTG8iTXEKTnIkT3MiUHQiUXUKUnglU3kpVHsqVXwqVn8qV4ABKliBASpZgwEqWoUBCluGAStciAEqXYoBCl6LASxfjAEqYI0BKmGOAQpikQEtY5IBM2STAQhllAEIZpUBCGeWAQholwEIaZkBCGqbAQprnAE0bJ4BCG2gAQpuoQE1b6IBCHCjAQhxpAEKcqcBNnOoATx0qgEFdasBBXauAQV3rwEFeLABBXmyAQV6tAEKe7UBPXy3AQV9uQEKfroBPn-7AQWAAbwBBYEBvQEKggHAAT-DAcEBQ4QBwgEEhQHDAQSGAcQBBIcBxQEEiAHGAQSJAcgBBIoBygEKiwHLAUSMAc0BBI0BzwEKjgHQAUWPAdEBBJAB0gEEkQHTAQqSAdYBRpMB1wFMlAHYAQaVAdkBBpYB2gEGlwHbAQaYAdwBBpkB3gEGmgHgAQqbAeEBTZwB4wEGnQHlAQqeAeYBTp8B5wEGoAHoAQahAekBCqIB7AFPowHtAVU"
+  graph: "9ANVkAESBAAArAIAIAUAAK0CACAKAACKAgAgCwAArgIAIKQBAACnAgAwpQEAAB8AEKYBAACnAgAwpwEBAAAAAakBAQAAAAGqAUAAhwIAIbgBAACpAtoBItYBQACoAgAh1wEBAIgCACHYAQEAiAIAIdoBQACoAgAh2wEgAIkCACHcAQAAqgLDASPdAQAAqwIAIAEAAAABACAQAwAAsQIAIKQBAAC6AgAwpQEAAAMAEKYBAAC6AgAwpwEBAIYCACG5AQEAhgIAIcMBAQCGAgAhzQEBAIYCACHOAQEAhgIAIc8BAQCIAgAh0AEBAIgCACHRAQIAuwIAIdIBAQCIAgAh0wEBAIgCACHUAQEAiAIAIdUBAQCIAgAhCAMAAM8DACDPAQAA0AIAINABAADQAgAg0QEAANACACDSAQAA0AIAINMBAADQAgAg1AEAANACACDVAQAA0AIAIBEDAACxAgAgpAEAALoCADClAQAAAwAQpgEAALoCADCnAQEAAAABuQEBAIYCACHDAQEAhgIAIc0BAQCGAgAhzgEBAIYCACHPAQEAiAIAIdABAQCIAgAh0QECALsCACHSAQEAiAIAIdMBAQCIAgAh1AEBAIgCACHVAQEAiAIAIeYBAAC5AgAgAwAAAAMAIAEAAAQAMAIAAAUAIAgDAACxAgAgpAEAALgCADClAQAABwAQpgEAALgCADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQEDAADPAwAgCAMAALECACCkAQAAuAIAMKUBAAAHABCmAQAAuAIAMKcBAQAAAAG5AQEAhgIAIcoBQACHAgAhzAEBAAAAAQMAAAAHACABAAAIADACAAAJACAJAwAAsQIAIAcAALQCACCkAQAAtgIAMKUBAAALABCmAQAAtgIAMKcBAgCSAgAhqwEBAIYCACG4AQAAtwK4ASK5AQEAhgIAIQIDAADPAwAgBwAA0AMAIAoDAACxAgAgBwAAtAIAIKQBAAC2AgAwpQEAAAsAEKYBAAC2AgAwpwECAAAAAasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACHlAQAAtQIAIAMAAAALACABAAAMADACAAANACADAAAACwAgAQAADAAwAgAADQAgCQcAALQCACCkAQAAswIAMKUBAAAQABCmAQAAswIAMKcBAgCSAgAhqAEBAIYCACGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACEBBwAA0AMAIAoHAAC0AgAgpAEAALMCADClAQAAEAAQpgEAALMCADCnAQIAAAABqAEBAAAAAakBAQCGAgAhqgFAAIcCACGrAQEAhgIAIeQBAACyAgAgAwAAABAAIAEAABEAMAIAABIAIAEAAAALACABAAAAEAAgCQMAALECACCkAQAArwIAMKUBAAAWABCmAQAArwIAMKcBAgCSAgAhqgFAAIcCACG5AQEAhgIAIcMBAACwAsMBIsQBAQCGAgAhAQMAAM8DACAJAwAAsQIAIKQBAACvAgAwpQEAABYAEKYBAACvAgAwpwECAAAAAaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAAAABAwAAABYAIAEAABcAMAIAABgAIAEAAAADACABAAAABwAgAQAAAAsAIAEAAAAWACABAAAAAQAgEgQAAKwCACAFAACtAgAgCgAAigIAIAsAAK4CACCkAQAApwIAMKUBAAAfABCmAQAApwIAMKcBAQCGAgAhqQEBAIYCACGqAUAAhwIAIbgBAACpAtoBItYBQACoAgAh1wEBAIgCACHYAQEAiAIAIdoBQACoAgAh2wEgAIkCACHcAQAAqgLDASPdAQAAqwIAIAoEAADMAwAgBQAAzQMAIAoAAPICACALAADOAwAg1gEAANACACDXAQAA0AIAINgBAADQAgAg2gEAANACACDcAQAA0AIAIN0BAADQAgAgAwAAAB8AIAEAACAAMAIAAAEAIAMAAAAfACABAAAgADACAAABACADAAAAHwAgAQAAIAAwAgAAAQAgDwQAAMgDACAFAADJAwAgCgAAygMAIAsAAMsDACCnAQEAAAABqQEBAAAAAaoBQAAAAAG4AQAAANoBAtYBQAAAAAHXAQEAAAAB2AEBAAAAAdoBQAAAAAHbASAAAAAB3AEAAADDAQPdAYAAAAABAREAACQAIAunAQEAAAABqQEBAAAAAaoBQAAAAAG4AQAAANoBAtYBQAAAAAHXAQEAAAAB2AEBAAAAAdoBQAAAAAHbASAAAAAB3AEAAADDAQPdAYAAAAABAREAACYAMAERAAAmADAPBAAAlwMAIAUAAJgDACAKAACZAwAgCwAAmgMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABAgAAAAEAIBEAACkAIAunAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQIAAAAfACARAAArACACAAAAHwAgEQAAKwAgAwAAAAEAIBgAACQAIBkAACkAIAEAAAABACABAAAAHwAgCQkAAJEDACAeAACTAwAgHwAAkgMAINYBAADQAgAg1wEAANACACDYAQAA0AIAINoBAADQAgAg3AEAANACACDdAQAA0AIAIA6kAQAAmwIAMKUBAAAyABCmAQAAmwIAMKcBAQDwAQAhqQEBAPABACGqAUAA8QEAIbgBAACdAtoBItYBQACcAgAh1wEBAP4BACHYAQEA_gEAIdoBQACcAgAh2wEgAP8BACHcAQAAngLDASPdAQAAnwIAIAMAAAAfACABAAAxADAdAAAyACADAAAAHwAgAQAAIAAwAgAAAQAgAQAAAAUAIAEAAAAFACADAAAAAwAgAQAABAAwAgAABQAgAwAAAAMAIAEAAAQAMAIAAAUAIAMAAAADACABAAAEADACAAAFACANAwAAkAMAIKcBAQAAAAG5AQEAAAABwwEBAAAAAc0BAQAAAAHOAQEAAAABzwEBAAAAAdABAQAAAAHRAQIAAAAB0gEBAAAAAdMBAQAAAAHUAQEAAAAB1QEBAAAAAQERAAA6ACAMpwEBAAAAAbkBAQAAAAHDAQEAAAABzQEBAAAAAc4BAQAAAAHPAQEAAAAB0AEBAAAAAdEBAgAAAAHSAQEAAAAB0wEBAAAAAdQBAQAAAAHVAQEAAAABAREAADwAMAERAAA8ADANAwAAjwMAIKcBAQDBAgAhuQEBAMECACHDAQEAwQIAIc0BAQDBAgAhzgEBAMECACHPAQEA1AIAIdABAQDUAgAh0QECAI4DACHSAQEA1AIAIdMBAQDUAgAh1AEBANQCACHVAQEA1AIAIQIAAAAFACARAAA_ACAMpwEBAMECACG5AQEAwQIAIcMBAQDBAgAhzQEBAMECACHOAQEAwQIAIc8BAQDUAgAh0AEBANQCACHRAQIAjgMAIdIBAQDUAgAh0wEBANQCACHUAQEA1AIAIdUBAQDUAgAhAgAAAAMAIBEAAEEAIAIAAAADACARAABBACADAAAABQAgGAAAOgAgGQAAPwAgAQAAAAUAIAEAAAADACAMCQAAiQMAIB4AAIwDACAfAACLAwAgMAAAigMAIDEAAI0DACDPAQAA0AIAINABAADQAgAg0QEAANACACDSAQAA0AIAINMBAADQAgAg1AEAANACACDVAQAA0AIAIA-kAQAAlwIAMKUBAABIABCmAQAAlwIAMKcBAQDwAQAhuQEBAPABACHDAQEA8AEAIc0BAQDwAQAhzgEBAPABACHPAQEA_gEAIdABAQD-AQAh0QECAJgCACHSAQEA_gEAIdMBAQD-AQAh1AEBAP4BACHVAQEA_gEAIQMAAAADACABAABHADAdAABIACADAAAAAwAgAQAABAAwAgAABQAgAQAAAAkAIAEAAAAJACADAAAABwAgAQAACAAwAgAACQAgAwAAAAcAIAEAAAgAMAIAAAkAIAMAAAAHACABAAAIADACAAAJACAFAwAAiAMAIKcBAQAAAAG5AQEAAAABygFAAAAAAcwBAQAAAAEBEQAAUAAgBKcBAQAAAAG5AQEAAAABygFAAAAAAcwBAQAAAAEBEQAAUgAwAREAAFIAMAUDAACHAwAgpwEBAMECACG5AQEAwQIAIcoBQADCAgAhzAEBAMECACECAAAACQAgEQAAVQAgBKcBAQDBAgAhuQEBAMECACHKAUAAwgIAIcwBAQDBAgAhAgAAAAcAIBEAAFcAIAIAAAAHACARAABXACADAAAACQAgGAAAUAAgGQAAVQAgAQAAAAkAIAEAAAAHACADCQAAhAMAIB4AAIYDACAfAACFAwAgB6QBAACWAgAwpQEAAF4AEKYBAACWAgAwpwEBAPABACG5AQEA8AEAIcoBQADxAQAhzAEBAPABACEDAAAABwAgAQAAXQAwHQAAXgAgAwAAAAcAIAEAAAgAMAIAAAkAIAekAQAAlAIAMKUBAABkABCmAQAAlAIAMKgBAQAAAAHJAQEAhgIAIcoBQACHAgAhywEAAJUCACABAAAAYQAgAQAAAGEAIAakAQAAlAIAMKUBAABkABCmAQAAlAIAMKgBAQCGAgAhyQEBAIYCACHKAUAAhwIAIQADAAAAZAAgAQAAZQAwAgAAYQAgAwAAAGQAIAEAAGUAMAIAAGEAIAMAAABkACABAABlADACAABhACADqAEBAAAAAckBAQAAAAHKAUAAAAABAREAAGkAIAOoAQEAAAAByQEBAAAAAcoBQAAAAAEBEQAAawAwAREAAGsAMAOoAQEAwQIAIckBAQDBAgAhygFAAMICACECAAAAYQAgEQAAbgAgA6gBAQDBAgAhyQEBAMECACHKAUAAwgIAIQIAAABkACARAABwACACAAAAZAAgEQAAcAAgAwAAAGEAIBgAAGkAIBkAAG4AIAEAAABhACABAAAAZAAgAwkAAIEDACAeAACDAwAgHwAAggMAIAakAQAAkwIAMKUBAAB3ABCmAQAAkwIAMKgBAQDwAQAhyQEBAPABACHKAUAA8QEAIQMAAABkACABAAB2ADAdAAB3ACADAAAAZAAgAQAAZQAwAgAAYQAgCqQBAACRAgAwpQEAAH0AEKYBAACRAgAwpwECAAAAAakBAQCGAgAhqgFAAIcCACHFAQEAAAABxgFAAIcCACHHAQEAiAIAIcgBAQCIAgAhAQAAAHoAIAEAAAB6ACAKpAEAAJECADClAQAAfQAQpgEAAJECADCnAQIAkgIAIakBAQCGAgAhqgFAAIcCACHFAQEAhgIAIcYBQACHAgAhxwEBAIgCACHIAQEAiAIAIQLHAQAA0AIAIMgBAADQAgAgAwAAAH0AIAEAAH4AMAIAAHoAIAMAAAB9ACABAAB-ADACAAB6ACADAAAAfQAgAQAAfgAwAgAAegAgB6cBAgAAAAGpAQEAAAABqgFAAAAAAcUBAQAAAAHGAUAAAAABxwEBAAAAAcgBAQAAAAEBEQAAggEAIAenAQIAAAABqQEBAAAAAaoBQAAAAAHFAQEAAAABxgFAAAAAAccBAQAAAAHIAQEAAAABAREAAIQBADABEQAAhAEAMAenAQIAwwIAIakBAQDBAgAhqgFAAMICACHFAQEAwQIAIcYBQADCAgAhxwEBANQCACHIAQEA1AIAIQIAAAB6ACARAACHAQAgB6cBAgDDAgAhqQEBAMECACGqAUAAwgIAIcUBAQDBAgAhxgFAAMICACHHAQEA1AIAIcgBAQDUAgAhAgAAAH0AIBEAAIkBACACAAAAfQAgEQAAiQEAIAMAAAB6ACAYAACCAQAgGQAAhwEAIAEAAAB6ACABAAAAfQAgBwkAAPwCACAeAAD_AgAgHwAA_gIAIDAAAP0CACAxAACAAwAgxwEAANACACDIAQAA0AIAIAqkAQAAkAIAMKUBAACQAQAQpgEAAJACADCnAQIA7wEAIakBAQDwAQAhqgFAAPEBACHFAQEA8AEAIcYBQADxAQAhxwEBAP4BACHIAQEA_gEAIQMAAAB9ACABAACPAQAwHQAAkAEAIAMAAAB9ACABAAB-ADACAAB6ACABAAAAGAAgAQAAABgAIAMAAAAWACABAAAXADACAAAYACADAAAAFgAgAQAAFwAwAgAAGAAgAwAAABYAIAEAABcAMAIAABgAIAYDAAD7AgAgpwECAAAAAaoBQAAAAAG5AQEAAAABwwEAAADDAQLEAQEAAAABAREAAJgBACAFpwECAAAAAaoBQAAAAAG5AQEAAAABwwEAAADDAQLEAQEAAAABAREAAJoBADABEQAAmgEAMAYDAAD6AgAgpwECAMMCACGqAUAAwgIAIbkBAQDBAgAhwwEAAPkCwwEixAEBAMECACECAAAAGAAgEQAAnQEAIAWnAQIAwwIAIaoBQADCAgAhuQEBAMECACHDAQAA-QLDASLEAQEAwQIAIQIAAAAWACARAACfAQAgAgAAABYAIBEAAJ8BACADAAAAGAAgGAAAmAEAIBkAAJ0BACABAAAAGAAgAQAAABYAIAUJAAD0AgAgHgAA9wIAIB8AAPYCACAwAAD1AgAgMQAA-AIAIAikAQAAjAIAMKUBAACmAQAQpgEAAIwCADCnAQIA7wEAIaoBQADxAQAhuQEBAPABACHDAQAAjQLDASLEAQEA8AEAIQMAAAAWACABAAClAQAwHQAApgEAIAMAAAAWACABAAAXADACAAAYACAMBgAAigIAIAgAAIsCACCkAQAAhQIAMKUBAACsAQAQpgEAAIUCADCnAQEAAAABqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAhAQAAAKkBACABAAAAqQEAIAwGAACKAgAgCAAAiwIAIKQBAACFAgAwpQEAAKwBABCmAQAAhQIAMKcBAQCGAgAhqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAhBAYAAPICACAIAADzAgAgvAEAANACACC9AQAA0AIAIAMAAACsAQAgAQAArQEAMAIAAKkBACADAAAArAEAIAEAAK0BADACAACpAQAgAwAAAKwBACABAACtAQAwAgAAqQEAIAkGAADwAgAgCAAA8QIAIKcBAQAAAAGqAUAAAAABugFAAAAAAbsBAQAAAAG8AQEAAAABvQEBAAAAAb4BIAAAAAEBEQAAsQEAIAenAQEAAAABqgFAAAAAAboBQAAAAAG7AQEAAAABvAEBAAAAAb0BAQAAAAG-ASAAAAABAREAALMBADABEQAAswEAMAkGAADWAgAgCAAA1wIAIKcBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhAgAAAKkBACARAAC2AQAgB6cBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhAgAAAKwBACARAAC4AQAgAgAAAKwBACARAAC4AQAgAwAAAKkBACAYAACxAQAgGQAAtgEAIAEAAACpAQAgAQAAAKwBACAFCQAA0QIAIB4AANMCACAfAADSAgAgvAEAANACACC9AQAA0AIAIAqkAQAA_QEAMKUBAAC_AQAQpgEAAP0BADCnAQEA8AEAIaoBQADxAQAhugFAAPEBACG7AQEA8AEAIbwBAQD-AQAhvQEBAP4BACG-ASAA_wEAIQMAAACsAQAgAQAAvgEAMB0AAL8BACADAAAArAEAIAEAAK0BADACAACpAQAgAQAAAA0AIAEAAAANACADAAAACwAgAQAADAAwAgAADQAgAwAAAAsAIAEAAAwAMAIAAA0AIAMAAAALACABAAAMADACAAANACAGAwAAzgIAIAcAAM8CACCnAQIAAAABqwEBAAAAAbgBAAAAuAECuQEBAAAAAQERAADHAQAgBKcBAgAAAAGrAQEAAAABuAEAAAC4AQK5AQEAAAABAREAAMkBADABEQAAyQEAMAYDAADMAgAgBwAAzQIAIKcBAgDDAgAhqwEBAMECACG4AQAAywK4ASK5AQEAwQIAIQIAAAANACARAADMAQAgBKcBAgDDAgAhqwEBAMECACG4AQAAywK4ASK5AQEAwQIAIQIAAAALACARAADOAQAgAgAAAAsAIBEAAM4BACADAAAADQAgGAAAxwEAIBkAAMwBACABAAAADQAgAQAAAAsAIAUJAADGAgAgHgAAyQIAIB8AAMgCACAwAADHAgAgMQAAygIAIAekAQAA-QEAMKUBAADVAQAQpgEAAPkBADCnAQIA7wEAIasBAQDwAQAhuAEAAPoBuAEiuQEBAPABACEDAAAACwAgAQAA1AEAMB0AANUBACADAAAACwAgAQAADAAwAgAADQAgAQAAABIAIAEAAAASACADAAAAEAAgAQAAEQAwAgAAEgAgAwAAABAAIAEAABEAMAIAABIAIAMAAAAQACABAAARADACAAASACAGBwAAxQIAIKcBAgAAAAGoAQEAAAABqQEBAAAAAaoBQAAAAAGrAQEAAAABAREAAN0BACAFpwECAAAAAagBAQAAAAGpAQEAAAABqgFAAAAAAasBAQAAAAEBEQAA3wEAMAERAADfAQAwBgcAAMQCACCnAQIAwwIAIagBAQDBAgAhqQEBAMECACGqAUAAwgIAIasBAQDBAgAhAgAAABIAIBEAAOIBACAFpwECAMMCACGoAQEAwQIAIakBAQDBAgAhqgFAAMICACGrAQEAwQIAIQIAAAAQACARAADkAQAgAgAAABAAIBEAAOQBACADAAAAEgAgGAAA3QEAIBkAAOIBACABAAAAEgAgAQAAABAAIAUJAAC8AgAgHgAAvwIAIB8AAL4CACAwAAC9AgAgMQAAwAIAIAikAQAA7gEAMKUBAADrAQAQpgEAAO4BADCnAQIA7wEAIagBAQDwAQAhqQEBAPABACGqAUAA8QEAIasBAQDwAQAhAwAAABAAIAEAAOoBADAdAADrAQAgAwAAABAAIAEAABEAMAIAABIAIAikAQAA7gEAMKUBAADrAQAQpgEAAO4BADCnAQIA7wEAIagBAQDwAQAhqQEBAPABACGqAUAA8QEAIasBAQDwAQAhDQkAAPMBACAeAADzAQAgHwAA8wEAIDAAAPgBACAxAADzAQAgrAECAAAAAa0BAgAAAASuAQIAAAAErwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgD3AQAhDgkAAPMBACAeAAD2AQAgHwAA9gEAIKwBAQAAAAGtAQEAAAAErgEBAAAABK8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEA9QEAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQsJAADzAQAgHgAA9AEAIB8AAPQBACCsAUAAAAABrQFAAAAABK4BQAAAAASvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAPIBACELCQAA8wEAIB4AAPQBACAfAAD0AQAgrAFAAAAAAa0BQAAAAASuAUAAAAAErwFAAAAAAbABQAAAAAGxAUAAAAABsgFAAAAAAbMBQADyAQAhCKwBAgAAAAGtAQIAAAAErgECAAAABK8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIA8wEAIQisAUAAAAABrQFAAAAABK4BQAAAAASvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAPQBACEOCQAA8wEAIB4AAPYBACAfAAD2AQAgrAEBAAAAAa0BAQAAAASuAQEAAAAErwEBAAAAAbABAQAAAAGxAQEAAAABsgEBAAAAAbMBAQD1AQAhtAEBAAAAAbUBAQAAAAG2AQEAAAABC6wBAQAAAAGtAQEAAAAErgEBAAAABK8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEA9gEAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQ0JAADzAQAgHgAA8wEAIB8AAPMBACAwAAD4AQAgMQAA8wEAIKwBAgAAAAGtAQIAAAAErgECAAAABK8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIA9wEAIQisAQgAAAABrQEIAAAABK4BCAAAAASvAQgAAAABsAEIAAAAAbEBCAAAAAGyAQgAAAABswEIAPgBACEHpAEAAPkBADClAQAA1QEAEKYBAAD5AQAwpwECAO8BACGrAQEA8AEAIbgBAAD6AbgBIrkBAQDwAQAhBwkAAPMBACAeAAD8AQAgHwAA_AEAIKwBAAAAuAECrQEAAAC4AQiuAQAAALgBCLMBAAD7AbgBIgcJAADzAQAgHgAA_AEAIB8AAPwBACCsAQAAALgBAq0BAAAAuAEIrgEAAAC4AQizAQAA-wG4ASIErAEAAAC4AQKtAQAAALgBCK4BAAAAuAEIswEAAPwBuAEiCqQBAAD9AQAwpQEAAL8BABCmAQAA_QEAMKcBAQDwAQAhqgFAAPEBACG6AUAA8QEAIbsBAQDwAQAhvAEBAP4BACG9AQEA_gEAIb4BIAD_AQAhDgkAAIMCACAeAACEAgAgHwAAhAIAIKwBAQAAAAGtAQEAAAAFrgEBAAAABa8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEAggIAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQUJAADzAQAgHgAAgQIAIB8AAIECACCsASAAAAABswEgAIACACEFCQAA8wEAIB4AAIECACAfAACBAgAgrAEgAAAAAbMBIACAAgAhAqwBIAAAAAGzASAAgQIAIQ4JAACDAgAgHgAAhAIAIB8AAIQCACCsAQEAAAABrQEBAAAABa4BAQAAAAWvAQEAAAABsAEBAAAAAbEBAQAAAAGyAQEAAAABswEBAIICACG0AQEAAAABtQEBAAAAAbYBAQAAAAEIrAECAAAAAa0BAgAAAAWuAQIAAAAFrwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgCDAgAhC6wBAQAAAAGtAQEAAAAFrgEBAAAABa8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEAhAIAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQwGAACKAgAgCAAAiwIAIKQBAACFAgAwpQEAAKwBABCmAQAAhQIAMKcBAQCGAgAhqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAhC6wBAQAAAAGtAQEAAAAErgEBAAAABK8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEA9gEAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQisAUAAAAABrQFAAAAABK4BQAAAAASvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAPQBACELrAEBAAAAAa0BAQAAAAWuAQEAAAAFrwEBAAAAAbABAQAAAAGxAQEAAAABsgEBAAAAAbMBAQCEAgAhtAEBAAAAAbUBAQAAAAG2AQEAAAABAqwBIAAAAAGzASAAgQIAIQO_AQAACwAgwAEAAAsAIMEBAAALACADvwEAABAAIMABAAAQACDBAQAAEAAgCKQBAACMAgAwpQEAAKYBABCmAQAAjAIAMKcBAgDvAQAhqgFAAPEBACG5AQEA8AEAIcMBAACNAsMBIsQBAQDwAQAhBwkAAPMBACAeAACPAgAgHwAAjwIAIKwBAAAAwwECrQEAAADDAQiuAQAAAMMBCLMBAACOAsMBIgcJAADzAQAgHgAAjwIAIB8AAI8CACCsAQAAAMMBAq0BAAAAwwEIrgEAAADDAQizAQAAjgLDASIErAEAAADDAQKtAQAAAMMBCK4BAAAAwwEIswEAAI8CwwEiCqQBAACQAgAwpQEAAJABABCmAQAAkAIAMKcBAgDvAQAhqQEBAPABACGqAUAA8QEAIcUBAQDwAQAhxgFAAPEBACHHAQEA_gEAIcgBAQD-AQAhCqQBAACRAgAwpQEAAH0AEKYBAACRAgAwpwECAJICACGpAQEAhgIAIaoBQACHAgAhxQEBAIYCACHGAUAAhwIAIccBAQCIAgAhyAEBAIgCACEIrAECAAAAAa0BAgAAAASuAQIAAAAErwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgDzAQAhBqQBAACTAgAwpQEAAHcAEKYBAACTAgAwqAEBAPABACHJAQEA8AEAIcoBQADxAQAhBqQBAACUAgAwpQEAAGQAEKYBAACUAgAwqAEBAIYCACHJAQEAhgIAIcoBQACHAgAhAqgBAQAAAAHJAQEAAAABB6QBAACWAgAwpQEAAF4AEKYBAACWAgAwpwEBAPABACG5AQEA8AEAIcoBQADxAQAhzAEBAPABACEPpAEAAJcCADClAQAASAAQpgEAAJcCADCnAQEA8AEAIbkBAQDwAQAhwwEBAPABACHNAQEA8AEAIc4BAQDwAQAhzwEBAP4BACHQAQEA_gEAIdEBAgCYAgAh0gEBAP4BACHTAQEA_gEAIdQBAQD-AQAh1QEBAP4BACENCQAAgwIAIB4AAIMCACAfAACDAgAgMAAAmgIAIDEAAIMCACCsAQIAAAABrQECAAAABa4BAgAAAAWvAQIAAAABsAECAAAAAbEBAgAAAAGyAQIAAAABswECAJkCACENCQAAgwIAIB4AAIMCACAfAACDAgAgMAAAmgIAIDEAAIMCACCsAQIAAAABrQECAAAABa4BAgAAAAWvAQIAAAABsAECAAAAAbEBAgAAAAGyAQIAAAABswECAJkCACEIrAEIAAAAAa0BCAAAAAWuAQgAAAAFrwEIAAAAAbABCAAAAAGxAQgAAAABsgEIAAAAAbMBCACaAgAhDqQBAACbAgAwpQEAADIAEKYBAACbAgAwpwEBAPABACGpAQEA8AEAIaoBQADxAQAhuAEAAJ0C2gEi1gFAAJwCACHXAQEA_gEAIdgBAQD-AQAh2gFAAJwCACHbASAA_wEAIdwBAACeAsMBI90BAACfAgAgCwkAAIMCACAeAACmAgAgHwAApgIAIKwBQAAAAAGtAUAAAAAFrgFAAAAABa8BQAAAAAGwAUAAAAABsQFAAAAAAbIBQAAAAAGzAUAApQIAIQcJAADzAQAgHgAApAIAIB8AAKQCACCsAQAAANoBAq0BAAAA2gEIrgEAAADaAQizAQAAowLaASIHCQAAgwIAIB4AAKICACAfAACiAgAgrAEAAADDAQOtAQAAAMMBCa4BAAAAwwEJswEAAKECwwEjDwkAAIMCACAeAACgAgAgHwAAoAIAIKwBgAAAAAGvAYAAAAABsAGAAAAAAbEBgAAAAAGyAYAAAAABswGAAAAAAd4BAQAAAAHfAQEAAAAB4AEBAAAAAeEBgAAAAAHiAYAAAAAB4wGAAAAAAQysAYAAAAABrwGAAAAAAbABgAAAAAGxAYAAAAABsgGAAAAAAbMBgAAAAAHeAQEAAAAB3wEBAAAAAeABAQAAAAHhAYAAAAAB4gGAAAAAAeMBgAAAAAEHCQAAgwIAIB4AAKICACAfAACiAgAgrAEAAADDAQOtAQAAAMMBCa4BAAAAwwEJswEAAKECwwEjBKwBAAAAwwEDrQEAAADDAQmuAQAAAMMBCbMBAACiAsMBIwcJAADzAQAgHgAApAIAIB8AAKQCACCsAQAAANoBAq0BAAAA2gEIrgEAAADaAQizAQAAowLaASIErAEAAADaAQKtAQAAANoBCK4BAAAA2gEIswEAAKQC2gEiCwkAAIMCACAeAACmAgAgHwAApgIAIKwBQAAAAAGtAUAAAAAFrgFAAAAABa8BQAAAAAGwAUAAAAABsQFAAAAAAbIBQAAAAAGzAUAApQIAIQisAUAAAAABrQFAAAAABa4BQAAAAAWvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAKYCACESBAAArAIAIAUAAK0CACAKAACKAgAgCwAArgIAIKQBAACnAgAwpQEAAB8AEKYBAACnAgAwpwEBAIYCACGpAQEAhgIAIaoBQACHAgAhuAEAAKkC2gEi1gFAAKgCACHXAQEAiAIAIdgBAQCIAgAh2gFAAKgCACHbASAAiQIAIdwBAACqAsMBI90BAACrAgAgCKwBQAAAAAGtAUAAAAAFrgFAAAAABa8BQAAAAAGwAUAAAAABsQFAAAAAAbIBQAAAAAGzAUAApgIAIQSsAQAAANoBAq0BAAAA2gEIrgEAAADaAQizAQAApALaASIErAEAAADDAQOtAQAAAMMBCa4BAAAAwwEJswEAAKICwwEjDKwBgAAAAAGvAYAAAAABsAGAAAAAAbEBgAAAAAGyAYAAAAABswGAAAAAAd4BAQAAAAHfAQEAAAAB4AEBAAAAAeEBgAAAAAHiAYAAAAAB4wGAAAAAAQO_AQAAAwAgwAEAAAMAIMEBAAADACADvwEAAAcAIMABAAAHACDBAQAABwAgA78BAAAWACDAAQAAFgAgwQEAABYAIAkDAACxAgAgpAEAAK8CADClAQAAFgAQpgEAAK8CADCnAQIAkgIAIaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQSsAQAAAMMBAq0BAAAAwwEIrgEAAADDAQizAQAAjwLDASIUBAAArAIAIAUAAK0CACAKAACKAgAgCwAArgIAIKQBAACnAgAwpQEAAB8AEKYBAACnAgAwpwEBAIYCACGpAQEAhgIAIaoBQACHAgAhuAEAAKkC2gEi1gFAAKgCACHXAQEAiAIAIdgBAQCIAgAh2gFAAKgCACHbASAAiQIAIdwBAACqAsMBI90BAACrAgAg5wEAAB8AIOgBAAAfACACqQEBAAAAAasBAQAAAAEJBwAAtAIAIKQBAACzAgAwpQEAABAAEKYBAACzAgAwpwECAJICACGoAQEAhgIAIakBAQCGAgAhqgFAAIcCACGrAQEAhgIAIQ4GAACKAgAgCAAAiwIAIKQBAACFAgAwpQEAAKwBABCmAQAAhQIAMKcBAQCGAgAhqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAh5wEAAKwBACDoAQAArAEAIAKrAQEAAAABuQEBAAAAAQkDAACxAgAgBwAAtAIAIKQBAAC2AgAwpQEAAAsAEKYBAAC2AgAwpwECAJICACGrAQEAhgIAIbgBAAC3ArgBIrkBAQCGAgAhBKwBAAAAuAECrQEAAAC4AQiuAQAAALgBCLMBAAD8AbgBIggDAACxAgAgpAEAALgCADClAQAABwAQpgEAALgCADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQLDAQEAAAABzgEBAAAAARADAACxAgAgpAEAALoCADClAQAAAwAQpgEAALoCADCnAQEAhgIAIbkBAQCGAgAhwwEBAIYCACHNAQEAhgIAIc4BAQCGAgAhzwEBAIgCACHQAQEAiAIAIdEBAgC7AgAh0gEBAIgCACHTAQEAiAIAIdQBAQCIAgAh1QEBAIgCACEIrAECAAAAAa0BAgAAAAWuAQIAAAAFrwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgCDAgAhAAAAAAAB7AEBAAAAAQHsAUAAAAABBewBAgAAAAHyAQIAAAAB8wECAAAAAfQBAgAAAAH1AQIAAAABBRgAAPADACAZAADzAwAg6QEAAPEDACDqAQAA8gMAIO8BAACpAQAgAxgAAPADACDpAQAA8QMAIO8BAACpAQAgAAAAAAAB7AEAAAC4AQIFGAAA6AMAIBkAAO4DACDpAQAA6QMAIOoBAADtAwAg7wEAAAEAIAUYAADmAwAgGQAA6wMAIOkBAADnAwAg6gEAAOoDACDvAQAAqQEAIAMYAADoAwAg6QEAAOkDACDvAQAAAQAgAxgAAOYDACDpAQAA5wMAIO8BAACpAQAgAAAAAAHsAQEAAAABAewBIAAAAAELGAAA5AIAMBkAAOkCADDpAQAA5QIAMOoBAADmAgAw6wEAAOcCACDsAQAA6AIAMO0BAADoAgAw7gEAAOgCADDvAQAA6AIAMPABAADqAgAw8QEAAOsCADALGAAA2AIAMBkAAN0CADDpAQAA2QIAMOoBAADaAgAw6wEAANsCACDsAQAA3AIAMO0BAADcAgAw7gEAANwCADDvAQAA3AIAMPABAADeAgAw8QEAAN8CADAEpwECAAAAAagBAQAAAAGpAQEAAAABqgFAAAAAAQIAAAASACAYAADjAgAgAwAAABIAIBgAAOMCACAZAADiAgAgAREAAOUDADAKBwAAtAIAIKQBAACzAgAwpQEAABAAEKYBAACzAgAwpwECAAAAAagBAQAAAAGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACHkAQAAsgIAIAIAAAASACARAADiAgAgAgAAAOACACARAADhAgAgCKQBAADfAgAwpQEAAOACABCmAQAA3wIAMKcBAgCSAgAhqAEBAIYCACGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACEIpAEAAN8CADClAQAA4AIAEKYBAADfAgAwpwECAJICACGoAQEAhgIAIakBAQCGAgAhqgFAAIcCACGrAQEAhgIAIQSnAQIAwwIAIagBAQDBAgAhqQEBAMECACGqAUAAwgIAIQSnAQIAwwIAIagBAQDBAgAhqQEBAMECACGqAUAAwgIAIQSnAQIAAAABqAEBAAAAAakBAQAAAAGqAUAAAAABBAMAAM4CACCnAQIAAAABuAEAAAC4AQK5AQEAAAABAgAAAA0AIBgAAO8CACADAAAADQAgGAAA7wIAIBkAAO4CACABEQAA5AMAMAoDAACxAgAgBwAAtAIAIKQBAAC2AgAwpQEAAAsAEKYBAAC2AgAwpwECAAAAAasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACHlAQAAtQIAIAIAAAANACARAADuAgAgAgAAAOwCACARAADtAgAgB6QBAADrAgAwpQEAAOwCABCmAQAA6wIAMKcBAgCSAgAhqwEBAIYCACG4AQAAtwK4ASK5AQEAhgIAIQekAQAA6wIAMKUBAADsAgAQpgEAAOsCADCnAQIAkgIAIasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACEDpwECAMMCACG4AQAAywK4ASK5AQEAwQIAIQQDAADMAgAgpwECAMMCACG4AQAAywK4ASK5AQEAwQIAIQQDAADOAgAgpwECAAAAAbgBAAAAuAECuQEBAAAAAQQYAADkAgAw6QEAAOUCADDrAQAA5wIAIO8BAADoAgAwBBgAANgCADDpAQAA2QIAMOsBAADbAgAg7wEAANwCADAAAAAAAAAAAewBAAAAwwECBRgAAN8DACAZAADiAwAg6QEAAOADACDqAQAA4QMAIO8BAAABACADGAAA3wMAIOkBAADgAwAg7wEAAAEAIAAAAAAAAAAAAAAABRgAANoDACAZAADdAwAg6QEAANsDACDqAQAA3AMAIO8BAAABACADGAAA2gMAIOkBAADbAwAg7wEAAAEAIAAAAAAABewBAgAAAAHyAQIAAAAB8wECAAAAAfQBAgAAAAH1AQIAAAABBRgAANUDACAZAADYAwAg6QEAANYDACDqAQAA1wMAIO8BAAABACADGAAA1QMAIOkBAADWAwAg7wEAAAEAIAAAAAHsAUAAAAABAewBAAAA2gECAewBAAAAwwEDCxgAALwDADAZAADBAwAw6QEAAL0DADDqAQAAvgMAMOsBAAC_AwAg7AEAAMADADDtAQAAwAMAMO4BAADAAwAw7wEAAMADADDwAQAAwgMAMPEBAADDAwAwCxgAALADADAZAAC1AwAw6QEAALEDADDqAQAAsgMAMOsBAACzAwAg7AEAALQDADDtAQAAtAMAMO4BAAC0AwAw7wEAALQDADDwAQAAtgMAMPEBAAC3AwAwCxgAAKcDADAZAACrAwAw6QEAAKgDADDqAQAAqQMAMOsBAACqAwAg7AEAAOgCADDtAQAA6AIAMO4BAADoAgAw7wEAAOgCADDwAQAArAMAMPEBAADrAgAwCxgAAJsDADAZAACgAwAw6QEAAJwDADDqAQAAnQMAMOsBAACeAwAg7AEAAJ8DADDtAQAAnwMAMO4BAACfAwAw7wEAAJ8DADDwAQAAoQMAMPEBAACiAwAwBKcBAgAAAAGqAUAAAAABwwEAAADDAQLEAQEAAAABAgAAABgAIBgAAKYDACADAAAAGAAgGAAApgMAIBkAAKUDACABEQAA1AMAMAkDAACxAgAgpAEAAK8CADClAQAAFgAQpgEAAK8CADCnAQIAAAABqgFAAIcCACG5AQEAhgIAIcMBAACwAsMBIsQBAQAAAAECAAAAGAAgEQAApQMAIAIAAACjAwAgEQAApAMAIAikAQAAogMAMKUBAACjAwAQpgEAAKIDADCnAQIAkgIAIaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQikAQAAogMAMKUBAACjAwAQpgEAAKIDADCnAQIAkgIAIaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQSnAQIAwwIAIaoBQADCAgAhwwEAAPkCwwEixAEBAMECACEEpwECAMMCACGqAUAAwgIAIcMBAAD5AsMBIsQBAQDBAgAhBKcBAgAAAAGqAUAAAAABwwEAAADDAQLEAQEAAAABBAcAAM8CACCnAQIAAAABqwEBAAAAAbgBAAAAuAECAgAAAA0AIBgAAK8DACADAAAADQAgGAAArwMAIBkAAK4DACABEQAA0wMAMAIAAAANACARAACuAwAgAgAAAOwCACARAACtAwAgA6cBAgDDAgAhqwEBAMECACG4AQAAywK4ASIEBwAAzQIAIKcBAgDDAgAhqwEBAMECACG4AQAAywK4ASIEBwAAzwIAIKcBAgAAAAGrAQEAAAABuAEAAAC4AQIDpwEBAAAAAcoBQAAAAAHMAQEAAAABAgAAAAkAIBgAALsDACADAAAACQAgGAAAuwMAIBkAALoDACABEQAA0gMAMAgDAACxAgAgpAEAALgCADClAQAABwAQpgEAALgCADCnAQEAAAABuQEBAIYCACHKAUAAhwIAIcwBAQAAAAECAAAACQAgEQAAugMAIAIAAAC4AwAgEQAAuQMAIAekAQAAtwMAMKUBAAC4AwAQpgEAALcDADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQekAQAAtwMAMKUBAAC4AwAQpgEAALcDADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQOnAQEAwQIAIcoBQADCAgAhzAEBAMECACEDpwEBAMECACHKAUAAwgIAIcwBAQDBAgAhA6cBAQAAAAHKAUAAAAABzAEBAAAAAQunAQEAAAABwwEBAAAAAc0BAQAAAAHOAQEAAAABzwEBAAAAAdABAQAAAAHRAQIAAAAB0gEBAAAAAdMBAQAAAAHUAQEAAAAB1QEBAAAAAQIAAAAFACAYAADHAwAgAwAAAAUAIBgAAMcDACAZAADGAwAgAREAANEDADARAwAAsQIAIKQBAAC6AgAwpQEAAAMAEKYBAAC6AgAwpwEBAAAAAbkBAQCGAgAhwwEBAIYCACHNAQEAhgIAIc4BAQCGAgAhzwEBAIgCACHQAQEAiAIAIdEBAgC7AgAh0gEBAIgCACHTAQEAiAIAIdQBAQCIAgAh1QEBAIgCACHmAQAAuQIAIAIAAAAFACARAADGAwAgAgAAAMQDACARAADFAwAgD6QBAADDAwAwpQEAAMQDABCmAQAAwwMAMKcBAQCGAgAhuQEBAIYCACHDAQEAhgIAIc0BAQCGAgAhzgEBAIYCACHPAQEAiAIAIdABAQCIAgAh0QECALsCACHSAQEAiAIAIdMBAQCIAgAh1AEBAIgCACHVAQEAiAIAIQ-kAQAAwwMAMKUBAADEAwAQpgEAAMMDADCnAQEAhgIAIbkBAQCGAgAhwwEBAIYCACHNAQEAhgIAIc4BAQCGAgAhzwEBAIgCACHQAQEAiAIAIdEBAgC7AgAh0gEBAIgCACHTAQEAiAIAIdQBAQCIAgAh1QEBAIgCACELpwEBAMECACHDAQEAwQIAIc0BAQDBAgAhzgEBAMECACHPAQEA1AIAIdABAQDUAgAh0QECAI4DACHSAQEA1AIAIdMBAQDUAgAh1AEBANQCACHVAQEA1AIAIQunAQEAwQIAIcMBAQDBAgAhzQEBAMECACHOAQEAwQIAIc8BAQDUAgAh0AEBANQCACHRAQIAjgMAIdIBAQDUAgAh0wEBANQCACHUAQEA1AIAIdUBAQDUAgAhC6cBAQAAAAHDAQEAAAABzQEBAAAAAc4BAQAAAAHPAQEAAAAB0AEBAAAAAdEBAgAAAAHSAQEAAAAB0wEBAAAAAdQBAQAAAAHVAQEAAAABBBgAALwDADDpAQAAvQMAMOsBAAC_AwAg7wEAAMADADAEGAAAsAMAMOkBAACxAwAw6wEAALMDACDvAQAAtAMAMAQYAACnAwAw6QEAAKgDADDrAQAAqgMAIO8BAADoAgAwBBgAAJsDADDpAQAAnAMAMOsBAACeAwAg7wEAAJ8DADAAAAAKBAAAzAMAIAUAAM0DACAKAADyAgAgCwAAzgMAINYBAADQAgAg1wEAANACACDYAQAA0AIAINoBAADQAgAg3AEAANACACDdAQAA0AIAIAQGAADyAgAgCAAA8wIAILwBAADQAgAgvQEAANACACALpwEBAAAAAcMBAQAAAAHNAQEAAAABzgEBAAAAAc8BAQAAAAHQAQEAAAAB0QECAAAAAdIBAQAAAAHTAQEAAAAB1AEBAAAAAdUBAQAAAAEDpwEBAAAAAcoBQAAAAAHMAQEAAAABA6cBAgAAAAGrAQEAAAABuAEAAAC4AQIEpwECAAAAAaoBQAAAAAHDAQAAAMMBAsQBAQAAAAEOBQAAyQMAIAoAAMoDACALAADLAwAgpwEBAAAAAakBAQAAAAGqAUAAAAABuAEAAADaAQLWAUAAAAAB1wEBAAAAAdgBAQAAAAHaAUAAAAAB2wEgAAAAAdwBAAAAwwED3QGAAAAAAQIAAAABACAYAADVAwAgAwAAAB8AIBgAANUDACAZAADZAwAgEAAAAB8AIAUAAJgDACAKAACZAwAgCwAAmgMAIBEAANkDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQ4FAACYAwAgCgAAmQMAIAsAAJoDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQ4EAADIAwAgCgAAygMAIAsAAMsDACCnAQEAAAABqQEBAAAAAaoBQAAAAAG4AQAAANoBAtYBQAAAAAHXAQEAAAAB2AEBAAAAAdoBQAAAAAHbASAAAAAB3AEAAADDAQPdAYAAAAABAgAAAAEAIBgAANoDACADAAAAHwAgGAAA2gMAIBkAAN4DACAQAAAAHwAgBAAAlwMAIAoAAJkDACALAACaAwAgEQAA3gMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABDgQAAJcDACAKAACZAwAgCwAAmgMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABDgQAAMgDACAFAADJAwAgCgAAygMAIKcBAQAAAAGpAQEAAAABqgFAAAAAAbgBAAAA2gEC1gFAAAAAAdcBAQAAAAHYAQEAAAAB2gFAAAAAAdsBIAAAAAHcAQAAAMMBA90BgAAAAAECAAAAAQAgGAAA3wMAIAMAAAAfACAYAADfAwAgGQAA4wMAIBAAAAAfACAEAACXAwAgBQAAmAMAIAoAAJkDACARAADjAwAgpwEBAMECACGpAQEAwQIAIaoBQADCAgAhuAEAAJUD2gEi1gFAAJQDACHXAQEA1AIAIdgBAQDUAgAh2gFAAJQDACHbASAA1QIAIdwBAACWA8MBI90BgAAAAAEOBAAAlwMAIAUAAJgDACAKAACZAwAgpwEBAMECACGpAQEAwQIAIaoBQADCAgAhuAEAAJUD2gEi1gFAAJQDACHXAQEA1AIAIdgBAQDUAgAh2gFAAJQDACHbASAA1QIAIdwBAACWA8MBI90BgAAAAAEDpwECAAAAAbgBAAAAuAECuQEBAAAAAQSnAQIAAAABqAEBAAAAAakBAQAAAAGqAUAAAAABCAgAAPECACCnAQEAAAABqgFAAAAAAboBQAAAAAG7AQEAAAABvAEBAAAAAb0BAQAAAAG-ASAAAAABAgAAAKkBACAYAADmAwAgDgQAAMgDACAFAADJAwAgCwAAywMAIKcBAQAAAAGpAQEAAAABqgFAAAAAAbgBAAAA2gEC1gFAAAAAAdcBAQAAAAHYAQEAAAAB2gFAAAAAAdsBIAAAAAHcAQAAAMMBA90BgAAAAAECAAAAAQAgGAAA6AMAIAMAAACsAQAgGAAA5gMAIBkAAOwDACAKAAAArAEAIAgAANcCACARAADsAwAgpwEBAMECACGqAUAAwgIAIboBQADCAgAhuwEBAMECACG8AQEA1AIAIb0BAQDUAgAhvgEgANUCACEICAAA1wIAIKcBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhAwAAAB8AIBgAAOgDACAZAADvAwAgEAAAAB8AIAQAAJcDACAFAACYAwAgCwAAmgMAIBEAAO8DACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQ4EAACXAwAgBQAAmAMAIAsAAJoDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQgGAADwAgAgpwEBAAAAAaoBQAAAAAG6AUAAAAABuwEBAAAAAbwBAQAAAAG9AQEAAAABvgEgAAAAAQIAAACpAQAgGAAA8AMAIAMAAACsAQAgGAAA8AMAIBkAAPQDACAKAAAArAEAIAYAANYCACARAAD0AwAgpwEBAMECACGqAUAAwgIAIboBQADCAgAhuwEBAMECACG8AQEA1AIAIb0BAQDUAgAhvgEgANUCACEIBgAA1gIAIKcBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhBQQGAgUKAwkACQoOBAsZCAEDAAEBAwABAgMAAQcABQMGDwQIEwYJAAcBBwAFAgYUAAgVAAEDAAEEBBoABRsAChwACx0AAAAAAwkADh4ADx8AEAAAAAMJAA4eAA8fABABAwABAQMAAQUJABUeABgfABkwABYxABcAAAAAAAUJABUeABgfABkwABYxABcBAwABAQMAAQMJAB4eAB8fACAAAAADCQAeHgAfHwAgAAAAAwkAJh4AJx8AKAAAAAMJACYeACcfACgAAAAFCQAuHgAxHwAyMAAvMQAwAAAAAAAFCQAuHgAxHwAyMAAvMQAwAQMAAQEDAAEFCQA3HgA6HwA7MAA4MQA5AAAAAAAFCQA3HgA6HwA7MAA4MQA5AAADCQBAHgBBHwBCAAAAAwkAQB4AQR8AQgIDAAEHAAUCAwABBwAFBQkARx4ASh8ASzAASDEASQAAAAAABQkARx4ASh8ASzAASDEASQEHAAUBBwAFBQkAUB4AUx8AVDAAUTEAUgAAAAAABQkAUB4AUx8AVDAAUTEAUgwCAQ0eAQ4hAQ8iARAjARIlARMnChQoCxUqARYsChctDBouARsvARwwCiAzDSE0ESI1AiM2AiQ3AiU4AiY5Aic7Aig9Cik-EipAAitCCixDEy1EAi5FAi9GCjJJFDNKGjRLAzVMAzZNAzdOAzhPAzlRAzpTCjtUGzxWAz1YCj5ZHD9aA0BbA0FcCkJfHUNgIURiIkVjIkZmIkdnIkhoIklqIkpsCkttI0xvIk1xCk5yJE9zIlB0IlF1ClJ4JVN5KVR7KlV8KlZ_KleAASpYgQEqWYMBKlqFAQpbhgErXIgBKl2KAQpeiwEsX4wBKmCNASphjgEKYpEBLWOSATNkkwEIZZQBCGaVAQhnlgEIaJcBCGmZAQhqmwEKa5wBNGyeAQhtoAEKbqEBNW-iAQhwowEIcaQBCnKnATZzqAE8dKoBBXWrAQV2rgEFd68BBXiwAQV5sgEFerQBCnu1AT18twEFfbkBCn66AT5_uwEFgAG8AQWBAb0BCoIBwAE_gwHBAUOEAcIBBIUBwwEEhgHEAQSHAcUBBIgBxgEEiQHIAQSKAcoBCosBywFEjAHNAQSNAc8BCo4B0AFFjwHRAQSQAdIBBJEB0wEKkgHWAUaTAdcBTJQB2AEGlQHZAQaWAdoBBpcB2wEGmAHcAQaZAd4BBpoB4AEKmwHhAU2cAeMBBp0B5QEKngHmAU6fAecBBqAB6AEGoQHpAQqiAewBT6MB7QFV"
 }
 
 async function decodeBase64AsWasm(wasmBase64: string): Promise<WebAssembly.Module> {
diff --git a/src/generated/client/models/Transaction.ts b/src/generated/client/models/Transaction.ts
index 1ef403af..218aa370 100644
--- a/src/generated/client/models/Transaction.ts
+++ b/src/generated/client/models/Transaction.ts
@@ -230,15 +230,15 @@ export type TransactionOrderByWithRelationInput = {
 
 export type TransactionWhereUniqueInput = Prisma.AtLeast<{
   id?: number
+  transactionId?: string
   AND?: Prisma.TransactionWhereInput | Prisma.TransactionWhereInput[]
   OR?: Prisma.TransactionWhereInput[]
   NOT?: Prisma.TransactionWhereInput | Prisma.TransactionWhereInput[]
   userId?: Prisma.StringFilter<"Transaction"> | string
   provider?: Prisma.EnumSubscriptionProviderFilter<"Transaction"> | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFilter<"Transaction"> | string
   createdAt?: Prisma.DateTimeFilter<"Transaction"> | Date | string
   user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-}, "id">
+}, "id" | "transactionId">
 
 export type TransactionOrderByWithAggregationInput = {
   id?: Prisma.SortOrder
diff --git a/src/server/repository/transaction-repository.ts b/src/server/repository/transaction-repository.ts
index 15797cf4..14c56e32 100644
--- a/src/server/repository/transaction-repository.ts
+++ b/src/server/repository/transaction-repository.ts
@@ -1,3 +1,4 @@
+import { SubscriptionProvider } from "../../generated/client/client";
 import prisma from "../db";
 
 export class TransactionRepository {
@@ -23,4 +24,19 @@ export class TransactionRepository {
             where: { createdAt: { gte: since } },
         });
     }
+
+    findByTransactionId(transactionId: string) {
+        return prisma.transaction.findFirst({
+            where: { transactionId },
+            select: { userId: true },
+        });
+    }
+
+    createIfNotExists(userId: string, provider: SubscriptionProvider, transactionId: string) {
+        return prisma.transaction.upsert({
+            where: { transactionId },
+            update: {},
+            create: { userId, provider, transactionId },
+        });
+    }
 }
diff --git a/src/server/service/transaction-service.ts b/src/server/service/transaction-service.ts
index d2eb42c7..5df0863f 100644
--- a/src/server/service/transaction-service.ts
+++ b/src/server/service/transaction-service.ts
@@ -1,3 +1,4 @@
+import { SubscriptionProvider } from "../../generated/client/client";
 import { TransactionRepository } from "../repository/transaction-repository";
 
 const repository = new TransactionRepository();
@@ -13,3 +14,15 @@ export const countTransactionsByUser = async (userId: string) => {
 export const countTransactionsSince = async (since: Date) => {
     return repository.countSince(since);
 };
+
+export const findUserByTransactionId = async (transactionId: string) => {
+    return repository.findByTransactionId(transactionId);
+};
+
+export const createTransactionIfNotExists = async (
+    userId: string,
+    provider: SubscriptionProvider,
+    transactionId: string,
+) => {
+    return repository.createIfNotExists(userId, provider, transactionId);
+};

From ebb241a87832fbf236947f130483473667f89a8b Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 27 Apr 2026 17:47:15 +0200
Subject: [PATCH 22/76] refreshed database

---
 .../migration.sql                                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename prisma/migrations/{20260424202833_init => 20260427154325_init}/migration.sql (98%)

diff --git a/prisma/migrations/20260424202833_init/migration.sql b/prisma/migrations/20260427154325_init/migration.sql
similarity index 98%
rename from prisma/migrations/20260424202833_init/migration.sql
rename to prisma/migrations/20260427154325_init/migration.sql
index ffa93ccf..ab2cadfb 100644
--- a/prisma/migrations/20260424202833_init/migration.sql
+++ b/prisma/migrations/20260427154325_init/migration.sql
@@ -139,10 +139,10 @@ CREATE UNIQUE INDEX "MagicLinkToken_tokenHash_key" ON "MagicLinkToken"("tokenHas
 CREATE INDEX "MagicLinkToken_email_createdAt_idx" ON "MagicLinkToken"("email", "createdAt");
 
 -- CreateIndex
-CREATE INDEX "Transaction_userId_idx" ON "Transaction"("userId");
+CREATE UNIQUE INDEX "Transaction_transactionId_key" ON "Transaction"("transactionId");
 
 -- CreateIndex
-CREATE INDEX "Transaction_transactionId_idx" ON "Transaction"("transactionId");
+CREATE INDEX "Transaction_userId_idx" ON "Transaction"("userId");
 
 -- CreateIndex
 CREATE UNIQUE INDEX "ProjectMember_userId_projectId_key" ON "ProjectMember"("userId", "projectId");

From 76c155ec1c6c57c5dd15bab897c2ce6f443217f1 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 27 Apr 2026 18:30:29 +0200
Subject: [PATCH 23/76] fixed proxy

---
 src/proxy.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/proxy.ts b/src/proxy.ts
index c56bcdb1..f9635ab9 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -1,5 +1,6 @@
 import { getToken } from "next-auth/jwt";
 import { NextRequest, NextResponse } from "next/server";
+import { getWebSessionCookie } from "@src/lib/auth-cookies";
 
 // Routes that handle their own auth or are intentionally public
 const PUBLIC_API_PREFIXES = [
@@ -31,7 +32,8 @@ export async function proxy(request: NextRequest) {
         return NextResponse.next();
     }
 
-    const token = await getToken({ req: request, secret: process.env.AUTH_SECRET });
+    const { name: cookieName } = getWebSessionCookie();
+    const token = await getToken({ req: request, secret: process.env.AUTH_SECRET, cookieName });
 
     // Admin pages: proxy only checks authentication.
     // Role enforcement happens in src/app/admin/layout.tsx via auth(), which runs the

From f10eed6d268550a12d3933a44df57c404c8df579 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 27 Apr 2026 19:44:00 +0200
Subject: [PATCH 24/76] refactored authentication and deleted generated/client
 folder from prisma

---
 .gitignore                                    |    3 +-
 package-lock.json                             |  124 +-
 src/app/api/auth/magic-link/verify/route.ts   |   34 +-
 src/app/api/desktop/token/route.ts            |   36 +-
 src/auth.ts                                   |    5 +-
 src/generated/client/browser.ts               |   64 -
 src/generated/client/client.ts                |   88 -
 src/generated/client/commonInputTypes.ts      |  617 -----
 src/generated/client/enums.ts                 |   35 -
 src/generated/client/internal/class.ts        |  284 ---
 .../client/internal/prismaNamespace.ts        | 1563 -------------
 .../client/internal/prismaNamespaceBrowser.ts |  232 --
 src/generated/client/models.ts                |   20 -
 src/generated/client/models/Account.ts        | 1648 --------------
 src/generated/client/models/MagicLinkToken.ts | 1254 -----------
 src/generated/client/models/Project.ts        | 1513 -------------
 .../client/models/ProjectInvitation.ts        | 1390 ------------
 src/generated/client/models/ProjectMember.ts  | 1471 ------------
 src/generated/client/models/Session.ts        | 1310 -----------
 src/generated/client/models/Transaction.ts    | 1388 ------------
 src/generated/client/models/User.ts           | 1979 -----------------
 .../client/models/VerificationToken.ts        | 1099 ---------
 src/lib/api-client.ts                         |   69 +
 src/lib/auth-cookies.ts                       |   33 -
 src/lib/auth-tokens.ts                        |   71 +
 src/lib/fetcher.ts                            |   94 +-
 src/lib/session.ts                            |    2 +-
 src/lib/utils/requests.ts                     |   41 +-
 src/proxy.ts                                  |   42 +-
 29 files changed, 291 insertions(+), 16218 deletions(-)
 delete mode 100644 src/generated/client/browser.ts
 delete mode 100644 src/generated/client/client.ts
 delete mode 100644 src/generated/client/commonInputTypes.ts
 delete mode 100644 src/generated/client/enums.ts
 delete mode 100644 src/generated/client/internal/class.ts
 delete mode 100644 src/generated/client/internal/prismaNamespace.ts
 delete mode 100644 src/generated/client/internal/prismaNamespaceBrowser.ts
 delete mode 100644 src/generated/client/models.ts
 delete mode 100644 src/generated/client/models/Account.ts
 delete mode 100644 src/generated/client/models/MagicLinkToken.ts
 delete mode 100644 src/generated/client/models/Project.ts
 delete mode 100644 src/generated/client/models/ProjectInvitation.ts
 delete mode 100644 src/generated/client/models/ProjectMember.ts
 delete mode 100644 src/generated/client/models/Session.ts
 delete mode 100644 src/generated/client/models/Transaction.ts
 delete mode 100644 src/generated/client/models/User.ts
 delete mode 100644 src/generated/client/models/VerificationToken.ts
 create mode 100644 src/lib/api-client.ts
 delete mode 100644 src/lib/auth-cookies.ts
 create mode 100644 src/lib/auth-tokens.ts

diff --git a/.gitignore b/.gitignore
index d3c18813..a2ee5728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 .pnp.js
 
 # collaboration
-/src/lib/collaboration/node_modules
+/src/lib/cloud/node_modules
 .wrangler/
 
 # testing
@@ -21,6 +21,7 @@ next-env.d.ts
 # production
 /build
 /target
+/src/generated
 
 # misc
 .DS_Store
diff --git a/package-lock.json b/package-lock.json
index 8ff438d4..2b2ac927 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1192,6 +1192,7 @@
             "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
             "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
                 "@babel/generator": "^7.28.5",
@@ -3033,7 +3034,8 @@
             "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20260210.0.tgz",
             "integrity": "sha512-zHaF0RZVYUQwNCJCECnNAJdMur72Lk3FMiD6wU78Dx3Bv7DQRcuXNmPNuJmsGnosVZCcWintHlPTQ/4BEiDG5w==",
             "dev": true,
-            "license": "MIT OR Apache-2.0"
+            "license": "MIT OR Apache-2.0",
+            "peer": true
         },
         "node_modules/@cspotcode/source-map-support": {
             "version": "0.8.1",
@@ -3064,7 +3066,8 @@
             "resolved": "https://registry.npmjs.org/@electric-sql/pglite/-/pglite-0.4.1.tgz",
             "integrity": "sha512-mZ9NzzUSYPOCnxHH1oAHPRzoMFJHY472raDKwXl/+6oPbpdJ7g8LsCN4FSaIIfkiCKHhb3iF/Zqo3NYxaIhU7Q==",
             "devOptional": true,
-            "license": "Apache-2.0"
+            "license": "Apache-2.0",
+            "peer": true
         },
         "node_modules/@electric-sql/pglite-socket": {
             "version": "0.1.1",
@@ -3105,6 +3108,7 @@
             "version": "1.7.1",
             "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
             "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==",
+            "dev": true,
             "license": "MIT",
             "optional": true,
             "dependencies": {
@@ -3763,17 +3767,6 @@
                 "@floating-ui/utils": "^0.2.11"
             }
         },
-        "node_modules/@floating-ui/dom": {
-            "version": "1.7.6",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
-            "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "@floating-ui/core": "^1.7.5",
-                "@floating-ui/utils": "^0.2.11"
-            }
-        },
         "node_modules/@floating-ui/utils": {
             "version": "0.2.11",
             "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
@@ -4019,6 +4012,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4041,6 +4035,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4063,6 +4058,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4079,6 +4075,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4095,6 +4092,7 @@
             "cpu": [
                 "arm"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4111,6 +4109,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4127,6 +4126,7 @@
             "cpu": [
                 "ppc64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4143,6 +4143,7 @@
             "cpu": [
                 "riscv64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4159,6 +4160,7 @@
             "cpu": [
                 "s390x"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4175,6 +4177,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4191,6 +4194,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4207,6 +4211,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4223,6 +4228,7 @@
             "cpu": [
                 "arm"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4245,6 +4251,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4267,6 +4274,7 @@
             "cpu": [
                 "ppc64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4289,6 +4297,7 @@
             "cpu": [
                 "riscv64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4311,6 +4320,7 @@
             "cpu": [
                 "s390x"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4333,6 +4343,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4355,6 +4366,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4377,6 +4389,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4399,6 +4412,7 @@
             "cpu": [
                 "wasm32"
             ],
+            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
             "optional": true,
             "dependencies": {
@@ -4418,6 +4432,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4437,6 +4452,7 @@
             "cpu": [
                 "ia32"
             ],
+            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4456,6 +4472,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -5371,6 +5388,7 @@
             "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz",
             "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
             "license": "Apache-2.0",
+            "peer": true,
             "engines": {
                 "node": ">=8.0.0"
             }
@@ -5763,6 +5781,7 @@
             "resolved": "https://registry.npmjs.org/@prisma/client/-/client-7.7.0.tgz",
             "integrity": "sha512-5Ar4OsZpJ54s21sy5oDNNW9gQtd4NuxCaiM7+JDTOU07D6VvlpLjYzAVCMB1+JzokN+08dAVomlx+b7bhJd3ww==",
             "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
                 "@prisma/client-runtime-utils": "7.7.0"
             },
@@ -6145,8 +6164,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
             "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
             "version": "4.60.0",
@@ -7429,6 +7447,7 @@
             "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz",
             "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@babel/core": "^7.21.3",
                 "@svgr/babel-preset": "8.1.0",
@@ -8391,15 +8410,13 @@
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
             "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/@types/markdown-it": {
             "version": "14.1.2",
             "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
             "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@types/linkify-it": "^5",
                 "@types/mdurl": "^2"
@@ -8409,14 +8426,14 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
             "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/@types/node": {
             "version": "20.11.0",
             "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
             "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "undici-types": "~5.26.4"
             }
@@ -8508,6 +8525,7 @@
             "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz",
             "integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/prop-types": "*",
                 "csstype": "^3.2.2"
@@ -8518,6 +8536,7 @@
             "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
             "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
             "license": "MIT",
+            "peer": true,
             "peerDependencies": {
                 "@types/react": "^18.0.0"
             }
@@ -8577,6 +8596,7 @@
             "integrity": "sha512-hM5faZwg7aVNa819m/5r7D0h0c9yC4DUlWAOvHAtISdFTc8xB86VmX5Xqabrama3wIPJ/q9RbGS1worb6JfnMg==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@typescript-eslint/scope-manager": "8.50.1",
                 "@typescript-eslint/types": "8.50.1",
@@ -9262,6 +9282,7 @@
             "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -9774,6 +9795,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "baseline-browser-mapping": "^2.9.0",
                 "caniuse-lite": "^1.0.30001759",
@@ -9999,6 +10021,7 @@
             "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
             "integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@kurkle/color": "^0.3.0"
             },
@@ -10265,8 +10288,7 @@
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
             "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/cross-env": {
             "version": "7.0.3",
@@ -11171,6 +11193,7 @@
             "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
@@ -11369,6 +11392,7 @@
             "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@rtsao/scc": "^1.1.0",
                 "array-includes": "^3.1.9",
@@ -12601,6 +12625,7 @@
             "integrity": "sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==",
             "devOptional": true,
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=16.9.0"
             }
@@ -13457,6 +13482,7 @@
             "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
             "devOptional": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "jiti": "lib/jiti-cli.mjs"
             }
@@ -13775,7 +13801,6 @@
             "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
             "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "uc.micro": "^2.0.0"
             }
@@ -14008,7 +14033,6 @@
             "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
             "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "argparse": "^2.0.1",
                 "entities": "^4.4.0",
@@ -14041,8 +14065,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
             "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/mediaquery-text": {
             "version": "1.2.0",
@@ -14328,6 +14351,7 @@
             "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz",
             "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@next/env": "16.1.6",
                 "@swc/helpers": "0.5.15",
@@ -14556,6 +14580,7 @@
             "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.12.tgz",
             "integrity": "sha512-H+rnK5bX2Pi/6ms3sN4/jRQvYSMltV6vqup/0SFOrxYYY/qoNvhXPlYq3e+Pm9RFJRwrMGbMIwi81M4dxpomhA==",
             "license": "MIT-0",
+            "peer": true,
             "engines": {
                 "node": ">=6.0.0"
             }
@@ -14835,8 +14860,7 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz",
             "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/own-keys": {
             "version": "1.0.1",
@@ -15197,6 +15221,7 @@
             "resolved": "https://registry.npmjs.org/pg/-/pg-8.20.0.tgz",
             "integrity": "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "pg-connection-string": "^2.12.0",
                 "pg-pool": "^3.13.0",
@@ -15460,6 +15485,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.6",
                 "picocolors": "^1.0.0",
@@ -15613,6 +15639,7 @@
             "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.3.tgz",
             "integrity": "sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==",
             "license": "MIT",
+            "peer": true,
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/preact"
@@ -15679,6 +15706,7 @@
             "devOptional": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
                 "@prisma/config": "7.7.0",
                 "@prisma/dev": "0.24.3",
@@ -15765,7 +15793,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.1.tgz",
             "integrity": "sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-transform": "^1.0.0"
             }
@@ -15775,7 +15802,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-collab/-/prosemirror-collab-1.3.1.tgz",
             "integrity": "sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0"
             }
@@ -15785,7 +15811,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.7.1.tgz",
             "integrity": "sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.0.0",
                 "prosemirror-state": "^1.0.0",
@@ -15797,7 +15822,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.2.tgz",
             "integrity": "sha512-CCk6Gyx9+Tt2sbYk5NK0nB1ukHi2ryaRgadV/LvyNuO3ena1payM2z6Cg0vO1ebK8cxbzo41ku2DE5Axj1Zuiw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0",
                 "prosemirror-transform": "^1.1.0",
@@ -15809,7 +15833,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.4.0.tgz",
             "integrity": "sha512-z00qvurSdCEWUIulij/isHaqu4uLS8r/Fi61IbjdIPJEonQgggbJsLnstW7Lgdk4zQ68/yr6B6bf7sJXowIgdQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-keymap": "^1.0.0",
                 "prosemirror-model": "^1.0.0",
@@ -15822,7 +15845,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.5.0.tgz",
             "integrity": "sha512-zlzTiH01eKA55UAf1MEjtssJeHnGxO0j4K4Dpx+gnmX9n+SHNlDqI2oO1Kv1iPN5B1dm5fsljCfqKF9nFL6HRg==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.2.2",
                 "prosemirror-transform": "^1.0.0",
@@ -15835,7 +15857,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.5.1.tgz",
             "integrity": "sha512-7wj4uMjKaXWAQ1CDgxNzNtR9AlsuwzHfdFH1ygEHA2KHF2DOEaXl1CJfNPAKCg9qNEh4rum975QLaCiQPyY6Fw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0",
                 "prosemirror-transform": "^1.0.0"
@@ -15846,7 +15867,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.2.3.tgz",
             "integrity": "sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0",
                 "w3c-keyname": "^2.2.0"
@@ -15857,7 +15877,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.13.2.tgz",
             "integrity": "sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@types/markdown-it": "^14.0.0",
                 "markdown-it": "^14.0.0",
@@ -15869,7 +15888,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.2.5.tgz",
             "integrity": "sha512-qwXzynnpBIeg1D7BAtjOusR+81xCp53j7iWu/IargiRZqRjGIlQuu1f3jFi+ehrHhWMLoyOQTSRx/IWZJqOYtQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "crelt": "^1.0.0",
                 "prosemirror-commands": "^1.0.0",
@@ -15892,7 +15910,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.4.tgz",
             "integrity": "sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.25.0"
             }
@@ -15902,7 +15919,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.5.1.tgz",
             "integrity": "sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.0.0",
                 "prosemirror-state": "^1.0.0",
@@ -15926,7 +15942,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.8.4.tgz",
             "integrity": "sha512-CGr2BK5sLdZx+ARbeLO4HBZYa3qSG3FmwOVmzYs0Zp7n5SkrGqj+1CeNuubFNZEr64yMAQ20SanbFyIyHWZc8w==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-keymap": "^1.2.3",
                 "prosemirror-model": "^1.25.4",
@@ -15940,7 +15955,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-trailing-node/-/prosemirror-trailing-node-3.0.0.tgz",
             "integrity": "sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@remirror/core-constants": "3.0.0",
                 "escape-string-regexp": "^4.0.0"
@@ -15956,7 +15970,6 @@
             "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.10.5.tgz",
             "integrity": "sha512-RPDQCxIDhIBb1o36xxwsaeAvivO8VLJcgBtzmOwQ64bMtsVFh5SSuJ6dWSxO1UsHTiTXPCgQm3PDJt7p6IOLbw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.21.0"
             }
@@ -16002,7 +16015,6 @@
             "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
             "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=6"
             }
@@ -16080,6 +16092,7 @@
             "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
             "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -16099,6 +16112,7 @@
             "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
             "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "scheduler": "^0.27.0"
             },
@@ -16440,8 +16454,7 @@
             "version": "1.3.4",
             "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz",
             "integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/run-parallel": {
             "version": "1.2.0",
@@ -16565,6 +16578,7 @@
             "integrity": "sha512-uf6HoO8fy6ClsrShvMgaKUn14f2EHQLQRtpsZZLeU/Mv0Q1K5P0+x2uvH6Cub39TVVbWNSrraUhDAoFph6vh0A==",
             "devOptional": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "chokidar": "^4.0.0",
                 "immutable": "^5.0.2",
@@ -17440,6 +17454,7 @@
             "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -17584,6 +17599,7 @@
             "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "esbuild": "~0.27.0",
                 "get-tsconfig": "^4.7.5"
@@ -17695,6 +17711,7 @@
             "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "devOptional": true,
             "license": "Apache-2.0",
+            "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -17796,6 +17813,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.11",
                 "picocolors": "^1.1.1",
@@ -17864,8 +17882,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
             "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/unbox-primitive": {
             "version": "1.1.0",
@@ -17907,6 +17924,7 @@
             "integrity": "sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "pathe": "^2.0.3"
             }
@@ -18170,6 +18188,7 @@
             "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "esbuild": "^0.25.0",
                 "fdir": "^6.4.4",
@@ -18789,6 +18808,7 @@
             "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -18831,6 +18851,7 @@
             "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/chai": "^5.2.2",
                 "@vitest/expect": "3.2.4",
@@ -18949,8 +18970,7 @@
             "version": "2.2.8",
             "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
             "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/wait-on": {
             "version": "9.0.3",
@@ -19133,6 +19153,7 @@
             "dev": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
+            "peer": true,
             "bin": {
                 "workerd": "bin/workerd"
             },
@@ -19310,6 +19331,7 @@
             "resolved": "https://registry.npmjs.org/y-protocols/-/y-protocols-1.0.7.tgz",
             "integrity": "sha512-YSVsLoXxO67J6eE/nV4AtFtT3QEotZf5sK5BHxFBXso7VDUT3Tx07IfA6hsu5Q5OmBdMkQVmFZ9QOA7fikWvnw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "lib0": "^0.2.85"
             },
@@ -19373,6 +19395,7 @@
             "resolved": "https://registry.npmjs.org/yjs/-/yjs-13.6.28.tgz",
             "integrity": "sha512-EgnDOXs8+hBVm6mq3/S89Kiwzh5JRbn7w2wXwbrMRyKy/8dOFsLvuIfC+x19ZdtaDc0tA9rQmdZzbqqNHG44wA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "lib0": "^0.2.99"
             },
@@ -19453,6 +19476,7 @@
             "resolved": "https://registry.npmjs.org/zod/-/zod-4.2.1.tgz",
             "integrity": "sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==",
             "license": "MIT",
+            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
diff --git a/src/app/api/auth/magic-link/verify/route.ts b/src/app/api/auth/magic-link/verify/route.ts
index 43fa70c9..10e11a30 100644
--- a/src/app/api/auth/magic-link/verify/route.ts
+++ b/src/app/api/auth/magic-link/verify/route.ts
@@ -2,7 +2,6 @@ import { ERROR_MAGIC_LINK_EXPIRED } from "@src/lib/messages";
 import { apiHandler } from "@src/lib/utils/api-handler";
 import { BodyFieldError, Success, validate } from "@src/lib/utils/api-utils";
 import { NextResponse, type NextRequest } from "next/server";
-import { encode } from "next-auth/jwt";
 
 import * as SecretService from "@src/lib/utils/secrets";
 import * as UserService from "@src/server/service/user-service";
@@ -10,13 +9,16 @@ import * as ProjectService from "@src/server/service/project-service";
 import * as MagicLinkService from "@src/server/service/magic-link-service";
 import * as Misc from "@src/lib/utils/misc";
 import { putBridgeToken } from "@src/lib/desktop-bridge";
-import { DESKTOP_BEARER_SALT, getWebSessionCookie } from "@src/lib/auth-cookies";
+import {
+    encodeDesktopBearer,
+    encodeWebSessionCookie,
+    SESSION_TTL_SECONDS,
+    type EncodedTokenPayload,
+} from "@src/lib/auth-tokens";
 
 import { VerifyMagicLinkBodySchema } from "@src/lib/utils/api-bodies";
 export type { VerifyMagicLinkBody } from "@src/lib/utils/api-bodies";
 
-const SESSION_TTL_SECONDS = 30 * 24 * 60 * 60; // mirrors auth.ts maxAge
-
 /**
  * POST `/api/auth/magic-link/verify`
  *
@@ -33,9 +35,6 @@ async function verifyMagicLinkRoute(req: NextRequest) {
     const body = await req.json();
     const { token } = validate(VerifyMagicLinkBodySchema, body);
 
-    const secret = process.env.AUTH_SECRET;
-    if (!secret) throw new BodyFieldError("Server is missing AUTH_SECRET");
-
     const tokenHash = SecretService.hashToken(token);
 
     // Atomically claim the token: deleteMany on the unique hash either deletes one row
@@ -72,9 +71,10 @@ async function verifyMagicLinkRoute(req: NextRequest) {
         }
     }
 
-    const tokenPayload = {
+    const tokenPayload: EncodedTokenPayload = {
         id: user.id,
         email: user.email,
+        role: user.role,
         createdAt: user.createdAt.toISOString(),
     };
 
@@ -82,32 +82,20 @@ async function verifyMagicLinkRoute(req: NextRequest) {
         // Desktop flow: hand the JWE to the bridge for the polling client to pick up.
         // Do NOT set a session cookie on whichever browser opened the magic link, since
         // it may not be the same machine running the desktop app.
-        const desktopJwe = await encode({
-            token: tokenPayload,
-            secret,
-            salt: DESKTOP_BEARER_SALT,
-            maxAge: SESSION_TTL_SECONDS,
-        });
+        const desktopJwe = await encodeDesktopBearer(tokenPayload);
         putBridgeToken(record.desktopNonce, desktopJwe);
         return Success({ mode: "desktop" });
     }
 
     // Web flow: set the NextAuth session cookie directly so the browser is signed in.
-    // The salt MUST equal the cookie name — that's what Auth.js's internal decoder uses.
-    const { name, secure } = getWebSessionCookie();
-    const webJwe = await encode({
-        token: tokenPayload,
-        secret,
-        salt: name,
-        maxAge: SESSION_TTL_SECONDS,
-    });
+    const { jwe, name, secure } = await encodeWebSessionCookie(tokenPayload);
     const response = NextResponse.json(
         { status: "success", data: { mode: "web" } },
         { status: 200 },
     );
     response.cookies.set({
         name,
-        value: webJwe,
+        value: jwe,
         httpOnly: true,
         sameSite: "lax",
         secure,
diff --git a/src/app/api/desktop/token/route.ts b/src/app/api/desktop/token/route.ts
index b08face6..42e37799 100644
--- a/src/app/api/desktop/token/route.ts
+++ b/src/app/api/desktop/token/route.ts
@@ -1,14 +1,11 @@
 import { NextRequest } from "next/server";
-import { encode } from "next-auth/jwt";
 import z from "zod";
 
 import { auth } from "@src/auth";
 import { apiHandler } from "@src/lib/utils/api-handler";
-import { ForbiddenError, BodyFieldError, Success, validate } from "@src/lib/utils/api-utils";
+import { ForbiddenError, Success, validate } from "@src/lib/utils/api-utils";
 import { putBridgeToken } from "@src/lib/desktop-bridge";
-import { DESKTOP_BEARER_SALT } from "@src/lib/auth-cookies";
-
-const DESKTOP_TOKEN_TTL_SECONDS = 30 * 24 * 60 * 60; // 30 days, mirrors auth.ts maxAge.
+import { encodeDesktopBearer } from "@src/lib/auth-tokens";
 
 const BodySchema = z.object({
     nonce: z.string().min(16),
@@ -27,28 +24,21 @@ async function desktopTokenRoute(req: NextRequest) {
     const { nonce } = validate(BodySchema, body);
 
     const session = await auth();
-    const user = session?.user as { id?: string; email?: string; createdAt?: Date | string } | undefined;
+    const user = session?.user as
+        | { id?: string; email?: string; createdAt?: Date | string; role?: string }
+        | undefined;
     if (!user?.id) {
         throw new ForbiddenError("Not authenticated");
     }
 
-    const secret = process.env.AUTH_SECRET;
-    if (!secret) {
-        throw new BodyFieldError("Server is missing AUTH_SECRET");
-    }
-
-    const token = await encode({
-        token: {
-            id: user.id,
-            email: user.email,
-            createdAt:
-                user.createdAt instanceof Date
-                    ? user.createdAt.toISOString()
-                    : (user.createdAt ?? new Date().toISOString()),
-        },
-        secret,
-        salt: DESKTOP_BEARER_SALT,
-        maxAge: DESKTOP_TOKEN_TTL_SECONDS,
+    const token = await encodeDesktopBearer({
+        id: user.id,
+        email: user.email ?? "",
+        role: user.role ?? "USER",
+        createdAt:
+            user.createdAt instanceof Date
+                ? user.createdAt.toISOString()
+                : (user.createdAt ?? new Date().toISOString()),
     });
 
     putBridgeToken(nonce, token);
diff --git a/src/auth.ts b/src/auth.ts
index 18b64de3..cc8cdfa7 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -8,7 +8,7 @@
  *   4. Desktop OAuth       — browser OAuth here, then /api/desktop/token mints
  *                            a fresh JWE for Tauri to pick up via the bridge.
  *
- * The desktop bearer JWEs all use `DESKTOP_BEARER_SALT` (lib/auth-cookies.ts)
+ * The desktop bearer JWEs all use `DESKTOP_BEARER_SALT` (lib/auth-tokens.ts)
  * so lib/session.ts can decrypt them in middleware. The web cookie uses Auth.js's
  * default salt (= cookie name) and is never encoded by us directly except in the
  * magic-link verify route, which uses `getWebSessionCookie()` to stay aligned.
@@ -22,10 +22,11 @@ import { UserRole } from "./generated/client/client";
 
 import prisma from "@src/server/db";
 import * as UserService from "@src/server/service/user-service";
+import { SESSION_TTL_SECONDS } from "@src/lib/auth-tokens";
 
 export const { handlers, auth, signIn, signOut } = NextAuth({
     adapter: PrismaAdapter(prisma),
-    session: { strategy: "jwt", maxAge: 30 * 24 * 60 * 60 },
+    session: { strategy: "jwt", maxAge: SESSION_TTL_SECONDS },
     pages: { signIn: "/" },
     providers: [
         Google({
diff --git a/src/generated/client/browser.ts b/src/generated/client/browser.ts
deleted file mode 100644
index 67c129be..00000000
--- a/src/generated/client/browser.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file should be your main import to use Prisma-related types and utilities in a browser. 
- * Use it to get access to models, enums, and input types.
- * 
- * This file does not contain a `PrismaClient` class, nor several other helpers that are intended as server-side only.
- * See `client.ts` for the standard, server-side entry point.
- *
- * 🟢 You can import this file directly.
- */
-
-import * as Prisma from './internal/prismaNamespaceBrowser'
-export { Prisma }
-export * as $Enums from './enums'
-export * from './enums';
-/**
- * Model User
- * 
- */
-export type User = Prisma.UserModel
-/**
- * Model Account
- * 
- */
-export type Account = Prisma.AccountModel
-/**
- * Model Session
- * 
- */
-export type Session = Prisma.SessionModel
-/**
- * Model VerificationToken
- * 
- */
-export type VerificationToken = Prisma.VerificationTokenModel
-/**
- * Model MagicLinkToken
- * 
- */
-export type MagicLinkToken = Prisma.MagicLinkTokenModel
-/**
- * Model Transaction
- * 
- */
-export type Transaction = Prisma.TransactionModel
-/**
- * Model Project
- * 
- */
-export type Project = Prisma.ProjectModel
-/**
- * Model ProjectMember
- * 
- */
-export type ProjectMember = Prisma.ProjectMemberModel
-/**
- * Model ProjectInvitation
- * 
- */
-export type ProjectInvitation = Prisma.ProjectInvitationModel
diff --git a/src/generated/client/client.ts b/src/generated/client/client.ts
deleted file mode 100644
index 659230b0..00000000
--- a/src/generated/client/client.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file should be your main import to use Prisma. Through it you get access to all the models, enums, and input types.
- * If you're looking for something you can import in the client-side of your application, please refer to the `browser.ts` file instead.
- *
- * 🟢 You can import this file directly.
- */
-
-import * as process from 'node:process'
-import * as path from 'node:path'
-import { fileURLToPath } from 'node:url'
-globalThis['__dirname'] = path.dirname(fileURLToPath(import.meta.url))
-
-import * as runtime from "@prisma/client/runtime/client"
-import * as $Enums from "./enums"
-import * as $Class from "./internal/class"
-import * as Prisma from "./internal/prismaNamespace"
-
-export * as $Enums from './enums'
-export * from "./enums"
-/**
- * ## Prisma Client
- * 
- * Type-safe database client for TypeScript
- * @example
- * ```
- * const prisma = new PrismaClient({
- *   adapter: new PrismaPg({ connectionString: process.env.DATABASE_URL })
- * })
- * // Fetch zero or more Users
- * const users = await prisma.user.findMany()
- * ```
- * 
- * Read more in our [docs](https://pris.ly/d/client).
- */
-export const PrismaClient = $Class.getPrismaClientClass()
-export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts extends Prisma.PrismaClientOptions["omit"] = Prisma.PrismaClientOptions["omit"], ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = $Class.PrismaClient<LogOpts, OmitOpts, ExtArgs>
-export { Prisma }
-
-/**
- * Model User
- * 
- */
-export type User = Prisma.UserModel
-/**
- * Model Account
- * 
- */
-export type Account = Prisma.AccountModel
-/**
- * Model Session
- * 
- */
-export type Session = Prisma.SessionModel
-/**
- * Model VerificationToken
- * 
- */
-export type VerificationToken = Prisma.VerificationTokenModel
-/**
- * Model MagicLinkToken
- * 
- */
-export type MagicLinkToken = Prisma.MagicLinkTokenModel
-/**
- * Model Transaction
- * 
- */
-export type Transaction = Prisma.TransactionModel
-/**
- * Model Project
- * 
- */
-export type Project = Prisma.ProjectModel
-/**
- * Model ProjectMember
- * 
- */
-export type ProjectMember = Prisma.ProjectMemberModel
-/**
- * Model ProjectInvitation
- * 
- */
-export type ProjectInvitation = Prisma.ProjectInvitationModel
diff --git a/src/generated/client/commonInputTypes.ts b/src/generated/client/commonInputTypes.ts
deleted file mode 100644
index fa37c0df..00000000
--- a/src/generated/client/commonInputTypes.ts
+++ /dev/null
@@ -1,617 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports various common sort, input & filter types that are not directly linked to a particular model.
- *
- * 🟢 You can import this file directly.
- */
-
-import type * as runtime from "@prisma/client/runtime/client"
-import * as $Enums from "./enums"
-import type * as Prisma from "./internal/prismaNamespace"
-
-
-export type StringFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  mode?: Prisma.QueryMode
-  not?: Prisma.NestedStringFilter<$PrismaModel> | string
-}
-
-export type DateTimeFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeFilter<$PrismaModel> | Date | string
-}
-
-export type DateTimeNullableFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel> | null
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeNullableFilter<$PrismaModel> | Date | string | null
-}
-
-export type StringNullableFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  mode?: Prisma.QueryMode
-  not?: Prisma.NestedStringNullableFilter<$PrismaModel> | string | null
-}
-
-export type EnumUserRoleFilter<$PrismaModel = never> = {
-  equals?: $Enums.UserRole | Prisma.EnumUserRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumUserRoleFilter<$PrismaModel> | $Enums.UserRole
-}
-
-export type BoolFilter<$PrismaModel = never> = {
-  equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean
-}
-
-export type EnumSubscriptionProviderNullableFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  not?: Prisma.NestedEnumSubscriptionProviderNullableFilter<$PrismaModel> | $Enums.SubscriptionProvider | null
-}
-
-export type JsonNullableFilter<$PrismaModel = never> =
-| Prisma.PatchUndefined<
-    Prisma.Either<Required<JsonNullableFilterBase<$PrismaModel>>, Exclude<keyof Required<JsonNullableFilterBase<$PrismaModel>>, 'path'>>,
-    Required<JsonNullableFilterBase<$PrismaModel>>
-  >
-| Prisma.OptionalFlat<Omit<Required<JsonNullableFilterBase<$PrismaModel>>, 'path'>>
-
-export type JsonNullableFilterBase<$PrismaModel = never> = {
-  equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
-  path?: string[]
-  mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
-  string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
-}
-
-export type SortOrderInput = {
-  sort: Prisma.SortOrder
-  nulls?: Prisma.NullsOrder
-}
-
-export type StringWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  mode?: Prisma.QueryMode
-  not?: Prisma.NestedStringWithAggregatesFilter<$PrismaModel> | string
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedStringFilter<$PrismaModel>
-  _max?: Prisma.NestedStringFilter<$PrismaModel>
-}
-
-export type DateTimeWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeWithAggregatesFilter<$PrismaModel> | Date | string
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedDateTimeFilter<$PrismaModel>
-  _max?: Prisma.NestedDateTimeFilter<$PrismaModel>
-}
-
-export type DateTimeNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel> | null
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeNullableWithAggregatesFilter<$PrismaModel> | Date | string | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
-}
-
-export type StringNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  mode?: Prisma.QueryMode
-  not?: Prisma.NestedStringNullableWithAggregatesFilter<$PrismaModel> | string | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedStringNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedStringNullableFilter<$PrismaModel>
-}
-
-export type EnumUserRoleWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.UserRole | Prisma.EnumUserRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumUserRoleWithAggregatesFilter<$PrismaModel> | $Enums.UserRole
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumUserRoleFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumUserRoleFilter<$PrismaModel>
-}
-
-export type BoolWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedBoolWithAggregatesFilter<$PrismaModel> | boolean
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedBoolFilter<$PrismaModel>
-  _max?: Prisma.NestedBoolFilter<$PrismaModel>
-}
-
-export type EnumSubscriptionProviderNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  not?: Prisma.NestedEnumSubscriptionProviderNullableWithAggregatesFilter<$PrismaModel> | $Enums.SubscriptionProvider | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumSubscriptionProviderNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumSubscriptionProviderNullableFilter<$PrismaModel>
-}
-
-export type JsonNullableWithAggregatesFilter<$PrismaModel = never> =
-| Prisma.PatchUndefined<
-    Prisma.Either<Required<JsonNullableWithAggregatesFilterBase<$PrismaModel>>, Exclude<keyof Required<JsonNullableWithAggregatesFilterBase<$PrismaModel>>, 'path'>>,
-    Required<JsonNullableWithAggregatesFilterBase<$PrismaModel>>
-  >
-| Prisma.OptionalFlat<Omit<Required<JsonNullableWithAggregatesFilterBase<$PrismaModel>>, 'path'>>
-
-export type JsonNullableWithAggregatesFilterBase<$PrismaModel = never> = {
-  equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
-  path?: string[]
-  mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
-  string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedJsonNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedJsonNullableFilter<$PrismaModel>
-}
-
-export type IntNullableFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntNullableFilter<$PrismaModel> | number | null
-}
-
-export type IntNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntNullableWithAggregatesFilter<$PrismaModel> | number | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _avg?: Prisma.NestedFloatNullableFilter<$PrismaModel>
-  _sum?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedIntNullableFilter<$PrismaModel>
-}
-
-export type IntFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntFilter<$PrismaModel> | number
-}
-
-export type IntWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntWithAggregatesFilter<$PrismaModel> | number
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _avg?: Prisma.NestedFloatFilter<$PrismaModel>
-  _sum?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedIntFilter<$PrismaModel>
-  _max?: Prisma.NestedIntFilter<$PrismaModel>
-}
-
-export type EnumSubscriptionProviderFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumSubscriptionProviderFilter<$PrismaModel> | $Enums.SubscriptionProvider
-}
-
-export type EnumSubscriptionProviderWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumSubscriptionProviderWithAggregatesFilter<$PrismaModel> | $Enums.SubscriptionProvider
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumSubscriptionProviderFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumSubscriptionProviderFilter<$PrismaModel>
-}
-
-export type EnumProjectRoleFilter<$PrismaModel = never> = {
-  equals?: $Enums.ProjectRole | Prisma.EnumProjectRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumProjectRoleFilter<$PrismaModel> | $Enums.ProjectRole
-}
-
-export type EnumProjectRoleWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.ProjectRole | Prisma.EnumProjectRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumProjectRoleWithAggregatesFilter<$PrismaModel> | $Enums.ProjectRole
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumProjectRoleFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumProjectRoleFilter<$PrismaModel>
-}
-
-export type NestedStringFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedStringFilter<$PrismaModel> | string
-}
-
-export type NestedDateTimeFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeFilter<$PrismaModel> | Date | string
-}
-
-export type NestedDateTimeNullableFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel> | null
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeNullableFilter<$PrismaModel> | Date | string | null
-}
-
-export type NestedStringNullableFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedStringNullableFilter<$PrismaModel> | string | null
-}
-
-export type NestedEnumUserRoleFilter<$PrismaModel = never> = {
-  equals?: $Enums.UserRole | Prisma.EnumUserRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumUserRoleFilter<$PrismaModel> | $Enums.UserRole
-}
-
-export type NestedBoolFilter<$PrismaModel = never> = {
-  equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean
-}
-
-export type NestedEnumSubscriptionProviderNullableFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  not?: Prisma.NestedEnumSubscriptionProviderNullableFilter<$PrismaModel> | $Enums.SubscriptionProvider | null
-}
-
-export type NestedStringWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel>
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedStringWithAggregatesFilter<$PrismaModel> | string
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedStringFilter<$PrismaModel>
-  _max?: Prisma.NestedStringFilter<$PrismaModel>
-}
-
-export type NestedIntFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntFilter<$PrismaModel> | number
-}
-
-export type NestedDateTimeWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel>
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeWithAggregatesFilter<$PrismaModel> | Date | string
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedDateTimeFilter<$PrismaModel>
-  _max?: Prisma.NestedDateTimeFilter<$PrismaModel>
-}
-
-export type NestedDateTimeNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel> | null
-  in?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  notIn?: Date[] | string[] | Prisma.ListDateTimeFieldRefInput<$PrismaModel> | null
-  lt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  lte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gt?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  gte?: Date | string | Prisma.DateTimeFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedDateTimeNullableWithAggregatesFilter<$PrismaModel> | Date | string | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
-}
-
-export type NestedIntNullableFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntNullableFilter<$PrismaModel> | number | null
-}
-
-export type NestedStringNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
-  in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  notIn?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
-  lt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  lte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gt?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  gte?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  startsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  endsWith?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedStringNullableWithAggregatesFilter<$PrismaModel> | string | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedStringNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedStringNullableFilter<$PrismaModel>
-}
-
-export type NestedEnumUserRoleWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.UserRole | Prisma.EnumUserRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.UserRole[] | Prisma.ListEnumUserRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumUserRoleWithAggregatesFilter<$PrismaModel> | $Enums.UserRole
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumUserRoleFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumUserRoleFilter<$PrismaModel>
-}
-
-export type NestedBoolWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedBoolWithAggregatesFilter<$PrismaModel> | boolean
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedBoolFilter<$PrismaModel>
-  _max?: Prisma.NestedBoolFilter<$PrismaModel>
-}
-
-export type NestedEnumSubscriptionProviderNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> | null
-  not?: Prisma.NestedEnumSubscriptionProviderNullableWithAggregatesFilter<$PrismaModel> | $Enums.SubscriptionProvider | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumSubscriptionProviderNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumSubscriptionProviderNullableFilter<$PrismaModel>
-}
-
-export type NestedJsonNullableFilter<$PrismaModel = never> =
-| Prisma.PatchUndefined<
-    Prisma.Either<Required<NestedJsonNullableFilterBase<$PrismaModel>>, Exclude<keyof Required<NestedJsonNullableFilterBase<$PrismaModel>>, 'path'>>,
-    Required<NestedJsonNullableFilterBase<$PrismaModel>>
-  >
-| Prisma.OptionalFlat<Omit<Required<NestedJsonNullableFilterBase<$PrismaModel>>, 'path'>>
-
-export type NestedJsonNullableFilterBase<$PrismaModel = never> = {
-  equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
-  path?: string[]
-  mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
-  string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
-  array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
-  lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
-  not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
-}
-
-export type NestedIntNullableWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntNullableWithAggregatesFilter<$PrismaModel> | number | null
-  _count?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _avg?: Prisma.NestedFloatNullableFilter<$PrismaModel>
-  _sum?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _min?: Prisma.NestedIntNullableFilter<$PrismaModel>
-  _max?: Prisma.NestedIntNullableFilter<$PrismaModel>
-}
-
-export type NestedFloatNullableFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.FloatFieldRefInput<$PrismaModel> | null
-  in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel> | null
-  notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel> | null
-  lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedFloatNullableFilter<$PrismaModel> | number | null
-}
-
-export type NestedIntWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  notIn?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
-  lt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.IntFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedIntWithAggregatesFilter<$PrismaModel> | number
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _avg?: Prisma.NestedFloatFilter<$PrismaModel>
-  _sum?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedIntFilter<$PrismaModel>
-  _max?: Prisma.NestedIntFilter<$PrismaModel>
-}
-
-export type NestedFloatFilter<$PrismaModel = never> = {
-  equals?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
-  notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
-  lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedFloatFilter<$PrismaModel> | number
-}
-
-export type NestedEnumSubscriptionProviderFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumSubscriptionProviderFilter<$PrismaModel> | $Enums.SubscriptionProvider
-}
-
-export type NestedEnumSubscriptionProviderWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.SubscriptionProvider | Prisma.EnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  in?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  notIn?: $Enums.SubscriptionProvider[] | Prisma.ListEnumSubscriptionProviderFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumSubscriptionProviderWithAggregatesFilter<$PrismaModel> | $Enums.SubscriptionProvider
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumSubscriptionProviderFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumSubscriptionProviderFilter<$PrismaModel>
-}
-
-export type NestedEnumProjectRoleFilter<$PrismaModel = never> = {
-  equals?: $Enums.ProjectRole | Prisma.EnumProjectRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumProjectRoleFilter<$PrismaModel> | $Enums.ProjectRole
-}
-
-export type NestedEnumProjectRoleWithAggregatesFilter<$PrismaModel = never> = {
-  equals?: $Enums.ProjectRole | Prisma.EnumProjectRoleFieldRefInput<$PrismaModel>
-  in?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  notIn?: $Enums.ProjectRole[] | Prisma.ListEnumProjectRoleFieldRefInput<$PrismaModel>
-  not?: Prisma.NestedEnumProjectRoleWithAggregatesFilter<$PrismaModel> | $Enums.ProjectRole
-  _count?: Prisma.NestedIntFilter<$PrismaModel>
-  _min?: Prisma.NestedEnumProjectRoleFilter<$PrismaModel>
-  _max?: Prisma.NestedEnumProjectRoleFilter<$PrismaModel>
-}
-
-
diff --git a/src/generated/client/enums.ts b/src/generated/client/enums.ts
deleted file mode 100644
index fa949563..00000000
--- a/src/generated/client/enums.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
-* This file exports all enum related types from the schema.
-*
-* 🟢 You can import this file directly.
-*/
-
-export const ProjectRole = {
-  OWNER: 'OWNER',
-  ADMIN: 'ADMIN',
-  EDITOR: 'EDITOR',
-  VIEWER: 'VIEWER'
-} as const
-
-export type ProjectRole = (typeof ProjectRole)[keyof typeof ProjectRole]
-
-
-export const UserRole = {
-  USER: 'USER',
-  ADMIN: 'ADMIN'
-} as const
-
-export type UserRole = (typeof UserRole)[keyof typeof UserRole]
-
-
-export const SubscriptionProvider = {
-  STRIPE: 'STRIPE',
-  APPLE: 'APPLE'
-} as const
-
-export type SubscriptionProvider = (typeof SubscriptionProvider)[keyof typeof SubscriptionProvider]
diff --git a/src/generated/client/internal/class.ts b/src/generated/client/internal/class.ts
deleted file mode 100644
index e46d9c76..00000000
--- a/src/generated/client/internal/class.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * WARNING: This is an internal file that is subject to change!
- *
- * 🛑 Under no circumstances should you import this file directly! 🛑
- *
- * Please import the `PrismaClient` class from the `client.ts` file instead.
- */
-
-import * as runtime from "@prisma/client/runtime/client"
-import type * as Prisma from "./prismaNamespace"
-
-
-const config: runtime.GetPrismaClientConfig = {
-  "previewFeatures": [],
-  "clientVersion": "7.7.0",
-  "engineVersion": "75cbdc1eb7150937890ad5465d861175c6624711",
-  "activeProvider": "postgresql",
-  "inlineSchema": "// This is your Prisma schema file,\n// learn more about it in the docs: https://pris.ly/d/prisma-schema\n\ngenerator client {\n  provider = \"prisma-client\"\n  output   = \"../src/generated/client\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n}\n\nenum ProjectRole {\n  OWNER\n  ADMIN\n  EDITOR\n  VIEWER\n}\n\nenum UserRole {\n  USER\n  ADMIN\n}\n\nenum SubscriptionProvider {\n  STRIPE\n  APPLE\n}\n\nmodel User {\n  id            String    @id @default(uuid(7))\n  createdAt     DateTime  @default(now())\n  email         String    @unique\n  emailVerified DateTime?\n  username      String?\n  color         String?\n  role          UserRole  @default(USER)\n\n  isProUntil              DateTime?\n  isSubscriptionCancelled Boolean               @default(false)\n  subscriptionProvider    SubscriptionProvider?\n\n  settings Json?\n\n  accounts     Account[]\n  sessions     Session[]\n  projects     ProjectMember[]\n  transactions Transaction[]\n}\n\nmodel Account {\n  id                String  @id @default(cuid())\n  userId            String\n  type              String\n  provider          String\n  providerAccountId String\n  refresh_token     String? @db.Text\n  access_token      String? @db.Text\n  expires_at        Int?\n  token_type        String?\n  scope             String?\n  id_token          String? @db.Text\n  session_state     String?\n\n  user User @relation(fields: [userId], references: [id], onDelete: Cascade)\n\n  @@unique([provider, providerAccountId])\n}\n\nmodel Session {\n  id           String   @id @default(cuid())\n  sessionToken String   @unique\n  userId       String\n  expires      DateTime\n  user         User     @relation(fields: [userId], references: [id], onDelete: Cascade)\n}\n\nmodel VerificationToken {\n  identifier String\n  token      String   @unique\n  expires    DateTime\n\n  @@unique([identifier, token])\n}\n\nmodel MagicLinkToken {\n  id        Int      @id @default(autoincrement())\n  email     String\n  tokenHash String   @unique\n  expiresAt DateTime\n  createdAt DateTime @default(now())\n\n  desktopNonce String?\n  inviteToken  String?\n\n  @@index([email, createdAt])\n}\n\nmodel Transaction {\n  id            Int                  @id @default(autoincrement())\n  userId        String\n  provider      SubscriptionProvider\n  transactionId String               @unique\n  createdAt     DateTime             @default(now())\n\n  user User @relation(fields: [userId], references: [id], onDelete: Cascade)\n\n  @@index([userId])\n}\n\nmodel Project {\n  id        String   @id @default(uuid(7))\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  title       String\n  description String?\n  author      String?\n  hasPoster   Boolean @default(false)\n\n  members     ProjectMember[]\n  invitations ProjectInvitation[]\n}\n\nmodel ProjectMember {\n  id   Int         @id @default(autoincrement())\n  role ProjectRole @default(VIEWER)\n\n  user      User    @relation(fields: [userId], references: [id])\n  userId    String\n  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)\n  projectId String\n\n  @@unique([userId, projectId])\n}\n\nmodel ProjectInvitation {\n  id        Int      @id @default(autoincrement())\n  token     String   @unique\n  email     String\n  createdAt DateTime @default(now())\n\n  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)\n  projectId String\n\n  @@unique([email, projectId])\n}\n",
-  "runtimeDataModel": {
-    "models": {},
-    "enums": {},
-    "types": {}
-  },
-  "parameterizationSchema": {
-    "strings": [],
-    "graph": ""
-  }
-}
-
-config.runtimeDataModel = JSON.parse("{\"models\":{\"User\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"email\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"emailVerified\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"username\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"color\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"role\",\"kind\":\"enum\",\"type\":\"UserRole\"},{\"name\":\"isProUntil\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"isSubscriptionCancelled\",\"kind\":\"scalar\",\"type\":\"Boolean\"},{\"name\":\"subscriptionProvider\",\"kind\":\"enum\",\"type\":\"SubscriptionProvider\"},{\"name\":\"settings\",\"kind\":\"scalar\",\"type\":\"Json\"},{\"name\":\"accounts\",\"kind\":\"object\",\"type\":\"Account\",\"relationName\":\"AccountToUser\"},{\"name\":\"sessions\",\"kind\":\"object\",\"type\":\"Session\",\"relationName\":\"SessionToUser\"},{\"name\":\"projects\",\"kind\":\"object\",\"type\":\"ProjectMember\",\"relationName\":\"ProjectMemberToUser\"},{\"name\":\"transactions\",\"kind\":\"object\",\"type\":\"Transaction\",\"relationName\":\"TransactionToUser\"}],\"dbName\":null},\"Account\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"type\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"provider\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"providerAccountId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"refresh_token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"access_token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expires_at\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"token_type\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"scope\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"id_token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"session_state\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"AccountToUser\"}],\"dbName\":null},\"Session\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"sessionToken\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expires\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"SessionToUser\"}],\"dbName\":null},\"VerificationToken\":{\"fields\":[{\"name\":\"identifier\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expires\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"MagicLinkToken\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"email\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"tokenHash\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expiresAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"desktopNonce\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"inviteToken\",\"kind\":\"scalar\",\"type\":\"String\"}],\"dbName\":null},\"Transaction\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"provider\",\"kind\":\"enum\",\"type\":\"SubscriptionProvider\"},{\"name\":\"transactionId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"TransactionToUser\"}],\"dbName\":null},\"Project\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"title\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"description\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"author\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"hasPoster\",\"kind\":\"scalar\",\"type\":\"Boolean\"},{\"name\":\"members\",\"kind\":\"object\",\"type\":\"ProjectMember\",\"relationName\":\"ProjectToProjectMember\"},{\"name\":\"invitations\",\"kind\":\"object\",\"type\":\"ProjectInvitation\",\"relationName\":\"ProjectToProjectInvitation\"}],\"dbName\":null},\"ProjectMember\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"role\",\"kind\":\"enum\",\"type\":\"ProjectRole\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"ProjectMemberToUser\"},{\"name\":\"userId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"project\",\"kind\":\"object\",\"type\":\"Project\",\"relationName\":\"ProjectToProjectMember\"},{\"name\":\"projectId\",\"kind\":\"scalar\",\"type\":\"String\"}],\"dbName\":null},\"ProjectInvitation\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"token\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"email\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"project\",\"kind\":\"object\",\"type\":\"Project\",\"relationName\":\"ProjectToProjectInvitation\"},{\"name\":\"projectId\",\"kind\":\"scalar\",\"type\":\"String\"}],\"dbName\":null}},\"enums\":{},\"types\":{}}")
-config.parameterizationSchema = {
-  strings: JSON.parse("[\"where\",\"orderBy\",\"cursor\",\"user\",\"accounts\",\"sessions\",\"members\",\"project\",\"invitations\",\"_count\",\"projects\",\"transactions\",\"User.findUnique\",\"User.findUniqueOrThrow\",\"User.findFirst\",\"User.findFirstOrThrow\",\"User.findMany\",\"data\",\"User.createOne\",\"User.createMany\",\"User.createManyAndReturn\",\"User.updateOne\",\"User.updateMany\",\"User.updateManyAndReturn\",\"create\",\"update\",\"User.upsertOne\",\"User.deleteOne\",\"User.deleteMany\",\"having\",\"_min\",\"_max\",\"User.groupBy\",\"User.aggregate\",\"Account.findUnique\",\"Account.findUniqueOrThrow\",\"Account.findFirst\",\"Account.findFirstOrThrow\",\"Account.findMany\",\"Account.createOne\",\"Account.createMany\",\"Account.createManyAndReturn\",\"Account.updateOne\",\"Account.updateMany\",\"Account.updateManyAndReturn\",\"Account.upsertOne\",\"Account.deleteOne\",\"Account.deleteMany\",\"_avg\",\"_sum\",\"Account.groupBy\",\"Account.aggregate\",\"Session.findUnique\",\"Session.findUniqueOrThrow\",\"Session.findFirst\",\"Session.findFirstOrThrow\",\"Session.findMany\",\"Session.createOne\",\"Session.createMany\",\"Session.createManyAndReturn\",\"Session.updateOne\",\"Session.updateMany\",\"Session.updateManyAndReturn\",\"Session.upsertOne\",\"Session.deleteOne\",\"Session.deleteMany\",\"Session.groupBy\",\"Session.aggregate\",\"VerificationToken.findUnique\",\"VerificationToken.findUniqueOrThrow\",\"VerificationToken.findFirst\",\"VerificationToken.findFirstOrThrow\",\"VerificationToken.findMany\",\"VerificationToken.createOne\",\"VerificationToken.createMany\",\"VerificationToken.createManyAndReturn\",\"VerificationToken.updateOne\",\"VerificationToken.updateMany\",\"VerificationToken.updateManyAndReturn\",\"VerificationToken.upsertOne\",\"VerificationToken.deleteOne\",\"VerificationToken.deleteMany\",\"VerificationToken.groupBy\",\"VerificationToken.aggregate\",\"MagicLinkToken.findUnique\",\"MagicLinkToken.findUniqueOrThrow\",\"MagicLinkToken.findFirst\",\"MagicLinkToken.findFirstOrThrow\",\"MagicLinkToken.findMany\",\"MagicLinkToken.createOne\",\"MagicLinkToken.createMany\",\"MagicLinkToken.createManyAndReturn\",\"MagicLinkToken.updateOne\",\"MagicLinkToken.updateMany\",\"MagicLinkToken.updateManyAndReturn\",\"MagicLinkToken.upsertOne\",\"MagicLinkToken.deleteOne\",\"MagicLinkToken.deleteMany\",\"MagicLinkToken.groupBy\",\"MagicLinkToken.aggregate\",\"Transaction.findUnique\",\"Transaction.findUniqueOrThrow\",\"Transaction.findFirst\",\"Transaction.findFirstOrThrow\",\"Transaction.findMany\",\"Transaction.createOne\",\"Transaction.createMany\",\"Transaction.createManyAndReturn\",\"Transaction.updateOne\",\"Transaction.updateMany\",\"Transaction.updateManyAndReturn\",\"Transaction.upsertOne\",\"Transaction.deleteOne\",\"Transaction.deleteMany\",\"Transaction.groupBy\",\"Transaction.aggregate\",\"Project.findUnique\",\"Project.findUniqueOrThrow\",\"Project.findFirst\",\"Project.findFirstOrThrow\",\"Project.findMany\",\"Project.createOne\",\"Project.createMany\",\"Project.createManyAndReturn\",\"Project.updateOne\",\"Project.updateMany\",\"Project.updateManyAndReturn\",\"Project.upsertOne\",\"Project.deleteOne\",\"Project.deleteMany\",\"Project.groupBy\",\"Project.aggregate\",\"ProjectMember.findUnique\",\"ProjectMember.findUniqueOrThrow\",\"ProjectMember.findFirst\",\"ProjectMember.findFirstOrThrow\",\"ProjectMember.findMany\",\"ProjectMember.createOne\",\"ProjectMember.createMany\",\"ProjectMember.createManyAndReturn\",\"ProjectMember.updateOne\",\"ProjectMember.updateMany\",\"ProjectMember.updateManyAndReturn\",\"ProjectMember.upsertOne\",\"ProjectMember.deleteOne\",\"ProjectMember.deleteMany\",\"ProjectMember.groupBy\",\"ProjectMember.aggregate\",\"ProjectInvitation.findUnique\",\"ProjectInvitation.findUniqueOrThrow\",\"ProjectInvitation.findFirst\",\"ProjectInvitation.findFirstOrThrow\",\"ProjectInvitation.findMany\",\"ProjectInvitation.createOne\",\"ProjectInvitation.createMany\",\"ProjectInvitation.createManyAndReturn\",\"ProjectInvitation.updateOne\",\"ProjectInvitation.updateMany\",\"ProjectInvitation.updateManyAndReturn\",\"ProjectInvitation.upsertOne\",\"ProjectInvitation.deleteOne\",\"ProjectInvitation.deleteMany\",\"ProjectInvitation.groupBy\",\"ProjectInvitation.aggregate\",\"AND\",\"OR\",\"NOT\",\"id\",\"token\",\"email\",\"createdAt\",\"projectId\",\"equals\",\"in\",\"notIn\",\"lt\",\"lte\",\"gt\",\"gte\",\"not\",\"contains\",\"startsWith\",\"endsWith\",\"ProjectRole\",\"role\",\"userId\",\"updatedAt\",\"title\",\"description\",\"author\",\"hasPoster\",\"every\",\"some\",\"none\",\"SubscriptionProvider\",\"provider\",\"transactionId\",\"tokenHash\",\"expiresAt\",\"desktopNonce\",\"inviteToken\",\"identifier\",\"expires\",\"identifier_token\",\"sessionToken\",\"type\",\"providerAccountId\",\"refresh_token\",\"access_token\",\"expires_at\",\"token_type\",\"scope\",\"id_token\",\"session_state\",\"emailVerified\",\"username\",\"color\",\"UserRole\",\"isProUntil\",\"isSubscriptionCancelled\",\"subscriptionProvider\",\"settings\",\"string_contains\",\"string_starts_with\",\"string_ends_with\",\"array_starts_with\",\"array_ends_with\",\"array_contains\",\"email_projectId\",\"userId_projectId\",\"provider_providerAccountId\",\"is\",\"isNot\",\"connectOrCreate\",\"upsert\",\"createMany\",\"set\",\"disconnect\",\"delete\",\"connect\",\"updateMany\",\"deleteMany\",\"increment\",\"decrement\",\"multiply\",\"divide\"]"),
-  graph: "9ANVkAESBAAArAIAIAUAAK0CACAKAACKAgAgCwAArgIAIKQBAACnAgAwpQEAAB8AEKYBAACnAgAwpwEBAAAAAakBAQAAAAGqAUAAhwIAIbgBAACpAtoBItYBQACoAgAh1wEBAIgCACHYAQEAiAIAIdoBQACoAgAh2wEgAIkCACHcAQAAqgLDASPdAQAAqwIAIAEAAAABACAQAwAAsQIAIKQBAAC6AgAwpQEAAAMAEKYBAAC6AgAwpwEBAIYCACG5AQEAhgIAIcMBAQCGAgAhzQEBAIYCACHOAQEAhgIAIc8BAQCIAgAh0AEBAIgCACHRAQIAuwIAIdIBAQCIAgAh0wEBAIgCACHUAQEAiAIAIdUBAQCIAgAhCAMAAM8DACDPAQAA0AIAINABAADQAgAg0QEAANACACDSAQAA0AIAINMBAADQAgAg1AEAANACACDVAQAA0AIAIBEDAACxAgAgpAEAALoCADClAQAAAwAQpgEAALoCADCnAQEAAAABuQEBAIYCACHDAQEAhgIAIc0BAQCGAgAhzgEBAIYCACHPAQEAiAIAIdABAQCIAgAh0QECALsCACHSAQEAiAIAIdMBAQCIAgAh1AEBAIgCACHVAQEAiAIAIeYBAAC5AgAgAwAAAAMAIAEAAAQAMAIAAAUAIAgDAACxAgAgpAEAALgCADClAQAABwAQpgEAALgCADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQEDAADPAwAgCAMAALECACCkAQAAuAIAMKUBAAAHABCmAQAAuAIAMKcBAQAAAAG5AQEAhgIAIcoBQACHAgAhzAEBAAAAAQMAAAAHACABAAAIADACAAAJACAJAwAAsQIAIAcAALQCACCkAQAAtgIAMKUBAAALABCmAQAAtgIAMKcBAgCSAgAhqwEBAIYCACG4AQAAtwK4ASK5AQEAhgIAIQIDAADPAwAgBwAA0AMAIAoDAACxAgAgBwAAtAIAIKQBAAC2AgAwpQEAAAsAEKYBAAC2AgAwpwECAAAAAasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACHlAQAAtQIAIAMAAAALACABAAAMADACAAANACADAAAACwAgAQAADAAwAgAADQAgCQcAALQCACCkAQAAswIAMKUBAAAQABCmAQAAswIAMKcBAgCSAgAhqAEBAIYCACGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACEBBwAA0AMAIAoHAAC0AgAgpAEAALMCADClAQAAEAAQpgEAALMCADCnAQIAAAABqAEBAAAAAakBAQCGAgAhqgFAAIcCACGrAQEAhgIAIeQBAACyAgAgAwAAABAAIAEAABEAMAIAABIAIAEAAAALACABAAAAEAAgCQMAALECACCkAQAArwIAMKUBAAAWABCmAQAArwIAMKcBAgCSAgAhqgFAAIcCACG5AQEAhgIAIcMBAACwAsMBIsQBAQCGAgAhAQMAAM8DACAJAwAAsQIAIKQBAACvAgAwpQEAABYAEKYBAACvAgAwpwECAAAAAaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAAAABAwAAABYAIAEAABcAMAIAABgAIAEAAAADACABAAAABwAgAQAAAAsAIAEAAAAWACABAAAAAQAgEgQAAKwCACAFAACtAgAgCgAAigIAIAsAAK4CACCkAQAApwIAMKUBAAAfABCmAQAApwIAMKcBAQCGAgAhqQEBAIYCACGqAUAAhwIAIbgBAACpAtoBItYBQACoAgAh1wEBAIgCACHYAQEAiAIAIdoBQACoAgAh2wEgAIkCACHcAQAAqgLDASPdAQAAqwIAIAoEAADMAwAgBQAAzQMAIAoAAPICACALAADOAwAg1gEAANACACDXAQAA0AIAINgBAADQAgAg2gEAANACACDcAQAA0AIAIN0BAADQAgAgAwAAAB8AIAEAACAAMAIAAAEAIAMAAAAfACABAAAgADACAAABACADAAAAHwAgAQAAIAAwAgAAAQAgDwQAAMgDACAFAADJAwAgCgAAygMAIAsAAMsDACCnAQEAAAABqQEBAAAAAaoBQAAAAAG4AQAAANoBAtYBQAAAAAHXAQEAAAAB2AEBAAAAAdoBQAAAAAHbASAAAAAB3AEAAADDAQPdAYAAAAABAREAACQAIAunAQEAAAABqQEBAAAAAaoBQAAAAAG4AQAAANoBAtYBQAAAAAHXAQEAAAAB2AEBAAAAAdoBQAAAAAHbASAAAAAB3AEAAADDAQPdAYAAAAABAREAACYAMAERAAAmADAPBAAAlwMAIAUAAJgDACAKAACZAwAgCwAAmgMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABAgAAAAEAIBEAACkAIAunAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQIAAAAfACARAAArACACAAAAHwAgEQAAKwAgAwAAAAEAIBgAACQAIBkAACkAIAEAAAABACABAAAAHwAgCQkAAJEDACAeAACTAwAgHwAAkgMAINYBAADQAgAg1wEAANACACDYAQAA0AIAINoBAADQAgAg3AEAANACACDdAQAA0AIAIA6kAQAAmwIAMKUBAAAyABCmAQAAmwIAMKcBAQDwAQAhqQEBAPABACGqAUAA8QEAIbgBAACdAtoBItYBQACcAgAh1wEBAP4BACHYAQEA_gEAIdoBQACcAgAh2wEgAP8BACHcAQAAngLDASPdAQAAnwIAIAMAAAAfACABAAAxADAdAAAyACADAAAAHwAgAQAAIAAwAgAAAQAgAQAAAAUAIAEAAAAFACADAAAAAwAgAQAABAAwAgAABQAgAwAAAAMAIAEAAAQAMAIAAAUAIAMAAAADACABAAAEADACAAAFACANAwAAkAMAIKcBAQAAAAG5AQEAAAABwwEBAAAAAc0BAQAAAAHOAQEAAAABzwEBAAAAAdABAQAAAAHRAQIAAAAB0gEBAAAAAdMBAQAAAAHUAQEAAAAB1QEBAAAAAQERAAA6ACAMpwEBAAAAAbkBAQAAAAHDAQEAAAABzQEBAAAAAc4BAQAAAAHPAQEAAAAB0AEBAAAAAdEBAgAAAAHSAQEAAAAB0wEBAAAAAdQBAQAAAAHVAQEAAAABAREAADwAMAERAAA8ADANAwAAjwMAIKcBAQDBAgAhuQEBAMECACHDAQEAwQIAIc0BAQDBAgAhzgEBAMECACHPAQEA1AIAIdABAQDUAgAh0QECAI4DACHSAQEA1AIAIdMBAQDUAgAh1AEBANQCACHVAQEA1AIAIQIAAAAFACARAAA_ACAMpwEBAMECACG5AQEAwQIAIcMBAQDBAgAhzQEBAMECACHOAQEAwQIAIc8BAQDUAgAh0AEBANQCACHRAQIAjgMAIdIBAQDUAgAh0wEBANQCACHUAQEA1AIAIdUBAQDUAgAhAgAAAAMAIBEAAEEAIAIAAAADACARAABBACADAAAABQAgGAAAOgAgGQAAPwAgAQAAAAUAIAEAAAADACAMCQAAiQMAIB4AAIwDACAfAACLAwAgMAAAigMAIDEAAI0DACDPAQAA0AIAINABAADQAgAg0QEAANACACDSAQAA0AIAINMBAADQAgAg1AEAANACACDVAQAA0AIAIA-kAQAAlwIAMKUBAABIABCmAQAAlwIAMKcBAQDwAQAhuQEBAPABACHDAQEA8AEAIc0BAQDwAQAhzgEBAPABACHPAQEA_gEAIdABAQD-AQAh0QECAJgCACHSAQEA_gEAIdMBAQD-AQAh1AEBAP4BACHVAQEA_gEAIQMAAAADACABAABHADAdAABIACADAAAAAwAgAQAABAAwAgAABQAgAQAAAAkAIAEAAAAJACADAAAABwAgAQAACAAwAgAACQAgAwAAAAcAIAEAAAgAMAIAAAkAIAMAAAAHACABAAAIADACAAAJACAFAwAAiAMAIKcBAQAAAAG5AQEAAAABygFAAAAAAcwBAQAAAAEBEQAAUAAgBKcBAQAAAAG5AQEAAAABygFAAAAAAcwBAQAAAAEBEQAAUgAwAREAAFIAMAUDAACHAwAgpwEBAMECACG5AQEAwQIAIcoBQADCAgAhzAEBAMECACECAAAACQAgEQAAVQAgBKcBAQDBAgAhuQEBAMECACHKAUAAwgIAIcwBAQDBAgAhAgAAAAcAIBEAAFcAIAIAAAAHACARAABXACADAAAACQAgGAAAUAAgGQAAVQAgAQAAAAkAIAEAAAAHACADCQAAhAMAIB4AAIYDACAfAACFAwAgB6QBAACWAgAwpQEAAF4AEKYBAACWAgAwpwEBAPABACG5AQEA8AEAIcoBQADxAQAhzAEBAPABACEDAAAABwAgAQAAXQAwHQAAXgAgAwAAAAcAIAEAAAgAMAIAAAkAIAekAQAAlAIAMKUBAABkABCmAQAAlAIAMKgBAQAAAAHJAQEAhgIAIcoBQACHAgAhywEAAJUCACABAAAAYQAgAQAAAGEAIAakAQAAlAIAMKUBAABkABCmAQAAlAIAMKgBAQCGAgAhyQEBAIYCACHKAUAAhwIAIQADAAAAZAAgAQAAZQAwAgAAYQAgAwAAAGQAIAEAAGUAMAIAAGEAIAMAAABkACABAABlADACAABhACADqAEBAAAAAckBAQAAAAHKAUAAAAABAREAAGkAIAOoAQEAAAAByQEBAAAAAcoBQAAAAAEBEQAAawAwAREAAGsAMAOoAQEAwQIAIckBAQDBAgAhygFAAMICACECAAAAYQAgEQAAbgAgA6gBAQDBAgAhyQEBAMECACHKAUAAwgIAIQIAAABkACARAABwACACAAAAZAAgEQAAcAAgAwAAAGEAIBgAAGkAIBkAAG4AIAEAAABhACABAAAAZAAgAwkAAIEDACAeAACDAwAgHwAAggMAIAakAQAAkwIAMKUBAAB3ABCmAQAAkwIAMKgBAQDwAQAhyQEBAPABACHKAUAA8QEAIQMAAABkACABAAB2ADAdAAB3ACADAAAAZAAgAQAAZQAwAgAAYQAgCqQBAACRAgAwpQEAAH0AEKYBAACRAgAwpwECAAAAAakBAQCGAgAhqgFAAIcCACHFAQEAAAABxgFAAIcCACHHAQEAiAIAIcgBAQCIAgAhAQAAAHoAIAEAAAB6ACAKpAEAAJECADClAQAAfQAQpgEAAJECADCnAQIAkgIAIakBAQCGAgAhqgFAAIcCACHFAQEAhgIAIcYBQACHAgAhxwEBAIgCACHIAQEAiAIAIQLHAQAA0AIAIMgBAADQAgAgAwAAAH0AIAEAAH4AMAIAAHoAIAMAAAB9ACABAAB-ADACAAB6ACADAAAAfQAgAQAAfgAwAgAAegAgB6cBAgAAAAGpAQEAAAABqgFAAAAAAcUBAQAAAAHGAUAAAAABxwEBAAAAAcgBAQAAAAEBEQAAggEAIAenAQIAAAABqQEBAAAAAaoBQAAAAAHFAQEAAAABxgFAAAAAAccBAQAAAAHIAQEAAAABAREAAIQBADABEQAAhAEAMAenAQIAwwIAIakBAQDBAgAhqgFAAMICACHFAQEAwQIAIcYBQADCAgAhxwEBANQCACHIAQEA1AIAIQIAAAB6ACARAACHAQAgB6cBAgDDAgAhqQEBAMECACGqAUAAwgIAIcUBAQDBAgAhxgFAAMICACHHAQEA1AIAIcgBAQDUAgAhAgAAAH0AIBEAAIkBACACAAAAfQAgEQAAiQEAIAMAAAB6ACAYAACCAQAgGQAAhwEAIAEAAAB6ACABAAAAfQAgBwkAAPwCACAeAAD_AgAgHwAA_gIAIDAAAP0CACAxAACAAwAgxwEAANACACDIAQAA0AIAIAqkAQAAkAIAMKUBAACQAQAQpgEAAJACADCnAQIA7wEAIakBAQDwAQAhqgFAAPEBACHFAQEA8AEAIcYBQADxAQAhxwEBAP4BACHIAQEA_gEAIQMAAAB9ACABAACPAQAwHQAAkAEAIAMAAAB9ACABAAB-ADACAAB6ACABAAAAGAAgAQAAABgAIAMAAAAWACABAAAXADACAAAYACADAAAAFgAgAQAAFwAwAgAAGAAgAwAAABYAIAEAABcAMAIAABgAIAYDAAD7AgAgpwECAAAAAaoBQAAAAAG5AQEAAAABwwEAAADDAQLEAQEAAAABAREAAJgBACAFpwECAAAAAaoBQAAAAAG5AQEAAAABwwEAAADDAQLEAQEAAAABAREAAJoBADABEQAAmgEAMAYDAAD6AgAgpwECAMMCACGqAUAAwgIAIbkBAQDBAgAhwwEAAPkCwwEixAEBAMECACECAAAAGAAgEQAAnQEAIAWnAQIAwwIAIaoBQADCAgAhuQEBAMECACHDAQAA-QLDASLEAQEAwQIAIQIAAAAWACARAACfAQAgAgAAABYAIBEAAJ8BACADAAAAGAAgGAAAmAEAIBkAAJ0BACABAAAAGAAgAQAAABYAIAUJAAD0AgAgHgAA9wIAIB8AAPYCACAwAAD1AgAgMQAA-AIAIAikAQAAjAIAMKUBAACmAQAQpgEAAIwCADCnAQIA7wEAIaoBQADxAQAhuQEBAPABACHDAQAAjQLDASLEAQEA8AEAIQMAAAAWACABAAClAQAwHQAApgEAIAMAAAAWACABAAAXADACAAAYACAMBgAAigIAIAgAAIsCACCkAQAAhQIAMKUBAACsAQAQpgEAAIUCADCnAQEAAAABqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAhAQAAAKkBACABAAAAqQEAIAwGAACKAgAgCAAAiwIAIKQBAACFAgAwpQEAAKwBABCmAQAAhQIAMKcBAQCGAgAhqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAhBAYAAPICACAIAADzAgAgvAEAANACACC9AQAA0AIAIAMAAACsAQAgAQAArQEAMAIAAKkBACADAAAArAEAIAEAAK0BADACAACpAQAgAwAAAKwBACABAACtAQAwAgAAqQEAIAkGAADwAgAgCAAA8QIAIKcBAQAAAAGqAUAAAAABugFAAAAAAbsBAQAAAAG8AQEAAAABvQEBAAAAAb4BIAAAAAEBEQAAsQEAIAenAQEAAAABqgFAAAAAAboBQAAAAAG7AQEAAAABvAEBAAAAAb0BAQAAAAG-ASAAAAABAREAALMBADABEQAAswEAMAkGAADWAgAgCAAA1wIAIKcBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhAgAAAKkBACARAAC2AQAgB6cBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhAgAAAKwBACARAAC4AQAgAgAAAKwBACARAAC4AQAgAwAAAKkBACAYAACxAQAgGQAAtgEAIAEAAACpAQAgAQAAAKwBACAFCQAA0QIAIB4AANMCACAfAADSAgAgvAEAANACACC9AQAA0AIAIAqkAQAA_QEAMKUBAAC_AQAQpgEAAP0BADCnAQEA8AEAIaoBQADxAQAhugFAAPEBACG7AQEA8AEAIbwBAQD-AQAhvQEBAP4BACG-ASAA_wEAIQMAAACsAQAgAQAAvgEAMB0AAL8BACADAAAArAEAIAEAAK0BADACAACpAQAgAQAAAA0AIAEAAAANACADAAAACwAgAQAADAAwAgAADQAgAwAAAAsAIAEAAAwAMAIAAA0AIAMAAAALACABAAAMADACAAANACAGAwAAzgIAIAcAAM8CACCnAQIAAAABqwEBAAAAAbgBAAAAuAECuQEBAAAAAQERAADHAQAgBKcBAgAAAAGrAQEAAAABuAEAAAC4AQK5AQEAAAABAREAAMkBADABEQAAyQEAMAYDAADMAgAgBwAAzQIAIKcBAgDDAgAhqwEBAMECACG4AQAAywK4ASK5AQEAwQIAIQIAAAANACARAADMAQAgBKcBAgDDAgAhqwEBAMECACG4AQAAywK4ASK5AQEAwQIAIQIAAAALACARAADOAQAgAgAAAAsAIBEAAM4BACADAAAADQAgGAAAxwEAIBkAAMwBACABAAAADQAgAQAAAAsAIAUJAADGAgAgHgAAyQIAIB8AAMgCACAwAADHAgAgMQAAygIAIAekAQAA-QEAMKUBAADVAQAQpgEAAPkBADCnAQIA7wEAIasBAQDwAQAhuAEAAPoBuAEiuQEBAPABACEDAAAACwAgAQAA1AEAMB0AANUBACADAAAACwAgAQAADAAwAgAADQAgAQAAABIAIAEAAAASACADAAAAEAAgAQAAEQAwAgAAEgAgAwAAABAAIAEAABEAMAIAABIAIAMAAAAQACABAAARADACAAASACAGBwAAxQIAIKcBAgAAAAGoAQEAAAABqQEBAAAAAaoBQAAAAAGrAQEAAAABAREAAN0BACAFpwECAAAAAagBAQAAAAGpAQEAAAABqgFAAAAAAasBAQAAAAEBEQAA3wEAMAERAADfAQAwBgcAAMQCACCnAQIAwwIAIagBAQDBAgAhqQEBAMECACGqAUAAwgIAIasBAQDBAgAhAgAAABIAIBEAAOIBACAFpwECAMMCACGoAQEAwQIAIakBAQDBAgAhqgFAAMICACGrAQEAwQIAIQIAAAAQACARAADkAQAgAgAAABAAIBEAAOQBACADAAAAEgAgGAAA3QEAIBkAAOIBACABAAAAEgAgAQAAABAAIAUJAAC8AgAgHgAAvwIAIB8AAL4CACAwAAC9AgAgMQAAwAIAIAikAQAA7gEAMKUBAADrAQAQpgEAAO4BADCnAQIA7wEAIagBAQDwAQAhqQEBAPABACGqAUAA8QEAIasBAQDwAQAhAwAAABAAIAEAAOoBADAdAADrAQAgAwAAABAAIAEAABEAMAIAABIAIAikAQAA7gEAMKUBAADrAQAQpgEAAO4BADCnAQIA7wEAIagBAQDwAQAhqQEBAPABACGqAUAA8QEAIasBAQDwAQAhDQkAAPMBACAeAADzAQAgHwAA8wEAIDAAAPgBACAxAADzAQAgrAECAAAAAa0BAgAAAASuAQIAAAAErwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgD3AQAhDgkAAPMBACAeAAD2AQAgHwAA9gEAIKwBAQAAAAGtAQEAAAAErgEBAAAABK8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEA9QEAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQsJAADzAQAgHgAA9AEAIB8AAPQBACCsAUAAAAABrQFAAAAABK4BQAAAAASvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAPIBACELCQAA8wEAIB4AAPQBACAfAAD0AQAgrAFAAAAAAa0BQAAAAASuAUAAAAAErwFAAAAAAbABQAAAAAGxAUAAAAABsgFAAAAAAbMBQADyAQAhCKwBAgAAAAGtAQIAAAAErgECAAAABK8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIA8wEAIQisAUAAAAABrQFAAAAABK4BQAAAAASvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAPQBACEOCQAA8wEAIB4AAPYBACAfAAD2AQAgrAEBAAAAAa0BAQAAAASuAQEAAAAErwEBAAAAAbABAQAAAAGxAQEAAAABsgEBAAAAAbMBAQD1AQAhtAEBAAAAAbUBAQAAAAG2AQEAAAABC6wBAQAAAAGtAQEAAAAErgEBAAAABK8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEA9gEAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQ0JAADzAQAgHgAA8wEAIB8AAPMBACAwAAD4AQAgMQAA8wEAIKwBAgAAAAGtAQIAAAAErgECAAAABK8BAgAAAAGwAQIAAAABsQECAAAAAbIBAgAAAAGzAQIA9wEAIQisAQgAAAABrQEIAAAABK4BCAAAAASvAQgAAAABsAEIAAAAAbEBCAAAAAGyAQgAAAABswEIAPgBACEHpAEAAPkBADClAQAA1QEAEKYBAAD5AQAwpwECAO8BACGrAQEA8AEAIbgBAAD6AbgBIrkBAQDwAQAhBwkAAPMBACAeAAD8AQAgHwAA_AEAIKwBAAAAuAECrQEAAAC4AQiuAQAAALgBCLMBAAD7AbgBIgcJAADzAQAgHgAA_AEAIB8AAPwBACCsAQAAALgBAq0BAAAAuAEIrgEAAAC4AQizAQAA-wG4ASIErAEAAAC4AQKtAQAAALgBCK4BAAAAuAEIswEAAPwBuAEiCqQBAAD9AQAwpQEAAL8BABCmAQAA_QEAMKcBAQDwAQAhqgFAAPEBACG6AUAA8QEAIbsBAQDwAQAhvAEBAP4BACG9AQEA_gEAIb4BIAD_AQAhDgkAAIMCACAeAACEAgAgHwAAhAIAIKwBAQAAAAGtAQEAAAAFrgEBAAAABa8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEAggIAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQUJAADzAQAgHgAAgQIAIB8AAIECACCsASAAAAABswEgAIACACEFCQAA8wEAIB4AAIECACAfAACBAgAgrAEgAAAAAbMBIACAAgAhAqwBIAAAAAGzASAAgQIAIQ4JAACDAgAgHgAAhAIAIB8AAIQCACCsAQEAAAABrQEBAAAABa4BAQAAAAWvAQEAAAABsAEBAAAAAbEBAQAAAAGyAQEAAAABswEBAIICACG0AQEAAAABtQEBAAAAAbYBAQAAAAEIrAECAAAAAa0BAgAAAAWuAQIAAAAFrwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgCDAgAhC6wBAQAAAAGtAQEAAAAFrgEBAAAABa8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEAhAIAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQwGAACKAgAgCAAAiwIAIKQBAACFAgAwpQEAAKwBABCmAQAAhQIAMKcBAQCGAgAhqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAhC6wBAQAAAAGtAQEAAAAErgEBAAAABK8BAQAAAAGwAQEAAAABsQEBAAAAAbIBAQAAAAGzAQEA9gEAIbQBAQAAAAG1AQEAAAABtgEBAAAAAQisAUAAAAABrQFAAAAABK4BQAAAAASvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAPQBACELrAEBAAAAAa0BAQAAAAWuAQEAAAAFrwEBAAAAAbABAQAAAAGxAQEAAAABsgEBAAAAAbMBAQCEAgAhtAEBAAAAAbUBAQAAAAG2AQEAAAABAqwBIAAAAAGzASAAgQIAIQO_AQAACwAgwAEAAAsAIMEBAAALACADvwEAABAAIMABAAAQACDBAQAAEAAgCKQBAACMAgAwpQEAAKYBABCmAQAAjAIAMKcBAgDvAQAhqgFAAPEBACG5AQEA8AEAIcMBAACNAsMBIsQBAQDwAQAhBwkAAPMBACAeAACPAgAgHwAAjwIAIKwBAAAAwwECrQEAAADDAQiuAQAAAMMBCLMBAACOAsMBIgcJAADzAQAgHgAAjwIAIB8AAI8CACCsAQAAAMMBAq0BAAAAwwEIrgEAAADDAQizAQAAjgLDASIErAEAAADDAQKtAQAAAMMBCK4BAAAAwwEIswEAAI8CwwEiCqQBAACQAgAwpQEAAJABABCmAQAAkAIAMKcBAgDvAQAhqQEBAPABACGqAUAA8QEAIcUBAQDwAQAhxgFAAPEBACHHAQEA_gEAIcgBAQD-AQAhCqQBAACRAgAwpQEAAH0AEKYBAACRAgAwpwECAJICACGpAQEAhgIAIaoBQACHAgAhxQEBAIYCACHGAUAAhwIAIccBAQCIAgAhyAEBAIgCACEIrAECAAAAAa0BAgAAAASuAQIAAAAErwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgDzAQAhBqQBAACTAgAwpQEAAHcAEKYBAACTAgAwqAEBAPABACHJAQEA8AEAIcoBQADxAQAhBqQBAACUAgAwpQEAAGQAEKYBAACUAgAwqAEBAIYCACHJAQEAhgIAIcoBQACHAgAhAqgBAQAAAAHJAQEAAAABB6QBAACWAgAwpQEAAF4AEKYBAACWAgAwpwEBAPABACG5AQEA8AEAIcoBQADxAQAhzAEBAPABACEPpAEAAJcCADClAQAASAAQpgEAAJcCADCnAQEA8AEAIbkBAQDwAQAhwwEBAPABACHNAQEA8AEAIc4BAQDwAQAhzwEBAP4BACHQAQEA_gEAIdEBAgCYAgAh0gEBAP4BACHTAQEA_gEAIdQBAQD-AQAh1QEBAP4BACENCQAAgwIAIB4AAIMCACAfAACDAgAgMAAAmgIAIDEAAIMCACCsAQIAAAABrQECAAAABa4BAgAAAAWvAQIAAAABsAECAAAAAbEBAgAAAAGyAQIAAAABswECAJkCACENCQAAgwIAIB4AAIMCACAfAACDAgAgMAAAmgIAIDEAAIMCACCsAQIAAAABrQECAAAABa4BAgAAAAWvAQIAAAABsAECAAAAAbEBAgAAAAGyAQIAAAABswECAJkCACEIrAEIAAAAAa0BCAAAAAWuAQgAAAAFrwEIAAAAAbABCAAAAAGxAQgAAAABsgEIAAAAAbMBCACaAgAhDqQBAACbAgAwpQEAADIAEKYBAACbAgAwpwEBAPABACGpAQEA8AEAIaoBQADxAQAhuAEAAJ0C2gEi1gFAAJwCACHXAQEA_gEAIdgBAQD-AQAh2gFAAJwCACHbASAA_wEAIdwBAACeAsMBI90BAACfAgAgCwkAAIMCACAeAACmAgAgHwAApgIAIKwBQAAAAAGtAUAAAAAFrgFAAAAABa8BQAAAAAGwAUAAAAABsQFAAAAAAbIBQAAAAAGzAUAApQIAIQcJAADzAQAgHgAApAIAIB8AAKQCACCsAQAAANoBAq0BAAAA2gEIrgEAAADaAQizAQAAowLaASIHCQAAgwIAIB4AAKICACAfAACiAgAgrAEAAADDAQOtAQAAAMMBCa4BAAAAwwEJswEAAKECwwEjDwkAAIMCACAeAACgAgAgHwAAoAIAIKwBgAAAAAGvAYAAAAABsAGAAAAAAbEBgAAAAAGyAYAAAAABswGAAAAAAd4BAQAAAAHfAQEAAAAB4AEBAAAAAeEBgAAAAAHiAYAAAAAB4wGAAAAAAQysAYAAAAABrwGAAAAAAbABgAAAAAGxAYAAAAABsgGAAAAAAbMBgAAAAAHeAQEAAAAB3wEBAAAAAeABAQAAAAHhAYAAAAAB4gGAAAAAAeMBgAAAAAEHCQAAgwIAIB4AAKICACAfAACiAgAgrAEAAADDAQOtAQAAAMMBCa4BAAAAwwEJswEAAKECwwEjBKwBAAAAwwEDrQEAAADDAQmuAQAAAMMBCbMBAACiAsMBIwcJAADzAQAgHgAApAIAIB8AAKQCACCsAQAAANoBAq0BAAAA2gEIrgEAAADaAQizAQAAowLaASIErAEAAADaAQKtAQAAANoBCK4BAAAA2gEIswEAAKQC2gEiCwkAAIMCACAeAACmAgAgHwAApgIAIKwBQAAAAAGtAUAAAAAFrgFAAAAABa8BQAAAAAGwAUAAAAABsQFAAAAAAbIBQAAAAAGzAUAApQIAIQisAUAAAAABrQFAAAAABa4BQAAAAAWvAUAAAAABsAFAAAAAAbEBQAAAAAGyAUAAAAABswFAAKYCACESBAAArAIAIAUAAK0CACAKAACKAgAgCwAArgIAIKQBAACnAgAwpQEAAB8AEKYBAACnAgAwpwEBAIYCACGpAQEAhgIAIaoBQACHAgAhuAEAAKkC2gEi1gFAAKgCACHXAQEAiAIAIdgBAQCIAgAh2gFAAKgCACHbASAAiQIAIdwBAACqAsMBI90BAACrAgAgCKwBQAAAAAGtAUAAAAAFrgFAAAAABa8BQAAAAAGwAUAAAAABsQFAAAAAAbIBQAAAAAGzAUAApgIAIQSsAQAAANoBAq0BAAAA2gEIrgEAAADaAQizAQAApALaASIErAEAAADDAQOtAQAAAMMBCa4BAAAAwwEJswEAAKICwwEjDKwBgAAAAAGvAYAAAAABsAGAAAAAAbEBgAAAAAGyAYAAAAABswGAAAAAAd4BAQAAAAHfAQEAAAAB4AEBAAAAAeEBgAAAAAHiAYAAAAAB4wGAAAAAAQO_AQAAAwAgwAEAAAMAIMEBAAADACADvwEAAAcAIMABAAAHACDBAQAABwAgA78BAAAWACDAAQAAFgAgwQEAABYAIAkDAACxAgAgpAEAAK8CADClAQAAFgAQpgEAAK8CADCnAQIAkgIAIaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQSsAQAAAMMBAq0BAAAAwwEIrgEAAADDAQizAQAAjwLDASIUBAAArAIAIAUAAK0CACAKAACKAgAgCwAArgIAIKQBAACnAgAwpQEAAB8AEKYBAACnAgAwpwEBAIYCACGpAQEAhgIAIaoBQACHAgAhuAEAAKkC2gEi1gFAAKgCACHXAQEAiAIAIdgBAQCIAgAh2gFAAKgCACHbASAAiQIAIdwBAACqAsMBI90BAACrAgAg5wEAAB8AIOgBAAAfACACqQEBAAAAAasBAQAAAAEJBwAAtAIAIKQBAACzAgAwpQEAABAAEKYBAACzAgAwpwECAJICACGoAQEAhgIAIakBAQCGAgAhqgFAAIcCACGrAQEAhgIAIQ4GAACKAgAgCAAAiwIAIKQBAACFAgAwpQEAAKwBABCmAQAAhQIAMKcBAQCGAgAhqgFAAIcCACG6AUAAhwIAIbsBAQCGAgAhvAEBAIgCACG9AQEAiAIAIb4BIACJAgAh5wEAAKwBACDoAQAArAEAIAKrAQEAAAABuQEBAAAAAQkDAACxAgAgBwAAtAIAIKQBAAC2AgAwpQEAAAsAEKYBAAC2AgAwpwECAJICACGrAQEAhgIAIbgBAAC3ArgBIrkBAQCGAgAhBKwBAAAAuAECrQEAAAC4AQiuAQAAALgBCLMBAAD8AbgBIggDAACxAgAgpAEAALgCADClAQAABwAQpgEAALgCADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQLDAQEAAAABzgEBAAAAARADAACxAgAgpAEAALoCADClAQAAAwAQpgEAALoCADCnAQEAhgIAIbkBAQCGAgAhwwEBAIYCACHNAQEAhgIAIc4BAQCGAgAhzwEBAIgCACHQAQEAiAIAIdEBAgC7AgAh0gEBAIgCACHTAQEAiAIAIdQBAQCIAgAh1QEBAIgCACEIrAECAAAAAa0BAgAAAAWuAQIAAAAFrwECAAAAAbABAgAAAAGxAQIAAAABsgECAAAAAbMBAgCDAgAhAAAAAAAB7AEBAAAAAQHsAUAAAAABBewBAgAAAAHyAQIAAAAB8wECAAAAAfQBAgAAAAH1AQIAAAABBRgAAPADACAZAADzAwAg6QEAAPEDACDqAQAA8gMAIO8BAACpAQAgAxgAAPADACDpAQAA8QMAIO8BAACpAQAgAAAAAAAB7AEAAAC4AQIFGAAA6AMAIBkAAO4DACDpAQAA6QMAIOoBAADtAwAg7wEAAAEAIAUYAADmAwAgGQAA6wMAIOkBAADnAwAg6gEAAOoDACDvAQAAqQEAIAMYAADoAwAg6QEAAOkDACDvAQAAAQAgAxgAAOYDACDpAQAA5wMAIO8BAACpAQAgAAAAAAHsAQEAAAABAewBIAAAAAELGAAA5AIAMBkAAOkCADDpAQAA5QIAMOoBAADmAgAw6wEAAOcCACDsAQAA6AIAMO0BAADoAgAw7gEAAOgCADDvAQAA6AIAMPABAADqAgAw8QEAAOsCADALGAAA2AIAMBkAAN0CADDpAQAA2QIAMOoBAADaAgAw6wEAANsCACDsAQAA3AIAMO0BAADcAgAw7gEAANwCADDvAQAA3AIAMPABAADeAgAw8QEAAN8CADAEpwECAAAAAagBAQAAAAGpAQEAAAABqgFAAAAAAQIAAAASACAYAADjAgAgAwAAABIAIBgAAOMCACAZAADiAgAgAREAAOUDADAKBwAAtAIAIKQBAACzAgAwpQEAABAAEKYBAACzAgAwpwECAAAAAagBAQAAAAGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACHkAQAAsgIAIAIAAAASACARAADiAgAgAgAAAOACACARAADhAgAgCKQBAADfAgAwpQEAAOACABCmAQAA3wIAMKcBAgCSAgAhqAEBAIYCACGpAQEAhgIAIaoBQACHAgAhqwEBAIYCACEIpAEAAN8CADClAQAA4AIAEKYBAADfAgAwpwECAJICACGoAQEAhgIAIakBAQCGAgAhqgFAAIcCACGrAQEAhgIAIQSnAQIAwwIAIagBAQDBAgAhqQEBAMECACGqAUAAwgIAIQSnAQIAwwIAIagBAQDBAgAhqQEBAMECACGqAUAAwgIAIQSnAQIAAAABqAEBAAAAAakBAQAAAAGqAUAAAAABBAMAAM4CACCnAQIAAAABuAEAAAC4AQK5AQEAAAABAgAAAA0AIBgAAO8CACADAAAADQAgGAAA7wIAIBkAAO4CACABEQAA5AMAMAoDAACxAgAgBwAAtAIAIKQBAAC2AgAwpQEAAAsAEKYBAAC2AgAwpwECAAAAAasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACHlAQAAtQIAIAIAAAANACARAADuAgAgAgAAAOwCACARAADtAgAgB6QBAADrAgAwpQEAAOwCABCmAQAA6wIAMKcBAgCSAgAhqwEBAIYCACG4AQAAtwK4ASK5AQEAhgIAIQekAQAA6wIAMKUBAADsAgAQpgEAAOsCADCnAQIAkgIAIasBAQCGAgAhuAEAALcCuAEiuQEBAIYCACEDpwECAMMCACG4AQAAywK4ASK5AQEAwQIAIQQDAADMAgAgpwECAMMCACG4AQAAywK4ASK5AQEAwQIAIQQDAADOAgAgpwECAAAAAbgBAAAAuAECuQEBAAAAAQQYAADkAgAw6QEAAOUCADDrAQAA5wIAIO8BAADoAgAwBBgAANgCADDpAQAA2QIAMOsBAADbAgAg7wEAANwCADAAAAAAAAAAAewBAAAAwwECBRgAAN8DACAZAADiAwAg6QEAAOADACDqAQAA4QMAIO8BAAABACADGAAA3wMAIOkBAADgAwAg7wEAAAEAIAAAAAAAAAAAAAAABRgAANoDACAZAADdAwAg6QEAANsDACDqAQAA3AMAIO8BAAABACADGAAA2gMAIOkBAADbAwAg7wEAAAEAIAAAAAAABewBAgAAAAHyAQIAAAAB8wECAAAAAfQBAgAAAAH1AQIAAAABBRgAANUDACAZAADYAwAg6QEAANYDACDqAQAA1wMAIO8BAAABACADGAAA1QMAIOkBAADWAwAg7wEAAAEAIAAAAAHsAUAAAAABAewBAAAA2gECAewBAAAAwwEDCxgAALwDADAZAADBAwAw6QEAAL0DADDqAQAAvgMAMOsBAAC_AwAg7AEAAMADADDtAQAAwAMAMO4BAADAAwAw7wEAAMADADDwAQAAwgMAMPEBAADDAwAwCxgAALADADAZAAC1AwAw6QEAALEDADDqAQAAsgMAMOsBAACzAwAg7AEAALQDADDtAQAAtAMAMO4BAAC0AwAw7wEAALQDADDwAQAAtgMAMPEBAAC3AwAwCxgAAKcDADAZAACrAwAw6QEAAKgDADDqAQAAqQMAMOsBAACqAwAg7AEAAOgCADDtAQAA6AIAMO4BAADoAgAw7wEAAOgCADDwAQAArAMAMPEBAADrAgAwCxgAAJsDADAZAACgAwAw6QEAAJwDADDqAQAAnQMAMOsBAACeAwAg7AEAAJ8DADDtAQAAnwMAMO4BAACfAwAw7wEAAJ8DADDwAQAAoQMAMPEBAACiAwAwBKcBAgAAAAGqAUAAAAABwwEAAADDAQLEAQEAAAABAgAAABgAIBgAAKYDACADAAAAGAAgGAAApgMAIBkAAKUDACABEQAA1AMAMAkDAACxAgAgpAEAAK8CADClAQAAFgAQpgEAAK8CADCnAQIAAAABqgFAAIcCACG5AQEAhgIAIcMBAACwAsMBIsQBAQAAAAECAAAAGAAgEQAApQMAIAIAAACjAwAgEQAApAMAIAikAQAAogMAMKUBAACjAwAQpgEAAKIDADCnAQIAkgIAIaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQikAQAAogMAMKUBAACjAwAQpgEAAKIDADCnAQIAkgIAIaoBQACHAgAhuQEBAIYCACHDAQAAsALDASLEAQEAhgIAIQSnAQIAwwIAIaoBQADCAgAhwwEAAPkCwwEixAEBAMECACEEpwECAMMCACGqAUAAwgIAIcMBAAD5AsMBIsQBAQDBAgAhBKcBAgAAAAGqAUAAAAABwwEAAADDAQLEAQEAAAABBAcAAM8CACCnAQIAAAABqwEBAAAAAbgBAAAAuAECAgAAAA0AIBgAAK8DACADAAAADQAgGAAArwMAIBkAAK4DACABEQAA0wMAMAIAAAANACARAACuAwAgAgAAAOwCACARAACtAwAgA6cBAgDDAgAhqwEBAMECACG4AQAAywK4ASIEBwAAzQIAIKcBAgDDAgAhqwEBAMECACG4AQAAywK4ASIEBwAAzwIAIKcBAgAAAAGrAQEAAAABuAEAAAC4AQIDpwEBAAAAAcoBQAAAAAHMAQEAAAABAgAAAAkAIBgAALsDACADAAAACQAgGAAAuwMAIBkAALoDACABEQAA0gMAMAgDAACxAgAgpAEAALgCADClAQAABwAQpgEAALgCADCnAQEAAAABuQEBAIYCACHKAUAAhwIAIcwBAQAAAAECAAAACQAgEQAAugMAIAIAAAC4AwAgEQAAuQMAIAekAQAAtwMAMKUBAAC4AwAQpgEAALcDADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQekAQAAtwMAMKUBAAC4AwAQpgEAALcDADCnAQEAhgIAIbkBAQCGAgAhygFAAIcCACHMAQEAhgIAIQOnAQEAwQIAIcoBQADCAgAhzAEBAMECACEDpwEBAMECACHKAUAAwgIAIcwBAQDBAgAhA6cBAQAAAAHKAUAAAAABzAEBAAAAAQunAQEAAAABwwEBAAAAAc0BAQAAAAHOAQEAAAABzwEBAAAAAdABAQAAAAHRAQIAAAAB0gEBAAAAAdMBAQAAAAHUAQEAAAAB1QEBAAAAAQIAAAAFACAYAADHAwAgAwAAAAUAIBgAAMcDACAZAADGAwAgAREAANEDADARAwAAsQIAIKQBAAC6AgAwpQEAAAMAEKYBAAC6AgAwpwEBAAAAAbkBAQCGAgAhwwEBAIYCACHNAQEAhgIAIc4BAQCGAgAhzwEBAIgCACHQAQEAiAIAIdEBAgC7AgAh0gEBAIgCACHTAQEAiAIAIdQBAQCIAgAh1QEBAIgCACHmAQAAuQIAIAIAAAAFACARAADGAwAgAgAAAMQDACARAADFAwAgD6QBAADDAwAwpQEAAMQDABCmAQAAwwMAMKcBAQCGAgAhuQEBAIYCACHDAQEAhgIAIc0BAQCGAgAhzgEBAIYCACHPAQEAiAIAIdABAQCIAgAh0QECALsCACHSAQEAiAIAIdMBAQCIAgAh1AEBAIgCACHVAQEAiAIAIQ-kAQAAwwMAMKUBAADEAwAQpgEAAMMDADCnAQEAhgIAIbkBAQCGAgAhwwEBAIYCACHNAQEAhgIAIc4BAQCGAgAhzwEBAIgCACHQAQEAiAIAIdEBAgC7AgAh0gEBAIgCACHTAQEAiAIAIdQBAQCIAgAh1QEBAIgCACELpwEBAMECACHDAQEAwQIAIc0BAQDBAgAhzgEBAMECACHPAQEA1AIAIdABAQDUAgAh0QECAI4DACHSAQEA1AIAIdMBAQDUAgAh1AEBANQCACHVAQEA1AIAIQunAQEAwQIAIcMBAQDBAgAhzQEBAMECACHOAQEAwQIAIc8BAQDUAgAh0AEBANQCACHRAQIAjgMAIdIBAQDUAgAh0wEBANQCACHUAQEA1AIAIdUBAQDUAgAhC6cBAQAAAAHDAQEAAAABzQEBAAAAAc4BAQAAAAHPAQEAAAAB0AEBAAAAAdEBAgAAAAHSAQEAAAAB0wEBAAAAAdQBAQAAAAHVAQEAAAABBBgAALwDADDpAQAAvQMAMOsBAAC_AwAg7wEAAMADADAEGAAAsAMAMOkBAACxAwAw6wEAALMDACDvAQAAtAMAMAQYAACnAwAw6QEAAKgDADDrAQAAqgMAIO8BAADoAgAwBBgAAJsDADDpAQAAnAMAMOsBAACeAwAg7wEAAJ8DADAAAAAKBAAAzAMAIAUAAM0DACAKAADyAgAgCwAAzgMAINYBAADQAgAg1wEAANACACDYAQAA0AIAINoBAADQAgAg3AEAANACACDdAQAA0AIAIAQGAADyAgAgCAAA8wIAILwBAADQAgAgvQEAANACACALpwEBAAAAAcMBAQAAAAHNAQEAAAABzgEBAAAAAc8BAQAAAAHQAQEAAAAB0QECAAAAAdIBAQAAAAHTAQEAAAAB1AEBAAAAAdUBAQAAAAEDpwEBAAAAAcoBQAAAAAHMAQEAAAABA6cBAgAAAAGrAQEAAAABuAEAAAC4AQIEpwECAAAAAaoBQAAAAAHDAQAAAMMBAsQBAQAAAAEOBQAAyQMAIAoAAMoDACALAADLAwAgpwEBAAAAAakBAQAAAAGqAUAAAAABuAEAAADaAQLWAUAAAAAB1wEBAAAAAdgBAQAAAAHaAUAAAAAB2wEgAAAAAdwBAAAAwwED3QGAAAAAAQIAAAABACAYAADVAwAgAwAAAB8AIBgAANUDACAZAADZAwAgEAAAAB8AIAUAAJgDACAKAACZAwAgCwAAmgMAIBEAANkDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQ4FAACYAwAgCgAAmQMAIAsAAJoDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQ4EAADIAwAgCgAAygMAIAsAAMsDACCnAQEAAAABqQEBAAAAAaoBQAAAAAG4AQAAANoBAtYBQAAAAAHXAQEAAAAB2AEBAAAAAdoBQAAAAAHbASAAAAAB3AEAAADDAQPdAYAAAAABAgAAAAEAIBgAANoDACADAAAAHwAgGAAA2gMAIBkAAN4DACAQAAAAHwAgBAAAlwMAIAoAAJkDACALAACaAwAgEQAA3gMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABDgQAAJcDACAKAACZAwAgCwAAmgMAIKcBAQDBAgAhqQEBAMECACGqAUAAwgIAIbgBAACVA9oBItYBQACUAwAh1wEBANQCACHYAQEA1AIAIdoBQACUAwAh2wEgANUCACHcAQAAlgPDASPdAYAAAAABDgQAAMgDACAFAADJAwAgCgAAygMAIKcBAQAAAAGpAQEAAAABqgFAAAAAAbgBAAAA2gEC1gFAAAAAAdcBAQAAAAHYAQEAAAAB2gFAAAAAAdsBIAAAAAHcAQAAAMMBA90BgAAAAAECAAAAAQAgGAAA3wMAIAMAAAAfACAYAADfAwAgGQAA4wMAIBAAAAAfACAEAACXAwAgBQAAmAMAIAoAAJkDACARAADjAwAgpwEBAMECACGpAQEAwQIAIaoBQADCAgAhuAEAAJUD2gEi1gFAAJQDACHXAQEA1AIAIdgBAQDUAgAh2gFAAJQDACHbASAA1QIAIdwBAACWA8MBI90BgAAAAAEOBAAAlwMAIAUAAJgDACAKAACZAwAgpwEBAMECACGpAQEAwQIAIaoBQADCAgAhuAEAAJUD2gEi1gFAAJQDACHXAQEA1AIAIdgBAQDUAgAh2gFAAJQDACHbASAA1QIAIdwBAACWA8MBI90BgAAAAAEDpwECAAAAAbgBAAAAuAECuQEBAAAAAQSnAQIAAAABqAEBAAAAAakBAQAAAAGqAUAAAAABCAgAAPECACCnAQEAAAABqgFAAAAAAboBQAAAAAG7AQEAAAABvAEBAAAAAb0BAQAAAAG-ASAAAAABAgAAAKkBACAYAADmAwAgDgQAAMgDACAFAADJAwAgCwAAywMAIKcBAQAAAAGpAQEAAAABqgFAAAAAAbgBAAAA2gEC1gFAAAAAAdcBAQAAAAHYAQEAAAAB2gFAAAAAAdsBIAAAAAHcAQAAAMMBA90BgAAAAAECAAAAAQAgGAAA6AMAIAMAAACsAQAgGAAA5gMAIBkAAOwDACAKAAAArAEAIAgAANcCACARAADsAwAgpwEBAMECACGqAUAAwgIAIboBQADCAgAhuwEBAMECACG8AQEA1AIAIb0BAQDUAgAhvgEgANUCACEICAAA1wIAIKcBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhAwAAAB8AIBgAAOgDACAZAADvAwAgEAAAAB8AIAQAAJcDACAFAACYAwAgCwAAmgMAIBEAAO8DACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQ4EAACXAwAgBQAAmAMAIAsAAJoDACCnAQEAwQIAIakBAQDBAgAhqgFAAMICACG4AQAAlQPaASLWAUAAlAMAIdcBAQDUAgAh2AEBANQCACHaAUAAlAMAIdsBIADVAgAh3AEAAJYDwwEj3QGAAAAAAQgGAADwAgAgpwEBAAAAAaoBQAAAAAG6AUAAAAABuwEBAAAAAbwBAQAAAAG9AQEAAAABvgEgAAAAAQIAAACpAQAgGAAA8AMAIAMAAACsAQAgGAAA8AMAIBkAAPQDACAKAAAArAEAIAYAANYCACARAAD0AwAgpwEBAMECACGqAUAAwgIAIboBQADCAgAhuwEBAMECACG8AQEA1AIAIb0BAQDUAgAhvgEgANUCACEIBgAA1gIAIKcBAQDBAgAhqgFAAMICACG6AUAAwgIAIbsBAQDBAgAhvAEBANQCACG9AQEA1AIAIb4BIADVAgAhBQQGAgUKAwkACQoOBAsZCAEDAAEBAwABAgMAAQcABQMGDwQIEwYJAAcBBwAFAgYUAAgVAAEDAAEEBBoABRsAChwACx0AAAAAAwkADh4ADx8AEAAAAAMJAA4eAA8fABABAwABAQMAAQUJABUeABgfABkwABYxABcAAAAAAAUJABUeABgfABkwABYxABcBAwABAQMAAQMJAB4eAB8fACAAAAADCQAeHgAfHwAgAAAAAwkAJh4AJx8AKAAAAAMJACYeACcfACgAAAAFCQAuHgAxHwAyMAAvMQAwAAAAAAAFCQAuHgAxHwAyMAAvMQAwAQMAAQEDAAEFCQA3HgA6HwA7MAA4MQA5AAAAAAAFCQA3HgA6HwA7MAA4MQA5AAADCQBAHgBBHwBCAAAAAwkAQB4AQR8AQgIDAAEHAAUCAwABBwAFBQkARx4ASh8ASzAASDEASQAAAAAABQkARx4ASh8ASzAASDEASQEHAAUBBwAFBQkAUB4AUx8AVDAAUTEAUgAAAAAABQkAUB4AUx8AVDAAUTEAUgwCAQ0eAQ4hAQ8iARAjARIlARMnChQoCxUqARYsChctDBouARsvARwwCiAzDSE0ESI1AiM2AiQ3AiU4AiY5Aic7Aig9Cik-EipAAitCCixDEy1EAi5FAi9GCjJJFDNKGjRLAzVMAzZNAzdOAzhPAzlRAzpTCjtUGzxWAz1YCj5ZHD9aA0BbA0FcCkJfHUNgIURiIkVjIkZmIkdnIkhoIklqIkpsCkttI0xvIk1xCk5yJE9zIlB0IlF1ClJ4JVN5KVR7KlV8KlZ_KleAASpYgQEqWYMBKlqFAQpbhgErXIgBKl2KAQpeiwEsX4wBKmCNASphjgEKYpEBLWOSATNkkwEIZZQBCGaVAQhnlgEIaJcBCGmZAQhqmwEKa5wBNGyeAQhtoAEKbqEBNW-iAQhwowEIcaQBCnKnATZzqAE8dKoBBXWrAQV2rgEFd68BBXiwAQV5sgEFerQBCnu1AT18twEFfbkBCn66AT5_uwEFgAG8AQWBAb0BCoIBwAE_gwHBAUOEAcIBBIUBwwEEhgHEAQSHAcUBBIgBxgEEiQHIAQSKAcoBCosBywFEjAHNAQSNAc8BCo4B0AFFjwHRAQSQAdIBBJEB0wEKkgHWAUaTAdcBTJQB2AEGlQHZAQaWAdoBBpcB2wEGmAHcAQaZAd4BBpoB4AEKmwHhAU2cAeMBBp0B5QEKngHmAU6fAecBBqAB6AEGoQHpAQqiAewBT6MB7QFV"
-}
-
-async function decodeBase64AsWasm(wasmBase64: string): Promise<WebAssembly.Module> {
-  const { Buffer } = await import('node:buffer')
-  const wasmArray = Buffer.from(wasmBase64, 'base64')
-  return new WebAssembly.Module(wasmArray)
-}
-
-config.compilerWasm = {
-  getRuntime: async () => await import("@prisma/client/runtime/query_compiler_fast_bg.postgresql.mjs"),
-
-  getQueryCompilerWasmModule: async () => {
-    const { wasm } = await import("@prisma/client/runtime/query_compiler_fast_bg.postgresql.wasm-base64.mjs")
-    return await decodeBase64AsWasm(wasm)
-  },
-
-  importName: "./query_compiler_fast_bg.js"
-}
-
-
-
-export type LogOptions<ClientOptions extends Prisma.PrismaClientOptions> =
-  'log' extends keyof ClientOptions ? ClientOptions['log'] extends Array<Prisma.LogLevel | Prisma.LogDefinition> ? Prisma.GetEvents<ClientOptions['log']> : never : never
-
-export interface PrismaClientConstructor {
-    /**
-   * ## Prisma Client
-   * 
-   * Type-safe database client for TypeScript
-   * @example
-   * ```
-   * const prisma = new PrismaClient({
-   *   adapter: new PrismaPg({ connectionString: process.env.DATABASE_URL })
-   * })
-   * // Fetch zero or more Users
-   * const users = await prisma.user.findMany()
-   * ```
-   * 
-   * Read more in our [docs](https://pris.ly/d/client).
-   */
-
-  new <
-    Options extends Prisma.PrismaClientOptions = Prisma.PrismaClientOptions,
-    LogOpts extends LogOptions<Options> = LogOptions<Options>,
-    OmitOpts extends Prisma.PrismaClientOptions['omit'] = Options extends { omit: infer U } ? U : Prisma.PrismaClientOptions['omit'],
-    ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs
-  >(options: Prisma.Subset<Options, Prisma.PrismaClientOptions> ): PrismaClient<LogOpts, OmitOpts, ExtArgs>
-}
-
-/**
- * ## Prisma Client
- * 
- * Type-safe database client for TypeScript
- * @example
- * ```
- * const prisma = new PrismaClient({
- *   adapter: new PrismaPg({ connectionString: process.env.DATABASE_URL })
- * })
- * // Fetch zero or more Users
- * const users = await prisma.user.findMany()
- * ```
- * 
- * Read more in our [docs](https://pris.ly/d/client).
- */
-
-export interface PrismaClient<
-  in LogOpts extends Prisma.LogLevel = never,
-  in out OmitOpts extends Prisma.PrismaClientOptions['omit'] = undefined,
-  in out ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs
-> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['other'] }
-
-  $on<V extends LogOpts>(eventType: V, callback: (event: V extends 'query' ? Prisma.QueryEvent : Prisma.LogEvent) => void): PrismaClient;
-
-  /**
-   * Connect with the database
-   */
-  $connect(): runtime.Types.Utils.JsPromise<void>;
-
-  /**
-   * Disconnect from the database
-   */
-  $disconnect(): runtime.Types.Utils.JsPromise<void>;
-
-/**
-   * Executes a prepared raw query and returns the number of affected rows.
-   * @example
-   * ```
-   * const result = await prisma.$executeRaw`UPDATE User SET cool = ${true} WHERE email = ${'user@email.com'};`
-   * ```
-   *
-   * Read more in our [docs](https://pris.ly/d/raw-queries).
-   */
-  $executeRaw<T = unknown>(query: TemplateStringsArray | Prisma.Sql, ...values: any[]): Prisma.PrismaPromise<number>;
-
-  /**
-   * Executes a raw query and returns the number of affected rows.
-   * Susceptible to SQL injections, see documentation.
-   * @example
-   * ```
-   * const result = await prisma.$executeRawUnsafe('UPDATE User SET cool = $1 WHERE email = $2 ;', true, 'user@email.com')
-   * ```
-   *
-   * Read more in our [docs](https://pris.ly/d/raw-queries).
-   */
-  $executeRawUnsafe<T = unknown>(query: string, ...values: any[]): Prisma.PrismaPromise<number>;
-
-  /**
-   * Performs a prepared raw query and returns the `SELECT` data.
-   * @example
-   * ```
-   * const result = await prisma.$queryRaw`SELECT * FROM User WHERE id = ${1} OR email = ${'user@email.com'};`
-   * ```
-   *
-   * Read more in our [docs](https://pris.ly/d/raw-queries).
-   */
-  $queryRaw<T = unknown>(query: TemplateStringsArray | Prisma.Sql, ...values: any[]): Prisma.PrismaPromise<T>;
-
-  /**
-   * Performs a raw query and returns the `SELECT` data.
-   * Susceptible to SQL injections, see documentation.
-   * @example
-   * ```
-   * const result = await prisma.$queryRawUnsafe('SELECT * FROM User WHERE id = $1 OR email = $2;', 1, 'user@email.com')
-   * ```
-   *
-   * Read more in our [docs](https://pris.ly/d/raw-queries).
-   */
-  $queryRawUnsafe<T = unknown>(query: string, ...values: any[]): Prisma.PrismaPromise<T>;
-
-
-  /**
-   * Allows the running of a sequence of read/write operations that are guaranteed to either succeed or fail as a whole.
-   * @example
-   * ```
-   * const [george, bob, alice] = await prisma.$transaction([
-   *   prisma.user.create({ data: { name: 'George' } }),
-   *   prisma.user.create({ data: { name: 'Bob' } }),
-   *   prisma.user.create({ data: { name: 'Alice' } }),
-   * ])
-   * ```
-   * 
-   * Read more in our [docs](https://www.prisma.io/docs/orm/prisma-client/queries/transactions).
-   */
-  $transaction<P extends Prisma.PrismaPromise<any>[]>(arg: [...P], options?: { isolationLevel?: Prisma.TransactionIsolationLevel }): runtime.Types.Utils.JsPromise<runtime.Types.Utils.UnwrapTuple<P>>
-
-  $transaction<R>(fn: (prisma: Omit<PrismaClient, runtime.ITXClientDenyList>) => runtime.Types.Utils.JsPromise<R>, options?: { maxWait?: number, timeout?: number, isolationLevel?: Prisma.TransactionIsolationLevel }): runtime.Types.Utils.JsPromise<R>
-
-  $extends: runtime.Types.Extensions.ExtendsHook<"extends", Prisma.TypeMapCb<OmitOpts>, ExtArgs, runtime.Types.Utils.Call<Prisma.TypeMapCb<OmitOpts>, {
-    extArgs: ExtArgs
-  }>>
-
-      /**
-   * `prisma.user`: Exposes CRUD operations for the **User** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more Users
-    * const users = await prisma.user.findMany()
-    * ```
-    */
-  get user(): Prisma.UserDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.account`: Exposes CRUD operations for the **Account** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more Accounts
-    * const accounts = await prisma.account.findMany()
-    * ```
-    */
-  get account(): Prisma.AccountDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.session`: Exposes CRUD operations for the **Session** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more Sessions
-    * const sessions = await prisma.session.findMany()
-    * ```
-    */
-  get session(): Prisma.SessionDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.verificationToken`: Exposes CRUD operations for the **VerificationToken** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more VerificationTokens
-    * const verificationTokens = await prisma.verificationToken.findMany()
-    * ```
-    */
-  get verificationToken(): Prisma.VerificationTokenDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.magicLinkToken`: Exposes CRUD operations for the **MagicLinkToken** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more MagicLinkTokens
-    * const magicLinkTokens = await prisma.magicLinkToken.findMany()
-    * ```
-    */
-  get magicLinkToken(): Prisma.MagicLinkTokenDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.transaction`: Exposes CRUD operations for the **Transaction** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more Transactions
-    * const transactions = await prisma.transaction.findMany()
-    * ```
-    */
-  get transaction(): Prisma.TransactionDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.project`: Exposes CRUD operations for the **Project** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more Projects
-    * const projects = await prisma.project.findMany()
-    * ```
-    */
-  get project(): Prisma.ProjectDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.projectMember`: Exposes CRUD operations for the **ProjectMember** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more ProjectMembers
-    * const projectMembers = await prisma.projectMember.findMany()
-    * ```
-    */
-  get projectMember(): Prisma.ProjectMemberDelegate<ExtArgs, { omit: OmitOpts }>;
-
-  /**
-   * `prisma.projectInvitation`: Exposes CRUD operations for the **ProjectInvitation** model.
-    * Example usage:
-    * ```ts
-    * // Fetch zero or more ProjectInvitations
-    * const projectInvitations = await prisma.projectInvitation.findMany()
-    * ```
-    */
-  get projectInvitation(): Prisma.ProjectInvitationDelegate<ExtArgs, { omit: OmitOpts }>;
-}
-
-export function getPrismaClientClass(): PrismaClientConstructor {
-  return runtime.getPrismaClient(config) as unknown as PrismaClientConstructor
-}
diff --git a/src/generated/client/internal/prismaNamespace.ts b/src/generated/client/internal/prismaNamespace.ts
deleted file mode 100644
index 9e34c497..00000000
--- a/src/generated/client/internal/prismaNamespace.ts
+++ /dev/null
@@ -1,1563 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * WARNING: This is an internal file that is subject to change!
- *
- * 🛑 Under no circumstances should you import this file directly! 🛑
- *
- * All exports from this file are wrapped under a `Prisma` namespace object in the client.ts file.
- * While this enables partial backward compatibility, it is not part of the stable public API.
- *
- * If you are looking for your Models, Enums, and Input Types, please import them from the respective
- * model files in the `model` directory!
- */
-
-import * as runtime from "@prisma/client/runtime/client"
-import type * as Prisma from "../models"
-import { type PrismaClient } from "./class"
-
-export type * from '../models'
-
-export type DMMF = typeof runtime.DMMF
-
-export type PrismaPromise<T> = runtime.Types.Public.PrismaPromise<T>
-
-/**
- * Prisma Errors
- */
-
-export const PrismaClientKnownRequestError = runtime.PrismaClientKnownRequestError
-export type PrismaClientKnownRequestError = runtime.PrismaClientKnownRequestError
-
-export const PrismaClientUnknownRequestError = runtime.PrismaClientUnknownRequestError
-export type PrismaClientUnknownRequestError = runtime.PrismaClientUnknownRequestError
-
-export const PrismaClientRustPanicError = runtime.PrismaClientRustPanicError
-export type PrismaClientRustPanicError = runtime.PrismaClientRustPanicError
-
-export const PrismaClientInitializationError = runtime.PrismaClientInitializationError
-export type PrismaClientInitializationError = runtime.PrismaClientInitializationError
-
-export const PrismaClientValidationError = runtime.PrismaClientValidationError
-export type PrismaClientValidationError = runtime.PrismaClientValidationError
-
-/**
- * Re-export of sql-template-tag
- */
-export const sql = runtime.sqltag
-export const empty = runtime.empty
-export const join = runtime.join
-export const raw = runtime.raw
-export const Sql = runtime.Sql
-export type Sql = runtime.Sql
-
-
-
-/**
- * Decimal.js
- */
-export const Decimal = runtime.Decimal
-export type Decimal = runtime.Decimal
-
-export type DecimalJsLike = runtime.DecimalJsLike
-
-/**
-* Extensions
-*/
-export type Extension = runtime.Types.Extensions.UserArgs
-export const getExtensionContext = runtime.Extensions.getExtensionContext
-export type Args<T, F extends runtime.Operation> = runtime.Types.Public.Args<T, F>
-export type Payload<T, F extends runtime.Operation = never> = runtime.Types.Public.Payload<T, F>
-export type Result<T, A, F extends runtime.Operation> = runtime.Types.Public.Result<T, A, F>
-export type Exact<A, W> = runtime.Types.Public.Exact<A, W>
-
-export type PrismaVersion = {
-  client: string
-  engine: string
-}
-
-/**
- * Prisma Client JS version: 7.7.0
- * Query Engine version: 75cbdc1eb7150937890ad5465d861175c6624711
- */
-export const prismaVersion: PrismaVersion = {
-  client: "7.7.0",
-  engine: "75cbdc1eb7150937890ad5465d861175c6624711"
-}
-
-/**
- * Utility Types
- */
-
-export type Bytes = runtime.Bytes
-export type JsonObject = runtime.JsonObject
-export type JsonArray = runtime.JsonArray
-export type JsonValue = runtime.JsonValue
-export type InputJsonObject = runtime.InputJsonObject
-export type InputJsonArray = runtime.InputJsonArray
-export type InputJsonValue = runtime.InputJsonValue
-
-
-export const NullTypes = {
-  DbNull: runtime.NullTypes.DbNull as (new (secret: never) => typeof runtime.DbNull),
-  JsonNull: runtime.NullTypes.JsonNull as (new (secret: never) => typeof runtime.JsonNull),
-  AnyNull: runtime.NullTypes.AnyNull as (new (secret: never) => typeof runtime.AnyNull),
-}
-/**
- * Helper for filtering JSON entries that have `null` on the database (empty on the db)
- *
- * @see https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-on-a-json-field
- */
-export const DbNull = runtime.DbNull
-
-/**
- * Helper for filtering JSON entries that have JSON `null` values (not empty on the db)
- *
- * @see https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-on-a-json-field
- */
-export const JsonNull = runtime.JsonNull
-
-/**
- * Helper for filtering JSON entries that are `Prisma.DbNull` or `Prisma.JsonNull`
- *
- * @see https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-on-a-json-field
- */
-export const AnyNull = runtime.AnyNull
-
-
-type SelectAndInclude = {
-  select: any
-  include: any
-}
-
-type SelectAndOmit = {
-  select: any
-  omit: any
-}
-
-/**
- * From T, pick a set of properties whose keys are in the union K
- */
-type Prisma__Pick<T, K extends keyof T> = {
-    [P in K]: T[P];
-};
-
-export type Enumerable<T> = T | Array<T>;
-
-/**
- * Subset
- * @desc From `T` pick properties that exist in `U`. Simple version of Intersection
- */
-export type Subset<T, U> = {
-  [key in keyof T]: key extends keyof U ? T[key] : never;
-};
-
-/**
- * SelectSubset
- * @desc From `T` pick properties that exist in `U`. Simple version of Intersection.
- * Additionally, it validates, if both select and include are present. If the case, it errors.
- */
-export type SelectSubset<T, U> = {
-  [key in keyof T]: key extends keyof U ? T[key] : never
-} &
-  (T extends SelectAndInclude
-    ? 'Please either choose `select` or `include`.'
-    : T extends SelectAndOmit
-      ? 'Please either choose `select` or `omit`.'
-      : {})
-
-/**
- * Subset + Intersection
- * @desc From `T` pick properties that exist in `U` and intersect `K`
- */
-export type SubsetIntersection<T, U, K> = {
-  [key in keyof T]: key extends keyof U ? T[key] : never
-} &
-  K
-
-type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
-
-/**
- * XOR is needed to have a real mutually exclusive union type
- * https://stackoverflow.com/questions/42123407/does-typescript-support-mutually-exclusive-types
- */
-export type XOR<T, U> =
-  T extends object ?
-  U extends object ?
-    (Without<T, U> & U) | (Without<U, T> & T)
-  : U : T
-
-
-/**
- * Is T a Record?
- */
-type IsObject<T extends any> = T extends Array<any>
-? False
-: T extends Date
-? False
-: T extends Uint8Array
-? False
-: T extends BigInt
-? False
-: T extends object
-? True
-: False
-
-
-/**
- * If it's T[], return T
- */
-export type UnEnumerate<T extends unknown> = T extends Array<infer U> ? U : T
-
-/**
- * From ts-toolbelt
- */
-
-type __Either<O extends object, K extends Key> = Omit<O, K> &
-  {
-    // Merge all but K
-    [P in K]: Prisma__Pick<O, P & keyof O> // With K possibilities
-  }[K]
-
-type EitherStrict<O extends object, K extends Key> = Strict<__Either<O, K>>
-
-type EitherLoose<O extends object, K extends Key> = ComputeRaw<__Either<O, K>>
-
-type _Either<
-  O extends object,
-  K extends Key,
-  strict extends Boolean
-> = {
-  1: EitherStrict<O, K>
-  0: EitherLoose<O, K>
-}[strict]
-
-export type Either<
-  O extends object,
-  K extends Key,
-  strict extends Boolean = 1
-> = O extends unknown ? _Either<O, K, strict> : never
-
-export type Union = any
-
-export type PatchUndefined<O extends object, O1 extends object> = {
-  [K in keyof O]: O[K] extends undefined ? At<O1, K> : O[K]
-} & {}
-
-/** Helper Types for "Merge" **/
-export type IntersectOf<U extends Union> = (
-  U extends unknown ? (k: U) => void : never
-) extends (k: infer I) => void
-  ? I
-  : never
-
-export type Overwrite<O extends object, O1 extends object> = {
-    [K in keyof O]: K extends keyof O1 ? O1[K] : O[K];
-} & {};
-
-type _Merge<U extends object> = IntersectOf<Overwrite<U, {
-    [K in keyof U]-?: At<U, K>;
-}>>;
-
-type Key = string | number | symbol;
-type AtStrict<O extends object, K extends Key> = O[K & keyof O];
-type AtLoose<O extends object, K extends Key> = O extends unknown ? AtStrict<O, K> : never;
-export type At<O extends object, K extends Key, strict extends Boolean = 1> = {
-    1: AtStrict<O, K>;
-    0: AtLoose<O, K>;
-}[strict];
-
-export type ComputeRaw<A extends any> = A extends Function ? A : {
-  [K in keyof A]: A[K];
-} & {};
-
-export type OptionalFlat<O> = {
-  [K in keyof O]?: O[K];
-} & {};
-
-type _Record<K extends keyof any, T> = {
-  [P in K]: T;
-};
-
-// cause typescript not to expand types and preserve names
-type NoExpand<T> = T extends unknown ? T : never;
-
-// this type assumes the passed object is entirely optional
-export type AtLeast<O extends object, K extends string> = NoExpand<
-  O extends unknown
-  ? | (K extends keyof O ? { [P in K]: O[P] } & O : O)
-    | {[P in keyof O as P extends K ? P : never]-?: O[P]} & O
-  : never>;
-
-type _Strict<U, _U = U> = U extends unknown ? U & OptionalFlat<_Record<Exclude<Keys<_U>, keyof U>, never>> : never;
-
-export type Strict<U extends object> = ComputeRaw<_Strict<U>>;
-/** End Helper Types for "Merge" **/
-
-export type Merge<U extends object> = ComputeRaw<_Merge<Strict<U>>>;
-
-export type Boolean = True | False
-
-export type True = 1
-
-export type False = 0
-
-export type Not<B extends Boolean> = {
-  0: 1
-  1: 0
-}[B]
-
-export type Extends<A1 extends any, A2 extends any> = [A1] extends [never]
-  ? 0 // anything `never` is false
-  : A1 extends A2
-  ? 1
-  : 0
-
-export type Has<U extends Union, U1 extends Union> = Not<
-  Extends<Exclude<U1, U>, U1>
->
-
-export type Or<B1 extends Boolean, B2 extends Boolean> = {
-  0: {
-    0: 0
-    1: 1
-  }
-  1: {
-    0: 1
-    1: 1
-  }
-}[B1][B2]
-
-export type Keys<U extends Union> = U extends unknown ? keyof U : never
-
-export type GetScalarType<T, O> = O extends object ? {
-  [P in keyof T]: P extends keyof O
-    ? O[P]
-    : never
-} : never
-
-type FieldPaths<
-  T,
-  U = Omit<T, '_avg' | '_sum' | '_count' | '_min' | '_max'>
-> = IsObject<T> extends True ? U : T
-
-export type GetHavingFields<T> = {
-  [K in keyof T]: Or<
-    Or<Extends<'OR', K>, Extends<'AND', K>>,
-    Extends<'NOT', K>
-  > extends True
-    ? // infer is only needed to not hit TS limit
-      // based on the brilliant idea of Pierre-Antoine Mills
-      // https://github.com/microsoft/TypeScript/issues/30188#issuecomment-478938437
-      T[K] extends infer TK
-      ? GetHavingFields<UnEnumerate<TK> extends object ? Merge<UnEnumerate<TK>> : never>
-      : never
-    : {} extends FieldPaths<T[K]>
-    ? never
-    : K
-}[keyof T]
-
-/**
- * Convert tuple to union
- */
-type _TupleToUnion<T> = T extends (infer E)[] ? E : never
-type TupleToUnion<K extends readonly any[]> = _TupleToUnion<K>
-export type MaybeTupleToUnion<T> = T extends any[] ? TupleToUnion<T> : T
-
-/**
- * Like `Pick`, but additionally can also accept an array of keys
- */
-export type PickEnumerable<T, K extends Enumerable<keyof T> | keyof T> = Prisma__Pick<T, MaybeTupleToUnion<K>>
-
-/**
- * Exclude all keys with underscores
- */
-export type ExcludeUnderscoreKeys<T extends string> = T extends `_${string}` ? never : T
-
-
-export type FieldRef<Model, FieldType> = runtime.FieldRef<Model, FieldType>
-
-type FieldRefInputType<Model, FieldType> = Model extends never ? never : FieldRef<Model, FieldType>
-
-
-export const ModelName = {
-  User: 'User',
-  Account: 'Account',
-  Session: 'Session',
-  VerificationToken: 'VerificationToken',
-  MagicLinkToken: 'MagicLinkToken',
-  Transaction: 'Transaction',
-  Project: 'Project',
-  ProjectMember: 'ProjectMember',
-  ProjectInvitation: 'ProjectInvitation'
-} as const
-
-export type ModelName = (typeof ModelName)[keyof typeof ModelName]
-
-
-
-export interface TypeMapCb<GlobalOmitOptions = {}> extends runtime.Types.Utils.Fn<{extArgs: runtime.Types.Extensions.InternalArgs }, runtime.Types.Utils.Record<string, any>> {
-  returns: TypeMap<this['params']['extArgs'], GlobalOmitOptions>
-}
-
-export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> = {
-  globalOmitOptions: {
-    omit: GlobalOmitOptions
-  }
-  meta: {
-    modelProps: "user" | "account" | "session" | "verificationToken" | "magicLinkToken" | "transaction" | "project" | "projectMember" | "projectInvitation"
-    txIsolationLevel: TransactionIsolationLevel
-  }
-  model: {
-    User: {
-      payload: Prisma.$UserPayload<ExtArgs>
-      fields: Prisma.UserFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.UserFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.UserFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>
-        }
-        findFirst: {
-          args: Prisma.UserFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.UserFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>
-        }
-        findMany: {
-          args: Prisma.UserFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>[]
-        }
-        create: {
-          args: Prisma.UserCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>
-        }
-        createMany: {
-          args: Prisma.UserCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.UserCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>[]
-        }
-        delete: {
-          args: Prisma.UserDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>
-        }
-        update: {
-          args: Prisma.UserUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>
-        }
-        deleteMany: {
-          args: Prisma.UserDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.UserUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.UserUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>[]
-        }
-        upsert: {
-          args: Prisma.UserUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$UserPayload>
-        }
-        aggregate: {
-          args: Prisma.UserAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateUser>
-        }
-        groupBy: {
-          args: Prisma.UserGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.UserGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.UserCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.UserCountAggregateOutputType> | number
-        }
-      }
-    }
-    Account: {
-      payload: Prisma.$AccountPayload<ExtArgs>
-      fields: Prisma.AccountFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.AccountFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.AccountFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>
-        }
-        findFirst: {
-          args: Prisma.AccountFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.AccountFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>
-        }
-        findMany: {
-          args: Prisma.AccountFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>[]
-        }
-        create: {
-          args: Prisma.AccountCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>
-        }
-        createMany: {
-          args: Prisma.AccountCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.AccountCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>[]
-        }
-        delete: {
-          args: Prisma.AccountDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>
-        }
-        update: {
-          args: Prisma.AccountUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>
-        }
-        deleteMany: {
-          args: Prisma.AccountDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.AccountUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.AccountUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>[]
-        }
-        upsert: {
-          args: Prisma.AccountUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$AccountPayload>
-        }
-        aggregate: {
-          args: Prisma.AccountAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateAccount>
-        }
-        groupBy: {
-          args: Prisma.AccountGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AccountGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.AccountCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AccountCountAggregateOutputType> | number
-        }
-      }
-    }
-    Session: {
-      payload: Prisma.$SessionPayload<ExtArgs>
-      fields: Prisma.SessionFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.SessionFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.SessionFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>
-        }
-        findFirst: {
-          args: Prisma.SessionFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.SessionFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>
-        }
-        findMany: {
-          args: Prisma.SessionFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>[]
-        }
-        create: {
-          args: Prisma.SessionCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>
-        }
-        createMany: {
-          args: Prisma.SessionCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.SessionCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>[]
-        }
-        delete: {
-          args: Prisma.SessionDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>
-        }
-        update: {
-          args: Prisma.SessionUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>
-        }
-        deleteMany: {
-          args: Prisma.SessionDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.SessionUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.SessionUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>[]
-        }
-        upsert: {
-          args: Prisma.SessionUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$SessionPayload>
-        }
-        aggregate: {
-          args: Prisma.SessionAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateSession>
-        }
-        groupBy: {
-          args: Prisma.SessionGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.SessionGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.SessionCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.SessionCountAggregateOutputType> | number
-        }
-      }
-    }
-    VerificationToken: {
-      payload: Prisma.$VerificationTokenPayload<ExtArgs>
-      fields: Prisma.VerificationTokenFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.VerificationTokenFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.VerificationTokenFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>
-        }
-        findFirst: {
-          args: Prisma.VerificationTokenFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.VerificationTokenFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>
-        }
-        findMany: {
-          args: Prisma.VerificationTokenFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>[]
-        }
-        create: {
-          args: Prisma.VerificationTokenCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>
-        }
-        createMany: {
-          args: Prisma.VerificationTokenCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.VerificationTokenCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>[]
-        }
-        delete: {
-          args: Prisma.VerificationTokenDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>
-        }
-        update: {
-          args: Prisma.VerificationTokenUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>
-        }
-        deleteMany: {
-          args: Prisma.VerificationTokenDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.VerificationTokenUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.VerificationTokenUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>[]
-        }
-        upsert: {
-          args: Prisma.VerificationTokenUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$VerificationTokenPayload>
-        }
-        aggregate: {
-          args: Prisma.VerificationTokenAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateVerificationToken>
-        }
-        groupBy: {
-          args: Prisma.VerificationTokenGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.VerificationTokenGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.VerificationTokenCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.VerificationTokenCountAggregateOutputType> | number
-        }
-      }
-    }
-    MagicLinkToken: {
-      payload: Prisma.$MagicLinkTokenPayload<ExtArgs>
-      fields: Prisma.MagicLinkTokenFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.MagicLinkTokenFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.MagicLinkTokenFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>
-        }
-        findFirst: {
-          args: Prisma.MagicLinkTokenFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.MagicLinkTokenFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>
-        }
-        findMany: {
-          args: Prisma.MagicLinkTokenFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>[]
-        }
-        create: {
-          args: Prisma.MagicLinkTokenCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>
-        }
-        createMany: {
-          args: Prisma.MagicLinkTokenCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.MagicLinkTokenCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>[]
-        }
-        delete: {
-          args: Prisma.MagicLinkTokenDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>
-        }
-        update: {
-          args: Prisma.MagicLinkTokenUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>
-        }
-        deleteMany: {
-          args: Prisma.MagicLinkTokenDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.MagicLinkTokenUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.MagicLinkTokenUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>[]
-        }
-        upsert: {
-          args: Prisma.MagicLinkTokenUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$MagicLinkTokenPayload>
-        }
-        aggregate: {
-          args: Prisma.MagicLinkTokenAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateMagicLinkToken>
-        }
-        groupBy: {
-          args: Prisma.MagicLinkTokenGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.MagicLinkTokenGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.MagicLinkTokenCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.MagicLinkTokenCountAggregateOutputType> | number
-        }
-      }
-    }
-    Transaction: {
-      payload: Prisma.$TransactionPayload<ExtArgs>
-      fields: Prisma.TransactionFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.TransactionFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.TransactionFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>
-        }
-        findFirst: {
-          args: Prisma.TransactionFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.TransactionFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>
-        }
-        findMany: {
-          args: Prisma.TransactionFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>[]
-        }
-        create: {
-          args: Prisma.TransactionCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>
-        }
-        createMany: {
-          args: Prisma.TransactionCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.TransactionCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>[]
-        }
-        delete: {
-          args: Prisma.TransactionDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>
-        }
-        update: {
-          args: Prisma.TransactionUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>
-        }
-        deleteMany: {
-          args: Prisma.TransactionDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.TransactionUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.TransactionUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>[]
-        }
-        upsert: {
-          args: Prisma.TransactionUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$TransactionPayload>
-        }
-        aggregate: {
-          args: Prisma.TransactionAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateTransaction>
-        }
-        groupBy: {
-          args: Prisma.TransactionGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.TransactionGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.TransactionCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.TransactionCountAggregateOutputType> | number
-        }
-      }
-    }
-    Project: {
-      payload: Prisma.$ProjectPayload<ExtArgs>
-      fields: Prisma.ProjectFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.ProjectFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.ProjectFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>
-        }
-        findFirst: {
-          args: Prisma.ProjectFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.ProjectFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>
-        }
-        findMany: {
-          args: Prisma.ProjectFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>[]
-        }
-        create: {
-          args: Prisma.ProjectCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>
-        }
-        createMany: {
-          args: Prisma.ProjectCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.ProjectCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>[]
-        }
-        delete: {
-          args: Prisma.ProjectDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>
-        }
-        update: {
-          args: Prisma.ProjectUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>
-        }
-        deleteMany: {
-          args: Prisma.ProjectDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.ProjectUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.ProjectUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>[]
-        }
-        upsert: {
-          args: Prisma.ProjectUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectPayload>
-        }
-        aggregate: {
-          args: Prisma.ProjectAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateProject>
-        }
-        groupBy: {
-          args: Prisma.ProjectGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ProjectGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.ProjectCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ProjectCountAggregateOutputType> | number
-        }
-      }
-    }
-    ProjectMember: {
-      payload: Prisma.$ProjectMemberPayload<ExtArgs>
-      fields: Prisma.ProjectMemberFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.ProjectMemberFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.ProjectMemberFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>
-        }
-        findFirst: {
-          args: Prisma.ProjectMemberFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.ProjectMemberFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>
-        }
-        findMany: {
-          args: Prisma.ProjectMemberFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>[]
-        }
-        create: {
-          args: Prisma.ProjectMemberCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>
-        }
-        createMany: {
-          args: Prisma.ProjectMemberCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.ProjectMemberCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>[]
-        }
-        delete: {
-          args: Prisma.ProjectMemberDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>
-        }
-        update: {
-          args: Prisma.ProjectMemberUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>
-        }
-        deleteMany: {
-          args: Prisma.ProjectMemberDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.ProjectMemberUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.ProjectMemberUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>[]
-        }
-        upsert: {
-          args: Prisma.ProjectMemberUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectMemberPayload>
-        }
-        aggregate: {
-          args: Prisma.ProjectMemberAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateProjectMember>
-        }
-        groupBy: {
-          args: Prisma.ProjectMemberGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ProjectMemberGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.ProjectMemberCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ProjectMemberCountAggregateOutputType> | number
-        }
-      }
-    }
-    ProjectInvitation: {
-      payload: Prisma.$ProjectInvitationPayload<ExtArgs>
-      fields: Prisma.ProjectInvitationFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.ProjectInvitationFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.ProjectInvitationFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>
-        }
-        findFirst: {
-          args: Prisma.ProjectInvitationFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.ProjectInvitationFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>
-        }
-        findMany: {
-          args: Prisma.ProjectInvitationFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>[]
-        }
-        create: {
-          args: Prisma.ProjectInvitationCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>
-        }
-        createMany: {
-          args: Prisma.ProjectInvitationCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.ProjectInvitationCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>[]
-        }
-        delete: {
-          args: Prisma.ProjectInvitationDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>
-        }
-        update: {
-          args: Prisma.ProjectInvitationUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>
-        }
-        deleteMany: {
-          args: Prisma.ProjectInvitationDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.ProjectInvitationUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.ProjectInvitationUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>[]
-        }
-        upsert: {
-          args: Prisma.ProjectInvitationUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$ProjectInvitationPayload>
-        }
-        aggregate: {
-          args: Prisma.ProjectInvitationAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateProjectInvitation>
-        }
-        groupBy: {
-          args: Prisma.ProjectInvitationGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ProjectInvitationGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.ProjectInvitationCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.ProjectInvitationCountAggregateOutputType> | number
-        }
-      }
-    }
-  }
-} & {
-  other: {
-    payload: any
-    operations: {
-      $executeRaw: {
-        args: [query: TemplateStringsArray | Sql, ...values: any[]],
-        result: any
-      }
-      $executeRawUnsafe: {
-        args: [query: string, ...values: any[]],
-        result: any
-      }
-      $queryRaw: {
-        args: [query: TemplateStringsArray | Sql, ...values: any[]],
-        result: any
-      }
-      $queryRawUnsafe: {
-        args: [query: string, ...values: any[]],
-        result: any
-      }
-    }
-  }
-}
-
-/**
- * Enums
- */
-
-export const TransactionIsolationLevel = runtime.makeStrictEnum({
-  ReadUncommitted: 'ReadUncommitted',
-  ReadCommitted: 'ReadCommitted',
-  RepeatableRead: 'RepeatableRead',
-  Serializable: 'Serializable'
-} as const)
-
-export type TransactionIsolationLevel = (typeof TransactionIsolationLevel)[keyof typeof TransactionIsolationLevel]
-
-
-export const UserScalarFieldEnum = {
-  id: 'id',
-  createdAt: 'createdAt',
-  email: 'email',
-  emailVerified: 'emailVerified',
-  username: 'username',
-  color: 'color',
-  role: 'role',
-  isProUntil: 'isProUntil',
-  isSubscriptionCancelled: 'isSubscriptionCancelled',
-  subscriptionProvider: 'subscriptionProvider',
-  settings: 'settings'
-} as const
-
-export type UserScalarFieldEnum = (typeof UserScalarFieldEnum)[keyof typeof UserScalarFieldEnum]
-
-
-export const AccountScalarFieldEnum = {
-  id: 'id',
-  userId: 'userId',
-  type: 'type',
-  provider: 'provider',
-  providerAccountId: 'providerAccountId',
-  refresh_token: 'refresh_token',
-  access_token: 'access_token',
-  expires_at: 'expires_at',
-  token_type: 'token_type',
-  scope: 'scope',
-  id_token: 'id_token',
-  session_state: 'session_state'
-} as const
-
-export type AccountScalarFieldEnum = (typeof AccountScalarFieldEnum)[keyof typeof AccountScalarFieldEnum]
-
-
-export const SessionScalarFieldEnum = {
-  id: 'id',
-  sessionToken: 'sessionToken',
-  userId: 'userId',
-  expires: 'expires'
-} as const
-
-export type SessionScalarFieldEnum = (typeof SessionScalarFieldEnum)[keyof typeof SessionScalarFieldEnum]
-
-
-export const VerificationTokenScalarFieldEnum = {
-  identifier: 'identifier',
-  token: 'token',
-  expires: 'expires'
-} as const
-
-export type VerificationTokenScalarFieldEnum = (typeof VerificationTokenScalarFieldEnum)[keyof typeof VerificationTokenScalarFieldEnum]
-
-
-export const MagicLinkTokenScalarFieldEnum = {
-  id: 'id',
-  email: 'email',
-  tokenHash: 'tokenHash',
-  expiresAt: 'expiresAt',
-  createdAt: 'createdAt',
-  desktopNonce: 'desktopNonce',
-  inviteToken: 'inviteToken'
-} as const
-
-export type MagicLinkTokenScalarFieldEnum = (typeof MagicLinkTokenScalarFieldEnum)[keyof typeof MagicLinkTokenScalarFieldEnum]
-
-
-export const TransactionScalarFieldEnum = {
-  id: 'id',
-  userId: 'userId',
-  provider: 'provider',
-  transactionId: 'transactionId',
-  createdAt: 'createdAt'
-} as const
-
-export type TransactionScalarFieldEnum = (typeof TransactionScalarFieldEnum)[keyof typeof TransactionScalarFieldEnum]
-
-
-export const ProjectScalarFieldEnum = {
-  id: 'id',
-  createdAt: 'createdAt',
-  updatedAt: 'updatedAt',
-  title: 'title',
-  description: 'description',
-  author: 'author',
-  hasPoster: 'hasPoster'
-} as const
-
-export type ProjectScalarFieldEnum = (typeof ProjectScalarFieldEnum)[keyof typeof ProjectScalarFieldEnum]
-
-
-export const ProjectMemberScalarFieldEnum = {
-  id: 'id',
-  role: 'role',
-  userId: 'userId',
-  projectId: 'projectId'
-} as const
-
-export type ProjectMemberScalarFieldEnum = (typeof ProjectMemberScalarFieldEnum)[keyof typeof ProjectMemberScalarFieldEnum]
-
-
-export const ProjectInvitationScalarFieldEnum = {
-  id: 'id',
-  token: 'token',
-  email: 'email',
-  createdAt: 'createdAt',
-  projectId: 'projectId'
-} as const
-
-export type ProjectInvitationScalarFieldEnum = (typeof ProjectInvitationScalarFieldEnum)[keyof typeof ProjectInvitationScalarFieldEnum]
-
-
-export const SortOrder = {
-  asc: 'asc',
-  desc: 'desc'
-} as const
-
-export type SortOrder = (typeof SortOrder)[keyof typeof SortOrder]
-
-
-export const NullableJsonNullValueInput = {
-  DbNull: DbNull,
-  JsonNull: JsonNull
-} as const
-
-export type NullableJsonNullValueInput = (typeof NullableJsonNullValueInput)[keyof typeof NullableJsonNullValueInput]
-
-
-export const QueryMode = {
-  default: 'default',
-  insensitive: 'insensitive'
-} as const
-
-export type QueryMode = (typeof QueryMode)[keyof typeof QueryMode]
-
-
-export const JsonNullValueFilter = {
-  DbNull: DbNull,
-  JsonNull: JsonNull,
-  AnyNull: AnyNull
-} as const
-
-export type JsonNullValueFilter = (typeof JsonNullValueFilter)[keyof typeof JsonNullValueFilter]
-
-
-export const NullsOrder = {
-  first: 'first',
-  last: 'last'
-} as const
-
-export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder]
-
-
-
-/**
- * Field references
- */
-
-
-/**
- * Reference to a field of type 'String'
- */
-export type StringFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'String'>
-    
-
-
-/**
- * Reference to a field of type 'String[]'
- */
-export type ListStringFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'String[]'>
-    
-
-
-/**
- * Reference to a field of type 'DateTime'
- */
-export type DateTimeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'DateTime'>
-    
-
-
-/**
- * Reference to a field of type 'DateTime[]'
- */
-export type ListDateTimeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'DateTime[]'>
-    
-
-
-/**
- * Reference to a field of type 'UserRole'
- */
-export type EnumUserRoleFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'UserRole'>
-    
-
-
-/**
- * Reference to a field of type 'UserRole[]'
- */
-export type ListEnumUserRoleFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'UserRole[]'>
-    
-
-
-/**
- * Reference to a field of type 'Boolean'
- */
-export type BooleanFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Boolean'>
-    
-
-
-/**
- * Reference to a field of type 'SubscriptionProvider'
- */
-export type EnumSubscriptionProviderFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'SubscriptionProvider'>
-    
-
-
-/**
- * Reference to a field of type 'SubscriptionProvider[]'
- */
-export type ListEnumSubscriptionProviderFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'SubscriptionProvider[]'>
-    
-
-
-/**
- * Reference to a field of type 'Json'
- */
-export type JsonFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Json'>
-    
-
-
-/**
- * Reference to a field of type 'QueryMode'
- */
-export type EnumQueryModeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'QueryMode'>
-    
-
-
-/**
- * Reference to a field of type 'Int'
- */
-export type IntFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Int'>
-    
-
-
-/**
- * Reference to a field of type 'Int[]'
- */
-export type ListIntFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Int[]'>
-    
-
-
-/**
- * Reference to a field of type 'ProjectRole'
- */
-export type EnumProjectRoleFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'ProjectRole'>
-    
-
-
-/**
- * Reference to a field of type 'ProjectRole[]'
- */
-export type ListEnumProjectRoleFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'ProjectRole[]'>
-    
-
-
-/**
- * Reference to a field of type 'Float'
- */
-export type FloatFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Float'>
-    
-
-
-/**
- * Reference to a field of type 'Float[]'
- */
-export type ListFloatFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Float[]'>
-    
-
-/**
- * Batch Payload for updateMany & deleteMany & createMany
- */
-export type BatchPayload = {
-  count: number
-}
-
-export const defineExtension = runtime.Extensions.defineExtension as unknown as runtime.Types.Extensions.ExtendsHook<"define", TypeMapCb, runtime.Types.Extensions.DefaultArgs>
-export type DefaultPrismaClient = PrismaClient
-export type ErrorFormat = 'pretty' | 'colorless' | 'minimal'
-export type PrismaClientOptions = ({
-  /**
-   * Instance of a Driver Adapter, e.g., like one provided by `@prisma/adapter-pg`.
-   */
-  adapter: runtime.SqlDriverAdapterFactory
-  accelerateUrl?: never
-} | {
-  /**
-   * Prisma Accelerate URL allowing the client to connect through Accelerate instead of a direct database.
-   */
-  accelerateUrl: string
-  adapter?: never
-}) & {
-  /**
-   * @default "colorless"
-   */
-  errorFormat?: ErrorFormat
-  /**
-   * @example
-   * ```
-   * // Shorthand for `emit: 'stdout'`
-   * log: ['query', 'info', 'warn', 'error']
-   * 
-   * // Emit as events only
-   * log: [
-   *   { emit: 'event', level: 'query' },
-   *   { emit: 'event', level: 'info' },
-   *   { emit: 'event', level: 'warn' }
-   *   { emit: 'event', level: 'error' }
-   * ]
-   * 
-   * / Emit as events and log to stdout
-   * og: [
-   *  { emit: 'stdout', level: 'query' },
-   *  { emit: 'stdout', level: 'info' },
-   *  { emit: 'stdout', level: 'warn' }
-   *  { emit: 'stdout', level: 'error' }
-   * 
-   * ```
-   * Read more in our [docs](https://pris.ly/d/logging).
-   */
-  log?: (LogLevel | LogDefinition)[]
-  /**
-   * The default values for transactionOptions
-   * maxWait ?= 2000
-   * timeout ?= 5000
-   */
-  transactionOptions?: {
-    maxWait?: number
-    timeout?: number
-    isolationLevel?: TransactionIsolationLevel
-  }
-  /**
-   * Global configuration for omitting model fields by default.
-   * 
-   * @example
-   * ```
-   * const prisma = new PrismaClient({
-   *   omit: {
-   *     user: {
-   *       password: true
-   *     }
-   *   }
-   * })
-   * ```
-   */
-  omit?: GlobalOmitConfig
-  /**
-   * SQL commenter plugins that add metadata to SQL queries as comments.
-   * Comments follow the sqlcommenter format: https://google.github.io/sqlcommenter/
-   * 
-   * @example
-   * ```
-   * const prisma = new PrismaClient({
-   *   adapter,
-   *   comments: [
-   *     traceContext(),
-   *     queryInsights(),
-   *   ],
-   * })
-   * ```
-   */
-  comments?: runtime.SqlCommenterPlugin[]
-}
-export type GlobalOmitConfig = {
-  user?: Prisma.UserOmit
-  account?: Prisma.AccountOmit
-  session?: Prisma.SessionOmit
-  verificationToken?: Prisma.VerificationTokenOmit
-  magicLinkToken?: Prisma.MagicLinkTokenOmit
-  transaction?: Prisma.TransactionOmit
-  project?: Prisma.ProjectOmit
-  projectMember?: Prisma.ProjectMemberOmit
-  projectInvitation?: Prisma.ProjectInvitationOmit
-}
-
-/* Types for Logging */
-export type LogLevel = 'info' | 'query' | 'warn' | 'error'
-export type LogDefinition = {
-  level: LogLevel
-  emit: 'stdout' | 'event'
-}
-
-export type CheckIsLogLevel<T> = T extends LogLevel ? T : never;
-
-export type GetLogType<T> = CheckIsLogLevel<
-  T extends LogDefinition ? T['level'] : T
->;
-
-export type GetEvents<T extends any[]> = T extends Array<LogLevel | LogDefinition>
-  ? GetLogType<T[number]>
-  : never;
-
-export type QueryEvent = {
-  timestamp: Date
-  query: string
-  params: string
-  duration: number
-  target: string
-}
-
-export type LogEvent = {
-  timestamp: Date
-  message: string
-  target: string
-}
-/* End Types for Logging */
-
-
-export type PrismaAction =
-  | 'findUnique'
-  | 'findUniqueOrThrow'
-  | 'findMany'
-  | 'findFirst'
-  | 'findFirstOrThrow'
-  | 'create'
-  | 'createMany'
-  | 'createManyAndReturn'
-  | 'update'
-  | 'updateMany'
-  | 'updateManyAndReturn'
-  | 'upsert'
-  | 'delete'
-  | 'deleteMany'
-  | 'executeRaw'
-  | 'queryRaw'
-  | 'aggregate'
-  | 'count'
-  | 'runCommandRaw'
-  | 'findRaw'
-  | 'groupBy'
-
-/**
- * `PrismaClient` proxy available in interactive transactions.
- */
-export type TransactionClient = Omit<DefaultPrismaClient, runtime.ITXClientDenyList>
-
diff --git a/src/generated/client/internal/prismaNamespaceBrowser.ts b/src/generated/client/internal/prismaNamespaceBrowser.ts
deleted file mode 100644
index c67ed3f2..00000000
--- a/src/generated/client/internal/prismaNamespaceBrowser.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * WARNING: This is an internal file that is subject to change!
- *
- * 🛑 Under no circumstances should you import this file directly! 🛑
- *
- * All exports from this file are wrapped under a `Prisma` namespace object in the browser.ts file.
- * While this enables partial backward compatibility, it is not part of the stable public API.
- *
- * If you are looking for your Models, Enums, and Input Types, please import them from the respective
- * model files in the `model` directory!
- */
-
-import * as runtime from "@prisma/client/runtime/index-browser"
-
-export type * from '../models'
-export type * from './prismaNamespace'
-
-export const Decimal = runtime.Decimal
-
-
-export const NullTypes = {
-  DbNull: runtime.NullTypes.DbNull as (new (secret: never) => typeof runtime.DbNull),
-  JsonNull: runtime.NullTypes.JsonNull as (new (secret: never) => typeof runtime.JsonNull),
-  AnyNull: runtime.NullTypes.AnyNull as (new (secret: never) => typeof runtime.AnyNull),
-}
-/**
- * Helper for filtering JSON entries that have `null` on the database (empty on the db)
- *
- * @see https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-on-a-json-field
- */
-export const DbNull = runtime.DbNull
-
-/**
- * Helper for filtering JSON entries that have JSON `null` values (not empty on the db)
- *
- * @see https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-on-a-json-field
- */
-export const JsonNull = runtime.JsonNull
-
-/**
- * Helper for filtering JSON entries that are `Prisma.DbNull` or `Prisma.JsonNull`
- *
- * @see https://www.prisma.io/docs/concepts/components/prisma-client/working-with-fields/working-with-json-fields#filtering-on-a-json-field
- */
-export const AnyNull = runtime.AnyNull
-
-
-export const ModelName = {
-  User: 'User',
-  Account: 'Account',
-  Session: 'Session',
-  VerificationToken: 'VerificationToken',
-  MagicLinkToken: 'MagicLinkToken',
-  Transaction: 'Transaction',
-  Project: 'Project',
-  ProjectMember: 'ProjectMember',
-  ProjectInvitation: 'ProjectInvitation'
-} as const
-
-export type ModelName = (typeof ModelName)[keyof typeof ModelName]
-
-/*
- * Enums
- */
-
-export const TransactionIsolationLevel = runtime.makeStrictEnum({
-  ReadUncommitted: 'ReadUncommitted',
-  ReadCommitted: 'ReadCommitted',
-  RepeatableRead: 'RepeatableRead',
-  Serializable: 'Serializable'
-} as const)
-
-export type TransactionIsolationLevel = (typeof TransactionIsolationLevel)[keyof typeof TransactionIsolationLevel]
-
-
-export const UserScalarFieldEnum = {
-  id: 'id',
-  createdAt: 'createdAt',
-  email: 'email',
-  emailVerified: 'emailVerified',
-  username: 'username',
-  color: 'color',
-  role: 'role',
-  isProUntil: 'isProUntil',
-  isSubscriptionCancelled: 'isSubscriptionCancelled',
-  subscriptionProvider: 'subscriptionProvider',
-  settings: 'settings'
-} as const
-
-export type UserScalarFieldEnum = (typeof UserScalarFieldEnum)[keyof typeof UserScalarFieldEnum]
-
-
-export const AccountScalarFieldEnum = {
-  id: 'id',
-  userId: 'userId',
-  type: 'type',
-  provider: 'provider',
-  providerAccountId: 'providerAccountId',
-  refresh_token: 'refresh_token',
-  access_token: 'access_token',
-  expires_at: 'expires_at',
-  token_type: 'token_type',
-  scope: 'scope',
-  id_token: 'id_token',
-  session_state: 'session_state'
-} as const
-
-export type AccountScalarFieldEnum = (typeof AccountScalarFieldEnum)[keyof typeof AccountScalarFieldEnum]
-
-
-export const SessionScalarFieldEnum = {
-  id: 'id',
-  sessionToken: 'sessionToken',
-  userId: 'userId',
-  expires: 'expires'
-} as const
-
-export type SessionScalarFieldEnum = (typeof SessionScalarFieldEnum)[keyof typeof SessionScalarFieldEnum]
-
-
-export const VerificationTokenScalarFieldEnum = {
-  identifier: 'identifier',
-  token: 'token',
-  expires: 'expires'
-} as const
-
-export type VerificationTokenScalarFieldEnum = (typeof VerificationTokenScalarFieldEnum)[keyof typeof VerificationTokenScalarFieldEnum]
-
-
-export const MagicLinkTokenScalarFieldEnum = {
-  id: 'id',
-  email: 'email',
-  tokenHash: 'tokenHash',
-  expiresAt: 'expiresAt',
-  createdAt: 'createdAt',
-  desktopNonce: 'desktopNonce',
-  inviteToken: 'inviteToken'
-} as const
-
-export type MagicLinkTokenScalarFieldEnum = (typeof MagicLinkTokenScalarFieldEnum)[keyof typeof MagicLinkTokenScalarFieldEnum]
-
-
-export const TransactionScalarFieldEnum = {
-  id: 'id',
-  userId: 'userId',
-  provider: 'provider',
-  transactionId: 'transactionId',
-  createdAt: 'createdAt'
-} as const
-
-export type TransactionScalarFieldEnum = (typeof TransactionScalarFieldEnum)[keyof typeof TransactionScalarFieldEnum]
-
-
-export const ProjectScalarFieldEnum = {
-  id: 'id',
-  createdAt: 'createdAt',
-  updatedAt: 'updatedAt',
-  title: 'title',
-  description: 'description',
-  author: 'author',
-  hasPoster: 'hasPoster'
-} as const
-
-export type ProjectScalarFieldEnum = (typeof ProjectScalarFieldEnum)[keyof typeof ProjectScalarFieldEnum]
-
-
-export const ProjectMemberScalarFieldEnum = {
-  id: 'id',
-  role: 'role',
-  userId: 'userId',
-  projectId: 'projectId'
-} as const
-
-export type ProjectMemberScalarFieldEnum = (typeof ProjectMemberScalarFieldEnum)[keyof typeof ProjectMemberScalarFieldEnum]
-
-
-export const ProjectInvitationScalarFieldEnum = {
-  id: 'id',
-  token: 'token',
-  email: 'email',
-  createdAt: 'createdAt',
-  projectId: 'projectId'
-} as const
-
-export type ProjectInvitationScalarFieldEnum = (typeof ProjectInvitationScalarFieldEnum)[keyof typeof ProjectInvitationScalarFieldEnum]
-
-
-export const SortOrder = {
-  asc: 'asc',
-  desc: 'desc'
-} as const
-
-export type SortOrder = (typeof SortOrder)[keyof typeof SortOrder]
-
-
-export const NullableJsonNullValueInput = {
-  DbNull: DbNull,
-  JsonNull: JsonNull
-} as const
-
-export type NullableJsonNullValueInput = (typeof NullableJsonNullValueInput)[keyof typeof NullableJsonNullValueInput]
-
-
-export const QueryMode = {
-  default: 'default',
-  insensitive: 'insensitive'
-} as const
-
-export type QueryMode = (typeof QueryMode)[keyof typeof QueryMode]
-
-
-export const JsonNullValueFilter = {
-  DbNull: DbNull,
-  JsonNull: JsonNull,
-  AnyNull: AnyNull
-} as const
-
-export type JsonNullValueFilter = (typeof JsonNullValueFilter)[keyof typeof JsonNullValueFilter]
-
-
-export const NullsOrder = {
-  first: 'first',
-  last: 'last'
-} as const
-
-export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder]
-
diff --git a/src/generated/client/models.ts b/src/generated/client/models.ts
deleted file mode 100644
index 2db97a39..00000000
--- a/src/generated/client/models.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This is a barrel export file for all models and their related types.
- *
- * 🟢 You can import this file directly.
- */
-export type * from './models/User'
-export type * from './models/Account'
-export type * from './models/Session'
-export type * from './models/VerificationToken'
-export type * from './models/MagicLinkToken'
-export type * from './models/Transaction'
-export type * from './models/Project'
-export type * from './models/ProjectMember'
-export type * from './models/ProjectInvitation'
-export type * from './commonInputTypes'
\ No newline at end of file
diff --git a/src/generated/client/models/Account.ts b/src/generated/client/models/Account.ts
deleted file mode 100644
index 068b2bd1..00000000
--- a/src/generated/client/models/Account.ts
+++ /dev/null
@@ -1,1648 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `Account` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model Account
- * 
- */
-export type AccountModel = runtime.Types.Result.DefaultSelection<Prisma.$AccountPayload>
-
-export type AggregateAccount = {
-  _count: AccountCountAggregateOutputType | null
-  _avg: AccountAvgAggregateOutputType | null
-  _sum: AccountSumAggregateOutputType | null
-  _min: AccountMinAggregateOutputType | null
-  _max: AccountMaxAggregateOutputType | null
-}
-
-export type AccountAvgAggregateOutputType = {
-  expires_at: number | null
-}
-
-export type AccountSumAggregateOutputType = {
-  expires_at: number | null
-}
-
-export type AccountMinAggregateOutputType = {
-  id: string | null
-  userId: string | null
-  type: string | null
-  provider: string | null
-  providerAccountId: string | null
-  refresh_token: string | null
-  access_token: string | null
-  expires_at: number | null
-  token_type: string | null
-  scope: string | null
-  id_token: string | null
-  session_state: string | null
-}
-
-export type AccountMaxAggregateOutputType = {
-  id: string | null
-  userId: string | null
-  type: string | null
-  provider: string | null
-  providerAccountId: string | null
-  refresh_token: string | null
-  access_token: string | null
-  expires_at: number | null
-  token_type: string | null
-  scope: string | null
-  id_token: string | null
-  session_state: string | null
-}
-
-export type AccountCountAggregateOutputType = {
-  id: number
-  userId: number
-  type: number
-  provider: number
-  providerAccountId: number
-  refresh_token: number
-  access_token: number
-  expires_at: number
-  token_type: number
-  scope: number
-  id_token: number
-  session_state: number
-  _all: number
-}
-
-
-export type AccountAvgAggregateInputType = {
-  expires_at?: true
-}
-
-export type AccountSumAggregateInputType = {
-  expires_at?: true
-}
-
-export type AccountMinAggregateInputType = {
-  id?: true
-  userId?: true
-  type?: true
-  provider?: true
-  providerAccountId?: true
-  refresh_token?: true
-  access_token?: true
-  expires_at?: true
-  token_type?: true
-  scope?: true
-  id_token?: true
-  session_state?: true
-}
-
-export type AccountMaxAggregateInputType = {
-  id?: true
-  userId?: true
-  type?: true
-  provider?: true
-  providerAccountId?: true
-  refresh_token?: true
-  access_token?: true
-  expires_at?: true
-  token_type?: true
-  scope?: true
-  id_token?: true
-  session_state?: true
-}
-
-export type AccountCountAggregateInputType = {
-  id?: true
-  userId?: true
-  type?: true
-  provider?: true
-  providerAccountId?: true
-  refresh_token?: true
-  access_token?: true
-  expires_at?: true
-  token_type?: true
-  scope?: true
-  id_token?: true
-  session_state?: true
-  _all?: true
-}
-
-export type AccountAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Account to aggregate.
-   */
-  where?: Prisma.AccountWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Accounts to fetch.
-   */
-  orderBy?: Prisma.AccountOrderByWithRelationInput | Prisma.AccountOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.AccountWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Accounts from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Accounts.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned Accounts
-  **/
-  _count?: true | AccountCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to average
-  **/
-  _avg?: AccountAvgAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to sum
-  **/
-  _sum?: AccountSumAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: AccountMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: AccountMaxAggregateInputType
-}
-
-export type GetAccountAggregateType<T extends AccountAggregateArgs> = {
-      [P in keyof T & keyof AggregateAccount]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateAccount[P]>
-    : Prisma.GetScalarType<T[P], AggregateAccount[P]>
-}
-
-
-
-
-export type AccountGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.AccountWhereInput
-  orderBy?: Prisma.AccountOrderByWithAggregationInput | Prisma.AccountOrderByWithAggregationInput[]
-  by: Prisma.AccountScalarFieldEnum[] | Prisma.AccountScalarFieldEnum
-  having?: Prisma.AccountScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: AccountCountAggregateInputType | true
-  _avg?: AccountAvgAggregateInputType
-  _sum?: AccountSumAggregateInputType
-  _min?: AccountMinAggregateInputType
-  _max?: AccountMaxAggregateInputType
-}
-
-export type AccountGroupByOutputType = {
-  id: string
-  userId: string
-  type: string
-  provider: string
-  providerAccountId: string
-  refresh_token: string | null
-  access_token: string | null
-  expires_at: number | null
-  token_type: string | null
-  scope: string | null
-  id_token: string | null
-  session_state: string | null
-  _count: AccountCountAggregateOutputType | null
-  _avg: AccountAvgAggregateOutputType | null
-  _sum: AccountSumAggregateOutputType | null
-  _min: AccountMinAggregateOutputType | null
-  _max: AccountMaxAggregateOutputType | null
-}
-
-export type GetAccountGroupByPayload<T extends AccountGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<AccountGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof AccountGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], AccountGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], AccountGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type AccountWhereInput = {
-  AND?: Prisma.AccountWhereInput | Prisma.AccountWhereInput[]
-  OR?: Prisma.AccountWhereInput[]
-  NOT?: Prisma.AccountWhereInput | Prisma.AccountWhereInput[]
-  id?: Prisma.StringFilter<"Account"> | string
-  userId?: Prisma.StringFilter<"Account"> | string
-  type?: Prisma.StringFilter<"Account"> | string
-  provider?: Prisma.StringFilter<"Account"> | string
-  providerAccountId?: Prisma.StringFilter<"Account"> | string
-  refresh_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  access_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  expires_at?: Prisma.IntNullableFilter<"Account"> | number | null
-  token_type?: Prisma.StringNullableFilter<"Account"> | string | null
-  scope?: Prisma.StringNullableFilter<"Account"> | string | null
-  id_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  session_state?: Prisma.StringNullableFilter<"Account"> | string | null
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-}
-
-export type AccountOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  type?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  providerAccountId?: Prisma.SortOrder
-  refresh_token?: Prisma.SortOrderInput | Prisma.SortOrder
-  access_token?: Prisma.SortOrderInput | Prisma.SortOrder
-  expires_at?: Prisma.SortOrderInput | Prisma.SortOrder
-  token_type?: Prisma.SortOrderInput | Prisma.SortOrder
-  scope?: Prisma.SortOrderInput | Prisma.SortOrder
-  id_token?: Prisma.SortOrderInput | Prisma.SortOrder
-  session_state?: Prisma.SortOrderInput | Prisma.SortOrder
-  user?: Prisma.UserOrderByWithRelationInput
-}
-
-export type AccountWhereUniqueInput = Prisma.AtLeast<{
-  id?: string
-  provider_providerAccountId?: Prisma.AccountProviderProviderAccountIdCompoundUniqueInput
-  AND?: Prisma.AccountWhereInput | Prisma.AccountWhereInput[]
-  OR?: Prisma.AccountWhereInput[]
-  NOT?: Prisma.AccountWhereInput | Prisma.AccountWhereInput[]
-  userId?: Prisma.StringFilter<"Account"> | string
-  type?: Prisma.StringFilter<"Account"> | string
-  provider?: Prisma.StringFilter<"Account"> | string
-  providerAccountId?: Prisma.StringFilter<"Account"> | string
-  refresh_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  access_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  expires_at?: Prisma.IntNullableFilter<"Account"> | number | null
-  token_type?: Prisma.StringNullableFilter<"Account"> | string | null
-  scope?: Prisma.StringNullableFilter<"Account"> | string | null
-  id_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  session_state?: Prisma.StringNullableFilter<"Account"> | string | null
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-}, "id" | "provider_providerAccountId">
-
-export type AccountOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  type?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  providerAccountId?: Prisma.SortOrder
-  refresh_token?: Prisma.SortOrderInput | Prisma.SortOrder
-  access_token?: Prisma.SortOrderInput | Prisma.SortOrder
-  expires_at?: Prisma.SortOrderInput | Prisma.SortOrder
-  token_type?: Prisma.SortOrderInput | Prisma.SortOrder
-  scope?: Prisma.SortOrderInput | Prisma.SortOrder
-  id_token?: Prisma.SortOrderInput | Prisma.SortOrder
-  session_state?: Prisma.SortOrderInput | Prisma.SortOrder
-  _count?: Prisma.AccountCountOrderByAggregateInput
-  _avg?: Prisma.AccountAvgOrderByAggregateInput
-  _max?: Prisma.AccountMaxOrderByAggregateInput
-  _min?: Prisma.AccountMinOrderByAggregateInput
-  _sum?: Prisma.AccountSumOrderByAggregateInput
-}
-
-export type AccountScalarWhereWithAggregatesInput = {
-  AND?: Prisma.AccountScalarWhereWithAggregatesInput | Prisma.AccountScalarWhereWithAggregatesInput[]
-  OR?: Prisma.AccountScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.AccountScalarWhereWithAggregatesInput | Prisma.AccountScalarWhereWithAggregatesInput[]
-  id?: Prisma.StringWithAggregatesFilter<"Account"> | string
-  userId?: Prisma.StringWithAggregatesFilter<"Account"> | string
-  type?: Prisma.StringWithAggregatesFilter<"Account"> | string
-  provider?: Prisma.StringWithAggregatesFilter<"Account"> | string
-  providerAccountId?: Prisma.StringWithAggregatesFilter<"Account"> | string
-  refresh_token?: Prisma.StringNullableWithAggregatesFilter<"Account"> | string | null
-  access_token?: Prisma.StringNullableWithAggregatesFilter<"Account"> | string | null
-  expires_at?: Prisma.IntNullableWithAggregatesFilter<"Account"> | number | null
-  token_type?: Prisma.StringNullableWithAggregatesFilter<"Account"> | string | null
-  scope?: Prisma.StringNullableWithAggregatesFilter<"Account"> | string | null
-  id_token?: Prisma.StringNullableWithAggregatesFilter<"Account"> | string | null
-  session_state?: Prisma.StringNullableWithAggregatesFilter<"Account"> | string | null
-}
-
-export type AccountCreateInput = {
-  id?: string
-  type: string
-  provider: string
-  providerAccountId: string
-  refresh_token?: string | null
-  access_token?: string | null
-  expires_at?: number | null
-  token_type?: string | null
-  scope?: string | null
-  id_token?: string | null
-  session_state?: string | null
-  user: Prisma.UserCreateNestedOneWithoutAccountsInput
-}
-
-export type AccountUncheckedCreateInput = {
-  id?: string
-  userId: string
-  type: string
-  provider: string
-  providerAccountId: string
-  refresh_token?: string | null
-  access_token?: string | null
-  expires_at?: number | null
-  token_type?: string | null
-  scope?: string | null
-  id_token?: string | null
-  session_state?: string | null
-}
-
-export type AccountUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.StringFieldUpdateOperationsInput | string
-  providerAccountId?: Prisma.StringFieldUpdateOperationsInput | string
-  refresh_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  access_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  expires_at?: Prisma.NullableIntFieldUpdateOperationsInput | number | null
-  token_type?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  scope?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  id_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  session_state?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  user?: Prisma.UserUpdateOneRequiredWithoutAccountsNestedInput
-}
-
-export type AccountUncheckedUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.StringFieldUpdateOperationsInput | string
-  providerAccountId?: Prisma.StringFieldUpdateOperationsInput | string
-  refresh_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  access_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  expires_at?: Prisma.NullableIntFieldUpdateOperationsInput | number | null
-  token_type?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  scope?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  id_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  session_state?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type AccountCreateManyInput = {
-  id?: string
-  userId: string
-  type: string
-  provider: string
-  providerAccountId: string
-  refresh_token?: string | null
-  access_token?: string | null
-  expires_at?: number | null
-  token_type?: string | null
-  scope?: string | null
-  id_token?: string | null
-  session_state?: string | null
-}
-
-export type AccountUpdateManyMutationInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.StringFieldUpdateOperationsInput | string
-  providerAccountId?: Prisma.StringFieldUpdateOperationsInput | string
-  refresh_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  access_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  expires_at?: Prisma.NullableIntFieldUpdateOperationsInput | number | null
-  token_type?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  scope?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  id_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  session_state?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type AccountUncheckedUpdateManyInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.StringFieldUpdateOperationsInput | string
-  providerAccountId?: Prisma.StringFieldUpdateOperationsInput | string
-  refresh_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  access_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  expires_at?: Prisma.NullableIntFieldUpdateOperationsInput | number | null
-  token_type?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  scope?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  id_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  session_state?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type AccountListRelationFilter = {
-  every?: Prisma.AccountWhereInput
-  some?: Prisma.AccountWhereInput
-  none?: Prisma.AccountWhereInput
-}
-
-export type AccountOrderByRelationAggregateInput = {
-  _count?: Prisma.SortOrder
-}
-
-export type AccountProviderProviderAccountIdCompoundUniqueInput = {
-  provider: string
-  providerAccountId: string
-}
-
-export type AccountCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  type?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  providerAccountId?: Prisma.SortOrder
-  refresh_token?: Prisma.SortOrder
-  access_token?: Prisma.SortOrder
-  expires_at?: Prisma.SortOrder
-  token_type?: Prisma.SortOrder
-  scope?: Prisma.SortOrder
-  id_token?: Prisma.SortOrder
-  session_state?: Prisma.SortOrder
-}
-
-export type AccountAvgOrderByAggregateInput = {
-  expires_at?: Prisma.SortOrder
-}
-
-export type AccountMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  type?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  providerAccountId?: Prisma.SortOrder
-  refresh_token?: Prisma.SortOrder
-  access_token?: Prisma.SortOrder
-  expires_at?: Prisma.SortOrder
-  token_type?: Prisma.SortOrder
-  scope?: Prisma.SortOrder
-  id_token?: Prisma.SortOrder
-  session_state?: Prisma.SortOrder
-}
-
-export type AccountMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  type?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  providerAccountId?: Prisma.SortOrder
-  refresh_token?: Prisma.SortOrder
-  access_token?: Prisma.SortOrder
-  expires_at?: Prisma.SortOrder
-  token_type?: Prisma.SortOrder
-  scope?: Prisma.SortOrder
-  id_token?: Prisma.SortOrder
-  session_state?: Prisma.SortOrder
-}
-
-export type AccountSumOrderByAggregateInput = {
-  expires_at?: Prisma.SortOrder
-}
-
-export type AccountCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.AccountCreateWithoutUserInput, Prisma.AccountUncheckedCreateWithoutUserInput> | Prisma.AccountCreateWithoutUserInput[] | Prisma.AccountUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.AccountCreateOrConnectWithoutUserInput | Prisma.AccountCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.AccountCreateManyUserInputEnvelope
-  connect?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-}
-
-export type AccountUncheckedCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.AccountCreateWithoutUserInput, Prisma.AccountUncheckedCreateWithoutUserInput> | Prisma.AccountCreateWithoutUserInput[] | Prisma.AccountUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.AccountCreateOrConnectWithoutUserInput | Prisma.AccountCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.AccountCreateManyUserInputEnvelope
-  connect?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-}
-
-export type AccountUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.AccountCreateWithoutUserInput, Prisma.AccountUncheckedCreateWithoutUserInput> | Prisma.AccountCreateWithoutUserInput[] | Prisma.AccountUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.AccountCreateOrConnectWithoutUserInput | Prisma.AccountCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.AccountUpsertWithWhereUniqueWithoutUserInput | Prisma.AccountUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.AccountCreateManyUserInputEnvelope
-  set?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  disconnect?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  delete?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  connect?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  update?: Prisma.AccountUpdateWithWhereUniqueWithoutUserInput | Prisma.AccountUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.AccountUpdateManyWithWhereWithoutUserInput | Prisma.AccountUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.AccountScalarWhereInput | Prisma.AccountScalarWhereInput[]
-}
-
-export type AccountUncheckedUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.AccountCreateWithoutUserInput, Prisma.AccountUncheckedCreateWithoutUserInput> | Prisma.AccountCreateWithoutUserInput[] | Prisma.AccountUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.AccountCreateOrConnectWithoutUserInput | Prisma.AccountCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.AccountUpsertWithWhereUniqueWithoutUserInput | Prisma.AccountUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.AccountCreateManyUserInputEnvelope
-  set?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  disconnect?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  delete?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  connect?: Prisma.AccountWhereUniqueInput | Prisma.AccountWhereUniqueInput[]
-  update?: Prisma.AccountUpdateWithWhereUniqueWithoutUserInput | Prisma.AccountUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.AccountUpdateManyWithWhereWithoutUserInput | Prisma.AccountUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.AccountScalarWhereInput | Prisma.AccountScalarWhereInput[]
-}
-
-export type NullableIntFieldUpdateOperationsInput = {
-  set?: number | null
-  increment?: number
-  decrement?: number
-  multiply?: number
-  divide?: number
-}
-
-export type AccountCreateWithoutUserInput = {
-  id?: string
-  type: string
-  provider: string
-  providerAccountId: string
-  refresh_token?: string | null
-  access_token?: string | null
-  expires_at?: number | null
-  token_type?: string | null
-  scope?: string | null
-  id_token?: string | null
-  session_state?: string | null
-}
-
-export type AccountUncheckedCreateWithoutUserInput = {
-  id?: string
-  type: string
-  provider: string
-  providerAccountId: string
-  refresh_token?: string | null
-  access_token?: string | null
-  expires_at?: number | null
-  token_type?: string | null
-  scope?: string | null
-  id_token?: string | null
-  session_state?: string | null
-}
-
-export type AccountCreateOrConnectWithoutUserInput = {
-  where: Prisma.AccountWhereUniqueInput
-  create: Prisma.XOR<Prisma.AccountCreateWithoutUserInput, Prisma.AccountUncheckedCreateWithoutUserInput>
-}
-
-export type AccountCreateManyUserInputEnvelope = {
-  data: Prisma.AccountCreateManyUserInput | Prisma.AccountCreateManyUserInput[]
-  skipDuplicates?: boolean
-}
-
-export type AccountUpsertWithWhereUniqueWithoutUserInput = {
-  where: Prisma.AccountWhereUniqueInput
-  update: Prisma.XOR<Prisma.AccountUpdateWithoutUserInput, Prisma.AccountUncheckedUpdateWithoutUserInput>
-  create: Prisma.XOR<Prisma.AccountCreateWithoutUserInput, Prisma.AccountUncheckedCreateWithoutUserInput>
-}
-
-export type AccountUpdateWithWhereUniqueWithoutUserInput = {
-  where: Prisma.AccountWhereUniqueInput
-  data: Prisma.XOR<Prisma.AccountUpdateWithoutUserInput, Prisma.AccountUncheckedUpdateWithoutUserInput>
-}
-
-export type AccountUpdateManyWithWhereWithoutUserInput = {
-  where: Prisma.AccountScalarWhereInput
-  data: Prisma.XOR<Prisma.AccountUpdateManyMutationInput, Prisma.AccountUncheckedUpdateManyWithoutUserInput>
-}
-
-export type AccountScalarWhereInput = {
-  AND?: Prisma.AccountScalarWhereInput | Prisma.AccountScalarWhereInput[]
-  OR?: Prisma.AccountScalarWhereInput[]
-  NOT?: Prisma.AccountScalarWhereInput | Prisma.AccountScalarWhereInput[]
-  id?: Prisma.StringFilter<"Account"> | string
-  userId?: Prisma.StringFilter<"Account"> | string
-  type?: Prisma.StringFilter<"Account"> | string
-  provider?: Prisma.StringFilter<"Account"> | string
-  providerAccountId?: Prisma.StringFilter<"Account"> | string
-  refresh_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  access_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  expires_at?: Prisma.IntNullableFilter<"Account"> | number | null
-  token_type?: Prisma.StringNullableFilter<"Account"> | string | null
-  scope?: Prisma.StringNullableFilter<"Account"> | string | null
-  id_token?: Prisma.StringNullableFilter<"Account"> | string | null
-  session_state?: Prisma.StringNullableFilter<"Account"> | string | null
-}
-
-export type AccountCreateManyUserInput = {
-  id?: string
-  type: string
-  provider: string
-  providerAccountId: string
-  refresh_token?: string | null
-  access_token?: string | null
-  expires_at?: number | null
-  token_type?: string | null
-  scope?: string | null
-  id_token?: string | null
-  session_state?: string | null
-}
-
-export type AccountUpdateWithoutUserInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.StringFieldUpdateOperationsInput | string
-  providerAccountId?: Prisma.StringFieldUpdateOperationsInput | string
-  refresh_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  access_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  expires_at?: Prisma.NullableIntFieldUpdateOperationsInput | number | null
-  token_type?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  scope?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  id_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  session_state?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type AccountUncheckedUpdateWithoutUserInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.StringFieldUpdateOperationsInput | string
-  providerAccountId?: Prisma.StringFieldUpdateOperationsInput | string
-  refresh_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  access_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  expires_at?: Prisma.NullableIntFieldUpdateOperationsInput | number | null
-  token_type?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  scope?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  id_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  session_state?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type AccountUncheckedUpdateManyWithoutUserInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  type?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.StringFieldUpdateOperationsInput | string
-  providerAccountId?: Prisma.StringFieldUpdateOperationsInput | string
-  refresh_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  access_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  expires_at?: Prisma.NullableIntFieldUpdateOperationsInput | number | null
-  token_type?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  scope?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  id_token?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  session_state?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-
-
-export type AccountSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  userId?: boolean
-  type?: boolean
-  provider?: boolean
-  providerAccountId?: boolean
-  refresh_token?: boolean
-  access_token?: boolean
-  expires_at?: boolean
-  token_type?: boolean
-  scope?: boolean
-  id_token?: boolean
-  session_state?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["account"]>
-
-export type AccountSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  userId?: boolean
-  type?: boolean
-  provider?: boolean
-  providerAccountId?: boolean
-  refresh_token?: boolean
-  access_token?: boolean
-  expires_at?: boolean
-  token_type?: boolean
-  scope?: boolean
-  id_token?: boolean
-  session_state?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["account"]>
-
-export type AccountSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  userId?: boolean
-  type?: boolean
-  provider?: boolean
-  providerAccountId?: boolean
-  refresh_token?: boolean
-  access_token?: boolean
-  expires_at?: boolean
-  token_type?: boolean
-  scope?: boolean
-  id_token?: boolean
-  session_state?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["account"]>
-
-export type AccountSelectScalar = {
-  id?: boolean
-  userId?: boolean
-  type?: boolean
-  provider?: boolean
-  providerAccountId?: boolean
-  refresh_token?: boolean
-  access_token?: boolean
-  expires_at?: boolean
-  token_type?: boolean
-  scope?: boolean
-  id_token?: boolean
-  session_state?: boolean
-}
-
-export type AccountOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "userId" | "type" | "provider" | "providerAccountId" | "refresh_token" | "access_token" | "expires_at" | "token_type" | "scope" | "id_token" | "session_state", ExtArgs["result"]["account"]>
-export type AccountInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-export type AccountIncludeCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-export type AccountIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-
-export type $AccountPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "Account"
-  objects: {
-    user: Prisma.$UserPayload<ExtArgs>
-  }
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: string
-    userId: string
-    type: string
-    provider: string
-    providerAccountId: string
-    refresh_token: string | null
-    access_token: string | null
-    expires_at: number | null
-    token_type: string | null
-    scope: string | null
-    id_token: string | null
-    session_state: string | null
-  }, ExtArgs["result"]["account"]>
-  composites: {}
-}
-
-export type AccountGetPayload<S extends boolean | null | undefined | AccountDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$AccountPayload, S>
-
-export type AccountCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<AccountFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: AccountCountAggregateInputType | true
-  }
-
-export interface AccountDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['Account'], meta: { name: 'Account' } }
-  /**
-   * Find zero or one Account that matches the filter.
-   * @param {AccountFindUniqueArgs} args - Arguments to find a Account
-   * @example
-   * // Get one Account
-   * const account = await prisma.account.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends AccountFindUniqueArgs>(args: Prisma.SelectSubset<T, AccountFindUniqueArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one Account that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {AccountFindUniqueOrThrowArgs} args - Arguments to find a Account
-   * @example
-   * // Get one Account
-   * const account = await prisma.account.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends AccountFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, AccountFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Account that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {AccountFindFirstArgs} args - Arguments to find a Account
-   * @example
-   * // Get one Account
-   * const account = await prisma.account.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends AccountFindFirstArgs>(args?: Prisma.SelectSubset<T, AccountFindFirstArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Account that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {AccountFindFirstOrThrowArgs} args - Arguments to find a Account
-   * @example
-   * // Get one Account
-   * const account = await prisma.account.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends AccountFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, AccountFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more Accounts that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {AccountFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all Accounts
-   * const accounts = await prisma.account.findMany()
-   * 
-   * // Get first 10 Accounts
-   * const accounts = await prisma.account.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const accountWithIdOnly = await prisma.account.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends AccountFindManyArgs>(args?: Prisma.SelectSubset<T, AccountFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a Account.
-   * @param {AccountCreateArgs} args - Arguments to create a Account.
-   * @example
-   * // Create one Account
-   * const Account = await prisma.account.create({
-   *   data: {
-   *     // ... data to create a Account
-   *   }
-   * })
-   * 
-   */
-  create<T extends AccountCreateArgs>(args: Prisma.SelectSubset<T, AccountCreateArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many Accounts.
-   * @param {AccountCreateManyArgs} args - Arguments to create many Accounts.
-   * @example
-   * // Create many Accounts
-   * const account = await prisma.account.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends AccountCreateManyArgs>(args?: Prisma.SelectSubset<T, AccountCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many Accounts and returns the data saved in the database.
-   * @param {AccountCreateManyAndReturnArgs} args - Arguments to create many Accounts.
-   * @example
-   * // Create many Accounts
-   * const account = await prisma.account.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many Accounts and only return the `id`
-   * const accountWithIdOnly = await prisma.account.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends AccountCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, AccountCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a Account.
-   * @param {AccountDeleteArgs} args - Arguments to delete one Account.
-   * @example
-   * // Delete one Account
-   * const Account = await prisma.account.delete({
-   *   where: {
-   *     // ... filter to delete one Account
-   *   }
-   * })
-   * 
-   */
-  delete<T extends AccountDeleteArgs>(args: Prisma.SelectSubset<T, AccountDeleteArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one Account.
-   * @param {AccountUpdateArgs} args - Arguments to update one Account.
-   * @example
-   * // Update one Account
-   * const account = await prisma.account.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends AccountUpdateArgs>(args: Prisma.SelectSubset<T, AccountUpdateArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more Accounts.
-   * @param {AccountDeleteManyArgs} args - Arguments to filter Accounts to delete.
-   * @example
-   * // Delete a few Accounts
-   * const { count } = await prisma.account.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends AccountDeleteManyArgs>(args?: Prisma.SelectSubset<T, AccountDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Accounts.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {AccountUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many Accounts
-   * const account = await prisma.account.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends AccountUpdateManyArgs>(args: Prisma.SelectSubset<T, AccountUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Accounts and returns the data updated in the database.
-   * @param {AccountUpdateManyAndReturnArgs} args - Arguments to update many Accounts.
-   * @example
-   * // Update many Accounts
-   * const account = await prisma.account.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more Accounts and only return the `id`
-   * const accountWithIdOnly = await prisma.account.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends AccountUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, AccountUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one Account.
-   * @param {AccountUpsertArgs} args - Arguments to update or create a Account.
-   * @example
-   * // Update or create a Account
-   * const account = await prisma.account.upsert({
-   *   create: {
-   *     // ... data to create a Account
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the Account we want to update
-   *   }
-   * })
-   */
-  upsert<T extends AccountUpsertArgs>(args: Prisma.SelectSubset<T, AccountUpsertArgs<ExtArgs>>): Prisma.Prisma__AccountClient<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of Accounts.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {AccountCountArgs} args - Arguments to filter Accounts to count.
-   * @example
-   * // Count the number of Accounts
-   * const count = await prisma.account.count({
-   *   where: {
-   *     // ... the filter for the Accounts we want to count
-   *   }
-   * })
-  **/
-  count<T extends AccountCountArgs>(
-    args?: Prisma.Subset<T, AccountCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], AccountCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a Account.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {AccountAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends AccountAggregateArgs>(args: Prisma.Subset<T, AccountAggregateArgs>): Prisma.PrismaPromise<GetAccountAggregateType<T>>
-
-  /**
-   * Group by Account.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {AccountGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends AccountGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: AccountGroupByArgs['orderBy'] }
-      : { orderBy?: AccountGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, AccountGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetAccountGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the Account model
- */
-readonly fields: AccountFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for Account.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__AccountClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  user<T extends Prisma.UserDefaultArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.UserDefaultArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | Null, Null, ExtArgs, GlobalOmitOptions>
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the Account model
- */
-export interface AccountFieldRefs {
-  readonly id: Prisma.FieldRef<"Account", 'String'>
-  readonly userId: Prisma.FieldRef<"Account", 'String'>
-  readonly type: Prisma.FieldRef<"Account", 'String'>
-  readonly provider: Prisma.FieldRef<"Account", 'String'>
-  readonly providerAccountId: Prisma.FieldRef<"Account", 'String'>
-  readonly refresh_token: Prisma.FieldRef<"Account", 'String'>
-  readonly access_token: Prisma.FieldRef<"Account", 'String'>
-  readonly expires_at: Prisma.FieldRef<"Account", 'Int'>
-  readonly token_type: Prisma.FieldRef<"Account", 'String'>
-  readonly scope: Prisma.FieldRef<"Account", 'String'>
-  readonly id_token: Prisma.FieldRef<"Account", 'String'>
-  readonly session_state: Prisma.FieldRef<"Account", 'String'>
-}
-    
-
-// Custom InputTypes
-/**
- * Account findUnique
- */
-export type AccountFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * Filter, which Account to fetch.
-   */
-  where: Prisma.AccountWhereUniqueInput
-}
-
-/**
- * Account findUniqueOrThrow
- */
-export type AccountFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * Filter, which Account to fetch.
-   */
-  where: Prisma.AccountWhereUniqueInput
-}
-
-/**
- * Account findFirst
- */
-export type AccountFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * Filter, which Account to fetch.
-   */
-  where?: Prisma.AccountWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Accounts to fetch.
-   */
-  orderBy?: Prisma.AccountOrderByWithRelationInput | Prisma.AccountOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Accounts.
-   */
-  cursor?: Prisma.AccountWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Accounts from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Accounts.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Accounts.
-   */
-  distinct?: Prisma.AccountScalarFieldEnum | Prisma.AccountScalarFieldEnum[]
-}
-
-/**
- * Account findFirstOrThrow
- */
-export type AccountFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * Filter, which Account to fetch.
-   */
-  where?: Prisma.AccountWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Accounts to fetch.
-   */
-  orderBy?: Prisma.AccountOrderByWithRelationInput | Prisma.AccountOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Accounts.
-   */
-  cursor?: Prisma.AccountWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Accounts from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Accounts.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Accounts.
-   */
-  distinct?: Prisma.AccountScalarFieldEnum | Prisma.AccountScalarFieldEnum[]
-}
-
-/**
- * Account findMany
- */
-export type AccountFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * Filter, which Accounts to fetch.
-   */
-  where?: Prisma.AccountWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Accounts to fetch.
-   */
-  orderBy?: Prisma.AccountOrderByWithRelationInput | Prisma.AccountOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing Accounts.
-   */
-  cursor?: Prisma.AccountWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Accounts from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Accounts.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Accounts.
-   */
-  distinct?: Prisma.AccountScalarFieldEnum | Prisma.AccountScalarFieldEnum[]
-}
-
-/**
- * Account create
- */
-export type AccountCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * The data needed to create a Account.
-   */
-  data: Prisma.XOR<Prisma.AccountCreateInput, Prisma.AccountUncheckedCreateInput>
-}
-
-/**
- * Account createMany
- */
-export type AccountCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many Accounts.
-   */
-  data: Prisma.AccountCreateManyInput | Prisma.AccountCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * Account createManyAndReturn
- */
-export type AccountCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * The data used to create many Accounts.
-   */
-  data: Prisma.AccountCreateManyInput | Prisma.AccountCreateManyInput[]
-  skipDuplicates?: boolean
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountIncludeCreateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * Account update
- */
-export type AccountUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * The data needed to update a Account.
-   */
-  data: Prisma.XOR<Prisma.AccountUpdateInput, Prisma.AccountUncheckedUpdateInput>
-  /**
-   * Choose, which Account to update.
-   */
-  where: Prisma.AccountWhereUniqueInput
-}
-
-/**
- * Account updateMany
- */
-export type AccountUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update Accounts.
-   */
-  data: Prisma.XOR<Prisma.AccountUpdateManyMutationInput, Prisma.AccountUncheckedUpdateManyInput>
-  /**
-   * Filter which Accounts to update
-   */
-  where?: Prisma.AccountWhereInput
-  /**
-   * Limit how many Accounts to update.
-   */
-  limit?: number
-}
-
-/**
- * Account updateManyAndReturn
- */
-export type AccountUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * The data used to update Accounts.
-   */
-  data: Prisma.XOR<Prisma.AccountUpdateManyMutationInput, Prisma.AccountUncheckedUpdateManyInput>
-  /**
-   * Filter which Accounts to update
-   */
-  where?: Prisma.AccountWhereInput
-  /**
-   * Limit how many Accounts to update.
-   */
-  limit?: number
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountIncludeUpdateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * Account upsert
- */
-export type AccountUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * The filter to search for the Account to update in case it exists.
-   */
-  where: Prisma.AccountWhereUniqueInput
-  /**
-   * In case the Account found by the `where` argument doesn't exist, create a new Account with this data.
-   */
-  create: Prisma.XOR<Prisma.AccountCreateInput, Prisma.AccountUncheckedCreateInput>
-  /**
-   * In case the Account was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.AccountUpdateInput, Prisma.AccountUncheckedUpdateInput>
-}
-
-/**
- * Account delete
- */
-export type AccountDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  /**
-   * Filter which Account to delete.
-   */
-  where: Prisma.AccountWhereUniqueInput
-}
-
-/**
- * Account deleteMany
- */
-export type AccountDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Accounts to delete
-   */
-  where?: Prisma.AccountWhereInput
-  /**
-   * Limit how many Accounts to delete.
-   */
-  limit?: number
-}
-
-/**
- * Account without action
- */
-export type AccountDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-}
diff --git a/src/generated/client/models/MagicLinkToken.ts b/src/generated/client/models/MagicLinkToken.ts
deleted file mode 100644
index 9e3a2234..00000000
--- a/src/generated/client/models/MagicLinkToken.ts
+++ /dev/null
@@ -1,1254 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `MagicLinkToken` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model MagicLinkToken
- * 
- */
-export type MagicLinkTokenModel = runtime.Types.Result.DefaultSelection<Prisma.$MagicLinkTokenPayload>
-
-export type AggregateMagicLinkToken = {
-  _count: MagicLinkTokenCountAggregateOutputType | null
-  _avg: MagicLinkTokenAvgAggregateOutputType | null
-  _sum: MagicLinkTokenSumAggregateOutputType | null
-  _min: MagicLinkTokenMinAggregateOutputType | null
-  _max: MagicLinkTokenMaxAggregateOutputType | null
-}
-
-export type MagicLinkTokenAvgAggregateOutputType = {
-  id: number | null
-}
-
-export type MagicLinkTokenSumAggregateOutputType = {
-  id: number | null
-}
-
-export type MagicLinkTokenMinAggregateOutputType = {
-  id: number | null
-  email: string | null
-  tokenHash: string | null
-  expiresAt: Date | null
-  createdAt: Date | null
-  desktopNonce: string | null
-  inviteToken: string | null
-}
-
-export type MagicLinkTokenMaxAggregateOutputType = {
-  id: number | null
-  email: string | null
-  tokenHash: string | null
-  expiresAt: Date | null
-  createdAt: Date | null
-  desktopNonce: string | null
-  inviteToken: string | null
-}
-
-export type MagicLinkTokenCountAggregateOutputType = {
-  id: number
-  email: number
-  tokenHash: number
-  expiresAt: number
-  createdAt: number
-  desktopNonce: number
-  inviteToken: number
-  _all: number
-}
-
-
-export type MagicLinkTokenAvgAggregateInputType = {
-  id?: true
-}
-
-export type MagicLinkTokenSumAggregateInputType = {
-  id?: true
-}
-
-export type MagicLinkTokenMinAggregateInputType = {
-  id?: true
-  email?: true
-  tokenHash?: true
-  expiresAt?: true
-  createdAt?: true
-  desktopNonce?: true
-  inviteToken?: true
-}
-
-export type MagicLinkTokenMaxAggregateInputType = {
-  id?: true
-  email?: true
-  tokenHash?: true
-  expiresAt?: true
-  createdAt?: true
-  desktopNonce?: true
-  inviteToken?: true
-}
-
-export type MagicLinkTokenCountAggregateInputType = {
-  id?: true
-  email?: true
-  tokenHash?: true
-  expiresAt?: true
-  createdAt?: true
-  desktopNonce?: true
-  inviteToken?: true
-  _all?: true
-}
-
-export type MagicLinkTokenAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which MagicLinkToken to aggregate.
-   */
-  where?: Prisma.MagicLinkTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of MagicLinkTokens to fetch.
-   */
-  orderBy?: Prisma.MagicLinkTokenOrderByWithRelationInput | Prisma.MagicLinkTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.MagicLinkTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` MagicLinkTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` MagicLinkTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned MagicLinkTokens
-  **/
-  _count?: true | MagicLinkTokenCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to average
-  **/
-  _avg?: MagicLinkTokenAvgAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to sum
-  **/
-  _sum?: MagicLinkTokenSumAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: MagicLinkTokenMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: MagicLinkTokenMaxAggregateInputType
-}
-
-export type GetMagicLinkTokenAggregateType<T extends MagicLinkTokenAggregateArgs> = {
-      [P in keyof T & keyof AggregateMagicLinkToken]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateMagicLinkToken[P]>
-    : Prisma.GetScalarType<T[P], AggregateMagicLinkToken[P]>
-}
-
-
-
-
-export type MagicLinkTokenGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.MagicLinkTokenWhereInput
-  orderBy?: Prisma.MagicLinkTokenOrderByWithAggregationInput | Prisma.MagicLinkTokenOrderByWithAggregationInput[]
-  by: Prisma.MagicLinkTokenScalarFieldEnum[] | Prisma.MagicLinkTokenScalarFieldEnum
-  having?: Prisma.MagicLinkTokenScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: MagicLinkTokenCountAggregateInputType | true
-  _avg?: MagicLinkTokenAvgAggregateInputType
-  _sum?: MagicLinkTokenSumAggregateInputType
-  _min?: MagicLinkTokenMinAggregateInputType
-  _max?: MagicLinkTokenMaxAggregateInputType
-}
-
-export type MagicLinkTokenGroupByOutputType = {
-  id: number
-  email: string
-  tokenHash: string
-  expiresAt: Date
-  createdAt: Date
-  desktopNonce: string | null
-  inviteToken: string | null
-  _count: MagicLinkTokenCountAggregateOutputType | null
-  _avg: MagicLinkTokenAvgAggregateOutputType | null
-  _sum: MagicLinkTokenSumAggregateOutputType | null
-  _min: MagicLinkTokenMinAggregateOutputType | null
-  _max: MagicLinkTokenMaxAggregateOutputType | null
-}
-
-export type GetMagicLinkTokenGroupByPayload<T extends MagicLinkTokenGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<MagicLinkTokenGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof MagicLinkTokenGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], MagicLinkTokenGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], MagicLinkTokenGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type MagicLinkTokenWhereInput = {
-  AND?: Prisma.MagicLinkTokenWhereInput | Prisma.MagicLinkTokenWhereInput[]
-  OR?: Prisma.MagicLinkTokenWhereInput[]
-  NOT?: Prisma.MagicLinkTokenWhereInput | Prisma.MagicLinkTokenWhereInput[]
-  id?: Prisma.IntFilter<"MagicLinkToken"> | number
-  email?: Prisma.StringFilter<"MagicLinkToken"> | string
-  tokenHash?: Prisma.StringFilter<"MagicLinkToken"> | string
-  expiresAt?: Prisma.DateTimeFilter<"MagicLinkToken"> | Date | string
-  createdAt?: Prisma.DateTimeFilter<"MagicLinkToken"> | Date | string
-  desktopNonce?: Prisma.StringNullableFilter<"MagicLinkToken"> | string | null
-  inviteToken?: Prisma.StringNullableFilter<"MagicLinkToken"> | string | null
-}
-
-export type MagicLinkTokenOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  tokenHash?: Prisma.SortOrder
-  expiresAt?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  desktopNonce?: Prisma.SortOrderInput | Prisma.SortOrder
-  inviteToken?: Prisma.SortOrderInput | Prisma.SortOrder
-}
-
-export type MagicLinkTokenWhereUniqueInput = Prisma.AtLeast<{
-  id?: number
-  tokenHash?: string
-  AND?: Prisma.MagicLinkTokenWhereInput | Prisma.MagicLinkTokenWhereInput[]
-  OR?: Prisma.MagicLinkTokenWhereInput[]
-  NOT?: Prisma.MagicLinkTokenWhereInput | Prisma.MagicLinkTokenWhereInput[]
-  email?: Prisma.StringFilter<"MagicLinkToken"> | string
-  expiresAt?: Prisma.DateTimeFilter<"MagicLinkToken"> | Date | string
-  createdAt?: Prisma.DateTimeFilter<"MagicLinkToken"> | Date | string
-  desktopNonce?: Prisma.StringNullableFilter<"MagicLinkToken"> | string | null
-  inviteToken?: Prisma.StringNullableFilter<"MagicLinkToken"> | string | null
-}, "id" | "tokenHash">
-
-export type MagicLinkTokenOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  tokenHash?: Prisma.SortOrder
-  expiresAt?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  desktopNonce?: Prisma.SortOrderInput | Prisma.SortOrder
-  inviteToken?: Prisma.SortOrderInput | Prisma.SortOrder
-  _count?: Prisma.MagicLinkTokenCountOrderByAggregateInput
-  _avg?: Prisma.MagicLinkTokenAvgOrderByAggregateInput
-  _max?: Prisma.MagicLinkTokenMaxOrderByAggregateInput
-  _min?: Prisma.MagicLinkTokenMinOrderByAggregateInput
-  _sum?: Prisma.MagicLinkTokenSumOrderByAggregateInput
-}
-
-export type MagicLinkTokenScalarWhereWithAggregatesInput = {
-  AND?: Prisma.MagicLinkTokenScalarWhereWithAggregatesInput | Prisma.MagicLinkTokenScalarWhereWithAggregatesInput[]
-  OR?: Prisma.MagicLinkTokenScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.MagicLinkTokenScalarWhereWithAggregatesInput | Prisma.MagicLinkTokenScalarWhereWithAggregatesInput[]
-  id?: Prisma.IntWithAggregatesFilter<"MagicLinkToken"> | number
-  email?: Prisma.StringWithAggregatesFilter<"MagicLinkToken"> | string
-  tokenHash?: Prisma.StringWithAggregatesFilter<"MagicLinkToken"> | string
-  expiresAt?: Prisma.DateTimeWithAggregatesFilter<"MagicLinkToken"> | Date | string
-  createdAt?: Prisma.DateTimeWithAggregatesFilter<"MagicLinkToken"> | Date | string
-  desktopNonce?: Prisma.StringNullableWithAggregatesFilter<"MagicLinkToken"> | string | null
-  inviteToken?: Prisma.StringNullableWithAggregatesFilter<"MagicLinkToken"> | string | null
-}
-
-export type MagicLinkTokenCreateInput = {
-  email: string
-  tokenHash: string
-  expiresAt: Date | string
-  createdAt?: Date | string
-  desktopNonce?: string | null
-  inviteToken?: string | null
-}
-
-export type MagicLinkTokenUncheckedCreateInput = {
-  id?: number
-  email: string
-  tokenHash: string
-  expiresAt: Date | string
-  createdAt?: Date | string
-  desktopNonce?: string | null
-  inviteToken?: string | null
-}
-
-export type MagicLinkTokenUpdateInput = {
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  tokenHash?: Prisma.StringFieldUpdateOperationsInput | string
-  expiresAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  desktopNonce?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  inviteToken?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type MagicLinkTokenUncheckedUpdateInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  tokenHash?: Prisma.StringFieldUpdateOperationsInput | string
-  expiresAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  desktopNonce?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  inviteToken?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type MagicLinkTokenCreateManyInput = {
-  id?: number
-  email: string
-  tokenHash: string
-  expiresAt: Date | string
-  createdAt?: Date | string
-  desktopNonce?: string | null
-  inviteToken?: string | null
-}
-
-export type MagicLinkTokenUpdateManyMutationInput = {
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  tokenHash?: Prisma.StringFieldUpdateOperationsInput | string
-  expiresAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  desktopNonce?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  inviteToken?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type MagicLinkTokenUncheckedUpdateManyInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  tokenHash?: Prisma.StringFieldUpdateOperationsInput | string
-  expiresAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  desktopNonce?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  inviteToken?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-}
-
-export type MagicLinkTokenCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  tokenHash?: Prisma.SortOrder
-  expiresAt?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  desktopNonce?: Prisma.SortOrder
-  inviteToken?: Prisma.SortOrder
-}
-
-export type MagicLinkTokenAvgOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type MagicLinkTokenMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  tokenHash?: Prisma.SortOrder
-  expiresAt?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  desktopNonce?: Prisma.SortOrder
-  inviteToken?: Prisma.SortOrder
-}
-
-export type MagicLinkTokenMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  tokenHash?: Prisma.SortOrder
-  expiresAt?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  desktopNonce?: Prisma.SortOrder
-  inviteToken?: Prisma.SortOrder
-}
-
-export type MagicLinkTokenSumOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type IntFieldUpdateOperationsInput = {
-  set?: number
-  increment?: number
-  decrement?: number
-  multiply?: number
-  divide?: number
-}
-
-
-
-export type MagicLinkTokenSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  email?: boolean
-  tokenHash?: boolean
-  expiresAt?: boolean
-  createdAt?: boolean
-  desktopNonce?: boolean
-  inviteToken?: boolean
-}, ExtArgs["result"]["magicLinkToken"]>
-
-export type MagicLinkTokenSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  email?: boolean
-  tokenHash?: boolean
-  expiresAt?: boolean
-  createdAt?: boolean
-  desktopNonce?: boolean
-  inviteToken?: boolean
-}, ExtArgs["result"]["magicLinkToken"]>
-
-export type MagicLinkTokenSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  email?: boolean
-  tokenHash?: boolean
-  expiresAt?: boolean
-  createdAt?: boolean
-  desktopNonce?: boolean
-  inviteToken?: boolean
-}, ExtArgs["result"]["magicLinkToken"]>
-
-export type MagicLinkTokenSelectScalar = {
-  id?: boolean
-  email?: boolean
-  tokenHash?: boolean
-  expiresAt?: boolean
-  createdAt?: boolean
-  desktopNonce?: boolean
-  inviteToken?: boolean
-}
-
-export type MagicLinkTokenOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "email" | "tokenHash" | "expiresAt" | "createdAt" | "desktopNonce" | "inviteToken", ExtArgs["result"]["magicLinkToken"]>
-
-export type $MagicLinkTokenPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "MagicLinkToken"
-  objects: {}
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: number
-    email: string
-    tokenHash: string
-    expiresAt: Date
-    createdAt: Date
-    desktopNonce: string | null
-    inviteToken: string | null
-  }, ExtArgs["result"]["magicLinkToken"]>
-  composites: {}
-}
-
-export type MagicLinkTokenGetPayload<S extends boolean | null | undefined | MagicLinkTokenDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload, S>
-
-export type MagicLinkTokenCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<MagicLinkTokenFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: MagicLinkTokenCountAggregateInputType | true
-  }
-
-export interface MagicLinkTokenDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['MagicLinkToken'], meta: { name: 'MagicLinkToken' } }
-  /**
-   * Find zero or one MagicLinkToken that matches the filter.
-   * @param {MagicLinkTokenFindUniqueArgs} args - Arguments to find a MagicLinkToken
-   * @example
-   * // Get one MagicLinkToken
-   * const magicLinkToken = await prisma.magicLinkToken.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends MagicLinkTokenFindUniqueArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenFindUniqueArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one MagicLinkToken that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {MagicLinkTokenFindUniqueOrThrowArgs} args - Arguments to find a MagicLinkToken
-   * @example
-   * // Get one MagicLinkToken
-   * const magicLinkToken = await prisma.magicLinkToken.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends MagicLinkTokenFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first MagicLinkToken that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {MagicLinkTokenFindFirstArgs} args - Arguments to find a MagicLinkToken
-   * @example
-   * // Get one MagicLinkToken
-   * const magicLinkToken = await prisma.magicLinkToken.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends MagicLinkTokenFindFirstArgs>(args?: Prisma.SelectSubset<T, MagicLinkTokenFindFirstArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first MagicLinkToken that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {MagicLinkTokenFindFirstOrThrowArgs} args - Arguments to find a MagicLinkToken
-   * @example
-   * // Get one MagicLinkToken
-   * const magicLinkToken = await prisma.magicLinkToken.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends MagicLinkTokenFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, MagicLinkTokenFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more MagicLinkTokens that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {MagicLinkTokenFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all MagicLinkTokens
-   * const magicLinkTokens = await prisma.magicLinkToken.findMany()
-   * 
-   * // Get first 10 MagicLinkTokens
-   * const magicLinkTokens = await prisma.magicLinkToken.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const magicLinkTokenWithIdOnly = await prisma.magicLinkToken.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends MagicLinkTokenFindManyArgs>(args?: Prisma.SelectSubset<T, MagicLinkTokenFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a MagicLinkToken.
-   * @param {MagicLinkTokenCreateArgs} args - Arguments to create a MagicLinkToken.
-   * @example
-   * // Create one MagicLinkToken
-   * const MagicLinkToken = await prisma.magicLinkToken.create({
-   *   data: {
-   *     // ... data to create a MagicLinkToken
-   *   }
-   * })
-   * 
-   */
-  create<T extends MagicLinkTokenCreateArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenCreateArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many MagicLinkTokens.
-   * @param {MagicLinkTokenCreateManyArgs} args - Arguments to create many MagicLinkTokens.
-   * @example
-   * // Create many MagicLinkTokens
-   * const magicLinkToken = await prisma.magicLinkToken.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends MagicLinkTokenCreateManyArgs>(args?: Prisma.SelectSubset<T, MagicLinkTokenCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many MagicLinkTokens and returns the data saved in the database.
-   * @param {MagicLinkTokenCreateManyAndReturnArgs} args - Arguments to create many MagicLinkTokens.
-   * @example
-   * // Create many MagicLinkTokens
-   * const magicLinkToken = await prisma.magicLinkToken.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many MagicLinkTokens and only return the `id`
-   * const magicLinkTokenWithIdOnly = await prisma.magicLinkToken.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends MagicLinkTokenCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, MagicLinkTokenCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a MagicLinkToken.
-   * @param {MagicLinkTokenDeleteArgs} args - Arguments to delete one MagicLinkToken.
-   * @example
-   * // Delete one MagicLinkToken
-   * const MagicLinkToken = await prisma.magicLinkToken.delete({
-   *   where: {
-   *     // ... filter to delete one MagicLinkToken
-   *   }
-   * })
-   * 
-   */
-  delete<T extends MagicLinkTokenDeleteArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenDeleteArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one MagicLinkToken.
-   * @param {MagicLinkTokenUpdateArgs} args - Arguments to update one MagicLinkToken.
-   * @example
-   * // Update one MagicLinkToken
-   * const magicLinkToken = await prisma.magicLinkToken.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends MagicLinkTokenUpdateArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenUpdateArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more MagicLinkTokens.
-   * @param {MagicLinkTokenDeleteManyArgs} args - Arguments to filter MagicLinkTokens to delete.
-   * @example
-   * // Delete a few MagicLinkTokens
-   * const { count } = await prisma.magicLinkToken.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends MagicLinkTokenDeleteManyArgs>(args?: Prisma.SelectSubset<T, MagicLinkTokenDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more MagicLinkTokens.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {MagicLinkTokenUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many MagicLinkTokens
-   * const magicLinkToken = await prisma.magicLinkToken.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends MagicLinkTokenUpdateManyArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more MagicLinkTokens and returns the data updated in the database.
-   * @param {MagicLinkTokenUpdateManyAndReturnArgs} args - Arguments to update many MagicLinkTokens.
-   * @example
-   * // Update many MagicLinkTokens
-   * const magicLinkToken = await prisma.magicLinkToken.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more MagicLinkTokens and only return the `id`
-   * const magicLinkTokenWithIdOnly = await prisma.magicLinkToken.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends MagicLinkTokenUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one MagicLinkToken.
-   * @param {MagicLinkTokenUpsertArgs} args - Arguments to update or create a MagicLinkToken.
-   * @example
-   * // Update or create a MagicLinkToken
-   * const magicLinkToken = await prisma.magicLinkToken.upsert({
-   *   create: {
-   *     // ... data to create a MagicLinkToken
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the MagicLinkToken we want to update
-   *   }
-   * })
-   */
-  upsert<T extends MagicLinkTokenUpsertArgs>(args: Prisma.SelectSubset<T, MagicLinkTokenUpsertArgs<ExtArgs>>): Prisma.Prisma__MagicLinkTokenClient<runtime.Types.Result.GetResult<Prisma.$MagicLinkTokenPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of MagicLinkTokens.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {MagicLinkTokenCountArgs} args - Arguments to filter MagicLinkTokens to count.
-   * @example
-   * // Count the number of MagicLinkTokens
-   * const count = await prisma.magicLinkToken.count({
-   *   where: {
-   *     // ... the filter for the MagicLinkTokens we want to count
-   *   }
-   * })
-  **/
-  count<T extends MagicLinkTokenCountArgs>(
-    args?: Prisma.Subset<T, MagicLinkTokenCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], MagicLinkTokenCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a MagicLinkToken.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {MagicLinkTokenAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends MagicLinkTokenAggregateArgs>(args: Prisma.Subset<T, MagicLinkTokenAggregateArgs>): Prisma.PrismaPromise<GetMagicLinkTokenAggregateType<T>>
-
-  /**
-   * Group by MagicLinkToken.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {MagicLinkTokenGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends MagicLinkTokenGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: MagicLinkTokenGroupByArgs['orderBy'] }
-      : { orderBy?: MagicLinkTokenGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, MagicLinkTokenGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetMagicLinkTokenGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the MagicLinkToken model
- */
-readonly fields: MagicLinkTokenFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for MagicLinkToken.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__MagicLinkTokenClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the MagicLinkToken model
- */
-export interface MagicLinkTokenFieldRefs {
-  readonly id: Prisma.FieldRef<"MagicLinkToken", 'Int'>
-  readonly email: Prisma.FieldRef<"MagicLinkToken", 'String'>
-  readonly tokenHash: Prisma.FieldRef<"MagicLinkToken", 'String'>
-  readonly expiresAt: Prisma.FieldRef<"MagicLinkToken", 'DateTime'>
-  readonly createdAt: Prisma.FieldRef<"MagicLinkToken", 'DateTime'>
-  readonly desktopNonce: Prisma.FieldRef<"MagicLinkToken", 'String'>
-  readonly inviteToken: Prisma.FieldRef<"MagicLinkToken", 'String'>
-}
-    
-
-// Custom InputTypes
-/**
- * MagicLinkToken findUnique
- */
-export type MagicLinkTokenFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which MagicLinkToken to fetch.
-   */
-  where: Prisma.MagicLinkTokenWhereUniqueInput
-}
-
-/**
- * MagicLinkToken findUniqueOrThrow
- */
-export type MagicLinkTokenFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which MagicLinkToken to fetch.
-   */
-  where: Prisma.MagicLinkTokenWhereUniqueInput
-}
-
-/**
- * MagicLinkToken findFirst
- */
-export type MagicLinkTokenFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which MagicLinkToken to fetch.
-   */
-  where?: Prisma.MagicLinkTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of MagicLinkTokens to fetch.
-   */
-  orderBy?: Prisma.MagicLinkTokenOrderByWithRelationInput | Prisma.MagicLinkTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for MagicLinkTokens.
-   */
-  cursor?: Prisma.MagicLinkTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` MagicLinkTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` MagicLinkTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of MagicLinkTokens.
-   */
-  distinct?: Prisma.MagicLinkTokenScalarFieldEnum | Prisma.MagicLinkTokenScalarFieldEnum[]
-}
-
-/**
- * MagicLinkToken findFirstOrThrow
- */
-export type MagicLinkTokenFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which MagicLinkToken to fetch.
-   */
-  where?: Prisma.MagicLinkTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of MagicLinkTokens to fetch.
-   */
-  orderBy?: Prisma.MagicLinkTokenOrderByWithRelationInput | Prisma.MagicLinkTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for MagicLinkTokens.
-   */
-  cursor?: Prisma.MagicLinkTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` MagicLinkTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` MagicLinkTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of MagicLinkTokens.
-   */
-  distinct?: Prisma.MagicLinkTokenScalarFieldEnum | Prisma.MagicLinkTokenScalarFieldEnum[]
-}
-
-/**
- * MagicLinkToken findMany
- */
-export type MagicLinkTokenFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which MagicLinkTokens to fetch.
-   */
-  where?: Prisma.MagicLinkTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of MagicLinkTokens to fetch.
-   */
-  orderBy?: Prisma.MagicLinkTokenOrderByWithRelationInput | Prisma.MagicLinkTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing MagicLinkTokens.
-   */
-  cursor?: Prisma.MagicLinkTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` MagicLinkTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` MagicLinkTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of MagicLinkTokens.
-   */
-  distinct?: Prisma.MagicLinkTokenScalarFieldEnum | Prisma.MagicLinkTokenScalarFieldEnum[]
-}
-
-/**
- * MagicLinkToken create
- */
-export type MagicLinkTokenCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * The data needed to create a MagicLinkToken.
-   */
-  data: Prisma.XOR<Prisma.MagicLinkTokenCreateInput, Prisma.MagicLinkTokenUncheckedCreateInput>
-}
-
-/**
- * MagicLinkToken createMany
- */
-export type MagicLinkTokenCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many MagicLinkTokens.
-   */
-  data: Prisma.MagicLinkTokenCreateManyInput | Prisma.MagicLinkTokenCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * MagicLinkToken createManyAndReturn
- */
-export type MagicLinkTokenCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * The data used to create many MagicLinkTokens.
-   */
-  data: Prisma.MagicLinkTokenCreateManyInput | Prisma.MagicLinkTokenCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * MagicLinkToken update
- */
-export type MagicLinkTokenUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * The data needed to update a MagicLinkToken.
-   */
-  data: Prisma.XOR<Prisma.MagicLinkTokenUpdateInput, Prisma.MagicLinkTokenUncheckedUpdateInput>
-  /**
-   * Choose, which MagicLinkToken to update.
-   */
-  where: Prisma.MagicLinkTokenWhereUniqueInput
-}
-
-/**
- * MagicLinkToken updateMany
- */
-export type MagicLinkTokenUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update MagicLinkTokens.
-   */
-  data: Prisma.XOR<Prisma.MagicLinkTokenUpdateManyMutationInput, Prisma.MagicLinkTokenUncheckedUpdateManyInput>
-  /**
-   * Filter which MagicLinkTokens to update
-   */
-  where?: Prisma.MagicLinkTokenWhereInput
-  /**
-   * Limit how many MagicLinkTokens to update.
-   */
-  limit?: number
-}
-
-/**
- * MagicLinkToken updateManyAndReturn
- */
-export type MagicLinkTokenUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * The data used to update MagicLinkTokens.
-   */
-  data: Prisma.XOR<Prisma.MagicLinkTokenUpdateManyMutationInput, Prisma.MagicLinkTokenUncheckedUpdateManyInput>
-  /**
-   * Filter which MagicLinkTokens to update
-   */
-  where?: Prisma.MagicLinkTokenWhereInput
-  /**
-   * Limit how many MagicLinkTokens to update.
-   */
-  limit?: number
-}
-
-/**
- * MagicLinkToken upsert
- */
-export type MagicLinkTokenUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * The filter to search for the MagicLinkToken to update in case it exists.
-   */
-  where: Prisma.MagicLinkTokenWhereUniqueInput
-  /**
-   * In case the MagicLinkToken found by the `where` argument doesn't exist, create a new MagicLinkToken with this data.
-   */
-  create: Prisma.XOR<Prisma.MagicLinkTokenCreateInput, Prisma.MagicLinkTokenUncheckedCreateInput>
-  /**
-   * In case the MagicLinkToken was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.MagicLinkTokenUpdateInput, Prisma.MagicLinkTokenUncheckedUpdateInput>
-}
-
-/**
- * MagicLinkToken delete
- */
-export type MagicLinkTokenDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-  /**
-   * Filter which MagicLinkToken to delete.
-   */
-  where: Prisma.MagicLinkTokenWhereUniqueInput
-}
-
-/**
- * MagicLinkToken deleteMany
- */
-export type MagicLinkTokenDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which MagicLinkTokens to delete
-   */
-  where?: Prisma.MagicLinkTokenWhereInput
-  /**
-   * Limit how many MagicLinkTokens to delete.
-   */
-  limit?: number
-}
-
-/**
- * MagicLinkToken without action
- */
-export type MagicLinkTokenDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the MagicLinkToken
-   */
-  select?: Prisma.MagicLinkTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the MagicLinkToken
-   */
-  omit?: Prisma.MagicLinkTokenOmit<ExtArgs> | null
-}
diff --git a/src/generated/client/models/Project.ts b/src/generated/client/models/Project.ts
deleted file mode 100644
index 5b8fe942..00000000
--- a/src/generated/client/models/Project.ts
+++ /dev/null
@@ -1,1513 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `Project` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model Project
- * 
- */
-export type ProjectModel = runtime.Types.Result.DefaultSelection<Prisma.$ProjectPayload>
-
-export type AggregateProject = {
-  _count: ProjectCountAggregateOutputType | null
-  _min: ProjectMinAggregateOutputType | null
-  _max: ProjectMaxAggregateOutputType | null
-}
-
-export type ProjectMinAggregateOutputType = {
-  id: string | null
-  createdAt: Date | null
-  updatedAt: Date | null
-  title: string | null
-  description: string | null
-  author: string | null
-  hasPoster: boolean | null
-}
-
-export type ProjectMaxAggregateOutputType = {
-  id: string | null
-  createdAt: Date | null
-  updatedAt: Date | null
-  title: string | null
-  description: string | null
-  author: string | null
-  hasPoster: boolean | null
-}
-
-export type ProjectCountAggregateOutputType = {
-  id: number
-  createdAt: number
-  updatedAt: number
-  title: number
-  description: number
-  author: number
-  hasPoster: number
-  _all: number
-}
-
-
-export type ProjectMinAggregateInputType = {
-  id?: true
-  createdAt?: true
-  updatedAt?: true
-  title?: true
-  description?: true
-  author?: true
-  hasPoster?: true
-}
-
-export type ProjectMaxAggregateInputType = {
-  id?: true
-  createdAt?: true
-  updatedAt?: true
-  title?: true
-  description?: true
-  author?: true
-  hasPoster?: true
-}
-
-export type ProjectCountAggregateInputType = {
-  id?: true
-  createdAt?: true
-  updatedAt?: true
-  title?: true
-  description?: true
-  author?: true
-  hasPoster?: true
-  _all?: true
-}
-
-export type ProjectAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Project to aggregate.
-   */
-  where?: Prisma.ProjectWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Projects to fetch.
-   */
-  orderBy?: Prisma.ProjectOrderByWithRelationInput | Prisma.ProjectOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.ProjectWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Projects from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Projects.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned Projects
-  **/
-  _count?: true | ProjectCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: ProjectMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: ProjectMaxAggregateInputType
-}
-
-export type GetProjectAggregateType<T extends ProjectAggregateArgs> = {
-      [P in keyof T & keyof AggregateProject]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateProject[P]>
-    : Prisma.GetScalarType<T[P], AggregateProject[P]>
-}
-
-
-
-
-export type ProjectGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.ProjectWhereInput
-  orderBy?: Prisma.ProjectOrderByWithAggregationInput | Prisma.ProjectOrderByWithAggregationInput[]
-  by: Prisma.ProjectScalarFieldEnum[] | Prisma.ProjectScalarFieldEnum
-  having?: Prisma.ProjectScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: ProjectCountAggregateInputType | true
-  _min?: ProjectMinAggregateInputType
-  _max?: ProjectMaxAggregateInputType
-}
-
-export type ProjectGroupByOutputType = {
-  id: string
-  createdAt: Date
-  updatedAt: Date
-  title: string
-  description: string | null
-  author: string | null
-  hasPoster: boolean
-  _count: ProjectCountAggregateOutputType | null
-  _min: ProjectMinAggregateOutputType | null
-  _max: ProjectMaxAggregateOutputType | null
-}
-
-export type GetProjectGroupByPayload<T extends ProjectGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<ProjectGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof ProjectGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], ProjectGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], ProjectGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type ProjectWhereInput = {
-  AND?: Prisma.ProjectWhereInput | Prisma.ProjectWhereInput[]
-  OR?: Prisma.ProjectWhereInput[]
-  NOT?: Prisma.ProjectWhereInput | Prisma.ProjectWhereInput[]
-  id?: Prisma.StringFilter<"Project"> | string
-  createdAt?: Prisma.DateTimeFilter<"Project"> | Date | string
-  updatedAt?: Prisma.DateTimeFilter<"Project"> | Date | string
-  title?: Prisma.StringFilter<"Project"> | string
-  description?: Prisma.StringNullableFilter<"Project"> | string | null
-  author?: Prisma.StringNullableFilter<"Project"> | string | null
-  hasPoster?: Prisma.BoolFilter<"Project"> | boolean
-  members?: Prisma.ProjectMemberListRelationFilter
-  invitations?: Prisma.ProjectInvitationListRelationFilter
-}
-
-export type ProjectOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  updatedAt?: Prisma.SortOrder
-  title?: Prisma.SortOrder
-  description?: Prisma.SortOrderInput | Prisma.SortOrder
-  author?: Prisma.SortOrderInput | Prisma.SortOrder
-  hasPoster?: Prisma.SortOrder
-  members?: Prisma.ProjectMemberOrderByRelationAggregateInput
-  invitations?: Prisma.ProjectInvitationOrderByRelationAggregateInput
-}
-
-export type ProjectWhereUniqueInput = Prisma.AtLeast<{
-  id?: string
-  AND?: Prisma.ProjectWhereInput | Prisma.ProjectWhereInput[]
-  OR?: Prisma.ProjectWhereInput[]
-  NOT?: Prisma.ProjectWhereInput | Prisma.ProjectWhereInput[]
-  createdAt?: Prisma.DateTimeFilter<"Project"> | Date | string
-  updatedAt?: Prisma.DateTimeFilter<"Project"> | Date | string
-  title?: Prisma.StringFilter<"Project"> | string
-  description?: Prisma.StringNullableFilter<"Project"> | string | null
-  author?: Prisma.StringNullableFilter<"Project"> | string | null
-  hasPoster?: Prisma.BoolFilter<"Project"> | boolean
-  members?: Prisma.ProjectMemberListRelationFilter
-  invitations?: Prisma.ProjectInvitationListRelationFilter
-}, "id">
-
-export type ProjectOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  updatedAt?: Prisma.SortOrder
-  title?: Prisma.SortOrder
-  description?: Prisma.SortOrderInput | Prisma.SortOrder
-  author?: Prisma.SortOrderInput | Prisma.SortOrder
-  hasPoster?: Prisma.SortOrder
-  _count?: Prisma.ProjectCountOrderByAggregateInput
-  _max?: Prisma.ProjectMaxOrderByAggregateInput
-  _min?: Prisma.ProjectMinOrderByAggregateInput
-}
-
-export type ProjectScalarWhereWithAggregatesInput = {
-  AND?: Prisma.ProjectScalarWhereWithAggregatesInput | Prisma.ProjectScalarWhereWithAggregatesInput[]
-  OR?: Prisma.ProjectScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.ProjectScalarWhereWithAggregatesInput | Prisma.ProjectScalarWhereWithAggregatesInput[]
-  id?: Prisma.StringWithAggregatesFilter<"Project"> | string
-  createdAt?: Prisma.DateTimeWithAggregatesFilter<"Project"> | Date | string
-  updatedAt?: Prisma.DateTimeWithAggregatesFilter<"Project"> | Date | string
-  title?: Prisma.StringWithAggregatesFilter<"Project"> | string
-  description?: Prisma.StringNullableWithAggregatesFilter<"Project"> | string | null
-  author?: Prisma.StringNullableWithAggregatesFilter<"Project"> | string | null
-  hasPoster?: Prisma.BoolWithAggregatesFilter<"Project"> | boolean
-}
-
-export type ProjectCreateInput = {
-  id?: string
-  createdAt?: Date | string
-  updatedAt?: Date | string
-  title: string
-  description?: string | null
-  author?: string | null
-  hasPoster?: boolean
-  members?: Prisma.ProjectMemberCreateNestedManyWithoutProjectInput
-  invitations?: Prisma.ProjectInvitationCreateNestedManyWithoutProjectInput
-}
-
-export type ProjectUncheckedCreateInput = {
-  id?: string
-  createdAt?: Date | string
-  updatedAt?: Date | string
-  title: string
-  description?: string | null
-  author?: string | null
-  hasPoster?: boolean
-  members?: Prisma.ProjectMemberUncheckedCreateNestedManyWithoutProjectInput
-  invitations?: Prisma.ProjectInvitationUncheckedCreateNestedManyWithoutProjectInput
-}
-
-export type ProjectUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  members?: Prisma.ProjectMemberUpdateManyWithoutProjectNestedInput
-  invitations?: Prisma.ProjectInvitationUpdateManyWithoutProjectNestedInput
-}
-
-export type ProjectUncheckedUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  members?: Prisma.ProjectMemberUncheckedUpdateManyWithoutProjectNestedInput
-  invitations?: Prisma.ProjectInvitationUncheckedUpdateManyWithoutProjectNestedInput
-}
-
-export type ProjectCreateManyInput = {
-  id?: string
-  createdAt?: Date | string
-  updatedAt?: Date | string
-  title: string
-  description?: string | null
-  author?: string | null
-  hasPoster?: boolean
-}
-
-export type ProjectUpdateManyMutationInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-}
-
-export type ProjectUncheckedUpdateManyInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-}
-
-export type ProjectCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  updatedAt?: Prisma.SortOrder
-  title?: Prisma.SortOrder
-  description?: Prisma.SortOrder
-  author?: Prisma.SortOrder
-  hasPoster?: Prisma.SortOrder
-}
-
-export type ProjectMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  updatedAt?: Prisma.SortOrder
-  title?: Prisma.SortOrder
-  description?: Prisma.SortOrder
-  author?: Prisma.SortOrder
-  hasPoster?: Prisma.SortOrder
-}
-
-export type ProjectMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  updatedAt?: Prisma.SortOrder
-  title?: Prisma.SortOrder
-  description?: Prisma.SortOrder
-  author?: Prisma.SortOrder
-  hasPoster?: Prisma.SortOrder
-}
-
-export type ProjectScalarRelationFilter = {
-  is?: Prisma.ProjectWhereInput
-  isNot?: Prisma.ProjectWhereInput
-}
-
-export type ProjectCreateNestedOneWithoutMembersInput = {
-  create?: Prisma.XOR<Prisma.ProjectCreateWithoutMembersInput, Prisma.ProjectUncheckedCreateWithoutMembersInput>
-  connectOrCreate?: Prisma.ProjectCreateOrConnectWithoutMembersInput
-  connect?: Prisma.ProjectWhereUniqueInput
-}
-
-export type ProjectUpdateOneRequiredWithoutMembersNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectCreateWithoutMembersInput, Prisma.ProjectUncheckedCreateWithoutMembersInput>
-  connectOrCreate?: Prisma.ProjectCreateOrConnectWithoutMembersInput
-  upsert?: Prisma.ProjectUpsertWithoutMembersInput
-  connect?: Prisma.ProjectWhereUniqueInput
-  update?: Prisma.XOR<Prisma.XOR<Prisma.ProjectUpdateToOneWithWhereWithoutMembersInput, Prisma.ProjectUpdateWithoutMembersInput>, Prisma.ProjectUncheckedUpdateWithoutMembersInput>
-}
-
-export type ProjectCreateNestedOneWithoutInvitationsInput = {
-  create?: Prisma.XOR<Prisma.ProjectCreateWithoutInvitationsInput, Prisma.ProjectUncheckedCreateWithoutInvitationsInput>
-  connectOrCreate?: Prisma.ProjectCreateOrConnectWithoutInvitationsInput
-  connect?: Prisma.ProjectWhereUniqueInput
-}
-
-export type ProjectUpdateOneRequiredWithoutInvitationsNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectCreateWithoutInvitationsInput, Prisma.ProjectUncheckedCreateWithoutInvitationsInput>
-  connectOrCreate?: Prisma.ProjectCreateOrConnectWithoutInvitationsInput
-  upsert?: Prisma.ProjectUpsertWithoutInvitationsInput
-  connect?: Prisma.ProjectWhereUniqueInput
-  update?: Prisma.XOR<Prisma.XOR<Prisma.ProjectUpdateToOneWithWhereWithoutInvitationsInput, Prisma.ProjectUpdateWithoutInvitationsInput>, Prisma.ProjectUncheckedUpdateWithoutInvitationsInput>
-}
-
-export type ProjectCreateWithoutMembersInput = {
-  id?: string
-  createdAt?: Date | string
-  updatedAt?: Date | string
-  title: string
-  description?: string | null
-  author?: string | null
-  hasPoster?: boolean
-  invitations?: Prisma.ProjectInvitationCreateNestedManyWithoutProjectInput
-}
-
-export type ProjectUncheckedCreateWithoutMembersInput = {
-  id?: string
-  createdAt?: Date | string
-  updatedAt?: Date | string
-  title: string
-  description?: string | null
-  author?: string | null
-  hasPoster?: boolean
-  invitations?: Prisma.ProjectInvitationUncheckedCreateNestedManyWithoutProjectInput
-}
-
-export type ProjectCreateOrConnectWithoutMembersInput = {
-  where: Prisma.ProjectWhereUniqueInput
-  create: Prisma.XOR<Prisma.ProjectCreateWithoutMembersInput, Prisma.ProjectUncheckedCreateWithoutMembersInput>
-}
-
-export type ProjectUpsertWithoutMembersInput = {
-  update: Prisma.XOR<Prisma.ProjectUpdateWithoutMembersInput, Prisma.ProjectUncheckedUpdateWithoutMembersInput>
-  create: Prisma.XOR<Prisma.ProjectCreateWithoutMembersInput, Prisma.ProjectUncheckedCreateWithoutMembersInput>
-  where?: Prisma.ProjectWhereInput
-}
-
-export type ProjectUpdateToOneWithWhereWithoutMembersInput = {
-  where?: Prisma.ProjectWhereInput
-  data: Prisma.XOR<Prisma.ProjectUpdateWithoutMembersInput, Prisma.ProjectUncheckedUpdateWithoutMembersInput>
-}
-
-export type ProjectUpdateWithoutMembersInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  invitations?: Prisma.ProjectInvitationUpdateManyWithoutProjectNestedInput
-}
-
-export type ProjectUncheckedUpdateWithoutMembersInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  invitations?: Prisma.ProjectInvitationUncheckedUpdateManyWithoutProjectNestedInput
-}
-
-export type ProjectCreateWithoutInvitationsInput = {
-  id?: string
-  createdAt?: Date | string
-  updatedAt?: Date | string
-  title: string
-  description?: string | null
-  author?: string | null
-  hasPoster?: boolean
-  members?: Prisma.ProjectMemberCreateNestedManyWithoutProjectInput
-}
-
-export type ProjectUncheckedCreateWithoutInvitationsInput = {
-  id?: string
-  createdAt?: Date | string
-  updatedAt?: Date | string
-  title: string
-  description?: string | null
-  author?: string | null
-  hasPoster?: boolean
-  members?: Prisma.ProjectMemberUncheckedCreateNestedManyWithoutProjectInput
-}
-
-export type ProjectCreateOrConnectWithoutInvitationsInput = {
-  where: Prisma.ProjectWhereUniqueInput
-  create: Prisma.XOR<Prisma.ProjectCreateWithoutInvitationsInput, Prisma.ProjectUncheckedCreateWithoutInvitationsInput>
-}
-
-export type ProjectUpsertWithoutInvitationsInput = {
-  update: Prisma.XOR<Prisma.ProjectUpdateWithoutInvitationsInput, Prisma.ProjectUncheckedUpdateWithoutInvitationsInput>
-  create: Prisma.XOR<Prisma.ProjectCreateWithoutInvitationsInput, Prisma.ProjectUncheckedCreateWithoutInvitationsInput>
-  where?: Prisma.ProjectWhereInput
-}
-
-export type ProjectUpdateToOneWithWhereWithoutInvitationsInput = {
-  where?: Prisma.ProjectWhereInput
-  data: Prisma.XOR<Prisma.ProjectUpdateWithoutInvitationsInput, Prisma.ProjectUncheckedUpdateWithoutInvitationsInput>
-}
-
-export type ProjectUpdateWithoutInvitationsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  members?: Prisma.ProjectMemberUpdateManyWithoutProjectNestedInput
-}
-
-export type ProjectUncheckedUpdateWithoutInvitationsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  title?: Prisma.StringFieldUpdateOperationsInput | string
-  description?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  author?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  hasPoster?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  members?: Prisma.ProjectMemberUncheckedUpdateManyWithoutProjectNestedInput
-}
-
-
-/**
- * Count Type ProjectCountOutputType
- */
-
-export type ProjectCountOutputType = {
-  members: number
-  invitations: number
-}
-
-export type ProjectCountOutputTypeSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  members?: boolean | ProjectCountOutputTypeCountMembersArgs
-  invitations?: boolean | ProjectCountOutputTypeCountInvitationsArgs
-}
-
-/**
- * ProjectCountOutputType without action
- */
-export type ProjectCountOutputTypeDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectCountOutputType
-   */
-  select?: Prisma.ProjectCountOutputTypeSelect<ExtArgs> | null
-}
-
-/**
- * ProjectCountOutputType without action
- */
-export type ProjectCountOutputTypeCountMembersArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.ProjectMemberWhereInput
-}
-
-/**
- * ProjectCountOutputType without action
- */
-export type ProjectCountOutputTypeCountInvitationsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.ProjectInvitationWhereInput
-}
-
-
-export type ProjectSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  createdAt?: boolean
-  updatedAt?: boolean
-  title?: boolean
-  description?: boolean
-  author?: boolean
-  hasPoster?: boolean
-  members?: boolean | Prisma.Project$membersArgs<ExtArgs>
-  invitations?: boolean | Prisma.Project$invitationsArgs<ExtArgs>
-  _count?: boolean | Prisma.ProjectCountOutputTypeDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["project"]>
-
-export type ProjectSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  createdAt?: boolean
-  updatedAt?: boolean
-  title?: boolean
-  description?: boolean
-  author?: boolean
-  hasPoster?: boolean
-}, ExtArgs["result"]["project"]>
-
-export type ProjectSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  createdAt?: boolean
-  updatedAt?: boolean
-  title?: boolean
-  description?: boolean
-  author?: boolean
-  hasPoster?: boolean
-}, ExtArgs["result"]["project"]>
-
-export type ProjectSelectScalar = {
-  id?: boolean
-  createdAt?: boolean
-  updatedAt?: boolean
-  title?: boolean
-  description?: boolean
-  author?: boolean
-  hasPoster?: boolean
-}
-
-export type ProjectOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "createdAt" | "updatedAt" | "title" | "description" | "author" | "hasPoster", ExtArgs["result"]["project"]>
-export type ProjectInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  members?: boolean | Prisma.Project$membersArgs<ExtArgs>
-  invitations?: boolean | Prisma.Project$invitationsArgs<ExtArgs>
-  _count?: boolean | Prisma.ProjectCountOutputTypeDefaultArgs<ExtArgs>
-}
-export type ProjectIncludeCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {}
-export type ProjectIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {}
-
-export type $ProjectPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "Project"
-  objects: {
-    members: Prisma.$ProjectMemberPayload<ExtArgs>[]
-    invitations: Prisma.$ProjectInvitationPayload<ExtArgs>[]
-  }
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: string
-    createdAt: Date
-    updatedAt: Date
-    title: string
-    description: string | null
-    author: string | null
-    hasPoster: boolean
-  }, ExtArgs["result"]["project"]>
-  composites: {}
-}
-
-export type ProjectGetPayload<S extends boolean | null | undefined | ProjectDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$ProjectPayload, S>
-
-export type ProjectCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<ProjectFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: ProjectCountAggregateInputType | true
-  }
-
-export interface ProjectDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['Project'], meta: { name: 'Project' } }
-  /**
-   * Find zero or one Project that matches the filter.
-   * @param {ProjectFindUniqueArgs} args - Arguments to find a Project
-   * @example
-   * // Get one Project
-   * const project = await prisma.project.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends ProjectFindUniqueArgs>(args: Prisma.SelectSubset<T, ProjectFindUniqueArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one Project that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {ProjectFindUniqueOrThrowArgs} args - Arguments to find a Project
-   * @example
-   * // Get one Project
-   * const project = await prisma.project.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends ProjectFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, ProjectFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Project that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectFindFirstArgs} args - Arguments to find a Project
-   * @example
-   * // Get one Project
-   * const project = await prisma.project.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends ProjectFindFirstArgs>(args?: Prisma.SelectSubset<T, ProjectFindFirstArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Project that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectFindFirstOrThrowArgs} args - Arguments to find a Project
-   * @example
-   * // Get one Project
-   * const project = await prisma.project.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends ProjectFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, ProjectFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more Projects that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all Projects
-   * const projects = await prisma.project.findMany()
-   * 
-   * // Get first 10 Projects
-   * const projects = await prisma.project.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const projectWithIdOnly = await prisma.project.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends ProjectFindManyArgs>(args?: Prisma.SelectSubset<T, ProjectFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a Project.
-   * @param {ProjectCreateArgs} args - Arguments to create a Project.
-   * @example
-   * // Create one Project
-   * const Project = await prisma.project.create({
-   *   data: {
-   *     // ... data to create a Project
-   *   }
-   * })
-   * 
-   */
-  create<T extends ProjectCreateArgs>(args: Prisma.SelectSubset<T, ProjectCreateArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many Projects.
-   * @param {ProjectCreateManyArgs} args - Arguments to create many Projects.
-   * @example
-   * // Create many Projects
-   * const project = await prisma.project.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends ProjectCreateManyArgs>(args?: Prisma.SelectSubset<T, ProjectCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many Projects and returns the data saved in the database.
-   * @param {ProjectCreateManyAndReturnArgs} args - Arguments to create many Projects.
-   * @example
-   * // Create many Projects
-   * const project = await prisma.project.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many Projects and only return the `id`
-   * const projectWithIdOnly = await prisma.project.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends ProjectCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, ProjectCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a Project.
-   * @param {ProjectDeleteArgs} args - Arguments to delete one Project.
-   * @example
-   * // Delete one Project
-   * const Project = await prisma.project.delete({
-   *   where: {
-   *     // ... filter to delete one Project
-   *   }
-   * })
-   * 
-   */
-  delete<T extends ProjectDeleteArgs>(args: Prisma.SelectSubset<T, ProjectDeleteArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one Project.
-   * @param {ProjectUpdateArgs} args - Arguments to update one Project.
-   * @example
-   * // Update one Project
-   * const project = await prisma.project.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends ProjectUpdateArgs>(args: Prisma.SelectSubset<T, ProjectUpdateArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more Projects.
-   * @param {ProjectDeleteManyArgs} args - Arguments to filter Projects to delete.
-   * @example
-   * // Delete a few Projects
-   * const { count } = await prisma.project.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends ProjectDeleteManyArgs>(args?: Prisma.SelectSubset<T, ProjectDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Projects.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many Projects
-   * const project = await prisma.project.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends ProjectUpdateManyArgs>(args: Prisma.SelectSubset<T, ProjectUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Projects and returns the data updated in the database.
-   * @param {ProjectUpdateManyAndReturnArgs} args - Arguments to update many Projects.
-   * @example
-   * // Update many Projects
-   * const project = await prisma.project.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more Projects and only return the `id`
-   * const projectWithIdOnly = await prisma.project.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends ProjectUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, ProjectUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one Project.
-   * @param {ProjectUpsertArgs} args - Arguments to update or create a Project.
-   * @example
-   * // Update or create a Project
-   * const project = await prisma.project.upsert({
-   *   create: {
-   *     // ... data to create a Project
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the Project we want to update
-   *   }
-   * })
-   */
-  upsert<T extends ProjectUpsertArgs>(args: Prisma.SelectSubset<T, ProjectUpsertArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of Projects.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectCountArgs} args - Arguments to filter Projects to count.
-   * @example
-   * // Count the number of Projects
-   * const count = await prisma.project.count({
-   *   where: {
-   *     // ... the filter for the Projects we want to count
-   *   }
-   * })
-  **/
-  count<T extends ProjectCountArgs>(
-    args?: Prisma.Subset<T, ProjectCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], ProjectCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a Project.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends ProjectAggregateArgs>(args: Prisma.Subset<T, ProjectAggregateArgs>): Prisma.PrismaPromise<GetProjectAggregateType<T>>
-
-  /**
-   * Group by Project.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends ProjectGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: ProjectGroupByArgs['orderBy'] }
-      : { orderBy?: ProjectGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, ProjectGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetProjectGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the Project model
- */
-readonly fields: ProjectFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for Project.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__ProjectClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  members<T extends Prisma.Project$membersArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.Project$membersArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
-  invitations<T extends Prisma.Project$invitationsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.Project$invitationsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the Project model
- */
-export interface ProjectFieldRefs {
-  readonly id: Prisma.FieldRef<"Project", 'String'>
-  readonly createdAt: Prisma.FieldRef<"Project", 'DateTime'>
-  readonly updatedAt: Prisma.FieldRef<"Project", 'DateTime'>
-  readonly title: Prisma.FieldRef<"Project", 'String'>
-  readonly description: Prisma.FieldRef<"Project", 'String'>
-  readonly author: Prisma.FieldRef<"Project", 'String'>
-  readonly hasPoster: Prisma.FieldRef<"Project", 'Boolean'>
-}
-    
-
-// Custom InputTypes
-/**
- * Project findUnique
- */
-export type ProjectFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * Filter, which Project to fetch.
-   */
-  where: Prisma.ProjectWhereUniqueInput
-}
-
-/**
- * Project findUniqueOrThrow
- */
-export type ProjectFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * Filter, which Project to fetch.
-   */
-  where: Prisma.ProjectWhereUniqueInput
-}
-
-/**
- * Project findFirst
- */
-export type ProjectFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * Filter, which Project to fetch.
-   */
-  where?: Prisma.ProjectWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Projects to fetch.
-   */
-  orderBy?: Prisma.ProjectOrderByWithRelationInput | Prisma.ProjectOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Projects.
-   */
-  cursor?: Prisma.ProjectWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Projects from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Projects.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Projects.
-   */
-  distinct?: Prisma.ProjectScalarFieldEnum | Prisma.ProjectScalarFieldEnum[]
-}
-
-/**
- * Project findFirstOrThrow
- */
-export type ProjectFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * Filter, which Project to fetch.
-   */
-  where?: Prisma.ProjectWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Projects to fetch.
-   */
-  orderBy?: Prisma.ProjectOrderByWithRelationInput | Prisma.ProjectOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Projects.
-   */
-  cursor?: Prisma.ProjectWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Projects from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Projects.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Projects.
-   */
-  distinct?: Prisma.ProjectScalarFieldEnum | Prisma.ProjectScalarFieldEnum[]
-}
-
-/**
- * Project findMany
- */
-export type ProjectFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * Filter, which Projects to fetch.
-   */
-  where?: Prisma.ProjectWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Projects to fetch.
-   */
-  orderBy?: Prisma.ProjectOrderByWithRelationInput | Prisma.ProjectOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing Projects.
-   */
-  cursor?: Prisma.ProjectWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Projects from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Projects.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Projects.
-   */
-  distinct?: Prisma.ProjectScalarFieldEnum | Prisma.ProjectScalarFieldEnum[]
-}
-
-/**
- * Project create
- */
-export type ProjectCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * The data needed to create a Project.
-   */
-  data: Prisma.XOR<Prisma.ProjectCreateInput, Prisma.ProjectUncheckedCreateInput>
-}
-
-/**
- * Project createMany
- */
-export type ProjectCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many Projects.
-   */
-  data: Prisma.ProjectCreateManyInput | Prisma.ProjectCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * Project createManyAndReturn
- */
-export type ProjectCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * The data used to create many Projects.
-   */
-  data: Prisma.ProjectCreateManyInput | Prisma.ProjectCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * Project update
- */
-export type ProjectUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * The data needed to update a Project.
-   */
-  data: Prisma.XOR<Prisma.ProjectUpdateInput, Prisma.ProjectUncheckedUpdateInput>
-  /**
-   * Choose, which Project to update.
-   */
-  where: Prisma.ProjectWhereUniqueInput
-}
-
-/**
- * Project updateMany
- */
-export type ProjectUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update Projects.
-   */
-  data: Prisma.XOR<Prisma.ProjectUpdateManyMutationInput, Prisma.ProjectUncheckedUpdateManyInput>
-  /**
-   * Filter which Projects to update
-   */
-  where?: Prisma.ProjectWhereInput
-  /**
-   * Limit how many Projects to update.
-   */
-  limit?: number
-}
-
-/**
- * Project updateManyAndReturn
- */
-export type ProjectUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * The data used to update Projects.
-   */
-  data: Prisma.XOR<Prisma.ProjectUpdateManyMutationInput, Prisma.ProjectUncheckedUpdateManyInput>
-  /**
-   * Filter which Projects to update
-   */
-  where?: Prisma.ProjectWhereInput
-  /**
-   * Limit how many Projects to update.
-   */
-  limit?: number
-}
-
-/**
- * Project upsert
- */
-export type ProjectUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * The filter to search for the Project to update in case it exists.
-   */
-  where: Prisma.ProjectWhereUniqueInput
-  /**
-   * In case the Project found by the `where` argument doesn't exist, create a new Project with this data.
-   */
-  create: Prisma.XOR<Prisma.ProjectCreateInput, Prisma.ProjectUncheckedCreateInput>
-  /**
-   * In case the Project was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.ProjectUpdateInput, Prisma.ProjectUncheckedUpdateInput>
-}
-
-/**
- * Project delete
- */
-export type ProjectDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-  /**
-   * Filter which Project to delete.
-   */
-  where: Prisma.ProjectWhereUniqueInput
-}
-
-/**
- * Project deleteMany
- */
-export type ProjectDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Projects to delete
-   */
-  where?: Prisma.ProjectWhereInput
-  /**
-   * Limit how many Projects to delete.
-   */
-  limit?: number
-}
-
-/**
- * Project.members
- */
-export type Project$membersArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  where?: Prisma.ProjectMemberWhereInput
-  orderBy?: Prisma.ProjectMemberOrderByWithRelationInput | Prisma.ProjectMemberOrderByWithRelationInput[]
-  cursor?: Prisma.ProjectMemberWhereUniqueInput
-  take?: number
-  skip?: number
-  distinct?: Prisma.ProjectMemberScalarFieldEnum | Prisma.ProjectMemberScalarFieldEnum[]
-}
-
-/**
- * Project.invitations
- */
-export type Project$invitationsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  where?: Prisma.ProjectInvitationWhereInput
-  orderBy?: Prisma.ProjectInvitationOrderByWithRelationInput | Prisma.ProjectInvitationOrderByWithRelationInput[]
-  cursor?: Prisma.ProjectInvitationWhereUniqueInput
-  take?: number
-  skip?: number
-  distinct?: Prisma.ProjectInvitationScalarFieldEnum | Prisma.ProjectInvitationScalarFieldEnum[]
-}
-
-/**
- * Project without action
- */
-export type ProjectDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Project
-   */
-  select?: Prisma.ProjectSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Project
-   */
-  omit?: Prisma.ProjectOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInclude<ExtArgs> | null
-}
diff --git a/src/generated/client/models/ProjectInvitation.ts b/src/generated/client/models/ProjectInvitation.ts
deleted file mode 100644
index 3d15a96d..00000000
--- a/src/generated/client/models/ProjectInvitation.ts
+++ /dev/null
@@ -1,1390 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `ProjectInvitation` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model ProjectInvitation
- * 
- */
-export type ProjectInvitationModel = runtime.Types.Result.DefaultSelection<Prisma.$ProjectInvitationPayload>
-
-export type AggregateProjectInvitation = {
-  _count: ProjectInvitationCountAggregateOutputType | null
-  _avg: ProjectInvitationAvgAggregateOutputType | null
-  _sum: ProjectInvitationSumAggregateOutputType | null
-  _min: ProjectInvitationMinAggregateOutputType | null
-  _max: ProjectInvitationMaxAggregateOutputType | null
-}
-
-export type ProjectInvitationAvgAggregateOutputType = {
-  id: number | null
-}
-
-export type ProjectInvitationSumAggregateOutputType = {
-  id: number | null
-}
-
-export type ProjectInvitationMinAggregateOutputType = {
-  id: number | null
-  token: string | null
-  email: string | null
-  createdAt: Date | null
-  projectId: string | null
-}
-
-export type ProjectInvitationMaxAggregateOutputType = {
-  id: number | null
-  token: string | null
-  email: string | null
-  createdAt: Date | null
-  projectId: string | null
-}
-
-export type ProjectInvitationCountAggregateOutputType = {
-  id: number
-  token: number
-  email: number
-  createdAt: number
-  projectId: number
-  _all: number
-}
-
-
-export type ProjectInvitationAvgAggregateInputType = {
-  id?: true
-}
-
-export type ProjectInvitationSumAggregateInputType = {
-  id?: true
-}
-
-export type ProjectInvitationMinAggregateInputType = {
-  id?: true
-  token?: true
-  email?: true
-  createdAt?: true
-  projectId?: true
-}
-
-export type ProjectInvitationMaxAggregateInputType = {
-  id?: true
-  token?: true
-  email?: true
-  createdAt?: true
-  projectId?: true
-}
-
-export type ProjectInvitationCountAggregateInputType = {
-  id?: true
-  token?: true
-  email?: true
-  createdAt?: true
-  projectId?: true
-  _all?: true
-}
-
-export type ProjectInvitationAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which ProjectInvitation to aggregate.
-   */
-  where?: Prisma.ProjectInvitationWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectInvitations to fetch.
-   */
-  orderBy?: Prisma.ProjectInvitationOrderByWithRelationInput | Prisma.ProjectInvitationOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.ProjectInvitationWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectInvitations from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectInvitations.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned ProjectInvitations
-  **/
-  _count?: true | ProjectInvitationCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to average
-  **/
-  _avg?: ProjectInvitationAvgAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to sum
-  **/
-  _sum?: ProjectInvitationSumAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: ProjectInvitationMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: ProjectInvitationMaxAggregateInputType
-}
-
-export type GetProjectInvitationAggregateType<T extends ProjectInvitationAggregateArgs> = {
-      [P in keyof T & keyof AggregateProjectInvitation]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateProjectInvitation[P]>
-    : Prisma.GetScalarType<T[P], AggregateProjectInvitation[P]>
-}
-
-
-
-
-export type ProjectInvitationGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.ProjectInvitationWhereInput
-  orderBy?: Prisma.ProjectInvitationOrderByWithAggregationInput | Prisma.ProjectInvitationOrderByWithAggregationInput[]
-  by: Prisma.ProjectInvitationScalarFieldEnum[] | Prisma.ProjectInvitationScalarFieldEnum
-  having?: Prisma.ProjectInvitationScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: ProjectInvitationCountAggregateInputType | true
-  _avg?: ProjectInvitationAvgAggregateInputType
-  _sum?: ProjectInvitationSumAggregateInputType
-  _min?: ProjectInvitationMinAggregateInputType
-  _max?: ProjectInvitationMaxAggregateInputType
-}
-
-export type ProjectInvitationGroupByOutputType = {
-  id: number
-  token: string
-  email: string
-  createdAt: Date
-  projectId: string
-  _count: ProjectInvitationCountAggregateOutputType | null
-  _avg: ProjectInvitationAvgAggregateOutputType | null
-  _sum: ProjectInvitationSumAggregateOutputType | null
-  _min: ProjectInvitationMinAggregateOutputType | null
-  _max: ProjectInvitationMaxAggregateOutputType | null
-}
-
-export type GetProjectInvitationGroupByPayload<T extends ProjectInvitationGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<ProjectInvitationGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof ProjectInvitationGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], ProjectInvitationGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], ProjectInvitationGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type ProjectInvitationWhereInput = {
-  AND?: Prisma.ProjectInvitationWhereInput | Prisma.ProjectInvitationWhereInput[]
-  OR?: Prisma.ProjectInvitationWhereInput[]
-  NOT?: Prisma.ProjectInvitationWhereInput | Prisma.ProjectInvitationWhereInput[]
-  id?: Prisma.IntFilter<"ProjectInvitation"> | number
-  token?: Prisma.StringFilter<"ProjectInvitation"> | string
-  email?: Prisma.StringFilter<"ProjectInvitation"> | string
-  createdAt?: Prisma.DateTimeFilter<"ProjectInvitation"> | Date | string
-  projectId?: Prisma.StringFilter<"ProjectInvitation"> | string
-  project?: Prisma.XOR<Prisma.ProjectScalarRelationFilter, Prisma.ProjectWhereInput>
-}
-
-export type ProjectInvitationOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-  project?: Prisma.ProjectOrderByWithRelationInput
-}
-
-export type ProjectInvitationWhereUniqueInput = Prisma.AtLeast<{
-  id?: number
-  token?: string
-  email_projectId?: Prisma.ProjectInvitationEmailProjectIdCompoundUniqueInput
-  AND?: Prisma.ProjectInvitationWhereInput | Prisma.ProjectInvitationWhereInput[]
-  OR?: Prisma.ProjectInvitationWhereInput[]
-  NOT?: Prisma.ProjectInvitationWhereInput | Prisma.ProjectInvitationWhereInput[]
-  email?: Prisma.StringFilter<"ProjectInvitation"> | string
-  createdAt?: Prisma.DateTimeFilter<"ProjectInvitation"> | Date | string
-  projectId?: Prisma.StringFilter<"ProjectInvitation"> | string
-  project?: Prisma.XOR<Prisma.ProjectScalarRelationFilter, Prisma.ProjectWhereInput>
-}, "id" | "token" | "email_projectId">
-
-export type ProjectInvitationOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-  _count?: Prisma.ProjectInvitationCountOrderByAggregateInput
-  _avg?: Prisma.ProjectInvitationAvgOrderByAggregateInput
-  _max?: Prisma.ProjectInvitationMaxOrderByAggregateInput
-  _min?: Prisma.ProjectInvitationMinOrderByAggregateInput
-  _sum?: Prisma.ProjectInvitationSumOrderByAggregateInput
-}
-
-export type ProjectInvitationScalarWhereWithAggregatesInput = {
-  AND?: Prisma.ProjectInvitationScalarWhereWithAggregatesInput | Prisma.ProjectInvitationScalarWhereWithAggregatesInput[]
-  OR?: Prisma.ProjectInvitationScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.ProjectInvitationScalarWhereWithAggregatesInput | Prisma.ProjectInvitationScalarWhereWithAggregatesInput[]
-  id?: Prisma.IntWithAggregatesFilter<"ProjectInvitation"> | number
-  token?: Prisma.StringWithAggregatesFilter<"ProjectInvitation"> | string
-  email?: Prisma.StringWithAggregatesFilter<"ProjectInvitation"> | string
-  createdAt?: Prisma.DateTimeWithAggregatesFilter<"ProjectInvitation"> | Date | string
-  projectId?: Prisma.StringWithAggregatesFilter<"ProjectInvitation"> | string
-}
-
-export type ProjectInvitationCreateInput = {
-  token: string
-  email: string
-  createdAt?: Date | string
-  project: Prisma.ProjectCreateNestedOneWithoutInvitationsInput
-}
-
-export type ProjectInvitationUncheckedCreateInput = {
-  id?: number
-  token: string
-  email: string
-  createdAt?: Date | string
-  projectId: string
-}
-
-export type ProjectInvitationUpdateInput = {
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  project?: Prisma.ProjectUpdateOneRequiredWithoutInvitationsNestedInput
-}
-
-export type ProjectInvitationUncheckedUpdateInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  projectId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-export type ProjectInvitationCreateManyInput = {
-  id?: number
-  token: string
-  email: string
-  createdAt?: Date | string
-  projectId: string
-}
-
-export type ProjectInvitationUpdateManyMutationInput = {
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type ProjectInvitationUncheckedUpdateManyInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  projectId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-export type ProjectInvitationListRelationFilter = {
-  every?: Prisma.ProjectInvitationWhereInput
-  some?: Prisma.ProjectInvitationWhereInput
-  none?: Prisma.ProjectInvitationWhereInput
-}
-
-export type ProjectInvitationOrderByRelationAggregateInput = {
-  _count?: Prisma.SortOrder
-}
-
-export type ProjectInvitationEmailProjectIdCompoundUniqueInput = {
-  email: string
-  projectId: string
-}
-
-export type ProjectInvitationCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-}
-
-export type ProjectInvitationAvgOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type ProjectInvitationMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-}
-
-export type ProjectInvitationMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-}
-
-export type ProjectInvitationSumOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type ProjectInvitationCreateNestedManyWithoutProjectInput = {
-  create?: Prisma.XOR<Prisma.ProjectInvitationCreateWithoutProjectInput, Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput> | Prisma.ProjectInvitationCreateWithoutProjectInput[] | Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput | Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput[]
-  createMany?: Prisma.ProjectInvitationCreateManyProjectInputEnvelope
-  connect?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-}
-
-export type ProjectInvitationUncheckedCreateNestedManyWithoutProjectInput = {
-  create?: Prisma.XOR<Prisma.ProjectInvitationCreateWithoutProjectInput, Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput> | Prisma.ProjectInvitationCreateWithoutProjectInput[] | Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput | Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput[]
-  createMany?: Prisma.ProjectInvitationCreateManyProjectInputEnvelope
-  connect?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-}
-
-export type ProjectInvitationUpdateManyWithoutProjectNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectInvitationCreateWithoutProjectInput, Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput> | Prisma.ProjectInvitationCreateWithoutProjectInput[] | Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput | Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput[]
-  upsert?: Prisma.ProjectInvitationUpsertWithWhereUniqueWithoutProjectInput | Prisma.ProjectInvitationUpsertWithWhereUniqueWithoutProjectInput[]
-  createMany?: Prisma.ProjectInvitationCreateManyProjectInputEnvelope
-  set?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  disconnect?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  delete?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  connect?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  update?: Prisma.ProjectInvitationUpdateWithWhereUniqueWithoutProjectInput | Prisma.ProjectInvitationUpdateWithWhereUniqueWithoutProjectInput[]
-  updateMany?: Prisma.ProjectInvitationUpdateManyWithWhereWithoutProjectInput | Prisma.ProjectInvitationUpdateManyWithWhereWithoutProjectInput[]
-  deleteMany?: Prisma.ProjectInvitationScalarWhereInput | Prisma.ProjectInvitationScalarWhereInput[]
-}
-
-export type ProjectInvitationUncheckedUpdateManyWithoutProjectNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectInvitationCreateWithoutProjectInput, Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput> | Prisma.ProjectInvitationCreateWithoutProjectInput[] | Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput | Prisma.ProjectInvitationCreateOrConnectWithoutProjectInput[]
-  upsert?: Prisma.ProjectInvitationUpsertWithWhereUniqueWithoutProjectInput | Prisma.ProjectInvitationUpsertWithWhereUniqueWithoutProjectInput[]
-  createMany?: Prisma.ProjectInvitationCreateManyProjectInputEnvelope
-  set?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  disconnect?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  delete?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  connect?: Prisma.ProjectInvitationWhereUniqueInput | Prisma.ProjectInvitationWhereUniqueInput[]
-  update?: Prisma.ProjectInvitationUpdateWithWhereUniqueWithoutProjectInput | Prisma.ProjectInvitationUpdateWithWhereUniqueWithoutProjectInput[]
-  updateMany?: Prisma.ProjectInvitationUpdateManyWithWhereWithoutProjectInput | Prisma.ProjectInvitationUpdateManyWithWhereWithoutProjectInput[]
-  deleteMany?: Prisma.ProjectInvitationScalarWhereInput | Prisma.ProjectInvitationScalarWhereInput[]
-}
-
-export type ProjectInvitationCreateWithoutProjectInput = {
-  token: string
-  email: string
-  createdAt?: Date | string
-}
-
-export type ProjectInvitationUncheckedCreateWithoutProjectInput = {
-  id?: number
-  token: string
-  email: string
-  createdAt?: Date | string
-}
-
-export type ProjectInvitationCreateOrConnectWithoutProjectInput = {
-  where: Prisma.ProjectInvitationWhereUniqueInput
-  create: Prisma.XOR<Prisma.ProjectInvitationCreateWithoutProjectInput, Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput>
-}
-
-export type ProjectInvitationCreateManyProjectInputEnvelope = {
-  data: Prisma.ProjectInvitationCreateManyProjectInput | Prisma.ProjectInvitationCreateManyProjectInput[]
-  skipDuplicates?: boolean
-}
-
-export type ProjectInvitationUpsertWithWhereUniqueWithoutProjectInput = {
-  where: Prisma.ProjectInvitationWhereUniqueInput
-  update: Prisma.XOR<Prisma.ProjectInvitationUpdateWithoutProjectInput, Prisma.ProjectInvitationUncheckedUpdateWithoutProjectInput>
-  create: Prisma.XOR<Prisma.ProjectInvitationCreateWithoutProjectInput, Prisma.ProjectInvitationUncheckedCreateWithoutProjectInput>
-}
-
-export type ProjectInvitationUpdateWithWhereUniqueWithoutProjectInput = {
-  where: Prisma.ProjectInvitationWhereUniqueInput
-  data: Prisma.XOR<Prisma.ProjectInvitationUpdateWithoutProjectInput, Prisma.ProjectInvitationUncheckedUpdateWithoutProjectInput>
-}
-
-export type ProjectInvitationUpdateManyWithWhereWithoutProjectInput = {
-  where: Prisma.ProjectInvitationScalarWhereInput
-  data: Prisma.XOR<Prisma.ProjectInvitationUpdateManyMutationInput, Prisma.ProjectInvitationUncheckedUpdateManyWithoutProjectInput>
-}
-
-export type ProjectInvitationScalarWhereInput = {
-  AND?: Prisma.ProjectInvitationScalarWhereInput | Prisma.ProjectInvitationScalarWhereInput[]
-  OR?: Prisma.ProjectInvitationScalarWhereInput[]
-  NOT?: Prisma.ProjectInvitationScalarWhereInput | Prisma.ProjectInvitationScalarWhereInput[]
-  id?: Prisma.IntFilter<"ProjectInvitation"> | number
-  token?: Prisma.StringFilter<"ProjectInvitation"> | string
-  email?: Prisma.StringFilter<"ProjectInvitation"> | string
-  createdAt?: Prisma.DateTimeFilter<"ProjectInvitation"> | Date | string
-  projectId?: Prisma.StringFilter<"ProjectInvitation"> | string
-}
-
-export type ProjectInvitationCreateManyProjectInput = {
-  id?: number
-  token: string
-  email: string
-  createdAt?: Date | string
-}
-
-export type ProjectInvitationUpdateWithoutProjectInput = {
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type ProjectInvitationUncheckedUpdateWithoutProjectInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type ProjectInvitationUncheckedUpdateManyWithoutProjectInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-
-
-export type ProjectInvitationSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  token?: boolean
-  email?: boolean
-  createdAt?: boolean
-  projectId?: boolean
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["projectInvitation"]>
-
-export type ProjectInvitationSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  token?: boolean
-  email?: boolean
-  createdAt?: boolean
-  projectId?: boolean
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["projectInvitation"]>
-
-export type ProjectInvitationSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  token?: boolean
-  email?: boolean
-  createdAt?: boolean
-  projectId?: boolean
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["projectInvitation"]>
-
-export type ProjectInvitationSelectScalar = {
-  id?: boolean
-  token?: boolean
-  email?: boolean
-  createdAt?: boolean
-  projectId?: boolean
-}
-
-export type ProjectInvitationOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "token" | "email" | "createdAt" | "projectId", ExtArgs["result"]["projectInvitation"]>
-export type ProjectInvitationInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}
-export type ProjectInvitationIncludeCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}
-export type ProjectInvitationIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}
-
-export type $ProjectInvitationPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "ProjectInvitation"
-  objects: {
-    project: Prisma.$ProjectPayload<ExtArgs>
-  }
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: number
-    token: string
-    email: string
-    createdAt: Date
-    projectId: string
-  }, ExtArgs["result"]["projectInvitation"]>
-  composites: {}
-}
-
-export type ProjectInvitationGetPayload<S extends boolean | null | undefined | ProjectInvitationDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload, S>
-
-export type ProjectInvitationCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<ProjectInvitationFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: ProjectInvitationCountAggregateInputType | true
-  }
-
-export interface ProjectInvitationDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['ProjectInvitation'], meta: { name: 'ProjectInvitation' } }
-  /**
-   * Find zero or one ProjectInvitation that matches the filter.
-   * @param {ProjectInvitationFindUniqueArgs} args - Arguments to find a ProjectInvitation
-   * @example
-   * // Get one ProjectInvitation
-   * const projectInvitation = await prisma.projectInvitation.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends ProjectInvitationFindUniqueArgs>(args: Prisma.SelectSubset<T, ProjectInvitationFindUniqueArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one ProjectInvitation that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {ProjectInvitationFindUniqueOrThrowArgs} args - Arguments to find a ProjectInvitation
-   * @example
-   * // Get one ProjectInvitation
-   * const projectInvitation = await prisma.projectInvitation.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends ProjectInvitationFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, ProjectInvitationFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first ProjectInvitation that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectInvitationFindFirstArgs} args - Arguments to find a ProjectInvitation
-   * @example
-   * // Get one ProjectInvitation
-   * const projectInvitation = await prisma.projectInvitation.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends ProjectInvitationFindFirstArgs>(args?: Prisma.SelectSubset<T, ProjectInvitationFindFirstArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first ProjectInvitation that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectInvitationFindFirstOrThrowArgs} args - Arguments to find a ProjectInvitation
-   * @example
-   * // Get one ProjectInvitation
-   * const projectInvitation = await prisma.projectInvitation.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends ProjectInvitationFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, ProjectInvitationFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more ProjectInvitations that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectInvitationFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all ProjectInvitations
-   * const projectInvitations = await prisma.projectInvitation.findMany()
-   * 
-   * // Get first 10 ProjectInvitations
-   * const projectInvitations = await prisma.projectInvitation.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const projectInvitationWithIdOnly = await prisma.projectInvitation.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends ProjectInvitationFindManyArgs>(args?: Prisma.SelectSubset<T, ProjectInvitationFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a ProjectInvitation.
-   * @param {ProjectInvitationCreateArgs} args - Arguments to create a ProjectInvitation.
-   * @example
-   * // Create one ProjectInvitation
-   * const ProjectInvitation = await prisma.projectInvitation.create({
-   *   data: {
-   *     // ... data to create a ProjectInvitation
-   *   }
-   * })
-   * 
-   */
-  create<T extends ProjectInvitationCreateArgs>(args: Prisma.SelectSubset<T, ProjectInvitationCreateArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many ProjectInvitations.
-   * @param {ProjectInvitationCreateManyArgs} args - Arguments to create many ProjectInvitations.
-   * @example
-   * // Create many ProjectInvitations
-   * const projectInvitation = await prisma.projectInvitation.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends ProjectInvitationCreateManyArgs>(args?: Prisma.SelectSubset<T, ProjectInvitationCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many ProjectInvitations and returns the data saved in the database.
-   * @param {ProjectInvitationCreateManyAndReturnArgs} args - Arguments to create many ProjectInvitations.
-   * @example
-   * // Create many ProjectInvitations
-   * const projectInvitation = await prisma.projectInvitation.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many ProjectInvitations and only return the `id`
-   * const projectInvitationWithIdOnly = await prisma.projectInvitation.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends ProjectInvitationCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, ProjectInvitationCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a ProjectInvitation.
-   * @param {ProjectInvitationDeleteArgs} args - Arguments to delete one ProjectInvitation.
-   * @example
-   * // Delete one ProjectInvitation
-   * const ProjectInvitation = await prisma.projectInvitation.delete({
-   *   where: {
-   *     // ... filter to delete one ProjectInvitation
-   *   }
-   * })
-   * 
-   */
-  delete<T extends ProjectInvitationDeleteArgs>(args: Prisma.SelectSubset<T, ProjectInvitationDeleteArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one ProjectInvitation.
-   * @param {ProjectInvitationUpdateArgs} args - Arguments to update one ProjectInvitation.
-   * @example
-   * // Update one ProjectInvitation
-   * const projectInvitation = await prisma.projectInvitation.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends ProjectInvitationUpdateArgs>(args: Prisma.SelectSubset<T, ProjectInvitationUpdateArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more ProjectInvitations.
-   * @param {ProjectInvitationDeleteManyArgs} args - Arguments to filter ProjectInvitations to delete.
-   * @example
-   * // Delete a few ProjectInvitations
-   * const { count } = await prisma.projectInvitation.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends ProjectInvitationDeleteManyArgs>(args?: Prisma.SelectSubset<T, ProjectInvitationDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more ProjectInvitations.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectInvitationUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many ProjectInvitations
-   * const projectInvitation = await prisma.projectInvitation.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends ProjectInvitationUpdateManyArgs>(args: Prisma.SelectSubset<T, ProjectInvitationUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more ProjectInvitations and returns the data updated in the database.
-   * @param {ProjectInvitationUpdateManyAndReturnArgs} args - Arguments to update many ProjectInvitations.
-   * @example
-   * // Update many ProjectInvitations
-   * const projectInvitation = await prisma.projectInvitation.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more ProjectInvitations and only return the `id`
-   * const projectInvitationWithIdOnly = await prisma.projectInvitation.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends ProjectInvitationUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, ProjectInvitationUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one ProjectInvitation.
-   * @param {ProjectInvitationUpsertArgs} args - Arguments to update or create a ProjectInvitation.
-   * @example
-   * // Update or create a ProjectInvitation
-   * const projectInvitation = await prisma.projectInvitation.upsert({
-   *   create: {
-   *     // ... data to create a ProjectInvitation
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the ProjectInvitation we want to update
-   *   }
-   * })
-   */
-  upsert<T extends ProjectInvitationUpsertArgs>(args: Prisma.SelectSubset<T, ProjectInvitationUpsertArgs<ExtArgs>>): Prisma.Prisma__ProjectInvitationClient<runtime.Types.Result.GetResult<Prisma.$ProjectInvitationPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of ProjectInvitations.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectInvitationCountArgs} args - Arguments to filter ProjectInvitations to count.
-   * @example
-   * // Count the number of ProjectInvitations
-   * const count = await prisma.projectInvitation.count({
-   *   where: {
-   *     // ... the filter for the ProjectInvitations we want to count
-   *   }
-   * })
-  **/
-  count<T extends ProjectInvitationCountArgs>(
-    args?: Prisma.Subset<T, ProjectInvitationCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], ProjectInvitationCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a ProjectInvitation.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectInvitationAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends ProjectInvitationAggregateArgs>(args: Prisma.Subset<T, ProjectInvitationAggregateArgs>): Prisma.PrismaPromise<GetProjectInvitationAggregateType<T>>
-
-  /**
-   * Group by ProjectInvitation.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectInvitationGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends ProjectInvitationGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: ProjectInvitationGroupByArgs['orderBy'] }
-      : { orderBy?: ProjectInvitationGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, ProjectInvitationGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetProjectInvitationGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the ProjectInvitation model
- */
-readonly fields: ProjectInvitationFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for ProjectInvitation.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__ProjectInvitationClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  project<T extends Prisma.ProjectDefaultArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.ProjectDefaultArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | Null, Null, ExtArgs, GlobalOmitOptions>
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the ProjectInvitation model
- */
-export interface ProjectInvitationFieldRefs {
-  readonly id: Prisma.FieldRef<"ProjectInvitation", 'Int'>
-  readonly token: Prisma.FieldRef<"ProjectInvitation", 'String'>
-  readonly email: Prisma.FieldRef<"ProjectInvitation", 'String'>
-  readonly createdAt: Prisma.FieldRef<"ProjectInvitation", 'DateTime'>
-  readonly projectId: Prisma.FieldRef<"ProjectInvitation", 'String'>
-}
-    
-
-// Custom InputTypes
-/**
- * ProjectInvitation findUnique
- */
-export type ProjectInvitationFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectInvitation to fetch.
-   */
-  where: Prisma.ProjectInvitationWhereUniqueInput
-}
-
-/**
- * ProjectInvitation findUniqueOrThrow
- */
-export type ProjectInvitationFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectInvitation to fetch.
-   */
-  where: Prisma.ProjectInvitationWhereUniqueInput
-}
-
-/**
- * ProjectInvitation findFirst
- */
-export type ProjectInvitationFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectInvitation to fetch.
-   */
-  where?: Prisma.ProjectInvitationWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectInvitations to fetch.
-   */
-  orderBy?: Prisma.ProjectInvitationOrderByWithRelationInput | Prisma.ProjectInvitationOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for ProjectInvitations.
-   */
-  cursor?: Prisma.ProjectInvitationWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectInvitations from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectInvitations.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of ProjectInvitations.
-   */
-  distinct?: Prisma.ProjectInvitationScalarFieldEnum | Prisma.ProjectInvitationScalarFieldEnum[]
-}
-
-/**
- * ProjectInvitation findFirstOrThrow
- */
-export type ProjectInvitationFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectInvitation to fetch.
-   */
-  where?: Prisma.ProjectInvitationWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectInvitations to fetch.
-   */
-  orderBy?: Prisma.ProjectInvitationOrderByWithRelationInput | Prisma.ProjectInvitationOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for ProjectInvitations.
-   */
-  cursor?: Prisma.ProjectInvitationWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectInvitations from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectInvitations.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of ProjectInvitations.
-   */
-  distinct?: Prisma.ProjectInvitationScalarFieldEnum | Prisma.ProjectInvitationScalarFieldEnum[]
-}
-
-/**
- * ProjectInvitation findMany
- */
-export type ProjectInvitationFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectInvitations to fetch.
-   */
-  where?: Prisma.ProjectInvitationWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectInvitations to fetch.
-   */
-  orderBy?: Prisma.ProjectInvitationOrderByWithRelationInput | Prisma.ProjectInvitationOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing ProjectInvitations.
-   */
-  cursor?: Prisma.ProjectInvitationWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectInvitations from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectInvitations.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of ProjectInvitations.
-   */
-  distinct?: Prisma.ProjectInvitationScalarFieldEnum | Prisma.ProjectInvitationScalarFieldEnum[]
-}
-
-/**
- * ProjectInvitation create
- */
-export type ProjectInvitationCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * The data needed to create a ProjectInvitation.
-   */
-  data: Prisma.XOR<Prisma.ProjectInvitationCreateInput, Prisma.ProjectInvitationUncheckedCreateInput>
-}
-
-/**
- * ProjectInvitation createMany
- */
-export type ProjectInvitationCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many ProjectInvitations.
-   */
-  data: Prisma.ProjectInvitationCreateManyInput | Prisma.ProjectInvitationCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * ProjectInvitation createManyAndReturn
- */
-export type ProjectInvitationCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * The data used to create many ProjectInvitations.
-   */
-  data: Prisma.ProjectInvitationCreateManyInput | Prisma.ProjectInvitationCreateManyInput[]
-  skipDuplicates?: boolean
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationIncludeCreateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * ProjectInvitation update
- */
-export type ProjectInvitationUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * The data needed to update a ProjectInvitation.
-   */
-  data: Prisma.XOR<Prisma.ProjectInvitationUpdateInput, Prisma.ProjectInvitationUncheckedUpdateInput>
-  /**
-   * Choose, which ProjectInvitation to update.
-   */
-  where: Prisma.ProjectInvitationWhereUniqueInput
-}
-
-/**
- * ProjectInvitation updateMany
- */
-export type ProjectInvitationUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update ProjectInvitations.
-   */
-  data: Prisma.XOR<Prisma.ProjectInvitationUpdateManyMutationInput, Prisma.ProjectInvitationUncheckedUpdateManyInput>
-  /**
-   * Filter which ProjectInvitations to update
-   */
-  where?: Prisma.ProjectInvitationWhereInput
-  /**
-   * Limit how many ProjectInvitations to update.
-   */
-  limit?: number
-}
-
-/**
- * ProjectInvitation updateManyAndReturn
- */
-export type ProjectInvitationUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * The data used to update ProjectInvitations.
-   */
-  data: Prisma.XOR<Prisma.ProjectInvitationUpdateManyMutationInput, Prisma.ProjectInvitationUncheckedUpdateManyInput>
-  /**
-   * Filter which ProjectInvitations to update
-   */
-  where?: Prisma.ProjectInvitationWhereInput
-  /**
-   * Limit how many ProjectInvitations to update.
-   */
-  limit?: number
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationIncludeUpdateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * ProjectInvitation upsert
- */
-export type ProjectInvitationUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * The filter to search for the ProjectInvitation to update in case it exists.
-   */
-  where: Prisma.ProjectInvitationWhereUniqueInput
-  /**
-   * In case the ProjectInvitation found by the `where` argument doesn't exist, create a new ProjectInvitation with this data.
-   */
-  create: Prisma.XOR<Prisma.ProjectInvitationCreateInput, Prisma.ProjectInvitationUncheckedCreateInput>
-  /**
-   * In case the ProjectInvitation was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.ProjectInvitationUpdateInput, Prisma.ProjectInvitationUncheckedUpdateInput>
-}
-
-/**
- * ProjectInvitation delete
- */
-export type ProjectInvitationDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-  /**
-   * Filter which ProjectInvitation to delete.
-   */
-  where: Prisma.ProjectInvitationWhereUniqueInput
-}
-
-/**
- * ProjectInvitation deleteMany
- */
-export type ProjectInvitationDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which ProjectInvitations to delete
-   */
-  where?: Prisma.ProjectInvitationWhereInput
-  /**
-   * Limit how many ProjectInvitations to delete.
-   */
-  limit?: number
-}
-
-/**
- * ProjectInvitation without action
- */
-export type ProjectInvitationDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectInvitation
-   */
-  select?: Prisma.ProjectInvitationSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectInvitation
-   */
-  omit?: Prisma.ProjectInvitationOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectInvitationInclude<ExtArgs> | null
-}
diff --git a/src/generated/client/models/ProjectMember.ts b/src/generated/client/models/ProjectMember.ts
deleted file mode 100644
index bac15c15..00000000
--- a/src/generated/client/models/ProjectMember.ts
+++ /dev/null
@@ -1,1471 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `ProjectMember` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model ProjectMember
- * 
- */
-export type ProjectMemberModel = runtime.Types.Result.DefaultSelection<Prisma.$ProjectMemberPayload>
-
-export type AggregateProjectMember = {
-  _count: ProjectMemberCountAggregateOutputType | null
-  _avg: ProjectMemberAvgAggregateOutputType | null
-  _sum: ProjectMemberSumAggregateOutputType | null
-  _min: ProjectMemberMinAggregateOutputType | null
-  _max: ProjectMemberMaxAggregateOutputType | null
-}
-
-export type ProjectMemberAvgAggregateOutputType = {
-  id: number | null
-}
-
-export type ProjectMemberSumAggregateOutputType = {
-  id: number | null
-}
-
-export type ProjectMemberMinAggregateOutputType = {
-  id: number | null
-  role: $Enums.ProjectRole | null
-  userId: string | null
-  projectId: string | null
-}
-
-export type ProjectMemberMaxAggregateOutputType = {
-  id: number | null
-  role: $Enums.ProjectRole | null
-  userId: string | null
-  projectId: string | null
-}
-
-export type ProjectMemberCountAggregateOutputType = {
-  id: number
-  role: number
-  userId: number
-  projectId: number
-  _all: number
-}
-
-
-export type ProjectMemberAvgAggregateInputType = {
-  id?: true
-}
-
-export type ProjectMemberSumAggregateInputType = {
-  id?: true
-}
-
-export type ProjectMemberMinAggregateInputType = {
-  id?: true
-  role?: true
-  userId?: true
-  projectId?: true
-}
-
-export type ProjectMemberMaxAggregateInputType = {
-  id?: true
-  role?: true
-  userId?: true
-  projectId?: true
-}
-
-export type ProjectMemberCountAggregateInputType = {
-  id?: true
-  role?: true
-  userId?: true
-  projectId?: true
-  _all?: true
-}
-
-export type ProjectMemberAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which ProjectMember to aggregate.
-   */
-  where?: Prisma.ProjectMemberWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectMembers to fetch.
-   */
-  orderBy?: Prisma.ProjectMemberOrderByWithRelationInput | Prisma.ProjectMemberOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.ProjectMemberWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectMembers from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectMembers.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned ProjectMembers
-  **/
-  _count?: true | ProjectMemberCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to average
-  **/
-  _avg?: ProjectMemberAvgAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to sum
-  **/
-  _sum?: ProjectMemberSumAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: ProjectMemberMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: ProjectMemberMaxAggregateInputType
-}
-
-export type GetProjectMemberAggregateType<T extends ProjectMemberAggregateArgs> = {
-      [P in keyof T & keyof AggregateProjectMember]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateProjectMember[P]>
-    : Prisma.GetScalarType<T[P], AggregateProjectMember[P]>
-}
-
-
-
-
-export type ProjectMemberGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.ProjectMemberWhereInput
-  orderBy?: Prisma.ProjectMemberOrderByWithAggregationInput | Prisma.ProjectMemberOrderByWithAggregationInput[]
-  by: Prisma.ProjectMemberScalarFieldEnum[] | Prisma.ProjectMemberScalarFieldEnum
-  having?: Prisma.ProjectMemberScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: ProjectMemberCountAggregateInputType | true
-  _avg?: ProjectMemberAvgAggregateInputType
-  _sum?: ProjectMemberSumAggregateInputType
-  _min?: ProjectMemberMinAggregateInputType
-  _max?: ProjectMemberMaxAggregateInputType
-}
-
-export type ProjectMemberGroupByOutputType = {
-  id: number
-  role: $Enums.ProjectRole
-  userId: string
-  projectId: string
-  _count: ProjectMemberCountAggregateOutputType | null
-  _avg: ProjectMemberAvgAggregateOutputType | null
-  _sum: ProjectMemberSumAggregateOutputType | null
-  _min: ProjectMemberMinAggregateOutputType | null
-  _max: ProjectMemberMaxAggregateOutputType | null
-}
-
-export type GetProjectMemberGroupByPayload<T extends ProjectMemberGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<ProjectMemberGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof ProjectMemberGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], ProjectMemberGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], ProjectMemberGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type ProjectMemberWhereInput = {
-  AND?: Prisma.ProjectMemberWhereInput | Prisma.ProjectMemberWhereInput[]
-  OR?: Prisma.ProjectMemberWhereInput[]
-  NOT?: Prisma.ProjectMemberWhereInput | Prisma.ProjectMemberWhereInput[]
-  id?: Prisma.IntFilter<"ProjectMember"> | number
-  role?: Prisma.EnumProjectRoleFilter<"ProjectMember"> | $Enums.ProjectRole
-  userId?: Prisma.StringFilter<"ProjectMember"> | string
-  projectId?: Prisma.StringFilter<"ProjectMember"> | string
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-  project?: Prisma.XOR<Prisma.ProjectScalarRelationFilter, Prisma.ProjectWhereInput>
-}
-
-export type ProjectMemberOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-  user?: Prisma.UserOrderByWithRelationInput
-  project?: Prisma.ProjectOrderByWithRelationInput
-}
-
-export type ProjectMemberWhereUniqueInput = Prisma.AtLeast<{
-  id?: number
-  userId_projectId?: Prisma.ProjectMemberUserIdProjectIdCompoundUniqueInput
-  AND?: Prisma.ProjectMemberWhereInput | Prisma.ProjectMemberWhereInput[]
-  OR?: Prisma.ProjectMemberWhereInput[]
-  NOT?: Prisma.ProjectMemberWhereInput | Prisma.ProjectMemberWhereInput[]
-  role?: Prisma.EnumProjectRoleFilter<"ProjectMember"> | $Enums.ProjectRole
-  userId?: Prisma.StringFilter<"ProjectMember"> | string
-  projectId?: Prisma.StringFilter<"ProjectMember"> | string
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-  project?: Prisma.XOR<Prisma.ProjectScalarRelationFilter, Prisma.ProjectWhereInput>
-}, "id" | "userId_projectId">
-
-export type ProjectMemberOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-  _count?: Prisma.ProjectMemberCountOrderByAggregateInput
-  _avg?: Prisma.ProjectMemberAvgOrderByAggregateInput
-  _max?: Prisma.ProjectMemberMaxOrderByAggregateInput
-  _min?: Prisma.ProjectMemberMinOrderByAggregateInput
-  _sum?: Prisma.ProjectMemberSumOrderByAggregateInput
-}
-
-export type ProjectMemberScalarWhereWithAggregatesInput = {
-  AND?: Prisma.ProjectMemberScalarWhereWithAggregatesInput | Prisma.ProjectMemberScalarWhereWithAggregatesInput[]
-  OR?: Prisma.ProjectMemberScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.ProjectMemberScalarWhereWithAggregatesInput | Prisma.ProjectMemberScalarWhereWithAggregatesInput[]
-  id?: Prisma.IntWithAggregatesFilter<"ProjectMember"> | number
-  role?: Prisma.EnumProjectRoleWithAggregatesFilter<"ProjectMember"> | $Enums.ProjectRole
-  userId?: Prisma.StringWithAggregatesFilter<"ProjectMember"> | string
-  projectId?: Prisma.StringWithAggregatesFilter<"ProjectMember"> | string
-}
-
-export type ProjectMemberCreateInput = {
-  role?: $Enums.ProjectRole
-  user: Prisma.UserCreateNestedOneWithoutProjectsInput
-  project: Prisma.ProjectCreateNestedOneWithoutMembersInput
-}
-
-export type ProjectMemberUncheckedCreateInput = {
-  id?: number
-  role?: $Enums.ProjectRole
-  userId: string
-  projectId: string
-}
-
-export type ProjectMemberUpdateInput = {
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  user?: Prisma.UserUpdateOneRequiredWithoutProjectsNestedInput
-  project?: Prisma.ProjectUpdateOneRequiredWithoutMembersNestedInput
-}
-
-export type ProjectMemberUncheckedUpdateInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  projectId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-export type ProjectMemberCreateManyInput = {
-  id?: number
-  role?: $Enums.ProjectRole
-  userId: string
-  projectId: string
-}
-
-export type ProjectMemberUpdateManyMutationInput = {
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-}
-
-export type ProjectMemberUncheckedUpdateManyInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  projectId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-export type ProjectMemberListRelationFilter = {
-  every?: Prisma.ProjectMemberWhereInput
-  some?: Prisma.ProjectMemberWhereInput
-  none?: Prisma.ProjectMemberWhereInput
-}
-
-export type ProjectMemberOrderByRelationAggregateInput = {
-  _count?: Prisma.SortOrder
-}
-
-export type ProjectMemberUserIdProjectIdCompoundUniqueInput = {
-  userId: string
-  projectId: string
-}
-
-export type ProjectMemberCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-}
-
-export type ProjectMemberAvgOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type ProjectMemberMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-}
-
-export type ProjectMemberMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  projectId?: Prisma.SortOrder
-}
-
-export type ProjectMemberSumOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type ProjectMemberCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutUserInput, Prisma.ProjectMemberUncheckedCreateWithoutUserInput> | Prisma.ProjectMemberCreateWithoutUserInput[] | Prisma.ProjectMemberUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutUserInput | Prisma.ProjectMemberCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.ProjectMemberCreateManyUserInputEnvelope
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-}
-
-export type ProjectMemberUncheckedCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutUserInput, Prisma.ProjectMemberUncheckedCreateWithoutUserInput> | Prisma.ProjectMemberCreateWithoutUserInput[] | Prisma.ProjectMemberUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutUserInput | Prisma.ProjectMemberCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.ProjectMemberCreateManyUserInputEnvelope
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-}
-
-export type ProjectMemberUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutUserInput, Prisma.ProjectMemberUncheckedCreateWithoutUserInput> | Prisma.ProjectMemberCreateWithoutUserInput[] | Prisma.ProjectMemberUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutUserInput | Prisma.ProjectMemberCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.ProjectMemberUpsertWithWhereUniqueWithoutUserInput | Prisma.ProjectMemberUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.ProjectMemberCreateManyUserInputEnvelope
-  set?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  disconnect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  delete?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  update?: Prisma.ProjectMemberUpdateWithWhereUniqueWithoutUserInput | Prisma.ProjectMemberUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.ProjectMemberUpdateManyWithWhereWithoutUserInput | Prisma.ProjectMemberUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.ProjectMemberScalarWhereInput | Prisma.ProjectMemberScalarWhereInput[]
-}
-
-export type ProjectMemberUncheckedUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutUserInput, Prisma.ProjectMemberUncheckedCreateWithoutUserInput> | Prisma.ProjectMemberCreateWithoutUserInput[] | Prisma.ProjectMemberUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutUserInput | Prisma.ProjectMemberCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.ProjectMemberUpsertWithWhereUniqueWithoutUserInput | Prisma.ProjectMemberUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.ProjectMemberCreateManyUserInputEnvelope
-  set?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  disconnect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  delete?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  update?: Prisma.ProjectMemberUpdateWithWhereUniqueWithoutUserInput | Prisma.ProjectMemberUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.ProjectMemberUpdateManyWithWhereWithoutUserInput | Prisma.ProjectMemberUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.ProjectMemberScalarWhereInput | Prisma.ProjectMemberScalarWhereInput[]
-}
-
-export type ProjectMemberCreateNestedManyWithoutProjectInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutProjectInput, Prisma.ProjectMemberUncheckedCreateWithoutProjectInput> | Prisma.ProjectMemberCreateWithoutProjectInput[] | Prisma.ProjectMemberUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutProjectInput | Prisma.ProjectMemberCreateOrConnectWithoutProjectInput[]
-  createMany?: Prisma.ProjectMemberCreateManyProjectInputEnvelope
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-}
-
-export type ProjectMemberUncheckedCreateNestedManyWithoutProjectInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutProjectInput, Prisma.ProjectMemberUncheckedCreateWithoutProjectInput> | Prisma.ProjectMemberCreateWithoutProjectInput[] | Prisma.ProjectMemberUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutProjectInput | Prisma.ProjectMemberCreateOrConnectWithoutProjectInput[]
-  createMany?: Prisma.ProjectMemberCreateManyProjectInputEnvelope
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-}
-
-export type ProjectMemberUpdateManyWithoutProjectNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutProjectInput, Prisma.ProjectMemberUncheckedCreateWithoutProjectInput> | Prisma.ProjectMemberCreateWithoutProjectInput[] | Prisma.ProjectMemberUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutProjectInput | Prisma.ProjectMemberCreateOrConnectWithoutProjectInput[]
-  upsert?: Prisma.ProjectMemberUpsertWithWhereUniqueWithoutProjectInput | Prisma.ProjectMemberUpsertWithWhereUniqueWithoutProjectInput[]
-  createMany?: Prisma.ProjectMemberCreateManyProjectInputEnvelope
-  set?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  disconnect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  delete?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  update?: Prisma.ProjectMemberUpdateWithWhereUniqueWithoutProjectInput | Prisma.ProjectMemberUpdateWithWhereUniqueWithoutProjectInput[]
-  updateMany?: Prisma.ProjectMemberUpdateManyWithWhereWithoutProjectInput | Prisma.ProjectMemberUpdateManyWithWhereWithoutProjectInput[]
-  deleteMany?: Prisma.ProjectMemberScalarWhereInput | Prisma.ProjectMemberScalarWhereInput[]
-}
-
-export type ProjectMemberUncheckedUpdateManyWithoutProjectNestedInput = {
-  create?: Prisma.XOR<Prisma.ProjectMemberCreateWithoutProjectInput, Prisma.ProjectMemberUncheckedCreateWithoutProjectInput> | Prisma.ProjectMemberCreateWithoutProjectInput[] | Prisma.ProjectMemberUncheckedCreateWithoutProjectInput[]
-  connectOrCreate?: Prisma.ProjectMemberCreateOrConnectWithoutProjectInput | Prisma.ProjectMemberCreateOrConnectWithoutProjectInput[]
-  upsert?: Prisma.ProjectMemberUpsertWithWhereUniqueWithoutProjectInput | Prisma.ProjectMemberUpsertWithWhereUniqueWithoutProjectInput[]
-  createMany?: Prisma.ProjectMemberCreateManyProjectInputEnvelope
-  set?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  disconnect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  delete?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  connect?: Prisma.ProjectMemberWhereUniqueInput | Prisma.ProjectMemberWhereUniqueInput[]
-  update?: Prisma.ProjectMemberUpdateWithWhereUniqueWithoutProjectInput | Prisma.ProjectMemberUpdateWithWhereUniqueWithoutProjectInput[]
-  updateMany?: Prisma.ProjectMemberUpdateManyWithWhereWithoutProjectInput | Prisma.ProjectMemberUpdateManyWithWhereWithoutProjectInput[]
-  deleteMany?: Prisma.ProjectMemberScalarWhereInput | Prisma.ProjectMemberScalarWhereInput[]
-}
-
-export type EnumProjectRoleFieldUpdateOperationsInput = {
-  set?: $Enums.ProjectRole
-}
-
-export type ProjectMemberCreateWithoutUserInput = {
-  role?: $Enums.ProjectRole
-  project: Prisma.ProjectCreateNestedOneWithoutMembersInput
-}
-
-export type ProjectMemberUncheckedCreateWithoutUserInput = {
-  id?: number
-  role?: $Enums.ProjectRole
-  projectId: string
-}
-
-export type ProjectMemberCreateOrConnectWithoutUserInput = {
-  where: Prisma.ProjectMemberWhereUniqueInput
-  create: Prisma.XOR<Prisma.ProjectMemberCreateWithoutUserInput, Prisma.ProjectMemberUncheckedCreateWithoutUserInput>
-}
-
-export type ProjectMemberCreateManyUserInputEnvelope = {
-  data: Prisma.ProjectMemberCreateManyUserInput | Prisma.ProjectMemberCreateManyUserInput[]
-  skipDuplicates?: boolean
-}
-
-export type ProjectMemberUpsertWithWhereUniqueWithoutUserInput = {
-  where: Prisma.ProjectMemberWhereUniqueInput
-  update: Prisma.XOR<Prisma.ProjectMemberUpdateWithoutUserInput, Prisma.ProjectMemberUncheckedUpdateWithoutUserInput>
-  create: Prisma.XOR<Prisma.ProjectMemberCreateWithoutUserInput, Prisma.ProjectMemberUncheckedCreateWithoutUserInput>
-}
-
-export type ProjectMemberUpdateWithWhereUniqueWithoutUserInput = {
-  where: Prisma.ProjectMemberWhereUniqueInput
-  data: Prisma.XOR<Prisma.ProjectMemberUpdateWithoutUserInput, Prisma.ProjectMemberUncheckedUpdateWithoutUserInput>
-}
-
-export type ProjectMemberUpdateManyWithWhereWithoutUserInput = {
-  where: Prisma.ProjectMemberScalarWhereInput
-  data: Prisma.XOR<Prisma.ProjectMemberUpdateManyMutationInput, Prisma.ProjectMemberUncheckedUpdateManyWithoutUserInput>
-}
-
-export type ProjectMemberScalarWhereInput = {
-  AND?: Prisma.ProjectMemberScalarWhereInput | Prisma.ProjectMemberScalarWhereInput[]
-  OR?: Prisma.ProjectMemberScalarWhereInput[]
-  NOT?: Prisma.ProjectMemberScalarWhereInput | Prisma.ProjectMemberScalarWhereInput[]
-  id?: Prisma.IntFilter<"ProjectMember"> | number
-  role?: Prisma.EnumProjectRoleFilter<"ProjectMember"> | $Enums.ProjectRole
-  userId?: Prisma.StringFilter<"ProjectMember"> | string
-  projectId?: Prisma.StringFilter<"ProjectMember"> | string
-}
-
-export type ProjectMemberCreateWithoutProjectInput = {
-  role?: $Enums.ProjectRole
-  user: Prisma.UserCreateNestedOneWithoutProjectsInput
-}
-
-export type ProjectMemberUncheckedCreateWithoutProjectInput = {
-  id?: number
-  role?: $Enums.ProjectRole
-  userId: string
-}
-
-export type ProjectMemberCreateOrConnectWithoutProjectInput = {
-  where: Prisma.ProjectMemberWhereUniqueInput
-  create: Prisma.XOR<Prisma.ProjectMemberCreateWithoutProjectInput, Prisma.ProjectMemberUncheckedCreateWithoutProjectInput>
-}
-
-export type ProjectMemberCreateManyProjectInputEnvelope = {
-  data: Prisma.ProjectMemberCreateManyProjectInput | Prisma.ProjectMemberCreateManyProjectInput[]
-  skipDuplicates?: boolean
-}
-
-export type ProjectMemberUpsertWithWhereUniqueWithoutProjectInput = {
-  where: Prisma.ProjectMemberWhereUniqueInput
-  update: Prisma.XOR<Prisma.ProjectMemberUpdateWithoutProjectInput, Prisma.ProjectMemberUncheckedUpdateWithoutProjectInput>
-  create: Prisma.XOR<Prisma.ProjectMemberCreateWithoutProjectInput, Prisma.ProjectMemberUncheckedCreateWithoutProjectInput>
-}
-
-export type ProjectMemberUpdateWithWhereUniqueWithoutProjectInput = {
-  where: Prisma.ProjectMemberWhereUniqueInput
-  data: Prisma.XOR<Prisma.ProjectMemberUpdateWithoutProjectInput, Prisma.ProjectMemberUncheckedUpdateWithoutProjectInput>
-}
-
-export type ProjectMemberUpdateManyWithWhereWithoutProjectInput = {
-  where: Prisma.ProjectMemberScalarWhereInput
-  data: Prisma.XOR<Prisma.ProjectMemberUpdateManyMutationInput, Prisma.ProjectMemberUncheckedUpdateManyWithoutProjectInput>
-}
-
-export type ProjectMemberCreateManyUserInput = {
-  id?: number
-  role?: $Enums.ProjectRole
-  projectId: string
-}
-
-export type ProjectMemberUpdateWithoutUserInput = {
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  project?: Prisma.ProjectUpdateOneRequiredWithoutMembersNestedInput
-}
-
-export type ProjectMemberUncheckedUpdateWithoutUserInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  projectId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-export type ProjectMemberUncheckedUpdateManyWithoutUserInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  projectId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-export type ProjectMemberCreateManyProjectInput = {
-  id?: number
-  role?: $Enums.ProjectRole
-  userId: string
-}
-
-export type ProjectMemberUpdateWithoutProjectInput = {
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  user?: Prisma.UserUpdateOneRequiredWithoutProjectsNestedInput
-}
-
-export type ProjectMemberUncheckedUpdateWithoutProjectInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-export type ProjectMemberUncheckedUpdateManyWithoutProjectInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  role?: Prisma.EnumProjectRoleFieldUpdateOperationsInput | $Enums.ProjectRole
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-}
-
-
-
-export type ProjectMemberSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  role?: boolean
-  userId?: boolean
-  projectId?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["projectMember"]>
-
-export type ProjectMemberSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  role?: boolean
-  userId?: boolean
-  projectId?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["projectMember"]>
-
-export type ProjectMemberSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  role?: boolean
-  userId?: boolean
-  projectId?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["projectMember"]>
-
-export type ProjectMemberSelectScalar = {
-  id?: boolean
-  role?: boolean
-  userId?: boolean
-  projectId?: boolean
-}
-
-export type ProjectMemberOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "role" | "userId" | "projectId", ExtArgs["result"]["projectMember"]>
-export type ProjectMemberInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}
-export type ProjectMemberIncludeCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}
-export type ProjectMemberIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-  project?: boolean | Prisma.ProjectDefaultArgs<ExtArgs>
-}
-
-export type $ProjectMemberPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "ProjectMember"
-  objects: {
-    user: Prisma.$UserPayload<ExtArgs>
-    project: Prisma.$ProjectPayload<ExtArgs>
-  }
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: number
-    role: $Enums.ProjectRole
-    userId: string
-    projectId: string
-  }, ExtArgs["result"]["projectMember"]>
-  composites: {}
-}
-
-export type ProjectMemberGetPayload<S extends boolean | null | undefined | ProjectMemberDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload, S>
-
-export type ProjectMemberCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<ProjectMemberFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: ProjectMemberCountAggregateInputType | true
-  }
-
-export interface ProjectMemberDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['ProjectMember'], meta: { name: 'ProjectMember' } }
-  /**
-   * Find zero or one ProjectMember that matches the filter.
-   * @param {ProjectMemberFindUniqueArgs} args - Arguments to find a ProjectMember
-   * @example
-   * // Get one ProjectMember
-   * const projectMember = await prisma.projectMember.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends ProjectMemberFindUniqueArgs>(args: Prisma.SelectSubset<T, ProjectMemberFindUniqueArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one ProjectMember that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {ProjectMemberFindUniqueOrThrowArgs} args - Arguments to find a ProjectMember
-   * @example
-   * // Get one ProjectMember
-   * const projectMember = await prisma.projectMember.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends ProjectMemberFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, ProjectMemberFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first ProjectMember that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectMemberFindFirstArgs} args - Arguments to find a ProjectMember
-   * @example
-   * // Get one ProjectMember
-   * const projectMember = await prisma.projectMember.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends ProjectMemberFindFirstArgs>(args?: Prisma.SelectSubset<T, ProjectMemberFindFirstArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first ProjectMember that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectMemberFindFirstOrThrowArgs} args - Arguments to find a ProjectMember
-   * @example
-   * // Get one ProjectMember
-   * const projectMember = await prisma.projectMember.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends ProjectMemberFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, ProjectMemberFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more ProjectMembers that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectMemberFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all ProjectMembers
-   * const projectMembers = await prisma.projectMember.findMany()
-   * 
-   * // Get first 10 ProjectMembers
-   * const projectMembers = await prisma.projectMember.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const projectMemberWithIdOnly = await prisma.projectMember.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends ProjectMemberFindManyArgs>(args?: Prisma.SelectSubset<T, ProjectMemberFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a ProjectMember.
-   * @param {ProjectMemberCreateArgs} args - Arguments to create a ProjectMember.
-   * @example
-   * // Create one ProjectMember
-   * const ProjectMember = await prisma.projectMember.create({
-   *   data: {
-   *     // ... data to create a ProjectMember
-   *   }
-   * })
-   * 
-   */
-  create<T extends ProjectMemberCreateArgs>(args: Prisma.SelectSubset<T, ProjectMemberCreateArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many ProjectMembers.
-   * @param {ProjectMemberCreateManyArgs} args - Arguments to create many ProjectMembers.
-   * @example
-   * // Create many ProjectMembers
-   * const projectMember = await prisma.projectMember.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends ProjectMemberCreateManyArgs>(args?: Prisma.SelectSubset<T, ProjectMemberCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many ProjectMembers and returns the data saved in the database.
-   * @param {ProjectMemberCreateManyAndReturnArgs} args - Arguments to create many ProjectMembers.
-   * @example
-   * // Create many ProjectMembers
-   * const projectMember = await prisma.projectMember.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many ProjectMembers and only return the `id`
-   * const projectMemberWithIdOnly = await prisma.projectMember.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends ProjectMemberCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, ProjectMemberCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a ProjectMember.
-   * @param {ProjectMemberDeleteArgs} args - Arguments to delete one ProjectMember.
-   * @example
-   * // Delete one ProjectMember
-   * const ProjectMember = await prisma.projectMember.delete({
-   *   where: {
-   *     // ... filter to delete one ProjectMember
-   *   }
-   * })
-   * 
-   */
-  delete<T extends ProjectMemberDeleteArgs>(args: Prisma.SelectSubset<T, ProjectMemberDeleteArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one ProjectMember.
-   * @param {ProjectMemberUpdateArgs} args - Arguments to update one ProjectMember.
-   * @example
-   * // Update one ProjectMember
-   * const projectMember = await prisma.projectMember.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends ProjectMemberUpdateArgs>(args: Prisma.SelectSubset<T, ProjectMemberUpdateArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more ProjectMembers.
-   * @param {ProjectMemberDeleteManyArgs} args - Arguments to filter ProjectMembers to delete.
-   * @example
-   * // Delete a few ProjectMembers
-   * const { count } = await prisma.projectMember.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends ProjectMemberDeleteManyArgs>(args?: Prisma.SelectSubset<T, ProjectMemberDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more ProjectMembers.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectMemberUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many ProjectMembers
-   * const projectMember = await prisma.projectMember.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends ProjectMemberUpdateManyArgs>(args: Prisma.SelectSubset<T, ProjectMemberUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more ProjectMembers and returns the data updated in the database.
-   * @param {ProjectMemberUpdateManyAndReturnArgs} args - Arguments to update many ProjectMembers.
-   * @example
-   * // Update many ProjectMembers
-   * const projectMember = await prisma.projectMember.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more ProjectMembers and only return the `id`
-   * const projectMemberWithIdOnly = await prisma.projectMember.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends ProjectMemberUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, ProjectMemberUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one ProjectMember.
-   * @param {ProjectMemberUpsertArgs} args - Arguments to update or create a ProjectMember.
-   * @example
-   * // Update or create a ProjectMember
-   * const projectMember = await prisma.projectMember.upsert({
-   *   create: {
-   *     // ... data to create a ProjectMember
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the ProjectMember we want to update
-   *   }
-   * })
-   */
-  upsert<T extends ProjectMemberUpsertArgs>(args: Prisma.SelectSubset<T, ProjectMemberUpsertArgs<ExtArgs>>): Prisma.Prisma__ProjectMemberClient<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of ProjectMembers.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectMemberCountArgs} args - Arguments to filter ProjectMembers to count.
-   * @example
-   * // Count the number of ProjectMembers
-   * const count = await prisma.projectMember.count({
-   *   where: {
-   *     // ... the filter for the ProjectMembers we want to count
-   *   }
-   * })
-  **/
-  count<T extends ProjectMemberCountArgs>(
-    args?: Prisma.Subset<T, ProjectMemberCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], ProjectMemberCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a ProjectMember.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectMemberAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends ProjectMemberAggregateArgs>(args: Prisma.Subset<T, ProjectMemberAggregateArgs>): Prisma.PrismaPromise<GetProjectMemberAggregateType<T>>
-
-  /**
-   * Group by ProjectMember.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {ProjectMemberGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends ProjectMemberGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: ProjectMemberGroupByArgs['orderBy'] }
-      : { orderBy?: ProjectMemberGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, ProjectMemberGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetProjectMemberGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the ProjectMember model
- */
-readonly fields: ProjectMemberFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for ProjectMember.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__ProjectMemberClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  user<T extends Prisma.UserDefaultArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.UserDefaultArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | Null, Null, ExtArgs, GlobalOmitOptions>
-  project<T extends Prisma.ProjectDefaultArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.ProjectDefaultArgs<ExtArgs>>): Prisma.Prisma__ProjectClient<runtime.Types.Result.GetResult<Prisma.$ProjectPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | Null, Null, ExtArgs, GlobalOmitOptions>
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the ProjectMember model
- */
-export interface ProjectMemberFieldRefs {
-  readonly id: Prisma.FieldRef<"ProjectMember", 'Int'>
-  readonly role: Prisma.FieldRef<"ProjectMember", 'ProjectRole'>
-  readonly userId: Prisma.FieldRef<"ProjectMember", 'String'>
-  readonly projectId: Prisma.FieldRef<"ProjectMember", 'String'>
-}
-    
-
-// Custom InputTypes
-/**
- * ProjectMember findUnique
- */
-export type ProjectMemberFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectMember to fetch.
-   */
-  where: Prisma.ProjectMemberWhereUniqueInput
-}
-
-/**
- * ProjectMember findUniqueOrThrow
- */
-export type ProjectMemberFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectMember to fetch.
-   */
-  where: Prisma.ProjectMemberWhereUniqueInput
-}
-
-/**
- * ProjectMember findFirst
- */
-export type ProjectMemberFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectMember to fetch.
-   */
-  where?: Prisma.ProjectMemberWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectMembers to fetch.
-   */
-  orderBy?: Prisma.ProjectMemberOrderByWithRelationInput | Prisma.ProjectMemberOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for ProjectMembers.
-   */
-  cursor?: Prisma.ProjectMemberWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectMembers from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectMembers.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of ProjectMembers.
-   */
-  distinct?: Prisma.ProjectMemberScalarFieldEnum | Prisma.ProjectMemberScalarFieldEnum[]
-}
-
-/**
- * ProjectMember findFirstOrThrow
- */
-export type ProjectMemberFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectMember to fetch.
-   */
-  where?: Prisma.ProjectMemberWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectMembers to fetch.
-   */
-  orderBy?: Prisma.ProjectMemberOrderByWithRelationInput | Prisma.ProjectMemberOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for ProjectMembers.
-   */
-  cursor?: Prisma.ProjectMemberWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectMembers from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectMembers.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of ProjectMembers.
-   */
-  distinct?: Prisma.ProjectMemberScalarFieldEnum | Prisma.ProjectMemberScalarFieldEnum[]
-}
-
-/**
- * ProjectMember findMany
- */
-export type ProjectMemberFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * Filter, which ProjectMembers to fetch.
-   */
-  where?: Prisma.ProjectMemberWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of ProjectMembers to fetch.
-   */
-  orderBy?: Prisma.ProjectMemberOrderByWithRelationInput | Prisma.ProjectMemberOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing ProjectMembers.
-   */
-  cursor?: Prisma.ProjectMemberWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` ProjectMembers from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` ProjectMembers.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of ProjectMembers.
-   */
-  distinct?: Prisma.ProjectMemberScalarFieldEnum | Prisma.ProjectMemberScalarFieldEnum[]
-}
-
-/**
- * ProjectMember create
- */
-export type ProjectMemberCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * The data needed to create a ProjectMember.
-   */
-  data: Prisma.XOR<Prisma.ProjectMemberCreateInput, Prisma.ProjectMemberUncheckedCreateInput>
-}
-
-/**
- * ProjectMember createMany
- */
-export type ProjectMemberCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many ProjectMembers.
-   */
-  data: Prisma.ProjectMemberCreateManyInput | Prisma.ProjectMemberCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * ProjectMember createManyAndReturn
- */
-export type ProjectMemberCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * The data used to create many ProjectMembers.
-   */
-  data: Prisma.ProjectMemberCreateManyInput | Prisma.ProjectMemberCreateManyInput[]
-  skipDuplicates?: boolean
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberIncludeCreateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * ProjectMember update
- */
-export type ProjectMemberUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * The data needed to update a ProjectMember.
-   */
-  data: Prisma.XOR<Prisma.ProjectMemberUpdateInput, Prisma.ProjectMemberUncheckedUpdateInput>
-  /**
-   * Choose, which ProjectMember to update.
-   */
-  where: Prisma.ProjectMemberWhereUniqueInput
-}
-
-/**
- * ProjectMember updateMany
- */
-export type ProjectMemberUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update ProjectMembers.
-   */
-  data: Prisma.XOR<Prisma.ProjectMemberUpdateManyMutationInput, Prisma.ProjectMemberUncheckedUpdateManyInput>
-  /**
-   * Filter which ProjectMembers to update
-   */
-  where?: Prisma.ProjectMemberWhereInput
-  /**
-   * Limit how many ProjectMembers to update.
-   */
-  limit?: number
-}
-
-/**
- * ProjectMember updateManyAndReturn
- */
-export type ProjectMemberUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * The data used to update ProjectMembers.
-   */
-  data: Prisma.XOR<Prisma.ProjectMemberUpdateManyMutationInput, Prisma.ProjectMemberUncheckedUpdateManyInput>
-  /**
-   * Filter which ProjectMembers to update
-   */
-  where?: Prisma.ProjectMemberWhereInput
-  /**
-   * Limit how many ProjectMembers to update.
-   */
-  limit?: number
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberIncludeUpdateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * ProjectMember upsert
- */
-export type ProjectMemberUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * The filter to search for the ProjectMember to update in case it exists.
-   */
-  where: Prisma.ProjectMemberWhereUniqueInput
-  /**
-   * In case the ProjectMember found by the `where` argument doesn't exist, create a new ProjectMember with this data.
-   */
-  create: Prisma.XOR<Prisma.ProjectMemberCreateInput, Prisma.ProjectMemberUncheckedCreateInput>
-  /**
-   * In case the ProjectMember was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.ProjectMemberUpdateInput, Prisma.ProjectMemberUncheckedUpdateInput>
-}
-
-/**
- * ProjectMember delete
- */
-export type ProjectMemberDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  /**
-   * Filter which ProjectMember to delete.
-   */
-  where: Prisma.ProjectMemberWhereUniqueInput
-}
-
-/**
- * ProjectMember deleteMany
- */
-export type ProjectMemberDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which ProjectMembers to delete
-   */
-  where?: Prisma.ProjectMemberWhereInput
-  /**
-   * Limit how many ProjectMembers to delete.
-   */
-  limit?: number
-}
-
-/**
- * ProjectMember without action
- */
-export type ProjectMemberDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-}
diff --git a/src/generated/client/models/Session.ts b/src/generated/client/models/Session.ts
deleted file mode 100644
index ebea2b47..00000000
--- a/src/generated/client/models/Session.ts
+++ /dev/null
@@ -1,1310 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `Session` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model Session
- * 
- */
-export type SessionModel = runtime.Types.Result.DefaultSelection<Prisma.$SessionPayload>
-
-export type AggregateSession = {
-  _count: SessionCountAggregateOutputType | null
-  _min: SessionMinAggregateOutputType | null
-  _max: SessionMaxAggregateOutputType | null
-}
-
-export type SessionMinAggregateOutputType = {
-  id: string | null
-  sessionToken: string | null
-  userId: string | null
-  expires: Date | null
-}
-
-export type SessionMaxAggregateOutputType = {
-  id: string | null
-  sessionToken: string | null
-  userId: string | null
-  expires: Date | null
-}
-
-export type SessionCountAggregateOutputType = {
-  id: number
-  sessionToken: number
-  userId: number
-  expires: number
-  _all: number
-}
-
-
-export type SessionMinAggregateInputType = {
-  id?: true
-  sessionToken?: true
-  userId?: true
-  expires?: true
-}
-
-export type SessionMaxAggregateInputType = {
-  id?: true
-  sessionToken?: true
-  userId?: true
-  expires?: true
-}
-
-export type SessionCountAggregateInputType = {
-  id?: true
-  sessionToken?: true
-  userId?: true
-  expires?: true
-  _all?: true
-}
-
-export type SessionAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Session to aggregate.
-   */
-  where?: Prisma.SessionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Sessions to fetch.
-   */
-  orderBy?: Prisma.SessionOrderByWithRelationInput | Prisma.SessionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.SessionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Sessions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Sessions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned Sessions
-  **/
-  _count?: true | SessionCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: SessionMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: SessionMaxAggregateInputType
-}
-
-export type GetSessionAggregateType<T extends SessionAggregateArgs> = {
-      [P in keyof T & keyof AggregateSession]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateSession[P]>
-    : Prisma.GetScalarType<T[P], AggregateSession[P]>
-}
-
-
-
-
-export type SessionGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.SessionWhereInput
-  orderBy?: Prisma.SessionOrderByWithAggregationInput | Prisma.SessionOrderByWithAggregationInput[]
-  by: Prisma.SessionScalarFieldEnum[] | Prisma.SessionScalarFieldEnum
-  having?: Prisma.SessionScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: SessionCountAggregateInputType | true
-  _min?: SessionMinAggregateInputType
-  _max?: SessionMaxAggregateInputType
-}
-
-export type SessionGroupByOutputType = {
-  id: string
-  sessionToken: string
-  userId: string
-  expires: Date
-  _count: SessionCountAggregateOutputType | null
-  _min: SessionMinAggregateOutputType | null
-  _max: SessionMaxAggregateOutputType | null
-}
-
-export type GetSessionGroupByPayload<T extends SessionGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<SessionGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof SessionGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], SessionGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], SessionGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type SessionWhereInput = {
-  AND?: Prisma.SessionWhereInput | Prisma.SessionWhereInput[]
-  OR?: Prisma.SessionWhereInput[]
-  NOT?: Prisma.SessionWhereInput | Prisma.SessionWhereInput[]
-  id?: Prisma.StringFilter<"Session"> | string
-  sessionToken?: Prisma.StringFilter<"Session"> | string
-  userId?: Prisma.StringFilter<"Session"> | string
-  expires?: Prisma.DateTimeFilter<"Session"> | Date | string
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-}
-
-export type SessionOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  sessionToken?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-  user?: Prisma.UserOrderByWithRelationInput
-}
-
-export type SessionWhereUniqueInput = Prisma.AtLeast<{
-  id?: string
-  sessionToken?: string
-  AND?: Prisma.SessionWhereInput | Prisma.SessionWhereInput[]
-  OR?: Prisma.SessionWhereInput[]
-  NOT?: Prisma.SessionWhereInput | Prisma.SessionWhereInput[]
-  userId?: Prisma.StringFilter<"Session"> | string
-  expires?: Prisma.DateTimeFilter<"Session"> | Date | string
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-}, "id" | "sessionToken">
-
-export type SessionOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  sessionToken?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-  _count?: Prisma.SessionCountOrderByAggregateInput
-  _max?: Prisma.SessionMaxOrderByAggregateInput
-  _min?: Prisma.SessionMinOrderByAggregateInput
-}
-
-export type SessionScalarWhereWithAggregatesInput = {
-  AND?: Prisma.SessionScalarWhereWithAggregatesInput | Prisma.SessionScalarWhereWithAggregatesInput[]
-  OR?: Prisma.SessionScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.SessionScalarWhereWithAggregatesInput | Prisma.SessionScalarWhereWithAggregatesInput[]
-  id?: Prisma.StringWithAggregatesFilter<"Session"> | string
-  sessionToken?: Prisma.StringWithAggregatesFilter<"Session"> | string
-  userId?: Prisma.StringWithAggregatesFilter<"Session"> | string
-  expires?: Prisma.DateTimeWithAggregatesFilter<"Session"> | Date | string
-}
-
-export type SessionCreateInput = {
-  id?: string
-  sessionToken: string
-  expires: Date | string
-  user: Prisma.UserCreateNestedOneWithoutSessionsInput
-}
-
-export type SessionUncheckedCreateInput = {
-  id?: string
-  sessionToken: string
-  userId: string
-  expires: Date | string
-}
-
-export type SessionUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  sessionToken?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  user?: Prisma.UserUpdateOneRequiredWithoutSessionsNestedInput
-}
-
-export type SessionUncheckedUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  sessionToken?: Prisma.StringFieldUpdateOperationsInput | string
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type SessionCreateManyInput = {
-  id?: string
-  sessionToken: string
-  userId: string
-  expires: Date | string
-}
-
-export type SessionUpdateManyMutationInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  sessionToken?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type SessionUncheckedUpdateManyInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  sessionToken?: Prisma.StringFieldUpdateOperationsInput | string
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type SessionListRelationFilter = {
-  every?: Prisma.SessionWhereInput
-  some?: Prisma.SessionWhereInput
-  none?: Prisma.SessionWhereInput
-}
-
-export type SessionOrderByRelationAggregateInput = {
-  _count?: Prisma.SortOrder
-}
-
-export type SessionCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  sessionToken?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-}
-
-export type SessionMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  sessionToken?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-}
-
-export type SessionMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  sessionToken?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-}
-
-export type SessionCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.SessionCreateWithoutUserInput, Prisma.SessionUncheckedCreateWithoutUserInput> | Prisma.SessionCreateWithoutUserInput[] | Prisma.SessionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.SessionCreateOrConnectWithoutUserInput | Prisma.SessionCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.SessionCreateManyUserInputEnvelope
-  connect?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-}
-
-export type SessionUncheckedCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.SessionCreateWithoutUserInput, Prisma.SessionUncheckedCreateWithoutUserInput> | Prisma.SessionCreateWithoutUserInput[] | Prisma.SessionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.SessionCreateOrConnectWithoutUserInput | Prisma.SessionCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.SessionCreateManyUserInputEnvelope
-  connect?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-}
-
-export type SessionUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.SessionCreateWithoutUserInput, Prisma.SessionUncheckedCreateWithoutUserInput> | Prisma.SessionCreateWithoutUserInput[] | Prisma.SessionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.SessionCreateOrConnectWithoutUserInput | Prisma.SessionCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.SessionUpsertWithWhereUniqueWithoutUserInput | Prisma.SessionUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.SessionCreateManyUserInputEnvelope
-  set?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  disconnect?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  delete?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  connect?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  update?: Prisma.SessionUpdateWithWhereUniqueWithoutUserInput | Prisma.SessionUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.SessionUpdateManyWithWhereWithoutUserInput | Prisma.SessionUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.SessionScalarWhereInput | Prisma.SessionScalarWhereInput[]
-}
-
-export type SessionUncheckedUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.SessionCreateWithoutUserInput, Prisma.SessionUncheckedCreateWithoutUserInput> | Prisma.SessionCreateWithoutUserInput[] | Prisma.SessionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.SessionCreateOrConnectWithoutUserInput | Prisma.SessionCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.SessionUpsertWithWhereUniqueWithoutUserInput | Prisma.SessionUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.SessionCreateManyUserInputEnvelope
-  set?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  disconnect?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  delete?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  connect?: Prisma.SessionWhereUniqueInput | Prisma.SessionWhereUniqueInput[]
-  update?: Prisma.SessionUpdateWithWhereUniqueWithoutUserInput | Prisma.SessionUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.SessionUpdateManyWithWhereWithoutUserInput | Prisma.SessionUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.SessionScalarWhereInput | Prisma.SessionScalarWhereInput[]
-}
-
-export type SessionCreateWithoutUserInput = {
-  id?: string
-  sessionToken: string
-  expires: Date | string
-}
-
-export type SessionUncheckedCreateWithoutUserInput = {
-  id?: string
-  sessionToken: string
-  expires: Date | string
-}
-
-export type SessionCreateOrConnectWithoutUserInput = {
-  where: Prisma.SessionWhereUniqueInput
-  create: Prisma.XOR<Prisma.SessionCreateWithoutUserInput, Prisma.SessionUncheckedCreateWithoutUserInput>
-}
-
-export type SessionCreateManyUserInputEnvelope = {
-  data: Prisma.SessionCreateManyUserInput | Prisma.SessionCreateManyUserInput[]
-  skipDuplicates?: boolean
-}
-
-export type SessionUpsertWithWhereUniqueWithoutUserInput = {
-  where: Prisma.SessionWhereUniqueInput
-  update: Prisma.XOR<Prisma.SessionUpdateWithoutUserInput, Prisma.SessionUncheckedUpdateWithoutUserInput>
-  create: Prisma.XOR<Prisma.SessionCreateWithoutUserInput, Prisma.SessionUncheckedCreateWithoutUserInput>
-}
-
-export type SessionUpdateWithWhereUniqueWithoutUserInput = {
-  where: Prisma.SessionWhereUniqueInput
-  data: Prisma.XOR<Prisma.SessionUpdateWithoutUserInput, Prisma.SessionUncheckedUpdateWithoutUserInput>
-}
-
-export type SessionUpdateManyWithWhereWithoutUserInput = {
-  where: Prisma.SessionScalarWhereInput
-  data: Prisma.XOR<Prisma.SessionUpdateManyMutationInput, Prisma.SessionUncheckedUpdateManyWithoutUserInput>
-}
-
-export type SessionScalarWhereInput = {
-  AND?: Prisma.SessionScalarWhereInput | Prisma.SessionScalarWhereInput[]
-  OR?: Prisma.SessionScalarWhereInput[]
-  NOT?: Prisma.SessionScalarWhereInput | Prisma.SessionScalarWhereInput[]
-  id?: Prisma.StringFilter<"Session"> | string
-  sessionToken?: Prisma.StringFilter<"Session"> | string
-  userId?: Prisma.StringFilter<"Session"> | string
-  expires?: Prisma.DateTimeFilter<"Session"> | Date | string
-}
-
-export type SessionCreateManyUserInput = {
-  id?: string
-  sessionToken: string
-  expires: Date | string
-}
-
-export type SessionUpdateWithoutUserInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  sessionToken?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type SessionUncheckedUpdateWithoutUserInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  sessionToken?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type SessionUncheckedUpdateManyWithoutUserInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  sessionToken?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-
-
-export type SessionSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  sessionToken?: boolean
-  userId?: boolean
-  expires?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["session"]>
-
-export type SessionSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  sessionToken?: boolean
-  userId?: boolean
-  expires?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["session"]>
-
-export type SessionSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  sessionToken?: boolean
-  userId?: boolean
-  expires?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["session"]>
-
-export type SessionSelectScalar = {
-  id?: boolean
-  sessionToken?: boolean
-  userId?: boolean
-  expires?: boolean
-}
-
-export type SessionOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "sessionToken" | "userId" | "expires", ExtArgs["result"]["session"]>
-export type SessionInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-export type SessionIncludeCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-export type SessionIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-
-export type $SessionPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "Session"
-  objects: {
-    user: Prisma.$UserPayload<ExtArgs>
-  }
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: string
-    sessionToken: string
-    userId: string
-    expires: Date
-  }, ExtArgs["result"]["session"]>
-  composites: {}
-}
-
-export type SessionGetPayload<S extends boolean | null | undefined | SessionDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$SessionPayload, S>
-
-export type SessionCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<SessionFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: SessionCountAggregateInputType | true
-  }
-
-export interface SessionDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['Session'], meta: { name: 'Session' } }
-  /**
-   * Find zero or one Session that matches the filter.
-   * @param {SessionFindUniqueArgs} args - Arguments to find a Session
-   * @example
-   * // Get one Session
-   * const session = await prisma.session.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends SessionFindUniqueArgs>(args: Prisma.SelectSubset<T, SessionFindUniqueArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one Session that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {SessionFindUniqueOrThrowArgs} args - Arguments to find a Session
-   * @example
-   * // Get one Session
-   * const session = await prisma.session.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends SessionFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, SessionFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Session that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {SessionFindFirstArgs} args - Arguments to find a Session
-   * @example
-   * // Get one Session
-   * const session = await prisma.session.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends SessionFindFirstArgs>(args?: Prisma.SelectSubset<T, SessionFindFirstArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Session that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {SessionFindFirstOrThrowArgs} args - Arguments to find a Session
-   * @example
-   * // Get one Session
-   * const session = await prisma.session.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends SessionFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, SessionFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more Sessions that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {SessionFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all Sessions
-   * const sessions = await prisma.session.findMany()
-   * 
-   * // Get first 10 Sessions
-   * const sessions = await prisma.session.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const sessionWithIdOnly = await prisma.session.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends SessionFindManyArgs>(args?: Prisma.SelectSubset<T, SessionFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a Session.
-   * @param {SessionCreateArgs} args - Arguments to create a Session.
-   * @example
-   * // Create one Session
-   * const Session = await prisma.session.create({
-   *   data: {
-   *     // ... data to create a Session
-   *   }
-   * })
-   * 
-   */
-  create<T extends SessionCreateArgs>(args: Prisma.SelectSubset<T, SessionCreateArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many Sessions.
-   * @param {SessionCreateManyArgs} args - Arguments to create many Sessions.
-   * @example
-   * // Create many Sessions
-   * const session = await prisma.session.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends SessionCreateManyArgs>(args?: Prisma.SelectSubset<T, SessionCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many Sessions and returns the data saved in the database.
-   * @param {SessionCreateManyAndReturnArgs} args - Arguments to create many Sessions.
-   * @example
-   * // Create many Sessions
-   * const session = await prisma.session.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many Sessions and only return the `id`
-   * const sessionWithIdOnly = await prisma.session.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends SessionCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, SessionCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a Session.
-   * @param {SessionDeleteArgs} args - Arguments to delete one Session.
-   * @example
-   * // Delete one Session
-   * const Session = await prisma.session.delete({
-   *   where: {
-   *     // ... filter to delete one Session
-   *   }
-   * })
-   * 
-   */
-  delete<T extends SessionDeleteArgs>(args: Prisma.SelectSubset<T, SessionDeleteArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one Session.
-   * @param {SessionUpdateArgs} args - Arguments to update one Session.
-   * @example
-   * // Update one Session
-   * const session = await prisma.session.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends SessionUpdateArgs>(args: Prisma.SelectSubset<T, SessionUpdateArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more Sessions.
-   * @param {SessionDeleteManyArgs} args - Arguments to filter Sessions to delete.
-   * @example
-   * // Delete a few Sessions
-   * const { count } = await prisma.session.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends SessionDeleteManyArgs>(args?: Prisma.SelectSubset<T, SessionDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Sessions.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {SessionUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many Sessions
-   * const session = await prisma.session.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends SessionUpdateManyArgs>(args: Prisma.SelectSubset<T, SessionUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Sessions and returns the data updated in the database.
-   * @param {SessionUpdateManyAndReturnArgs} args - Arguments to update many Sessions.
-   * @example
-   * // Update many Sessions
-   * const session = await prisma.session.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more Sessions and only return the `id`
-   * const sessionWithIdOnly = await prisma.session.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends SessionUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, SessionUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one Session.
-   * @param {SessionUpsertArgs} args - Arguments to update or create a Session.
-   * @example
-   * // Update or create a Session
-   * const session = await prisma.session.upsert({
-   *   create: {
-   *     // ... data to create a Session
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the Session we want to update
-   *   }
-   * })
-   */
-  upsert<T extends SessionUpsertArgs>(args: Prisma.SelectSubset<T, SessionUpsertArgs<ExtArgs>>): Prisma.Prisma__SessionClient<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of Sessions.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {SessionCountArgs} args - Arguments to filter Sessions to count.
-   * @example
-   * // Count the number of Sessions
-   * const count = await prisma.session.count({
-   *   where: {
-   *     // ... the filter for the Sessions we want to count
-   *   }
-   * })
-  **/
-  count<T extends SessionCountArgs>(
-    args?: Prisma.Subset<T, SessionCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], SessionCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a Session.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {SessionAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends SessionAggregateArgs>(args: Prisma.Subset<T, SessionAggregateArgs>): Prisma.PrismaPromise<GetSessionAggregateType<T>>
-
-  /**
-   * Group by Session.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {SessionGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends SessionGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: SessionGroupByArgs['orderBy'] }
-      : { orderBy?: SessionGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, SessionGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetSessionGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the Session model
- */
-readonly fields: SessionFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for Session.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__SessionClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  user<T extends Prisma.UserDefaultArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.UserDefaultArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | Null, Null, ExtArgs, GlobalOmitOptions>
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the Session model
- */
-export interface SessionFieldRefs {
-  readonly id: Prisma.FieldRef<"Session", 'String'>
-  readonly sessionToken: Prisma.FieldRef<"Session", 'String'>
-  readonly userId: Prisma.FieldRef<"Session", 'String'>
-  readonly expires: Prisma.FieldRef<"Session", 'DateTime'>
-}
-    
-
-// Custom InputTypes
-/**
- * Session findUnique
- */
-export type SessionFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * Filter, which Session to fetch.
-   */
-  where: Prisma.SessionWhereUniqueInput
-}
-
-/**
- * Session findUniqueOrThrow
- */
-export type SessionFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * Filter, which Session to fetch.
-   */
-  where: Prisma.SessionWhereUniqueInput
-}
-
-/**
- * Session findFirst
- */
-export type SessionFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * Filter, which Session to fetch.
-   */
-  where?: Prisma.SessionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Sessions to fetch.
-   */
-  orderBy?: Prisma.SessionOrderByWithRelationInput | Prisma.SessionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Sessions.
-   */
-  cursor?: Prisma.SessionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Sessions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Sessions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Sessions.
-   */
-  distinct?: Prisma.SessionScalarFieldEnum | Prisma.SessionScalarFieldEnum[]
-}
-
-/**
- * Session findFirstOrThrow
- */
-export type SessionFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * Filter, which Session to fetch.
-   */
-  where?: Prisma.SessionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Sessions to fetch.
-   */
-  orderBy?: Prisma.SessionOrderByWithRelationInput | Prisma.SessionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Sessions.
-   */
-  cursor?: Prisma.SessionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Sessions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Sessions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Sessions.
-   */
-  distinct?: Prisma.SessionScalarFieldEnum | Prisma.SessionScalarFieldEnum[]
-}
-
-/**
- * Session findMany
- */
-export type SessionFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * Filter, which Sessions to fetch.
-   */
-  where?: Prisma.SessionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Sessions to fetch.
-   */
-  orderBy?: Prisma.SessionOrderByWithRelationInput | Prisma.SessionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing Sessions.
-   */
-  cursor?: Prisma.SessionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Sessions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Sessions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Sessions.
-   */
-  distinct?: Prisma.SessionScalarFieldEnum | Prisma.SessionScalarFieldEnum[]
-}
-
-/**
- * Session create
- */
-export type SessionCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * The data needed to create a Session.
-   */
-  data: Prisma.XOR<Prisma.SessionCreateInput, Prisma.SessionUncheckedCreateInput>
-}
-
-/**
- * Session createMany
- */
-export type SessionCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many Sessions.
-   */
-  data: Prisma.SessionCreateManyInput | Prisma.SessionCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * Session createManyAndReturn
- */
-export type SessionCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * The data used to create many Sessions.
-   */
-  data: Prisma.SessionCreateManyInput | Prisma.SessionCreateManyInput[]
-  skipDuplicates?: boolean
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionIncludeCreateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * Session update
- */
-export type SessionUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * The data needed to update a Session.
-   */
-  data: Prisma.XOR<Prisma.SessionUpdateInput, Prisma.SessionUncheckedUpdateInput>
-  /**
-   * Choose, which Session to update.
-   */
-  where: Prisma.SessionWhereUniqueInput
-}
-
-/**
- * Session updateMany
- */
-export type SessionUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update Sessions.
-   */
-  data: Prisma.XOR<Prisma.SessionUpdateManyMutationInput, Prisma.SessionUncheckedUpdateManyInput>
-  /**
-   * Filter which Sessions to update
-   */
-  where?: Prisma.SessionWhereInput
-  /**
-   * Limit how many Sessions to update.
-   */
-  limit?: number
-}
-
-/**
- * Session updateManyAndReturn
- */
-export type SessionUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * The data used to update Sessions.
-   */
-  data: Prisma.XOR<Prisma.SessionUpdateManyMutationInput, Prisma.SessionUncheckedUpdateManyInput>
-  /**
-   * Filter which Sessions to update
-   */
-  where?: Prisma.SessionWhereInput
-  /**
-   * Limit how many Sessions to update.
-   */
-  limit?: number
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionIncludeUpdateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * Session upsert
- */
-export type SessionUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * The filter to search for the Session to update in case it exists.
-   */
-  where: Prisma.SessionWhereUniqueInput
-  /**
-   * In case the Session found by the `where` argument doesn't exist, create a new Session with this data.
-   */
-  create: Prisma.XOR<Prisma.SessionCreateInput, Prisma.SessionUncheckedCreateInput>
-  /**
-   * In case the Session was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.SessionUpdateInput, Prisma.SessionUncheckedUpdateInput>
-}
-
-/**
- * Session delete
- */
-export type SessionDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  /**
-   * Filter which Session to delete.
-   */
-  where: Prisma.SessionWhereUniqueInput
-}
-
-/**
- * Session deleteMany
- */
-export type SessionDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Sessions to delete
-   */
-  where?: Prisma.SessionWhereInput
-  /**
-   * Limit how many Sessions to delete.
-   */
-  limit?: number
-}
-
-/**
- * Session without action
- */
-export type SessionDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-}
diff --git a/src/generated/client/models/Transaction.ts b/src/generated/client/models/Transaction.ts
deleted file mode 100644
index 218aa370..00000000
--- a/src/generated/client/models/Transaction.ts
+++ /dev/null
@@ -1,1388 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `Transaction` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model Transaction
- * 
- */
-export type TransactionModel = runtime.Types.Result.DefaultSelection<Prisma.$TransactionPayload>
-
-export type AggregateTransaction = {
-  _count: TransactionCountAggregateOutputType | null
-  _avg: TransactionAvgAggregateOutputType | null
-  _sum: TransactionSumAggregateOutputType | null
-  _min: TransactionMinAggregateOutputType | null
-  _max: TransactionMaxAggregateOutputType | null
-}
-
-export type TransactionAvgAggregateOutputType = {
-  id: number | null
-}
-
-export type TransactionSumAggregateOutputType = {
-  id: number | null
-}
-
-export type TransactionMinAggregateOutputType = {
-  id: number | null
-  userId: string | null
-  provider: $Enums.SubscriptionProvider | null
-  transactionId: string | null
-  createdAt: Date | null
-}
-
-export type TransactionMaxAggregateOutputType = {
-  id: number | null
-  userId: string | null
-  provider: $Enums.SubscriptionProvider | null
-  transactionId: string | null
-  createdAt: Date | null
-}
-
-export type TransactionCountAggregateOutputType = {
-  id: number
-  userId: number
-  provider: number
-  transactionId: number
-  createdAt: number
-  _all: number
-}
-
-
-export type TransactionAvgAggregateInputType = {
-  id?: true
-}
-
-export type TransactionSumAggregateInputType = {
-  id?: true
-}
-
-export type TransactionMinAggregateInputType = {
-  id?: true
-  userId?: true
-  provider?: true
-  transactionId?: true
-  createdAt?: true
-}
-
-export type TransactionMaxAggregateInputType = {
-  id?: true
-  userId?: true
-  provider?: true
-  transactionId?: true
-  createdAt?: true
-}
-
-export type TransactionCountAggregateInputType = {
-  id?: true
-  userId?: true
-  provider?: true
-  transactionId?: true
-  createdAt?: true
-  _all?: true
-}
-
-export type TransactionAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Transaction to aggregate.
-   */
-  where?: Prisma.TransactionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Transactions to fetch.
-   */
-  orderBy?: Prisma.TransactionOrderByWithRelationInput | Prisma.TransactionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.TransactionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Transactions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Transactions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned Transactions
-  **/
-  _count?: true | TransactionCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to average
-  **/
-  _avg?: TransactionAvgAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to sum
-  **/
-  _sum?: TransactionSumAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: TransactionMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: TransactionMaxAggregateInputType
-}
-
-export type GetTransactionAggregateType<T extends TransactionAggregateArgs> = {
-      [P in keyof T & keyof AggregateTransaction]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateTransaction[P]>
-    : Prisma.GetScalarType<T[P], AggregateTransaction[P]>
-}
-
-
-
-
-export type TransactionGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.TransactionWhereInput
-  orderBy?: Prisma.TransactionOrderByWithAggregationInput | Prisma.TransactionOrderByWithAggregationInput[]
-  by: Prisma.TransactionScalarFieldEnum[] | Prisma.TransactionScalarFieldEnum
-  having?: Prisma.TransactionScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: TransactionCountAggregateInputType | true
-  _avg?: TransactionAvgAggregateInputType
-  _sum?: TransactionSumAggregateInputType
-  _min?: TransactionMinAggregateInputType
-  _max?: TransactionMaxAggregateInputType
-}
-
-export type TransactionGroupByOutputType = {
-  id: number
-  userId: string
-  provider: $Enums.SubscriptionProvider
-  transactionId: string
-  createdAt: Date
-  _count: TransactionCountAggregateOutputType | null
-  _avg: TransactionAvgAggregateOutputType | null
-  _sum: TransactionSumAggregateOutputType | null
-  _min: TransactionMinAggregateOutputType | null
-  _max: TransactionMaxAggregateOutputType | null
-}
-
-export type GetTransactionGroupByPayload<T extends TransactionGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<TransactionGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof TransactionGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], TransactionGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], TransactionGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type TransactionWhereInput = {
-  AND?: Prisma.TransactionWhereInput | Prisma.TransactionWhereInput[]
-  OR?: Prisma.TransactionWhereInput[]
-  NOT?: Prisma.TransactionWhereInput | Prisma.TransactionWhereInput[]
-  id?: Prisma.IntFilter<"Transaction"> | number
-  userId?: Prisma.StringFilter<"Transaction"> | string
-  provider?: Prisma.EnumSubscriptionProviderFilter<"Transaction"> | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFilter<"Transaction"> | string
-  createdAt?: Prisma.DateTimeFilter<"Transaction"> | Date | string
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-}
-
-export type TransactionOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  transactionId?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  user?: Prisma.UserOrderByWithRelationInput
-}
-
-export type TransactionWhereUniqueInput = Prisma.AtLeast<{
-  id?: number
-  transactionId?: string
-  AND?: Prisma.TransactionWhereInput | Prisma.TransactionWhereInput[]
-  OR?: Prisma.TransactionWhereInput[]
-  NOT?: Prisma.TransactionWhereInput | Prisma.TransactionWhereInput[]
-  userId?: Prisma.StringFilter<"Transaction"> | string
-  provider?: Prisma.EnumSubscriptionProviderFilter<"Transaction"> | $Enums.SubscriptionProvider
-  createdAt?: Prisma.DateTimeFilter<"Transaction"> | Date | string
-  user?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
-}, "id" | "transactionId">
-
-export type TransactionOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  transactionId?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  _count?: Prisma.TransactionCountOrderByAggregateInput
-  _avg?: Prisma.TransactionAvgOrderByAggregateInput
-  _max?: Prisma.TransactionMaxOrderByAggregateInput
-  _min?: Prisma.TransactionMinOrderByAggregateInput
-  _sum?: Prisma.TransactionSumOrderByAggregateInput
-}
-
-export type TransactionScalarWhereWithAggregatesInput = {
-  AND?: Prisma.TransactionScalarWhereWithAggregatesInput | Prisma.TransactionScalarWhereWithAggregatesInput[]
-  OR?: Prisma.TransactionScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.TransactionScalarWhereWithAggregatesInput | Prisma.TransactionScalarWhereWithAggregatesInput[]
-  id?: Prisma.IntWithAggregatesFilter<"Transaction"> | number
-  userId?: Prisma.StringWithAggregatesFilter<"Transaction"> | string
-  provider?: Prisma.EnumSubscriptionProviderWithAggregatesFilter<"Transaction"> | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringWithAggregatesFilter<"Transaction"> | string
-  createdAt?: Prisma.DateTimeWithAggregatesFilter<"Transaction"> | Date | string
-}
-
-export type TransactionCreateInput = {
-  provider: $Enums.SubscriptionProvider
-  transactionId: string
-  createdAt?: Date | string
-  user: Prisma.UserCreateNestedOneWithoutTransactionsInput
-}
-
-export type TransactionUncheckedCreateInput = {
-  id?: number
-  userId: string
-  provider: $Enums.SubscriptionProvider
-  transactionId: string
-  createdAt?: Date | string
-}
-
-export type TransactionUpdateInput = {
-  provider?: Prisma.EnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  user?: Prisma.UserUpdateOneRequiredWithoutTransactionsNestedInput
-}
-
-export type TransactionUncheckedUpdateInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.EnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type TransactionCreateManyInput = {
-  id?: number
-  userId: string
-  provider: $Enums.SubscriptionProvider
-  transactionId: string
-  createdAt?: Date | string
-}
-
-export type TransactionUpdateManyMutationInput = {
-  provider?: Prisma.EnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type TransactionUncheckedUpdateManyInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  userId?: Prisma.StringFieldUpdateOperationsInput | string
-  provider?: Prisma.EnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type TransactionListRelationFilter = {
-  every?: Prisma.TransactionWhereInput
-  some?: Prisma.TransactionWhereInput
-  none?: Prisma.TransactionWhereInput
-}
-
-export type TransactionOrderByRelationAggregateInput = {
-  _count?: Prisma.SortOrder
-}
-
-export type TransactionCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  transactionId?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-}
-
-export type TransactionAvgOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type TransactionMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  transactionId?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-}
-
-export type TransactionMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  userId?: Prisma.SortOrder
-  provider?: Prisma.SortOrder
-  transactionId?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-}
-
-export type TransactionSumOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-}
-
-export type TransactionCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.TransactionCreateWithoutUserInput, Prisma.TransactionUncheckedCreateWithoutUserInput> | Prisma.TransactionCreateWithoutUserInput[] | Prisma.TransactionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.TransactionCreateOrConnectWithoutUserInput | Prisma.TransactionCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.TransactionCreateManyUserInputEnvelope
-  connect?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-}
-
-export type TransactionUncheckedCreateNestedManyWithoutUserInput = {
-  create?: Prisma.XOR<Prisma.TransactionCreateWithoutUserInput, Prisma.TransactionUncheckedCreateWithoutUserInput> | Prisma.TransactionCreateWithoutUserInput[] | Prisma.TransactionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.TransactionCreateOrConnectWithoutUserInput | Prisma.TransactionCreateOrConnectWithoutUserInput[]
-  createMany?: Prisma.TransactionCreateManyUserInputEnvelope
-  connect?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-}
-
-export type TransactionUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.TransactionCreateWithoutUserInput, Prisma.TransactionUncheckedCreateWithoutUserInput> | Prisma.TransactionCreateWithoutUserInput[] | Prisma.TransactionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.TransactionCreateOrConnectWithoutUserInput | Prisma.TransactionCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.TransactionUpsertWithWhereUniqueWithoutUserInput | Prisma.TransactionUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.TransactionCreateManyUserInputEnvelope
-  set?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  disconnect?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  delete?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  connect?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  update?: Prisma.TransactionUpdateWithWhereUniqueWithoutUserInput | Prisma.TransactionUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.TransactionUpdateManyWithWhereWithoutUserInput | Prisma.TransactionUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.TransactionScalarWhereInput | Prisma.TransactionScalarWhereInput[]
-}
-
-export type TransactionUncheckedUpdateManyWithoutUserNestedInput = {
-  create?: Prisma.XOR<Prisma.TransactionCreateWithoutUserInput, Prisma.TransactionUncheckedCreateWithoutUserInput> | Prisma.TransactionCreateWithoutUserInput[] | Prisma.TransactionUncheckedCreateWithoutUserInput[]
-  connectOrCreate?: Prisma.TransactionCreateOrConnectWithoutUserInput | Prisma.TransactionCreateOrConnectWithoutUserInput[]
-  upsert?: Prisma.TransactionUpsertWithWhereUniqueWithoutUserInput | Prisma.TransactionUpsertWithWhereUniqueWithoutUserInput[]
-  createMany?: Prisma.TransactionCreateManyUserInputEnvelope
-  set?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  disconnect?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  delete?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  connect?: Prisma.TransactionWhereUniqueInput | Prisma.TransactionWhereUniqueInput[]
-  update?: Prisma.TransactionUpdateWithWhereUniqueWithoutUserInput | Prisma.TransactionUpdateWithWhereUniqueWithoutUserInput[]
-  updateMany?: Prisma.TransactionUpdateManyWithWhereWithoutUserInput | Prisma.TransactionUpdateManyWithWhereWithoutUserInput[]
-  deleteMany?: Prisma.TransactionScalarWhereInput | Prisma.TransactionScalarWhereInput[]
-}
-
-export type EnumSubscriptionProviderFieldUpdateOperationsInput = {
-  set?: $Enums.SubscriptionProvider
-}
-
-export type TransactionCreateWithoutUserInput = {
-  provider: $Enums.SubscriptionProvider
-  transactionId: string
-  createdAt?: Date | string
-}
-
-export type TransactionUncheckedCreateWithoutUserInput = {
-  id?: number
-  provider: $Enums.SubscriptionProvider
-  transactionId: string
-  createdAt?: Date | string
-}
-
-export type TransactionCreateOrConnectWithoutUserInput = {
-  where: Prisma.TransactionWhereUniqueInput
-  create: Prisma.XOR<Prisma.TransactionCreateWithoutUserInput, Prisma.TransactionUncheckedCreateWithoutUserInput>
-}
-
-export type TransactionCreateManyUserInputEnvelope = {
-  data: Prisma.TransactionCreateManyUserInput | Prisma.TransactionCreateManyUserInput[]
-  skipDuplicates?: boolean
-}
-
-export type TransactionUpsertWithWhereUniqueWithoutUserInput = {
-  where: Prisma.TransactionWhereUniqueInput
-  update: Prisma.XOR<Prisma.TransactionUpdateWithoutUserInput, Prisma.TransactionUncheckedUpdateWithoutUserInput>
-  create: Prisma.XOR<Prisma.TransactionCreateWithoutUserInput, Prisma.TransactionUncheckedCreateWithoutUserInput>
-}
-
-export type TransactionUpdateWithWhereUniqueWithoutUserInput = {
-  where: Prisma.TransactionWhereUniqueInput
-  data: Prisma.XOR<Prisma.TransactionUpdateWithoutUserInput, Prisma.TransactionUncheckedUpdateWithoutUserInput>
-}
-
-export type TransactionUpdateManyWithWhereWithoutUserInput = {
-  where: Prisma.TransactionScalarWhereInput
-  data: Prisma.XOR<Prisma.TransactionUpdateManyMutationInput, Prisma.TransactionUncheckedUpdateManyWithoutUserInput>
-}
-
-export type TransactionScalarWhereInput = {
-  AND?: Prisma.TransactionScalarWhereInput | Prisma.TransactionScalarWhereInput[]
-  OR?: Prisma.TransactionScalarWhereInput[]
-  NOT?: Prisma.TransactionScalarWhereInput | Prisma.TransactionScalarWhereInput[]
-  id?: Prisma.IntFilter<"Transaction"> | number
-  userId?: Prisma.StringFilter<"Transaction"> | string
-  provider?: Prisma.EnumSubscriptionProviderFilter<"Transaction"> | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFilter<"Transaction"> | string
-  createdAt?: Prisma.DateTimeFilter<"Transaction"> | Date | string
-}
-
-export type TransactionCreateManyUserInput = {
-  id?: number
-  provider: $Enums.SubscriptionProvider
-  transactionId: string
-  createdAt?: Date | string
-}
-
-export type TransactionUpdateWithoutUserInput = {
-  provider?: Prisma.EnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type TransactionUncheckedUpdateWithoutUserInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  provider?: Prisma.EnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type TransactionUncheckedUpdateManyWithoutUserInput = {
-  id?: Prisma.IntFieldUpdateOperationsInput | number
-  provider?: Prisma.EnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider
-  transactionId?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-
-
-export type TransactionSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  userId?: boolean
-  provider?: boolean
-  transactionId?: boolean
-  createdAt?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["transaction"]>
-
-export type TransactionSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  userId?: boolean
-  provider?: boolean
-  transactionId?: boolean
-  createdAt?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["transaction"]>
-
-export type TransactionSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  userId?: boolean
-  provider?: boolean
-  transactionId?: boolean
-  createdAt?: boolean
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["transaction"]>
-
-export type TransactionSelectScalar = {
-  id?: boolean
-  userId?: boolean
-  provider?: boolean
-  transactionId?: boolean
-  createdAt?: boolean
-}
-
-export type TransactionOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "userId" | "provider" | "transactionId" | "createdAt", ExtArgs["result"]["transaction"]>
-export type TransactionInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-export type TransactionIncludeCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-export type TransactionIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  user?: boolean | Prisma.UserDefaultArgs<ExtArgs>
-}
-
-export type $TransactionPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "Transaction"
-  objects: {
-    user: Prisma.$UserPayload<ExtArgs>
-  }
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: number
-    userId: string
-    provider: $Enums.SubscriptionProvider
-    transactionId: string
-    createdAt: Date
-  }, ExtArgs["result"]["transaction"]>
-  composites: {}
-}
-
-export type TransactionGetPayload<S extends boolean | null | undefined | TransactionDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$TransactionPayload, S>
-
-export type TransactionCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<TransactionFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: TransactionCountAggregateInputType | true
-  }
-
-export interface TransactionDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['Transaction'], meta: { name: 'Transaction' } }
-  /**
-   * Find zero or one Transaction that matches the filter.
-   * @param {TransactionFindUniqueArgs} args - Arguments to find a Transaction
-   * @example
-   * // Get one Transaction
-   * const transaction = await prisma.transaction.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends TransactionFindUniqueArgs>(args: Prisma.SelectSubset<T, TransactionFindUniqueArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one Transaction that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {TransactionFindUniqueOrThrowArgs} args - Arguments to find a Transaction
-   * @example
-   * // Get one Transaction
-   * const transaction = await prisma.transaction.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends TransactionFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, TransactionFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Transaction that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {TransactionFindFirstArgs} args - Arguments to find a Transaction
-   * @example
-   * // Get one Transaction
-   * const transaction = await prisma.transaction.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends TransactionFindFirstArgs>(args?: Prisma.SelectSubset<T, TransactionFindFirstArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first Transaction that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {TransactionFindFirstOrThrowArgs} args - Arguments to find a Transaction
-   * @example
-   * // Get one Transaction
-   * const transaction = await prisma.transaction.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends TransactionFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, TransactionFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more Transactions that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {TransactionFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all Transactions
-   * const transactions = await prisma.transaction.findMany()
-   * 
-   * // Get first 10 Transactions
-   * const transactions = await prisma.transaction.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const transactionWithIdOnly = await prisma.transaction.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends TransactionFindManyArgs>(args?: Prisma.SelectSubset<T, TransactionFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a Transaction.
-   * @param {TransactionCreateArgs} args - Arguments to create a Transaction.
-   * @example
-   * // Create one Transaction
-   * const Transaction = await prisma.transaction.create({
-   *   data: {
-   *     // ... data to create a Transaction
-   *   }
-   * })
-   * 
-   */
-  create<T extends TransactionCreateArgs>(args: Prisma.SelectSubset<T, TransactionCreateArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many Transactions.
-   * @param {TransactionCreateManyArgs} args - Arguments to create many Transactions.
-   * @example
-   * // Create many Transactions
-   * const transaction = await prisma.transaction.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends TransactionCreateManyArgs>(args?: Prisma.SelectSubset<T, TransactionCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many Transactions and returns the data saved in the database.
-   * @param {TransactionCreateManyAndReturnArgs} args - Arguments to create many Transactions.
-   * @example
-   * // Create many Transactions
-   * const transaction = await prisma.transaction.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many Transactions and only return the `id`
-   * const transactionWithIdOnly = await prisma.transaction.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends TransactionCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, TransactionCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a Transaction.
-   * @param {TransactionDeleteArgs} args - Arguments to delete one Transaction.
-   * @example
-   * // Delete one Transaction
-   * const Transaction = await prisma.transaction.delete({
-   *   where: {
-   *     // ... filter to delete one Transaction
-   *   }
-   * })
-   * 
-   */
-  delete<T extends TransactionDeleteArgs>(args: Prisma.SelectSubset<T, TransactionDeleteArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one Transaction.
-   * @param {TransactionUpdateArgs} args - Arguments to update one Transaction.
-   * @example
-   * // Update one Transaction
-   * const transaction = await prisma.transaction.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends TransactionUpdateArgs>(args: Prisma.SelectSubset<T, TransactionUpdateArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more Transactions.
-   * @param {TransactionDeleteManyArgs} args - Arguments to filter Transactions to delete.
-   * @example
-   * // Delete a few Transactions
-   * const { count } = await prisma.transaction.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends TransactionDeleteManyArgs>(args?: Prisma.SelectSubset<T, TransactionDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Transactions.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {TransactionUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many Transactions
-   * const transaction = await prisma.transaction.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends TransactionUpdateManyArgs>(args: Prisma.SelectSubset<T, TransactionUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Transactions and returns the data updated in the database.
-   * @param {TransactionUpdateManyAndReturnArgs} args - Arguments to update many Transactions.
-   * @example
-   * // Update many Transactions
-   * const transaction = await prisma.transaction.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more Transactions and only return the `id`
-   * const transactionWithIdOnly = await prisma.transaction.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends TransactionUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, TransactionUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one Transaction.
-   * @param {TransactionUpsertArgs} args - Arguments to update or create a Transaction.
-   * @example
-   * // Update or create a Transaction
-   * const transaction = await prisma.transaction.upsert({
-   *   create: {
-   *     // ... data to create a Transaction
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the Transaction we want to update
-   *   }
-   * })
-   */
-  upsert<T extends TransactionUpsertArgs>(args: Prisma.SelectSubset<T, TransactionUpsertArgs<ExtArgs>>): Prisma.Prisma__TransactionClient<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of Transactions.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {TransactionCountArgs} args - Arguments to filter Transactions to count.
-   * @example
-   * // Count the number of Transactions
-   * const count = await prisma.transaction.count({
-   *   where: {
-   *     // ... the filter for the Transactions we want to count
-   *   }
-   * })
-  **/
-  count<T extends TransactionCountArgs>(
-    args?: Prisma.Subset<T, TransactionCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], TransactionCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a Transaction.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {TransactionAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends TransactionAggregateArgs>(args: Prisma.Subset<T, TransactionAggregateArgs>): Prisma.PrismaPromise<GetTransactionAggregateType<T>>
-
-  /**
-   * Group by Transaction.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {TransactionGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends TransactionGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: TransactionGroupByArgs['orderBy'] }
-      : { orderBy?: TransactionGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, TransactionGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetTransactionGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the Transaction model
- */
-readonly fields: TransactionFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for Transaction.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__TransactionClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  user<T extends Prisma.UserDefaultArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.UserDefaultArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions> | Null, Null, ExtArgs, GlobalOmitOptions>
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the Transaction model
- */
-export interface TransactionFieldRefs {
-  readonly id: Prisma.FieldRef<"Transaction", 'Int'>
-  readonly userId: Prisma.FieldRef<"Transaction", 'String'>
-  readonly provider: Prisma.FieldRef<"Transaction", 'SubscriptionProvider'>
-  readonly transactionId: Prisma.FieldRef<"Transaction", 'String'>
-  readonly createdAt: Prisma.FieldRef<"Transaction", 'DateTime'>
-}
-    
-
-// Custom InputTypes
-/**
- * Transaction findUnique
- */
-export type TransactionFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * Filter, which Transaction to fetch.
-   */
-  where: Prisma.TransactionWhereUniqueInput
-}
-
-/**
- * Transaction findUniqueOrThrow
- */
-export type TransactionFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * Filter, which Transaction to fetch.
-   */
-  where: Prisma.TransactionWhereUniqueInput
-}
-
-/**
- * Transaction findFirst
- */
-export type TransactionFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * Filter, which Transaction to fetch.
-   */
-  where?: Prisma.TransactionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Transactions to fetch.
-   */
-  orderBy?: Prisma.TransactionOrderByWithRelationInput | Prisma.TransactionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Transactions.
-   */
-  cursor?: Prisma.TransactionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Transactions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Transactions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Transactions.
-   */
-  distinct?: Prisma.TransactionScalarFieldEnum | Prisma.TransactionScalarFieldEnum[]
-}
-
-/**
- * Transaction findFirstOrThrow
- */
-export type TransactionFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * Filter, which Transaction to fetch.
-   */
-  where?: Prisma.TransactionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Transactions to fetch.
-   */
-  orderBy?: Prisma.TransactionOrderByWithRelationInput | Prisma.TransactionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Transactions.
-   */
-  cursor?: Prisma.TransactionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Transactions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Transactions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Transactions.
-   */
-  distinct?: Prisma.TransactionScalarFieldEnum | Prisma.TransactionScalarFieldEnum[]
-}
-
-/**
- * Transaction findMany
- */
-export type TransactionFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * Filter, which Transactions to fetch.
-   */
-  where?: Prisma.TransactionWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Transactions to fetch.
-   */
-  orderBy?: Prisma.TransactionOrderByWithRelationInput | Prisma.TransactionOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing Transactions.
-   */
-  cursor?: Prisma.TransactionWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Transactions from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Transactions.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Transactions.
-   */
-  distinct?: Prisma.TransactionScalarFieldEnum | Prisma.TransactionScalarFieldEnum[]
-}
-
-/**
- * Transaction create
- */
-export type TransactionCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * The data needed to create a Transaction.
-   */
-  data: Prisma.XOR<Prisma.TransactionCreateInput, Prisma.TransactionUncheckedCreateInput>
-}
-
-/**
- * Transaction createMany
- */
-export type TransactionCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many Transactions.
-   */
-  data: Prisma.TransactionCreateManyInput | Prisma.TransactionCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * Transaction createManyAndReturn
- */
-export type TransactionCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * The data used to create many Transactions.
-   */
-  data: Prisma.TransactionCreateManyInput | Prisma.TransactionCreateManyInput[]
-  skipDuplicates?: boolean
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionIncludeCreateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * Transaction update
- */
-export type TransactionUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * The data needed to update a Transaction.
-   */
-  data: Prisma.XOR<Prisma.TransactionUpdateInput, Prisma.TransactionUncheckedUpdateInput>
-  /**
-   * Choose, which Transaction to update.
-   */
-  where: Prisma.TransactionWhereUniqueInput
-}
-
-/**
- * Transaction updateMany
- */
-export type TransactionUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update Transactions.
-   */
-  data: Prisma.XOR<Prisma.TransactionUpdateManyMutationInput, Prisma.TransactionUncheckedUpdateManyInput>
-  /**
-   * Filter which Transactions to update
-   */
-  where?: Prisma.TransactionWhereInput
-  /**
-   * Limit how many Transactions to update.
-   */
-  limit?: number
-}
-
-/**
- * Transaction updateManyAndReturn
- */
-export type TransactionUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * The data used to update Transactions.
-   */
-  data: Prisma.XOR<Prisma.TransactionUpdateManyMutationInput, Prisma.TransactionUncheckedUpdateManyInput>
-  /**
-   * Filter which Transactions to update
-   */
-  where?: Prisma.TransactionWhereInput
-  /**
-   * Limit how many Transactions to update.
-   */
-  limit?: number
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionIncludeUpdateManyAndReturn<ExtArgs> | null
-}
-
-/**
- * Transaction upsert
- */
-export type TransactionUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * The filter to search for the Transaction to update in case it exists.
-   */
-  where: Prisma.TransactionWhereUniqueInput
-  /**
-   * In case the Transaction found by the `where` argument doesn't exist, create a new Transaction with this data.
-   */
-  create: Prisma.XOR<Prisma.TransactionCreateInput, Prisma.TransactionUncheckedCreateInput>
-  /**
-   * In case the Transaction was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.TransactionUpdateInput, Prisma.TransactionUncheckedUpdateInput>
-}
-
-/**
- * Transaction delete
- */
-export type TransactionDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  /**
-   * Filter which Transaction to delete.
-   */
-  where: Prisma.TransactionWhereUniqueInput
-}
-
-/**
- * Transaction deleteMany
- */
-export type TransactionDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Transactions to delete
-   */
-  where?: Prisma.TransactionWhereInput
-  /**
-   * Limit how many Transactions to delete.
-   */
-  limit?: number
-}
-
-/**
- * Transaction without action
- */
-export type TransactionDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-}
diff --git a/src/generated/client/models/User.ts b/src/generated/client/models/User.ts
deleted file mode 100644
index 4a4bdba9..00000000
--- a/src/generated/client/models/User.ts
+++ /dev/null
@@ -1,1979 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `User` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model User
- * 
- */
-export type UserModel = runtime.Types.Result.DefaultSelection<Prisma.$UserPayload>
-
-export type AggregateUser = {
-  _count: UserCountAggregateOutputType | null
-  _min: UserMinAggregateOutputType | null
-  _max: UserMaxAggregateOutputType | null
-}
-
-export type UserMinAggregateOutputType = {
-  id: string | null
-  createdAt: Date | null
-  email: string | null
-  emailVerified: Date | null
-  username: string | null
-  color: string | null
-  role: $Enums.UserRole | null
-  isProUntil: Date | null
-  isSubscriptionCancelled: boolean | null
-  subscriptionProvider: $Enums.SubscriptionProvider | null
-}
-
-export type UserMaxAggregateOutputType = {
-  id: string | null
-  createdAt: Date | null
-  email: string | null
-  emailVerified: Date | null
-  username: string | null
-  color: string | null
-  role: $Enums.UserRole | null
-  isProUntil: Date | null
-  isSubscriptionCancelled: boolean | null
-  subscriptionProvider: $Enums.SubscriptionProvider | null
-}
-
-export type UserCountAggregateOutputType = {
-  id: number
-  createdAt: number
-  email: number
-  emailVerified: number
-  username: number
-  color: number
-  role: number
-  isProUntil: number
-  isSubscriptionCancelled: number
-  subscriptionProvider: number
-  settings: number
-  _all: number
-}
-
-
-export type UserMinAggregateInputType = {
-  id?: true
-  createdAt?: true
-  email?: true
-  emailVerified?: true
-  username?: true
-  color?: true
-  role?: true
-  isProUntil?: true
-  isSubscriptionCancelled?: true
-  subscriptionProvider?: true
-}
-
-export type UserMaxAggregateInputType = {
-  id?: true
-  createdAt?: true
-  email?: true
-  emailVerified?: true
-  username?: true
-  color?: true
-  role?: true
-  isProUntil?: true
-  isSubscriptionCancelled?: true
-  subscriptionProvider?: true
-}
-
-export type UserCountAggregateInputType = {
-  id?: true
-  createdAt?: true
-  email?: true
-  emailVerified?: true
-  username?: true
-  color?: true
-  role?: true
-  isProUntil?: true
-  isSubscriptionCancelled?: true
-  subscriptionProvider?: true
-  settings?: true
-  _all?: true
-}
-
-export type UserAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which User to aggregate.
-   */
-  where?: Prisma.UserWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Users to fetch.
-   */
-  orderBy?: Prisma.UserOrderByWithRelationInput | Prisma.UserOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.UserWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Users from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Users.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned Users
-  **/
-  _count?: true | UserCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: UserMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: UserMaxAggregateInputType
-}
-
-export type GetUserAggregateType<T extends UserAggregateArgs> = {
-      [P in keyof T & keyof AggregateUser]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateUser[P]>
-    : Prisma.GetScalarType<T[P], AggregateUser[P]>
-}
-
-
-
-
-export type UserGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.UserWhereInput
-  orderBy?: Prisma.UserOrderByWithAggregationInput | Prisma.UserOrderByWithAggregationInput[]
-  by: Prisma.UserScalarFieldEnum[] | Prisma.UserScalarFieldEnum
-  having?: Prisma.UserScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: UserCountAggregateInputType | true
-  _min?: UserMinAggregateInputType
-  _max?: UserMaxAggregateInputType
-}
-
-export type UserGroupByOutputType = {
-  id: string
-  createdAt: Date
-  email: string
-  emailVerified: Date | null
-  username: string | null
-  color: string | null
-  role: $Enums.UserRole
-  isProUntil: Date | null
-  isSubscriptionCancelled: boolean
-  subscriptionProvider: $Enums.SubscriptionProvider | null
-  settings: runtime.JsonValue | null
-  _count: UserCountAggregateOutputType | null
-  _min: UserMinAggregateOutputType | null
-  _max: UserMaxAggregateOutputType | null
-}
-
-export type GetUserGroupByPayload<T extends UserGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<UserGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof UserGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], UserGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], UserGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type UserWhereInput = {
-  AND?: Prisma.UserWhereInput | Prisma.UserWhereInput[]
-  OR?: Prisma.UserWhereInput[]
-  NOT?: Prisma.UserWhereInput | Prisma.UserWhereInput[]
-  id?: Prisma.StringFilter<"User"> | string
-  createdAt?: Prisma.DateTimeFilter<"User"> | Date | string
-  email?: Prisma.StringFilter<"User"> | string
-  emailVerified?: Prisma.DateTimeNullableFilter<"User"> | Date | string | null
-  username?: Prisma.StringNullableFilter<"User"> | string | null
-  color?: Prisma.StringNullableFilter<"User"> | string | null
-  role?: Prisma.EnumUserRoleFilter<"User"> | $Enums.UserRole
-  isProUntil?: Prisma.DateTimeNullableFilter<"User"> | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFilter<"User"> | boolean
-  subscriptionProvider?: Prisma.EnumSubscriptionProviderNullableFilter<"User"> | $Enums.SubscriptionProvider | null
-  settings?: Prisma.JsonNullableFilter<"User">
-  accounts?: Prisma.AccountListRelationFilter
-  sessions?: Prisma.SessionListRelationFilter
-  projects?: Prisma.ProjectMemberListRelationFilter
-  transactions?: Prisma.TransactionListRelationFilter
-}
-
-export type UserOrderByWithRelationInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  emailVerified?: Prisma.SortOrderInput | Prisma.SortOrder
-  username?: Prisma.SortOrderInput | Prisma.SortOrder
-  color?: Prisma.SortOrderInput | Prisma.SortOrder
-  role?: Prisma.SortOrder
-  isProUntil?: Prisma.SortOrderInput | Prisma.SortOrder
-  isSubscriptionCancelled?: Prisma.SortOrder
-  subscriptionProvider?: Prisma.SortOrderInput | Prisma.SortOrder
-  settings?: Prisma.SortOrderInput | Prisma.SortOrder
-  accounts?: Prisma.AccountOrderByRelationAggregateInput
-  sessions?: Prisma.SessionOrderByRelationAggregateInput
-  projects?: Prisma.ProjectMemberOrderByRelationAggregateInput
-  transactions?: Prisma.TransactionOrderByRelationAggregateInput
-}
-
-export type UserWhereUniqueInput = Prisma.AtLeast<{
-  id?: string
-  email?: string
-  AND?: Prisma.UserWhereInput | Prisma.UserWhereInput[]
-  OR?: Prisma.UserWhereInput[]
-  NOT?: Prisma.UserWhereInput | Prisma.UserWhereInput[]
-  createdAt?: Prisma.DateTimeFilter<"User"> | Date | string
-  emailVerified?: Prisma.DateTimeNullableFilter<"User"> | Date | string | null
-  username?: Prisma.StringNullableFilter<"User"> | string | null
-  color?: Prisma.StringNullableFilter<"User"> | string | null
-  role?: Prisma.EnumUserRoleFilter<"User"> | $Enums.UserRole
-  isProUntil?: Prisma.DateTimeNullableFilter<"User"> | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFilter<"User"> | boolean
-  subscriptionProvider?: Prisma.EnumSubscriptionProviderNullableFilter<"User"> | $Enums.SubscriptionProvider | null
-  settings?: Prisma.JsonNullableFilter<"User">
-  accounts?: Prisma.AccountListRelationFilter
-  sessions?: Prisma.SessionListRelationFilter
-  projects?: Prisma.ProjectMemberListRelationFilter
-  transactions?: Prisma.TransactionListRelationFilter
-}, "id" | "email">
-
-export type UserOrderByWithAggregationInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  emailVerified?: Prisma.SortOrderInput | Prisma.SortOrder
-  username?: Prisma.SortOrderInput | Prisma.SortOrder
-  color?: Prisma.SortOrderInput | Prisma.SortOrder
-  role?: Prisma.SortOrder
-  isProUntil?: Prisma.SortOrderInput | Prisma.SortOrder
-  isSubscriptionCancelled?: Prisma.SortOrder
-  subscriptionProvider?: Prisma.SortOrderInput | Prisma.SortOrder
-  settings?: Prisma.SortOrderInput | Prisma.SortOrder
-  _count?: Prisma.UserCountOrderByAggregateInput
-  _max?: Prisma.UserMaxOrderByAggregateInput
-  _min?: Prisma.UserMinOrderByAggregateInput
-}
-
-export type UserScalarWhereWithAggregatesInput = {
-  AND?: Prisma.UserScalarWhereWithAggregatesInput | Prisma.UserScalarWhereWithAggregatesInput[]
-  OR?: Prisma.UserScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.UserScalarWhereWithAggregatesInput | Prisma.UserScalarWhereWithAggregatesInput[]
-  id?: Prisma.StringWithAggregatesFilter<"User"> | string
-  createdAt?: Prisma.DateTimeWithAggregatesFilter<"User"> | Date | string
-  email?: Prisma.StringWithAggregatesFilter<"User"> | string
-  emailVerified?: Prisma.DateTimeNullableWithAggregatesFilter<"User"> | Date | string | null
-  username?: Prisma.StringNullableWithAggregatesFilter<"User"> | string | null
-  color?: Prisma.StringNullableWithAggregatesFilter<"User"> | string | null
-  role?: Prisma.EnumUserRoleWithAggregatesFilter<"User"> | $Enums.UserRole
-  isProUntil?: Prisma.DateTimeNullableWithAggregatesFilter<"User"> | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolWithAggregatesFilter<"User"> | boolean
-  subscriptionProvider?: Prisma.EnumSubscriptionProviderNullableWithAggregatesFilter<"User"> | $Enums.SubscriptionProvider | null
-  settings?: Prisma.JsonNullableWithAggregatesFilter<"User">
-}
-
-export type UserCreateInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountCreateNestedManyWithoutUserInput
-  sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionCreateNestedManyWithoutUserInput
-}
-
-export type UserUncheckedCreateInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedCreateNestedManyWithoutUserInput
-  sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberUncheckedCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionUncheckedCreateNestedManyWithoutUserInput
-}
-
-export type UserUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUpdateManyWithoutUserNestedInput
-  sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUpdateManyWithoutUserNestedInput
-}
-
-export type UserUncheckedUpdateInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedUpdateManyWithoutUserNestedInput
-  sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUncheckedUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUncheckedUpdateManyWithoutUserNestedInput
-}
-
-export type UserCreateManyInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-}
-
-export type UserUpdateManyMutationInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-}
-
-export type UserUncheckedUpdateManyInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-}
-
-export type UserCountOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  emailVerified?: Prisma.SortOrder
-  username?: Prisma.SortOrder
-  color?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  isProUntil?: Prisma.SortOrder
-  isSubscriptionCancelled?: Prisma.SortOrder
-  subscriptionProvider?: Prisma.SortOrder
-  settings?: Prisma.SortOrder
-}
-
-export type UserMaxOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  emailVerified?: Prisma.SortOrder
-  username?: Prisma.SortOrder
-  color?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  isProUntil?: Prisma.SortOrder
-  isSubscriptionCancelled?: Prisma.SortOrder
-  subscriptionProvider?: Prisma.SortOrder
-}
-
-export type UserMinOrderByAggregateInput = {
-  id?: Prisma.SortOrder
-  createdAt?: Prisma.SortOrder
-  email?: Prisma.SortOrder
-  emailVerified?: Prisma.SortOrder
-  username?: Prisma.SortOrder
-  color?: Prisma.SortOrder
-  role?: Prisma.SortOrder
-  isProUntil?: Prisma.SortOrder
-  isSubscriptionCancelled?: Prisma.SortOrder
-  subscriptionProvider?: Prisma.SortOrder
-}
-
-export type UserScalarRelationFilter = {
-  is?: Prisma.UserWhereInput
-  isNot?: Prisma.UserWhereInput
-}
-
-export type StringFieldUpdateOperationsInput = {
-  set?: string
-}
-
-export type DateTimeFieldUpdateOperationsInput = {
-  set?: Date | string
-}
-
-export type NullableDateTimeFieldUpdateOperationsInput = {
-  set?: Date | string | null
-}
-
-export type NullableStringFieldUpdateOperationsInput = {
-  set?: string | null
-}
-
-export type EnumUserRoleFieldUpdateOperationsInput = {
-  set?: $Enums.UserRole
-}
-
-export type BoolFieldUpdateOperationsInput = {
-  set?: boolean
-}
-
-export type NullableEnumSubscriptionProviderFieldUpdateOperationsInput = {
-  set?: $Enums.SubscriptionProvider | null
-}
-
-export type UserCreateNestedOneWithoutAccountsInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutAccountsInput, Prisma.UserUncheckedCreateWithoutAccountsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutAccountsInput
-  connect?: Prisma.UserWhereUniqueInput
-}
-
-export type UserUpdateOneRequiredWithoutAccountsNestedInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutAccountsInput, Prisma.UserUncheckedCreateWithoutAccountsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutAccountsInput
-  upsert?: Prisma.UserUpsertWithoutAccountsInput
-  connect?: Prisma.UserWhereUniqueInput
-  update?: Prisma.XOR<Prisma.XOR<Prisma.UserUpdateToOneWithWhereWithoutAccountsInput, Prisma.UserUpdateWithoutAccountsInput>, Prisma.UserUncheckedUpdateWithoutAccountsInput>
-}
-
-export type UserCreateNestedOneWithoutSessionsInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutSessionsInput, Prisma.UserUncheckedCreateWithoutSessionsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutSessionsInput
-  connect?: Prisma.UserWhereUniqueInput
-}
-
-export type UserUpdateOneRequiredWithoutSessionsNestedInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutSessionsInput, Prisma.UserUncheckedCreateWithoutSessionsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutSessionsInput
-  upsert?: Prisma.UserUpsertWithoutSessionsInput
-  connect?: Prisma.UserWhereUniqueInput
-  update?: Prisma.XOR<Prisma.XOR<Prisma.UserUpdateToOneWithWhereWithoutSessionsInput, Prisma.UserUpdateWithoutSessionsInput>, Prisma.UserUncheckedUpdateWithoutSessionsInput>
-}
-
-export type UserCreateNestedOneWithoutTransactionsInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutTransactionsInput, Prisma.UserUncheckedCreateWithoutTransactionsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutTransactionsInput
-  connect?: Prisma.UserWhereUniqueInput
-}
-
-export type UserUpdateOneRequiredWithoutTransactionsNestedInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutTransactionsInput, Prisma.UserUncheckedCreateWithoutTransactionsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutTransactionsInput
-  upsert?: Prisma.UserUpsertWithoutTransactionsInput
-  connect?: Prisma.UserWhereUniqueInput
-  update?: Prisma.XOR<Prisma.XOR<Prisma.UserUpdateToOneWithWhereWithoutTransactionsInput, Prisma.UserUpdateWithoutTransactionsInput>, Prisma.UserUncheckedUpdateWithoutTransactionsInput>
-}
-
-export type UserCreateNestedOneWithoutProjectsInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutProjectsInput, Prisma.UserUncheckedCreateWithoutProjectsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutProjectsInput
-  connect?: Prisma.UserWhereUniqueInput
-}
-
-export type UserUpdateOneRequiredWithoutProjectsNestedInput = {
-  create?: Prisma.XOR<Prisma.UserCreateWithoutProjectsInput, Prisma.UserUncheckedCreateWithoutProjectsInput>
-  connectOrCreate?: Prisma.UserCreateOrConnectWithoutProjectsInput
-  upsert?: Prisma.UserUpsertWithoutProjectsInput
-  connect?: Prisma.UserWhereUniqueInput
-  update?: Prisma.XOR<Prisma.XOR<Prisma.UserUpdateToOneWithWhereWithoutProjectsInput, Prisma.UserUpdateWithoutProjectsInput>, Prisma.UserUncheckedUpdateWithoutProjectsInput>
-}
-
-export type UserCreateWithoutAccountsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionCreateNestedManyWithoutUserInput
-}
-
-export type UserUncheckedCreateWithoutAccountsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberUncheckedCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionUncheckedCreateNestedManyWithoutUserInput
-}
-
-export type UserCreateOrConnectWithoutAccountsInput = {
-  where: Prisma.UserWhereUniqueInput
-  create: Prisma.XOR<Prisma.UserCreateWithoutAccountsInput, Prisma.UserUncheckedCreateWithoutAccountsInput>
-}
-
-export type UserUpsertWithoutAccountsInput = {
-  update: Prisma.XOR<Prisma.UserUpdateWithoutAccountsInput, Prisma.UserUncheckedUpdateWithoutAccountsInput>
-  create: Prisma.XOR<Prisma.UserCreateWithoutAccountsInput, Prisma.UserUncheckedCreateWithoutAccountsInput>
-  where?: Prisma.UserWhereInput
-}
-
-export type UserUpdateToOneWithWhereWithoutAccountsInput = {
-  where?: Prisma.UserWhereInput
-  data: Prisma.XOR<Prisma.UserUpdateWithoutAccountsInput, Prisma.UserUncheckedUpdateWithoutAccountsInput>
-}
-
-export type UserUpdateWithoutAccountsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUpdateManyWithoutUserNestedInput
-}
-
-export type UserUncheckedUpdateWithoutAccountsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUncheckedUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUncheckedUpdateManyWithoutUserNestedInput
-}
-
-export type UserCreateWithoutSessionsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionCreateNestedManyWithoutUserInput
-}
-
-export type UserUncheckedCreateWithoutSessionsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberUncheckedCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionUncheckedCreateNestedManyWithoutUserInput
-}
-
-export type UserCreateOrConnectWithoutSessionsInput = {
-  where: Prisma.UserWhereUniqueInput
-  create: Prisma.XOR<Prisma.UserCreateWithoutSessionsInput, Prisma.UserUncheckedCreateWithoutSessionsInput>
-}
-
-export type UserUpsertWithoutSessionsInput = {
-  update: Prisma.XOR<Prisma.UserUpdateWithoutSessionsInput, Prisma.UserUncheckedUpdateWithoutSessionsInput>
-  create: Prisma.XOR<Prisma.UserCreateWithoutSessionsInput, Prisma.UserUncheckedCreateWithoutSessionsInput>
-  where?: Prisma.UserWhereInput
-}
-
-export type UserUpdateToOneWithWhereWithoutSessionsInput = {
-  where?: Prisma.UserWhereInput
-  data: Prisma.XOR<Prisma.UserUpdateWithoutSessionsInput, Prisma.UserUncheckedUpdateWithoutSessionsInput>
-}
-
-export type UserUpdateWithoutSessionsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUpdateManyWithoutUserNestedInput
-}
-
-export type UserUncheckedUpdateWithoutSessionsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUncheckedUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUncheckedUpdateManyWithoutUserNestedInput
-}
-
-export type UserCreateWithoutTransactionsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountCreateNestedManyWithoutUserInput
-  sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberCreateNestedManyWithoutUserInput
-}
-
-export type UserUncheckedCreateWithoutTransactionsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedCreateNestedManyWithoutUserInput
-  sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
-  projects?: Prisma.ProjectMemberUncheckedCreateNestedManyWithoutUserInput
-}
-
-export type UserCreateOrConnectWithoutTransactionsInput = {
-  where: Prisma.UserWhereUniqueInput
-  create: Prisma.XOR<Prisma.UserCreateWithoutTransactionsInput, Prisma.UserUncheckedCreateWithoutTransactionsInput>
-}
-
-export type UserUpsertWithoutTransactionsInput = {
-  update: Prisma.XOR<Prisma.UserUpdateWithoutTransactionsInput, Prisma.UserUncheckedUpdateWithoutTransactionsInput>
-  create: Prisma.XOR<Prisma.UserCreateWithoutTransactionsInput, Prisma.UserUncheckedCreateWithoutTransactionsInput>
-  where?: Prisma.UserWhereInput
-}
-
-export type UserUpdateToOneWithWhereWithoutTransactionsInput = {
-  where?: Prisma.UserWhereInput
-  data: Prisma.XOR<Prisma.UserUpdateWithoutTransactionsInput, Prisma.UserUncheckedUpdateWithoutTransactionsInput>
-}
-
-export type UserUpdateWithoutTransactionsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUpdateManyWithoutUserNestedInput
-  sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUpdateManyWithoutUserNestedInput
-}
-
-export type UserUncheckedUpdateWithoutTransactionsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedUpdateManyWithoutUserNestedInput
-  sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
-  projects?: Prisma.ProjectMemberUncheckedUpdateManyWithoutUserNestedInput
-}
-
-export type UserCreateWithoutProjectsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountCreateNestedManyWithoutUserInput
-  sessions?: Prisma.SessionCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionCreateNestedManyWithoutUserInput
-}
-
-export type UserUncheckedCreateWithoutProjectsInput = {
-  id?: string
-  createdAt?: Date | string
-  email: string
-  emailVerified?: Date | string | null
-  username?: string | null
-  color?: string | null
-  role?: $Enums.UserRole
-  isProUntil?: Date | string | null
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedCreateNestedManyWithoutUserInput
-  sessions?: Prisma.SessionUncheckedCreateNestedManyWithoutUserInput
-  transactions?: Prisma.TransactionUncheckedCreateNestedManyWithoutUserInput
-}
-
-export type UserCreateOrConnectWithoutProjectsInput = {
-  where: Prisma.UserWhereUniqueInput
-  create: Prisma.XOR<Prisma.UserCreateWithoutProjectsInput, Prisma.UserUncheckedCreateWithoutProjectsInput>
-}
-
-export type UserUpsertWithoutProjectsInput = {
-  update: Prisma.XOR<Prisma.UserUpdateWithoutProjectsInput, Prisma.UserUncheckedUpdateWithoutProjectsInput>
-  create: Prisma.XOR<Prisma.UserCreateWithoutProjectsInput, Prisma.UserUncheckedCreateWithoutProjectsInput>
-  where?: Prisma.UserWhereInput
-}
-
-export type UserUpdateToOneWithWhereWithoutProjectsInput = {
-  where?: Prisma.UserWhereInput
-  data: Prisma.XOR<Prisma.UserUpdateWithoutProjectsInput, Prisma.UserUncheckedUpdateWithoutProjectsInput>
-}
-
-export type UserUpdateWithoutProjectsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUpdateManyWithoutUserNestedInput
-  sessions?: Prisma.SessionUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUpdateManyWithoutUserNestedInput
-}
-
-export type UserUncheckedUpdateWithoutProjectsInput = {
-  id?: Prisma.StringFieldUpdateOperationsInput | string
-  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-  email?: Prisma.StringFieldUpdateOperationsInput | string
-  emailVerified?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  username?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  color?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
-  role?: Prisma.EnumUserRoleFieldUpdateOperationsInput | $Enums.UserRole
-  isProUntil?: Prisma.NullableDateTimeFieldUpdateOperationsInput | Date | string | null
-  isSubscriptionCancelled?: Prisma.BoolFieldUpdateOperationsInput | boolean
-  subscriptionProvider?: Prisma.NullableEnumSubscriptionProviderFieldUpdateOperationsInput | $Enums.SubscriptionProvider | null
-  settings?: Prisma.NullableJsonNullValueInput | runtime.InputJsonValue
-  accounts?: Prisma.AccountUncheckedUpdateManyWithoutUserNestedInput
-  sessions?: Prisma.SessionUncheckedUpdateManyWithoutUserNestedInput
-  transactions?: Prisma.TransactionUncheckedUpdateManyWithoutUserNestedInput
-}
-
-
-/**
- * Count Type UserCountOutputType
- */
-
-export type UserCountOutputType = {
-  accounts: number
-  sessions: number
-  projects: number
-  transactions: number
-}
-
-export type UserCountOutputTypeSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  accounts?: boolean | UserCountOutputTypeCountAccountsArgs
-  sessions?: boolean | UserCountOutputTypeCountSessionsArgs
-  projects?: boolean | UserCountOutputTypeCountProjectsArgs
-  transactions?: boolean | UserCountOutputTypeCountTransactionsArgs
-}
-
-/**
- * UserCountOutputType without action
- */
-export type UserCountOutputTypeDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the UserCountOutputType
-   */
-  select?: Prisma.UserCountOutputTypeSelect<ExtArgs> | null
-}
-
-/**
- * UserCountOutputType without action
- */
-export type UserCountOutputTypeCountAccountsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.AccountWhereInput
-}
-
-/**
- * UserCountOutputType without action
- */
-export type UserCountOutputTypeCountSessionsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.SessionWhereInput
-}
-
-/**
- * UserCountOutputType without action
- */
-export type UserCountOutputTypeCountProjectsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.ProjectMemberWhereInput
-}
-
-/**
- * UserCountOutputType without action
- */
-export type UserCountOutputTypeCountTransactionsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.TransactionWhereInput
-}
-
-
-export type UserSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  createdAt?: boolean
-  email?: boolean
-  emailVerified?: boolean
-  username?: boolean
-  color?: boolean
-  role?: boolean
-  isProUntil?: boolean
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: boolean
-  settings?: boolean
-  accounts?: boolean | Prisma.User$accountsArgs<ExtArgs>
-  sessions?: boolean | Prisma.User$sessionsArgs<ExtArgs>
-  projects?: boolean | Prisma.User$projectsArgs<ExtArgs>
-  transactions?: boolean | Prisma.User$transactionsArgs<ExtArgs>
-  _count?: boolean | Prisma.UserCountOutputTypeDefaultArgs<ExtArgs>
-}, ExtArgs["result"]["user"]>
-
-export type UserSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  createdAt?: boolean
-  email?: boolean
-  emailVerified?: boolean
-  username?: boolean
-  color?: boolean
-  role?: boolean
-  isProUntil?: boolean
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: boolean
-  settings?: boolean
-}, ExtArgs["result"]["user"]>
-
-export type UserSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  id?: boolean
-  createdAt?: boolean
-  email?: boolean
-  emailVerified?: boolean
-  username?: boolean
-  color?: boolean
-  role?: boolean
-  isProUntil?: boolean
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: boolean
-  settings?: boolean
-}, ExtArgs["result"]["user"]>
-
-export type UserSelectScalar = {
-  id?: boolean
-  createdAt?: boolean
-  email?: boolean
-  emailVerified?: boolean
-  username?: boolean
-  color?: boolean
-  role?: boolean
-  isProUntil?: boolean
-  isSubscriptionCancelled?: boolean
-  subscriptionProvider?: boolean
-  settings?: boolean
-}
-
-export type UserOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "createdAt" | "email" | "emailVerified" | "username" | "color" | "role" | "isProUntil" | "isSubscriptionCancelled" | "subscriptionProvider" | "settings", ExtArgs["result"]["user"]>
-export type UserInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  accounts?: boolean | Prisma.User$accountsArgs<ExtArgs>
-  sessions?: boolean | Prisma.User$sessionsArgs<ExtArgs>
-  projects?: boolean | Prisma.User$projectsArgs<ExtArgs>
-  transactions?: boolean | Prisma.User$transactionsArgs<ExtArgs>
-  _count?: boolean | Prisma.UserCountOutputTypeDefaultArgs<ExtArgs>
-}
-export type UserIncludeCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {}
-export type UserIncludeUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {}
-
-export type $UserPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "User"
-  objects: {
-    accounts: Prisma.$AccountPayload<ExtArgs>[]
-    sessions: Prisma.$SessionPayload<ExtArgs>[]
-    projects: Prisma.$ProjectMemberPayload<ExtArgs>[]
-    transactions: Prisma.$TransactionPayload<ExtArgs>[]
-  }
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    id: string
-    createdAt: Date
-    email: string
-    emailVerified: Date | null
-    username: string | null
-    color: string | null
-    role: $Enums.UserRole
-    isProUntil: Date | null
-    isSubscriptionCancelled: boolean
-    subscriptionProvider: $Enums.SubscriptionProvider | null
-    settings: runtime.JsonValue | null
-  }, ExtArgs["result"]["user"]>
-  composites: {}
-}
-
-export type UserGetPayload<S extends boolean | null | undefined | UserDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$UserPayload, S>
-
-export type UserCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<UserFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: UserCountAggregateInputType | true
-  }
-
-export interface UserDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['User'], meta: { name: 'User' } }
-  /**
-   * Find zero or one User that matches the filter.
-   * @param {UserFindUniqueArgs} args - Arguments to find a User
-   * @example
-   * // Get one User
-   * const user = await prisma.user.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends UserFindUniqueArgs>(args: Prisma.SelectSubset<T, UserFindUniqueArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one User that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {UserFindUniqueOrThrowArgs} args - Arguments to find a User
-   * @example
-   * // Get one User
-   * const user = await prisma.user.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends UserFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, UserFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first User that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {UserFindFirstArgs} args - Arguments to find a User
-   * @example
-   * // Get one User
-   * const user = await prisma.user.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends UserFindFirstArgs>(args?: Prisma.SelectSubset<T, UserFindFirstArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first User that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {UserFindFirstOrThrowArgs} args - Arguments to find a User
-   * @example
-   * // Get one User
-   * const user = await prisma.user.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends UserFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, UserFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more Users that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {UserFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all Users
-   * const users = await prisma.user.findMany()
-   * 
-   * // Get first 10 Users
-   * const users = await prisma.user.findMany({ take: 10 })
-   * 
-   * // Only select the `id`
-   * const userWithIdOnly = await prisma.user.findMany({ select: { id: true } })
-   * 
-   */
-  findMany<T extends UserFindManyArgs>(args?: Prisma.SelectSubset<T, UserFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a User.
-   * @param {UserCreateArgs} args - Arguments to create a User.
-   * @example
-   * // Create one User
-   * const User = await prisma.user.create({
-   *   data: {
-   *     // ... data to create a User
-   *   }
-   * })
-   * 
-   */
-  create<T extends UserCreateArgs>(args: Prisma.SelectSubset<T, UserCreateArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many Users.
-   * @param {UserCreateManyArgs} args - Arguments to create many Users.
-   * @example
-   * // Create many Users
-   * const user = await prisma.user.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends UserCreateManyArgs>(args?: Prisma.SelectSubset<T, UserCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many Users and returns the data saved in the database.
-   * @param {UserCreateManyAndReturnArgs} args - Arguments to create many Users.
-   * @example
-   * // Create many Users
-   * const user = await prisma.user.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many Users and only return the `id`
-   * const userWithIdOnly = await prisma.user.createManyAndReturn({
-   *   select: { id: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends UserCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, UserCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a User.
-   * @param {UserDeleteArgs} args - Arguments to delete one User.
-   * @example
-   * // Delete one User
-   * const User = await prisma.user.delete({
-   *   where: {
-   *     // ... filter to delete one User
-   *   }
-   * })
-   * 
-   */
-  delete<T extends UserDeleteArgs>(args: Prisma.SelectSubset<T, UserDeleteArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one User.
-   * @param {UserUpdateArgs} args - Arguments to update one User.
-   * @example
-   * // Update one User
-   * const user = await prisma.user.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends UserUpdateArgs>(args: Prisma.SelectSubset<T, UserUpdateArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more Users.
-   * @param {UserDeleteManyArgs} args - Arguments to filter Users to delete.
-   * @example
-   * // Delete a few Users
-   * const { count } = await prisma.user.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends UserDeleteManyArgs>(args?: Prisma.SelectSubset<T, UserDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Users.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {UserUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many Users
-   * const user = await prisma.user.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends UserUpdateManyArgs>(args: Prisma.SelectSubset<T, UserUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more Users and returns the data updated in the database.
-   * @param {UserUpdateManyAndReturnArgs} args - Arguments to update many Users.
-   * @example
-   * // Update many Users
-   * const user = await prisma.user.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more Users and only return the `id`
-   * const userWithIdOnly = await prisma.user.updateManyAndReturn({
-   *   select: { id: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends UserUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, UserUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one User.
-   * @param {UserUpsertArgs} args - Arguments to update or create a User.
-   * @example
-   * // Update or create a User
-   * const user = await prisma.user.upsert({
-   *   create: {
-   *     // ... data to create a User
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the User we want to update
-   *   }
-   * })
-   */
-  upsert<T extends UserUpsertArgs>(args: Prisma.SelectSubset<T, UserUpsertArgs<ExtArgs>>): Prisma.Prisma__UserClient<runtime.Types.Result.GetResult<Prisma.$UserPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of Users.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {UserCountArgs} args - Arguments to filter Users to count.
-   * @example
-   * // Count the number of Users
-   * const count = await prisma.user.count({
-   *   where: {
-   *     // ... the filter for the Users we want to count
-   *   }
-   * })
-  **/
-  count<T extends UserCountArgs>(
-    args?: Prisma.Subset<T, UserCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], UserCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a User.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {UserAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends UserAggregateArgs>(args: Prisma.Subset<T, UserAggregateArgs>): Prisma.PrismaPromise<GetUserAggregateType<T>>
-
-  /**
-   * Group by User.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {UserGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends UserGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: UserGroupByArgs['orderBy'] }
-      : { orderBy?: UserGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, UserGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetUserGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the User model
- */
-readonly fields: UserFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for User.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__UserClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  accounts<T extends Prisma.User$accountsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$accountsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$AccountPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
-  sessions<T extends Prisma.User$sessionsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$sessionsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$SessionPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
-  projects<T extends Prisma.User$projectsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$projectsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$ProjectMemberPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
-  transactions<T extends Prisma.User$transactionsArgs<ExtArgs> = {}>(args?: Prisma.Subset<T, Prisma.User$transactionsArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$TransactionPayload<ExtArgs>, T, "findMany", GlobalOmitOptions> | Null>
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the User model
- */
-export interface UserFieldRefs {
-  readonly id: Prisma.FieldRef<"User", 'String'>
-  readonly createdAt: Prisma.FieldRef<"User", 'DateTime'>
-  readonly email: Prisma.FieldRef<"User", 'String'>
-  readonly emailVerified: Prisma.FieldRef<"User", 'DateTime'>
-  readonly username: Prisma.FieldRef<"User", 'String'>
-  readonly color: Prisma.FieldRef<"User", 'String'>
-  readonly role: Prisma.FieldRef<"User", 'UserRole'>
-  readonly isProUntil: Prisma.FieldRef<"User", 'DateTime'>
-  readonly isSubscriptionCancelled: Prisma.FieldRef<"User", 'Boolean'>
-  readonly subscriptionProvider: Prisma.FieldRef<"User", 'SubscriptionProvider'>
-  readonly settings: Prisma.FieldRef<"User", 'Json'>
-}
-    
-
-// Custom InputTypes
-/**
- * User findUnique
- */
-export type UserFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * Filter, which User to fetch.
-   */
-  where: Prisma.UserWhereUniqueInput
-}
-
-/**
- * User findUniqueOrThrow
- */
-export type UserFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * Filter, which User to fetch.
-   */
-  where: Prisma.UserWhereUniqueInput
-}
-
-/**
- * User findFirst
- */
-export type UserFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * Filter, which User to fetch.
-   */
-  where?: Prisma.UserWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Users to fetch.
-   */
-  orderBy?: Prisma.UserOrderByWithRelationInput | Prisma.UserOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Users.
-   */
-  cursor?: Prisma.UserWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Users from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Users.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Users.
-   */
-  distinct?: Prisma.UserScalarFieldEnum | Prisma.UserScalarFieldEnum[]
-}
-
-/**
- * User findFirstOrThrow
- */
-export type UserFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * Filter, which User to fetch.
-   */
-  where?: Prisma.UserWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Users to fetch.
-   */
-  orderBy?: Prisma.UserOrderByWithRelationInput | Prisma.UserOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for Users.
-   */
-  cursor?: Prisma.UserWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Users from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Users.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Users.
-   */
-  distinct?: Prisma.UserScalarFieldEnum | Prisma.UserScalarFieldEnum[]
-}
-
-/**
- * User findMany
- */
-export type UserFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * Filter, which Users to fetch.
-   */
-  where?: Prisma.UserWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of Users to fetch.
-   */
-  orderBy?: Prisma.UserOrderByWithRelationInput | Prisma.UserOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing Users.
-   */
-  cursor?: Prisma.UserWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` Users from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` Users.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of Users.
-   */
-  distinct?: Prisma.UserScalarFieldEnum | Prisma.UserScalarFieldEnum[]
-}
-
-/**
- * User create
- */
-export type UserCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * The data needed to create a User.
-   */
-  data: Prisma.XOR<Prisma.UserCreateInput, Prisma.UserUncheckedCreateInput>
-}
-
-/**
- * User createMany
- */
-export type UserCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many Users.
-   */
-  data: Prisma.UserCreateManyInput | Prisma.UserCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * User createManyAndReturn
- */
-export type UserCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * The data used to create many Users.
-   */
-  data: Prisma.UserCreateManyInput | Prisma.UserCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * User update
- */
-export type UserUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * The data needed to update a User.
-   */
-  data: Prisma.XOR<Prisma.UserUpdateInput, Prisma.UserUncheckedUpdateInput>
-  /**
-   * Choose, which User to update.
-   */
-  where: Prisma.UserWhereUniqueInput
-}
-
-/**
- * User updateMany
- */
-export type UserUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update Users.
-   */
-  data: Prisma.XOR<Prisma.UserUpdateManyMutationInput, Prisma.UserUncheckedUpdateManyInput>
-  /**
-   * Filter which Users to update
-   */
-  where?: Prisma.UserWhereInput
-  /**
-   * Limit how many Users to update.
-   */
-  limit?: number
-}
-
-/**
- * User updateManyAndReturn
- */
-export type UserUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * The data used to update Users.
-   */
-  data: Prisma.XOR<Prisma.UserUpdateManyMutationInput, Prisma.UserUncheckedUpdateManyInput>
-  /**
-   * Filter which Users to update
-   */
-  where?: Prisma.UserWhereInput
-  /**
-   * Limit how many Users to update.
-   */
-  limit?: number
-}
-
-/**
- * User upsert
- */
-export type UserUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * The filter to search for the User to update in case it exists.
-   */
-  where: Prisma.UserWhereUniqueInput
-  /**
-   * In case the User found by the `where` argument doesn't exist, create a new User with this data.
-   */
-  create: Prisma.XOR<Prisma.UserCreateInput, Prisma.UserUncheckedCreateInput>
-  /**
-   * In case the User was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.UserUpdateInput, Prisma.UserUncheckedUpdateInput>
-}
-
-/**
- * User delete
- */
-export type UserDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-  /**
-   * Filter which User to delete.
-   */
-  where: Prisma.UserWhereUniqueInput
-}
-
-/**
- * User deleteMany
- */
-export type UserDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which Users to delete
-   */
-  where?: Prisma.UserWhereInput
-  /**
-   * Limit how many Users to delete.
-   */
-  limit?: number
-}
-
-/**
- * User.accounts
- */
-export type User$accountsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Account
-   */
-  select?: Prisma.AccountSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Account
-   */
-  omit?: Prisma.AccountOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.AccountInclude<ExtArgs> | null
-  where?: Prisma.AccountWhereInput
-  orderBy?: Prisma.AccountOrderByWithRelationInput | Prisma.AccountOrderByWithRelationInput[]
-  cursor?: Prisma.AccountWhereUniqueInput
-  take?: number
-  skip?: number
-  distinct?: Prisma.AccountScalarFieldEnum | Prisma.AccountScalarFieldEnum[]
-}
-
-/**
- * User.sessions
- */
-export type User$sessionsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Session
-   */
-  select?: Prisma.SessionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Session
-   */
-  omit?: Prisma.SessionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.SessionInclude<ExtArgs> | null
-  where?: Prisma.SessionWhereInput
-  orderBy?: Prisma.SessionOrderByWithRelationInput | Prisma.SessionOrderByWithRelationInput[]
-  cursor?: Prisma.SessionWhereUniqueInput
-  take?: number
-  skip?: number
-  distinct?: Prisma.SessionScalarFieldEnum | Prisma.SessionScalarFieldEnum[]
-}
-
-/**
- * User.projects
- */
-export type User$projectsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the ProjectMember
-   */
-  select?: Prisma.ProjectMemberSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the ProjectMember
-   */
-  omit?: Prisma.ProjectMemberOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.ProjectMemberInclude<ExtArgs> | null
-  where?: Prisma.ProjectMemberWhereInput
-  orderBy?: Prisma.ProjectMemberOrderByWithRelationInput | Prisma.ProjectMemberOrderByWithRelationInput[]
-  cursor?: Prisma.ProjectMemberWhereUniqueInput
-  take?: number
-  skip?: number
-  distinct?: Prisma.ProjectMemberScalarFieldEnum | Prisma.ProjectMemberScalarFieldEnum[]
-}
-
-/**
- * User.transactions
- */
-export type User$transactionsArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the Transaction
-   */
-  select?: Prisma.TransactionSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the Transaction
-   */
-  omit?: Prisma.TransactionOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.TransactionInclude<ExtArgs> | null
-  where?: Prisma.TransactionWhereInput
-  orderBy?: Prisma.TransactionOrderByWithRelationInput | Prisma.TransactionOrderByWithRelationInput[]
-  cursor?: Prisma.TransactionWhereUniqueInput
-  take?: number
-  skip?: number
-  distinct?: Prisma.TransactionScalarFieldEnum | Prisma.TransactionScalarFieldEnum[]
-}
-
-/**
- * User without action
- */
-export type UserDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the User
-   */
-  select?: Prisma.UserSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the User
-   */
-  omit?: Prisma.UserOmit<ExtArgs> | null
-  /**
-   * Choose, which related nodes to fetch as well
-   */
-  include?: Prisma.UserInclude<ExtArgs> | null
-}
diff --git a/src/generated/client/models/VerificationToken.ts b/src/generated/client/models/VerificationToken.ts
deleted file mode 100644
index 9b850854..00000000
--- a/src/generated/client/models/VerificationToken.ts
+++ /dev/null
@@ -1,1099 +0,0 @@
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file exports the `VerificationToken` model and its related types.
- *
- * 🟢 You can import this file directly.
- */
-import type * as runtime from "@prisma/client/runtime/client"
-import type * as $Enums from "../enums"
-import type * as Prisma from "../internal/prismaNamespace"
-
-/**
- * Model VerificationToken
- * 
- */
-export type VerificationTokenModel = runtime.Types.Result.DefaultSelection<Prisma.$VerificationTokenPayload>
-
-export type AggregateVerificationToken = {
-  _count: VerificationTokenCountAggregateOutputType | null
-  _min: VerificationTokenMinAggregateOutputType | null
-  _max: VerificationTokenMaxAggregateOutputType | null
-}
-
-export type VerificationTokenMinAggregateOutputType = {
-  identifier: string | null
-  token: string | null
-  expires: Date | null
-}
-
-export type VerificationTokenMaxAggregateOutputType = {
-  identifier: string | null
-  token: string | null
-  expires: Date | null
-}
-
-export type VerificationTokenCountAggregateOutputType = {
-  identifier: number
-  token: number
-  expires: number
-  _all: number
-}
-
-
-export type VerificationTokenMinAggregateInputType = {
-  identifier?: true
-  token?: true
-  expires?: true
-}
-
-export type VerificationTokenMaxAggregateInputType = {
-  identifier?: true
-  token?: true
-  expires?: true
-}
-
-export type VerificationTokenCountAggregateInputType = {
-  identifier?: true
-  token?: true
-  expires?: true
-  _all?: true
-}
-
-export type VerificationTokenAggregateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which VerificationToken to aggregate.
-   */
-  where?: Prisma.VerificationTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of VerificationTokens to fetch.
-   */
-  orderBy?: Prisma.VerificationTokenOrderByWithRelationInput | Prisma.VerificationTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the start position
-   */
-  cursor?: Prisma.VerificationTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` VerificationTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` VerificationTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Count returned VerificationTokens
-  **/
-  _count?: true | VerificationTokenCountAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the minimum value
-  **/
-  _min?: VerificationTokenMinAggregateInputType
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/aggregations Aggregation Docs}
-   * 
-   * Select which fields to find the maximum value
-  **/
-  _max?: VerificationTokenMaxAggregateInputType
-}
-
-export type GetVerificationTokenAggregateType<T extends VerificationTokenAggregateArgs> = {
-      [P in keyof T & keyof AggregateVerificationToken]: P extends '_count' | 'count'
-    ? T[P] extends true
-      ? number
-      : Prisma.GetScalarType<T[P], AggregateVerificationToken[P]>
-    : Prisma.GetScalarType<T[P], AggregateVerificationToken[P]>
-}
-
-
-
-
-export type VerificationTokenGroupByArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  where?: Prisma.VerificationTokenWhereInput
-  orderBy?: Prisma.VerificationTokenOrderByWithAggregationInput | Prisma.VerificationTokenOrderByWithAggregationInput[]
-  by: Prisma.VerificationTokenScalarFieldEnum[] | Prisma.VerificationTokenScalarFieldEnum
-  having?: Prisma.VerificationTokenScalarWhereWithAggregatesInput
-  take?: number
-  skip?: number
-  _count?: VerificationTokenCountAggregateInputType | true
-  _min?: VerificationTokenMinAggregateInputType
-  _max?: VerificationTokenMaxAggregateInputType
-}
-
-export type VerificationTokenGroupByOutputType = {
-  identifier: string
-  token: string
-  expires: Date
-  _count: VerificationTokenCountAggregateOutputType | null
-  _min: VerificationTokenMinAggregateOutputType | null
-  _max: VerificationTokenMaxAggregateOutputType | null
-}
-
-export type GetVerificationTokenGroupByPayload<T extends VerificationTokenGroupByArgs> = Prisma.PrismaPromise<
-  Array<
-    Prisma.PickEnumerable<VerificationTokenGroupByOutputType, T['by']> &
-      {
-        [P in ((keyof T) & (keyof VerificationTokenGroupByOutputType))]: P extends '_count'
-          ? T[P] extends boolean
-            ? number
-            : Prisma.GetScalarType<T[P], VerificationTokenGroupByOutputType[P]>
-          : Prisma.GetScalarType<T[P], VerificationTokenGroupByOutputType[P]>
-      }
-    >
-  >
-
-
-
-export type VerificationTokenWhereInput = {
-  AND?: Prisma.VerificationTokenWhereInput | Prisma.VerificationTokenWhereInput[]
-  OR?: Prisma.VerificationTokenWhereInput[]
-  NOT?: Prisma.VerificationTokenWhereInput | Prisma.VerificationTokenWhereInput[]
-  identifier?: Prisma.StringFilter<"VerificationToken"> | string
-  token?: Prisma.StringFilter<"VerificationToken"> | string
-  expires?: Prisma.DateTimeFilter<"VerificationToken"> | Date | string
-}
-
-export type VerificationTokenOrderByWithRelationInput = {
-  identifier?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-}
-
-export type VerificationTokenWhereUniqueInput = Prisma.AtLeast<{
-  token?: string
-  identifier_token?: Prisma.VerificationTokenIdentifierTokenCompoundUniqueInput
-  AND?: Prisma.VerificationTokenWhereInput | Prisma.VerificationTokenWhereInput[]
-  OR?: Prisma.VerificationTokenWhereInput[]
-  NOT?: Prisma.VerificationTokenWhereInput | Prisma.VerificationTokenWhereInput[]
-  identifier?: Prisma.StringFilter<"VerificationToken"> | string
-  expires?: Prisma.DateTimeFilter<"VerificationToken"> | Date | string
-}, "token" | "identifier_token">
-
-export type VerificationTokenOrderByWithAggregationInput = {
-  identifier?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-  _count?: Prisma.VerificationTokenCountOrderByAggregateInput
-  _max?: Prisma.VerificationTokenMaxOrderByAggregateInput
-  _min?: Prisma.VerificationTokenMinOrderByAggregateInput
-}
-
-export type VerificationTokenScalarWhereWithAggregatesInput = {
-  AND?: Prisma.VerificationTokenScalarWhereWithAggregatesInput | Prisma.VerificationTokenScalarWhereWithAggregatesInput[]
-  OR?: Prisma.VerificationTokenScalarWhereWithAggregatesInput[]
-  NOT?: Prisma.VerificationTokenScalarWhereWithAggregatesInput | Prisma.VerificationTokenScalarWhereWithAggregatesInput[]
-  identifier?: Prisma.StringWithAggregatesFilter<"VerificationToken"> | string
-  token?: Prisma.StringWithAggregatesFilter<"VerificationToken"> | string
-  expires?: Prisma.DateTimeWithAggregatesFilter<"VerificationToken"> | Date | string
-}
-
-export type VerificationTokenCreateInput = {
-  identifier: string
-  token: string
-  expires: Date | string
-}
-
-export type VerificationTokenUncheckedCreateInput = {
-  identifier: string
-  token: string
-  expires: Date | string
-}
-
-export type VerificationTokenUpdateInput = {
-  identifier?: Prisma.StringFieldUpdateOperationsInput | string
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type VerificationTokenUncheckedUpdateInput = {
-  identifier?: Prisma.StringFieldUpdateOperationsInput | string
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type VerificationTokenCreateManyInput = {
-  identifier: string
-  token: string
-  expires: Date | string
-}
-
-export type VerificationTokenUpdateManyMutationInput = {
-  identifier?: Prisma.StringFieldUpdateOperationsInput | string
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type VerificationTokenUncheckedUpdateManyInput = {
-  identifier?: Prisma.StringFieldUpdateOperationsInput | string
-  token?: Prisma.StringFieldUpdateOperationsInput | string
-  expires?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
-}
-
-export type VerificationTokenIdentifierTokenCompoundUniqueInput = {
-  identifier: string
-  token: string
-}
-
-export type VerificationTokenCountOrderByAggregateInput = {
-  identifier?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-}
-
-export type VerificationTokenMaxOrderByAggregateInput = {
-  identifier?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-}
-
-export type VerificationTokenMinOrderByAggregateInput = {
-  identifier?: Prisma.SortOrder
-  token?: Prisma.SortOrder
-  expires?: Prisma.SortOrder
-}
-
-
-
-export type VerificationTokenSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  identifier?: boolean
-  token?: boolean
-  expires?: boolean
-}, ExtArgs["result"]["verificationToken"]>
-
-export type VerificationTokenSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  identifier?: boolean
-  token?: boolean
-  expires?: boolean
-}, ExtArgs["result"]["verificationToken"]>
-
-export type VerificationTokenSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
-  identifier?: boolean
-  token?: boolean
-  expires?: boolean
-}, ExtArgs["result"]["verificationToken"]>
-
-export type VerificationTokenSelectScalar = {
-  identifier?: boolean
-  token?: boolean
-  expires?: boolean
-}
-
-export type VerificationTokenOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"identifier" | "token" | "expires", ExtArgs["result"]["verificationToken"]>
-
-export type $VerificationTokenPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  name: "VerificationToken"
-  objects: {}
-  scalars: runtime.Types.Extensions.GetPayloadResult<{
-    identifier: string
-    token: string
-    expires: Date
-  }, ExtArgs["result"]["verificationToken"]>
-  composites: {}
-}
-
-export type VerificationTokenGetPayload<S extends boolean | null | undefined | VerificationTokenDefaultArgs> = runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload, S>
-
-export type VerificationTokenCountArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> =
-  Omit<VerificationTokenFindManyArgs, 'select' | 'include' | 'distinct' | 'omit'> & {
-    select?: VerificationTokenCountAggregateInputType | true
-  }
-
-export interface VerificationTokenDelegate<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> {
-  [K: symbol]: { types: Prisma.TypeMap<ExtArgs>['model']['VerificationToken'], meta: { name: 'VerificationToken' } }
-  /**
-   * Find zero or one VerificationToken that matches the filter.
-   * @param {VerificationTokenFindUniqueArgs} args - Arguments to find a VerificationToken
-   * @example
-   * // Get one VerificationToken
-   * const verificationToken = await prisma.verificationToken.findUnique({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUnique<T extends VerificationTokenFindUniqueArgs>(args: Prisma.SelectSubset<T, VerificationTokenFindUniqueArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "findUnique", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find one VerificationToken that matches the filter or throw an error with `error.code='P2025'`
-   * if no matches were found.
-   * @param {VerificationTokenFindUniqueOrThrowArgs} args - Arguments to find a VerificationToken
-   * @example
-   * // Get one VerificationToken
-   * const verificationToken = await prisma.verificationToken.findUniqueOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findUniqueOrThrow<T extends VerificationTokenFindUniqueOrThrowArgs>(args: Prisma.SelectSubset<T, VerificationTokenFindUniqueOrThrowArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "findUniqueOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first VerificationToken that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {VerificationTokenFindFirstArgs} args - Arguments to find a VerificationToken
-   * @example
-   * // Get one VerificationToken
-   * const verificationToken = await prisma.verificationToken.findFirst({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirst<T extends VerificationTokenFindFirstArgs>(args?: Prisma.SelectSubset<T, VerificationTokenFindFirstArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "findFirst", GlobalOmitOptions> | null, null, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find the first VerificationToken that matches the filter or
-   * throw `PrismaKnownClientError` with `P2025` code if no matches were found.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {VerificationTokenFindFirstOrThrowArgs} args - Arguments to find a VerificationToken
-   * @example
-   * // Get one VerificationToken
-   * const verificationToken = await prisma.verificationToken.findFirstOrThrow({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   */
-  findFirstOrThrow<T extends VerificationTokenFindFirstOrThrowArgs>(args?: Prisma.SelectSubset<T, VerificationTokenFindFirstOrThrowArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "findFirstOrThrow", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Find zero or more VerificationTokens that matches the filter.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {VerificationTokenFindManyArgs} args - Arguments to filter and select certain fields only.
-   * @example
-   * // Get all VerificationTokens
-   * const verificationTokens = await prisma.verificationToken.findMany()
-   * 
-   * // Get first 10 VerificationTokens
-   * const verificationTokens = await prisma.verificationToken.findMany({ take: 10 })
-   * 
-   * // Only select the `identifier`
-   * const verificationTokenWithIdentifierOnly = await prisma.verificationToken.findMany({ select: { identifier: true } })
-   * 
-   */
-  findMany<T extends VerificationTokenFindManyArgs>(args?: Prisma.SelectSubset<T, VerificationTokenFindManyArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "findMany", GlobalOmitOptions>>
-
-  /**
-   * Create a VerificationToken.
-   * @param {VerificationTokenCreateArgs} args - Arguments to create a VerificationToken.
-   * @example
-   * // Create one VerificationToken
-   * const VerificationToken = await prisma.verificationToken.create({
-   *   data: {
-   *     // ... data to create a VerificationToken
-   *   }
-   * })
-   * 
-   */
-  create<T extends VerificationTokenCreateArgs>(args: Prisma.SelectSubset<T, VerificationTokenCreateArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "create", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Create many VerificationTokens.
-   * @param {VerificationTokenCreateManyArgs} args - Arguments to create many VerificationTokens.
-   * @example
-   * // Create many VerificationTokens
-   * const verificationToken = await prisma.verificationToken.createMany({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   *     
-   */
-  createMany<T extends VerificationTokenCreateManyArgs>(args?: Prisma.SelectSubset<T, VerificationTokenCreateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Create many VerificationTokens and returns the data saved in the database.
-   * @param {VerificationTokenCreateManyAndReturnArgs} args - Arguments to create many VerificationTokens.
-   * @example
-   * // Create many VerificationTokens
-   * const verificationToken = await prisma.verificationToken.createManyAndReturn({
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Create many VerificationTokens and only return the `identifier`
-   * const verificationTokenWithIdentifierOnly = await prisma.verificationToken.createManyAndReturn({
-   *   select: { identifier: true },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  createManyAndReturn<T extends VerificationTokenCreateManyAndReturnArgs>(args?: Prisma.SelectSubset<T, VerificationTokenCreateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "createManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Delete a VerificationToken.
-   * @param {VerificationTokenDeleteArgs} args - Arguments to delete one VerificationToken.
-   * @example
-   * // Delete one VerificationToken
-   * const VerificationToken = await prisma.verificationToken.delete({
-   *   where: {
-   *     // ... filter to delete one VerificationToken
-   *   }
-   * })
-   * 
-   */
-  delete<T extends VerificationTokenDeleteArgs>(args: Prisma.SelectSubset<T, VerificationTokenDeleteArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "delete", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Update one VerificationToken.
-   * @param {VerificationTokenUpdateArgs} args - Arguments to update one VerificationToken.
-   * @example
-   * // Update one VerificationToken
-   * const verificationToken = await prisma.verificationToken.update({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  update<T extends VerificationTokenUpdateArgs>(args: Prisma.SelectSubset<T, VerificationTokenUpdateArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "update", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-  /**
-   * Delete zero or more VerificationTokens.
-   * @param {VerificationTokenDeleteManyArgs} args - Arguments to filter VerificationTokens to delete.
-   * @example
-   * // Delete a few VerificationTokens
-   * const { count } = await prisma.verificationToken.deleteMany({
-   *   where: {
-   *     // ... provide filter here
-   *   }
-   * })
-   * 
-   */
-  deleteMany<T extends VerificationTokenDeleteManyArgs>(args?: Prisma.SelectSubset<T, VerificationTokenDeleteManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more VerificationTokens.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {VerificationTokenUpdateManyArgs} args - Arguments to update one or more rows.
-   * @example
-   * // Update many VerificationTokens
-   * const verificationToken = await prisma.verificationToken.updateMany({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: {
-   *     // ... provide data here
-   *   }
-   * })
-   * 
-   */
-  updateMany<T extends VerificationTokenUpdateManyArgs>(args: Prisma.SelectSubset<T, VerificationTokenUpdateManyArgs<ExtArgs>>): Prisma.PrismaPromise<Prisma.BatchPayload>
-
-  /**
-   * Update zero or more VerificationTokens and returns the data updated in the database.
-   * @param {VerificationTokenUpdateManyAndReturnArgs} args - Arguments to update many VerificationTokens.
-   * @example
-   * // Update many VerificationTokens
-   * const verificationToken = await prisma.verificationToken.updateManyAndReturn({
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * 
-   * // Update zero or more VerificationTokens and only return the `identifier`
-   * const verificationTokenWithIdentifierOnly = await prisma.verificationToken.updateManyAndReturn({
-   *   select: { identifier: true },
-   *   where: {
-   *     // ... provide filter here
-   *   },
-   *   data: [
-   *     // ... provide data here
-   *   ]
-   * })
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * 
-   */
-  updateManyAndReturn<T extends VerificationTokenUpdateManyAndReturnArgs>(args: Prisma.SelectSubset<T, VerificationTokenUpdateManyAndReturnArgs<ExtArgs>>): Prisma.PrismaPromise<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "updateManyAndReturn", GlobalOmitOptions>>
-
-  /**
-   * Create or update one VerificationToken.
-   * @param {VerificationTokenUpsertArgs} args - Arguments to update or create a VerificationToken.
-   * @example
-   * // Update or create a VerificationToken
-   * const verificationToken = await prisma.verificationToken.upsert({
-   *   create: {
-   *     // ... data to create a VerificationToken
-   *   },
-   *   update: {
-   *     // ... in case it already exists, update
-   *   },
-   *   where: {
-   *     // ... the filter for the VerificationToken we want to update
-   *   }
-   * })
-   */
-  upsert<T extends VerificationTokenUpsertArgs>(args: Prisma.SelectSubset<T, VerificationTokenUpsertArgs<ExtArgs>>): Prisma.Prisma__VerificationTokenClient<runtime.Types.Result.GetResult<Prisma.$VerificationTokenPayload<ExtArgs>, T, "upsert", GlobalOmitOptions>, never, ExtArgs, GlobalOmitOptions>
-
-
-  /**
-   * Count the number of VerificationTokens.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {VerificationTokenCountArgs} args - Arguments to filter VerificationTokens to count.
-   * @example
-   * // Count the number of VerificationTokens
-   * const count = await prisma.verificationToken.count({
-   *   where: {
-   *     // ... the filter for the VerificationTokens we want to count
-   *   }
-   * })
-  **/
-  count<T extends VerificationTokenCountArgs>(
-    args?: Prisma.Subset<T, VerificationTokenCountArgs>,
-  ): Prisma.PrismaPromise<
-    T extends runtime.Types.Utils.Record<'select', any>
-      ? T['select'] extends true
-        ? number
-        : Prisma.GetScalarType<T['select'], VerificationTokenCountAggregateOutputType>
-      : number
-  >
-
-  /**
-   * Allows you to perform aggregations operations on a VerificationToken.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {VerificationTokenAggregateArgs} args - Select which aggregations you would like to apply and on what fields.
-   * @example
-   * // Ordered by age ascending
-   * // Where email contains prisma.io
-   * // Limited to the 10 users
-   * const aggregations = await prisma.user.aggregate({
-   *   _avg: {
-   *     age: true,
-   *   },
-   *   where: {
-   *     email: {
-   *       contains: "prisma.io",
-   *     },
-   *   },
-   *   orderBy: {
-   *     age: "asc",
-   *   },
-   *   take: 10,
-   * })
-  **/
-  aggregate<T extends VerificationTokenAggregateArgs>(args: Prisma.Subset<T, VerificationTokenAggregateArgs>): Prisma.PrismaPromise<GetVerificationTokenAggregateType<T>>
-
-  /**
-   * Group by VerificationToken.
-   * Note, that providing `undefined` is treated as the value not being there.
-   * Read more here: https://pris.ly/d/null-undefined
-   * @param {VerificationTokenGroupByArgs} args - Group by arguments.
-   * @example
-   * // Group by city, order by createdAt, get count
-   * const result = await prisma.user.groupBy({
-   *   by: ['city', 'createdAt'],
-   *   orderBy: {
-   *     createdAt: true
-   *   },
-   *   _count: {
-   *     _all: true
-   *   },
-   * })
-   * 
-  **/
-  groupBy<
-    T extends VerificationTokenGroupByArgs,
-    HasSelectOrTake extends Prisma.Or<
-      Prisma.Extends<'skip', Prisma.Keys<T>>,
-      Prisma.Extends<'take', Prisma.Keys<T>>
-    >,
-    OrderByArg extends Prisma.True extends HasSelectOrTake
-      ? { orderBy: VerificationTokenGroupByArgs['orderBy'] }
-      : { orderBy?: VerificationTokenGroupByArgs['orderBy'] },
-    OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
-    ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
-    ByValid extends Prisma.Has<ByFields, OrderFields>,
-    HavingFields extends Prisma.GetHavingFields<T['having']>,
-    HavingValid extends Prisma.Has<ByFields, HavingFields>,
-    ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
-    InputErrors extends ByEmpty extends Prisma.True
-    ? `Error: "by" must not be empty.`
-    : HavingValid extends Prisma.False
-    ? {
-        [P in HavingFields]: P extends ByFields
-          ? never
-          : P extends string
-          ? `Error: Field "${P}" used in "having" needs to be provided in "by".`
-          : [
-              Error,
-              'Field ',
-              P,
-              ` in "having" needs to be provided in "by"`,
-            ]
-      }[HavingFields]
-    : 'take' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "take", you also need to provide "orderBy"'
-    : 'skip' extends Prisma.Keys<T>
-    ? 'orderBy' extends Prisma.Keys<T>
-      ? ByValid extends Prisma.True
-        ? {}
-        : {
-            [P in OrderFields]: P extends ByFields
-              ? never
-              : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-          }[OrderFields]
-      : 'Error: If you provide "skip", you also need to provide "orderBy"'
-    : ByValid extends Prisma.True
-    ? {}
-    : {
-        [P in OrderFields]: P extends ByFields
-          ? never
-          : `Error: Field "${P}" in "orderBy" needs to be provided in "by"`
-      }[OrderFields]
-  >(args: Prisma.SubsetIntersection<T, VerificationTokenGroupByArgs, OrderByArg> & InputErrors): {} extends InputErrors ? GetVerificationTokenGroupByPayload<T> : Prisma.PrismaPromise<InputErrors>
-/**
- * Fields of the VerificationToken model
- */
-readonly fields: VerificationTokenFieldRefs;
-}
-
-/**
- * The delegate class that acts as a "Promise-like" for VerificationToken.
- * Why is this prefixed with `Prisma__`?
- * Because we want to prevent naming conflicts as mentioned in
- * https://github.com/prisma/prisma-client-js/issues/707
- */
-export interface Prisma__VerificationTokenClient<T, Null = never, ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs, GlobalOmitOptions = {}> extends Prisma.PrismaPromise<T> {
-  readonly [Symbol.toStringTag]: "PrismaPromise"
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of which ever callback is executed.
-   */
-  then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): runtime.Types.Utils.JsPromise<TResult1 | TResult2>
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @returns A Promise for the completion of the callback.
-   */
-  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): runtime.Types.Utils.JsPromise<T | TResult>
-  /**
-   * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
-   * resolved value cannot be modified from the callback.
-   * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
-   * @returns A Promise for the completion of the callback.
-   */
-  finally(onfinally?: (() => void) | undefined | null): runtime.Types.Utils.JsPromise<T>
-}
-
-
-
-
-/**
- * Fields of the VerificationToken model
- */
-export interface VerificationTokenFieldRefs {
-  readonly identifier: Prisma.FieldRef<"VerificationToken", 'String'>
-  readonly token: Prisma.FieldRef<"VerificationToken", 'String'>
-  readonly expires: Prisma.FieldRef<"VerificationToken", 'DateTime'>
-}
-    
-
-// Custom InputTypes
-/**
- * VerificationToken findUnique
- */
-export type VerificationTokenFindUniqueArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which VerificationToken to fetch.
-   */
-  where: Prisma.VerificationTokenWhereUniqueInput
-}
-
-/**
- * VerificationToken findUniqueOrThrow
- */
-export type VerificationTokenFindUniqueOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which VerificationToken to fetch.
-   */
-  where: Prisma.VerificationTokenWhereUniqueInput
-}
-
-/**
- * VerificationToken findFirst
- */
-export type VerificationTokenFindFirstArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which VerificationToken to fetch.
-   */
-  where?: Prisma.VerificationTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of VerificationTokens to fetch.
-   */
-  orderBy?: Prisma.VerificationTokenOrderByWithRelationInput | Prisma.VerificationTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for VerificationTokens.
-   */
-  cursor?: Prisma.VerificationTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` VerificationTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` VerificationTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of VerificationTokens.
-   */
-  distinct?: Prisma.VerificationTokenScalarFieldEnum | Prisma.VerificationTokenScalarFieldEnum[]
-}
-
-/**
- * VerificationToken findFirstOrThrow
- */
-export type VerificationTokenFindFirstOrThrowArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which VerificationToken to fetch.
-   */
-  where?: Prisma.VerificationTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of VerificationTokens to fetch.
-   */
-  orderBy?: Prisma.VerificationTokenOrderByWithRelationInput | Prisma.VerificationTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for searching for VerificationTokens.
-   */
-  cursor?: Prisma.VerificationTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` VerificationTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` VerificationTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of VerificationTokens.
-   */
-  distinct?: Prisma.VerificationTokenScalarFieldEnum | Prisma.VerificationTokenScalarFieldEnum[]
-}
-
-/**
- * VerificationToken findMany
- */
-export type VerificationTokenFindManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * Filter, which VerificationTokens to fetch.
-   */
-  where?: Prisma.VerificationTokenWhereInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/sorting Sorting Docs}
-   * 
-   * Determine the order of VerificationTokens to fetch.
-   */
-  orderBy?: Prisma.VerificationTokenOrderByWithRelationInput | Prisma.VerificationTokenOrderByWithRelationInput[]
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination#cursor-based-pagination Cursor Docs}
-   * 
-   * Sets the position for listing VerificationTokens.
-   */
-  cursor?: Prisma.VerificationTokenWhereUniqueInput
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Take `±n` VerificationTokens from the position of the cursor.
-   */
-  take?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/pagination Pagination Docs}
-   * 
-   * Skip the first `n` VerificationTokens.
-   */
-  skip?: number
-  /**
-   * {@link https://www.prisma.io/docs/concepts/components/prisma-client/distinct Distinct Docs}
-   * 
-   * Filter by unique combinations of VerificationTokens.
-   */
-  distinct?: Prisma.VerificationTokenScalarFieldEnum | Prisma.VerificationTokenScalarFieldEnum[]
-}
-
-/**
- * VerificationToken create
- */
-export type VerificationTokenCreateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * The data needed to create a VerificationToken.
-   */
-  data: Prisma.XOR<Prisma.VerificationTokenCreateInput, Prisma.VerificationTokenUncheckedCreateInput>
-}
-
-/**
- * VerificationToken createMany
- */
-export type VerificationTokenCreateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to create many VerificationTokens.
-   */
-  data: Prisma.VerificationTokenCreateManyInput | Prisma.VerificationTokenCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * VerificationToken createManyAndReturn
- */
-export type VerificationTokenCreateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelectCreateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * The data used to create many VerificationTokens.
-   */
-  data: Prisma.VerificationTokenCreateManyInput | Prisma.VerificationTokenCreateManyInput[]
-  skipDuplicates?: boolean
-}
-
-/**
- * VerificationToken update
- */
-export type VerificationTokenUpdateArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * The data needed to update a VerificationToken.
-   */
-  data: Prisma.XOR<Prisma.VerificationTokenUpdateInput, Prisma.VerificationTokenUncheckedUpdateInput>
-  /**
-   * Choose, which VerificationToken to update.
-   */
-  where: Prisma.VerificationTokenWhereUniqueInput
-}
-
-/**
- * VerificationToken updateMany
- */
-export type VerificationTokenUpdateManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * The data used to update VerificationTokens.
-   */
-  data: Prisma.XOR<Prisma.VerificationTokenUpdateManyMutationInput, Prisma.VerificationTokenUncheckedUpdateManyInput>
-  /**
-   * Filter which VerificationTokens to update
-   */
-  where?: Prisma.VerificationTokenWhereInput
-  /**
-   * Limit how many VerificationTokens to update.
-   */
-  limit?: number
-}
-
-/**
- * VerificationToken updateManyAndReturn
- */
-export type VerificationTokenUpdateManyAndReturnArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelectUpdateManyAndReturn<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * The data used to update VerificationTokens.
-   */
-  data: Prisma.XOR<Prisma.VerificationTokenUpdateManyMutationInput, Prisma.VerificationTokenUncheckedUpdateManyInput>
-  /**
-   * Filter which VerificationTokens to update
-   */
-  where?: Prisma.VerificationTokenWhereInput
-  /**
-   * Limit how many VerificationTokens to update.
-   */
-  limit?: number
-}
-
-/**
- * VerificationToken upsert
- */
-export type VerificationTokenUpsertArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * The filter to search for the VerificationToken to update in case it exists.
-   */
-  where: Prisma.VerificationTokenWhereUniqueInput
-  /**
-   * In case the VerificationToken found by the `where` argument doesn't exist, create a new VerificationToken with this data.
-   */
-  create: Prisma.XOR<Prisma.VerificationTokenCreateInput, Prisma.VerificationTokenUncheckedCreateInput>
-  /**
-   * In case the VerificationToken was found with the provided `where` argument, update it with this data.
-   */
-  update: Prisma.XOR<Prisma.VerificationTokenUpdateInput, Prisma.VerificationTokenUncheckedUpdateInput>
-}
-
-/**
- * VerificationToken delete
- */
-export type VerificationTokenDeleteArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-  /**
-   * Filter which VerificationToken to delete.
-   */
-  where: Prisma.VerificationTokenWhereUniqueInput
-}
-
-/**
- * VerificationToken deleteMany
- */
-export type VerificationTokenDeleteManyArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Filter which VerificationTokens to delete
-   */
-  where?: Prisma.VerificationTokenWhereInput
-  /**
-   * Limit how many VerificationTokens to delete.
-   */
-  limit?: number
-}
-
-/**
- * VerificationToken without action
- */
-export type VerificationTokenDefaultArgs<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
-  /**
-   * Select specific fields to fetch from the VerificationToken
-   */
-  select?: Prisma.VerificationTokenSelect<ExtArgs> | null
-  /**
-   * Omit specific fields from the VerificationToken
-   */
-  omit?: Prisma.VerificationTokenOmit<ExtArgs> | null
-}
diff --git a/src/lib/api-client.ts b/src/lib/api-client.ts
new file mode 100644
index 00000000..e9ab82d6
--- /dev/null
+++ b/src/lib/api-client.ts
@@ -0,0 +1,69 @@
+/**
+ * Shared HTTP client used by both the SWR fetcher (`fetcher.ts`) and the explicit
+ * request helpers (`utils/requests.ts`).
+ *
+ * Handles two environments:
+ *  - Web: relative URLs hit Next.js routes; cookies do the auth.
+ *  - Tauri desktop: rewrites relative URLs against `NEXT_PUBLIC_API_URL`, attaches
+ *    the cached desktop JWE in `Authorization: Bearer …`, and tags the request
+ *    with `x-client-type: desktop`.
+ */
+
+import { isTauri } from "@tauri-apps/api/core";
+
+const DEFAULT_DESKTOP_API_BASE = "http://localhost:3000";
+
+function resolveUrl(input: RequestInfo): string {
+    const url = typeof input === "string" ? input : input.url;
+    if (!isTauri() || url.startsWith("http")) return url;
+    const base = process.env.NEXT_PUBLIC_API_URL || DEFAULT_DESKTOP_API_BASE;
+    return `${base}${url}`;
+}
+
+async function buildHeaders(initHeaders?: HeadersInit): Promise<Record<string, string>> {
+    const headers: Record<string, string> = { "Content-Type": "application/json" };
+    if (initHeaders) Object.assign(headers, initHeaders as Record<string, string>);
+
+    if (isTauri()) {
+        headers["x-client-type"] = "desktop";
+        const { getDesktopToken } = await import("./desktop-auth");
+        const token = await getDesktopToken();
+        if (token) headers["Authorization"] = `Bearer ${token}`;
+    }
+    return headers;
+}
+
+/**
+ * Issue an authenticated API request and return the raw `Response`.
+ * Callers decide what to do with the body and status.
+ */
+export async function apiFetch(input: RequestInfo, init?: RequestInit): Promise<Response> {
+    const headers = await buildHeaders(init?.headers);
+    return fetch(resolveUrl(input), { ...init, headers });
+}
+
+/**
+ * Issue an authenticated API request, parse the JSON envelope, and return the
+ * `data` field. Throws a structured error on non-2xx responses so SWR can react.
+ *
+ * The desktop variant additionally short-circuits when no token is cached — the
+ * caller falls back to local storage rather than firing a doomed network request.
+ */
+export async function apiFetchJson<T = unknown>(input: RequestInfo, init?: RequestInit): Promise<T> {
+    if (isTauri()) {
+        const { getDesktopToken } = await import("./desktop-auth");
+        const token = await getDesktopToken();
+        if (!token) throw { message: "Not authenticated", status: 401 };
+    }
+
+    let response: Response;
+    try {
+        response = await apiFetch(input, init);
+    } catch {
+        throw { message: "Server unreachable", status: 0, isNetworkError: true };
+    }
+
+    const json = (await response.json()) as { data?: T; message?: string; status?: number };
+    if (response.ok) return json.data as T;
+    throw { ...json, status: response.status };
+}
diff --git a/src/lib/auth-cookies.ts b/src/lib/auth-cookies.ts
deleted file mode 100644
index a3cfea9c..00000000
--- a/src/lib/auth-cookies.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Centralized cookie + salt helpers for the auth surface.
- *
- * All sites that encode or decode NextAuth JWEs MUST import from here so the
- * salts stay in lockstep across flows.
- *
- * Two salts are in play:
- *
- *  - **Web cookie salt**: Auth.js uses the cookie *name* as the JWE salt by
- *    default. The name differs by environment ("__Secure-authjs.session-token"
- *    on HTTPS, "authjs.session-token" otherwise). Use `getWebSessionCookie()`
- *    and pass `name` as both the cookie name and the JWE salt — anything else
- *    and Auth.js's middleware (`getToken`) and `auth()` cannot decrypt the
- *    cookie we just set.
- *
- *  - **Desktop bearer salt**: a single constant (`DESKTOP_BEARER_SALT`) shared
- *    by the encoder (api/desktop/token, api/auth/magic-link/verify) and the
- *    decoder (lib/session.ts). Changing it invalidates every Tauri-side bearer
- *    token in circulation, so any rotation needs a forced sign-out.
- */
-
-export const DESKTOP_BEARER_SALT = "authjs.session-token";
-
-export function getWebSessionCookie(): { name: string; secure: boolean } {
-    const useSecure =
-        process.env.NEXTAUTH_URL?.startsWith("https://") === true ||
-        process.env.AUTH_URL?.startsWith("https://") === true ||
-        process.env.NODE_ENV === "production";
-    return {
-        name: useSecure ? "__Secure-authjs.session-token" : "authjs.session-token",
-        secure: useSecure,
-    };
-}
diff --git a/src/lib/auth-tokens.ts b/src/lib/auth-tokens.ts
new file mode 100644
index 00000000..d1a67b8a
--- /dev/null
+++ b/src/lib/auth-tokens.ts
@@ -0,0 +1,71 @@
+/**
+ * Centralized auth-token plumbing.
+ *
+ * Every site that mints or verifies an Auth.js JWE in this app routes through
+ * here so the salts, cookie names, and TTLs stay in lockstep across flows.
+ *
+ * Two token formats are in play:
+ *
+ *  - **Web session cookie** — read by Auth.js's own `auth()`/`getToken()`. Auth.js
+ *    uses the cookie *name* as the JWE salt by default, and the name varies by
+ *    environment (`__Secure-authjs.session-token` on HTTPS,
+ *    `authjs.session-token` otherwise). `encodeWebSessionCookie()` returns the
+ *    JWE alongside the name/secure flag so callers can set the cookie.
+ *
+ *  - **Desktop bearer** — sent by Tauri clients in `Authorization: Bearer <jwe>`.
+ *    Always salted with `DESKTOP_BEARER_SALT`. Rotating the salt invalidates
+ *    every desktop token in circulation.
+ */
+
+import { encode } from "next-auth/jwt";
+
+export const DESKTOP_BEARER_SALT = "authjs.session-token";
+
+// Mirrors auth.ts session.maxAge — keep in sync with the JWT session TTL there.
+export const SESSION_TTL_SECONDS = 30 * 24 * 60 * 60;
+
+export type EncodedTokenPayload = {
+    id: string;
+    email: string;
+    role: string;
+    createdAt: string;
+};
+
+export function getWebSessionCookie(): { name: string; secure: boolean } {
+    const useSecure =
+        process.env.NEXTAUTH_URL?.startsWith("https://") === true ||
+        process.env.AUTH_URL?.startsWith("https://") === true ||
+        process.env.NODE_ENV === "production";
+    return {
+        name: useSecure ? "__Secure-authjs.session-token" : "authjs.session-token",
+        secure: useSecure,
+    };
+}
+
+function getSecret(): string {
+    const secret = process.env.AUTH_SECRET;
+    if (!secret) throw new Error("Server is missing AUTH_SECRET");
+    return secret;
+}
+
+export async function encodeDesktopBearer(payload: EncodedTokenPayload): Promise<string> {
+    return encode({
+        token: payload,
+        secret: getSecret(),
+        salt: DESKTOP_BEARER_SALT,
+        maxAge: SESSION_TTL_SECONDS,
+    });
+}
+
+export async function encodeWebSessionCookie(
+    payload: EncodedTokenPayload,
+): Promise<{ jwe: string; name: string; secure: boolean }> {
+    const { name, secure } = getWebSessionCookie();
+    const jwe = await encode({
+        token: payload,
+        secret: getSecret(),
+        salt: name,
+        maxAge: SESSION_TTL_SECONDS,
+    });
+    return { jwe, name, secure };
+}
diff --git a/src/lib/fetcher.ts b/src/lib/fetcher.ts
index e186ae9f..a2efecd8 100644
--- a/src/lib/fetcher.ts
+++ b/src/lib/fetcher.ts
@@ -1,95 +1,13 @@
-import { isTauri } from "@tauri-apps/api/core";
-import { getDesktopToken } from "./desktop-auth";
+import { apiFetchJson } from "./api-client";
 
 /**
- * The base URL for the API when running in desktop mode.
- * Set this environment variable to your hosted API server URL.
+ * Universal SWR fetcher. Returns the `data` field of the API envelope.
+ * On Tauri, throws `{ status: 401 }` if no desktop token is cached so SWR keys
+ * fall back to local SQLite storage instead of hitting an unauthenticated API.
  */
-const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || "";
-
-/**
- * Fetcher for desktop environment - calls remote API with JWT auth.
- * Desktop app connects to your hosted API server with JWT in Authorization header.
- *
- * Note: Magic-link auth requests don't use this fetcher - they make direct fetch calls.
- * This fetcher is used by SWR for authenticated data fetching.
- */
-async function fetchFromDesktop<JSON = unknown>(
-    input: RequestInfo,
-    init?: RequestInit,
-): Promise<JSON> {
-    const token = await getDesktopToken();
-
-    // No token = not logged in. Skip the remote request entirely.
-    // The app will fall back to local SQLite storage via useCachedProjects().
-    if (!token) {
-        throw { message: "Not authenticated", status: 401 };
-    }
-
-    const url = typeof input === "string" ? input : input.url;
-    const fullUrl = url.startsWith("http") ? url : `${API_BASE_URL}${url}`;
-
-    const headers: Record<string, string> = {
-        "Content-Type": "application/json",
-        "x-client-type": "desktop",
-        Authorization: `Bearer ${token}`,
-    };
-
-    if (init?.headers) {
-        Object.assign(headers, init.headers as Record<string, string>);
-    }
-
-    let response: Response;
-    try {
-        response = await fetch(fullUrl, {
-            ...init,
-            headers,
-        });
-    } catch {
-        // Network error (server unreachable) - throw structured error so SWR won't retry
-        throw { message: "Server unreachable", status: 0, isNetworkError: true };
-    }
-
-    const data = await response.json() as { data?: JSON; message?: string; status?: number };
-
-    if (response.ok) {
-        return data.data as JSON;
-    }
-
-    const error = { ...data, status: response.status };
-    throw error;
-}
-
-/**
- * Fetcher for web environment - calls Next.js API routes with cookies
- */
-async function fetchFromBrowser<JSON = unknown>(
-    input: RequestInfo,
-    init?: RequestInit,
-): Promise<JSON> {
-    const response = await fetch(input, init);
-    const data = await response.json() as { data?: JSON; message?: string; status?: number };
-
-    if (response.ok) {
-        return data.data as JSON;
-    }
-
-    // Include status code in the error for SWR's shouldRetryOnError
-    const error = { ...data, status: response.status };
-    throw error;
-}
-
-/**
- * Universal fetcher that routes based on environment:
- * - Desktop (Tauri): Calls remote API with JWT in Authorization header
- * - Web: Calls local Next.js API routes with cookies
- */
-export default async function fetcher<JSON = unknown>(
+export default function fetcher<JSON = unknown>(
     input: RequestInfo,
     init?: RequestInit,
 ): Promise<JSON> {
-    if (isTauri()) {
-        return fetchFromDesktop<JSON>(input, init);
-    }
-    return fetchFromBrowser<JSON>(input, init);
+    return apiFetchJson<JSON>(input, init);
 }
diff --git a/src/lib/session.ts b/src/lib/session.ts
index 80c2da5a..98bbe169 100644
--- a/src/lib/session.ts
+++ b/src/lib/session.ts
@@ -3,7 +3,7 @@ import { headers } from "next/headers";
 import { decode } from "next-auth/jwt";
 import { UserRole } from "../generated/client/client";
 import { auth } from "@src/auth";
-import { DESKTOP_BEARER_SALT } from "@src/lib/auth-cookies";
+import { DESKTOP_BEARER_SALT } from "@src/lib/auth-tokens";
 
 /**
  * Resolve the current user from either:
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index 48b1d9cd..4b709b3e 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -7,49 +7,17 @@ import {
     RequestMagicLinkBody,
     UpdateUserBody,
 } from "./api-bodies";
-import { isTauri } from "@tauri-apps/api/core";
+import { apiFetch } from "@src/lib/api-client";
 
 type RESTMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
 
-const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || "";
-
-const request = async (url: string, method: RESTMethod, body?: object) => {
-    const json = JSON.stringify(body);
-    const headers: Record<string, string> = { "Content-Type": "application/json" };
-
-    // In desktop mode, add client type header and use full API URL
-    let fullUrl = url;
-    if (isTauri()) {
-        headers["x-client-type"] = "desktop";
-        
-        const base = API_BASE_URL || "http://localhost:3000";
-        fullUrl = url.startsWith("http") ? url : `${base}${url}`;
-
-        // Add auth token if available (dynamic import to avoid SSR issues)
-        const { getDesktopToken } = await import("@src/lib/desktop-auth");
-        const token = await getDesktopToken();
-        if (token) {
-            headers["Authorization"] = `Bearer ${token}`;
-        }
-    }
-
-    return fetch(fullUrl, {
-        headers,
+const request = (url: string, method: RESTMethod, body?: object): Promise<Response> => {
+    return apiFetch(url, {
         method,
-        body: json,
+        body: body !== undefined ? JSON.stringify(body) : undefined,
     });
 };
 
-/**
- * Converts a WebSocket URL (ws:// or wss://) to an HTTP URL (http:// or https://).
- * Useful for calling REST endpoints on the collaboration Worker.
- */
-export function getCollabHttpUrl(path: string): string {
-    const baseUrl = process.env.NEXT_PUBLIC_COLLAB_WEBSOCKET_URL || "";
-    const httpUrl = baseUrl.replace(/^ws/, "http");
-    return `${httpUrl}${path}`;
-}
-
 /* Projects */
 
 export const getCloudToken = async (projectId: string): Promise<{ token: string | null; status: number }> => {
@@ -174,4 +142,3 @@ export const verifyApplePurchase = async (jwsTransaction: string): Promise<boole
     const res = await request("/api/apple/verify", "POST", { jwsTransaction });
     return res.ok;
 };
-
diff --git a/src/proxy.ts b/src/proxy.ts
index f9635ab9..0014140e 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -1,6 +1,7 @@
-import { getToken } from "next-auth/jwt";
+import { decode, getToken, type JWT } from "next-auth/jwt";
 import { NextRequest, NextResponse } from "next/server";
-import { getWebSessionCookie } from "@src/lib/auth-cookies";
+
+import { DESKTOP_BEARER_SALT, getWebSessionCookie } from "@src/lib/auth-tokens";
 
 // Routes that handle their own auth or are intentionally public
 const PUBLIC_API_PREFIXES = [
@@ -21,6 +22,38 @@ function isAdminPageRoute(pathname: string): boolean {
     return pathname === "/admin" || pathname.startsWith("/admin/");
 }
 
+/**
+ * Resolve the caller's identity from either:
+ *  - `Authorization: Bearer <jwe>` — desktop clients (Tauri). Encoded by
+ *    /api/desktop/token and /api/auth/magic-link/verify with `DESKTOP_BEARER_SALT`.
+ *  - The Auth.js session cookie — web clients. Cookie name and JWE salt vary by
+ *    environment and are centralized in `getWebSessionCookie()`.
+ *
+ * Returns null when no valid credential is present so the caller can decide
+ * whether to 401 (API) or redirect (admin page).
+ */
+async function resolveCaller(request: NextRequest): Promise<JWT | null> {
+    const secret = process.env.AUTH_SECRET;
+    if (!secret) return null;
+
+    const authHeader = request.headers.get("authorization");
+    if (authHeader?.startsWith("Bearer ")) {
+        try {
+            const decoded = await decode({
+                token: authHeader.slice(7),
+                secret,
+                salt: DESKTOP_BEARER_SALT,
+            });
+            return decoded?.id ? decoded : null;
+        } catch {
+            return null;
+        }
+    }
+
+    const { name: cookieName } = getWebSessionCookie();
+    return getToken({ req: request, secret, cookieName });
+}
+
 export async function proxy(request: NextRequest) {
     const { pathname } = request.nextUrl;
 
@@ -32,8 +65,7 @@ export async function proxy(request: NextRequest) {
         return NextResponse.next();
     }
 
-    const { name: cookieName } = getWebSessionCookie();
-    const token = await getToken({ req: request, secret: process.env.AUTH_SECRET, cookieName });
+    const token = await resolveCaller(request);
 
     // Admin pages: proxy only checks authentication.
     // Role enforcement happens in src/app/admin/layout.tsx via auth(), which runs the
@@ -61,7 +93,7 @@ export async function proxy(request: NextRequest) {
 
         const headers = new Headers(request.headers);
         headers.set("x-user-id", token.id as string);
-        headers.set("x-user-email", token.email as string);
+        headers.set("x-user-email", (token.email as string) ?? "");
         headers.set("x-user-created-at", (token.createdAt as string) ?? "0");
         headers.set("x-user-role", (token.role as string) ?? "USER");
         return NextResponse.next({ request: { headers } });

From b45970936cc1032739fc08e1424f15e8807adeb3 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 27 Apr 2026 22:42:51 +0200
Subject: [PATCH 25/76] added logging utility, refaxctored some auth-related
 files

---
 .../account/SubscriptionSettings.tsx          | 18 ++--
 src/app/api/apple/purchase/route.ts           | 99 +++++++++++++++++++
 src/app/api/apple/verify/route.ts             | 54 ----------
 src/app/api/desktop/token/route.ts            |  6 ++
 src/app/api/webhooks/apple/route.ts           | 60 ++++++++---
 src/lib/apple-jws.ts                          | 61 ++++++++++++
 src/lib/utils/logger.ts                       | 54 ++++++++++
 src/lib/utils/requests.ts                     |  4 +-
 src/server/service/transaction-service.ts     | 18 +++-
 9 files changed, 293 insertions(+), 81 deletions(-)
 create mode 100644 src/app/api/apple/purchase/route.ts
 delete mode 100644 src/app/api/apple/verify/route.ts
 create mode 100644 src/lib/apple-jws.ts
 create mode 100644 src/lib/utils/logger.ts

diff --git a/components/dashboard/account/SubscriptionSettings.tsx b/components/dashboard/account/SubscriptionSettings.tsx
index 72c77d1a..31dfc42a 100644
--- a/components/dashboard/account/SubscriptionSettings.tsx
+++ b/components/dashboard/account/SubscriptionSettings.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import { useTranslations } from "next-intl";
 import { ArrowRight, Check, Lock } from "lucide-react";
 import { isTauri } from "@tauri-apps/api/core";
-import { cancelStripeSubscription, createStripeCheckout, verifyApplePurchase } from "@src/lib/utils/requests";
+import { cancelStripeSubscription, createStripeCheckout, submitApplePurchase } from "@src/lib/utils/requests";
 import { useUser } from "@src/lib/utils/hooks";
 
 import styles from "./SubscriptionSettings.module.css";
@@ -27,12 +27,13 @@ const SubscriptionSettings = () => {
     const isApple = user?.subscriptionProvider === "APPLE";
     const expiryDate = user?.isProUntil ? new Date(user.isProUntil).toLocaleDateString() : "";
 
-    // Restore Apple purchases on mount to sync subscription state with the server
+    // Restore Apple purchases on mount to sync subscription state with the server.
     useEffect(() => {
         if (!isTauri() || !user?.id) return;
 
         let cancelled = false;
-        (async () => {
+
+        async function syncAppleSubscription() {
             try {
                 const { restorePurchases, PurchaseState } = await import("@choochmeque/tauri-plugin-iap-api");
                 const { purchases } = await restorePurchases("subs");
@@ -41,18 +42,17 @@ const SubscriptionSettings = () => {
                         && p.purchaseState === PurchaseState.PURCHASED
                         && p.jwsRepresentation,
                 );
-
                 if (cancelled) return;
-
                 if (active?.jwsRepresentation) {
-                    await verifyApplePurchase(active.jwsRepresentation);
+                    await submitApplePurchase(active.jwsRepresentation);
                     await mutate();
                 }
             } catch {
-                // Restore can fail if not signed into App Store — silently ignore
+                // Restore can fail if the user is not signed into the App Store — silently ignore.
             }
-        })();
+        }
 
+        syncAppleSubscription();
         return () => { cancelled = true; };
     }, [user?.id]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -72,7 +72,7 @@ const SubscriptionSettings = () => {
                     return;
                 }
 
-                const ok = await verifyApplePurchase(result.jwsRepresentation);
+                const ok = await submitApplePurchase(result.jwsRepresentation);
                 if (ok) {
                     await mutate();
                 } else {
diff --git a/src/app/api/apple/purchase/route.ts b/src/app/api/apple/purchase/route.ts
new file mode 100644
index 00000000..6c0fcf71
--- /dev/null
+++ b/src/app/api/apple/purchase/route.ts
@@ -0,0 +1,99 @@
+import { NextRequest } from "next/server";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { BodyFieldError, ForbiddenError, Success } from "@src/lib/utils/api-utils";
+import { verifyAppleJws, APPLE_BUNDLE_IDS, APPLE_PRODUCT_ID } from "@src/lib/apple-jws";
+import { logger } from "@src/lib/utils/logger";
+import * as UserService from "@src/server/service/user-service";
+import * as TransactionService from "@src/server/service/transaction-service";
+
+interface AppleTransactionPayload {
+    transactionId: string;
+    originalTransactionId: string;
+    bundleId: string;
+    productId: string;
+    purchaseDate: number;
+    expiresDate: number;
+    type: string;
+    appAccountToken?: string;
+}
+
+async function handleApplePurchase(req: NextRequest, { user }: AuthApiContext) {
+    const body = (await req.json().catch(() => ({}))) as Record<string, unknown>;
+    const jwsTransaction = body.jwsTransaction;
+    if (typeof jwsTransaction !== "string") {
+        throw new BodyFieldError("Missing jwsTransaction");
+    }
+
+    logger.debug("[Apple purchase] Verifying JWS", { userId: user.id });
+
+    const payload = await verifyAppleJws<AppleTransactionPayload>(jwsTransaction);
+
+    logger.debug("[Apple purchase] JWS verified", {
+        userId: user.id,
+        originalTransactionId: payload.originalTransactionId,
+        bundleId: payload.bundleId,
+        productId: payload.productId,
+    });
+
+    if (!APPLE_BUNDLE_IDS.includes(payload.bundleId)) {
+        logger.warn("[Apple purchase] Invalid bundle ID", { bundleId: payload.bundleId, userId: user.id });
+        throw new ForbiddenError("Invalid bundle ID");
+    }
+    if (payload.productId !== APPLE_PRODUCT_ID) {
+        logger.warn("[Apple purchase] Invalid product ID", { productId: payload.productId, userId: user.id });
+        throw new ForbiddenError("Invalid product ID");
+    }
+
+    // appAccountToken is the UUID embedded at purchase time (StoreKit's
+    // Product.purchase(options: .init(appAccountToken:))). If present it must
+    // match the caller so a receipt from one account can't be redeemed on another.
+    if (payload.appAccountToken && payload.appAccountToken !== user.id) {
+        logger.warn("[Apple purchase] appAccountToken mismatch", {
+            appAccountToken: payload.appAccountToken,
+            userId: user.id,
+        });
+        throw new ForbiddenError("Transaction does not belong to this account");
+    }
+
+    const expiresDate = new Date(payload.expiresDate);
+    if (expiresDate <= new Date()) {
+        logger.warn("[Apple purchase] Transaction already expired", {
+            originalTransactionId: payload.originalTransactionId,
+            expiresDate,
+            userId: user.id,
+        });
+        throw new ForbiddenError("Transaction already expired");
+    }
+
+    // Reject if this subscription is already claimed by a different user.
+    // Uses originalTransactionId so every renewal of the same subscription
+    // is anchored to the same record. This check MUST precede updateUserFromId
+    // so we never grant Pro before verifying ownership.
+    const existing = await TransactionService.findUserByTransactionId(payload.originalTransactionId);
+    if (existing && existing.userId !== user.id) {
+        logger.warn("[Apple purchase] Subscription already claimed by another user", {
+            originalTransactionId: payload.originalTransactionId,
+            claimingUserId: user.id,
+            existingUserId: existing.userId,
+        });
+        throw new ForbiddenError("Subscription is already linked to a different account");
+    }
+
+    await TransactionService.createTransactionIfNotExists(user.id, "APPLE", payload.originalTransactionId);
+
+    await UserService.updateUserFromId(user.id, {
+        isProUntil: expiresDate,
+        subscriptionProvider: "APPLE",
+        isSubscriptionCancelled: false,
+    });
+
+    logger.debug("[Apple purchase] Pro granted", {
+        userId: user.id,
+        originalTransactionId: payload.originalTransactionId,
+        expiresDate,
+    });
+
+    return Success(null);
+}
+
+export const POST = apiHandler(handleApplePurchase);
diff --git a/src/app/api/apple/verify/route.ts b/src/app/api/apple/verify/route.ts
deleted file mode 100644
index 3817569b..00000000
--- a/src/app/api/apple/verify/route.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { NextRequest } from "next/server";
-import { decodeJwt } from "jose";
-import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
-import { BodyFieldError, ForbiddenError, Success } from "@src/lib/utils/api-utils";
-import * as UserService from "@src/server/service/user-service";
-import * as TransactionService from "@src/server/service/transaction-service";
-
-const APPLE_PRODUCT_ID = "app.scriptio.pro.monthly";
-const APPLE_BUNDLE_IDS = ["app.scriptio", "app.scriptio.staging"];
-
-interface AppleTransactionPayload {
-    transactionId: string;
-    originalTransactionId: string;
-    bundleId: string;
-    productId: string;
-    purchaseDate: number;
-    expiresDate: number;
-    type: string;
-    appAccountToken?: string;
-}
-
-async function verifyApplePurchase(req: NextRequest, { user }: AuthApiContext) {
-    const body = (await req.json().catch(() => ({}))) as Record<string, unknown>;
-    const jwsTransaction = body.jwsTransaction;
-    if (typeof jwsTransaction !== "string") {
-        throw new BodyFieldError("Missing jwsTransaction");
-    }
-
-    const payload = decodeJwt(jwsTransaction) as unknown as AppleTransactionPayload;
-
-    if (!APPLE_BUNDLE_IDS.includes(payload.bundleId)) {
-        throw new ForbiddenError("Invalid bundle ID");
-    }
-    if (payload.productId !== APPLE_PRODUCT_ID) {
-        throw new ForbiddenError("Invalid product ID");
-    }
-
-    const expiresDate = new Date(payload.expiresDate);
-    if (expiresDate <= new Date()) {
-        throw new ForbiddenError("Transaction already expired");
-    }
-
-    await UserService.updateUserFromId(user.id, {
-        isProUntil: expiresDate,
-        subscriptionProvider: "APPLE",
-        isSubscriptionCancelled: false,
-    });
-
-    await TransactionService.createTransactionIfNotExists(user.id, "APPLE", payload.transactionId);
-
-    return Success(null);
-}
-
-export const POST = apiHandler(verifyApplePurchase);
diff --git a/src/app/api/desktop/token/route.ts b/src/app/api/desktop/token/route.ts
index 42e37799..5a6b7e71 100644
--- a/src/app/api/desktop/token/route.ts
+++ b/src/app/api/desktop/token/route.ts
@@ -6,6 +6,7 @@ import { apiHandler } from "@src/lib/utils/api-handler";
 import { ForbiddenError, Success, validate } from "@src/lib/utils/api-utils";
 import { putBridgeToken } from "@src/lib/desktop-bridge";
 import { encodeDesktopBearer } from "@src/lib/auth-tokens";
+import { logger } from "@src/lib/utils/logger";
 
 const BodySchema = z.object({
     nonce: z.string().min(16),
@@ -23,11 +24,14 @@ async function desktopTokenRoute(req: NextRequest) {
     const body = await req.json();
     const { nonce } = validate(BodySchema, body);
 
+    logger.debug("[Desktop token] Minting token for nonce", { nonce: nonce.slice(0, 8) + "…" });
+
     const session = await auth();
     const user = session?.user as
         | { id?: string; email?: string; createdAt?: Date | string; role?: string }
         | undefined;
     if (!user?.id) {
+        logger.warn("[Desktop token] No active session for token request");
         throw new ForbiddenError("Not authenticated");
     }
 
@@ -42,6 +46,8 @@ async function desktopTokenRoute(req: NextRequest) {
     });
 
     putBridgeToken(nonce, token);
+    logger.debug("[Desktop token] Token stowed in bridge", { userId: user.id });
+
     return Success(null);
 }
 
diff --git a/src/app/api/webhooks/apple/route.ts b/src/app/api/webhooks/apple/route.ts
index 39ee350b..182d3b88 100644
--- a/src/app/api/webhooks/apple/route.ts
+++ b/src/app/api/webhooks/apple/route.ts
@@ -1,5 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
-import { decodeJwt } from "jose";
+import { verifyAppleJws } from "@src/lib/apple-jws";
+import { logger } from "@src/lib/utils/logger";
 import * as UserService from "@src/server/service/user-service";
 import * as TransactionService from "@src/server/service/transaction-service";
 
@@ -14,6 +15,7 @@ interface AppleNotificationPayload {
 
 interface AppleTransactionInfo {
     transactionId: string;
+    originalTransactionId: string;
     bundleId: string;
     productId: string;
     purchaseDate: number;
@@ -27,12 +29,23 @@ interface AppleRenewalInfo {
 }
 
 async function findUser(transaction: AppleTransactionInfo): Promise<{ id: string } | null> {
+    // appAccountToken is the user ID set at purchase time via StoreKit's appAccountToken option.
     if (transaction.appAccountToken) {
         const user = await UserService.getUserFromId(transaction.appAccountToken);
-        if (user) return { id: user.id };
+        if (user) {
+            logger.debug("[Apple webhook] Resolved user via appAccountToken", { userId: user.id });
+            return { id: user.id };
+        }
+    }
+    // Fallback: look up via originalTransactionId, which is the stable anchor stored
+    // in the Transaction table during the initial /api/apple/purchase call.
+    const tx = await TransactionService.findUserByTransactionId(transaction.originalTransactionId);
+    if (tx) {
+        logger.debug("[Apple webhook] Resolved user via originalTransactionId", {
+            userId: tx.userId,
+            originalTransactionId: transaction.originalTransactionId,
+        });
     }
-    // Fallback: look up via the transaction stored during initial purchase verification
-    const tx = await TransactionService.findUserByTransactionId(transaction.transactionId);
     return tx ? { id: tx.userId } : null;
 }
 
@@ -42,15 +55,32 @@ export async function POST(req: NextRequest) {
         return NextResponse.json({ error: "Missing signedPayload" }, { status: 400 });
     }
 
-    const notification = decodeJwt(body.signedPayload) as unknown as AppleNotificationPayload;
-    const transaction = decodeJwt(notification.data.signedTransactionInfo) as unknown as AppleTransactionInfo;
-    const renewal = notification.data.signedRenewalInfo
-        ? (decodeJwt(notification.data.signedRenewalInfo) as unknown as AppleRenewalInfo)
-        : null;
+    let notification: AppleNotificationPayload;
+    let transaction: AppleTransactionInfo;
+    let renewal: AppleRenewalInfo | null = null;
+
+    try {
+        notification = await verifyAppleJws<AppleNotificationPayload>(body.signedPayload);
+        transaction = await verifyAppleJws<AppleTransactionInfo>(notification.data.signedTransactionInfo);
+        if (notification.data.signedRenewalInfo) {
+            renewal = await verifyAppleJws<AppleRenewalInfo>(notification.data.signedRenewalInfo);
+        }
+    } catch (err) {
+        logger.error("[Apple webhook] JWS verification failed", err);
+        return NextResponse.json({ error: "Invalid payload" }, { status: 400 });
+    }
+
+    logger.debug("[Apple webhook] Received notification", {
+        type: notification.notificationType,
+        subtype: notification.subtype,
+        originalTransactionId: transaction.originalTransactionId,
+    });
 
     const user = await findUser(transaction);
     if (!user) {
-        console.warn("[Apple webhook] No user found for transaction:", transaction.transactionId);
+        logger.warn("[Apple webhook] No user found for transaction", {
+            originalTransactionId: transaction.originalTransactionId,
+        });
         return NextResponse.json({ received: true });
     }
 
@@ -63,7 +93,8 @@ export async function POST(req: NextRequest) {
                 subscriptionProvider: "APPLE",
                 isSubscriptionCancelled: false,
             });
-            await TransactionService.createTransactionIfNotExists(user.id, "APPLE", transaction.transactionId);
+            await TransactionService.createTransactionIfNotExists(user.id, "APPLE", transaction.originalTransactionId);
+            logger.debug("[Apple webhook] Pro granted", { userId: user.id, expiresDate });
             break;
         }
 
@@ -74,14 +105,14 @@ export async function POST(req: NextRequest) {
                 subscriptionProvider: null,
                 isSubscriptionCancelled: false,
             });
+            logger.debug("[Apple webhook] Pro revoked", { userId: user.id, reason: notification.notificationType });
             break;
         }
 
         case "DID_CHANGE_RENEWAL_STATUS": {
             const autoRenewOff = renewal?.autoRenewStatus === 0;
-            await UserService.updateUserFromId(user.id, {
-                isSubscriptionCancelled: autoRenewOff,
-            });
+            await UserService.updateUserFromId(user.id, { isSubscriptionCancelled: autoRenewOff });
+            logger.debug("[Apple webhook] Renewal status changed", { userId: user.id, autoRenewOff });
             break;
         }
 
@@ -91,6 +122,7 @@ export async function POST(req: NextRequest) {
                 subscriptionProvider: null,
                 isSubscriptionCancelled: false,
             });
+            logger.debug("[Apple webhook] Pro refunded", { userId: user.id });
             break;
         }
     }
diff --git a/src/lib/apple-jws.ts b/src/lib/apple-jws.ts
new file mode 100644
index 00000000..8365b957
--- /dev/null
+++ b/src/lib/apple-jws.ts
@@ -0,0 +1,61 @@
+/**
+ * Apple StoreKit 2 JWS verification.
+ *
+ * Apple signs all transaction and notification payloads as compact JWS (ES256).
+ * The certificate chain is embedded in the `x5c` JOSE header; the root must
+ * match Apple Root CA G3 before we trust the leaf key that verifies the
+ * signature. Using `decodeJwt` alone (no verification) would allow anyone to
+ * forge receipts with arbitrary expiry dates.
+ */
+
+import { compactVerify, importX509 } from "jose";
+import { ForbiddenError } from "@src/lib/utils/api-utils";
+
+export const APPLE_BUNDLE_IDS = ["app.scriptio", "app.scriptio.staging"];
+export const APPLE_PRODUCT_ID = "app.scriptio.pro.monthly";
+
+// Apple Root CA G3 — the trust anchor for all App Store JWS certificates.
+// Source: https://www.apple.com/certificateauthority/ ("Apple Root CA - G3")
+const APPLE_ROOT_CA_G3 = `-----BEGIN CERTIFICATE-----
+MIICQzCCAcmgAwIBAgIILcX8iNLFS5UwCgYIKoZIzj0EAwMwZzEbMBkGA1UEAxMS
+QXBwbGUgUm9vdCBDQSAtIEczMSYwJAYDVQQLEx1BcHBsZSBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTETMBEGA1UEChMKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcN
+MTQwNDMwMTgxOTA2WhcNMzkwNDMwMTgxOTA2WjBnMRswGQYDVQQDExJBcHBsZSBS
+b290IENBIC0gRzMxJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5MRMwEQYDVQQKEwpBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzB2MBAGByqGSM49
+AgEGBSuBBAAiA2IABJjpLz1AcqTtkyJygnnkNkA0KiOmhDBlKAjnTNDCJ8SBRp2a
+WUBZ8Z8z6LgEcNAMNJOJLj5Y+Mrt4L3FYFqaOzjkzL2B6G5CiEF5W1GpMpBW5RE
+3bTqWR5IGFlS3v7VPqNjMGEwHQYDVR0OBBYEFLuw3qFYM4iapIqZ3r6sWibyVGkB
+MB8GA1UdIwQYMBaAFLuw3qFYM4iapIqZ3r6sWibyVGkBMA8GA1UdEwEB/wQFMAMB
+Af8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2gAMGUCMQCD6cHEFl4aXTQY
+2e3v9GwOAEZKuEi2ggmD6Ngi3AKU9G1vSqJwNHX7TLDL3TFWoA8CMHdpckGvN3C
+XdHNMfQ6z5M+4+oMikUdSh6dE9nBaSaA3o04fhXMXN4Y1aMB77MONA==
+-----END CERTIFICATE-----`;
+
+/**
+ * Verify an Apple StoreKit 2 JWS string and return its decoded payload.
+ *
+ * Validates the x5c certificate chain against Apple Root CA G3, then
+ * verifies the JWS signature using the leaf certificate's public key.
+ */
+export async function verifyAppleJws<T = unknown>(jws: string): Promise<T> {
+    const [headerB64] = jws.split(".");
+    const header = JSON.parse(Buffer.from(headerB64, "base64url").toString()) as {
+        x5c?: string[];
+    };
+
+    if (!header.x5c || header.x5c.length < 2) {
+        throw new ForbiddenError("Missing certificate chain in Apple JWS");
+    }
+
+    const leafCert = `-----BEGIN CERTIFICATE-----\n${header.x5c[0]}\n-----END CERTIFICATE-----`;
+    const rootCert = `-----BEGIN CERTIFICATE-----\n${header.x5c[header.x5c.length - 1]}\n-----END CERTIFICATE-----`;
+
+    if (rootCert.trim() !== APPLE_ROOT_CA_G3.trim()) {
+        throw new ForbiddenError("Apple JWS root certificate does not match Apple Root CA G3");
+    }
+
+    const publicKey = await importX509(leafCert, "ES256");
+    const { payload } = await compactVerify(jws, publicKey);
+    return JSON.parse(new TextDecoder().decode(payload)) as T;
+}
diff --git a/src/lib/utils/logger.ts b/src/lib/utils/logger.ts
new file mode 100644
index 00000000..5862baac
--- /dev/null
+++ b/src/lib/utils/logger.ts
@@ -0,0 +1,54 @@
+// 1. Define your levels
+enum LogLevel {
+    DEBUG = 0,
+    INFO = 1,
+    WARN = 2,
+    ERROR = 3,
+}
+
+class Logger {
+    private static instance: Logger;
+    private readonly currentLevel: LogLevel;
+
+    private constructor() {
+        const env = process.env.NODE_ENV || "production";
+
+        if (env === "development") {
+            this.currentLevel = LogLevel.DEBUG;
+        } else {
+            this.currentLevel = LogLevel.WARN;
+        }
+    }
+
+    public static getInstance(): Logger {
+        if (!Logger.instance) {
+            Logger.instance = new Logger();
+        }
+        return Logger.instance;
+    }
+
+    private log(level: LogLevel, message: string, ...args: unknown[]) {
+        if (level >= this.currentLevel) {
+            const timestamp = new Date().toISOString();
+            const label = LogLevel[level];
+            const method = level === LogLevel.ERROR ? "error" : level === LogLevel.WARN ? "warn" : "log";
+
+            console[method](`[${timestamp}] [${label}]: ${message}`, ...args);
+        }
+    }
+
+    debug(msg: string, ...args: unknown[]) {
+        this.log(LogLevel.DEBUG, msg, ...args);
+    }
+    info(msg: string, ...args: unknown[]) {
+        this.log(LogLevel.INFO, msg, ...args);
+    }
+    warn(msg: string, ...args: unknown[]) {
+        this.log(LogLevel.WARN, msg, ...args);
+    }
+    error(msg: string, ...args: unknown[]) {
+        this.log(LogLevel.ERROR, msg, ...args);
+    }
+}
+
+export const logger = Logger.getInstance();
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index 4b709b3e..ab9606c1 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -138,7 +138,7 @@ export const createStripeCheckout = async (): Promise<{ url: string } | null> =>
     return null;
 };
 
-export const verifyApplePurchase = async (jwsTransaction: string): Promise<boolean> => {
-    const res = await request("/api/apple/verify", "POST", { jwsTransaction });
+export const submitApplePurchase = async (jwsTransaction: string): Promise<boolean> => {
+    const res = await request("/api/apple/purchase", "POST", { jwsTransaction });
     return res.ok;
 };
diff --git a/src/server/service/transaction-service.ts b/src/server/service/transaction-service.ts
index 5df0863f..9abb44b6 100644
--- a/src/server/service/transaction-service.ts
+++ b/src/server/service/transaction-service.ts
@@ -1,22 +1,33 @@
 import { SubscriptionProvider } from "../../generated/client/client";
 import { TransactionRepository } from "../repository/transaction-repository";
+import { logger } from "@src/lib/utils/logger";
 
 const repository = new TransactionRepository();
 
 export const getTransactionsByUser = async (userId: string) => {
+    logger.debug("[TransactionService] Fetching transactions", { userId });
     return repository.fetchByUser(userId);
 };
 
 export const countTransactionsByUser = async (userId: string) => {
+    logger.debug("[TransactionService] Counting transactions", { userId });
     return repository.countByUser(userId);
 };
 
 export const countTransactionsSince = async (since: Date) => {
+    logger.debug("[TransactionService] Counting transactions since", { since });
     return repository.countSince(since);
 };
 
 export const findUserByTransactionId = async (transactionId: string) => {
-    return repository.findByTransactionId(transactionId);
+    logger.debug("[TransactionService] Looking up user by transactionId", { transactionId });
+    const result = await repository.findByTransactionId(transactionId);
+    if (result) {
+        logger.debug("[TransactionService] Found user for transaction", { transactionId, userId: result.userId });
+    } else {
+        logger.debug("[TransactionService] No user found for transaction", { transactionId });
+    }
+    return result;
 };
 
 export const createTransactionIfNotExists = async (
@@ -24,5 +35,8 @@ export const createTransactionIfNotExists = async (
     provider: SubscriptionProvider,
     transactionId: string,
 ) => {
-    return repository.createIfNotExists(userId, provider, transactionId);
+    logger.debug("[TransactionService] Creating transaction if not exists", { userId, provider, transactionId });
+    const result = await repository.createIfNotExists(userId, provider, transactionId);
+    logger.debug("[TransactionService] Transaction upserted", { id: result.id, transactionId });
+    return result;
 };

From 067c70b960bca501c09b46caa3eed46baf0afb8e Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Tue, 28 Apr 2026 01:51:04 +0200
Subject: [PATCH 26/76] tweaked apple IAP UX

---
 .../account/SubscriptionSettings.module.css   | 10 ++++
 .../account/SubscriptionSettings.tsx          | 33 +++++++++--
 components/projects/CreateProjectPage.tsx     |  4 +-
 messages/de.json                              |  6 +-
 messages/en.json                              |  6 +-
 messages/es.json                              |  6 +-
 messages/fr.json                              |  6 +-
 messages/ja.json                              |  6 +-
 messages/ko.json                              |  6 +-
 messages/pl.json                              |  6 +-
 messages/zh.json                              |  6 +-
 src/app/api/apple/subscription-owner/route.ts | 41 +++++++++++++
 src/app/api/apple/verify/route.ts             | 57 +++++++++++++++++++
 src/app/api/webhooks/stripe/route.ts          | 10 +---
 src/lib/import/import-project.ts              |  2 +-
 src/lib/utils/requests.ts                     | 10 +++-
 16 files changed, 183 insertions(+), 32 deletions(-)
 create mode 100644 src/app/api/apple/subscription-owner/route.ts
 create mode 100644 src/app/api/apple/verify/route.ts

diff --git a/components/dashboard/account/SubscriptionSettings.module.css b/components/dashboard/account/SubscriptionSettings.module.css
index 05722580..058d4329 100644
--- a/components/dashboard/account/SubscriptionSettings.module.css
+++ b/components/dashboard/account/SubscriptionSettings.module.css
@@ -170,6 +170,16 @@
     margin: 0;
 }
 
+.errorMessage {
+    font-size: 0.82rem;
+    color: var(--error);
+    padding: 8px 12px;
+    border-radius: 8px;
+    background: color-mix(in srgb, var(--error) 8%, transparent);
+    border: 1px solid color-mix(in srgb, var(--error) 20%, transparent);
+    margin: 0;
+}
+
 .upgradeBtn {
     display: flex;
     align-items: center;
diff --git a/components/dashboard/account/SubscriptionSettings.tsx b/components/dashboard/account/SubscriptionSettings.tsx
index 31dfc42a..5e5c0a86 100644
--- a/components/dashboard/account/SubscriptionSettings.tsx
+++ b/components/dashboard/account/SubscriptionSettings.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import { useTranslations } from "next-intl";
 import { ArrowRight, Check, Lock } from "lucide-react";
 import { isTauri } from "@tauri-apps/api/core";
-import { cancelStripeSubscription, createStripeCheckout, submitApplePurchase } from "@src/lib/utils/requests";
+import { cancelStripeSubscription, createStripeCheckout, getAppleSubscriptionOwner, submitApplePurchase } from "@src/lib/utils/requests";
 import { useUser } from "@src/lib/utils/hooks";
 
 import styles from "./SubscriptionSettings.module.css";
@@ -56,13 +56,22 @@ const SubscriptionSettings = () => {
         return () => { cancelled = true; };
     }, [user?.id]); // eslint-disable-line react-hooks/exhaustive-deps
 
+    const showOwnerError = async (jwsRepresentation: string) => {
+        const ownerEmail = await getAppleSubscriptionOwner(jwsRepresentation);
+        if (ownerEmail) {
+            setError(t("subscription.alreadyBoundTo", { email: ownerEmail }));
+        } else {
+            setError(t("subscription.alreadyBoundUnknown"));
+        }
+    };
+
     const handleUpgrade = async () => {
         setError(null);
         setUpgradeLoading(true);
 
         if (isTauri()) {
             try {
-                const { purchase, PurchaseState } = await import("@choochmeque/tauri-plugin-iap-api");
+                const { purchase, restorePurchases, PurchaseState } = await import("@choochmeque/tauri-plugin-iap-api");
                 const result = await purchase(APPLE_PRODUCT_ID, "subs", {
                     appAccountToken: user?.id,
                 });
@@ -76,9 +85,25 @@ const SubscriptionSettings = () => {
                 if (ok) {
                     await mutate();
                 } else {
-                    setError(t("subscription.purchaseError"));
+                    await showOwnerError(result.jwsRepresentation);
                 }
             } catch (err) {
+                // StoreKit may throw when the Apple ID already has an active subscription.
+                // Restore purchases to find the existing JWS and identify the linked account.
+                try {
+                    const { restorePurchases, PurchaseState } = await import("@choochmeque/tauri-plugin-iap-api");
+                    const { purchases } = await restorePurchases("subs");
+                    const existing = purchases.find(
+                        (p) => p.productId === APPLE_PRODUCT_ID
+                            && p.purchaseState === PurchaseState.PURCHASED
+                            && p.jwsRepresentation,
+                    );
+                    if (existing?.jwsRepresentation) {
+                        await showOwnerError(existing.jwsRepresentation);
+                        return;
+                    }
+                } catch { /* ignore */ }
+
                 console.error("[SubscriptionSettings] Apple IAP failed:", err);
                 setError(t("subscription.purchaseError"));
             } finally {
@@ -194,7 +219,7 @@ const SubscriptionSettings = () => {
                 </button>
             )}
 
-            {error && <p className={styles.cancelSuccess} style={{ color: "var(--error)" }}>{error}</p>}
+            {error && <p className={styles.errorMessage}>{error}</p>}
         </div>
     );
 };
diff --git a/components/projects/CreateProjectPage.tsx b/components/projects/CreateProjectPage.tsx
index edab4e63..90946933 100644
--- a/components/projects/CreateProjectPage.tsx
+++ b/components/projects/CreateProjectPage.tsx
@@ -62,7 +62,7 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
                         if (selectedFile) {
                             body.poster = await cropImageBase64(selectedFile, 686, 1016);
                         }
-                        const res = await createProject(user.id, body);
+                        const res = await createProject(body);
                         const json = (await res.json()) as ApiResponse<{ id: string }>;
                         if (res.ok && json.data) {
                             projectId = json.data.id;
@@ -104,7 +104,7 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
                 body.poster = await cropImageBase64(selectedFile, 686, 1016);
             }
 
-            const res = await createProject(user.id, body);
+            const res = await createProject(body);
             const json = (await res.json()) as ApiResponse<{ id: string }>;
             if (!res.ok || !json.data) {
                 setFormInfo({ content: json.message!, isError: true });
diff --git a/messages/de.json b/messages/de.json
index dce8e7f5..a0c0217d 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -148,7 +148,9 @@
       "purchasing": "Kauf wird durchgeführt...",
       "purchaseError": "Kauf fehlgeschlagen. Bitte erneut versuchen.",
       "cancelApple": "Apple-Abonnements werden über den App Store verwaltet.",
-      "manageApple": "App Store öffnen"
+      "manageApple": "App Store öffnen",
+      "alreadyBoundTo": "Dieses Abonnement ist bereits mit {email} verknüpft.",
+      "alreadyBoundUnknown": "Dieses Abonnement ist bereits mit einem anderen Konto verknüpft."
     }
   },
   "projects": {
@@ -465,4 +467,4 @@
     "monthsAgo": "Vor {months, plural, one {# Monat} other {# Monaten}}",
     "moreThanYearAgo": "Vor über einem Jahr"
   }
-}
+}
\ No newline at end of file
diff --git a/messages/en.json b/messages/en.json
index 39d3bb9e..4bcca531 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -147,7 +147,9 @@
       "purchasing": "Purchasing...",
       "purchaseError": "Purchase failed. Please try again.",
       "cancelApple": "Apple subscriptions are managed through the App Store.",
-      "manageApple": "Open App Store"
+      "manageApple": "Open App Store",
+      "alreadyBoundTo": "This subscription is already linked to {email}.",
+      "alreadyBoundUnknown": "This subscription is already linked to another account."
     }
   },
   "projects": {
@@ -464,4 +466,4 @@
     "monthsAgo": "{months, plural, one {# month ago} other {# months ago}}",
     "moreThanYearAgo": "More than 1 year ago"
   }
-}
+}
\ No newline at end of file
diff --git a/messages/es.json b/messages/es.json
index ab41adb9..f62a42d6 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -147,7 +147,9 @@
       "purchasing": "Comprando...",
       "purchaseError": "La compra falló. Inténtalo de nuevo.",
       "cancelApple": "Las suscripciones de Apple se gestionan a través del App Store.",
-      "manageApple": "Abrir App Store"
+      "manageApple": "Abrir App Store",
+      "alreadyBoundTo": "Esta suscripción ya está vinculada a {email}.",
+      "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta."
     }
   },
   "projects": {
@@ -464,4 +466,4 @@
     "monthsAgo": "Hace {months, plural, one {# mes} other {# meses}}",
     "moreThanYearAgo": "Hace más de 1 año"
   }
-}
+}
\ No newline at end of file
diff --git a/messages/fr.json b/messages/fr.json
index dc30105a..f2b1eb62 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -148,7 +148,9 @@
       "purchasing": "Achat en cours...",
       "purchaseError": "L'achat a échoué. Veuillez réessayer.",
       "cancelApple": "Les abonnements Apple sont gérés via l'App Store.",
-      "manageApple": "Ouvrir l'App Store"
+      "manageApple": "Ouvrir l'App Store",
+      "alreadyBoundTo": "Cet abonnement est déjà associé à {email}.",
+      "alreadyBoundUnknown": "Cet abonnement est déjà associé à un autre compte."
     }
   },
   "projects": {
@@ -465,4 +467,4 @@
     "monthsAgo": "Il y a {months, plural, one {# mois} other {# mois}}",
     "moreThanYearAgo": "Il y a plus d'un an"
   }
-}
+}
\ No newline at end of file
diff --git a/messages/ja.json b/messages/ja.json
index 84f66eee..f6428a42 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -147,7 +147,9 @@
       "purchasing": "購入中...",
       "purchaseError": "購入に失敗しました。もう一度お試しください。",
       "cancelApple": "Appleのサブスクリプションはアプリストアで管理されます。",
-      "manageApple": "App Storeを開く"
+      "manageApple": "App Storeを開く",
+      "alreadyBoundTo": "このサブスクリプションは既に {email} に関連付けられています。",
+      "alreadyBoundUnknown": "このサブスクリプションは既に別のアカウントに関連付けられています。"
     }
   },
   "projects": {
@@ -464,4 +466,4 @@
     "monthsAgo": "{months}ヶ月前",
     "moreThanYearAgo": "1年以上前"
   }
-}
+}
\ No newline at end of file
diff --git a/messages/ko.json b/messages/ko.json
index c9eb3baf..d031da89 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -147,7 +147,9 @@
       "purchasing": "구매 중...",
       "purchaseError": "구매에 실패했습니다. 다시 시도해 주세요.",
       "cancelApple": "Apple 구독은 App Store에서 관리됩니다.",
-      "manageApple": "App Store 열기"
+      "manageApple": "App Store 열기",
+      "alreadyBoundTo": "이 구독은 이미 {email}에 연결되어 있습니다.",
+      "alreadyBoundUnknown": "이 구독은 이미 다른 계정에 연결되어 있습니다."
     }
   },
   "projects": {
@@ -464,4 +466,4 @@
     "monthsAgo": "{months}달 전",
     "moreThanYearAgo": "1년 이상 전"
   }
-}
+}
\ No newline at end of file
diff --git a/messages/pl.json b/messages/pl.json
index 0b3aeb35..b982fd08 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -147,7 +147,9 @@
       "purchasing": "Zakup w toku...",
       "purchaseError": "Zakup nie powiódł się. Spróbuj ponownie.",
       "cancelApple": "Subskrypcje Apple są zarządzane przez App Store.",
-      "manageApple": "Otwórz App Store"
+      "manageApple": "Otwórz App Store",
+      "alreadyBoundTo": "Ta subskrypcja jest już powiązana z {email}.",
+      "alreadyBoundUnknown": "Ta subskrypcja jest już powiązana z innym kontem."
     }
   },
   "projects": {
@@ -464,4 +466,4 @@
     "monthsAgo": "{months, plural, one {# miesiąc} few {# miesiące} many {# miesięcy} other {# miesięcy}} temu",
     "moreThanYearAgo": "Ponad rok temu"
   }
-}
+}
\ No newline at end of file
diff --git a/messages/zh.json b/messages/zh.json
index fc85ce77..14655f9c 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -147,7 +147,9 @@
       "purchasing": "购买中...",
       "purchaseError": "购买失败，请重试。",
       "cancelApple": "Apple 订阅通过 App Store 管理。",
-      "manageApple": "打开 App Store"
+      "manageApple": "打开 App Store",
+      "alreadyBoundTo": "此订阅已与 {email} 关联。",
+      "alreadyBoundUnknown": "此订阅已与其他账户关联。"
     }
   },
   "projects": {
@@ -464,4 +466,4 @@
     "monthsAgo": "{months} 个月前",
     "moreThanYearAgo": "1 年前"
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/apple/subscription-owner/route.ts b/src/app/api/apple/subscription-owner/route.ts
new file mode 100644
index 00000000..46e43cef
--- /dev/null
+++ b/src/app/api/apple/subscription-owner/route.ts
@@ -0,0 +1,41 @@
+import { NextRequest, NextResponse } from "next/server";
+import { decodeJwt } from "jose";
+import * as UserService from "@src/server/service/user-service";
+
+const APPLE_PRODUCT_ID = "app.scriptio.pro.monthly";
+const APPLE_BUNDLE_IDS = ["app.scriptio", "app.scriptio.staging"];
+
+interface AppleTransactionPayload {
+    bundleId: string;
+    productId: string;
+    appAccountToken?: string;
+}
+
+function maskEmail(email: string): string {
+    const [local, domain] = email.split("@");
+    return `${local[0]}***@${domain}`;
+}
+
+export async function POST(req: NextRequest) {
+    const body = (await req.json().catch(() => ({}))) as Record<string, unknown>;
+    const jwsTransaction = body.jwsTransaction;
+
+    if (typeof jwsTransaction !== "string") {
+        return NextResponse.json({ email: null });
+    }
+
+    const payload = decodeJwt(jwsTransaction) as unknown as AppleTransactionPayload;
+
+    if (!APPLE_BUNDLE_IDS.includes(payload.bundleId) || payload.productId !== APPLE_PRODUCT_ID) {
+        return NextResponse.json({ email: null });
+    }
+
+    if (!payload.appAccountToken) {
+        return NextResponse.json({ email: null });
+    }
+
+    const user = await UserService.getUserFromId(payload.appAccountToken);
+    const email = user?.email ? maskEmail(user.email) : null;
+
+    return NextResponse.json({ email });
+}
diff --git a/src/app/api/apple/verify/route.ts b/src/app/api/apple/verify/route.ts
new file mode 100644
index 00000000..30d53ea6
--- /dev/null
+++ b/src/app/api/apple/verify/route.ts
@@ -0,0 +1,57 @@
+import { NextRequest } from "next/server";
+import { decodeJwt } from "jose";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { BodyFieldError, ForbiddenError, Success } from "@src/lib/utils/api-utils";
+import * as UserService from "@src/server/service/user-service";
+import * as TransactionService from "@src/server/service/transaction-service";
+
+const APPLE_PRODUCT_ID = "app.scriptio.pro.monthly";
+const APPLE_BUNDLE_IDS = ["app.scriptio", "app.scriptio.staging"];
+
+interface AppleTransactionPayload {
+    transactionId: string;
+    originalTransactionId: string;
+    bundleId: string;
+    productId: string;
+    purchaseDate: number;
+    expiresDate: number;
+    type: string;
+    appAccountToken?: string;
+}
+
+async function verifyApplePurchase(req: NextRequest, { user }: AuthApiContext) {
+    const body = (await req.json().catch(() => ({}))) as Record<string, unknown>;
+    const jwsTransaction = body.jwsTransaction;
+    if (typeof jwsTransaction !== "string") {
+        throw new BodyFieldError("Missing jwsTransaction");
+    }
+
+    const payload = decodeJwt(jwsTransaction) as unknown as AppleTransactionPayload;
+
+    if (!APPLE_BUNDLE_IDS.includes(payload.bundleId)) {
+        throw new ForbiddenError("Invalid bundle ID");
+    }
+    if (payload.productId !== APPLE_PRODUCT_ID) {
+        throw new ForbiddenError("Invalid product ID");
+    }
+    if (payload.appAccountToken && payload.appAccountToken !== user.id) {
+        throw new ForbiddenError("This purchase belongs to a different account");
+    }
+
+    const expiresDate = new Date(payload.expiresDate);
+    if (expiresDate <= new Date()) {
+        throw new ForbiddenError("Transaction already expired");
+    }
+
+    await UserService.updateUserFromId(user.id, {
+        isProUntil: expiresDate,
+        subscriptionProvider: "APPLE",
+        isSubscriptionCancelled: false,
+    });
+
+    await TransactionService.createTransactionIfNotExists(user.id, "APPLE", payload.transactionId);
+
+    return Success(null);
+}
+
+export const POST = apiHandler(verifyApplePurchase);
diff --git a/src/app/api/webhooks/stripe/route.ts b/src/app/api/webhooks/stripe/route.ts
index 09a5f208..61d86a6d 100644
--- a/src/app/api/webhooks/stripe/route.ts
+++ b/src/app/api/webhooks/stripe/route.ts
@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import Stripe from "stripe";
-import prisma from "@src/server/db";
 import * as UserService from "@src/server/service/user-service";
+import * as TransactionService from "@src/server/service/transaction-service";
 
 export async function POST(req: NextRequest) {
     const stripe = new Stripe(process.env.STRIPE_SECRET_KEY!);
@@ -30,13 +30,7 @@ export async function POST(req: NextRequest) {
                 isProUntil: periodEnd ? new Date(periodEnd * 1000) : null,
                 subscriptionProvider: "STRIPE",
             });
-            await prisma.transaction.create({
-                data: {
-                    userId,
-                    provider: "STRIPE",
-                    transactionId: subscriptionId,
-                },
-            });
+            await TransactionService.createTransactionIfNotExists(userId, "STRIPE", subscriptionId);
         }
     }
 
diff --git a/src/lib/import/import-project.ts b/src/lib/import/import-project.ts
index ea134c6b..276e9817 100644
--- a/src/lib/import/import-project.ts
+++ b/src/lib/import/import-project.ts
@@ -144,7 +144,7 @@ async function createRemoteProject(userId: string, title: string, description?:
         description,
     };
 
-    const res = await createProject(userId, body);
+    const res = await createProject(body);
     const json = (await res.json()) as ApiResponse<{ id: string }>;
 
     if (!res.ok || !json.data) {
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index ab9606c1..550b1f28 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -29,7 +29,7 @@ export const getCloudToken = async (projectId: string): Promise<{ token: string
     return { token: null, status: res.status };
 };
 
-export const createProject = async (userId: string, body: CreateProjectBody) => {
+export const createProject = async (body: CreateProjectBody) => {
     return request(`/api/projects`, "POST", body);
 };
 
@@ -142,3 +142,11 @@ export const submitApplePurchase = async (jwsTransaction: string): Promise<boole
     const res = await request("/api/apple/purchase", "POST", { jwsTransaction });
     return res.ok;
 };
+
+export const getAppleSubscriptionOwner = async (jwsTransaction: string): Promise<string | null> => {
+    const res = await request("/api/apple/subscription-owner", "POST", { jwsTransaction });
+    if (!res.ok) return null;
+    const { email } = (await res.json()) as { email: string | null };
+    return email ?? null;
+};
+

From 9fd57e0cfe5942bd9f784b2027a3b587749a0614 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Tue, 28 Apr 2026 01:54:45 +0200
Subject: [PATCH 27/76] added missing prisma generate in ci

---
 .github/workflows/checks.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index 88e9fbaa..80c489c1 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -24,7 +24,7 @@ jobs:
               continue-on-error: true
 
             - name: Typecheck
-              run: npx tsc --noEmit
+              run: npx prisma generate && npx tsc --noEmit
 
     build-macos:
         runs-on: macos-latest

From 6c84c20f70cac81b11c7c8c10409a72804f51561 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Thu, 30 Apr 2026 01:06:16 +0200
Subject: [PATCH 28/76] refactored oauth buttons

---
 .../dashboard/account/DashboardAuth.tsx       | 39 +++++--------------
 components/dashboard/account/OAuthButtons.tsx | 30 +++-----------
 src/lib/utils/hooks.ts                        | 29 +++++++++++++-
 3 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/components/dashboard/account/DashboardAuth.tsx b/components/dashboard/account/DashboardAuth.tsx
index 6dfe49e4..43cb6e38 100644
--- a/components/dashboard/account/DashboardAuth.tsx
+++ b/components/dashboard/account/DashboardAuth.tsx
@@ -1,13 +1,13 @@
 "use client";
 
-import { useState, useRef, useEffect } from "react";
+import { useState } from "react";
 import { useTranslations } from "next-intl";
 import { isTauri } from "@tauri-apps/api/core";
-import { useSWRConfig } from "swr";
 
 import { requestMagicLink } from "@src/lib/utils/requests";
 import { ApiResponse } from "@src/lib/utils/api-utils";
 import { RequestMagicLinkBody } from "@src/lib/utils/api-bodies";
+import { useDesktopBridgeAuth } from "@src/lib/utils/hooks";
 
 import OAuthButtons from "./OAuthButtons";
 
@@ -19,20 +19,13 @@ type MessageType = "success" | "error" | "info";
 
 const DashboardAuth = () => {
     const tAuth = useTranslations("auth");
-    const { mutate } = useSWRConfig();
+    const { completeBridgeAuth } = useDesktopBridgeAuth();
 
     const [email, setEmail] = useState("");
     const [loading, setLoading] = useState(false);
     const [submitted, setSubmitted] = useState(false);
     const [message, setMessage] = useState<{ type: MessageType; text: string } | null>(null);
-    // Desktop-only: poll the bridge after the email is sent so the user is signed in
-    // here as soon as they click the magic link in their browser.
     const [pollingDesktop, setPollingDesktop] = useState(false);
-    const pollAbortRef = useRef<AbortController | null>(null);
-
-    useEffect(() => {
-        return () => { pollAbortRef.current?.abort(); };
-    }, []);
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault();
@@ -45,11 +38,7 @@ const DashboardAuth = () => {
             const body: RequestMagicLinkBody = { email };
 
             if (isTauri()) {
-                // Desktop: generate a nonce, request the magic link bound to it, then poll the
-                // bridge until the browser-side click drops the JWE for us to pick up.
-                const { generateBridgeNonce, pollBridgeToken, setDesktopToken } = await import(
-                    "@src/lib/desktop-auth"
-                );
+                const { generateBridgeNonce } = await import("@src/lib/desktop-auth");
                 const nonce = generateBridgeNonce();
                 body.desktopNonce = nonce;
 
@@ -63,22 +52,12 @@ const DashboardAuth = () => {
                 setSubmitted(true);
                 setPollingDesktop(true);
 
-                pollAbortRef.current?.abort();
-                const controller = new AbortController();
-                pollAbortRef.current = controller;
-
-                const token = await pollBridgeToken(nonce, { signal: controller.signal });
-                if (!token) {
-                    if (!controller.signal.aborted) {
-                        setMessage({ type: "error", text: tAuth("desktopTimeout") });
-                        setPollingDesktop(false);
-                        setSubmitted(false);
-                    }
-                    return;
+                const result = await completeBridgeAuth(nonce);
+                if (result === "timeout") {
+                    setMessage({ type: "error", text: tAuth("desktopTimeout") });
+                    setPollingDesktop(false);
+                    setSubmitted(false);
                 }
-                await setDesktopToken(token);
-                await mutate("/api/users/cookie");
-                await mutate("/api/users");
                 return;
             }
 
diff --git a/components/dashboard/account/OAuthButtons.tsx b/components/dashboard/account/OAuthButtons.tsx
index ea9eed1d..28154041 100644
--- a/components/dashboard/account/OAuthButtons.tsx
+++ b/components/dashboard/account/OAuthButtons.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import { useState, useRef, useEffect } from "react";
-import { useSWRConfig } from "swr";
+import { useState } from "react";
 import { signIn } from "next-auth/react";
 import { isTauri } from "@tauri-apps/api/core";
 import { useTranslations } from "next-intl";
+import { useDesktopBridgeAuth } from "@src/lib/utils/hooks";
 
 import GoogleIcon from "@components/icons/GoogleIcon";
 import AppleIcon from "@components/icons/AppleIcon";
@@ -19,15 +19,10 @@ type Props = {
 };
 
 const OAuthButtons = ({ callbackUrl = "/projects" }: Props) => {
-    const { mutate } = useSWRConfig();
+    const { completeBridgeAuth } = useDesktopBridgeAuth();
     const t = useTranslations("oauth");
     const [pendingProvider, setPendingProvider] = useState<Provider | null>(null);
     const [error, setError] = useState<string | null>(null);
-    const pollAbortRef = useRef<AbortController | null>(null);
-
-    useEffect(() => {
-        return () => { pollAbortRef.current?.abort(); };
-    }, []);
 
     const startOAuth = async (provider: Provider) => {
         setError(null);
@@ -37,14 +32,9 @@ const OAuthButtons = ({ callbackUrl = "/projects" }: Props) => {
             return;
         }
 
-        // Cancel any in-progress poll before starting a new one
-        pollAbortRef.current?.abort();
-        const controller = new AbortController();
-        pollAbortRef.current = controller;
-
         setPendingProvider(provider);
         try {
-            const { generateBridgeNonce, pollBridgeToken, setDesktopToken } = await import("@src/lib/desktop-auth");
+            const { generateBridgeNonce } = await import("@src/lib/desktop-auth");
             const { openUrl } = await import("@tauri-apps/plugin-opener");
 
             const nonce = generateBridgeNonce();
@@ -52,17 +42,9 @@ const OAuthButtons = ({ callbackUrl = "/projects" }: Props) => {
             const bridgeUrl = `${apiBase}/desktop-oauth/start?provider=${provider}&nonce=${encodeURIComponent(nonce)}`;
             await openUrl(bridgeUrl);
 
-            const token = await pollBridgeToken(nonce, { signal: controller.signal });
-            if (!token) {
-                if (!controller.signal.aborted) setError(t("timeout"));
-                return;
-            }
-
-            await setDesktopToken(token);
-            await mutate("/api/users/cookie");
-            await mutate("/api/users");
+            const result = await completeBridgeAuth(nonce);
+            if (result === "timeout") setError(t("timeout"));
         } catch (err) {
-            if (controller.signal.aborted) return;
             console.error("[OAuthButtons] Desktop OAuth failed:", err);
             setError(t("error"));
         } finally {
diff --git a/src/lib/utils/hooks.ts b/src/lib/utils/hooks.ts
index 88c6cbc1..333539da 100644
--- a/src/lib/utils/hooks.ts
+++ b/src/lib/utils/hooks.ts
@@ -1,6 +1,6 @@
 "use client";
 
-import useSWR from "swr";
+import useSWR, { useSWRConfig } from "swr";
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { CookieUser, UserSettings } from "./types";
 import { editUserSettings } from "./requests";
@@ -467,6 +467,32 @@ const useIsPro = () => {
     return { isPro, isLoading };
 };
 
+const useDesktopBridgeAuth = () => {
+    const { mutate } = useSWRConfig();
+    const pollAbortRef = useRef<AbortController | null>(null);
+
+    useEffect(() => {
+        return () => { pollAbortRef.current?.abort(); };
+    }, []);
+
+    const completeBridgeAuth = useCallback(async (nonce: string): Promise<"success" | "timeout" | "aborted"> => {
+        pollAbortRef.current?.abort();
+        const controller = new AbortController();
+        pollAbortRef.current = controller;
+
+        const { pollBridgeToken, setDesktopToken } = await import("@src/lib/desktop-auth");
+        const token = await pollBridgeToken(nonce, { signal: controller.signal });
+        if (!token) return controller.signal.aborted ? "aborted" : "timeout";
+
+        await setDesktopToken(token);
+        await mutate("/api/users/cookie");
+        await mutate("/api/users");
+        return "success";
+    }, [mutate]);
+
+    return { completeBridgeAuth };
+};
+
 export {
     useDraggable,
     useUser,
@@ -482,4 +508,5 @@ export {
     useCachedProjects,
     useCachedProjectInfo,
     useProjectIdFromUrl,
+    useDesktopBridgeAuth,
 };

From 337376051bcf9646cef3be260a5317b52b48240d Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Thu, 30 Apr 2026 02:03:12 +0200
Subject: [PATCH 29/76] visual tweaks to homepage, hidden sidebars by default,
 updates admin dashboard

---
 components/admin/AdminShell.module.css        |  34 ++---
 components/admin/AdminShell.tsx               |  13 +-
 components/admin/ProjectSearch.tsx            |  10 +-
 components/admin/UserSearch.tsx               |  10 +-
 components/home/Landing.module.css            |  98 +++++++++++++-
 .../navbar/LandingPageNavbar.module.css       | 125 ++++++++++++++---
 components/navbar/LandingPageNavbar.tsx       | 101 +++++++++++---
 components/projects/CreateProjectPage.tsx     |  42 +-----
 .../projects/EmptyProjectPage.module.css      | 126 ++++++++++--------
 components/projects/EmptyProjectPage.tsx      |  34 ++---
 components/projects/ProjectItem.module.css    |   5 +-
 src/app/api/admin/projects/route.ts           |   4 -
 src/app/api/admin/users/route.ts              |   4 -
 src/context/ViewContext.tsx                   |   4 +-
 src/server/repository/project-repository.ts   |  34 ++---
 src/server/repository/user-repository.ts      |  11 +-
 16 files changed, 443 insertions(+), 212 deletions(-)

diff --git a/components/admin/AdminShell.module.css b/components/admin/AdminShell.module.css
index 07024496..eebea079 100644
--- a/components/admin/AdminShell.module.css
+++ b/components/admin/AdminShell.module.css
@@ -21,11 +21,25 @@
     align-items: center;
     gap: 10px;
     padding: 0 8px;
-    color: var(--primary-text);
-    font-family: var(--font-josefin), sans-serif;
-    font-weight: 700;
-    font-size: 18px;
-    letter-spacing: 0.02em;
+}
+
+.brandLogo {
+    display: block;
+    height: 28px;
+    width: auto;
+    object-fit: contain;
+}
+
+.brandEmail {
+    display: block;
+    padding: 0 8px;
+    color: var(--secondary-text);
+    font-family: var(--font-inter), sans-serif;
+    font-size: 12px;
+    font-weight: 500;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .brandBadge {
@@ -95,16 +109,6 @@
     font-family: var(--font-inter), sans-serif;
 }
 
-.footerEmail {
-    color: var(--primary-text);
-    font-weight: 600;
-    display: block;
-    margin-bottom: 2px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
 .main {
     flex: 1;
     overflow-y: auto;
diff --git a/components/admin/AdminShell.tsx b/components/admin/AdminShell.tsx
index a0db4ec0..54105565 100644
--- a/components/admin/AdminShell.tsx
+++ b/components/admin/AdminShell.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { ReactNode } from "react";
+import Image from "next/image";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { BarChart3, Users, FolderOpen, LogOut } from "lucide-react";
@@ -28,9 +29,16 @@ export default function AdminShell({ email, title, subtitle, children }: Props)
         <div className={styles.wrapper}>
             <aside className={styles.sidebar}>
                 <div className={styles.brand}>
-                    Scriptio
+                    <Image
+                        src="/images/scriptio.svg"
+                        alt="Scriptio"
+                        width={100}
+                        height={28}
+                        className={styles.brandLogo}
+                    />
                     <span className={styles.brandBadge}>Admin</span>
                 </div>
+                <span className={styles.brandEmail} title={email}>{email}</span>
                 <nav className={styles.nav}>
                     <div className={styles.navGroupLabel}>Monitoring</div>
                     {NAV_LINKS.map((link) => {
@@ -51,9 +59,6 @@ export default function AdminShell({ email, title, subtitle, children }: Props)
                     })}
                 </nav>
                 <div className={styles.footer}>
-                    <span className={styles.footerEmail} title={email}>
-                        {email}
-                    </span>
                     <Link href="/" className={styles.navItem} style={{ padding: "8px 0" }}>
                         <LogOut size={14} />
                         Back to app
diff --git a/components/admin/ProjectSearch.tsx b/components/admin/ProjectSearch.tsx
index 7ae94a5d..260fa9c4 100644
--- a/components/admin/ProjectSearch.tsx
+++ b/components/admin/ProjectSearch.tsx
@@ -37,7 +37,9 @@ export default function ProjectSearch() {
         return () => clearTimeout(t);
     }, [query]);
 
-    const key = debounced ? `/api/admin/projects?q=${encodeURIComponent(debounced)}` : null;
+    const key = debounced
+        ? `/api/admin/projects?q=${encodeURIComponent(debounced)}`
+        : `/api/admin/projects?limit=10`;
     const { data, isLoading } = useSWR<SearchResponse>(key);
 
     return (
@@ -53,11 +55,7 @@ export default function ProjectSearch() {
                 />
             </div>
 
-            {!debounced && (
-                <p className={styles.hint}>
-                    Start typing a title (partial, case-insensitive) or paste a full project ID.
-                </p>
-            )}
+            {!debounced && isLoading && <p className={styles.hint}>Loading…</p>}
 
             {debounced && isLoading && <p className={styles.hint}>Searching…</p>}
 
diff --git a/components/admin/UserSearch.tsx b/components/admin/UserSearch.tsx
index ad5c8499..59c96f12 100644
--- a/components/admin/UserSearch.tsx
+++ b/components/admin/UserSearch.tsx
@@ -39,7 +39,9 @@ export default function UserSearch() {
         return () => clearTimeout(t);
     }, [query]);
 
-    const key = debounced ? `/api/admin/users?q=${encodeURIComponent(debounced)}` : null;
+    const key = debounced
+        ? `/api/admin/users?q=${encodeURIComponent(debounced)}`
+        : `/api/admin/users?limit=10`;
     const { data, isLoading } = useSWR<SearchResponse>(key);
 
     return (
@@ -55,11 +57,7 @@ export default function UserSearch() {
                 />
             </div>
 
-            {!debounced && (
-                <p className={styles.hint}>
-                    Start typing an email (partial, case-insensitive) or paste a full user ID.
-                </p>
-            )}
+            {!debounced && isLoading && <p className={styles.hint}>Loading…</p>}
 
             {debounced && isLoading && <p className={styles.hint}>Searching…</p>}
 
diff --git a/components/home/Landing.module.css b/components/home/Landing.module.css
index b7725d21..f8660b56 100644
--- a/components/home/Landing.module.css
+++ b/components/home/Landing.module.css
@@ -326,17 +326,111 @@
         font-size: 2.5rem;
     }
     .heroLogo {
-        height: 70px;
+        height: 140px;
     }
     .catchphrase {
         font-size: 1rem;
     }
     .contentContainer {
-        padding: 0 1.5rem;
+        padding: 0 1.25rem;
     }
     .carouselWrapper {
         height: 280px;
     }
+
+    .hero {
+        gap: 2rem;
+    }
+    .heroContent {
+        gap: 1.5rem;
+    }
+    .heroBackgroundImage {
+        max-width: 140%;
+        max-height: 50vh;
+    }
+
+    .sectionTitle {
+        font-size: 1.75rem;
+    }
+    .subheadline {
+        font-size: 1rem;
+        margin-bottom: 1.5rem;
+    }
+    .sectionHeader {
+        margin-bottom: 2rem;
+    }
+
+    .bentoSection {
+        padding: 2rem 0 3rem;
+    }
+    .bentoContent {
+        padding: 1.25rem;
+    }
+    .pillarTitle {
+        font-size: 1.25rem;
+    }
+    .pillarText {
+        font-size: 0.95rem;
+    }
+
+    .faqSection {
+        padding: 2rem 0 3rem;
+    }
+    .faqQuestion {
+        font-size: 1rem;
+        padding: 1rem 1.25rem;
+    }
+    .faqAnswer {
+        font-size: 0.95rem;
+        padding: 0.75rem 1.25rem 1rem;
+    }
+
+    .footer {
+        padding: 2rem 0;
+        margin-top: 2rem;
+    }
+    .footerContent {
+        flex-direction: column;
+        gap: 1rem;
+        text-align: center;
+    }
+    .footerLinks {
+        justify-content: center;
+        flex-wrap: wrap;
+    }
+
+    .pageContainer {
+        padding: 90px 1.25rem 3rem;
+    }
+    .pageTitle {
+        font-size: 2rem;
+        margin-bottom: 2rem;
+    }
+    .pageSectionTitle {
+        font-size: 1.25rem;
+    }
+}
+
+@media (max-width: 480px) {
+    .heroLogo {
+        height: 110px;
+    }
+    .ctaPlatform {
+        width: 100%;
+        max-width: 280px;
+    }
+    .sectionTitle {
+        font-size: 1.5rem;
+    }
+    .pillarTitle {
+        font-size: 1.1rem;
+    }
+    .stripeText {
+        font-size: 1.5rem;
+    }
+    .cursor {
+        height: 1.5rem;
+    }
 }
 
 /* --- BENTO GRID & FEATURES --- */
diff --git a/components/navbar/LandingPageNavbar.module.css b/components/navbar/LandingPageNavbar.module.css
index 3fafb823..277105d4 100644
--- a/components/navbar/LandingPageNavbar.module.css
+++ b/components/navbar/LandingPageNavbar.module.css
@@ -1,36 +1,121 @@
 .navbar {
-  position: fixed;
-  width: 100%;
-  z-index: 1000;
-  
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 1.5rem 2.5rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1.5rem 2.5rem;
+
+    background-color: transparent;
+    border-bottom: 1px solid transparent;
+    transition: background-color 0.25s ease, backdrop-filter 0.25s ease,
+        box-shadow 0.25s ease, border-color 0.25s ease;
+}
+
+.navbarScrolled {
+    background-color: color-mix(in srgb, var(--secondary) 75%, transparent);
+    backdrop-filter: blur(20px);
+    -webkit-backdrop-filter: blur(20px);
+    border-bottom-color: var(--separator);
+    box-shadow: 0 6px 24px rgba(0, 0, 0, 0.45);
 }
 
 .navLinks {
-  display: flex;
-  gap: 1.7rem;
+    display: flex;
+    gap: 1.7rem;
 }
 
 .navLink {
-  color: var(--secondary-text);
-  text-decoration: none;
-  font-size: 0.9rem;
-  transition: color 0.2s ease;
+    color: var(--secondary-text);
+    text-decoration: none;
+    font-size: 0.9rem;
+    transition: color 0.2s ease;
 }
 
 .navLink:hover {
-  color: var(--primary-text);
+    color: var(--primary-text);
 }
 
 .logoWrapper {
-  position: absolute;
-  margin-top: 22px;
-  top: 0;
+    position: absolute;
+    margin-top: 22px;
+    top: 0;
 }
 
 .logo {
-  width: 90px;
-}
\ No newline at end of file
+    width: 90px;
+}
+
+.burgerBtn {
+    display: none;
+    background: transparent;
+    border: none;
+    color: var(--primary-text);
+    cursor: pointer;
+    padding: 8px;
+    border-radius: 8px;
+    align-items: center;
+    justify-content: center;
+    transition: background-color 0.15s ease;
+}
+
+.burgerBtn:hover {
+    background-color: rgba(255, 255, 255, 0.08);
+}
+
+.mobileMenu {
+    position: absolute;
+    top: calc(100% - 0.5rem);
+    right: 1rem;
+    display: flex;
+    flex-direction: column;
+    min-width: 200px;
+    padding: 8px;
+    border-radius: 14px;
+    background-color: var(--secondary);
+    border: 1px solid var(--separator);
+    box-shadow: 0 12px 32px rgba(0, 0, 0, 0.35);
+    animation: fadeInDown 0.15s ease-out;
+}
+
+.mobileLink {
+    color: var(--primary-text);
+    text-decoration: none;
+    font-size: 0.95rem;
+    padding: 10px 14px;
+    border-radius: 10px;
+    transition: background-color 0.15s ease, color 0.15s ease;
+}
+
+.mobileLink:hover {
+    background-color: var(--secondary-hover);
+    color: var(--primary-text);
+}
+
+@keyframes fadeInDown {
+    from {
+        opacity: 0;
+        transform: translateY(-4px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+@media (max-width: 768px) {
+    .navbar {
+        padding: 1rem 1.25rem;
+    }
+
+    .navLinks {
+        display: none;
+    }
+
+    .burgerBtn {
+        display: flex;
+        margin-left: auto;
+    }
+}
diff --git a/components/navbar/LandingPageNavbar.tsx b/components/navbar/LandingPageNavbar.tsx
index 092b8882..e0c76aa8 100644
--- a/components/navbar/LandingPageNavbar.tsx
+++ b/components/navbar/LandingPageNavbar.tsx
@@ -1,44 +1,101 @@
 "use client";
 
+import { useState, useEffect } from "react";
 import { usePage } from "@src/lib/utils/hooks";
+import { usePathname } from "next/navigation";
 import Link from "next/link";
 import Image from "next/image";
+import { Menu, X } from "lucide-react";
 
 import styles from "./LandingPageNavbar.module.css";
 
 export default function LandingPageNavbar() {
     const page = usePage();
+    const pathname = usePathname();
+    const [open, setOpen] = useState(false);
+    const [scrolled, setScrolled] = useState(false);
+
+    useEffect(() => {
+        setOpen(false);
+    }, [pathname]);
+
+    useEffect(() => {
+        const readScrollY = (target: EventTarget | null): number => {
+            if (!target || target === document) return window.scrollY;
+            if (target instanceof HTMLElement) return target.scrollTop;
+            return 0;
+        };
+        const onScroll = (e: Event) => {
+            setScrolled(readScrollY(e.target) > 16);
+        };
+        document.addEventListener("scroll", onScroll, { capture: true, passive: true });
+        return () => document.removeEventListener("scroll", onScroll, { capture: true });
+    }, []);
+
+    useEffect(() => {
+        if (!open) return;
+        const onKey = (e: KeyboardEvent) => {
+            if (e.key === "Escape") setOpen(false);
+        };
+        window.addEventListener("keydown", onKey);
+        return () => window.removeEventListener("keydown", onKey);
+    }, [open]);
+
     if (!page) return null;
 
+    const close = () => setOpen(false);
+
     return (
-        <div className={styles.navbar}>
+        <nav className={`${styles.navbar} ${scrolled ? styles.navbarScrolled : ""}`}>
+            {page !== "index" && (
+                <Link className={styles.logoWrapper} href="/">
+                    <Image
+                        src="/images/scriptio.png"
+                        alt="Scriptio Logo"
+                        width={90}
+                        height={27}
+                        className={styles.logo}
+                    />
+                </Link>
+            )}
+
             <div className={styles.navLinks}>
-                {page === "index" ? (
+                {page === "index" && (
                     <>
-                        <Link className={styles.navLink} href="#features">
-                            Features
-                        </Link>
-                        <Link className={styles.navLink} href="#faq">
-                            FAQ
-                        </Link>
-                        <Link className={styles.navLink} href="#pricing">
-                            Pricing
-                        </Link>
+                        <Link className={styles.navLink} href="#features">Features</Link>
+                        <Link className={styles.navLink} href="#faq">FAQ</Link>
+                        <Link className={styles.navLink} href="#pricing">Pricing</Link>
                     </>
-                ) : (
-                    <Link className={styles.logoWrapper} href="/">
-                        <Image src="/images/scriptio.png" alt="Scriptio Logo" width={90} height={27} className={styles.logo} />
-                    </Link>
                 )}
             </div>
+
             <div className={styles.navLinks}>
-                <Link className={styles.navLink} href="/contact">
-                    Contact
-                </Link>
-                <Link className={styles.navLink} href="/privacy">
-                    Privacy
-                </Link>
+                <Link className={styles.navLink} href="/contact">Contact</Link>
+                <Link className={styles.navLink} href="/privacy">Privacy</Link>
             </div>
-        </div>
+
+            <button
+                className={styles.burgerBtn}
+                onClick={() => setOpen((v) => !v)}
+                aria-label={open ? "Close menu" : "Open menu"}
+                aria-expanded={open}
+            >
+                {open ? <X size={22} /> : <Menu size={22} />}
+            </button>
+
+            {open && (
+                <div className={styles.mobileMenu}>
+                    {page === "index" && (
+                        <>
+                            <Link className={styles.mobileLink} href="#features" onClick={close}>Features</Link>
+                            <Link className={styles.mobileLink} href="#faq" onClick={close}>FAQ</Link>
+                            <Link className={styles.mobileLink} href="#pricing" onClick={close}>Pricing</Link>
+                        </>
+                    )}
+                    <Link className={styles.mobileLink} href="/contact" onClick={close}>Contact</Link>
+                    <Link className={styles.mobileLink} href="/privacy" onClick={close}>Privacy</Link>
+                </div>
+            )}
+        </nav>
     );
 }
diff --git a/components/projects/CreateProjectPage.tsx b/components/projects/CreateProjectPage.tsx
index 90946933..eae94706 100644
--- a/components/projects/CreateProjectPage.tsx
+++ b/components/projects/CreateProjectPage.tsx
@@ -2,12 +2,11 @@
 
 import { useState } from "react";
 import { isTauri } from "@tauri-apps/api/core";
-import { cropImageBase64, join } from "@src/lib/utils/misc";
+import { join } from "@src/lib/utils/misc";
 import { FormInfoType } from "../utils/FormInfo";
 import { redirectScreenplay } from "@src/lib/utils/redirects";
 import { createProject } from "@src/lib/utils/requests";
 import { useCookieUser, useIsPro } from "@src/lib/utils/hooks";
-import UploadButton from "./UploadButton";
 import FormHeader from "./FormHeader";
 import FormEnd from "./FormEnd";
 
@@ -27,7 +26,6 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
     const t = useTranslations("projects");
 
     const [formInfo, setFormInfo] = useState<FormInfoType | null>(null);
-    const [selectedFile, setSelectedFile] = useState<File | null>(null);
 
     const exitCreating = () => {
         setIsCreating(false);
@@ -44,11 +42,9 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
         const form = e.target as typeof e.target & {
             title: { value: string };
             description: { value: string };
-            author: { value: string };
         };
         const title = form.title.value;
         const description = form.description.value;
-        const author = form.author.value;
 
         // Desktop: offline-first project creation
         // Always create locally. If Pro and signed in, try cloud first to use its ID.
@@ -58,10 +54,7 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
                 // If Pro and signed in, try creating on server to get the cloud project ID
                 if (user && isPro) {
                     try {
-                        const body: CreateProjectBody = { title, description, author };
-                        if (selectedFile) {
-                            body.poster = await cropImageBase64(selectedFile, 686, 1016);
-                        }
+                        const body: CreateProjectBody = { title, description };
                         const res = await createProject(body);
                         const json = (await res.json()) as ApiResponse<{ id: string }>;
                         if (res.ok && json.data) {
@@ -76,9 +69,9 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
                 const { createCachedProject, createCachedProjectWithId } =
                     await import("@src/lib/persistence/storage-provider/local-persistence");
                 if (projectId) {
-                    await createCachedProjectWithId(projectId, title, description, true, author);
+                    await createCachedProjectWithId(projectId, title, description, true);
                 } else {
-                    const cachedProject = await createCachedProject(title, description, author);
+                    const cachedProject = await createCachedProject(title, description);
                     projectId = cachedProject.id;
                 }
             } catch (error) {
@@ -94,16 +87,7 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
 
         // Web: create via API if authenticated Pro, otherwise create locally (IndexedDB)
         if (user && isPro) {
-            const body: CreateProjectBody = {
-                title,
-                description,
-                author,
-            };
-
-            if (selectedFile) {
-                body.poster = await cropImageBase64(selectedFile, 686, 1016);
-            }
-
+            const body: CreateProjectBody = { title, description };
             const res = await createProject(body);
             const json = (await res.json()) as ApiResponse<{ id: string }>;
             if (!res.ok || !json.data) {
@@ -114,12 +98,12 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
             // Also create local entry for offline cache
             const { createCachedProjectWithId } =
                 await import("@src/lib/persistence/storage-provider/local-persistence");
-            await createCachedProjectWithId(json.data.id, title, description, true, author);
+            await createCachedProjectWithId(json.data.id, title, description, true);
             redirectScreenplay(json.data.id);
         } else {
             // Unauthenticated or non-Pro: create local-only project (IndexedDB)
             const { createCachedProject } = await import("@src/lib/persistence/storage-provider/local-persistence");
-            const cachedProject = await createCachedProject(title, description, author);
+            const cachedProject = await createCachedProject(title, description);
             redirectScreenplay(cachedProject.id);
         }
     };
@@ -144,18 +128,6 @@ const CreateProjectPage = ({ setIsCreating }: Props) => {
                             onChange={resetFormInfo}
                         />
                     </div>
-                    <div className={form.element}>
-                        <p className={form.label}>
-                            {t("form.authorField")} - <i>{t("form.optional")}</i>
-                        </p>
-                        <input name="author" className={form.input} onChange={resetFormInfo} />
-                    </div>
-                    <div className={form.element}>
-                        <p className={form.label}>
-                            {t("form.posterField")} - <i>{t("form.optional")}</i>
-                        </p>
-                        <UploadButton setSelectedFile={setSelectedFile} selectedFile={selectedFile} />
-                    </div>
                 </div>
 
                 <FormEnd submitText={t("form.submitBtn")} onBack={() => exitCreating()} />
diff --git a/components/projects/EmptyProjectPage.module.css b/components/projects/EmptyProjectPage.module.css
index 779ad52f..86f46438 100644
--- a/components/projects/EmptyProjectPage.module.css
+++ b/components/projects/EmptyProjectPage.module.css
@@ -1,86 +1,106 @@
 .container {
     display: flex;
-    flex-direction: row;
-    justify-content: center;
+    flex-direction: column;
     align-items: center;
+    justify-content: center;
     flex: 1;
-    padding-bottom: 60px;
+    gap: 32px;
+}
+
+.heading {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 10px;
+    text-align: center;
+}
+
+.title {
+    font-family: var(--font-josefin), sans-serif;
+    font-size: 2.25rem;
+    font-weight: 700;
+    font-style: italic;
+    color: var(--primary-text);
+    letter-spacing: 0.01em;
+    margin: 0;
+}
+
+.subtitle {
+    font-family: var(--font-inter), sans-serif;
+    font-size: 0.95rem;
+    color: var(--secondary-text);
+    margin: 0;
 }
 
-.cards {
+.row {
     display: flex;
     flex-direction: row;
-    gap: 24px;
+    align-items: center;
+    gap: 16px;
 }
 
-.card {
+.btnWrapper {
     display: flex;
     flex-direction: column;
-    align-items: flex-start;
-    gap: 18px;
-
-    width: 280px;
-    padding: 36px 32px;
+    align-items: center;
+    gap: 8px;
+}
 
-    border-radius: 18px;
-    border: 3px solid var(--tertiary);
-    background-color: var(--project-item-bg);
+.formats {
+    font-family: var(--font-inter), sans-serif;
+    font-size: 0.75rem;
+    color: var(--secondary-text);
+    letter-spacing: 0.02em;
+}
 
+.createBtn,
+.importBtn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 10px;
+    width: 280px;
+    padding: 16px 0;
+    border-radius: 40px;
+    font-family: var(--font-inter), sans-serif;
+    font-size: 1rem;
+    font-weight: 500;
     cursor: pointer;
-    text-align: left;
+    transition: border-color 0.2s ease, color 0.2s ease;
+}
 
-    box-shadow: var(--project-item-shadow);
-    transition: border-color 0.2s, box-shadow 0.2s, transform 0.2s;
+.createBtn {
+    border: 3px solid var(--tertiary);
+    background-color: var(--secondary);
+    color: var(--primary-text);
 }
 
-.card:hover {
+.createBtn:hover {
     border-color: var(--tertiary-hover);
-    box-shadow: var(--project-item-shadow-hover);
-    transform: translate(-3px, -3px);
 }
 
-.card:active {
+.createBtn:active {
     transform: scale(0.98);
     transition: transform 0.07s;
 }
 
-.card:disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-    transform: none;
-    box-shadow: var(--project-item-shadow);
+.importBtn {
+    border: 3px solid var(--tertiary);
+    background: transparent;
+    color: var(--secondary-text);
 }
 
-.cardIcon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 52px;
-    height: 52px;
-    border-radius: 14px;
-    background-color: var(--tertiary);
+.importBtn:hover {
+    border-color: var(--tertiary-hover);
     color: var(--primary-text);
-    flex-shrink: 0;
-    transition: background-color 0.2s;
-}
-
-.card:hover .cardIcon {
-    background-color: var(--tertiary-hover);
 }
 
-.cardTitle {
-    font-family: var(--font-josefin), sans-serif;
-    font-style: italic;
-    font-size: 1.25rem;
-    font-weight: 700;
-    color: var(--primary-text);
-    margin: 0;
-    letter-spacing: 0.01em;
+.importBtn:active {
+    transform: scale(0.98);
+    transition: transform 0.07s;
 }
 
-.cardDesc {
-    font-size: 0.85rem;
-    color: var(--secondary-text);
-    margin: 0;
-    line-height: 1.5;
+.importBtn:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
 }
diff --git a/components/projects/EmptyProjectPage.tsx b/components/projects/EmptyProjectPage.tsx
index 393ea0da..cae827bc 100644
--- a/components/projects/EmptyProjectPage.tsx
+++ b/components/projects/EmptyProjectPage.tsx
@@ -55,29 +55,31 @@ const EmptyProjectPage = ({ setIsCreating }: Props) => {
                 accept={getSupportedImportExtensions()}
                 style={{ display: "none" }}
             />
-            <div className={styles.cards}>
-                <button className={styles.card} onClick={() => setIsCreating(true)}>
-                    <div className={styles.cardIcon}>
-                        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+            <div className={styles.heading}>
+                <p className={styles.title}>{t("empty.title")}</p>
+                <p className={styles.subtitle}>{t("empty.subtitle")}</p>
+            </div>
+            <div className={styles.row}>
+                <div className={styles.btnWrapper}>
+                    <button className={styles.createBtn} onClick={() => setIsCreating(true)}>
+                        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
                             <path d="M12 5v14M5 12h14" />
                         </svg>
-                    </div>
-                    <p className={styles.cardTitle}>{t("empty.createFirst")}</p>
-                    <p className={styles.cardDesc}>{t("empty.createDesc")}</p>
-                </button>
-                <button className={styles.card} onClick={handleImportClick} disabled={isImporting}>
-                    <div className={styles.cardIcon}>
-                        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                        {t("empty.createFirst")}
+                    </button>
+                    <span className={styles.formats}>{t("empty.createDesc")}</span>
+                </div>
+                <div className={styles.btnWrapper}>
+                    <button className={styles.importBtn} onClick={handleImportClick} disabled={isImporting}>
+                        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
                             <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
                             <polyline points="17 8 12 3 7 8" />
                             <line x1="12" y1="3" x2="12" y2="15" />
                         </svg>
-                    </div>
-                    <p className={styles.cardTitle}>
                         {isImporting ? t("importing") : t("empty.importExisting")}
-                    </p>
-                    <p className={styles.cardDesc}>{t("empty.importDesc")}</p>
-                </button>
+                    </button>
+                    <span className={styles.formats}>.fountain · .fdx · .txt · .scriptio</span>
+                </div>
             </div>
         </div>
     );
diff --git a/components/projects/ProjectItem.module.css b/components/projects/ProjectItem.module.css
index 889d50ea..8eec44fd 100644
--- a/components/projects/ProjectItem.module.css
+++ b/components/projects/ProjectItem.module.css
@@ -17,11 +17,12 @@
     background-color: var(--project-item-bg);
     box-shadow: var(--panel-shadow);
 
-    transition: border-color 0.2s;
+    transition: background-color 0.15s ease, transform 0.15s ease;
 }
 
 .container:hover {
-    border-color: var(--tertiary-hover);
+    background-color: var(--secondary-hover);
+    transform: translateY(-1px);
 }
 
 .container:active {
diff --git a/src/app/api/admin/projects/route.ts b/src/app/api/admin/projects/route.ts
index 003a394f..716737ee 100644
--- a/src/app/api/admin/projects/route.ts
+++ b/src/app/api/admin/projects/route.ts
@@ -18,10 +18,6 @@ async function searchProjects(req: NextRequest, { searchParams, user }: AuthApiC
     const { q, limit = 25, cursor } = validate(QuerySchema, searchParams);
     const term = (q ?? "").trim();
 
-    if (!term) {
-        return Success({ projects: [], nextCursor: null });
-    }
-
     const projects = await ProjectService.searchProjects(term, limit + 1, cursor);
     const hasMore = projects.length > limit;
     const page = hasMore ? projects.slice(0, limit) : projects;
diff --git a/src/app/api/admin/users/route.ts b/src/app/api/admin/users/route.ts
index c134b4bb..288645f6 100644
--- a/src/app/api/admin/users/route.ts
+++ b/src/app/api/admin/users/route.ts
@@ -18,10 +18,6 @@ async function searchUsers(req: NextRequest, { searchParams, user }: AuthApiCont
     const { q, limit = 25, cursor } = validate(QuerySchema, searchParams);
     const term = (q ?? "").trim();
 
-    if (!term) {
-        return Success({ users: [], nextCursor: null });
-    }
-
     const users = await UserService.searchUsers(term, limit + 1, cursor);
     const hasMore = users.length > limit;
     const page = hasMore ? users.slice(0, limit) : users;
diff --git a/src/context/ViewContext.tsx b/src/context/ViewContext.tsx
index 262ede63..2b546fb8 100644
--- a/src/context/ViewContext.tsx
+++ b/src/context/ViewContext.tsx
@@ -42,8 +42,8 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
     const [focusedSide, setFocusedSideState] = useState<SplitSide>("primary");
     const [isEndlessScroll, setIsEndlessScroll] = useState<boolean>(false);
     const [showComments, setShowComments] = useState<boolean>(true);
-    const [leftSidebarOpen, setLeftSidebarOpen] = useState<boolean>(true);
-    const [rightSidebarOpen, setRightSidebarOpen] = useState<boolean>(true);
+    const [leftSidebarOpen, setLeftSidebarOpen] = useState<boolean>(false);
+    const [rightSidebarOpen, setRightSidebarOpen] = useState<boolean>(false);
 
     const isSplit = secondaryPanel !== null;
 
diff --git a/src/server/repository/project-repository.ts b/src/server/repository/project-repository.ts
index df9780a5..da49c73d 100644
--- a/src/server/repository/project-repository.ts
+++ b/src/server/repository/project-repository.ts
@@ -265,25 +265,27 @@ export class ProjectRepository {
     }
 
     async searchProjects(term: string, limit: number, cursor?: number) {
-        const isUuid = /^[0-9a-f-]{36,}$/i.test(term);
-
-        if (isUuid) {
-            const project = await prisma.project.findUnique({
-                where: { id: term },
-                select: {
-                    id: true,
-                    title: true,
-                    author: true,
-                    createdAt: true,
-                    updatedAt: true,
-                    _count: { select: { members: true } },
-                },
-            });
-            return project ? [project] : [];
+        if (term) {
+            const isUuid = /^[0-9a-f-]{36,}$/i.test(term);
+
+            if (isUuid) {
+                const project = await prisma.project.findUnique({
+                    where: { id: term },
+                    select: {
+                        id: true,
+                        title: true,
+                        author: true,
+                        createdAt: true,
+                        updatedAt: true,
+                        _count: { select: { members: true } },
+                    },
+                });
+                return project ? [project] : [];
+            }
         }
 
         return prisma.project.findMany({
-            where: { title: { contains: term, mode: "insensitive" } },
+            ...(term && { where: { title: { contains: term, mode: "insensitive" } } }),
             select: {
                 id: true,
                 title: true,
diff --git a/src/server/repository/user-repository.ts b/src/server/repository/user-repository.ts
index a8374617..bae10d1f 100644
--- a/src/server/repository/user-repository.ts
+++ b/src/server/repository/user-repository.ts
@@ -90,13 +90,14 @@ export class UserRepository {
     }
 
     searchUsers(term: string, limit: number, cursor?: number) {
-        const isLikelyId = /^[0-9a-f-]{30,}$/i.test(term);
-        const where: Prisma.UserWhereInput = isLikelyId
-            ? { OR: [{ id: term }, { email: { contains: term, mode: "insensitive" } }] }
-            : { email: { contains: term, mode: "insensitive" } };
+        const where: Prisma.UserWhereInput | undefined = term
+            ? (/^[0-9a-f-]{30,}$/i.test(term)
+                ? { OR: [{ id: term }, { email: { contains: term, mode: "insensitive" } }] }
+                : { email: { contains: term, mode: "insensitive" } })
+            : undefined;
 
         return prisma.user.findMany({
-            where,
+            ...(where && { where }),
             orderBy: { createdAt: "desc" },
             take: limit,
             ...(cursor !== undefined && { skip: cursor }),

From b9a5e9f2bee9c75dc491eea8310d53d54ee7dc81 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Thu, 30 Apr 2026 21:52:14 +0200
Subject: [PATCH 30/76] fixed dropdown width, cloud project sync fix, payment
 workflow fix, visual tweaks to desktop-oauth

---
 .../account/SubscriptionSettings.tsx          | 11 ++--
 .../preferences/KeybindsSettings.module.css   | 53 +++++++++++++++----
 .../preferences/KeybindsSettings.tsx          |  8 ++-
 .../editor/sidebar/ContextMenu.module.css     | 25 +++++----
 components/editor/sidebar/ContextMenu.tsx     | 30 ++++-------
 components/home/auth/AuthPage.module.css      |  4 +-
 components/navbar/SavesPanel.module.css       |  2 +
 components/navbar/SavesPanel.tsx              | 14 +++--
 .../ProjectUnavailableDialog.module.css       | 12 +++--
 .../projects/ProjectUnavailableDialog.tsx     | 23 ++++----
 package.json                                  |  4 +-
 src/app/projects/layout.tsx                   |  5 +-
 src/app/providers.tsx                         | 10 ++--
 src/lib/desktop-auth.ts                       |  2 +-
 src/lib/metrics/db-size-collector.ts          |  1 -
 src/lib/metrics/registry.ts                   |  1 -
 src/lib/project/project-state.ts              |  6 ++-
 src/lib/utils/hooks.ts                        | 17 ++++--
 18 files changed, 146 insertions(+), 82 deletions(-)

diff --git a/components/dashboard/account/SubscriptionSettings.tsx b/components/dashboard/account/SubscriptionSettings.tsx
index 5e5c0a86..ac69fe50 100644
--- a/components/dashboard/account/SubscriptionSettings.tsx
+++ b/components/dashboard/account/SubscriptionSettings.tsx
@@ -13,6 +13,11 @@ const APPLE_PRODUCT_ID = "app.scriptio.pro.monthly";
 const APPLE_SUBSCRIPTIONS_URL = "https://apps.apple.com/account/subscriptions";
 const PERKS = ["perkProjects", "perkSaves", "perkCollaborators", "perkAutoSave"] as const;
 
+// Apple IAP is only available on the macOS Tauri build. The Windows Tauri
+// build is distributed via the Microsoft Store but uses Stripe for billing.
+const isMacosTauri = () =>
+    isTauri() && typeof navigator !== "undefined" && /Mac/.test(navigator.userAgent);
+
 const SubscriptionSettings = () => {
     const { user, mutate } = useUser();
     const t = useTranslations("profile");
@@ -29,7 +34,7 @@ const SubscriptionSettings = () => {
 
     // Restore Apple purchases on mount to sync subscription state with the server.
     useEffect(() => {
-        if (!isTauri() || !user?.id) return;
+        if (!isMacosTauri() || !user?.id) return;
 
         let cancelled = false;
 
@@ -69,7 +74,7 @@ const SubscriptionSettings = () => {
         setError(null);
         setUpgradeLoading(true);
 
-        if (isTauri()) {
+        if (isMacosTauri()) {
             try {
                 const { purchase, restorePurchases, PurchaseState } = await import("@choochmeque/tauri-plugin-iap-api");
                 const result = await purchase(APPLE_PRODUCT_ID, "subs", {
@@ -212,7 +217,7 @@ const SubscriptionSettings = () => {
             ) : (
                 <button className={styles.upgradeBtn} onClick={handleUpgrade} disabled={upgradeLoading}>
                     {upgradeLoading
-                        ? isTauri() ? t("subscription.purchasing") : t("subscription.redirecting")
+                        ? isMacosTauri() ? t("subscription.purchasing") : t("subscription.redirecting")
                         : t("subscription.upgradeBtn")
                     }
                     {!upgradeLoading && <ArrowRight size={16} />}
diff --git a/components/dashboard/preferences/KeybindsSettings.module.css b/components/dashboard/preferences/KeybindsSettings.module.css
index b6230725..e73b9801 100644
--- a/components/dashboard/preferences/KeybindsSettings.module.css
+++ b/components/dashboard/preferences/KeybindsSettings.module.css
@@ -56,26 +56,51 @@
 
 /* clickable area where user clicks to record combination */
 .keyArea {
-  min-width: 140px;
+  min-width: 150px;
   max-width: 280px;
-  padding: 8px 10px;
-  border-radius: 6px;
-  border: 1px dashed var(--primary-text);
-  background: var(--tertiary);
+  padding: 8px 14px;
+  border-radius: 8px;
+  border: 1px solid var(--separator);
+  background: var(--primary);
   cursor: pointer;
   display: flex;
   align-items: center;
   justify-content: center;
+  outline: none;
+  transition: border-color 0.15s ease, background-color 0.15s ease, box-shadow 0.15s ease;
 }
 
-.keyArea:hover, .keyArea:focus {
-  background: var(--tertiary-hover);
+.keyArea:hover {
+  border-color: var(--primary-text);
+  background: var(--primary-hover);
+}
+
+.keyArea:focus-visible {
+  border-color: var(--primary-text);
+  box-shadow: 0 0 0 3px var(--separator);
+}
+
+.keyArea[data-listening="true"] {
+  border-color: var(--primary-text);
+  background: var(--primary-hover);
+  animation: keyAreaPulse 1.4s ease-in-out infinite;
+}
+
+@keyframes keyAreaPulse {
+  0%, 100% {
+    box-shadow: 0 0 0 0 var(--separator);
+  }
+  50% {
+    box-shadow: 0 0 0 6px transparent;
+  }
 }
 
 .keyText {
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, "Roboto Mono", monospace;
   font-size: 13px;
+  font-weight: 500;
   color: var(--primary-text);
+  letter-spacing: 0.02em;
 }
 
 .keyAreaActions {
@@ -85,17 +110,25 @@
 }
 
 .clearBtn {
-  padding: 6px 9px;
-  border-radius: 6px;
+  padding: 6px 12px;
+  border-radius: 8px;
   color: var(--secondary-text);
-  border: 1px solid var(--secondary-text);
+  border: 1px solid var(--separator);
   background: var(--tertiary);
   font-size: 12px;
+  font-weight: 500;
   cursor: pointer;
+  transition: background-color 0.15s ease, color 0.15s ease, border-color 0.15s ease;
 }
 
 .clearBtn:hover {
   background: var(--tertiary-hover);
+  color: var(--primary-text);
+  border-color: var(--primary-text);
+}
+
+.clearBtn:active {
+  background: var(--tertiary-hover);
 }
 
 .optionCard {
diff --git a/components/dashboard/preferences/KeybindsSettings.tsx b/components/dashboard/preferences/KeybindsSettings.tsx
index 250a4475..0faa8957 100644
--- a/components/dashboard/preferences/KeybindsSettings.tsx
+++ b/components/dashboard/preferences/KeybindsSettings.tsx
@@ -46,6 +46,7 @@ const KeybindElement = ({
                     role="button"
                     tabIndex={0}
                     className={styles.keyArea}
+                    data-listening={isListening}
                     onClick={() => startListening(id)}
                     onKeyDown={(e) => {
                         if (e.key === "Enter" || e.key === " ") {
@@ -171,16 +172,19 @@ const KeybindsSettings = () => {
 
         const onCancel = (e: KeyboardEvent) => {
             if (e.key === "Escape") {
+                // Stop the dashboard's window-level Escape handler from also firing
+                // and closing the modal — Escape during capture only cancels listening.
+                e.stopImmediatePropagation();
                 setListeningFor(null);
                 setTempCombo(null);
             }
         };
 
         window.addEventListener("keydown", onKeyDown);
-        window.addEventListener("keydown", onCancel);
+        window.addEventListener("keydown", onCancel, { capture: true });
         return () => {
             window.removeEventListener("keydown", onKeyDown);
-            window.removeEventListener("keydown", onCancel);
+            window.removeEventListener("keydown", onCancel, { capture: true });
         };
     }, [listeningFor, saveSettings, t]);
 
diff --git a/components/editor/sidebar/ContextMenu.module.css b/components/editor/sidebar/ContextMenu.module.css
index b9af861e..cc266da3 100644
--- a/components/editor/sidebar/ContextMenu.module.css
+++ b/components/editor/sidebar/ContextMenu.module.css
@@ -1,7 +1,7 @@
 .menu {
     display: flex;
     flex-direction: column;
-    width: max-content;
+    width: 220px;
 
     z-index: 100;
     position: fixed;
@@ -13,11 +13,11 @@
 
 .menu_item {
     display: flex;
+    align-items: center;
     gap: 10px;
 
     padding-block: 8px;
-    padding-left: 12px;
-    padding-right: 35px;
+    padding-inline: 12px;
 
     font-size: 14px;
     cursor: pointer;
@@ -29,17 +29,25 @@
 
 .menu_item_disabled {
     display: flex;
+    align-items: center;
     gap: 10px;
 
     padding-block: 8px;
-    padding-left: 12px;
-    padding-right: 35px;
+    padding-inline: 12px;
 
     font-size: 14px;
     cursor: default;
     opacity: 0.4;
 }
 
+.menu_item_icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    flex-shrink: 0;
+}
+
 .menu_separator {
     height: 1px;
     background-color: var(--separator);
@@ -48,11 +56,11 @@
 
 .suggestion_item {
     display: flex;
+    align-items: center;
     gap: 10px;
 
     padding-block: 8px;
-    padding-left: 12px;
-    padding-right: 35px;
+    padding-inline: 12px;
 
     font-size: 14px;
     font-weight: 600;
@@ -69,8 +77,7 @@
     align-items: center;
 
     padding-block: 8px;
-    padding-left: 12px;
-    padding-right: 35px;
+    padding-inline: 12px;
 
     font-size: 13px;
     color: var(--secondary-text);
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index 6185731a..4b14cd83 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -20,14 +20,11 @@ import {
     ClipboardPaste,
     Columns2,
     Copy,
-    Highlighter,
     Loader2,
     LucideIcon,
     MessageSquarePlus,
     Pencil,
     Scissors,
-    Search,
-    SquareDashedMousePointer,
     Trash2,
     UserRound,
 } from "lucide-react";
@@ -62,7 +59,7 @@ export const enum ContextMenuType {
 type ContextMenuItemProps = {
     text: string;
     action: () => void;
-    icon: LucideIcon;
+    icon?: LucideIcon;
     disabled?: boolean;
 };
 
@@ -71,7 +68,7 @@ type SubMenuProps<T> = { props: T };
 export const ContextMenuItem = ({ text, action, icon: Icon, disabled }: ContextMenuItemProps) => {
     return (
         <div onClick={disabled ? undefined : action} className={disabled ? context.menu_item_disabled : context.menu_item}>
-            <Icon size={16} />
+            <span className={context.menu_item_icon}>{Icon && <Icon size={16} />}</span>
             <p className="unselectable">{text}</p>
         </div>
     );
@@ -98,15 +95,13 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
                 icon={ArrowDownRight}
                 action={() => focusOnPosition(editor!, scene.position)}
             />
-            <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editScenePopup(scene, userCtx)} />
+            <ContextMenuItem text={t("edit")} action={() => editScenePopup(scene, userCtx)} />
             <ContextMenuItem
                 text={t("cut")}
-                icon={Scissors}
                 action={() => cutText(editor!, scene.position, scene.nextPosition)}
             />
             <ContextMenuItem
                 text={t("selectInEditor")}
-                icon={SquareDashedMousePointer}
                 action={() => selectTextInEditor(editor!, scene.position, scene.nextPosition)}
             />
         </>
@@ -136,15 +131,13 @@ const CharacterItemMenu = ({ props }: SubMenuProps<CharacterContextProps>) => {
     return (
         <>
             <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editCharacterPopup(character, userCtx)} />
-            <ContextMenuItem text={t("remove")} icon={Trash2} action={() => deleteCharacter(character.name, projectCtx)} />
+            <ContextMenuItem text={t("remove")} action={() => deleteCharacter(character.name, projectCtx)} />
             <ContextMenuItem
                 text={t("paste")}
-                icon={ClipboardPaste}
                 action={() => pasteText(projectCtx.editor!, character.name)}
             />
             <ContextMenuItem
                 text={t("highlight")}
-                icon={Highlighter}
                 action={() => toggleCharacterHighlight(character.name)}
             />
         </>
@@ -174,7 +167,6 @@ const LocationItemMenu = ({ props }: SubMenuProps<LocationContextProps>) => {
         <>
             <ContextMenuItem icon={Trash2} text={t("remove")} action={() => deleteLocation(location.name, projectCtx)} />
             <ContextMenuItem
-                icon={ClipboardPaste}
                 text={t("paste")}
                 action={() => pasteText(projectCtx.editor!, location.name)}
             />
@@ -232,13 +224,13 @@ const EditorSelectionMenu = ({ props }: SubMenuProps<EditorSelectionContextProps
     return (
         <>
             {hasSelection && <ContextMenuItem text={t("copy")} icon={Copy} action={handleCopy} />}
-            {hasSelection && <ContextMenuItem text={t("cut")} icon={Scissors} action={handleCut} />}
-            <ContextMenuItem text={t("paste")} icon={ClipboardPaste} action={handlePaste} />
+            {hasSelection && <ContextMenuItem text={t("cut")} action={handleCut} />}
+            <ContextMenuItem text={t("paste")} icon={hasSelection ? undefined : ClipboardPaste} action={handlePaste} />
             {hasSelection && (
                 <>
                     <div className={context.menu_separator} />
                     <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
-                    <ContextMenuItem text={t("searchOnWeb")} icon={Search} action={handleSearchOnWeb} />
+                    <ContextMenuItem text={t("searchOnWeb")} action={handleSearchOnWeb} />
                 </>
             )}
         </>
@@ -398,7 +390,6 @@ const ShelveNodeMenu = ({ props }: SubMenuProps<{ pos: number; nodeClass: string
             {canDualDialogue && (
                 <ContextMenuItem
                     text={t("makeDualDialogue")}
-                    icon={Columns2}
                     action={() => {
                         if (editor) makeDualDialogue(editor, pos);
                         updateContextMenu(undefined);
@@ -551,15 +542,15 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
 
             {/* Clipboard — always visible */}
             <ContextMenuItem text={t("cut")} icon={Scissors} action={handleCut} disabled={!hasSelection} />
-            <ContextMenuItem text={t("copy")} icon={Copy} action={handleCopy} disabled={!hasSelection} />
-            <ContextMenuItem text={t("paste")} icon={ClipboardPaste} action={handlePaste} />
+            <ContextMenuItem text={t("copy")} action={handleCopy} disabled={!hasSelection} />
+            <ContextMenuItem text={t("paste")} action={handlePaste} />
 
             {/* Selection actions — only when there's a selection and no spellcheck error */}
             {hasSelection && !spellError && (
                 <>
                     <div className={context.menu_separator} />
                     <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
-                    <ContextMenuItem text={t("searchOnWeb")} icon={Search} action={handleSearchOnWeb} />
+                    <ContextMenuItem text={t("searchOnWeb")} action={handleSearchOnWeb} />
                 </>
             )}
 
@@ -581,7 +572,6 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
                     {canDualDialogue && (
                         <ContextMenuItem
                             text={t("makeDualDialogue")}
-                            icon={Columns2}
                             action={() => {
                                 if (editor && nodePos !== undefined) makeDualDialogue(editor, nodePos);
                                 updateContextMenu(undefined);
diff --git a/components/home/auth/AuthPage.module.css b/components/home/auth/AuthPage.module.css
index b70d20bc..5fcc98e6 100644
--- a/components/home/auth/AuthPage.module.css
+++ b/components/home/auth/AuthPage.module.css
@@ -2,13 +2,13 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    gap: 40px;
+    gap: 90px;
     padding: 40px;
 }
 
 .authLogo {
     width: auto;
-    height: 80px;
+    height: 50px;
 }
 
 .info {
diff --git a/components/navbar/SavesPanel.module.css b/components/navbar/SavesPanel.module.css
index cdfaaee8..a1db7a1b 100644
--- a/components/navbar/SavesPanel.module.css
+++ b/components/navbar/SavesPanel.module.css
@@ -312,12 +312,14 @@
 .pro_gate_btn {
     margin-top: 8px;
     padding: 6px 18px;
+    border: none;
     border-radius: 20px;
     background-color: var(--tertiary);
     color: var(--primary-text);
     font-size: 0.82rem;
     font-weight: 600;
     text-decoration: none;
+    cursor: pointer;
     transition: background-color 0.15s;
 }
 
diff --git a/components/navbar/SavesPanel.tsx b/components/navbar/SavesPanel.tsx
index 2e3c6265..b8e5161a 100644
--- a/components/navbar/SavesPanel.tsx
+++ b/components/navbar/SavesPanel.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { useEffect, useRef, useState } from "react";
-import Link from "next/link";
+import { useContext, useEffect, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
+import { DashboardContext } from "@src/context/DashboardContext";
 import {
     X,
     Save,
@@ -35,6 +35,12 @@ interface SavesPanelProps {
 const SavesPanel = ({ projectId, isOpen, onClose, isPro }: SavesPanelProps) => {
     const t = useTranslations("saves");
     const tDates = useTranslations("dates");
+    const { openDashboard } = useContext(DashboardContext);
+
+    const handleUpgrade = () => {
+        onClose();
+        openDashboard("Subscription");
+    };
 
     const [saves, setSaves] = useState<SaveEntry[]>([]);
     const [loading, setLoading] = useState(false);
@@ -186,9 +192,9 @@ const SavesPanel = ({ projectId, isOpen, onClose, isPro }: SavesPanelProps) => {
                     <Lock size={20} />
                     <p className={styles.pro_gate_title}>{t("proRequired")}</p>
                     <p className={styles.pro_gate_desc}>{t("proRequiredDesc")}</p>
-                    <Link href="/?settings=Profile" className={styles.pro_gate_btn}>
+                    <button className={styles.pro_gate_btn} onClick={handleUpgrade}>
                         {t("upgradeBtn")}
-                    </Link>
+                    </button>
                 </div>
             </div>
         );
diff --git a/components/projects/ProjectUnavailableDialog.module.css b/components/projects/ProjectUnavailableDialog.module.css
index fe77bcb3..1e6d8d29 100644
--- a/components/projects/ProjectUnavailableDialog.module.css
+++ b/components/projects/ProjectUnavailableDialog.module.css
@@ -46,11 +46,11 @@
     justify-content: center;
     gap: 8px;
     padding: 10px 16px;
-    border-radius: 8px;
-    border: none;
+    border-radius: 40px;
     font-size: 0.9rem;
+    font-weight: 500;
     cursor: pointer;
-    transition: all 0.2s ease;
+    transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease;
 }
 
 .btn:disabled {
@@ -59,12 +59,14 @@
 }
 
 .keepBtn {
-    background: var(--editor-tab-active);
+    background: var(--tertiary);
     color: var(--primary-text);
+    border: 1px solid var(--separator);
 }
 
 .keepBtn:hover:not(:disabled) {
-    opacity: 0.85;
+    background: var(--tertiary-hover);
+    border-color: var(--primary-text);
 }
 
 .discardBtn {
diff --git a/components/projects/ProjectUnavailableDialog.tsx b/components/projects/ProjectUnavailableDialog.tsx
index bb1e791c..5c6b6606 100644
--- a/components/projects/ProjectUnavailableDialog.tsx
+++ b/components/projects/ProjectUnavailableDialog.tsx
@@ -2,9 +2,15 @@
 
 import { useCallback, useContext, useState } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
-import { ProjectContext } from "@src/context/ProjectContext";
 import { Save, Trash2 } from "lucide-react";
 
+import { ProjectContext } from "@src/context/ProjectContext";
+import {
+    discardCloudProjectData,
+    getCachedProject,
+    migrateToCachedProject,
+} from "@src/lib/persistence/storage-provider/local-persistence";
+
 import styles from "./ProjectUnavailableDialog.module.css";
 
 const ProjectUnavailableDialog = () => {
@@ -19,25 +25,20 @@ const ProjectUnavailableDialog = () => {
         if (!projectId) return;
         setLoading(true);
         try {
-            const { getCachedProject, migrateToCachedProject } =
-                await import("@src/lib/persistence/storage-provider/local-persistence");
-            const cachedProject = await getCachedProject(projectId);
-            const metadataTitle = repository?.getTitle();
-            const title = cachedProject?.title || project?.project?.title || metadataTitle || "Untitled Project";
-            const newProject = await migrateToCachedProject(projectId, title, cachedProject?.description ?? undefined);
-            router.replace(`/projects/screenplay?projectId=${newProject.id}`);
+            const cached = await getCachedProject(projectId);
+            const title = cached?.title || project?.project?.title || repository?.getTitle() || "Untitled Project";
+            const newProject = await migrateToCachedProject(projectId, title, cached?.description ?? undefined);
+            router.replace(`/projects?projectId=${newProject.id}`);
         } catch (e) {
             console.error("[ProjectUnavailableDialog] Migration failed:", e);
             setLoading(false);
         }
-    }, [projectId, repository, router, project?.project?.title]);
+    }, [projectId, repository, router, project]);
 
     const handleDiscard = useCallback(async () => {
         if (!projectId) return;
         setLoading(true);
         try {
-            const { discardCloudProjectData } =
-                await import("@src/lib/persistence/storage-provider/local-persistence");
             await discardCloudProjectData(projectId);
             router.replace("/projects");
         } catch (e) {
diff --git a/package.json b/package.json
index 4b134dec..a4720068 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
         "dev": "docker compose --profile dev up -d --wait && npx prisma db push && next dev",
         "build": "npx prisma generate && next build",
         "build:tauri": "npx prisma generate && npx tsx scripts/build-tauri.ts",
-        "worker:dev": "wrangler dev -c src/lib/cloud/wrangler.toml",
-        "worker:deploy": "wrangler deploy -c src/lib/cloud/wrangler.toml",
+        "cloud:dev": "wrangler dev -c src/lib/cloud/wrangler.toml",
+        "cloud:deploy": "wrangler deploy -c src/lib/cloud/wrangler.toml",
         "stripe:dev": "stripe listen --forward-to localhost:3000/api/webhooks/stripe",
         "tauri": "tauri",
         "tauri:dev": "tauri dev",
diff --git a/src/app/projects/layout.tsx b/src/app/projects/layout.tsx
index 127b9fa6..0a977e0d 100644
--- a/src/app/projects/layout.tsx
+++ b/src/app/projects/layout.tsx
@@ -81,8 +81,9 @@ const ProjectLayoutInner = ({ children }: ProjectLayoutInnerProps) => {
         redirect("/projects");
     }
 
-    // On desktop, show dialog when cloud project is unavailable
-    if (isDesktop && isProjectUnavailable) {
+    // The cloud copy is gone (project deleted, or the user was removed). Offer the
+    // user a choice between keeping a local copy or discarding it — same on web and desktop.
+    if (isProjectUnavailable) {
         return <ProjectUnavailableDialog />;
     }
 
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
index 01955184..01a3df43 100644
--- a/src/app/providers.tsx
+++ b/src/app/providers.tsx
@@ -43,13 +43,17 @@ export function Providers({ children }: { children: ReactNode }) {
                 fetcher,
                 onSuccess: () => { },
                 onError: (err) => {
-                    if (err?.status !== 401 && err?.status !== 403) {
+                    // 401/403 are handled by the auth flow. 404 is expected for offline-first
+                    // resources (e.g. a cached project whose cloud copy no longer exists) — the
+                    // calling hook decides what to do, no need to log it as unexpected.
+                    if (err?.status !== 401 && err?.status !== 403 && err?.status !== 404) {
                         console.error("[Fetcher] An unexpected error occurred: ", err);
                     }
                 },
                 shouldRetryOnError: (err) => {
-                    // Don't retry on auth errors (401, 403) or network errors (server unreachable)
-                    if (err?.status === 401 || err?.status === 403 || err?.isNetworkError) {
+                    // Don't retry on auth errors (401, 403), missing resources (404), or
+                    // network errors (server unreachable).
+                    if (err?.status === 401 || err?.status === 403 || err?.status === 404 || err?.isNetworkError) {
                         return false;
                     }
                     return true;
diff --git a/src/lib/desktop-auth.ts b/src/lib/desktop-auth.ts
index 249b5caa..33d565f7 100644
--- a/src/lib/desktop-auth.ts
+++ b/src/lib/desktop-auth.ts
@@ -103,7 +103,7 @@ export async function pollBridgeToken(
                 const token = json.data?.token;
                 if (token) return token;
             }
-        } catch (err) {
+        } catch {
             if (signal?.aborted) return null;
             // network blip — keep polling
         }
diff --git a/src/lib/metrics/db-size-collector.ts b/src/lib/metrics/db-size-collector.ts
index bd7af953..22ce0699 100644
--- a/src/lib/metrics/db-size-collector.ts
+++ b/src/lib/metrics/db-size-collector.ts
@@ -4,7 +4,6 @@ import { dbSizeBytes } from "./registry";
 const POLL_INTERVAL_MS = 30_000;
 
 declare global {
-    // eslint-disable-next-line no-var
     var __scriptio_db_size_timer__: NodeJS.Timeout | undefined;
 }
 
diff --git a/src/lib/metrics/registry.ts b/src/lib/metrics/registry.ts
index 1f132ac2..361289c8 100644
--- a/src/lib/metrics/registry.ts
+++ b/src/lib/metrics/registry.ts
@@ -8,7 +8,6 @@ type MetricsBundle = {
 };
 
 declare global {
-    // eslint-disable-next-line no-var
     var __scriptio_metrics__: MetricsBundle | undefined;
 }
 
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 0150b54f..35a6ead2 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -500,8 +500,10 @@ export const useCloudSync = (
                     setConnectionStatus("disconnected");
                     setIsCloudSynced(true); // Mark as "synced" so isReady becomes true
 
-                    // On desktop, 403 means the cloud project was deleted or user was removed
-                    if (status === 403 && isDesktop) {
+                    // 403 means the cloud project was deleted or the user was removed.
+                    // Surface the recovery dialog on both desktop and web — the local
+                    // cache is still valid and the user should choose what to do with it.
+                    if (status === 403) {
                         setIsProjectUnavailable(true);
                     }
                     return;
diff --git a/src/lib/utils/hooks.ts b/src/lib/utils/hooks.ts
index 333539da..4d6c8b17 100644
--- a/src/lib/utils/hooks.ts
+++ b/src/lib/utils/hooks.ts
@@ -343,7 +343,7 @@ const useProjectMembership = () => {
     // Fetch cloud membership only for authenticated users with non-local projects
     const shouldFetch = isAuthenticated && isLocalOnly === false && !!projectId;
 
-    const { data, isLoading, mutate } = useSWR<ProjectMembershipPayload>(
+    const { data, error, isLoading, mutate } = useSWR<ProjectMembershipPayload, { status?: number }>(
         shouldFetch ? `/api/projects/${projectId}` : null,
     );
 
@@ -353,13 +353,22 @@ const useProjectMembership = () => {
         }
     }, [data, isLoading, updateProject]);
 
-    // Treat as locally accessible: explicitly local-only, or any cached project when offline
-    const isLocalAccessible = isLocalOnly === true || (!isAuthenticated && !isUserLoading && isCachedLocally === true);
+    // The cloud copy is gone (e.g. owner lost Pro and the project was demoted server-side,
+    // or it was deleted from another device). Offline-first: if we still have it cached
+    // locally, fall back to that copy instead of redirecting away.
+    const cloudMissing = error?.status === 404 && isCachedLocally === true;
+
+    // Treat as locally accessible: explicitly local-only, any cached project when offline,
+    // or a cached project whose cloud copy disappeared.
+    const isLocalAccessible =
+        isLocalOnly === true ||
+        (!isAuthenticated && !isUserLoading && isCachedLocally === true) ||
+        cloudMissing;
 
     return {
         membership: data,
         isLocalOnly: isLocalAccessible,
-        isLoading: isUserLoading || isLocalOnly === null || isCachedLocally === null || (shouldFetch && isLoading),
+        isLoading: isUserLoading || isLocalOnly === null || isCachedLocally === null || (shouldFetch && isLoading && !error),
         mutate,
     };
 };

From 30e1e862931996cdab9f74c915678e2c4c6c84c6 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Thu, 30 Apr 2026 23:51:46 +0200
Subject: [PATCH 31/76] updated deployment for cloud durable object

---
 .../actions/setup-desktop-build/action.yml    |  4 +--
 .github/workflows/checks.yaml                 |  4 +--
 .github/workflows/deploy-release.yaml         | 23 ++++++++++++
 .github/workflows/deploy-staging.yaml         | 23 ++++++++++++
 Dockerfile                                    |  2 +-
 package.json                                  | 13 +++----
 src/lib/cloud/index.ts                        | 14 ++++----
 src/lib/cloud/room.ts                         |  2 +-
 src/lib/cloud/types.ts                        |  2 +-
 src/lib/cloud/wrangler.toml                   | 35 +++++++++++++++----
 10 files changed, 94 insertions(+), 28 deletions(-)

diff --git a/.github/actions/setup-desktop-build/action.yml b/.github/actions/setup-desktop-build/action.yml
index d11ca429..e06dd6d3 100644
--- a/.github/actions/setup-desktop-build/action.yml
+++ b/.github/actions/setup-desktop-build/action.yml
@@ -1,5 +1,5 @@
 name: Setup Desktop Build Toolchain
-description: Installs Node.js, Rust with platform-appropriate targets, MSIX bundler on Windows, and runs npm install.
+description: Installs Node.js, Rust with platform-appropriate targets, MSIX bundler on Windows, and runs npm ci.
 
 inputs:
     platform:
@@ -39,4 +39,4 @@ runs:
 
         - name: Install dependencies
           shell: bash
-          run: npm install
+          run: npm ci
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index 80c489c1..4144b77e 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -17,7 +17,7 @@ jobs:
                   cache: "npm"
 
             - name: Install dependencies
-              run: npm install
+              run: npm ci
 
             - name: Lint
               run: npm run lint
@@ -75,7 +75,7 @@ jobs:
                   cache: "npm"
 
             - name: Install dependencies
-              run: npm install
+              run: npm ci
 
             - name: Get Playwright version
               id: pw-version
diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index b802b0c9..d75b7474 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -71,6 +71,7 @@ jobs:
               env:
                   APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
                   NEXT_PUBLIC_API_URL: https://scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -113,6 +114,7 @@ jobs:
               run: npm run build:windows
               env:
                   NEXT_PUBLIC_API_URL: https://scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -133,6 +135,26 @@ jobs:
             - name: Publish to Microsoft Store
               run: msstore publish "$env:APP_PATH" -id "9P4M1XPHJKS1"
 
+    deploy-cloud:
+        runs-on: ubuntu-latest
+        needs: prepare
+        steps:
+            - uses: actions/checkout@v6
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: npm
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Deploy Cloudflare Worker (production)
+              run: npm run cloud:deploy:prod
+              env:
+                  CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+
     deploy-web:
         runs-on: ubuntu-latest
         needs: prepare
@@ -164,6 +186,7 @@ jobs:
                       ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }}
                   build-args: |
                       NEXT_PUBLIC_API_URL=https://scriptio.app
+                      NEXT_PUBLIC_CLOUD_URL=wss://cloud.scriptio.app
                       NEXT_PUBLIC_COMMIT_SHA=${{ env.COMMIT_SHA }}
                       NEXT_PUBLIC_APP_VERSION=${{ needs.prepare.outputs.version }}
 
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index ce4c5fef..3864c4a6 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -71,6 +71,7 @@ jobs:
               env:
                   APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.staging.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -114,6 +115,7 @@ jobs:
               run: npm run debug:windows
               env:
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.staging.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -134,6 +136,26 @@ jobs:
             - name: Publish to Microsoft Store (staging)
               run: msstore publish "$env:APP_PATH" -id "9P1N2HMSH40L"
 
+    deploy-cloud:
+        runs-on: ubuntu-latest
+        needs: prepare
+        steps:
+            - uses: actions/checkout@v6
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: npm
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Deploy Cloudflare Worker (staging)
+              run: npm run cloud:deploy:staging
+              env:
+                  CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+
     deploy-web:
         runs-on: ubuntu-latest
         needs: prepare
@@ -165,6 +187,7 @@ jobs:
                       ${{ env.IMAGE_NAME }}:staging-${{ needs.prepare.outputs.version }}
                   build-args: |
                       NEXT_PUBLIC_API_URL=https://staging.scriptio.app
+                      NEXT_PUBLIC_CLOUD_URL=wss://cloud.staging.scriptio.app
                       NEXT_PUBLIC_COMMIT_SHA=${{ env.COMMIT_SHA }}
                       NEXT_PUBLIC_APP_VERSION=${{ needs.prepare.outputs.version }}
 
diff --git a/Dockerfile b/Dockerfile
index a6df5d08..c99ded3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache git
 
 WORKDIR /usr/app
 COPY ./package*.json ./
-RUN npm install
+RUN npm ci
 COPY ./ ./
 
 ENV DATABASE_URL="postgresql://dummy:dummy@localhost:5432/dummy"
diff --git a/package.json b/package.json
index a4720068..a0fdcb7c 100644
--- a/package.json
+++ b/package.json
@@ -5,14 +5,17 @@
     "type": "module",
     "scripts": {
         "postinstall": "patch-package",
+        "export": "next export",
+        "start": "next start",
         "dev": "docker compose --profile dev up -d --wait && npx prisma db push && next dev",
         "build": "npx prisma generate && next build",
-        "build:tauri": "npx prisma generate && npx tsx scripts/build-tauri.ts",
-        "cloud:dev": "wrangler dev -c src/lib/cloud/wrangler.toml",
-        "cloud:deploy": "wrangler deploy -c src/lib/cloud/wrangler.toml",
-        "stripe:dev": "stripe listen --forward-to localhost:3000/api/webhooks/stripe",
         "tauri": "tauri",
         "tauri:dev": "tauri dev",
+        "build:tauri": "npx prisma generate && npx tsx scripts/build-tauri.ts",
+        "stripe:dev": "stripe listen --forward-to localhost:3000/api/webhooks/stripe",
+        "cloud:dev": "wrangler dev -c src/lib/cloud/wrangler.toml",
+        "cloud:deploy:staging": "wrangler deploy -c src/lib/cloud/wrangler.toml --env staging",
+        "cloud:deploy:prod": "wrangler deploy -c src/lib/cloud/wrangler.toml --env production",
         "build:standalone": "next build && tauri dev --no-watch",
         "build:windows": "tauri-windows-bundle build --arch x64,arm64 --runner npm",
         "debug:windows": "tauri-windows-bundle build --arch x64,arm64 --debug --runner npm",
@@ -22,8 +25,6 @@
         "build:macos": "npm run tauri build -- --bundles app --target universal-apple-darwin",
         "debug:macos": "npm run tauri build -- --bundles app --target universal-apple-darwin --debug",
         "build:macos:appstore": "npm run tauri build -- --bundles app --target universal-apple-darwin --config src-tauri/tauri.appstore.conf.json",
-        "export": "next export",
-        "start": "next start",
         "lint": "eslint .",
         "bench": "vitest bench",
         "bench:watch": "vitest bench --watch",
diff --git a/src/lib/cloud/index.ts b/src/lib/cloud/index.ts
index 714eaff1..5e4f2969 100644
--- a/src/lib/cloud/index.ts
+++ b/src/lib/cloud/index.ts
@@ -1,7 +1,7 @@
 /// <reference types="@cloudflare/workers-types" />
 import { jwtVerify, JWTPayload } from "jose";
 import { Env } from "./types";
-import { ScreenplayRoom } from "./room";
+import { ProjectRoom } from "./room";
 
 interface DecodedToken extends JWTPayload {
     type?: string;
@@ -20,7 +20,7 @@ async function getVerifiedPayload(token: string | null, secret: string): Promise
     }
 }
 
-export { ScreenplayRoom };
+export { ProjectRoom };
 
 const worker = {
     async fetch(request: Request, env: Env): Promise<Response> {
@@ -38,9 +38,7 @@ const worker = {
 
         // Authenticated API endpoints (saves, blacklist, allow)
         const isAuthEndpoint =
-            url.pathname.includes("/saves") ||
-            url.pathname.endsWith("/blacklist") ||
-            url.pathname.endsWith("/allow");
+            url.pathname.includes("/saves") || url.pathname.endsWith("/blacklist") || url.pathname.endsWith("/allow");
 
         if (isAuthEndpoint && request.method !== "GET") {
             const authHeader = request.headers.get("Authorization");
@@ -55,7 +53,7 @@ const worker = {
                 return new Response("Unauthorized: Project mismatch", { status: 401 });
             }
 
-            const stub = env.SCREENPLAY_ROOM.get(env.SCREENPLAY_ROOM.idFromName(projectId));
+            const stub = env.PROJECT_ROOM.get(env.PROJECT_ROOM.idFromName(projectId));
             const doUrl = new URL(request.url);
             doUrl.pathname = doPath;
             const doRequest = new Request(doUrl.toString(), request);
@@ -77,7 +75,7 @@ const worker = {
                 return new Response("Unauthorized: Project mismatch", { status: 401 });
             }
 
-            const stub = env.SCREENPLAY_ROOM.get(env.SCREENPLAY_ROOM.idFromName(projectId));
+            const stub = env.PROJECT_ROOM.get(env.PROJECT_ROOM.idFromName(projectId));
             const doUrl = new URL(request.url);
             doUrl.pathname = doPath;
             const doRequest = new Request(doUrl.toString(), request);
@@ -103,7 +101,7 @@ const worker = {
             newRequest.headers.set("X-User-Id", userId);
             newRequest.headers.set("X-Project-Id", projectId);
 
-            const stub = env.SCREENPLAY_ROOM.get(env.SCREENPLAY_ROOM.idFromName(projectId));
+            const stub = env.PROJECT_ROOM.get(env.PROJECT_ROOM.idFromName(projectId));
             return stub.fetch(newRequest);
         }
 
diff --git a/src/lib/cloud/room.ts b/src/lib/cloud/room.ts
index b0be2af5..7f9260eb 100644
--- a/src/lib/cloud/room.ts
+++ b/src/lib/cloud/room.ts
@@ -18,7 +18,7 @@ import {
 } from "./types";
 import { handleProtocolMessage } from "./protocol";
 
-export class ScreenplayRoom extends DurableObject {
+export class ProjectRoom extends DurableObject {
     doc: Y.Doc;
     saveTimeout: ReturnType<typeof setTimeout> | null = null;
     awareness: awarenessProtocol.Awareness;
diff --git a/src/lib/cloud/types.ts b/src/lib/cloud/types.ts
index e6a9f47e..33006eeb 100644
--- a/src/lib/cloud/types.ts
+++ b/src/lib/cloud/types.ts
@@ -1,7 +1,7 @@
 /// <reference types="@cloudflare/workers-types" />
 
 export interface Env {
-    SCREENPLAY_ROOM: DurableObjectNamespace;
+    PROJECT_ROOM: DurableObjectNamespace;
     JWT_SECRET: string;
     SNAPSHOTS: R2Bucket;
 }
diff --git a/src/lib/cloud/wrangler.toml b/src/lib/cloud/wrangler.toml
index aa5e5f6d..9e371a2d 100644
--- a/src/lib/cloud/wrangler.toml
+++ b/src/lib/cloud/wrangler.toml
@@ -1,16 +1,37 @@
-name = "screenplay-collaboration"
+# Global configuration
+name = "scriptio-cloud"
 main = "index.ts"
 compatibility_date = "2025-12-08"
 compatibility_flags = ["nodejs_compat"]
 
+# Default Durable Object binding (used as a template)
 [[durable_objects.bindings]]
-name = "SCREENPLAY_ROOM"
-class_name = "ScreenplayRoom"
+name = "PROJECT_ROOM"
+class_name = "ProjectRoom"
 
-[[r2_buckets]]
+# Migrations are global to the script class
+[[migrations]]
+tag = "v1"
+new_sqlite_classes = ["ProjectRoom"]
+
+# --- Production ---
+[env.production]
+name = "scriptio-cloud"
+routes = [
+  { pattern = "cloud.scriptio.app", custom_domain = true }
+]
+
+[[env.production.r2_buckets]]
 binding = "SNAPSHOTS"
 bucket_name = "scriptio-snapshots"
 
-[[migrations]]
-tag = "v1"
-new_sqlite_classes = ["ScreenplayRoom"]
\ No newline at end of file
+# --- Staging ---
+[env.staging]
+name = "scriptio-cloud-staging"
+routes = [
+  { pattern = "cloud.staging.scriptio.app", custom_domain = true }
+]
+
+[[env.staging.r2_buckets]]
+binding = "SNAPSHOTS"
+bucket_name = "scriptio-snapshots-staging"
\ No newline at end of file

From 1886d3d62f7e68a34210ffcbb51bde0861c91b12 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Fri, 1 May 2026 05:43:01 +0200
Subject: [PATCH 32/76] fixed compilation

---
 src/lib/cloud/protocol.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/cloud/protocol.ts b/src/lib/cloud/protocol.ts
index 3c43a014..58576e11 100644
--- a/src/lib/cloud/protocol.ts
+++ b/src/lib/cloud/protocol.ts
@@ -2,9 +2,9 @@ import * as encoding from "lib0/encoding";
 import * as decoding from "lib0/decoding";
 import * as syncProtocol from "y-protocols/sync";
 import * as awarenessProtocol from "y-protocols/awareness";
-import type { ScreenplayRoom } from "./room";
+import type { ProjectRoom } from "./room";
 
-export function handleProtocolMessage(room: ScreenplayRoom, fullMessage: Uint8Array, sender: WebSocket) {
+export function handleProtocolMessage(room: ProjectRoom, fullMessage: Uint8Array, sender: WebSocket) {
     const messageType = fullMessage[0];
     const messageContent = fullMessage.subarray(1);
     const decoder = decoding.createDecoder(messageContent);
@@ -19,7 +19,7 @@ export function handleProtocolMessage(room: ScreenplayRoom, fullMessage: Uint8Ar
                 try {
                     while (decoding.hasContent(decoder)) {
                         // Passing 'sender' (WebSocket) as origin causes the doc.on('update')
-                        // listener (set up in constructor) to broadcast the change, 
+                        // listener (set up in constructor) to broadcast the change,
                         // schedule a hot save, and flag for cold snapshot.
                         syncProtocol.readSyncMessage(decoder, syncEncoder, room.doc, sender);
                     }
@@ -50,7 +50,7 @@ export function handleProtocolMessage(room: ScreenplayRoom, fullMessage: Uint8Ar
                     encoding.writeVarUint(respEncoder, 1); // awareness message type
                     encoding.writeVarUint8Array(
                         respEncoder,
-                        awarenessProtocol.encodeAwarenessUpdate(room.awareness, Array.from(currentStates.keys()))
+                        awarenessProtocol.encodeAwarenessUpdate(room.awareness, Array.from(currentStates.keys())),
                     );
                     sender.send(encoding.toUint8Array(respEncoder));
                 }

From 6bda6378d9d2059c8114dae00ba001675d31e075 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Fri, 1 May 2026 16:25:03 +0200
Subject: [PATCH 33/76] visual tweaks to dropdown, added missing translations,
 fixed cloudflare deployment...

---
 .github/workflows/deploy-release.yaml         |   11 +-
 .github/workflows/deploy-staging.yaml         |   11 +-
 .../dashboard/DashboardModal.module.css       |   21 +
 components/dashboard/DashboardModal.tsx       |    9 +-
 .../dashboard/account/AuthForm.module.css     |    4 +-
 .../preferences/KeybindsSettings.module.css   |   22 +-
 .../preferences/KeybindsSettings.tsx          |   23 +-
 .../editor/sidebar/ContextMenu.module.css     |    9 +-
 components/home/HomePageContainer.tsx         |    1 +
 components/home/Landing.module.css            |   26 +-
 components/navbar/SavesPanel.tsx              |    7 +-
 messages/de.json                              |    7 +-
 messages/en.json                              |    3 +-
 messages/es.json                              |    7 +-
 messages/fr.json                              |    7 +-
 messages/ja.json                              |    7 +-
 messages/ko.json                              |    7 +-
 messages/pl.json                              |    7 +-
 messages/zh.json                              |    7 +-
 package-lock.json                             | 1695 ++++++++---------
 package.json                                  |   11 +-
 styles/themes.css                             |   20 +-
 22 files changed, 900 insertions(+), 1022 deletions(-)

diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index d75b7474..b25cb396 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -141,17 +141,8 @@ jobs:
         steps:
             - uses: actions/checkout@v6
 
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-                  cache: npm
-
-            - name: Install dependencies
-              run: npm ci
-
             - name: Deploy Cloudflare Worker (production)
-              run: npm run cloud:deploy:prod
+              run: npx wrangler@4 deploy -c src/lib/cloud/wrangler.toml --env production
               env:
                   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index 3864c4a6..bfa091ad 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -142,17 +142,8 @@ jobs:
         steps:
             - uses: actions/checkout@v6
 
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-                  cache: npm
-
-            - name: Install dependencies
-              run: npm ci
-
             - name: Deploy Cloudflare Worker (staging)
-              run: npm run cloud:deploy:staging
+              run: npx wrangler@4 deploy -c src/lib/cloud/wrangler.toml --env staging
               env:
                   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 
diff --git a/components/dashboard/DashboardModal.module.css b/components/dashboard/DashboardModal.module.css
index d885c86a..0f426ff0 100644
--- a/components/dashboard/DashboardModal.module.css
+++ b/components/dashboard/DashboardModal.module.css
@@ -94,6 +94,7 @@
     flex-direction: column;
     padding: 30px;
     background: var(--main-bg);
+    min-height: 0;
 }
 
 .contentHeader {
@@ -101,15 +102,35 @@
     justify-content: space-between;
     align-items: center;
     margin-bottom: 20px;
+    flex-shrink: 0;
 }
 
 .scrollArea {
     overflow-y: auto;
     flex: 1;
+    min-height: 0;
     scrollbar-gutter: stable;
     padding-right: 20px;
 }
 
+.scrollArea::before {
+    content: "";
+    position: sticky;
+    top: 0;
+    display: block;
+    height: 12px;
+    margin-bottom: -12px;
+    background: linear-gradient(to bottom, var(--editor-shadow) 0%, rgba(0, 0, 0, 0) 100%);
+    pointer-events: none;
+    opacity: 0;
+    transition: opacity 0.2s ease;
+    z-index: 2;
+}
+
+.scrollArea.scrolled::before {
+    opacity: 1;
+}
+
 .input {
     width: 100%;
     padding: 10px;
diff --git a/components/dashboard/DashboardModal.tsx b/components/dashboard/DashboardModal.tsx
index 0266148b..8945690e 100644
--- a/components/dashboard/DashboardModal.tsx
+++ b/components/dashboard/DashboardModal.tsx
@@ -96,11 +96,18 @@ const DashboardModal = () => {
     }, [isInProject, isSignedIn, activeTab, setActiveTab, ACCOUNT_MENU, PREFERENCES_MENU, PROJECT_MENU]);
 
     const [prevActiveTab, setPrevActiveTab] = useState(activeTab);
+    const [isScrolled, setIsScrolled] = useState(false);
     if (prevActiveTab !== activeTab) {
         setPrevActiveTab(activeTab);
         setDangerOpen(false);
+        setIsScrolled(false);
     }
 
+    const handleScroll = (e: React.UIEvent<HTMLDivElement>) => {
+        const scrolled = e.currentTarget.scrollTop > 0;
+        setIsScrolled((prev) => (prev !== scrolled ? scrolled : prev));
+    };
+
     useEffect(() => {
         const handleEsc = (e: KeyboardEvent) => {
             if (e.key === "Escape") closeDashboard();
@@ -122,7 +129,7 @@ const DashboardModal = () => {
                         <X className={styles.close_btn} onClick={closeDashboard} />
                     </header>
 
-                    <div className={styles.scrollArea}>
+                    <div className={`${styles.scrollArea} ${isScrolled ? styles.scrolled : ""}`} onScroll={handleScroll}>
                         {/* Project tabs - only rendered when in project context */}
                         {isInProject && activeTab === "General" && <ProjectSettings dangerOpen={dangerOpen} onDangerToggle={() => setDangerOpen((v) => !v)} />}
                         {isInProject && activeTab === "Layout" && <LayoutSettings />}
diff --git a/components/dashboard/account/AuthForm.module.css b/components/dashboard/account/AuthForm.module.css
index 6952ef41..4538f2e6 100644
--- a/components/dashboard/account/AuthForm.module.css
+++ b/components/dashboard/account/AuthForm.module.css
@@ -107,7 +107,6 @@
     display: flex;
     flex-direction: column;
     gap: 10px;
-    margin-top: 12px;
 }
 
 .authSubmitBtn {
@@ -166,7 +165,7 @@
     display: flex;
     align-items: center;
     gap: 12px;
-    margin: 12px 0 4px;
+    margin: 12px 0 12px;
     font-size: 0.75rem;
     color: var(--secondary-text);
     text-transform: uppercase;
@@ -192,4 +191,3 @@
     justify-content: center;
     gap: 10px;
 }
-
diff --git a/components/dashboard/preferences/KeybindsSettings.module.css b/components/dashboard/preferences/KeybindsSettings.module.css
index e73b9801..f29b2311 100644
--- a/components/dashboard/preferences/KeybindsSettings.module.css
+++ b/components/dashboard/preferences/KeybindsSettings.module.css
@@ -110,25 +110,21 @@
 }
 
 .clearBtn {
-  padding: 6px 12px;
-  border-radius: 8px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 6px;
+  border: none;
+  border-radius: 6px;
+  background: transparent;
   color: var(--secondary-text);
-  border: 1px solid var(--separator);
-  background: var(--tertiary);
-  font-size: 12px;
-  font-weight: 500;
   cursor: pointer;
-  transition: background-color 0.15s ease, color 0.15s ease, border-color 0.15s ease;
+  transition: color 0.15s ease, background-color 0.15s ease;
 }
 
 .clearBtn:hover {
-  background: var(--tertiary-hover);
   color: var(--primary-text);
-  border-color: var(--primary-text);
-}
-
-.clearBtn:active {
-  background: var(--tertiary-hover);
+  background: var(--secondary-hover);
 }
 
 .optionCard {
diff --git a/components/dashboard/preferences/KeybindsSettings.tsx b/components/dashboard/preferences/KeybindsSettings.tsx
index 0faa8957..6063909a 100644
--- a/components/dashboard/preferences/KeybindsSettings.tsx
+++ b/components/dashboard/preferences/KeybindsSettings.tsx
@@ -10,7 +10,7 @@ import { useSettings } from "@src/lib/utils/hooks";
 import { tinykeys } from "@node_modules/tinykeys/dist/tinykeys";
 import { DEFAULT_KEYBINDS, DefaultKeyBind, prettyPrintKeybind, UserKeybindsMap } from "@src/lib/utils/keybinds";
 import { useTranslations } from "next-intl";
-import { Save } from "lucide-react";
+import { RotateCcw, Save } from "lucide-react";
 
 export type KeybindElementProps = {
     id: string;
@@ -73,7 +73,7 @@ const KeybindElement = ({
                         onClick={() => resetBinding(id)}
                         title={t("resetTitle")}
                     >
-                        {t("reset")}
+                        <RotateCcw size={16} />
                     </button>
                 </div>
             </div>
@@ -85,6 +85,7 @@ const KeybindsSettings = () => {
     const { settings, saveSettings } = useSettings();
 
     const t = useTranslations("keybinds");
+    const tCommon = useTranslations("common");
     const [userKeybinds, setUserKeybinds] = useState<UserKeybindsMap>(settings?.keybinds ?? {});
     const [listeningFor, setListeningFor] = useState<string | null>(null);
     const [tempCombo, setTempCombo] = useState<string | null>(null);
@@ -242,21 +243,13 @@ const KeybindsSettings = () => {
             </div>
 
             <div className={sharedStyles.formActions}>
-                <button
-                    type="button"
-                    onClick={resetDefaults}
-                    className={`${sharedStyles.formBtn} ${sharedStyles.danger}`}
-                >
-                    {t("resetDefaults")}
+                <button className={sharedStyles.formBtn} onClick={resetDefaults}>
+                    <RotateCcw size={18} />
+                    {tCommon("resetDefaults")}
                 </button>
-                <button
-                    type="button"
-                    onClick={saveChanges}
-                    disabled={!hasUpdatedKeybinds}
-                    className={`${sharedStyles.formBtn}`}
-                >
+                <button className={sharedStyles.formBtn} disabled={!hasUpdatedKeybinds} onClick={saveChanges}>
                     <Save size={18} />
-                    {t("save")}
+                    {tCommon("save")}
                 </button>
             </div>
         </div>
diff --git a/components/editor/sidebar/ContextMenu.module.css b/components/editor/sidebar/ContextMenu.module.css
index cc266da3..95855b57 100644
--- a/components/editor/sidebar/ContextMenu.module.css
+++ b/components/editor/sidebar/ContextMenu.module.css
@@ -5,6 +5,7 @@
 
     z-index: 100;
     position: fixed;
+    padding-block: 6px;
     overflow-y: auto;
     border-radius: 12px;
     background-color: var(--context-menu-bg);
@@ -16,7 +17,7 @@
     align-items: center;
     gap: 10px;
 
-    padding-block: 8px;
+    padding-block: 6px;
     padding-inline: 12px;
 
     font-size: 14px;
@@ -32,7 +33,7 @@
     align-items: center;
     gap: 10px;
 
-    padding-block: 8px;
+    padding-block: 6px;
     padding-inline: 12px;
 
     font-size: 14px;
@@ -59,7 +60,7 @@
     align-items: center;
     gap: 10px;
 
-    padding-block: 8px;
+    padding-block: 6px;
     padding-inline: 12px;
 
     font-size: 14px;
@@ -76,7 +77,7 @@
     gap: 10px;
     align-items: center;
 
-    padding-block: 8px;
+    padding-block: 6px;
     padding-inline: 12px;
 
     font-size: 13px;
diff --git a/components/home/HomePageContainer.tsx b/components/home/HomePageContainer.tsx
index 9e19a173..a38c7d64 100644
--- a/components/home/HomePageContainer.tsx
+++ b/components/home/HomePageContainer.tsx
@@ -53,6 +53,7 @@ export default function HomePageContainer() {
                             alt="Scriptio Interface Preview"
                             width={1920}
                             height={1080}
+                            loading="eager"
                             className={styles.heroBackgroundImage}
                         />
                     </div>
diff --git a/components/home/Landing.module.css b/components/home/Landing.module.css
index f8660b56..36d6f6ad 100644
--- a/components/home/Landing.module.css
+++ b/components/home/Landing.module.css
@@ -173,8 +173,10 @@
 }
 
 .heroBackgroundImage {
-    max-width: 110%;
+    width: 100%;
+    height: auto;
     max-height: 70vh;
+    object-fit: contain;
 }
 
 /* 1. Header & Branding */
@@ -274,6 +276,7 @@
 .ctaPlatformText {
     display: flex;
     flex-direction: column;
+    align-items: flex-start;
     line-height: 1.2;
 }
 
@@ -322,6 +325,16 @@
 
 /* Responsive Logic */
 @media (max-width: 768px) {
+    .marqueeContainer {
+        gap: 5vh;
+    }
+    .stripeText {
+        font-size: 1.75rem;
+    }
+    .cursor {
+        height: 1.75rem;
+    }
+
     .heroHeadline {
         font-size: 2.5rem;
     }
@@ -345,8 +358,8 @@
         gap: 1.5rem;
     }
     .heroBackgroundImage {
-        max-width: 140%;
-        max-height: 50vh;
+        max-width: 90%;
+        max-height: 35vh;
     }
 
     .sectionTitle {
@@ -425,11 +438,14 @@
     .pillarTitle {
         font-size: 1.1rem;
     }
+    .marqueeContainer {
+        gap: 3vh;
+    }
     .stripeText {
-        font-size: 1.5rem;
+        font-size: 1.1rem;
     }
     .cursor {
-        height: 1.5rem;
+        height: 1.1rem;
     }
 }
 
diff --git a/components/navbar/SavesPanel.tsx b/components/navbar/SavesPanel.tsx
index b8e5161a..77b3d80c 100644
--- a/components/navbar/SavesPanel.tsx
+++ b/components/navbar/SavesPanel.tsx
@@ -3,6 +3,7 @@
 import { useContext, useEffect, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
 import { DashboardContext } from "@src/context/DashboardContext";
+import { useCookieUser } from "@src/lib/utils/hooks";
 import {
     X,
     Save,
@@ -36,10 +37,12 @@ const SavesPanel = ({ projectId, isOpen, onClose, isPro }: SavesPanelProps) => {
     const t = useTranslations("saves");
     const tDates = useTranslations("dates");
     const { openDashboard } = useContext(DashboardContext);
+    const { user } = useCookieUser();
+    const isSignedIn = !!user;
 
     const handleUpgrade = () => {
         onClose();
-        openDashboard("Subscription");
+        openDashboard(isSignedIn ? "Subscription" : "Auth");
     };
 
     const [saves, setSaves] = useState<SaveEntry[]>([]);
@@ -193,7 +196,7 @@ const SavesPanel = ({ projectId, isOpen, onClose, isPro }: SavesPanelProps) => {
                     <p className={styles.pro_gate_title}>{t("proRequired")}</p>
                     <p className={styles.pro_gate_desc}>{t("proRequiredDesc")}</p>
                     <button className={styles.pro_gate_btn} onClick={handleUpgrade}>
-                        {t("upgradeBtn")}
+                        {isSignedIn ? t("upgradeBtn") : t("signInAndUpgrade")}
                     </button>
                 </div>
             </div>
diff --git a/messages/de.json b/messages/de.json
index a0c0217d..0468424a 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -434,9 +434,10 @@
     "confirmRestore": "Dies wird das aktuelle Dokument für alle Mitwirkenden ersetzen. Sind Sie sicher?",
     "confirmDelete": "Sind Sie sicher, dass Sie diese Speicherung löschen möchten?",
     "noSaves": "Noch keine Speicherungen vorhanden",
-    "proRequired": "Pro Required",
-    "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "proRequired": "Pro erforderlich",
+    "proRequiredDesc": "Der Versionsverlauf ist eine Pro-Funktion. Aktualisieren Sie Ihr Abonnement, um benannte Versionen Ihres Drehbuchs zu speichern und wiederherzustellen.",
+    "upgradeBtn": "Auf Pro upgraden",
+    "signInAndUpgrade": "Anmelden und upgraden"
   },
   "auth": {
     "intro": "Geben Sie Ihre E-Mail ein und wir senden Ihnen einen einmaligen Anmeldelink. Kein Passwort erforderlich.",
diff --git a/messages/en.json b/messages/en.json
index 4bcca531..7a641f65 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -435,7 +435,8 @@
     "noSaves": "No saves yet",
     "proRequired": "Pro Required",
     "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "upgradeBtn": "Upgrade to Pro",
+    "signInAndUpgrade": "Sign in and Upgrade"
   },
   "auth": {
     "intro": "Enter your email and we'll send you a single-use sign-in link. No password needed.",
diff --git a/messages/es.json b/messages/es.json
index f62a42d6..45cf0a38 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -433,9 +433,10 @@
     "confirmRestore": "Esto reemplazará el documento actual para todos los colaboradores. ¿Estás seguro?",
     "confirmDelete": "¿Estás seguro de que quieres eliminar este guardado?",
     "noSaves": "Aún no hay guardados",
-    "proRequired": "Pro Required",
-    "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "proRequired": "Se requiere Pro",
+    "proRequiredDesc": "El historial de versiones es una función Pro. Actualiza tu suscripción para guardar y restaurar versiones con nombre de tu guion.",
+    "upgradeBtn": "Actualizar a Pro",
+    "signInAndUpgrade": "Iniciar sesión y actualizar"
   },
   "auth": {
     "intro": "Introduce tu correo y te enviaremos un enlace de inicio de sesión de un solo uso. No necesitas contraseña.",
diff --git a/messages/fr.json b/messages/fr.json
index f2b1eb62..55d74f75 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -434,9 +434,10 @@
     "confirmRestore": "Cela remplacera le document actuel pour tous les collaborateurs. Êtes-vous sûr ?",
     "confirmDelete": "Êtes-vous sûr de vouloir supprimer cet enregistrement ?",
     "noSaves": "Aucun enregistrement pour le moment",
-    "proRequired": "Pro Required",
-    "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "proRequired": "Abonnement Pro requis",
+    "proRequiredDesc": "L'historique des versions est une fonctionnalité Pro. Passez à l'abonnement supérieur pour enregistrer et restaurer des versions nommées de votre scénario.",
+    "upgradeBtn": "Passer à Pro",
+    "signInAndUpgrade": "Se connecter et passer à Pro"
   },
   "auth": {
     "intro": "Saisissez votre e-mail et nous vous enverrons un lien de connexion à usage unique. Aucun mot de passe nécessaire.",
diff --git a/messages/ja.json b/messages/ja.json
index f6428a42..ebb73af0 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -433,9 +433,10 @@
     "confirmRestore": "全共同作業者の現在のドキュメントがこのバージョンで上書きされます。よろしいですか？",
     "confirmDelete": "この保存データを削除しますか？",
     "noSaves": "保存データはありません",
-    "proRequired": "Pro Required",
-    "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "proRequired": "Pro が必要です",
+    "proRequiredDesc": "バージョン履歴は Pro の機能です。アップグレードすると、脚本の名前付きバージョンを保存・復元できます。",
+    "upgradeBtn": "Pro にアップグレード",
+    "signInAndUpgrade": "サインインしてアップグレード"
   },
   "auth": {
     "intro": "メールアドレスを入力してください。一度きりのサインインリンクをお送りします。パスワードは必要ありません。",
diff --git a/messages/ko.json b/messages/ko.json
index d031da89..1254c202 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -433,9 +433,10 @@
     "confirmRestore": "모든 공동 작업자의 현재 문서가 이 버전으로 대체됩니다. 계속하시겠습니까?",
     "confirmDelete": "이 저장본을 삭제하시겠습니까?",
     "noSaves": "저장된 버전이 없습니다",
-    "proRequired": "Pro Required",
-    "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "proRequired": "Pro 필요",
+    "proRequiredDesc": "버전 기록은 Pro 기능입니다. 업그레이드하여 시나리오의 이름 있는 버전을 저장하고 복원하세요.",
+    "upgradeBtn": "Pro로 업그레이드",
+    "signInAndUpgrade": "로그인하고 업그레이드"
   },
   "auth": {
     "intro": "이메일을 입력하시면 일회용 로그인 링크를 보내드립니다. 비밀번호가 필요 없습니다.",
diff --git a/messages/pl.json b/messages/pl.json
index b982fd08..40e604be 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -433,9 +433,10 @@
     "confirmRestore": "To zastąpi aktualny dokument u wszystkich współpracowników. Czy na pewno?",
     "confirmDelete": "Czy na pewno chcesz usunąć ten zapis?",
     "noSaves": "Brak zapisów",
-    "proRequired": "Pro Required",
-    "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "proRequired": "Wymagana subskrypcja Pro",
+    "proRequiredDesc": "Historia wersji to funkcja Pro. Przejdź na wyższy plan, aby zapisywać i przywracać nazwane wersje swojego scenariusza.",
+    "upgradeBtn": "Przejdź na Pro",
+    "signInAndUpgrade": "Zaloguj się i przejdź na Pro"
   },
   "auth": {
     "intro": "Wprowadź swój e-mail, a wyślemy Ci jednorazowy link do logowania. Hasło nie jest potrzebne.",
diff --git a/messages/zh.json b/messages/zh.json
index 14655f9c..d1aa39ce 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -433,9 +433,10 @@
     "confirmRestore": "这将为所有协作成员覆盖当前文档。确认吗？",
     "confirmDelete": "确认删除此备份？",
     "noSaves": "暂无备份",
-    "proRequired": "Pro Required",
-    "proRequiredDesc": "Version history is a Pro feature. Upgrade to save and restore named versions of your screenplay.",
-    "upgradeBtn": "Upgrade to Pro"
+    "proRequired": "需要 Pro 版本",
+    "proRequiredDesc": "版本历史记录是 Pro 功能。升级即可保存和恢复您剧本的命名版本。",
+    "upgradeBtn": "升级到 Pro",
+    "signInAndUpgrade": "登录并升级"
   },
   "auth": {
     "intro": "输入您的邮箱，我们将向您发送一次性登录链接。无需密码。",
diff --git a/package-lock.json b/package-lock.json
index 2b2ac927..f4f44abd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,12 +45,12 @@
                 "jose": "^5.10.0",
                 "jspdf": "^4.2.0",
                 "lucide-react": "^0.562.0",
-                "nanoid": "^5.1.7",
+                "nanoid": "^5.1.11",
                 "next": "^16.1.6",
                 "next-auth": "^5.0.0-beta.30",
                 "next-intl": "^4.8.3",
                 "next-themes": "^0.2.0",
-                "nodemailer": "^7.0.12",
+                "nodemailer": "^8.0.7",
                 "pdfmake": "^0.2.9",
                 "pg": "^8.20.0",
                 "prom-client": "^15.1.3",
@@ -61,7 +61,7 @@
                 "stripe": "^21.0.1",
                 "swr": "^2.2.4",
                 "tinykeys": "^3.0.0",
-                "uuid": "^13.0.0",
+                "uuid": "^14.0.0",
                 "y-indexeddb": "^9.0.12",
                 "y-prosemirror": "^1.3.7",
                 "y-protocols": "^1.0.6",
@@ -82,7 +82,6 @@
                 "@types/pg": "^8.20.0",
                 "@types/react": "^18.3.27",
                 "@types/react-dom": "^18.3.7",
-                "@types/uuid": "^10.0.0",
                 "@typescript-eslint/eslint-plugin": "^8.49.0",
                 "@typescript-eslint/parser": "^8.49.0",
                 "@vitest/browser": "^3.2.4",
@@ -112,10 +111,22 @@
             "license": "MIT",
             "optional": true
         },
-        "node_modules/@auth/core": {
-            "version": "0.41.1",
-            "resolved": "https://registry.npmjs.org/@auth/core/-/core-0.41.1.tgz",
-            "integrity": "sha512-t9cJ2zNYAdWMacGRMT6+r4xr1uybIdmYa49calBPeTqwgAFPV/88ac9TEvCR85pvATiSPt8VaNf+Gt24JIT/uw==",
+        "node_modules/@auth/prisma-adapter": {
+            "version": "2.11.2",
+            "resolved": "https://registry.npmjs.org/@auth/prisma-adapter/-/prisma-adapter-2.11.2.tgz",
+            "integrity": "sha512-GyNEUNtrPgDPs0M4xX6F5i7jTsCKwU6BXV9zutctcoo6K1Ud+juckrmQS11uyNgeWsw6sliextHbU/e+8lsizQ==",
+            "license": "ISC",
+            "dependencies": {
+                "@auth/core": "0.41.2"
+            },
+            "peerDependencies": {
+                "@prisma/client": ">=2.26.0 || >=3 || >=4 || >=5 || >=6"
+            }
+        },
+        "node_modules/@auth/prisma-adapter/node_modules/@auth/core": {
+            "version": "0.41.2",
+            "resolved": "https://registry.npmjs.org/@auth/core/-/core-0.41.2.tgz",
+            "integrity": "sha512-Hx5MNBxN2fJTbJKGUKAA0wca43D0Akl3TvufY54Gn8lop7F+34vU1zA1pn0vQfIoVuLIrpfc2nkyjwIaPJMW7w==",
             "license": "ISC",
             "dependencies": {
                 "@panva/hkdf": "^1.2.1",
@@ -141,27 +152,15 @@
                 }
             }
         },
-        "node_modules/@auth/core/node_modules/jose": {
-            "version": "6.2.2",
-            "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.2.tgz",
-            "integrity": "sha512-d7kPDd34KO/YnzaDOlikGpOurfF0ByC2sEV4cANCtdqLlTfBlw2p14O/5d/zv40gJPbIQxfES3nSx1/oYNyuZQ==",
+        "node_modules/@auth/prisma-adapter/node_modules/jose": {
+            "version": "6.2.3",
+            "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz",
+            "integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/panva"
             }
         },
-        "node_modules/@auth/prisma-adapter": {
-            "version": "2.11.1",
-            "resolved": "https://registry.npmjs.org/@auth/prisma-adapter/-/prisma-adapter-2.11.1.tgz",
-            "integrity": "sha512-Ke7DXP0Fy0Mlmjz/ZJLXwQash2UkA4621xCM0rMtEczr1kppLc/njCbUkHkIQ/PnmILjqSPEKeTjDPsYruvkug==",
-            "license": "ISC",
-            "dependencies": {
-                "@auth/core": "0.41.1"
-            },
-            "peerDependencies": {
-                "@prisma/client": ">=2.26.0 || >=3 || >=4 || >=5 || >=6"
-            }
-        },
         "node_modules/@aws-crypto/crc32": {
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
@@ -1124,37 +1123,20 @@
             }
         },
         "node_modules/@aws-sdk/xml-builder": {
-            "version": "3.972.4",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.4.tgz",
-            "integrity": "sha512-0zJ05ANfYqI6+rGqj8samZBFod0dPPousBjLEqg8WdxSgbMAkRgLyn81lP215Do0rFJ/17LIXwr7q0yK24mP6Q==",
+            "version": "3.972.22",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.22.tgz",
+            "integrity": "sha512-PMYKKtJd70IsSG0yHrdAbxBr+ZWBKLvzFZfD3/urxgf6hXVMzuU5M+3MJ5G67RpOmLBu1fAUN65SbWuKUCOlAA==",
             "license": "Apache-2.0",
             "dependencies": {
-                "@smithy/types": "^4.12.0",
-                "fast-xml-parser": "5.3.4",
+                "@nodable/entities": "2.1.0",
+                "@smithy/types": "^4.14.1",
+                "fast-xml-parser": "5.7.2",
                 "tslib": "^2.6.2"
             },
             "engines": {
                 "node": ">=20.0.0"
             }
         },
-        "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
-            "version": "5.3.4",
-            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.4.tgz",
-            "integrity": "sha512-EFd6afGmXlCx8H8WTZHhAoDaWaGyuIBoZJ2mknrNxug+aZKjkp0a0dlars9Izl+jF+7Gu1/5f/2h68cQpe0IiA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/NaturalIntelligence"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "strnum": "^2.1.0"
-            },
-            "bin": {
-                "fxparser": "src/cli/cli.js"
-            }
-        },
         "node_modules/@aws/lambda-invoke-store": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.2.tgz",
@@ -2850,6 +2832,17 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@borewit/text-codec": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/@borewit/text-codec/-/text-codec-0.2.2.tgz",
+            "integrity": "sha512-DDaRehssg1aNrH4+2hnj1B7vnUGEjU6OIlyRdkMd0aUdIUvKXrJfXsy8LVtXAy7DRvYVluWbMspsRhz2lcW0mQ==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/Borewit"
+            }
+        },
         "node_modules/@choochmeque/tauri-plugin-iap-api": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/@choochmeque/tauri-plugin-iap-api/-/tauri-plugin-iap-api-0.8.2.tgz",
@@ -2874,6 +2867,29 @@
                 "tauri-windows-bundle": "dist/cli.js"
             }
         },
+        "node_modules/@choochmeque/tauri-windows-bundle/node_modules/balanced-match": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+            "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "18 || 20 || >=22"
+            }
+        },
+        "node_modules/@choochmeque/tauri-windows-bundle/node_modules/brace-expansion": {
+            "version": "5.0.5",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+            "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^4.0.2"
+            },
+            "engines": {
+                "node": "18 || 20 || >=22"
+            }
+        },
         "node_modules/@choochmeque/tauri-windows-bundle/node_modules/commander": {
             "version": "14.0.2",
             "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
@@ -2903,40 +2919,40 @@
             }
         },
         "node_modules/@choochmeque/tauri-windows-bundle/node_modules/minimatch": {
-            "version": "10.1.1",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-            "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+            "version": "10.2.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+            "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
             "dev": true,
             "license": "BlueOak-1.0.0",
             "dependencies": {
-                "@isaacs/brace-expansion": "^5.0.0"
+                "brace-expansion": "^5.0.5"
             },
             "engines": {
-                "node": "20 || >=22"
+                "node": "18 || 20 || >=22"
             },
             "funding": {
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/@cloudflare/kv-asset-handler": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.4.2.tgz",
-            "integrity": "sha512-SIOD2DxrRRwQ+jgzlXCqoEFiKOFqaPjhnNTGKXSRLvp1HiOvapLaFG2kEr9dYQTYe8rKrd9uvDUzmAITeNyaHQ==",
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.5.0.tgz",
+            "integrity": "sha512-jxQYkj8dSIzc0cD6cMMNdOc1UVjqSqu8BZdor5s8cGjW2I8BjODt/kWPVdY+u9zj3ms75Q5qaZgnxUad83+eAg==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "engines": {
-                "node": ">=18.0.0"
+                "node": ">=22.0.0"
             }
         },
         "node_modules/@cloudflare/unenv-preset": {
-            "version": "2.12.1",
-            "resolved": "https://registry.npmjs.org/@cloudflare/unenv-preset/-/unenv-preset-2.12.1.tgz",
-            "integrity": "sha512-tP/Wi+40aBJovonSNJSsS7aFJY0xjuckKplmzDs2Xat06BJ68B6iG7YDUWXJL8gNn0gqW7YC5WhlYhO3QbugQA==",
+            "version": "2.16.1",
+            "resolved": "https://registry.npmjs.org/@cloudflare/unenv-preset/-/unenv-preset-2.16.1.tgz",
+            "integrity": "sha512-ECxObrMfyTl5bhQf/lZCXwo5G6xX9IAUo+nDMKK4SZ8m4Jvvxp52vilxyySSWh2YTZz8+HQ07qGH/2rEom1vDw==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "peerDependencies": {
                 "unenv": "2.0.0-rc.24",
-                "workerd": "^1.20260115.0"
+                "workerd": ">1.20260305.0 <2.0.0-0"
             },
             "peerDependenciesMeta": {
                 "workerd": {
@@ -2945,9 +2961,9 @@
             }
         },
         "node_modules/@cloudflare/workerd-darwin-64": {
-            "version": "1.20260210.0",
-            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20260210.0.tgz",
-            "integrity": "sha512-e3vMgzr8ZM6VjpJVFrnMBhjvFhlMIkhT+BLpBk3pKaWsrXao+azDlmzzxB3Zf4CZ8LmCEtaP7n5d2mNGL6Dqww==",
+            "version": "1.20260430.1",
+            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20260430.1.tgz",
+            "integrity": "sha512-ADohZUHf7NBvPp2PdZig2Opxx+hDkk3ve7jrTne3JRx9kDSB73zc4LzcEeEN8LKkbAcqZmvfRJfpChSlusu0lA==",
             "cpu": [
                 "x64"
             ],
@@ -2962,9 +2978,9 @@
             }
         },
         "node_modules/@cloudflare/workerd-darwin-arm64": {
-            "version": "1.20260210.0",
-            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20260210.0.tgz",
-            "integrity": "sha512-ng2uLJVMrI5VrcAS26gDGM+qxCuWD4ZA8VR4i88RdyM8TLn+AqPFisrvn7AMA+QSv0+ck+ZdFtXek7qNp2gNuA==",
+            "version": "1.20260430.1",
+            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20260430.1.tgz",
+            "integrity": "sha512-/DoYC/1wHs+YRZzzqSQg1/EHB4hiv1yV5U8FnmapRRIzVaPtnt+ApeOXeMrIdKidgKOI8TqQzgBU8xbIM7Cl4Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2979,9 +2995,9 @@
             }
         },
         "node_modules/@cloudflare/workerd-linux-64": {
-            "version": "1.20260210.0",
-            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20260210.0.tgz",
-            "integrity": "sha512-frn2/+6DV59h13JbGSk9ATvJw3uORWssFIKZ/G/to+WRrIDQgCpSrjLtGbFSSn5eBEhYOvwxPKc7IrppkmIj/w==",
+            "version": "1.20260430.1",
+            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20260430.1.tgz",
+            "integrity": "sha512-koJhBWvEVZPKCVFtMLp2iMHlYr+lFCF47wGbnlKdHVlemV0zTxJEyHI8aLlrhPLhBmOmYLp46rXw09/qJkRIhQ==",
             "cpu": [
                 "x64"
             ],
@@ -2996,9 +3012,9 @@
             }
         },
         "node_modules/@cloudflare/workerd-linux-arm64": {
-            "version": "1.20260210.0",
-            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20260210.0.tgz",
-            "integrity": "sha512-0fmxEHaDcAF+7gcqnBcQdBCOzNvGz3mTMwqxEYJc5xZgFwQf65/dYK5fnV8z56GVNqu88NEnLMG3DD2G7Ey1vw==",
+            "version": "1.20260430.1",
+            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20260430.1.tgz",
+            "integrity": "sha512-hMdapNAzNQZDXGGkg4Slydc3fRJP5FUZLJVVcZCW/+imhhJro9Z1rv5n/wfR+txKoSWhTYR8eOp8Pyi2bzLzlw==",
             "cpu": [
                 "arm64"
             ],
@@ -3013,9 +3029,9 @@
             }
         },
         "node_modules/@cloudflare/workerd-windows-64": {
-            "version": "1.20260210.0",
-            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20260210.0.tgz",
-            "integrity": "sha512-G/Apjk/QLNnwbu8B0JO9FuAJKHNr+gl8X3G/7qaUrpwIkPx5JFQElVE6LKk4teSrycvAy5AzLFAL0lOB1xsUIQ==",
+            "version": "1.20260430.1",
+            "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20260430.1.tgz",
+            "integrity": "sha512-jS3ffixjb5USOwz4frw4WzCz0HrjVxkgyU3WiYb06N7hBAfN6eOrveAJ4QRef0+suK4V1vQFoB1oKdRBsXe9Dw==",
             "cpu": [
                 "x64"
             ],
@@ -3030,9 +3046,9 @@
             }
         },
         "node_modules/@cloudflare/workers-types": {
-            "version": "4.20260210.0",
-            "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20260210.0.tgz",
-            "integrity": "sha512-zHaF0RZVYUQwNCJCECnNAJdMur72Lk3FMiD6wU78Dx3Bv7DQRcuXNmPNuJmsGnosVZCcWintHlPTQ/4BEiDG5w==",
+            "version": "4.20260501.1",
+            "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20260501.1.tgz",
+            "integrity": "sha512-B/VX2w3my/sCqxKyWOX7SxUpFC1uD8Gh7I2zbI1d3zA8p7Tx03AFsnuEx8lYLmcd8yONAA93YsAZb1wAaLK83w==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "peer": true
@@ -3613,9 +3629,9 @@
             }
         },
         "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3624,9 +3640,9 @@
             }
         },
         "node_modules/@eslint/config-array/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -3687,9 +3703,9 @@
             }
         },
         "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3708,9 +3724,9 @@
             }
         },
         "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -3818,56 +3834,34 @@
             "integrity": "sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA==",
             "license": "MIT"
         },
-        "node_modules/@formatjs/ecma402-abstract": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-3.1.1.tgz",
-            "integrity": "sha512-jhZbTwda+2tcNrs4kKvxrPLPjx8QsBCLCUgrrJ/S+G9YrGHWLhAyFMMBHJBnBoOwuLHd7L14FgYudviKaxkO2Q==",
-            "license": "MIT",
-            "dependencies": {
-                "@formatjs/fast-memoize": "3.1.0",
-                "@formatjs/intl-localematcher": "0.8.1",
-                "decimal.js": "^10.6.0",
-                "tslib": "^2.8.1"
-            }
-        },
         "node_modules/@formatjs/fast-memoize": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-3.1.0.tgz",
-            "integrity": "sha512-b5mvSWCI+XVKiz5WhnBCY3RJ4ZwfjAidU0yVlKa3d3MSgKmH1hC3tBGEAtYyN5mqL7N0G5x0BOUYyO8CEupWgg==",
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.8.1"
-            }
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-3.1.3.tgz",
+            "integrity": "sha512-Ocd1vPuD68rW6BJDuAOtnnc1GPeVepY5kZXML1psGVFQ+1Q8CfkftT3Tnam+Mxx97Pz08jIEDCotl/GV+Naccg==",
+            "license": "MIT"
         },
         "node_modules/@formatjs/icu-messageformat-parser": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-3.5.1.tgz",
-            "integrity": "sha512-sSDmSvmmoVQ92XqWb499KrIhv/vLisJU8ITFrx7T7NZHUmMY7EL9xgRowAosaljhqnj/5iufG24QrdzB6X3ItA==",
+            "version": "3.5.6",
+            "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-3.5.6.tgz",
+            "integrity": "sha512-04ZjRIeQCnR/h32wBP9/S7rkyy1hLAs2fXJcNwc7hseJd//K9TMBqK0ukb4dXqnALKQ9m5ruZeOD2qqEkK9ixg==",
             "license": "MIT",
             "dependencies": {
-                "@formatjs/ecma402-abstract": "3.1.1",
-                "@formatjs/icu-skeleton-parser": "2.1.1",
-                "tslib": "^2.8.1"
+                "@formatjs/icu-skeleton-parser": "2.1.6"
             }
         },
         "node_modules/@formatjs/icu-skeleton-parser": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-2.1.1.tgz",
-            "integrity": "sha512-PSFABlcNefjI6yyk8f7nyX1DC7NHmq6WaCHZLySEXBrXuLOB2f935YsnzuPjlz+ibhb9yWTdPeVX1OVcj24w2Q==",
-            "license": "MIT",
-            "dependencies": {
-                "@formatjs/ecma402-abstract": "3.1.1",
-                "tslib": "^2.8.1"
-            }
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-2.1.6.tgz",
+            "integrity": "sha512-9f1VQ2kaaLHK0WPU1OrAmiNKCKJwyoDmwNzQXbUa6XtFBOgHZ4YZURE8sSedHmMr0kvpB75OtplB0hMYkfdwfg==",
+            "license": "MIT"
         },
         "node_modules/@formatjs/intl-localematcher": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.8.1.tgz",
-            "integrity": "sha512-xwEuwQFdtSq1UKtQnyTZWC+eHdv7Uygoa+H2k/9uzBVQjDyp9r20LNDNKedWXll7FssT3GRHvqsdJGYSUWqYFA==",
+            "version": "0.8.5",
+            "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.8.5.tgz",
+            "integrity": "sha512-TEW/NR367c3PcQ2AXfkNig9jC740+qbkM0LgKl7UCE7Xtv7C5Uk1mvlu86MjQZBmscUai8HSWjcEETpwaVvJ6A==",
             "license": "MIT",
             "dependencies": {
-                "@formatjs/fast-memoize": "3.1.0",
-                "tslib": "^2.8.1"
+                "@formatjs/fast-memoize": "3.1.3"
             }
         },
         "node_modules/@formkit/auto-animate": {
@@ -3931,13 +3925,13 @@
             }
         },
         "node_modules/@hono/node-server": {
-            "version": "1.19.11",
-            "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.11.tgz",
-            "integrity": "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-2.0.1.tgz",
+            "integrity": "sha512-jI9yMDyFpqBeSighf/zlXnQG/nl9AyBc6aAgy4XtxJMyt/CNyJpvPfzDD+bCc2zAOmhhqtF6TnmIaY+xV4mIrw==",
             "devOptional": true,
             "license": "MIT",
             "engines": {
-                "node": ">=18.14.1"
+                "node": ">=20"
             },
             "peerDependencies": {
                 "hono": "^4"
@@ -4485,42 +4479,19 @@
                 "url": "https://opencollective.com/libvips"
             }
         },
-        "node_modules/@isaacs/balanced-match": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
-            "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "20 || >=22"
-            }
-        },
-        "node_modules/@isaacs/brace-expansion": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz",
-            "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@isaacs/balanced-match": "^4.0.1"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            }
-        },
         "node_modules/@jimp/core": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/core/-/core-1.6.0.tgz",
-            "integrity": "sha512-EQQlKU3s9QfdJqiSrZWNTxBs3rKXgO2W+GxNXDtwchF3a4IqxDheFX1ti+Env9hdJXDiYLp2jTRjlxhPthsk8w==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/core/-/core-1.6.1.tgz",
+            "integrity": "sha512-+BoKC5G6hkrSy501zcJ2EpfnllP+avPevcBfRcZe/CW+EwEfY6X1EZ8QWyT7NpDIvEEJb1fdJnMMfUnFkxmw9A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/file-ops": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/file-ops": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "await-to-js": "^3.0.0",
                 "exif-parser": "^0.1.12",
-                "file-type": "^16.0.0",
+                "file-type": "^21.3.3",
                 "mime": "3"
             },
             "engines": {
@@ -4541,15 +4512,15 @@
             }
         },
         "node_modules/@jimp/diff": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/diff/-/diff-1.6.0.tgz",
-            "integrity": "sha512-+yUAQ5gvRC5D1WHYxjBHZI7JBRusGGSLf8AmPRPCenTzh4PA+wZ1xv2+cYqQwTfQHU5tXYOhA0xDytfHUf1Zyw==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/diff/-/diff-1.6.1.tgz",
+            "integrity": "sha512-YkKDPdHjLgo1Api3+Bhc0GLAygldlpt97NfOKoNg1U6IUNXA6X2MgosCjPfSBiSvJvrrz1fsIR+/4cfYXBI/HQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/plugin-resize": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/plugin-resize": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "pixelmatch": "^5.3.0"
             },
             "engines": {
@@ -4557,9 +4528,9 @@
             }
         },
         "node_modules/@jimp/file-ops": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/file-ops/-/file-ops-1.6.0.tgz",
-            "integrity": "sha512-Dx/bVDmgnRe1AlniRpCKrGRm5YvGmUwbDzt+MAkgmLGf+jvBT75hmMEZ003n9HQI/aPnm/YKnXjg/hOpzNCpHQ==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/file-ops/-/file-ops-1.6.1.tgz",
+            "integrity": "sha512-T+gX6osHjprbDRad0/B71Evyre7ZdVY1z/gFGEG9Z8KOtZPKboWvPeP2UjbZYWQLy9UKCPQX1FNAnDiOPkJL7w==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -4567,15 +4538,15 @@
             }
         },
         "node_modules/@jimp/js-bmp": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/js-bmp/-/js-bmp-1.6.0.tgz",
-            "integrity": "sha512-FU6Q5PC/e3yzLyBDXupR3SnL3htU7S3KEs4e6rjDP6gNEOXRFsWs6YD3hXuXd50jd8ummy+q2WSwuGkr8wi+Gw==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/js-bmp/-/js-bmp-1.6.1.tgz",
+            "integrity": "sha512-xzWzNT4/u5zGrTT3Tme9sGU7YzIKxi13+BCQwLqACbt5DXf9SAfdzRkopZQnmDko+6In5nqaT89Gjs43/WdnYQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "bmp-ts": "^1.0.9"
             },
             "engines": {
@@ -4583,14 +4554,14 @@
             }
         },
         "node_modules/@jimp/js-gif": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/js-gif/-/js-gif-1.6.0.tgz",
-            "integrity": "sha512-N9CZPHOrJTsAUoWkWZstLPpwT5AwJ0wge+47+ix3++SdSL/H2QzyMqxbcDYNFe4MoI5MIhATfb0/dl/wmX221g==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/js-gif/-/js-gif-1.6.1.tgz",
+            "integrity": "sha512-YjY2W26rQa05XhanYhRZ7dingCiNN+T2Ymb1JiigIbABY0B28wHE3v3Cf1/HZPWGu0hOg36ylaKgV5KxF2M58w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
                 "gifwrap": "^0.10.1",
                 "omggif": "^1.0.10"
             },
@@ -4599,14 +4570,14 @@
             }
         },
         "node_modules/@jimp/js-jpeg": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/js-jpeg/-/js-jpeg-1.6.0.tgz",
-            "integrity": "sha512-6vgFDqeusblf5Pok6B2DUiMXplH8RhIKAryj1yn+007SIAQ0khM1Uptxmpku/0MfbClx2r7pnJv9gWpAEJdMVA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/js-jpeg/-/js-jpeg-1.6.1.tgz",
+            "integrity": "sha512-HT9H3yOmlOFzYmdI15IYdfy6ggQhSRIaHeA+OTJSEORXBqEo97sUZu/DsgHIcX5NJ7TkJBTgZ9BZXsV6UbsyMg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
                 "jpeg-js": "^0.4.4"
             },
             "engines": {
@@ -4614,14 +4585,14 @@
             }
         },
         "node_modules/@jimp/js-png": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/js-png/-/js-png-1.6.0.tgz",
-            "integrity": "sha512-AbQHScy3hDDgMRNfG0tPjL88AV6qKAILGReIa3ATpW5QFjBKpisvUaOqhzJ7Reic1oawx3Riyv152gaPfqsBVg==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/js-png/-/js-png-1.6.1.tgz",
+            "integrity": "sha512-SZ/KVhI5UjcSzzlXsXdIi/LhJ7UShf2NkMOtVrbZQcGzsqNtynAelrOXeoTxcanfVqmNhAoVHg8yR2cYoqrYjA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
                 "pngjs": "^7.0.0"
             },
             "engines": {
@@ -4629,14 +4600,14 @@
             }
         },
         "node_modules/@jimp/js-tiff": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/js-tiff/-/js-tiff-1.6.0.tgz",
-            "integrity": "sha512-zhReR8/7KO+adijj3h0ZQUOiun3mXUv79zYEAKvE0O+rP7EhgtKvWJOZfRzdZSNv0Pu1rKtgM72qgtwe2tFvyw==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/js-tiff/-/js-tiff-1.6.1.tgz",
+            "integrity": "sha512-jDG/eJquID1M4MBlKMmDRBmz2TpXMv7TUyu2nIRUxhlUc2ogC82T+VQUkca9GJH1BBJ9dx5sSE5dGkWNjIbZxw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
                 "utif2": "^4.1.0"
             },
             "engines": {
@@ -4644,14 +4615,14 @@
             }
         },
         "node_modules/@jimp/plugin-blit": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-1.6.0.tgz",
-            "integrity": "sha512-M+uRWl1csi7qilnSK8uxK4RJMSuVeBiO1AY0+7APnfUbQNZm6hCe0CCFv1Iyw1D/Dhb8ph8fQgm5mwM0eSxgVA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-1.6.1.tgz",
+            "integrity": "sha512-MwnI7C7K81uWddY9FLw1fCOIy6SsPIUftUz36Spt7jisCn8/40DhQMlSxpxTNelnZb/2SnloFimQfRZAmHLOqQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4669,27 +4640,27 @@
             }
         },
         "node_modules/@jimp/plugin-blur": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-1.6.0.tgz",
-            "integrity": "sha512-zrM7iic1OTwUCb0g/rN5y+UnmdEsT3IfuCXCJJNs8SZzP0MkZ1eTvuwK9ZidCuMo4+J3xkzCidRwYXB5CyGZTw==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-1.6.1.tgz",
+            "integrity": "sha512-lIo7Tzp5jQu30EFFSK/phXANK3citKVEjepDjQ6ljHoIFtuMRrnybnmI2Md24ulvWlDaz+hh3n6qrMb8ydwhZQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/utils": "1.6.0"
+                "@jimp/core": "1.6.1",
+                "@jimp/utils": "1.6.1"
             },
             "engines": {
                 "node": ">=18"
             }
         },
         "node_modules/@jimp/plugin-circle": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-1.6.0.tgz",
-            "integrity": "sha512-xt1Gp+LtdMKAXfDp3HNaG30SPZW6AQ7dtAtTnoRKorRi+5yCJjKqXRgkewS5bvj8DEh87Ko1ydJfzqS3P2tdWw==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-1.6.1.tgz",
+            "integrity": "sha512-kK1PavY6cKHNNKce37vdV4Tmpc1/zDKngGoeOV3j+EMatoHFZUinV3s6F9aWryPs3A0xhCLZgdJ6Zeea1d5LCQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0",
+                "@jimp/types": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4707,15 +4678,15 @@
             }
         },
         "node_modules/@jimp/plugin-color": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-1.6.0.tgz",
-            "integrity": "sha512-J5q8IVCpkBsxIXM+45XOXTrsyfblyMZg3a9eAo0P7VPH4+CrvyNQwaYatbAIamSIN1YzxmO3DkIZXzRjFSz1SA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-1.6.1.tgz",
+            "integrity": "sha512-LtUN1vAP+LRlZAtTNVhDRSiXx+26Kbz3zJaG6a5k59gQ95jgT5mknnF8lxkHcqJthM4MEk3/tPxkdJpEybyF/A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "tinycolor2": "^1.6.0",
                 "zod": "^3.23.8"
             },
@@ -4734,17 +4705,17 @@
             }
         },
         "node_modules/@jimp/plugin-contain": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-1.6.0.tgz",
-            "integrity": "sha512-oN/n+Vdq/Qg9bB4yOBOxtY9IPAtEfES8J1n9Ddx+XhGBYT1/QTU/JYkGaAkIGoPnyYvmLEDqMz2SGihqlpqfzQ==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-1.6.1.tgz",
+            "integrity": "sha512-m0qhrfA8jkTqretGv4w+T/ADFR4GwBpE0sCOC2uJ0dzr44/ddOMsIdrpi89kabqYiPYIrxkgdCVCLm3zn1Vkkg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/plugin-blit": "1.6.0",
-                "@jimp/plugin-resize": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/plugin-blit": "1.6.1",
+                "@jimp/plugin-resize": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4762,16 +4733,16 @@
             }
         },
         "node_modules/@jimp/plugin-cover": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-1.6.0.tgz",
-            "integrity": "sha512-Iow0h6yqSC269YUJ8HC3Q/MpCi2V55sMlbkkTTx4zPvd8mWZlC0ykrNDeAy9IJegrQ7v5E99rJwmQu25lygKLA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-1.6.1.tgz",
+            "integrity": "sha512-hZytnsth0zoll6cPf434BrT+p/v569Wr5tyO6Dp0dH1IDPhzhB5F38sZGMLDo7bzQiN9JFVB3fxkcJ/WYCJ3Mg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/plugin-crop": "1.6.0",
-                "@jimp/plugin-resize": "1.6.0",
-                "@jimp/types": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/plugin-crop": "1.6.1",
+                "@jimp/plugin-resize": "1.6.1",
+                "@jimp/types": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4789,15 +4760,15 @@
             }
         },
         "node_modules/@jimp/plugin-crop": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-1.6.0.tgz",
-            "integrity": "sha512-KqZkEhvs+21USdySCUDI+GFa393eDIzbi1smBqkUPTE+pRwSWMAf01D5OC3ZWB+xZsNla93BDS9iCkLHA8wang==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-1.6.1.tgz",
+            "integrity": "sha512-EerRSLlclXyKDnYc/H9w/1amZW7b7v3OGi/VlerPd2M/pAu5X8TkyYWtfqYCXnNp1Ixtd8oCo9zGfY9zoXT4rg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4815,14 +4786,14 @@
             }
         },
         "node_modules/@jimp/plugin-displace": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-1.6.0.tgz",
-            "integrity": "sha512-4Y10X9qwr5F+Bo5ME356XSACEF55485j5nGdiyJ9hYzjQP9nGgxNJaZ4SAOqpd+k5sFaIeD7SQ0Occ26uIng5Q==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-1.6.1.tgz",
+            "integrity": "sha512-K07QVl7xQwIfD6KfxRV/c3E9e7ZBXxUXdWuvoTWcKHL2qV48MOF5Nqbz/aJW4ThnQARIsxvYlZjPFiqkCjlU+g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4840,27 +4811,27 @@
             }
         },
         "node_modules/@jimp/plugin-dither": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-1.6.0.tgz",
-            "integrity": "sha512-600d1RxY0pKwgyU0tgMahLNKsqEcxGdbgXadCiVCoGd6V6glyCvkNrnnwC0n5aJ56Htkj88PToSdF88tNVZEEQ==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-1.6.1.tgz",
+            "integrity": "sha512-+2V+GCV2WycMoX1/z977TkZ8Zq/4MVSKElHYatgUqtwXMi2fDK2gKYU2g9V39IqFvTJsTIsK0+58VFz/ROBVew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0"
+                "@jimp/types": "1.6.1"
             },
             "engines": {
                 "node": ">=18"
             }
         },
         "node_modules/@jimp/plugin-fisheye": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-1.6.0.tgz",
-            "integrity": "sha512-E5QHKWSCBFtpgZarlmN3Q6+rTQxjirFqo44ohoTjzYVrDI6B6beXNnPIThJgPr0Y9GwfzgyarKvQuQuqCnnfbA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-1.6.1.tgz",
+            "integrity": "sha512-XtS5ZyoZ0vxZxJ6gkqI63SivhtI58vX95foMPM+cyzYkRsJXMOYCr8DScxF5bp4Xr003NjYm/P+7+08tibwzHA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4878,13 +4849,13 @@
             }
         },
         "node_modules/@jimp/plugin-flip": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-1.6.0.tgz",
-            "integrity": "sha512-/+rJVDuBIVOgwoyVkBjUFHtP+wmW0r+r5OQ2GpatQofToPVbJw1DdYWXlwviSx7hvixTWLKVgRWQ5Dw862emDg==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-1.6.1.tgz",
+            "integrity": "sha512-ws38W/sGj7LobNRayQ83garxiktOyWxM5vO/y4a/2cy9v65SLEUzVkrj+oeAaUSSObdz4HcCEla7XtGlnAGAaA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0",
+                "@jimp/types": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4902,21 +4873,21 @@
             }
         },
         "node_modules/@jimp/plugin-hash": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-hash/-/plugin-hash-1.6.0.tgz",
-            "integrity": "sha512-wWzl0kTpDJgYVbZdajTf+4NBSKvmI3bRI8q6EH9CVeIHps9VWVsUvEyb7rpbcwVLWYuzDtP2R0lTT6WeBNQH9Q==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-hash/-/plugin-hash-1.6.1.tgz",
+            "integrity": "sha512-sZt6ZcMX6i8vFWb4GYnw0pR/o9++ef0dTVcboTB5B/g7nrxCODIB4wfEkJ/YqZM5wUvol77K1qeS0/rVO6z21A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/js-bmp": "1.6.0",
-                "@jimp/js-jpeg": "1.6.0",
-                "@jimp/js-png": "1.6.0",
-                "@jimp/js-tiff": "1.6.0",
-                "@jimp/plugin-color": "1.6.0",
-                "@jimp/plugin-resize": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/js-bmp": "1.6.1",
+                "@jimp/js-jpeg": "1.6.1",
+                "@jimp/js-png": "1.6.1",
+                "@jimp/js-tiff": "1.6.1",
+                "@jimp/plugin-color": "1.6.1",
+                "@jimp/plugin-resize": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "any-base": "^1.1.0"
             },
             "engines": {
@@ -4924,13 +4895,13 @@
             }
         },
         "node_modules/@jimp/plugin-mask": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-1.6.0.tgz",
-            "integrity": "sha512-Cwy7ExSJMZszvkad8NV8o/Z92X2kFUFM8mcDAhNVxU0Q6tA0op2UKRJY51eoK8r6eds/qak3FQkXakvNabdLnA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-1.6.1.tgz",
+            "integrity": "sha512-SIG0/FcmEj3tkwFxc7fAGLO8o4uNzMpSOdQOhbCgxefQKq5wOVMk9BQx/sdMPBwtMLr9WLq0GzLA/rk6t2v20A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0",
+                "@jimp/types": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -4948,17 +4919,17 @@
             }
         },
         "node_modules/@jimp/plugin-print": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-1.6.0.tgz",
-            "integrity": "sha512-zarTIJi8fjoGMSI/M3Xh5yY9T65p03XJmPsuNet19K/Q7mwRU6EV2pfj+28++2PV2NJ+htDF5uecAlnGyxFN2A==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-1.6.1.tgz",
+            "integrity": "sha512-BYVz/X3Xzv8XYilVeDy11NOp0h7BTDjlOtu0BekIFHP1yHVd24AXNzbOy52XlzYZWQ0Dl36HOHEpl/nSNrzc6w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/js-jpeg": "1.6.0",
-                "@jimp/js-png": "1.6.0",
-                "@jimp/plugin-blit": "1.6.0",
-                "@jimp/types": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/js-jpeg": "1.6.1",
+                "@jimp/js-png": "1.6.1",
+                "@jimp/plugin-blit": "1.6.1",
+                "@jimp/types": "1.6.1",
                 "parse-bmfont-ascii": "^1.0.6",
                 "parse-bmfont-binary": "^1.0.6",
                 "parse-bmfont-xml": "^1.1.6",
@@ -4980,9 +4951,9 @@
             }
         },
         "node_modules/@jimp/plugin-quantize": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-quantize/-/plugin-quantize-1.6.0.tgz",
-            "integrity": "sha512-EmzZ/s9StYQwbpG6rUGBCisc3f64JIhSH+ncTJd+iFGtGo0YvSeMdAd+zqgiHpfZoOL54dNavZNjF4otK+mvlg==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-quantize/-/plugin-quantize-1.6.1.tgz",
+            "integrity": "sha512-J2En9PLURfP+vwYDtuZ9T8yBW6BWYZBScydAjRiPBmJfEhTcNQqiiQODrZf7EqbbX/Sy5H6dAeRiqkgoV9N6Ww==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5004,14 +4975,14 @@
             }
         },
         "node_modules/@jimp/plugin-resize": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-1.6.0.tgz",
-            "integrity": "sha512-uSUD1mqXN9i1SGSz5ov3keRZ7S9L32/mAQG08wUwZiEi5FpbV0K8A8l1zkazAIZi9IJzLlTauRNU41Mi8IF9fA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-1.6.1.tgz",
+            "integrity": "sha512-CLkrtJoIz2HdWnpYiN6p8KYcPc00rCH/SUu6o+lfZL05Q4uhecJlnvXuj9x+U6mDn3ldPmJj6aZqMHuUJzdVqg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/types": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/types": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -5029,17 +5000,17 @@
             }
         },
         "node_modules/@jimp/plugin-rotate": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-1.6.0.tgz",
-            "integrity": "sha512-JagdjBLnUZGSG4xjCLkIpQOZZ3Mjbg8aGCCi4G69qR+OjNpOeGI7N2EQlfK/WE8BEHOW5vdjSyglNqcYbQBWRw==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-1.6.1.tgz",
+            "integrity": "sha512-nOjVjbbj705B02ksysKnh0POAwEBXZtJ9zQ5qC+X7Tavl3JNn+P3BzQovbBxLPSbUSld6XID9z5ijin4PtOAUg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/plugin-crop": "1.6.0",
-                "@jimp/plugin-resize": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/plugin-crop": "1.6.1",
+                "@jimp/plugin-resize": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -5057,17 +5028,17 @@
             }
         },
         "node_modules/@jimp/plugin-threshold": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-1.6.0.tgz",
-            "integrity": "sha512-M59m5dzLoHOVWdM41O8z9SyySzcDn43xHseOH0HavjsfQsT56GGCC4QzU1banJidbUrePhzoEdS42uFE8Fei8w==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-1.6.1.tgz",
+            "integrity": "sha512-JOKv9F8s6tnVLf4sB/2fF0F339EFnHvgEdFYugO6VhowKLsap0pEZmLyE/DlRnYtIj2RddHZVxVMp/eKJ04l2Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/plugin-color": "1.6.0",
-                "@jimp/plugin-hash": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0",
+                "@jimp/core": "1.6.1",
+                "@jimp/plugin-color": "1.6.1",
+                "@jimp/plugin-hash": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1",
                 "zod": "^3.23.8"
             },
             "engines": {
@@ -5085,9 +5056,9 @@
             }
         },
         "node_modules/@jimp/types": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/types/-/types-1.6.0.tgz",
-            "integrity": "sha512-7UfRsiKo5GZTAATxm2qQ7jqmUXP0DxTArztllTcYdyw6Xi5oT4RaoXynVtCD4UyLK5gJgkZJcwonoijrhYFKfg==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/types/-/types-1.6.1.tgz",
+            "integrity": "sha512-leI7YbveTNi565m910XgIOwXyuu074H5qazAD1357HImJSv2hqxnWXpwxQbadGWZ7goZRYBDZy5lpqud0p7q5w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5108,13 +5079,13 @@
             }
         },
         "node_modules/@jimp/utils": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-1.6.0.tgz",
-            "integrity": "sha512-gqFTGEosKbOkYF/WFj26jMHOI5OH2jeP1MmC/zbK6BF6VJBf8rIC5898dPfSzZEbSA0wbbV5slbntWVc5PKLFA==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-1.6.1.tgz",
+            "integrity": "sha512-veFPRd93FCnS7AgmCkPgARVGoDRrJ9cm1ujuNyA+UfQ5VKbED2002sm5XfFLFwTsKC8j04heTrwe+tU1dluXOw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jimp/types": "1.6.0",
+                "@jimp/types": "1.6.1",
                 "tinycolor2": "^1.6.0"
             },
             "engines": {
@@ -5192,9 +5163,9 @@
             }
         },
         "node_modules/@next/env": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.6.tgz",
-            "integrity": "sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/env/-/env-16.2.4.tgz",
+            "integrity": "sha512-dKkkOzOSwFYe5RX6y26fZgkSpVAlIOJKQHIiydQcrWH6y/97+RceSOAdjZ14Qa3zLduVUy0TXcn+EiM6t4rPgw==",
             "license": "MIT"
         },
         "node_modules/@next/eslint-plugin-next": {
@@ -5208,9 +5179,9 @@
             }
         },
         "node_modules/@next/swc-darwin-arm64": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.6.tgz",
-            "integrity": "sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.4.tgz",
+            "integrity": "sha512-OXTFFox5EKN1Ym08vfrz+OXxmCcEjT4SFMbNRsWZE99dMqt2Kcusl5MqPXcW232RYkMLQTy0hqgAMEsfEd/l2A==",
             "cpu": [
                 "arm64"
             ],
@@ -5224,9 +5195,9 @@
             }
         },
         "node_modules/@next/swc-darwin-x64": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.6.tgz",
-            "integrity": "sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.4.tgz",
+            "integrity": "sha512-XhpVnUfmYWvD3YrXu55XdcAkQtOnvaI6wtQa8fuF5fGoKoxIUZ0kWPtcOfqJEWngFF/lOS9l3+O9CcownhiQxQ==",
             "cpu": [
                 "x64"
             ],
@@ -5240,9 +5211,9 @@
             }
         },
         "node_modules/@next/swc-linux-arm64-gnu": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.6.tgz",
-            "integrity": "sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.4.tgz",
+            "integrity": "sha512-Mx/tjlNA3G8kg14QvuGAJ4xBwPk1tUHq56JxZ8CXnZwz1Etz714soCEzGQQzVMz4bEnGPowzkV6Xrp6wAkEWOQ==",
             "cpu": [
                 "arm64"
             ],
@@ -5256,9 +5227,9 @@
             }
         },
         "node_modules/@next/swc-linux-arm64-musl": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.6.tgz",
-            "integrity": "sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.4.tgz",
+            "integrity": "sha512-iVMMp14514u7Nup2umQS03nT/bN9HurK8ufylC3FZNykrwjtx7V1A7+4kvhbDSCeonTVqV3Txnv0Lu+m2oDXNg==",
             "cpu": [
                 "arm64"
             ],
@@ -5272,9 +5243,9 @@
             }
         },
         "node_modules/@next/swc-linux-x64-gnu": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.6.tgz",
-            "integrity": "sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.4.tgz",
+            "integrity": "sha512-EZOvm1aQWgnI/N/xcWOlnS3RQBk0VtVav5Zo7n4p0A7UKyTDx047k8opDbXgBpHl4CulRqRfbw3QrX2w5UOXMQ==",
             "cpu": [
                 "x64"
             ],
@@ -5288,9 +5259,9 @@
             }
         },
         "node_modules/@next/swc-linux-x64-musl": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.6.tgz",
-            "integrity": "sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.4.tgz",
+            "integrity": "sha512-h9FxsngCm9cTBf71AR4fGznDEDx1hS7+kSEiIRjq5kO1oXWm07DxVGZjCvk0SGx7TSjlUqhI8oOyz7NfwAdPoA==",
             "cpu": [
                 "x64"
             ],
@@ -5304,9 +5275,9 @@
             }
         },
         "node_modules/@next/swc-win32-arm64-msvc": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.6.tgz",
-            "integrity": "sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.4.tgz",
+            "integrity": "sha512-3NdJV5OXMSOeJYijX+bjaLge3mJBlh4ybydbT4GFoB/2hAojWHtMhl3CYlYoMrjPuodp0nzFVi4Tj2+WaMg+Ow==",
             "cpu": [
                 "arm64"
             ],
@@ -5320,9 +5291,9 @@
             }
         },
         "node_modules/@next/swc-win32-x64-msvc": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.6.tgz",
-            "integrity": "sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.4.tgz",
+            "integrity": "sha512-kMVGgsqhO5YTYODD9IPGGhA6iprWidQckK3LmPeW08PIFENRmgfb4MjXHO+p//d+ts2rpjvK5gXWzXSMrPl9cw==",
             "cpu": [
                 "x64"
             ],
@@ -5335,6 +5306,18 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/@nodable/entities": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
+            "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/nodable"
+                }
+            ],
+            "license": "MIT"
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -5808,13 +5791,13 @@
             "license": "Apache-2.0"
         },
         "node_modules/@prisma/config": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@prisma/config/-/config-7.7.0.tgz",
-            "integrity": "sha512-hmPI3tKLO2aP0Y5vugbjcnA9qqlfJndiT6ds4tw28U5hNHLWg+mHJEWAhjsSPgxjtmxhJ/EDIeIlyh+3Us0OPg==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@prisma/config/-/config-7.8.0.tgz",
+            "integrity": "sha512-HFESzd9rx2ZQxlK+TL7tu1HPvCqrHiL6LCxYykI2c34mvaUuIVVl3lYuicJD/MNnzgPnyeBEMlK4WTomJCV5jw==",
             "devOptional": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "c12": "3.1.0",
+                "c12": "3.3.4",
                 "deepmerge-ts": "7.1.5",
                 "effect": "3.20.0",
                 "empathic": "2.0.0"
@@ -5862,70 +5845,56 @@
             }
         },
         "node_modules/@prisma/engines": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-7.7.0.tgz",
-            "integrity": "sha512-7fmcbT7HHXBq/b+3h/dO1JI3fd8l8q7erf7xP7pRprh58hmSSnG8mg9K3yjW3h9WaHWUwngVFpSxxxivaitQ2w==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-7.8.0.tgz",
+            "integrity": "sha512-jx3rCnNNrt5uzbkKlegtQ2GZHxSlihMCzutgT/BP6UIDF1r9tDI39hV/0T/cHZgzJ3ELbuQPXlVZy+Y1n0pcgw==",
             "devOptional": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@prisma/debug": "7.7.0",
-                "@prisma/engines-version": "7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711",
-                "@prisma/fetch-engine": "7.7.0",
-                "@prisma/get-platform": "7.7.0"
+                "@prisma/debug": "7.8.0",
+                "@prisma/engines-version": "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a",
+                "@prisma/fetch-engine": "7.8.0",
+                "@prisma/get-platform": "7.8.0"
             }
         },
         "node_modules/@prisma/engines-version": {
-            "version": "7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711",
-            "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711.tgz",
-            "integrity": "sha512-r51DLcJ8bDRSrBEJF3J4cinoWyGA7rfP2mG6lD90VqIbGNOkbfcLcXalSVjq5Y6brQS3vcjrq4GbyUb1Cb7vkw==",
-            "devOptional": true,
-            "license": "Apache-2.0"
-        },
-        "node_modules/@prisma/engines/node_modules/@prisma/debug": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.7.0.tgz",
-            "integrity": "sha512-12J62XdqCmpiwJHhHdQxZeY3ckVCWIFmcJP8hg5dPTceeiQ0wiojXGFYTluKqFQfu46fRLgb/rLALZMAx3+dTA==",
+            "version": "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a",
+            "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a.tgz",
+            "integrity": "sha512-fJPQxCkLgA5EayWaW8eArgCvjJ+N+Kz3VyeNKMEeYiQC4alNkxRKFVAGxv/ZUzuJISKqdw+zGeDbS6mn6RCPOA==",
             "devOptional": true,
             "license": "Apache-2.0"
         },
         "node_modules/@prisma/engines/node_modules/@prisma/get-platform": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.7.0.tgz",
-            "integrity": "sha512-MEUNzvKxvYnJ7kgvd6oNRnMmmiGNS9TYLB2weMeIXplnHdL/UWEGnvavYGnN7KLJ2n0iI4dDAyzSkHI3c7AscQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.8.0.tgz",
+            "integrity": "sha512-WlxgRGnolL8VH2EmkH1R/DkKNr/mVdS3G2h42IZFFZ3eUrH9OT6t73kIOSlkkrv50wG123Iq8d96ufv5LlZktw==",
             "devOptional": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@prisma/debug": "7.7.0"
+                "@prisma/debug": "7.8.0"
             }
         },
         "node_modules/@prisma/fetch-engine": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-7.7.0.tgz",
-            "integrity": "sha512-TfyzveBQoK4xALzsTpVhB/0KG1N8zOK0ap+RnBMkzGUu3f98fnQ4QtXa2wlKPhsO2X8a3N5ugFQgcKNoHGmDfw==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-7.8.0.tgz",
+            "integrity": "sha512-gwB0Euiz/DDRyxFRpLXYlK3RfaZUj1c5dAYMuhZYfApg7arknJlcb9bIsOHDppJmbqYaVA+yBIiFMDBfprsNPQ==",
             "devOptional": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@prisma/debug": "7.7.0",
-                "@prisma/engines-version": "7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711",
-                "@prisma/get-platform": "7.7.0"
+                "@prisma/debug": "7.8.0",
+                "@prisma/engines-version": "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a",
+                "@prisma/get-platform": "7.8.0"
             }
         },
-        "node_modules/@prisma/fetch-engine/node_modules/@prisma/debug": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.7.0.tgz",
-            "integrity": "sha512-12J62XdqCmpiwJHhHdQxZeY3ckVCWIFmcJP8hg5dPTceeiQ0wiojXGFYTluKqFQfu46fRLgb/rLALZMAx3+dTA==",
-            "devOptional": true,
-            "license": "Apache-2.0"
-        },
         "node_modules/@prisma/fetch-engine/node_modules/@prisma/get-platform": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.7.0.tgz",
-            "integrity": "sha512-MEUNzvKxvYnJ7kgvd6oNRnMmmiGNS9TYLB2weMeIXplnHdL/UWEGnvavYGnN7KLJ2n0iI4dDAyzSkHI3c7AscQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.8.0.tgz",
+            "integrity": "sha512-WlxgRGnolL8VH2EmkH1R/DkKNr/mVdS3G2h42IZFFZ3eUrH9OT6t73kIOSlkkrv50wG123Iq8d96ufv5LlZktw==",
             "devOptional": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@prisma/debug": "7.7.0"
+                "@prisma/debug": "7.8.0"
             }
         },
         "node_modules/@prisma/get-platform": {
@@ -7030,9 +6999,9 @@
             }
         },
         "node_modules/@smithy/types": {
-            "version": "4.12.0",
-            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.12.0.tgz",
-            "integrity": "sha512-9YcuJVTOBDjg9LWo23Qp0lTQ3D7fQsQtwle0jVfpbUHy9qBwCEgKuVH4FqFB3VYu0nwdHKiEMA+oXz7oV8X1kw==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.14.1.tgz",
+            "integrity": "sha512-59b5HtSVrVR/eYNei3BUj3DCPKD/G7EtDDe7OEJE7i7FtQFugYo6MxbotS8mVJkLNVf8gYaAlEBwwtJ9HzhWSg==",
             "license": "Apache-2.0",
             "dependencies": {
                 "tslib": "^2.6.2"
@@ -7275,9 +7244,9 @@
             }
         },
         "node_modules/@speed-highlight/core": {
-            "version": "1.2.14",
-            "resolved": "https://registry.npmjs.org/@speed-highlight/core/-/core-1.2.14.tgz",
-            "integrity": "sha512-G4ewlBNhUtlLvrJTb88d2mdy2KRijzs4UhnlrOSRT4bmjh/IqNElZa3zkrZ+TC47TwtlDWzVLFADljF1Ijp5hA==",
+            "version": "1.2.15",
+            "resolved": "https://registry.npmjs.org/@speed-highlight/core/-/core-1.2.15.tgz",
+            "integrity": "sha512-BMq1K3DsElxDWawkX6eLg9+CKJrTVGCBAWVuHXVUV2u0s2711qiChLSId6ikYPfxhdYocLNt3wWwSvDiTvFabw==",
             "dev": true,
             "license": "CC0-1.0"
         },
@@ -8318,6 +8287,24 @@
                 "yjs": "^13.5.38"
             }
         },
+        "node_modules/@tokenizer/inflate": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@tokenizer/inflate/-/inflate-0.4.1.tgz",
+            "integrity": "sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.4.3",
+                "token-types": "^6.1.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/Borewit"
+            }
+        },
         "node_modules/@tokenizer/token": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
@@ -8325,16 +8312,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/@trysound/sax": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
         "node_modules/@tybys/wasm-util": {
             "version": "0.10.1",
             "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
@@ -8554,13 +8531,6 @@
             "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
             "license": "MIT"
         },
-        "node_modules/@types/uuid": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
-            "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/@typescript-eslint/eslint-plugin": {
             "version": "8.50.1",
             "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.50.1.tgz",
@@ -9263,19 +9233,6 @@
             "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
             "license": "ISC"
         },
-        "node_modules/abort-controller": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-            "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "event-target-shim": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=6.5"
-            }
-        },
         "node_modules/acorn": {
             "version": "8.15.0",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -9301,9 +9258,9 @@
             }
         },
         "node_modules/ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "version": "6.15.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
+            "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9612,14 +9569,23 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.13.5",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
-            "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
+            "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
             "license": "MIT",
             "dependencies": {
                 "follow-redirects": "^1.15.11",
                 "form-data": "^4.0.5",
-                "proxy-from-env": "^1.1.0"
+                "proxy-from-env": "^2.1.0"
+            }
+        },
+        "node_modules/axios/node_modules/proxy-from-env": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+            "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
             }
         },
         "node_modules/axobject-query": {
@@ -9698,12 +9664,15 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.9.11",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz",
-            "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==",
+            "version": "2.10.24",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.24.tgz",
+            "integrity": "sha512-I2NkZOOrj2XuguvWCK6OVh9GavsNjZjK908Rq3mIBK25+GD8vPX5w2WdxVqnQ7xx3SrZJiCiZFu+/Oz50oSYSA==",
             "license": "Apache-2.0",
             "bin": {
-                "baseline-browser-mapping": "dist/cli.js"
+                "baseline-browser-mapping": "dist/cli.cjs"
+            },
+            "engines": {
+                "node": ">=6.0.0"
             }
         },
         "node_modules/better-result": {
@@ -9746,9 +9715,9 @@
             "license": "MIT"
         },
         "node_modules/brace-expansion": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+            "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9810,53 +9779,28 @@
                 "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
             }
         },
-        "node_modules/buffer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-            "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.2.1"
-            }
-        },
         "node_modules/c12": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/c12/-/c12-3.1.0.tgz",
-            "integrity": "sha512-uWoS8OU1MEIsOv8p/5a82c3H31LsWVR5qiyXVfBNOzfffjUWtPnhAb4BYI2uG2HfGmZmFjCtui5XNWaps+iFuw==",
+            "version": "3.3.4",
+            "resolved": "https://registry.npmjs.org/c12/-/c12-3.3.4.tgz",
+            "integrity": "sha512-cM0ApFQSBXuourJejzwv/AuPRvAxordTyParRVcHjjtXirtkzM0uK2L9TTn9s0cXZbG7E55jCivRQzoxYmRAlA==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "chokidar": "^4.0.3",
-                "confbox": "^0.2.2",
-                "defu": "^6.1.4",
-                "dotenv": "^16.6.1",
-                "exsolve": "^1.0.7",
-                "giget": "^2.0.0",
-                "jiti": "^2.4.2",
+                "chokidar": "^5.0.0",
+                "confbox": "^0.2.4",
+                "defu": "^6.1.6",
+                "dotenv": "^17.3.1",
+                "exsolve": "^1.0.8",
+                "giget": "^3.2.0",
+                "jiti": "^2.6.1",
                 "ohash": "^2.0.11",
                 "pathe": "^2.0.3",
-                "perfect-debounce": "^1.0.0",
-                "pkg-types": "^2.2.0",
-                "rc9": "^2.1.2"
+                "perfect-debounce": "^2.1.0",
+                "pkg-types": "^2.3.0",
+                "rc9": "^3.0.1"
             },
             "peerDependencies": {
-                "magicast": "^0.3.5"
+                "magicast": "*"
             },
             "peerDependenciesMeta": {
                 "magicast": {
@@ -9864,6 +9808,49 @@
                 }
             }
         },
+        "node_modules/c12/node_modules/chokidar": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+            "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+            "devOptional": true,
+            "license": "MIT",
+            "dependencies": {
+                "readdirp": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 20.19.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/c12/node_modules/dotenv": {
+            "version": "17.4.2",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
+            "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
+            "devOptional": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://dotenvx.com"
+            }
+        },
+        "node_modules/c12/node_modules/readdirp": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
+            "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
+            "devOptional": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 20.19.0"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
         "node_modules/cac": {
             "version": "6.7.14",
             "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
@@ -10122,16 +10109,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/citty": {
-            "version": "0.1.6",
-            "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz",
-            "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==",
-            "devOptional": true,
-            "license": "MIT",
-            "dependencies": {
-                "consola": "^3.2.3"
-            }
-        },
         "node_modules/client-only": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
@@ -10203,22 +10180,26 @@
             "devOptional": true,
             "license": "MIT"
         },
-        "node_modules/consola": {
-            "version": "3.4.2",
-            "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
-            "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==",
-            "devOptional": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^14.18.0 || >=16.10.0"
-            }
-        },
         "node_modules/convert-source-map": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
             "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
             "license": "MIT"
         },
+        "node_modules/cookie": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
+            "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/express"
+            }
+        },
         "node_modules/copy-anything": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
@@ -10542,12 +10523,6 @@
                 }
             }
         },
-        "node_modules/decimal.js": {
-            "version": "10.6.0",
-            "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
-            "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
-            "license": "MIT"
-        },
         "node_modules/deep-eql": {
             "version": "5.0.2",
             "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
@@ -10759,9 +10734,9 @@
             }
         },
         "node_modules/dompurify": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz",
-            "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.2.tgz",
+            "integrity": "sha512-lHeS9SA/IKeIFFyYciHBr2n0v1VMPlSj843HdLOwjb2OxNwdq9Xykxqhk+FE42MzAdHvInbAolSE4mhahPpjXA==",
             "license": "(MPL-2.0 OR Apache-2.0)",
             "optional": true,
             "optionalDependencies": {
@@ -10796,7 +10771,7 @@
             "version": "16.6.1",
             "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
             "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
-            "devOptional": true,
+            "dev": true,
             "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=12"
@@ -11422,9 +11397,9 @@
             }
         },
         "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11443,9 +11418,9 @@
             }
         },
         "node_modules/eslint-plugin-import/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -11486,9 +11461,9 @@
             }
         },
         "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11497,9 +11472,9 @@
             }
         },
         "node_modules/eslint-plugin-jsx-a11y/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -11563,9 +11538,9 @@
             }
         },
         "node_modules/eslint-plugin-react/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11574,9 +11549,9 @@
             }
         },
         "node_modules/eslint-plugin-react/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -11635,9 +11610,9 @@
             }
         },
         "node_modules/eslint/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11669,9 +11644,9 @@
             }
         },
         "node_modules/eslint/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -11768,26 +11743,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/event-target-shim": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-            "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/events": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-            "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.8.x"
-            }
-        },
         "node_modules/exif-parser": {
             "version": "0.1.12",
             "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz",
@@ -11940,10 +11895,25 @@
             ],
             "license": "BSD-3-Clause"
         },
+        "node_modules/fast-xml-builder": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz",
+            "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "path-expression-matcher": "^1.1.3"
+            }
+        },
         "node_modules/fast-xml-parser": {
-            "version": "5.3.5",
-            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.5.tgz",
-            "integrity": "sha512-JeaA2Vm9ffQKp9VjvfzObuMCjUYAp5WDYhRYL5LrBPY/jUDlUtOvDfot0vKSkB9tuX885BDHjtw4fZadD95wnA==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.2.tgz",
+            "integrity": "sha512-P7oW7tLbYnhOLQk/Gv7cZgzgMPP/XN03K02/Jy6Y/NHzyIAIpxuZIM/YqAkfiXFPxA2CTm7NtCijK9EDu09u2w==",
             "funding": [
                 {
                     "type": "github",
@@ -11952,7 +11922,10 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "strnum": "^2.1.2"
+                "@nodable/entities": "^2.1.0",
+                "fast-xml-builder": "^1.1.5",
+                "path-expression-matcher": "^1.5.0",
+                "strnum": "^2.2.3"
             },
             "bin": {
                 "fxparser": "src/cli/cli.js"
@@ -11994,18 +11967,19 @@
             "license": "MIT"
         },
         "node_modules/file-type": {
-            "version": "16.5.4",
-            "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
-            "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+            "version": "21.3.4",
+            "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.3.4.tgz",
+            "integrity": "sha512-Ievi/yy8DS3ygGvT47PjSfdFoX+2isQueoYP1cntFW1JLYAuS4GD7NUPGg4zv2iZfV52uDyk5w5Z0TdpRS6Q1g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "readable-web-to-node-stream": "^3.0.0",
-                "strtok3": "^6.2.4",
-                "token-types": "^4.1.1"
+                "@tokenizer/inflate": "^0.4.1",
+                "strtok3": "^10.3.4",
+                "token-types": "^6.1.1",
+                "uint8array-extras": "^1.4.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=20"
             },
             "funding": {
                 "url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -12071,16 +12045,16 @@
             "license": "MIT"
         },
         "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
             "dev": true,
             "license": "ISC"
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.11",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-            "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+            "version": "1.16.0",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
+            "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
             "funding": [
                 {
                     "type": "individual",
@@ -12358,19 +12332,11 @@
             }
         },
         "node_modules/giget": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz",
-            "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/giget/-/giget-3.2.0.tgz",
+            "integrity": "sha512-GvHTWcykIR/fP8cj8dMpuMMkvaeJfPvYnhq0oW+chSeIr+ldX21ifU2Ms6KBoyKZQZmVaUAAhQ2EZ68KJF8a7A==",
             "devOptional": true,
             "license": "MIT",
-            "dependencies": {
-                "citty": "^0.1.6",
-                "consola": "^3.4.0",
-                "defu": "^6.1.4",
-                "node-fetch-native": "^1.6.6",
-                "nypm": "^0.6.0",
-                "pathe": "^2.0.3"
-            },
             "bin": {
                 "giget": "dist/cli.mjs"
             }
@@ -12412,9 +12378,9 @@
             }
         },
         "node_modules/glob/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
             "dev": true,
             "license": "MIT",
             "optional": true,
@@ -12424,9 +12390,9 @@
             }
         },
         "node_modules/glob/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
             "license": "ISC",
             "optional": true,
@@ -12736,9 +12702,9 @@
             }
         },
         "node_modules/icu-minify": {
-            "version": "4.8.3",
-            "resolved": "https://registry.npmjs.org/icu-minify/-/icu-minify-4.8.3.tgz",
-            "integrity": "sha512-65Av7FLosNk7bPbmQx5z5XG2Y3T2GFppcjiXh4z1idHeVgQxlDpAmkGoYI0eFzAvrOnjpWTL5FmPDhsdfRMPEA==",
+            "version": "4.11.0",
+            "resolved": "https://registry.npmjs.org/icu-minify/-/icu-minify-4.11.0.tgz",
+            "integrity": "sha512-XRvblCwLqWXio5ZLcmDqXvJv7alSACK6UjXuuMOdQWB//d25AQX6xlVlI1FEbc3Q6iPLXXo6HaVLn8LcAFhn1Q==",
             "funding": [
                 {
                     "type": "individual",
@@ -12813,9 +12779,9 @@
             }
         },
         "node_modules/immutable": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz",
-            "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==",
+            "version": "5.1.5",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
+            "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
             "devOptional": true,
             "license": "MIT"
         },
@@ -12903,15 +12869,13 @@
             }
         },
         "node_modules/intl-messageformat": {
-            "version": "11.1.2",
-            "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-11.1.2.tgz",
-            "integrity": "sha512-ucSrQmZGAxfiBHfBRXW/k7UC8MaGFlEj4Ry1tKiDcmgwQm1y3EDl40u+4VNHYomxJQMJi9NEI3riDRlth96jKg==",
+            "version": "11.2.3",
+            "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-11.2.3.tgz",
+            "integrity": "sha512-kZthTU+3WLcoWoRg5j6LOkN1TeUBtmkX0OIwSAbcHVIfQAEbGVdmANM8u6GL3eUDOqLwheYoXMUshAh1UdeXlQ==",
             "license": "BSD-3-Clause",
             "dependencies": {
-                "@formatjs/ecma402-abstract": "3.1.1",
-                "@formatjs/fast-memoize": "3.1.0",
-                "@formatjs/icu-messageformat-parser": "3.5.1",
-                "tslib": "^2.8.1"
+                "@formatjs/fast-memoize": "3.1.3",
+                "@formatjs/icu-messageformat-parser": "3.5.6"
             }
         },
         "node_modules/iobuffer": {
@@ -13438,39 +13402,39 @@
             }
         },
         "node_modules/jimp": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/jimp/-/jimp-1.6.0.tgz",
-            "integrity": "sha512-YcwCHw1kiqEeI5xRpDlPPBGL2EOpBKLwO4yIBJcXWHPj5PnA5urGq0jbyhM5KoNpypQ6VboSoxc9D8HyfvngSg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jimp/core": "1.6.0",
-                "@jimp/diff": "1.6.0",
-                "@jimp/js-bmp": "1.6.0",
-                "@jimp/js-gif": "1.6.0",
-                "@jimp/js-jpeg": "1.6.0",
-                "@jimp/js-png": "1.6.0",
-                "@jimp/js-tiff": "1.6.0",
-                "@jimp/plugin-blit": "1.6.0",
-                "@jimp/plugin-blur": "1.6.0",
-                "@jimp/plugin-circle": "1.6.0",
-                "@jimp/plugin-color": "1.6.0",
-                "@jimp/plugin-contain": "1.6.0",
-                "@jimp/plugin-cover": "1.6.0",
-                "@jimp/plugin-crop": "1.6.0",
-                "@jimp/plugin-displace": "1.6.0",
-                "@jimp/plugin-dither": "1.6.0",
-                "@jimp/plugin-fisheye": "1.6.0",
-                "@jimp/plugin-flip": "1.6.0",
-                "@jimp/plugin-hash": "1.6.0",
-                "@jimp/plugin-mask": "1.6.0",
-                "@jimp/plugin-print": "1.6.0",
-                "@jimp/plugin-quantize": "1.6.0",
-                "@jimp/plugin-resize": "1.6.0",
-                "@jimp/plugin-rotate": "1.6.0",
-                "@jimp/plugin-threshold": "1.6.0",
-                "@jimp/types": "1.6.0",
-                "@jimp/utils": "1.6.0"
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/jimp/-/jimp-1.6.1.tgz",
+            "integrity": "sha512-hNQh6rZtWfSVWSNVmvq87N5BPJsNH7k7I7qyrXf9DOma9xATQk3fsyHazCQe51nCjdkoWdTmh0vD7bjVSLoxxw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jimp/core": "1.6.1",
+                "@jimp/diff": "1.6.1",
+                "@jimp/js-bmp": "1.6.1",
+                "@jimp/js-gif": "1.6.1",
+                "@jimp/js-jpeg": "1.6.1",
+                "@jimp/js-png": "1.6.1",
+                "@jimp/js-tiff": "1.6.1",
+                "@jimp/plugin-blit": "1.6.1",
+                "@jimp/plugin-blur": "1.6.1",
+                "@jimp/plugin-circle": "1.6.1",
+                "@jimp/plugin-color": "1.6.1",
+                "@jimp/plugin-contain": "1.6.1",
+                "@jimp/plugin-cover": "1.6.1",
+                "@jimp/plugin-crop": "1.6.1",
+                "@jimp/plugin-displace": "1.6.1",
+                "@jimp/plugin-dither": "1.6.1",
+                "@jimp/plugin-fisheye": "1.6.1",
+                "@jimp/plugin-flip": "1.6.1",
+                "@jimp/plugin-hash": "1.6.1",
+                "@jimp/plugin-mask": "1.6.1",
+                "@jimp/plugin-print": "1.6.1",
+                "@jimp/plugin-quantize": "1.6.1",
+                "@jimp/plugin-resize": "1.6.1",
+                "@jimp/plugin-rotate": "1.6.1",
+                "@jimp/plugin-threshold": "1.6.1",
+                "@jimp/types": "1.6.1",
+                "@jimp/utils": "1.6.1"
             },
             "engines": {
                 "node": ">=18"
@@ -13635,9 +13599,9 @@
             }
         },
         "node_modules/jspdf": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.2.0.tgz",
-            "integrity": "sha512-hR/hnRevAXXlrjeqU5oahOE+Ln9ORJUB5brLHHqH67A+RBQZuFr5GkbI9XQI8OUFSEezKegsi45QRpc4bGj75Q==",
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.2.1.tgz",
+            "integrity": "sha512-YyAXyvnmjTbR4bHQRLzex3CuINCDlQnBqoSYyjJwTP2x9jDLuKDzy7aKUl0hgx3uhcl7xzg32agn5vlie6HIlQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.28.6",
@@ -13860,9 +13824,9 @@
             }
         },
         "node_modules/list-stylesheets/node_modules/undici": {
-            "version": "6.23.0",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz",
-            "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==",
+            "version": "6.25.0",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz",
+            "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.17"
@@ -13885,9 +13849,9 @@
             }
         },
         "node_modules/lodash": {
-            "version": "4.17.23",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-            "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+            "version": "4.18.1",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+            "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
             "dev": true,
             "license": "MIT"
         },
@@ -14029,9 +13993,9 @@
             }
         },
         "node_modules/markdown-it": {
-            "version": "14.1.0",
-            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
-            "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+            "version": "14.1.1",
+            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
+            "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
             "license": "MIT",
             "dependencies": {
                 "argparse": "^2.0.1",
@@ -14135,16 +14099,16 @@
             }
         },
         "node_modules/miniflare": {
-            "version": "4.20260210.0",
-            "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20260210.0.tgz",
-            "integrity": "sha512-HXR6m53IOqEzq52DuGF1x7I1K6lSIqzhbCbQXv/cTmPnPJmNkr7EBtLDm4nfSkOvlDtnwDCLUjWII5fyGJI5Tw==",
+            "version": "4.20260430.0",
+            "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20260430.0.tgz",
+            "integrity": "sha512-MWvMm3Siho9Yj7lbJZidLs8hbrRvIcOrif2mnsHQZdvoKfedpea+GaN8XJxbpRcq0B2WzNI1BB1ihdnqes3/ZA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@cspotcode/source-map-support": "0.8.1",
                 "sharp": "^0.34.5",
-                "undici": "7.18.2",
-                "workerd": "1.20260210.0",
+                "undici": "7.24.8",
+                "workerd": "1.20260430.1",
                 "ws": "8.18.0",
                 "youch": "4.1.0-beta.10"
             },
@@ -14152,13 +14116,13 @@
                 "miniflare": "bootstrap.js"
             },
             "engines": {
-                "node": ">=18.0.0"
+                "node": ">=22.0.0"
             }
         },
         "node_modules/miniflare/node_modules/undici": {
-            "version": "7.18.2",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-7.18.2.tgz",
-            "integrity": "sha512-y+8YjDFzWdQlSE9N5nzKMT3g4a5UBX1HKowfdXh0uvAnTaqqwqB92Jt4UXBAeKekDs5IaDKyJFR4X1gYVCgXcw==",
+            "version": "7.24.8",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.8.tgz",
+            "integrity": "sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -14166,13 +14130,13 @@
             }
         },
         "node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "version": "9.0.9",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
-                "brace-expansion": "^2.0.1"
+                "brace-expansion": "^2.0.2"
             },
             "engines": {
                 "node": ">=16 || 14 >=14.17"
@@ -14279,9 +14243,9 @@
             }
         },
         "node_modules/nanoid": {
-            "version": "5.1.7",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.7.tgz",
-            "integrity": "sha512-ua3NDgISf6jdwezAheMOk4mbE1LXjm1DfMUDMuJf4AqxLFK3ccGpgWizwa5YV7Yz9EpXwEaWoRXSb/BnV0t5dQ==",
+            "version": "5.1.11",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.11.tgz",
+            "integrity": "sha512-v+KEsUv2ps74PaSKv0gHTxTCgMXOIfBEbaqa6w6ISIGC7ZsvHN4N9oJ8d4cmf0n5oTzQz2SLmThbQWhjd/8eKg==",
             "funding": [
                 {
                     "type": "github",
@@ -14347,15 +14311,15 @@
             }
         },
         "node_modules/next": {
-            "version": "16.1.6",
-            "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz",
-            "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==",
+            "version": "16.2.4",
+            "resolved": "https://registry.npmjs.org/next/-/next-16.2.4.tgz",
+            "integrity": "sha512-kPvz56wF5frc+FxlHI5qnklCzbq53HTwORaWBGdT0vNoKh1Aya9XC8aPauH4NJxqtzbWsS5mAbctm4cr+EkQ2Q==",
             "license": "MIT",
             "peer": true,
             "dependencies": {
-                "@next/env": "16.1.6",
+                "@next/env": "16.2.4",
                 "@swc/helpers": "0.5.15",
-                "baseline-browser-mapping": "^2.8.3",
+                "baseline-browser-mapping": "^2.9.19",
                 "caniuse-lite": "^1.0.30001579",
                 "postcss": "8.4.31",
                 "styled-jsx": "5.1.6"
@@ -14367,15 +14331,15 @@
                 "node": ">=20.9.0"
             },
             "optionalDependencies": {
-                "@next/swc-darwin-arm64": "16.1.6",
-                "@next/swc-darwin-x64": "16.1.6",
-                "@next/swc-linux-arm64-gnu": "16.1.6",
-                "@next/swc-linux-arm64-musl": "16.1.6",
-                "@next/swc-linux-x64-gnu": "16.1.6",
-                "@next/swc-linux-x64-musl": "16.1.6",
-                "@next/swc-win32-arm64-msvc": "16.1.6",
-                "@next/swc-win32-x64-msvc": "16.1.6",
-                "sharp": "^0.34.4"
+                "@next/swc-darwin-arm64": "16.2.4",
+                "@next/swc-darwin-x64": "16.2.4",
+                "@next/swc-linux-arm64-gnu": "16.2.4",
+                "@next/swc-linux-arm64-musl": "16.2.4",
+                "@next/swc-linux-x64-gnu": "16.2.4",
+                "@next/swc-linux-x64-musl": "16.2.4",
+                "@next/swc-win32-arm64-msvc": "16.2.4",
+                "@next/swc-win32-x64-msvc": "16.2.4",
+                "sharp": "^0.34.5"
             },
             "peerDependencies": {
                 "@opentelemetry/api": "^1.1.0",
@@ -14401,12 +14365,12 @@
             }
         },
         "node_modules/next-auth": {
-            "version": "5.0.0-beta.30",
-            "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-5.0.0-beta.30.tgz",
-            "integrity": "sha512-+c51gquM3F6nMVmoAusRJ7RIoY0K4Ts9HCCwyy/BRoe4mp3msZpOzYMyb5LAYc1wSo74PMQkGDcaghIO7W6Xjg==",
+            "version": "5.0.0-beta.31",
+            "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-5.0.0-beta.31.tgz",
+            "integrity": "sha512-1OBgCKPzo+S7UWWMp3xgvGvIJ0OpV7B3vR4ZDRqD9a4Ch+OT6dakLXG9ivhtmIWVa71nTSXattOHyCg8sNi8/Q==",
             "license": "ISC",
             "dependencies": {
-                "@auth/core": "0.41.0"
+                "@auth/core": "0.41.2"
             },
             "peerDependencies": {
                 "@simplewebauthn/browser": "^9.0.1",
@@ -14428,9 +14392,9 @@
             }
         },
         "node_modules/next-auth/node_modules/@auth/core": {
-            "version": "0.41.0",
-            "resolved": "https://registry.npmjs.org/@auth/core/-/core-0.41.0.tgz",
-            "integrity": "sha512-Wd7mHPQ/8zy6Qj7f4T46vg3aoor8fskJm6g2Zyj064oQ3+p0xNZXAV60ww0hY+MbTesfu29kK14Zk5d5JTazXQ==",
+            "version": "0.41.2",
+            "resolved": "https://registry.npmjs.org/@auth/core/-/core-0.41.2.tgz",
+            "integrity": "sha512-Hx5MNBxN2fJTbJKGUKAA0wca43D0Akl3TvufY54Gn8lop7F+34vU1zA1pn0vQfIoVuLIrpfc2nkyjwIaPJMW7w==",
             "license": "ISC",
             "dependencies": {
                 "@panva/hkdf": "^1.2.1",
@@ -14442,7 +14406,7 @@
             "peerDependencies": {
                 "@simplewebauthn/browser": "^9.0.1",
                 "@simplewebauthn/server": "^9.0.2",
-                "nodemailer": "^6.8.0"
+                "nodemailer": "^7.0.7"
             },
             "peerDependenciesMeta": {
                 "@simplewebauthn/browser": {
@@ -14457,18 +14421,18 @@
             }
         },
         "node_modules/next-auth/node_modules/jose": {
-            "version": "6.2.2",
-            "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.2.tgz",
-            "integrity": "sha512-d7kPDd34KO/YnzaDOlikGpOurfF0ByC2sEV4cANCtdqLlTfBlw2p14O/5d/zv40gJPbIQxfES3nSx1/oYNyuZQ==",
+            "version": "6.2.3",
+            "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz",
+            "integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/panva"
             }
         },
         "node_modules/next-intl": {
-            "version": "4.8.3",
-            "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-4.8.3.tgz",
-            "integrity": "sha512-PvdBDWg+Leh7BR7GJUQbCDVVaBRn37GwDBWc9sv0rVQOJDQ5JU1rVzx9EEGuOGYo0DHAl70++9LQ7HxTawdL7w==",
+            "version": "4.11.0",
+            "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-4.11.0.tgz",
+            "integrity": "sha512-Chp8rgEVUYOX/bCtYy+PXH6lDX3X+GPT9sR9HScHroL283em/4urP9btfdHEMEHJJXdq2W/5wDaDDtWONPdNSA==",
             "funding": [
                 {
                     "type": "individual",
@@ -14480,16 +14444,15 @@
                 "@formatjs/intl-localematcher": "^0.8.1",
                 "@parcel/watcher": "^2.4.1",
                 "@swc/core": "^1.15.2",
-                "icu-minify": "^4.8.3",
+                "icu-minify": "^4.11.0",
                 "negotiator": "^1.0.0",
-                "next-intl-swc-plugin-extractor": "^4.8.3",
+                "next-intl-swc-plugin-extractor": "^4.11.0",
                 "po-parser": "^2.1.1",
-                "use-intl": "^4.8.3"
+                "use-intl": "^4.11.0"
             },
             "peerDependencies": {
                 "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0",
-                "typescript": "^5.0.0"
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0"
             },
             "peerDependenciesMeta": {
                 "typescript": {
@@ -14498,9 +14461,9 @@
             }
         },
         "node_modules/next-intl-swc-plugin-extractor": {
-            "version": "4.8.3",
-            "resolved": "https://registry.npmjs.org/next-intl-swc-plugin-extractor/-/next-intl-swc-plugin-extractor-4.8.3.tgz",
-            "integrity": "sha512-YcaT+R9z69XkGhpDarVFWUprrCMbxgIQYPUaXoE6LGVnLjGdo8hu3gL6bramDVjNKViYY8a/pXPy7Bna0mXORg==",
+            "version": "4.11.0",
+            "resolved": "https://registry.npmjs.org/next-intl-swc-plugin-extractor/-/next-intl-swc-plugin-extractor-4.11.0.tgz",
+            "integrity": "sha512-WUGBSxGNd8eQ0rAsJHFmRw2H7+SZAXQIY/HAnYM57JaUsj5D2vx4KOz4zFtXlyKDtsw9awHfgWVvBae2/RDF9A==",
             "license": "MIT"
         },
         "node_modules/next-intl/node_modules/@swc/core": {
@@ -14562,13 +14525,6 @@
                 "tslib": "^2.0.3"
             }
         },
-        "node_modules/node-fetch-native": {
-            "version": "1.6.7",
-            "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.7.tgz",
-            "integrity": "sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==",
-            "devOptional": true,
-            "license": "MIT"
-        },
         "node_modules/node-releases": {
             "version": "2.0.27",
             "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
@@ -14576,9 +14532,9 @@
             "license": "MIT"
         },
         "node_modules/nodemailer": {
-            "version": "7.0.12",
-            "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.12.tgz",
-            "integrity": "sha512-H+rnK5bX2Pi/6ms3sN4/jRQvYSMltV6vqup/0SFOrxYYY/qoNvhXPlYq3e+Pm9RFJRwrMGbMIwi81M4dxpomhA==",
+            "version": "8.0.7",
+            "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.7.tgz",
+            "integrity": "sha512-pkjE4mkBzQjdJT4/UmlKl3pX0rC9fZmjh7c6C9o7lv66Ac6w9WCnzPzhbPNxwZAzlF4mdq4CSWB5+FbK6FWCow==",
             "license": "MIT-0",
             "peer": true,
             "engines": {
@@ -14624,35 +14580,10 @@
                 "url": "https://github.com/fb55/nth-check?sponsor=1"
             }
         },
-        "node_modules/nypm": {
-            "version": "0.6.5",
-            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.5.tgz",
-            "integrity": "sha512-K6AJy1GMVyfyMXRVB88700BJqNUkByijGJM8kEHpLdcAt+vSQAVfkWWHYzuRXHSY6xA2sNc5RjTj0p9rE2izVQ==",
-            "devOptional": true,
-            "license": "MIT",
-            "dependencies": {
-                "citty": "^0.2.0",
-                "pathe": "^2.0.3",
-                "tinyexec": "^1.0.2"
-            },
-            "bin": {
-                "nypm": "dist/cli.mjs"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/nypm/node_modules/citty": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/citty/-/citty-0.2.2.tgz",
-            "integrity": "sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==",
-            "devOptional": true,
-            "license": "MIT"
-        },
         "node_modules/oauth4webapi": {
-            "version": "3.8.5",
-            "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.8.5.tgz",
-            "integrity": "sha512-A8jmyUckVhRJj5lspguklcl90Ydqk61H3dcU0oLhH3Yv13KpAliKTt5hknpGGPZSSfOwGyraNEFmofDYH+1kSg==",
+            "version": "3.8.6",
+            "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.8.6.tgz",
+            "integrity": "sha512-iwemM91xz8nryHti2yTmg5fhyEMVOkOXwHNqbvcATjyajb5oQxCQzrNOA6uElRHuMhQQTKUyFKV9y/CNyg25BQ==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/panva"
@@ -15085,6 +15016,21 @@
                 "node": ">=8"
             }
         },
+        "node_modules/path-expression-matcher": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
+            "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
         "node_modules/path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -15188,24 +15134,10 @@
                 "node": ">=12"
             }
         },
-        "node_modules/peek-readable": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
-            "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/Borewit"
-            }
-        },
         "node_modules/perfect-debounce": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-            "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.1.0.tgz",
+            "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==",
             "devOptional": true,
             "license": "MIT"
         },
@@ -15331,9 +15263,9 @@
             "license": "ISC"
         },
         "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+            "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
             "license": "MIT",
             "engines": {
                 "node": ">=8.6"
@@ -15377,14 +15309,14 @@
             }
         },
         "node_modules/pkg-types": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
-            "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.1.tgz",
+            "integrity": "sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "confbox": "^0.2.2",
-                "exsolve": "^1.0.7",
+                "confbox": "^0.2.4",
+                "exsolve": "^1.0.8",
                 "pathe": "^2.0.3"
             }
         },
@@ -15700,17 +15632,17 @@
             "license": "MIT"
         },
         "node_modules/prisma": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/prisma/-/prisma-7.7.0.tgz",
-            "integrity": "sha512-HlgwRBt1uEFB9LStHL4HLYDvoi4BNu1rYA0hPG0zCAEyK9SaZBqp7E5Rjpc3Qh8Lex/ye/svoHZ0OWoFNhWxuQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/prisma/-/prisma-7.8.0.tgz",
+            "integrity": "sha512-yfN4yrw7HV9kEJhoy1+jgah0jafEIQsf7uWouSsM8MvJtlubsk+kM7AIBWZ8+GJl74Yj3c+nbYqBkMOxtsZ3Lw==",
             "devOptional": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "peer": true,
             "dependencies": {
-                "@prisma/config": "7.7.0",
+                "@prisma/config": "7.8.0",
                 "@prisma/dev": "0.24.3",
-                "@prisma/engines": "7.7.0",
+                "@prisma/engines": "7.8.0",
                 "@prisma/studio-core": "0.27.3",
                 "mysql2": "3.15.3",
                 "postgres": "3.4.7"
@@ -15734,16 +15666,6 @@
                 }
             }
         },
-        "node_modules/process": {
-            "version": "0.11.10",
-            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.6.0"
-            }
-        },
         "node_modules/prom-client": {
             "version": "15.1.3",
             "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-15.1.3.tgz",
@@ -16077,14 +15999,14 @@
             }
         },
         "node_modules/rc9": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz",
-            "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/rc9/-/rc9-3.0.1.tgz",
+            "integrity": "sha512-gMDyleLWVE+i6Sgtc0QbbY6pEKqYs97NGi6isHQPqYlLemPoO8dxQ3uGi0f4NiP98c+jMW6cG1Kx9dDwfvqARQ==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "defu": "^6.1.4",
-                "destr": "^2.0.3"
+                "defu": "^6.1.6",
+                "destr": "^2.0.5"
             }
         },
         "node_modules/react": {
@@ -16127,40 +16049,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/readable-stream": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
-            "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "abort-controller": "^3.0.0",
-                "buffer": "^6.0.3",
-                "events": "^3.3.0",
-                "process": "^0.11.10",
-                "string_decoder": "^1.3.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            }
-        },
-        "node_modules/readable-web-to-node-stream": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.4.tgz",
-            "integrity": "sha512-9nX56alTf5bwXQ3ZDipHJhusu9NTQJ/CVPtb/XHAJCXihZeitfJvIRS4GqQ/mfIoOE3IelHMrpayVrosdHBuLw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "readable-stream": "^4.7.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/Borewit"
-            }
-        },
         "node_modules/readdirp": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
@@ -16510,27 +16398,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
         "node_modules/safe-push-apply": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
@@ -16595,10 +16462,13 @@
             }
         },
         "node_modules/sax": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz",
-            "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==",
-            "license": "BlueOak-1.0.0"
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
+            "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=11.0.0"
+            }
         },
         "node_modules/scheduler": {
             "version": "0.27.0",
@@ -16846,9 +16716,9 @@
             }
         },
         "node_modules/simple-xml-to-json": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/simple-xml-to-json/-/simple-xml-to-json-1.2.3.tgz",
-            "integrity": "sha512-kWJDCr9EWtZ+/EYYM5MareWj2cRnZGF93YDNpH4jQiHB+hBIZnfPFSQiVMzZOdk+zXWqTZ/9fTeQNu2DqeiudA==",
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/simple-xml-to-json/-/simple-xml-to-json-1.2.7.tgz",
+            "integrity": "sha512-mz9VXphOxQWX3eQ/uXCtm6upltoN0DLx8Zb5T4TFC4FHB7S9FDPGre8CfLWqPWQQH/GrQYd2AXhhVM5LDpYx6Q==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -16992,16 +16862,6 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "safe-buffer": "~5.2.0"
-            }
-        },
         "node_modules/string.prototype.includes": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
@@ -17176,9 +17036,9 @@
             }
         },
         "node_modules/strnum": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
-            "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
+            "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
             "funding": [
                 {
                     "type": "github",
@@ -17188,17 +17048,16 @@
             "license": "MIT"
         },
         "node_modules/strtok3": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
-            "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+            "version": "10.3.5",
+            "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.3.5.tgz",
+            "integrity": "sha512-ki4hZQfh5rX0QDLLkOCj+h+CVNkqmp/CMf8v8kZpkNVK6jGQooMytqzLZYUVYIZcFZ6yDB70EfD8POcFXiF5oA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@tokenizer/token": "^0.3.0",
-                "peek-readable": "^4.1.0"
+                "@tokenizer/token": "^0.3.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             },
             "funding": {
                 "type": "github",
@@ -17326,19 +17185,19 @@
             }
         },
         "node_modules/svgo": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
-            "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.3.tgz",
+            "integrity": "sha512-+wn7I4p7YgJhHs38k2TNjy1vCfPIfLIJWR5MnCStsN8WuuTcBnRKcMHQLMM2ijxGZmDoZwNv8ipl5aTTen62ng==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@trysound/sax": "0.2.0",
                 "commander": "^7.2.0",
                 "css-select": "^5.1.0",
                 "css-tree": "^2.3.1",
                 "css-what": "^6.1.0",
                 "csso": "^5.0.5",
-                "picocolors": "^1.0.0"
+                "picocolors": "^1.0.0",
+                "sax": "^1.5.0"
             },
             "bin": {
                 "svgo": "bin/svgo"
@@ -17403,16 +17262,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/tinyexec": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.1.tgz",
-            "integrity": "sha512-VKS/ZaQhhkKFMANmAOhhXVoIfBXblQxGX1myCQ2faQrfmobMftXeJPcZGp0gS07ocvGJWDLZGyOZDadDBqYIJg==",
-            "devOptional": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            }
-        },
         "node_modules/tinyglobby": {
             "version": "0.2.15",
             "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
@@ -17449,9 +17298,9 @@
             }
         },
         "node_modules/tinyglobby/node_modules/picomatch": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
             "dev": true,
             "license": "MIT",
             "peer": true,
@@ -17521,17 +17370,18 @@
             }
         },
         "node_modules/token-types": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
-            "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.1.2.tgz",
+            "integrity": "sha512-dRXchy+C0IgK8WPC6xvCHFRIWYUbqqdEIKPaKo/AcTUNzwLTK6AH7RjdLWsEZcAN/TBdtfUw3PYEgPr5VPr6ww==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
+                "@borewit/text-codec": "^0.2.1",
                 "@tokenizer/token": "^0.3.0",
                 "ieee754": "^1.2.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=14.16"
             },
             "funding": {
                 "type": "github",
@@ -17794,9 +17644,9 @@
             }
         },
         "node_modules/typescript-plugin-css-modules/node_modules/postcss": {
-            "version": "8.5.6",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+            "version": "8.5.13",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.13.tgz",
+            "integrity": "sha512-qif0+jGGZoLWdHey3UFHHWP0H7Gbmsk8T5VEqyYFbWqPr1XqvLGBbk/sl8V5exGmcYJklJOhOQq1pV9IcsiFag==",
             "dev": true,
             "funding": [
                 {
@@ -17884,6 +17734,19 @@
             "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
             "license": "MIT"
         },
+        "node_modules/uint8array-extras": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.5.0.tgz",
+            "integrity": "sha512-rvKSBiC5zqCCiDZ9kAOszZcDvdAHwwIKJG33Ykj43OKcWsnmcBRL09YTU4nOeHZ8Y2a7l1MgTd08SBe9A8Qj6A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/unbox-primitive": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
@@ -17904,9 +17767,9 @@
             }
         },
         "node_modules/undici": {
-            "version": "7.21.0",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-7.21.0.tgz",
-            "integrity": "sha512-Hn2tCQpoDt1wv23a68Ctc8Cr/BHpUSfaPYrkajTXOS9IKpxVRx/X5m1K2YkbK2ipgZgxXSgsUinl3x+2YdSSfg==",
+            "version": "7.25.0",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz",
+            "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=20.18.1"
@@ -18091,9 +17954,9 @@
             }
         },
         "node_modules/use-intl": {
-            "version": "4.8.3",
-            "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-4.8.3.tgz",
-            "integrity": "sha512-nLxlC/RH+le6g3amA508Itnn/00mE+J22ui21QhOWo5V9hCEC43+WtnRAITbJW0ztVZphev5X9gvOf2/Dk9PLA==",
+            "version": "4.11.0",
+            "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-4.11.0.tgz",
+            "integrity": "sha512-7ILhTLuo3fnSKhoTGDk5X9591pjtWr6qB4inrlvGkN9OEyKhoiG73GZFoLSs68wz3BsSGtoWa62iWvrYEYU+iA==",
             "funding": [
                 {
                     "type": "individual",
@@ -18104,7 +17967,7 @@
             "dependencies": {
                 "@formatjs/fast-memoize": "^3.1.0",
                 "@schummar/icu-type-parser": "1.21.5",
-                "icu-minify": "^4.8.3",
+                "icu-minify": "^4.11.0",
                 "intl-messageformat": "^11.1.0"
             },
             "peerDependencies": {
@@ -18155,9 +18018,9 @@
             }
         },
         "node_modules/uuid": {
-            "version": "13.0.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
-            "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
+            "version": "14.0.0",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.0.tgz",
+            "integrity": "sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==",
             "funding": [
                 "https://github.com/sponsors/broofa",
                 "https://github.com/sponsors/ctavan"
@@ -18183,9 +18046,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.4.1",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
-            "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
+            "version": "6.4.2",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz",
+            "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==",
             "dev": true,
             "license": "MIT",
             "peer": true,
@@ -18817,9 +18680,9 @@
             }
         },
         "node_modules/vite/node_modules/postcss": {
-            "version": "8.5.8",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
-            "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
+            "version": "8.5.13",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.13.tgz",
+            "integrity": "sha512-qif0+jGGZoLWdHey3UFHHWP0H7Gbmsk8T5VEqyYFbWqPr1XqvLGBbk/sl8V5exGmcYJklJOhOQq1pV9IcsiFag==",
             "dev": true,
             "funding": [
                 {
@@ -19147,9 +19010,9 @@
             }
         },
         "node_modules/workerd": {
-            "version": "1.20260210.0",
-            "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20260210.0.tgz",
-            "integrity": "sha512-Sb0WXhrvf+XHQigP2trAxQnXo7wxZFC4PWnn6I7LhFxiTvzxvOAqMEiLkIz58wggRCb54T/KAA8hdjkTniR5FA==",
+            "version": "1.20260430.1",
+            "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20260430.1.tgz",
+            "integrity": "sha512-KEgIWyiw3Jmn+DCd/L3ePo5fmiiYb/UcwKvDWPf/nLLOiwShDFzDSsegU5NY/JcwgvO/QsLHVi2FYrbkcXNY5Q==",
             "dev": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
@@ -19161,41 +19024,41 @@
                 "node": ">=16"
             },
             "optionalDependencies": {
-                "@cloudflare/workerd-darwin-64": "1.20260210.0",
-                "@cloudflare/workerd-darwin-arm64": "1.20260210.0",
-                "@cloudflare/workerd-linux-64": "1.20260210.0",
-                "@cloudflare/workerd-linux-arm64": "1.20260210.0",
-                "@cloudflare/workerd-windows-64": "1.20260210.0"
+                "@cloudflare/workerd-darwin-64": "1.20260430.1",
+                "@cloudflare/workerd-darwin-arm64": "1.20260430.1",
+                "@cloudflare/workerd-linux-64": "1.20260430.1",
+                "@cloudflare/workerd-linux-arm64": "1.20260430.1",
+                "@cloudflare/workerd-windows-64": "1.20260430.1"
             }
         },
         "node_modules/wrangler": {
-            "version": "4.64.0",
-            "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-4.64.0.tgz",
-            "integrity": "sha512-0PBiVEbshQT4Av/KLHbOAks4ioIKp/eAO7Xr2BgAX5v7cFYYgeOvudBrbtZa/hDDIA6858QuJnTQ8mI+cm8Vqw==",
+            "version": "4.87.0",
+            "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-4.87.0.tgz",
+            "integrity": "sha512-lfhfKwLfQlowwgV0xhlYgE9fU3n0I30d4ccGY/rTCEm/n42Mjvlr0Ng3ZPNqlsrsKBcDR531V7dsPkgELvrk/Q==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "dependencies": {
-                "@cloudflare/kv-asset-handler": "0.4.2",
-                "@cloudflare/unenv-preset": "2.12.1",
+                "@cloudflare/kv-asset-handler": "0.5.0",
+                "@cloudflare/unenv-preset": "2.16.1",
                 "blake3-wasm": "2.1.5",
                 "esbuild": "0.27.3",
-                "miniflare": "4.20260210.0",
+                "miniflare": "4.20260430.0",
                 "path-to-regexp": "6.3.0",
                 "unenv": "2.0.0-rc.24",
-                "workerd": "1.20260210.0"
+                "workerd": "1.20260430.1"
             },
             "bin": {
                 "wrangler": "bin/wrangler.js",
                 "wrangler2": "bin/wrangler.js"
             },
             "engines": {
-                "node": ">=20.0.0"
+                "node": ">=22.0.0"
             },
             "optionalDependencies": {
                 "fsevents": "~2.3.2"
             },
             "peerDependencies": {
-                "@cloudflare/workers-types": "^4.20260210.0"
+                "@cloudflare/workers-types": "^4.20260430.1"
             },
             "peerDependenciesMeta": {
                 "@cloudflare/workers-types": {
@@ -19446,20 +19309,6 @@
                 "error-stack-parser-es": "^1.0.5"
             }
         },
-        "node_modules/youch/node_modules/cookie": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
-            "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/express"
-            }
-        },
         "node_modules/zeptomatch": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/zeptomatch/-/zeptomatch-2.1.0.tgz",
diff --git a/package.json b/package.json
index a0fdcb7c..21949db5 100644
--- a/package.json
+++ b/package.json
@@ -69,12 +69,12 @@
         "jose": "^5.10.0",
         "jspdf": "^4.2.0",
         "lucide-react": "^0.562.0",
-        "nanoid": "^5.1.7",
+        "nanoid": "^5.1.11",
         "next": "^16.1.6",
         "next-auth": "^5.0.0-beta.30",
         "next-intl": "^4.8.3",
         "next-themes": "^0.2.0",
-        "nodemailer": "^7.0.12",
+        "nodemailer": "^8.0.7",
         "pdfmake": "^0.2.9",
         "pg": "^8.20.0",
         "prom-client": "^15.1.3",
@@ -85,7 +85,7 @@
         "stripe": "^21.0.1",
         "swr": "^2.2.4",
         "tinykeys": "^3.0.0",
-        "uuid": "^13.0.0",
+        "uuid": "^14.0.0",
         "y-indexeddb": "^9.0.12",
         "y-prosemirror": "^1.3.7",
         "y-protocols": "^1.0.6",
@@ -106,7 +106,6 @@
         "@types/pg": "^8.20.0",
         "@types/react": "^18.3.27",
         "@types/react-dom": "^18.3.7",
-        "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^8.49.0",
         "@typescript-eslint/parser": "^8.49.0",
         "@vitest/browser": "^3.2.4",
@@ -127,6 +126,10 @@
         "wait-on": "^9.0.3",
         "wrangler": "^4.35.0"
     },
+    "overrides": {
+        "@hono/node-server": ">=1.19.13",
+        "nodemailer": "^8.0.7"
+    },
     "browser": {
         "tokenize": false
     }
diff --git a/styles/themes.css b/styles/themes.css
index 5d6cba39..074e1e92 100644
--- a/styles/themes.css
+++ b/styles/themes.css
@@ -84,8 +84,8 @@ html.dark {
     --editor-sidebar: #272727;
     --editor-sidebar-list: #3c3c3c;
     --editor-sidebar-hover: var(--primary);
-    --context-menu-bg: #272727;
-    --context-menu-item-hover: #363636;
+    --context-menu-bg: var(--secondary);
+    --context-menu-item-hover: var(--primary);
     --editor-style-bg: #1d1d1d;
     --editor-style-bg-hover: #3c3c3c;
     --editor-style-bg-active: #5d5d5d;
@@ -135,8 +135,8 @@ html.latte {
     --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
-    --context-menu-bg: #fff8e9;
-    --context-menu-item-hover: #fffef8;
+    --context-menu-bg: var(--secondary);
+    --context-menu-item-hover: var(--primary);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);
@@ -182,8 +182,8 @@ html.wonka {
     --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
-    --context-menu-bg: #2c1e1a;
-    --context-menu-item-hover: #3d2b24;
+    --context-menu-bg: var(--secondary);
+    --context-menu-item-hover: var(--primary);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);
@@ -229,8 +229,8 @@ html.mint {
     --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
-    --context-menu-bg: #ecfdec;
-    --context-menu-item-hover: #f5fff8;
+    --context-menu-bg: var(--primary);
+    --context-menu-item-hover: var(--primary-hover);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);
@@ -276,8 +276,8 @@ html.blossom {
     --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
-    --context-menu-bg: #fff6fb;
-    --context-menu-item-hover: #fffcff;
+    --context-menu-bg: var(--secondary);
+    --context-menu-item-hover: var(--primary);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);

From 6331c60c43178367037b4a5cac0b1e7c37f6c333 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Fri, 1 May 2026 18:53:52 +0200
Subject: [PATCH 34/76] fixed cloudflare durable object deployment

---
 .github/workflows/deploy-release.yaml |  9 ++++++++-
 .github/workflows/deploy-staging.yaml |  9 ++++++++-
 src/lib/cloud/wrangler.toml           | 13 ++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index b25cb396..8046662c 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -141,8 +141,15 @@ jobs:
         steps:
             - uses: actions/checkout@v6
 
+            - uses: actions/setup-node@v6
+              with:
+                  node-version: "25.2.1"
+                  cache: "npm"
+
+            - run: npm ci
+
             - name: Deploy Cloudflare Worker (production)
-              run: npx wrangler@4 deploy -c src/lib/cloud/wrangler.toml --env production
+              run: npm run cloud:deploy:prod
               env:
                   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index bfa091ad..030c6c9a 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -142,8 +142,15 @@ jobs:
         steps:
             - uses: actions/checkout@v6
 
+            - uses: actions/setup-node@v6
+              with:
+                  node-version: "25.2.1"
+                  cache: "npm"
+
+            - run: npm ci
+
             - name: Deploy Cloudflare Worker (staging)
-              run: npx wrangler@4 deploy -c src/lib/cloud/wrangler.toml --env staging
+              run: npm run cloud:deploy:staging
               env:
                   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 
diff --git a/src/lib/cloud/wrangler.toml b/src/lib/cloud/wrangler.toml
index 9e371a2d..7b1c9985 100644
--- a/src/lib/cloud/wrangler.toml
+++ b/src/lib/cloud/wrangler.toml
@@ -4,11 +4,6 @@ main = "index.ts"
 compatibility_date = "2025-12-08"
 compatibility_flags = ["nodejs_compat"]
 
-# Default Durable Object binding (used as a template)
-[[durable_objects.bindings]]
-name = "PROJECT_ROOM"
-class_name = "ProjectRoom"
-
 # Migrations are global to the script class
 [[migrations]]
 tag = "v1"
@@ -21,6 +16,10 @@ routes = [
   { pattern = "cloud.scriptio.app", custom_domain = true }
 ]
 
+[[env.production.durable_objects.bindings]]
+name = "PROJECT_ROOM"
+class_name = "ProjectRoom"
+
 [[env.production.r2_buckets]]
 binding = "SNAPSHOTS"
 bucket_name = "scriptio-snapshots"
@@ -32,6 +31,10 @@ routes = [
   { pattern = "cloud.staging.scriptio.app", custom_domain = true }
 ]
 
+[[env.staging.durable_objects.bindings]]
+name = "PROJECT_ROOM"
+class_name = "ProjectRoom"
+
 [[env.staging.r2_buckets]]
 binding = "SNAPSHOTS"
 bucket_name = "scriptio-snapshots-staging"
\ No newline at end of file

From 79a82250bd55d5fe2fdc87346aa2c03af3eeae4c Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Fri, 1 May 2026 21:07:52 +0200
Subject: [PATCH 35/76] added midnight theme, fixed shelve item logic in
 dropdown, fixes to SubscriptionSettings...

---
 components/dashboard/DashboardModal.tsx       |  5 +-
 .../account/SubscriptionSettings.module.css   | 58 ++++++++++++++++++-
 .../account/SubscriptionSettings.tsx          | 41 ++++++++++---
 .../preferences/AppearanceSettings.tsx        | 22 ++++---
 components/editor/DocumentEditorPanel.tsx     | 25 ++++----
 components/editor/sidebar/ContextMenu.tsx     |  8 ++-
 components/projects/ProjectItem.tsx           | 35 ++++++++---
 messages/de.json                              |  7 ++-
 messages/en.json                              |  7 ++-
 messages/es.json                              |  7 ++-
 messages/fr.json                              |  7 ++-
 messages/ja.json                              |  7 ++-
 messages/ko.json                              |  7 ++-
 messages/pl.json                              |  7 ++-
 messages/zh.json                              |  7 ++-
 src/app/api/stripe/checkout/route.ts          |  4 +-
 src/app/api/users/settings/route.ts           |  2 +-
 src/app/api/webhooks/stripe/route.ts          |  1 +
 src/app/projects/page.tsx                     | 15 ++++-
 src/app/providers.tsx                         |  4 +-
 src/lib/utils/types.ts                        |  2 +-
 styles/themes.css                             | 51 ++++++++++++++++
 22 files changed, 262 insertions(+), 67 deletions(-)

diff --git a/components/dashboard/DashboardModal.tsx b/components/dashboard/DashboardModal.tsx
index 8945690e..a2d22443 100644
--- a/components/dashboard/DashboardModal.tsx
+++ b/components/dashboard/DashboardModal.tsx
@@ -25,7 +25,7 @@ import AboutSettings from "./AboutSettings";
 const DashboardModal = () => {
     const { isOpen, closeDashboard, activeTab, setActiveTab } = useContext(DashboardContext);
     const { project, isYjsReady } = useContext(ProjectContext);
-    const { user } = useCookieUser();
+    const { user, isLoading: isUserLoading } = useCookieUser();
     const t = useTranslations("modal");
 
     const PROJECT_MENU = useMemo<MenuSection>(() => ({
@@ -83,6 +83,7 @@ const DashboardModal = () => {
     // loading would silently bounce the user to Profile.
     const prevSignedInRef = useRef(isSignedIn);
     useEffect(() => {
+        if (isUserLoading) return;
         const projectTabIds = PROJECT_MENU.items.map((item) => item.id);
         const accountTabIds = ACCOUNT_MENU.items.map((item) => item.id);
         if ((!isInProject && projectTabIds.includes(activeTab)) || (!isSignedIn && accountTabIds.includes(activeTab))) {
@@ -93,7 +94,7 @@ const DashboardModal = () => {
             setActiveTab("Profile");
         }
         prevSignedInRef.current = isSignedIn;
-    }, [isInProject, isSignedIn, activeTab, setActiveTab, ACCOUNT_MENU, PREFERENCES_MENU, PROJECT_MENU]);
+    }, [isInProject, isSignedIn, isUserLoading, activeTab, setActiveTab, ACCOUNT_MENU, PREFERENCES_MENU, PROJECT_MENU]);
 
     const [prevActiveTab, setPrevActiveTab] = useState(activeTab);
     const [isScrolled, setIsScrolled] = useState(false);
diff --git a/components/dashboard/account/SubscriptionSettings.module.css b/components/dashboard/account/SubscriptionSettings.module.css
index 058d4329..17ab21fc 100644
--- a/components/dashboard/account/SubscriptionSettings.module.css
+++ b/components/dashboard/account/SubscriptionSettings.module.css
@@ -180,14 +180,68 @@
     margin: 0;
 }
 
+.welcomeBox {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 0.82rem;
+    font-weight: 500;
+    color: var(--primary-text);
+    padding: 10px 14px;
+    border-radius: 8px;
+    background: color-mix(in srgb, var(--primary-text) 8%, transparent);
+    border: 1px solid color-mix(in srgb, var(--primary-text) 22%, transparent);
+    margin: 0;
+    animation: welcomeIn 0.35s cubic-bezier(0.22, 1, 0.36, 1) both;
+}
+
+.welcomeBoxLeaving {
+    animation: welcomeOut 0.6s ease-in forwards;
+}
+
+.welcomeIcon {
+    flex-shrink: 0;
+    color: var(--primary-text);
+    animation: welcomeSpin 0.6s ease-out 0.1s both;
+}
+
+@keyframes welcomeIn {
+    from {
+        opacity: 0;
+        transform: translateY(-6px) scale(0.97);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0) scale(1);
+    }
+}
+
+@keyframes welcomeOut {
+    from {
+        opacity: 1;
+    }
+    to {
+        opacity: 0;
+    }
+}
+
+@keyframes welcomeSpin {
+    from {
+        transform: rotate(-20deg) scale(0.8);
+    }
+    to {
+        transform: rotate(0deg) scale(1);
+    }
+}
+
 .upgradeBtn {
     display: flex;
     align-items: center;
     justify-content: center;
     gap: 8px;
     padding: 10px 20px;
-    border-radius: 8px;
-    background: var(--secondary);
+    border-radius: 24px;
+    background: var(--primary);
     color: var(--primary-text);
     border: none;
     font-size: 0.9rem;
diff --git a/components/dashboard/account/SubscriptionSettings.tsx b/components/dashboard/account/SubscriptionSettings.tsx
index ac69fe50..40111fea 100644
--- a/components/dashboard/account/SubscriptionSettings.tsx
+++ b/components/dashboard/account/SubscriptionSettings.tsx
@@ -2,10 +2,11 @@
 
 import { useEffect, useState } from "react";
 import { useTranslations } from "next-intl";
-import { ArrowRight, Check, Lock } from "lucide-react";
+import { ArrowRight, Check, Lock, Sparkles } from "lucide-react";
 import { isTauri } from "@tauri-apps/api/core";
 import { cancelStripeSubscription, createStripeCheckout, getAppleSubscriptionOwner, submitApplePurchase } from "@src/lib/utils/requests";
 import { useUser } from "@src/lib/utils/hooks";
+import { useLocale } from "@src/context/LocaleContext";
 
 import styles from "./SubscriptionSettings.module.css";
 
@@ -21,16 +22,23 @@ const isMacosTauri = () =>
 const SubscriptionSettings = () => {
     const { user, mutate } = useUser();
     const t = useTranslations("profile");
+    const { locale } = useLocale();
 
     const [upgradeLoading, setUpgradeLoading] = useState(false);
     const [cancelConfirm, setCancelConfirm] = useState(false);
     const [cancelling, setCancelling] = useState(false);
     const [error, setError] = useState<string | null>(null);
+    const [showWelcome, setShowWelcome] = useState(
+        () => typeof window !== "undefined" && sessionStorage.getItem("proWelcome") === "1"
+    );
+    const [welcomeLeaving, setWelcomeLeaving] = useState(false);
 
     const isPro = !!user?.isProUntil && new Date(user.isProUntil) > new Date();
     const isCancelled = !!user?.isSubscriptionCancelled;
     const isApple = user?.subscriptionProvider === "APPLE";
-    const expiryDate = user?.isProUntil ? new Date(user.isProUntil).toLocaleDateString() : "";
+    const expiryDate = user?.isProUntil
+        ? new Intl.DateTimeFormat(locale, { year: "numeric", month: "long", day: "numeric" }).format(new Date(user.isProUntil))
+        : "";
 
     // Restore Apple purchases on mount to sync subscription state with the server.
     useEffect(() => {
@@ -61,6 +69,14 @@ const SubscriptionSettings = () => {
         return () => { cancelled = true; };
     }, [user?.id]); // eslint-disable-line react-hooks/exhaustive-deps
 
+    useEffect(() => {
+        if (!showWelcome) return;
+        sessionStorage.removeItem("proWelcome");
+        const fadeTimer = setTimeout(() => setWelcomeLeaving(true), 4000);
+        const hideTimer = setTimeout(() => setShowWelcome(false), 4600);
+        return () => { clearTimeout(fadeTimer); clearTimeout(hideTimer); };
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
     const showOwnerError = async (jwsRepresentation: string) => {
         const ownerEmail = await getAppleSubscriptionOwner(jwsRepresentation);
         if (ownerEmail) {
@@ -119,6 +135,7 @@ const SubscriptionSettings = () => {
             if (result?.url) {
                 window.location.href = result.url;
             } else {
+                setError(t("subscription.purchaseError"));
                 setUpgradeLoading(false);
             }
         }
@@ -183,11 +200,7 @@ const SubscriptionSettings = () => {
 
             {/* Actions */}
             {isPro ? (
-                isCancelled ? (
-                    <p className={styles.cancelSuccess}>
-                        {t("subscription.cancelSuccess", { date: expiryDate })}
-                    </p>
-                ) : cancelConfirm ? (
+                cancelConfirm ? (
                     <div className={styles.confirmBox}>
                         <p className={styles.confirmText}>
                             {isApple
@@ -209,6 +222,14 @@ const SubscriptionSettings = () => {
                             </button>
                         </div>
                     </div>
+                ) : isCancelled ? (
+                    <button className={styles.upgradeBtn} onClick={handleUpgrade} disabled={upgradeLoading}>
+                        {upgradeLoading
+                            ? isMacosTauri() ? t("subscription.purchasing") : t("subscription.redirecting")
+                            : t("subscription.resubscribe")
+                        }
+                        {!upgradeLoading && <ArrowRight size={16} />}
+                    </button>
                 ) : (
                     <button className={styles.cancelBtn} onClick={() => setCancelConfirm(true)}>
                         {t("subscription.cancel")}
@@ -224,6 +245,12 @@ const SubscriptionSettings = () => {
                 </button>
             )}
 
+            {showWelcome && (
+                <div className={`${styles.welcomeBox} ${welcomeLeaving ? styles.welcomeBoxLeaving : ""}`}>
+                    <Sparkles size={15} className={styles.welcomeIcon} />
+                    <span>{t("subscription.welcomePro")}</span>
+                </div>
+            )}
             {error && <p className={styles.errorMessage}>{error}</p>}
         </div>
     );
diff --git a/components/dashboard/preferences/AppearanceSettings.tsx b/components/dashboard/preferences/AppearanceSettings.tsx
index a7128d60..30a3ba48 100644
--- a/components/dashboard/preferences/AppearanceSettings.tsx
+++ b/components/dashboard/preferences/AppearanceSettings.tsx
@@ -21,6 +21,20 @@ const THEME_COLORS: Record<
         text: "#ffffff",
         subtext: "#9b9b9b",
     },
+    wonka: {
+        primary: "#1e1410",
+        secondary: "#2c1e1a",
+        tertiary: "#4d3b36",
+        text: "#e6dcca",
+        subtext: "#a89b91",
+    },
+    midnight: {
+        primary: "#0d1117",
+        secondary: "#161c2d",
+        tertiary: "#1e2a45",
+        text: "#c8d8f0",
+        subtext: "#6878a8",
+    },
     light: {
         primary: "#f3f3f3",
         secondary: "#ffffff",
@@ -35,13 +49,6 @@ const THEME_COLORS: Record<
         text: "#7a6129",
         subtext: "#c09c50",
     },
-    wonka: {
-        primary: "#1e1410",
-        secondary: "#2c1e1a",
-        tertiary: "#4d3b36",
-        text: "#e6dcca",
-        subtext: "#a89b91",
-    },
     mint: {
         primary: "#dcf5de",
         secondary: "#ecfdec",
@@ -65,6 +72,7 @@ const THEME_LABELS: Record<string, string> = {
     wonka: "Wonka",
     mint: "Mint",
     blossom: "Blossom",
+    midnight: "Midnight",
 };
 
 const AppearanceSettings = () => {
diff --git a/components/editor/DocumentEditorPanel.tsx b/components/editor/DocumentEditorPanel.tsx
index a403ef54..d4d51123 100644
--- a/components/editor/DocumentEditorPanel.tsx
+++ b/components/editor/DocumentEditorPanel.tsx
@@ -460,23 +460,20 @@ const DocumentEditorPanel = ({
                 spellError = { word, from: spellFrom, to: spellFrom + word.length };
             }
 
-            // Detect shelvable node at click position
+            // Detect shelvable node at caret position
             let nodePos: number | undefined;
             let nodeClass: string | undefined;
             if (config.features.shelving) {
-                const coords = editor.view.posAtCoords({ left: e.clientX, top: e.clientY });
-                if (coords) {
-                    const $pos = editor.state.doc.resolve(coords.pos);
-                    if ($pos.depth === 1) {
-                        const cls = $pos.parent.attrs.class as ScreenplayElement;
-                        if (
-                            cls === ScreenplayElement.Scene ||
-                            cls === ScreenplayElement.Character ||
-                            cls === ScreenplayElement.Action
-                        ) {
-                            nodePos = coords.pos;
-                            nodeClass = cls;
-                        }
+                const $pos = editor.state.doc.resolve(from);
+                if ($pos.depth >= 1) {
+                    const cls = $pos.node(1).attrs.class as ScreenplayElement;
+                    if (
+                        cls === ScreenplayElement.Scene ||
+                        cls === ScreenplayElement.Character ||
+                        cls === ScreenplayElement.Action
+                    ) {
+                        nodePos = from;
+                        nodeClass = cls;
                     }
                 }
             }
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index 4b14cd83..f88f96a1 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -634,15 +634,17 @@ const ContextMenu = () => {
         updateContextMenu(undefined);
     }, [updateContextMenu]);
 
+    if (!contextMenu) return null;
+
     return (
         <div
             className={context.menu}
             style={{
-                top: contextMenu?.position.y,
-                left: contextMenu?.position.x,
+                top: contextMenu.position.y,
+                left: contextMenu.position.x,
             }}
         >
-            {contextMenu && renderContextMenu(contextMenu)}
+            {renderContextMenu(contextMenu)}
         </div>
     );
 };
diff --git a/components/projects/ProjectItem.tsx b/components/projects/ProjectItem.tsx
index b38e44fc..bdb2f4ad 100644
--- a/components/projects/ProjectItem.tsx
+++ b/components/projects/ProjectItem.tsx
@@ -19,11 +19,15 @@ const ProjectItem = ({ project, isLocalOnly = false }: Props) => {
     const tDates = useTranslations("dates");
     const elapsedDays = getElapsedDaysFrom(project.updatedAt);
     const lastUpdated =
-        elapsedDays === 0 ? tDates("today") :
-        elapsedDays === 1 ? tDates("yesterday") :
-        elapsedDays <= 30 ? tDates("daysAgo", { days: elapsedDays }) :
-        elapsedDays <= 365 ? tDates("monthsAgo", { months: Math.round(elapsedDays / 30) }) :
-        tDates("moreThanYearAgo");
+        elapsedDays === 0
+            ? tDates("today")
+            : elapsedDays === 1
+              ? tDates("yesterday")
+              : elapsedDays <= 30
+                ? tDates("daysAgo", { days: elapsedDays })
+                : elapsedDays <= 365
+                  ? tDates("monthsAgo", { months: Math.round(elapsedDays / 30) })
+                  : tDates("moreThanYearAgo");
 
     let posterPath;
     if (project.poster) posterPath = project.poster;
@@ -31,12 +35,27 @@ const ProjectItem = ({ project, isLocalOnly = false }: Props) => {
 
     return (
         <button className={join(item.container)} onClick={() => redirectScreenplay(project.id)}>
-            <Image className={item.poster} src={posterPath} alt={t("item.posterAlt")} width={160} height={220} style={{ width: "52px", height: "auto", aspectRatio: "0.675" }} />
+            <Image
+                className={item.poster}
+                src={posterPath}
+                alt={t("item.posterAlt")}
+                width={160}
+                height={220}
+                loading="eager"
+                style={{ width: "52px", height: "auto", aspectRatio: "0.675" }}
+            />
             <div className={item.info}>
                 <h2 className={item.title}>{project.title}</h2>
                 <div className={item.date}>
-                    <span className={item.sync_icon} title={isLocalOnly ? t("item.localOnly") : t("item.syncedToCloud")}>
-                        {isLocalOnly ? <HardDrive className={item.icon} size={16} /> : <CloudCheck className={item.icon} size={16} />}
+                    <span
+                        className={item.sync_icon}
+                        title={isLocalOnly ? t("item.localOnly") : t("item.syncedToCloud")}
+                    >
+                        {isLocalOnly ? (
+                            <HardDrive className={item.icon} size={16} />
+                        ) : (
+                            <CloudCheck className={item.icon} size={16} />
+                        )}
                     </span>
                     <p className={item.date_text}>{lastUpdated}</p>
                 </div>
diff --git a/messages/de.json b/messages/de.json
index 0468424a..839bad2b 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -38,7 +38,8 @@
       "latte": "Ein sanftes Design mit Cremetönen, das Wärme mit Lesbarkeit verbindet.",
       "wonka": "Ein samtiges Design mit Kakaotönen, das tiefen Luxus mit visueller Erholung verbindet.",
       "mint": "Ein frisches Design mit Minzakzenten, das botanische Ruhe mit visueller Balance verbindet.",
-      "blossom": "Ein zartes Design mit floralen Tönen, das blütenhafte Sanftheit mit visuellem Komfort verbindet."
+      "blossom": "Ein zartes Design mit floralen Tönen, das blütenhafte Sanftheit mit visuellem Komfort verbindet.",
+      "midnight": "Ein tiefes Mitternachtsblau-Design für konzentriertes Arbeiten unter dem Sternenhimmel."
     },
     "editor": "Editor",
     "themedEditor": "Themenbasierter Editor",
@@ -150,7 +151,9 @@
       "cancelApple": "Apple-Abonnements werden über den App Store verwaltet.",
       "manageApple": "App Store öffnen",
       "alreadyBoundTo": "Dieses Abonnement ist bereits mit {email} verknüpft.",
-      "alreadyBoundUnknown": "Dieses Abonnement ist bereits mit einem anderen Konto verknüpft."
+      "alreadyBoundUnknown": "Dieses Abonnement ist bereits mit einem anderen Konto verknüpft.",
+      "welcomePro": "Du hast jetzt Scriptio Pro abonniert. Willkommen!",
+      "resubscribe": "Abonnement reaktivieren"
     }
   },
   "projects": {
diff --git a/messages/en.json b/messages/en.json
index 7a641f65..9ad8342d 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -37,7 +37,8 @@
       "latte": "Soft, cream-based theme that blends warmth with readability.",
       "wonka": "Velvety, cocoa-based theme that blends deep luxury with eye-resting focus.",
       "mint": "Refreshing, mint-infused theme that blends botanical serenity with eye-resting balance.",
-      "blossom": "Gentle, petal-infused theme that blends floral warmth with eye-resting softness."
+      "blossom": "Gentle, petal-infused theme that blends floral warmth with eye-resting softness.",
+      "midnight": "Deep, midnight-blue theme crafted for focused work under a starlit sky."
     },
     "editor": "Editor",
     "themedEditor": "Themed editor",
@@ -149,7 +150,9 @@
       "cancelApple": "Apple subscriptions are managed through the App Store.",
       "manageApple": "Open App Store",
       "alreadyBoundTo": "This subscription is already linked to {email}.",
-      "alreadyBoundUnknown": "This subscription is already linked to another account."
+      "alreadyBoundUnknown": "This subscription is already linked to another account.",
+      "welcomePro": "You're now subscribed to Scriptio Pro. Welcome!",
+      "resubscribe": "Reactivate subscription"
     }
   },
   "projects": {
diff --git a/messages/es.json b/messages/es.json
index 45cf0a38..7a90acb8 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -37,7 +37,8 @@
       "latte": "Tema suave con base crema que combina calidez y legibilidad.",
       "wonka": "Tema aterciopelado con base de cacao que combina lujo profundo y descanso visual.",
       "mint": "Tema refrescante con esencia de menta que combina serenidad botánica y equilibrio visual.",
-      "blossom": "Tema delicado con esencia floral que combina calidez de pétalos y suavidad visual."
+      "blossom": "Tema delicado con esencia floral que combina calidez de pétalos y suavidad visual.",
+      "midnight": "Tema azul medianoche profundo, diseñado para el trabajo concentrado bajo un cielo estrellado."
     },
     "editor": "Editor",
     "themedEditor": "Editor con tema",
@@ -149,7 +150,9 @@
       "cancelApple": "Las suscripciones de Apple se gestionan a través del App Store.",
       "manageApple": "Abrir App Store",
       "alreadyBoundTo": "Esta suscripción ya está vinculada a {email}.",
-      "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta."
+      "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta.",
+      "welcomePro": "Ya estás suscrito a Scriptio Pro. ¡Bienvenido!",
+      "resubscribe": "Reactivar suscripción"
     }
   },
   "projects": {
diff --git a/messages/fr.json b/messages/fr.json
index 55d74f75..50ffb436 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -38,7 +38,8 @@
       "latte": "Thème doux aux tons crème, alliant chaleur et lisibilité.",
       "wonka": "Thème velouté aux tons cacao, entre luxe profond et confort visuel.",
       "mint": "Thème frais aux notes de menthe, alliant sérénité botanique et équilibre visuel.",
-      "blossom": "Thème délicat aux notes florales, alliant douceur pétale et confort visuel."
+      "blossom": "Thème délicat aux notes florales, alliant douceur pétale et confort visuel.",
+      "midnight": "Thème bleu nuit profond, conçu pour le travail concentré sous un ciel étoilé."
     },
     "editor": "Éditeur",
     "themedEditor": "Éditeur thématisé",
@@ -150,7 +151,9 @@
       "cancelApple": "Les abonnements Apple sont gérés via l'App Store.",
       "manageApple": "Ouvrir l'App Store",
       "alreadyBoundTo": "Cet abonnement est déjà associé à {email}.",
-      "alreadyBoundUnknown": "Cet abonnement est déjà associé à un autre compte."
+      "alreadyBoundUnknown": "Cet abonnement est déjà associé à un autre compte.",
+      "welcomePro": "Vous êtes maintenant abonné à Scriptio Pro. Bienvenue !",
+      "resubscribe": "Réactiver l'abonnement"
     }
   },
   "projects": {
diff --git a/messages/ja.json b/messages/ja.json
index ebb73af0..ea849326 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -37,7 +37,8 @@
       "latte": "温かみのあるクリームトーン。読みやすさと心地よさを両立します。",
       "wonka": "深みのあるカカオトーン。高級感と視覚的な快適さを提供します。",
       "mint": "爽やかなミントカラー。植物のような安らぎとバランスをもたらします。",
-      "blossom": "繊細なフローラルトーン。花びらのような柔らかさと快適さを提供します。"
+      "blossom": "繊細なフローラルトーン。花びらのような柔らかさと快適さを提供します。",
+      "midnight": "深みのある深夜ブルー。星空の下で集中して作業するための落ち着いたテーマです。"
     },
     "editor": "エディタ",
     "themedEditor": "テーマエディタ",
@@ -149,7 +150,9 @@
       "cancelApple": "Appleのサブスクリプションはアプリストアで管理されます。",
       "manageApple": "App Storeを開く",
       "alreadyBoundTo": "このサブスクリプションは既に {email} に関連付けられています。",
-      "alreadyBoundUnknown": "このサブスクリプションは既に別のアカウントに関連付けられています。"
+      "alreadyBoundUnknown": "このサブスクリプションは既に別のアカウントに関連付けられています。",
+      "welcomePro": "Scriptio Pro にご登録いただきました。ようこそ！",
+      "resubscribe": "サブスクリプションを再開する"
     }
   },
   "projects": {
diff --git a/messages/ko.json b/messages/ko.json
index 1254c202..eba1aab2 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -37,7 +37,8 @@
       "latte": "따뜻하고 가독성이 좋은 크림색 테마입니다.",
       "wonka": "깊고 고급스러운 초콜릿 톤의 테마입니다.",
       "mint": "신선하고 균형 잡힌 민트색 테마입니다.",
-      "blossom": "부드럽고 화사한 꽃잎 톤의 테마입니다."
+      "blossom": "부드럽고 화사한 꽃잎 톤의 테마입니다.",
+      "midnight": "깊고 풍부한 한밤의 파란 테마로, 집중적인 작업을 위해 설계되었습니다."
     },
     "editor": "에디터",
     "themedEditor": "테마 에디터",
@@ -149,7 +150,9 @@
       "cancelApple": "Apple 구독은 App Store에서 관리됩니다.",
       "manageApple": "App Store 열기",
       "alreadyBoundTo": "이 구독은 이미 {email}에 연결되어 있습니다.",
-      "alreadyBoundUnknown": "이 구독은 이미 다른 계정에 연결되어 있습니다."
+      "alreadyBoundUnknown": "이 구독은 이미 다른 계정에 연결되어 있습니다.",
+      "welcomePro": "Scriptio Pro를 구독하셨습니다. 환영합니다!",
+      "resubscribe": "구독 재활성화"
     }
   },
   "projects": {
diff --git a/messages/pl.json b/messages/pl.json
index 40e604be..a8171bda 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -37,7 +37,8 @@
       "latte": "Delikatny kremowy motyw, łączący ciepło z czytelnością.",
       "wonka": "Aksamitny czekoladowy motyw, łączący luksus z komfortem wizualnym.",
       "mint": "Świeży miętowy motyw, łączący spokój z równowagą wizualną.",
-      "blossom": "Delikatny kwiatowy motyw, łączący miękkość płatków z komfortem wizualnym."
+      "blossom": "Delikatny kwiatowy motyw, łączący miękkość płatków z komfortem wizualnym.",
+      "midnight": "Głęboki, granatowy motyw stworzony do skupionej pracy pod rozgwieżdżonym niebem."
     },
     "editor": "Edytor",
     "themedEditor": "Edytor z motywem",
@@ -149,7 +150,9 @@
       "cancelApple": "Subskrypcje Apple są zarządzane przez App Store.",
       "manageApple": "Otwórz App Store",
       "alreadyBoundTo": "Ta subskrypcja jest już powiązana z {email}.",
-      "alreadyBoundUnknown": "Ta subskrypcja jest już powiązana z innym kontem."
+      "alreadyBoundUnknown": "Ta subskrypcja jest już powiązana z innym kontem.",
+      "welcomePro": "Subskrybujesz teraz Scriptio Pro. Witamy!",
+      "resubscribe": "Reaktywuj subskrypcję"
     }
   },
   "projects": {
diff --git a/messages/zh.json b/messages/zh.json
index d1aa39ce..4ce24cb4 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -37,7 +37,8 @@
       "latte": "温暖乳白，阅读舒适。",
       "wonka": "丝滑可可，深沉奢华。",
       "mint": "清新薄荷，视觉平衡。",
-      "blossom": "娇柔花卉，视觉温和。"
+      "blossom": "娇柔花卉，视觉温和。",
+      "midnight": "深邃午夜蓝，专为星空下的专注工作而设计。"
     },
     "editor": "编辑器",
     "themedEditor": "主题编辑器",
@@ -149,7 +150,9 @@
       "cancelApple": "Apple 订阅通过 App Store 管理。",
       "manageApple": "打开 App Store",
       "alreadyBoundTo": "此订阅已与 {email} 关联。",
-      "alreadyBoundUnknown": "此订阅已与其他账户关联。"
+      "alreadyBoundUnknown": "此订阅已与其他账户关联。",
+      "welcomePro": "您已成功订阅 Scriptio Pro。欢迎！",
+      "resubscribe": "重新激活订阅"
     }
   },
   "projects": {
diff --git a/src/app/api/stripe/checkout/route.ts b/src/app/api/stripe/checkout/route.ts
index f55f0fae..b887bc21 100644
--- a/src/app/api/stripe/checkout/route.ts
+++ b/src/app/api/stripe/checkout/route.ts
@@ -15,8 +15,8 @@ async function createCheckoutSession(req: NextRequest, { user }: AuthApiContext)
         mode: "subscription",
         line_items: [{ price: process.env.STRIPE_PRO_PRICE_ID!, quantity: 1 }],
         client_reference_id: user.id,
-        success_url: `${baseUrl}/?pro=success`,
-        cancel_url: `${baseUrl}/?pro=cancel`,
+        success_url: `${baseUrl}/projects?pro=success`,
+        cancel_url: `${baseUrl}/projects?pro=cancel`,
     });
 
     return Success({ url: session.url });
diff --git a/src/app/api/users/settings/route.ts b/src/app/api/users/settings/route.ts
index 40d8ff75..7187d2f4 100644
--- a/src/app/api/users/settings/route.ts
+++ b/src/app/api/users/settings/route.ts
@@ -14,7 +14,7 @@ import { NextRequest } from "next/server";
 
 const UpdateSettingsBodySchema = z.object({
     keybinds: z.record(z.string(), z.string()).optional(),
-    theme: z.enum(["light", "dark", "latte", "wonka", "mint", "blossom"]).optional(),
+    theme: z.enum(["light", "dark", "latte", "wonka", "mint", "blossom", "midnight"]).optional(),
     language: z.enum(["en", "es", "fr", "zh", "ko", "ja", "de", "pl"]).optional(),
     themedEditor: z.boolean().optional(),
     highlightOnHover: z.boolean().optional(),
diff --git a/src/app/api/webhooks/stripe/route.ts b/src/app/api/webhooks/stripe/route.ts
index 61d86a6d..3aa5e92d 100644
--- a/src/app/api/webhooks/stripe/route.ts
+++ b/src/app/api/webhooks/stripe/route.ts
@@ -28,6 +28,7 @@ export async function POST(req: NextRequest) {
             const periodEnd = subscription.items.data[0]?.current_period_end;
             await UserService.updateUserFromId(userId, {
                 isProUntil: periodEnd ? new Date(periodEnd * 1000) : null,
+                isSubscriptionCancelled: false,
                 subscriptionProvider: "STRIPE",
             });
             await TransactionService.createTransactionIfNotExists(userId, "STRIPE", subscriptionId);
diff --git a/src/app/projects/page.tsx b/src/app/projects/page.tsx
index 6e05962f..c6856a4e 100644
--- a/src/app/projects/page.tsx
+++ b/src/app/projects/page.tsx
@@ -1,16 +1,27 @@
 "use client";
 
-import { Suspense } from "react";
-import { useSearchParams } from "next/navigation";
+import { Suspense, useContext, useEffect } from "react";
+import { useSearchParams, useRouter } from "next/navigation";
 import ProjectWorkspace from "@components/project/ProjectWorkspace";
 import ProjectPageContainer from "@components/projects/ProjectPageContainer";
 import HomeNavbar from "@components/navbar/HomeNavbar";
 import DashboardModal from "@components/dashboard/DashboardModal";
 import Loading from "@components/utils/Loading";
+import { DashboardContext } from "@src/context/DashboardContext";
 
 function ProjectsPageContent() {
     const params = useSearchParams();
     const projectId = params.get("projectId");
+    const { openDashboard } = useContext(DashboardContext);
+    const router = useRouter();
+
+    useEffect(() => {
+        if (!projectId && params.get("pro") === "success") {
+            sessionStorage.setItem("proWelcome", "1");
+            router.replace("/projects");
+            openDashboard("Subscription");
+        }
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
     if (!projectId) {
         return (
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
index 01a3df43..3227ce97 100644
--- a/src/app/providers.tsx
+++ b/src/app/providers.tsx
@@ -41,7 +41,7 @@ export function Providers({ children }: { children: ReactNode }) {
             value={{
                 revalidateOnFocus: false,
                 fetcher,
-                onSuccess: () => { },
+                onSuccess: () => {},
                 onError: (err) => {
                     // 401/403 are handled by the auth flow. 404 is expected for offline-first
                     // resources (e.g. a cached project whose cloud copy no longer exists) — the
@@ -69,7 +69,7 @@ export function Providers({ children }: { children: ReactNode }) {
                                 attribute="class"
                                 disableTransitionOnChange
                                 defaultTheme="dark"
-                                themes={["dark", "light", "latte", "wonka", "mint", "blossom"]}
+                                themes={["dark", "wonka", "midnight", "light", "latte", "mint", "blossom"]}
                                 enableColorScheme={false}
                             >
                                 <SpellcheckProvider>
diff --git a/src/lib/utils/types.ts b/src/lib/utils/types.ts
index e270db6d..31344f92 100644
--- a/src/lib/utils/types.ts
+++ b/src/lib/utils/types.ts
@@ -41,7 +41,7 @@ export interface UserSettings {
 }
 
 export type UserLanguage = "en" | "es" | "fr" | "zh" | "ko" | "ja" | "de" | "pl";
-export type UserTheme = "light" | "dark" | "latte" | "wonka" | "mint" | "blossom";
+export type UserTheme = "light" | "dark" | "latte" | "wonka" | "mint" | "blossom" | "midnight";
 
 /* Dictionaries */
 
diff --git a/styles/themes.css b/styles/themes.css
index 074e1e92..d9aecee2 100644
--- a/styles/themes.css
+++ b/styles/themes.css
@@ -289,6 +289,57 @@ html.blossom {
     --editor-scroll-btn-hover: var(--tertiary-hover);
 }
 
+html.midnight {
+    color-scheme: dark;
+
+    --panel-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.03), 0 0 12px rgba(0, 0, 0, 0.5);
+
+    --main-bg: var(--primary);
+    --primary: #0d1117;
+    --secondary: #161c2d;
+    --tertiary: #1e2a45;
+
+    --primary-hover: #131a2a;
+    --secondary-hover: #1a2438;
+    --tertiary-hover: #263554;
+
+    --primary-text: #c8d8f0;
+    --secondary-text: #6878a8;
+
+    --separator: #1e2a45;
+    --input-outline: #2a3d60;
+    --navbar-outline: #1e2a45;
+    --header-background: #161c2d;
+
+    --project-item-bg: var(--secondary);
+    --project-item-shadow: 6px 6px 0 var(--tertiary);
+    --project-item-shadow-hover: 12px 12px 0 var(--tertiary);
+    --project-item-shadow-active: 12px 12px 0 var(--tertiary);
+    --export-project-selected: #2a3d60;
+
+    --themed-editor-script-bg: var(--secondary);
+    --themed-editor-text: var(--primary-text);
+    --editor-scene: #c8d8f0;
+    --editor-sidebar: #0f1520;
+    --editor-sidebar-list: #1e2a45;
+    --editor-sidebar-hover: var(--primary);
+    --context-menu-bg: var(--secondary);
+    --context-menu-item-hover: var(--primary);
+    --editor-style-bg: #0d1117;
+    --editor-style-bg-hover: #1e2a45;
+    --editor-style-bg-active: #263554;
+    --editor-element-hover: #c8d8f0;
+    --editor-shadow: rgba(0, 0, 30, 0.6);
+
+    --editor-scroll-bg: var(--secondary);
+    --editor-scroll-btn: var(--tertiary);
+    --editor-scroll-btn-hover: var(--tertiary-hover);
+
+    --shadow-s: inset 0 1px 2px #3355aa30, 0 1px 2px #00000040, 0 2px 4px #00000020;
+    --shadow-m: inset 0 1px 2px #3355aa50, 0 2px 4px #00000040, 0 4px 8px #00000020;
+    --shadow-l: inset 0 1px 2px #3355aa70, 0 4px 6px #00000040, 0 6px 10px #00000020;
+}
+
 /* Themed editor: use the theme's own background and text colors instead of black & white */
 html.themed-editor {
     --editor-script-bg: var(--themed-editor-script-bg);

From 713c9603bbb019a80a832aaba7737f4398850226 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Sat, 2 May 2026 03:31:30 +0200
Subject: [PATCH 36/76] lots of visual tweaks, added cloud project sync from
 local-only project

---
 components/board/BoardCanvas.module.css       |  27 +-
 components/dashboard/AboutSettings.module.css |   5 +-
 components/dashboard/AboutSettings.tsx        |   6 +-
 .../dashboard/account/DashboardAuth.tsx       |   2 +
 .../dashboard/account/ProfileSettings.tsx     |  34 +-
 .../account/SubscriptionSettings.module.css   |   6 +-
 .../project/CollaboratorsSettings.module.css  |  17 +-
 .../project/CollaboratorsSettings.tsx         |  60 +-
 components/editor/SuggestionMenu.module.css   |  37 +-
 .../editor/sidebar/ContextMenu.module.css     |   1 +
 components/editor/sidebar/ContextMenu.tsx     |  14 +-
 components/navbar/ProjectNavbar.tsx           |  40 +-
 components/navbar/SavesPanel.module.css       |  26 +-
 components/navbar/ScreenplaySearch.module.css |  12 +-
 components/popup/Popup.module.css             |  10 +-
 components/popup/Popup.tsx                    |   4 +
 components/popup/PopupUploadToCloud.tsx       |  79 ++
 components/utils/NavbarIconButton.module.css  |  11 +-
 messages/de.json                              |  13 +-
 messages/en.json                              |  13 +-
 messages/es.json                              | 925 +++++++++---------
 messages/fr.json                              |  13 +-
 messages/ja.json                              |  13 +-
 messages/ko.json                              |  13 +-
 messages/pl.json                              |  13 +-
 messages/zh.json                              |  13 +-
 .../[projectId]/upload-to-cloud/route.ts      |  51 +
 .../indexeddb-storage-provider.ts             |   6 +
 .../storage-provider/local-persistence.ts     |  28 +
 .../storage-provider/storage-provider.ts      |   1 +
 src/lib/screenplay/popup.ts                   |  18 +-
 src/lib/utils/api-utils.ts                    |   5 +
 src/lib/utils/requests.ts                     |   7 +
 src/lib/utils/types.ts                        |   1 +
 src/server/repository/project-repository.ts   |  35 +-
 styles/themes.css                             |  52 +-
 36 files changed, 974 insertions(+), 637 deletions(-)
 create mode 100644 components/popup/PopupUploadToCloud.tsx
 create mode 100644 src/app/api/projects/[projectId]/upload-to-cloud/route.ts

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index a38eda82..37d4491e 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -232,36 +232,29 @@
 .context_menu {
     display: flex;
     flex-direction: column;
-    width: 150px;
+    width: 220px;
     z-index: 1000;
     position: fixed;
+    padding-block: 6px;
     overflow-y: auto;
     border-radius: 12px;
-    background-color: var(--editor-sidebar);
+    background-color: var(--context-menu-bg);
     box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
 }
 
 .context_menu_item {
-    display: flex; /* Enables flexbox layout */
-    align-items: center; /* Vertically centers the icon and text */
-    gap: 10px; /* Adds space between the icon and the text */
-
-    /* Your existing styles */
-    padding-block: 8px;
-    padding-left: 12px;
-    padding-right: 35px;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+
+    padding-block: 6px;
+    padding-inline: 12px;
     font-size: 14px;
-    border-bottom: 1px solid;
-    border-color: var(--separator);
     cursor: pointer;
 }
 
-.context_menu_item:last-child {
-    border-bottom: none;
-}
-
 .context_menu_item:hover {
-    background-color: var(--editor-sidebar-hover);
+    background-color: var(--context-menu-item-hover);
 }
 
 .context_menu_colors {
diff --git a/components/dashboard/AboutSettings.module.css b/components/dashboard/AboutSettings.module.css
index c6cebf89..8d08f68f 100644
--- a/components/dashboard/AboutSettings.module.css
+++ b/components/dashboard/AboutSettings.module.css
@@ -70,12 +70,11 @@
     justify-content: space-between;
     align-items: center;
     padding: 16px 20px;
-    background-color: transparent;
     transition: background-color 0.2s;
 }
 
 .row:hover {
-    background-color: var(--tertiary);
+    background-color: var(--secondary-hover);
 }
 
 .row:not(:last-child) {
@@ -113,4 +112,4 @@
         opacity: 1;
         transform: translateY(0);
     }
-}
\ No newline at end of file
+}
diff --git a/components/dashboard/AboutSettings.tsx b/components/dashboard/AboutSettings.tsx
index 01fe15c5..47f74510 100644
--- a/components/dashboard/AboutSettings.tsx
+++ b/components/dashboard/AboutSettings.tsx
@@ -29,13 +29,11 @@ const AboutSettings = () => {
                         <GitCommit size={18} className={styles.icon} />
                         <span className={styles.label}>Build</span>
                     </div>
-                    <span className={styles.value} style={{ fontFamily: "monospace", letterSpacing: "0.05em" }}>
-                        {buildId}
-                    </span>
+                    <span className={styles.value}>{buildId}</span>
                 </div>
             </div>
         </div>
     );
 };
 
-export default AboutSettings;
\ No newline at end of file
+export default AboutSettings;
diff --git a/components/dashboard/account/DashboardAuth.tsx b/components/dashboard/account/DashboardAuth.tsx
index 43cb6e38..b76a62e4 100644
--- a/components/dashboard/account/DashboardAuth.tsx
+++ b/components/dashboard/account/DashboardAuth.tsx
@@ -10,10 +10,12 @@ import { RequestMagicLinkBody } from "@src/lib/utils/api-bodies";
 import { useDesktopBridgeAuth } from "@src/lib/utils/hooks";
 
 import OAuthButtons from "./OAuthButtons";
+import { ArrowLeft } from "lucide-react";
 
 import form from "./../../utils/Form.module.css";
 import sharedStyles from "../project/ProjectSettings.module.css";
 import styles from "./AuthForm.module.css";
+import dangerStyles from "../project/DangerZone.module.css";
 
 type MessageType = "success" | "error" | "info";
 
diff --git a/components/dashboard/account/ProfileSettings.tsx b/components/dashboard/account/ProfileSettings.tsx
index 9d0f7446..edfc7a1f 100644
--- a/components/dashboard/account/ProfileSettings.tsx
+++ b/components/dashboard/account/ProfileSettings.tsx
@@ -129,14 +129,18 @@ const ProfileSettings = ({ dangerOpen, onDangerToggle }: { dangerOpen: boolean;
                         <div className={dangerStyles.modal}>
                             <h2 className={dangerStyles.modalTitle}>{t("deleteModalTitle")}</h2>
                             <p className={dangerStyles.modalDescription}>{t("deleteModalDesc")}</p>
-                            <label htmlFor="delete-confirm" className={dangerStyles.modalDescription} style={{ display: "block" }}>
-                                {t.rich("deleteConfirmLabel", { ph: () => <strong>{confirmPhrase}</strong> })}
+                            <label
+                                htmlFor="delete-confirm"
+                                className={dangerStyles.modalDescription}
+                                style={{ display: "block" }}
+                            >
+                                {t("deleteConfirmLabel")}
+                                <strong style={{ display: "block", marginTop: 6 }}>{confirmPhrase}</strong>
                             </label>
                             <input
                                 id="delete-confirm"
                                 type="text"
                                 className={`${sharedStyles.input} ${dangerStyles.modalInput}`}
-                                placeholder={confirmPhrase}
                                 value={deleteConfirmInput}
                                 onChange={(e) => setDeleteConfirmInput(e.target.value)}
                                 autoComplete="off"
@@ -172,13 +176,24 @@ const ProfileSettings = ({ dangerOpen, onDangerToggle }: { dangerOpen: boolean;
         <div className={sharedStyles.settingsForm}>
             {/* Email */}
             <div className={sharedStyles.formGroup}>
-                <label htmlFor="email" className={form.label}>{t("email")}</label>
-                <input id="email" type="email" value={user?.email ?? ""} disabled className={sharedStyles.input} autoComplete="email" />
+                <label htmlFor="email" className={form.label}>
+                    {t("email")}
+                </label>
+                <input
+                    id="email"
+                    type="email"
+                    value={user?.email ?? ""}
+                    disabled
+                    className={sharedStyles.input}
+                    autoComplete="email"
+                />
             </div>
 
             {/* Username */}
             <div className={sharedStyles.formGroup}>
-                <label htmlFor="username" className={form.label}>{t("username")}</label>
+                <label htmlFor="username" className={form.label}>
+                    {t("username")}
+                </label>
                 <input
                     id="username"
                     type="text"
@@ -236,7 +251,12 @@ const ProfileSettings = ({ dangerOpen, onDangerToggle }: { dangerOpen: boolean;
                     <Save size={18} />
                     {loading ? t("saving") : tCommon("save")}
                 </button>
-                <button type="button" className={dangerStyles.arrowBtn} onClick={onDangerToggle} title={t("dangerZoneTitle")}>
+                <button
+                    type="button"
+                    className={dangerStyles.arrowBtn}
+                    onClick={onDangerToggle}
+                    title={t("dangerZoneTitle")}
+                >
                     <ArrowRight size={16} />
                 </button>
             </div>
diff --git a/components/dashboard/account/SubscriptionSettings.module.css b/components/dashboard/account/SubscriptionSettings.module.css
index 17ab21fc..f829a9f9 100644
--- a/components/dashboard/account/SubscriptionSettings.module.css
+++ b/components/dashboard/account/SubscriptionSettings.module.css
@@ -1,4 +1,5 @@
 .card {
+    background: var(--secondary);
     border: 1px solid var(--separator);
     border-radius: 12px;
     padding: 20px;
@@ -7,11 +8,6 @@
     gap: 16px;
 }
 
-.card[data-pro="true"] {
-    border-color: color-mix(in srgb, var(--primary-text) 30%, transparent);
-    background: var(--secondary);
-}
-
 .header {
     display: flex;
     align-items: center;
diff --git a/components/dashboard/project/CollaboratorsSettings.module.css b/components/dashboard/project/CollaboratorsSettings.module.css
index 80b0a1a6..8dede8f4 100644
--- a/components/dashboard/project/CollaboratorsSettings.module.css
+++ b/components/dashboard/project/CollaboratorsSettings.module.css
@@ -33,10 +33,6 @@
     color: var(--primary-text);
 }
 
-.infoIconWrapper:hover .permissionsHint {
-    opacity: 1;
-    visibility: visible;
-}
 
 .slotGrid {
     display: flex;
@@ -189,10 +185,7 @@
 }
 
 .permissionsHint {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    margin-top: 8px;
+    position: fixed;
     background: var(--secondary);
     border: 1px solid var(--separator);
     border-radius: 8px;
@@ -200,12 +193,8 @@
     display: flex;
     flex-direction: column;
     gap: 6px;
-    opacity: 0;
-    visibility: hidden;
-    transition:
-        opacity 0.2s,
-        visibility 0.2s;
-    z-index: 100;
+    pointer-events: none;
+    z-index: 1000;
     white-space: nowrap;
     width: max-content;
     box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
diff --git a/components/dashboard/project/CollaboratorsSettings.tsx b/components/dashboard/project/CollaboratorsSettings.tsx
index 7d98ce24..286bf601 100644
--- a/components/dashboard/project/CollaboratorsSettings.tsx
+++ b/components/dashboard/project/CollaboratorsSettings.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { useContext, useMemo, useState } from "react";
+import { useContext, useMemo, useRef, useState } from "react";
+import { createPortal } from "react-dom";
 import { useTranslations } from "next-intl";
 import { useCookieUser, useIsPro, useProjectCollaborators, useProjectInvites, useProjectMembership } from "@src/lib/utils/hooks";
 import { CookieUser } from "@src/lib/utils/types";
@@ -53,36 +54,53 @@ const CollaboratorsSettings = () => {
         return result;
     }, [membership, collaborators, invites]);
 
+    const iconRef = useRef<HTMLDivElement>(null);
+    const [hintPos, setHintPos] = useState<{ top: number; left: number } | null>(null);
+
     if (isLocalOnly) return <p style={{ color: "var(--secondary-text)", fontSize: "0.85rem" }}>{t("localProjectOnly")}</p>;
     if (!membership || !user) return null;
 
+    const hint = hintPos && createPortal(
+        <div className={styles.permissionsHint} style={{ top: hintPos.top, left: hintPos.left }}>
+            <div className={styles.hintItem}>
+                <span className={styles.hintRole}>{t("roles.owner")}</span>
+                {t("roleDesc.owner")}
+            </div>
+            <div className={styles.hintItem}>
+                <span className={styles.hintRole}>{t("roles.admin")}</span>
+                {t("roleDesc.admin")}
+            </div>
+            <div className={styles.hintItem}>
+                <span className={styles.hintRole}>{t("roles.editor")}</span>
+                {t("roleDesc.editor")}
+            </div>
+            <div className={styles.hintItem}>
+                <span className={styles.hintRole}>{t("roles.viewer")}</span>
+                {t("roleDesc.viewer")}
+            </div>
+        </div>,
+        document.body,
+    );
+
     return (
         <div className={styles.container}>
+            {hint}
             <section className={styles.section}>
                 <div className={styles.labelRow}>
                     <label className={form.label}>
                         {t("projectTeam", { count: collaborators.length + invites.length, max: MAX_COLLABORATORS })}
                     </label>
-                    <div className={styles.infoIconWrapper}>
+                    <div
+                        className={styles.infoIconWrapper}
+                        ref={iconRef}
+                        onMouseEnter={() => {
+                            if (!iconRef.current) return;
+                            const rect = iconRef.current.getBoundingClientRect();
+                            setHintPos({ top: rect.bottom + 8, left: rect.left });
+                        }}
+                        onMouseLeave={() => setHintPos(null)}
+                    >
                         <Info size={16} className={styles.infoIcon} />
-                        <div className={styles.permissionsHint}>
-                            <div className={styles.hintItem}>
-                                <span className={styles.hintRole}>{t("roles.owner")}</span>
-                                {t("roleDesc.owner")}
-                            </div>
-                            <div className={styles.hintItem}>
-                                <span className={styles.hintRole}>{t("roles.admin")}</span>
-                                {t("roleDesc.admin")}
-                            </div>
-                            <div className={styles.hintItem}>
-                                <span className={styles.hintRole}>{t("roles.editor")}</span>
-                                {t("roleDesc.editor")}
-                            </div>
-                            <div className={styles.hintItem}>
-                                <span className={styles.hintRole}>{t("roles.viewer")}</span>
-                                {t("roleDesc.viewer")}
-                            </div>
-                        </div>
                     </div>
                 </div>
                 <p className={shared.helpText}>{t("teamHelp")}</p>
@@ -147,7 +165,7 @@ const MemberSlot = ({ data, membership, mutateCollaborators, user }: MemberSlotP
     const isOwner = data.role === ProjectRole.OWNER;
     const isAdmin = Roles.hasRoleOrGreater(membership.role, ProjectRole.ADMIN);
     const isSelf = data.user.email === user.email;
-    const canKick = (isSelf && !isOwner) || isAdmin;
+    const canKick = (isSelf && !isOwner) || (!isSelf && isAdmin);
 
     const handleKick = async () => {
         const res = await kickCollaborator(membership.project.id, data.user.id);
diff --git a/components/editor/SuggestionMenu.module.css b/components/editor/SuggestionMenu.module.css
index 9f0829ab..2f55d3a1 100644
--- a/components/editor/SuggestionMenu.module.css
+++ b/components/editor/SuggestionMenu.module.css
@@ -2,46 +2,33 @@
     position: fixed;
     display: flex;
     flex-direction: column;
-    padding: 6px;
-
+    padding-block: 6px;
     z-index: 100;
-    border-radius: 10px;
-    background-color: color-mix(in srgb, var(--primary) 70%, transparent);
-    backdrop-filter: blur(12px);
-    border: 1px solid var(--separator);
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
-
+    border-radius: 12px;
+    background-color: var(--context-menu-bg);
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
     min-width: 120px;
-    max-width: 200px;
+    max-width: 220px;
     max-height: 180px;
     overflow-y: auto;
     overflow-x: hidden;
 }
 
 .menu_item {
-    display: block;
-    width: 100%;
-    padding: 8px 12px;
-    border: none;
-    border-radius: 6px;
-    font-size: 0.85rem;
-    text-align: left;
+    display: flex;
+    align-items: center;
+    padding-block: 6px;
+    padding-inline: 12px;
+    font-size: 14px;
     cursor: pointer;
-    color: var(--primary-text);
-    background-color: transparent;
-    transition: background-color 0.15s ease;
 }
 
 .menu_item:hover {
-    background-color: color-mix(in srgb, var(--primary-text) 10%, transparent);
+    background-color: var(--context-menu-item-hover);
 }
 
 .selected {
-    background-color: color-mix(in srgb, var(--primary-text) 15%, transparent);
-}
-
-.selected:hover {
-    background-color: color-mix(in srgb, var(--primary-text) 15%, transparent);
+    background-color: var(--context-menu-item-hover);
 }
 
 .item {
diff --git a/components/editor/sidebar/ContextMenu.module.css b/components/editor/sidebar/ContextMenu.module.css
index 95855b57..fa554e32 100644
--- a/components/editor/sidebar/ContextMenu.module.css
+++ b/components/editor/sidebar/ContextMenu.module.css
@@ -9,6 +9,7 @@
     overflow-y: auto;
     border-radius: 12px;
     background-color: var(--context-menu-bg);
+    border: 1px solid var(--separator);
     box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
 }
 
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index f88f96a1..d26110f7 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -20,6 +20,7 @@ import {
     ClipboardPaste,
     Columns2,
     Copy,
+    Highlighter,
     Loader2,
     LucideIcon,
     MessageSquarePlus,
@@ -95,15 +96,16 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
                 icon={ArrowDownRight}
                 action={() => focusOnPosition(editor!, scene.position)}
             />
-            <ContextMenuItem text={t("edit")} action={() => editScenePopup(scene, userCtx)} />
-            <ContextMenuItem
-                text={t("cut")}
-                action={() => cutText(editor!, scene.position, scene.nextPosition)}
-            />
             <ContextMenuItem
                 text={t("selectInEditor")}
                 action={() => selectTextInEditor(editor!, scene.position, scene.nextPosition)}
             />
+            <div className={context.menu_separator} />
+            <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editScenePopup(scene, userCtx)} />
+            <ContextMenuItem
+                text={t("cut")}
+                action={() => cutText(editor!, scene.position, scene.nextPosition)}
+            />
         </>
     );
 };
@@ -136,8 +138,10 @@ const CharacterItemMenu = ({ props }: SubMenuProps<CharacterContextProps>) => {
                 text={t("paste")}
                 action={() => pasteText(projectCtx.editor!, character.name)}
             />
+            <div className={context.menu_separator} />
             <ContextMenuItem
                 text={t("highlight")}
+                icon={Highlighter}
                 action={() => toggleCharacterHighlight(character.name)}
             />
         </>
diff --git a/components/navbar/ProjectNavbar.tsx b/components/navbar/ProjectNavbar.tsx
index a626e81e..839b9011 100644
--- a/components/navbar/ProjectNavbar.tsx
+++ b/components/navbar/ProjectNavbar.tsx
@@ -3,19 +3,22 @@
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
 import { ConnectionStatus } from "@src/lib/utils/enums";
-import { useIsPro, useProjectIdFromUrl } from "@src/lib/utils/hooks";
+import { useCookieUser, useIsPro, useProjectIdFromUrl } from "@src/lib/utils/hooks";
 import { redirectHome } from "@src/lib/utils/redirects";
 
 import { ProjectContext } from "@src/context/ProjectContext";
+import { UserContext } from "@src/context/UserContext";
 import { useViewContext } from "@src/context/ViewContext";
 import debounce from "debounce";
 import { editProject } from "@src/lib/utils/requests";
 import { join } from "@src/lib/utils/misc";
+import { uploadToCloudPopup } from "@src/lib/screenplay/popup";
 import { DashboardContext } from "@src/context/DashboardContext";
 import {
     BarChart2,
     CircleArrowLeft,
     CircleCheckBig,
+    CloudUpload,
     History,
     Monitor,
     Settings,
@@ -89,18 +92,41 @@ const CollaboratorsDisplay = () => {
 const ProjectNavbar = () => {
     const { openDashboard } = useContext(DashboardContext);
     const { project: membership, setProjectTitle: setContextTitle } = useContext(ProjectContext);
+    const userCtx = useContext(UserContext);
 
     const [projectTitle, setProjectTitle] = useState<string>("");
     const [isAnalyticsOpen, setIsAnalyticsOpen] = useState(false);
     const [isSavesOpen, setIsSavesOpen] = useState(false);
+    const [isLocalOnly, setIsLocalOnly] = useState<boolean | null>(null);
     const isLocalEdit = useRef(false);
 
     const { isPro } = useIsPro();
+    const { user } = useCookieUser();
     const projectId = useProjectIdFromUrl();
 
     const t = useTranslations("navbar");
     const viewContext = useViewContext();
 
+    useEffect(() => {
+        if (!projectId) {
+            setIsLocalOnly(null);
+            return;
+        }
+        let cancelled = false;
+        (async () => {
+            const { isLocalOnlyProject, cachedProjectExists } =
+                await import("@src/lib/persistence/storage-provider/local-persistence");
+            const exists = await cachedProjectExists(projectId);
+            const local = exists ? await isLocalOnlyProject(projectId) : false;
+            if (!cancelled) setIsLocalOnly(local);
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [projectId, membership]);
+
+    const canUploadToCloud = !membership && !!user && isPro && !!projectId && isLocalOnly === true;
+
     const isInProject = !!projectId;
     const hasScreenplay = viewContext.visiblePanels.includes("screenplay");
     const hasTitlePage = viewContext.visiblePanels.includes("title");
@@ -164,6 +190,18 @@ const ProjectNavbar = () => {
                         <div className={navbar.navbar_island}>
                             {membership ? (
                                 <StatusIndicator />
+                            ) : canUploadToCloud ? (
+                                <div
+                                    className={navbar.tooltip}
+                                    data-hint={t("uploadToCloud")}
+                                    onClick={() => uploadToCloudPopup(projectId, userCtx)}
+                                    style={{ cursor: "pointer" }}
+                                >
+                                    <CloudUpload
+                                        style={{ color: "var(--primary-text)" }}
+                                        className={navbar.status_icon}
+                                    />
+                                </div>
                             ) : (
                                 <div className={navbar.tooltip} data-hint={t("localProject")}>
                                     <Monitor
diff --git a/components/navbar/SavesPanel.module.css b/components/navbar/SavesPanel.module.css
index a1db7a1b..f3a52ac6 100644
--- a/components/navbar/SavesPanel.module.css
+++ b/components/navbar/SavesPanel.module.css
@@ -56,11 +56,11 @@
     align-items: center;
     gap: 8px;
     width: 100%;
-    padding: 6px 12px;
-    border: 1px dashed var(--tertiary);
+    padding: 7px 12px;
+    border: none;
+    background-color: var(--primary);
+    color: var(--primary-text);
     border-radius: 8px;
-    background: none;
-    color: var(--secondary-text);
     font-size: 0.85rem;
     cursor: pointer;
     transition: all 0.15s ease;
@@ -87,15 +87,23 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 6px 10px;
-    border: 1px solid transparent;
-    border-radius: 6px;
-    background-color: var(--tertiary);
-    color: var(--primary);
+    padding-inline: 8px;
+    border: none;
+    border-radius: 4px;
+    background: none;
     cursor: pointer;
     flex-shrink: 0;
 }
 
+.save_btn svg {
+    color: var(--primary-text);
+    transition: opacity 0.2s ease;
+}
+
+.save_btn:hover svg {
+    opacity: 0.7;
+}
+
 .save_btn:disabled {
     opacity: 0.5;
     cursor: not-allowed;
diff --git a/components/navbar/ScreenplaySearch.module.css b/components/navbar/ScreenplaySearch.module.css
index 93bf3e92..48ef6aa0 100644
--- a/components/navbar/ScreenplaySearch.module.css
+++ b/components/navbar/ScreenplaySearch.module.css
@@ -10,15 +10,21 @@
     flex-direction: row;
     align-items: center;
     border-radius: 64px;
-    border: 2px solid var(--tertiary);
+    border: 2px solid var(--secondary);
+    background-color: var(--secondary);
     overflow: hidden;
     transition: width 0.25s ease;
     width: 44px;
+    transition: border-color 0.2s ease;
+}
+
+.search_wrapper:hover {
+    border-color: var(--tertiary);
 }
 
 .search_wrapper_open {
     width: 220px;
-    background-color: var(--secondary);
+    border-color: var(--tertiary);
 }
 
 .search_input {
@@ -49,7 +55,7 @@
 }
 
 .search_btn:hover {
-    background-color: var(--secondary-hover);
+    border-color: var(--tertiary);
 }
 
 .search_btn_active {
diff --git a/components/popup/Popup.module.css b/components/popup/Popup.module.css
index 1be77504..031a81cf 100644
--- a/components/popup/Popup.module.css
+++ b/components/popup/Popup.module.css
@@ -3,7 +3,7 @@
     width: 500px;
     min-height: 250px;
     padding: 16px;
-
+    border: 2px solid var(--separator);
     box-shadow: 0 5px 30px rgba(0, 0, 0, 0.3);
     background-color: var(--primary);
     border-radius: 12px;
@@ -41,7 +41,7 @@
     font-size: 1.4rem;
     font-weight: bold;
     color: var(--primary-text);
-    font-family: var(--font-inter);
+    font-family: var(--font-josef);
     text-transform: uppercase;
 }
 
@@ -116,11 +116,13 @@
 }
 
 .confirm {
-    background-color: var(--tertiary) !important;
+    background-color: var(--secondary);
+    border-radius: 8px !important;
+    transition: background-color 0.15s ease !important;
 }
 
 .confirm:hover {
-    background-color: var(--tertiary-hover) !important;
+    background-color: var(--secondary-hover) !important;
 }
 
 .confirm:disabled {
diff --git a/components/popup/Popup.tsx b/components/popup/Popup.tsx
index 64cd0185..570411d9 100644
--- a/components/popup/Popup.tsx
+++ b/components/popup/Popup.tsx
@@ -7,11 +7,13 @@ import {
     PopupImportFileData,
     PopupSceneData,
     PopupType,
+    PopupUploadToCloudData,
 } from "@src/lib/screenplay/popup";
 import { useContext } from "react";
 import PopupCharacterItem from "./PopupCharacterItem";
 import PopupImportFile from "./PopupImportFile";
 import PopupSceneItem from "./PopupSceneItem";
+import PopupUploadToCloud from "./PopupUploadToCloud";
 
 export const Popup = () => {
     const { popup } = useContext(UserContext);
@@ -26,6 +28,8 @@ export const Popup = () => {
             return <PopupImportFile {...(popup as PopupData<PopupImportFileData>)} />;
         case PopupType.EditScene:
             return <PopupSceneItem {...(popup as PopupData<PopupSceneData>)} />;
+        case PopupType.UploadToCloud:
+            return <PopupUploadToCloud {...(popup as PopupData<PopupUploadToCloudData>)} />;
         default:
             return null;
     }
diff --git a/components/popup/PopupUploadToCloud.tsx b/components/popup/PopupUploadToCloud.tsx
new file mode 100644
index 00000000..faf1c3ba
--- /dev/null
+++ b/components/popup/PopupUploadToCloud.tsx
@@ -0,0 +1,79 @@
+"use client";
+
+import popup from "./Popup.module.css";
+import form from "../utils/Form.module.css";
+
+import { X } from "lucide-react";
+import { join } from "@src/lib/utils/misc";
+import { useDraggable } from "@src/lib/utils/hooks";
+import { PopupData, PopupUploadToCloudData, closePopup } from "@src/lib/screenplay/popup";
+import { useContext, useState } from "react";
+import { UserContext } from "@src/context/UserContext";
+import { useTranslations } from "next-intl";
+import FormInfo, { FormInfoType } from "../utils/FormInfo";
+
+const PopupUploadToCloud = ({ data: { projectId } }: PopupData<PopupUploadToCloudData>) => {
+    const userCtx = useContext(UserContext);
+    const { position, handleMouseDown, isDragging } = useDraggable();
+    const t = useTranslations("popup.uploadToCloud");
+
+    const [isUploading, setIsUploading] = useState(false);
+    const [info, setInfo] = useState<FormInfoType | undefined>(undefined);
+
+    const onConfirm = async () => {
+        if (isUploading) return;
+        setIsUploading(true);
+        setInfo(undefined);
+        try {
+            const { promoteLocalProjectToCloud } = await import(
+                "@src/lib/persistence/storage-provider/local-persistence"
+            );
+            await promoteLocalProjectToCloud(projectId);
+            window.location.reload();
+        } catch (e) {
+            const message = e instanceof Error ? e.message : t("failed");
+            setInfo({ content: message, isError: true });
+            setIsUploading(false);
+        }
+    };
+
+    const onCancel = () => {
+        if (isUploading) return;
+        closePopup(userCtx);
+    };
+
+    return (
+        <div className={popup.window}>
+            <div className={popup.container} style={{ transform: `translate(${position.x}px, ${position.y}px)` }}>
+                <div
+                    className={popup.header}
+                    onMouseDown={handleMouseDown}
+                    style={{ cursor: isDragging ? "grabbing" : "grab" }}
+                >
+                    <h2 className={popup.title}>{t("title")}</h2>
+                    <X className={popup.close_btn} onClick={onCancel} />
+                </div>
+                <div className={popup.info}>
+                    <p>{t("body")}</p>
+                </div>
+                {info && <FormInfo info={info} />}
+                <button
+                    className={join(form.btn, popup.confirm)}
+                    onClick={onConfirm}
+                    disabled={isUploading}
+                >
+                    {isUploading ? t("uploading") : t("confirm")}
+                </button>
+                <button
+                    className={join(form.btn, popup.cancel)}
+                    onClick={onCancel}
+                    disabled={isUploading}
+                >
+                    {t("cancel")}
+                </button>
+            </div>
+        </div>
+    );
+};
+
+export default PopupUploadToCloud;
diff --git a/components/utils/NavbarIconButton.module.css b/components/utils/NavbarIconButton.module.css
index a270fed2..6cdc5124 100644
--- a/components/utils/NavbarIconButton.module.css
+++ b/components/utils/NavbarIconButton.module.css
@@ -6,20 +6,17 @@
     padding-inline: 10px;
     gap: 12px;
     border-radius: 64px;
-    border: 2px solid var(--tertiary);
-    color: var(--secondary-text);
-    background-color: var(--main-bg);
+    border: 2px solid var(--secondary);
+    background-color: var(--secondary);
     user-select: none;
     cursor: pointer;
     transition: all 0.2s ease;
 }
 
 .button:hover {
-    background-color: var(--secondary-hover);
-    color: var(--primary-text);
+    border-color: var(--tertiary);
 }
 
 .active {
-    background-color: var(--primary);
-    color: var(--primary-text);
+    border-color: var(--tertiary);
 }
diff --git a/messages/de.json b/messages/de.json
index 839bad2b..f31e0e08 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -7,6 +7,7 @@
     "noConnection": "Keine Verbindung",
     "reconnecting": "Verbindung wird wiederhergestellt...",
     "localProject": "Lokales Projekt",
+    "uploadToCloud": "In die Cloud hochladen",
     "cachedProject": "Gecachtes Projekt",
     "endlessScroll": "Endloses Scrollen",
     "toggleComments": "Kommentare ein/aus",
@@ -122,7 +123,7 @@
     "deleteModalTitle": "Konto löschen",
     "deleteModalDesc": "Dies wird dauerhaft Ihr Konto und alle verknüpften Daten löschen. Diese Aktion kann nicht rückgängig gemacht werden.",
     "deleteConfirmPhrase": "Ich bestätige die Löschung meines Kontos",
-    "deleteConfirmLabel": "Tippe <ph/> zur Bestätigung.",
+    "deleteConfirmLabel": "Gib folgenden Text ein, um die Löschung zu bestätigen:",
     "deleting": "Löschen...",
     "deleteAccountBtn": "Mein Konto löschen",
     "subscription": {
@@ -363,7 +364,7 @@
     "edit": "Bearbeiten",
     "copy": "Kopieren",
     "cut": "Ausschneiden",
-    "selectInEditor": "Im Editor auswählen",
+    "selectInEditor": "Auswählen",
     "remove": "Entfernen",
     "paste": "Einfügen",
     "highlight": "Hervorheben",
@@ -409,6 +410,14 @@
       "synopsis": "Kurzbeschreibung",
       "synopsisPlaceholder": "Schreiben Sie eine kurze Beschreibung dieser Szene...",
       "save": "Speichern"
+    },
+    "uploadToCloud": {
+      "title": "In die Cloud hochladen",
+      "body": "Dieses Projekt in die Cloud hochladen? Ihr Projekt wird gesichert und ist von jedem Gerät zugänglich, und Sie können Mitarbeiter einladen.",
+      "confirm": "Hochladen",
+      "cancel": "Abbrechen",
+      "uploading": "Wird hochgeladen...",
+      "failed": "Hochladen fehlgeschlagen. Bitte versuchen Sie es erneut."
     }
   },
   "board": {
diff --git a/messages/en.json b/messages/en.json
index 9ad8342d..8c52eba1 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -7,6 +7,7 @@
     "noConnection": "No connection",
     "reconnecting": "Reconnecting...",
     "localProject": "Local project",
+    "uploadToCloud": "Upload to cloud",
     "endlessScroll": "Endless Scroll",
     "toggleComments": "Toggle Comments",
     "focusMode": "Focus Mode",
@@ -121,7 +122,7 @@
     "deleteModalTitle": "Delete account",
     "deleteModalDesc": "This will permanently delete your account and all associated data. This action cannot be undone.",
     "deleteConfirmPhrase": "I confirm my account deletion",
-    "deleteConfirmLabel": "Type <ph/> to confirm.",
+    "deleteConfirmLabel": "Type the following text to confirm deletion:",
     "deleting": "Deleting...",
     "deleteAccountBtn": "Delete my account",
     "subscription": {
@@ -362,7 +363,7 @@
     "edit": "Edit",
     "copy": "Copy",
     "cut": "Cut",
-    "selectInEditor": "Select in editor",
+    "selectInEditor": "Select",
     "remove": "Remove",
     "paste": "Paste",
     "highlight": "Highlight",
@@ -408,6 +409,14 @@
       "synopsis": "Synopsis",
       "synopsisPlaceholder": "Write a brief description of this scene...",
       "save": "Save"
+    },
+    "uploadToCloud": {
+      "title": "Upload to cloud",
+      "body": "Upload this project to the cloud? Your project will be backed up and accessible from any device, and you'll be able to invite collaborators.",
+      "confirm": "Upload",
+      "cancel": "Cancel",
+      "uploading": "Uploading...",
+      "failed": "Upload failed. Please try again."
     }
   },
   "board": {
diff --git a/messages/es.json b/messages/es.json
index 7a90acb8..fc373f7a 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -1,473 +1,482 @@
 {
-  "navbar": {
-    "screenplay": "Guión",
-    "board": "Tablero",
-    "titlePage": "Portada",
-    "synced": "Sincronizado en la nube",
-    "noConnection": "Sin conexión",
-    "reconnecting": "Reconectando...",
-    "localProject": "Proyecto local",
-    "endlessScroll": "Desplazamiento infinito",
-    "toggleComments": "Mostrar/ocultar comentarios",
-    "focusMode": "Modo concentración",
-    "splitPanel": "Dividir panel",
-    "unsplitPanel": "Unir panel",
-    "draftEditor": "Editor de borrador"
-  },
-  "common": {
-    "save": "Guardar cambios",
-    "cancel": "Cancelar",
-    "loading": "Cargando...",
-    "resetDefaults": "Restablecer predeterminados"
-  },
-  "sidebar": {
-    "title": "Panel",
-    "logOut": "Cerrar sesión",
-    "auth": "Iniciar sesión",
-    "logOutConfirmTitle": "Cerrar sesión",
-    "logOutConfirmDesc": "¿Estás seguro de que quieres cerrar sesión?",
-    "logOutConfirmBtn": "Cerrar sesión",
-    "logOutCancelBtn": "Cancelar"
-  },
-  "appearance": {
-    "theme": "Tema",
-    "themeHelp": {
-      "dark": "Tema acogedor y de bajo resplandor, perfecto para noctámbulos y noches de concentración.",
-      "light": "Tema nítido y aireado que se siente natural y cómodo durante el día.",
-      "latte": "Tema suave con base crema que combina calidez y legibilidad.",
-      "wonka": "Tema aterciopelado con base de cacao que combina lujo profundo y descanso visual.",
-      "mint": "Tema refrescante con esencia de menta que combina serenidad botánica y equilibrio visual.",
-      "blossom": "Tema delicado con esencia floral que combina calidez de pétalos y suavidad visual.",
-      "midnight": "Tema azul medianoche profundo, diseñado para el trabajo concentrado bajo un cielo estrellado."
+    "navbar": {
+        "screenplay": "Guión",
+        "board": "Tablero",
+        "titlePage": "Portada",
+        "synced": "Sincronizado en la nube",
+        "noConnection": "Sin conexión",
+        "reconnecting": "Reconectando...",
+        "localProject": "Proyecto local",
+        "uploadToCloud": "Subir a la nube",
+        "endlessScroll": "Desplazamiento infinito",
+        "toggleComments": "Mostrar/ocultar comentarios",
+        "focusMode": "Modo concentración",
+        "splitPanel": "Dividir panel",
+        "unsplitPanel": "Unir panel",
+        "draftEditor": "Editor de borrador"
     },
-    "editor": "Editor",
-    "themedEditor": "Editor con tema",
-    "themedEditorDesc": "Usar los colores del tema para el fondo y el texto del editor",
-    "highlightOnHover": "Resaltar al pasar el cursor",
-    "highlightOnHoverDesc": "Resalta ligeramente la línea sobre la que se pasa el cursor en el editor"
-  },
-  "keybinds": {
-    "screenplayElements": "Elementos de guión",
-    "typing": "Escribir… (Esc para cancelar)",
-    "notSet": "No asignado",
-    "modifiersOnly": "Solo modificadores — presiona una tecla normal",
-    "defaultPrefix": "Por defecto: {combo}",
-    "reset": "Restablecer",
-    "resetTitle": "Borrar asignación del usuario",
-    "resetDefaults": "Restablecer predeterminados",
-    "save": "Guardar cambios"
-  },
-  "language": {
-    "label": "Idioma de la interfaz",
-    "helpText": "Elige el idioma que se usa en toda la aplicación.",
-    "spellcheckLabel": "Corrector orthográfico",
-    "spellcheckHelpText": "Descarga un diccionario para la corrección ortográfica en el editor.",
-    "spellcheckNone": "Desactivado",
-    "customDictLabel": "Diccionario del proyecto",
-    "customDictAdd": "Añadir",
-    "customDictEmpty": "Aún no hay palabras personalizadas.",
-    "customDictHelpText": "Las palabras añadidas aquí se comparten con todos los colaboradores del proyecto."
-  },
-  "modal": {
-    "groups": {
-      "project": "Proyecto",
-      "preferences": "Preferencias",
-      "account": "Cuenta"
+    "common": {
+        "save": "Guardar cambios",
+        "cancel": "Cancelar",
+        "loading": "Cargando...",
+        "resetDefaults": "Restablecer predeterminados"
     },
-    "tabs": {
-      "General": "General",
-      "Layout": "Diseño",
-      "Export": "Importar/Exportar",
-      "Collaborators": "Colaboradores",
-      "Keybinds": "Atajos de teclado",
-      "Appearance": "Apariencia",
-      "Language": "Idioma",
-      "Profile": "Perfil",
-      "Settings": "Ajustes",
-      "Auth": "Iniciar sesión",
-      "About": "Acerca de",
-      "Subscription": "Suscripción"
-    }
-  },
-  "dangerZone": {
-    "transferOwnership": "Transferir propiedad",
-    "transferDesc": "Transfiere tu rol de propietario a otro usuario. Pasarás a tener el rol de editor.",
-    "transferBtn": "Transferir",
-    "transferPrompt": "Introduce el correo del nuevo propietario:",
-    "deleteProject": "Eliminar proyecto",
-    "deleteProjectDesc": "Once un proyecto es eliminado, no hay vuelta atrás. Por favor, asegúrate.",
-    "deleteBtn": "Eliminar",
-    "modalTitle": "Eliminar proyecto",
-    "modalDesc": "Esta acción es permanente y no se puede deshacer. Se perderán todos los datos asociados a este proyecto.",
-    "deleting": "Eliminando...",
-    "confirmDeleteBtn": "Eliminar proyecto"
-  },
-  "profile": {
-    "email": "Correo electrónico",
-    "username": "Nombre de usuario",
-    "usernamePlaceholder": "Introduce tu nombre para mostrar...",
-    "usernameHelp": "Este nombre será visible para los colaboradores cuando trabajes en proyectos compartidos.",
-    "color": "Color",
-    "customColor": "Color personalizado",
-    "selectColor": "Seleccionar color {color}",
-    "successMessage": "Perfil actualizado correctamente",
-    "failedUpdate": "Error al actualizar el perfil",
-    "errorSaving": "Ocurrió un error al guardar",
-    "saving": "Guardando...",
-    "dangerZoneTitle": "Zona de peligro",
-    "deleteAccount": "Eliminar cuenta",
-    "deleteAccountDesc": "Elimina permanentemente tu cuenta y todos los datos asociados. Esto no se puede deshacer.",
-    "deleteBtn": "Eliminar",
-    "deleteModalTitle": "Eliminar cuenta",
-    "deleteModalDesc": "Esto eliminará permanentemente tu cuenta y todos los datos asociados. Esta acción no se puede deshacer.",
-    "deleteConfirmPhrase": "Confirmo la eliminación de mi cuenta",
-    "deleteConfirmLabel": "Escribe <ph/> para confirmar.",
-    "deleting": "Eliminando...",
-    "deleteAccountBtn": "Eliminar mi cuenta",
-    "subscription": {
-      "title": "Suscripción",
-      "proBadge": "Pro",
-      "proTitle": "Plan Pro",
-      "freeTitle": "Plan Gratuito",
-      "renewsOn": "Se renueva el {date}",
-      "perksTitle": "Incluido en tu plan:",
-      "upgradeTitle": "Mejora para desbloquear:",
-      "perkProjects": "Crear proyectos en la nube",
-      "perkSaves": "Guardados manuales e historial de versiones",
-      "perkCollaborators": "Invitar colaboradores",
-      "perkAutoSave": "Guardado automático en la nube",
-      "upgradeBtn": "Actualizar a Pro",
-      "redirecting": "Redirigiendo...",
-      "cancel": "Cancelar suscripción",
-      "cancelConfirm": "Tu acceso Pro permanece activo hasta {date}. ¿Cancelar de todos modos?",
-      "cancelYes": "Sí, cancelar",
-      "cancelNo": "Mantener Pro",
-      "cancelling": "Cancelando...",
-      "cancelSuccess": "Suscripción cancelada. Acceso Pro hasta {date}.",
-      "endsOn": "Tu suscripción termina el {date}",
-      "purchasing": "Comprando...",
-      "purchaseError": "La compra falló. Inténtalo de nuevo.",
-      "cancelApple": "Las suscripciones de Apple se gestionan a través del App Store.",
-      "manageApple": "Abrir App Store",
-      "alreadyBoundTo": "Esta suscripción ya está vinculada a {email}.",
-      "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta.",
-      "welcomePro": "Ya estás suscrito a Scriptio Pro. ¡Bienvenido!",
-      "resubscribe": "Reactivar suscripción"
-    }
-  },
-  "projects": {
-    "untitled": "Sin título",
-    "newProject": "Nuevo proyecto",
-    "pageTitle": "Proyectos",
-    "importBtn": "Importar...",
-    "importing": "Importando...",
-    "createBtn": "Crear",
-    "empty": {
-      "title": "Tu Historia Empieza Aquí",
-      "subtitle": "Crea un nuevo guión o importa un script existente",
-      "createFirst": "Nuevo proyecto",
-      "createDesc": "Empezar desde una página en blanco",
-      "importExisting": "Importar",
-      "importDesc": "Abrir un archivo de guión existente"
+    "sidebar": {
+        "title": "Panel",
+        "logOut": "Cerrar sesión",
+        "auth": "Iniciar sesión",
+        "logOutConfirmTitle": "Cerrar sesión",
+        "logOutConfirmDesc": "¿Estás seguro de que quieres cerrar sesión?",
+        "logOutConfirmBtn": "Cerrar sesión",
+        "logOutCancelBtn": "Cancelar"
     },
-    "item": {
-      "posterAlt": "Póster de la película",
-      "localOnly": "Solo local",
-      "syncedToCloud": "Sincronizado en la nube"
+    "appearance": {
+        "theme": "Tema",
+        "themeHelp": {
+            "dark": "Tema acogedor y de bajo resplandor, perfecto para noctámbulos y noches de concentración.",
+            "light": "Tema nítido y aireado que se siente natural y cómodo durante el día.",
+            "latte": "Tema suave con base crema que combina calidez y legibilidad.",
+            "wonka": "Tema aterciopelado con base de cacao que combina lujo profundo y descanso visual.",
+            "mint": "Tema refrescante con esencia de menta que combina serenidad botánica y equilibrio visual.",
+            "blossom": "Tema delicado con esencia floral que combina calidez de pétalos y suavidad visual.",
+            "midnight": "Tema azul medianoche profundo, diseñado para el trabajo concentrado bajo un cielo estrellado."
+        },
+        "editor": "Editor",
+        "themedEditor": "Editor con tema",
+        "themedEditorDesc": "Usar los colores del tema para el fondo y el texto del editor",
+        "highlightOnHover": "Resaltar al pasar el cursor",
+        "highlightOnHoverDesc": "Resalta ligeramente la línea sobre la que se pasa el cursor en el editor"
     },
-    "form": {
-      "formTitle": "Crear proyecto",
-      "titleField": "Título",
-      "descriptionField": "Descripción",
-      "authorField": "Autor",
-      "posterField": "Póster",
-      "optional": "opcional",
-      "submitBtn": "Crear",
-      "failedToCreate": "Error al crear el proyecto"
-    }
-  },
-  "editorSidebar": {
-    "scenes": "Escenas",
-    "characters": "Personajes",
-    "locations": "Localizaciones",
-    "shelf": "Estante",
-    "shelfEmpty": "Seleccione una versión para editar",
-    "goTo": "Ir al guión",
-    "confirmRestore": "Esto reemplazará el contenido correspondiente en su guión.",
-    "restore": "Restaurar",
-    "cancel": "Cancelar"
-  },
-  "formatDropdown": {
-    "elements": {
-      "scene": "ENCABEZADO DE SCÈNE",
-      "action": "Acción",
-      "character": "PERSONAJE",
-      "dialogue": "Diálogo",
-      "parenthetical": "(Paréntesis)",
-      "transition": "TRANSICIÓN:",
-      "section": "Sección",
-      "note": "[[Nota]]",
-      "dual_dialogue": "Doble diálogo",
-      "none": "Ninguno"
+    "keybinds": {
+        "screenplayElements": "Elementos de guión",
+        "typing": "Escribir… (Esc para cancelar)",
+        "notSet": "No asignado",
+        "modifiersOnly": "Solo modificadores — presiona una tecla normal",
+        "defaultPrefix": "Por defecto: {combo}",
+        "reset": "Restablecer",
+        "resetTitle": "Borrar asignación del usuario",
+        "resetDefaults": "Restablecer predeterminados",
+        "save": "Guardar cambios"
     },
-    "titlePageElements": {
-      "title": "Título",
-      "author": "Autor",
-      "date": "Fecha",
-      "none": "Ninguno"
-    }
-  },
-  "search": {
-    "placeholder": "Buscar...",
-    "noMatches": "Sin resultados",
-    "matchCount": "{current} de {total}",
-    "replacePlaceholder": "Remplazar con...",
-    "replace": "Remplazar",
-    "replaceAll": "Remplazar todo",
-    "filterByElement": "Filtrar por elemento:",
-    "elements": {
-      "scene": "Encabezado de escena",
-      "action": "Acción",
-      "character": "Personaje",
-      "dialogue": "Diálogo",
-      "parenthetical": "Paréntesis",
-      "transition": "Transición",
-      "section": "Sección",
-      "note": "Nota",
-      "dual_dialogue": "Diálogo dual",
-      "none": "Ninguno"
-    }
-  },
-  "collaborators": {
-    "projectTeam": "Equipo del proyecto ({count}/{max})",
-    "teamHelp": "Gestiona los miembros de tu equipo y las invitaciones pendientes. Puedes invitar a cualquier usuario no Pro a participar en tu proyecto. El proyecto permanece colaborativo mientras el propietario tenga el plan Pro.",
-    "roles": {
-      "owner": "Propietario",
-      "admin": "Administrador",
-      "editor": "Editor",
-      "viewer": "Espectador"
+    "language": {
+        "label": "Idioma de la interfaz",
+        "helpText": "Elige el idioma que se usa en toda la aplicación.",
+        "spellcheckLabel": "Corrector orthográfico",
+        "spellcheckHelpText": "Descarga un diccionario para la corrección ortográfica en el editor.",
+        "spellcheckNone": "Desactivado",
+        "customDictLabel": "Diccionario del proyecto",
+        "customDictAdd": "Añadir",
+        "customDictEmpty": "Aún no hay palabras personalizadas.",
+        "customDictHelpText": "Las palabras añadidas aquí se comparten con todos los colaboradores del proyecto."
     },
-    "roleDesc": {
-      "owner": "Puede eliminar el proyecto y transferir la propiedad",
-      "admin": "Puede invitar, ascender, degradar y expulsar colaboradores",
-      "editor": "Puede modificar el guión y otro contenido del proyecto",
-      "viewer": "Acceso de solo lectura. No puede realizar cambios"
+    "modal": {
+        "groups": {
+            "project": "Proyecto",
+            "preferences": "Preferencias",
+            "account": "Cuenta"
+        },
+        "tabs": {
+            "General": "General",
+            "Layout": "Diseño",
+            "Export": "Importar/Exportar",
+            "Collaborators": "Colaboradores",
+            "Keybinds": "Atajos de teclado",
+            "Appearance": "Apariencia",
+            "Language": "Idioma",
+            "Profile": "Perfil",
+            "Settings": "Ajustes",
+            "Auth": "Iniciar sesión",
+            "About": "Acerca de",
+            "Subscription": "Suscripción"
+        }
     },
-    "you": "(tú)",
-    "leave": "Salir",
-    "kick": "Expulsar",
-    "pending": "Pendiente",
-    "cancel": "Cancelar",
-    "emailPlaceholder": "Introduce el correo...",
-    "invite": "Invitar",
-    "proRequired": "A Pro subscription is required to invite collaborators.",
-    "proRequiredInvite": "Upgrade to Pro to invite collaborators",
-    "upgrade": "Upgrade",
-    "localProjectOnly": "Collaboration is not available for local projects. Upload your project to the cloud to invite collaborators."
-  },
-  "export": {
-    "importLabel": "Importar",
-    "selectFile": "Seleccionar archivo",
-    "selectFileDesc": "Sube .fountain, .fdx, .scriptio o .txt",
-    "exportLabel": "Exportar",
-    "formatOptions": {
-      "pdf": "Documento PDF (.pdf)",
-      "fountain": "Fountain (.fountain)",
-      "fdx": "Final Draft (.fdx)",
-      "scriptio": "Scriptio (.scriptio)"
+    "dangerZone": {
+        "transferOwnership": "Transferir propiedad",
+        "transferDesc": "Transfiere tu rol de propietario a otro usuario. Pasarás a tener el rol de editor.",
+        "transferBtn": "Transferir",
+        "transferPrompt": "Introduce el correo del nuevo propietario:",
+        "deleteProject": "Eliminar proyecto",
+        "deleteProjectDesc": "Once un proyecto es eliminado, no hay vuelta atrás. Por favor, asegúrate.",
+        "deleteBtn": "Eliminar",
+        "modalTitle": "Eliminar proyecto",
+        "modalDesc": "Esta acción es permanente y no se puede deshacer. Se perderán todos los datos asociados a este proyecto.",
+        "deleting": "Eliminando...",
+        "confirmDeleteBtn": "Eliminar proyecto"
     },
-    "formatHelp": {
-      "pdf": "Formato estándar de la industria. Ideal para compartir e imprimir.",
-      "fountain": "Formato de texto plano basado en Markdown, ideal para compatibilidad.",
-      "fdx": "Compatible con el software de la industria Final Draft.",
-      "scriptio": "Formato propio de Scriptio, para mantener el proyecto en local"
+    "profile": {
+        "email": "Correo electrónico",
+        "username": "Nombre de usuario",
+        "usernamePlaceholder": "Introduce tu nombre para mostrar...",
+        "usernameHelp": "Este nombre será visible para los colaboradores cuando trabajes en proyectos compartidos.",
+        "color": "Color",
+        "customColor": "Color personalizado",
+        "selectColor": "Seleccionar color {color}",
+        "successMessage": "Perfil actualizado correctamente",
+        "failedUpdate": "Error al actualizar el perfil",
+        "errorSaving": "Ocurrió un error al guardar",
+        "saving": "Guardando...",
+        "dangerZoneTitle": "Zona de peligro",
+        "deleteAccount": "Eliminar cuenta",
+        "deleteAccountDesc": "Elimina permanentemente tu cuenta y todos los datos asociados. Esto no se puede deshacer.",
+        "deleteBtn": "Eliminar",
+        "deleteModalTitle": "Eliminar cuenta",
+        "deleteModalDesc": "Esto eliminará permanentemente tu cuenta y todos los datos asociados. Esta acción no se puede deshacer.",
+        "deleteConfirmPhrase": "Confirmo la eliminación de mi cuenta",
+        "deleteConfirmLabel": "Escribe el siguiente texto para confirmar la eliminación:",
+        "deleting": "Eliminando...",
+        "deleteAccountBtn": "Eliminar mi cuenta",
+        "subscription": {
+            "title": "Suscripción",
+            "proBadge": "Pro",
+            "proTitle": "Plan Pro",
+            "freeTitle": "Plan Gratuito",
+            "renewsOn": "Se renueva el {date}",
+            "perksTitle": "Incluido en tu plan:",
+            "upgradeTitle": "Mejora para desbloquear:",
+            "perkProjects": "Crear proyectos en la nube",
+            "perkSaves": "Guardados manuales e historial de versiones",
+            "perkCollaborators": "Invitar colaboradores",
+            "perkAutoSave": "Guardado automático en la nube",
+            "upgradeBtn": "Actualizar a Pro",
+            "redirecting": "Redirigiendo...",
+            "cancel": "Cancelar suscripción",
+            "cancelConfirm": "Tu acceso Pro permanece activo hasta {date}. ¿Cancelar de todos modos?",
+            "cancelYes": "Sí, cancelar",
+            "cancelNo": "Mantener Pro",
+            "cancelling": "Cancelando...",
+            "cancelSuccess": "Suscripción cancelada. Acceso Pro hasta {date}.",
+            "endsOn": "Tu suscripción termina el {date}",
+            "purchasing": "Comprando...",
+            "purchaseError": "La compra falló. Inténtalo de nuevo.",
+            "cancelApple": "Las suscripciones de Apple se gestionan a través del App Store.",
+            "manageApple": "Abrir App Store",
+            "alreadyBoundTo": "Esta suscripción ya está vinculada a {email}.",
+            "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta.",
+            "welcomePro": "Ya estás suscrito a Scriptio Pro. ¡Bienvenido!",
+            "resubscribe": "Reactivar suscripción"
+        }
     },
-    "includeNotes": "Incluir notas",
-    "includeNotesDesc": "Exportar notas en línea.",
-    "readable": "JSON legible",
-    "readableDesc": "Exportar como JSON plano en lugar de binario comprimido. Archivo más grande, inspeccionable con cualquier editor de texto.",
-    "watermark": "Marca de agua",
-    "watermarkDesc": "Superponer texto en las páginas.",
-    "watermarkPlaceholder": "Texto de marca de agua",
-    "passwordProtection": "Protección con contraseña",
-    "passwordProtectionDesc": "Requerir una contraseña para abrir el PDF.",
-    "passwordPlaceholder": "Introduce la contraseña",
-    "exportBtn": "Exportar",
-    "exporting": "Exportando...",
-    "exportingProgress": "Exportando ({progress}%)"
-  },
-  "layout": {
-    "pageFormat": "Formato de página",
-    "pageFormatHelp": {
-      "letter": "Formato estándar de Estados Unidos. Estándar de la industria para guiones de Hollywood.",
-      "a4": "Formato estándar internacional. Común en Europa y la mayoría de los países."
+    "projects": {
+        "untitled": "Sin título",
+        "newProject": "Nuevo proyecto",
+        "pageTitle": "Proyectos",
+        "importBtn": "Importar...",
+        "importing": "Importando...",
+        "createBtn": "Crear",
+        "empty": {
+            "title": "Tu Historia Empieza Aquí",
+            "subtitle": "Crea un nuevo guión o importa un script existente",
+            "createFirst": "Nuevo proyecto",
+            "createDesc": "Empezar desde una página en blanco",
+            "importExisting": "Importar",
+            "importDesc": "Abrir un archivo de guión existente"
+        },
+        "item": {
+            "posterAlt": "Póster de la película",
+            "localOnly": "Solo local",
+            "syncedToCloud": "Sincronizado en la nube"
+        },
+        "form": {
+            "formTitle": "Crear proyecto",
+            "titleField": "Título",
+            "descriptionField": "Descripción",
+            "authorField": "Autor",
+            "posterField": "Póster",
+            "optional": "opcional",
+            "submitBtn": "Crear",
+            "failedToCreate": "Error al crear el proyecto"
+        }
     },
-    "sceneHeadings": "Encabezados de escena",
-    "bold": "Negrita",
-    "boldDesc": "Los encabezados de escena aparecerán en negrita",
-    "extraSpace": "Espacio extra arriba",
-    "extraSpaceDesc": "Añadir espacio extra antes de los encabezados de escena",
-    "sceneNumbering": "Numeración de escenas",
-    "sceneNumberingDesc": "Mostrar números de escena en el margen izquierdo",
-    "duplicateRight": "Duplicar en margen derecho",
-    "duplicateRightDesc": "Mostrar número en ambos lados",
-    "continuation": "Continuación",
-    "moreTitle": "(MORE) Etiqueta",
-    "contdTitle": "(CONT'D) Etiqueta",
-    "pageMargins": "Márgenes de página",
-    "vertical": "Vertical",
-    "horizontal": "Horizontal",
-    "marginTop": "Superior",
-    "marginBottom": "Inferior",
-    "margins": "Márgenes",
-    "marginLeft": "Izquierda",
-    "marginRight": "Derecha",
-    "marginElements": {
-      "action": "Acción",
-      "scene": "Encabezado de escena",
-      "character": "Personaje",
-      "dialogue": "Diálogo",
-      "parenthetical": "Paréntesis",
-      "transition": "Transición",
-      "section": "Sección"
+    "editorSidebar": {
+        "scenes": "Escenas",
+        "characters": "Personajes",
+        "locations": "Localizaciones",
+        "shelf": "Estante",
+        "shelfEmpty": "Seleccione una versión para editar",
+        "goTo": "Ir al guión",
+        "confirmRestore": "Esto reemplazará el contenido correspondiente en su guión.",
+        "restore": "Restaurar",
+        "cancel": "Cancelar"
     },
-    "elements": "Configuración de elementos",
-    "style": "Estilo",
-    "alignment": "Alineación",
-    "italic": "Cursiva",
-    "underline": "Subrayado",
-    "uppercase": "Mayúsculas",
-    "alignLeft": "Izquierda",
-    "alignCenter": "Centro",
-    "alignRight": "Derecha",
-    "sceneSpacing": "Espaciado",
-    "sceneSpacingDesc": "Espaciado sobre los encabezados de escena",
-    "startNewPage": "Iniciar nueva página"
-  },
-  "projectSettings": {
-    "titleLabel": "Título",
-    "titlePlaceholder": "Introduce el nombre del proyecto...",
-    "authorLabel": "Autor",
-    "authorPlaceholder": "Nombre del autor...",
-    "descriptionLabel": "Descripción",
-    "descriptionPlaceholder": "¿De qué trata este guión?",
-    "posterLabel": "Póster",
-    "noPoster": "Sin póster",
-    "posterHelp": "Recomendado: 600x900 píxeles (proporción 2:3). Compatible con PNG y JPG.",
-    "saveChanges": "Guardar cambios",
-    "dangerZoneTitle": "Zona de peligro"
-  },
-  "contextMenu": {
-    "goToScene": "Ir a la escena",
-    "edit": "Editar",
-    "copy": "Copiar",
-    "cut": "Cortar",
-    "selectInEditor": "Seleccionar en el editor",
-    "remove": "Eliminar",
-    "paste": "Pegar",
-    "highlight": "Resaltar",
-    "addCharacter": "Añadir personaje",
-    "addComment": "Añadir comentario",
-    "searchOnWeb": "Buscar en la web",
-    "noSuggestions": "Sin sugerencias",
-    "addToDictionary": "Añadir al diccionario",
-    "makeDualDialogue": "Crear doble diálogo",
-    "shelve": "Archivar",
-    "shelveScene": "Archivar escena",
-    "shelveDialogue": "Archivar diálogo",
-    "shelveAction": "Archivar acción"
-  },
-  "popup": {
-    "character": {
-      "create": "Crear personaje",
-      "edit": "Editar personaje",
-      "name": "Nombre",
-      "gender": "Género",
-      "genderFemale": "Mujer",
-      "genderMale": "Hombre",
-      "genderOther": "Otro",
-      "color": "Color",
-      "synopsis": "Sinopsis",
-      "confirm": "Confirmar",
-      "takenNameError": "Ya existe un personaje con el nombre {newName}. Por favor, elige un nombre diferente o edita el personaje existente.",
-      "updateOccurrences": "¿Estás seguro de que quieres actualizar {count} ocurrencias de la palabra {oldName} a {newName}? Ten especial cuidado con las palabras comunes cuya actualización podría ser indeseada.",
-      "yes": "Sí",
-      "noDoNotChange": "No, no cambiar"
+    "formatDropdown": {
+        "elements": {
+            "scene": "ENCABEZADO DE SCÈNE",
+            "action": "Acción",
+            "character": "PERSONAJE",
+            "dialogue": "Diálogo",
+            "parenthetical": "(Paréntesis)",
+            "transition": "TRANSICIÓN:",
+            "section": "Sección",
+            "note": "[[Nota]]",
+            "dual_dialogue": "Doble diálogo",
+            "none": "Ninguno"
+        },
+        "titlePageElements": {
+            "title": "Título",
+            "author": "Autor",
+            "date": "Fecha",
+            "none": "Ninguno"
+        }
     },
-    "import": {
-      "title": "Confirmar importación",
-      "warning": "¿Estás seguro de que quieres <b>sobrescribir</b> tu proyecto actual?",
-      "info": "Puedes exportar tu proyecto antes de importar uno nuevo.",
-      "yesImport": "Sí, importar",
-      "no": "No"
+    "search": {
+        "placeholder": "Buscar...",
+        "noMatches": "Sin resultados",
+        "matchCount": "{current} de {total}",
+        "replacePlaceholder": "Remplazar con...",
+        "replace": "Remplazar",
+        "replaceAll": "Remplazar todo",
+        "filterByElement": "Filtrar por elemento:",
+        "elements": {
+            "scene": "Encabezado de escena",
+            "action": "Acción",
+            "character": "Personaje",
+            "dialogue": "Diálogo",
+            "parenthetical": "Paréntesis",
+            "transition": "Transición",
+            "section": "Sección",
+            "note": "Nota",
+            "dual_dialogue": "Diálogo dual",
+            "none": "Ninguno"
+        }
     },
-    "scene": {
-      "edit": "Editar escena",
-      "sceneTitle": "Escena",
-      "color": "Color",
-      "synopsis": "Sinopsis",
-      "synopsisPlaceholder": "Escribe una breve descripción de esta escena...",
-      "save": "Guardar"
-    }
-  },
-  "board": {
-    "duplicate": "Duplicar",
-    "delete": "Eliminar",
-    "hints": {
-      "pan": "Clic central para desplazar",
-      "select": "Arrastrar para seleccionar tarjetas",
-      "create": "Doble clic para crear tarjeta",
-      "move": "Mantener Shift para mover libremente"
+    "collaborators": {
+        "projectTeam": "Equipo del proyecto ({count}/{max})",
+        "teamHelp": "Gestiona los miembros de tu equipo y las invitaciones pendientes. Puedes invitar a cualquier usuario no Pro a participar en tu proyecto. El proyecto permanece colaborativo mientras el propietario tenga el plan Pro.",
+        "roles": {
+            "owner": "Propietario",
+            "admin": "Administrador",
+            "editor": "Editor",
+            "viewer": "Espectador"
+        },
+        "roleDesc": {
+            "owner": "Puede eliminar el proyecto y transferir la propiedad",
+            "admin": "Puede invitar, ascender, degradar y expulsar colaboradores",
+            "editor": "Puede modificar el guión y otro contenido del proyecto",
+            "viewer": "Acceso de solo lectura. No puede realizar cambios"
+        },
+        "you": "(tú)",
+        "leave": "Salir",
+        "kick": "Expulsar",
+        "pending": "Pendiente",
+        "cancel": "Cancelar",
+        "emailPlaceholder": "Introduce el correo...",
+        "invite": "Invitar",
+        "proRequired": "A Pro subscription is required to invite collaborators.",
+        "proRequiredInvite": "Upgrade to Pro to invite collaborators",
+        "upgrade": "Upgrade",
+        "localProjectOnly": "Collaboration is not available for local projects. Upload your project to the cloud to invite collaborators."
+    },
+    "export": {
+        "importLabel": "Importar",
+        "selectFile": "Seleccionar archivo",
+        "selectFileDesc": "Sube .fountain, .fdx, .scriptio o .txt",
+        "exportLabel": "Exportar",
+        "formatOptions": {
+            "pdf": "Documento PDF (.pdf)",
+            "fountain": "Fountain (.fountain)",
+            "fdx": "Final Draft (.fdx)",
+            "scriptio": "Scriptio (.scriptio)"
+        },
+        "formatHelp": {
+            "pdf": "Formato estándar de la industria. Ideal para compartir e imprimir.",
+            "fountain": "Formato de texto plano basado en Markdown, ideal para compatibilidad.",
+            "fdx": "Compatible con el software de la industria Final Draft.",
+            "scriptio": "Formato propio de Scriptio, para mantener el proyecto en local"
+        },
+        "includeNotes": "Incluir notas",
+        "includeNotesDesc": "Exportar notas en línea.",
+        "readable": "JSON legible",
+        "readableDesc": "Exportar como JSON plano en lugar de binario comprimido. Archivo más grande, inspeccionable con cualquier editor de texto.",
+        "watermark": "Marca de agua",
+        "watermarkDesc": "Superponer texto en las páginas.",
+        "watermarkPlaceholder": "Texto de marca de agua",
+        "passwordProtection": "Protección con contraseña",
+        "passwordProtectionDesc": "Requerir una contraseña para abrir el PDF.",
+        "passwordPlaceholder": "Introduce la contraseña",
+        "exportBtn": "Exportar",
+        "exporting": "Exportando...",
+        "exportingProgress": "Exportando ({progress}%)"
+    },
+    "layout": {
+        "pageFormat": "Formato de página",
+        "pageFormatHelp": {
+            "letter": "Formato estándar de Estados Unidos. Estándar de la industria para guiones de Hollywood.",
+            "a4": "Formato estándar internacional. Común en Europa y la mayoría de los países."
+        },
+        "sceneHeadings": "Encabezados de escena",
+        "bold": "Negrita",
+        "boldDesc": "Los encabezados de escena aparecerán en negrita",
+        "extraSpace": "Espacio extra arriba",
+        "extraSpaceDesc": "Añadir espacio extra antes de los encabezados de escena",
+        "sceneNumbering": "Numeración de escenas",
+        "sceneNumberingDesc": "Mostrar números de escena en el margen izquierdo",
+        "duplicateRight": "Duplicar en margen derecho",
+        "duplicateRightDesc": "Mostrar número en ambos lados",
+        "continuation": "Continuación",
+        "moreTitle": "(MORE) Etiqueta",
+        "contdTitle": "(CONT'D) Etiqueta",
+        "pageMargins": "Márgenes de página",
+        "vertical": "Vertical",
+        "horizontal": "Horizontal",
+        "marginTop": "Superior",
+        "marginBottom": "Inferior",
+        "margins": "Márgenes",
+        "marginLeft": "Izquierda",
+        "marginRight": "Derecha",
+        "marginElements": {
+            "action": "Acción",
+            "scene": "Encabezado de escena",
+            "character": "Personaje",
+            "dialogue": "Diálogo",
+            "parenthetical": "Paréntesis",
+            "transition": "Transición",
+            "section": "Sección"
+        },
+        "elements": "Configuración de elementos",
+        "style": "Estilo",
+        "alignment": "Alineación",
+        "italic": "Cursiva",
+        "underline": "Subrayado",
+        "uppercase": "Mayúsculas",
+        "alignLeft": "Izquierda",
+        "alignCenter": "Centro",
+        "alignRight": "Derecha",
+        "sceneSpacing": "Espaciado",
+        "sceneSpacingDesc": "Espaciado sobre los encabezados de escena",
+        "startNewPage": "Iniciar nueva página"
     },
-    "untitled": "Sin título",
-    "titlePlaceholder": "Título",
-    "descriptionPlaceholder": "Descripción"
-  },
-  "saves": {
-    "title": "Historial de versiones",
-    "saveCurrentVersion": "Guardar versión actual",
-    "namePlaceholder": "Nombre de la versión...",
-    "manualSaves": "Guardados manuales",
-    "autoSaves": "Guardados automáticos",
-    "restore": "Restaurar",
-    "rename": "Renombrar",
-    "delete": "Eliminar",
-    "cancel": "Cancelar",
-    "confirmRestore": "Esto reemplazará el documento actual para todos los colaboradores. ¿Estás seguro?",
-    "confirmDelete": "¿Estás seguro de que quieres eliminar este guardado?",
-    "noSaves": "Aún no hay guardados",
-    "proRequired": "Se requiere Pro",
-    "proRequiredDesc": "El historial de versiones es una función Pro. Actualiza tu suscripción para guardar y restaurar versiones con nombre de tu guion.",
-    "upgradeBtn": "Actualizar a Pro",
-    "signInAndUpgrade": "Iniciar sesión y actualizar"
-  },
-  "auth": {
-    "intro": "Introduce tu correo y te enviaremos un enlace de inicio de sesión de un solo uso. No necesitas contraseña.",
-    "emailLabel": "Correo electrónico",
-    "sendLink": "Enviar enlace de inicio de sesión",
-    "sending": "Enviando...",
-    "checkInbox": "Si existe una cuenta asociada a {email}, se ha enviado un enlace de inicio de sesión. El enlace es válido durante los próximos 10 minutos.",
-    "useDifferentEmail": "Usar otro correo electrónico",
-    "waitingForClick": "Esperando a que hagas clic en el enlace de tu bandeja de entrada...",
-    "requestFailed": "No se pudo enviar el enlace de inicio de sesión. Por favor, vuelve a intentarlo en un momento.",
-    "desktopTimeout": "El tiempo de inicio de sesión expiró. Por favor, solicita un nuevo enlace."
-  },
-  "oauth": {
-    "orContinueWith": "o continuar con",
-    "continueWithGoogle": "Continuar con Google",
-    "continueWithApple": "Continuar con Apple",
-    "waiting": "Esperando al navegador…",
-    "timeout": "Tiempo de espera agotado. Por favor, inténtalo de nuevo.",
-    "error": "Error al iniciar sesión. Por favor, inténtalo de nuevo."
-  },
-  "dates": {
-    "justNow": "Recién",
-    "minutesAgo": "{mins, plural, one {hace # minuto} other {hace # minutos}}",
-    "hoursAgo": "{hours, plural, one {hace # hora} other {hace # horas}}",
-    "today": "Hoy",
-    "yesterday": "Ayer",
-    "daysAgo": "{days, plural, one {hace # día} other {hace # días}}",
-    "monthsAgo": "Hace {months, plural, one {# mes} other {# meses}}",
-    "moreThanYearAgo": "Hace más de 1 año"
-  }
-}
\ No newline at end of file
+    "projectSettings": {
+        "titleLabel": "Título",
+        "titlePlaceholder": "Introduce el nombre del proyecto...",
+        "authorLabel": "Autor",
+        "authorPlaceholder": "Nombre del autor...",
+        "descriptionLabel": "Descripción",
+        "descriptionPlaceholder": "¿De qué trata este guión?",
+        "posterLabel": "Póster",
+        "noPoster": "Sin póster",
+        "posterHelp": "Recomendado: 600x900 píxeles (proporción 2:3). Compatible con PNG y JPG.",
+        "saveChanges": "Guardar cambios",
+        "dangerZoneTitle": "Zona de peligro"
+    },
+    "contextMenu": {
+        "goToScene": "Ir a la escena",
+        "edit": "Editar",
+        "copy": "Copiar",
+        "cut": "Cortar",
+        "selectInEditor": "Seleccionar",
+        "remove": "Eliminar",
+        "paste": "Pegar",
+        "highlight": "Resaltar",
+        "addCharacter": "Añadir personaje",
+        "addComment": "Añadir comentario",
+        "searchOnWeb": "Buscar en la web",
+        "noSuggestions": "Sin sugerencias",
+        "addToDictionary": "Añadir al diccionario",
+        "makeDualDialogue": "Crear doble diálogo",
+        "shelve": "Archivar",
+        "shelveScene": "Archivar escena",
+        "shelveDialogue": "Archivar diálogo",
+        "shelveAction": "Archivar acción"
+    },
+    "popup": {
+        "character": {
+            "create": "Crear personaje",
+            "edit": "Editar personaje",
+            "name": "Nombre",
+            "gender": "Género",
+            "genderFemale": "Mujer",
+            "genderMale": "Hombre",
+            "genderOther": "Otro",
+            "color": "Color",
+            "synopsis": "Sinopsis",
+            "confirm": "Confirmar",
+            "takenNameError": "Ya existe un personaje con el nombre {newName}. Por favor, elige un nombre diferente o edita el personaje existente.",
+            "updateOccurrences": "¿Estás seguro de que quieres actualizar {count} ocurrencias de la palabra {oldName} a {newName}? Ten especial cuidado con las palabras comunes cuya actualización podría ser indeseada.",
+            "yes": "Sí",
+            "noDoNotChange": "No, no cambiar"
+        },
+        "import": {
+            "title": "Confirmar importación",
+            "warning": "¿Estás seguro de que quieres <b>sobrescribir</b> tu proyecto actual?",
+            "info": "Puedes exportar tu proyecto antes de importar uno nuevo.",
+            "yesImport": "Sí, importar",
+            "no": "No"
+        },
+        "scene": {
+            "edit": "Editar escena",
+            "sceneTitle": "Escena",
+            "color": "Color",
+            "synopsis": "Sinopsis",
+            "synopsisPlaceholder": "Escribe una breve descripción de esta escena...",
+            "save": "Guardar"
+        },
+        "uploadToCloud": {
+            "title": "Subir a la nube",
+            "body": "¿Subir este proyecto a la nube? Tu proyecto se respaldará y será accesible desde cualquier dispositivo, y podrás invitar colaboradores.",
+            "confirm": "Subir",
+            "cancel": "Cancelar",
+            "uploading": "Subiendo a la nube...",
+            "failed": "Error al subir. Por favor, inténtalo de nuevo."
+        }
+    },
+    "board": {
+        "duplicate": "Duplicar",
+        "delete": "Eliminar",
+        "hints": {
+            "pan": "Clic central para desplazar",
+            "select": "Arrastrar para seleccionar tarjetas",
+            "create": "Doble clic para crear tarjeta",
+            "move": "Mantener Shift para mover libremente"
+        },
+        "untitled": "Sin título",
+        "titlePlaceholder": "Título",
+        "descriptionPlaceholder": "Descripción"
+    },
+    "saves": {
+        "title": "Historial de versiones",
+        "saveCurrentVersion": "Guardar versión actual",
+        "namePlaceholder": "Nombre de la versión...",
+        "manualSaves": "Guardados manuales",
+        "autoSaves": "Guardados automáticos",
+        "restore": "Restaurar",
+        "rename": "Renombrar",
+        "delete": "Eliminar",
+        "cancel": "Cancelar",
+        "confirmRestore": "Esto reemplazará el documento actual para todos los colaboradores. ¿Estás seguro?",
+        "confirmDelete": "¿Estás seguro de que quieres eliminar este guardado?",
+        "noSaves": "Aún no hay guardados",
+        "proRequired": "Se requiere Pro",
+        "proRequiredDesc": "El historial de versiones es una función Pro. Actualiza tu suscripción para guardar y restaurar versiones con nombre de tu guion.",
+        "upgradeBtn": "Actualizar a Pro",
+        "signInAndUpgrade": "Iniciar sesión y actualizar"
+    },
+    "auth": {
+        "intro": "Introduce tu correo y te enviaremos un enlace de inicio de sesión de un solo uso. No necesitas contraseña.",
+        "emailLabel": "Correo electrónico",
+        "sendLink": "Enviar enlace de inicio de sesión",
+        "sending": "Enviando...",
+        "checkInbox": "Si existe una cuenta asociada a {email}, se ha enviado un enlace de inicio de sesión. El enlace es válido durante los próximos 10 minutos.",
+        "useDifferentEmail": "Usar otro correo electrónico",
+        "waitingForClick": "Esperando a que hagas clic en el enlace de tu bandeja de entrada...",
+        "requestFailed": "No se pudo enviar el enlace de inicio de sesión. Por favor, vuelve a intentarlo en un momento.",
+        "desktopTimeout": "El tiempo de inicio de sesión expiró. Por favor, solicita un nuevo enlace."
+    },
+    "oauth": {
+        "orContinueWith": "o continuar con",
+        "continueWithGoogle": "Continuar con Google",
+        "continueWithApple": "Continuar con Apple",
+        "waiting": "Esperando al navegador…",
+        "timeout": "Tiempo de espera agotado. Por favor, inténtalo de nuevo.",
+        "error": "Error al iniciar sesión. Por favor, inténtalo de nuevo."
+    },
+    "dates": {
+        "justNow": "Recién",
+        "minutesAgo": "{mins, plural, one {hace # minuto} other {hace # minutos}}",
+        "hoursAgo": "{hours, plural, one {hace # hora} other {hace # horas}}",
+        "today": "Hoy",
+        "yesterday": "Ayer",
+        "daysAgo": "{days, plural, one {hace # día} other {hace # días}}",
+        "monthsAgo": "Hace {months, plural, one {# mes} other {# meses}}",
+        "moreThanYearAgo": "Hace más de 1 año"
+    }
+}
diff --git a/messages/fr.json b/messages/fr.json
index 50ffb436..895c1d9f 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -7,6 +7,7 @@
     "noConnection": "Pas de connexion",
     "reconnecting": "Reconnexion...",
     "localProject": "Projet local",
+    "uploadToCloud": "Téléverser dans le cloud",
     "cachedProject": "Projet en cache",
     "endlessScroll": "Défilement infini",
     "toggleComments": "Afficher/masquer les commentaires",
@@ -122,7 +123,7 @@
     "deleteModalTitle": "Supprimer le compte",
     "deleteModalDesc": "Cela supprimera définitivement votre compte et toutes les données associées. Cette action ne peut pas être annulée.",
     "deleteConfirmPhrase": "Je confirme la suppression de mon compte",
-    "deleteConfirmLabel": "Tapez <ph/> pour confirmer.",
+    "deleteConfirmLabel": "Écrivez le texte suivant pour confirmer la suppression :",
     "deleting": "Suppression...",
     "deleteAccountBtn": "Supprimer mon compte",
     "subscription": {
@@ -363,7 +364,7 @@
     "edit": "Modifier",
     "copy": "Copier",
     "cut": "Couper",
-    "selectInEditor": "Sélectionner dans l'éditeur",
+    "selectInEditor": "Sélectionner",
     "remove": "Supprimer",
     "paste": "Coller",
     "highlight": "Surligner",
@@ -409,6 +410,14 @@
       "synopsis": "Synopsis",
       "synopsisPlaceholder": "Écrivez une brève description de cette scène...",
       "save": "Enregistrer"
+    },
+    "uploadToCloud": {
+      "title": "Téléverser dans le cloud",
+      "body": "Téléverser ce projet dans le cloud ? Votre projet sera sauvegardé et accessible depuis n'importe quel appareil, et vous pourrez inviter des collaborateurs.",
+      "confirm": "Téléverser",
+      "cancel": "Annuler",
+      "uploading": "Téléversement en cours...",
+      "failed": "Échec du téléversement. Veuillez réessayer."
     }
   },
   "board": {
diff --git a/messages/ja.json b/messages/ja.json
index ea849326..4f99929c 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -7,6 +7,7 @@
     "noConnection": "接続なし",
     "reconnecting": "再接続中...",
     "localProject": "ローカルプロジェクト",
+    "uploadToCloud": "クラウドにアップロード",
     "endlessScroll": "無限スクロール",
     "toggleComments": "コメントの表示/非表示",
     "focusMode": "集中モード",
@@ -121,7 +122,7 @@
     "deleteModalTitle": "アカウントを削除",
     "deleteModalDesc": "アカウントとすべての関連データを完全に削除します。この操作は取り消せません。",
     "deleteConfirmPhrase": "アカウントの削除を承認します",
-    "deleteConfirmLabel": "確認のために <ph/> と入力してください。",
+    "deleteConfirmLabel": "削除を確認するために以下のテキストを入力してください：",
     "deleting": "削除中...",
     "deleteAccountBtn": "自分のアカウントを削除",
     "subscription": {
@@ -362,7 +363,7 @@
     "edit": "編集",
     "copy": "コピー",
     "cut": "切り取り",
-    "selectInEditor": "エディタで選択",
+    "selectInEditor": "選択",
     "remove": "削除",
     "paste": "貼り付け",
     "highlight": "ハイライト",
@@ -408,6 +409,14 @@
       "synopsis": "あらすじ",
       "synopsisPlaceholder": "シーンの簡単な説明を入力...",
       "save": "保存"
+    },
+    "uploadToCloud": {
+      "title": "クラウドにアップロード",
+      "body": "このプロジェクトをクラウドにアップロードしますか？プロジェクトはバックアップされ、どのデバイスからでもアクセスでき、コラボレーターを招待できるようになります。",
+      "confirm": "アップロード",
+      "cancel": "キャンセル",
+      "uploading": "アップロード中...",
+      "failed": "アップロードに失敗しました。もう一度お試しください。"
     }
   },
   "board": {
diff --git a/messages/ko.json b/messages/ko.json
index eba1aab2..810d39a4 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -7,6 +7,7 @@
     "noConnection": "연결 없음",
     "reconnecting": "재연결 중...",
     "localProject": "로컬 프로젝트",
+    "uploadToCloud": "클라우드에 업로드",
     "endlessScroll": "무한 스크롤",
     "toggleComments": "댓글 표시 전환",
     "focusMode": "집중 모드",
@@ -121,7 +122,7 @@
     "deleteModalTitle": "계정 삭제",
     "deleteModalDesc": "계정과 모든 데이터를 영구적으로 삭제합니다. 이 작업은 취소할 수 없습니다.",
     "deleteConfirmPhrase": "계정 삭제를 확인합니다",
-    "deleteConfirmLabel": "확인을 위해 <ph/>를 입력하세요.",
+    "deleteConfirmLabel": "삭제를 확인하려면 아래 텍스트를 입력하세요:",
     "deleting": "삭제 중...",
     "deleteAccountBtn": "내 계정 삭제",
     "subscription": {
@@ -362,7 +363,7 @@
     "edit": "편집",
     "copy": "복사",
     "cut": "잘라내기",
-    "selectInEditor": "에디터에서 선택",
+    "selectInEditor": "선택",
     "remove": "삭제",
     "paste": "붙여넣기",
     "highlight": "하이라이트",
@@ -408,6 +409,14 @@
       "synopsis": "시놉시스",
       "synopsisPlaceholder": "장면에 대한 간단한 설명을 입력하세요...",
       "save": "저장"
+    },
+    "uploadToCloud": {
+      "title": "클라우드에 업로드",
+      "body": "이 프로젝트를 클라우드에 업로드하시겠습니까? 프로젝트가 백업되어 어떤 기기에서든 액세스할 수 있으며, 협업자를 초대할 수 있습니다.",
+      "confirm": "업로드",
+      "cancel": "취소",
+      "uploading": "업로드 중...",
+      "failed": "업로드에 실패했습니다. 다시 시도해 주세요."
     }
   },
   "board": {
diff --git a/messages/pl.json b/messages/pl.json
index a8171bda..83fe875d 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -7,6 +7,7 @@
     "noConnection": "Brak połączenia",
     "reconnecting": "Łączenie...",
     "localProject": "Projekt lokalny",
+    "uploadToCloud": "Wyślij do chmury",
     "endlessScroll": "Nieskończone przewijanie",
     "toggleComments": "Pokaż/ukryj komentarze",
     "focusMode": "Tryb skupienia",
@@ -121,7 +122,7 @@
     "deleteModalTitle": "Usuń konto",
     "deleteModalDesc": "To trwale usunie Twoje konto i wszystkie powiązane dane. Tej akcji nie można cofnąć.",
     "deleteConfirmPhrase": "Potwierdzam usunięcie mojego konta",
-    "deleteConfirmLabel": "Wpisz <ph/>, aby potwierdzić.",
+    "deleteConfirmLabel": "Wpisz poniższy tekst, aby potwierdzić usunięcie:",
     "deleting": "Usuwanie...",
     "deleteAccountBtn": "Usuń moje konto",
     "subscription": {
@@ -362,7 +363,7 @@
     "edit": "Edytuj",
     "copy": "Kopiuj",
     "cut": "Wytnij",
-    "selectInEditor": "Zaznacz w edytorze",
+    "selectInEditor": "Zaznacz",
     "remove": "Usuń",
     "paste": "Wklej",
     "highlight": "Wyróżnij",
@@ -408,6 +409,14 @@
       "synopsis": "Opis sceny",
       "synopsisPlaceholder": "Wpisz krótki opis tej sceny...",
       "save": "Zapisz"
+    },
+    "uploadToCloud": {
+      "title": "Wyślij do chmury",
+      "body": "Wysłać ten projekt do chmury? Twój projekt zostanie zarchiwizowany i będzie dostępny z dowolnego urządzenia, a także będziesz mógł zapraszać współpracowników.",
+      "confirm": "Wyślij",
+      "cancel": "Anuluj",
+      "uploading": "Wysyłanie do chmury...",
+      "failed": "Wysyłanie nie powiodło się. Spróbuj ponownie."
     }
   },
   "board": {
diff --git a/messages/zh.json b/messages/zh.json
index 4ce24cb4..77a22434 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -7,6 +7,7 @@
     "noConnection": "无连接",
     "reconnecting": "正在重新连接...",
     "localProject": "本地项目",
+    "uploadToCloud": "上传到云端",
     "endlessScroll": "无限滚动",
     "toggleComments": "切换显示评论",
     "focusMode": "聚焦模式",
@@ -121,7 +122,7 @@
     "deleteModalTitle": "删除账户",
     "deleteModalDesc": "该操作不可撤销。",
     "deleteConfirmPhrase": "我确认删除我的账户",
-    "deleteConfirmLabel": "输入 <ph/> 以确认。",
+    "deleteConfirmLabel": "请输入以下文字以确认删除：",
     "deleting": "正在注销...",
     "deleteAccountBtn": "确认注销账户",
     "subscription": {
@@ -362,7 +363,7 @@
     "edit": "编辑",
     "copy": "复制",
     "cut": "剪切",
-    "selectInEditor": "在编辑器中选择",
+    "selectInEditor": "选择",
     "remove": "移除",
     "paste": "粘贴",
     "highlight": "高亮",
@@ -408,6 +409,14 @@
       "synopsis": "简介",
       "synopsisPlaceholder": "场景简述...",
       "save": "保存"
+    },
+    "uploadToCloud": {
+      "title": "上传到云端",
+      "body": "将此项目上传到云端？您的项目将被备份，可从任何设备访问，并且可以邀请协作者。",
+      "confirm": "上传",
+      "cancel": "取消",
+      "uploading": "正在上传...",
+      "failed": "上传失败。请重试。"
     }
   },
   "board": {
diff --git a/src/app/api/projects/[projectId]/upload-to-cloud/route.ts b/src/app/api/projects/[projectId]/upload-to-cloud/route.ts
new file mode 100644
index 00000000..0e398c0e
--- /dev/null
+++ b/src/app/api/projects/[projectId]/upload-to-cloud/route.ts
@@ -0,0 +1,51 @@
+import { NextRequest } from "next/server";
+import * as ProjectService from "@src/server/service/project-service";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { InternalServerError, SuccessCreated, validate } from "@src/lib/utils/api-utils";
+import { requirePro } from "@src/lib/utils/pro-utils";
+
+import z from "zod";
+
+const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+const QuerySchema = z.object({
+    projectId: z.string().regex(UUID_REGEX, "Invalid project id"),
+});
+
+const BodySchema = z.object({
+    title: z.string().min(1).max(256),
+    description: z.string().max(2048).optional(),
+    author: z.string().max(256).optional(),
+});
+
+/**
+ * POST `/projects/[projectId]/upload-to-cloud`
+ *
+ * Promotes a local-only project to a cloud project, reusing the supplied id.
+ * Returns the freshly created membership so the client can hydrate ProjectContext.
+ */
+async function uploadProjectToCloud(req: NextRequest, { routeParams, user }: AuthApiContext) {
+    await requirePro(user.id);
+
+    const { projectId } = validate(QuerySchema, routeParams);
+    const body = await req.json();
+    const { title, description, author } = validate(BodySchema, body);
+
+    await ProjectService.create({
+        id: projectId,
+        title,
+        description,
+        author,
+        userId: user.id,
+        hasPoster: false,
+    });
+
+    const membership = await ProjectService.getMembership(projectId, user.id);
+    if (!membership) {
+        throw new InternalServerError();
+    }
+
+    return SuccessCreated(membership);
+}
+
+export const POST = apiHandler(uploadProjectToCloud);
diff --git a/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts b/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
index 5ac71cec..04d37191 100644
--- a/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
+++ b/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
@@ -187,6 +187,12 @@ export class IndexedDBStorageProvider implements StorageProvider {
         });
     }
 
+    async markAsSynced(id: string): Promise<void> {
+        const existing = await idbGet(id);
+        if (!existing) return;
+        await idbPut({ ...existing, is_synced: 1, updatedAt: Date.now() });
+    }
+
     async touch(id: string): Promise<void> {
         const existing = await idbGet(id);
         if (existing) {
diff --git a/src/lib/persistence/storage-provider/local-persistence.ts b/src/lib/persistence/storage-provider/local-persistence.ts
index 1d3c605b..53bd90c2 100644
--- a/src/lib/persistence/storage-provider/local-persistence.ts
+++ b/src/lib/persistence/storage-provider/local-persistence.ts
@@ -49,6 +49,10 @@ export async function updateCachedProject(
     return (await getStorageProvider()).update(id, updates);
 }
 
+export async function markCachedProjectAsSynced(id: string): Promise<void> {
+    return (await getStorageProvider()).markAsSynced(id);
+}
+
 export async function touchCachedProject(id: string): Promise<void> {
     return (await getStorageProvider()).touch(id);
 }
@@ -126,6 +130,30 @@ export async function migrateToCachedProject(
     return newProject;
 }
 
+/**
+ * Promote a local-only cached project to a cloud project, reusing the same id.
+ * Creates a cloud project record + membership, then flips the local cache flag.
+ * The Y.js doc at `scriptio-{projectId}` is unchanged — `useCloudSync` will
+ * push it to the empty server doc on next mount via the standard CRDT handshake.
+ */
+export async function promoteLocalProjectToCloud(projectId: string): Promise<void> {
+    const local = await getCachedProject(projectId);
+    if (!local) throw new Error("Project not found in local cache");
+    if (!local.isLocalOnly) return;
+
+    const { uploadProjectToCloud } = await import("@src/lib/utils/requests");
+    const res = await uploadProjectToCloud(projectId, {
+        title: local.title,
+        description: local.description ?? undefined,
+        author: local.author ?? undefined,
+    });
+    if (!res.ok) {
+        const json = (await res.json().catch(() => ({}))) as { message?: string };
+        throw new Error(json.message ?? `Upload failed (${res.status})`);
+    }
+    await markCachedProjectAsSynced(projectId);
+}
+
 /**
  * Discard a cloud project's local data (cached entry + Yjs IndexedDB database).
  */
diff --git a/src/lib/persistence/storage-provider/storage-provider.ts b/src/lib/persistence/storage-provider/storage-provider.ts
index 69a4ca8c..4e5d4649 100644
--- a/src/lib/persistence/storage-provider/storage-provider.ts
+++ b/src/lib/persistence/storage-provider/storage-provider.ts
@@ -31,6 +31,7 @@ export interface StorageProvider {
     getAll(): Promise<CachedProject[]>;
     get(id: string): Promise<CachedProject | null>;
     update(id: string, updates: { title?: string; description?: string; author?: string }): Promise<void>;
+    markAsSynced(id: string): Promise<void>;
     touch(id: string): Promise<void>;
     delete(id: string): Promise<void>;
     exists(id: string): Promise<boolean>;
diff --git a/src/lib/screenplay/popup.ts b/src/lib/screenplay/popup.ts
index 17619764..fcc6c681 100644
--- a/src/lib/screenplay/popup.ts
+++ b/src/lib/screenplay/popup.ts
@@ -17,16 +17,25 @@ export type PopupSceneData = {
     scene: Scene;
 };
 
+export type PopupUploadToCloudData = {
+    projectId: string;
+};
+
 // ------------------------------ //
 //         GENERIC POPUP          //
 // ------------------------------ //
-export type PopupUnionData = PopupImportFileData | PopupCharacterData | PopupSceneData;
+export type PopupUnionData =
+    | PopupImportFileData
+    | PopupCharacterData
+    | PopupSceneData
+    | PopupUploadToCloudData;
 
 export enum PopupType {
     NewCharacter,
     EditCharacter,
     ImportFile,
     EditScene,
+    UploadToCloud,
 }
 
 export type PopupData<DataType extends PopupUnionData> = {
@@ -69,3 +78,10 @@ export const editScenePopup = (scene: Scene, userCtx: UserContextType) => {
         data: { scene },
     });
 };
+
+export const uploadToCloudPopup = (projectId: string, userCtx: UserContextType) => {
+    userCtx.updatePopup({
+        type: PopupType.UploadToCloud,
+        data: { projectId },
+    });
+};
diff --git a/src/lib/utils/api-utils.ts b/src/lib/utils/api-utils.ts
index bc75e175..efa88cdb 100644
--- a/src/lib/utils/api-utils.ts
+++ b/src/lib/utils/api-utils.ts
@@ -53,6 +53,11 @@ export class MissingBodyError extends AppError {
         super(400, message);
     }
 }
+export class ConflictError extends AppError {
+    constructor(message = "Resource already exists") {
+        super(409, message);
+    }
+}
 export class InternalServerError extends AppError {
     constructor(message = "Internal server error") {
         super(500, message);
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index 550b1f28..e066a590 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -41,6 +41,13 @@ export const editProject = (projectId: string, body: UpdateProjectBody) => {
     return request(`/api/projects/${projectId}`, "PATCH", body);
 };
 
+export const uploadProjectToCloud = (
+    projectId: string,
+    body: { title: string; description?: string; author?: string },
+) => {
+    return request(`/api/projects/${projectId}/upload-to-cloud`, "POST", body);
+};
+
 /* Saves / Version History */
 
 export interface SaveEntry {
diff --git a/src/lib/utils/types.ts b/src/lib/utils/types.ts
index 31344f92..f313c9cb 100644
--- a/src/lib/utils/types.ts
+++ b/src/lib/utils/types.ts
@@ -16,6 +16,7 @@ export type User = CookieUser & {
 };
 
 export type ProjectCreation = {
+    id?: string;
     userId: string;
     title: string;
     description?: string;
diff --git a/src/server/repository/project-repository.ts b/src/server/repository/project-repository.ts
index da49c73d..74802ff0 100644
--- a/src/server/repository/project-repository.ts
+++ b/src/server/repository/project-repository.ts
@@ -3,6 +3,7 @@ import { Prisma, ProjectRole } from "../../generated/client/client";
 import prisma from "../db";
 
 import * as S3 from "@src/lib/s3";
+import { ConflictError } from "@src/lib/utils/api-utils";
 
 const projectMembershipSelect = {
     project: {
@@ -126,21 +127,29 @@ export class ProjectRepository {
         });
     }
 
-    createProject(project: ProjectCreation) {
-        return prisma.project.create({
-            data: {
-                title: project.title,
-                description: project.description,
-                author: project.author,
-                hasPoster: project.hasPoster,
-                members: {
-                    create: {
-                        userId: project.userId,
-                        role: ProjectRole.OWNER,
+    async createProject(project: ProjectCreation) {
+        try {
+            return await prisma.project.create({
+                data: {
+                    ...(project.id && { id: project.id }),
+                    title: project.title,
+                    description: project.description,
+                    author: project.author,
+                    hasPoster: project.hasPoster,
+                    members: {
+                        create: {
+                            userId: project.userId,
+                            role: ProjectRole.OWNER,
+                        },
                     },
                 },
-            },
-        });
+            });
+        } catch (e) {
+            if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === "P2002") {
+                throw new ConflictError("A project with this id already exists");
+            }
+            throw e;
+        }
     }
 
     updateProject(project: ProjectUpdate) {
diff --git a/styles/themes.css b/styles/themes.css
index d9aecee2..ff2484af 100644
--- a/styles/themes.css
+++ b/styles/themes.css
@@ -14,7 +14,7 @@ html.light {
     --tertiary: #e2e2e2;
 
     --primary-hover: #f0f0f3;
-    --secondary-hover: #e7e7e7;
+    --secondary-hover: #ececec;
     --tertiary-hover: rgb(211, 211, 211);
 
     --primary-text: #1a1a1c;
@@ -34,11 +34,11 @@ html.light {
     --themed-editor-script-bg: var(--secondary);
     --themed-editor-text: var(--primary-text);
     --editor-scene: #f1f5f9;
-    --editor-sidebar: #ffffff;
+    --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
-    --context-menu-bg: #ffffff;
-    --context-menu-item-hover: #f0f4ff;
+    --context-menu-bg: var(--secondary);
+    --context-menu-item-hover: var(--secondary-hover);
     --editor-style-bg: #ffffff;
     --editor-style-bg-hover: #f1f5f9;
     --editor-style-bg-active: #f1f5f9;
@@ -57,11 +57,11 @@ html.dark {
 
     --main-bg: var(--primary);
     --primary: #1d1d1d;
-    --secondary: #2e2e2e;
-    --tertiary: #3a3a3a;
+    --secondary: #272727;
+    --tertiary: #585858;
 
     --primary-hover: #2e2e2e;
-    --secondary-hover: #3a3a3a;
+    --secondary-hover: #363636;
     --tertiary-hover: #464646;
 
     --primary-text: #ffffff;
@@ -81,11 +81,11 @@ html.dark {
     --themed-editor-script-bg: var(--secondary);
     --themed-editor-text: var(--primary-text);
     --editor-scene: #dadada;
-    --editor-sidebar: #272727;
+    --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #3c3c3c;
     --editor-sidebar-hover: var(--primary);
     --context-menu-bg: var(--secondary);
-    --context-menu-item-hover: var(--primary);
+    --context-menu-item-hover: var(--secondary-hover);
     --editor-style-bg: #1d1d1d;
     --editor-style-bg-hover: #3c3c3c;
     --editor-style-bg-active: #5d5d5d;
@@ -136,7 +136,7 @@ html.latte {
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
     --context-menu-bg: var(--secondary);
-    --context-menu-item-hover: var(--primary);
+    --context-menu-item-hover: var(--secondary-hover);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);
@@ -183,7 +183,7 @@ html.wonka {
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
     --context-menu-bg: var(--secondary);
-    --context-menu-item-hover: var(--primary);
+    --context-menu-item-hover: var(--secondary-hover);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);
@@ -201,12 +201,12 @@ html.mint {
     --panel-shadow: 0 0 8px rgba(0, 0, 0, 0.06);
 
     --main-bg: var(--primary);
-    --primary: #dcf5de;
+    --primary: #d3eed5;
     --secondary: #ecfdec;
     --tertiary: #bce0bc;
 
-    --primary-hover: #c6e7c8;
-    --secondary-hover: #e2ffe4;
+    --primary-hover: #c6e4c8;
+    --secondary-hover: #d5ecd5;
     --tertiary-hover: #c7e4c7;
 
     --primary-text: #354937;
@@ -229,8 +229,8 @@ html.mint {
     --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
-    --context-menu-bg: var(--primary);
-    --context-menu-item-hover: var(--primary-hover);
+    --context-menu-bg: var(--secondary);
+    --context-menu-item-hover: var(--secondary-hover);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);
@@ -250,11 +250,11 @@ html.blossom {
     --main-bg: var(--primary);
     --primary: #ffe7f3;
     --secondary: #fff6fb;
-    --tertiary: #ffbbdd;
+    --tertiary: #ffc8e6;
 
     --primary-hover: #ffe7f3;
-    --secondary-hover: #fff1f9;
-    --tertiary-hover: #ffa0d0;
+    --secondary-hover: #fae5f0;
+    --tertiary-hover: #fdbde1;
 
     --primary-text: #bb4bbb;
     --secondary-text: #a579a5;
@@ -277,7 +277,7 @@ html.blossom {
     --editor-sidebar-list: #ededf3;
     --editor-sidebar-hover: var(--primary);
     --context-menu-bg: var(--secondary);
-    --context-menu-item-hover: var(--primary);
+    --context-menu-item-hover: var(--secondary-hover);
     --editor-style-bg: var(--primary);
     --editor-style-bg-hover: var(--primary-hover);
     --editor-style-bg-active: var(--primary-hover);
@@ -297,16 +297,16 @@ html.midnight {
     --main-bg: var(--primary);
     --primary: #0d1117;
     --secondary: #161c2d;
-    --tertiary: #1e2a45;
+    --tertiary: #283758;
 
     --primary-hover: #131a2a;
-    --secondary-hover: #1a2438;
-    --tertiary-hover: #263554;
+    --secondary-hover: #253453;
+    --tertiary-hover: #304166;
 
     --primary-text: #c8d8f0;
     --secondary-text: #6878a8;
 
-    --separator: #1e2a45;
+    --separator: #2b3a5e;
     --input-outline: #2a3d60;
     --navbar-outline: #1e2a45;
     --header-background: #161c2d;
@@ -320,11 +320,11 @@ html.midnight {
     --themed-editor-script-bg: var(--secondary);
     --themed-editor-text: var(--primary-text);
     --editor-scene: #c8d8f0;
-    --editor-sidebar: #0f1520;
+    --editor-sidebar: var(--secondary);
     --editor-sidebar-list: #1e2a45;
     --editor-sidebar-hover: var(--primary);
     --context-menu-bg: var(--secondary);
-    --context-menu-item-hover: var(--primary);
+    --context-menu-item-hover: var(--secondary-hover);
     --editor-style-bg: #0d1117;
     --editor-style-bg-hover: #1e2a45;
     --editor-style-bg-active: #263554;

From a7bfc5a46aa373add8a68666330750541c4cae4f Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sat, 2 May 2026 13:24:30 +0200
Subject: [PATCH 37/76] fixed clipboard handling and web search for desktop
 apps

---
 src-tauri/Cargo.lock                | 367 +++++++++++++++++++++++++++-
 src-tauri/Cargo.toml                |   1 +
 src-tauri/capabilities/default.json |   1 +
 src-tauri/src/lib.rs                |   1 +
 4 files changed, 365 insertions(+), 5 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 00590328..232acd45 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -11,6 +11,7 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-build",
+ "tauri-plugin-clipboard-manager",
  "tauri-plugin-dialog",
  "tauri-plugin-fs",
  "tauri-plugin-iap",
@@ -92,6 +93,27 @@ version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
+[[package]]
+name = "arboard"
+version = "3.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
+dependencies = [
+ "clipboard-win",
+ "image",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation",
+ "parking_lot",
+ "percent-encoding",
+ "windows-sys 0.60.2",
+ "wl-clipboard-rs",
+ "x11rb",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -430,6 +452,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
 version = "1.11.0"
@@ -567,6 +595,15 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "clipboard-win"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
+dependencies = [
+ "error-code",
+]
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -675,6 +712,12 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.7"
@@ -863,6 +906,12 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
 [[package]]
 name = "dpi"
 version = "0.1.2"
@@ -983,6 +1032,12 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "error-code"
+version = "3.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
+
 [[package]]
 name = "event-listener"
 version = "5.4.1"
@@ -1010,6 +1065,12 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "fax"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -1044,6 +1105,12 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
 version = "1.1.8"
@@ -1060,6 +1127,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1315,6 +1388,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "gethostname"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
+dependencies = [
+ "rustix",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -1497,6 +1580,17 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1506,6 +1600,15 @@ dependencies = [
  "ahash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
@@ -1663,7 +1766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371"
 dependencies = [
  "byteorder",
- "png",
+ "png 0.17.16",
 ]
 
 [[package]]
@@ -1774,6 +1877,20 @@ dependencies = [
  "icu_properties",
 ]
 
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png 0.18.1",
+ "tiff",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2112,6 +2229,16 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
 [[package]]
 name = "muda"
 version = "0.17.1"
@@ -2127,7 +2254,7 @@ dependencies = [
  "objc2-core-foundation",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.17.16",
  "serde",
  "thiserror 2.0.18",
  "windows-sys 0.60.2",
@@ -2175,6 +2302,15 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -2467,6 +2603,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "pango"
 version = "0.18.3"
@@ -2533,6 +2679,17 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
+[[package]]
+name = "petgraph"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap 2.13.0",
+]
+
 [[package]]
 name = "phf"
 version = "0.8.0"
@@ -2704,7 +2861,7 @@ checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.13.0",
- "quick-xml",
+ "quick-xml 0.38.4",
  "serde",
  "time",
 ]
@@ -2722,6 +2879,19 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.10.0",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "polling"
 version = "3.11.0"
@@ -2854,6 +3024,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "pxfm"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quick-xml"
 version = "0.38.4"
@@ -2863,6 +3045,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.39.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.43"
@@ -3856,7 +4047,7 @@ dependencies = [
  "ico",
  "json-patch",
  "plist",
- "png",
+ "png 0.17.16",
  "proc-macro2",
  "quote",
  "semver",
@@ -3903,6 +4094,21 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "tauri-plugin-clipboard-manager"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206dc20af4ed210748ba945c2774e60fd0acd52b9a73a028402caf809e9b6ecf"
+dependencies = [
+ "arboard",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "tauri-plugin-dialog"
 version = "2.6.0"
@@ -4186,6 +4392,20 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "tiff"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"
+dependencies = [
+ "fax",
+ "flate2",
+ "half",
+ "quick-error",
+ "weezl",
+ "zune-jpeg",
+]
+
 [[package]]
 name = "time"
 version = "0.3.45"
@@ -4471,12 +4691,23 @@ dependencies = [
  "objc2-core-graphics",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.17.16",
  "serde",
  "thiserror 2.0.18",
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "tree_magic_mini"
+version = "3.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
+dependencies = [
+ "memchr",
+ "nom",
+ "petgraph",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -4764,6 +4995,76 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
+dependencies = [
+ "bitflags 2.10.0",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
+dependencies = [
+ "bitflags 2.10.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+dependencies = [
+ "bitflags 2.10.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
+dependencies = [
+ "proc-macro2",
+ "quick-xml 0.39.2",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.85"
@@ -4854,6 +5155,12 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "weezl"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5313,6 +5620,24 @@ version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
+dependencies = [
+ "libc",
+ "log",
+ "os_pipe",
+ "rustix",
+ "thiserror 2.0.18",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
+
 [[package]]
 name = "writeable"
 version = "0.6.2"
@@ -5394,6 +5719,23 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "x11rb"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
+dependencies = [
+ "gethostname",
+ "rustix",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
+
 [[package]]
 name = "yoke"
 version = "0.8.1"
@@ -5558,6 +5900,21 @@ version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"
 
+[[package]]
+name = "zune-core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
+dependencies = [
+ "zune-core",
+]
+
 [[package]]
 name = "zvariant"
 version = "5.9.2"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index d00433d1..a0f34396 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -26,5 +26,6 @@ tauri-plugin-log = "2.8.0"
 tauri-plugin-store = "2.4.2"
 tauri-plugin-dialog = "2.6.0"
 tauri-plugin-fs = "2.4.5"
+tauri-plugin-clipboard-manager = "2"
 tauri-plugin-opener = "2.5.3"
 tauri-plugin-iap = "0.8"
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index d5e7ffa9..e6dd1e40 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -12,6 +12,7 @@
         "store:allow-load",
         "dialog:allow-save",
         "fs:allow-write-file",
+        "clipboard-manager:allow-read-text",
         "opener:default",
         "iap:default"
     ]
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index d021d2a3..693c6fa2 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -6,6 +6,7 @@ fn some_noop_command() {
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
+        .plugin(tauri_plugin_clipboard_manager::init())
         .plugin(tauri_plugin_store::Builder::default().build())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_fs::init())

From b50c0832ba381016d8718c4a4646a6f1b4c080dd Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sat, 2 May 2026 13:55:50 +0200
Subject: [PATCH 38/76] updating tauri window theme on theme change, added
 missing fixes

---
 .../preferences/AppearanceSettings.tsx        |  17 ++-
 components/editor/sidebar/ContextMenu.tsx     |  35 +++--
 package-lock.json                             | 134 ++++++++----------
 package.json                                  |   1 +
 4 files changed, 102 insertions(+), 85 deletions(-)

diff --git a/components/dashboard/preferences/AppearanceSettings.tsx b/components/dashboard/preferences/AppearanceSettings.tsx
index 30a3ba48..dbcdf406 100644
--- a/components/dashboard/preferences/AppearanceSettings.tsx
+++ b/components/dashboard/preferences/AppearanceSettings.tsx
@@ -8,8 +8,19 @@ import { UserTheme } from "@src/lib/utils/types";
 import { useTheme } from "next-themes";
 import { useSettings } from "@src/lib/utils/hooks";
 import { useTranslations } from "next-intl";
+import { isTauri } from "@tauri-apps/api/core";
 import Dropdown, { DropdownOption } from "@components/utils/Dropdown";
 
+const THEME_WINDOW_MODE: Record<string, "dark" | "light"> = {
+    dark: "dark",
+    wonka: "dark",
+    midnight: "dark",
+    light: "light",
+    latte: "light",
+    mint: "light",
+    blossom: "light",
+};
+
 const THEME_COLORS: Record<
     string,
     { primary: string; secondary: string; tertiary: string; text: string; subtext: string }
@@ -122,9 +133,13 @@ const AppearanceSettings = () => {
                 <label className={form.label}>{t("theme")}</label>
                 <Dropdown
                     value={theme || "dark"}
-                    onChange={(value) => {
+                    onChange={async (value) => {
                         setTheme(value);
                         saveSettings({ theme: value as UserTheme });
+                        if (isTauri()) {
+                            const { setTheme: setWindowTheme } = await import("@tauri-apps/api/app");
+                            await setWindowTheme(THEME_WINDOW_MODE[value] ?? "dark");
+                        }
                     }}
                     options={themeOptions}
                     className={`${sharedStyles.input} ${styles.input}`}
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index d26110f7..86b8a744 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -9,6 +9,7 @@ import { Scene } from "@src/lib/screenplay/scenes";
 import context from "./ContextMenu.module.css";
 import { CharacterData, deleteCharacter } from "@src/lib/screenplay/characters";
 import { LocationData, deleteLocation } from "@src/lib/screenplay/locations";
+import { isTauri } from "@tauri-apps/api/core";
 import { cutText, focusOnPosition, pasteText, selectTextInEditor } from "@src/lib/screenplay/editor";
 import { addCharacterPopup, editCharacterPopup, editScenePopup } from "@src/lib/screenplay/popup";
 import { ProjectContext } from "@src/context/ProjectContext";
@@ -66,6 +67,26 @@ type ContextMenuItemProps = {
 
 type SubMenuProps<T> = { props: T };
 
+const openWebSearch = async (text: string) => {
+    const trimmed = text.trim();
+    if (!trimmed) return;
+    const url = `https://www.google.com/search?q=${encodeURIComponent(trimmed)}`;
+    if (isTauri()) {
+        const { openUrl } = await import("@tauri-apps/plugin-opener");
+        await openUrl(url);
+    } else {
+        window.open(url, "_blank");
+    }
+};
+
+const readClipboardText = async (): Promise<string> => {
+    if (isTauri()) {
+        const { readText } = await import("@tauri-apps/plugin-clipboard-manager");
+        return readText();
+    }
+    return navigator.clipboard.readText();
+};
+
 export const ContextMenuItem = ({ text, action, icon: Icon, disabled }: ContextMenuItemProps) => {
     return (
         <div onClick={disabled ? undefined : action} className={disabled ? context.menu_item_disabled : context.menu_item}>
@@ -213,16 +234,13 @@ const EditorSelectionMenu = ({ props }: SubMenuProps<EditorSelectionContextProps
 
     const handlePaste = async () => {
         if (!editor) return;
-        const text = await navigator.clipboard.readText();
-        editor.commands.insertContent(text);
+        editor.commands.insertContent(await readClipboardText());
         updateContextMenu(undefined);
     };
 
     const handleSearchOnWeb = () => {
         if (!editor) return;
-        const selectedText = editor.state.doc.textBetween(from, to, " ");
-        if (!selectedText.trim()) return;
-        window.open(`https://www.google.com/search?q=${encodeURIComponent(selectedText)}`, "_blank");
+        openWebSearch(editor.state.doc.textBetween(from, to, " "));
     };
 
     return (
@@ -456,8 +474,7 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
 
     const handlePaste = async () => {
         if (!editor) return;
-        const text = await navigator.clipboard.readText();
-        editor.commands.insertContent(text);
+        editor.commands.insertContent(await readClipboardText());
         updateContextMenu(undefined);
     };
 
@@ -482,9 +499,7 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
 
     const handleSearchOnWeb = () => {
         if (!editor) return;
-        const selectedText = editor.state.doc.textBetween(from, to, " ");
-        if (!selectedText.trim()) return;
-        window.open(`https://www.google.com/search?q=${encodeURIComponent(selectedText)}`, "_blank");
+        openWebSearch(editor.state.doc.textBetween(from, to, " "));
     };
 
     const handleShelve = () => {
diff --git a/package-lock.json b/package-lock.json
index f4f44abd..e11bfec9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
                 "@prisma/client": "^7.7.0",
                 "@svgr/core": "^8.1.0",
                 "@tauri-apps/api": "2.10.1",
+                "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
                 "@tauri-apps/plugin-dialog": "2.6.0",
                 "@tauri-apps/plugin-fs": "2.4.5",
                 "@tauri-apps/plugin-opener": "2.5.3",
@@ -1174,7 +1175,6 @@
             "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
             "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
                 "@babel/generator": "^7.28.5",
@@ -3050,8 +3050,7 @@
             "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20260501.1.tgz",
             "integrity": "sha512-B/VX2w3my/sCqxKyWOX7SxUpFC1uD8Gh7I2zbI1d3zA8p7Tx03AFsnuEx8lYLmcd8yONAA93YsAZb1wAaLK83w==",
             "dev": true,
-            "license": "MIT OR Apache-2.0",
-            "peer": true
+            "license": "MIT OR Apache-2.0"
         },
         "node_modules/@cspotcode/source-map-support": {
             "version": "0.8.1",
@@ -3082,8 +3081,7 @@
             "resolved": "https://registry.npmjs.org/@electric-sql/pglite/-/pglite-0.4.1.tgz",
             "integrity": "sha512-mZ9NzzUSYPOCnxHH1oAHPRzoMFJHY472raDKwXl/+6oPbpdJ7g8LsCN4FSaIIfkiCKHhb3iF/Zqo3NYxaIhU7Q==",
             "devOptional": true,
-            "license": "Apache-2.0",
-            "peer": true
+            "license": "Apache-2.0"
         },
         "node_modules/@electric-sql/pglite-socket": {
             "version": "0.1.1",
@@ -3124,7 +3122,6 @@
             "version": "1.7.1",
             "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
             "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==",
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "dependencies": {
@@ -3783,6 +3780,17 @@
                 "@floating-ui/utils": "^0.2.11"
             }
         },
+        "node_modules/@floating-ui/dom": {
+            "version": "1.7.6",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
+            "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@floating-ui/core": "^1.7.5",
+                "@floating-ui/utils": "^0.2.11"
+            }
+        },
         "node_modules/@floating-ui/utils": {
             "version": "0.2.11",
             "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
@@ -4006,7 +4014,6 @@
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4029,7 +4036,6 @@
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4052,7 +4058,6 @@
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4069,7 +4074,6 @@
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4086,7 +4090,6 @@
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4103,7 +4106,6 @@
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4120,7 +4122,6 @@
             "cpu": [
                 "ppc64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4137,7 +4138,6 @@
             "cpu": [
                 "riscv64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4154,7 +4154,6 @@
             "cpu": [
                 "s390x"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4171,7 +4170,6 @@
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4188,7 +4186,6 @@
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4205,7 +4202,6 @@
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4222,7 +4218,6 @@
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4245,7 +4240,6 @@
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4268,7 +4262,6 @@
             "cpu": [
                 "ppc64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4291,7 +4284,6 @@
             "cpu": [
                 "riscv64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4314,7 +4306,6 @@
             "cpu": [
                 "s390x"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4337,7 +4328,6 @@
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4360,7 +4350,6 @@
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4383,7 +4372,6 @@
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "Apache-2.0",
             "optional": true,
             "os": [
@@ -4406,7 +4394,6 @@
             "cpu": [
                 "wasm32"
             ],
-            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
             "optional": true,
             "dependencies": {
@@ -4426,7 +4413,6 @@
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4446,7 +4432,6 @@
             "cpu": [
                 "ia32"
             ],
-            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -4466,7 +4451,6 @@
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "Apache-2.0 AND LGPL-3.0-or-later",
             "optional": true,
             "os": [
@@ -5371,7 +5355,6 @@
             "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz",
             "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
             "license": "Apache-2.0",
-            "peer": true,
             "engines": {
                 "node": ">=8.0.0"
             }
@@ -5764,7 +5747,6 @@
             "resolved": "https://registry.npmjs.org/@prisma/client/-/client-7.7.0.tgz",
             "integrity": "sha512-5Ar4OsZpJ54s21sy5oDNNW9gQtd4NuxCaiM7+JDTOU07D6VvlpLjYzAVCMB1+JzokN+08dAVomlx+b7bhJd3ww==",
             "license": "Apache-2.0",
-            "peer": true,
             "dependencies": {
                 "@prisma/client-runtime-utils": "7.7.0"
             },
@@ -6133,7 +6115,8 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
             "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
             "version": "4.60.0",
@@ -7416,7 +7399,6 @@
             "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz",
             "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@babel/core": "^7.21.3",
                 "@svgr/babel-preset": "8.1.0",
@@ -7930,6 +7912,15 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/@tauri-apps/plugin-clipboard-manager": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-clipboard-manager/-/plugin-clipboard-manager-2.3.2.tgz",
+            "integrity": "sha512-CUlb5Hqi2oZbcZf4VUyUH53XWPPdtpw43EUpCza5HWZJwxEoDowFzNUDt1tRUXA8Uq+XPn17Ysfptip33sG4eQ==",
+            "license": "MIT OR Apache-2.0",
+            "dependencies": {
+                "@tauri-apps/api": "^2.8.0"
+            }
+        },
         "node_modules/@tauri-apps/plugin-dialog": {
             "version": "2.6.0",
             "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.6.0.tgz",
@@ -8387,13 +8378,15 @@
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
             "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/@types/markdown-it": {
             "version": "14.1.2",
             "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
             "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/linkify-it": "^5",
                 "@types/mdurl": "^2"
@@ -8403,14 +8396,14 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
             "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/@types/node": {
             "version": "20.11.0",
             "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
             "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "undici-types": "~5.26.4"
             }
@@ -8502,7 +8495,6 @@
             "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz",
             "integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@types/prop-types": "*",
                 "csstype": "^3.2.2"
@@ -8513,7 +8505,6 @@
             "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
             "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
             "license": "MIT",
-            "peer": true,
             "peerDependencies": {
                 "@types/react": "^18.0.0"
             }
@@ -8566,7 +8557,6 @@
             "integrity": "sha512-hM5faZwg7aVNa819m/5r7D0h0c9yC4DUlWAOvHAtISdFTc8xB86VmX5Xqabrama3wIPJ/q9RbGS1worb6JfnMg==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@typescript-eslint/scope-manager": "8.50.1",
                 "@typescript-eslint/types": "8.50.1",
@@ -9239,7 +9229,6 @@
             "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -9764,7 +9753,6 @@
                 }
             ],
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "baseline-browser-mapping": "^2.9.0",
                 "caniuse-lite": "^1.0.30001759",
@@ -10008,7 +9996,6 @@
             "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
             "integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@kurkle/color": "^0.3.0"
             },
@@ -10269,7 +10256,8 @@
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
             "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/cross-env": {
             "version": "7.0.3",
@@ -11168,7 +11156,6 @@
             "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
@@ -11367,7 +11354,6 @@
             "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@rtsao/scc": "^1.1.0",
                 "array-includes": "^3.1.9",
@@ -12591,7 +12577,6 @@
             "integrity": "sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==",
             "devOptional": true,
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=16.9.0"
             }
@@ -13446,7 +13431,6 @@
             "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
             "devOptional": true,
             "license": "MIT",
-            "peer": true,
             "bin": {
                 "jiti": "lib/jiti-cli.mjs"
             }
@@ -13765,6 +13749,7 @@
             "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
             "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "uc.micro": "^2.0.0"
             }
@@ -13997,6 +13982,7 @@
             "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
             "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "argparse": "^2.0.1",
                 "entities": "^4.4.0",
@@ -14029,7 +14015,8 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
             "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/mediaquery-text": {
             "version": "1.2.0",
@@ -14315,7 +14302,6 @@
             "resolved": "https://registry.npmjs.org/next/-/next-16.2.4.tgz",
             "integrity": "sha512-kPvz56wF5frc+FxlHI5qnklCzbq53HTwORaWBGdT0vNoKh1Aya9XC8aPauH4NJxqtzbWsS5mAbctm4cr+EkQ2Q==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@next/env": "16.2.4",
                 "@swc/helpers": "0.5.15",
@@ -14536,7 +14522,6 @@
             "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.7.tgz",
             "integrity": "sha512-pkjE4mkBzQjdJT4/UmlKl3pX0rC9fZmjh7c6C9o7lv66Ac6w9WCnzPzhbPNxwZAzlF4mdq4CSWB5+FbK6FWCow==",
             "license": "MIT-0",
-            "peer": true,
             "engines": {
                 "node": ">=6.0.0"
             }
@@ -14791,7 +14776,8 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz",
             "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/own-keys": {
             "version": "1.0.1",
@@ -15153,7 +15139,6 @@
             "resolved": "https://registry.npmjs.org/pg/-/pg-8.20.0.tgz",
             "integrity": "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "pg-connection-string": "^2.12.0",
                 "pg-pool": "^3.13.0",
@@ -15417,7 +15402,6 @@
                 }
             ],
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.6",
                 "picocolors": "^1.0.0",
@@ -15571,7 +15555,6 @@
             "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.3.tgz",
             "integrity": "sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==",
             "license": "MIT",
-            "peer": true,
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/preact"
@@ -15638,7 +15621,6 @@
             "devOptional": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
-            "peer": true,
             "dependencies": {
                 "@prisma/config": "7.8.0",
                 "@prisma/dev": "0.24.3",
@@ -15715,6 +15697,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.1.tgz",
             "integrity": "sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-transform": "^1.0.0"
             }
@@ -15724,6 +15707,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-collab/-/prosemirror-collab-1.3.1.tgz",
             "integrity": "sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0"
             }
@@ -15733,6 +15717,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.7.1.tgz",
             "integrity": "sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.0.0",
                 "prosemirror-state": "^1.0.0",
@@ -15744,6 +15729,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.2.tgz",
             "integrity": "sha512-CCk6Gyx9+Tt2sbYk5NK0nB1ukHi2ryaRgadV/LvyNuO3ena1payM2z6Cg0vO1ebK8cxbzo41ku2DE5Axj1Zuiw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0",
                 "prosemirror-transform": "^1.1.0",
@@ -15755,6 +15741,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.4.0.tgz",
             "integrity": "sha512-z00qvurSdCEWUIulij/isHaqu4uLS8r/Fi61IbjdIPJEonQgggbJsLnstW7Lgdk4zQ68/yr6B6bf7sJXowIgdQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-keymap": "^1.0.0",
                 "prosemirror-model": "^1.0.0",
@@ -15767,6 +15754,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.5.0.tgz",
             "integrity": "sha512-zlzTiH01eKA55UAf1MEjtssJeHnGxO0j4K4Dpx+gnmX9n+SHNlDqI2oO1Kv1iPN5B1dm5fsljCfqKF9nFL6HRg==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.2.2",
                 "prosemirror-transform": "^1.0.0",
@@ -15779,6 +15767,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.5.1.tgz",
             "integrity": "sha512-7wj4uMjKaXWAQ1CDgxNzNtR9AlsuwzHfdFH1ygEHA2KHF2DOEaXl1CJfNPAKCg9qNEh4rum975QLaCiQPyY6Fw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0",
                 "prosemirror-transform": "^1.0.0"
@@ -15789,6 +15778,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.2.3.tgz",
             "integrity": "sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-state": "^1.0.0",
                 "w3c-keyname": "^2.2.0"
@@ -15799,6 +15789,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.13.2.tgz",
             "integrity": "sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/markdown-it": "^14.0.0",
                 "markdown-it": "^14.0.0",
@@ -15810,6 +15801,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.2.5.tgz",
             "integrity": "sha512-qwXzynnpBIeg1D7BAtjOusR+81xCp53j7iWu/IargiRZqRjGIlQuu1f3jFi+ehrHhWMLoyOQTSRx/IWZJqOYtQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "crelt": "^1.0.0",
                 "prosemirror-commands": "^1.0.0",
@@ -15832,6 +15824,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.4.tgz",
             "integrity": "sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.25.0"
             }
@@ -15841,6 +15834,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.5.1.tgz",
             "integrity": "sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.0.0",
                 "prosemirror-state": "^1.0.0",
@@ -15864,6 +15858,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.8.4.tgz",
             "integrity": "sha512-CGr2BK5sLdZx+ARbeLO4HBZYa3qSG3FmwOVmzYs0Zp7n5SkrGqj+1CeNuubFNZEr64yMAQ20SanbFyIyHWZc8w==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-keymap": "^1.2.3",
                 "prosemirror-model": "^1.25.4",
@@ -15877,6 +15872,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-trailing-node/-/prosemirror-trailing-node-3.0.0.tgz",
             "integrity": "sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@remirror/core-constants": "3.0.0",
                 "escape-string-regexp": "^4.0.0"
@@ -15892,6 +15888,7 @@
             "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.10.5.tgz",
             "integrity": "sha512-RPDQCxIDhIBb1o36xxwsaeAvivO8VLJcgBtzmOwQ64bMtsVFh5SSuJ6dWSxO1UsHTiTXPCgQm3PDJt7p6IOLbw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "prosemirror-model": "^1.21.0"
             }
@@ -15937,6 +15934,7 @@
             "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
             "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=6"
             }
@@ -16014,7 +16012,6 @@
             "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
             "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -16034,7 +16031,6 @@
             "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
             "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "scheduler": "^0.27.0"
             },
@@ -16342,7 +16338,8 @@
             "version": "1.3.4",
             "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz",
             "integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/run-parallel": {
             "version": "1.2.0",
@@ -16445,7 +16442,6 @@
             "integrity": "sha512-uf6HoO8fy6ClsrShvMgaKUn14f2EHQLQRtpsZZLeU/Mv0Q1K5P0+x2uvH6Cub39TVVbWNSrraUhDAoFph6vh0A==",
             "devOptional": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "chokidar": "^4.0.0",
                 "immutable": "^5.0.2",
@@ -17303,7 +17299,6 @@
             "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -17449,7 +17444,6 @@
             "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "esbuild": "~0.27.0",
                 "get-tsconfig": "^4.7.5"
@@ -17561,7 +17555,6 @@
             "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "devOptional": true,
             "license": "Apache-2.0",
-            "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -17663,7 +17656,6 @@
                 }
             ],
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.11",
                 "picocolors": "^1.1.1",
@@ -17732,7 +17724,8 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
             "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/uint8array-extras": {
             "version": "1.5.0",
@@ -17787,7 +17780,6 @@
             "integrity": "sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "pathe": "^2.0.3"
             }
@@ -18051,7 +18043,6 @@
             "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "esbuild": "^0.25.0",
                 "fdir": "^6.4.4",
@@ -18671,7 +18662,6 @@
             "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -18714,7 +18704,6 @@
             "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@types/chai": "^5.2.2",
                 "@vitest/expect": "3.2.4",
@@ -18833,7 +18822,8 @@
             "version": "2.2.8",
             "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
             "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/wait-on": {
             "version": "9.0.3",
@@ -19016,7 +19006,6 @@
             "dev": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
-            "peer": true,
             "bin": {
                 "workerd": "bin/workerd"
             },
@@ -19194,7 +19183,6 @@
             "resolved": "https://registry.npmjs.org/y-protocols/-/y-protocols-1.0.7.tgz",
             "integrity": "sha512-YSVsLoXxO67J6eE/nV4AtFtT3QEotZf5sK5BHxFBXso7VDUT3Tx07IfA6hsu5Q5OmBdMkQVmFZ9QOA7fikWvnw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "lib0": "^0.2.85"
             },
@@ -19258,7 +19246,6 @@
             "resolved": "https://registry.npmjs.org/yjs/-/yjs-13.6.28.tgz",
             "integrity": "sha512-EgnDOXs8+hBVm6mq3/S89Kiwzh5JRbn7w2wXwbrMRyKy/8dOFsLvuIfC+x19ZdtaDc0tA9rQmdZzbqqNHG44wA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "lib0": "^0.2.99"
             },
@@ -19325,7 +19312,6 @@
             "resolved": "https://registry.npmjs.org/zod/-/zod-4.2.1.tgz",
             "integrity": "sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==",
             "license": "MIT",
-            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
diff --git a/package.json b/package.json
index 21949db5..2bca12af 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
         "@prisma/client": "^7.7.0",
         "@svgr/core": "^8.1.0",
         "@tauri-apps/api": "2.10.1",
+        "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
         "@tauri-apps/plugin-dialog": "2.6.0",
         "@tauri-apps/plugin-fs": "2.4.5",
         "@tauri-apps/plugin-opener": "2.5.3",

From f10eb4a79ed4f05437b9ea5e14ec88253b3a2a66 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sat, 2 May 2026 19:03:03 +0200
Subject: [PATCH 39/76] fixing missing capability for theme update on tauri,
 removed ci requirements for staging

---
 .github/workflows/deploy-staging.yaml | 4 ++--
 src-tauri/capabilities/default.json   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index 030c6c9a..5143daae 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -27,7 +27,7 @@ jobs:
 
     publish-macos:
         runs-on: macos-latest
-        needs: [prepare, deploy-web]
+        needs: [prepare]
         env:
             APP_PATH: src-tauri/target/universal-apple-darwin/debug/bundle/macos/Scriptio (Staging).app
             PKG_PATH: Scriptio.pkg
@@ -94,7 +94,7 @@ jobs:
 
     publish-windows:
         runs-on: windows-latest
-        needs: [prepare, deploy-web]
+        needs: [prepare]
         env:
             APP_PATH: src-tauri/target/msix/Scriptio_${{ needs.prepare.outputs.version }}.msixbundle
         steps:
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index e6dd1e40..afc587fe 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -5,6 +5,7 @@
     "windows": ["main"],
     "permissions": [
         "core:default",
+        "core:app:allow-set-app-theme",
         "store:allow-get",
         "store:allow-set",
         "store:allow-delete",

From 332ff1bc12d1fc1d8550e4befb01bcf8ecba168d Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 3 May 2026 03:41:08 +0200
Subject: [PATCH 40/76] disabled apple iap, wired migration logic to avoid sync
 issues, fixed websocket urls

---
 .env.template                                 |   2 +-
 .../account/SubscriptionSettings.module.css   |   7 +
 .../account/SubscriptionSettings.tsx          |  87 ++++-
 .../project/ProjectWorkspace.module.css       |   2 +-
 .../project/SplitPanelContainer.module.css    |   2 +-
 .../projects/ProjectMigrationErrorDialog.tsx  |  34 +-
 messages/de.json                              |   9 +-
 messages/en.json                              |   9 +-
 messages/es.json                              |   9 +-
 messages/fr.json                              |   9 +-
 messages/ja.json                              |   9 +-
 messages/ko.json                              |   9 +-
 messages/pl.json                              |   9 +-
 messages/zh.json                              |   9 +-
 .../api/apple/transfer-subscription/route.ts  |  92 ++++++
 src/app/projects/layout.tsx                   |   9 +-
 src/context/ProjectContext.tsx                |   7 +-
 src/global.d.ts                               |   2 +-
 src/lib/adapters/fdx/finaldraft-adapter.ts    |   4 +-
 src/lib/adapters/fountain/fountain-adapter.ts |   6 +-
 src/lib/adapters/scriptio/scriptio-adapter.ts |  18 +-
 src/lib/cloud/room.ts                         | 120 ++++++-
 src/lib/cloud/utils.ts                        |  62 +++-
 .../migrations/project-migration-runner.ts    |  98 ++++--
 .../project/migrations/project-migrations.ts  |  17 +-
 src/lib/project/project-doc.ts                | 243 ++++++++++++++
 src/lib/project/project-repository.ts         |   3 +-
 src/lib/project/project-state.ts              | 304 ++++--------------
 src/lib/utils/api-utils.ts                    |   5 +-
 src/lib/utils/requests.ts                     |   5 +
 .../repository/transaction-repository.ts      |   7 +
 src/server/service/transaction-service.ts     |   5 +
 .../project-migration-runner.test.ts          | 158 ++++++++-
 33 files changed, 1046 insertions(+), 325 deletions(-)
 create mode 100644 src/app/api/apple/transfer-subscription/route.ts
 create mode 100644 src/lib/project/project-doc.ts

diff --git a/.env.template b/.env.template
index cc30051c..ec02df0e 100644
--- a/.env.template
+++ b/.env.template
@@ -1,7 +1,7 @@
 NODE_ENV=development
 
 NEXT_PUBLIC_API_URL=https://scriptio.app
-NEXT_PUBLIC_COLLAB_WEBSOCKET_URL=ws://127.0.0.1:8787
+NEXT_PUBLIC_CLOUD_URL=http://127.0.0.1:8787
 
 # Secrets
 AUTH_SECRET=
diff --git a/components/dashboard/account/SubscriptionSettings.module.css b/components/dashboard/account/SubscriptionSettings.module.css
index f829a9f9..37131140 100644
--- a/components/dashboard/account/SubscriptionSettings.module.css
+++ b/components/dashboard/account/SubscriptionSettings.module.css
@@ -166,6 +166,13 @@
     margin: 0;
 }
 
+.infoText {
+    font-size: 0.85rem;
+    color: var(--secondary-text);
+    line-height: 1.5;
+    margin: 0;
+}
+
 .errorMessage {
     font-size: 0.82rem;
     color: var(--error);
diff --git a/components/dashboard/account/SubscriptionSettings.tsx b/components/dashboard/account/SubscriptionSettings.tsx
index 40111fea..d372e7cc 100644
--- a/components/dashboard/account/SubscriptionSettings.tsx
+++ b/components/dashboard/account/SubscriptionSettings.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import { useTranslations } from "next-intl";
 import { ArrowRight, Check, Lock, Sparkles } from "lucide-react";
 import { isTauri } from "@tauri-apps/api/core";
-import { cancelStripeSubscription, createStripeCheckout, getAppleSubscriptionOwner, submitApplePurchase } from "@src/lib/utils/requests";
+import { cancelStripeSubscription, createStripeCheckout, getAppleSubscriptionOwner, submitApplePurchase, transferAppleSubscription } from "@src/lib/utils/requests";
 import { useUser } from "@src/lib/utils/hooks";
 import { useLocale } from "@src/context/LocaleContext";
 
@@ -14,6 +14,11 @@ const APPLE_PRODUCT_ID = "app.scriptio.pro.monthly";
 const APPLE_SUBSCRIPTIONS_URL = "https://apps.apple.com/account/subscriptions";
 const PERKS = ["perkProjects", "perkSaves", "perkCollaborators", "perkAutoSave"] as const;
 
+// Apple IAP is disabled at launch — Pro is sold exclusively via the website.
+// All IAP code paths (mount sync, purchase, restore/transfer) are kept but
+// gated by this flag so re-enabling later is a one-line change.
+const APPLE_IAP_ENABLED = false;
+
 // Apple IAP is only available on the macOS Tauri build. The Windows Tauri
 // build is distributed via the Microsoft Store but uses Stripe for billing.
 const isMacosTauri = () =>
@@ -32,6 +37,18 @@ const SubscriptionSettings = () => {
         () => typeof window !== "undefined" && sessionStorage.getItem("proWelcome") === "1"
     );
     const [welcomeLeaving, setWelcomeLeaving] = useState(false);
+    // When the App Store account has an active subscription bound to a
+    // different Scriptio account, we capture the JWS + masked owner email so
+    // we can offer a "Restore Purchases" flow that transfers it.
+    const [transferableJws, setTransferableJws] = useState<string | null>(null);
+    const [transferableEmail, setTransferableEmail] = useState<string | null>(null);
+    const [transferConfirm, setTransferConfirm] = useState(false);
+    const [transferring, setTransferring] = useState(false);
+    // Detect macOS Tauri after mount so SSR renders the same tree the client
+    // initially does, avoiding hydration mismatches.
+    const [isAppleStoreBuild, setIsAppleStoreBuild] = useState(false);
+    useEffect(() => { setIsAppleStoreBuild(isMacosTauri()); }, []);
+    const showAppleStoreNotice = isAppleStoreBuild && !APPLE_IAP_ENABLED;
 
     const isPro = !!user?.isProUntil && new Date(user.isProUntil) > new Date();
     const isCancelled = !!user?.isSubscriptionCancelled;
@@ -42,7 +59,7 @@ const SubscriptionSettings = () => {
 
     // Restore Apple purchases on mount to sync subscription state with the server.
     useEffect(() => {
-        if (!isMacosTauri() || !user?.id) return;
+        if (!APPLE_IAP_ENABLED || !isMacosTauri() || !user?.id) return;
 
         let cancelled = false;
 
@@ -55,10 +72,20 @@ const SubscriptionSettings = () => {
                         && p.purchaseState === PurchaseState.PURCHASED
                         && p.jwsRepresentation,
                 );
+                if (cancelled || !active?.jwsRepresentation) return;
+
+                const ok = await submitApplePurchase(active.jwsRepresentation);
                 if (cancelled) return;
-                if (active?.jwsRepresentation) {
-                    await submitApplePurchase(active.jwsRepresentation);
+                if (ok) {
                     await mutate();
+                } else {
+                    // The App Store has an active sub but it's bound to a
+                    // different Scriptio account — surface a Restore Purchases
+                    // flow rather than the regular Upgrade button.
+                    const ownerEmail = await getAppleSubscriptionOwner(active.jwsRepresentation);
+                    if (cancelled) return;
+                    setTransferableJws(active.jwsRepresentation);
+                    setTransferableEmail(ownerEmail);
                 }
             } catch {
                 // Restore can fail if the user is not signed into the App Store — silently ignore.
@@ -141,6 +168,25 @@ const SubscriptionSettings = () => {
         }
     };
 
+    const handleTransfer = async () => {
+        if (!transferableJws) return;
+        setError(null);
+        setTransferring(true);
+        try {
+            const ok = await transferAppleSubscription(transferableJws);
+            if (ok) {
+                setTransferableJws(null);
+                setTransferableEmail(null);
+                setTransferConfirm(false);
+                await mutate();
+            } else {
+                setError(t("subscription.purchaseError"));
+            }
+        } finally {
+            setTransferring(false);
+        }
+    };
+
     const handleCancel = async () => {
         setCancelling(true);
 
@@ -199,7 +245,14 @@ const SubscriptionSettings = () => {
             </div>
 
             {/* Actions */}
-            {isPro ? (
+            {showAppleStoreNotice ? (
+                <p className={styles.infoText}>
+                    {isPro
+                        ? t("subscription.appleStoreProInfo")
+                        : t("subscription.appleStoreFreeInfo")
+                    }
+                </p>
+            ) : isPro ? (
                 cancelConfirm ? (
                     <div className={styles.confirmBox}>
                         <p className={styles.confirmText}>
@@ -235,6 +288,30 @@ const SubscriptionSettings = () => {
                         {t("subscription.cancel")}
                     </button>
                 )
+            ) : transferableJws ? (
+                transferConfirm ? (
+                    <div className={styles.confirmBox}>
+                        <p className={styles.confirmText}>
+                            {transferableEmail
+                                ? t("subscription.transferConfirm", { email: transferableEmail })
+                                : t("subscription.transferConfirmUnknown")
+                            }
+                        </p>
+                        <div className={styles.confirmBtns}>
+                            <button className={styles.confirmYes} onClick={handleTransfer} disabled={transferring}>
+                                {transferring ? t("subscription.transferring") : t("subscription.transferYes")}
+                            </button>
+                            <button className={styles.confirmNo} onClick={() => setTransferConfirm(false)} disabled={transferring}>
+                                {t("subscription.cancelNo")}
+                            </button>
+                        </div>
+                    </div>
+                ) : (
+                    <button className={styles.upgradeBtn} onClick={() => setTransferConfirm(true)}>
+                        {t("subscription.restorePurchases")}
+                        <ArrowRight size={16} />
+                    </button>
+                )
             ) : (
                 <button className={styles.upgradeBtn} onClick={handleUpgrade} disabled={upgradeLoading}>
                     {upgradeLoading
diff --git a/components/project/ProjectWorkspace.module.css b/components/project/ProjectWorkspace.module.css
index a6bb271d..346cdef8 100644
--- a/components/project/ProjectWorkspace.module.css
+++ b/components/project/ProjectWorkspace.module.css
@@ -29,7 +29,7 @@
     cursor: pointer;
     color: var(--secondary-text);
     background-color: var(--secondary);
-    border-radius: 6px;
+    border-radius: 16px;
 }
 
 .right_sidebar_toggle:hover {
diff --git a/components/project/SplitPanelContainer.module.css b/components/project/SplitPanelContainer.module.css
index 376938de..74a5f69c 100644
--- a/components/project/SplitPanelContainer.module.css
+++ b/components/project/SplitPanelContainer.module.css
@@ -99,7 +99,7 @@
     cursor: pointer;
     color: var(--secondary-text);
     background-color: var(--secondary);
-    border-radius: 6px;
+    border-radius: 16px;
     border: none;
 }
 
diff --git a/components/projects/ProjectMigrationErrorDialog.tsx b/components/projects/ProjectMigrationErrorDialog.tsx
index a369a793..012c1c88 100644
--- a/components/projects/ProjectMigrationErrorDialog.tsx
+++ b/components/projects/ProjectMigrationErrorDialog.tsx
@@ -2,14 +2,17 @@
 
 import { useCallback, useState } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
-import { ArrowLeft, RotateCcw } from "lucide-react";
+import { ArrowLeft, RefreshCw, RotateCcw } from "lucide-react";
 
 import type { ProjectMigrationOutcome } from "@src/lib/project/migrations/project-migration-runner";
 
 import styles from "./ProjectMigrationErrorDialog.module.css";
 
 interface Props {
-    outcome: Extract<ProjectMigrationOutcome, { kind: "future-version" | "failed" }>;
+    outcome: Extract<
+        ProjectMigrationOutcome,
+        { kind: "future-version" | "failed" | "stale-client" }
+    >;
 }
 
 const ProjectMigrationErrorDialog = ({ outcome }: Props) => {
@@ -64,6 +67,33 @@ const ProjectMigrationErrorDialog = ({ outcome }: Props) => {
         );
     }
 
+    if (outcome.kind === "stale-client") {
+        return (
+            <div className={styles.overlay}>
+                <div className={styles.modal}>
+                    <h2 className={styles.title}>Update Scriptio to open this project</h2>
+                    <p className={styles.description}>
+                        The cloud copy of this project is at a newer schema version than your app
+                        knows. Reload to fetch the latest version, or update the desktop app.
+                    </p>
+                    <div className={styles.actions}>
+                        <button
+                            className={`${styles.btn} ${styles.primaryBtn}`}
+                            onClick={() => window.location.reload()}
+                        >
+                            <RefreshCw size={16} />
+                            Reload
+                        </button>
+                        <button className={`${styles.btn} ${styles.secondaryBtn}`} onClick={goBack}>
+                            <ArrowLeft size={16} />
+                            Back to projects
+                        </button>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+
     return (
         <div className={styles.overlay}>
             <div className={styles.modal}>
diff --git a/messages/de.json b/messages/de.json
index f31e0e08..d1e89246 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -154,7 +154,14 @@
       "alreadyBoundTo": "Dieses Abonnement ist bereits mit {email} verknüpft.",
       "alreadyBoundUnknown": "Dieses Abonnement ist bereits mit einem anderen Konto verknüpft.",
       "welcomePro": "Du hast jetzt Scriptio Pro abonniert. Willkommen!",
-      "resubscribe": "Abonnement reaktivieren"
+      "resubscribe": "Abonnement reaktivieren",
+      "restorePurchases": "Käufe wiederherstellen",
+      "transferConfirm": "Dein App-Store-Konto hat ein aktives Abonnement, das mit {email} verknüpft ist. Beim Wiederherstellen wird Pro auf dieses Konto übertragen und {email} verliert den Pro-Zugang. Apple stellt weiterhin derselben Apple ID die Rechnung. Fortfahren?",
+      "transferConfirmUnknown": "Dein App-Store-Konto hat ein aktives Abonnement, das mit einem anderen Scriptio-Konto verknüpft ist. Beim Wiederherstellen wird Pro auf dieses Konto übertragen und das andere Konto verliert den Pro-Zugang. Apple stellt weiterhin derselben Apple ID die Rechnung. Fortfahren?",
+      "transferYes": "Ja, übertragen",
+      "transferring": "Wird übertragen...",
+      "appleStoreFreeInfo": "Pro-Funktionen sind für Konten verfügbar, die über unsere Website upgegradet wurden.",
+      "appleStoreProInfo": "Um deine Zahlungsmethode zu aktualisieren oder zu kündigen, besuche bitte die Profileinstellungen auf scriptio.app."
     }
   },
   "projects": {
diff --git a/messages/en.json b/messages/en.json
index 8c52eba1..ef72b2b6 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -153,7 +153,14 @@
       "alreadyBoundTo": "This subscription is already linked to {email}.",
       "alreadyBoundUnknown": "This subscription is already linked to another account.",
       "welcomePro": "You're now subscribed to Scriptio Pro. Welcome!",
-      "resubscribe": "Reactivate subscription"
+      "resubscribe": "Reactivate subscription",
+      "restorePurchases": "Restore Purchases",
+      "transferConfirm": "Your App Store account has an active subscription linked to {email}. Restoring will transfer Pro to this account, and {email} will lose Pro access. Apple will continue billing the same Apple ID. Continue?",
+      "transferConfirmUnknown": "Your App Store account has an active subscription linked to another Scriptio account. Restoring will transfer Pro to this account, and the other account will lose Pro access. Apple will continue billing the same Apple ID. Continue?",
+      "transferYes": "Yes, transfer",
+      "transferring": "Transferring...",
+      "appleStoreFreeInfo": "Pro features are available for accounts upgraded via our website.",
+      "appleStoreProInfo": "To update your billing method or cancel, please visit your profile settings on scriptio.app."
     }
   },
   "projects": {
diff --git a/messages/es.json b/messages/es.json
index fc373f7a..c1bf0dbe 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -153,7 +153,14 @@
             "alreadyBoundTo": "Esta suscripción ya está vinculada a {email}.",
             "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta.",
             "welcomePro": "Ya estás suscrito a Scriptio Pro. ¡Bienvenido!",
-            "resubscribe": "Reactivar suscripción"
+            "resubscribe": "Reactivar suscripción",
+            "restorePurchases": "Restaurar compras",
+            "transferConfirm": "Tu cuenta de App Store tiene una suscripción activa vinculada a {email}. La restauración transferirá Pro a esta cuenta, y {email} perderá el acceso a Pro. Apple seguirá facturando al mismo ID de Apple. ¿Continuar?",
+            "transferConfirmUnknown": "Tu cuenta de App Store tiene una suscripción activa vinculada a otra cuenta de Scriptio. La restauración transferirá Pro a esta cuenta, y la otra cuenta perderá el acceso a Pro. Apple seguirá facturando al mismo ID de Apple. ¿Continuar?",
+            "transferYes": "Sí, transferir",
+            "transferring": "Transfiriendo...",
+            "appleStoreFreeInfo": "Las funciones Pro están disponibles para las cuentas actualizadas a través de nuestro sitio web.",
+            "appleStoreProInfo": "Para actualizar tu método de pago o cancelar, visita la configuración de tu perfil en scriptio.app."
         }
     },
     "projects": {
diff --git a/messages/fr.json b/messages/fr.json
index 895c1d9f..c34f72f0 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -154,7 +154,14 @@
       "alreadyBoundTo": "Cet abonnement est déjà associé à {email}.",
       "alreadyBoundUnknown": "Cet abonnement est déjà associé à un autre compte.",
       "welcomePro": "Vous êtes maintenant abonné à Scriptio Pro. Bienvenue !",
-      "resubscribe": "Réactiver l'abonnement"
+      "resubscribe": "Réactiver l'abonnement",
+      "restorePurchases": "Restaurer les achats",
+      "transferConfirm": "Votre compte App Store dispose d'un abonnement actif associé à {email}. La restauration transférera Pro à ce compte, et {email} perdra l'accès Pro. Apple continuera à facturer le même identifiant Apple. Continuer ?",
+      "transferConfirmUnknown": "Votre compte App Store dispose d'un abonnement actif associé à un autre compte Scriptio. La restauration transférera Pro à ce compte, et l'autre compte perdra l'accès Pro. Apple continuera à facturer le même identifiant Apple. Continuer ?",
+      "transferYes": "Oui, transférer",
+      "transferring": "Transfert en cours...",
+      "appleStoreFreeInfo": "Les fonctionnalités Pro sont disponibles pour les comptes abonnés via notre site web.",
+      "appleStoreProInfo": "Pour modifier votre méthode de paiement ou annuler, veuillez consulter les paramètres de votre profil sur scriptio.app."
     }
   },
   "projects": {
diff --git a/messages/ja.json b/messages/ja.json
index 4f99929c..53d015ec 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -153,7 +153,14 @@
       "alreadyBoundTo": "このサブスクリプションは既に {email} に関連付けられています。",
       "alreadyBoundUnknown": "このサブスクリプションは既に別のアカウントに関連付けられています。",
       "welcomePro": "Scriptio Pro にご登録いただきました。ようこそ！",
-      "resubscribe": "サブスクリプションを再開する"
+      "resubscribe": "サブスクリプションを再開する",
+      "restorePurchases": "購入を復元",
+      "transferConfirm": "App Storeアカウントには {email} に関連付けられた有効なサブスクリプションがあります。復元するとProがこのアカウントに移行し、{email} はProアクセスを失います。Appleは引き続き同じApple IDに請求します。続けますか？",
+      "transferConfirmUnknown": "App Storeアカウントには別のScriptioアカウントに関連付けられた有効なサブスクリプションがあります。復元するとProがこのアカウントに移行し、もう一方のアカウントはProアクセスを失います。Appleは引き続き同じApple IDに請求します。続けますか？",
+      "transferYes": "はい、移行する",
+      "transferring": "移行中...",
+      "appleStoreFreeInfo": "Pro機能は当社のウェブサイトでアップグレードされたアカウントでご利用いただけます。",
+      "appleStoreProInfo": "お支払い方法の更新やキャンセルは、scriptio.app のプロフィール設定からお手続きください。"
     }
   },
   "projects": {
diff --git a/messages/ko.json b/messages/ko.json
index 810d39a4..e9b982cd 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -153,7 +153,14 @@
       "alreadyBoundTo": "이 구독은 이미 {email}에 연결되어 있습니다.",
       "alreadyBoundUnknown": "이 구독은 이미 다른 계정에 연결되어 있습니다.",
       "welcomePro": "Scriptio Pro를 구독하셨습니다. 환영합니다!",
-      "resubscribe": "구독 재활성화"
+      "resubscribe": "구독 재활성화",
+      "restorePurchases": "구매 복원",
+      "transferConfirm": "App Store 계정에 {email}에 연결된 활성 구독이 있습니다. 복원하면 Pro가 이 계정으로 이전되며 {email}은(는) Pro 액세스를 잃게 됩니다. Apple은 계속해서 동일한 Apple ID에 청구합니다. 계속하시겠습니까?",
+      "transferConfirmUnknown": "App Store 계정에 다른 Scriptio 계정에 연결된 활성 구독이 있습니다. 복원하면 Pro가 이 계정으로 이전되며 다른 계정은 Pro 액세스를 잃게 됩니다. Apple은 계속해서 동일한 Apple ID에 청구합니다. 계속하시겠습니까?",
+      "transferYes": "예, 이전",
+      "transferring": "이전 중...",
+      "appleStoreFreeInfo": "Pro 기능은 웹사이트를 통해 업그레이드된 계정에서 이용할 수 있습니다.",
+      "appleStoreProInfo": "결제 수단을 업데이트하거나 취소하려면 scriptio.app의 프로필 설정을 방문하세요."
     }
   },
   "projects": {
diff --git a/messages/pl.json b/messages/pl.json
index 83fe875d..40a57f94 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -153,7 +153,14 @@
       "alreadyBoundTo": "Ta subskrypcja jest już powiązana z {email}.",
       "alreadyBoundUnknown": "Ta subskrypcja jest już powiązana z innym kontem.",
       "welcomePro": "Subskrybujesz teraz Scriptio Pro. Witamy!",
-      "resubscribe": "Reaktywuj subskrypcję"
+      "resubscribe": "Reaktywuj subskrypcję",
+      "restorePurchases": "Przywróć zakupy",
+      "transferConfirm": "Twoje konto App Store ma aktywną subskrypcję powiązaną z {email}. Przywrócenie przeniesie Pro na to konto, a {email} straci dostęp do Pro. Apple będzie nadal obciążał ten sam Apple ID. Kontynuować?",
+      "transferConfirmUnknown": "Twoje konto App Store ma aktywną subskrypcję powiązaną z innym kontem Scriptio. Przywrócenie przeniesie Pro na to konto, a drugie konto straci dostęp do Pro. Apple będzie nadal obciążał ten sam Apple ID. Kontynuować?",
+      "transferYes": "Tak, przenieś",
+      "transferring": "Przenoszenie...",
+      "appleStoreFreeInfo": "Funkcje Pro są dostępne dla kont uaktualnionych przez naszą stronę internetową.",
+      "appleStoreProInfo": "Aby zaktualizować metodę płatności lub anulować, odwiedź ustawienia profilu na scriptio.app."
     }
   },
   "projects": {
diff --git a/messages/zh.json b/messages/zh.json
index 77a22434..d988de9b 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -153,7 +153,14 @@
       "alreadyBoundTo": "此订阅已与 {email} 关联。",
       "alreadyBoundUnknown": "此订阅已与其他账户关联。",
       "welcomePro": "您已成功订阅 Scriptio Pro。欢迎！",
-      "resubscribe": "重新激活订阅"
+      "resubscribe": "重新激活订阅",
+      "restorePurchases": "恢复购买",
+      "transferConfirm": "您的 App Store 账户有一个与 {email} 关联的有效订阅。恢复将把 Pro 转移到此账户，{email} 将失去 Pro 访问权限。Apple 将继续向同一个 Apple ID 收费。继续吗？",
+      "transferConfirmUnknown": "您的 App Store 账户有一个与另一个 Scriptio 账户关联的有效订阅。恢复将把 Pro 转移到此账户，另一个账户将失去 Pro 访问权限。Apple 将继续向同一个 Apple ID 收费。继续吗？",
+      "transferYes": "是的，转移",
+      "transferring": "转移中...",
+      "appleStoreFreeInfo": "Pro 功能适用于通过我们网站升级的账户。",
+      "appleStoreProInfo": "如需更新付款方式或取消，请访问 scriptio.app 上的个人资料设置。"
     }
   },
   "projects": {
diff --git a/src/app/api/apple/transfer-subscription/route.ts b/src/app/api/apple/transfer-subscription/route.ts
new file mode 100644
index 00000000..feb1e254
--- /dev/null
+++ b/src/app/api/apple/transfer-subscription/route.ts
@@ -0,0 +1,92 @@
+import { NextRequest } from "next/server";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { BodyFieldError, ForbiddenError, Success } from "@src/lib/utils/api-utils";
+import { verifyAppleJws, APPLE_BUNDLE_IDS, APPLE_PRODUCT_ID } from "@src/lib/apple-jws";
+import { logger } from "@src/lib/utils/logger";
+import * as UserService from "@src/server/service/user-service";
+import * as TransactionService from "@src/server/service/transaction-service";
+
+interface AppleTransactionPayload {
+    transactionId: string;
+    originalTransactionId: string;
+    bundleId: string;
+    productId: string;
+    purchaseDate: number;
+    expiresDate: number;
+    type: string;
+    appAccountToken?: string;
+}
+
+// Transfers an existing Apple subscription from a previously-linked Scriptio
+// account to the calling user. Unlike /api/apple/purchase, this endpoint
+// intentionally tolerates an appAccountToken / existing-owner mismatch — that
+// mismatch is the precondition for needing a transfer in the first place.
+async function handleTransferSubscription(req: NextRequest, { user }: AuthApiContext) {
+    const body = (await req.json().catch(() => ({}))) as Record<string, unknown>;
+    const jwsTransaction = body.jwsTransaction;
+    if (typeof jwsTransaction !== "string") {
+        throw new BodyFieldError("Missing jwsTransaction");
+    }
+
+    logger.debug("[Apple transfer] Verifying JWS", { userId: user.id });
+
+    const payload = await verifyAppleJws<AppleTransactionPayload>(jwsTransaction);
+
+    if (!APPLE_BUNDLE_IDS.includes(payload.bundleId)) {
+        logger.warn("[Apple transfer] Invalid bundle ID", { bundleId: payload.bundleId, userId: user.id });
+        throw new ForbiddenError("Invalid bundle ID");
+    }
+    if (payload.productId !== APPLE_PRODUCT_ID) {
+        logger.warn("[Apple transfer] Invalid product ID", { productId: payload.productId, userId: user.id });
+        throw new ForbiddenError("Invalid product ID");
+    }
+
+    const expiresDate = new Date(payload.expiresDate);
+    if (expiresDate <= new Date()) {
+        logger.warn("[Apple transfer] Transaction already expired", {
+            originalTransactionId: payload.originalTransactionId,
+            expiresDate,
+            userId: user.id,
+        });
+        throw new ForbiddenError("Transaction already expired");
+    }
+
+    const existing = await TransactionService.findUserByTransactionId(payload.originalTransactionId);
+    const previousUserId = existing && existing.userId !== user.id ? existing.userId : null;
+
+    if (previousUserId) {
+        // Revoke Pro from the previously-linked account before re-binding the
+        // transaction. Apple keeps billing the same Apple ID — only which
+        // Scriptio account benefits is changing.
+        logger.info("[Apple transfer] Revoking Pro from previous user", {
+            previousUserId,
+            newUserId: user.id,
+            originalTransactionId: payload.originalTransactionId,
+        });
+        await UserService.updateUserFromId(previousUserId, {
+            isProUntil: null,
+            subscriptionProvider: null,
+            isSubscriptionCancelled: false,
+        });
+        await TransactionService.reassignTransactionToUser(payload.originalTransactionId, user.id);
+    } else if (!existing) {
+        await TransactionService.createTransactionIfNotExists(user.id, "APPLE", payload.originalTransactionId);
+    }
+
+    await UserService.updateUserFromId(user.id, {
+        isProUntil: expiresDate,
+        subscriptionProvider: "APPLE",
+        isSubscriptionCancelled: false,
+    });
+
+    logger.info("[Apple transfer] Subscription transferred", {
+        newUserId: user.id,
+        previousUserId,
+        originalTransactionId: payload.originalTransactionId,
+        expiresDate,
+    });
+
+    return Success(null);
+}
+
+export const POST = apiHandler(handleTransferSubscription);
diff --git a/src/app/projects/layout.tsx b/src/app/projects/layout.tsx
index 0a977e0d..71531ab1 100644
--- a/src/app/projects/layout.tsx
+++ b/src/app/projects/layout.tsx
@@ -50,13 +50,20 @@ interface ProjectLayoutInnerProps {
 }
 
 const ProjectLayoutInner = ({ children }: ProjectLayoutInnerProps) => {
-    const { isYjsReady, isProjectUnavailable, migrationOutcome } = useProjectReady();
+    const { isYjsReady, isProjectUnavailable, isStaleClient, migrationOutcome } = useProjectReady();
     const { membership, isLoading: isMembershipLoading, isLocalOnly: isBrowserLocalOnly } = useProjectMembership();
 
     // Desktop (Tauri) and browser local-only projects skip the cloud membership requirement
     const isDesktop = isTauri();
     const isLocalAccess = isDesktop || isBrowserLocalOnly;
 
+    // Server rejected this client as stale — its bundle predates the doc's
+    // schema version. Treat as a future-version outcome so the user gets a
+    // clear "update required" message.
+    if (isStaleClient) {
+        return <ProjectMigrationErrorDialog outcome={{ kind: "stale-client" }} />;
+    }
+
     // Migration blocked the project from loading: show a dedicated error dialog
     // before any other gating logic, so the user always gets a clear message.
     if (
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index 2980b2bf..d9881b44 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -217,12 +217,14 @@ export const ProjectContext = createContext<ProjectContextType>(defaultContextVa
 interface ProjectReadyContextType {
     isYjsReady: boolean;
     isProjectUnavailable: boolean;
+    isStaleClient: boolean;
     migrationOutcome: ProjectMigrationOutcome | null;
 }
 
 const ProjectReadyContext = createContext<ProjectReadyContextType>({
     isYjsReady: false,
     isProjectUnavailable: false,
+    isStaleClient: false,
     migrationOutcome: null,
 });
 
@@ -253,6 +255,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         connectionStatus: yjsConnectionStatus,
         users: yjsUsers,
         isProjectUnavailable,
+        isStaleClient,
         migrationOutcome,
     } = useProjectYjs({
         projectId,
@@ -845,8 +848,8 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
     );
 
     const readyValue = useMemo(
-        () => ({ isYjsReady, isProjectUnavailable, migrationOutcome }),
-        [isYjsReady, isProjectUnavailable, migrationOutcome],
+        () => ({ isYjsReady, isProjectUnavailable, isStaleClient, migrationOutcome }),
+        [isYjsReady, isProjectUnavailable, isStaleClient, migrationOutcome],
     );
 
     return (
diff --git a/src/global.d.ts b/src/global.d.ts
index 3eb45d36..977cb5c4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -9,7 +9,7 @@ declare global {
     namespace NodeJS {
         interface ProcessEnv {
             NODE_ENV: "development" | "production";
-            NEXT_PUBLIC_COLLAB_WEBSOCKET_URL: string;
+            NEXT_PUBLIC_CLOUD_URL: string;
 
             // Token Secrets
             JWT_SECRET: string;
diff --git a/src/lib/adapters/fdx/finaldraft-adapter.ts b/src/lib/adapters/fdx/finaldraft-adapter.ts
index 6c2aba43..699bc278 100644
--- a/src/lib/adapters/fdx/finaldraft-adapter.ts
+++ b/src/lib/adapters/fdx/finaldraft-adapter.ts
@@ -1,7 +1,7 @@
 import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { XMLBuilder, XMLParser } from "@node_modules/fast-xml-parser/src/fxp";
 import { getNodeFlattenContent } from "@src/lib/screenplay/screenplay";
-import { ProjectData, ProjectState } from "@src/lib/project/project-state";
+import { ProjectData, ProjectState, screenplayOf } from "@src/lib/project/project-state";
 import type { JSONContent } from "@tiptap/core";
 
 interface FDXStyledText {
@@ -50,7 +50,7 @@ export class FinalDraftAdapter extends ProjectAdapter<BaseExportOptions> {
 
     convertTo(project: ProjectState, options: BaseExportOptions): Promise<Blob> {
         const paragraphNodes: FDXParagraphNode[] = [];
-        const nodes = project.screenplay();
+        const nodes = screenplayOf(project);
         const characters = options.characters;
 
         for (let i = 0; i < nodes.length; i++) {
diff --git a/src/lib/adapters/fountain/fountain-adapter.ts b/src/lib/adapters/fountain/fountain-adapter.ts
index 96956b5a..d05a259d 100644
--- a/src/lib/adapters/fountain/fountain-adapter.ts
+++ b/src/lib/adapters/fountain/fountain-adapter.ts
@@ -4,7 +4,7 @@ import fountain from "./fountain_parser";
 import { generateJSON, JSONContent } from "@tiptap/react";
 import { getNodeFlattenContent } from "@src/lib/screenplay/screenplay";
 import { BASE_EXTENSIONS } from "@src/lib/screenplay/editor";
-import { ProjectData, ProjectState } from "@src/lib/project/project-state";
+import { ProjectData, ProjectState, screenplayOf, titlepageOf } from "@src/lib/project/project-state";
 
 export class FountainAdapter extends ProjectAdapter {
     label = "Fountain Script";
@@ -42,7 +42,7 @@ export class FountainAdapter extends ProjectAdapter {
      * and plain text lines to Credit.
      */
     private buildFountainTitlePage(project: ProjectState, options: BaseExportOptions): string {
-        const titlePageContent = project.titlepage();
+        const titlePageContent = titlepageOf(project);
         if (!titlePageContent || titlePageContent.length === 0) return "";
 
         const lines: string[] = [];
@@ -87,7 +87,7 @@ export class FountainAdapter extends ProjectAdapter {
         let fountain = this.buildFountainTitlePage(project, options);
 
         let sceneCount = 1;
-        const nodes = project.screenplay();
+        const nodes = screenplayOf(project);
         const characters = options.characters;
 
         for (let i = 0; i < nodes.length; i++) {
diff --git a/src/lib/adapters/scriptio/scriptio-adapter.ts b/src/lib/adapters/scriptio/scriptio-adapter.ts
index d3d3d904..21464087 100644
--- a/src/lib/adapters/scriptio/scriptio-adapter.ts
+++ b/src/lib/adapters/scriptio/scriptio-adapter.ts
@@ -1,8 +1,9 @@
-import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState } from "@src/lib/project/project-state";
+import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState, screenplayOf, titlepageOf } from "@src/lib/project/project-state";
 import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { replaceScreenplay } from "../../screenplay/editor";
 import { Editor } from "@tiptap/react";
 import { ProjectRepository } from "../../project/project-repository";
+import { CURRENT_PROJECT_VERSION } from "../../project/migrations/project-migrations";
 import * as fflate from "fflate";
 import * as Y from "yjs";
 
@@ -11,13 +12,12 @@ import * as Y from "yjs";
 //  Offset  Size  Description
 //  ──────  ────  ──────────────────────────────────────────────────────────────
 //   0       8    Magic bytes: ASCII "SCRIPTIO"
-//   8       1    Version (u8):  current = 1
+//   8       1    Version (u8):  see CURRENT_PROJECT_VERSION
 //   9       1    Flags   (u8):  bit 0 → 0 = zlib-compressed binary Yjs state
 //                                        1 = human-readable JSON (ProjectData)
 //  10       …    Payload
 //
 const MAGIC = new Uint8Array([0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x49, 0x4f]); // "SCRIPTIO"
-const CURRENT_VERSION = 1;
 const HEADER_SIZE = MAGIC.length + 1 + 1; // 8 magic + 1 version + 1 flags = 10 bytes
 
 const FLAG_READABLE_JSON = 0x01; // bit 0: payload is UTF-8 JSON, not compressed Yjs
@@ -47,7 +47,7 @@ function parseHeader(data: Uint8Array): { version: number; flags: number; payloa
     }
 
     const version = data[MAGIC.length];
-    if (version > CURRENT_VERSION) {
+    if (version > CURRENT_PROJECT_VERSION) {
         throw new Error(`Unsupported .scriptio file version: ${version}. Please update Scriptio.`);
     }
 
@@ -62,7 +62,7 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
     convertTo(project: ProjectState, options: ScriptioExportOptions): Promise<Blob> {
         const isReadable = options.readable ?? false;
         const flags = isReadable ? FLAG_READABLE_JSON : 0x00;
-        const header = buildHeader(CURRENT_VERSION, flags);
+        const header = buildHeader(CURRENT_PROJECT_VERSION, flags);
 
         let payload: Uint8Array;
 
@@ -71,8 +71,8 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
             // This produces a larger file but makes the content inspectable
             // with any text editor.
             const data: ProjectData = {
-                screenplay: project.screenplay(),
-                titlepage: project.titlepage(),
+                screenplay: screenplayOf(project),
+                titlepage: titlepageOf(project),
                 metadata: project.metadata().toJSON() as ProjectMetadata,
                 characters: project.characters().toJSON(),
                 scenes: project.scenes().toJSON(),
@@ -121,8 +121,8 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
             Y.applyUpdate(tmpDoc, decompressed);
 
             return {
-                screenplay: tmpDoc.screenplay(),
-                titlepage: tmpDoc.titlepage(),
+                screenplay: screenplayOf(tmpDoc),
+                titlepage: titlepageOf(tmpDoc),
                 metadata: tmpDoc.metadata().toJSON() as ProjectMetadata,
                 characters: tmpDoc.characters().toJSON(),
                 scenes: tmpDoc.scenes().toJSON(),
diff --git a/src/lib/cloud/room.ts b/src/lib/cloud/room.ts
index 7f9260eb..ac971fc0 100644
--- a/src/lib/cloud/room.ts
+++ b/src/lib/cloud/room.ts
@@ -17,9 +17,15 @@ import {
     SaveEntry,
 } from "./types";
 import { handleProtocolMessage } from "./protocol";
+import { ProjectState } from "../project/project-doc";
+import {
+    migrateProjectDocCore,
+    readProjectDocVersion,
+} from "../project/migrations/project-migration-runner";
+import { CURRENT_PROJECT_VERSION } from "../project/migrations/project-migrations";
 
 export class ProjectRoom extends DurableObject {
-    doc: Y.Doc;
+    doc: ProjectState;
     saveTimeout: ReturnType<typeof setTimeout> | null = null;
     awareness: awarenessProtocol.Awareness;
     sessions: Map<WebSocket, SessionInfo>;
@@ -31,6 +37,14 @@ export class ProjectRoom extends DurableObject {
     private alarmScheduled: boolean = false;
     private projectId: string | null = null;
 
+    /** Project schema version of the in-memory doc; the gatekeeper compares
+     *  client-advertised versions against this on connect. */
+    private docVersion: number = CURRENT_PROJECT_VERSION;
+
+    /** Set if server-side migration threw; we refuse new connections until
+     *  the project is fixed manually (preserves data integrity). */
+    private docMigrationFailed: boolean = false;
+
     // Typed references to bound handlers — initialized in the constructor body
     // so they're guaranteed to exist before being passed to doc.on/doc.off.
     // (esbuild does not guarantee class-field arrow functions are initialized
@@ -63,7 +77,7 @@ export class ProjectRoom extends DurableObject {
             }
         };
 
-        this.doc = new Y.Doc();
+        this.doc = new ProjectState();
         this.awareness = new awarenessProtocol.Awareness(this.doc);
 
         // Disable the built-in 30s outdated-state cleanup — we manage session
@@ -117,12 +131,77 @@ export class ProjectRoom extends DurableObject {
             this.projectId = configRows[0].value as string;
         }
 
+        // Server-side migration gatekeeper: bring the doc up to
+        // CURRENT_PROJECT_VERSION before any client is allowed to connect.
+        // blockConcurrencyWhile makes incoming requests wait for completion.
+        this.ctx.blockConcurrencyWhile(async () => {
+            await this.runDocMigration();
+            this.observeDocVersion();
+        });
+
         // Start periodic stale awareness cleanup
         this.startAwarenessCleanup();
 
         console.log("[Room] Initialized");
     }
 
+    /**
+     * Apply pending project-doc migrations to the in-memory doc and persist
+     * the result. Idempotent: a no-op when the doc is already at
+     * CURRENT_PROJECT_VERSION.
+     */
+    private async runDocMigration(): Promise<void> {
+        const outcome = await migrateProjectDocCore({ ydoc: this.doc });
+        switch (outcome.kind) {
+            case "up-to-date":
+                this.docVersion = outcome.version;
+                break;
+            case "migrated":
+                this.docVersion = outcome.to;
+                console.log(
+                    `[Room] Migrated doc from v${outcome.from} to v${outcome.to} ` +
+                        `(${outcome.appliedSteps.length} step${outcome.appliedSteps.length === 1 ? "" : "s"})`,
+                );
+                // Persist the migrated state immediately so a restart doesn't replay.
+                await this.saveToDisk();
+                break;
+            case "future-version":
+                // The on-disk doc is at a version newer than this worker knows.
+                // Refuse new connections until the worker is upgraded.
+                this.docMigrationFailed = true;
+                this.docVersion = outcome.storedVersion;
+                console.error(
+                    `[Room] Doc at v${outcome.storedVersion} but worker only supports v${outcome.expected}. ` +
+                        `Worker is out of date — refusing connections.`,
+                );
+                break;
+            case "failed":
+                this.docMigrationFailed = true;
+                this.docVersion = outcome.from;
+                console.error(
+                    `[Room] Doc migration failed at step v${outcome.failedAt} ` +
+                        `(stored v${outcome.from}):`,
+                    outcome.error,
+                );
+                break;
+        }
+    }
+
+    /**
+     * Track upward changes to metadata.version so the connection gatekeeper
+     * always sees the latest doc version (e.g., after a higher-version client
+     * propagates a migration we don't yet know about — would-be future-version).
+     */
+    private observeDocVersion(): void {
+        const map = this.doc.getMap("metadata") as Y.Map<unknown>;
+        map.observe(() => {
+            const v = map.get("version");
+            if (typeof v === "number" && v > this.docVersion) {
+                this.docVersion = v;
+            }
+        });
+    }
+
     /**
      * Mark the document as dirty and schedule an R2 snapshot alarm.
      */
@@ -455,6 +534,13 @@ export class ProjectRoom extends DurableObject {
                 return new Response("Unauthorized: You have been kicked.", { status: 403 });
             }
 
+            // Server-side migration gatekeeper. Refuse the upgrade if
+            // server-side migration failed — data integrity is at risk and
+            // the project should be inspected manually.
+            if (this.docMigrationFailed) {
+                return new Response("Project temporarily unavailable", { status: 503 });
+            }
+
             // Clean up any existing connection for this user (e.g., stale tab).
             // This ensures awareness states don't duplicate for the same user.
             const existingSocket = this.userConnections.get(userId);
@@ -480,6 +566,21 @@ export class ProjectRoom extends DurableObject {
 
             this.ctx.acceptWebSocket(server);
 
+            // Stale-client gate: reject clients whose bundle is older than
+            // the doc's schema version. Sending sync to them would let them
+            // write back the pre-migration shape and corrupt the doc.
+            const clientVersionParam = url.searchParams.get("clientVersion");
+            const clientVersion = clientVersionParam !== null ? Number(clientVersionParam) : NaN;
+            if (Number.isFinite(clientVersion) && clientVersion < this.docVersion) {
+                console.log(
+                    `[Room] Rejecting stale client v${clientVersion} (doc at v${this.docVersion})`,
+                );
+                try {
+                    server.close(4006, `Stale client: update to access v${this.docVersion}`);
+                } catch {}
+                return new Response(null, { status: 101, webSocket: client });
+            }
+
             // Initialize session
             this.sessions.set(server, {
                 clientIds: new Set(),
@@ -618,7 +719,7 @@ export class ProjectRoom extends DurableObject {
         this.awareness.destroy();
 
         // 2. Build the restored doc.
-        this.doc = new Y.Doc();
+        this.doc = new ProjectState();
         this.doc.on("update", this.handleDocUpdate);
         Y.applyUpdate(this.doc, data);
 
@@ -628,10 +729,19 @@ export class ProjectRoom extends DurableObject {
         this.awareness.setLocalState(null);
         this.awareness.on("update", this.handleAwarenessUpdate);
 
-        // 4. Persist the restored state immediately to SQLite.
+        // 4. Migrate the restored doc forward — snapshots can be from any
+        //    historical version. Resets docMigrationFailed so this restore
+        //    attempt has a clean slate; runDocMigration will set it again
+        //    if migration fails on the restored data.
+        this.docMigrationFailed = false;
+        this.docVersion = readProjectDocVersion(this.doc);
+        await this.runDocMigration();
+        this.observeDocVersion();
+
+        // 5. Persist the restored (and possibly migrated) state to SQLite.
         await this.saveToDisk();
 
-        // 5. Close all connected clients with "document-restored" (4005).
+        // 6. Close all connected clients with "document-restored" (4005).
         //    The client provider will clear its local cache and reload so it
         //    reconnects with an empty doc and receives the restored state via sync.
         for (const [socket] of this.sessions) {
diff --git a/src/lib/cloud/utils.ts b/src/lib/cloud/utils.ts
index c6a43253..5de26ce2 100644
--- a/src/lib/cloud/utils.ts
+++ b/src/lib/cloud/utils.ts
@@ -6,6 +6,7 @@ import * as Y from "yjs";
 import * as encoding from "lib0/encoding";
 import * as syncProtocol from "y-protocols/sync";
 import * as awarenessProtocol from "y-protocols/awareness";
+import { CURRENT_PROJECT_VERSION } from "../project/migrations/project-migrations";
 
 
 declare const window: Window & typeof globalThis;
@@ -36,6 +37,7 @@ type WSInternals = {
 
 export class ThrottledWebsocketProvider extends WebsocketProvider {
     on(event: "document-restored", listener: () => void): this;
+    on(event: "stale-client-version", listener: () => void): this;
     on(event: Parameters<WebsocketProvider["on"]>[0], listener: Parameters<WebsocketProvider["on"]>[1]): this;
     on(event: string, listener: (...args: unknown[]) => void): this {
         return super.on(
@@ -45,6 +47,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     }
 
     emit(event: "document-restored", args: []): this;
+    emit(event: "stale-client-version", args: []): this;
     emit(event: Parameters<WebsocketProvider["emit"]>[0], args: Parameters<WebsocketProvider["emit"]>[1]): this;
     emit(event: string, args: unknown[]): this {
         super.emit(
@@ -79,6 +82,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     private readonly localClientId: number;
     private isIdleDisconnected: boolean = false;
     private isSessionReplaced: boolean = false;
+    private isStaleClient: boolean = false;
     private lastKnownUserCount: number = 1;
 
     // Store userInfo so we can restore it on reconnection
@@ -87,6 +91,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     // Close codes from server
     private readonly CLOSE_CODE_SESSION_REPLACED = 4001;
     private readonly CLOSE_CODE_DOCUMENT_RESTORED = 4005;
+    private readonly CLOSE_CODE_STALE_CLIENT_VERSION = 4006;
 
     // Bound event handlers for proper cleanup
     private boundResetIdleTimer: () => void;
@@ -100,8 +105,22 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         options: WebsocketProviderOptions & { userInfo?: { name: string; color: string; userId?: string } },
     ) {
         // Pass connect: false to prevent immediate connection
-        // We'll connect after setting up user info
-        super(serverUrl, room, doc, { ...options, connect: false });
+        // We'll connect after setting up user info.
+        // Always advertise the client's project schema version via `params`
+        // so the DO can refuse stale-bundle connections that would write back
+        // a pre-migration shape and corrupt the doc.
+        const params: { [x: string]: string } = {
+            ...(options.params ?? {}),
+            clientVersion: String(CURRENT_PROJECT_VERSION),
+        };
+        super(
+            serverUrl,
+            room,
+            doc,
+            { ...options, params, connect: false } as unknown as ConstructorParameters<
+                typeof WebsocketProvider
+            >[3],
+        );
 
         this.localClientId = doc.clientID;
         this.boundResetIdleTimer = this.resetUserIdleTimer.bind(this);
@@ -191,8 +210,8 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         let currentWs: WebSocket | null = null;
 
         const checkAndHookWs = () => {
-            // Don't hook if session was already replaced
-            if (this.isSessionReplaced) return;
+            // Don't hook if session was already replaced or rejected as stale
+            if (this.isSessionReplaced || this.isStaleClient) return;
 
             const ws = (this as unknown as WSInternals).ws;
             if (ws && ws !== currentWs) {
@@ -207,6 +226,10 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
                         this.handleDocumentRestored();
                         return;
                     }
+                    if (event.code === this.CLOSE_CODE_STALE_CLIENT_VERSION) {
+                        this.handleStaleClientVersion();
+                        return;
+                    }
                     if (originalClose) {
                         originalClose.call(ws, event);
                     }
@@ -216,8 +239,8 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
         // Hook into new WebSocket connections when status changes
         this.on("status", (event: { status: string }) => {
-            // Only hook when connecting, not when already replaced
-            if (event.status === "connecting" && !this.isSessionReplaced) {
+            // Only hook when connecting, not when already replaced or stale-rejected
+            if (event.status === "connecting" && !this.isSessionReplaced && !this.isStaleClient) {
                 setTimeout(checkAndHookWs, 0);
             }
         });
@@ -266,6 +289,29 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         this.emit("document-restored", []);
     }
 
+    /**
+     * Handle stale-client-version close — this client's bundle is older than
+     * the project's schema version. Stop reconnecting (would just be rejected
+     * again) and notify the consumer to prompt the user to update.
+     */
+    private handleStaleClientVersion(): void {
+        console.warn("[WS] Client version is stale. Notifying consumer to prompt update.");
+        this.isStaleClient = true;
+
+        if (this.reconnectTimeout) {
+            clearTimeout(this.reconnectTimeout);
+            this.reconnectTimeout = null;
+        }
+
+        this.shouldConnect = false;
+        this.disconnect();
+        this.emit("stale-client-version", []);
+    }
+
+    public get wasStaleClient(): boolean {
+        return this.isStaleClient;
+    }
+
     /**
      * Count active collaborators (excluding ourselves and stale states)
      * Only counts users who have set a 'user' field in their awareness state
@@ -813,7 +859,7 @@ export const allowOnWebsocket = async (userId: string, projectId: string) => {
         .setProtectedHeader({ alg: "HS256" })
         .setExpirationTime("1m")
         .sign(secret);
-    await fetch(`${process.env.NEXT_PUBLIC_COLLAB_WEBSOCKET_URL}/${projectId}/allow`, {
+    await fetch(`${process.env.NEXT_PUBLIC_CLOUD_URL}/${projectId}/allow`, {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
@@ -834,7 +880,7 @@ export const blacklistFromWebsocket = async (userId: string, projectId: string)
         .setProtectedHeader({ alg: "HS256" })
         .setExpirationTime("1m")
         .sign(secret);
-    await fetch(`${process.env.NEXT_PUBLIC_COLLAB_WEBSOCKET_URL}/${projectId}/blacklist`, {
+    await fetch(`${process.env.NEXT_PUBLIC_CLOUD_URL}/${projectId}/blacklist`, {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
diff --git a/src/lib/project/migrations/project-migration-runner.ts b/src/lib/project/migrations/project-migration-runner.ts
index e8550fd4..fb185017 100644
--- a/src/lib/project/migrations/project-migration-runner.ts
+++ b/src/lib/project/migrations/project-migration-runner.ts
@@ -1,15 +1,23 @@
 /**
- * Drives `PROJECT_MIGRATIONS` against a single `ProjectState`. Called from
- * `useLocalPersistence` after `y-indexeddb` has fully synced and **before**
- * the cloud `WebsocketProvider` connects, to avoid concurrent migrations
- * across clients producing duplicated effects.
+ * Drives `PROJECT_MIGRATIONS` against a single `ProjectState`.
+ *
+ * Two entry points:
+ *   - `migrateProjectDocCore`: pure migration with no I/O. Used by the
+ *     DurableObject (server-side gatekeeper) to migrate the doc on load
+ *     before serving updates to clients.
+ *   - `migrateProjectDoc`: client wrapper that adds an IndexedDB pre-migration
+ *     backup so a failed step can be rolled back. Called from
+ *     `useLocalPersistence` after `y-indexeddb` has synced and before the
+ *     cloud `WebsocketProvider` connects.
+ *
+ * Both rely on idempotent migration steps so concurrent migrations across
+ * the DO and any number of clients converge cleanly under CRDT merge.
  */
 
 import * as Y from "yjs";
-import type { ProjectState } from "../project-state";
+import { ProjectState } from "../project-doc";
 import {
     CURRENT_PROJECT_VERSION,
-    LEGACY_PROJECT_VERSION,
     PROJECT_MIGRATIONS,
     type ProjectMigration,
 } from "./project-migrations";
@@ -18,7 +26,14 @@ export type ProjectMigrationOutcome =
     | { kind: "up-to-date"; version: number }
     | { kind: "migrated"; from: number; to: number; appliedSteps: string[] }
     | { kind: "future-version"; storedVersion: number; expected: number }
-    | { kind: "failed"; from: number; failedAt: number; error: Error };
+    | { kind: "failed"; from: number; failedAt: number; error: Error }
+    /**
+     * Surfaced by the layout when the cloud server rejects the WebSocket
+     * upgrade because this client's bundle predates the doc's schema version.
+     * Not produced by the migration runner itself — it's a UI-side outcome
+     * routed through the same error dialog.
+     */
+    | { kind: "stale-client" };
 
 const MIGRATION_ORIGIN = "migration";
 
@@ -26,6 +41,20 @@ interface BackupStore {
     saveMigrationBackup(projectId: string, snapshot: Uint8Array, fromVersion: number): Promise<void>;
 }
 
+export interface MigrateProjectDocCoreArgs {
+    ydoc: ProjectState;
+    /** Override for tests; defaults to `PROJECT_MIGRATIONS`. */
+    migrations?: ProjectMigration[];
+    /** Override for tests; defaults to `CURRENT_PROJECT_VERSION`. */
+    currentVersion?: number;
+    /**
+     * Optional async hook invoked once we know migration steps will run, with
+     * the pre-mutation snapshot. The client uses this to persist a rollback
+     * backup; the DO leaves it unset.
+     */
+    onBeforeMutate?: (snapshot: Uint8Array, fromVersion: number) => Promise<void>;
+}
+
 export interface MigrateProjectDocArgs {
     ydoc: ProjectState;
     projectId: string;
@@ -44,22 +73,28 @@ async function defaultBackupStore(): Promise<BackupStore> {
 
 function readVersion(ydoc: ProjectState): number {
     const stored = ydoc.metadata().get("version");
-    return typeof stored === "number" ? stored : LEGACY_PROJECT_VERSION;
+    return typeof stored === "number" ? stored : 1;
 }
 
 /**
- * Migrate a project Y.Doc to `CURRENT_PROJECT_VERSION`.
- *
- * Returns an outcome describing what happened. The caller decides UI
- * (block load on `future-version`/`failed`, show the doc on `up-to-date`/`migrated`).
+ * Public helper: peek the version field of a project doc without mutating it.
+ * Accepts a raw `Y.Doc` so callers that don't carry the `ProjectState` typing
+ * (e.g. examining a freshly-applied snapshot before constructing one) can use it.
  */
-export async function migrateProjectDoc({
+export function readProjectDocVersion(ydoc: Y.Doc): number {
+    const stored = ydoc.getMap("metadata").get("version");
+    return typeof stored === "number" ? stored : 1;
+}
+
+/**
+ * Pure migration: no I/O, safe to call from any environment (browser, DO).
+ */
+export async function migrateProjectDocCore({
     ydoc,
-    projectId,
-    backupStore,
     migrations = PROJECT_MIGRATIONS,
     currentVersion = CURRENT_PROJECT_VERSION,
-}: MigrateProjectDocArgs): Promise<ProjectMigrationOutcome> {
+    onBeforeMutate,
+}: MigrateProjectDocCoreArgs): Promise<ProjectMigrationOutcome> {
     const stored = readVersion(ydoc);
 
     if (stored === currentVersion) {
@@ -81,10 +116,10 @@ export async function migrateProjectDoc({
         return { kind: "migrated", from: stored, to: currentVersion, appliedSteps: [] };
     }
 
-    // Snapshot the doc before mutating so a failed step can be rolled back.
-    const snapshot = Y.encodeStateAsUpdate(ydoc);
-    const store = backupStore ?? (await defaultBackupStore());
-    await store.saveMigrationBackup(projectId, snapshot, stored);
+    if (onBeforeMutate) {
+        const snapshot = Y.encodeStateAsUpdate(ydoc);
+        await onBeforeMutate(snapshot, stored);
+    }
 
     const applied: string[] = [];
     for (const step of steps) {
@@ -108,6 +143,29 @@ export async function migrateProjectDoc({
     return { kind: "migrated", from: stored, to: currentVersion, appliedSteps: applied };
 }
 
+/**
+ * Client-side migration. Wraps `migrateProjectDocCore` with an IndexedDB
+ * rollback backup so a failed step can be restored from the
+ * `ProjectMigrationErrorDialog`.
+ */
+export async function migrateProjectDoc({
+    ydoc,
+    projectId,
+    backupStore,
+    migrations,
+    currentVersion,
+}: MigrateProjectDocArgs): Promise<ProjectMigrationOutcome> {
+    return migrateProjectDocCore({
+        ydoc,
+        migrations,
+        currentVersion,
+        onBeforeMutate: async (snapshot, fromVersion) => {
+            const store = backupStore ?? (await defaultBackupStore());
+            await store.saveMigrationBackup(projectId, snapshot, fromVersion);
+        },
+    });
+}
+
 /**
  * Replay a stored backup snapshot into a fresh Y.Doc, then write that doc
  * back to local persistence. Used when the user picks "Restore from backup"
diff --git a/src/lib/project/migrations/project-migrations.ts b/src/lib/project/migrations/project-migrations.ts
index 972bd0cb..77d12e53 100644
--- a/src/lib/project/migrations/project-migrations.ts
+++ b/src/lib/project/migrations/project-migrations.ts
@@ -18,12 +18,18 @@
  *   3. Existing projects upgrade lazily on first open.
  */
 
-import type { ProjectState } from "../project-state";
+import type { ProjectState } from "../project-doc";
 
 export interface ProjectMigration {
     from: number;
     to: number;
     description: string;
+    /**
+     * Mutate the project Yjs document. The runner wraps this call in a
+     * single `Y.transact` with origin "migration". The argument is a
+     * `ProjectState` (Y.Doc subclass) so steps get typed accessors:
+     * `ydoc.metadata()`, `ydoc.comments()`, `ydoc.layout()`, etc.
+     */
     run: (ydoc: ProjectState) => void;
 }
 
@@ -37,14 +43,7 @@ export const PROJECT_MIGRATIONS: ProjectMigration[] = [
     // },
 ];
 
-/**
- * Version every project should be at after migration. Legacy projects (no
- * version field in metadata) are treated as version 1, matching the schema
- * shipped before the migration framework existed.
- */
-export const LEGACY_PROJECT_VERSION = 1;
-
 export const CURRENT_PROJECT_VERSION =
     PROJECT_MIGRATIONS.length === 0
-        ? LEGACY_PROJECT_VERSION
+        ? 1
         : PROJECT_MIGRATIONS[PROJECT_MIGRATIONS.length - 1].to;
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
new file mode 100644
index 00000000..8bf590d7
--- /dev/null
+++ b/src/lib/project/project-doc.ts
@@ -0,0 +1,243 @@
+/**
+ * Worker-safe Y.Doc subclass for Scriptio projects.
+ *
+ * This file deliberately avoids React, tiptap, and any prosemirror imports
+ * so it can be loaded inside the Cloudflare DurableObject. The browser-only
+ * helpers that need ProseMirror conversion (e.g. screenplay()/titlepage()
+ * → JSONContent) live as standalone functions in `./project-state.ts`.
+ *
+ * All non-yjs imports here are `import type` so nothing else is pulled into
+ * the worker bundle at runtime.
+ */
+
+import * as Y from "yjs";
+
+import type { JSONContent } from "@tiptap/react";
+import type { PageFormat } from "../utils/enums";
+import type { CharacterItem } from "../screenplay/characters";
+import type { LocationItem } from "../screenplay/locations";
+import type { PersistentScene } from "../screenplay/scenes";
+import type { Comment } from "../utils/types";
+
+// -------------------------------- //
+//          SHELF TYPES             //
+// -------------------------------- //
+
+export type ShelfEntryType = "scene" | "character" | "action";
+
+export type ShelfVersionMeta = {
+    id: string;
+    title: string;
+};
+
+export type ShelfEntry = {
+    title: string;
+    type: ShelfEntryType;
+    versions: ShelfVersionMeta[];
+};
+
+// -------------------------------- //
+//          METADATA                //
+// -------------------------------- //
+
+export type ProjectMetadata = {
+    version: number;
+    id: string;
+    title: string;
+    author: string;
+    titlepageInitialized?: boolean;
+};
+
+// -------------------------------- //
+//          LAYOUT                  //
+// -------------------------------- //
+
+export type ElementMargin = { left: number; right: number };
+export type PageMargin = { top: number; bottom: number; left: number; right: number };
+
+export const DEFAULT_PAGE_MARGINS: PageMargin = {
+    top: 1.0,
+    bottom: 1.0,
+    left: 1.5,
+    right: 1.0,
+};
+
+export const DEFAULT_ELEMENT_MARGINS: Record<string, ElementMargin> = {
+    action: { left: 0, right: 0 },
+    scene: { left: 0, right: 0 },
+    character: { left: 2.5, right: 0 },
+    dialogue: { left: 1.3, right: 1.0 },
+    parenthetical: { left: 2.0, right: 2.0 },
+    transition: { left: 0, right: 0 },
+    section: { left: 0, right: 0 },
+};
+
+export type ElementStyle = {
+    bold?: boolean;
+    italic?: boolean;
+    underline?: boolean;
+    uppercase?: boolean;
+    align?: "left" | "center" | "right";
+    startNewPage?: boolean;
+};
+
+export const DEFAULT_ELEMENT_STYLES: Record<string, ElementStyle> = {
+    action: { align: "left" },
+    scene: { bold: true, align: "left", uppercase: true },
+    character: { align: "left", uppercase: true },
+    dialogue: { align: "left" },
+    parenthetical: { align: "left" },
+    transition: { align: "right", uppercase: true },
+    section: { align: "center", underline: true, startNewPage: true, uppercase: true },
+};
+
+export type LayoutData = {
+    pageSize: PageFormat;
+    pageMargins: PageMargin;
+    displaySceneNumbers: boolean;
+    sceneHeadingSpacing: number;
+    sceneNumberOnRight: boolean;
+    contdLabel: string;
+    moreLabel: string;
+    elementMargins: Record<string, ElementMargin>;
+    elementStyles: Record<string, ElementStyle>;
+};
+
+// -------------------------------- //
+//          BOARD                   //
+// -------------------------------- //
+
+export interface BoardCardData {
+    id: string;
+    title: string;
+    description: string;
+    color: string;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
+
+export interface BoardArrowData {
+    id: string;
+    fromCardId: string;
+    toCardId: string;
+}
+
+export type BoardData = {
+    cards: string;
+    arrows: string;
+};
+
+// -------------------------------- //
+//          PROJECT DATA            //
+// -------------------------------- //
+
+export type ProjectData = {
+    screenplay: JSONContent[];
+    titlepage?: JSONContent[];
+    characters: Record<string, CharacterItem>;
+    scenes: Record<string, PersistentScene>;
+    locations: Record<string, LocationItem>;
+    metadata: ProjectMetadata;
+    board: BoardData;
+    layout: LayoutData;
+    comments?: Record<string, Comment>;
+    shelf?: Record<string, ShelfEntry>;
+};
+
+/**
+ * Helper to provide stronger typing for Y.Map where different keys have different types.
+ */
+export interface TypedMap<T extends Record<string, unknown>>
+    extends Omit<Y.Map<T[keyof T]>, "get" | "set" | "toJSON"> {
+    get<K extends keyof T>(key: K): T[K] | undefined;
+    set<K extends keyof T>(key: K, value: T[K]): T[K];
+    toJSON(): T;
+}
+
+// -------------------------------- //
+//          PROJECT STATE           //
+// -------------------------------- //
+
+/**
+ * Y.Doc subclass with typed accessors for Scriptio's schema. All accessors
+ * are pure Y.js operations — no ProseMirror, no React. Safe to instantiate
+ * in the DurableObject. Browser-only ProseMirror conversion lives in
+ * `project-state.ts` as standalone helpers.
+ */
+export class ProjectState extends Y.Doc {
+    KEYS = {
+        SCREENPLAY: "screenplay",
+        TITLEPAGE: "titlepage",
+        CHARACTERS: "characters",
+        SCENES: "scenes",
+        LOCATIONS: "locations",
+        METADATA: "metadata",
+        BOARD: "board",
+        LAYOUT: "layout",
+        COMMENTS: "comments",
+        DICTIONARY: "dictionary",
+        SHELF: "shelf",
+    } as const;
+
+    metadata(): TypedMap<ProjectMetadata> {
+        return this.getMap(this.KEYS.METADATA) as unknown as TypedMap<ProjectMetadata>;
+    }
+
+    screenplayFragment(): Y.XmlFragment {
+        return this.getXmlFragment(this.KEYS.SCREENPLAY);
+    }
+
+    titlepageFragment(): Y.XmlFragment {
+        return this.getXmlFragment(this.KEYS.TITLEPAGE);
+    }
+
+    characters(): Y.Map<CharacterItem> {
+        return this.getMap(this.KEYS.CHARACTERS);
+    }
+
+    locations(): Y.Map<LocationItem> {
+        return this.getMap(this.KEYS.LOCATIONS);
+    }
+
+    scenes(): Y.Map<PersistentScene> {
+        return this.getMap(this.KEYS.SCENES);
+    }
+
+    board(): TypedMap<BoardData> {
+        return this.getMap(this.KEYS.BOARD) as unknown as TypedMap<BoardData>;
+    }
+
+    layout(): TypedMap<LayoutData> {
+        return this.getMap(this.KEYS.LAYOUT) as unknown as TypedMap<LayoutData>;
+    }
+
+    comments(): Y.Map<Comment> {
+        return this.getMap(this.KEYS.COMMENTS);
+    }
+
+    /** Per-project custom dictionary words (keys are words, values are true). */
+    dictionary(): Y.Map<boolean> {
+        return this.getMap(this.KEYS.DICTIONARY);
+    }
+
+    /** Shelf entries keyed by node UUID. */
+    shelf(): Y.Map<ShelfEntry> {
+        return this.getMap(this.KEYS.SHELF);
+    }
+
+    /** Get the Y.XmlFragment for a specific shelf version's content. */
+    shelfFragment(nodeId: string, versionId: string): Y.XmlFragment {
+        return this.getXmlFragment(`shelf_${nodeId}_${versionId}`);
+    }
+}
+
+// -------------------------------- //
+//          MAP HELPERS             //
+// -------------------------------- //
+
+export const getCharactersMap = (ydoc: ProjectState): Y.Map<CharacterItem> => ydoc.characters();
+export const getLocationsMap = (ydoc: ProjectState): Y.Map<LocationItem> => ydoc.locations();
+export const getScenesMap = (ydoc: ProjectState): Y.Map<PersistentScene> => ydoc.scenes();
+export const getBoardMap = (ydoc: ProjectState): TypedMap<BoardData> => ydoc.board();
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index 1e3a78c1..b5e15d74 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -12,6 +12,7 @@ import {
     ShelfEntry,
     ShelfEntryType,
     ShelfVersionMeta,
+    screenplayOf,
 } from "./project-state";
 import { CharacterMap } from "../screenplay/characters";
 import { LocationMap } from "../screenplay/locations";
@@ -65,7 +66,7 @@ export class ProjectRepository {
      * This converts the Y.js XmlFragment to a ProseMirror document structure.
      */
     get screenplay(): Screenplay {
-        return this.ydoc.screenplay();
+        return screenplayOf(this.ydoc);
     }
 
     /**
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 35a6ead2..6f5bc809 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -5,19 +5,47 @@ import { getRandomColor } from "@src/lib/utils/misc";
 import { getCloudToken } from "../utils/requests";
 import { JSONContent } from "@tiptap/react";
 import { Screenplay } from "../utils/types";
-import { PageFormat } from "../utils/enums";
 import * as Y from "yjs";
 import type { ThrottledWebsocketProvider } from "../cloud/utils";
 import { ScreenplaySchema } from "../screenplay/editor";
 import { TitlePageSchema } from "../titlepage/editor";
 import { yXmlFragmentToProseMirrorRootNode } from "y-prosemirror";
-import type { CharacterItem, CharacterMap } from "../screenplay/characters";
-import type { LocationItem, LocationMap } from "../screenplay/locations";
-import type { PersistentScene, PersistentSceneMap } from "../screenplay/scenes";
-import type { Comment } from "../utils/types";
+import type { CharacterMap } from "../screenplay/characters";
+import type { LocationMap } from "../screenplay/locations";
+import type { PersistentSceneMap } from "../screenplay/scenes";
 import type { YjsLocalProvider } from "../persistence/y-local-provider";
 import type { ProjectMigrationOutcome } from "./migrations/project-migration-runner";
 
+import { ProjectState } from "./project-doc";
+
+// Re-export all schema types & the class so existing consumers continue to
+// import from "@src/lib/project/project-state" without changes.
+export {
+    ProjectState,
+    DEFAULT_PAGE_MARGINS,
+    DEFAULT_ELEMENT_MARGINS,
+    DEFAULT_ELEMENT_STYLES,
+    getCharactersMap,
+    getLocationsMap,
+    getScenesMap,
+    getBoardMap,
+} from "./project-doc";
+export type {
+    ShelfEntryType,
+    ShelfVersionMeta,
+    ShelfEntry,
+    ProjectMetadata,
+    ElementMargin,
+    PageMargin,
+    ElementStyle,
+    LayoutData,
+    BoardCardData,
+    BoardArrowData,
+    BoardData,
+    ProjectData,
+    TypedMap,
+} from "./project-doc";
+
 // Lazy re-export repository for convenient access (avoid loading yjs at module level)
 export const getProjectRepository = async () => {
     const mod = await import("./project-repository");
@@ -33,21 +61,6 @@ export const getProjectRepository = async () => {
 
 export type ConnectionStatus = "disconnected" | "connecting" | "connected";
 
-// ---- Shelf types ----
-
-export type ShelfEntryType = "scene" | "character" | "action";
-
-export type ShelfVersionMeta = {
-    id: string; // unique version ID (nanoid)
-    title: string; // default: today's date on creation
-};
-
-export type ShelfEntry = {
-    title: string; // text content of the shelved node
-    type: ShelfEntryType;
-    versions: ShelfVersionMeta[];
-};
-
 export interface ProjectYjsState {
     ydoc: ProjectState | null;
     provider: ThrottledWebsocketProvider | null;
@@ -59,6 +72,7 @@ export interface ProjectYjsState {
     isLockedByServer: boolean;
     isSessionReplaced: boolean;
     isProjectUnavailable: boolean;
+    isStaleClient: boolean;
     migrationOutcome: ProjectMigrationOutcome | null;
 }
 
@@ -75,117 +89,6 @@ export interface UserInfo {
     userId?: string;
 }
 
-export type ProjectMetadata = {
-    version: number;
-    id: string;
-    title: string;
-    author: string;
-    titlepageInitialized?: boolean;
-};
-
-export type ElementMargin = { left: number; right: number }; // values in inches (offset from page margin)
-
-export type PageMargin = { top: number; bottom: number; left: number; right: number }; // values in inches
-
-/** Default page margins (in inches). */
-export const DEFAULT_PAGE_MARGINS: PageMargin = {
-    top: 1.0,
-    bottom: 1.0,
-    left: 1.5,
-    right: 1.0,
-};
-
-/** Default margins per screenplay element (offset from page margin, in inches). */
-export const DEFAULT_ELEMENT_MARGINS: Record<string, ElementMargin> = {
-    action: { left: 0, right: 0 },
-    scene: { left: 0, right: 0 },
-    character: { left: 2.5, right: 0 },
-    dialogue: { left: 1.3, right: 1.0 },
-    parenthetical: { left: 2.0, right: 2.0 },
-    transition: { left: 0, right: 0 },
-    section: { left: 0, right: 0 },
-};
-
-export type ElementStyle = {
-    bold?: boolean;
-    italic?: boolean;
-    underline?: boolean;
-    uppercase?: boolean;
-    align?: "left" | "center" | "right";
-    startNewPage?: boolean;
-};
-
-/** Default styling per screenplay element */
-export const DEFAULT_ELEMENT_STYLES: Record<string, ElementStyle> = {
-    action: { align: "left" },
-    scene: { bold: true, align: "left", uppercase: true },
-    character: { align: "left", uppercase: true },
-    dialogue: { align: "left" },
-    parenthetical: { align: "left" },
-    transition: { align: "right", uppercase: true },
-    section: { align: "center", underline: true, startNewPage: true, uppercase: true },
-};
-
-export type LayoutData = {
-    pageSize: PageFormat;
-    pageMargins: PageMargin;
-    displaySceneNumbers: boolean;
-    sceneHeadingSpacing: number;
-    sceneNumberOnRight: boolean;
-    contdLabel: string;
-    moreLabel: string;
-    elementMargins: Record<string, ElementMargin>;
-    elementStyles: Record<string, ElementStyle>;
-};
-
-export interface BoardCardData {
-    id: string;
-    title: string;
-    description: string;
-    color: string;
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-}
-
-export interface BoardArrowData {
-    id: string;
-    fromCardId: string;
-    toCardId: string;
-}
-
-export type BoardData = {
-    cards: string; // JSON string of BoardCardData[]
-    arrows: string; // JSON string of BoardArrowData[]
-};
-
-export type ProjectData = {
-    screenplay: JSONContent[];
-    titlepage?: JSONContent[];
-    characters: CharacterMap;
-    scenes: PersistentSceneMap;
-    locations: LocationMap;
-    metadata: ProjectMetadata;
-    board: BoardData;
-    layout: LayoutData;
-    comments?: Record<string, Comment>;
-    shelf?: Record<string, ShelfEntry>;
-};
-
-/**
- * Helper to provide stronger typing for Y.Map where different keys have different types.
- * This avoids manual casts when accessing known keys.
- */
-export interface TypedMap<T extends Record<string, unknown>> extends Omit<
-    Y.Map<T[keyof T]>,
-    "get" | "set" | "toJSON"
-> {
-    get<K extends keyof T>(key: K): T[K] | undefined;
-    set<K extends keyof T>(key: K, value: T[K]): T[K];
-    toJSON(): T;
-}
-
 // -------------------------------- //
 //       LAZY-LOADED MODULES        //
 // -------------------------------- //
@@ -224,123 +127,27 @@ export async function clearLocalProjectCache(projectId: string): Promise<void> {
 }
 
 // -------------------------------- //
-//          PROJECT STATE           //
-// -------------------------------- //
-
-// ProjectState class - created dynamically to avoid SSR issues
-export class ProjectState extends Y.Doc {
-    KEYS = {
-        SCREENPLAY: "screenplay",
-        TITLEPAGE: "titlepage",
-        CHARACTERS: "characters",
-        SCENES: "scenes",
-        LOCATIONS: "locations",
-        METADATA: "metadata",
-        BOARD: "board",
-        LAYOUT: "layout",
-        COMMENTS: "comments",
-        DICTIONARY: "dictionary",
-        SHELF: "shelf",
-    } as const;
-
-    metadata(): TypedMap<ProjectMetadata> {
-        return this.getMap(this.KEYS.METADATA) as unknown as TypedMap<ProjectMetadata>;
-    }
-
-    screenplay(): Screenplay {
-        const fragment = this.screenplayFragment();
-        const proseMirrorNode = yXmlFragmentToProseMirrorRootNode(fragment, ScreenplaySchema);
-        return proseMirrorNode.content.toJSON() as Screenplay;
-    }
-
-    screenplayFragment(): Y.XmlFragment {
-        return this.getXmlFragment(this.KEYS.SCREENPLAY);
-    }
-
-    titlepage(): JSONContent[] {
-        const fragment = this.titlepageFragment();
-        const proseMirrorNode = yXmlFragmentToProseMirrorRootNode(fragment, TitlePageSchema);
-        return proseMirrorNode.content.toJSON() as JSONContent[];
-    }
-
-    titlepageFragment(): Y.XmlFragment {
-        return this.getXmlFragment(this.KEYS.TITLEPAGE);
-    }
-
-    characters(): Y.Map<CharacterItem> {
-        return this.getMap(this.KEYS.CHARACTERS);
-    }
-
-    locations(): Y.Map<LocationItem> {
-        return this.getMap(this.KEYS.LOCATIONS);
-    }
-
-    scenes(): Y.Map<PersistentScene> {
-        return this.getMap(this.KEYS.SCENES);
-    }
-
-    board(): TypedMap<BoardData> {
-        return this.getMap(this.KEYS.BOARD) as unknown as TypedMap<BoardData>;
-    }
-
-    layout(): TypedMap<LayoutData> {
-        return this.getMap(this.KEYS.LAYOUT) as unknown as TypedMap<LayoutData>;
-    }
-
-    comments(): Y.Map<Comment> {
-        return this.getMap(this.KEYS.COMMENTS);
-    }
-
-    /** Per-project custom dictionary words (keys are words, values are true). */
-    dictionary(): Y.Map<boolean> {
-        return this.getMap(this.KEYS.DICTIONARY);
-    }
-
-    /** Shelf entries keyed by node UUID. */
-    shelf(): Y.Map<ShelfEntry> {
-        return this.getMap(this.KEYS.SHELF);
-    }
-
-    /** Get the Y.XmlFragment for a specific shelf version's content. */
-    shelfFragment(nodeId: string, versionId: string): Y.XmlFragment {
-        return this.getXmlFragment(`shelf_${nodeId}_${versionId}`);
-    }
-}
-
-// -------------------------------- //
-//       HELPER FUNCTIONS           //
+//   PROSEMIRROR HELPERS (browser)  //
 // -------------------------------- //
 
 /**
- * Get the characters Y.Map from a ProjectState.
- * Convenience function for direct access without repository.
+ * Convert the screenplay Y.XmlFragment to ProseMirror JSONContent[].
+ * Browser-only: uses tiptap's ScreenplaySchema and y-prosemirror.
  */
-export const getCharactersMap = (ydoc: ProjectState): Y.Map<CharacterItem> => {
-    return ydoc.characters();
+export const screenplayOf = (ydoc: ProjectState): Screenplay => {
+    const fragment = ydoc.screenplayFragment();
+    const proseMirrorNode = yXmlFragmentToProseMirrorRootNode(fragment, ScreenplaySchema);
+    return proseMirrorNode.content.toJSON() as Screenplay;
 };
 
 /**
- * Get the locations Y.Map from a ProjectState.
- * Convenience function for direct access without repository.
+ * Convert the title-page Y.XmlFragment to ProseMirror JSONContent[].
+ * Browser-only: uses tiptap's TitlePageSchema and y-prosemirror.
  */
-export const getLocationsMap = (ydoc: ProjectState): Y.Map<LocationItem> => {
-    return ydoc.locations();
-};
-
-/**
- * Get the scenes Y.Map from a ProjectState.
- * Convenience function for direct access without repository.
- */
-export const getScenesMap = (ydoc: ProjectState): Y.Map<PersistentScene> => {
-    return ydoc.scenes();
-};
-
-/**
- * Get the board Y.Map from a ProjectState.
- * Convenience function for direct access without repository.
- */
-export const getBoardMap = (ydoc: ProjectState): TypedMap<BoardData> => {
-    return ydoc.board();
+export const titlepageOf = (ydoc: ProjectState): JSONContent[] => {
+    const fragment = ydoc.titlepageFragment();
+    const proseMirrorNode = yXmlFragmentToProseMirrorRootNode(fragment, TitlePageSchema);
+    return proseMirrorNode.content.toJSON() as JSONContent[];
 };
 
 // -------------------------------- //
@@ -349,7 +156,6 @@ export const getBoardMap = (ydoc: ProjectState): TypedMap<BoardData> => {
 
 /**
  * Hook to initialize local persistence for the Yjs document.
- * Uses SQLite on desktop (Tauri) and IndexedDB on browser.
  */
 export const useLocalPersistence = (projectId: string | null) => {
     const [ydoc, setYdoc] = useState<ProjectState | null>(null);
@@ -430,6 +236,7 @@ export const useCloudSync = (
     const [isLockedByServer] = useState(false);
     const [isSessionReplaced] = useState(false);
     const [isProjectUnavailable, setIsProjectUnavailable] = useState(false);
+    const [isStaleClient, setIsStaleClient] = useState(false);
 
     const isMountedRef = useRef(true);
     const providerRef = useRef<ThrottledWebsocketProvider | null>(null);
@@ -512,8 +319,9 @@ export const useCloudSync = (
                 // Dynamically import collaboration utils
                 const { ThrottledWebsocketProvider } = await import("../cloud/utils");
 
+                const cloudWsUrl = (process.env.NEXT_PUBLIC_CLOUD_URL || "").replace(/^http/, "ws");
                 const cloudProvider = new ThrottledWebsocketProvider(
-                    `${process.env.NEXT_PUBLIC_COLLAB_WEBSOCKET_URL}`,
+                    cloudWsUrl,
                     projectId,
                     ydoc,
                     {
@@ -596,6 +404,15 @@ export const useCloudSync = (
                     window.location.reload();
                 });
 
+                // Server rejected this client as stale — its bundle predates
+                // the doc's schema version. Surface to the UI so the user is
+                // prompted to update.
+                cloudProvider.on("stale-client-version", () => {
+                    if (!isMountedRef.current) return;
+                    console.warn("[ProjectYjs] Server rejected this client as stale");
+                    setIsStaleClient(true);
+                });
+
                 // Poll for synced status
                 const checkSynced = () => {
                     if (!isMountedRef.current) return;
@@ -679,6 +496,7 @@ export const useCloudSync = (
         isLockedByServer,
         isSessionReplaced,
         isProjectUnavailable,
+        isStaleClient,
     };
 };
 
@@ -725,6 +543,7 @@ export const useProjectYjs = ({
         isLockedByServer,
         isSessionReplaced,
         isProjectUnavailable,
+        isStaleClient,
     } = useCloudSync(projectId, isLocalReady ? ydoc : null, userInfo);
 
     // isReady: project is ready when ydoc exists and local storage is synced
@@ -745,6 +564,7 @@ export const useProjectYjs = ({
         isLockedByServer,
         isSessionReplaced,
         isProjectUnavailable,
+        isStaleClient,
         migrationOutcome,
     };
 };
diff --git a/src/lib/utils/api-utils.ts b/src/lib/utils/api-utils.ts
index efa88cdb..8fede38c 100644
--- a/src/lib/utils/api-utils.ts
+++ b/src/lib/utils/api-utils.ts
@@ -92,7 +92,6 @@ export function validate<T>(schema: z.ZodSchema<T>, data: unknown): T {
  * Useful for calling REST endpoints on the collaboration Worker from the Next.js server.
  */
 export function getCollabHttpUrl(path: string): string {
-    const baseUrl = process.env.NEXT_PUBLIC_COLLAB_WEBSOCKET_URL || "";
-    const httpUrl = baseUrl.replace(/^ws/, "http");
-    return `${httpUrl}${path}`;
+    const baseUrl = process.env.NEXT_PUBLIC_CLOUD_URL || "";
+    return `${baseUrl}${path}`;
 }
diff --git a/src/lib/utils/requests.ts b/src/lib/utils/requests.ts
index e066a590..c14b8f7e 100644
--- a/src/lib/utils/requests.ts
+++ b/src/lib/utils/requests.ts
@@ -150,6 +150,11 @@ export const submitApplePurchase = async (jwsTransaction: string): Promise<boole
     return res.ok;
 };
 
+export const transferAppleSubscription = async (jwsTransaction: string): Promise<boolean> => {
+    const res = await request("/api/apple/transfer-subscription", "POST", { jwsTransaction });
+    return res.ok;
+};
+
 export const getAppleSubscriptionOwner = async (jwsTransaction: string): Promise<string | null> => {
     const res = await request("/api/apple/subscription-owner", "POST", { jwsTransaction });
     if (!res.ok) return null;
diff --git a/src/server/repository/transaction-repository.ts b/src/server/repository/transaction-repository.ts
index 14c56e32..8dc7c005 100644
--- a/src/server/repository/transaction-repository.ts
+++ b/src/server/repository/transaction-repository.ts
@@ -39,4 +39,11 @@ export class TransactionRepository {
             create: { userId, provider, transactionId },
         });
     }
+
+    reassignToUser(transactionId: string, newUserId: string) {
+        return prisma.transaction.update({
+            where: { transactionId },
+            data: { userId: newUserId },
+        });
+    }
 }
diff --git a/src/server/service/transaction-service.ts b/src/server/service/transaction-service.ts
index 9abb44b6..79db5f28 100644
--- a/src/server/service/transaction-service.ts
+++ b/src/server/service/transaction-service.ts
@@ -40,3 +40,8 @@ export const createTransactionIfNotExists = async (
     logger.debug("[TransactionService] Transaction upserted", { id: result.id, transactionId });
     return result;
 };
+
+export const reassignTransactionToUser = async (transactionId: string, newUserId: string) => {
+    logger.debug("[TransactionService] Reassigning transaction", { transactionId, newUserId });
+    return repository.reassignToUser(transactionId, newUserId);
+};
diff --git a/src/tests/migrations/project-migration-runner.test.ts b/src/tests/migrations/project-migration-runner.test.ts
index cf5bb410..b01c92bd 100644
--- a/src/tests/migrations/project-migration-runner.test.ts
+++ b/src/tests/migrations/project-migration-runner.test.ts
@@ -2,7 +2,11 @@ import { describe, expect, it } from "vitest";
 import * as Y from "yjs";
 
 import { ProjectState } from "@src/lib/project/project-state";
-import { migrateProjectDoc } from "@src/lib/project/migrations/project-migration-runner";
+import {
+    migrateProjectDoc,
+    migrateProjectDocCore,
+    readProjectDocVersion,
+} from "@src/lib/project/migrations/project-migration-runner";
 import type { ProjectMigration } from "@src/lib/project/migrations/project-migrations";
 
 interface FakeBackupStore {
@@ -20,6 +24,7 @@ function makeBackupStore(): FakeBackupStore {
     };
 }
 
+
 describe("migrateProjectDoc", () => {
     it("returns up-to-date and writes nothing when version equals current", async () => {
         const ydoc = new ProjectState();
@@ -225,3 +230,154 @@ describe("migrateProjectDoc", () => {
         ydoc.destroy();
     });
 });
+
+describe("migrateProjectDocCore", () => {
+    /** Idempotent migration that only sets keys (the contract from project-migrations.ts). */
+    const setAuthor: ProjectMigration = {
+        from: 1,
+        to: 2,
+        description: "set-author",
+        run: (doc) => doc.metadata().set("author", "v2-author"),
+    };
+
+    it("runs without a backup store (DO-style invocation)", async () => {
+        const ydoc = new ProjectState();
+        const outcome = await migrateProjectDocCore({
+            ydoc,
+            migrations: [setAuthor],
+            currentVersion: 2,
+        });
+        expect(outcome.kind).toBe("migrated");
+        expect(ydoc.metadata().get("version")).toBe(2);
+        expect(ydoc.metadata().get("author")).toBe("v2-author");
+        ydoc.destroy();
+    });
+
+    it("invokes onBeforeMutate exactly once with the pre-mutation snapshot", async () => {
+        const ydoc = new ProjectState();
+        ydoc.metadata().set("title", "T");
+        const beforeBytes = Y.encodeStateAsUpdate(ydoc);
+
+        const calls: Array<{ snapshot: Uint8Array; fromVersion: number }> = [];
+        await migrateProjectDocCore({
+            ydoc,
+            migrations: [setAuthor],
+            currentVersion: 2,
+            onBeforeMutate: async (snapshot, fromVersion) => {
+                calls.push({ snapshot, fromVersion });
+            },
+        });
+
+        expect(calls).toHaveLength(1);
+        expect(calls[0].fromVersion).toBe(1);
+        expect(calls[0].snapshot).toEqual(beforeBytes);
+        ydoc.destroy();
+    });
+
+    it("does NOT call onBeforeMutate when there's nothing to do (no steps, version-only bump)", async () => {
+        const ydoc = new ProjectState();
+        // No registered migrations — the runner just brings the version field forward.
+        let called = false;
+        await migrateProjectDocCore({
+            ydoc,
+            migrations: [],
+            currentVersion: 5,
+            onBeforeMutate: async () => {
+                called = true;
+            },
+        });
+        expect(called).toBe(false);
+        expect(ydoc.metadata().get("version")).toBe(5);
+        ydoc.destroy();
+    });
+});
+
+describe("multi-source migration convergence", () => {
+    /**
+     * Simulates the gatekeeper-on-both-sides architecture: the DurableObject
+     * migrates its in-memory doc; the client also migrates its local cache;
+     * they exchange Y.js updates and must converge to the same shape.
+     */
+    it("client and server independently migrate then sync to identical state", async () => {
+        const migrations: ProjectMigration[] = [
+            {
+                from: 1,
+                to: 2,
+                description: "set-author",
+                run: (doc) => doc.metadata().set("author", "post-migration"),
+            },
+        ];
+
+        // Server side: starts at v1 (legacy), runs migration.
+        const server = new ProjectState();
+        server.metadata().set("title", "shared-title");
+        await migrateProjectDocCore({ ydoc: server, migrations, currentVersion: 2 });
+
+        // Client side: cold cache (empty), runs migration on empty doc, then
+        // applies the server's update (the race we're closing).
+        const client = new ProjectState();
+        await migrateProjectDocCore({ ydoc: client, migrations, currentVersion: 2 });
+        Y.applyUpdate(client, Y.encodeStateAsUpdate(server));
+
+        // Both must converge to v2 with author + title set.
+        expect(client.metadata().get("version")).toBe(2);
+        expect(client.metadata().get("author")).toBe("post-migration");
+        expect(client.metadata().get("title")).toBe("shared-title");
+
+        // Reverse direction also converges — round-trip the client's state to server.
+        Y.applyUpdate(server, Y.encodeStateAsUpdate(client));
+        expect(server.metadata().get("version")).toBe(2);
+        expect(server.metadata().get("author")).toBe("post-migration");
+        server.destroy();
+        client.destroy();
+    });
+
+    it("re-migrates when an old-version update arrives after migration", async () => {
+        const migrations: ProjectMigration[] = [
+            {
+                from: 1,
+                to: 2,
+                description: "init-author",
+                // Idempotent: only sets if missing.
+                run: (doc) => {
+                    if (!doc.metadata().has("author")) doc.metadata().set("author", "default");
+                },
+            },
+        ];
+
+        // Doc A starts at v1 with content, never migrated.
+        const oldDoc = new ProjectState();
+        oldDoc.metadata().set("title", "from-old-client");
+        const oldUpdate = Y.encodeStateAsUpdate(oldDoc);
+
+        // Doc B migrates fresh.
+        const migrated = new ProjectState();
+        await migrateProjectDocCore({ ydoc: migrated, migrations, currentVersion: 2 });
+        // Now an old-version update arrives (e.g., from a client that bypassed the gate).
+        Y.applyUpdate(migrated, oldUpdate);
+
+        // The doc still has version=2 (LWW with a newer clock) and the title.
+        expect(migrated.metadata().get("version")).toBe(2);
+        expect(migrated.metadata().get("title")).toBe("from-old-client");
+        // Re-running migration is a no-op (already at v2).
+        const second = await migrateProjectDocCore({ ydoc: migrated, migrations, currentVersion: 2 });
+        expect(second.kind).toBe("up-to-date");
+        oldDoc.destroy();
+        migrated.destroy();
+    });
+});
+
+describe("readProjectDocVersion", () => {
+    it("returns 1 when no version field is set", () => {
+        const ydoc = new Y.Doc();
+        expect(readProjectDocVersion(ydoc)).toBe(1);
+        ydoc.destroy();
+    });
+
+    it("returns the stored version when set", () => {
+        const ydoc = new Y.Doc();
+        ydoc.getMap("metadata").set("version", 7);
+        expect(readProjectDocVersion(ydoc)).toBe(7);
+        ydoc.destroy();
+    });
+});

From 5c5091d9973722cbcc7090146ef299d06acc5016 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 3 May 2026 03:44:55 +0200
Subject: [PATCH 41/76] added missing ci file

---
 .github/workflows/deploy-staging.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index 5143daae..ff75f74a 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -71,7 +71,7 @@ jobs:
               env:
                   APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
-                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.staging.scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: https://cloud.staging.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -115,7 +115,7 @@ jobs:
               run: npm run debug:windows
               env:
                   NEXT_PUBLIC_API_URL: https://staging.scriptio.app
-                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.staging.scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: https://cloud.staging.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -185,7 +185,7 @@ jobs:
                       ${{ env.IMAGE_NAME }}:staging-${{ needs.prepare.outputs.version }}
                   build-args: |
                       NEXT_PUBLIC_API_URL=https://staging.scriptio.app
-                      NEXT_PUBLIC_CLOUD_URL=wss://cloud.staging.scriptio.app
+                      NEXT_PUBLIC_CLOUD_URL=https://cloud.staging.scriptio.app
                       NEXT_PUBLIC_COMMIT_SHA=${{ env.COMMIT_SHA }}
                       NEXT_PUBLIC_APP_VERSION=${{ needs.prepare.outputs.version }}
 

From 50a573fdfba6fd3c1a30f94bda4f5af65eb188d5 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 3 May 2026 03:45:20 +0200
Subject: [PATCH 42/76] added missing ci file

---
 .github/workflows/deploy-release.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
index 8046662c..d0be15ad 100644
--- a/.github/workflows/deploy-release.yaml
+++ b/.github/workflows/deploy-release.yaml
@@ -71,7 +71,7 @@ jobs:
               env:
                   APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
                   NEXT_PUBLIC_API_URL: https://scriptio.app
-                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: https://cloud.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -114,7 +114,7 @@ jobs:
               run: npm run build:windows
               env:
                   NEXT_PUBLIC_API_URL: https://scriptio.app
-                  NEXT_PUBLIC_CLOUD_URL: wss://cloud.scriptio.app
+                  NEXT_PUBLIC_CLOUD_URL: https://cloud.scriptio.app
                   NEXT_PUBLIC_APP_VERSION: ${{ needs.prepare.outputs.version }}
                   NEXT_PUBLIC_COMMIT_SHA: ${{ needs.prepare.outputs.commit_sha }}
 
@@ -184,7 +184,7 @@ jobs:
                       ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }}
                   build-args: |
                       NEXT_PUBLIC_API_URL=https://scriptio.app
-                      NEXT_PUBLIC_CLOUD_URL=wss://cloud.scriptio.app
+                      NEXT_PUBLIC_CLOUD_URL=https://cloud.scriptio.app
                       NEXT_PUBLIC_COMMIT_SHA=${{ env.COMMIT_SHA }}
                       NEXT_PUBLIC_APP_VERSION=${{ needs.prepare.outputs.version }}
 

From 73fde53c903f4fab3ac016c8a66567879513f53e Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Sun, 3 May 2026 04:04:05 +0200
Subject: [PATCH 43/76] updated Dockerfile for websocket cloud URL

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c99ded3e..507afe3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,12 @@ COPY ./ ./
 ENV DATABASE_URL="postgresql://dummy:dummy@localhost:5432/dummy"
 
 ARG NEXT_PUBLIC_API_URL=https://scriptio.app
+ARG NEXT_PUBLIC_CLOUD_URL=https://cloud.scriptio.app
 ARG NEXT_PUBLIC_COMMIT_SHA
 ARG NEXT_PUBLIC_APP_VERSION
 
 ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
+ENV NEXT_PUBLIC_CLOUD_URL=$NEXT_PUBLIC_CLOUD_URL
 ENV NEXT_PUBLIC_COMMIT_SHA=$NEXT_PUBLIC_COMMIT_SHA
 ENV NEXT_PUBLIC_APP_VERSION=$NEXT_PUBLIC_APP_VERSION
 

From 5dacb6751ba560fae77d2ab610bcdf57c27a43b3 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Sun, 3 May 2026 16:02:40 +0200
Subject: [PATCH 44/76] fixing cloud sync issues

---
 .../projects/[projectId]/cloud-token/route.ts |  2 +-
 src/lib/cloud/room.ts                         | 42 ++++----
 src/lib/cloud/utils.ts                        | 98 ++++++++++---------
 src/lib/project/project-state.ts              | 25 +++--
 4 files changed, 94 insertions(+), 73 deletions(-)

diff --git a/src/app/api/projects/[projectId]/cloud-token/route.ts b/src/app/api/projects/[projectId]/cloud-token/route.ts
index f78032e7..6b940aa0 100644
--- a/src/app/api/projects/[projectId]/cloud-token/route.ts
+++ b/src/app/api/projects/[projectId]/cloud-token/route.ts
@@ -27,7 +27,7 @@ async function projectCloudTokenRoute(req: NextRequest, { routeParams, user }: A
     const secret = new TextEncoder().encode(process.env.JWT_SECRET!);
     const token = await new SignJWT(payload)
         .setProtectedHeader({ alg: "HS256" })
-        .setExpirationTime("1m")
+        .setExpirationTime("1h")
         .sign(secret);
 
     return Success(token);
diff --git a/src/lib/cloud/room.ts b/src/lib/cloud/room.ts
index ac971fc0..e8e58307 100644
--- a/src/lib/cloud/room.ts
+++ b/src/lib/cloud/room.ts
@@ -18,10 +18,7 @@ import {
 } from "./types";
 import { handleProtocolMessage } from "./protocol";
 import { ProjectState } from "../project/project-doc";
-import {
-    migrateProjectDocCore,
-    readProjectDocVersion,
-} from "../project/migrations/project-migration-runner";
+import { migrateProjectDocCore, readProjectDocVersion } from "../project/migrations/project-migration-runner";
 import { CURRENT_PROJECT_VERSION } from "../project/migrations/project-migrations";
 
 export class ProjectRoom extends DurableObject {
@@ -31,7 +28,6 @@ export class ProjectRoom extends DurableObject {
     sessions: Map<WebSocket, SessionInfo>;
     userConnections: Map<string, WebSocket>;
     blacklist: Set<string>;
-    cleanupInterval: ReturnType<typeof setInterval> | null = null;
 
     private isDirty: boolean = false;
     private alarmScheduled: boolean = false;
@@ -50,7 +46,10 @@ export class ProjectRoom extends DurableObject {
     // (esbuild does not guarantee class-field arrow functions are initialized
     // before the constructor body runs.)
     private handleDocUpdate!: (update: Uint8Array, origin: unknown) => void;
-    private handleAwarenessUpdate!: (changes: { added: number[]; updated: number[]; removed: number[] }, origin: unknown) => void;
+    private handleAwarenessUpdate!: (
+        changes: { added: number[]; updated: number[]; removed: number[] },
+        origin: unknown,
+    ) => void;
 
     constructor(ctx: DurableObjectState, env: Env) {
         super(ctx, env);
@@ -67,7 +66,10 @@ export class ProjectRoom extends DurableObject {
             this.markDirty();
         };
 
-        this.handleAwarenessUpdate = ({ added }: { added: number[]; updated: number[]; removed: number[] }, origin: unknown): void => {
+        this.handleAwarenessUpdate = (
+            { added }: { added: number[]; updated: number[]; removed: number[] },
+            origin: unknown,
+        ): void => {
             if (origin instanceof WebSocket) {
                 const session = this.sessions.get(origin);
                 if (session) {
@@ -179,8 +181,7 @@ export class ProjectRoom extends DurableObject {
                 this.docMigrationFailed = true;
                 this.docVersion = outcome.from;
                 console.error(
-                    `[Room] Doc migration failed at step v${outcome.failedAt} ` +
-                        `(stored v${outcome.from}):`,
+                    `[Room] Doc migration failed at step v${outcome.failedAt} ` + `(stored v${outcome.from}):`,
                     outcome.error,
                 );
                 break;
@@ -335,12 +336,16 @@ export class ProjectRoom extends DurableObject {
     }
 
     /**
-     * Start periodic cleanup of stale awareness states
+     * Throttled inline cleanup. Called from message/connect paths instead of
+     * setInterval — a live timer would prevent the DO from hibernating, which
+     * keeps it billed continuously. With this approach the DO only does
+     * cleanup work when traffic is already arriving.
      */
-    private startAwarenessCleanup(): void {
-        this.cleanupInterval = setInterval(() => {
-            this.cleanupStaleAwareness();
-        }, AWARENESS_CLEANUP_INTERVAL_MS);
+    maybeCleanupStaleAwareness(): void {
+        const now = Date.now();
+        if (now - this.lastAwarenessCleanup < AWARENESS_CLEANUP_INTERVAL_MS) return;
+        this.lastAwarenessCleanup = now;
+        this.cleanupStaleAwareness();
     }
 
     /**
@@ -572,9 +577,7 @@ export class ProjectRoom extends DurableObject {
             const clientVersionParam = url.searchParams.get("clientVersion");
             const clientVersion = clientVersionParam !== null ? Number(clientVersionParam) : NaN;
             if (Number.isFinite(clientVersion) && clientVersion < this.docVersion) {
-                console.log(
-                    `[Room] Rejecting stale client v${clientVersion} (doc at v${this.docVersion})`,
-                );
+                console.log(`[Room] Rejecting stale client v${clientVersion} (doc at v${this.docVersion})`);
                 try {
                     server.close(4006, `Stale client: update to access v${this.docVersion}`);
                 } catch {}
@@ -611,6 +614,10 @@ export class ProjectRoom extends DurableObject {
 
             console.log(`[Room] User ${userId} connected. Total sessions: ${this.sessions.size}`);
 
+            // Opportunistic cleanup on connect — a new client arriving is the
+            // best moment to drop awareness for clients that quietly went away.
+            this.maybeCleanupStaleAwareness();
+
             // Request all existing clients to re-broadcast their awareness
             // This ensures the new client receives everyone's current state,
             // especially important after a DurableObject restart where
@@ -802,6 +809,7 @@ export class ProjectRoom extends DurableObject {
         if (fullMessage.length === 0) return;
 
         handleProtocolMessage(this, fullMessage, ws);
+        this.maybeCleanupStaleAwareness();
     }
 
     scheduleSave(): void {
diff --git a/src/lib/cloud/utils.ts b/src/lib/cloud/utils.ts
index 5de26ce2..3151f08a 100644
--- a/src/lib/cloud/utils.ts
+++ b/src/lib/cloud/utils.ts
@@ -8,7 +8,6 @@ import * as syncProtocol from "y-protocols/sync";
 import * as awarenessProtocol from "y-protocols/awareness";
 import { CURRENT_PROJECT_VERSION } from "../project/migrations/project-migrations";
 
-
 declare const window: Window & typeof globalThis;
 
 /**
@@ -28,7 +27,10 @@ type WebsocketProviderOptions = {
 
 type WSInternals = {
     _updateHandler: (update: Uint8Array, origin: unknown) => void;
-    _awarenessUpdateHandler: (changes: { added: number[]; updated: number[]; removed: number[] }, origin: unknown) => void;
+    _awarenessUpdateHandler: (
+        changes: { added: number[]; updated: number[]; removed: number[] },
+        origin: unknown,
+    ) => void;
     messageHandlers: Array<(encoder: encoding.Encoder, ...rest: unknown[]) => void>;
     ws: WebSocket | null;
     bcconnected: boolean;
@@ -63,6 +65,11 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     private lastMessageTime: number = 0; // Milliseconds (Date.now())
     private userIdleTimer: ReturnType<typeof setTimeout> | null = null;
 
+    // Cap the queue so a long disconnect can't grow it without bound. The
+    // local Yjs doc is the source of truth — on reconnect, syncStep1/2 will
+    // re-converge state regardless of what's in the queue.
+    private readonly MAX_UPDATE_QUEUE = 1000;
+
     // Throttling configuration (all in milliseconds)
     private readonly SOLO_USER_UPDATE_MS = 1000; // 1s when alone
     private readonly MULTI_USER_UPDATE_MS = 200; // 200ms with others
@@ -113,14 +120,9 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
             ...(options.params ?? {}),
             clientVersion: String(CURRENT_PROJECT_VERSION),
         };
-        super(
-            serverUrl,
-            room,
-            doc,
-            { ...options, params, connect: false } as unknown as ConstructorParameters<
-                typeof WebsocketProvider
-            >[3],
-        );
+        super(serverUrl, room, doc, { ...options, params, connect: false } as unknown as ConstructorParameters<
+            typeof WebsocketProvider
+        >[3]);
 
         this.localClientId = doc.clientID;
         this.boundResetIdleTimer = this.resetUserIdleTimer.bind(this);
@@ -143,9 +145,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
         // Handle awareness query (message type 3 = messageQueryAwareness)
         // When the server requests awareness, immediately send our current state
-        (this as unknown as WSInternals).messageHandlers[3] = (
-            encoder: encoding.Encoder,
-        ) => {
+        (this as unknown as WSInternals).messageHandlers[3] = (encoder: encoding.Encoder) => {
             this.lastMessageTime = Date.now();
             // Write awareness update to the encoder (y-websocket will send it)
             encoding.writeVarUint(encoder, 1); // messageAwareness
@@ -256,20 +256,14 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         console.log("[WS] Session was replaced by another connection. Stopping reconnection.");
         this.isSessionReplaced = true;
 
-        // Cancel any pending reconnects from our custom logic
         if (this.reconnectTimeout) {
             clearTimeout(this.reconnectTimeout);
             this.reconnectTimeout = null;
         }
 
-        // Tell y-websocket to not reconnect
         this.shouldConnect = false;
-
-        // Disconnect properly to clean up
         this.disconnect();
-
-        // Emit custom event for UI to handle
-        //this.emit("session-replaced", []);
+        this.emit("session-replaced", []);
     }
 
     /**
@@ -587,11 +581,22 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
     /**
      * Reconnect after wake (visibility restored or network online).
-     * Only acts if not connected, not idle-disconnected (that case is handled
-     * by resetUserIdleTimer on next user activity), and not session-replaced.
+     *
+     * Visibility/online return is a strong "user is back" signal — strong
+     * enough that we treat it the same as user input and reset the idle
+     * state. Previously we bailed out for idle-disconnected sessions, which
+     * left the user offline (no presence, no incoming updates) until they
+     * happened to type or move the mouse.
      */
     private handleWakeUp(source: string): void {
-        if (this.isDestroyed || this.isSessionReplaced || this.isIdleDisconnected) return;
+        if (this.isDestroyed || this.isSessionReplaced) return;
+
+        // resetUserIdleTimer clears isIdleDisconnected and triggers a
+        // reconnect when we were idle, so it covers that path.
+        const wasIdleDisconnected = this.isIdleDisconnected;
+        this.resetUserIdleTimer();
+        if (wasIdleDisconnected) return;
+
         if (!this.wsconnected) {
             console.log(`[WS] Reconnecting after wake (${source})...`);
             this.reconnectAttempts = 0;
@@ -650,6 +655,11 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     private onThrottledUpdate = (update: Uint8Array, origin: unknown): void => {
         if (origin !== this) {
             this.updateQueue.push(update);
+            // Cap queue length on long disconnects. The local doc still holds
+            // every change; sync on reconnect will replay them.
+            if (this.updateQueue.length > this.MAX_UPDATE_QUEUE) {
+                this.updateQueue.splice(0, this.updateQueue.length - this.MAX_UPDATE_QUEUE);
+            }
         }
     };
 
@@ -714,18 +724,24 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     }
 
     /**
-     * Flush all pending updates to the server and BroadcastChannel
+     * Flush all pending updates to the server and BroadcastChannel.
+     *
+     * Queues are only cleared if at least one transport (WS or BC) actually
+     * delivered the message. Otherwise the entries stay queued for the next
+     * flush — important when the WS is mid-reconnect: the previous code
+     * dropped the queue regardless, relying on Yjs re-sync to recover.
      */
     public flush(): void {
         const ws = this.ws;
-        const isWsConnected = this.wsconnected && ws && ws.readyState === 1;
+        const internals = this as unknown as WSInternals;
+        const isWsConnected = this.wsconnected && !!ws && ws.readyState === 1;
+        const isBcConnected = internals.bcconnected;
+        const canDeliver = isWsConnected || isBcConnected;
 
         // Send document updates
-        if (this.updateQueue.length > 0) {
+        if (this.updateQueue.length > 0 && canDeliver) {
             try {
                 const updates = this.updateQueue;
-                this.updateQueue = [];
-
                 const encoder = encoding.createEncoder();
                 encoding.writeVarUint(encoder, 0); // sync message type
                 for (const update of updates) {
@@ -736,21 +752,19 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
                 if (isWsConnected) {
                     ws.send(message);
                 }
-
-                if ((this as unknown as WSInternals).bcconnected) {
-                    bc.publish((this as unknown as WSInternals).bcChannel, message, this);
+                if (isBcConnected) {
+                    bc.publish(internals.bcChannel, message, this);
                 }
+                this.updateQueue = [];
             } catch (e) {
                 console.error("[WS] Failed to send document updates:", e);
             }
         }
 
         // Send awareness updates
-        if (this.awarenessQueue.size > 0) {
+        if (this.awarenessQueue.size > 0 && canDeliver) {
             try {
                 const changedClients = Array.from(this.awarenessQueue);
-                this.awarenessQueue.clear();
-
                 const encoder = encoding.createEncoder();
                 encoding.writeVarUint(encoder, 1); // awareness message type
                 encoding.writeVarUint8Array(
@@ -762,10 +776,10 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
                 if (isWsConnected) {
                     ws.send(message);
                 }
-
-                if ((this as unknown as WSInternals).bcconnected) {
-                    bc.publish((this as unknown as WSInternals).bcChannel, message, this);
+                if (isBcConnected) {
+                    bc.publish(internals.bcChannel, message, this);
                 }
+                this.awarenessQueue.clear();
             } catch (e) {
                 console.error("[WS] Failed to send awareness updates:", e);
             }
@@ -855,10 +869,7 @@ export const allowOnWebsocket = async (userId: string, projectId: string) => {
     };
 
     const secret = new TextEncoder().encode(process.env.JWT_SECRET!);
-    const token = await new SignJWT(payload)
-        .setProtectedHeader({ alg: "HS256" })
-        .setExpirationTime("1m")
-        .sign(secret);
+    const token = await new SignJWT(payload).setProtectedHeader({ alg: "HS256" }).setExpirationTime("1m").sign(secret);
     await fetch(`${process.env.NEXT_PUBLIC_CLOUD_URL}/${projectId}/allow`, {
         method: "POST",
         headers: {
@@ -876,10 +887,7 @@ export const blacklistFromWebsocket = async (userId: string, projectId: string)
     };
 
     const secret = new TextEncoder().encode(process.env.JWT_SECRET!);
-    const token = await new SignJWT(payload)
-        .setProtectedHeader({ alg: "HS256" })
-        .setExpirationTime("1m")
-        .sign(secret);
+    const token = await new SignJWT(payload).setProtectedHeader({ alg: "HS256" }).setExpirationTime("1m").sign(secret);
     await fetch(`${process.env.NEXT_PUBLIC_CLOUD_URL}/${projectId}/blacklist`, {
         method: "POST",
         headers: {
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 6f5bc809..9563db0b 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -234,7 +234,7 @@ export const useCloudSync = (
     const [connectionStatus, setConnectionStatus] = useState<ConnectionStatus>("disconnected");
     const [isCloudSynced, setIsCloudSynced] = useState(false);
     const [isLockedByServer] = useState(false);
-    const [isSessionReplaced] = useState(false);
+    const [isSessionReplaced, setIsSessionReplaced] = useState(false);
     const [isProjectUnavailable, setIsProjectUnavailable] = useState(false);
     const [isStaleClient, setIsStaleClient] = useState(false);
 
@@ -274,6 +274,7 @@ export const useCloudSync = (
     useEffect(() => {
         isMountedRef.current = true;
         setIsProjectUnavailable(false);
+        setIsSessionReplaced(false);
 
         if (!ydoc || !projectId || typeof window === "undefined") {
             setConnectionStatus("disconnected");
@@ -375,15 +376,10 @@ export const useCloudSync = (
 
                 // Status updates
                 cloudProvider.on("status", (e: { status: string }) => {
-                    if (isMountedRef.current) {
-                        setTimeout(() => {
-                            if (isMountedRef.current) {
-                                setConnectionStatus(e.status as ConnectionStatus);
-                                if (e.status === "connected" && cloudProvider.synced) {
-                                    setIsCloudSynced(true);
-                                }
-                            }
-                        }, 0);
+                    if (!isMountedRef.current) return;
+                    setConnectionStatus(e.status as ConnectionStatus);
+                    if (e.status === "connected" && cloudProvider.synced) {
+                        setIsCloudSynced(true);
                     }
                 });
 
@@ -394,6 +390,15 @@ export const useCloudSync = (
                     }
                 });
 
+                // Surface session-replaced state to the UI so the connection
+                // indicator and recovery dialogs reflect the terminal state
+                // (the provider stops reconnecting after this fires).
+                cloudProvider.on("session-replaced", () => {
+                    if (!isMountedRef.current) return;
+                    setIsSessionReplaced(true);
+                    setConnectionStatus("disconnected");
+                });
+
                 // Handle document restore
                 cloudProvider.on("document-restored", async () => {
                     if (!isMountedRef.current) return;

From 6f4ce9e0835e2ca083bdea453a0c0feeb4fea240 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Wed, 6 May 2026 16:40:17 +0200
Subject: [PATCH 45/76] fixed cloud sync issues after idle, fixed wrangler.toml
 for dev environment

---
 src/lib/cloud/room.ts       | 75 ++++++++++++++++++++++++++++++++-----
 src/lib/cloud/utils.ts      | 17 ++++++---
 src/lib/cloud/wrangler.toml | 11 ++++++
 3 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/src/lib/cloud/room.ts b/src/lib/cloud/room.ts
index e8e58307..9af67d3b 100644
--- a/src/lib/cloud/room.ts
+++ b/src/lib/cloud/room.ts
@@ -32,6 +32,7 @@ export class ProjectRoom extends DurableObject {
     private isDirty: boolean = false;
     private alarmScheduled: boolean = false;
     private projectId: string | null = null;
+    private lastAwarenessCleanup: number = 0;
 
     /** Project schema version of the in-memory doc; the gatekeeper compares
      *  client-advertised versions against this on connect. */
@@ -67,14 +68,23 @@ export class ProjectRoom extends DurableObject {
         };
 
         this.handleAwarenessUpdate = (
-            { added }: { added: number[]; updated: number[]; removed: number[] },
+            { added, updated }: { added: number[]; updated: number[]; removed: number[] },
             origin: unknown,
         ): void => {
             if (origin instanceof WebSocket) {
                 const session = this.sessions.get(origin);
                 if (session) {
-                    added.forEach((id: number) => session.clientIds.add(id));
+                    let changed = false;
+                    const toAdd = [...added, ...updated];
+                    toAdd.forEach((id: number) => {
+                        if (!session.clientIds.has(id)) {
+                            session.clientIds.add(id);
+                            changed = true;
+                        }
+                    });
                     session.lastActivity = Date.now();
+                    // Persist updated clientIds so they survive DO hibernation.
+                    if (changed) this.persistSessionAttachment(origin);
                 }
             }
         };
@@ -91,10 +101,6 @@ export class ProjectRoom extends DurableObject {
         this.userConnections = new Map();
         this.blacklist = new Set();
 
-        // Listen for document updates and handle broadcasting + persistence.
-        // This is the source of truth for ALL changes to the document.
-        this.doc.on("update", this.handleDocUpdate);
-
         // Track client IDs when awareness updates come from a WebSocket
         this.awareness.on("update", this.handleAwarenessUpdate);
 
@@ -113,7 +119,10 @@ export class ProjectRoom extends DurableObject {
             );
         `);
 
-        // Restore project state
+        // Restore project state from SQLite. Attach the update handler AFTER
+        // the restore so that re-loading persisted bytes on every DO wake-up
+        // doesn't trigger scheduleSave / markDirty (which would save identical
+        // bytes and schedule an unnecessary R2 snapshot).
         const cursor = this.ctx.storage.sql.exec("SELECT data FROM project WHERE id = 1;");
         for (const row of cursor) {
             if (row.data) {
@@ -121,6 +130,11 @@ export class ProjectRoom extends DurableObject {
             }
         }
 
+        // Listen for document updates and handle broadcasting + persistence.
+        // Attached here (after restore) so only live writes from WS clients
+        // and server-side migrations trigger the save pipeline.
+        this.doc.on("update", this.handleDocUpdate);
+
         // Restore blacklist
         const blacklistRows = this.ctx.storage.sql.exec("SELECT user_id FROM blacklist;").toArray();
         for (const row of blacklistRows) {
@@ -141,12 +155,52 @@ export class ProjectRoom extends DurableObject {
             this.observeDocVersion();
         });
 
-        // Start periodic stale awareness cleanup
-        this.startAwarenessCleanup();
+        // Restore sessions from hibernated WebSockets. Cloudflare DOs can
+        // hibernate to save memory while WebSockets stay connected; on the
+        // next message the constructor runs again with empty maps. Without
+        // this restoration, incoming messages have no session to attach to,
+        // session activity tracking breaks, webSocketClose finds nothing to
+        // clean up, and broadcastAwarenessRequest counts wrongly.
+        const hibernatedSockets = this.ctx.getWebSockets();
+        for (const ws of hibernatedSockets) {
+            const attachment = ws.deserializeAttachment() as
+                | { userId: string; clientIds: number[] }
+                | null;
+            if (!attachment) continue;
+            this.sessions.set(ws, {
+                clientIds: new Set(attachment.clientIds),
+                userId: attachment.userId,
+                lastActivity: Date.now(),
+            });
+            this.userConnections.set(attachment.userId, ws);
+        }
+        if (hibernatedSockets.length > 0) {
+            console.log(
+                `[Room] Restored ${this.sessions.size} session(s) from ${hibernatedSockets.length} hibernated WebSocket(s)`,
+            );
+            // Awareness state was lost when the DO hibernated. Ask all
+            // restored clients to re-broadcast their awareness so we can
+            // rebuild room.awareness from scratch.
+            this.broadcastAwarenessRequest();
+        }
 
         console.log("[Room] Initialized");
     }
 
+    /**
+     * Persist the current session state on the WebSocket so it survives
+     * Cloudflare DO hibernation. Called whenever clientIds or userId changes
+     * for a session.
+     */
+    private persistSessionAttachment(ws: WebSocket): void {
+        const session = this.sessions.get(ws);
+        if (!session) return;
+        ws.serializeAttachment({
+            userId: session.userId,
+            clientIds: Array.from(session.clientIds),
+        });
+    }
+
     /**
      * Apply pending project-doc migrations to the in-memory doc and persist
      * the result. Idempotent: a no-op when the doc is already at
@@ -591,6 +645,9 @@ export class ProjectRoom extends DurableObject {
                 lastActivity: Date.now(),
             });
             this.userConnections.set(userId, server);
+            // Persist immediately so a hibernation-wake before the first
+            // awareness message can still identify this socket.
+            this.persistSessionAttachment(server);
 
             // Send current document state (sync step 1) using the same encoder
             // pattern as all other outgoing messages — avoids fragile manual byte prepend.
diff --git a/src/lib/cloud/utils.ts b/src/lib/cloud/utils.ts
index 3151f08a..c691399e 100644
--- a/src/lib/cloud/utils.ts
+++ b/src/lib/cloud/utils.ts
@@ -74,7 +74,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     private readonly SOLO_USER_UPDATE_MS = 1000; // 1s when alone
     private readonly MULTI_USER_UPDATE_MS = 200; // 200ms with others
     private readonly MAX_SILENCE_DURATION_MS = 20000; // 20s max silence before ping
-    private readonly MAX_IDLE_DURATION_MS = 10 * 60 * 1000; // 10 minutes idle timeout
+    private readonly MAX_IDLE_DURATION_MS = 30 * 1000; // 30 seconds idle timeout
     private readonly FLUSH_CHECK_INTERVAL_MS = 100; // Check flush every 100ms
 
     private readonly ACTIVITY_EVENTS = ["mousedown", "mousemove", "keydown", "touchstart", "scroll"];
@@ -134,7 +134,8 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         // Store and set user info BEFORE connecting so awareness is correct from the start
         if (options.userInfo) {
             this.userInfo = options.userInfo;
-            this.awareness.setLocalStateField("user", options.userInfo);
+            const currentState = this.awareness.getLocalState() || {};
+            this.awareness.setLocalState({ ...currentState, user: options.userInfo });
         }
 
         // Replace default handlers with throttled versions
@@ -190,8 +191,10 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
             // Restore user info if it was lost during reconnection
             // y-websocket may clear awareness state internally during reconnect
-            if (this.userInfo && !this.awareness.getLocalState()?.user) {
-                this.awareness.setLocalStateField("user", this.userInfo);
+            const localState = this.awareness.getLocalState();
+            if (this.userInfo && !localState?.user) {
+                const currentState = localState || {};
+                this.awareness.setLocalState({ ...currentState, user: this.userInfo });
             }
 
             // Queue and send our awareness update
@@ -341,7 +344,8 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
      */
     public setUserInfo(userInfo: { name: string; color: string; userId?: string }): void {
         this.userInfo = userInfo;
-        this.awareness.setLocalStateField("user", userInfo);
+        const currentState = this.awareness.getLocalState() || {};
+        this.awareness.setLocalState({ ...currentState, user: userInfo });
     }
 
     /**
@@ -409,7 +413,8 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
                 // Restore user info after cleanup (it will also be restored in onStatusChange)
                 if (this.userInfo) {
-                    this.awareness.setLocalStateField("user", this.userInfo);
+                    const currentState = this.awareness.getLocalState() || {};
+                    this.awareness.setLocalState({ ...currentState, user: this.userInfo });
                 }
 
                 // Clear any pending reconnect
diff --git a/src/lib/cloud/wrangler.toml b/src/lib/cloud/wrangler.toml
index 7b1c9985..37e7f2db 100644
--- a/src/lib/cloud/wrangler.toml
+++ b/src/lib/cloud/wrangler.toml
@@ -9,6 +9,17 @@ compatibility_flags = ["nodejs_compat"]
 tag = "v1"
 new_sqlite_classes = ["ProjectRoom"]
 
+# --- Local dev (default env, wrangler dev with no --env flag) ---
+# Wrangler simulates DOs and R2 locally when bindings are declared here.
+
+[[durable_objects.bindings]]
+name = "PROJECT_ROOM"
+class_name = "ProjectRoom"
+
+[[r2_buckets]]
+binding = "SNAPSHOTS"
+bucket_name = "scriptio-snapshots-local"
+
 # --- Production ---
 [env.production]
 name = "scriptio-cloud"

From 3c6ca03cabab7ced313cadc0028548251e9ec9bf Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Thu, 7 May 2026 11:33:03 +0200
Subject: [PATCH 46/76] fixed compilation

---
 src/lib/cloud/utils.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/cloud/utils.ts b/src/lib/cloud/utils.ts
index c691399e..d9c5adc2 100644
--- a/src/lib/cloud/utils.ts
+++ b/src/lib/cloud/utils.ts
@@ -40,6 +40,7 @@ type WSInternals = {
 export class ThrottledWebsocketProvider extends WebsocketProvider {
     on(event: "document-restored", listener: () => void): this;
     on(event: "stale-client-version", listener: () => void): this;
+    on(event: "session-replaced", listener: () => void): this;
     on(event: Parameters<WebsocketProvider["on"]>[0], listener: Parameters<WebsocketProvider["on"]>[1]): this;
     on(event: string, listener: (...args: unknown[]) => void): this {
         return super.on(
@@ -50,6 +51,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
     emit(event: "document-restored", args: []): this;
     emit(event: "stale-client-version", args: []): this;
+    emit(event: "session-replaced", args: []): this;
     emit(event: Parameters<WebsocketProvider["emit"]>[0], args: Parameters<WebsocketProvider["emit"]>[1]): this;
     emit(event: string, args: unknown[]): this {
         super.emit(

From f006765808735dd5d374caba25e73ba5c4089dca Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Sat, 9 May 2026 03:44:55 +0200
Subject: [PATCH 47/76] refactoring of project state, cloud logic, configured
 viewer role limitations

---
 components/board/BoardCanvas.tsx              |  24 +-
 .../project/CollaboratorsSettings.tsx         |  25 +-
 components/editor/DocumentEditorPanel.tsx     |  40 +
 components/editor/EditorPanel.module.css      |  59 +-
 components/editor/sidebar/ContextMenu.tsx     |  95 ++-
 .../navbar/ScreenplayFormatDropdown.tsx       |   6 +-
 components/projects/ProjectItem.module.css    |  17 +-
 .../projects/ProjectPageContainer.module.css  |   4 +-
 messages/de.json                              |   4 +-
 messages/en.json                              |   4 +-
 messages/es.json                              |   4 +-
 messages/fr.json                              |   4 +-
 messages/ja.json                              |   4 +-
 messages/ko.json                              |   4 +-
 messages/pl.json                              |   4 +-
 messages/zh.json                              |   4 +-
 src/app/api/auth/magic-link/verify/route.ts   |   9 +
 .../[projectId]/members/[userId]/route.ts     |  11 +-
 src/app/api/projects/accept-invite/route.ts   |  11 +
 src/app/projects/layout.tsx                   |  48 +-
 src/context/ProjectContext.tsx                |  55 +-
 src/lib/cloud/index.ts                        |   9 +-
 src/lib/cloud/protocol.ts                     |  43 +-
 src/lib/cloud/room.ts                         |  46 +-
 src/lib/cloud/types.ts                        |   2 +
 src/lib/cloud/utils.ts                        | 120 ++-
 src/lib/import/import-project.ts              |   5 +
 .../storage-provider/local-persistence.ts     |  26 +-
 .../migrations/project-migration-runner.ts    |   6 +-
 src/lib/project/project-doc.ts                |  18 +-
 src/lib/project/project-repository.ts         |  37 +
 src/lib/project/project-state.ts              | 744 +++++++++---------
 src/lib/screenplay/characters.ts              |  45 +-
 src/lib/screenplay/locations.ts               |  15 +-
 34 files changed, 967 insertions(+), 585 deletions(-)

diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index 91bfcd93..b0dee478 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -2,7 +2,7 @@
 
 import { useContext, useRef, useState, useCallback, useEffect, useMemo } from "react";
 import { ProjectContext } from "@src/context/ProjectContext";
-import { getBoardMap, BoardCardData, BoardArrowData } from "@src/lib/project/project-state";
+import { BoardCardData, BoardArrowData } from "@src/lib/project/project-state";
 import BoardCard from "./BoardCard";
 import styles from "./BoardCanvas.module.css";
 import { v7 as uuidv7 } from "uuid";
@@ -36,9 +36,9 @@ interface ArrowContextMenuState {
 }
 
 const BoardCanvas = ({ isVisible }: { isVisible: boolean }) => {
-    const { repository, isYjsReady } = useContext(ProjectContext);
+    const { repository, isYjsReady, isReadOnly } = useContext(ProjectContext);
     const t = useTranslations("board");
-    const ydoc = repository?.getState();
+    const projectState = repository?.getState();
     const containerRef = useRef<HTMLDivElement>(null);
     const canvasRef = useRef<HTMLDivElement>(null);
 
@@ -123,9 +123,9 @@ const BoardCanvas = ({ isVisible }: { isVisible: boolean }) => {
 
     // Sync cards with Yjs
     useEffect(() => {
-        if (!ydoc || !isYjsReady) return;
+        if (!projectState || !isYjsReady) return;
 
-        const boardMap = getBoardMap(ydoc);
+        const boardMap = projectState.board();
 
         const syncCards = () => {
             const cardsData = boardMap.get("cards");
@@ -176,26 +176,26 @@ const BoardCanvas = ({ isVisible }: { isVisible: boolean }) => {
         return () => {
             boardMap.unobserve(syncCards);
         };
-    }, [ydoc, isYjsReady, centerCameraOnCards]);
+    }, [projectState, isYjsReady, centerCameraOnCards]);
 
     // Save cards to Yjs
     const saveCards = useCallback(
         (newCards: BoardCardData[]) => {
-            if (!ydoc || !isYjsReady) return;
-            const boardMap = getBoardMap(ydoc);
+            if (!projectState || !isYjsReady || isReadOnly) return;
+            const boardMap = projectState.board();
             boardMap.set("cards", JSON.stringify(newCards));
         },
-        [ydoc, isYjsReady],
+        [projectState, isYjsReady, isReadOnly],
     );
 
     // Save arrows to Yjs
     const saveArrows = useCallback(
         (newArrows: BoardArrowData[]) => {
-            if (!ydoc || !isYjsReady) return;
-            const boardMap = getBoardMap(ydoc);
+            if (!projectState || !isYjsReady || isReadOnly) return;
+            const boardMap = projectState.board();
             boardMap.set("arrows", JSON.stringify(newArrows));
         },
-        [ydoc, isYjsReady],
+        [projectState, isYjsReady, isReadOnly],
     );
 
     // Handle keyboard events for snapping
diff --git a/components/dashboard/project/CollaboratorsSettings.tsx b/components/dashboard/project/CollaboratorsSettings.tsx
index 286bf601..05f4b053 100644
--- a/components/dashboard/project/CollaboratorsSettings.tsx
+++ b/components/dashboard/project/CollaboratorsSettings.tsx
@@ -15,9 +15,7 @@ import styles from "./CollaboratorsSettings.module.css";
 import { deleteInvite, inviteCollaborator, kickCollaborator, updateMemberRole } from "@src/lib/utils/requests";
 
 import * as Roles from "@src/lib/utils/roles";
-import { ApiResponse } from "@src/lib/utils/api-utils";
 import { DashboardContext } from "@src/context/DashboardContext";
-import { redirect } from "next/navigation";
 import Link from "next/link";
 
 const MAX_COLLABORATORS = 5;
@@ -169,18 +167,17 @@ const MemberSlot = ({ data, membership, mutateCollaborators, user }: MemberSlotP
 
     const handleKick = async () => {
         const res = await kickCollaborator(membership.project.id, data.user.id);
-
-        if (res.ok) {
-            if (res.status !== 204) {
-                // If user left the project by himself, redirect him to home
-                const json = (await res.json()) as ApiResponse<{ redirectUrl: string }>;
-                if (json.data && json.data.redirectUrl) {
-                    closeDashboard();
-                    redirect(json.data.redirectUrl);
-                }
-            } else {
-                mutateCollaborators();
-            }
+        if (!res.ok) return;
+
+        if (isSelf) {
+            // Self-leave: the server has already deleted the membership and
+            // blacklisted the user on the WS, so a 4003 close is on its way.
+            // The cloud-sync hook surfaces ProjectUnavailableDialog from there,
+            // letting the leaver decide whether to keep a local copy or discard.
+            // We just close the dashboard so the dialog isn't covered.
+            closeDashboard();
+        } else {
+            mutateCollaborators();
         }
     };
 
diff --git a/components/editor/DocumentEditorPanel.tsx b/components/editor/DocumentEditorPanel.tsx
index d4d51123..cf5dada4 100644
--- a/components/editor/DocumentEditorPanel.tsx
+++ b/components/editor/DocumentEditorPanel.tsx
@@ -6,6 +6,8 @@ import { EditorContent } from "@tiptap/react";
 
 import { applyElement, insertElement, SCREENPLAY_FORMATS } from "@src/lib/screenplay/editor";
 import { ScreenplayElement } from "@src/lib/utils/enums";
+import { Eye } from "lucide-react";
+import { useTranslations } from "next-intl";
 import { DUAL_DIALOGUE_COLUMN } from "@src/lib/screenplay/nodes/dual-dialogue-column-node";
 import { DEFAULT_ELEMENT_MARGINS, DEFAULT_ELEMENT_STYLES } from "@src/lib/project/project-state";
 import { join } from "@src/lib/utils/misc";
@@ -59,6 +61,7 @@ const DocumentEditorPanel = ({
     const projectCtx = useContext(ProjectContext);
     const {
         isYjsReady,
+        isReadOnly,
         selectedElement,
         setSelectedElement,
         setSelectedStyles,
@@ -124,6 +127,17 @@ const DocumentEditorPanel = ({
         };
     }, [editor, onEditorCreated]);
 
+    // Read-only enforcement for VIEWER role.
+    //
+    // The server already drops doc writes from viewers (see protocol.ts), but
+    // disabling tiptap locally avoids a confusing "I typed but nothing
+    // happened" experience: keystrokes are blocked at the editor level and
+    // collaboration carets/awareness still render normally.
+    useEffect(() => {
+        if (!editor || editor.isDestroyed) return;
+        editor.setEditable(!isReadOnly);
+    }, [editor, isReadOnly]);
+
     // Ready state
     useEffect(() => {
         if (editor && isYjsReady) {
@@ -514,6 +528,15 @@ const DocumentEditorPanel = ({
     const focusType =
         focusedTypeOverride ?? (config.type === "screenplay" ? "screenplay" : "title");
 
+    const pageSize = SCREENPLAY_FORMATS[pageFormat as keyof typeof SCREENPLAY_FORMATS];
+    const wrapperStyle = pageSize
+        ? ({
+              "--page-width": `${pageSize.pageWidth}px`,
+              "--page-height": `${pageSize.pageHeight}px`,
+          } as React.CSSProperties)
+        : undefined;
+
+    const t = useTranslations("navbar");
     const isLocalAccess = isTauri() || isLocalOnly;
     if (!isLocalAccess && (!membership || isLoading)) return <Loading />;
 
@@ -524,13 +547,30 @@ const DocumentEditorPanel = ({
                 onScroll={onScroll}
                 onMouseDown={handleContainerMouseDown}
                 onFocus={() => setFocusedEditorType(focusType)}
+                onPasteCapture={
+                    isReadOnly
+                        ? (e) => {
+                              e.preventDefault();
+                              e.stopPropagation();
+                          }
+                        : undefined
+                }
             >
                 <div
                     className={`${styles.editor_wrapper} ${isEndlessScroll ? styles.endless_scroll : ""}`}
+                    style={wrapperStyle}
                 >
                     <div
                         className={join(styles.editor_shadow, isScrolled ? styles.show_shadow : "")}
                     />
+                    {isReadOnly && (
+                        <div className={styles.viewOnlyBannerWrapper}>
+                            <div className={styles.viewOnlyBanner} title={t("viewOnlyHint")}>
+                                <Eye size={14} />
+                                <span>{t("viewOnly")}</span>
+                            </div>
+                        </div>
+                    )}
                     <div onContextMenu={onEditorContextMenu}>
                         <EditorContent editor={editor} spellCheck={false} />
                     </div>
diff --git a/components/editor/EditorPanel.module.css b/components/editor/EditorPanel.module.css
index eeade120..9d5221f8 100644
--- a/components/editor/EditorPanel.module.css
+++ b/components/editor/EditorPanel.module.css
@@ -24,6 +24,22 @@
     contain: layout;
 }
 
+/* Default page-shaped sizing for the ProseMirror element so it is correctly
+ * dimensioned from its very first paint. The pagination extension's onCreate
+ * fires asynchronously (Tiptap emits 'create' via setTimeout(0)), which would
+ * otherwise leave a gap where .ProseMirror exists without the .pagination
+ * class — stretching to the full wrapper width before snapping back to the
+ * page width. The wrapper sets --page-width / --page-height inline based on
+ * pageFormat, and the !important rule from the pagination extension's
+ * stylesheet still wins once the class is added (with the same value, so no
+ * visible change). */
+.editor_wrapper :global(.ProseMirror) {
+    width: var(--page-width);
+    min-height: var(--page-height);
+    margin: 0 auto;
+    box-sizing: border-box;
+}
+
 .editor_shadow {
     position: sticky;
     top: 0;
@@ -40,7 +56,48 @@
     transition: opacity 0.7s ease;
     background: linear-gradient(to bottom, var(--editor-shadow) 0%, transparent 100%);
     mask-image: linear-gradient(to right, transparent 0%, black 20%, black 80%, transparent 100%);
-    -webkit-mask-image: linear-gradient(to right, transparent 0%, black 20%, black 80%, transparent 100%);
+    -webkit-mask-image: linear-gradient(
+        to right,
+        transparent 0%,
+        black 20%,
+        black 80%,
+        transparent 100%
+    );
+}
+
+/* Zero-height sticky container so the banner overlays the editor without
+ * shifting any content — overflow: visible lets the banner render beyond it. */
+.viewOnlyBannerWrapper {
+    position: sticky;
+    top: 0;
+    z-index: 51;
+    height: 0;
+    overflow: visible;
+    pointer-events: none;
+    width: 100%;
+}
+
+/* Read-only banner shown to VIEWER role at the top of the editor scroll area. */
+.viewOnlyBanner {
+    pointer-events: auto;
+    width: fit-content;
+    margin: 0 auto;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 14px;
+    border-radius: 0 0 12px 12px;
+
+    background-color: var(--main-bg);
+    border-top: none;
+    color: var(--secondary-text);
+    font-size: 0.75rem;
+    font-weight: 500;
+    user-select: none;
+    cursor: default;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 }
 
 .show_shadow {
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index 86b8a744..36a21ac2 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -107,7 +107,7 @@ export type SceneContextProps = {
 const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
     const t = useTranslations("contextMenu");
     const userCtx = useContext(UserContext);
-    const { editor } = useContext(ProjectContext);
+    const { editor, isReadOnly } = useContext(ProjectContext);
     const scene: Scene = props.scene;
 
     return (
@@ -121,12 +121,16 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
                 text={t("selectInEditor")}
                 action={() => selectTextInEditor(editor!, scene.position, scene.nextPosition)}
             />
-            <div className={context.menu_separator} />
-            <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editScenePopup(scene, userCtx)} />
-            <ContextMenuItem
-                text={t("cut")}
-                action={() => cutText(editor!, scene.position, scene.nextPosition)}
-            />
+            {!isReadOnly && (
+                <>
+                    <div className={context.menu_separator} />
+                    <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editScenePopup(scene, userCtx)} />
+                    <ContextMenuItem
+                        text={t("cut")}
+                        action={() => cutText(editor!, scene.position, scene.nextPosition)}
+                    />
+                </>
+            )}
         </>
     );
 };
@@ -148,18 +152,22 @@ const CharacterItemMenu = ({ props }: SubMenuProps<CharacterContextProps>) => {
     const t = useTranslations("contextMenu");
     const userCtx = useContext(UserContext);
     const projectCtx = useContext(ProjectContext);
-    const { toggleCharacterHighlight } = projectCtx;
+    const { toggleCharacterHighlight, isReadOnly } = projectCtx;
     const character: CharacterData = props.character;
 
     return (
         <>
-            <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editCharacterPopup(character, userCtx)} />
-            <ContextMenuItem text={t("remove")} action={() => deleteCharacter(character.name, projectCtx)} />
-            <ContextMenuItem
-                text={t("paste")}
-                action={() => pasteText(projectCtx.editor!, character.name)}
-            />
-            <div className={context.menu_separator} />
+            {!isReadOnly && (
+                <>
+                    <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editCharacterPopup(character, userCtx)} />
+                    <ContextMenuItem text={t("remove")} action={() => deleteCharacter(character.name, projectCtx)} />
+                    <ContextMenuItem
+                        text={t("paste")}
+                        action={() => pasteText(projectCtx.editor!, character.name)}
+                    />
+                    <div className={context.menu_separator} />
+                </>
+            )}
             <ContextMenuItem
                 text={t("highlight")}
                 icon={Highlighter}
@@ -186,8 +194,11 @@ export type LocationContextProps = {
 const LocationItemMenu = ({ props }: SubMenuProps<LocationContextProps>) => {
     const t = useTranslations("contextMenu");
     const projectCtx = useContext(ProjectContext);
+    const { isReadOnly } = projectCtx;
     const location: LocationData = props.location;
 
+    if (isReadOnly) return null;
+
     return (
         <>
             <ContextMenuItem icon={Trash2} text={t("remove")} action={() => deleteLocation(location.name, projectCtx)} />
@@ -212,7 +223,7 @@ export type EditorSelectionContextProps = {
 const EditorSelectionMenu = ({ props }: SubMenuProps<EditorSelectionContextProps>) => {
     const t = useTranslations("contextMenu");
     const projectCtx = useContext(ProjectContext);
-    const { editor } = projectCtx;
+    const { editor, isReadOnly } = projectCtx;
     const { updateContextMenu } = useContext(UserContext);
     const { from, to, onAddComment } = props;
     const hasSelection = from !== to;
@@ -225,7 +236,7 @@ const EditorSelectionMenu = ({ props }: SubMenuProps<EditorSelectionContextProps
     };
 
     const handleCut = async () => {
-        if (!editor) return;
+        if (!editor || isReadOnly) return;
         const text = editor.state.doc.textBetween(from, to, "\n");
         await navigator.clipboard.writeText(text);
         editor.commands.deleteRange({ from, to });
@@ -233,7 +244,7 @@ const EditorSelectionMenu = ({ props }: SubMenuProps<EditorSelectionContextProps
     };
 
     const handlePaste = async () => {
-        if (!editor) return;
+        if (!editor || isReadOnly) return;
         editor.commands.insertContent(await readClipboardText());
         updateContextMenu(undefined);
     };
@@ -246,12 +257,16 @@ const EditorSelectionMenu = ({ props }: SubMenuProps<EditorSelectionContextProps
     return (
         <>
             {hasSelection && <ContextMenuItem text={t("copy")} icon={Copy} action={handleCopy} />}
-            {hasSelection && <ContextMenuItem text={t("cut")} action={handleCut} />}
-            <ContextMenuItem text={t("paste")} icon={hasSelection ? undefined : ClipboardPaste} action={handlePaste} />
+            {hasSelection && !isReadOnly && <ContextMenuItem text={t("cut")} action={handleCut} />}
+            {!isReadOnly && (
+                <ContextMenuItem text={t("paste")} icon={hasSelection ? undefined : ClipboardPaste} action={handlePaste} />
+            )}
             {hasSelection && (
                 <>
                     <div className={context.menu_separator} />
-                    <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
+                    {!isReadOnly && (
+                        <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
+                    )}
                     <ContextMenuItem text={t("searchOnWeb")} action={handleSearchOnWeb} />
                 </>
             )}
@@ -345,10 +360,12 @@ const SpellcheckMenu = ({ props }: SubMenuProps<SpellcheckContextProps>) => {
 
 const DualDialogueMenu = ({ props }: SubMenuProps<{ pos: number }>) => {
     const t = useTranslations("contextMenu");
-    const { editor } = useContext(ProjectContext);
+    const { editor, isReadOnly } = useContext(ProjectContext);
     const { updateContextMenu } = useContext(UserContext);
     const { pos } = props;
 
+    if (isReadOnly) return null;
+
     return (
         <ContextMenuItem
             text={t("makeDualDialogue")}
@@ -367,12 +384,12 @@ const DualDialogueMenu = ({ props }: SubMenuProps<{ pos: number }>) => {
 
 const ShelveNodeMenu = ({ props }: SubMenuProps<{ pos: number; nodeClass: string }>) => {
     const t = useTranslations("contextMenu");
-    const { editor, repository } = useContext(ProjectContext);
+    const { editor, repository, isReadOnly } = useContext(ProjectContext);
     const { updateContextMenu } = useContext(UserContext);
     const { pos, nodeClass } = props;
 
     const handleShelve = () => {
-        if (!editor || !repository) return;
+        if (!editor || !repository || isReadOnly) return;
         const candidate = extractShelveCandidate(editor, pos);
         if (candidate) {
             repository.shelveNode(candidate.nodeId, candidate.title, candidate.type, candidate.content);
@@ -406,6 +423,8 @@ const ShelveNodeMenu = ({ props }: SubMenuProps<{ pos: number; nodeClass: string
               ? t("shelveDialogue")
               : t("shelveAction");
 
+    if (isReadOnly) return null;
+
     return (
         <>
             <ContextMenuItem text={shelveLabel} icon={Archive} action={handleShelve} />
@@ -437,7 +456,7 @@ export type EditorContextMenuProps = {
 
 const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
     const t = useTranslations("contextMenu");
-    const { editor, repository } = useContext(ProjectContext);
+    const { editor, repository, isReadOnly } = useContext(ProjectContext);
     const { worker } = useSpellcheck();
     const { updateContextMenu } = useContext(UserContext);
     const { from, to, onAddComment, spellError, nodePos, nodeClass } = props;
@@ -466,20 +485,20 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
     };
 
     const handleCut = async () => {
-        if (!editor) return;
+        if (!editor || isReadOnly) return;
         await navigator.clipboard.writeText(editor.state.doc.textBetween(from, to, "\n"));
         editor.commands.deleteRange({ from, to });
         updateContextMenu(undefined);
     };
 
     const handlePaste = async () => {
-        if (!editor) return;
+        if (!editor || isReadOnly) return;
         editor.commands.insertContent(await readClipboardText());
         updateContextMenu(undefined);
     };
 
     const handleSpellReplace = (suggestion: string) => {
-        if (!editor || !spellError) return;
+        if (!editor || !spellError || isReadOnly) return;
         const tr = editor.state.tr.replaceWith(spellError.from, spellError.to, editor.state.schema.text(suggestion));
         editor.view.dispatch(tr);
         updateContextMenu(undefined);
@@ -503,7 +522,7 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
     };
 
     const handleShelve = () => {
-        if (!editor || !repository || nodePos === undefined) return;
+        if (!editor || !repository || nodePos === undefined || isReadOnly) return;
         const candidate = extractShelveCandidate(editor, nodePos);
         if (candidate) {
             repository.shelveNode(candidate.nodeId, candidate.title, candidate.type, candidate.content);
@@ -554,27 +573,33 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
                             <p className="unselectable">{s}</p>
                         </div>
                     ))}
-                    <ContextMenuItem text={t("addToDictionary")} icon={BookPlus} action={handleAddToDictionary} />
+                    {!isReadOnly && (
+                        <ContextMenuItem text={t("addToDictionary")} icon={BookPlus} action={handleAddToDictionary} />
+                    )}
                     <div className={context.menu_separator} />
                 </>
             )}
 
-            {/* Clipboard — always visible */}
-            <ContextMenuItem text={t("cut")} icon={Scissors} action={handleCut} disabled={!hasSelection} />
+            {/* Clipboard — copy is always visible; cut/paste hidden for viewers */}
+            {!isReadOnly && (
+                <ContextMenuItem text={t("cut")} icon={Scissors} action={handleCut} disabled={!hasSelection} />
+            )}
             <ContextMenuItem text={t("copy")} action={handleCopy} disabled={!hasSelection} />
-            <ContextMenuItem text={t("paste")} action={handlePaste} />
+            {!isReadOnly && <ContextMenuItem text={t("paste")} action={handlePaste} />}
 
             {/* Selection actions — only when there's a selection and no spellcheck error */}
             {hasSelection && !spellError && (
                 <>
                     <div className={context.menu_separator} />
-                    <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
+                    {!isReadOnly && (
+                        <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
+                    )}
                     <ContextMenuItem text={t("searchOnWeb")} action={handleSearchOnWeb} />
                 </>
             )}
 
             {/* Node actions — shelve and optional dual dialogue */}
-            {isShelvable && (
+            {isShelvable && !isReadOnly && (
                 <>
                     <div className={context.menu_separator} />
                     <ContextMenuItem
diff --git a/components/navbar/ScreenplayFormatDropdown.tsx b/components/navbar/ScreenplayFormatDropdown.tsx
index ddd6f2b5..8342544b 100644
--- a/components/navbar/ScreenplayFormatDropdown.tsx
+++ b/components/navbar/ScreenplayFormatDropdown.tsx
@@ -63,6 +63,7 @@ const ScreenplayFormatDropdown = () => {
         setSelectedTitlePageElement,
         focusedEditorType,
         draftEditor,
+        isReadOnly,
     } = useContext(ProjectContext);
 
     const [isOpen, setIsOpen] = useState(false);
@@ -89,6 +90,7 @@ const ScreenplayFormatDropdown = () => {
 
     const handleElementSelect = useCallback(
         (element: ScreenplayElement | TitlePageElement) => {
+            if (isReadOnly) return;
             if (isTitleContext) {
                 setSelectedTitlePageElement(element as TitlePageElement);
                 if (titlePageEditor) applyTitlePageElement(titlePageEditor, element as TitlePageElement);
@@ -103,6 +105,7 @@ const ScreenplayFormatDropdown = () => {
 
     const toggleStyle = useCallback(
         (style: Style) => {
+            if (isReadOnly) return;
             setSelectedStyles((prev) => (prev ^ style) as Style);
             if (isTitleContext && titlePageEditor) {
                 applyTitlePageMarkToggle(titlePageEditor, style);
@@ -137,6 +140,7 @@ const ScreenplayFormatDropdown = () => {
 
     const setAlignment = useCallback(
         (align: string) => {
+            if (isReadOnly) return;
             setSelectedAlign(align);
             if (isTitleContext) {
                 if (!titlePageEditor) return;
@@ -208,7 +212,7 @@ const ScreenplayFormatDropdown = () => {
 
             {/* Element dropdown */}
             <div className={styles.dropdown_wrapper}>
-                <button className={styles.dropdown_trigger} onClick={() => setIsOpen(!isOpen)}>
+                <button className={styles.dropdown_trigger} onClick={() => !isReadOnly && setIsOpen(!isOpen)}>
                     <span className={styles.selected_label}>
                         {activeLabels[activeSelected as keyof typeof activeLabels]}
                     </span>
diff --git a/components/projects/ProjectItem.module.css b/components/projects/ProjectItem.module.css
index 8eec44fd..b3da288a 100644
--- a/components/projects/ProjectItem.module.css
+++ b/components/projects/ProjectItem.module.css
@@ -12,21 +12,15 @@
     align-items: center;
     gap: 16px;
 
-    border-radius: 18px;
-    border: none;
+    border-radius: 24px;
+    border: 2px solid var(--separator);
     background-color: var(--project-item-bg);
-    box-shadow: var(--panel-shadow);
 
-    transition: background-color 0.15s ease, transform 0.15s ease;
-}
-
-.container:hover {
-    background-color: var(--secondary-hover);
-    transform: translateY(-1px);
+    transition: transform 0.15s ease;
 }
 
 .container:active {
-    transform: scale(0.99);
+    transform: scale(0.98);
     transition: transform 0.07s;
 }
 
@@ -53,8 +47,7 @@
     font-family: var(--font-inter), sans-serif;
     font-style: italic;
     font-weight: 400;
-    font-size: 1.3rem;
-    text-align: left;
+    font-size: 1.4rem;
 
     white-space: nowrap;
     overflow: hidden;
diff --git a/components/projects/ProjectPageContainer.module.css b/components/projects/ProjectPageContainer.module.css
index 55239e01..fa2265f3 100644
--- a/components/projects/ProjectPageContainer.module.css
+++ b/components/projects/ProjectPageContainer.module.css
@@ -39,7 +39,7 @@
 }
 
 .create_btn {
-    font-weight: 500;
+    font-weight: 600;
     padding-inline: 40px !important;
     border-width: 3px;
 }
@@ -50,7 +50,7 @@
     align-items: center;
     white-space: nowrap;
 
-    font-weight: 500;
+    font-weight: 600;
     padding-inline: 40px !important;
     border-width: 3px;
     background: none !important;
diff --git a/messages/de.json b/messages/de.json
index d1e89246..2af8fbfd 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -14,7 +14,9 @@
     "focusMode": "Fokus-Modus",
     "splitPanel": "Panel teilen",
     "unsplitPanel": "Panel schließen",
-    "draftEditor": "Entwurfseditor"
+    "draftEditor": "Entwurfseditor",
+    "viewOnly": "Nur ansehen",
+    "viewOnlyHint": "Sie haben Lesezugriff. Die Bearbeitung ist deaktiviert."
   },
   "common": {
     "save": "Änderungen speichern",
diff --git a/messages/en.json b/messages/en.json
index ef72b2b6..f6b085c3 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -13,7 +13,9 @@
     "focusMode": "Focus Mode",
     "splitPanel": "Split Panel",
     "unsplitPanel": "Unsplit Panel",
-    "draftEditor": "Draft Editor"
+    "draftEditor": "Draft Editor",
+    "viewOnly": "View only",
+    "viewOnlyHint": "You have viewer access. Editing is disabled."
   },
   "common": {
     "save": "Save",
diff --git a/messages/es.json b/messages/es.json
index c1bf0dbe..d4bb3972 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -13,7 +13,9 @@
         "focusMode": "Modo concentración",
         "splitPanel": "Dividir panel",
         "unsplitPanel": "Unir panel",
-        "draftEditor": "Editor de borrador"
+        "draftEditor": "Editor de borrador",
+        "viewOnly": "Solo lectura",
+        "viewOnlyHint": "Tienes acceso de solo visualización. La edición está desactivada."
     },
     "common": {
         "save": "Guardar cambios",
diff --git a/messages/fr.json b/messages/fr.json
index c34f72f0..84060b90 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -14,7 +14,9 @@
     "focusMode": "Mode concentration",
     "splitPanel": "Diviser le panneau",
     "unsplitPanel": "Fermer le panneau divisé",
-    "draftEditor": "Éditeur de brouillon"
+    "draftEditor": "Éditeur de brouillon",
+    "viewOnly": "Vue seule",
+    "viewOnlyHint": "Vous avez un accès visiteur. La modification est désactivée."
   },
   "common": {
     "save": "Enregistrer",
diff --git a/messages/ja.json b/messages/ja.json
index 53d015ec..c41ec2f3 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -13,7 +13,9 @@
     "focusMode": "集中モード",
     "splitPanel": "パネルを分割",
     "unsplitPanel": "パネルを閉じる",
-    "draftEditor": "下書きエディター"
+    "draftEditor": "下書きエディター",
+    "viewOnly": "閲覧のみ",
+    "viewOnlyHint": "閲覧者アクセスです。編集は無効になっています。"
   },
   "common": {
     "save": "変更を保存",
diff --git a/messages/ko.json b/messages/ko.json
index e9b982cd..c34bd0ce 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -13,7 +13,9 @@
     "focusMode": "집중 모드",
     "splitPanel": "패널 분할",
     "unsplitPanel": "패널 통합",
-    "draftEditor": "초안 편집기"
+    "draftEditor": "초안 편집기",
+    "viewOnly": "보기 전용",
+    "viewOnlyHint": "뷰어 권한이 있습니다. 편집이 비활성화되었습니다."
   },
   "common": {
     "save": "변경사항 저장",
diff --git a/messages/pl.json b/messages/pl.json
index 40a57f94..f9b9cc3d 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -13,7 +13,9 @@
     "focusMode": "Tryb skupienia",
     "splitPanel": "Podziel panel",
     "unsplitPanel": "Zamknij panel",
-    "draftEditor": "Edytor szkiców"
+    "draftEditor": "Edytor szkiców",
+    "viewOnly": "Tylko podgląd",
+    "viewOnlyHint": "Masz dostęp gościa. Edytowanie jest wyłączone."
   },
   "common": {
     "save": "Zapisz zmiany",
diff --git a/messages/zh.json b/messages/zh.json
index d988de9b..d130c2cd 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -13,7 +13,9 @@
     "focusMode": "聚焦模式",
     "splitPanel": "分割面板",
     "unsplitPanel": "合并面板",
-    "draftEditor": "草稿编辑器"
+    "draftEditor": "草稿编辑器",
+    "viewOnly": "仅查看",
+    "viewOnlyHint": "您拥有访客权限，编辑功能已禁用。"
   },
   "common": {
     "save": "保存",
diff --git a/src/app/api/auth/magic-link/verify/route.ts b/src/app/api/auth/magic-link/verify/route.ts
index 10e11a30..92a67c98 100644
--- a/src/app/api/auth/magic-link/verify/route.ts
+++ b/src/app/api/auth/magic-link/verify/route.ts
@@ -8,6 +8,7 @@ import * as UserService from "@src/server/service/user-service";
 import * as ProjectService from "@src/server/service/project-service";
 import * as MagicLinkService from "@src/server/service/magic-link-service";
 import * as Misc from "@src/lib/utils/misc";
+import * as CollabUtils from "@src/lib/cloud/utils";
 import { putBridgeToken } from "@src/lib/desktop-bridge";
 import {
     encodeDesktopBearer,
@@ -65,6 +66,14 @@ async function verifyMagicLinkRoute(req: NextRequest) {
             ) {
                 await ProjectService.upsertMember(invite.projectId, user.id);
                 await ProjectService.deleteInviteFromToken(record.inviteToken);
+                // Clear any leftover DO blacklist entry from a prior kick so
+                // the freshly re-invited user can actually open a WS to the
+                // project room (otherwise the upgrade returns 403 forever).
+                try {
+                    await CollabUtils.allowOnWebsocket(user.id, invite.projectId);
+                } catch (err) {
+                    console.error("[magic-link] Failed to clear blacklist:", err);
+                }
             }
         } catch (err) {
             console.error("[magic-link] Invite acceptance failed:", err);
diff --git a/src/app/api/projects/[projectId]/members/[userId]/route.ts b/src/app/api/projects/[projectId]/members/[userId]/route.ts
index 3ad9c65d..e186658f 100644
--- a/src/app/api/projects/[projectId]/members/[userId]/route.ts
+++ b/src/app/api/projects/[projectId]/members/[userId]/route.ts
@@ -80,6 +80,10 @@ async function updateProjectMemberRole(req: NextRequest, { routeParams, user }:
     }
 
     const updated = await ProjectService.upsertMember(projectId, userToUpdateId, newRole);
+    // Push the new role to any active WS so the server-side write gate and the
+    // client UI flip to the new permissions immediately. Without this the
+    // downgraded user keeps editing until they refresh — a security hole.
+    await CollabUtils.notifyRoleChange(userToUpdateId, projectId, newRole);
     return Success(updated);
 }
 
@@ -99,7 +103,12 @@ async function deleteProjectMember(req: NextRequest, { routeParams, user }: Auth
     if (isSelf) {
         if (member.role !== ProjectRole.OWNER) {
             await ProjectService.deleteProjectMember(projectId, userToDelete);
-            return Success({ redirectUrl: "/projects" });
+            // Blacklist the leaver too so any open WS gets a 4003 close,
+            // which surfaces ProjectUnavailableDialog on the leaver's tab
+            // (consistent with the kick flow). Without this the user would
+            // stay connected with stale credentials until the JWT expires.
+            await CollabUtils.blacklistFromWebsocket(userToDelete, projectId);
+            return SuccessNoContent();
         } else {
             throw new ForbiddenError("Owner cannot leave project");
         }
diff --git a/src/app/api/projects/accept-invite/route.ts b/src/app/api/projects/accept-invite/route.ts
index 055be2a0..b9a210b5 100644
--- a/src/app/api/projects/accept-invite/route.ts
+++ b/src/app/api/projects/accept-invite/route.ts
@@ -4,6 +4,7 @@ import { InternalServerError, NotFoundError, validate } from "@src/lib/utils/api
 import * as ProjectService from "@src/server/service/project-service";
 import * as UserService from "@src/server/service/user-service";
 import * as Misc from "@src/lib/utils/misc";
+import * as CollabUtils from "@src/lib/cloud/utils";
 
 import z from "zod";
 import { NextRequest } from "next/server";
@@ -38,6 +39,16 @@ async function acceptProjectInvite(req: NextRequest, { searchParams }: ApiContex
         await ProjectService.upsertMember(invite.projectId, user.id);
         await ProjectService.deleteInviteFromToken(token);
 
+        // The DO keeps a blacklist of kicked userIds (persisted in SQLite).
+        // If this user was previously kicked from this project, the entry is
+        // still there and would reject their next WS upgrade with 403. Clear
+        // it now so the re-invite actually grants access.
+        try {
+            await CollabUtils.allowOnWebsocket(user.id, invite.projectId);
+        } catch (err) {
+            console.error("[accept-invite] Failed to clear blacklist:", err);
+        }
+
         // If user is not logged in, send them to the home page with the email pre-filled
         // so they can request a magic link.
         const cookieUser = await getCookieUser();
diff --git a/src/app/projects/layout.tsx b/src/app/projects/layout.tsx
index 71531ab1..bd139936 100644
--- a/src/app/projects/layout.tsx
+++ b/src/app/projects/layout.tsx
@@ -50,50 +50,32 @@ interface ProjectLayoutInnerProps {
 }
 
 const ProjectLayoutInner = ({ children }: ProjectLayoutInnerProps) => {
-    const { isYjsReady, isProjectUnavailable, isStaleClient, migrationOutcome } = useProjectReady();
+    const { status } = useProjectReady();
     const { membership, isLoading: isMembershipLoading, isLocalOnly: isBrowserLocalOnly } = useProjectMembership();
 
-    // Desktop (Tauri) and browser local-only projects skip the cloud membership requirement
-    const isDesktop = isTauri();
-    const isLocalAccess = isDesktop || isBrowserLocalOnly;
+    // Desktop (Tauri) and browser local-only projects skip the cloud membership requirement.
+    const isLocalAccess = isTauri() || isBrowserLocalOnly;
 
-    // Server rejected this client as stale — its bundle predates the doc's
-    // schema version. Treat as a future-version outcome so the user gets a
-    // clear "update required" message.
-    if (isStaleClient) {
-        return <ProjectMigrationErrorDialog outcome={{ kind: "stale-client" }} />;
+    // Surface terminal error states first so the user always gets a clear message,
+    // before any redirect or loading gating runs.
+    if (status.kind === "needs-update") {
+        return <ProjectMigrationErrorDialog outcome={status.outcome} />;
     }
-
-    // Migration blocked the project from loading: show a dedicated error dialog
-    // before any other gating logic, so the user always gets a clear message.
-    if (
-        migrationOutcome &&
-        (migrationOutcome.kind === "future-version" || migrationOutcome.kind === "failed")
-    ) {
-        return <ProjectMigrationErrorDialog outcome={migrationOutcome} />;
-    }
-
-    // Wait for membership to resolve for potential cloud projects
-    if (!isLocalAccess && isMembershipLoading) {
-        return <Loading />;
+    // The cloud copy is gone (project deleted, or the user was removed). Checked
+    // before the redirect so a kicked user with a stale (undefined) membership
+    // lands on the dialog instead of being bounced to /projects mid-loop.
+    if (status.kind === "unavailable") {
+        return <ProjectUnavailableDialog />;
     }
-
-    // Always wait for local data to be ready
-    if (!isYjsReady) {
+    // Wait for local data and (for cloud projects) for membership to resolve.
+    if (status.kind === "loading" || (!isLocalAccess && isMembershipLoading)) {
         return <Loading />;
     }
-
-    // On web, redirect if no cloud membership and not a local project
+    // On web, redirect if no cloud membership and not a local project.
     if (!isLocalAccess && !membership) {
         redirect("/projects");
     }
 
-    // The cloud copy is gone (project deleted, or the user was removed). Offer the
-    // user a choice between keeping a local copy or discarding it — same on web and desktop.
-    if (isProjectUnavailable) {
-        return <ProjectUnavailableDialog />;
-    }
-
     return (
         <ViewProvider>
             <div style={{ display: "flex", flexDirection: "column", height: "100vh", overflow: "hidden" }}>
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index d9881b44..74e4c638 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -14,6 +14,7 @@ import { CharacterMap, mergeCharactersData } from "@src/lib/screenplay/character
 import { LocationMap, mergeLocationsData } from "@src/lib/screenplay/locations";
 import { mergeScenesData, PersistentSceneMap, Scene } from "@src/lib/screenplay/scenes";
 import { ProjectMembershipPayload } from "@src/server/repository/project-repository";
+import { ProjectRole } from "@src/generated/client/browser";
 import { useUser } from "@src/lib/utils/hooks";
 import {
     CollaboratorInfo,
@@ -24,8 +25,8 @@ import {
     PageMargin,
     DEFAULT_PAGE_MARGINS,
     ShelfEntry,
+    ProjectStatus,
 } from "@src/lib/project/project-state";
-import type { ProjectMigrationOutcome } from "@src/lib/project/migrations/project-migration-runner";
 import { Screenplay } from "@src/lib/utils/types";
 import { ScreenplayElement, TitlePageElement, Style, PageFormat } from "@src/lib/utils/enums";
 import { SearchMatch } from "@src/lib/screenplay/extensions/search-highlight-extension";
@@ -48,6 +49,11 @@ export interface ProjectContextType {
     provider: ThrottledWebsocketProvider | null;
     isYjsReady: boolean;
 
+    /** True when the current user has VIEWER role on a cloud project.
+     *  All edit affordances must be hidden/disabled when this is true,
+     *  and the repository's writes are no-ops as a safety net. */
+    isReadOnly: boolean;
+
     // Connection state
     connectionStatus: ConnectionStatus;
     users: CollaboratorInfo[];
@@ -137,6 +143,7 @@ const defaultContextValue: ProjectContextType = {
     repository: null,
     provider: null,
     isYjsReady: false,
+    isReadOnly: false,
 
     connectionStatus: "disconnected",
     users: [],
@@ -215,17 +222,11 @@ export const ProjectContext = createContext<ProjectContextType>(defaultContextVa
 // Stable context for rarely-changing infrastructure values.
 // Prevents ProjectLayoutInner from re-rendering on every screenplay change.
 interface ProjectReadyContextType {
-    isYjsReady: boolean;
-    isProjectUnavailable: boolean;
-    isStaleClient: boolean;
-    migrationOutcome: ProjectMigrationOutcome | null;
+    status: ProjectStatus;
 }
 
 const ProjectReadyContext = createContext<ProjectReadyContextType>({
-    isYjsReady: false,
-    isProjectUnavailable: false,
-    isStaleClient: false,
-    migrationOutcome: null,
+    status: { kind: "loading" },
 });
 
 export const useProjectReady = () => useContext(ProjectReadyContext);
@@ -251,12 +252,9 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
     const {
         ydoc,
         provider,
-        isReady: isYjsReady,
+        status,
         connectionStatus: yjsConnectionStatus,
         users: yjsUsers,
-        isProjectUnavailable,
-        isStaleClient,
-        migrationOutcome,
     } = useProjectYjs({
         projectId,
         userName,
@@ -264,10 +262,15 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         userId: user?.id,
     });
 
+    // Derived for downstream consumers (editor, board, etc.) that only care
+    // whether the project is renderable, not which error state we're in.
+    const isYjsReady = status.kind === "ready";
+
     // Repository state - loaded dynamically
     const [repository, setRepository] = useState<ProjectRepository | null>(null);
 
     const [project, setProject] = useState<ProjectMembershipPayload | null>(null);
+    const isReadOnly = !!project && project.role === ProjectRole.VIEWER;
     const [editor, setEditor] = useState<Editor | null>(null);
     const [screenplay, setScreenplay] = useState<Screenplay>([]);
     const [characters, setCharacters] = useState<CharacterMap | undefined>(undefined);
@@ -357,6 +360,25 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         };
     }, [ydoc]);
 
+    useEffect(() => {
+        repository?.setReadOnly(isReadOnly);
+    }, [repository, isReadOnly]);
+
+    // The DO pushes a role-changed message whenever an admin updates this
+    // user's role. Mirror it into local state so isReadOnly flips and the
+    // editor/repository gates apply immediately, without waiting for an SWR
+    // revalidation of the membership endpoint.
+    useEffect(() => {
+        if (!provider) return;
+        const handler = (newRole: string) => {
+            setProject((prev) => (prev ? { ...prev, role: newRole as ProjectRole } : prev));
+        };
+        provider.on("role-changed", handler);
+        return () => {
+            provider.off("role-changed", handler);
+        };
+    }, [provider]);
+
     const updateScreenplay = useCallback((newScreenplay: Screenplay) => {
         setScreenplay(newScreenplay);
     }, []);
@@ -725,6 +747,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             repository,
             provider,
             isYjsReady,
+            isReadOnly,
             connectionStatus,
             users,
             editor,
@@ -788,6 +811,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             repository,
             provider,
             isYjsReady,
+            isReadOnly,
             connectionStatus,
             users,
             editor,
@@ -847,10 +871,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         ],
     );
 
-    const readyValue = useMemo(
-        () => ({ isYjsReady, isProjectUnavailable, isStaleClient, migrationOutcome }),
-        [isYjsReady, isProjectUnavailable, isStaleClient, migrationOutcome],
-    );
+    const readyValue = useMemo(() => ({ status }), [status]);
 
     return (
         <ProjectReadyContext.Provider value={readyValue}>
diff --git a/src/lib/cloud/index.ts b/src/lib/cloud/index.ts
index 5e4f2969..c934e69e 100644
--- a/src/lib/cloud/index.ts
+++ b/src/lib/cloud/index.ts
@@ -7,6 +7,7 @@ interface DecodedToken extends JWTPayload {
     type?: string;
     projectId?: string;
     userId?: string;
+    role?: string;
 }
 
 async function getVerifiedPayload(token: string | null, secret: string): Promise<DecodedToken | null> {
@@ -36,9 +37,12 @@ const worker = {
         // segments: [projectId, ...rest]
         const doPath = "/" + segments.slice(1).join("/");
 
-        // Authenticated API endpoints (saves, blacklist, allow)
+        // Authenticated API endpoints (saves, blacklist, allow, role-update)
         const isAuthEndpoint =
-            url.pathname.includes("/saves") || url.pathname.endsWith("/blacklist") || url.pathname.endsWith("/allow");
+            url.pathname.includes("/saves") ||
+            url.pathname.endsWith("/blacklist") ||
+            url.pathname.endsWith("/allow") ||
+            url.pathname.endsWith("/role-update");
 
         if (isAuthEndpoint && request.method !== "GET") {
             const authHeader = request.headers.get("Authorization");
@@ -99,6 +103,7 @@ const worker = {
 
             const newRequest = new Request(request);
             newRequest.headers.set("X-User-Id", userId);
+            newRequest.headers.set("X-User-Role", decoded.role || "VIEWER");
             newRequest.headers.set("X-Project-Id", projectId);
 
             const stub = env.PROJECT_ROOM.get(env.PROJECT_ROOM.idFromName(projectId));
diff --git a/src/lib/cloud/protocol.ts b/src/lib/cloud/protocol.ts
index 58576e11..261ba4b2 100644
--- a/src/lib/cloud/protocol.ts
+++ b/src/lib/cloud/protocol.ts
@@ -4,6 +4,15 @@ import * as syncProtocol from "y-protocols/sync";
 import * as awarenessProtocol from "y-protocols/awareness";
 import type { ProjectRoom } from "./room";
 
+/**
+ * Yjs sync sub-message types (mirrors y-protocols/sync constants).
+ * Step1 is a read-only request — the server replies with Step2.
+ * Step2 and Update both carry data that mutates the doc.
+ */
+const SYNC_STEP_1 = 0;
+const SYNC_STEP_2 = 1;
+const SYNC_UPDATE = 2;
+
 export function handleProtocolMessage(room: ProjectRoom, fullMessage: Uint8Array, sender: WebSocket) {
     const messageType = fullMessage[0];
     const messageContent = fullMessage.subarray(1);
@@ -12,16 +21,40 @@ export function handleProtocolMessage(room: ProjectRoom, fullMessage: Uint8Array
     try {
         switch (messageType) {
             case 0: // Sync (document updates)
+                const session = room.sessions.get(sender);
+                const isReadOnly = session?.role === "VIEWER";
+
                 const syncEncoder = encoding.createEncoder();
                 encoding.writeVarUint(syncEncoder, 0); // Message type 0 (sync)
 
-                // Handle multiple sync messages in a single packet (common in y-websocket)
+                // Handle multiple sync messages in a single packet (common in y-websocket).
+                // We dispatch sub-messages manually so we can drop writes from
+                // viewers while still answering their SyncStep1 read requests.
                 try {
                     while (decoding.hasContent(decoder)) {
-                        // Passing 'sender' (WebSocket) as origin causes the doc.on('update')
-                        // listener (set up in constructor) to broadcast the change,
-                        // schedule a hot save, and flag for cold snapshot.
-                        syncProtocol.readSyncMessage(decoder, syncEncoder, room.doc, sender);
+                        const subType = decoding.readVarUint(decoder);
+                        if (subType === SYNC_STEP_1) {
+                            // Read-only: server responds with SyncStep2 carrying the current doc state.
+                            syncProtocol.readSyncStep1(decoder, syncEncoder, room.doc);
+                        } else if (subType === SYNC_STEP_2 || subType === SYNC_UPDATE) {
+                            // Both carry an update payload that would mutate the doc.
+                            // For viewers we read the bytes off the decoder but never
+                            // apply them, so the rest of the packet stays parseable.
+                            if (isReadOnly) {
+                                decoding.readVarUint8Array(decoder);
+                                console.warn(
+                                    `[Room] Dropped doc write from viewer ${session?.userId ?? "?"}`,
+                                );
+                            } else if (subType === SYNC_STEP_2) {
+                                syncProtocol.readSyncStep2(decoder, room.doc, sender);
+                            } else {
+                                syncProtocol.readUpdate(decoder, room.doc, sender);
+                            }
+                        } else {
+                            // Unknown sub-type — bail to avoid mis-aligning the decoder.
+                            console.warn(`[Room] Unknown sync sub-message type: ${subType}`);
+                            break;
+                        }
                     }
                 } catch (e) {
                     console.error("[Room] Error reading sync message:", e);
diff --git a/src/lib/cloud/room.ts b/src/lib/cloud/room.ts
index 9af67d3b..8d359e1b 100644
--- a/src/lib/cloud/room.ts
+++ b/src/lib/cloud/room.ts
@@ -164,12 +164,16 @@ export class ProjectRoom extends DurableObject {
         const hibernatedSockets = this.ctx.getWebSockets();
         for (const ws of hibernatedSockets) {
             const attachment = ws.deserializeAttachment() as
-                | { userId: string; clientIds: number[] }
+                | { userId: string; role?: string; clientIds: number[] }
                 | null;
             if (!attachment) continue;
             this.sessions.set(ws, {
                 clientIds: new Set(attachment.clientIds),
                 userId: attachment.userId,
+                // Older attachments may not have a role; default to VIEWER
+                // (read-only) to fail safe — the client will reconnect with a
+                // fresh JWT carrying the correct role on the next message.
+                role: attachment.role || "VIEWER",
                 lastActivity: Date.now(),
             });
             this.userConnections.set(attachment.userId, ws);
@@ -189,14 +193,15 @@ export class ProjectRoom extends DurableObject {
 
     /**
      * Persist the current session state on the WebSocket so it survives
-     * Cloudflare DO hibernation. Called whenever clientIds or userId changes
-     * for a session.
+     * Cloudflare DO hibernation. Called whenever clientIds, userId, or role
+     * changes for a session.
      */
     private persistSessionAttachment(ws: WebSocket): void {
         const session = this.sessions.get(ws);
         if (!session) return;
         ws.serializeAttachment({
             userId: session.userId,
+            role: session.role,
             clientIds: Array.from(session.clientIds),
         });
     }
@@ -582,12 +587,46 @@ export class ProjectRoom extends DurableObject {
             return new Response(`User ${userId} allowed.`, { status: 200 });
         }
 
+        // Role-update endpoint — push a role change to a connected user.
+        // Updates the in-memory SessionInfo so the protocol's write gate uses
+        // the new role on the next message, and notifies the client so its
+        // local `project.role` updates without a manual refresh. We don't
+        // close the socket: the existing JWT carries the OLD role, but the
+        // server-side gate is the source of truth and is now correct.
+        if (request.method === "POST" && url.pathname === "/role-update") {
+            const { userId, role } = (await request.json()) as { userId?: string; role?: string };
+            if (!userId || !role) {
+                return new Response("Missing userId or role", { status: 400 });
+            }
+
+            const socket = this.userConnections.get(userId);
+            if (socket) {
+                const session = this.sessions.get(socket);
+                if (session) {
+                    session.role = role;
+                    this.persistSessionAttachment(socket);
+                }
+                try {
+                    const encoder = encoding.createEncoder();
+                    encoding.writeVarUint(encoder, 100); // custom message type: role-update
+                    encoding.writeVarString(encoder, role);
+                    socket.send(encoding.toUint8Array(encoder));
+                } catch (e) {
+                    console.warn(`[Room] Failed to push role-update to ${userId}:`, e);
+                }
+            }
+
+            console.log(`[Room] Role updated for user ${userId} -> ${role}`);
+            return new Response(`User ${userId} role updated.`, { status: 200 });
+        }
+
         // WebSocket upgrade
         if (request.headers.get("Upgrade") === "websocket") {
             const userId = request.headers.get("X-User-Id");
             if (!userId) {
                 return new Response("Missing User Identity", { status: 400 });
             }
+            const role = request.headers.get("X-User-Role") || "VIEWER";
 
             if (this.blacklist.has(userId)) {
                 return new Response("Unauthorized: You have been kicked.", { status: 403 });
@@ -642,6 +681,7 @@ export class ProjectRoom extends DurableObject {
             this.sessions.set(server, {
                 clientIds: new Set(),
                 userId,
+                role,
                 lastActivity: Date.now(),
             });
             this.userConnections.set(userId, server);
diff --git a/src/lib/cloud/types.ts b/src/lib/cloud/types.ts
index 33006eeb..d85d6cd9 100644
--- a/src/lib/cloud/types.ts
+++ b/src/lib/cloud/types.ts
@@ -21,6 +21,8 @@ export const RETENTION_INTERVAL_30MIN_MS = 30 * 60 * 1000;
 export interface SessionInfo {
     clientIds: Set<number>;
     userId: string;
+    /** Project role from the JWT — used to gate doc writes (VIEWER is read-only). */
+    role: string;
     lastActivity: number;
 }
 
diff --git a/src/lib/cloud/utils.ts b/src/lib/cloud/utils.ts
index d9c5adc2..2edded27 100644
--- a/src/lib/cloud/utils.ts
+++ b/src/lib/cloud/utils.ts
@@ -4,6 +4,7 @@ import * as bc from "lib0/broadcastchannel";
 import { WebsocketProvider } from "y-websocket";
 import * as Y from "yjs";
 import * as encoding from "lib0/encoding";
+import * as decoding from "lib0/decoding";
 import * as syncProtocol from "y-protocols/sync";
 import * as awarenessProtocol from "y-protocols/awareness";
 import { CURRENT_PROJECT_VERSION } from "../project/migrations/project-migrations";
@@ -41,8 +42,11 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     on(event: "document-restored", listener: () => void): this;
     on(event: "stale-client-version", listener: () => void): this;
     on(event: "session-replaced", listener: () => void): this;
+    on(event: "kicked", listener: () => void): this;
+    on(event: "role-changed", listener: (role: string) => void): this;
     on(event: Parameters<WebsocketProvider["on"]>[0], listener: Parameters<WebsocketProvider["on"]>[1]): this;
-    on(event: string, listener: (...args: unknown[]) => void): this {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    on(event: string, listener: (...args: any[]) => void): this {
         return super.on(
             event as unknown as Parameters<WebsocketProvider["on"]>[0],
             listener as unknown as Parameters<WebsocketProvider["on"]>[1],
@@ -52,6 +56,8 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     emit(event: "document-restored", args: []): this;
     emit(event: "stale-client-version", args: []): this;
     emit(event: "session-replaced", args: []): this;
+    emit(event: "kicked", args: []): this;
+    emit(event: "role-changed", args: [string]): this;
     emit(event: Parameters<WebsocketProvider["emit"]>[0], args: Parameters<WebsocketProvider["emit"]>[1]): this;
     emit(event: string, args: unknown[]): this {
         super.emit(
@@ -60,6 +66,20 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         );
         return this;
     }
+
+    off(event: "document-restored", listener: () => void): this;
+    off(event: "stale-client-version", listener: () => void): this;
+    off(event: "session-replaced", listener: () => void): this;
+    off(event: "kicked", listener: () => void): this;
+    off(event: "role-changed", listener: (role: string) => void): this;
+    off(event: Parameters<WebsocketProvider["off"]>[0], listener: Parameters<WebsocketProvider["off"]>[1]): this;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    off(event: string, listener: (...args: any[]) => void): this {
+        return super.off(
+            event as unknown as Parameters<WebsocketProvider["off"]>[0],
+            listener as unknown as Parameters<WebsocketProvider["off"]>[1],
+        ) as unknown as this;
+    }
     private updateQueue: Uint8Array[] = [];
     private awarenessQueue: Set<number> = new Set();
     private flushInterval: ReturnType<typeof setInterval> | null = null;
@@ -92,6 +112,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     private isIdleDisconnected: boolean = false;
     private isSessionReplaced: boolean = false;
     private isStaleClient: boolean = false;
+    private isKicked: boolean = false;
     private lastKnownUserCount: number = 1;
 
     // Store userInfo so we can restore it on reconnection
@@ -99,6 +120,7 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
     // Close codes from server
     private readonly CLOSE_CODE_SESSION_REPLACED = 4001;
+    private readonly CLOSE_CODE_KICKED = 4003;
     private readonly CLOSE_CODE_DOCUMENT_RESTORED = 4005;
     private readonly CLOSE_CODE_STALE_CLIENT_VERSION = 4006;
 
@@ -165,6 +187,22 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
             this.lastMessageTime = Date.now();
         };
 
+        // Custom message type 100 — server pushes the user's new role when an
+        // admin changes it. The DO has already updated its in-memory SessionInfo
+        // (so the server-side write gate is correct on the next message); this
+        // handler propagates the change to the UI so editor affordances flip
+        // immediately, without waiting for an SWR revalidation.
+        (this as unknown as WSInternals).messageHandlers[100] = (_encoder, ...rest: unknown[]) => {
+            this.lastMessageTime = Date.now();
+            const decoder = rest[0] as decoding.Decoder;
+            try {
+                const role = decoding.readVarString(decoder);
+                this.emit("role-changed", [role]);
+            } catch (e) {
+                console.warn("[WS] Failed to read role-changed message:", e);
+            }
+        };
+
         // Handle connection status changes
         this.on("status", this.onStatusChange);
 
@@ -215,8 +253,8 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         let currentWs: WebSocket | null = null;
 
         const checkAndHookWs = () => {
-            // Don't hook if session was already replaced or rejected as stale
-            if (this.isSessionReplaced || this.isStaleClient) return;
+            // Don't hook if session was already replaced, rejected as stale, or kicked
+            if (this.isSessionReplaced || this.isStaleClient || this.isKicked) return;
 
             const ws = (this as unknown as WSInternals).ws;
             if (ws && ws !== currentWs) {
@@ -227,6 +265,10 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
                         this.handleSessionReplaced();
                         return;
                     }
+                    if (event.code === this.CLOSE_CODE_KICKED) {
+                        this.handleKicked();
+                        return;
+                    }
                     if (event.code === this.CLOSE_CODE_DOCUMENT_RESTORED) {
                         this.handleDocumentRestored();
                         return;
@@ -244,8 +286,13 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
 
         // Hook into new WebSocket connections when status changes
         this.on("status", (event: { status: string }) => {
-            // Only hook when connecting, not when already replaced or stale-rejected
-            if (event.status === "connecting" && !this.isSessionReplaced && !this.isStaleClient) {
+            // Only hook when connecting, not when already replaced, stale-rejected, or kicked
+            if (
+                event.status === "connecting" &&
+                !this.isSessionReplaced &&
+                !this.isStaleClient &&
+                !this.isKicked
+            ) {
                 setTimeout(checkAndHookWs, 0);
             }
         });
@@ -288,6 +335,29 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
         this.emit("document-restored", []);
     }
 
+    /**
+     * Handle kick close (4003) — the user was removed from the project. Stop
+     * reconnecting (the cloud token endpoint will reject us with 403 forever)
+     * and notify the consumer to surface the project-unavailable dialog.
+     */
+    private handleKicked(): void {
+        console.log("[WS] User was kicked from the project. Stopping reconnection.");
+        this.isKicked = true;
+
+        if (this.reconnectTimeout) {
+            clearTimeout(this.reconnectTimeout);
+            this.reconnectTimeout = null;
+        }
+
+        this.shouldConnect = false;
+        this.disconnect();
+        this.emit("kicked", []);
+    }
+
+    public get wasKicked(): boolean {
+        return this.isKicked;
+    }
+
     /**
      * Handle stale-client-version close — this client's bundle is older than
      * the project's schema version. Stop reconnecting (would just be rejected
@@ -660,13 +730,21 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
      * Handle document updates (throttled)
      */
     private onThrottledUpdate = (update: Uint8Array, origin: unknown): void => {
-        if (origin !== this) {
-            this.updateQueue.push(update);
-            // Cap queue length on long disconnects. The local doc still holds
-            // every change; sync on reconnect will replay them.
-            if (this.updateQueue.length > this.MAX_UPDATE_QUEUE) {
-                this.updateQueue.splice(0, this.updateQueue.length - this.MAX_UPDATE_QUEUE);
-            }
+        if (origin === this) return;
+
+        // Read-only short-circuit: when the local doc is in viewer mode, the
+        // ProjectState rollback guard reverts every local write immediately.
+        // Both the original write and the inverse op fire `update` events, but
+        // the server would drop them anyway (protocol.ts blocks viewer writes).
+        // Skip the queue entirely to save bandwidth and keep the WS quiet.
+        const ydoc = this.doc as { isReadOnly?: boolean };
+        if (ydoc.isReadOnly) return;
+
+        this.updateQueue.push(update);
+        // Cap queue length on long disconnects. The local doc still holds
+        // every change; sync on reconnect will replay them.
+        if (this.updateQueue.length > this.MAX_UPDATE_QUEUE) {
+            this.updateQueue.splice(0, this.updateQueue.length - this.MAX_UPDATE_QUEUE);
         }
     };
 
@@ -904,3 +982,21 @@ export const blacklistFromWebsocket = async (userId: string, projectId: string)
         body: JSON.stringify({ userId }),
     });
 };
+
+export const notifyRoleChange = async (userId: string, projectId: string, role: string) => {
+    const payload = {
+        type: "admin-action",
+        projectId,
+    };
+
+    const secret = new TextEncoder().encode(process.env.JWT_SECRET!);
+    const token = await new SignJWT(payload).setProtectedHeader({ alg: "HS256" }).setExpirationTime("1m").sign(secret);
+    await fetch(`${process.env.NEXT_PUBLIC_CLOUD_URL}/${projectId}/role-update`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`,
+        },
+        body: JSON.stringify({ userId, role }),
+    });
+};
diff --git a/src/lib/import/import-project.ts b/src/lib/import/import-project.ts
index 276e9817..97f4f177 100644
--- a/src/lib/import/import-project.ts
+++ b/src/lib/import/import-project.ts
@@ -58,6 +58,11 @@ export async function importFileIntoProject(
         throw new Error(`Unsupported file type: ${file.name.split(".").pop()}`);
     }
 
+    // Bail before reading the file when the doc is in read-only mode (viewer
+    // role). The Y.Doc rollback gate would revert every write the adapter
+    // emits — this just avoids a brief flash of imported content in the UI.
+    if (repository?.getState().isReadOnly) return;
+
     const content = await file.arrayBuffer();
     adapter.import(content, editor, titlePageEditor, repository);
     if (editor) editor.commands.focus();
diff --git a/src/lib/persistence/storage-provider/local-persistence.ts b/src/lib/persistence/storage-provider/local-persistence.ts
index 53bd90c2..1162f684 100644
--- a/src/lib/persistence/storage-provider/local-persistence.ts
+++ b/src/lib/persistence/storage-provider/local-persistence.ts
@@ -133,8 +133,9 @@ export async function migrateToCachedProject(
 /**
  * Promote a local-only cached project to a cloud project, reusing the same id.
  * Creates a cloud project record + membership, then flips the local cache flag.
- * The Y.js doc at `scriptio-{projectId}` is unchanged — `useCloudSync` will
- * push it to the empty server doc on next mount via the standard CRDT handshake.
+ * The Y.js doc at `scriptio-{projectId}` is unchanged — the cloud provider in
+ * `useProjectYjs` will push it to the empty server doc on next mount via the
+ * standard CRDT handshake.
  */
 export async function promoteLocalProjectToCloud(projectId: string): Promise<void> {
     const local = await getCachedProject(projectId);
@@ -155,18 +156,23 @@ export async function promoteLocalProjectToCloud(projectId: string): Promise<voi
 }
 
 /**
- * Discard a cloud project's local data (cached entry + Yjs IndexedDB database).
+ * Delete the Yjs IndexedDB database for a project without touching its metadata.
+ * Used when the server restores a snapshot so the next load syncs a clean state.
  */
-export async function discardCloudProjectData(projectId: string): Promise<void> {
-    // Remove the cached project entry
-    await deleteCachedProject(projectId);
-
-    // Delete the Yjs IndexedDB database for this project
+export async function clearYjsData(projectId: string): Promise<void> {
     const dbName = yjsDbKey(projectId);
-    await new Promise<void>((resolve, reject) => {
+    await new Promise<void>((resolve) => {
         const req = indexedDB.deleteDatabase(dbName);
         req.onsuccess = () => resolve();
-        req.onerror = () => reject(req.error);
+        req.onerror = () => resolve(); // best-effort
         req.onblocked = () => resolve();
     });
 }
+
+/**
+ * Discard a cloud project's local data (cached entry + Yjs IndexedDB database).
+ */
+export async function discardCloudProjectData(projectId: string): Promise<void> {
+    await deleteCachedProject(projectId);
+    await clearYjsData(projectId);
+}
diff --git a/src/lib/project/migrations/project-migration-runner.ts b/src/lib/project/migrations/project-migration-runner.ts
index fb185017..9a8ddcd1 100644
--- a/src/lib/project/migrations/project-migration-runner.ts
+++ b/src/lib/project/migrations/project-migration-runner.ts
@@ -6,9 +6,9 @@
  *     DurableObject (server-side gatekeeper) to migrate the doc on load
  *     before serving updates to clients.
  *   - `migrateProjectDoc`: client wrapper that adds an IndexedDB pre-migration
- *     backup so a failed step can be rolled back. Called from
- *     `useLocalPersistence` after `y-indexeddb` has synced and before the
- *     cloud `WebsocketProvider` connects.
+ *     backup so a failed step can be rolled back. Called from the session
+ *     cache in `project-state.ts` after `y-indexeddb` has synced and before
+ *     the cloud `WebsocketProvider` connects.
  *
  * Both rely on idempotent migration steps so concurrent migrations across
  * the DO and any number of clients converge cleanly under CRDT merge.
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index 8bf590d7..936c2c7f 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -181,6 +181,16 @@ export class ProjectState extends Y.Doc {
         SHELF: "shelf",
     } as const;
 
+    private _readOnly: boolean = false;
+
+    setReadOnly(readOnly: boolean): void {
+        this._readOnly = readOnly;
+    }
+
+    get isReadOnly(): boolean {
+        return this._readOnly;
+    }
+
     metadata(): TypedMap<ProjectMetadata> {
         return this.getMap(this.KEYS.METADATA) as unknown as TypedMap<ProjectMetadata>;
     }
@@ -233,11 +243,3 @@ export class ProjectState extends Y.Doc {
     }
 }
 
-// -------------------------------- //
-//          MAP HELPERS             //
-// -------------------------------- //
-
-export const getCharactersMap = (ydoc: ProjectState): Y.Map<CharacterItem> => ydoc.characters();
-export const getLocationsMap = (ydoc: ProjectState): Y.Map<LocationItem> => ydoc.locations();
-export const getScenesMap = (ydoc: ProjectState): Y.Map<PersistentScene> => ydoc.scenes();
-export const getBoardMap = (ydoc: ProjectState): TypedMap<BoardData> => ydoc.board();
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index b5e15d74..5402e11e 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -41,6 +41,22 @@ export class ProjectRepository {
         this.ydoc = ydoc;
     }
 
+    setReadOnly(readOnly: boolean): void {
+        this.ydoc.setReadOnly(readOnly);
+    }
+
+    get readOnly(): boolean {
+        return this.ydoc.isReadOnly;
+    }
+
+    private guardWrite(op: string): boolean {
+        if (this.ydoc.isReadOnly) {
+            console.warn(`[Repo] Blocked ${op}: project is read-only`);
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Get the underlying Y.js document.
      * Use sparingly - prefer using repository methods when possible.
@@ -118,10 +134,12 @@ export class ProjectRepository {
     }
 
     setTitle(title: string): void {
+        if (this.guardWrite("setTitle")) return;
         this.ydoc.metadata().set("title", title);
     }
 
     setAuthor(author: string): void {
+        if (this.guardWrite("setAuthor")) return;
         this.ydoc.metadata().set("author", author);
     }
 
@@ -229,6 +247,7 @@ export class ProjectRepository {
      * Returns the scene id.
      */
     upsertScene(sceneId: string, data: Partial<PersistentScene>): string {
+        if (this.guardWrite("upsertScene")) return sceneId;
         const map = this.ydoc.scenes();
         const existing = map.get(sceneId) as PersistentScene | undefined;
 
@@ -266,6 +285,7 @@ export class ProjectRepository {
      * Delete a scene's persistent data.
      */
     deleteScene(sceneId: string): void {
+        if (this.guardWrite("deleteScene")) return;
         const map = this.ydoc.scenes();
         if (map.has(sceneId)) {
             map.delete(sceneId);
@@ -305,30 +325,39 @@ export class ProjectRepository {
     }
 
     setPageSize(pageSize: PageFormat) {
+        if (this.guardWrite("setPageSize")) return;
         this.ydoc.layout().set("pageSize", pageSize);
     }
     setPageMargins(margins: PageMargin) {
+        if (this.guardWrite("setPageMargins")) return;
         this.ydoc.layout().set("pageMargins", margins);
     }
     setDisplaySceneNumbers(display: boolean) {
+        if (this.guardWrite("setDisplaySceneNumbers")) return;
         this.ydoc.layout().set("displaySceneNumbers", display);
     }
     setSceneHeadingSpacing(spacing: number) {
+        if (this.guardWrite("setSceneHeadingSpacing")) return;
         this.ydoc.layout().set("sceneHeadingSpacing", spacing);
     }
     setSceneNumberOnRight(onRight: boolean) {
+        if (this.guardWrite("setSceneNumberOnRight")) return;
         this.ydoc.layout().set("sceneNumberOnRight", onRight);
     }
     setContdLabel(label: string) {
+        if (this.guardWrite("setContdLabel")) return;
         this.ydoc.layout().set("contdLabel", label);
     }
     setMoreLabel(label: string) {
+        if (this.guardWrite("setMoreLabel")) return;
         this.ydoc.layout().set("moreLabel", label);
     }
     setElementMargins(margins: Record<string, { left: number; right: number }>) {
+        if (this.guardWrite("setElementMargins")) return;
         this.ydoc.layout().set("elementMargins", margins);
     }
     setElementStyles(styles: Record<string, ElementStyle>) {
+        if (this.guardWrite("setElementStyles")) return;
         this.ydoc.layout().set("elementStyles", styles);
     }
 
@@ -350,12 +379,14 @@ export class ProjectRepository {
     }
 
     addCommentToMap(map: Y.Map<Comment>, comment: Omit<Comment, "id">): string {
+        if (this.guardWrite("addComment")) return "";
         const id = uuidv7();
         map.set(id, { ...comment, id });
         return id;
     }
 
     updateCommentInMap(map: Y.Map<Comment>, commentId: string, data: Partial<Comment>): void {
+        if (this.guardWrite("updateComment")) return;
         const existing = map.get(commentId);
         if (!existing) return;
         map.set(commentId, { ...existing, ...data });
@@ -366,6 +397,7 @@ export class ProjectRepository {
     }
 
     addReplyToMap(map: Y.Map<Comment>, commentId: string, reply: Omit<CommentReply, "id">): string | undefined {
+        if (this.guardWrite("addReply")) return undefined;
         const existing = map.get(commentId);
         if (!existing) return undefined;
         const id = uuidv7();
@@ -375,6 +407,7 @@ export class ProjectRepository {
     }
 
     deleteCommentFromMap(map: Y.Map<Comment>, commentId: string): void {
+        if (this.guardWrite("deleteComment")) return;
         if (map.has(commentId)) {
             map.delete(commentId);
         }
@@ -434,6 +467,7 @@ export class ProjectRepository {
 
     /** Create a new shelf entry or add a version to an existing one. Returns the version ID. */
     shelveNode(nodeId: string, title: string, type: ShelfEntryType, content: JSONContent[]): string {
+        if (this.guardWrite("shelveNode")) return "";
         const map = this.ydoc.shelf();
         const existing = map.get(nodeId) as ShelfEntry | undefined;
         const versionId = generateNodeId();
@@ -465,6 +499,7 @@ export class ProjectRepository {
     }
 
     renameShelfVersion(nodeId: string, versionId: string, newTitle: string): void {
+        if (this.guardWrite("renameShelfVersion")) return;
         const map = this.ydoc.shelf();
         const entry = map.get(nodeId) as ShelfEntry | undefined;
         if (!entry) return;
@@ -473,6 +508,7 @@ export class ProjectRepository {
     }
 
     deleteShelfEntry(nodeId: string): void {
+        if (this.guardWrite("deleteShelfEntry")) return;
         const map = this.ydoc.shelf();
         const entry = map.get(nodeId) as ShelfEntry | undefined;
         if (!entry) return;
@@ -487,6 +523,7 @@ export class ProjectRepository {
     }
 
     deleteShelfVersion(nodeId: string, versionId: string): void {
+        if (this.guardWrite("deleteShelfVersion")) return;
         const map = this.ydoc.shelf();
         const entry = map.get(nodeId) as ShelfEntry | undefined;
         if (!entry) return;
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 9563db0b..9196005a 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -10,9 +10,6 @@ import type { ThrottledWebsocketProvider } from "../cloud/utils";
 import { ScreenplaySchema } from "../screenplay/editor";
 import { TitlePageSchema } from "../titlepage/editor";
 import { yXmlFragmentToProseMirrorRootNode } from "y-prosemirror";
-import type { CharacterMap } from "../screenplay/characters";
-import type { LocationMap } from "../screenplay/locations";
-import type { PersistentSceneMap } from "../screenplay/scenes";
 import type { YjsLocalProvider } from "../persistence/y-local-provider";
 import type { ProjectMigrationOutcome } from "./migrations/project-migration-runner";
 
@@ -25,10 +22,6 @@ export {
     DEFAULT_PAGE_MARGINS,
     DEFAULT_ELEMENT_MARGINS,
     DEFAULT_ELEMENT_STYLES,
-    getCharactersMap,
-    getLocationsMap,
-    getScenesMap,
-    getBoardMap,
 } from "./project-doc";
 export type {
     ShelfEntryType,
@@ -61,19 +54,31 @@ export const getProjectRepository = async () => {
 
 export type ConnectionStatus = "disconnected" | "connecting" | "connected";
 
+/**
+ * High-level state of a project from the layout's perspective. Replaces the
+ * previous bag of `isReady` / `isProjectUnavailable` / `isStaleClient` /
+ * `migrationOutcome` booleans — a single discriminated union makes the
+ * priority of error states explicit and lets the layout switch on one value.
+ *
+ * Priority (highest first): needs-update > unavailable > loading > ready.
+ */
+export type ProjectStatusOutcome = Extract<
+    ProjectMigrationOutcome,
+    { kind: "future-version" | "failed" | "stale-client" }
+>;
+
+export type ProjectStatus =
+    | { kind: "loading" }
+    | { kind: "ready" }
+    | { kind: "needs-update"; outcome: ProjectStatusOutcome }
+    | { kind: "unavailable" };
+
 export interface ProjectYjsState {
     ydoc: ProjectState | null;
     provider: ThrottledWebsocketProvider | null;
-    isLocalReady: boolean;
-    isCloudReady: boolean;
-    isCloudSynced: boolean;
+    status: ProjectStatus;
     connectionStatus: ConnectionStatus;
     users: CollaboratorInfo[];
-    isLockedByServer: boolean;
-    isSessionReplaced: boolean;
-    isProjectUnavailable: boolean;
-    isStaleClient: boolean;
-    migrationOutcome: ProjectMigrationOutcome | null;
 }
 
 export interface CollaboratorInfo {
@@ -103,28 +108,6 @@ async function getYProtocols() {
     return yProtocolsModule;
 }
 
-/**
- * Utility to clear the local IndexedDB cache for a specific project.
- * Used when the server restores a document from a snapshot to avoid merge conflicts.
- */
-export async function clearLocalProjectCache(projectId: string): Promise<void> {
-    try {
-        const { IndexeddbPersistence } = await import("y-indexeddb");
-        const tmpDoc = new Y.Doc();
-        const tmpPersistence = new IndexeddbPersistence(`scriptio-${projectId}`, tmpDoc);
-
-        // Check if clearData is available on the persistence instance
-        const provider = tmpPersistence as unknown as { clearData?: () => Promise<void> };
-        if (typeof provider.clearData === "function") {
-            await provider.clearData();
-        }
-
-        tmpPersistence.destroy();
-        tmpDoc.destroy();
-    } catch (e) {
-        console.warn(`[ProjectState] Failed to clear local cache for ${projectId}:`, e);
-    }
-}
 
 // -------------------------------- //
 //   PROSEMIRROR HELPERS (browser)  //
@@ -151,358 +134,293 @@ export const titlepageOf = (ydoc: ProjectState): JSONContent[] => {
 };
 
 // -------------------------------- //
-//          LOCAL PERSISTENCE       //
+//        SESSION CACHE             //
 // -------------------------------- //
 
 /**
- * Hook to initialize local persistence for the Yjs document.
+ * Per-projectId session cache holding the Yjs doc, the IndexedDB local
+ * provider, and the cloud WebSocket provider. RefCount + a deferred dispose
+ * timer let a synchronous unmount/remount pair (React StrictMode in dev,
+ * route remounts) reuse the same resources instead of tearing them down and
+ * rebuilding from scratch — which previously produced two disconnect/connect
+ * cycles per page refresh in dev.
  */
-export const useLocalPersistence = (projectId: string | null) => {
-    const [ydoc, setYdoc] = useState<ProjectState | null>(null);
-    const [isLocalReady, setIsLocalReady] = useState(false);
-    const [migrationOutcome, setMigrationOutcome] = useState<ProjectMigrationOutcome | null>(null);
-    const persistenceRef = useRef<YjsLocalProvider | null>(null);
-
-    useEffect(() => {
-        if (!projectId || typeof window === "undefined") {
-            setYdoc(null);
-            setIsLocalReady(false);
-            setMigrationOutcome(null);
-            return;
-        }
-
-        let isDestroyed = false;
-        const initPersistence = async () => {
-            const state = new ProjectState();
-            const { createLocalYjsProvider } = await import("../persistence/y-local-provider");
-            const localProvider = await createLocalYjsProvider(projectId, state);
-
-            localProvider.on("synced", async () => {
-                if (isDestroyed) return;
-                const { migrateProjectDoc } = await import("./migrations/project-migration-runner");
-                const outcome = await migrateProjectDoc({ ydoc: state, projectId });
-                if (isDestroyed) return;
-                setMigrationOutcome(outcome);
-                if (outcome.kind === "future-version" || outcome.kind === "failed") {
-                    // Block UI from rendering the project; layout shows error dialog instead.
-                    return;
-                }
-                setIsLocalReady(true);
-            });
-
-            persistenceRef.current = localProvider;
-
-            if (!isDestroyed) {
-                setYdoc(state);
-            }
-        };
-
-        initPersistence();
+type SessionEntry = {
+    projectId: string;
+    state: ProjectState;
+    localProvider: YjsLocalProvider | null;
+    cloudProvider: ThrottledWebsocketProvider | null;
+    isLocalReady: boolean;
+    isCloudSynced: boolean;
+    isCloudInitStarted: boolean;
+    migrationOutcome: ProjectMigrationOutcome | null;
+    connectionStatus: ConnectionStatus;
+    users: CollaboratorInfo[];
+    isProjectUnavailable: boolean;
+    isSessionReplaced: boolean;
+    isStaleClient: boolean;
+    currentUserInfo: UserInfo;
+    lastUsersJson: string;
+    refCount: number;
+    disposeTimer: ReturnType<typeof setTimeout> | null;
+    subscribers: Set<() => void>;
+};
 
-        return () => {
-            isDestroyed = true;
-            if (persistenceRef.current) {
-                persistenceRef.current.destroy();
-                persistenceRef.current = null;
-            }
-            setYdoc((prev) => {
-                prev?.destroy();
-                return null;
-            });
-            setIsLocalReady(false);
-            setMigrationOutcome(null);
-        };
-    }, [projectId]);
+const sessionCache = new Map<string, SessionEntry>();
 
-    return { ydoc, isLocalReady, migrationOutcome };
+const notifySubscribers = (entry: SessionEntry): void => {
+    entry.subscribers.forEach((cb) => cb());
 };
 
-// -------------------------------- //
-//          CLOUD SYNC              //
-// -------------------------------- //
-
 /**
- * Hook to manage cloud WebSocket synchronization.
+ * Has the cache evicted this entry while we were awaiting? Used to bail out
+ * of async init paths whose entry was disposed before they completed.
  */
-export const useCloudSync = (
-    projectId: string | null,
-    ydoc: ProjectState | null,
-    userInfo: UserInfo,
-) => {
-    const [provider, setProvider] = useState<ThrottledWebsocketProvider | null>(null);
-    const [users, setUsers] = useState<CollaboratorInfo[]>([]);
-    const [connectionStatus, setConnectionStatus] = useState<ConnectionStatus>("disconnected");
-    const [isCloudSynced, setIsCloudSynced] = useState(false);
-    const [isLockedByServer] = useState(false);
-    const [isSessionReplaced, setIsSessionReplaced] = useState(false);
-    const [isProjectUnavailable, setIsProjectUnavailable] = useState(false);
-    const [isStaleClient, setIsStaleClient] = useState(false);
-
-    const isMountedRef = useRef(true);
-    const providerRef = useRef<ThrottledWebsocketProvider | null>(null);
-    const lastUsersJsonRef = useRef<string>("");
-
-    // Use ref for userInfo to avoid triggering effects on every render
-    const userInfoRef = useRef(userInfo);
-    useEffect(() => {
-        userInfoRef.current = userInfo;
-    }, [userInfo]);
+const isLive = (entry: SessionEntry): boolean => sessionCache.get(entry.projectId) === entry;
 
-    // Ref for the refresh function so it can be called from event handlers
-    const refreshAndReconnectRef = useRef<() => Promise<void>>();
+const initLocalProvider = async (entry: SessionEntry): Promise<void> => {
+    const { createLocalYjsProvider } = await import("../persistence/y-local-provider");
+    if (!isLive(entry)) return;
 
-    // Refresh token and reconnect
-    const refreshAndReconnect = useCallback(async () => {
-        if (!providerRef.current || !projectId) return;
-
-        try {
-            const { token } = await getCloudToken(projectId);
-            if (token && isMountedRef.current) {
-                await providerRef.current.updateToken(token);
-            }
-        } catch (e) {
-            console.warn("[ProjectYjs] Failed to refresh token:", e);
+    const localProvider = await createLocalYjsProvider(entry.projectId, entry.state);
+    if (!isLive(entry)) {
+        localProvider.destroy();
+        return;
+    }
+    entry.localProvider = localProvider;
+
+    localProvider.on("synced", async () => {
+        const { migrateProjectDoc } = await import("./migrations/project-migration-runner");
+        const outcome = await migrateProjectDoc({ ydoc: entry.state, projectId: entry.projectId });
+        if (!isLive(entry)) return;
+        entry.migrationOutcome = outcome;
+        if (outcome.kind === "future-version" || outcome.kind === "failed") {
+            notifySubscribers(entry);
+            return;
         }
-    }, [projectId]);
+        entry.isLocalReady = true;
+        notifySubscribers(entry);
+        void initCloudProvider(entry);
+    });
+};
 
-    // Keep the ref up to date
-    useEffect(() => {
-        refreshAndReconnectRef.current = refreshAndReconnect;
-    }, [refreshAndReconnect]);
+const initCloudProvider = async (entry: SessionEntry): Promise<void> => {
+    if (entry.isCloudInitStarted) return;
+    entry.isCloudInitStarted = true;
+    entry.connectionStatus = "connecting";
+    notifySubscribers(entry);
 
-    // Initialize provider when doc is ready
-    useEffect(() => {
-        isMountedRef.current = true;
-        setIsProjectUnavailable(false);
-        setIsSessionReplaced(false);
-
-        if (!ydoc || !projectId || typeof window === "undefined") {
-            setConnectionStatus("disconnected");
+    try {
+        const { isTauri } = await import("@tauri-apps/api/core");
+        const isDesktop = isTauri();
+
+        const { isLocalOnlyProject } = await import(
+            "../persistence/storage-provider/local-persistence"
+        );
+        if (await isLocalOnlyProject(entry.projectId)) {
+            if (!isLive(entry)) return;
+            entry.connectionStatus = "disconnected";
+            entry.isCloudSynced = true;
+            notifySubscribers(entry);
             return;
         }
 
-        // If provider already exists for this doc, don't recreate
-        if (providerRef.current) {
+        const { token, status } = await getCloudToken(entry.projectId);
+        if (!isLive(entry)) return;
+        if (!token) {
+            entry.connectionStatus = "disconnected";
+            entry.isCloudSynced = true;
+            // 403 means the cloud project was deleted or the user was removed.
+            // Surface the recovery dialog on both desktop and web — the local
+            // cache is still valid and the user should choose what to do with it.
+            if (status === 403) entry.isProjectUnavailable = true;
+            notifySubscribers(entry);
             return;
         }
 
-        const setupProvider = async () => {
-            setConnectionStatus("connecting");
-
+        const { ThrottledWebsocketProvider } = await import("../cloud/utils");
+        if (!isLive(entry)) return;
+
+        const cloudWsUrl = (process.env.NEXT_PUBLIC_CLOUD_URL || "").replace(/^http/, "ws");
+        const cloudProvider = new ThrottledWebsocketProvider(
+            cloudWsUrl,
+            entry.projectId,
+            entry.state,
+            {
+                params: { token, clientId: entry.state.clientID.toString() },
+                userInfo: entry.currentUserInfo,
+                disableBc: isDesktop,
+            },
+        );
+        entry.cloudProvider = cloudProvider;
+        notifySubscribers(entry);
+
+        cloudProvider.awareness.on("update", () => {
+            const states = Array.from(cloudProvider.awareness.getStates().values());
+            const uniqueUsers = new Map<string, CollaboratorInfo>();
+            for (const s of states) {
+                if (s.user) {
+                    const user = s.user as CollaboratorInfo;
+                    const key = user.userId || user.name;
+                    if (!uniqueUsers.has(key)) uniqueUsers.set(key, user);
+                }
+            }
+            const next = Array.from(uniqueUsers.values());
+            const nextJson = JSON.stringify(next);
+            if (nextJson !== entry.lastUsersJson) {
+                entry.lastUsersJson = nextJson;
+                entry.users = next;
+                notifySubscribers(entry);
+            }
+        });
+
+        cloudProvider.on("connection-error", async () => {
+            // Skip terminal states — refreshing after a kick would just hit
+            // cloud-token, get 403, and loop forever.
+            if (cloudProvider.wasSessionReplaced || cloudProvider.wasKicked) return;
+            console.warn("[ProjectYjs] Connection error, attempting to refresh token...");
+            entry.connectionStatus = "connecting";
+            notifySubscribers(entry);
             try {
-                // Check if we're in Tauri environment first
-                const { isTauri } = await import("@tauri-apps/api/core");
-                const isDesktop = isTauri();
-
-                // Local-only projects (not cloud-synced) don't need cloud sync
-                const { isLocalOnlyProject } =
-                    await import("../persistence/storage-provider/local-persistence");
-                if (await isLocalOnlyProject(projectId)) {
-                    setConnectionStatus("disconnected");
-                    setIsCloudSynced(true);
+                const { token: refreshed, status: refreshStatus } = await getCloudToken(
+                    entry.projectId,
+                );
+                if (!isLive(entry)) return;
+                if (refreshStatus === 403) {
+                    cloudProvider.shouldConnect = false;
+                    cloudProvider.disconnect();
+                    entry.isProjectUnavailable = true;
+                    entry.connectionStatus = "disconnected";
+                    notifySubscribers(entry);
                     return;
                 }
-
-                const { token, status } = await getCloudToken(projectId);
-                if (!token || !isMountedRef.current) {
-                    setConnectionStatus("disconnected");
-                    setIsCloudSynced(true); // Mark as "synced" so isReady becomes true
-
-                    // 403 means the cloud project was deleted or the user was removed.
-                    // Surface the recovery dialog on both desktop and web — the local
-                    // cache is still valid and the user should choose what to do with it.
-                    if (status === 403) {
-                        setIsProjectUnavailable(true);
-                    }
-                    return;
+                if (refreshed) await cloudProvider.updateToken(refreshed);
+            } catch (e) {
+                console.warn("[ProjectYjs] Failed to refresh token:", e);
+            }
+        });
+
+        cloudProvider.on("status", (e: { status: string }) => {
+            entry.connectionStatus = e.status as ConnectionStatus;
+            if (e.status === "connected" && cloudProvider.synced) entry.isCloudSynced = true;
+            notifySubscribers(entry);
+        });
+
+        cloudProvider.on("sync", (isSynced: boolean) => {
+            if (isSynced) {
+                entry.isCloudSynced = true;
+                notifySubscribers(entry);
+            }
+        });
+
+        cloudProvider.on("session-replaced", () => {
+            entry.isSessionReplaced = true;
+            entry.connectionStatus = "disconnected";
+            notifySubscribers(entry);
+        });
+
+        cloudProvider.on("kicked", () => {
+            entry.isProjectUnavailable = true;
+            entry.connectionStatus = "disconnected";
+            notifySubscribers(entry);
+        });
+
+        cloudProvider.on("document-restored", async () => {
+            console.log("[ProjectYjs] Document restored — clearing local cache and reloading");
+            try {
+                if (entry.localProvider?.clearData) {
+                    await entry.localProvider.clearData();
+                } else {
+                    const { clearYjsData } = await import(
+                        "../persistence/storage-provider/local-persistence"
+                    );
+                    await clearYjsData(entry.projectId);
                 }
+            } catch (e) {
+                console.warn("[ProjectYjs] Failed to clear local cache:", e);
+            }
+            window.location.reload();
+        });
+
+        cloudProvider.on("stale-client-version", () => {
+            console.warn("[ProjectYjs] Server rejected this client as stale");
+            entry.isStaleClient = true;
+            notifySubscribers(entry);
+        });
+    } catch (e) {
+        console.error("[ProjectYjs] Failed to initialize provider:", e);
+        if (!isLive(entry)) return;
+        entry.connectionStatus = "disconnected";
+        entry.isCloudSynced = true;
+        notifySubscribers(entry);
+    }
+};
 
-                // Dynamically import collaboration utils
-                const { ThrottledWebsocketProvider } = await import("../cloud/utils");
-
-                const cloudWsUrl = (process.env.NEXT_PUBLIC_CLOUD_URL || "").replace(/^http/, "ws");
-                const cloudProvider = new ThrottledWebsocketProvider(
-                    cloudWsUrl,
-                    projectId,
-                    ydoc,
-                    {
-                        params: {
-                            token,
-                            clientId: ydoc.clientID.toString(),
-                        },
-                        userInfo: userInfoRef.current,
-                        disableBc: isDesktop,
-                    },
-                );
+const acquireSession = (projectId: string, userInfo: UserInfo): SessionEntry => {
+    const existing = sessionCache.get(projectId);
+    if (existing) {
+        existing.refCount++;
+        existing.currentUserInfo = userInfo;
+        existing.cloudProvider?.setUserInfo(userInfo);
+        if (existing.disposeTimer) {
+            clearTimeout(existing.disposeTimer);
+            existing.disposeTimer = null;
+        }
+        return existing;
+    }
 
-                // Track connected users - only update state if users actually changed
-                cloudProvider.awareness.on("update", () => {
-                    if (!isMountedRef.current) return;
-
-                    const states = Array.from(cloudProvider.awareness.getStates().values());
-                    const uniqueUsersMap = new Map<string, CollaboratorInfo>();
-
-                    for (const state of states) {
-                        if (state.user) {
-                            const user = state.user as CollaboratorInfo;
-                            const key = user.userId || user.name;
-                            if (!uniqueUsersMap.has(key)) {
-                                uniqueUsersMap.set(key, user);
-                            }
-                        }
-                    }
-
-                    const connectedUsers = Array.from(uniqueUsersMap.values());
-                    const usersJson = JSON.stringify(connectedUsers);
-                    if (usersJson !== lastUsersJsonRef.current) {
-                        lastUsersJsonRef.current = usersJson;
-                        setUsers(connectedUsers);
-                    }
-                });
-
-                // Handle connection errors
-                cloudProvider.on("connection-error", async () => {
-                    if (cloudProvider.wasSessionReplaced) return;
-                    console.warn("[ProjectYjs] Connection error, attempting to refresh token...");
-                    if (isMountedRef.current) {
-                        setConnectionStatus("connecting");
-                        if (refreshAndReconnectRef.current) {
-                            await refreshAndReconnectRef.current();
-                        } else {
-                            cloudProvider.scheduleReconnect();
-                        }
-                    }
-                });
-
-                // Status updates
-                cloudProvider.on("status", (e: { status: string }) => {
-                    if (!isMountedRef.current) return;
-                    setConnectionStatus(e.status as ConnectionStatus);
-                    if (e.status === "connected" && cloudProvider.synced) {
-                        setIsCloudSynced(true);
-                    }
-                });
-
-                // Track when initial cloud sync completes
-                cloudProvider.on("sync", (isSynced: boolean) => {
-                    if (isMountedRef.current && isSynced) {
-                        setIsCloudSynced(true);
-                    }
-                });
-
-                // Surface session-replaced state to the UI so the connection
-                // indicator and recovery dialogs reflect the terminal state
-                // (the provider stops reconnecting after this fires).
-                cloudProvider.on("session-replaced", () => {
-                    if (!isMountedRef.current) return;
-                    setIsSessionReplaced(true);
-                    setConnectionStatus("disconnected");
-                });
-
-                // Handle document restore
-                cloudProvider.on("document-restored", async () => {
-                    if (!isMountedRef.current) return;
-                    console.log(
-                        "[ProjectYjs] Document restored — clearing local cache and reloading",
-                    );
-                    await clearLocalProjectCache(projectId);
-                    window.location.reload();
-                });
-
-                // Server rejected this client as stale — its bundle predates
-                // the doc's schema version. Surface to the UI so the user is
-                // prompted to update.
-                cloudProvider.on("stale-client-version", () => {
-                    if (!isMountedRef.current) return;
-                    console.warn("[ProjectYjs] Server rejected this client as stale");
-                    setIsStaleClient(true);
-                });
-
-                // Poll for synced status
-                const checkSynced = () => {
-                    if (!isMountedRef.current) return;
-                    if (cloudProvider.synced) {
-                        setIsCloudSynced(true);
-                    } else {
-                        setTimeout(checkSynced, 100);
-                    }
-                };
-                setTimeout(checkSynced, 50);
+    const entry: SessionEntry = {
+        projectId,
+        state: new ProjectState(),
+        localProvider: null,
+        cloudProvider: null,
+        isLocalReady: false,
+        isCloudSynced: false,
+        isCloudInitStarted: false,
+        migrationOutcome: null,
+        connectionStatus: "disconnected",
+        users: [],
+        isProjectUnavailable: false,
+        isSessionReplaced: false,
+        isStaleClient: false,
+        currentUserInfo: userInfo,
+        lastUsersJson: "",
+        refCount: 1,
+        disposeTimer: null,
+        subscribers: new Set(),
+    };
+    sessionCache.set(projectId, entry);
+    void initLocalProvider(entry);
+    return entry;
+};
 
-                providerRef.current = cloudProvider;
-                setProvider(cloudProvider);
-            } catch (e) {
-                console.error("[ProjectYjs] Failed to initialize provider:", e);
-                if (isMountedRef.current) {
-                    setConnectionStatus("disconnected");
-                    setIsCloudSynced(true);
-                }
-            }
-        };
+const releaseSession = (projectId: string): void => {
+    const entry = sessionCache.get(projectId);
+    if (!entry) return;
+    entry.refCount--;
+    if (entry.refCount > 0) return;
 
-        setupProvider();
+    // Defer disposal so a synchronous remount (StrictMode) can cancel it via
+    // clearTimeout in acquireSession before the resources are torn down.
+    entry.disposeTimer = setTimeout(async () => {
+        entry.disposeTimer = null;
+        if (entry.refCount > 0) return;
 
-        const handleUnload = async () => {
-            if (providerRef.current && ydoc) {
+        if (entry.cloudProvider) {
+            try {
                 const { removeAwarenessStates } = await getYProtocols();
                 removeAwarenessStates(
-                    providerRef.current.awareness,
-                    [ydoc.clientID],
-                    "window unload",
+                    entry.cloudProvider.awareness,
+                    [entry.state.clientID],
+                    "session release",
                 );
-            }
-        };
-
-        window.addEventListener("beforeunload", handleUnload);
-
-        return () => {
-            isMountedRef.current = false;
-            window.removeEventListener("beforeunload", handleUnload);
-        };
-    }, [ydoc, projectId]);
-
-    useEffect(() => {
-        if (providerRef.current) {
-            providerRef.current.setUserInfo(userInfo);
+            } catch {}
+            entry.cloudProvider.destroy();
         }
-    }, [userInfo]);
-
-    useEffect(() => {
-        return () => {
-            if (providerRef.current) {
-                if (ydoc) {
-                    getYProtocols().then(({ removeAwarenessStates }) => {
-                        if (providerRef.current) {
-                            removeAwarenessStates(
-                                providerRef.current.awareness,
-                                [ydoc.clientID],
-                                "component unmount",
-                            );
-                            providerRef.current.destroy();
-                            providerRef.current = null;
-                            setProvider(null);
-                        }
-                    });
-                } else {
-                    providerRef.current.destroy();
-                    providerRef.current = null;
-                    setProvider(null);
-                }
-            }
-        };
-    }, [ydoc]);
-
-    return {
-        provider,
-        users,
-        connectionStatus,
-        isCloudSynced,
-        refreshAndReconnect,
-        isLockedByServer,
-        isSessionReplaced,
-        isProjectUnavailable,
-        isStaleClient,
-    };
+        entry.localProvider?.destroy();
+        entry.state.destroy();
+        sessionCache.delete(projectId);
+    }, 0);
 };
 
 // -------------------------------- //
@@ -516,13 +434,28 @@ export interface UseProjectYjsOptions {
     userId?: string;
 }
 
+const computeStatus = (entry: SessionEntry | null): ProjectStatus => {
+    if (!entry) return { kind: "loading" };
+    if (entry.isStaleClient) {
+        return { kind: "needs-update", outcome: { kind: "stale-client" } };
+    }
+    if (
+        entry.migrationOutcome?.kind === "future-version" ||
+        entry.migrationOutcome?.kind === "failed"
+    ) {
+        return { kind: "needs-update", outcome: entry.migrationOutcome };
+    }
+    if (entry.isProjectUnavailable) return { kind: "unavailable" };
+    if (!entry.isLocalReady) return { kind: "loading" };
+    return { kind: "ready" };
+};
+
 export const useProjectYjs = ({
     projectId,
     userName,
     userColor,
     userId,
 }: UseProjectYjsOptions): ProjectYjsState & {
-    isReady: boolean;
     refreshAndReconnect: () => Promise<void>;
 } => {
     const [fallback] = useState(() => ({
@@ -538,39 +471,80 @@ export const useProjectYjs = ({
         [userName, userColor, userId, fallback.name, fallback.color],
     );
 
-    const { ydoc, isLocalReady, migrationOutcome } = useLocalPersistence(projectId);
-    const {
-        provider,
-        users,
-        connectionStatus,
-        isCloudSynced,
-        refreshAndReconnect,
-        isLockedByServer,
-        isSessionReplaced,
-        isProjectUnavailable,
-        isStaleClient,
-    } = useCloudSync(projectId, isLocalReady ? ydoc : null, userInfo);
+    const entryRef = useRef<SessionEntry | null>(null);
+    const [, setVersion] = useState(0);
+
+    useEffect(() => {
+        if (!projectId || typeof window === "undefined") {
+            entryRef.current = null;
+            setVersion((v) => v + 1);
+            return;
+        }
+
+        const entry = acquireSession(projectId, userInfo);
+        entryRef.current = entry;
+        const onChange = () => setVersion((v) => v + 1);
+        entry.subscribers.add(onChange);
+        setVersion((v) => v + 1);
+
+        const handleUnload = async () => {
+            if (entry.cloudProvider) {
+                const { removeAwarenessStates } = await getYProtocols();
+                removeAwarenessStates(
+                    entry.cloudProvider.awareness,
+                    [entry.state.clientID],
+                    "window unload",
+                );
+            }
+        };
+        window.addEventListener("beforeunload", handleUnload);
+
+        return () => {
+            window.removeEventListener("beforeunload", handleUnload);
+            entry.subscribers.delete(onChange);
+            entryRef.current = null;
+            releaseSession(projectId);
+        };
+        // userInfo is intentionally NOT in the deps: re-acquiring on every
+        // userInfo change would defeat the cache. Updates flow via the
+        // separate effect below, which calls setUserInfo on the live provider.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [projectId]);
 
-    // isReady: project is ready when ydoc exists and local storage is synced
-    // Cloud sync happens in the background and will merge data when it arrives
-    const isCloudReady = connectionStatus === "connected";
-    const isReady = ydoc !== null && isLocalReady;
+    useEffect(() => {
+        const entry = entryRef.current;
+        if (!entry) return;
+        entry.currentUserInfo = userInfo;
+        entry.cloudProvider?.setUserInfo(userInfo);
+    }, [userInfo]);
+
+    const refreshAndReconnect = useCallback(async () => {
+        const entry = entryRef.current;
+        if (!entry?.cloudProvider || !projectId) return;
+        try {
+            const { token, status } = await getCloudToken(projectId);
+            if (status === 403) {
+                entry.cloudProvider.shouldConnect = false;
+                entry.cloudProvider.disconnect();
+                entry.isProjectUnavailable = true;
+                entry.connectionStatus = "disconnected";
+                notifySubscribers(entry);
+                return;
+            }
+            if (token) await entry.cloudProvider.updateToken(token);
+        } catch (e) {
+            console.warn("[ProjectYjs] Failed to refresh token:", e);
+        }
+    }, [projectId]);
 
+    const entry = entryRef.current;
     return {
-        ydoc,
-        provider,
-        isLocalReady,
-        isCloudReady,
-        isCloudSynced,
-        isReady,
-        connectionStatus,
-        users,
+        ydoc: entry?.state ?? null,
+        provider: entry?.cloudProvider ?? null,
+        status: computeStatus(entry),
+        connectionStatus: entry?.connectionStatus ?? "disconnected",
+        users: entry?.users ?? [],
         refreshAndReconnect,
-        isLockedByServer,
-        isSessionReplaced,
-        isProjectUnavailable,
-        isStaleClient,
-        migrationOutcome,
     };
 };
 
diff --git a/src/lib/screenplay/characters.ts b/src/lib/screenplay/characters.ts
index 38dbb98f..b9d59995 100644
--- a/src/lib/screenplay/characters.ts
+++ b/src/lib/screenplay/characters.ts
@@ -11,7 +11,6 @@ import { ProjectContextType } from "@src/context/ProjectContext";
 import { getNodeFlattenContent } from "./screenplay";
 import { ScreenplayElement } from "../utils/enums";
 import { Screenplay } from "../utils/types";
-import { getCharactersMap } from "@src/lib/project/project-state";
 
 // -------------------------------- //
 //          TYPE DEFINITIONS        //
@@ -46,13 +45,14 @@ export type CharacterItem = {
  * This will automatically sync to all connected collaborators.
  */
 export const upsertCharacterData = (data: CharacterData, projectCtx: ProjectContextType) => {
-    const ydoc = projectCtx.repository?.getState();
-    if (!ydoc) {
+    if (projectCtx.isReadOnly) return;
+    const projectState = projectCtx.repository?.getState();
+    if (!projectState) {
         console.warn("[Characters] Cannot upsert: Yjs document not available");
         return;
     }
 
-    const charactersMap = getCharactersMap(ydoc);
+    const charactersMap = projectState.characters();
     const characterItem: CharacterItem = {
         persistent: true, // Explicitly created/edited characters are always persistent
         gender: data.gender,
@@ -71,13 +71,14 @@ export const upsertCharacterData = (data: CharacterData, projectCtx: ProjectCont
  * Delete a character from the Yjs document.
  */
 export const deleteCharacter = (name: string, projectCtx: ProjectContextType) => {
-    const ydoc = projectCtx.repository?.getState();
-    if (!ydoc) {
+    if (projectCtx.isReadOnly) return;
+    const projectState = projectCtx.repository?.getState();
+    if (!projectState) {
         console.warn("[Characters] Cannot delete: Yjs document not available");
         return;
     }
 
-    const charactersMap = getCharactersMap(ydoc);
+    const charactersMap = projectState.characters();
     if (charactersMap.has(name)) {
         charactersMap.delete(name);
         console.log(`[Characters] Deleted character: ${name}`);
@@ -89,14 +90,19 @@ export const deleteCharacter = (name: string, projectCtx: ProjectContextType) =>
  * If the character exists in the persistent map, it will be renamed.
  * If not, this is a no-op (the character will be created by upsertCharacterData).
  */
-export const renameCharacter = (oldName: string, newName: string, projectCtx: ProjectContextType) => {
-    const ydoc = projectCtx.repository?.getState();
-    if (!ydoc) {
+export const renameCharacter = (
+    oldName: string,
+    newName: string,
+    projectCtx: ProjectContextType,
+) => {
+    if (projectCtx.isReadOnly) return;
+    const projectState = projectCtx.repository?.getState();
+    if (!projectState) {
         console.warn("[Characters] Cannot rename: Yjs document not available");
         return;
     }
 
-    const charactersMap = getCharactersMap(ydoc);
+    const charactersMap = projectState.characters();
 
     // Find the character with case-insensitive matching
     const oldNameUpper = oldName.toUpperCase();
@@ -112,7 +118,7 @@ export const renameCharacter = (oldName: string, newName: string, projectCtx: Pr
 
     if (existingKey && character) {
         const characterToRename = character;
-        ydoc.transact(() => {
+        projectState.transact(() => {
             charactersMap.delete(existingKey!);
             charactersMap.set(newName.toUpperCase(), characterToRename);
         });
@@ -132,7 +138,10 @@ export const doesCharacterExist = (name: string, projectCtx: ProjectContextType)
 /**
  * Get a character by name (case-insensitive).
  */
-export const getCharacter = (name: string, projectCtx: ProjectContextType): CharacterItem | undefined => {
+export const getCharacter = (
+    name: string,
+    projectCtx: ProjectContextType,
+): CharacterItem | undefined => {
     if (!projectCtx.characters) return undefined;
     const nameUppered = name.toUpperCase();
     const key = Object.keys(projectCtx.characters).find((k) => k.toUpperCase() === nameUppered);
@@ -175,7 +184,10 @@ export const getCharacterNames = (screenplay: Screenplay): string[] => {
 /**
  * Count how many times a character appears in the screenplay.
  */
-export const countCharacterAppearances = (screenplay: Screenplay, characterName: string): number => {
+export const countCharacterAppearances = (
+    screenplay: Screenplay,
+    characterName: string,
+): number => {
     if (!screenplay) return 0;
 
     const upperName = characterName.toUpperCase();
@@ -216,7 +228,10 @@ export const createDefaultCharacterItem = (): CharacterItem => ({
  * - Persistent characters (from Yjs) take precedence
  * - Auto-detected characters (from screenplay) fill in the rest with default values
  */
-export const mergeCharactersData = (persistentCharacters: CharacterMap, screenplay: Screenplay): CharacterMap => {
+export const mergeCharactersData = (
+    persistentCharacters: CharacterMap,
+    screenplay: Screenplay,
+): CharacterMap => {
     const result: CharacterMap = { ...persistentCharacters };
     const namesFromScreenplay = getCharacterNames(screenplay);
 
diff --git a/src/lib/screenplay/locations.ts b/src/lib/screenplay/locations.ts
index 45500f55..23ab6f82 100644
--- a/src/lib/screenplay/locations.ts
+++ b/src/lib/screenplay/locations.ts
@@ -11,7 +11,6 @@ import { ProjectContextType } from "@src/context/ProjectContext";
 import { getNodeFlattenContent } from "./screenplay";
 import { ScreenplayElement } from "../utils/enums";
 import { Screenplay } from "../utils/types";
-import { getLocationsMap } from "@src/lib/project/project-state";
 
 // -------------------------------- //
 //          TYPE DEFINITIONS        //
@@ -38,13 +37,14 @@ export type LocationItem = {
  * This will automatically sync to all connected collaborators.
  */
 export const upsertLocationData = (data: LocationData, projectCtx: ProjectContextType) => {
+    if (projectCtx.isReadOnly) return;
     const ydoc = projectCtx.repository?.getState();
     if (!ydoc) {
         console.warn("[Locations] Cannot upsert: Yjs document not available");
         return;
     }
 
-    const locationsMap = getLocationsMap(ydoc);
+    const locationsMap = ydoc.locations();
     const locationItem: LocationItem = {
         persistent: true,
         description: data.description,
@@ -61,13 +61,14 @@ export const upsertLocationData = (data: LocationData, projectCtx: ProjectContex
  * Delete a location from the Yjs document.
  */
 export const deleteLocation = (name: string, projectCtx: ProjectContextType) => {
+    if (projectCtx.isReadOnly) return;
     const ydoc = projectCtx.repository?.getState();
     if (!ydoc) {
         console.warn("[Locations] Cannot delete: Yjs document not available");
         return;
     }
 
-    const locationsMap = getLocationsMap(ydoc);
+    const locationsMap = ydoc.locations();
     if (locationsMap.has(name)) {
         locationsMap.delete(name);
         console.log(`[Locations] Deleted location: ${name}`);
@@ -78,13 +79,14 @@ export const deleteLocation = (name: string, projectCtx: ProjectContextType) =>
  * Rename a location in the Yjs document.
  */
 export const renameLocation = (oldName: string, newName: string, projectCtx: ProjectContextType) => {
+    if (projectCtx.isReadOnly) return;
     const ydoc = projectCtx.repository?.getState();
     if (!ydoc) {
         console.warn("[Locations] Cannot rename: Yjs document not available");
         return;
     }
 
-    const locationsMap = getLocationsMap(ydoc);
+    const locationsMap = ydoc.locations();
     const location = locationsMap.get(oldName);
 
     if (location) {
@@ -233,7 +235,7 @@ export const isLocationPersistent = (name: string, projectCtx: ProjectContextTyp
     const ydoc = projectCtx.repository?.getState();
     if (!ydoc) return false;
 
-    const locationsMap = getLocationsMap(ydoc);
+    const locationsMap = ydoc.locations();
     const upperName = name.toUpperCase();
 
     let found = false;
@@ -252,10 +254,11 @@ export const isLocationPersistent = (name: string, projectCtx: ProjectContextTyp
  * If not, creates a new persistent location entry.
  */
 export const makeLocationPersistent = (name: string, projectCtx: ProjectContextType, data?: Partial<LocationItem>) => {
+    if (projectCtx.isReadOnly) return;
     const ydoc = projectCtx.repository?.getState();
     if (!ydoc) return;
 
-    const locationsMap = getLocationsMap(ydoc);
+    const locationsMap = ydoc.locations();
 
     // Get existing data from merged locations (could be auto-detected)
     const existingData = projectCtx.locations?.[name] || createDefaultLocationItem();

From c9b42494811a0fa79d681d9045f3c05ba340e40f Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Sun, 10 May 2026 03:18:43 +0200
Subject: [PATCH 48/76] fixed is-empty css on cloud sync, collab caret, added
 durable object observability

---
 .../project/CollaboratorsSettings.tsx         | 28 +------
 src/context/ProjectContext.tsx                | 19 ++++-
 src/lib/cloud/protocol.ts                     | 22 +++--
 src/lib/cloud/room.ts                         | 84 +++++++++----------
 src/lib/cloud/utils.ts                        | 41 ++++-----
 src/lib/cloud/wrangler.toml                   |  4 +
 src/lib/editor/use-document-editor.ts         | 15 ++--
 .../extensions/placeholder-extension.ts       | 24 +-----
 styles/scriptio.css                           | 43 +++++++++-
 9 files changed, 154 insertions(+), 126 deletions(-)

diff --git a/components/dashboard/project/CollaboratorsSettings.tsx b/components/dashboard/project/CollaboratorsSettings.tsx
index 05f4b053..1270f6b7 100644
--- a/components/dashboard/project/CollaboratorsSettings.tsx
+++ b/components/dashboard/project/CollaboratorsSettings.tsx
@@ -3,11 +3,11 @@
 import { useContext, useMemo, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import { useTranslations } from "next-intl";
-import { useCookieUser, useIsPro, useProjectCollaborators, useProjectInvites, useProjectMembership } from "@src/lib/utils/hooks";
+import { useCookieUser, useProjectCollaborators, useProjectInvites, useProjectMembership } from "@src/lib/utils/hooks";
 import { CookieUser } from "@src/lib/utils/types";
 import { ProjectRole } from "../../../src/generated/client/browser";
 import { Collaborator, ProjectInvite, ProjectMembershipPayload } from "@src/server/repository/project-repository";
-import { Info, Lock } from "lucide-react";
+import { Info } from "lucide-react";
 
 import form from "./../../utils/Form.module.css";
 import shared from "./ProjectSettings.module.css";
@@ -16,7 +16,6 @@ import { deleteInvite, inviteCollaborator, kickCollaborator, updateMemberRole }
 
 import * as Roles from "@src/lib/utils/roles";
 import { DashboardContext } from "@src/context/DashboardContext";
-import Link from "next/link";
 
 const MAX_COLLABORATORS = 5;
 
@@ -26,7 +25,6 @@ const CollaboratorsSettings = () => {
     const { invites, mutate: mutateInvites } = useProjectInvites(membership?.project.id);
     const { collaborators, mutate: mutateCollaborators } = useProjectCollaborators(membership?.project.id);
     const { user } = useCookieUser();
-    const { isPro } = useIsPro();
 
     const slots = useMemo(() => {
         if (!membership) return [];
@@ -103,15 +101,6 @@ const CollaboratorsSettings = () => {
                 </div>
                 <p className={shared.helpText}>{t("teamHelp")}</p>
 
-                {/* Pro gate banner */}
-                {!isPro && (
-                    <div className={styles.proGateBanner}>
-                        <Lock size={14} />
-                        <span>{t("proRequired")}</span>
-                        <Link href="/?settings=Profile" className={styles.proGateLink}>{t("upgrade")}</Link>
-                    </div>
-                )}
-
                 {/* Project Collaborators */}
                 <div className={styles.slotGrid}>
                     {slots.map((slot) => {
@@ -137,7 +126,7 @@ const CollaboratorsSettings = () => {
                                 );
                             case "EMPTY":
                                 return (
-                                    <EmptySlot key={slot.key} membership={membership} mutateInvites={mutateInvites} isPro={isPro} />
+                                    <EmptySlot key={slot.key} membership={membership} mutateInvites={mutateInvites} />
                                 );
                             default:
                                 return null;
@@ -257,10 +246,9 @@ const InviteSlot = ({ data, membership, mutateInvites }: InviteSlotProps) => {
 interface EmptySlotProps {
     membership: ProjectMembershipPayload;
     mutateInvites: () => void;
-    isPro: boolean;
 }
 
-const EmptySlot = ({ membership, mutateInvites, isPro }: EmptySlotProps) => {
+const EmptySlot = ({ membership, mutateInvites }: EmptySlotProps) => {
     const t = useTranslations("collaborators");
     const [email, setEmail] = useState("");
 
@@ -273,14 +261,6 @@ const EmptySlot = ({ membership, mutateInvites, isPro }: EmptySlotProps) => {
         }
     };
 
-    if (!isPro) {
-        return (
-            <div className={`${styles.slot} ${styles.empty}`}>
-                <span className={styles.proHint}>{t("proRequiredInvite")}</span>
-            </div>
-        );
-    }
-
     return (
         <div className={`${styles.slot} ${styles.empty}`}>
             <div className={styles.inviteAction}>
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index 74e4c638..f13d1f2b 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -370,14 +370,29 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
     // revalidation of the membership endpoint.
     useEffect(() => {
         if (!provider) return;
-        const handler = (newRole: string) => {
+        const handler = async (newRole: string) => {
             setProject((prev) => (prev ? { ...prev, role: newRole as ProjectRole } : prev));
+            if (project?.project.id) {
+                try {
+                    const res = await fetch(`/api/projects/${project.project.id}/cloud-token`);
+                    if (res.ok) {
+                        const { token } = (await res.json()) as { token: string };
+                        if (token) {
+                            // Update token silently so future reconnects use the new role
+                            // We don't force reconnect because the DO already updated our active session
+                            await provider.updateToken(token, false);
+                        }
+                    }
+                } catch (e) {
+                    console.warn("Failed to fetch new token on role change", e);
+                }
+            }
         };
         provider.on("role-changed", handler);
         return () => {
             provider.off("role-changed", handler);
         };
-    }, [provider]);
+    }, [provider, project?.project.id]);
 
     const updateScreenplay = useCallback((newScreenplay: Screenplay) => {
         setScreenplay(newScreenplay);
diff --git a/src/lib/cloud/protocol.ts b/src/lib/cloud/protocol.ts
index 261ba4b2..07ae86d9 100644
--- a/src/lib/cloud/protocol.ts
+++ b/src/lib/cloud/protocol.ts
@@ -42,9 +42,10 @@ export function handleProtocolMessage(room: ProjectRoom, fullMessage: Uint8Array
                             // apply them, so the rest of the packet stays parseable.
                             if (isReadOnly) {
                                 decoding.readVarUint8Array(decoder);
-                                console.warn(
-                                    `[Room] Dropped doc write from viewer ${session?.userId ?? "?"}`,
-                                );
+                                console.warn(JSON.stringify({
+                                    event: "dropped_write_from_viewer",
+                                    userId: session?.userId ?? "?"
+                                }));
                             } else if (subType === SYNC_STEP_2) {
                                 syncProtocol.readSyncStep2(decoder, room.doc, sender);
                             } else {
@@ -52,12 +53,15 @@ export function handleProtocolMessage(room: ProjectRoom, fullMessage: Uint8Array
                             }
                         } else {
                             // Unknown sub-type — bail to avoid mis-aligning the decoder.
-                            console.warn(`[Room] Unknown sync sub-message type: ${subType}`);
+                            console.warn(JSON.stringify({
+                                event: "unknown_sync_sub_message_type",
+                                subType
+                            }));
                             break;
                         }
                     }
                 } catch (e) {
-                    console.error("[Room] Error reading sync message:", e);
+                    console.error(JSON.stringify({ event: "error_reading_sync_message", error: String(e) }));
                 }
 
                 // If there's a response to send (e.g., SyncStep2 in response to SyncStep1),
@@ -96,11 +100,15 @@ export function handleProtocolMessage(room: ProjectRoom, fullMessage: Uint8Array
                 break;
 
             default:
-                console.warn(`[Room] Unknown message type: ${messageType}`);
+                console.warn(JSON.stringify({ event: "unknown_message_type", messageType }));
                 break;
         }
     } catch (e) {
-        console.error(`[Room] Protocol error for message type ${messageType}:`, e);
+        console.error(JSON.stringify({
+            event: "protocol_error",
+            messageType,
+            error: String(e)
+        }));
         // For non-awareness messages, still try to broadcast (might be important)
         if (messageType !== 1) {
             room.broadcast(fullMessage, sender);
diff --git a/src/lib/cloud/room.ts b/src/lib/cloud/room.ts
index 8d359e1b..ac9156e7 100644
--- a/src/lib/cloud/room.ts
+++ b/src/lib/cloud/room.ts
@@ -179,16 +179,14 @@ export class ProjectRoom extends DurableObject {
             this.userConnections.set(attachment.userId, ws);
         }
         if (hibernatedSockets.length > 0) {
-            console.log(
-                `[Room] Restored ${this.sessions.size} session(s) from ${hibernatedSockets.length} hibernated WebSocket(s)`,
-            );
+            console.log(JSON.stringify({ event: "room_restore", hibernatedSockets: hibernatedSockets.length, restoredSessions: this.sessions.size }));
             // Awareness state was lost when the DO hibernated. Ask all
             // restored clients to re-broadcast their awareness so we can
             // rebuild room.awareness from scratch.
             this.broadcastAwarenessRequest();
         }
 
-        console.log("[Room] Initialized");
+        console.log(JSON.stringify({ event: "room_initialized" }));
     }
 
     /**
@@ -219,10 +217,7 @@ export class ProjectRoom extends DurableObject {
                 break;
             case "migrated":
                 this.docVersion = outcome.to;
-                console.log(
-                    `[Room] Migrated doc from v${outcome.from} to v${outcome.to} ` +
-                        `(${outcome.appliedSteps.length} step${outcome.appliedSteps.length === 1 ? "" : "s"})`,
-                );
+                console.log(JSON.stringify({ event: "document_migrated", fromVersion: outcome.from, toVersion: outcome.to, steps: outcome.appliedSteps.length }));
                 // Persist the migrated state immediately so a restart doesn't replay.
                 await this.saveToDisk();
                 break;
@@ -231,18 +226,12 @@ export class ProjectRoom extends DurableObject {
                 // Refuse new connections until the worker is upgraded.
                 this.docMigrationFailed = true;
                 this.docVersion = outcome.storedVersion;
-                console.error(
-                    `[Room] Doc at v${outcome.storedVersion} but worker only supports v${outcome.expected}. ` +
-                        `Worker is out of date — refusing connections.`,
-                );
+                console.error(JSON.stringify({ event: "document_migration_future_version", storedVersion: outcome.storedVersion, expectedVersion: outcome.expected, message: "Worker is out of date — refusing connections." }));
                 break;
             case "failed":
                 this.docMigrationFailed = true;
                 this.docVersion = outcome.from;
-                console.error(
-                    `[Room] Doc migration failed at step v${outcome.failedAt} ` + `(stored v${outcome.from}):`,
-                    outcome.error,
-                );
+                console.error(JSON.stringify({ event: "document_migration_failed", failedAtStep: outcome.failedAt, storedVersion: outcome.from, error: String(outcome.error) }));
                 break;
         }
     }
@@ -305,12 +294,12 @@ export class ProjectRoom extends DurableObject {
                 await (this.env as Env).SNAPSHOTS.put(key, state, {
                     customMetadata: { type: "auto" },
                 });
-                console.log(`[Room] Snapshot saved to R2: ${key}`);
+                console.log(JSON.stringify({ event: "snapshot_saved", key }));
 
                 // Run retention cleanup
                 await this.cleanupAutoSaves();
             } catch (e) {
-                console.error("[Room] Failed to snapshot to R2:", e);
+                console.error(JSON.stringify({ event: "snapshot_failed", error: String(e) }));
                 // Re-mark dirty so next alarm retries
                 this.isDirty = true;
                 this.scheduleSnapshotAlarm();
@@ -381,7 +370,7 @@ export class ProjectRoom extends DurableObject {
         // Batch delete (R2 supports up to 1000 keys per delete)
         if (toDelete.length > 0) {
             await (this.env as Env).SNAPSHOTS.delete(toDelete);
-            console.log(`[Room] Retention cleanup: deleted ${toDelete.length} auto-saves`);
+            console.log(JSON.stringify({ event: "retention_cleanup", deletedCount: toDelete.length }));
         }
     }
 
@@ -419,9 +408,7 @@ export class ProjectRoom extends DurableObject {
             const timeSinceActivity = now - session.lastActivity;
 
             if (timeSinceActivity > STALE_AWARENESS_TIMEOUT_MS) {
-                console.log(
-                    `[Room] Session for user ${session.userId} is stale (${timeSinceActivity}ms since activity)`,
-                );
+                console.log(JSON.stringify({ event: "stale_session", userId: session.userId, timeSinceActivity }));
                 staleClientIds.push(...session.clientIds);
                 staleSockets.push(socket);
             }
@@ -470,7 +457,7 @@ export class ProjectRoom extends DurableObject {
                 }
             }
 
-            console.log(`[Room] Cleaned up ${staleClientIds.length} stale awareness states`);
+            console.log(JSON.stringify({ event: "cleaned_stale_awareness", count: staleClientIds.length }));
         }
     }
 
@@ -567,7 +554,7 @@ export class ProjectRoom extends DurableObject {
 
             this.ctx.storage.sql.exec("INSERT OR IGNORE INTO blacklist (user_id) VALUES (?);", userId);
 
-            console.log(`[Room] Blacklisted user ${userId}`);
+            console.log(JSON.stringify({ event: "user_blacklisted", userId }));
             return new Response(`User ${userId} blacklisted.`, { status: 200 });
         }
 
@@ -583,7 +570,7 @@ export class ProjectRoom extends DurableObject {
                 this.ctx.storage.sql.exec("DELETE FROM blacklist WHERE user_id = ?;", userId);
             }
 
-            console.log(`[Room] Allowed user ${userId}`);
+            console.log(JSON.stringify({ event: "user_allowed", userId }));
             return new Response(`User ${userId} allowed.`, { status: 200 });
         }
 
@@ -612,11 +599,11 @@ export class ProjectRoom extends DurableObject {
                     encoding.writeVarString(encoder, role);
                     socket.send(encoding.toUint8Array(encoder));
                 } catch (e) {
-                    console.warn(`[Room] Failed to push role-update to ${userId}:`, e);
+                    console.error(JSON.stringify({ event: "role_update_push_failed", userId, error: String(e) }));
                 }
             }
 
-            console.log(`[Room] Role updated for user ${userId} -> ${role}`);
+            console.log(JSON.stringify({ event: "role_updated", userId, role }));
             return new Response(`User ${userId} role updated.`, { status: 200 });
         }
 
@@ -670,7 +657,7 @@ export class ProjectRoom extends DurableObject {
             const clientVersionParam = url.searchParams.get("clientVersion");
             const clientVersion = clientVersionParam !== null ? Number(clientVersionParam) : NaN;
             if (Number.isFinite(clientVersion) && clientVersion < this.docVersion) {
-                console.log(`[Room] Rejecting stale client v${clientVersion} (doc at v${this.docVersion})`);
+                console.warn(JSON.stringify({ event: "client_rejected_stale", clientVersion, docVersion: this.docVersion }));
                 try {
                     server.close(4006, `Stale client: update to access v${this.docVersion}`);
                 } catch {}
@@ -709,7 +696,7 @@ export class ProjectRoom extends DurableObject {
                 server.send(encoding.toUint8Array(awarenessEncoder));
             }
 
-            console.log(`[Room] User ${userId} connected. Total sessions: ${this.sessions.size}`);
+            console.log(JSON.stringify({ event: "user_connected", userId, totalSessions: this.sessions.size }));
 
             // Opportunistic cleanup on connect — a new client arriving is the
             // best moment to drop awareness for clients that quietly went away.
@@ -793,7 +780,7 @@ export class ProjectRoom extends DurableObject {
             customMetadata: { type: "manual", name },
         });
 
-        console.log(`[Room] Manual save created: ${name}`);
+        console.log(JSON.stringify({ event: "manual_save_created", name }));
 
         const entry: SaveEntry = { key, type: "manual", name, date: timestamp, size: state.byteLength };
         return Response.json(entry, { status: 201 });
@@ -856,7 +843,7 @@ export class ProjectRoom extends DurableObject {
         this.sessions.clear();
         this.userConnections.clear();
 
-        console.log(`[Room] Restored from: ${key}`);
+        console.log(JSON.stringify({ event: "restored_from_save", key }));
         return new Response("Restored", { status: 200 });
     }
 
@@ -882,7 +869,7 @@ export class ProjectRoom extends DurableObject {
         });
         await (this.env as Env).SNAPSHOTS.delete(key);
 
-        console.log(`[Room] Renamed save: ${key} -> ${name}`);
+        console.log(JSON.stringify({ event: "save_renamed", key, name }));
         return new Response("Renamed", { status: 200 });
     }
 
@@ -893,7 +880,7 @@ export class ProjectRoom extends DurableObject {
         }
 
         await (this.env as Env).SNAPSHOTS.delete(key);
-        console.log(`[Room] Deleted save: ${key}`);
+        console.log(JSON.stringify({ event: "save_deleted", key }));
         return new Response("Deleted", { status: 200 });
     }
 
@@ -921,17 +908,17 @@ export class ProjectRoom extends DurableObject {
             const fullDocState = Y.encodeStateAsUpdate(this.doc);
             this.ctx.storage.sql.exec("INSERT OR REPLACE INTO project (id, data) VALUES (1, ?);", fullDocState);
             this.saveTimeout = null;
-            console.log("[Room] Document saved to disk");
+            console.log(JSON.stringify({ event: "document_saved" }));
         } catch (e) {
-            console.error("[Room] Failed to save document:", e);
+            console.error(JSON.stringify({ event: "document_save_failed", error: String(e) }));
         }
     }
 
-    async webSocketClose(ws: WebSocket): Promise<void> {
+    async webSocketClose(ws: WebSocket, code: number, reason: string, wasClean: boolean): Promise<void> {
         const session = this.sessions.get(ws);
 
         if (session) {
-            console.log(`[Room] User ${session.userId} disconnected`);
+            console.log(JSON.stringify({ event: "websocket_close", userId: session.userId }));
 
             if (session.clientIds.size > 0) {
                 const clientIds = Array.from(session.clientIds);
@@ -942,7 +929,7 @@ export class ProjectRoom extends DurableObject {
                 // Broadcast removal to remaining clients
                 this.broadcastAwarenessRemoval(clientIds, ws);
 
-                console.log(`[Room] Removed awareness for clients: ${clientIds.join(", ")}`);
+                console.log(JSON.stringify({ event: "awareness_removed", clientIds }));
             }
 
             // Only delete from userConnections if this is the active entry
@@ -952,11 +939,24 @@ export class ProjectRoom extends DurableObject {
         }
 
         this.sessions.delete(ws);
-        console.log(`[Room] Remaining sessions: ${this.sessions.size}`);
+        console.log(JSON.stringify({ event: "session_count_update", count: this.sessions.size }));
     }
 
     async webSocketError(ws: WebSocket, error: unknown): Promise<void> {
-        console.error("[Room] WebSocket error:", error);
+        const errStr = String(error);
+        if (errStr.includes("Network connection lost") || errStr.includes("WebSocket disconnected") || errStr.includes("1006") || errStr.includes("1005")) {
+            console.log(JSON.stringify({
+                event: "websocket_disconnect",
+                level: "info",
+                reason: "idle or network connection lost",
+                error: errStr
+            }));
+        } else {
+            console.error(JSON.stringify({
+                event: "websocket_error",
+                error: errStr
+            }));
+        }
         // The close handler will clean up
     }
 
@@ -979,7 +979,7 @@ export class ProjectRoom extends DurableObject {
         const encoder = encoding.createEncoder();
         encoding.writeVarUint(encoder, 3); // Message type 3: messageQueryAwareness
         this.broadcast(encoding.toUint8Array(encoder), excludeSocket);
-        console.log("[Room] Sent awareness request to existing clients");
+        console.log(JSON.stringify({ event: "awareness_request_sent" }));
     }
 
     /**
@@ -991,7 +991,7 @@ export class ProjectRoom extends DurableObject {
                 try {
                     client.send(message);
                 } catch (e) {
-                    console.error(`[Room] Failed to send to client ${session.userId}:`, e);
+                    console.error(JSON.stringify({ event: "send_to_client_failed", userId: session.userId, error: String(e) }));
                 }
             }
         }
diff --git a/src/lib/cloud/utils.ts b/src/lib/cloud/utils.ts
index 2edded27..ea742242 100644
--- a/src/lib/cloud/utils.ts
+++ b/src/lib/cloud/utils.ts
@@ -421,10 +421,11 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
     }
 
     /**
-     * Update the authentication token and reconnect.
-     * This allows refreshing expired tokens without destroying the provider.
+     * Update the authentication token.
+     * @param newToken The new JWT token
+     * @param forceReconnect Whether to immediately disconnect and reconnect using the new token (default: true)
      */
-    public async updateToken(newToken: string): Promise<void> {
+    public async updateToken(newToken: string, forceReconnect: boolean = true): Promise<void> {
         if (this.isDestroyed) {
             console.warn("[WS] Cannot update token on destroyed provider");
             return;
@@ -435,26 +436,26 @@ export class ThrottledWebsocketProvider extends WebsocketProvider {
             return;
         }
 
-        console.log("[WS] Updating token and reconnecting...");
-
         // Snapshot current params so we can roll back if reconnect fails.
-        // Without this, a failed reconnect would leave the provider holding
-        // a new (possibly invalid) token with no active connection.
         const previousParams = { ...this.params };
 
-        try {
-            // Update params with new token
-            this.params = {
-                ...this.params,
-                token: newToken,
-            };
-            await this.reconnect();
-        } catch (e) {
-            // Restore original params — the old token stays in effect so that
-            // a future updateToken() call or reconnect attempt can succeed.
-            this.params = previousParams;
-            console.warn("[WS] Failed to update token, params restored to previous state", e);
-            throw e;
+        // Update params with new token
+        this.params = {
+            ...this.params,
+            token: newToken,
+        };
+
+        if (forceReconnect) {
+            console.log("[WS] Updating token and reconnecting...");
+            try {
+                await this.reconnect();
+            } catch (e) {
+                // Restore original params — the old token stays in effect so that
+                // a future updateToken() call or reconnect attempt can succeed.
+                this.params = previousParams;
+                console.warn("[WS] Failed to update token, params restored to previous state", e);
+                throw e;
+            }
         }
     }
 
diff --git a/src/lib/cloud/wrangler.toml b/src/lib/cloud/wrangler.toml
index 37e7f2db..400c38d3 100644
--- a/src/lib/cloud/wrangler.toml
+++ b/src/lib/cloud/wrangler.toml
@@ -4,6 +4,10 @@ main = "index.ts"
 compatibility_date = "2025-12-08"
 compatibility_flags = ["nodejs_compat"]
 
+[observability.logs]
+enabled = true
+invocation_logs = false
+
 # Migrations are global to the script class
 [[migrations]]
 tag = "v1"
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index ae244132..81a9c31b 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -305,15 +305,18 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
                               provider,
                               user: userInfo,
                               render: (user: { color: string; name: string }) => {
+                                  // Render with no DOM children. The username label is rendered
+                                  // via a ::before pseudo-element (see styles/scriptio.css),
+                                  // so there is no text node Firefox can place the local HTML
+                                  // caret into when the user clicks an empty node containing
+                                  // this remote caret.
                                   const caret = document.createElement("span");
                                   caret.classList.add("collab-caret");
                                   caret.style.borderLeft = `2px solid ${user.color}`;
-                                  const label = document.createElement("div");
-                                  label.classList.add("collab-caret-label");
-                                  label.style.backgroundColor = user.color;
-                                  label.innerText = user.name;
-                                  label.contentEditable = "false";
-                                  caret.appendChild(label);
+                                  caret.style.setProperty("--collab-caret-color", user.color);
+                                  // JSON.stringify yields a CSS-safe quoted string (escapes \ and ").
+                                  caret.style.setProperty("--collab-caret-name", JSON.stringify(user.name));
+                                  caret.contentEditable = "false";
                                   return caret;
                               },
                           }),
diff --git a/src/lib/screenplay/extensions/placeholder-extension.ts b/src/lib/screenplay/extensions/placeholder-extension.ts
index 08fc9b6d..bac529a5 100644
--- a/src/lib/screenplay/extensions/placeholder-extension.ts
+++ b/src/lib/screenplay/extensions/placeholder-extension.ts
@@ -135,33 +135,13 @@ export const Placeholder = Extension.create<PlaceholderOptions>({
             const oldAnchor = oldState.selection.anchor
             const newAnchor = newState.selection.anchor
 
-            // Check if we need to recompute:
-            // 1. Anchor moved to a different node
-            // 2. A node became empty or non-empty
-            const anchorNodeChanged = oldState.doc.resolve(oldAnchor).parent !== newState.doc.resolve(newAnchor).parent
-
             if (tr.docChanged) {
-              // Check if the node at the cursor changed emptiness
-              try {
-                const newNode = newState.doc.resolve(newAnchor).parent
-                const wasEmpty = !oldState.doc.resolve(oldAnchor).parent.content.size
-                const isEmpty = !newNode.content.size
-
-                // If emptiness changed or anchor moved to different node, recompute
-                if (wasEmpty !== isEmpty || anchorNodeChanged) {
-                  return computePlaceholderDecorations(newState.doc, newAnchor)
-                }
-              } catch {
-                // Position resolution failed, recompute to be safe
-                return computePlaceholderDecorations(newState.doc, newAnchor)
-              }
-
-              // Simple text edit in non-empty node — just remap positions (O(log n))
-              return oldDecorations.map(tr.mapping, newState.doc)
+              return computePlaceholderDecorations(newState.doc, newAnchor)
             }
 
             // Selection-only change: recompute if anchor moved to different node
             // (showOnlyCurrent mode needs this, but also hasAnchor attribute changes)
+            const anchorNodeChanged = oldState.doc.resolve(oldAnchor).parent !== newState.doc.resolve(newAnchor).parent
             if (anchorNodeChanged) {
               return computePlaceholderDecorations(newState.doc, newAnchor)
             }
diff --git a/styles/scriptio.css b/styles/scriptio.css
index ab047c03..a6f359ab 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -103,6 +103,34 @@
         height: var(--line-height);
     }
 
+    /* Stabilize the absolute caret's containing block. Without this, the caret
+       resolves up to .ProseMirror — and during a backspace that destroys the
+       paragraph it lives in, y-prosemirror briefly remaps the caret's head
+       position to 0 before awareness syncs, painting it for one frame at the
+       editor's leftmost edge (the very start of the document). Pinning the
+       containing block to whichever paragraph the caret currently sits in
+       keeps the absolute position bounded to that paragraph's box. */
+    p:has(.collab-caret),
+    .dual_dialogue_column p:has(.collab-caret) {
+        position: relative;
+    }
+
+    /* Empty non-parenthetical paragraphs additionally need overflow:visible so
+       the caret's pseudo-element username label (anchored above the line via
+       top: -1.8em) isn't clipped. Parenthetical empties keep overflow:hidden
+       to clip the trailing line box that would push their `)` to a second
+       line; the label is sacrificed there as an acceptable trade. */
+    .is-empty:has(.collab-caret):not(.parenthetical) {
+        overflow: visible;
+    }
+
+    /* Defensive: the widget should always live inside a paragraph. If a
+       transaction ever briefly attaches it directly to .ProseMirror (e.g.
+       during a structural restructure), don't paint it. */
+    > .collab-caret {
+        display: none;
+    }
+
     .action {
         text-align: var(--action-align, left) !important;
         font-weight: var(--action-weight, normal);
@@ -308,10 +336,19 @@
         pointer-events: none;
         user-select: none;
         -webkit-user-select: none !important;
-        transition: transform 0.1s ease-out;
+        -moz-user-select: none !important;
     }
 
-    .collab-caret-label {
+    /* Username label rendered as a pseudo-element rather than a child <div>.
+       Pseudo-elements aren't in the DOM, so they cannot host a text cursor;
+       this prevents Firefox from placing the local HTML caret into the
+       label's text node when the local user clicks an empty node hosting a
+       remote caret. The color and name come from custom properties set
+       inline by the cursor render function. */
+    .collab-caret::before {
+        content: var(--collab-caret-name, "");
+        background-color: var(--collab-caret-color, currentColor);
+
         position: absolute;
         top: -1.8em;
         left: -0.5em;
@@ -322,7 +359,7 @@
         border-radius: 1em;
         line-height: normal;
 
-        /* Prevent the collaboration caret from inheriting parent styles, such as with scene headings (uppercase & bold) */
+        /* Prevent inheritance of parent styles (scene headings are uppercase & bold). */
         text-transform: none !important;
         font-weight: 400 !important;
         font-style: normal !important;

From c1a2fa751bb673de502f3e93d25787318163fd9a Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Sun, 10 May 2026 23:56:24 +0200
Subject: [PATCH 49/76] fixed editor sync in read-only, added comments
 navigation to sidebar, tweaked some visuals

---
 components/board/BoardCanvas.module.css       |  8 +--
 .../editor/sidebar/CommentSidebarItem.tsx     | 62 +++++++++++++++++++
 .../editor/sidebar/CommentSidebarView.tsx     | 58 +++++++++++++++++
 .../EditorSidebarNavigation.module.css        | 12 ++++
 .../sidebar/EditorSidebarNavigation.tsx       | 23 +++++--
 .../editor/sidebar/ShelfSidebarItem.tsx       | 44 ++++++-------
 .../editor/sidebar/ShelfSidebarView.tsx       | 24 ++++---
 messages/en.json                              |  6 +-
 .../extensions/placeholder-extension.ts       |  2 +-
 9 files changed, 193 insertions(+), 46 deletions(-)
 create mode 100644 components/editor/sidebar/CommentSidebarItem.tsx
 create mode 100644 components/editor/sidebar/CommentSidebarView.tsx

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index 37d4491e..157042be 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -397,7 +397,7 @@
         transform 0.15s ease,
         background-color 0.15s ease;
     z-index: 10;
-    background: radial-gradient(circle, var(--secondary) 30%, transparent 30%);
+    background: radial-gradient(circle, white 30%, transparent 30%);
 }
 
 .connection_handle::before {
@@ -408,7 +408,7 @@
     width: 16px;
     height: 16px;
     transform: translate(-50%, -50%);
-    border: 2px solid var(--secondary);
+    border: 2px solid white;
     border-radius: 50%;
     opacity: 0.6;
 }
@@ -419,7 +419,7 @@
 
 .connection_handle:hover {
     transform: scale(1.2);
-    background: radial-gradient(circle, var(--secondary) 40%, transparent 40%);
+    background: radial-gradient(circle, white 40%, transparent 40%);
 }
 
 .connection_handle:hover::before {
@@ -449,6 +449,6 @@
 
 .card_connecting:hover {
     box-shadow:
-        0 0 0 3px var(--secondary),
+        0 0 0 3px white,
         0 4px 16px rgba(0, 0, 0, 0.2);
 }
diff --git a/components/editor/sidebar/CommentSidebarItem.tsx b/components/editor/sidebar/CommentSidebarItem.tsx
new file mode 100644
index 00000000..a8d3efc3
--- /dev/null
+++ b/components/editor/sidebar/CommentSidebarItem.tsx
@@ -0,0 +1,62 @@
+"use client";
+
+import { memo, useCallback, useContext } from "react";
+import { ProjectContext } from "@src/context/ProjectContext";
+import { Comment } from "@src/lib/utils/types";
+import { getCommentPositions } from "@src/lib/screenplay/extensions/comment-highlight-extension";
+import { focusOnPosition } from "@src/lib/screenplay/editor";
+import { join } from "@src/lib/utils/misc";
+import nav_item from "./SidebarItem.module.css";
+
+type CommentSidebarItemProps = {
+    comment: Comment;
+    isActive: boolean;
+    onActivate: () => void;
+};
+
+const CommentSidebarItem = memo(({ comment, isActive, onActivate }: CommentSidebarItemProps) => {
+    const { editor } = useContext(ProjectContext);
+
+    const handleDoubleClick = useCallback(() => {
+        if (!editor) return;
+        const positions = getCommentPositions(editor);
+        const pos = positions.get(comment.id);
+        if (pos) {
+            focusOnPosition(editor, pos.from);
+        }
+    }, [comment.id, editor]);
+
+    const handleClick = useCallback(() => {
+        onActivate();
+    }, [onActivate]);
+
+    // Format date similar to other places, keeping it short
+    const date = new Date(comment.createdAt);
+    const dateStr = date.toLocaleDateString(undefined, { month: 'short', day: 'numeric', year: 'numeric' });
+
+    const containerClass = join(
+        nav_item.container,
+        isActive ? nav_item.current : "",
+    );
+
+    return (
+        <div
+            onClick={handleClick}
+            onDoubleClick={handleDoubleClick}
+            className={containerClass}
+            style={{ cursor: "pointer" }}
+        >
+            <div className={nav_item.header}>
+                <div className={nav_item.title_row}>
+                    <p className={join(nav_item.title, "unselectable")} style={{ fontWeight: 600 }}>{comment.author}</p>
+                </div>
+                <span className={nav_item.sceneLength}>{dateStr}</span>
+            </div>
+            <p className={join(nav_item.preview, "unselectable")}>{comment.text || "Empty comment"}</p>
+        </div>
+    );
+});
+
+CommentSidebarItem.displayName = "CommentSidebarItem";
+
+export default CommentSidebarItem;
diff --git a/components/editor/sidebar/CommentSidebarView.tsx b/components/editor/sidebar/CommentSidebarView.tsx
new file mode 100644
index 00000000..ff6ae066
--- /dev/null
+++ b/components/editor/sidebar/CommentSidebarView.tsx
@@ -0,0 +1,58 @@
+"use client";
+
+import { useContext, useMemo } from "react";
+import { useTranslations } from "next-intl";
+import { ProjectContext } from "@src/context/ProjectContext";
+import { SCREENPLAY_EDITOR_CONFIG } from "@src/lib/editor/document-editor-config";
+import { useDocumentComments } from "@src/lib/editor/use-document-comments";
+import { join } from "@src/lib/utils/misc";
+import { MessageSquare } from "lucide-react";
+import CommentSidebarItem from "./CommentSidebarItem";
+
+import form from "./../../utils/Form.module.css";
+import sidebar_nav from "./EditorSidebarNavigation.module.css";
+
+const CommentSidebarView = () => {
+    const t = useTranslations("editorSidebar");
+    const { repository } = useContext(ProjectContext);
+
+    const projectState = repository?.getState();
+    const commentsMap = useMemo(
+        () =>
+            projectState && SCREENPLAY_EDITOR_CONFIG.features.comments
+                ? SCREENPLAY_EDITOR_CONFIG.getCommentsMap(projectState)
+                : null,
+        [projectState],
+    );
+
+    const { comments, activeCommentId, setActiveCommentId } = useDocumentComments(commentsMap, repository);
+
+    const unresolvedComments = useMemo(() => comments.filter((c) => !c.resolved), [comments]);
+
+    return (
+        <>
+            <div className={sidebar_nav.list_header}>
+                <MessageSquare size={18} />
+                <p className={form.label}>{t("comments")}</p>
+            </div>
+            <div className={join(sidebar_nav.list, sidebar_nav.scene_list)}>
+                {unresolvedComments.length !== 0 ? (
+                    unresolvedComments.map((comment) => (
+                        <CommentSidebarItem
+                            key={comment.id}
+                            comment={comment}
+                            isActive={activeCommentId === comment.id}
+                            onActivate={() => setActiveCommentId(comment.id)}
+                        />
+                    ))
+                ) : (
+                    <div className={sidebar_nav.empty_state}>
+                        {t("commentsEmpty")}
+                    </div>
+                )}
+            </div>
+        </>
+    );
+};
+
+export default CommentSidebarView;
diff --git a/components/editor/sidebar/EditorSidebarNavigation.module.css b/components/editor/sidebar/EditorSidebarNavigation.module.css
index f4bc011a..6587655f 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.module.css
+++ b/components/editor/sidebar/EditorSidebarNavigation.module.css
@@ -54,6 +54,18 @@
     overflow-x: hidden;
 }
 
+.empty_state {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 20px;
+    text-align: center;
+    color: var(--secondary-text);
+    font-size: 12px;
+}
+
 .scene_list {
     flex: 1;
 }
diff --git a/components/editor/sidebar/EditorSidebarNavigation.tsx b/components/editor/sidebar/EditorSidebarNavigation.tsx
index ad5b68e2..dcca095e 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.tsx
+++ b/components/editor/sidebar/EditorSidebarNavigation.tsx
@@ -7,9 +7,10 @@ import { ProjectContext } from "@src/context/ProjectContext";
 import { useViewContext } from "@src/context/ViewContext";
 import { Scene } from "@src/lib/screenplay/scenes";
 import { focusOnPosition } from "@src/lib/screenplay/editor";
-import { Archive, Clapperboard } from "lucide-react";
+import { Archive, Clapperboard, MessageSquare } from "lucide-react";
 import SidebarSceneItem from "./SidebarSceneItem";
 import ShelfSidebarView from "./ShelfSidebarView";
+import CommentSidebarView from "./CommentSidebarView";
 
 import form from "./../../utils/Form.module.css";
 import sidebar_nav from "./EditorSidebarNavigation.module.css";
@@ -19,7 +20,7 @@ const EditorSidebarNavigation = () => {
     const { scenes, updateScenes, editor } = useContext(ProjectContext);
     const { leftSidebarOpen } = useViewContext();
 
-    const [activeTab, setActiveTab] = useState<"scenes" | "shelf">("scenes");
+    const [activeTab, setActiveTab] = useState<"scenes" | "shelf" | "comments">("scenes");
 
     const [dragIndex, setDragIndex] = useState<number | null>(null);
     // indicatorIndex represents the gap where the item will be inserted.
@@ -193,7 +194,7 @@ const EditorSidebarNavigation = () => {
                                 className={join(sidebar_nav.list, sidebar_nav.scene_list)}
                                 onPointerMove={handlePointerMove}
                             >
-                                {scenes.length != 0 &&
+                                {scenes.length != 0 ?
                                     scenes.map((scene: Scene, index: number) => {
                                         const isNoOp =
                                             dragIndex === null ||
@@ -214,11 +215,17 @@ const EditorSidebarNavigation = () => {
                                                 onDoubleClick={handleDoubleClick}
                                             />
                                         );
-                                    })}
+                                    }) : (
+                                        <div className={sidebar_nav.empty_state}>
+                                            {t("scenesEmpty")}
+                                        </div>
+                                    )}
                             </div>
                         </>
-                    ) : (
+                    ) : activeTab === "shelf" ? (
                         <ShelfSidebarView />
+                    ) : (
+                        <CommentSidebarView />
                     )}
                     <div className={sidebar_nav.tab_bar}>
                         <button
@@ -227,6 +234,12 @@ const EditorSidebarNavigation = () => {
                         >
                             <Clapperboard size={16} />
                         </button>
+                        <button
+                            className={join(sidebar_nav.tab_btn, activeTab === "comments" ? sidebar_nav.tab_btn_active : "")}
+                            onClick={() => setActiveTab("comments")}
+                        >
+                            <MessageSquare size={16} />
+                        </button>
                         <button
                             className={join(sidebar_nav.tab_btn, activeTab === "shelf" ? sidebar_nav.tab_btn_active : "")}
                             onClick={() => setActiveTab("shelf")}
diff --git a/components/editor/sidebar/ShelfSidebarItem.tsx b/components/editor/sidebar/ShelfSidebarItem.tsx
index b139c918..a296ea33 100644
--- a/components/editor/sidebar/ShelfSidebarItem.tsx
+++ b/components/editor/sidebar/ShelfSidebarItem.tsx
@@ -114,16 +114,13 @@ const ShelfSidebarItem = memo(({ nodeId, entry, isExpanded, onToggle }: ShelfSid
         [nodeId, entry.type, repository, editor],
     );
 
-    const handleRenameStart = useCallback(
-        (e: React.MouseEvent, versionId: string, currentTitle: string) => {
-            e.stopPropagation();
-            setRenamingVersionId(versionId);
-            setRenameValue(currentTitle);
-            // Focus the input on next tick
-            setTimeout(() => renameInputRef.current?.focus(), 0);
-        },
-        [],
-    );
+    const handleRenameStart = useCallback((e: React.MouseEvent, versionId: string, currentTitle: string) => {
+        e.stopPropagation();
+        setRenamingVersionId(versionId);
+        setRenameValue(currentTitle);
+        // Focus the input on next tick
+        setTimeout(() => renameInputRef.current?.focus(), 0);
+    }, []);
 
     const handleRenameCommit = useCallback(() => {
         if (!renamingVersionId || !repository) return;
@@ -145,20 +142,13 @@ const ShelfSidebarItem = memo(({ nodeId, entry, isExpanded, onToggle }: ShelfSid
     return (
         <div className={styles.container}>
             <div className={join(styles.header, isExpanded ? styles.header_active : "")} onClick={onToggle}>
-                <ChevronRight
-                    size={13}
-                    className={join(styles.chevron, isExpanded ? styles.chevron_expanded : "")}
-                />
+                <ChevronRight size={13} className={join(styles.chevron, isExpanded ? styles.chevron_expanded : "")} />
                 <Icon size={14} className={styles.type_icon} />
                 <span className={join(styles.title, "unselectable")}>{entry.title}</span>
-                <span className={join(styles.version_count, "unselectable")}>{entry.versions.length}</span>
-                <button
-                    className={styles.goto_btn}
-                    title={t("goTo")}
-                    onClick={handleGoTo}
-                >
+                <button className={styles.goto_btn} title={t("goTo")} onClick={handleGoTo}>
                     <CornerDownLeft size={12} />
                 </button>
+                <span className={join(styles.version_count, "unselectable")}>{entry.versions.length}</span>
             </div>
             {isExpanded && (
                 <div className={styles.versions_list}>
@@ -185,10 +175,7 @@ const ShelfSidebarItem = memo(({ nodeId, entry, isExpanded, onToggle }: ShelfSid
                                         onClick={(e) => e.stopPropagation()}
                                     />
                                 ) : isConfirmingRestore ? (
-                                    <div
-                                        className={styles.confirm_row}
-                                        onClick={(e) => e.stopPropagation()}
-                                    >
+                                    <div className={styles.confirm_row} onClick={(e) => e.stopPropagation()}>
                                         <span className={styles.confirm_text}>{t("confirmRestore")}</span>
                                         <div className={styles.confirm_btns}>
                                             <button
@@ -210,7 +197,9 @@ const ShelfSidebarItem = memo(({ nodeId, entry, isExpanded, onToggle }: ShelfSid
                                     </div>
                                 ) : (
                                     <>
-                                        <span className={join(styles.version_title, "unselectable")}>{version.title}</span>
+                                        <span className={join(styles.version_title, "unselectable")}>
+                                            {version.title}
+                                        </span>
                                         <div className={styles.version_actions}>
                                             <button
                                                 className={styles.action_btn}
@@ -222,7 +211,10 @@ const ShelfSidebarItem = memo(({ nodeId, entry, isExpanded, onToggle }: ShelfSid
                                             <button
                                                 className={styles.action_btn}
                                                 title="Restore to screenplay"
-                                                onClick={(e) => { e.stopPropagation(); setConfirmRestoreVersionId(version.id); }}
+                                                onClick={(e) => {
+                                                    e.stopPropagation();
+                                                    setConfirmRestoreVersionId(version.id);
+                                                }}
                                             >
                                                 <CornerUpLeft size={12} />
                                             </button>
diff --git a/components/editor/sidebar/ShelfSidebarView.tsx b/components/editor/sidebar/ShelfSidebarView.tsx
index 6aaa621e..17463ced 100644
--- a/components/editor/sidebar/ShelfSidebarView.tsx
+++ b/components/editor/sidebar/ShelfSidebarView.tsx
@@ -24,15 +24,21 @@ const ShelfSidebarView = () => {
                 <p className={form.label}>{t("shelf")}</p>
             </div>
             <div className={join(sidebar_nav.list, sidebar_nav.scene_list)}>
-                {entries.map(([nodeId, entry]) => (
-                    <ShelfSidebarItem
-                        key={nodeId}
-                        nodeId={nodeId}
-                        entry={entry}
-                        isExpanded={expandedId === nodeId}
-                        onToggle={() => setExpandedId(expandedId === nodeId ? null : nodeId)}
-                    />
-                ))}
+                {entries.length !== 0 ? (
+                    entries.map(([nodeId, entry]) => (
+                        <ShelfSidebarItem
+                            key={nodeId}
+                            nodeId={nodeId}
+                            entry={entry}
+                            isExpanded={expandedId === nodeId}
+                            onToggle={() => setExpandedId(expandedId === nodeId ? null : nodeId)}
+                        />
+                    ))
+                ) : (
+                    <div className={sidebar_nav.empty_state}>
+                        {t("shelfEmpty")}
+                    </div>
+                )}
             </div>
         </>
     );
diff --git a/messages/en.json b/messages/en.json
index f6b085c3..797eb080 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -198,10 +198,14 @@
   },
   "editorSidebar": {
     "scenes": "Scenes",
+    "scenesEmpty": "No scenes yet",
     "characters": "Characters",
     "locations": "Locations",
     "shelf": "Shelf",
-    "shelfEmpty": "Select a shelved version to edit",
+    "shelfEmpty": "No shelved items yet",
+    "comments": "Comments",
+    "commentsEmpty": "No active comments",
+    "shelfEmptySelection": "Select a shelved version to edit",
     "goTo": "Go to in screenplay",
     "confirmRestore": "This will replace the matching content in your screenplay.",
     "restore": "Restore",
diff --git a/src/lib/screenplay/extensions/placeholder-extension.ts b/src/lib/screenplay/extensions/placeholder-extension.ts
index bac529a5..b10f7381 100644
--- a/src/lib/screenplay/extensions/placeholder-extension.ts
+++ b/src/lib/screenplay/extensions/placeholder-extension.ts
@@ -70,7 +70,7 @@ export const Placeholder = Extension.create<PlaceholderOptions>({
       emptyEditorClass: 'is-editor-empty',
       emptyNodeClass: 'is-empty',
       placeholder: 'Write something …',
-      showOnlyWhenEditable: true,
+      showOnlyWhenEditable: false,
       showOnlyCurrent: false,
       includeChildren: true,
     }

From d728446c5bba0d0375f98c043e9391da5d92e921 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 11 May 2026 00:17:55 +0200
Subject: [PATCH 50/76] added missing translations

---
 messages/de.json |   8 +-
 messages/es.json | 952 ++++++++++++++++++++++++-----------------------
 messages/fr.json |   8 +-
 messages/ja.json |   8 +-
 messages/ko.json |   8 +-
 messages/pl.json |   8 +-
 messages/zh.json |   8 +-
 7 files changed, 514 insertions(+), 486 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 2af8fbfd..1471557c 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -206,7 +206,11 @@
     "goTo": "Im Drehbuch anzeigen",
     "confirmRestore": "Dies ersetzt den passenden Inhalt in Ihrem Drehbuch.",
     "restore": "Wiederherstellen",
-    "cancel": "Abbrechen"
+    "cancel": "Abbrechen",
+    "scenesEmpty": "Noch keine Szenen",
+    "comments": "Kommentare",
+    "commentsEmpty": "Keine aktiven Kommentare",
+    "shelfEmptySelection": "Wählen Sie eine Version aus der Ablage zur Bearbeitung aus"
   },
   "formatDropdown": {
     "elements": {
@@ -489,4 +493,4 @@
     "monthsAgo": "Vor {months, plural, one {# Monat} other {# Monaten}}",
     "moreThanYearAgo": "Vor über einem Jahr"
   }
-}
\ No newline at end of file
+}
diff --git a/messages/es.json b/messages/es.json
index d4bb3972..0cda76fd 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -1,491 +1,495 @@
 {
-    "navbar": {
-        "screenplay": "Guión",
-        "board": "Tablero",
-        "titlePage": "Portada",
-        "synced": "Sincronizado en la nube",
-        "noConnection": "Sin conexión",
-        "reconnecting": "Reconectando...",
-        "localProject": "Proyecto local",
-        "uploadToCloud": "Subir a la nube",
-        "endlessScroll": "Desplazamiento infinito",
-        "toggleComments": "Mostrar/ocultar comentarios",
-        "focusMode": "Modo concentración",
-        "splitPanel": "Dividir panel",
-        "unsplitPanel": "Unir panel",
-        "draftEditor": "Editor de borrador",
-        "viewOnly": "Solo lectura",
-        "viewOnlyHint": "Tienes acceso de solo visualización. La edición está desactivada."
+  "navbar": {
+    "screenplay": "Guión",
+    "board": "Tablero",
+    "titlePage": "Portada",
+    "synced": "Sincronizado en la nube",
+    "noConnection": "Sin conexión",
+    "reconnecting": "Reconectando...",
+    "localProject": "Proyecto local",
+    "uploadToCloud": "Subir a la nube",
+    "endlessScroll": "Desplazamiento infinito",
+    "toggleComments": "Mostrar/ocultar comentarios",
+    "focusMode": "Modo concentración",
+    "splitPanel": "Dividir panel",
+    "unsplitPanel": "Unir panel",
+    "draftEditor": "Editor de borrador",
+    "viewOnly": "Solo lectura",
+    "viewOnlyHint": "Tienes acceso de solo visualización. La edición está desactivada."
+  },
+  "common": {
+    "save": "Guardar cambios",
+    "cancel": "Cancelar",
+    "loading": "Cargando...",
+    "resetDefaults": "Restablecer predeterminados"
+  },
+  "sidebar": {
+    "title": "Panel",
+    "logOut": "Cerrar sesión",
+    "auth": "Iniciar sesión",
+    "logOutConfirmTitle": "Cerrar sesión",
+    "logOutConfirmDesc": "¿Estás seguro de que quieres cerrar sesión?",
+    "logOutConfirmBtn": "Cerrar sesión",
+    "logOutCancelBtn": "Cancelar"
+  },
+  "appearance": {
+    "theme": "Tema",
+    "themeHelp": {
+      "dark": "Tema acogedor y de bajo resplandor, perfecto para noctámbulos y noches de concentración.",
+      "light": "Tema nítido y aireado que se siente natural y cómodo durante el día.",
+      "latte": "Tema suave con base crema que combina calidez y legibilidad.",
+      "wonka": "Tema aterciopelado con base de cacao que combina lujo profundo y descanso visual.",
+      "mint": "Tema refrescante con esencia de menta que combina serenidad botánica y equilibrio visual.",
+      "blossom": "Tema delicado con esencia floral que combina calidez de pétalos y suavidad visual.",
+      "midnight": "Tema azul medianoche profundo, diseñado para el trabajo concentrado bajo un cielo estrellado."
     },
-    "common": {
-        "save": "Guardar cambios",
-        "cancel": "Cancelar",
-        "loading": "Cargando...",
-        "resetDefaults": "Restablecer predeterminados"
+    "editor": "Editor",
+    "themedEditor": "Editor con tema",
+    "themedEditorDesc": "Usar los colores del tema para el fondo y el texto del editor",
+    "highlightOnHover": "Resaltar al pasar el cursor",
+    "highlightOnHoverDesc": "Resalta ligeramente la línea sobre la que se pasa el cursor en el editor"
+  },
+  "keybinds": {
+    "screenplayElements": "Elementos de guión",
+    "typing": "Escribir… (Esc para cancelar)",
+    "notSet": "No asignado",
+    "modifiersOnly": "Solo modificadores — presiona una tecla normal",
+    "defaultPrefix": "Por defecto: {combo}",
+    "reset": "Restablecer",
+    "resetTitle": "Borrar asignación del usuario",
+    "resetDefaults": "Restablecer predeterminados",
+    "save": "Guardar cambios"
+  },
+  "language": {
+    "label": "Idioma de la interfaz",
+    "helpText": "Elige el idioma que se usa en toda la aplicación.",
+    "spellcheckLabel": "Corrector orthográfico",
+    "spellcheckHelpText": "Descarga un diccionario para la corrección ortográfica en el editor.",
+    "spellcheckNone": "Desactivado",
+    "customDictLabel": "Diccionario del proyecto",
+    "customDictAdd": "Añadir",
+    "customDictEmpty": "Aún no hay palabras personalizadas.",
+    "customDictHelpText": "Las palabras añadidas aquí se comparten con todos los colaboradores del proyecto."
+  },
+  "modal": {
+    "groups": {
+      "project": "Proyecto",
+      "preferences": "Preferencias",
+      "account": "Cuenta"
     },
-    "sidebar": {
-        "title": "Panel",
-        "logOut": "Cerrar sesión",
-        "auth": "Iniciar sesión",
-        "logOutConfirmTitle": "Cerrar sesión",
-        "logOutConfirmDesc": "¿Estás seguro de que quieres cerrar sesión?",
-        "logOutConfirmBtn": "Cerrar sesión",
-        "logOutCancelBtn": "Cancelar"
-    },
-    "appearance": {
-        "theme": "Tema",
-        "themeHelp": {
-            "dark": "Tema acogedor y de bajo resplandor, perfecto para noctámbulos y noches de concentración.",
-            "light": "Tema nítido y aireado que se siente natural y cómodo durante el día.",
-            "latte": "Tema suave con base crema que combina calidez y legibilidad.",
-            "wonka": "Tema aterciopelado con base de cacao que combina lujo profundo y descanso visual.",
-            "mint": "Tema refrescante con esencia de menta que combina serenidad botánica y equilibrio visual.",
-            "blossom": "Tema delicado con esencia floral que combina calidez de pétalos y suavidad visual.",
-            "midnight": "Tema azul medianoche profundo, diseñado para el trabajo concentrado bajo un cielo estrellado."
-        },
-        "editor": "Editor",
-        "themedEditor": "Editor con tema",
-        "themedEditorDesc": "Usar los colores del tema para el fondo y el texto del editor",
-        "highlightOnHover": "Resaltar al pasar el cursor",
-        "highlightOnHoverDesc": "Resalta ligeramente la línea sobre la que se pasa el cursor en el editor"
-    },
-    "keybinds": {
-        "screenplayElements": "Elementos de guión",
-        "typing": "Escribir… (Esc para cancelar)",
-        "notSet": "No asignado",
-        "modifiersOnly": "Solo modificadores — presiona una tecla normal",
-        "defaultPrefix": "Por defecto: {combo}",
-        "reset": "Restablecer",
-        "resetTitle": "Borrar asignación del usuario",
-        "resetDefaults": "Restablecer predeterminados",
-        "save": "Guardar cambios"
-    },
-    "language": {
-        "label": "Idioma de la interfaz",
-        "helpText": "Elige el idioma que se usa en toda la aplicación.",
-        "spellcheckLabel": "Corrector orthográfico",
-        "spellcheckHelpText": "Descarga un diccionario para la corrección ortográfica en el editor.",
-        "spellcheckNone": "Desactivado",
-        "customDictLabel": "Diccionario del proyecto",
-        "customDictAdd": "Añadir",
-        "customDictEmpty": "Aún no hay palabras personalizadas.",
-        "customDictHelpText": "Las palabras añadidas aquí se comparten con todos los colaboradores del proyecto."
-    },
-    "modal": {
-        "groups": {
-            "project": "Proyecto",
-            "preferences": "Preferencias",
-            "account": "Cuenta"
-        },
-        "tabs": {
-            "General": "General",
-            "Layout": "Diseño",
-            "Export": "Importar/Exportar",
-            "Collaborators": "Colaboradores",
-            "Keybinds": "Atajos de teclado",
-            "Appearance": "Apariencia",
-            "Language": "Idioma",
-            "Profile": "Perfil",
-            "Settings": "Ajustes",
-            "Auth": "Iniciar sesión",
-            "About": "Acerca de",
-            "Subscription": "Suscripción"
-        }
-    },
-    "dangerZone": {
-        "transferOwnership": "Transferir propiedad",
-        "transferDesc": "Transfiere tu rol de propietario a otro usuario. Pasarás a tener el rol de editor.",
-        "transferBtn": "Transferir",
-        "transferPrompt": "Introduce el correo del nuevo propietario:",
-        "deleteProject": "Eliminar proyecto",
-        "deleteProjectDesc": "Once un proyecto es eliminado, no hay vuelta atrás. Por favor, asegúrate.",
-        "deleteBtn": "Eliminar",
-        "modalTitle": "Eliminar proyecto",
-        "modalDesc": "Esta acción es permanente y no se puede deshacer. Se perderán todos los datos asociados a este proyecto.",
-        "deleting": "Eliminando...",
-        "confirmDeleteBtn": "Eliminar proyecto"
-    },
-    "profile": {
-        "email": "Correo electrónico",
-        "username": "Nombre de usuario",
-        "usernamePlaceholder": "Introduce tu nombre para mostrar...",
-        "usernameHelp": "Este nombre será visible para los colaboradores cuando trabajes en proyectos compartidos.",
-        "color": "Color",
-        "customColor": "Color personalizado",
-        "selectColor": "Seleccionar color {color}",
-        "successMessage": "Perfil actualizado correctamente",
-        "failedUpdate": "Error al actualizar el perfil",
-        "errorSaving": "Ocurrió un error al guardar",
-        "saving": "Guardando...",
-        "dangerZoneTitle": "Zona de peligro",
-        "deleteAccount": "Eliminar cuenta",
-        "deleteAccountDesc": "Elimina permanentemente tu cuenta y todos los datos asociados. Esto no se puede deshacer.",
-        "deleteBtn": "Eliminar",
-        "deleteModalTitle": "Eliminar cuenta",
-        "deleteModalDesc": "Esto eliminará permanentemente tu cuenta y todos los datos asociados. Esta acción no se puede deshacer.",
-        "deleteConfirmPhrase": "Confirmo la eliminación de mi cuenta",
-        "deleteConfirmLabel": "Escribe el siguiente texto para confirmar la eliminación:",
-        "deleting": "Eliminando...",
-        "deleteAccountBtn": "Eliminar mi cuenta",
-        "subscription": {
-            "title": "Suscripción",
-            "proBadge": "Pro",
-            "proTitle": "Plan Pro",
-            "freeTitle": "Plan Gratuito",
-            "renewsOn": "Se renueva el {date}",
-            "perksTitle": "Incluido en tu plan:",
-            "upgradeTitle": "Mejora para desbloquear:",
-            "perkProjects": "Crear proyectos en la nube",
-            "perkSaves": "Guardados manuales e historial de versiones",
-            "perkCollaborators": "Invitar colaboradores",
-            "perkAutoSave": "Guardado automático en la nube",
-            "upgradeBtn": "Actualizar a Pro",
-            "redirecting": "Redirigiendo...",
-            "cancel": "Cancelar suscripción",
-            "cancelConfirm": "Tu acceso Pro permanece activo hasta {date}. ¿Cancelar de todos modos?",
-            "cancelYes": "Sí, cancelar",
-            "cancelNo": "Mantener Pro",
-            "cancelling": "Cancelando...",
-            "cancelSuccess": "Suscripción cancelada. Acceso Pro hasta {date}.",
-            "endsOn": "Tu suscripción termina el {date}",
-            "purchasing": "Comprando...",
-            "purchaseError": "La compra falló. Inténtalo de nuevo.",
-            "cancelApple": "Las suscripciones de Apple se gestionan a través del App Store.",
-            "manageApple": "Abrir App Store",
-            "alreadyBoundTo": "Esta suscripción ya está vinculada a {email}.",
-            "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta.",
-            "welcomePro": "Ya estás suscrito a Scriptio Pro. ¡Bienvenido!",
-            "resubscribe": "Reactivar suscripción",
-            "restorePurchases": "Restaurar compras",
-            "transferConfirm": "Tu cuenta de App Store tiene una suscripción activa vinculada a {email}. La restauración transferirá Pro a esta cuenta, y {email} perderá el acceso a Pro. Apple seguirá facturando al mismo ID de Apple. ¿Continuar?",
-            "transferConfirmUnknown": "Tu cuenta de App Store tiene una suscripción activa vinculada a otra cuenta de Scriptio. La restauración transferirá Pro a esta cuenta, y la otra cuenta perderá el acceso a Pro. Apple seguirá facturando al mismo ID de Apple. ¿Continuar?",
-            "transferYes": "Sí, transferir",
-            "transferring": "Transfiriendo...",
-            "appleStoreFreeInfo": "Las funciones Pro están disponibles para las cuentas actualizadas a través de nuestro sitio web.",
-            "appleStoreProInfo": "Para actualizar tu método de pago o cancelar, visita la configuración de tu perfil en scriptio.app."
-        }
-    },
-    "projects": {
-        "untitled": "Sin título",
-        "newProject": "Nuevo proyecto",
-        "pageTitle": "Proyectos",
-        "importBtn": "Importar...",
-        "importing": "Importando...",
-        "createBtn": "Crear",
-        "empty": {
-            "title": "Tu Historia Empieza Aquí",
-            "subtitle": "Crea un nuevo guión o importa un script existente",
-            "createFirst": "Nuevo proyecto",
-            "createDesc": "Empezar desde una página en blanco",
-            "importExisting": "Importar",
-            "importDesc": "Abrir un archivo de guión existente"
-        },
-        "item": {
-            "posterAlt": "Póster de la película",
-            "localOnly": "Solo local",
-            "syncedToCloud": "Sincronizado en la nube"
-        },
-        "form": {
-            "formTitle": "Crear proyecto",
-            "titleField": "Título",
-            "descriptionField": "Descripción",
-            "authorField": "Autor",
-            "posterField": "Póster",
-            "optional": "opcional",
-            "submitBtn": "Crear",
-            "failedToCreate": "Error al crear el proyecto"
-        }
-    },
-    "editorSidebar": {
-        "scenes": "Escenas",
-        "characters": "Personajes",
-        "locations": "Localizaciones",
-        "shelf": "Estante",
-        "shelfEmpty": "Seleccione una versión para editar",
-        "goTo": "Ir al guión",
-        "confirmRestore": "Esto reemplazará el contenido correspondiente en su guión.",
-        "restore": "Restaurar",
-        "cancel": "Cancelar"
-    },
-    "formatDropdown": {
-        "elements": {
-            "scene": "ENCABEZADO DE SCÈNE",
-            "action": "Acción",
-            "character": "PERSONAJE",
-            "dialogue": "Diálogo",
-            "parenthetical": "(Paréntesis)",
-            "transition": "TRANSICIÓN:",
-            "section": "Sección",
-            "note": "[[Nota]]",
-            "dual_dialogue": "Doble diálogo",
-            "none": "Ninguno"
-        },
-        "titlePageElements": {
-            "title": "Título",
-            "author": "Autor",
-            "date": "Fecha",
-            "none": "Ninguno"
-        }
+    "tabs": {
+      "General": "General",
+      "Layout": "Diseño",
+      "Export": "Importar/Exportar",
+      "Collaborators": "Colaboradores",
+      "Keybinds": "Atajos de teclado",
+      "Appearance": "Apariencia",
+      "Language": "Idioma",
+      "Profile": "Perfil",
+      "Settings": "Ajustes",
+      "Auth": "Iniciar sesión",
+      "About": "Acerca de",
+      "Subscription": "Suscripción"
+    }
+  },
+  "dangerZone": {
+    "transferOwnership": "Transferir propiedad",
+    "transferDesc": "Transfiere tu rol de propietario a otro usuario. Pasarás a tener el rol de editor.",
+    "transferBtn": "Transferir",
+    "transferPrompt": "Introduce el correo del nuevo propietario:",
+    "deleteProject": "Eliminar proyecto",
+    "deleteProjectDesc": "Once un proyecto es eliminado, no hay vuelta atrás. Por favor, asegúrate.",
+    "deleteBtn": "Eliminar",
+    "modalTitle": "Eliminar proyecto",
+    "modalDesc": "Esta acción es permanente y no se puede deshacer. Se perderán todos los datos asociados a este proyecto.",
+    "deleting": "Eliminando...",
+    "confirmDeleteBtn": "Eliminar proyecto"
+  },
+  "profile": {
+    "email": "Correo electrónico",
+    "username": "Nombre de usuario",
+    "usernamePlaceholder": "Introduce tu nombre para mostrar...",
+    "usernameHelp": "Este nombre será visible para los colaboradores cuando trabajes en proyectos compartidos.",
+    "color": "Color",
+    "customColor": "Color personalizado",
+    "selectColor": "Seleccionar color {color}",
+    "successMessage": "Perfil actualizado correctamente",
+    "failedUpdate": "Error al actualizar el perfil",
+    "errorSaving": "Ocurrió un error al guardar",
+    "saving": "Guardando...",
+    "dangerZoneTitle": "Zona de peligro",
+    "deleteAccount": "Eliminar cuenta",
+    "deleteAccountDesc": "Elimina permanentemente tu cuenta y todos los datos asociados. Esto no se puede deshacer.",
+    "deleteBtn": "Eliminar",
+    "deleteModalTitle": "Eliminar cuenta",
+    "deleteModalDesc": "Esto eliminará permanentemente tu cuenta y todos los datos asociados. Esta acción no se puede deshacer.",
+    "deleteConfirmPhrase": "Confirmo la eliminación de mi cuenta",
+    "deleteConfirmLabel": "Escribe el siguiente texto para confirmar la eliminación:",
+    "deleting": "Eliminando...",
+    "deleteAccountBtn": "Eliminar mi cuenta",
+    "subscription": {
+      "title": "Suscripción",
+      "proBadge": "Pro",
+      "proTitle": "Plan Pro",
+      "freeTitle": "Plan Gratuito",
+      "renewsOn": "Se renueva el {date}",
+      "perksTitle": "Incluido en tu plan:",
+      "upgradeTitle": "Mejora para desbloquear:",
+      "perkProjects": "Crear proyectos en la nube",
+      "perkSaves": "Guardados manuales e historial de versiones",
+      "perkCollaborators": "Invitar colaboradores",
+      "perkAutoSave": "Guardado automático en la nube",
+      "upgradeBtn": "Actualizar a Pro",
+      "redirecting": "Redirigiendo...",
+      "cancel": "Cancelar suscripción",
+      "cancelConfirm": "Tu acceso Pro permanece activo hasta {date}. ¿Cancelar de todos modos?",
+      "cancelYes": "Sí, cancelar",
+      "cancelNo": "Mantener Pro",
+      "cancelling": "Cancelando...",
+      "cancelSuccess": "Suscripción cancelada. Acceso Pro hasta {date}.",
+      "endsOn": "Tu suscripción termina el {date}",
+      "purchasing": "Comprando...",
+      "purchaseError": "La compra falló. Inténtalo de nuevo.",
+      "cancelApple": "Las suscripciones de Apple se gestionan a través del App Store.",
+      "manageApple": "Abrir App Store",
+      "alreadyBoundTo": "Esta suscripción ya está vinculada a {email}.",
+      "alreadyBoundUnknown": "Esta suscripción ya está vinculada a otra cuenta.",
+      "welcomePro": "Ya estás suscrito a Scriptio Pro. ¡Bienvenido!",
+      "resubscribe": "Reactivar suscripción",
+      "restorePurchases": "Restaurar compras",
+      "transferConfirm": "Tu cuenta de App Store tiene una suscripción activa vinculada a {email}. La restauración transferirá Pro a esta cuenta, y {email} perderá el acceso a Pro. Apple seguirá facturando al mismo ID de Apple. ¿Continuar?",
+      "transferConfirmUnknown": "Tu cuenta de App Store tiene una suscripción activa vinculada a otra cuenta de Scriptio. La restauración transferirá Pro a esta cuenta, y la otra cuenta perderá el acceso a Pro. Apple seguirá facturando al mismo ID de Apple. ¿Continuar?",
+      "transferYes": "Sí, transferir",
+      "transferring": "Transfiriendo...",
+      "appleStoreFreeInfo": "Las funciones Pro están disponibles para las cuentas actualizadas a través de nuestro sitio web.",
+      "appleStoreProInfo": "Para actualizar tu método de pago o cancelar, visita la configuración de tu perfil en scriptio.app."
+    }
+  },
+  "projects": {
+    "untitled": "Sin título",
+    "newProject": "Nuevo proyecto",
+    "pageTitle": "Proyectos",
+    "importBtn": "Importar...",
+    "importing": "Importando...",
+    "createBtn": "Crear",
+    "empty": {
+      "title": "Tu Historia Empieza Aquí",
+      "subtitle": "Crea un nuevo guión o importa un script existente",
+      "createFirst": "Nuevo proyecto",
+      "createDesc": "Empezar desde una página en blanco",
+      "importExisting": "Importar",
+      "importDesc": "Abrir un archivo de guión existente"
     },
-    "search": {
-        "placeholder": "Buscar...",
-        "noMatches": "Sin resultados",
-        "matchCount": "{current} de {total}",
-        "replacePlaceholder": "Remplazar con...",
-        "replace": "Remplazar",
-        "replaceAll": "Remplazar todo",
-        "filterByElement": "Filtrar por elemento:",
-        "elements": {
-            "scene": "Encabezado de escena",
-            "action": "Acción",
-            "character": "Personaje",
-            "dialogue": "Diálogo",
-            "parenthetical": "Paréntesis",
-            "transition": "Transición",
-            "section": "Sección",
-            "note": "Nota",
-            "dual_dialogue": "Diálogo dual",
-            "none": "Ninguno"
-        }
+    "item": {
+      "posterAlt": "Póster de la película",
+      "localOnly": "Solo local",
+      "syncedToCloud": "Sincronizado en la nube"
     },
-    "collaborators": {
-        "projectTeam": "Equipo del proyecto ({count}/{max})",
-        "teamHelp": "Gestiona los miembros de tu equipo y las invitaciones pendientes. Puedes invitar a cualquier usuario no Pro a participar en tu proyecto. El proyecto permanece colaborativo mientras el propietario tenga el plan Pro.",
-        "roles": {
-            "owner": "Propietario",
-            "admin": "Administrador",
-            "editor": "Editor",
-            "viewer": "Espectador"
-        },
-        "roleDesc": {
-            "owner": "Puede eliminar el proyecto y transferir la propiedad",
-            "admin": "Puede invitar, ascender, degradar y expulsar colaboradores",
-            "editor": "Puede modificar el guión y otro contenido del proyecto",
-            "viewer": "Acceso de solo lectura. No puede realizar cambios"
-        },
-        "you": "(tú)",
-        "leave": "Salir",
-        "kick": "Expulsar",
-        "pending": "Pendiente",
-        "cancel": "Cancelar",
-        "emailPlaceholder": "Introduce el correo...",
-        "invite": "Invitar",
-        "proRequired": "A Pro subscription is required to invite collaborators.",
-        "proRequiredInvite": "Upgrade to Pro to invite collaborators",
-        "upgrade": "Upgrade",
-        "localProjectOnly": "Collaboration is not available for local projects. Upload your project to the cloud to invite collaborators."
+    "form": {
+      "formTitle": "Crear proyecto",
+      "titleField": "Título",
+      "descriptionField": "Descripción",
+      "authorField": "Autor",
+      "posterField": "Póster",
+      "optional": "opcional",
+      "submitBtn": "Crear",
+      "failedToCreate": "Error al crear el proyecto"
+    }
+  },
+  "editorSidebar": {
+    "scenes": "Escenas",
+    "characters": "Personajes",
+    "locations": "Localizaciones",
+    "shelf": "Estante",
+    "shelfEmpty": "Seleccione una versión para editar",
+    "goTo": "Ir al guión",
+    "confirmRestore": "Esto reemplazará el contenido correspondiente en su guión.",
+    "restore": "Restaurar",
+    "cancel": "Cancelar",
+    "scenesEmpty": "Aún no hay escenas",
+    "comments": "Comentarios",
+    "commentsEmpty": "No hay comentarios activos",
+    "shelfEmptySelection": "Selecciona una versión del estante para editar"
+  },
+  "formatDropdown": {
+    "elements": {
+      "scene": "ENCABEZADO DE SCÈNE",
+      "action": "Acción",
+      "character": "PERSONAJE",
+      "dialogue": "Diálogo",
+      "parenthetical": "(Paréntesis)",
+      "transition": "TRANSICIÓN:",
+      "section": "Sección",
+      "note": "[[Nota]]",
+      "dual_dialogue": "Doble diálogo",
+      "none": "Ninguno"
     },
-    "export": {
-        "importLabel": "Importar",
-        "selectFile": "Seleccionar archivo",
-        "selectFileDesc": "Sube .fountain, .fdx, .scriptio o .txt",
-        "exportLabel": "Exportar",
-        "formatOptions": {
-            "pdf": "Documento PDF (.pdf)",
-            "fountain": "Fountain (.fountain)",
-            "fdx": "Final Draft (.fdx)",
-            "scriptio": "Scriptio (.scriptio)"
-        },
-        "formatHelp": {
-            "pdf": "Formato estándar de la industria. Ideal para compartir e imprimir.",
-            "fountain": "Formato de texto plano basado en Markdown, ideal para compatibilidad.",
-            "fdx": "Compatible con el software de la industria Final Draft.",
-            "scriptio": "Formato propio de Scriptio, para mantener el proyecto en local"
-        },
-        "includeNotes": "Incluir notas",
-        "includeNotesDesc": "Exportar notas en línea.",
-        "readable": "JSON legible",
-        "readableDesc": "Exportar como JSON plano en lugar de binario comprimido. Archivo más grande, inspeccionable con cualquier editor de texto.",
-        "watermark": "Marca de agua",
-        "watermarkDesc": "Superponer texto en las páginas.",
-        "watermarkPlaceholder": "Texto de marca de agua",
-        "passwordProtection": "Protección con contraseña",
-        "passwordProtectionDesc": "Requerir una contraseña para abrir el PDF.",
-        "passwordPlaceholder": "Introduce la contraseña",
-        "exportBtn": "Exportar",
-        "exporting": "Exportando...",
-        "exportingProgress": "Exportando ({progress}%)"
+    "titlePageElements": {
+      "title": "Título",
+      "author": "Autor",
+      "date": "Fecha",
+      "none": "Ninguno"
+    }
+  },
+  "search": {
+    "placeholder": "Buscar...",
+    "noMatches": "Sin resultados",
+    "matchCount": "{current} de {total}",
+    "replacePlaceholder": "Remplazar con...",
+    "replace": "Remplazar",
+    "replaceAll": "Remplazar todo",
+    "filterByElement": "Filtrar por elemento:",
+    "elements": {
+      "scene": "Encabezado de escena",
+      "action": "Acción",
+      "character": "Personaje",
+      "dialogue": "Diálogo",
+      "parenthetical": "Paréntesis",
+      "transition": "Transición",
+      "section": "Sección",
+      "note": "Nota",
+      "dual_dialogue": "Diálogo dual",
+      "none": "Ninguno"
+    }
+  },
+  "collaborators": {
+    "projectTeam": "Equipo del proyecto ({count}/{max})",
+    "teamHelp": "Gestiona los miembros de tu equipo y las invitaciones pendientes. Puedes invitar a cualquier usuario no Pro a participar en tu proyecto. El proyecto permanece colaborativo mientras el propietario tenga el plan Pro.",
+    "roles": {
+      "owner": "Propietario",
+      "admin": "Administrador",
+      "editor": "Editor",
+      "viewer": "Espectador"
     },
-    "layout": {
-        "pageFormat": "Formato de página",
-        "pageFormatHelp": {
-            "letter": "Formato estándar de Estados Unidos. Estándar de la industria para guiones de Hollywood.",
-            "a4": "Formato estándar internacional. Común en Europa y la mayoría de los países."
-        },
-        "sceneHeadings": "Encabezados de escena",
-        "bold": "Negrita",
-        "boldDesc": "Los encabezados de escena aparecerán en negrita",
-        "extraSpace": "Espacio extra arriba",
-        "extraSpaceDesc": "Añadir espacio extra antes de los encabezados de escena",
-        "sceneNumbering": "Numeración de escenas",
-        "sceneNumberingDesc": "Mostrar números de escena en el margen izquierdo",
-        "duplicateRight": "Duplicar en margen derecho",
-        "duplicateRightDesc": "Mostrar número en ambos lados",
-        "continuation": "Continuación",
-        "moreTitle": "(MORE) Etiqueta",
-        "contdTitle": "(CONT'D) Etiqueta",
-        "pageMargins": "Márgenes de página",
-        "vertical": "Vertical",
-        "horizontal": "Horizontal",
-        "marginTop": "Superior",
-        "marginBottom": "Inferior",
-        "margins": "Márgenes",
-        "marginLeft": "Izquierda",
-        "marginRight": "Derecha",
-        "marginElements": {
-            "action": "Acción",
-            "scene": "Encabezado de escena",
-            "character": "Personaje",
-            "dialogue": "Diálogo",
-            "parenthetical": "Paréntesis",
-            "transition": "Transición",
-            "section": "Sección"
-        },
-        "elements": "Configuración de elementos",
-        "style": "Estilo",
-        "alignment": "Alineación",
-        "italic": "Cursiva",
-        "underline": "Subrayado",
-        "uppercase": "Mayúsculas",
-        "alignLeft": "Izquierda",
-        "alignCenter": "Centro",
-        "alignRight": "Derecha",
-        "sceneSpacing": "Espaciado",
-        "sceneSpacingDesc": "Espaciado sobre los encabezados de escena",
-        "startNewPage": "Iniciar nueva página"
+    "roleDesc": {
+      "owner": "Puede eliminar el proyecto y transferir la propiedad",
+      "admin": "Puede invitar, ascender, degradar y expulsar colaboradores",
+      "editor": "Puede modificar el guión y otro contenido del proyecto",
+      "viewer": "Acceso de solo lectura. No puede realizar cambios"
     },
-    "projectSettings": {
-        "titleLabel": "Título",
-        "titlePlaceholder": "Introduce el nombre del proyecto...",
-        "authorLabel": "Autor",
-        "authorPlaceholder": "Nombre del autor...",
-        "descriptionLabel": "Descripción",
-        "descriptionPlaceholder": "¿De qué trata este guión?",
-        "posterLabel": "Póster",
-        "noPoster": "Sin póster",
-        "posterHelp": "Recomendado: 600x900 píxeles (proporción 2:3). Compatible con PNG y JPG.",
-        "saveChanges": "Guardar cambios",
-        "dangerZoneTitle": "Zona de peligro"
+    "you": "(tú)",
+    "leave": "Salir",
+    "kick": "Expulsar",
+    "pending": "Pendiente",
+    "cancel": "Cancelar",
+    "emailPlaceholder": "Introduce el correo...",
+    "invite": "Invitar",
+    "proRequired": "A Pro subscription is required to invite collaborators.",
+    "proRequiredInvite": "Upgrade to Pro to invite collaborators",
+    "upgrade": "Upgrade",
+    "localProjectOnly": "Collaboration is not available for local projects. Upload your project to the cloud to invite collaborators."
+  },
+  "export": {
+    "importLabel": "Importar",
+    "selectFile": "Seleccionar archivo",
+    "selectFileDesc": "Sube .fountain, .fdx, .scriptio o .txt",
+    "exportLabel": "Exportar",
+    "formatOptions": {
+      "pdf": "Documento PDF (.pdf)",
+      "fountain": "Fountain (.fountain)",
+      "fdx": "Final Draft (.fdx)",
+      "scriptio": "Scriptio (.scriptio)"
     },
-    "contextMenu": {
-        "goToScene": "Ir a la escena",
-        "edit": "Editar",
-        "copy": "Copiar",
-        "cut": "Cortar",
-        "selectInEditor": "Seleccionar",
-        "remove": "Eliminar",
-        "paste": "Pegar",
-        "highlight": "Resaltar",
-        "addCharacter": "Añadir personaje",
-        "addComment": "Añadir comentario",
-        "searchOnWeb": "Buscar en la web",
-        "noSuggestions": "Sin sugerencias",
-        "addToDictionary": "Añadir al diccionario",
-        "makeDualDialogue": "Crear doble diálogo",
-        "shelve": "Archivar",
-        "shelveScene": "Archivar escena",
-        "shelveDialogue": "Archivar diálogo",
-        "shelveAction": "Archivar acción"
+    "formatHelp": {
+      "pdf": "Formato estándar de la industria. Ideal para compartir e imprimir.",
+      "fountain": "Formato de texto plano basado en Markdown, ideal para compatibilidad.",
+      "fdx": "Compatible con el software de la industria Final Draft.",
+      "scriptio": "Formato propio de Scriptio, para mantener el proyecto en local"
     },
-    "popup": {
-        "character": {
-            "create": "Crear personaje",
-            "edit": "Editar personaje",
-            "name": "Nombre",
-            "gender": "Género",
-            "genderFemale": "Mujer",
-            "genderMale": "Hombre",
-            "genderOther": "Otro",
-            "color": "Color",
-            "synopsis": "Sinopsis",
-            "confirm": "Confirmar",
-            "takenNameError": "Ya existe un personaje con el nombre {newName}. Por favor, elige un nombre diferente o edita el personaje existente.",
-            "updateOccurrences": "¿Estás seguro de que quieres actualizar {count} ocurrencias de la palabra {oldName} a {newName}? Ten especial cuidado con las palabras comunes cuya actualización podría ser indeseada.",
-            "yes": "Sí",
-            "noDoNotChange": "No, no cambiar"
-        },
-        "import": {
-            "title": "Confirmar importación",
-            "warning": "¿Estás seguro de que quieres <b>sobrescribir</b> tu proyecto actual?",
-            "info": "Puedes exportar tu proyecto antes de importar uno nuevo.",
-            "yesImport": "Sí, importar",
-            "no": "No"
-        },
-        "scene": {
-            "edit": "Editar escena",
-            "sceneTitle": "Escena",
-            "color": "Color",
-            "synopsis": "Sinopsis",
-            "synopsisPlaceholder": "Escribe una breve descripción de esta escena...",
-            "save": "Guardar"
-        },
-        "uploadToCloud": {
-            "title": "Subir a la nube",
-            "body": "¿Subir este proyecto a la nube? Tu proyecto se respaldará y será accesible desde cualquier dispositivo, y podrás invitar colaboradores.",
-            "confirm": "Subir",
-            "cancel": "Cancelar",
-            "uploading": "Subiendo a la nube...",
-            "failed": "Error al subir. Por favor, inténtalo de nuevo."
-        }
+    "includeNotes": "Incluir notas",
+    "includeNotesDesc": "Exportar notas en línea.",
+    "readable": "JSON legible",
+    "readableDesc": "Exportar como JSON plano en lugar de binario comprimido. Archivo más grande, inspeccionable con cualquier editor de texto.",
+    "watermark": "Marca de agua",
+    "watermarkDesc": "Superponer texto en las páginas.",
+    "watermarkPlaceholder": "Texto de marca de agua",
+    "passwordProtection": "Protección con contraseña",
+    "passwordProtectionDesc": "Requerir una contraseña para abrir el PDF.",
+    "passwordPlaceholder": "Introduce la contraseña",
+    "exportBtn": "Exportar",
+    "exporting": "Exportando...",
+    "exportingProgress": "Exportando ({progress}%)"
+  },
+  "layout": {
+    "pageFormat": "Formato de página",
+    "pageFormatHelp": {
+      "letter": "Formato estándar de Estados Unidos. Estándar de la industria para guiones de Hollywood.",
+      "a4": "Formato estándar internacional. Común en Europa y la mayoría de los países."
     },
-    "board": {
-        "duplicate": "Duplicar",
-        "delete": "Eliminar",
-        "hints": {
-            "pan": "Clic central para desplazar",
-            "select": "Arrastrar para seleccionar tarjetas",
-            "create": "Doble clic para crear tarjeta",
-            "move": "Mantener Shift para mover libremente"
-        },
-        "untitled": "Sin título",
-        "titlePlaceholder": "Título",
-        "descriptionPlaceholder": "Descripción"
+    "sceneHeadings": "Encabezados de escena",
+    "bold": "Negrita",
+    "boldDesc": "Los encabezados de escena aparecerán en negrita",
+    "extraSpace": "Espacio extra arriba",
+    "extraSpaceDesc": "Añadir espacio extra antes de los encabezados de escena",
+    "sceneNumbering": "Numeración de escenas",
+    "sceneNumberingDesc": "Mostrar números de escena en el margen izquierdo",
+    "duplicateRight": "Duplicar en margen derecho",
+    "duplicateRightDesc": "Mostrar número en ambos lados",
+    "continuation": "Continuación",
+    "moreTitle": "(MORE) Etiqueta",
+    "contdTitle": "(CONT'D) Etiqueta",
+    "pageMargins": "Márgenes de página",
+    "vertical": "Vertical",
+    "horizontal": "Horizontal",
+    "marginTop": "Superior",
+    "marginBottom": "Inferior",
+    "margins": "Márgenes",
+    "marginLeft": "Izquierda",
+    "marginRight": "Derecha",
+    "marginElements": {
+      "action": "Acción",
+      "scene": "Encabezado de escena",
+      "character": "Personaje",
+      "dialogue": "Diálogo",
+      "parenthetical": "Paréntesis",
+      "transition": "Transición",
+      "section": "Sección"
     },
-    "saves": {
-        "title": "Historial de versiones",
-        "saveCurrentVersion": "Guardar versión actual",
-        "namePlaceholder": "Nombre de la versión...",
-        "manualSaves": "Guardados manuales",
-        "autoSaves": "Guardados automáticos",
-        "restore": "Restaurar",
-        "rename": "Renombrar",
-        "delete": "Eliminar",
-        "cancel": "Cancelar",
-        "confirmRestore": "Esto reemplazará el documento actual para todos los colaboradores. ¿Estás seguro?",
-        "confirmDelete": "¿Estás seguro de que quieres eliminar este guardado?",
-        "noSaves": "Aún no hay guardados",
-        "proRequired": "Se requiere Pro",
-        "proRequiredDesc": "El historial de versiones es una función Pro. Actualiza tu suscripción para guardar y restaurar versiones con nombre de tu guion.",
-        "upgradeBtn": "Actualizar a Pro",
-        "signInAndUpgrade": "Iniciar sesión y actualizar"
+    "elements": "Configuración de elementos",
+    "style": "Estilo",
+    "alignment": "Alineación",
+    "italic": "Cursiva",
+    "underline": "Subrayado",
+    "uppercase": "Mayúsculas",
+    "alignLeft": "Izquierda",
+    "alignCenter": "Centro",
+    "alignRight": "Derecha",
+    "sceneSpacing": "Espaciado",
+    "sceneSpacingDesc": "Espaciado sobre los encabezados de escena",
+    "startNewPage": "Iniciar nueva página"
+  },
+  "projectSettings": {
+    "titleLabel": "Título",
+    "titlePlaceholder": "Introduce el nombre del proyecto...",
+    "authorLabel": "Autor",
+    "authorPlaceholder": "Nombre del autor...",
+    "descriptionLabel": "Descripción",
+    "descriptionPlaceholder": "¿De qué trata este guión?",
+    "posterLabel": "Póster",
+    "noPoster": "Sin póster",
+    "posterHelp": "Recomendado: 600x900 píxeles (proporción 2:3). Compatible con PNG y JPG.",
+    "saveChanges": "Guardar cambios",
+    "dangerZoneTitle": "Zona de peligro"
+  },
+  "contextMenu": {
+    "goToScene": "Ir a la escena",
+    "edit": "Editar",
+    "copy": "Copiar",
+    "cut": "Cortar",
+    "selectInEditor": "Seleccionar",
+    "remove": "Eliminar",
+    "paste": "Pegar",
+    "highlight": "Resaltar",
+    "addCharacter": "Añadir personaje",
+    "addComment": "Añadir comentario",
+    "searchOnWeb": "Buscar en la web",
+    "noSuggestions": "Sin sugerencias",
+    "addToDictionary": "Añadir al diccionario",
+    "makeDualDialogue": "Crear doble diálogo",
+    "shelve": "Archivar",
+    "shelveScene": "Archivar escena",
+    "shelveDialogue": "Archivar diálogo",
+    "shelveAction": "Archivar acción"
+  },
+  "popup": {
+    "character": {
+      "create": "Crear personaje",
+      "edit": "Editar personaje",
+      "name": "Nombre",
+      "gender": "Género",
+      "genderFemale": "Mujer",
+      "genderMale": "Hombre",
+      "genderOther": "Otro",
+      "color": "Color",
+      "synopsis": "Sinopsis",
+      "confirm": "Confirmar",
+      "takenNameError": "Ya existe un personaje con el nombre {newName}. Por favor, elige un nombre diferente o edita el personaje existente.",
+      "updateOccurrences": "¿Estás seguro de que quieres actualizar {count} ocurrencias de la palabra {oldName} a {newName}? Ten especial cuidado con las palabras comunes cuya actualización podría ser indeseada.",
+      "yes": "Sí",
+      "noDoNotChange": "No, no cambiar"
     },
-    "auth": {
-        "intro": "Introduce tu correo y te enviaremos un enlace de inicio de sesión de un solo uso. No necesitas contraseña.",
-        "emailLabel": "Correo electrónico",
-        "sendLink": "Enviar enlace de inicio de sesión",
-        "sending": "Enviando...",
-        "checkInbox": "Si existe una cuenta asociada a {email}, se ha enviado un enlace de inicio de sesión. El enlace es válido durante los próximos 10 minutos.",
-        "useDifferentEmail": "Usar otro correo electrónico",
-        "waitingForClick": "Esperando a que hagas clic en el enlace de tu bandeja de entrada...",
-        "requestFailed": "No se pudo enviar el enlace de inicio de sesión. Por favor, vuelve a intentarlo en un momento.",
-        "desktopTimeout": "El tiempo de inicio de sesión expiró. Por favor, solicita un nuevo enlace."
+    "import": {
+      "title": "Confirmar importación",
+      "warning": "¿Estás seguro de que quieres <b>sobrescribir</b> tu proyecto actual?",
+      "info": "Puedes exportar tu proyecto antes de importar uno nuevo.",
+      "yesImport": "Sí, importar",
+      "no": "No"
     },
-    "oauth": {
-        "orContinueWith": "o continuar con",
-        "continueWithGoogle": "Continuar con Google",
-        "continueWithApple": "Continuar con Apple",
-        "waiting": "Esperando al navegador…",
-        "timeout": "Tiempo de espera agotado. Por favor, inténtalo de nuevo.",
-        "error": "Error al iniciar sesión. Por favor, inténtalo de nuevo."
+    "scene": {
+      "edit": "Editar escena",
+      "sceneTitle": "Escena",
+      "color": "Color",
+      "synopsis": "Sinopsis",
+      "synopsisPlaceholder": "Escribe una breve descripción de esta escena...",
+      "save": "Guardar"
     },
-    "dates": {
-        "justNow": "Recién",
-        "minutesAgo": "{mins, plural, one {hace # minuto} other {hace # minutos}}",
-        "hoursAgo": "{hours, plural, one {hace # hora} other {hace # horas}}",
-        "today": "Hoy",
-        "yesterday": "Ayer",
-        "daysAgo": "{days, plural, one {hace # día} other {hace # días}}",
-        "monthsAgo": "Hace {months, plural, one {# mes} other {# meses}}",
-        "moreThanYearAgo": "Hace más de 1 año"
+    "uploadToCloud": {
+      "title": "Subir a la nube",
+      "body": "¿Subir este proyecto a la nube? Tu proyecto se respaldará y será accesible desde cualquier dispositivo, y podrás invitar colaboradores.",
+      "confirm": "Subir",
+      "cancel": "Cancelar",
+      "uploading": "Subiendo a la nube...",
+      "failed": "Error al subir. Por favor, inténtalo de nuevo."
     }
+  },
+  "board": {
+    "duplicate": "Duplicar",
+    "delete": "Eliminar",
+    "hints": {
+      "pan": "Clic central para desplazar",
+      "select": "Arrastrar para seleccionar tarjetas",
+      "create": "Doble clic para crear tarjeta",
+      "move": "Mantener Shift para mover libremente"
+    },
+    "untitled": "Sin título",
+    "titlePlaceholder": "Título",
+    "descriptionPlaceholder": "Descripción"
+  },
+  "saves": {
+    "title": "Historial de versiones",
+    "saveCurrentVersion": "Guardar versión actual",
+    "namePlaceholder": "Nombre de la versión...",
+    "manualSaves": "Guardados manuales",
+    "autoSaves": "Guardados automáticos",
+    "restore": "Restaurar",
+    "rename": "Renombrar",
+    "delete": "Eliminar",
+    "cancel": "Cancelar",
+    "confirmRestore": "Esto reemplazará el documento actual para todos los colaboradores. ¿Estás seguro?",
+    "confirmDelete": "¿Estás seguro de que quieres eliminar este guardado?",
+    "noSaves": "Aún no hay guardados",
+    "proRequired": "Se requiere Pro",
+    "proRequiredDesc": "El historial de versiones es una función Pro. Actualiza tu suscripción para guardar y restaurar versiones con nombre de tu guion.",
+    "upgradeBtn": "Actualizar a Pro",
+    "signInAndUpgrade": "Iniciar sesión y actualizar"
+  },
+  "auth": {
+    "intro": "Introduce tu correo y te enviaremos un enlace de inicio de sesión de un solo uso. No necesitas contraseña.",
+    "emailLabel": "Correo electrónico",
+    "sendLink": "Enviar enlace de inicio de sesión",
+    "sending": "Enviando...",
+    "checkInbox": "Si existe una cuenta asociada a {email}, se ha enviado un enlace de inicio de sesión. El enlace es válido durante los próximos 10 minutos.",
+    "useDifferentEmail": "Usar otro correo electrónico",
+    "waitingForClick": "Esperando a que hagas clic en el enlace de tu bandeja de entrada...",
+    "requestFailed": "No se pudo enviar el enlace de inicio de sesión. Por favor, vuelve a intentarlo en un momento.",
+    "desktopTimeout": "El tiempo de inicio de sesión expiró. Por favor, solicita un nuevo enlace."
+  },
+  "oauth": {
+    "orContinueWith": "o continuar con",
+    "continueWithGoogle": "Continuar con Google",
+    "continueWithApple": "Continuar con Apple",
+    "waiting": "Esperando al navegador…",
+    "timeout": "Tiempo de espera agotado. Por favor, inténtalo de nuevo.",
+    "error": "Error al iniciar sesión. Por favor, inténtalo de nuevo."
+  },
+  "dates": {
+    "justNow": "Recién",
+    "minutesAgo": "{mins, plural, one {hace # minuto} other {hace # minutos}}",
+    "hoursAgo": "{hours, plural, one {hace # hora} other {hace # horas}}",
+    "today": "Hoy",
+    "yesterday": "Ayer",
+    "daysAgo": "{days, plural, one {hace # día} other {hace # días}}",
+    "monthsAgo": "Hace {months, plural, one {# mes} other {# meses}}",
+    "moreThanYearAgo": "Hace más de 1 año"
+  }
 }
diff --git a/messages/fr.json b/messages/fr.json
index 84060b90..5253634c 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -206,7 +206,11 @@
     "goTo": "Aller au scénario",
     "confirmRestore": "Cela remplacera le contenu correspondant dans votre scénario.",
     "restore": "Restaurer",
-    "cancel": "Annuler"
+    "cancel": "Annuler",
+    "scenesEmpty": "Aucune scène pour le moment",
+    "comments": "Commentaires",
+    "commentsEmpty": "Aucun commentaire actif",
+    "shelfEmptySelection": "Sélectionnez une version sur l'étagère pour la modifier"
   },
   "formatDropdown": {
     "elements": {
@@ -489,4 +493,4 @@
     "monthsAgo": "Il y a {months, plural, one {# mois} other {# mois}}",
     "moreThanYearAgo": "Il y a plus d'un an"
   }
-}
\ No newline at end of file
+}
diff --git a/messages/ja.json b/messages/ja.json
index c41ec2f3..2beb8a09 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -205,7 +205,11 @@
     "goTo": "脚本内で移動",
     "confirmRestore": "脚本内の一致するコンテンツが置き換えられます。",
     "restore": "復元",
-    "cancel": "キャンセル"
+    "cancel": "キャンセル",
+    "scenesEmpty": "まだシーンはありません",
+    "comments": "コメント",
+    "commentsEmpty": "アクティブなコメントはありません",
+    "shelfEmptySelection": "編集するシェルフのバージョンを選択してください"
   },
   "formatDropdown": {
     "elements": {
@@ -488,4 +492,4 @@
     "monthsAgo": "{months}ヶ月前",
     "moreThanYearAgo": "1年以上前"
   }
-}
\ No newline at end of file
+}
diff --git a/messages/ko.json b/messages/ko.json
index c34bd0ce..c9edda13 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -205,7 +205,11 @@
     "goTo": "각본에서 이동",
     "confirmRestore": "이것은 각본의 해당 내용을 대체합니다.",
     "restore": "복원",
-    "cancel": "취소"
+    "cancel": "취소",
+    "scenesEmpty": "아직 씬이 없습니다",
+    "comments": "코멘트",
+    "commentsEmpty": "활성 코멘트가 없습니다",
+    "shelfEmptySelection": "편집할 보관함 버전을 선택하세요"
   },
   "formatDropdown": {
     "elements": {
@@ -488,4 +492,4 @@
     "monthsAgo": "{months}달 전",
     "moreThanYearAgo": "1년 이상 전"
   }
-}
\ No newline at end of file
+}
diff --git a/messages/pl.json b/messages/pl.json
index f9b9cc3d..72f512bf 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -205,7 +205,11 @@
     "goTo": "Przejdź do scenariusza",
     "confirmRestore": "Spowoduje to zastąpienie pasującej treści w scenariuszu.",
     "restore": "Przywróć",
-    "cancel": "Anuluj"
+    "cancel": "Anuluj",
+    "scenesEmpty": "Brak scen",
+    "comments": "Komentarze",
+    "commentsEmpty": "Brak aktywnych komentarzy",
+    "shelfEmptySelection": "Wybierz wersję z półki do edycji"
   },
   "formatDropdown": {
     "elements": {
@@ -488,4 +492,4 @@
     "monthsAgo": "{months, plural, one {# miesiąc} few {# miesiące} many {# miesięcy} other {# miesięcy}} temu",
     "moreThanYearAgo": "Ponad rok temu"
   }
-}
\ No newline at end of file
+}
diff --git a/messages/zh.json b/messages/zh.json
index d130c2cd..ea963b3f 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -205,7 +205,11 @@
     "goTo": "在剧本中定位",
     "confirmRestore": "这将替换剧本中匹配的内容。",
     "restore": "恢复",
-    "cancel": "取消"
+    "cancel": "取消",
+    "scenesEmpty": "暂无场景",
+    "comments": "评论",
+    "commentsEmpty": "没有活动的评论",
+    "shelfEmptySelection": "选择要编辑的搁置版本"
   },
   "formatDropdown": {
     "elements": {
@@ -488,4 +492,4 @@
     "monthsAgo": "{months} 个月前",
     "moreThanYearAgo": "1 年前"
   }
-}
\ No newline at end of file
+}

From b0b6ab40a43292b804e9c89c9cc81cc6eaed2333 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Wed, 13 May 2026 01:00:22 +0200
Subject: [PATCH 51/76] fixed shelving logic for nodes with comments

---
 src/lib/shelf/shelf-utils.ts | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/lib/shelf/shelf-utils.ts b/src/lib/shelf/shelf-utils.ts
index a92ff999..ad3c2562 100644
--- a/src/lib/shelf/shelf-utils.ts
+++ b/src/lib/shelf/shelf-utils.ts
@@ -11,6 +11,24 @@ export interface ShelveCandidate {
     content: JSONContent[];
 }
 
+/**
+ * Removes 'comment' marks from a node's JSON to prevent it from being
+ * dropped by the shelf editor which lacks the comment extension.
+ */
+function stripComments(nodeJson: JSONContent): JSONContent {
+    const result = { ...nodeJson };
+    if (result.marks) {
+        result.marks = result.marks.filter((m) => m.type !== "comment");
+        if (result.marks.length === 0) {
+            delete result.marks;
+        }
+    }
+    if (result.content) {
+        result.content = result.content.map(stripComments);
+    }
+    return result;
+}
+
 /**
  * Given a position in the document, determine the shelvable content.
  * Returns null if the node at the position is not shelvable.
@@ -32,7 +50,7 @@ export function extractShelveCandidate(editor: Editor, pos: number): ShelveCandi
         case ScreenplayElement.Character:
             return extractDialogueBlockContent(doc, docChildIndex, nodeId, node.textContent);
         case ScreenplayElement.Action:
-            return { nodeId, title: node.textContent, type: "action", content: [node.toJSON()] };
+            return { nodeId, title: node.textContent, type: "action", content: [stripComments(node.toJSON())] };
         default:
             return null;
     }
@@ -48,12 +66,12 @@ function extractSceneContent(
     const content: JSONContent[] = [];
     const count = doc.childCount;
 
-    content.push(doc.child(startIndex).toJSON());
+    content.push(stripComments(doc.child(startIndex).toJSON()));
 
     for (let i = startIndex + 1; i < count; i++) {
         const child = doc.child(i);
         if (child.attrs.class === ScreenplayElement.Scene) break;
-        content.push(child.toJSON());
+        content.push(stripComments(child.toJSON()));
     }
 
     return { nodeId, title, type: "scene", content };
@@ -69,7 +87,7 @@ function extractDialogueBlockContent(
     const content: JSONContent[] = [];
     const count = doc.childCount;
 
-    content.push(doc.child(startIndex).toJSON());
+    content.push(stripComments(doc.child(startIndex).toJSON()));
 
     for (let i = startIndex + 1; i < count; i++) {
         const cls = doc.child(i).attrs.class;
@@ -77,7 +95,7 @@ function extractDialogueBlockContent(
             cls === ScreenplayElement.Dialogue ||
             cls === ScreenplayElement.Parenthetical
         ) {
-            content.push(doc.child(i).toJSON());
+            content.push(stripComments(doc.child(i).toJSON()));
         } else {
             break;
         }

From 2ca7d650b9b38a384b6178793f36112ba0112e1c Mon Sep 17 00:00:00 2001
From: Hugo <hugo@MacBook-Air-de-Hugo.local>
Date: Tue, 19 May 2026 17:19:03 +0200
Subject: [PATCH 52/76] added production logic for scene numbering locking

---
 components/dashboard/DashboardModal.tsx       |   5 +-
 components/dashboard/DashboardSidebar.tsx     |   6 +-
 .../dashboard/account/DashboardAuth.tsx       |   1 -
 .../dashboard/account/ProfileSettings.tsx     |   5 +-
 .../dashboard/project/DangerZone.module.css   |  40 --
 components/dashboard/project/DangerZone.tsx   |   5 +-
 .../project/ProductionSettings.module.css     |  56 +++
 .../dashboard/project/ProductionSettings.tsx  |  49 ++
 components/editor/DocumentEditorPanel.tsx     |   8 +
 components/editor/SuggestionMenu.module.css   |  39 --
 components/editor/SuggestionMenu.tsx          |  25 +-
 .../editor/sidebar/ContextMenu.module.css     |   2 +
 components/editor/sidebar/ContextMenu.tsx     |  81 +++-
 .../sidebar/EditorSidebarNavigation.tsx       |  23 +-
 .../editor/sidebar/SidebarItem.module.css     |   6 +
 .../editor/sidebar/SidebarSceneItem.tsx       |  12 +-
 components/navbar/ProductionPanel.module.css  | 174 +++++++
 components/navbar/ProductionPanel.tsx         | 235 +++++++++
 components/navbar/ProjectNavbar.tsx           |  23 +
 components/popup/Popup.module.css             |  34 +-
 components/popup/Popup.tsx                    |   4 +
 components/popup/PopupCharacterItem.tsx       |   2 +-
 components/popup/PopupImportFile.tsx          |   6 +-
 components/popup/PopupSceneItem.tsx           |   2 +-
 components/popup/PopupUnlockScenes.tsx        |  52 ++
 components/popup/PopupUploadToCloud.tsx       |   6 +-
 components/utils/Dropdown.module.css          |   3 +-
 components/utils/ModalBtn.module.css          |  42 ++
 components/utils/Switch.module.css            |  37 ++
 components/utils/Switch.tsx                   |  34 ++
 messages/de.json                              |  25 +-
 messages/en.json                              |  25 +-
 messages/es.json                              |  25 +-
 messages/fr.json                              |  25 +-
 messages/ja.json                              |  25 +-
 messages/ko.json                              |  25 +-
 messages/pl.json                              |  25 +-
 messages/zh.json                              |  25 +-
 src/context/ProjectContext.tsx                |  61 +++
 src/lib/adapters/pdf/pdf-adapter.ts           |  93 +++-
 src/lib/editor/document-editor-config.ts      |   4 +
 src/lib/editor/use-document-editor.ts         |  29 ++
 src/lib/project/project-doc.ts                |  10 +
 src/lib/project/project-repository.ts         |  66 ++-
 src/lib/screenplay/editor.ts                  |  12 +-
 .../extensions/fountain-extension.ts          |   4 +
 .../extensions/node-id-dedup-extension.ts     |   3 +
 .../extensions/scene-locking-extension.ts     | 244 ++++++++++
 src/lib/screenplay/nodes/scene-node.ts        |  81 ++++
 src/lib/screenplay/popup.ts                   |  15 +-
 src/lib/screenplay/scene-locking.ts           | 449 ++++++++++++++++++
 src/lib/screenplay/scenes.ts                  |  25 +-
 src/lib/shelf/shelf-editor-config.ts          |   1 +
 styles/scriptio.css                           |  59 +++
 54 files changed, 2209 insertions(+), 164 deletions(-)
 create mode 100644 components/dashboard/project/ProductionSettings.module.css
 create mode 100644 components/dashboard/project/ProductionSettings.tsx
 delete mode 100644 components/editor/SuggestionMenu.module.css
 create mode 100644 components/navbar/ProductionPanel.module.css
 create mode 100644 components/navbar/ProductionPanel.tsx
 create mode 100644 components/popup/PopupUnlockScenes.tsx
 create mode 100644 components/utils/ModalBtn.module.css
 create mode 100644 components/utils/Switch.module.css
 create mode 100644 components/utils/Switch.tsx
 create mode 100644 src/lib/screenplay/extensions/scene-locking-extension.ts
 create mode 100644 src/lib/screenplay/scene-locking.ts

diff --git a/components/dashboard/DashboardModal.tsx b/components/dashboard/DashboardModal.tsx
index a2d22443..7fd6c06f 100644
--- a/components/dashboard/DashboardModal.tsx
+++ b/components/dashboard/DashboardModal.tsx
@@ -11,7 +11,7 @@ import CollaboratorsSettings from "./project/CollaboratorsSettings";
 
 import styles from "./DashboardModal.module.css";
 import ExportProject from "./project/ExportProject";
-import { CreditCard, FileDown, Folder, Globe, Keyboard, Palette, PanelsTopLeft, User, Users, X } from "lucide-react";
+import { CreditCard, FileDown, Folder, Globe, Keyboard, Lock, Palette, PanelsTopLeft, User, Users, X } from "lucide-react";
 import { useTranslations } from "next-intl";
 import KeybindsSettings from "./preferences/KeybindsSettings";
 import AppearanceSettings from "./preferences/AppearanceSettings";
@@ -19,6 +19,7 @@ import LanguageSettings from "./preferences/LanguageSettings";
 import ProfileSettings from "./account/ProfileSettings";
 import SubscriptionSettings from "./account/SubscriptionSettings";
 import LayoutSettings from "./project/LayoutSettings";
+import ProductionSettings from "./project/ProductionSettings";
 import DashboardAuth from "./account/DashboardAuth";
 import AboutSettings from "./AboutSettings";
 
@@ -33,6 +34,7 @@ const DashboardModal = () => {
         items: [
             { id: "General",       label: t("tabs.General"),       icon: <Folder size={18} /> },
             { id: "Layout",        label: t("tabs.Layout"),        icon: <PanelsTopLeft size={18} /> },
+            { id: "Production",    label: t("tabs.Production"),    icon: <Lock size={18} /> },
             { id: "Export",        label: t("tabs.Export"),        icon: <FileDown size={18} /> },
             { id: "Collaborators", label: t("tabs.Collaborators"), icon: <Users size={18} /> },
         ],
@@ -134,6 +136,7 @@ const DashboardModal = () => {
                         {/* Project tabs - only rendered when in project context */}
                         {isInProject && activeTab === "General" && <ProjectSettings dangerOpen={dangerOpen} onDangerToggle={() => setDangerOpen((v) => !v)} />}
                         {isInProject && activeTab === "Layout" && <LayoutSettings />}
+                        {isInProject && activeTab === "Production" && <ProductionSettings />}
                         {isInProject && activeTab === "Export" && <ExportProject />}
                         {isInProject && activeTab === "Collaborators" && <CollaboratorsSettings />}
                         {/* Preferences tabs */}
diff --git a/components/dashboard/DashboardSidebar.tsx b/components/dashboard/DashboardSidebar.tsx
index 54db8fa9..73f2b50e 100644
--- a/components/dashboard/DashboardSidebar.tsx
+++ b/components/dashboard/DashboardSidebar.tsx
@@ -8,6 +8,7 @@ import { useTranslations } from "next-intl";
 
 import styles from "./DashboardModal.module.css";
 import dangerStyles from "./project/DangerZone.module.css";
+import modal from "../utils/ModalBtn.module.css";
 import { signOut } from "next-auth/react";
 import { isTauri } from "@tauri-apps/api/core";
 import { useCookieUser } from "@src/lib/utils/hooks";
@@ -15,6 +16,7 @@ import { useCookieUser } from "@src/lib/utils/hooks";
 export type Category =
     | "General"
     | "Layout"
+    | "Production"
     | "Export"
     | "Collaborators"
     | "Profile"
@@ -72,13 +74,13 @@ const SidebarMenu = ({ structure, activeTab, onTabChange }: SidebarMenuProps) =>
                         <p className={dangerStyles.modalDescription}>{t("logOutConfirmDesc")}</p>
                         <div className={dangerStyles.modalActions}>
                             <button
-                                className={`${dangerStyles.modalBtn} ${dangerStyles.modalBtnDanger}`}
+                                className={`${modal.modalBtn} ${modal.modalBtnDanger}`}
                                 onClick={onLogOut}
                             >
                                 {t("logOutConfirmBtn")}
                             </button>
                             <button
-                                className={`${dangerStyles.modalBtn} ${dangerStyles.modalBtnCancel}`}
+                                className={`${modal.modalBtn} ${modal.modalBtnCancel}`}
                                 onClick={() => setShowLogOutConfirm(false)}
                             >
                                 {t("logOutCancelBtn")}
diff --git a/components/dashboard/account/DashboardAuth.tsx b/components/dashboard/account/DashboardAuth.tsx
index b76a62e4..94983ecc 100644
--- a/components/dashboard/account/DashboardAuth.tsx
+++ b/components/dashboard/account/DashboardAuth.tsx
@@ -15,7 +15,6 @@ import { ArrowLeft } from "lucide-react";
 import form from "./../../utils/Form.module.css";
 import sharedStyles from "../project/ProjectSettings.module.css";
 import styles from "./AuthForm.module.css";
-import dangerStyles from "../project/DangerZone.module.css";
 
 type MessageType = "success" | "error" | "info";
 
diff --git a/components/dashboard/account/ProfileSettings.tsx b/components/dashboard/account/ProfileSettings.tsx
index edfc7a1f..f5e6324f 100644
--- a/components/dashboard/account/ProfileSettings.tsx
+++ b/components/dashboard/account/ProfileSettings.tsx
@@ -12,6 +12,7 @@ import form from "./../../utils/Form.module.css";
 import sharedStyles from "../project/ProjectSettings.module.css";
 import styles from "./ProfileSettings.module.css";
 import dangerStyles from "../project/DangerZone.module.css";
+import modal from "../../utils/ModalBtn.module.css";
 import { ApiResponse } from "@src/lib/utils/api-utils";
 import { useUser } from "@src/lib/utils/hooks";
 
@@ -147,7 +148,7 @@ const ProfileSettings = ({ dangerOpen, onDangerToggle }: { dangerOpen: boolean;
                             />
                             <div className={dangerStyles.modalActions}>
                                 <button
-                                    className={`${dangerStyles.modalBtn} ${dangerStyles.modalBtnDanger}`}
+                                    className={`${modal.modalBtn} ${modal.modalBtnDanger}`}
                                     onClick={handleDeleteAccount}
                                     disabled={deleteLoading || deleteConfirmInput !== confirmPhrase}
                                 >
@@ -155,7 +156,7 @@ const ProfileSettings = ({ dangerOpen, onDangerToggle }: { dangerOpen: boolean;
                                     {deleteLoading ? t("deleting") : t("deleteAccountBtn")}
                                 </button>
                                 <button
-                                    className={`${dangerStyles.modalBtn} ${dangerStyles.modalBtnCancel}`}
+                                    className={`${modal.modalBtn} ${modal.modalBtnCancel}`}
                                     onClick={() => {
                                         setShowDeleteDialog(false);
                                         setDeleteConfirmInput("");
diff --git a/components/dashboard/project/DangerZone.module.css b/components/dashboard/project/DangerZone.module.css
index dcde0a49..1bad62bb 100644
--- a/components/dashboard/project/DangerZone.module.css
+++ b/components/dashboard/project/DangerZone.module.css
@@ -115,43 +115,3 @@
     flex-direction: column;
     gap: 10px;
 }
-
-.modalBtn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 8px;
-    padding: 10px 16px;
-    border-radius: 40px;
-    border: none;
-    font-size: 0.9rem;
-    font-weight: 500;
-    cursor: pointer;
-    transition: opacity 0.2s ease;
-}
-
-.modalBtn:disabled {
-    opacity: 0.6;
-    cursor: not-allowed;
-}
-
-.modalBtnDanger {
-    background: var(--error);
-    color: white;
-}
-
-.modalBtnDanger:hover:not(:disabled) {
-    opacity: 0.85;
-}
-
-.modalBtnCancel {
-    background: transparent;
-    color: var(--secondary-text);
-    border-radius: 40px;
-    border: 2px solid var(--secondary-text);
-}
-
-.modalBtnCancel:hover:not(:disabled) {
-    color: var(--primary-text);
-    border-color: var(--primary-text);
-}
diff --git a/components/dashboard/project/DangerZone.tsx b/components/dashboard/project/DangerZone.tsx
index 8a239601..22a92350 100644
--- a/components/dashboard/project/DangerZone.tsx
+++ b/components/dashboard/project/DangerZone.tsx
@@ -9,6 +9,7 @@ import { Trash2 } from "lucide-react";
 import { useTranslations } from "next-intl";
 
 import styles from "./DangerZone.module.css";
+import modal from "../../utils/ModalBtn.module.css";
 import form from "../../utils/Form.module.css";
 
 interface DangerZoneProps {
@@ -95,7 +96,7 @@ const DangerZone = ({ projectId, isLocalOnly, isOpen }: DangerZoneProps) => {
                         <p className={styles.modalDescription}>{t("modalDesc")}</p>
                         <div className={styles.modalActions}>
                             <button
-                                className={`${styles.modalBtn} ${styles.modalBtnDanger}`}
+                                className={`${modal.modalBtn} ${modal.modalBtnDanger}`}
                                 onClick={handleDeleteProject}
                                 disabled={loading}
                             >
@@ -103,7 +104,7 @@ const DangerZone = ({ projectId, isLocalOnly, isOpen }: DangerZoneProps) => {
                                 {loading ? t("deleting") : t("confirmDeleteBtn")}
                             </button>
                             <button
-                                className={`${styles.modalBtn} ${styles.modalBtnCancel}`}
+                                className={`${modal.modalBtn} ${modal.modalBtnCancel}`}
                                 onClick={() => setShowDeleteDialog(false)}
                                 disabled={loading}
                             >
diff --git a/components/dashboard/project/ProductionSettings.module.css b/components/dashboard/project/ProductionSettings.module.css
new file mode 100644
index 00000000..6ee695e7
--- /dev/null
+++ b/components/dashboard/project/ProductionSettings.module.css
@@ -0,0 +1,56 @@
+.styleOptions {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 8px;
+    margin-top: 10px;
+}
+
+.styleOption {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+    justify-content: center;
+    gap: 8px;
+    padding: 8px 12px;
+    border: 1px solid var(--separator);
+    border-radius: 6px;
+    background: var(--main-bg);
+    color: var(--primary-text);
+    cursor: pointer;
+    transition: border-color 0.15s ease, background 0.15s ease;
+}
+
+.styleOption:hover:not(:disabled) {
+    border-color: var(--primary-text);
+}
+
+.styleOption:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+.styleOptionActive {
+    border-color: var(--primary-text);
+    background: color-mix(in srgb, var(--primary-text) 8%, transparent);
+}
+
+.styleExample {
+    font-family: var(--font-screenplay);
+    font-size: 0.85rem;
+    font-weight: 600;
+}
+
+.styleName {
+    font-size: 0.7rem;
+    color: var(--secondary-text);
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+}
+
+.note {
+    margin-top: 16px;
+    font-size: 0.78rem;
+    color: var(--secondary-text);
+    font-style: italic;
+    line-height: 1.4;
+}
diff --git a/components/dashboard/project/ProductionSettings.tsx b/components/dashboard/project/ProductionSettings.tsx
new file mode 100644
index 00000000..4620bbce
--- /dev/null
+++ b/components/dashboard/project/ProductionSettings.tsx
@@ -0,0 +1,49 @@
+"use client";
+
+import { useContext } from "react";
+import { useTranslations } from "next-intl";
+import { ProjectContext } from "@src/context/ProjectContext";
+
+import form from "./../../utils/Form.module.css";
+import sharedStyles from "./ProjectSettings.module.css";
+import styles from "./ProductionSettings.module.css";
+
+const ProductionSettings = () => {
+    const t = useTranslations("production");
+    const { sceneNumberingStyle, setSceneNumberingStyle, isReadOnly } =
+        useContext(ProjectContext);
+
+    return (
+        <div className={sharedStyles.settingsForm}>
+            <div className={sharedStyles.formGroup}>
+                <label className={form.label}>{t("numberingStyleTitle")}</label>
+                <p className={sharedStyles.helpText}>{t("numberingStyleHelp")}</p>
+
+                <div className={styles.styleOptions}>
+                    <button
+                        type="button"
+                        className={`${styles.styleOption} ${sceneNumberingStyle === "suffix" ? styles.styleOptionActive : ""}`}
+                        onClick={() => setSceneNumberingStyle("suffix")}
+                        disabled={isReadOnly}
+                    >
+                        <span className={styles.styleExample}>{t("suffixExample")}</span>
+                        <span className={styles.styleName}>{t("suffixName")}</span>
+                    </button>
+                    <button
+                        type="button"
+                        className={`${styles.styleOption} ${sceneNumberingStyle === "prefix" ? styles.styleOptionActive : ""}`}
+                        onClick={() => setSceneNumberingStyle("prefix")}
+                        disabled={isReadOnly}
+                    >
+                        <span className={styles.styleExample}>{t("prefixExample")}</span>
+                        <span className={styles.styleName}>{t("prefixName")}</span>
+                    </button>
+                </div>
+
+                <p className={styles.note}>{t("appliesToNewOnly")}</p>
+            </div>
+        </div>
+    );
+};
+
+export default ProductionSettings;
diff --git a/components/editor/DocumentEditorPanel.tsx b/components/editor/DocumentEditorPanel.tsx
index cf5dada4..24603169 100644
--- a/components/editor/DocumentEditorPanel.tsx
+++ b/components/editor/DocumentEditorPanel.tsx
@@ -74,6 +74,7 @@ const DocumentEditorPanel = ({
         moreLabel,
         elementMargins,
         elementStyles,
+        sceneLocking,
         setFocusedEditorType,
         setSelectedTitlePageElement,
         repository,
@@ -172,6 +173,12 @@ const DocumentEditorPanel = ({
             editorElement.classList.remove("scene-number-right");
         }
 
+        if (sceneLocking) {
+            editorElement.classList.add("production-locked");
+        } else {
+            editorElement.classList.remove("production-locked");
+        }
+
         editorElement.style.setProperty("--contd-label", `"${contdLabel}"`);
         editorElement.style.setProperty("--more-label", `"${moreLabel}"`);
 
@@ -246,6 +253,7 @@ const DocumentEditorPanel = ({
         moreLabel,
         elementMargins,
         elementStyles,
+        sceneLocking,
     ]);
 
     // ---- Pagination update (title page only) ----
diff --git a/components/editor/SuggestionMenu.module.css b/components/editor/SuggestionMenu.module.css
deleted file mode 100644
index 2f55d3a1..00000000
--- a/components/editor/SuggestionMenu.module.css
+++ /dev/null
@@ -1,39 +0,0 @@
-.menu {
-    position: fixed;
-    display: flex;
-    flex-direction: column;
-    padding-block: 6px;
-    z-index: 100;
-    border-radius: 12px;
-    background-color: var(--context-menu-bg);
-    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
-    min-width: 120px;
-    max-width: 220px;
-    max-height: 180px;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
-.menu_item {
-    display: flex;
-    align-items: center;
-    padding-block: 6px;
-    padding-inline: 12px;
-    font-size: 14px;
-    cursor: pointer;
-}
-
-.menu_item:hover {
-    background-color: var(--context-menu-item-hover);
-}
-
-.selected {
-    background-color: var(--context-menu-item-hover);
-}
-
-.item {
-    overflow-x: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    margin: 0;
-}
diff --git a/components/editor/SuggestionMenu.tsx b/components/editor/SuggestionMenu.tsx
index 0892b9f5..00d48e09 100644
--- a/components/editor/SuggestionMenu.tsx
+++ b/components/editor/SuggestionMenu.tsx
@@ -2,7 +2,7 @@
 
 import { useContext, useEffect, useState, useCallback, useRef } from "react";
 
-import styles from "./SuggestionMenu.module.css";
+import styles from "../utils/Dropdown.module.css";
 import { pasteTextAt, insertElement } from "@src/lib/screenplay/editor";
 import { ScreenplayElement } from "@src/lib/utils/enums";
 import { ProjectContext } from "@src/context/ProjectContext";
@@ -124,10 +124,19 @@ const SuggestionMenu = ({ suggestionData, suggestions, onSelect }: Props) => {
 
     return (
         <div
-            className={styles.menu}
+            className={styles.dropdown_menu}
             style={{
+                position: "fixed",
                 top: suggestionData.position.y + 20,
                 left: suggestionData.position.x,
+                width: "auto",
+                minWidth: "120px",
+                maxWidth: "220px",
+                maxHeight: "180px",
+                boxShadow: "0 0 10px 0 rgba(0, 0, 0, 0.2)",
+                padding: "6px",
+                backgroundColor: "var(--context-menu-bg)",
+                borderColor: "var(--separator)",
             }}
         >
             {suggestions.map((suggestion: string, index: number) => (
@@ -135,11 +144,19 @@ const SuggestionMenu = ({ suggestionData, suggestions, onSelect }: Props) => {
                     ref={(el) => {
                         itemRefs.current[index] = el;
                     }}
-                    className={`${styles.menu_item} ${index === selectedIdx ? styles.selected : ""}`}
+                    className={styles.dropdown_item}
                     onClick={() => selectSuggestion(index)}
                     key={index}
+                    style={{ 
+                        padding: "6px 12px",
+                        backgroundColor: index === selectedIdx ? "var(--context-menu-item-hover)" : "transparent"
+                    }}
                 >
-                    <p className={styles.item + " unselectable"}>{suggestion}</p>
+                    <div className={styles.item_content}>
+                        <p style={{ overflowX: "hidden", whiteSpace: "nowrap", textOverflow: "ellipsis", margin: 0, fontSize: "14px" }} className="unselectable">
+                            {suggestion}
+                        </p>
+                    </div>
                 </div>
             ))}
         </div>
diff --git a/components/editor/sidebar/ContextMenu.module.css b/components/editor/sidebar/ContextMenu.module.css
index fa554e32..02a9ffc8 100644
--- a/components/editor/sidebar/ContextMenu.module.css
+++ b/components/editor/sidebar/ContextMenu.module.css
@@ -18,8 +18,10 @@
     align-items: center;
     gap: 10px;
 
+    border-radius: 6px;
     padding-block: 6px;
     padding-inline: 12px;
+    margin-inline: 6px;
 
     font-size: 14px;
     cursor: pointer;
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index 36a21ac2..0aa60f00 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -21,6 +21,8 @@ import {
     ClipboardPaste,
     Columns2,
     Copy,
+    EyeOff,
+    Eye,
     Highlighter,
     Loader2,
     LucideIcon,
@@ -32,6 +34,7 @@ import {
 } from "lucide-react";
 import { makeDualDialogue } from "@src/lib/screenplay/dual-dialogue";
 import { extractShelveCandidate } from "@src/lib/shelf/shelf-utils";
+import { omitSceneByUuid, unomitSceneByUuid } from "@src/lib/screenplay/scene-locking";
 import { ScreenplayElement } from "@src/lib/utils/enums";
 
 /* ==================== */
@@ -107,9 +110,22 @@ export type SceneContextProps = {
 const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
     const t = useTranslations("contextMenu");
     const userCtx = useContext(UserContext);
-    const { editor, isReadOnly } = useContext(ProjectContext);
+    const { editor, isReadOnly, repository } = useContext(ProjectContext);
     const scene: Scene = props.scene;
 
+    const canOmit = !!scene.id && !scene.omitted;
+    const canUnomit = !!scene.id && !!scene.omitted;
+
+    const handleOmit = () => {
+        if (!repository || !scene.id) return;
+        omitSceneByUuid(repository, scene.id);
+    };
+
+    const handleUnomit = () => {
+        if (!repository || !scene.id) return;
+        unomitSceneByUuid(repository, scene.id);
+    };
+
     return (
         <>
             <ContextMenuItem
@@ -129,6 +145,12 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
                         text={t("cut")}
                         action={() => cutText(editor!, scene.position, scene.nextPosition)}
                     />
+                    {canOmit && (
+                        <ContextMenuItem text={t("omitScene")} icon={EyeOff} action={handleOmit} />
+                    )}
+                    {canUnomit && (
+                        <ContextMenuItem text={t("unomitScene")} icon={Eye} action={handleUnomit} />
+                    )}
                 </>
             )}
         </>
@@ -456,12 +478,47 @@ export type EditorContextMenuProps = {
 
 const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
     const t = useTranslations("contextMenu");
-    const { editor, repository, isReadOnly } = useContext(ProjectContext);
+    const { editor, repository, isReadOnly, persistentScenes } =
+        useContext(ProjectContext);
     const { worker } = useSpellcheck();
     const { updateContextMenu } = useContext(UserContext);
     const { from, to, onAddComment, spellError, nodePos, nodeClass } = props;
     const hasSelection = from !== to;
 
+    // Resolve scene UUID + lock state if right-clicked on a scene heading.
+    // `nodePos` is the cursor position inside the paragraph (from the editor
+    // dispatcher), so we resolve up to the depth-1 ancestor — the scene <p>
+    // node itself — rather than calling `doc.nodeAt(nodePos)` which would
+    // return the inner text node.
+    const sceneInfo = (() => {
+        if (nodeClass !== ScreenplayElement.Scene || nodePos === undefined || !editor) {
+            return null;
+        }
+        let sceneNode;
+        try {
+            sceneNode = editor.state.doc.resolve(nodePos).node(1);
+        } catch {
+            return null;
+        }
+        if (!sceneNode || sceneNode.attrs?.class !== ScreenplayElement.Scene) return null;
+        const uuid: string | undefined = sceneNode.attrs?.["data-id"];
+        if (!uuid) return null;
+        const entry = persistentScenes[uuid];
+        return { uuid, isOmitted: !!entry?.omitted };
+    })();
+
+    const handleOmitScene = () => {
+        if (!repository || !sceneInfo) return;
+        omitSceneByUuid(repository, sceneInfo.uuid);
+        updateContextMenu(undefined);
+    };
+
+    const handleUnomitScene = () => {
+        if (!repository || !sceneInfo) return;
+        unomitSceneByUuid(repository, sceneInfo.uuid);
+        updateContextMenu(undefined);
+    };
+
     const [suggestions, setSuggestions] = useState<string[] | null>(null);
     const displaySuggestions = spellError && !worker ? [] : suggestions;
 
@@ -624,6 +681,26 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
                     )}
                 </>
             )}
+
+            {/* Production: Omit / Unomit on a locked scene heading */}
+            {sceneInfo && !isReadOnly && (
+                <>
+                    <div className={context.menu_separator} />
+                    {sceneInfo.isOmitted ? (
+                        <ContextMenuItem
+                            text={t("unomitScene")}
+                            icon={Eye}
+                            action={handleUnomitScene}
+                        />
+                    ) : (
+                        <ContextMenuItem
+                            text={t("omitScene")}
+                            icon={EyeOff}
+                            action={handleOmitScene}
+                        />
+                    )}
+                </>
+            )}
         </>
     );
 };
diff --git a/components/editor/sidebar/EditorSidebarNavigation.tsx b/components/editor/sidebar/EditorSidebarNavigation.tsx
index dcca095e..4461fb37 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.tsx
+++ b/components/editor/sidebar/EditorSidebarNavigation.tsx
@@ -1,12 +1,13 @@
 "use client";
 
 import { join } from "@src/lib/utils/misc";
-import { useContext, useState, useCallback, useRef, useEffect } from "react";
+import { useContext, useState, useCallback, useRef, useEffect, useMemo } from "react";
 import { useTranslations } from "next-intl";
 import { ProjectContext } from "@src/context/ProjectContext";
 import { useViewContext } from "@src/context/ViewContext";
 import { Scene } from "@src/lib/screenplay/scenes";
 import { focusOnPosition } from "@src/lib/screenplay/editor";
+import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
 import { Archive, Clapperboard, MessageSquare } from "lucide-react";
 import SidebarSceneItem from "./SidebarSceneItem";
 import ShelfSidebarView from "./ShelfSidebarView";
@@ -17,7 +18,7 @@ import sidebar_nav from "./EditorSidebarNavigation.module.css";
 
 const EditorSidebarNavigation = () => {
     const t = useTranslations("editorSidebar");
-    const { scenes, updateScenes, editor } = useContext(ProjectContext);
+    const { scenes, updateScenes, editor, sceneLocking, sceneNumberingStyle, persistentScenes } = useContext(ProjectContext);
     const { leftSidebarOpen } = useViewContext();
 
     const [activeTab, setActiveTab] = useState<"scenes" | "shelf" | "comments">("scenes");
@@ -31,6 +32,21 @@ const EditorSidebarNavigation = () => {
     // Track which scene the cursor is currently in
     const [currentSceneIndex, setCurrentSceneIndex] = useState<number | null>(null);
 
+    // Compute display labels and omitted flags for every scene. When locking is
+    // off we fall back to positional numbers so the user always has a number to
+    // navigate by.
+    const sceneDisplays = useMemo(() => {
+        if (sceneLocking) {
+            const uuids = scenes.map((s) => s.id ?? "");
+            const labels = computeSceneLabels(uuids, persistentScenes, sceneNumberingStyle);
+            return scenes.map((_, i) => ({
+                label: labels[i]?.label ?? `${i + 1}`,
+                isOmitted: labels[i]?.status === "omitted",
+            }));
+        }
+        return scenes.map((_, i) => ({ label: `${i + 1}`, isOmitted: false }));
+    }, [scenes, sceneLocking, sceneNumberingStyle, persistentScenes]);
+
     const listRef = useRef<HTMLDivElement>(null);
     const currentSceneRef = useRef<HTMLDivElement>(null);
     const scenesRef = useRef(scenes);
@@ -202,12 +218,15 @@ const EditorSidebarNavigation = () => {
                                             indicatorIndex === dragIndex + 1;
                                         const showIndicator = !isNoOp && indicatorIndex === index;
                                         const isCurrent = index === currentSceneIndex;
+                                        const display = sceneDisplays[index];
                                         return (
                                             <SidebarSceneItem
                                                 key={scene.position}
                                                 scrollRef={isCurrent ? currentSceneRef : undefined}
                                                 scene={scene}
                                                 index={index}
+                                                label={display?.label ?? `${index + 1}`}
+                                                isOmitted={display?.isOmitted ?? false}
                                                 showDropIndicator={showIndicator}
                                                 isDragging={dragIndex === index}
                                                 isCurrent={isCurrent}
diff --git a/components/editor/sidebar/SidebarItem.module.css b/components/editor/sidebar/SidebarItem.module.css
index eba5302b..c4e9b35d 100644
--- a/components/editor/sidebar/SidebarItem.module.css
+++ b/components/editor/sidebar/SidebarItem.module.css
@@ -35,6 +35,12 @@
     background-color: var(--editor-style-bg-hover);
 }
 
+.scene_number {
+    color: var(--secondary-text);
+    font-weight: 600;
+    margin-right: 2px;
+}
+
 .header {
     display: flex;
     flex-direction: row;
diff --git a/components/editor/sidebar/SidebarSceneItem.tsx b/components/editor/sidebar/SidebarSceneItem.tsx
index b52cdc56..50742965 100644
--- a/components/editor/sidebar/SidebarSceneItem.tsx
+++ b/components/editor/sidebar/SidebarSceneItem.tsx
@@ -14,12 +14,16 @@ type SidebarSceneItemProps = SceneContextProps & {
     showDropIndicator: boolean;
     isDragging: boolean;
     isCurrent: boolean;
+    /** Display label for the scene number (e.g. "3", "3A"). */
+    label: string;
+    /** True when this scene is a locked OMITTED placeholder. */
+    isOmitted: boolean;
     scrollRef?: Ref<HTMLDivElement>;
     onPointerDown: (index: number, e: React.PointerEvent) => void;
     onDoubleClick: (scene: Scene) => void;
 };
 
-const SidebarSceneItem = memo(({ scene, index, showDropIndicator, isDragging, isCurrent, scrollRef, onPointerDown, onDoubleClick }: SidebarSceneItemProps) => {
+const SidebarSceneItem = memo(({ scene, index, showDropIndicator, isDragging, isCurrent, label, isOmitted, scrollRef, onPointerDown, onDoubleClick }: SidebarSceneItemProps) => {
     const { updateContextMenu } = useContext(UserContext);
 
     const handleDropdown = (e: React.MouseEvent) => {
@@ -43,6 +47,7 @@ const SidebarSceneItem = memo(({ scene, index, showDropIndicator, isDragging, is
 
     // Show synopsis if available, otherwise show preview
     const displayText = scene.synopsis || scene.preview;
+    const titleText = isOmitted ? "OMITTED" : scene.title;
 
     const containerClass = join(
         nav_item.container,
@@ -64,8 +69,9 @@ const SidebarSceneItem = memo(({ scene, index, showDropIndicator, isDragging, is
                     {scene.color && (
                         <span className={nav_item.color_indicator} style={{ backgroundColor: scene.color }} />
                     )}
-                    <p className={join(nav_item.title, "unselectable")}>{scene.title}</p>
-                    {/*scene.id && <LinkSVG className={nav_item.icon} />*/}
+                    <p className={join(nav_item.title, "unselectable")}>
+                        <span className={nav_item.scene_number}>{label}.</span> {titleText}
+                    </p>
                 </div>
                 <SceneLengthItem scene={scene} />
             </div>
diff --git a/components/navbar/ProductionPanel.module.css b/components/navbar/ProductionPanel.module.css
new file mode 100644
index 00000000..1f45f8e5
--- /dev/null
+++ b/components/navbar/ProductionPanel.module.css
@@ -0,0 +1,174 @@
+.container {
+    composes: panel from "./navbar-shared.module.css";
+    position: absolute;
+    top: calc(100% + 8px);
+    left: 0;
+    z-index: 100;
+    width: 340px;
+    max-height: 480px;
+    display: flex;
+    flex-direction: column;
+    border-radius: 16px;
+    overflow: hidden;
+}
+
+.header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 12px 16px;
+    border-bottom: 1px solid var(--separator);
+    flex-shrink: 0;
+}
+
+.title {
+    font-size: 0.85rem;
+    font-weight: 600;
+    color: var(--primary-text);
+}
+
+.close_btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 4px;
+    border: none;
+    background: none;
+    color: var(--secondary-text);
+    cursor: pointer;
+    border-radius: 4px;
+}
+
+.close_btn:hover {
+    background-color: var(--tertiary);
+    color: var(--primary-text);
+}
+
+/* Section */
+.section {
+    padding: 12px 16px;
+    border-bottom: 1px solid var(--separator);
+}
+
+.section:last-child {
+    border-bottom: none;
+}
+
+.row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    min-height: 22px;
+}
+
+.row_main {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    min-width: 0;
+}
+
+.row_actions {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    flex-shrink: 0;
+}
+
+.row_icon {
+    color: var(--secondary-text);
+    flex-shrink: 0;
+}
+
+.row_label {
+    font-size: 0.85rem;
+    color: var(--primary-text);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+/* Provisional labels preview — boxed sub-section under the locking toggle. */
+.provisional_box {
+    margin-top: 10px;
+    padding: 10px 12px;
+    background-color: var(--primary);
+    border: 1px solid var(--separator);
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.provisional_title {
+    font-size: 0.7rem;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.03em;
+    color: var(--secondary-text);
+    opacity: 0.8;
+}
+
+.provisional_list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    max-height: 120px;
+    overflow-y: auto;
+}
+
+.provisional_label {
+    display: inline-flex;
+    align-items: center;
+    padding: 2px 8px;
+    font-size: 0.72rem;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    color: var(--primary-text);
+    background: color-mix(in srgb, var(--primary-text) 15%, transparent);
+    border: 1px solid color-mix(in srgb, var(--primary-text) 30%, transparent);
+    border-radius: 20px;
+}
+
+.relock_btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 3px 10px;
+    border: none;
+    background-color: var(--tertiary);
+    color: var(--primary-text);
+    border-radius: 12px;
+    font-size: 0.72rem;
+    font-weight: 600;
+    letter-spacing: 0.02em;
+    cursor: pointer;
+    transition: opacity 0.15s ease;
+}
+
+.relock_btn:hover:not(:disabled) {
+    opacity: 0.75;
+}
+
+.relock_btn:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+/* Revision swatches */
+.swatches {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    margin-top: 10px;
+}
+
+.swatch {
+    width: 18px;
+    height: 18px;
+    border-radius: 50%;
+    border: 1px solid var(--separator);
+    opacity: 0.5;
+    cursor: not-allowed;
+}
diff --git a/components/navbar/ProductionPanel.tsx b/components/navbar/ProductionPanel.tsx
new file mode 100644
index 00000000..580487b0
--- /dev/null
+++ b/components/navbar/ProductionPanel.tsx
@@ -0,0 +1,235 @@
+"use client";
+
+import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
+import { useTranslations } from "next-intl";
+import { Lock, X } from "lucide-react";
+
+import { ProjectContext } from "@src/context/ProjectContext";
+import { UserContext } from "@src/context/UserContext";
+import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
+import { computeSceneItems } from "@src/lib/screenplay/scenes";
+import { unlockScenesPopup } from "@src/lib/screenplay/popup";
+import Switch from "@components/utils/Switch";
+
+import styles from "./ProductionPanel.module.css";
+
+interface ProductionPanelProps {
+    isOpen: boolean;
+    onClose: () => void;
+}
+
+const REVISION_COLORS = [
+    "#ffffff", // white
+    "#bbdfff", // blue
+    "#ffb6c1", // pink
+    "#ffea7a", // yellow
+    "#a5d6a7", // green
+    "#d4a017", // goldenrod
+    "#e0c58b", // buff
+    "#fa8072", // salmon
+    "#9b1c2a", // cherry
+];
+
+const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
+    const t = useTranslations("production");
+    const { sceneLocking, sceneNumberingStyle, persistentScenes, scenes, repository, isReadOnly } =
+        useContext(ProjectContext);
+    const userCtx = useContext(UserContext);
+
+    const panelRef = useRef<HTMLDivElement>(null);
+
+    // Click outside to close
+    useEffect(() => {
+        if (!isOpen) return;
+        const handleClickOutside = (e: MouseEvent) => {
+            if (panelRef.current && !panelRef.current.contains(e.target as Node)) {
+                onClose();
+            }
+        };
+        document.addEventListener("mousedown", handleClickOutside);
+        return () => document.removeEventListener("mousedown", handleClickOutside);
+    }, [isOpen, onClose]);
+
+    const sceneUuids = useMemo(
+        () => scenes.map((s) => s.id).filter((id): id is string => !!id),
+        [scenes],
+    );
+
+    const labels = useMemo(
+        () =>
+            sceneLocking
+                ? computeSceneLabels(sceneUuids, persistentScenes, sceneNumberingStyle)
+                : [],
+        [sceneLocking, sceneUuids, persistentScenes, sceneNumberingStyle],
+    );
+
+    const provisionalLabels = useMemo(
+        () => labels.filter((l) => l.status === "provisional"),
+        [labels],
+    );
+
+    // Stable across renders: the popup keeps a reference to this callback.
+    const performUnlock = useCallback(() => {
+        if (!repository) return;
+        repository.transact(() => {
+            repository.clearSceneLocks();
+            repository.setSceneLocking(false);
+        });
+    }, [repository]);
+
+    const handleSceneLockingToggle = (next: boolean) => {
+        if (!repository || isReadOnly) return;
+        if (next) {
+            repository.transact(() => {
+                const currentScreenplay = repository.screenplay;
+                const scenes = computeSceneItems(currentScreenplay);
+                const uuids = scenes.map(s => s.id).filter((id): id is string => !!id);
+
+                // Idempotent: any scene that already has a token (e.g. left
+                // over from an earlier session, or that survived an unlock
+                // in read-only mode) keeps its frozen label. Only scenes
+                // computed as provisional by `computeSceneLabels` get a new
+                // token written. On a fresh lock-on with no existing
+                // tokens, this falls through to baseToken(idx+1) for every
+                // scene, matching the previous behaviour.
+                const persistentSnapshot = repository.scenes;
+                const labels = computeSceneLabels(uuids, persistentSnapshot, sceneNumberingStyle);
+
+                labels.forEach((label) => {
+                    if (label.status === "provisional") {
+                        repository.upsertScene(label.uuid, { token: label.token });
+                    }
+                });
+
+                repository.setSceneLocking(true);
+            });
+        } else {
+            unlockScenesPopup(performUnlock, userCtx);
+        }
+    };
+
+    const handleRelock = () => {
+        if (!repository || isReadOnly) return;
+        repository.transact(() => {
+            const currentScreenplay = repository.screenplay;
+            const scenes = computeSceneItems(currentScreenplay);
+            const uuids = scenes.map(s => s.id).filter((id): id is string => !!id);
+            
+            // Re-read fresh persistent data
+            const persistentSnapshot = repository.scenes;
+
+            const currentLabels = computeSceneLabels(
+                uuids,
+                persistentSnapshot,
+                sceneNumberingStyle,
+            );
+
+            console.log("[ProductionPanel] RELOCKING PROVISIONAL. Full snapshot:", currentLabels.map(l => ({
+                uuid: l.uuid,
+                label: l.label,
+                status: l.status,
+                token: l.token
+            })));
+
+            let relockedCount = 0;
+            currentLabels.forEach((label) => {
+                if (label.status === "provisional") {
+                    console.log(`[ProductionPanel] -> Freezing ${label.uuid} as "${label.label}"`);
+                    repository.upsertScene(label.uuid, { token: label.token });
+                    relockedCount++;
+                }
+            });
+
+            console.log(`[ProductionPanel] Relock complete. Persisted ${relockedCount} tokens.`);
+        });
+    };
+
+    if (!isOpen) return null;
+
+    return (
+        <div className={styles.container} ref={panelRef}>
+            <div className={styles.header}>
+                <span className={styles.title}>{t("title")}</span>
+                <button className={styles.close_btn} onClick={onClose} aria-label="Close">
+                    <X size={16} />
+                </button>
+            </div>
+
+            {/* Scene Locking */}
+            <div className={styles.section}>
+                <div className={styles.row}>
+                    <div className={styles.row_main}>
+                        <Lock size={14} className={styles.row_icon} />
+                        <span className={styles.row_label}>{t("sceneLocking")}</span>
+                    </div>
+                    <div className={styles.row_actions}>
+                        {sceneLocking && provisionalLabels.length > 0 && (
+                            <button
+                                type="button"
+                                className={styles.relock_btn}
+                                onClick={handleRelock}
+                                disabled={isReadOnly}
+                            >
+                                {t("relock")}
+                            </button>
+                        )}
+                        <Switch
+                            checked={sceneLocking}
+                            onChange={handleSceneLockingToggle}
+                            disabled={isReadOnly}
+                            ariaLabel={t("sceneLocking")}
+                        />
+                    </div>
+                </div>
+
+                {sceneLocking && provisionalLabels.length > 0 && (
+                    <div className={styles.provisional_box}>
+                        <div className={styles.provisional_title}>{t("provisionalTitle")}</div>
+                        <div className={styles.provisional_list}>
+                            {provisionalLabels.map((l, idx) => (
+                                <span
+                                    key={`${l.uuid}-${idx}`}
+                                    className={styles.provisional_label}
+                                >
+                                    {l.label}
+                                </span>
+                            ))}
+                        </div>
+                    </div>
+                )}
+            </div>
+
+            {/* Page Locking (inert in v1) */}
+            <div className={styles.section}>
+                <div className={styles.row}>
+                    <div className={styles.row_main}>
+                        <span className={styles.row_label}>{t("pageLocking")}</span>
+                    </div>
+                    <Switch checked={false} onChange={() => {}} ariaLabel={t("pageLocking")} />
+                </div>
+            </div>
+
+            {/* Revisions (inert in v1) */}
+            <div className={styles.section}>
+                <div className={styles.row}>
+                    <div className={styles.row_main}>
+                        <span className={styles.row_label}>{t("revisions")}</span>
+                    </div>
+                    <Switch checked={false} onChange={() => {}} ariaLabel={t("revisions")} />
+                </div>
+                <div className={styles.swatches}>
+                    {REVISION_COLORS.map((color, idx) => (
+                        <span
+                            key={idx}
+                            className={styles.swatch}
+                            style={{ backgroundColor: color }}
+                            aria-disabled
+                        />
+                    ))}
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default ProductionPanel;
diff --git a/components/navbar/ProjectNavbar.tsx b/components/navbar/ProjectNavbar.tsx
index 839b9011..3d9e8edb 100644
--- a/components/navbar/ProjectNavbar.tsx
+++ b/components/navbar/ProjectNavbar.tsx
@@ -20,6 +20,7 @@ import {
     CircleCheckBig,
     CloudUpload,
     History,
+    Lock,
     Monitor,
     Settings,
     WifiOff,
@@ -27,6 +28,7 @@ import {
 } from "lucide-react";
 import AnalyticsModal from "@components/analytics/AnalyticsModal";
 import SavesPanel from "./SavesPanel";
+import ProductionPanel from "./ProductionPanel";
 
 import navbar from "./ProjectNavbar.module.css";
 import navBtn from "@components/utils/NavbarIconButton.module.css";
@@ -97,6 +99,7 @@ const ProjectNavbar = () => {
     const [projectTitle, setProjectTitle] = useState<string>("");
     const [isAnalyticsOpen, setIsAnalyticsOpen] = useState(false);
     const [isSavesOpen, setIsSavesOpen] = useState(false);
+    const [isProductionOpen, setIsProductionOpen] = useState(false);
     const [isLocalOnly, setIsLocalOnly] = useState<boolean | null>(null);
     const isLocalEdit = useRef(false);
 
@@ -250,6 +253,26 @@ const ProjectNavbar = () => {
                                 isPro={isPro}
                             />
                         </div>
+                        <div
+                            style={{
+                                position: "relative",
+                                height: "100%",
+                                width: "fit-content",
+                                display: "flex",
+                                alignItems: "center",
+                            }}
+                        >
+                            <div
+                                className={`${navBtn.button} ${isProductionOpen ? navBtn.active : ""}`}
+                                onClick={() => setIsProductionOpen(!isProductionOpen)}
+                            >
+                                <Lock size={18} />
+                            </div>
+                            <ProductionPanel
+                                isOpen={isProductionOpen}
+                                onClose={() => setIsProductionOpen(false)}
+                            />
+                        </div>
                     </div>
                 )}
             </nav>
diff --git a/components/popup/Popup.module.css b/components/popup/Popup.module.css
index 031a81cf..e8759d59 100644
--- a/components/popup/Popup.module.css
+++ b/components/popup/Popup.module.css
@@ -108,33 +108,25 @@
     font-size: 16px !important;
 }
 
-/* Popup confirm button */
-.import_confirm {
-    border-width: 2px !important;
-    border-style: dashed !important;
-    border-color: var(--error) !important;
-}
+/* Popup buttons — reuse the rounded "modal button" styling from DangerZone
+   so every modal/popup shares one consistent look. The popup container
+   stretches them to fill its width via `width: 100%` (DangerZone uses a
+   flex-column wrapper instead, so its variant doesn't need that). Use
+   these classes STANDALONE — do not pair with form.btn, since its
+   !important border/radius rules would override the composed styling. */
 
 .confirm {
-    background-color: var(--secondary);
-    border-radius: 8px !important;
-    transition: background-color 0.15s ease !important;
-}
-
-.confirm:hover {
-    background-color: var(--secondary-hover) !important;
+    composes: modalBtn from "../utils/ModalBtn.module.css";
+    width: 100% !important;
 }
 
-.confirm:disabled {
-    filter: brightness(60%);
-    cursor: not-allowed;
+.import_confirm {
+    composes: modalBtn modalBtnDanger from "../utils/ModalBtn.module.css";
+    width: 100% !important;
 }
 
 .cancel {
+    composes: modalBtn modalBtnCancel from "../utils/ModalBtn.module.css";
+    width: 100% !important;
     margin-top: 10px;
-    background-color: var(--tertiary) !important;
-}
-
-.cancel:hover {
-    background-color: var(--tertiary-hover) !important;
 }
diff --git a/components/popup/Popup.tsx b/components/popup/Popup.tsx
index 570411d9..f0950752 100644
--- a/components/popup/Popup.tsx
+++ b/components/popup/Popup.tsx
@@ -7,12 +7,14 @@ import {
     PopupImportFileData,
     PopupSceneData,
     PopupType,
+    PopupUnlockScenesData,
     PopupUploadToCloudData,
 } from "@src/lib/screenplay/popup";
 import { useContext } from "react";
 import PopupCharacterItem from "./PopupCharacterItem";
 import PopupImportFile from "./PopupImportFile";
 import PopupSceneItem from "./PopupSceneItem";
+import PopupUnlockScenes from "./PopupUnlockScenes";
 import PopupUploadToCloud from "./PopupUploadToCloud";
 
 export const Popup = () => {
@@ -30,6 +32,8 @@ export const Popup = () => {
             return <PopupSceneItem {...(popup as PopupData<PopupSceneData>)} />;
         case PopupType.UploadToCloud:
             return <PopupUploadToCloud {...(popup as PopupData<PopupUploadToCloudData>)} />;
+        case PopupType.UnlockScenes:
+            return <PopupUnlockScenes {...(popup as PopupData<PopupUnlockScenesData>)} />;
         default:
             return null;
     }
diff --git a/components/popup/PopupCharacterItem.tsx b/components/popup/PopupCharacterItem.tsx
index 221804a5..8fe8a818 100644
--- a/components/popup/PopupCharacterItem.tsx
+++ b/components/popup/PopupCharacterItem.tsx
@@ -274,7 +274,7 @@ export const PopupCharacterItem = ({ type, data: { character } }: PopupData<Popu
                     </div>
                     <button
                         disabled={newNameWarning || takenNameError}
-                        className={join(form.btn, popup.confirm)}
+                        className={popup.confirm}
                         type="submit"
                     >
                         {t("confirm")}
diff --git a/components/popup/PopupImportFile.tsx b/components/popup/PopupImportFile.tsx
index b63e6b36..d788ebf3 100644
--- a/components/popup/PopupImportFile.tsx
+++ b/components/popup/PopupImportFile.tsx
@@ -1,10 +1,8 @@
 "use client";
 
 import popup from "./Popup.module.css";
-import form from "../utils/Form.module.css";
 
 import { X } from "lucide-react";
-import { join } from "@src/lib/utils/misc";
 import { useDraggable } from "@src/lib/utils/hooks";
 import { PopupData, PopupImportFileData, closePopup } from "@src/lib/screenplay/popup";
 import { useContext } from "react";
@@ -39,10 +37,10 @@ const PopupImportFile = ({ data: { confirmImport } }: PopupData<PopupImportFileD
                         {t("info")}
                     </p>
                 </div>
-                <button className={join(form.btn, popup.confirm, popup.import_confirm)} onClick={onConfirmImport}>
+                <button className={popup.import_confirm} onClick={onConfirmImport}>
                     {t("yesImport")}
                 </button>
-                <button className={join(form.btn, popup.cancel)} onClick={() => closePopup(userCtx)}>
+                <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
                     {t("no")}
                 </button>
             </div>
diff --git a/components/popup/PopupSceneItem.tsx b/components/popup/PopupSceneItem.tsx
index 7814df40..72ac3fee 100644
--- a/components/popup/PopupSceneItem.tsx
+++ b/components/popup/PopupSceneItem.tsx
@@ -74,7 +74,7 @@ export const PopupSceneItem = ({ data: { scene } }: PopupData<PopupSceneData>) =
                             placeholder={t("synopsisPlaceholder")}
                         />
                     </div>
-                    <button className={join(form.btn, popup.confirm)} type="submit">
+                    <button className={popup.confirm} type="submit">
                         <Save size={18} />
                         {t("save")}
                     </button>
diff --git a/components/popup/PopupUnlockScenes.tsx b/components/popup/PopupUnlockScenes.tsx
new file mode 100644
index 00000000..930b6dcf
--- /dev/null
+++ b/components/popup/PopupUnlockScenes.tsx
@@ -0,0 +1,52 @@
+"use client";
+
+import { useContext } from "react";
+import { useTranslations } from "next-intl";
+import { X, Unlock } from "lucide-react";
+
+import popup from "./Popup.module.css";
+
+import { useDraggable } from "@src/lib/utils/hooks";
+import { PopupData, PopupUnlockScenesData, closePopup } from "@src/lib/screenplay/popup";
+import { UserContext } from "@src/context/UserContext";
+
+const PopupUnlockScenes = ({ data: { confirmUnlock } }: PopupData<PopupUnlockScenesData>) => {
+    const userCtx = useContext(UserContext);
+    const { position, handleMouseDown, isDragging } = useDraggable();
+    const t = useTranslations("production");
+
+    const onConfirm = () => {
+        confirmUnlock();
+        closePopup(userCtx);
+    };
+
+    return (
+        <div className={popup.window}>
+            <div
+                className={popup.container}
+                style={{ transform: `translate(${position.x}px, ${position.y}px)` }}
+            >
+                <div
+                    className={popup.header}
+                    onMouseDown={handleMouseDown}
+                    style={{ cursor: isDragging ? "grabbing" : "grab" }}
+                >
+                    <h2 className={popup.title}>{t("unlockTitle")}</h2>
+                    <X className={popup.close_btn} onClick={() => closePopup(userCtx)} />
+                </div>
+                <div className={popup.info}>
+                    <p>{t("unlockWarning")}</p>
+                </div>
+                <button className={popup.import_confirm} onClick={onConfirm}>
+                    <Unlock size={18} color="white" />
+                    {t("unlock")}
+                </button>
+                <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
+                    {t("cancel")}
+                </button>
+            </div>
+        </div>
+    );
+};
+
+export default PopupUnlockScenes;
diff --git a/components/popup/PopupUploadToCloud.tsx b/components/popup/PopupUploadToCloud.tsx
index faf1c3ba..58218b8e 100644
--- a/components/popup/PopupUploadToCloud.tsx
+++ b/components/popup/PopupUploadToCloud.tsx
@@ -1,10 +1,8 @@
 "use client";
 
 import popup from "./Popup.module.css";
-import form from "../utils/Form.module.css";
 
 import { X } from "lucide-react";
-import { join } from "@src/lib/utils/misc";
 import { useDraggable } from "@src/lib/utils/hooks";
 import { PopupData, PopupUploadToCloudData, closePopup } from "@src/lib/screenplay/popup";
 import { useContext, useState } from "react";
@@ -58,14 +56,14 @@ const PopupUploadToCloud = ({ data: { projectId } }: PopupData<PopupUploadToClou
                 </div>
                 {info && <FormInfo info={info} />}
                 <button
-                    className={join(form.btn, popup.confirm)}
+                    className={popup.confirm}
                     onClick={onConfirm}
                     disabled={isUploading}
                 >
                     {isUploading ? t("uploading") : t("confirm")}
                 </button>
                 <button
-                    className={join(form.btn, popup.cancel)}
+                    className={popup.cancel}
                     onClick={onCancel}
                     disabled={isUploading}
                 >
diff --git a/components/utils/Dropdown.module.css b/components/utils/Dropdown.module.css
index 6f23f449..614c2899 100644
--- a/components/utils/Dropdown.module.css
+++ b/components/utils/Dropdown.module.css
@@ -68,7 +68,8 @@
     font-family: var(--font-inter);
 }
 
-.dropdown_item:hover {
+.dropdown_item:hover,
+.dropdown_item_active {
     background-color: var(--primary);
 }
 
diff --git a/components/utils/ModalBtn.module.css b/components/utils/ModalBtn.module.css
new file mode 100644
index 00000000..ad9928ad
--- /dev/null
+++ b/components/utils/ModalBtn.module.css
@@ -0,0 +1,42 @@
+.modalBtn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    padding: 10px 16px;
+    border-radius: 40px;
+    border: none;
+    font-size: 0.9rem;
+    font-weight: 500;
+    cursor: pointer;
+    transition: opacity 0.2s ease;
+    transform: translateZ(0);
+    backface-visibility: hidden;
+    width: 100%;
+}
+
+.modalBtn:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+}
+
+.modalBtnDanger {
+    background: var(--error);
+    color: white;
+}
+
+.modalBtnDanger:hover:not(:disabled) {
+    opacity: 0.85;
+}
+
+.modalBtnCancel {
+    background: transparent;
+    color: var(--secondary-text);
+    border-radius: 40px;
+    border: 2px solid var(--secondary-text);
+}
+
+.modalBtnCancel:hover:not(:disabled) {
+    color: var(--primary-text);
+    border-color: var(--primary-text);
+}
diff --git a/components/utils/Switch.module.css b/components/utils/Switch.module.css
new file mode 100644
index 00000000..fd60aa0f
--- /dev/null
+++ b/components/utils/Switch.module.css
@@ -0,0 +1,37 @@
+.track {
+    position: relative;
+    flex-shrink: 0;
+    width: 32px;
+    height: 18px;
+    padding: 0;
+    border: none;
+    border-radius: 999px;
+    background-color: var(--separator);
+    cursor: pointer;
+    transition: background-color 0.15s ease;
+}
+
+.track.checked {
+    background-color: var(--success);
+}
+
+.track.disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+}
+
+.pip {
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    width: 14px;
+    height: 14px;
+    border-radius: 50%;
+    background-color: white;
+    transition: transform 0.15s ease;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+
+.track.checked .pip {
+    transform: translateX(14px);
+}
diff --git a/components/utils/Switch.tsx b/components/utils/Switch.tsx
new file mode 100644
index 00000000..48c011d4
--- /dev/null
+++ b/components/utils/Switch.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import styles from "./Switch.module.css";
+
+interface SwitchProps {
+    checked: boolean;
+    onChange: (next: boolean) => void;
+    disabled?: boolean;
+    label?: string;
+    ariaLabel?: string;
+}
+
+const Switch = ({ checked, onChange, disabled, label, ariaLabel }: SwitchProps) => {
+    const handleClick = () => {
+        if (disabled) return;
+        onChange(!checked);
+    };
+
+    return (
+        <button
+            type="button"
+            role="switch"
+            aria-checked={checked}
+            aria-label={ariaLabel ?? label}
+            onClick={handleClick}
+            disabled={disabled}
+            className={`${styles.track} ${checked ? styles.checked : ""} ${disabled ? styles.disabled : ""}`}
+        >
+            <span className={styles.pip} />
+        </button>
+    );
+};
+
+export default Switch;
diff --git a/messages/de.json b/messages/de.json
index 1471557c..cc8993df 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -81,6 +81,7 @@
     "tabs": {
       "General": "Allgemein",
       "Layout": "Layout",
+      "Production": "Produktion",
       "Export": "Import/Export",
       "Collaborators": "Mitwirkende",
       "Keybinds": "Tastenkürzel",
@@ -390,7 +391,9 @@
     "shelve": "Ablegen",
     "shelveScene": "Szene ablegen",
     "shelveDialogue": "Dialog ablegen",
-    "shelveAction": "Aktion ablegen"
+    "shelveAction": "Aktion ablegen",
+    "omitScene": "Szene auslassen",
+    "unomitScene": "Szene wiederherstellen"
   },
   "popup": {
     "character": {
@@ -446,6 +449,26 @@
     "titlePlaceholder": "Titel",
     "descriptionPlaceholder": "Beschreibung"
   },
+  "production": {
+    "title": "Produktion",
+    "sceneLocking": "Szenen sperren",
+    "pageLocking": "Seiten sperren",
+    "revisions": "Revisionen",
+    "relock": "Sperren",
+    "provisionalTitle": "Nicht gesperrte Szenen",
+    "unlockTitle": "Szenennummern entsperren?",
+    "unlockWarning": "<b>Alle gesperrten und ausgelassenen Szenen verlieren ihre fixierte Nummerierung.</b>",
+    "unlockInfo": "Dies betrifft alle Mitarbeiter. Das Drehbuch kehrt zu positionalen Szenennummern zurück. OMITTED-Szenen bleiben ausgelassen — heben Sie die Auslassung einzeln auf, um den Inhalt wiederherzustellen.",
+    "unlock": "Entsperren",
+    "cancel": "Abbrechen",
+    "numberingStyleTitle": "Szenennummerierung",
+    "numberingStyleHelp": "Wie neu eingefügte Szenen zwischen zwei gesperrten Szenen nummeriert werden. Suffix verweist auf die vorherige Szene, Präfix auf die nächste.",
+    "suffixName": "Suffix",
+    "prefixName": "Präfix",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "Bereits gesperrte Szenen behalten ihre Nummer — nur vorläufige Szenen und zukünftige Sperrungen sind betroffen."
+  },
   "saves": {
     "title": "Versionsverlauf",
     "saveCurrentVersion": "Aktuelle Version speichern",
diff --git a/messages/en.json b/messages/en.json
index 797eb080..3c775230 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -80,6 +80,7 @@
     "tabs": {
       "General": "General",
       "Layout": "Layout",
+      "Production": "Production",
       "Export": "Import/Export",
       "Collaborators": "Collaborators",
       "Keybinds": "Keybinds",
@@ -389,7 +390,9 @@
     "shelve": "Shelve",
     "shelveScene": "Shelve scene",
     "shelveDialogue": "Shelve dialogue",
-    "shelveAction": "Shelve action"
+    "shelveAction": "Shelve action",
+    "omitScene": "Omit scene",
+    "unomitScene": "Unomit scene"
   },
   "popup": {
     "character": {
@@ -445,6 +448,26 @@
     "titlePlaceholder": "Title",
     "descriptionPlaceholder": "Description"
   },
+  "production": {
+    "title": "Production",
+    "sceneLocking": "Scene locking",
+    "pageLocking": "Page locking",
+    "revisions": "Revisions",
+    "relock": "Relock",
+    "provisionalTitle": "Non-locked scenes",
+    "unlockTitle": "Unlock scenes",
+    "unlockWarning": "All scenes will lose their locked numbering, reverting to their initial positional numbering.",
+    "unlockInfo": "This affects every collaborator. The screenplay will revert to positional scene numbers. OMITTED scenes stay omitted — unomit them individually if you want their content back.",
+    "unlock": "Unlock",
+    "cancel": "Cancel",
+    "numberingStyleTitle": "Scene numbering",
+    "numberingStyleHelp": "How newly inserted scenes are numbered between two locked scenes. Suffix references the previous scene, prefix references the next.",
+    "suffixName": "Suffix",
+    "prefixName": "Prefix",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "Already-locked scenes keep their stored number — only provisional scenes and future locks are affected."
+  },
   "saves": {
     "title": "Version History",
     "saveCurrentVersion": "Save Current Version",
diff --git a/messages/es.json b/messages/es.json
index 0cda76fd..d809cea1 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -80,6 +80,7 @@
     "tabs": {
       "General": "General",
       "Layout": "Diseño",
+      "Production": "Producción",
       "Export": "Importar/Exportar",
       "Collaborators": "Colaboradores",
       "Keybinds": "Atajos de teclado",
@@ -389,7 +390,9 @@
     "shelve": "Archivar",
     "shelveScene": "Archivar escena",
     "shelveDialogue": "Archivar diálogo",
-    "shelveAction": "Archivar acción"
+    "shelveAction": "Archivar acción",
+    "omitScene": "Omitir escena",
+    "unomitScene": "Restaurar escena"
   },
   "popup": {
     "character": {
@@ -445,6 +448,26 @@
     "titlePlaceholder": "Título",
     "descriptionPlaceholder": "Descripción"
   },
+  "production": {
+    "title": "Producción",
+    "sceneLocking": "Bloquear escenas",
+    "pageLocking": "Bloquear páginas",
+    "revisions": "Revisiones",
+    "relock": "Bloquear",
+    "provisionalTitle": "Escenas no bloqueadas",
+    "unlockTitle": "¿Desbloquear los números de escena?",
+    "unlockWarning": "<b>Todas las escenas bloqueadas y omitidas perderán su numeración fija.</b>",
+    "unlockInfo": "Esto afecta a todos los colaboradores. El guion volverá a una numeración posicional. Las escenas OMITTED siguen omitidas — anula la omisión individualmente si quieres recuperar su contenido.",
+    "unlock": "Desbloquear",
+    "cancel": "Cancelar",
+    "numberingStyleTitle": "Numeración de escenas",
+    "numberingStyleHelp": "Cómo se numeran las escenas recién insertadas entre dos escenas bloqueadas. El sufijo se refiere a la escena anterior, el prefijo a la siguiente.",
+    "suffixName": "Sufijo",
+    "prefixName": "Prefijo",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "Las escenas ya bloqueadas conservan su número — solo se ven afectadas las escenas provisionales y los futuros bloqueos."
+  },
   "saves": {
     "title": "Historial de versiones",
     "saveCurrentVersion": "Guardar versión actual",
diff --git a/messages/fr.json b/messages/fr.json
index 5253634c..88569350 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -81,6 +81,7 @@
     "tabs": {
       "General": "Général",
       "Layout": "Mise en page",
+      "Production": "Production",
       "Export": "Import/Export",
       "Collaborators": "Collaborateurs",
       "Keybinds": "Raccourcis",
@@ -390,7 +391,9 @@
     "shelve": "Mettre de côté",
     "shelveScene": "Mettre la scène de côté",
     "shelveDialogue": "Mettre le dialogue de côté",
-    "shelveAction": "Mettre l'action de côté"
+    "shelveAction": "Mettre l'action de côté",
+    "omitScene": "Omettre la scène",
+    "unomitScene": "Restaurer la scène"
   },
   "popup": {
     "character": {
@@ -446,6 +449,26 @@
     "titlePlaceholder": "Titre",
     "descriptionPlaceholder": "Description"
   },
+  "production": {
+    "title": "Production",
+    "sceneLocking": "Verrouillage des scènes",
+    "pageLocking": "Verrouillage des pages",
+    "revisions": "Révisions",
+    "relock": "Verrouiller",
+    "provisionalTitle": "Scènes non verrouillées",
+    "unlockTitle": "Déverrouiller les numéros de scène ?",
+    "unlockWarning": "<b>Toutes les scènes verrouillées et omises perdront leur numérotation figée.</b>",
+    "unlockInfo": "Ceci affecte tous les collaborateurs. Le scénario reviendra à une numérotation positionnelle. Les scènes OMITTED restent omises — démasquez-les individuellement si vous souhaitez en récupérer le contenu.",
+    "unlock": "Déverrouiller",
+    "cancel": "Annuler",
+    "numberingStyleTitle": "Numérotation des scènes",
+    "numberingStyleHelp": "Comment les scènes nouvellement insérées sont numérotées entre deux scènes verrouillées. Le suffixe se réfère à la scène précédente, le préfixe à la suivante.",
+    "suffixName": "Suffixe",
+    "prefixName": "Préfixe",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "Les scènes déjà verrouillées conservent leur numéro — seules les scènes provisoires et les futurs verrouillages sont concernés."
+  },
   "saves": {
     "title": "Historique des versions",
     "saveCurrentVersion": "Enregistrer la version actuelle",
diff --git a/messages/ja.json b/messages/ja.json
index 2beb8a09..2a981d11 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -80,6 +80,7 @@
     "tabs": {
       "General": "全般",
       "Layout": "レイアウト",
+      "Production": "プロダクション",
       "Export": "インポート/エクスポート",
       "Collaborators": "共同作業者",
       "Keybinds": "ショートカットキー",
@@ -389,7 +390,9 @@
     "shelve": "保管する",
     "shelveScene": "シーンを保管する",
     "shelveDialogue": "セリフを保管する",
-    "shelveAction": "アクションを保管する"
+    "shelveAction": "アクションを保管する",
+    "omitScene": "シーンを省略",
+    "unomitScene": "シーンを復元"
   },
   "popup": {
     "character": {
@@ -445,6 +448,26 @@
     "titlePlaceholder": "タイトル",
     "descriptionPlaceholder": "説明"
   },
+  "production": {
+    "title": "プロダクション",
+    "sceneLocking": "シーンロック",
+    "pageLocking": "ページロック",
+    "revisions": "改訂",
+    "relock": "ロック",
+    "provisionalTitle": "未ロックのシーン",
+    "unlockTitle": "シーン番号のロックを解除しますか？",
+    "unlockWarning": "<b>ロック済みおよび省略されたシーンの固定番号はすべて失われます。</b>",
+    "unlockInfo": "この操作はすべてのコラボレーターに影響します。脚本は位置ベースの番号に戻ります。OMITTED シーンは省略のまま残ります — 内容を復元したい場合は個別に省略を解除してください。",
+    "unlock": "ロック解除",
+    "cancel": "キャンセル",
+    "numberingStyleTitle": "シーン番号",
+    "numberingStyleHelp": "ロック済みの2つのシーンの間に挿入された新しいシーンの番号付け方法。サフィックスは前のシーン、プレフィックスは次のシーンを参照します。",
+    "suffixName": "サフィックス",
+    "prefixName": "プレフィックス",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "すでにロックされているシーンは番号を保持します — 仮シーンと今後のロックのみが影響を受けます。"
+  },
   "saves": {
     "title": "バージョン履歴",
     "saveCurrentVersion": "現在のバージョンを保存",
diff --git a/messages/ko.json b/messages/ko.json
index c9edda13..93fbb859 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -80,6 +80,7 @@
     "tabs": {
       "General": "일반",
       "Layout": "레이아웃",
+      "Production": "프로덕션",
       "Export": "가져오기/내보내기",
       "Collaborators": "공동 작업자",
       "Keybinds": "단축키",
@@ -389,7 +390,9 @@
     "shelve": "보관하기",
     "shelveScene": "장면 보관하기",
     "shelveDialogue": "대사 보관하기",
-    "shelveAction": "행동 보관하기"
+    "shelveAction": "행동 보관하기",
+    "omitScene": "씬 생략",
+    "unomitScene": "씬 복원"
   },
   "popup": {
     "character": {
@@ -445,6 +448,26 @@
     "titlePlaceholder": "제목",
     "descriptionPlaceholder": "설명"
   },
+  "production": {
+    "title": "프로덕션",
+    "sceneLocking": "씬 잠금",
+    "pageLocking": "페이지 잠금",
+    "revisions": "개정",
+    "relock": "잠그기",
+    "provisionalTitle": "잠기지 않은 씬",
+    "unlockTitle": "씬 번호 잠금을 해제하시겠습니까?",
+    "unlockWarning": "<b>잠긴 씬과 생략된 씬의 고정 번호가 모두 사라집니다.</b>",
+    "unlockInfo": "이 작업은 모든 협업자에게 영향을 미칩니다. 시나리오는 위치 기반 씬 번호로 되돌아갑니다. OMITTED 씬은 그대로 유지되며, 내용을 복원하려면 개별적으로 생략을 해제하세요.",
+    "unlock": "잠금 해제",
+    "cancel": "취소",
+    "numberingStyleTitle": "씬 번호",
+    "numberingStyleHelp": "잠긴 두 씬 사이에 새로 삽입된 씬의 번호 매김 방식. 접미사는 이전 씬을, 접두사는 다음 씬을 참조합니다.",
+    "suffixName": "접미사",
+    "prefixName": "접두사",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "이미 잠긴 씬은 번호를 유지합니다 — 임시 씬과 향후 잠금에만 영향을 미칩니다."
+  },
   "saves": {
     "title": "버전 히스토리",
     "saveCurrentVersion": "현재 버전 저장",
diff --git a/messages/pl.json b/messages/pl.json
index 72f512bf..e21382c1 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -80,6 +80,7 @@
     "tabs": {
       "General": "Ogólne",
       "Layout": "Układ",
+      "Production": "Produkcja",
       "Export": "Import/Eksport",
       "Collaborators": "Współpracownicy",
       "Keybinds": "Skróty klawiszowe",
@@ -389,7 +390,9 @@
     "shelve": "Odłóż",
     "shelveScene": "Odłóż scenę",
     "shelveDialogue": "Odłóż dialog",
-    "shelveAction": "Odłóż akcję"
+    "shelveAction": "Odłóż akcję",
+    "omitScene": "Pomiń scenę",
+    "unomitScene": "Przywróć scenę"
   },
   "popup": {
     "character": {
@@ -445,6 +448,26 @@
     "titlePlaceholder": "Tytuł",
     "descriptionPlaceholder": "Opis"
   },
+  "production": {
+    "title": "Produkcja",
+    "sceneLocking": "Blokowanie scen",
+    "pageLocking": "Blokowanie stron",
+    "revisions": "Wersje",
+    "relock": "Zablokuj",
+    "provisionalTitle": "Niezablokowane sceny",
+    "unlockTitle": "Odblokować numery scen?",
+    "unlockWarning": "<b>Wszystkie zablokowane i pominięte sceny utracą zamrożoną numerację.</b>",
+    "unlockInfo": "Wpłynie to na wszystkich współpracowników. Scenariusz powróci do numeracji pozycyjnej. Sceny OMITTED pozostają pominięte — anuluj pominięcie pojedynczo, aby odzyskać ich zawartość.",
+    "unlock": "Odblokuj",
+    "cancel": "Anuluj",
+    "numberingStyleTitle": "Numeracja scen",
+    "numberingStyleHelp": "Jak są numerowane nowo wstawione sceny między dwiema zablokowanymi. Sufiks odnosi się do poprzedniej sceny, prefiks do następnej.",
+    "suffixName": "Sufiks",
+    "prefixName": "Prefiks",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "Już zablokowane sceny zachowują swój numer — wpływa tylko na sceny tymczasowe i przyszłe blokady."
+  },
   "saves": {
     "title": "Historia wersji",
     "saveCurrentVersion": "Zapisz aktualną wersję",
diff --git a/messages/zh.json b/messages/zh.json
index ea963b3f..09623192 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -80,6 +80,7 @@
     "tabs": {
       "General": "常规",
       "Layout": "布局",
+      "Production": "制作",
       "Export": "导入/导出",
       "Collaborators": "协作",
       "Keybinds": "键位",
@@ -389,7 +390,9 @@
     "shelve": "搁置",
     "shelveScene": "搁置场景",
     "shelveDialogue": "搁置对白",
-    "shelveAction": "搁置动作"
+    "shelveAction": "搁置动作",
+    "omitScene": "省略场景",
+    "unomitScene": "恢复场景"
   },
   "popup": {
     "character": {
@@ -445,6 +448,26 @@
     "titlePlaceholder": "标题",
     "descriptionPlaceholder": "描述"
   },
+  "production": {
+    "title": "制作",
+    "sceneLocking": "锁定场景",
+    "pageLocking": "锁定页面",
+    "revisions": "修订",
+    "relock": "锁定",
+    "provisionalTitle": "未锁定的场景",
+    "unlockTitle": "解锁场景编号?",
+    "unlockWarning": "<b>所有锁定和省略的场景都将失去固定编号。</b>",
+    "unlockInfo": "此操作会影响所有协作者。剧本将恢复为按位置编号。OMITTED 场景仍保持省略状态 — 如需恢复内容,请单独取消省略。",
+    "unlock": "解锁",
+    "cancel": "取消",
+    "numberingStyleTitle": "场景编号",
+    "numberingStyleHelp": "两个锁定场景之间新插入场景的编号方式。后缀参考上一个场景，前缀参考下一个场景。",
+    "suffixName": "后缀",
+    "prefixName": "前缀",
+    "suffixExample": "2 → 2A",
+    "prefixExample": "2 → A3",
+    "appliesToNewOnly": "已锁定的场景保留其编号 — 仅影响临时场景和将来的锁定。"
+  },
   "saves": {
     "title": "版本历史",
     "saveCurrentVersion": "保存当前版本",
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index f13d1f2b..e30c5a05 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -97,6 +97,16 @@ export interface ProjectContextType {
     elementStyles: Record<string, ElementStyle>;
     setElementStyles: (styles: Record<string, ElementStyle>) => void;
 
+    // Production
+    sceneLocking: boolean;
+    setSceneLocking: (locked: boolean) => void;
+    sceneNumberingStyle: "suffix" | "prefix";
+    setSceneNumberingStyle: (style: "suffix" | "prefix") => void;
+    /** Raw persistent scene map (UUID → PersistentScene). Includes synopsis,
+     *  color, and production-lock fields (token, omitted) for every scene that
+     *  has been persisted. */
+    persistentScenes: PersistentSceneMap;
+
     // Search state
     searchTerm: string;
     setSearchTerm: (term: string) => void;
@@ -173,6 +183,11 @@ const defaultContextValue: ProjectContextType = {
     setElementMargins: () => {},
     elementStyles: {},
     setElementStyles: () => {},
+    sceneLocking: false,
+    setSceneLocking: () => {},
+    sceneNumberingStyle: "suffix",
+    setSceneNumberingStyle: () => {},
+    persistentScenes: {},
     characters: {},
     locations: {},
     scenes: [],
@@ -292,6 +307,10 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         Record<string, { left: number; right: number }>
     >({});
     const [elementStyles, setElementStylesState] = useState<Record<string, ElementStyle>>({});
+    const [sceneLocking, setSceneLockingState] = useState<boolean>(false);
+    const [sceneNumberingStyle, setSceneNumberingStyleState] =
+        useState<"suffix" | "prefix">("suffix");
+    const [persistentScenes, setPersistentScenesState] = useState<PersistentSceneMap>({});
     const [connectionStatus, setConnectionStatus] = useState<ConnectionStatus>("disconnected");
     const [users, setUsers] = useState<CollaboratorInfo[]>([]);
 
@@ -469,8 +488,17 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             if (initialLayout.elementStyles !== undefined) {
                 setElementStylesState(initialLayout.elementStyles);
             }
+            if (initialLayout.sceneLocking !== undefined) {
+                setSceneLockingState(initialLayout.sceneLocking);
+            }
+            if (initialLayout.sceneNumberingStyle !== undefined) {
+                setSceneNumberingStyleState(initialLayout.sceneNumberingStyle);
+            }
         }
 
+        // Read initial persistent scenes
+        setPersistentScenesState(repository.scenes);
+
         // Observe layout changes
         const unsubscribeLayout = repository.observeLayout((layout: Partial<LayoutData>) => {
             const _pageSize = layout.pageSize;
@@ -509,6 +537,12 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             if (layout.elementStyles !== undefined) {
                 setElementStylesState(layout.elementStyles);
             }
+            if (layout.sceneLocking !== undefined) {
+                setSceneLockingState(layout.sceneLocking);
+            }
+            if (layout.sceneNumberingStyle !== undefined) {
+                setSceneNumberingStyleState(layout.sceneNumberingStyle);
+            }
         });
 
         // Observe character changes - get current screenplay from repository
@@ -530,6 +564,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             const currentScreenplay = repository.screenplay;
             const allScenes = mergeScenesData(_scenes, currentScreenplay);
             updateScenes(allScenes);
+            setPersistentScenesState(_scenes);
         });
 
         // Observe metadata changes (for title page placeholders)
@@ -707,6 +742,22 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         [repository],
     );
 
+    const setSceneLocking = useCallback(
+        (locked: boolean) => {
+            setSceneLockingState(locked);
+            repository?.setSceneLocking(locked);
+        },
+        [repository],
+    );
+
+    const setSceneNumberingStyle = useCallback(
+        (style: "suffix" | "prefix") => {
+            setSceneNumberingStyleState(style);
+            repository?.setSceneNumberingStyle(style);
+        },
+        [repository],
+    );
+
     const setSearchTerm = useCallback((term: string) => {
         setSearchTermState(term);
         // Reset to first match when search term changes
@@ -791,6 +842,11 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setElementMargins,
             elementStyles,
             setElementStyles,
+            sceneLocking,
+            setSceneLocking,
+            sceneNumberingStyle,
+            setSceneNumberingStyle,
+            persistentScenes,
             screenplay,
             scenes,
             updateScenes,
@@ -855,6 +911,11 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setElementMargins,
             elementStyles,
             setElementStyles,
+            sceneLocking,
+            setSceneLocking,
+            sceneNumberingStyle,
+            setSceneNumberingStyle,
+            persistentScenes,
             screenplay,
             scenes,
             updateScenes,
diff --git a/src/lib/adapters/pdf/pdf-adapter.ts b/src/lib/adapters/pdf/pdf-adapter.ts
index 36ca1821..9b23880c 100644
--- a/src/lib/adapters/pdf/pdf-adapter.ts
+++ b/src/lib/adapters/pdf/pdf-adapter.ts
@@ -1,11 +1,13 @@
 
 import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { ProjectData, ProjectState } from "@src/lib/project/project-state";
+import type { PersistentSceneMap } from "@src/lib/screenplay/scenes";
 import { PageFormat } from "@src/lib/utils/enums";
 import { getFontForCodePoint, ScriptFont } from "./pdf-utils";
 import type { TextRun } from "./pdf.worker";
 import { BASE_URL } from "@src/lib/utils/constants";
 import { PAGE_SIZES } from "@src/lib/screenplay/extensions/pagination-extension";
+import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
 
 // ─── Types ───────────────────────────────────────────────────────────────────
 
@@ -21,6 +23,10 @@ export type PDFExportOptions = BaseExportOptions & {
     moreLabel?: string;
     editorElement?: HTMLElement;
     titlePageElement?: HTMLElement;
+    /** Production-mode flag + persistent scene entries, set internally from the ProjectState. */
+    sceneLocking?: boolean;
+    sceneNumberingStyle?: "suffix" | "prefix";
+    persistentScenes?: PersistentSceneMap;
 };
 
 import type { WorkerMessage, WorkerPayload, VisualLine } from "./pdf.worker";
@@ -72,13 +78,27 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
         const format = options.format;
         const pdfPageSize = PDF_PAGE_SIZES[format];
 
+        // Resolve production state from the project. Persistent scenes carry
+        // synopsis/color (irrelevant here) and token/omitted (used for labels).
+        const layout = project.layout().toJSON() as {
+            sceneLocking?: boolean;
+            sceneNumberingStyle?: "suffix" | "prefix";
+        };
+        const persistentScenes = project.scenes().toJSON() as PersistentSceneMap;
+        const enrichedOptions: PDFExportOptions = {
+            ...options,
+            sceneLocking: !!layout.sceneLocking,
+            sceneNumberingStyle: layout.sceneNumberingStyle ?? "suffix",
+            persistentScenes,
+        };
+
         // ── Collect all visual lines from the browser DOM ───────────────────
         const titlePageEl = options.titlePageElement;
 
-        const titlePageLines = titlePageEl ? this.collectLines(titlePageEl, options) : [];
+        const titlePageLines = titlePageEl ? this.collectLines(titlePageEl, enrichedOptions) : [];
         const titlePageLeftPx = titlePageEl ? this.getPageLeftPx(titlePageEl) : 0;
 
-        const screenplayLines = this.collectLines(editorEl, options);
+        const screenplayLines = this.collectLines(editorEl, enrichedOptions);
         const screenplayLeftPx = this.getPageLeftPx(editorEl);
 
         return new Promise((resolve, reject) => {
@@ -142,6 +162,28 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
         let sceneCount = 0;
         let yOffset = 0;
 
+        // Pre-compute label per scene UUID when production lock is on.
+        const sceneLabels: { label: string; omitted: boolean }[] = [];
+        let sceneLabelIdx = 0;
+        if (options.sceneLocking) {
+            const uuids: string[] = [];
+            for (let i = 0; i < editorEl.children.length; i++) {
+                const child = editorEl.children[i] as HTMLElement;
+                if (child?.tagName === "P" && child.classList.contains("scene")) {
+                    const uuid = child.getAttribute("data-id");
+                    if (uuid) uuids.push(uuid);
+                }
+            }
+            const computed = computeSceneLabels(
+                uuids,
+                options.persistentScenes ?? {},
+                options.sceneNumberingStyle ?? "suffix",
+            );
+            for (const l of computed) {
+                sceneLabels.push({ label: l.label, omitted: l.status === "omitted" });
+            }
+        }
+
         for (let i = 0; i < editorEl.children.length; i++) {
             const el = editorEl.children[i] as HTMLElement;
             if (!el) continue;
@@ -164,6 +206,11 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
 
             const isScene = el.classList.contains("scene");
             if (isScene) sceneCount++;
+            const sceneInfo = isScene
+                ? options.sceneLocking
+                    ? sceneLabels[sceneLabelIdx++] ?? { label: String(sceneCount), omitted: false }
+                    : { label: String(sceneCount), omitted: false }
+                : undefined;
 
             // Extract the paragraph type from classList
             let nodeType: string | undefined;
@@ -200,7 +247,7 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
                     if (yOffset > 0) {
                         for (const line of beforeLines) line.y -= yOffset;
                     }
-                    this.injectPseudoContent(el, beforeLines, options, isScene ? sceneCount : undefined);
+                    this.injectPseudoContent(el, beforeLines, options, sceneInfo);
                     allLines.push(...beforeLines);
                 }
 
@@ -224,7 +271,7 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
                         for (const line of paragraphLines) line.y -= yOffset;
                     }
                     // ── Pseudo-element content (not captured by TreeWalker) ──
-                    this.injectPseudoContent(el, paragraphLines, options, isScene ? sceneCount : undefined);
+                    this.injectPseudoContent(el, paragraphLines, options, sceneInfo);
                     allLines.push(...paragraphLines);
                 } else {
                     // Empty paragraph — no text nodes, so collectParagraphLines
@@ -370,7 +417,24 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
                 // ── Measure position ─────────────────────────────────────
                 range.setStart(textNode, ci);
                 range.setEnd(textNode, ci + 1);
-                const rect = range.getBoundingClientRect();
+                // WebKit (Safari, Tauri on macOS) has a long-standing quirk:
+                // for the FIRST character of a wrapped line, the single-char
+                // range straddles a line boundary because position `ci` is
+                // bidi-ambiguous between the end of the previous line and the
+                // start of the new one. `getBoundingClientRect()` returns the
+                // UNION of both lines — `rect.top` then lands on the *previous*
+                // line, so we mistakenly attribute the char to it. The visible
+                // result in PDFs is "one letter at the end of every wrapped
+                // line plus a leading space on the next".
+                //
+                // `getClientRects()` returns one rect per line box the range
+                // intersects; the LAST rect is always the actual rendering
+                // line. For normal (single-line) chars only one rect is
+                // returned, so this is a no-op everywhere else.
+                const rects = range.getClientRects();
+                const rect = rects.length > 0
+                    ? rects[rects.length - 1]
+                    : range.getBoundingClientRect();
 
                 // If height is 0, it is usually a trailing wrapped space or hidden char
                 if (rect.height === 0) {
@@ -454,20 +518,21 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
         el: HTMLElement,
         paragraphLines: VisualLine[],
         options: PDFExportOptions,
-        sceneNumber?: number,
+        sceneInfo?: { label: string; omitted: boolean },
     ): void {
         const firstLine = paragraphLines[0];
         const lastLine = paragraphLines[paragraphLines.length - 1];
 
-        if (sceneNumber !== undefined && options.displaySceneNumbers) {
+        if (sceneInfo && options.displaySceneNumbers) {
             const elStyle = getComputedStyle(el);
-            // Left scene number — mirrors CSS `right: 100%; margin-right: -120px` on .scene::before:
-            // right edge lands at scene_element_left + 120px.
+            const paddingLeft = parseFloat(elStyle.paddingLeft) || 0;
+
+            // Left scene number — mirrors CSS `right: 100%; margin-right: -120px`
+            // on .scene::before: right edge lands at scene_element_left + 120px.
             if (firstLine.runs.length > 0) {
                 const leadRun = firstLine.runs[0];
-                const paddingLeft = parseFloat(elStyle.paddingLeft) || 0;
                 firstLine.runs.unshift({
-                    text: String(sceneNumber),
+                    text: sceneInfo.label,
                     x: leadRun.x - paddingLeft + 120,
                     fontFamily: leadRun.fontFamily,
                     bold: leadRun.bold,
@@ -478,12 +543,12 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
                 });
             }
 
-            // Right scene number — mirrors CSS `left: 100%; margin-left: -85px` on .scene::after:
-            // left edge lands at scene_element_right - 85px.
+            // Right scene number — mirrors CSS `left: 100%; margin-left: -85px`
+            // on .scene::after: left edge lands at scene_element_right - 85px.
             if (options.sceneNumberOnRight && firstLine.runs.length > 0) {
                 const tailRun = firstLine.runs[firstLine.runs.length - 1];
                 firstLine.runs.push({
-                    text: String(sceneNumber),
+                    text: sceneInfo.label,
                     x: el.getBoundingClientRect().right - 85,
                     fontFamily: tailRun.fontFamily,
                     bold: tailRun.bold,
diff --git a/src/lib/editor/document-editor-config.ts b/src/lib/editor/document-editor-config.ts
index fb456ea0..b1a61dda 100644
--- a/src/lib/editor/document-editor-config.ts
+++ b/src/lib/editor/document-editor-config.ts
@@ -18,6 +18,8 @@ export interface DocumentEditorFeatures {
     searchHighlights: boolean;
     /** Scene color bookmark decorations. */
     sceneBookmarks: boolean;
+    /** Production-mode scene labels + OMITTED placeholders. */
+    sceneLocking: boolean;
     /** Prevent duplicate data-ids on paste. */
     nodeIdDedup: boolean;
     /** Character / location autocomplete menus. */
@@ -67,6 +69,7 @@ export const SCREENPLAY_EDITOR_CONFIG: DocumentEditorConfig = {
         characterHighlights: true,
         searchHighlights: true,
         sceneBookmarks: true,
+        sceneLocking: true,
         nodeIdDedup: true,
         suggestions: true,
         orphanPrevention: true,
@@ -89,6 +92,7 @@ export const TITLEPAGE_EDITOR_CONFIG: DocumentEditorConfig = {
         characterHighlights: false,
         searchHighlights: false,
         sceneBookmarks: false,
+        sceneLocking: false,
         nodeIdDedup: false,
         suggestions: false,
         orphanPrevention: false,
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index 81a9c31b..7a6ac17f 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -27,6 +27,10 @@ import {
     createSceneBookmarkExtension,
     refreshSceneBookmarks,
 } from "@src/lib/screenplay/extensions/scene-bookmark-extension";
+import {
+    createSceneLockingExtension,
+    refreshSceneLocking,
+} from "@src/lib/screenplay/extensions/scene-locking-extension";
 import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
 import { CommentMark } from "@src/lib/screenplay/extensions/comment-highlight-extension";
 import { createSpellcheckExtension, refreshSpellcheck } from "@src/lib/spellcheck/spellcheck-extension";
@@ -71,6 +75,9 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         setSearchMatches,
         contdLabel,
         moreLabel,
+        sceneLocking,
+        sceneNumberingStyle,
+        persistentScenes,
     } = projectCtx;
 
     const projectState = repository?.getState();
@@ -163,6 +170,9 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         searchFilters,
         currentSearchIndex,
         setSearchMatches,
+        sceneLocking,
+        sceneNumberingStyle,
+        persistentScenes,
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }), []);
     ext.highlightedCharacters = highlightedCharacters;
@@ -176,6 +186,9 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     ext.searchFilters = searchFilters;
     ext.currentSearchIndex = currentSearchIndex;
     ext.setSearchMatches = setSearchMatches;
+    ext.sceneLocking = sceneLocking;
+    ext.sceneNumberingStyle = sceneNumberingStyle;
+    ext.persistentScenes = persistentScenes;
 
     const lastReportedElementRef = useRef<ScreenplayElement | null>(null);
 
@@ -251,6 +264,14 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
           })
         : null;
 
+    const sceneLockingExtension = features.sceneLocking
+        ? createSceneLockingExtension({
+              getSceneLocking: () => !!ext.sceneLocking,
+              getScenes: () => ext.repository?.scenes ?? {},
+              getNumberingStyle: () => ext.sceneNumberingStyle ?? "suffix",
+          })
+        : null;
+
     const commentMarkExtension = features.comments
         ? CommentMark.configure({
               onCommentActivated: (commentId: string | null) => {
@@ -363,6 +384,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
                 ...(characterHighlightExtension ? [characterHighlightExtension] : []),
                 ...(searchHighlightExtension ? [searchHighlightExtension] : []),
                 ...(sceneBookmarkExtension ? [sceneBookmarkExtension] : []),
+                ...(sceneLockingExtension ? [sceneLockingExtension] : []),
                 ...(nodeIdDedupExtension ? [nodeIdDedupExtension] : []),
                 ...(spellcheckExtension ? [spellcheckExtension] : []),
             ],
@@ -569,6 +591,13 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         }
     }, [editor, scenes, features.sceneBookmarks]);
 
+    // Refresh scene locking decorations when the lock map or toggle changes
+    useEffect(() => {
+        if (editor && features.sceneLocking) {
+            refreshSceneLocking(editor);
+        }
+    }, [editor, sceneLocking, sceneNumberingStyle, persistentScenes, features.sceneLocking]);
+
     // Refresh search highlights
     useEffect(() => {
         if (editor && features.searchHighlights) {
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index 936c2c7f..f729c449 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -101,6 +101,16 @@ export type LayoutData = {
     moreLabel: string;
     elementMargins: Record<string, ElementMargin>;
     elementStyles: Record<string, ElementStyle>;
+    sceneLocking?: boolean;
+    /**
+     * How provisional scenes inserted under production lock are labeled.
+     * - "suffix" (default): scene inserted between 3 and 4 → "3A".
+     * - "prefix": scene inserted between 3 and 4 → "A4". Letters decrease
+     *   going forward (closest to L_next gets "A").
+     * Only affects scenes that are computed/locked AFTER this setting is set;
+     * already-locked scenes keep their stored label.
+     */
+    sceneNumberingStyle?: "suffix" | "prefix";
 };
 
 // -------------------------------- //
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index 5402e11e..23d6a96a 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -244,20 +244,30 @@ export class ProjectRepository {
 
     /**
      * Create or update a scene's persistent data.
+     *
+     * Fields that appear in `data` (including ones explicitly set to undefined)
+     * overwrite the corresponding existing fields; everything else is preserved.
+     * Any final undefined values are stripped before writing.
+     *
      * Returns the scene id.
      */
     upsertScene(sceneId: string, data: Partial<PersistentScene>): string {
         if (this.guardWrite("upsertScene")) return sceneId;
         const map = this.ydoc.scenes();
-        const existing = map.get(sceneId) as PersistentScene | undefined;
+        const existing = (map.get(sceneId) as PersistentScene | undefined) ?? {};
 
-        const sceneData: PersistentScene = {
-            synopsis: data.synopsis ?? existing?.synopsis ?? "",
-            color: "color" in data ? data.color : existing?.color,
-        };
+        const merged: PersistentScene = { ...existing };
+        const FIELDS = ["synopsis", "color", "token", "omitted"] as const;
+        for (const key of FIELDS) {
+            if (key in data) {
+                (merged as Record<string, unknown>)[key] = data[key];
+            }
+        }
+        for (const key of FIELDS) {
+            if (merged[key] === undefined) delete merged[key];
+        }
 
-        map.set(sceneId, sceneData);
-        console.log(`[Scenes] Upserted scene: ${sceneId}`);
+        map.set(sceneId, merged);
         return sceneId;
     }
 
@@ -360,6 +370,48 @@ export class ProjectRepository {
         if (this.guardWrite("setElementStyles")) return;
         this.ydoc.layout().set("elementStyles", styles);
     }
+    setSceneLocking(locked: boolean) {
+        if (this.guardWrite("setSceneLocking")) return;
+        this.ydoc.layout().set("sceneLocking", locked);
+    }
+    setSceneNumberingStyle(style: "suffix" | "prefix") {
+        if (this.guardWrite("setSceneNumberingStyle")) return;
+        this.ydoc.layout().set("sceneNumberingStyle", style);
+    }
+
+    /**
+     * Strip the frozen production `token` from every persistent scene entry.
+     * Entries that have no remaining content (no `synopsis`, `color`, or
+     * `omitted` flag) are deleted outright. Used by the Production panel
+     * when the user unlocks scenes. The `omitted` flag is preserved — omit
+     * is independent of production lock and survives unlock.
+     */
+    clearSceneLocks(): void {
+        if (this.guardWrite("clearSceneLocks")) return;
+        const map = this.ydoc.scenes();
+        const entries: [string, PersistentScene][] = [];
+        map.forEach((value, key) => {
+            entries.push([key, value as PersistentScene]);
+        });
+        for (const [uuid, scene] of entries) {
+            const next: PersistentScene = { ...scene };
+            delete next.token;
+            if (!next.synopsis && !next.color && !next.omitted) {
+                map.delete(uuid);
+            } else {
+                map.set(uuid, next);
+            }
+        }
+    }
+
+    /**
+     * Run a function inside a single Y.js transaction.
+     * Useful for batching multiple repository mutations into one collab update.
+     */
+    transact(fn: () => void): void {
+        if (this.guardWrite("transact")) return;
+        this.ydoc.transact(fn);
+    }
 
     // -------------------------------- //
     //            COMMENTS              //
diff --git a/src/lib/screenplay/editor.ts b/src/lib/screenplay/editor.ts
index 8f4eded5..6c2fc7e9 100644
--- a/src/lib/screenplay/editor.ts
+++ b/src/lib/screenplay/editor.ts
@@ -5,7 +5,7 @@ import { ScreenplayElement, Style, TitlePageElement } from "../utils/enums";
 import Document from "@tiptap/extension-document";
 import Text from "@tiptap/extension-text";
 
-import { ScreenplayNodes, ScriptioBold, ScriptioItalic, ScriptioUnderline } from "@src/lib/screenplay/nodes";
+import { ScreenplayNodes, ScriptioBold, ScriptioItalic, ScriptioUnderline, generateNodeId } from "@src/lib/screenplay/nodes";
 import { Placeholder } from "./extensions/placeholder-extension";
 import { PAGE_SIZES } from "./extensions/pagination-extension";
 import { ContdExtension } from "./extensions/contd-extension";
@@ -19,8 +19,14 @@ export const applyMarkToggle = (editor: Editor, style: Style) => {
 };
 
 export const applyElement = (editor: Editor, element: ScreenplayElement) => {
-    // Use the element value directly as the node name since they now match
-    editor.chain().focus().setNode(element, { class: element }).run();
+    // Pass a fresh data-id explicitly: Tiptap pre-resolves the schema's
+    // function defaults at setup time (see @tiptap/core
+    // helpers/getAttributesFromExtensions.ts), so the data-id default is a
+    // static string after init. Without this, every type-conversion would
+    // produce a duplicate that the dedup extension renames — and the
+    // rename would transfer any locked persistent entry to the new node,
+    // silently breaking scene locks.
+    editor.chain().focus().setNode(element, { class: element, "data-id": generateNodeId() }).run();
 };
 
 export const focusOnPosition = (editor: Editor, position: number) => {
diff --git a/src/lib/screenplay/extensions/fountain-extension.ts b/src/lib/screenplay/extensions/fountain-extension.ts
index 41852b4a..5bfa9922 100644
--- a/src/lib/screenplay/extensions/fountain-extension.ts
+++ b/src/lib/screenplay/extensions/fountain-extension.ts
@@ -3,6 +3,7 @@ import { Node } from "@tiptap/pm/model";
 import { Plugin, PluginKey } from "@tiptap/pm/state";
 import { ReplaceStep, Step } from "@tiptap/pm/transform";
 import { ScreenplayElement } from "../../utils/enums";
+import { generateNodeId } from "../nodes";
 
 const fountainInputRulesPluginKey = new PluginKey("fountainInputRules");
 
@@ -116,6 +117,7 @@ export const FountainExtension = Extension.create<FountainInputRulesOptions>({
                         // Change the node type to the new element type
                         tr.setNodeMarkup(nodeStart, targetNodeType, {
                             class: forcedElement,
+                            "data-id": generateNodeId(),
                         });
 
                         // Then remove the prefix character
@@ -138,6 +140,7 @@ export const FountainExtension = Extension.create<FountainInputRulesOptions>({
                         const tr = newState.tr;
                         tr.setNodeMarkup(nodeStart, targetNodeType, {
                             class: ScreenplayElement.Note,
+                            "data-id": generateNodeId(),
                         });
 
                         // Remove the [[ prefix
@@ -175,6 +178,7 @@ export const FountainExtension = Extension.create<FountainInputRulesOptions>({
                         const tr = newState.tr;
                         tr.setNodeMarkup(nodeStart, targetNodeType, {
                             class: ScreenplayElement.Character,
+                            "data-id": generateNodeId(),
                         });
 
                         return tr;
diff --git a/src/lib/screenplay/extensions/node-id-dedup-extension.ts b/src/lib/screenplay/extensions/node-id-dedup-extension.ts
index 12a89bfa..31bbaab5 100644
--- a/src/lib/screenplay/extensions/node-id-dedup-extension.ts
+++ b/src/lib/screenplay/extensions/node-id-dedup-extension.ts
@@ -16,6 +16,9 @@ type NodeIdDedupConfig = {
  * This plugin only handles the duplicate case: when a node is copy-pasted, both the
  * original and copy share the same data-id. A new ID is generated for the copy, and
  * for persistent scene headings, the persistent scene data is duplicated as well.
+ *
+ * NOTE: production sceneLocks are intentionally NOT duplicated here — a pasted scene
+ * should start unlocked/provisional, not inherit the source's frozen label.
  */
 export const createNodeIdDedupExtension = (config: NodeIdDedupConfig) => {
     return Extension.create({
diff --git a/src/lib/screenplay/extensions/scene-locking-extension.ts b/src/lib/screenplay/extensions/scene-locking-extension.ts
new file mode 100644
index 00000000..9de747ef
--- /dev/null
+++ b/src/lib/screenplay/extensions/scene-locking-extension.ts
@@ -0,0 +1,244 @@
+import { Editor, Extension } from "@tiptap/core";
+import { Node } from "@tiptap/pm/model";
+import { Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
+import { Decoration, DecorationSet } from "@tiptap/pm/view";
+
+import type { PersistentScene } from "../scenes";
+import { computeSceneLabels, SceneNumberingStyle } from "../scene-locking";
+import { ScreenplayElement } from "../../utils/enums";
+
+const sceneLockingPluginKey = new PluginKey("sceneLocking");
+const REFRESH_META = "sceneLockingRefresh";
+
+type SceneLockingConfig = {
+    getSceneLocking: () => boolean;
+    getScenes: () => Record<string, PersistentScene>;
+    getNumberingStyle: () => SceneNumberingStyle;
+};
+
+type SceneEntry = { uuid: string; pos: number; nodeSize: number };
+
+const collectSceneEntries = (doc: Node): SceneEntry[] => {
+    const out: SceneEntry[] = [];
+    doc.forEach((node, pos) => {
+        if (node.attrs?.class !== ScreenplayElement.Scene) return;
+        const uuid: string | undefined = node.attrs?.["data-id"];
+        if (!uuid) return;
+        out.push({ uuid, pos, nodeSize: node.nodeSize });
+    });
+    return out;
+};
+
+/**
+ * Does any step in this transaction touch a Scene node or any node that sits
+ * between Scene boundaries? Used as a cheap early-exit so we don't rebuild
+ * decorations on every keystroke inside an action paragraph far away from
+ * any omitted scene. We have to be conservative when omitted scenes exist
+ * because hiding the body of an omitted scene means body-paragraph edits
+ * must trigger decoration recomputation too.
+ */
+const didSceneNodesChange = (tr: Transaction): boolean => {
+    if (!tr.docChanged) return false;
+    for (const step of tr.steps) {
+        const stepMap = step.getMap();
+        let affected = false;
+        stepMap.forEach((oldStart: number, oldEnd: number, newStart: number, newEnd: number) => {
+            try {
+                const oldDoc = tr.docs[0];
+                if (oldDoc) {
+                    oldDoc.nodesBetween(oldStart, oldEnd, (node: Node) => {
+                        if (node.attrs?.class === ScreenplayElement.Scene) affected = true;
+                    });
+                }
+            } catch { /* range out of bounds */ }
+            try {
+                tr.doc.nodesBetween(newStart, newEnd, (node: Node) => {
+                    if (node.attrs?.class === ScreenplayElement.Scene) affected = true;
+                });
+            } catch { /* range out of bounds */ }
+        });
+        if (affected) return true;
+    }
+    return false;
+};
+
+const buildLabelWidget = (label: string, side: "left" | "right"): HTMLElement => {
+    const span = document.createElement("span");
+    span.className = side === "left" ? "scene-label scene-label-left" : "scene-label scene-label-right";
+    span.contentEditable = "false";
+    span.textContent = label;
+    return span;
+};
+
+const buildOmittedWidget = (): HTMLElement => {
+    const span = document.createElement("span");
+    span.className = "scene-omitted-overlay";
+    span.contentEditable = "false";
+    span.textContent = "OMITTED";
+    return span;
+};
+
+const computeDecorations = (
+    doc: Node,
+    locking: boolean,
+    scenes: Record<string, PersistentScene>,
+    style: SceneNumberingStyle,
+): DecorationSet => {
+    const entries = collectSceneEntries(doc);
+    if (entries.length === 0) return DecorationSet.empty;
+
+    const decorations: Decoration[] = [];
+
+    // Scene-number labels are only meaningful under production lock.
+    if (locking) {
+        const labels = computeSceneLabels(
+            entries.map((e) => e.uuid),
+            scenes,
+            style,
+        );
+
+        for (let i = 0; i < entries.length; i++) {
+            const entry = entries[i];
+            const info = labels[i];
+            const keyBase = `${entry.uuid}-${info.label}-${info.status}`;
+
+            decorations.push(
+                Decoration.widget(entry.pos + 1, () => buildLabelWidget(info.label, "left"), {
+                    side: -1,
+                    key: `scene-label-l-${keyBase}`,
+                }),
+            );
+            decorations.push(
+                Decoration.widget(entry.pos + 1, () => buildLabelWidget(info.label, "right"), {
+                    side: -1,
+                    key: `scene-label-r-${keyBase}`,
+                }),
+            );
+        }
+    }
+
+    // OMITTED decorations are independent of production lock — the user can
+    // omit any scene at any time and the original heading + body are kept
+    // in the document; we just hide them visually until they unomit.
+    for (let i = 0; i < entries.length; i++) {
+        const entry = entries[i];
+        if (!scenes[entry.uuid]?.omitted) continue;
+
+        decorations.push(
+            Decoration.node(entry.pos, entry.pos + entry.nodeSize, {
+                "data-omitted-overlay": "true",
+            }),
+        );
+        decorations.push(
+            Decoration.widget(entry.pos + 1, () => buildOmittedWidget(), {
+                side: -1,
+                key: `scene-omitted-${entry.uuid}`,
+            }),
+        );
+
+        // Hide the original heading text behind the OMITTED widget. Skip
+        // empty headings — there's nothing to hide and the inline range
+        // would be degenerate.
+        if (entry.nodeSize > 2) {
+            decorations.push(
+                Decoration.inline(entry.pos + 1, entry.pos + entry.nodeSize - 1, {
+                    class: "scene-heading-omitted-text",
+                }),
+            );
+        }
+
+        // Hide every top-level paragraph between this heading and the next
+        // scene heading. We tag them with `data-omitted-body` so CSS can
+        // collapse them while leaving the underlying document untouched.
+        const nextEntry = entries[i + 1];
+        const bodyEnd = nextEntry ? nextEntry.pos : doc.content.size;
+        const bodyStart = entry.pos + entry.nodeSize;
+        doc.forEach((node, pos) => {
+            if (pos >= bodyStart && pos < bodyEnd) {
+                decorations.push(
+                    Decoration.node(pos, pos + node.nodeSize, {
+                        "data-omitted-body": "true",
+                    }),
+                );
+            }
+        });
+    }
+
+    return DecorationSet.create(doc, decorations);
+};
+
+/**
+ * Tiptap extension that renders scene-number labels under production lock
+ * and OMITTED overlays (independent of lock state).
+ *
+ * Hot-path notes:
+ *  - `apply` runs on every transaction. We early-exit when no scene nodes
+ *    were touched, simply mapping existing decorations forward through the
+ *    transaction. Full recomputation only happens on an explicit refresh
+ *    signal or when a scene node was actually modified.
+ */
+export const createSceneLockingExtension = (config: SceneLockingConfig) => {
+    return Extension.create({
+        name: "sceneLocking",
+
+        addProseMirrorPlugins() {
+            const { getSceneLocking, getScenes, getNumberingStyle } = config;
+
+            return [
+                new Plugin({
+                    key: sceneLockingPluginKey,
+                    state: {
+                        init(_, { doc }) {
+                            return computeDecorations(
+                                doc,
+                                getSceneLocking(),
+                                getScenes(),
+                                getNumberingStyle(),
+                            );
+                        },
+                        apply(tr, oldDecorations, _oldState, newState) {
+                            // Explicit refresh (lock toggle, lock-map change) → recompute.
+                            if (tr.getMeta(REFRESH_META)) {
+                                return computeDecorations(
+                                    newState.doc,
+                                    getSceneLocking(),
+                                    getScenes(),
+                                    getNumberingStyle(),
+                                );
+                            }
+
+                            if (!tr.docChanged) return oldDecorations;
+
+                            // Doc edits that don't touch a scene node only shift
+                            // existing decorations — no need to rebuild widgets.
+                            if (!didSceneNodesChange(tr)) {
+                                return oldDecorations.map(tr.mapping, newState.doc);
+                            }
+
+                            return computeDecorations(
+                                newState.doc,
+                                getSceneLocking(),
+                                getScenes(),
+                                getNumberingStyle(),
+                            );
+                        },
+                    },
+                    props: {
+                        decorations(state) {
+                            return this.getState(state);
+                        },
+                    },
+                }),
+            ];
+        },
+    });
+};
+
+/**
+ * Force a recompute of scene label decorations.
+ * Call when sceneLocking toggles or the sceneLocks map changes.
+ */
+export const refreshSceneLocking = (editor: Editor | null) => {
+    if (!editor || !editor.view) return;
+    editor.view.dispatch(editor.state.tr.setMeta(REFRESH_META, true));
+};
diff --git a/src/lib/screenplay/nodes/scene-node.ts b/src/lib/screenplay/nodes/scene-node.ts
index 457d84d3..6a03c3cc 100644
--- a/src/lib/screenplay/nodes/scene-node.ts
+++ b/src/lib/screenplay/nodes/scene-node.ts
@@ -1,4 +1,5 @@
 import { Node, mergeAttributes } from "@tiptap/core";
+import { TextSelection } from "@tiptap/pm/state";
 import { ScreenplayElement } from "../../utils/enums";
 import { ALIGN_CLASSES, generateNodeId } from "./index";
 
@@ -77,4 +78,84 @@ export const SceneNode = Node.create<SceneNodeOptions>({
     renderHTML({ HTMLAttributes }) {
         return ["p", mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0];
     },
+
+    addKeyboardShortcuts() {
+        return {
+            Backspace: ({ editor }) => {
+                const { state, view } = editor;
+                const { $from, empty } = state.selection;
+                if (!empty || $from.parentOffset !== 0) return false;
+
+                // Case 1: cursor inside an empty Scene heading → delete the
+                // Scene itself (unless it's the only block in the document).
+                // After deletion, drop the cursor at the end of the previous
+                // block — default PM selection mapping moves it forward into
+                // the *next* block instead, which feels wrong here.
+                if ($from.parent.type === this.type) {
+                    if ($from.parent.textContent.length === 0 && state.doc.childCount > 1) {
+                        const pos = $from.before();
+                        const tr = state.tr.delete(pos, pos + $from.parent.nodeSize);
+                        if (pos > 0) {
+                            tr.setSelection(TextSelection.create(tr.doc, pos - 1));
+                        }
+                        view.dispatch(tr);
+                        return true;
+                    }
+                    return false;
+                }
+
+                // Case 2: cursor at the start of an empty block whose
+                // immediately preceding sibling is a Scene heading. Default
+                // ProseMirror `joinBackward` would delete the Scene above
+                // (joinMaybeClear deletes the empty `before` block), leaving
+                // the empty current block orphaned. Intercept and delete the
+                // current block instead, dropping the cursor into the Scene.
+                if ($from.parent.textContent.length !== 0) return false;
+
+                const curStart = $from.before();
+                if (curStart === 0) return false;
+
+                const prev = state.doc.resolve(curStart).nodeBefore;
+                if (!prev || prev.type !== this.type) return false;
+
+                const cursorTarget = curStart - 1;
+                const tr = state.tr.delete(curStart, $from.after());
+                tr.setSelection(TextSelection.create(tr.doc, cursorTarget));
+                view.dispatch(tr);
+                return true;
+            },
+            Enter: ({ editor }) => {
+                const { state, view } = editor;
+                const { $from, empty } = state.selection;
+
+                if (empty && $from.parent.type === this.type && $from.parentOffset === 0) {
+                    // If the node is completely empty, let Tiptap handle it (converts to Action)
+                    if ($from.parent.textContent.length === 0) {
+                        return false;
+                    }
+
+                    // Split the block. We want the node AFTER the split (which contains the text)
+                    // to keep its original data-id, and the new empty node BEFORE the split
+                    // to get a new data-id. Since tr.split by default copies the original node's
+                    // attributes to both halves, we can split, and then update the attributes of
+                    // the newly created empty node (which will be right before $from.pos).
+                    const originalAttrs = $from.parent.attrs;
+                    let tr = state.tr.split($from.pos, 1, [{ type: this.type, attrs: originalAttrs }]);
+                    
+                    // After the split, the original node with its text is pushed down.
+                    // A new empty node is created above it. The new node starts at $from.pos - 1
+                    // (the start of the block). We update its data-id.
+                    const newNodePos = $from.pos - 1;
+                    tr = tr.setNodeMarkup(newNodePos, undefined, {
+                        ...originalAttrs,
+                        "data-id": generateNodeId()
+                    });
+                    
+                    view.dispatch(tr);
+                    return true;
+                }
+                return false;
+            },
+        };
+    },
 });
\ No newline at end of file
diff --git a/src/lib/screenplay/popup.ts b/src/lib/screenplay/popup.ts
index fcc6c681..e9b54903 100644
--- a/src/lib/screenplay/popup.ts
+++ b/src/lib/screenplay/popup.ts
@@ -21,6 +21,10 @@ export type PopupUploadToCloudData = {
     projectId: string;
 };
 
+export type PopupUnlockScenesData = {
+    confirmUnlock: () => void;
+};
+
 // ------------------------------ //
 //         GENERIC POPUP          //
 // ------------------------------ //
@@ -28,7 +32,8 @@ export type PopupUnionData =
     | PopupImportFileData
     | PopupCharacterData
     | PopupSceneData
-    | PopupUploadToCloudData;
+    | PopupUploadToCloudData
+    | PopupUnlockScenesData;
 
 export enum PopupType {
     NewCharacter,
@@ -36,6 +41,7 @@ export enum PopupType {
     ImportFile,
     EditScene,
     UploadToCloud,
+    UnlockScenes,
 }
 
 export type PopupData<DataType extends PopupUnionData> = {
@@ -85,3 +91,10 @@ export const uploadToCloudPopup = (projectId: string, userCtx: UserContextType)
         data: { projectId },
     });
 };
+
+export const unlockScenesPopup = (confirmUnlock: () => void, userCtx: UserContextType) => {
+    userCtx.updatePopup({
+        type: PopupType.UnlockScenes,
+        data: { confirmUnlock },
+    });
+};
diff --git a/src/lib/screenplay/scene-locking.ts b/src/lib/screenplay/scene-locking.ts
new file mode 100644
index 00000000..6e6a33ab
--- /dev/null
+++ b/src/lib/screenplay/scene-locking.ts
@@ -0,0 +1,449 @@
+/**
+ * Token-based scene labeling for production lock.
+ *
+ * Every locked scene stores a `SceneToken` — a structural, mode-independent
+ * encoding of its logical position in the screenplay. The display label is
+ * derived from the token via `compileSceneLabel(token)`. Because letter case
+ * is baked into each level (`lower: true | false`), toggling the global
+ * `SceneNumberingStyle` setting never alters the label of an already-locked
+ * scene.
+ *
+ * Convention
+ * ----------
+ * - `baseNumber` is the integer anchor (1, 2, 3, …) that the rest of the
+ *   token attaches to.
+ * - `prefixes` are letter levels rendered BEFORE the base. Stored
+ *   **inner-first** — `prefixes[0]` is the letter closest to the base.
+ *   Rendering reverses the array.
+ * - `suffixes` are letter levels rendered AFTER the base. Stored
+ *   **shallowest-first** — `suffixes[0]` is the letter immediately after
+ *   the base.
+ *
+ * Cases are encoded per-level. Uppercase = "AFTER" depth; lowercase = a
+ * wedge insertion that goes BEFORE its same-position uppercase sibling in
+ * production order.
+ *
+ *   "1"     →  { base:1 }
+ *   "1A"    →  { base:1, suffixes:[{1,U}] }
+ *   "1B"    →  { base:1, suffixes:[{2,U}] }
+ *   "1AA"   →  { base:1, suffixes:[{1,U},{1,U}] }  ← sub-scene of 1A, between 1A and 1B
+ *   "1aA"   →  { base:1, suffixes:[{1,L},{1,U}] }  ← wedge between 1 and 1A
+ *   "A2"    →  { base:2, prefixes:[{1,U}] }
+ *   "AA2"   →  { base:2, prefixes:[{1,U},{1,U}] }  ← deeper before A2, between 1 and A2
+ *
+ * Production order
+ * ----------------
+ * A total order on tokens:
+ *   1. Compare `baseNumber`.
+ *   2. Element-wise on `prefixes`. A SHORTER prefix array is LATER
+ *      (longer prefix = deeper level = comes earlier in the doc).
+ *      At each position, compare `value`, then case (lower < upper).
+ *   3. Element-wise on `suffixes`. A SHORTER suffix array is EARLIER
+ *      (longer suffix = deeper sub-scene, comes after the parent).
+ *      At each position, compare `value`, then case (lower < upper).
+ *
+ * Together these give:  1 < 1aA < 1A < 1AA < 1AB < 1B < 2.
+ */
+
+import type { ProjectRepository } from "../project/project-repository";
+
+// --------------------------------------------------------------------------
+//                                TYPES
+// --------------------------------------------------------------------------
+
+export type SceneLevel = { value: number; lower: boolean };
+
+export type SceneToken = {
+    baseNumber: number;
+    prefixes: SceneLevel[];
+    suffixes: SceneLevel[];
+};
+
+/** Minimal shape needed by `computeSceneLabels`. Persistent scenes match it. */
+export type LockReadable = {
+    token?: SceneToken;
+    omitted?: boolean;
+};
+
+export type SceneLabelStatus = "locked" | "provisional" | "omitted";
+
+export type SceneLabel = {
+    uuid: string;
+    /** Structural representation. Stable across style toggles when locked. */
+    token: SceneToken;
+    /** Display string, derived from `token`. */
+    label: string;
+    status: SceneLabelStatus;
+};
+
+export type SceneNumberingStyle = "suffix" | "prefix";
+
+// --------------------------------------------------------------------------
+//                          ENCODING & DISPLAY
+// --------------------------------------------------------------------------
+
+/** Excel-style alphabetic letter: 1 → A, 26 → Z, 27 → AA, … */
+const letterFromValue = (n: number, lower: boolean): string => {
+    let out = "";
+    const charBase = lower ? 97 : 65;
+    while (n > 0) {
+        const m = (n - 1) % 26;
+        out = String.fromCharCode(charBase + m) + out;
+        n = Math.floor((n - 1) / 26);
+    }
+    return out;
+};
+
+/**
+ * Render a token to its display string. Style-independent — the case of
+ * each level is taken directly from `level.lower`, so the result is the
+ * same regardless of the project's `SceneNumberingStyle` setting.
+ */
+export const compileSceneLabel = (token: SceneToken): string => {
+    // Prefixes are stored inner-first (closest to base at index 0). Render
+    // outer-to-inner, i.e. reverse before joining.
+    let out = "";
+    for (let i = token.prefixes.length - 1; i >= 0; i--) {
+        const lvl = token.prefixes[i];
+        out += letterFromValue(lvl.value, lvl.lower);
+    }
+    out += String(token.baseNumber);
+    for (let i = 0; i < token.suffixes.length; i++) {
+        const lvl = token.suffixes[i];
+        out += letterFromValue(lvl.value, lvl.lower);
+    }
+    return out;
+};
+
+/** Total order on `SceneToken`. See file header for the rules. */
+export const compareTokens = (a: SceneToken, b: SceneToken): number => {
+    if (a.baseNumber !== b.baseNumber) return a.baseNumber - b.baseNumber;
+
+    const pLen = Math.max(a.prefixes.length, b.prefixes.length);
+    for (let i = 0; i < pLen; i++) {
+        const ai = a.prefixes[i] as SceneLevel | undefined;
+        const bi = b.prefixes[i] as SceneLevel | undefined;
+        // For prefixes: longer = earlier ⇒ missing > defined.
+        if (ai === undefined) return 1;
+        if (bi === undefined) return -1;
+        if (ai.value !== bi.value) return ai.value - bi.value;
+        if (ai.lower !== bi.lower) return ai.lower ? -1 : 1;
+    }
+
+    const sLen = Math.max(a.suffixes.length, b.suffixes.length);
+    for (let i = 0; i < sLen; i++) {
+        const ai = a.suffixes[i] as SceneLevel | undefined;
+        const bi = b.suffixes[i] as SceneLevel | undefined;
+        // For suffixes: longer = later ⇒ missing < defined.
+        if (ai === undefined) return -1;
+        if (bi === undefined) return 1;
+        if (ai.value !== bi.value) return ai.value - bi.value;
+        if (ai.lower !== bi.lower) return ai.lower ? -1 : 1;
+    }
+
+    return 0;
+};
+
+// Convenience constructors.
+const sceneLevel = (value: number, lower: boolean): SceneLevel => ({ value, lower });
+
+/** Token for a bare integer scene number ("1", "2", …). */
+export const baseToken = (baseNumber: number): SceneToken => ({
+    baseNumber,
+    prefixes: [],
+    suffixes: [],
+});
+
+const levelEq = (a: SceneLevel, b: SceneLevel): boolean =>
+    a.value === b.value && a.lower === b.lower;
+
+// --------------------------------------------------------------------------
+//                  PROVISIONAL TOKEN COMPUTATION
+// --------------------------------------------------------------------------
+//
+// Each provisional scene gets a token derived from its immediate locked
+// neighbours and its 1-based position within the segment (`k`). The rules
+// preserve the existing user-visible behaviour:
+//
+//   suffix mode, between locked 1 and 2:                    1A,  1B,  1C, …
+//   suffix mode, between locked 1A and 1B (1 also locked):  1AA, 1AB, 1AC
+//   suffix mode, between locked 1 and 1A:                   1aA, 1aB, 1aC
+//   prefix mode, between locked 1 and 2:                     A2,  B2,  C2
+//   prefix mode, before locked 1:                            A1,  B1,  C1
+//   prefix mode, between locked 1 and A2:                   AA2, BA2, CA2
+//
+// Both modes are duals of one another and share the same three operations
+// applied along a single "axis" (suffix or prefix):
+//
+//   1. CONTINUE: bump the deepest level of an anchor along the axis.
+//   2. NEST:    append a new uppercase level to an anchor along the axis.
+//   3. WEDGE:   walk the OTHER token's path along the axis looking for a
+//               point where a lowercase wedge level slots strictly between
+//               the two anchors.
+//
+// SUFFIX mode anchors on `prev` and grows rightward toward `next`; PREFIX
+// mode anchors on `next` and grows leftward toward `prev`. Each candidate
+// is verified strictly-between by `compareTokens` before being returned —
+// if the chosen style's strategies all fall outside the range (as can
+// happen with cross-axis anchors, e.g. prefix-mode insertion between plain
+// "1" and suffix-bearing "1A"), we fall back to the dual style.
+
+type Axis = "suffix" | "prefix";
+
+const levelsOf = (t: SceneToken, axis: Axis): SceneLevel[] =>
+    axis === "suffix" ? t.suffixes : t.prefixes;
+
+const withLevels = (t: SceneToken, axis: Axis, levels: SceneLevel[]): SceneToken =>
+    axis === "suffix"
+        ? { baseNumber: t.baseNumber, prefixes: t.prefixes, suffixes: levels }
+        : { baseNumber: t.baseNumber, prefixes: levels, suffixes: t.suffixes };
+
+// Wedge convention per axis. lowercase < uppercase at the same value (see
+// `compareTokens`). Suffix levels count UP, so 'a' (value 1) is the deepest
+// wedge — decrementing past it means descending a level. Prefix levels are
+// mirrored: 'z' (value 26) is the bound; incrementing past it descends.
+const wedgeBound = (axis: Axis): number => (axis === "suffix" ? 1 : 26);
+const wedgeStep = (axis: Axis): number => (axis === "suffix" ? -1 : 1);
+
+/** Bump the deepest level of `anchor` along `axis` by k. */
+const continueAlong = (anchor: SceneToken, k: number, axis: Axis): SceneToken | null => {
+    const path = levelsOf(anchor, axis);
+    if (path.length === 0) {
+        // Suffix axis can fall through to bumping the base. Prefix axis
+        // has nothing to continue when there's no outermost prefix.
+        if (axis === "suffix") {
+            return { baseNumber: anchor.baseNumber + k, prefixes: anchor.prefixes, suffixes: [] };
+        }
+        return null;
+    }
+    const last = path[path.length - 1];
+    const newPath = path.slice(0, -1).concat([sceneLevel(last.value + k, last.lower)]);
+    return withLevels(anchor, axis, newPath);
+};
+
+/** Append a fresh uppercase level (value k) to anchor's path along axis. */
+const nestAlong = (anchor: SceneToken, k: number, axis: Axis): SceneToken =>
+    withLevels(anchor, axis, [...levelsOf(anchor, axis), sceneLevel(k, false)]);
+
+/**
+ * Walk `target`'s path (skipping any shared prefix with `from`) and slot in
+ * a lowercase wedge level just before its first divergent uppercase level.
+ * Returns a token whose label sorts strictly between `from` and `target`,
+ * or null if `target`'s path doesn't extend past the shared prefix (caller
+ * needs a different strategy).
+ *
+ *   suffix axis: `from` = prev, `target` = next. Wedge bound is 'a'.
+ *   prefix axis: `from` = next, `target` = prev. Wedge bound is 'z'.
+ */
+const wedgeAlong = (
+    from: SceneToken,
+    target: SceneToken,
+    k: number,
+    axis: Axis,
+): SceneToken | null => {
+    const fromLevels = levelsOf(from, axis);
+    const targetLevels = levelsOf(target, axis);
+    const bound = wedgeBound(axis);
+    const step = wedgeStep(axis);
+
+    let i = 0;
+    while (
+        i < fromLevels.length &&
+        i < targetLevels.length &&
+        levelEq(fromLevels[i], targetLevels[i])
+    ) {
+        i++;
+    }
+
+    if (i >= targetLevels.length) return null;
+
+    const levels = targetLevels.slice(0, i);
+    while (i < targetLevels.length) {
+        const div = targetLevels[i];
+        if (div.lower && div.value === bound) {
+            // Already a wedge at this level — descend one deeper.
+            levels.push(div);
+            i++;
+            continue;
+        }
+        // We can wedge here. Decrement an existing lowercase level (e.g.
+        // suffix 'b' → 'a') or convert an uppercase to its lowercase
+        // wedge equivalent ('A' → 'a').
+        const wedgeValue = div.lower ? div.value + step : div.value;
+        levels.push(sceneLevel(wedgeValue, true));
+        return withLevels(target, axis, [...levels, sceneLevel(k, false)]);
+    }
+
+    // All of target's diverging levels were already at the wedge bound —
+    // append one more wedge level to land strictly below them.
+    levels.push(sceneLevel(bound, true));
+    return withLevels(target, axis, [...levels, sceneLevel(k, false)]);
+};
+
+const isStrictlyBetween = (
+    prev: SceneToken | null,
+    next: SceneToken | null,
+    cand: SceneToken,
+): boolean => {
+    if (prev && compareTokens(prev, cand) >= 0) return false;
+    if (next && compareTokens(cand, next) >= 0) return false;
+    return true;
+};
+
+const computeProvisionalToken = (
+    prev: SceneToken | null,
+    next: SceneToken | null,
+    k: number,
+    style: SceneNumberingStyle,
+): SceneToken => {
+    if (!prev && !next) return baseToken(k);
+
+    const pick = (cands: Array<SceneToken | null>): SceneToken | null => {
+        for (const c of cands) if (c && isStrictlyBetween(prev, next, c)) return c;
+        return null;
+    };
+
+    // Suffix-style candidates grow rightward from prev.
+    const suffixCandidates = (): Array<SceneToken | null> => {
+        if (prev) {
+            return [
+                continueAlong(prev, k, "suffix"),
+                nestAlong(prev, k, "suffix"),
+                next ? wedgeAlong(prev, next, k, "suffix") : null,
+            ];
+        }
+        // No prev — nothing to grow from on the suffix axis. The natural
+        // dual is to nest leftward into next.
+        return next ? [nestAlong(next, k, "prefix")] : [];
+    };
+
+    // Prefix-style candidates grow leftward from next.
+    const prefixCandidates = (): Array<SceneToken | null> => {
+        if (next) {
+            return [
+                prev ? continueAlong(prev, k, "prefix") : null,
+                nestAlong(next, k, "prefix"),
+                prev ? wedgeAlong(next, prev, k, "prefix") : null,
+            ];
+        }
+        return prev ? [continueAlong(prev, k, "suffix")] : [];
+    };
+
+    const primary = style === "suffix" ? pick(suffixCandidates()) : pick(prefixCandidates());
+    if (primary) return primary;
+
+    // Cross-style fallback: anchors don't line up along the requested
+    // axis (e.g. prefix mode trying to fit something between bases 1 and
+    // 1A — there's no valid prefix-only token there).
+    const fallback = style === "suffix" ? pick(prefixCandidates()) : pick(suffixCandidates());
+    if (fallback) return fallback;
+
+    // Pathological input (prev >= next). Should never happen for a valid
+    // scene sequence, but emit a deterministic token rather than throwing.
+    if (prev) return nestAlong(prev, k, "suffix");
+    if (next) return nestAlong(next, k, "prefix");
+    return baseToken(k);
+};
+
+// --------------------------------------------------------------------------
+//                              MAIN API
+// --------------------------------------------------------------------------
+
+/**
+ * Compute display labels (and structural tokens) for an ordered list of
+ * scene UUIDs. Locked scenes get their persisted token; provisional ones
+ * get a token computed from their segment's immediate neighbours.
+ *
+ * O(N) — two linear passes precompute prev/next/segment-index, one final
+ * pass emits the result.
+ */
+export const computeSceneLabels = (
+    sceneUuids: string[],
+    persistent: Record<string, LockReadable | undefined>,
+    style: SceneNumberingStyle = "suffix",
+): SceneLabel[] => {
+    const n = sceneUuids.length;
+    const result: SceneLabel[] = new Array(n);
+
+    const prevLocked: (SceneToken | null)[] = new Array(n);
+    const nextLocked: (SceneToken | null)[] = new Array(n);
+    const segmentIdx: number[] = new Array(n);
+
+    let lastToken: SceneToken | null = null;
+    let runCount = 0;
+    for (let i = 0; i < n; i++) {
+        const entry = persistent[sceneUuids[i]];
+        if (entry?.token) {
+            prevLocked[i] = lastToken;
+            segmentIdx[i] = 0;
+            lastToken = entry.token;
+            runCount = 0;
+        } else {
+            prevLocked[i] = lastToken;
+            runCount++;
+            segmentIdx[i] = runCount;
+        }
+    }
+
+    let upcomingToken: SceneToken | null = null;
+    for (let i = n - 1; i >= 0; i--) {
+        const entry = persistent[sceneUuids[i]];
+        if (entry?.token) {
+            nextLocked[i] = upcomingToken;
+            upcomingToken = entry.token;
+        } else {
+            nextLocked[i] = upcomingToken;
+        }
+    }
+
+    for (let i = 0; i < n; i++) {
+        const uuid = sceneUuids[i];
+        const entry = persistent[uuid];
+
+        if (entry?.token) {
+            result[i] = {
+                uuid,
+                token: entry.token,
+                label: compileSceneLabel(entry.token),
+                status: entry.omitted ? "omitted" : "locked",
+            };
+            continue;
+        }
+
+        const token = computeProvisionalToken(
+            prevLocked[i],
+            nextLocked[i],
+            segmentIdx[i],
+            style,
+        );
+        result[i] = {
+            uuid,
+            token,
+            label: compileSceneLabel(token),
+            status: "provisional",
+        };
+    }
+
+    return result;
+};
+
+// --------------------------------------------------------------------------
+//                              ACTIONS
+// --------------------------------------------------------------------------
+
+/**
+ * Mark a scene as OMITTED. The scene's heading text and body content are
+ * preserved in the document; the editor overlays "OMITTED" and hides the
+ * underlying content via decorations so the original screenplay survives an
+ * unomit. Works regardless of production lock state.
+ */
+export const omitSceneByUuid = (repository: ProjectRepository, uuid: string): void => {
+    repository.upsertScene(uuid, { omitted: true });
+};
+
+/** Clear an OMITTED scene's `omitted` flag, restoring the heading + body. */
+export const unomitSceneByUuid = (repository: ProjectRepository, uuid: string): void => {
+    const scene = repository.getScene(uuid);
+    if (!scene?.omitted) return;
+    repository.upsertScene(uuid, { omitted: undefined });
+};
diff --git a/src/lib/screenplay/scenes.ts b/src/lib/screenplay/scenes.ts
index d39e6186..c89fa974 100644
--- a/src/lib/screenplay/scenes.ts
+++ b/src/lib/screenplay/scenes.ts
@@ -22,6 +22,8 @@ import { getNodeData } from "./screenplay";
 import { ScreenplayElement } from "../utils/enums";
 import { Screenplay } from "../utils/types";
 import { JSONContent } from "@tiptap/react";
+import type { SceneToken } from "./scene-locking";
+import { compileSceneLabel } from "./scene-locking";
 
 /**
  * Recursively compute the ProseMirror nodeSize of a JSONContent node.
@@ -53,12 +55,21 @@ export type TransientScene = {
 
 /**
  * Persistent scene metadata stored in Yjs.
- * Only contains user-editable fields.
  * Keyed by scene id (UUID) in the Yjs map.
+ *
+ * Contains both user-editable fields (synopsis, color) and production-mode
+ * fields (token, omitted). `token` is the structural, mode-independent
+ * representation of the scene's frozen number under production lock; the
+ * display label is derived from it via `compileSceneLabel`. `omitted`
+ * flags the scene as an OMITTED placeholder.
  */
 export type PersistentScene = {
     synopsis?: string;
     color?: string;
+    /** Frozen structural position under production lock. */
+    token?: SceneToken;
+    /** True when the scene is an OMITTED placeholder (only meaningful with `token`). */
+    omitted?: boolean;
 };
 
 /**
@@ -69,10 +80,19 @@ export type PersistentSceneMap = { [id: string]: PersistentScene };
 /**
  * Full scene data combining transient and persistent data.
  * This is what gets exposed to the UI.
+ *
+ * `token` is the structural lock (when persisted); `label` is the derived
+ * display string (compiled from the token). Both are absent for scenes
+ * that have not been locked. UI code that needs *provisional* labels
+ * should call `computeSceneLabels()` over the full ordered scene list
+ * instead of reading `Scene.label` directly.
  */
 export type Scene = TransientScene & {
     synopsis?: string;
     color?: string;
+    token?: SceneToken;
+    label?: string;
+    omitted?: boolean;
 };
 
 // -------------------------------- //
@@ -172,6 +192,9 @@ export const mergeScenesData = (persistentScenes: PersistentSceneMap, screenplay
                 ...item,
                 synopsis: persistent.synopsis,
                 color: persistent.color,
+                token: persistent.token,
+                label: persistent.token ? compileSceneLabel(persistent.token) : undefined,
+                omitted: persistent.omitted,
             };
         }
 
diff --git a/src/lib/shelf/shelf-editor-config.ts b/src/lib/shelf/shelf-editor-config.ts
index 7af1c86d..a4e23b99 100644
--- a/src/lib/shelf/shelf-editor-config.ts
+++ b/src/lib/shelf/shelf-editor-config.ts
@@ -13,6 +13,7 @@ export function createShelfEditorConfig(nodeId: string, versionId: string): Docu
             characterHighlights: false,
             searchHighlights: false,
             sceneBookmarks: false,
+            sceneLocking: false,
             nodeIdDedup: true,
             suggestions: false,
             orphanPrevention: false,
diff --git a/styles/scriptio.css b/styles/scriptio.css
index a6f359ab..82ed8f4d 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -185,6 +185,65 @@
         display: none;
     }
 
+    /* Production lock: suppress CSS counter pseudo-elements — labels come
+       from widget decorations (scene-locking-extension) so we can render
+       suffixed / OMITTED labels that CSS counters can't express. */
+    &.production-locked .scene::before,
+    &.production-locked .scene::after {
+        display: none;
+    }
+
+    /* Widget decoration for the left scene label (mirrors the ::before slot).
+       text-transform: none !important is required to defeat the parent
+       .scene's text-transform: uppercase (matching the same pattern used by
+       .collab-caret-name above) so lowercase suffix markers like "3aA"
+       render with their original case. */
+    .scene-label-left {
+        position: absolute;
+        right: 100%;
+        margin-right: -120px;
+        user-select: none;
+        pointer-events: none;
+        text-transform: none !important;
+    }
+
+    /* Widget decoration for the right scene label (mirrors the ::after slot). */
+    .scene-label-right {
+        position: absolute;
+        top: 0;
+        left: 100%;
+        margin-left: -85px;
+        user-select: none;
+        pointer-events: none;
+        display: none;
+        text-transform: none !important;
+    }
+    &.scene-number-right .scene-label-right {
+        display: block;
+    }
+    &.hide-scene-numbers .scene-label-left,
+    &.hide-scene-numbers .scene-label-right {
+        display: none;
+    }
+
+    /* OMITTED scene placeholder. The heading text and body paragraphs are
+       preserved in the document so the user can restore them; we just hide
+       them visually and overlay "OMITTED" in place of the heading. */
+    .scene[data-omitted-overlay="true"] {
+        color: var(--secondary-text);
+    }
+    .scene-heading-omitted-text {
+        display: none;
+    }
+    [data-omitted-body="true"] {
+        display: none;
+    }
+    .scene-omitted-overlay {
+        user-select: none;
+        pointer-events: none;
+        font-style: normal;
+    }
+
     /* Normal weight scene headings (when bold disabled) */
     &.scene-heading-normal .scene {
         font-weight: normal;

From e57147de5940659e901cb4650cbda19e0898fcde Mon Sep 17 00:00:00 2001
From: Hugo <hugo@MacBook-Air-de-Hugo.local>
Date: Sat, 23 May 2026 13:47:21 +0200
Subject: [PATCH 53/76] optimized scene locking

---
 .../screenplay/extensions/scene-locking-extension.ts  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/lib/screenplay/extensions/scene-locking-extension.ts b/src/lib/screenplay/extensions/scene-locking-extension.ts
index 9de747ef..ea7fd1ec 100644
--- a/src/lib/screenplay/extensions/scene-locking-extension.ts
+++ b/src/lib/screenplay/extensions/scene-locking-extension.ts
@@ -78,12 +78,23 @@ const buildOmittedWidget = (): HTMLElement => {
     return span;
 };
 
+const hasAnyOmitted = (scenes: Record<string, PersistentScene>): boolean => {
+    for (const key in scenes) {
+        if (scenes[key]?.omitted) return true;
+    }
+    return false;
+};
+
 const computeDecorations = (
     doc: Node,
     locking: boolean,
     scenes: Record<string, PersistentScene>,
     style: SceneNumberingStyle,
 ): DecorationSet => {
+    // Nothing to render: no production lock and no omitted scenes. Skip the
+    // doc traversal entirely — this is the common case for most users.
+    if (!locking && !hasAnyOmitted(scenes)) return DecorationSet.empty;
+
     const entries = collectSceneEntries(doc);
     if (entries.length === 0) return DecorationSet.empty;
 

From 68576fec7571068279a4046e157edf326dda8381 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@MacBook-Air-de-Hugo.local>
Date: Sat, 23 May 2026 15:23:52 +0200
Subject: [PATCH 54/76] moved production settings in its own yjs entry, added
 letter skipping to scene numbering, tweaked styling of production settings

---
 .../project/ProductionSettings.module.css     |  66 +++++-------
 .../dashboard/project/ProductionSettings.tsx  | 101 +++++++++++++++---
 .../sidebar/EditorSidebarNavigation.tsx       |  19 +++-
 components/navbar/ProductionPanel.tsx         |  28 ++++-
 messages/de.json                              |   8 +-
 messages/en.json                              |   8 +-
 messages/es.json                              |   8 +-
 messages/fr.json                              |   8 +-
 messages/ja.json                              |   8 +-
 messages/ko.json                              |   8 +-
 messages/pl.json                              |   8 +-
 messages/zh.json                              |   8 +-
 src/context/ProjectContext.tsx                |  52 +++++++--
 src/lib/adapters/pdf/pdf-adapter.ts           |  66 ++++--------
 src/lib/adapters/scriptio/scriptio-adapter.ts |   5 +-
 src/lib/editor/use-document-editor.ts         |   6 +-
 src/lib/project/project-doc.ts                |  26 +++++
 src/lib/project/project-repository.ts         |  25 ++++-
 src/lib/project/project-state.ts              |   3 +
 .../extensions/scene-locking-extension.ts     |   8 +-
 src/lib/screenplay/scene-locking.ts           |  60 ++++++++---
 21 files changed, 359 insertions(+), 170 deletions(-)

diff --git a/components/dashboard/project/ProductionSettings.module.css b/components/dashboard/project/ProductionSettings.module.css
index 6ee695e7..f0669ec1 100644
--- a/components/dashboard/project/ProductionSettings.module.css
+++ b/components/dashboard/project/ProductionSettings.module.css
@@ -5,52 +5,44 @@
     margin-top: 10px;
 }
 
-.styleOption {
-    display: flex;
-    flex-direction: row;
-    align-items: baseline;
-    justify-content: center;
-    gap: 8px;
-    padding: 8px 12px;
-    border: 1px solid var(--separator);
-    border-radius: 6px;
-    background: var(--main-bg);
-    color: var(--primary-text);
-    cursor: pointer;
-    transition: border-color 0.15s ease, background 0.15s ease;
+.styleName {
+    font-size: 0.7rem;
+    color: var(--secondary-text);
+    text-transform: uppercase;
+    letter-spacing: 0.06em;
+    font-weight: 600;
 }
 
-.styleOption:hover:not(:disabled) {
-    border-color: var(--primary-text);
+.styleExample {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    margin-left: auto;
+    font-family: var(--font-screenplay);
+    font-size: 0.9rem;
+    font-weight: 600;
+    color: var(--primary-text);
 }
 
-.styleOption:disabled {
+.arrowIcon {
     opacity: 0.5;
-    cursor: not-allowed;
 }
 
-.styleOptionActive {
-    border-color: var(--primary-text);
-    background: color-mix(in srgb, var(--primary-text) 8%, transparent);
-}
-
-.styleExample {
-    font-family: var(--font-screenplay);
-    font-size: 0.85rem;
-    font-weight: 600;
+.letterToggles {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 8px;
+    margin-top: 10px;
 }
 
-.styleName {
-    font-size: 0.7rem;
-    color: var(--secondary-text);
-    text-transform: uppercase;
-    letter-spacing: 0.04em;
+.letterCard {
+    justify-content: center;
+    padding: 12px;
 }
 
-.note {
-    margin-top: 16px;
-    font-size: 0.78rem;
-    color: var(--secondary-text);
-    font-style: italic;
-    line-height: 1.4;
+.letter {
+    font-family: var(--font-screenplay);
+    font-size: 1rem;
+    font-weight: 600;
+    color: var(--primary-text);
 }
diff --git a/components/dashboard/project/ProductionSettings.tsx b/components/dashboard/project/ProductionSettings.tsx
index 4620bbce..e585576f 100644
--- a/components/dashboard/project/ProductionSettings.tsx
+++ b/components/dashboard/project/ProductionSettings.tsx
@@ -2,16 +2,39 @@
 
 import { useContext } from "react";
 import { useTranslations } from "next-intl";
+import { ArrowRight } from "lucide-react";
 import { ProjectContext } from "@src/context/ProjectContext";
+import { TOGGLEABLE_SCENE_LETTERS } from "@src/lib/project/project-state";
 
 import form from "./../../utils/Form.module.css";
 import sharedStyles from "./ProjectSettings.module.css";
+import optionCard from "./OptionCard.module.css";
 import styles from "./ProductionSettings.module.css";
 
+const Arrow = () => <ArrowRight size={14} className={styles.arrowIcon} aria-hidden />;
+
 const ProductionSettings = () => {
     const t = useTranslations("production");
-    const { sceneNumberingStyle, setSceneNumberingStyle, isReadOnly } =
-        useContext(ProjectContext);
+    const {
+        sceneNumberingStyle,
+        setSceneNumberingStyle,
+        skippedSceneLetters,
+        setSkippedSceneLetters,
+        isReadOnly,
+    } = useContext(ProjectContext);
+
+    const isLetterSkipped = (letter: string) =>
+        skippedSceneLetters.includes(letter.toUpperCase());
+
+    const toggleLetter = (letter: string) => {
+        if (isReadOnly) return;
+        const upper = letter.toUpperCase();
+        const next = isLetterSkipped(upper)
+            ? skippedSceneLetters.filter((l) => l.toUpperCase() !== upper)
+            : [...skippedSceneLetters, upper];
+        next.sort();
+        setSkippedSceneLetters(next);
+    };
 
     return (
         <div className={sharedStyles.settingsForm}>
@@ -20,27 +43,71 @@ const ProductionSettings = () => {
                 <p className={sharedStyles.helpText}>{t("numberingStyleHelp")}</p>
 
                 <div className={styles.styleOptions}>
-                    <button
-                        type="button"
-                        className={`${styles.styleOption} ${sceneNumberingStyle === "suffix" ? styles.styleOptionActive : ""}`}
-                        onClick={() => setSceneNumberingStyle("suffix")}
-                        disabled={isReadOnly}
+                    <div
+                        className={`${optionCard.optionCard} ${sceneNumberingStyle === "suffix" ? optionCard.active : ""}`}
+                        onClick={() => !isReadOnly && setSceneNumberingStyle("suffix")}
+                        role="radio"
+                        aria-checked={sceneNumberingStyle === "suffix"}
+                        aria-label={t("suffixName")}
                     >
-                        <span className={styles.styleExample}>{t("suffixExample")}</span>
+                        <div className={optionCard.checkbox}>
+                            {sceneNumberingStyle === "suffix" && <div className={optionCard.checkInner} />}
+                        </div>
                         <span className={styles.styleName}>{t("suffixName")}</span>
-                    </button>
-                    <button
-                        type="button"
-                        className={`${styles.styleOption} ${sceneNumberingStyle === "prefix" ? styles.styleOptionActive : ""}`}
-                        onClick={() => setSceneNumberingStyle("prefix")}
-                        disabled={isReadOnly}
+                        <span className={styles.styleExample}>
+                            <span>1</span>
+                            <Arrow />
+                            <span>1A</span>
+                            <Arrow />
+                            <span>2</span>
+                        </span>
+                    </div>
+                    <div
+                        className={`${optionCard.optionCard} ${sceneNumberingStyle === "prefix" ? optionCard.active : ""}`}
+                        onClick={() => !isReadOnly && setSceneNumberingStyle("prefix")}
+                        role="radio"
+                        aria-checked={sceneNumberingStyle === "prefix"}
+                        aria-label={t("prefixName")}
                     >
-                        <span className={styles.styleExample}>{t("prefixExample")}</span>
+                        <div className={optionCard.checkbox}>
+                            {sceneNumberingStyle === "prefix" && <div className={optionCard.checkInner} />}
+                        </div>
                         <span className={styles.styleName}>{t("prefixName")}</span>
-                    </button>
+                        <span className={styles.styleExample}>
+                            <span>1</span>
+                            <Arrow />
+                            <span>A2</span>
+                            <Arrow />
+                            <span>2</span>
+                        </span>
+                    </div>
                 </div>
+            </div>
 
-                <p className={styles.note}>{t("appliesToNewOnly")}</p>
+            <div className={sharedStyles.formGroup}>
+                <label className={form.label}>{t("skippedLettersTitle")}</label>
+                <p className={sharedStyles.helpText}>{t("skippedLettersHelp")}</p>
+
+                <div className={styles.letterToggles}>
+                    {TOGGLEABLE_SCENE_LETTERS.map((letter) => {
+                        const active = isLetterSkipped(letter);
+                        return (
+                            <div
+                                key={letter}
+                                className={`${optionCard.optionCard} ${styles.letterCard} ${active ? optionCard.active : ""}`}
+                                onClick={() => toggleLetter(letter)}
+                                role="button"
+                                aria-pressed={active}
+                                aria-label={t("skipLetterAriaLabel", { letter })}
+                            >
+                                <div className={optionCard.checkbox}>
+                                    {active && <div className={optionCard.checkInner} />}
+                                </div>
+                                <span className={styles.letter}>{letter}</span>
+                            </div>
+                        );
+                    })}
+                </div>
             </div>
         </div>
     );
diff --git a/components/editor/sidebar/EditorSidebarNavigation.tsx b/components/editor/sidebar/EditorSidebarNavigation.tsx
index 4461fb37..dae8d2db 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.tsx
+++ b/components/editor/sidebar/EditorSidebarNavigation.tsx
@@ -18,7 +18,15 @@ import sidebar_nav from "./EditorSidebarNavigation.module.css";
 
 const EditorSidebarNavigation = () => {
     const t = useTranslations("editorSidebar");
-    const { scenes, updateScenes, editor, sceneLocking, sceneNumberingStyle, persistentScenes } = useContext(ProjectContext);
+    const {
+        scenes,
+        updateScenes,
+        editor,
+        sceneLocking,
+        sceneNumberingStyle,
+        skippedSceneLetters,
+        persistentScenes,
+    } = useContext(ProjectContext);
     const { leftSidebarOpen } = useViewContext();
 
     const [activeTab, setActiveTab] = useState<"scenes" | "shelf" | "comments">("scenes");
@@ -38,14 +46,19 @@ const EditorSidebarNavigation = () => {
     const sceneDisplays = useMemo(() => {
         if (sceneLocking) {
             const uuids = scenes.map((s) => s.id ?? "");
-            const labels = computeSceneLabels(uuids, persistentScenes, sceneNumberingStyle);
+            const labels = computeSceneLabels(
+                uuids,
+                persistentScenes,
+                sceneNumberingStyle,
+                skippedSceneLetters,
+            );
             return scenes.map((_, i) => ({
                 label: labels[i]?.label ?? `${i + 1}`,
                 isOmitted: labels[i]?.status === "omitted",
             }));
         }
         return scenes.map((_, i) => ({ label: `${i + 1}`, isOmitted: false }));
-    }, [scenes, sceneLocking, sceneNumberingStyle, persistentScenes]);
+    }, [scenes, sceneLocking, sceneNumberingStyle, skippedSceneLetters, persistentScenes]);
 
     const listRef = useRef<HTMLDivElement>(null);
     const currentSceneRef = useRef<HTMLDivElement>(null);
diff --git a/components/navbar/ProductionPanel.tsx b/components/navbar/ProductionPanel.tsx
index 580487b0..a334f3b8 100644
--- a/components/navbar/ProductionPanel.tsx
+++ b/components/navbar/ProductionPanel.tsx
@@ -32,8 +32,15 @@ const REVISION_COLORS = [
 
 const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
     const t = useTranslations("production");
-    const { sceneLocking, sceneNumberingStyle, persistentScenes, scenes, repository, isReadOnly } =
-        useContext(ProjectContext);
+    const {
+        sceneLocking,
+        sceneNumberingStyle,
+        skippedSceneLetters,
+        persistentScenes,
+        scenes,
+        repository,
+        isReadOnly,
+    } = useContext(ProjectContext);
     const userCtx = useContext(UserContext);
 
     const panelRef = useRef<HTMLDivElement>(null);
@@ -58,9 +65,14 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
     const labels = useMemo(
         () =>
             sceneLocking
-                ? computeSceneLabels(sceneUuids, persistentScenes, sceneNumberingStyle)
+                ? computeSceneLabels(
+                      sceneUuids,
+                      persistentScenes,
+                      sceneNumberingStyle,
+                      skippedSceneLetters,
+                  )
                 : [],
-        [sceneLocking, sceneUuids, persistentScenes, sceneNumberingStyle],
+        [sceneLocking, sceneUuids, persistentScenes, sceneNumberingStyle, skippedSceneLetters],
     );
 
     const provisionalLabels = useMemo(
@@ -93,7 +105,12 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                 // tokens, this falls through to baseToken(idx+1) for every
                 // scene, matching the previous behaviour.
                 const persistentSnapshot = repository.scenes;
-                const labels = computeSceneLabels(uuids, persistentSnapshot, sceneNumberingStyle);
+                const labels = computeSceneLabels(
+                    uuids,
+                    persistentSnapshot,
+                    sceneNumberingStyle,
+                    skippedSceneLetters,
+                );
 
                 labels.forEach((label) => {
                     if (label.status === "provisional") {
@@ -122,6 +139,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                 uuids,
                 persistentSnapshot,
                 sceneNumberingStyle,
+                skippedSceneLetters,
             );
 
             console.log("[ProductionPanel] RELOCKING PROVISIONAL. Full snapshot:", currentLabels.map(l => ({
diff --git a/messages/de.json b/messages/de.json
index cc8993df..0302bcda 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -462,12 +462,12 @@
     "unlock": "Entsperren",
     "cancel": "Abbrechen",
     "numberingStyleTitle": "Szenennummerierung",
-    "numberingStyleHelp": "Wie neu eingefügte Szenen zwischen zwei gesperrten Szenen nummeriert werden. Suffix verweist auf die vorherige Szene, Präfix auf die nächste.",
+    "numberingStyleHelp": "Bestimmt, wie neu eingefügte Szenen zwischen zwei gesperrten Szenen nummeriert werden.",
     "suffixName": "Suffix",
     "prefixName": "Präfix",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "Bereits gesperrte Szenen behalten ihre Nummer — nur vorläufige Szenen und zukünftige Sperrungen sind betroffen."
+    "skippedLettersTitle": "Übersprungene Buchstaben",
+    "skippedLettersHelp": "Buchstaben, die bei der Szenennummerierung weggelassen werden, meist um Verwechslungen zu vermeiden.",
+    "skipLetterAriaLabel": "Buchstabe {letter} überspringen"
   },
   "saves": {
     "title": "Versionsverlauf",
diff --git a/messages/en.json b/messages/en.json
index 3c775230..81b9fb7e 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -461,12 +461,12 @@
     "unlock": "Unlock",
     "cancel": "Cancel",
     "numberingStyleTitle": "Scene numbering",
-    "numberingStyleHelp": "How newly inserted scenes are numbered between two locked scenes. Suffix references the previous scene, prefix references the next.",
+    "numberingStyleHelp": "Dictates how newly inserted scenes should be numbered between two locked scenes.",
     "suffixName": "Suffix",
     "prefixName": "Prefix",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "Already-locked scenes keep their stored number — only provisional scenes and future locks are affected."
+    "skippedLettersTitle": "Skipped letters",
+    "skippedLettersHelp": "Letters to omit when generating scene numbers usually to avoid confusion.",
+    "skipLetterAriaLabel": "Skip letter {letter}"
   },
   "saves": {
     "title": "Version History",
diff --git a/messages/es.json b/messages/es.json
index d809cea1..365185cb 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -461,12 +461,12 @@
     "unlock": "Desbloquear",
     "cancel": "Cancelar",
     "numberingStyleTitle": "Numeración de escenas",
-    "numberingStyleHelp": "Cómo se numeran las escenas recién insertadas entre dos escenas bloqueadas. El sufijo se refiere a la escena anterior, el prefijo a la siguiente.",
+    "numberingStyleHelp": "Determina cómo se numeran las escenas recién insertadas entre dos escenas bloqueadas.",
     "suffixName": "Sufijo",
     "prefixName": "Prefijo",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "Las escenas ya bloqueadas conservan su número — solo se ven afectadas las escenas provisionales y los futuros bloqueos."
+    "skippedLettersTitle": "Letras omitidas",
+    "skippedLettersHelp": "Letras que se omiten al generar los números de escena, generalmente para evitar confusiones.",
+    "skipLetterAriaLabel": "Omitir la letra {letter}"
   },
   "saves": {
     "title": "Historial de versiones",
diff --git a/messages/fr.json b/messages/fr.json
index 88569350..0e2b96b5 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -462,12 +462,12 @@
     "unlock": "Déverrouiller",
     "cancel": "Annuler",
     "numberingStyleTitle": "Numérotation des scènes",
-    "numberingStyleHelp": "Comment les scènes nouvellement insérées sont numérotées entre deux scènes verrouillées. Le suffixe se réfère à la scène précédente, le préfixe à la suivante.",
+    "numberingStyleHelp": "Détermine comment les scènes nouvellement insérées sont numérotées entre deux scènes verrouillées.",
     "suffixName": "Suffixe",
     "prefixName": "Préfixe",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "Les scènes déjà verrouillées conservent leur numéro — seules les scènes provisoires et les futurs verrouillages sont concernés."
+    "skippedLettersTitle": "Lettres ignorées",
+    "skippedLettersHelp": "Lettres à omettre lors de la génération des numéros de scène, généralement pour éviter toute confusion.",
+    "skipLetterAriaLabel": "Ignorer la lettre {letter}"
   },
   "saves": {
     "title": "Historique des versions",
diff --git a/messages/ja.json b/messages/ja.json
index 2a981d11..5c473138 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -461,12 +461,12 @@
     "unlock": "ロック解除",
     "cancel": "キャンセル",
     "numberingStyleTitle": "シーン番号",
-    "numberingStyleHelp": "ロック済みの2つのシーンの間に挿入された新しいシーンの番号付け方法。サフィックスは前のシーン、プレフィックスは次のシーンを参照します。",
+    "numberingStyleHelp": "ロック済みの2つのシーンの間に挿入された新しいシーンの番号付け方法を決定します。",
     "suffixName": "サフィックス",
     "prefixName": "プレフィックス",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "すでにロックされているシーンは番号を保持します — 仮シーンと今後のロックのみが影響を受けます。"
+    "skippedLettersTitle": "スキップする文字",
+    "skippedLettersHelp": "シーン番号生成時に省略する文字。通常は混同を避けるために使用します。",
+    "skipLetterAriaLabel": "{letter} をスキップ"
   },
   "saves": {
     "title": "バージョン履歴",
diff --git a/messages/ko.json b/messages/ko.json
index 93fbb859..17d8160e 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -461,12 +461,12 @@
     "unlock": "잠금 해제",
     "cancel": "취소",
     "numberingStyleTitle": "씬 번호",
-    "numberingStyleHelp": "잠긴 두 씬 사이에 새로 삽입된 씬의 번호 매김 방식. 접미사는 이전 씬을, 접두사는 다음 씬을 참조합니다.",
+    "numberingStyleHelp": "잠긴 두 씬 사이에 새로 삽입된 씬의 번호 매김 방식을 결정합니다.",
     "suffixName": "접미사",
     "prefixName": "접두사",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "이미 잠긴 씬은 번호를 유지합니다 — 임시 씬과 향후 잠금에만 영향을 미칩니다."
+    "skippedLettersTitle": "건너뛸 문자",
+    "skippedLettersHelp": "씬 번호를 생성할 때 제외할 문자입니다. 보통 혼동을 피하기 위해 사용합니다.",
+    "skipLetterAriaLabel": "{letter} 문자 건너뛰기"
   },
   "saves": {
     "title": "버전 히스토리",
diff --git a/messages/pl.json b/messages/pl.json
index e21382c1..bf9f2ea0 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -461,12 +461,12 @@
     "unlock": "Odblokuj",
     "cancel": "Anuluj",
     "numberingStyleTitle": "Numeracja scen",
-    "numberingStyleHelp": "Jak są numerowane nowo wstawione sceny między dwiema zablokowanymi. Sufiks odnosi się do poprzedniej sceny, prefiks do następnej.",
+    "numberingStyleHelp": "Określa, jak numerowane są nowo wstawione sceny między dwiema zablokowanymi scenami.",
     "suffixName": "Sufiks",
     "prefixName": "Prefiks",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "Już zablokowane sceny zachowują swój numer — wpływa tylko na sceny tymczasowe i przyszłe blokady."
+    "skippedLettersTitle": "Pomijane litery",
+    "skippedLettersHelp": "Litery pomijane podczas generowania numerów scen, zwykle aby uniknąć pomyłek.",
+    "skipLetterAriaLabel": "Pomiń literę {letter}"
   },
   "saves": {
     "title": "Historia wersji",
diff --git a/messages/zh.json b/messages/zh.json
index 09623192..fec25d70 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -461,12 +461,12 @@
     "unlock": "解锁",
     "cancel": "取消",
     "numberingStyleTitle": "场景编号",
-    "numberingStyleHelp": "两个锁定场景之间新插入场景的编号方式。后缀参考上一个场景，前缀参考下一个场景。",
+    "numberingStyleHelp": "决定两个锁定场景之间新插入场景的编号方式。",
     "suffixName": "后缀",
     "prefixName": "前缀",
-    "suffixExample": "2 → 2A",
-    "prefixExample": "2 → A3",
-    "appliesToNewOnly": "已锁定的场景保留其编号 — 仅影响临时场景和将来的锁定。"
+    "skippedLettersTitle": "跳过的字母",
+    "skippedLettersHelp": "生成场景编号时省略的字母，通常用于避免混淆。",
+    "skipLetterAriaLabel": "跳过字母 {letter}"
   },
   "saves": {
     "title": "版本历史",
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index e30c5a05..9fd6b465 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -20,10 +20,12 @@ import {
     CollaboratorInfo,
     ConnectionStatus,
     LayoutData,
+    ProductionData,
     useProjectYjs,
     ElementStyle,
     PageMargin,
     DEFAULT_PAGE_MARGINS,
+    DEFAULT_SKIPPED_SCENE_LETTERS,
     ShelfEntry,
     ProjectStatus,
 } from "@src/lib/project/project-state";
@@ -102,6 +104,8 @@ export interface ProjectContextType {
     setSceneLocking: (locked: boolean) => void;
     sceneNumberingStyle: "suffix" | "prefix";
     setSceneNumberingStyle: (style: "suffix" | "prefix") => void;
+    skippedSceneLetters: string[];
+    setSkippedSceneLetters: (letters: string[]) => void;
     /** Raw persistent scene map (UUID → PersistentScene). Includes synopsis,
      *  color, and production-lock fields (token, omitted) for every scene that
      *  has been persisted. */
@@ -187,6 +191,8 @@ const defaultContextValue: ProjectContextType = {
     setSceneLocking: () => {},
     sceneNumberingStyle: "suffix",
     setSceneNumberingStyle: () => {},
+    skippedSceneLetters: DEFAULT_SKIPPED_SCENE_LETTERS,
+    setSkippedSceneLetters: () => {},
     persistentScenes: {},
     characters: {},
     locations: {},
@@ -310,6 +316,8 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
     const [sceneLocking, setSceneLockingState] = useState<boolean>(false);
     const [sceneNumberingStyle, setSceneNumberingStyleState] =
         useState<"suffix" | "prefix">("suffix");
+    const [skippedSceneLetters, setSkippedSceneLettersState] =
+        useState<string[]>(DEFAULT_SKIPPED_SCENE_LETTERS);
     const [persistentScenes, setPersistentScenesState] = useState<PersistentSceneMap>({});
     const [connectionStatus, setConnectionStatus] = useState<ConnectionStatus>("disconnected");
     const [users, setUsers] = useState<CollaboratorInfo[]>([]);
@@ -488,11 +496,19 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             if (initialLayout.elementStyles !== undefined) {
                 setElementStylesState(initialLayout.elementStyles);
             }
-            if (initialLayout.sceneLocking !== undefined) {
-                setSceneLockingState(initialLayout.sceneLocking);
+        }
+
+        // Read initial production data (separate Y.Map from layout).
+        const initialProduction = repository.getProduction();
+        if (initialProduction) {
+            if (initialProduction.sceneLocking !== undefined) {
+                setSceneLockingState(initialProduction.sceneLocking);
+            }
+            if (initialProduction.sceneNumberingStyle !== undefined) {
+                setSceneNumberingStyleState(initialProduction.sceneNumberingStyle);
             }
-            if (initialLayout.sceneNumberingStyle !== undefined) {
-                setSceneNumberingStyleState(initialLayout.sceneNumberingStyle);
+            if (initialProduction.skippedSceneLetters !== undefined) {
+                setSkippedSceneLettersState(initialProduction.skippedSceneLetters);
             }
         }
 
@@ -537,11 +553,18 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             if (layout.elementStyles !== undefined) {
                 setElementStylesState(layout.elementStyles);
             }
-            if (layout.sceneLocking !== undefined) {
-                setSceneLockingState(layout.sceneLocking);
+        });
+
+        // Observe production changes
+        const unsubscribeProduction = repository.observeProduction((production: Partial<ProductionData>) => {
+            if (production.sceneLocking !== undefined) {
+                setSceneLockingState(production.sceneLocking);
+            }
+            if (production.sceneNumberingStyle !== undefined) {
+                setSceneNumberingStyleState(production.sceneNumberingStyle);
             }
-            if (layout.sceneNumberingStyle !== undefined) {
-                setSceneNumberingStyleState(layout.sceneNumberingStyle);
+            if (production.skippedSceneLetters !== undefined) {
+                setSkippedSceneLettersState(production.skippedSceneLetters);
             }
         });
 
@@ -586,6 +609,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         return () => {
             repository.unregisterScreenplayCallback(recomputeFromScreenplay);
             unsubscribeLayout();
+            unsubscribeProduction();
             unsubscribeCharacters();
             unsubscribeLocations();
             unsubscribeScenes();
@@ -758,6 +782,14 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         [repository],
     );
 
+    const setSkippedSceneLetters = useCallback(
+        (letters: string[]) => {
+            setSkippedSceneLettersState(letters);
+            repository?.setSkippedSceneLetters(letters);
+        },
+        [repository],
+    );
+
     const setSearchTerm = useCallback((term: string) => {
         setSearchTermState(term);
         // Reset to first match when search term changes
@@ -846,6 +878,8 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setSceneLocking,
             sceneNumberingStyle,
             setSceneNumberingStyle,
+            skippedSceneLetters,
+            setSkippedSceneLetters,
             persistentScenes,
             screenplay,
             scenes,
@@ -915,6 +949,8 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setSceneLocking,
             sceneNumberingStyle,
             setSceneNumberingStyle,
+            skippedSceneLetters,
+            setSkippedSceneLetters,
             persistentScenes,
             screenplay,
             scenes,
diff --git a/src/lib/adapters/pdf/pdf-adapter.ts b/src/lib/adapters/pdf/pdf-adapter.ts
index 9b23880c..245e84e5 100644
--- a/src/lib/adapters/pdf/pdf-adapter.ts
+++ b/src/lib/adapters/pdf/pdf-adapter.ts
@@ -1,13 +1,11 @@
 
 import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { ProjectData, ProjectState } from "@src/lib/project/project-state";
-import type { PersistentSceneMap } from "@src/lib/screenplay/scenes";
 import { PageFormat } from "@src/lib/utils/enums";
 import { getFontForCodePoint, ScriptFont } from "./pdf-utils";
 import type { TextRun } from "./pdf.worker";
 import { BASE_URL } from "@src/lib/utils/constants";
 import { PAGE_SIZES } from "@src/lib/screenplay/extensions/pagination-extension";
-import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
 
 // ─── Types ───────────────────────────────────────────────────────────────────
 
@@ -23,10 +21,6 @@ export type PDFExportOptions = BaseExportOptions & {
     moreLabel?: string;
     editorElement?: HTMLElement;
     titlePageElement?: HTMLElement;
-    /** Production-mode flag + persistent scene entries, set internally from the ProjectState. */
-    sceneLocking?: boolean;
-    sceneNumberingStyle?: "suffix" | "prefix";
-    persistentScenes?: PersistentSceneMap;
 };
 
 import type { WorkerMessage, WorkerPayload, VisualLine } from "./pdf.worker";
@@ -71,34 +65,25 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
     label = "PDF";
     extension = "pdf";
 
-    async convertTo(project: ProjectState, options: PDFExportOptions): Promise<Blob> {
+    async convertTo(_project: ProjectState, options: PDFExportOptions): Promise<Blob> {
         const editorEl = options.editorElement;
         if (!editorEl) throw new Error("Editor element is required for DOM-based PDF export");
 
         const format = options.format;
         const pdfPageSize = PDF_PAGE_SIZES[format];
 
-        // Resolve production state from the project. Persistent scenes carry
-        // synopsis/color (irrelevant here) and token/omitted (used for labels).
-        const layout = project.layout().toJSON() as {
-            sceneLocking?: boolean;
-            sceneNumberingStyle?: "suffix" | "prefix";
-        };
-        const persistentScenes = project.scenes().toJSON() as PersistentSceneMap;
-        const enrichedOptions: PDFExportOptions = {
-            ...options,
-            sceneLocking: !!layout.sceneLocking,
-            sceneNumberingStyle: layout.sceneNumberingStyle ?? "suffix",
-            persistentScenes,
-        };
+        // Scene labels (under production lock) and OMITTED state are already
+        // rendered as ProseMirror decoration widgets inside each scene <p>.
+        // `collectLines` reads them directly from the DOM, so we don't need to
+        // re-run the scene-labeling logic here.
 
         // ── Collect all visual lines from the browser DOM ───────────────────
         const titlePageEl = options.titlePageElement;
 
-        const titlePageLines = titlePageEl ? this.collectLines(titlePageEl, enrichedOptions) : [];
+        const titlePageLines = titlePageEl ? this.collectLines(titlePageEl, options) : [];
         const titlePageLeftPx = titlePageEl ? this.getPageLeftPx(titlePageEl) : 0;
 
-        const screenplayLines = this.collectLines(editorEl, enrichedOptions);
+        const screenplayLines = this.collectLines(editorEl, options);
         const screenplayLeftPx = this.getPageLeftPx(editorEl);
 
         return new Promise((resolve, reject) => {
@@ -162,28 +147,6 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
         let sceneCount = 0;
         let yOffset = 0;
 
-        // Pre-compute label per scene UUID when production lock is on.
-        const sceneLabels: { label: string; omitted: boolean }[] = [];
-        let sceneLabelIdx = 0;
-        if (options.sceneLocking) {
-            const uuids: string[] = [];
-            for (let i = 0; i < editorEl.children.length; i++) {
-                const child = editorEl.children[i] as HTMLElement;
-                if (child?.tagName === "P" && child.classList.contains("scene")) {
-                    const uuid = child.getAttribute("data-id");
-                    if (uuid) uuids.push(uuid);
-                }
-            }
-            const computed = computeSceneLabels(
-                uuids,
-                options.persistentScenes ?? {},
-                options.sceneNumberingStyle ?? "suffix",
-            );
-            for (const l of computed) {
-                sceneLabels.push({ label: l.label, omitted: l.status === "omitted" });
-            }
-        }
-
         for (let i = 0; i < editorEl.children.length; i++) {
             const el = editorEl.children[i] as HTMLElement;
             if (!el) continue;
@@ -206,10 +169,19 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
 
             const isScene = el.classList.contains("scene");
             if (isScene) sceneCount++;
+            // Label widgets are injected by `scene-locking-extension` when
+            // production lock is on. Read whichever side is present (left or
+            // right) and fall back to a positional number when neither is.
             const sceneInfo = isScene
-                ? options.sceneLocking
-                    ? sceneLabels[sceneLabelIdx++] ?? { label: String(sceneCount), omitted: false }
-                    : { label: String(sceneCount), omitted: false }
+                ? {
+                      label:
+                          (el.querySelector(".scene-label-left") as HTMLElement | null)?.textContent
+                              ?.trim() ||
+                          (el.querySelector(".scene-label-right") as HTMLElement | null)?.textContent
+                              ?.trim() ||
+                          String(sceneCount),
+                      omitted: el.getAttribute("data-omitted-overlay") === "true",
+                  }
                 : undefined;
 
             // Extract the paragraph type from classList
diff --git a/src/lib/adapters/scriptio/scriptio-adapter.ts b/src/lib/adapters/scriptio/scriptio-adapter.ts
index 21464087..cb1bdcb8 100644
--- a/src/lib/adapters/scriptio/scriptio-adapter.ts
+++ b/src/lib/adapters/scriptio/scriptio-adapter.ts
@@ -1,4 +1,4 @@
-import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState, screenplayOf, titlepageOf } from "@src/lib/project/project-state";
+import { BoardData, LayoutData, ProductionData, ProjectData, ProjectMetadata, ProjectState, screenplayOf, titlepageOf } from "@src/lib/project/project-state";
 import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { replaceScreenplay } from "../../screenplay/editor";
 import { Editor } from "@tiptap/react";
@@ -79,6 +79,7 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                 locations: project.locations().toJSON(),
                 board: project.board().toJSON() as BoardData,
                 layout: project.layout().toJSON() as LayoutData,
+                production: project.production().toJSON() as ProductionData,
                 comments: project.comments().toJSON(),
             };
             payload = new TextEncoder().encode(JSON.stringify(data, null, 2));
@@ -129,6 +130,7 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                 locations: tmpDoc.locations().toJSON(),
                 board: tmpDoc.board().toJSON() as BoardData,
                 layout: tmpDoc.layout().toJSON() as LayoutData,
+                production: tmpDoc.production().toJSON() as ProductionData,
                 comments: tmpDoc.comments().toJSON(),
             };
         } catch (error) {
@@ -171,6 +173,7 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                     ydoc.locations().clear();
                     ydoc.board().clear();
                     ydoc.layout().clear();
+                    ydoc.production().clear();
                     ydoc.comments().clear();
                 });
 
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index 7a6ac17f..4d19fa14 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -77,6 +77,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         moreLabel,
         sceneLocking,
         sceneNumberingStyle,
+        skippedSceneLetters,
         persistentScenes,
     } = projectCtx;
 
@@ -172,6 +173,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         setSearchMatches,
         sceneLocking,
         sceneNumberingStyle,
+        skippedSceneLetters,
         persistentScenes,
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }), []);
@@ -188,6 +190,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     ext.setSearchMatches = setSearchMatches;
     ext.sceneLocking = sceneLocking;
     ext.sceneNumberingStyle = sceneNumberingStyle;
+    ext.skippedSceneLetters = skippedSceneLetters;
     ext.persistentScenes = persistentScenes;
 
     const lastReportedElementRef = useRef<ScreenplayElement | null>(null);
@@ -269,6 +272,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
               getSceneLocking: () => !!ext.sceneLocking,
               getScenes: () => ext.repository?.scenes ?? {},
               getNumberingStyle: () => ext.sceneNumberingStyle ?? "suffix",
+              getSkippedLetters: () => ext.skippedSceneLetters ?? [],
           })
         : null;
 
@@ -596,7 +600,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         if (editor && features.sceneLocking) {
             refreshSceneLocking(editor);
         }
-    }, [editor, sceneLocking, sceneNumberingStyle, persistentScenes, features.sceneLocking]);
+    }, [editor, sceneLocking, sceneNumberingStyle, skippedSceneLetters, persistentScenes, features.sceneLocking]);
 
     // Refresh search highlights
     useEffect(() => {
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index f729c449..c8ecf342 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -101,6 +101,13 @@ export type LayoutData = {
     moreLabel: string;
     elementMargins: Record<string, ElementMargin>;
     elementStyles: Record<string, ElementStyle>;
+};
+
+// -------------------------------- //
+//          PRODUCTION              //
+// -------------------------------- //
+
+export type ProductionData = {
     sceneLocking?: boolean;
     /**
      * How provisional scenes inserted under production lock are labeled.
@@ -111,8 +118,21 @@ export type LayoutData = {
      * already-locked scenes keep their stored label.
      */
     sceneNumberingStyle?: "suffix" | "prefix";
+    /**
+     * Uppercase letters to omit from generated scene labels (e.g. "I" and "O"
+     * are visually confused with "1" and "0"). Stored explicitly so the user's
+     * choice survives — when `undefined`, callers fall back to
+     * `DEFAULT_SKIPPED_SCENE_LETTERS`.
+     */
+    skippedSceneLetters?: string[];
 };
 
+/** Letters skipped by default in newly-created projects. */
+export const DEFAULT_SKIPPED_SCENE_LETTERS: string[] = ["I", "O"];
+
+/** Letters the user can toggle via Production Settings. */
+export const TOGGLEABLE_SCENE_LETTERS: readonly string[] = ["I", "O", "Q", "Z"];
+
 // -------------------------------- //
 //          BOARD                   //
 // -------------------------------- //
@@ -152,6 +172,7 @@ export type ProjectData = {
     metadata: ProjectMetadata;
     board: BoardData;
     layout: LayoutData;
+    production: ProductionData;
     comments?: Record<string, Comment>;
     shelf?: Record<string, ShelfEntry>;
 };
@@ -186,6 +207,7 @@ export class ProjectState extends Y.Doc {
         METADATA: "metadata",
         BOARD: "board",
         LAYOUT: "layout",
+        PRODUCTION: "production",
         COMMENTS: "comments",
         DICTIONARY: "dictionary",
         SHELF: "shelf",
@@ -233,6 +255,10 @@ export class ProjectState extends Y.Doc {
         return this.getMap(this.KEYS.LAYOUT) as unknown as TypedMap<LayoutData>;
     }
 
+    production(): TypedMap<ProductionData> {
+        return this.getMap(this.KEYS.PRODUCTION) as unknown as TypedMap<ProductionData>;
+    }
+
     comments(): Y.Map<Comment> {
         return this.getMap(this.KEYS.COMMENTS);
     }
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index 23d6a96a..bc7f51de 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -5,6 +5,7 @@ import { ScreenplaySchema } from "../screenplay/editor";
 import { Comment, CommentReply, Screenplay } from "../utils/types";
 import {
     LayoutData,
+    ProductionData,
     ProjectMetadata,
     ProjectState,
     ElementStyle,
@@ -370,13 +371,33 @@ export class ProjectRepository {
         if (this.guardWrite("setElementStyles")) return;
         this.ydoc.layout().set("elementStyles", styles);
     }
+
+    // -------------------------------- //
+    //           PRODUCTION             //
+    // -------------------------------- //
+
+    getProduction(): Partial<ProductionData> {
+        return this.ydoc.production().toJSON() as Partial<ProductionData>;
+    }
+
+    observeProduction(callback: (production: Partial<ProductionData>) => void): () => void {
+        const map = this.ydoc.production();
+        const observer = () => callback(map.toJSON() as Partial<ProductionData>);
+        map.observe(observer);
+        return () => map.unobserve(observer);
+    }
+
     setSceneLocking(locked: boolean) {
         if (this.guardWrite("setSceneLocking")) return;
-        this.ydoc.layout().set("sceneLocking", locked);
+        this.ydoc.production().set("sceneLocking", locked);
     }
     setSceneNumberingStyle(style: "suffix" | "prefix") {
         if (this.guardWrite("setSceneNumberingStyle")) return;
-        this.ydoc.layout().set("sceneNumberingStyle", style);
+        this.ydoc.production().set("sceneNumberingStyle", style);
+    }
+    setSkippedSceneLetters(letters: string[]) {
+        if (this.guardWrite("setSkippedSceneLetters")) return;
+        this.ydoc.production().set("skippedSceneLetters", letters);
     }
 
     /**
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 9196005a..aadb2a33 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -22,6 +22,8 @@ export {
     DEFAULT_PAGE_MARGINS,
     DEFAULT_ELEMENT_MARGINS,
     DEFAULT_ELEMENT_STYLES,
+    DEFAULT_SKIPPED_SCENE_LETTERS,
+    TOGGLEABLE_SCENE_LETTERS,
 } from "./project-doc";
 export type {
     ShelfEntryType,
@@ -32,6 +34,7 @@ export type {
     PageMargin,
     ElementStyle,
     LayoutData,
+    ProductionData,
     BoardCardData,
     BoardArrowData,
     BoardData,
diff --git a/src/lib/screenplay/extensions/scene-locking-extension.ts b/src/lib/screenplay/extensions/scene-locking-extension.ts
index ea7fd1ec..fec51525 100644
--- a/src/lib/screenplay/extensions/scene-locking-extension.ts
+++ b/src/lib/screenplay/extensions/scene-locking-extension.ts
@@ -14,6 +14,7 @@ type SceneLockingConfig = {
     getSceneLocking: () => boolean;
     getScenes: () => Record<string, PersistentScene>;
     getNumberingStyle: () => SceneNumberingStyle;
+    getSkippedLetters: () => readonly string[];
 };
 
 type SceneEntry = { uuid: string; pos: number; nodeSize: number };
@@ -90,6 +91,7 @@ const computeDecorations = (
     locking: boolean,
     scenes: Record<string, PersistentScene>,
     style: SceneNumberingStyle,
+    skippedLetters: readonly string[],
 ): DecorationSet => {
     // Nothing to render: no production lock and no omitted scenes. Skip the
     // doc traversal entirely — this is the common case for most users.
@@ -106,6 +108,7 @@ const computeDecorations = (
             entries.map((e) => e.uuid),
             scenes,
             style,
+            skippedLetters,
         );
 
         for (let i = 0; i < entries.length; i++) {
@@ -193,7 +196,7 @@ export const createSceneLockingExtension = (config: SceneLockingConfig) => {
         name: "sceneLocking",
 
         addProseMirrorPlugins() {
-            const { getSceneLocking, getScenes, getNumberingStyle } = config;
+            const { getSceneLocking, getScenes, getNumberingStyle, getSkippedLetters } = config;
 
             return [
                 new Plugin({
@@ -205,6 +208,7 @@ export const createSceneLockingExtension = (config: SceneLockingConfig) => {
                                 getSceneLocking(),
                                 getScenes(),
                                 getNumberingStyle(),
+                                getSkippedLetters(),
                             );
                         },
                         apply(tr, oldDecorations, _oldState, newState) {
@@ -215,6 +219,7 @@ export const createSceneLockingExtension = (config: SceneLockingConfig) => {
                                     getSceneLocking(),
                                     getScenes(),
                                     getNumberingStyle(),
+                                    getSkippedLetters(),
                                 );
                             }
 
@@ -231,6 +236,7 @@ export const createSceneLockingExtension = (config: SceneLockingConfig) => {
                                 getSceneLocking(),
                                 getScenes(),
                                 getNumberingStyle(),
+                                getSkippedLetters(),
                             );
                         },
                     },
diff --git a/src/lib/screenplay/scene-locking.ts b/src/lib/screenplay/scene-locking.ts
index 6e6a33ab..cc14d023 100644
--- a/src/lib/screenplay/scene-locking.ts
+++ b/src/lib/screenplay/scene-locking.ts
@@ -78,18 +78,38 @@ export type SceneLabel = {
 
 export type SceneNumberingStyle = "suffix" | "prefix";
 
+const FULL_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+/**
+ * Build the effective alphabet by removing any letters the user wants to
+ * skip (e.g. "I" and "O" are commonly skipped because they're confused with
+ * digits). Always returns at least 2 letters so the labeling math doesn't
+ * degenerate — pathological skip lists fall back to the full alphabet.
+ */
+export const buildSceneAlphabet = (skipped: readonly string[] = []): string => {
+    const skipSet = new Set(skipped.map((s) => s.toUpperCase()));
+    const filtered = FULL_ALPHABET.split("").filter((c) => !skipSet.has(c)).join("");
+    return filtered.length >= 2 ? filtered : FULL_ALPHABET;
+};
+
 // --------------------------------------------------------------------------
 //                          ENCODING & DISPLAY
 // --------------------------------------------------------------------------
 
-/** Excel-style alphabetic letter: 1 → A, 26 → Z, 27 → AA, … */
-const letterFromValue = (n: number, lower: boolean): string => {
+/**
+ * Excel-style alphabetic letter over a configurable alphabet:
+ *   1 → alphabet[0], alphabet.length → last letter, alphabet.length+1 → "AA", …
+ * The alphabet defaults to A–Z but callers can pass a filtered one (e.g.
+ * with "I" and "O" removed).
+ */
+const letterFromValue = (n: number, lower: boolean, alphabet: string = FULL_ALPHABET): string => {
+    const base = alphabet.length;
     let out = "";
-    const charBase = lower ? 97 : 65;
     while (n > 0) {
-        const m = (n - 1) % 26;
-        out = String.fromCharCode(charBase + m) + out;
-        n = Math.floor((n - 1) / 26);
+        const m = (n - 1) % base;
+        const ch = alphabet[m];
+        out = (lower ? ch.toLowerCase() : ch) + out;
+        n = Math.floor((n - 1) / base);
     }
     return out;
 };
@@ -99,18 +119,18 @@ const letterFromValue = (n: number, lower: boolean): string => {
  * each level is taken directly from `level.lower`, so the result is the
  * same regardless of the project's `SceneNumberingStyle` setting.
  */
-export const compileSceneLabel = (token: SceneToken): string => {
+export const compileSceneLabel = (token: SceneToken, alphabet: string = FULL_ALPHABET): string => {
     // Prefixes are stored inner-first (closest to base at index 0). Render
     // outer-to-inner, i.e. reverse before joining.
     let out = "";
     for (let i = token.prefixes.length - 1; i >= 0; i--) {
         const lvl = token.prefixes[i];
-        out += letterFromValue(lvl.value, lvl.lower);
+        out += letterFromValue(lvl.value, lvl.lower, alphabet);
     }
     out += String(token.baseNumber);
     for (let i = 0; i < token.suffixes.length; i++) {
         const lvl = token.suffixes[i];
-        out += letterFromValue(lvl.value, lvl.lower);
+        out += letterFromValue(lvl.value, lvl.lower, alphabet);
     }
     return out;
 };
@@ -201,8 +221,10 @@ const withLevels = (t: SceneToken, axis: Axis, levels: SceneLevel[]): SceneToken
 // Wedge convention per axis. lowercase < uppercase at the same value (see
 // `compareTokens`). Suffix levels count UP, so 'a' (value 1) is the deepest
 // wedge — decrementing past it means descending a level. Prefix levels are
-// mirrored: 'z' (value 26) is the bound; incrementing past it descends.
-const wedgeBound = (axis: Axis): number => (axis === "suffix" ? 1 : 26);
+// mirrored: the alphabet's last letter (value = alphabet.length) is the
+// bound; incrementing past it descends.
+const wedgeBound = (axis: Axis, alphabetSize: number): number =>
+    axis === "suffix" ? 1 : alphabetSize;
 const wedgeStep = (axis: Axis): number => (axis === "suffix" ? -1 : 1);
 
 /** Bump the deepest level of `anchor` along `axis` by k. */
@@ -240,10 +262,11 @@ const wedgeAlong = (
     target: SceneToken,
     k: number,
     axis: Axis,
+    alphabetSize: number,
 ): SceneToken | null => {
     const fromLevels = levelsOf(from, axis);
     const targetLevels = levelsOf(target, axis);
-    const bound = wedgeBound(axis);
+    const bound = wedgeBound(axis, alphabetSize);
     const step = wedgeStep(axis);
 
     let i = 0;
@@ -295,6 +318,7 @@ const computeProvisionalToken = (
     next: SceneToken | null,
     k: number,
     style: SceneNumberingStyle,
+    alphabetSize: number,
 ): SceneToken => {
     if (!prev && !next) return baseToken(k);
 
@@ -309,7 +333,7 @@ const computeProvisionalToken = (
             return [
                 continueAlong(prev, k, "suffix"),
                 nestAlong(prev, k, "suffix"),
-                next ? wedgeAlong(prev, next, k, "suffix") : null,
+                next ? wedgeAlong(prev, next, k, "suffix", alphabetSize) : null,
             ];
         }
         // No prev — nothing to grow from on the suffix axis. The natural
@@ -323,7 +347,7 @@ const computeProvisionalToken = (
             return [
                 prev ? continueAlong(prev, k, "prefix") : null,
                 nestAlong(next, k, "prefix"),
-                prev ? wedgeAlong(next, prev, k, "prefix") : null,
+                prev ? wedgeAlong(next, prev, k, "prefix", alphabetSize) : null,
             ];
         }
         return prev ? [continueAlong(prev, k, "suffix")] : [];
@@ -361,7 +385,10 @@ export const computeSceneLabels = (
     sceneUuids: string[],
     persistent: Record<string, LockReadable | undefined>,
     style: SceneNumberingStyle = "suffix",
+    skippedLetters: readonly string[] = [],
 ): SceneLabel[] => {
+    const alphabet = buildSceneAlphabet(skippedLetters);
+    const alphabetSize = alphabet.length;
     const n = sceneUuids.length;
     const result: SceneLabel[] = new Array(n);
 
@@ -404,7 +431,7 @@ export const computeSceneLabels = (
             result[i] = {
                 uuid,
                 token: entry.token,
-                label: compileSceneLabel(entry.token),
+                label: compileSceneLabel(entry.token, alphabet),
                 status: entry.omitted ? "omitted" : "locked",
             };
             continue;
@@ -415,11 +442,12 @@ export const computeSceneLabels = (
             nextLocked[i],
             segmentIdx[i],
             style,
+            alphabetSize,
         );
         result[i] = {
             uuid,
             token,
-            label: compileSceneLabel(token),
+            label: compileSceneLabel(token, alphabet),
             status: "provisional",
         };
     }

From 8b0853bd53587cba19db49463318ed74d1b7977d Mon Sep 17 00:00:00 2001
From: Hugo <hugo@device-35.home>
Date: Mon, 25 May 2026 11:32:08 +0200
Subject: [PATCH 55/76] started page locking feature

---
 components/editor/CommentCards.tsx            |  40 +-
 components/navbar/ProductionPanel.tsx         | 139 +++++-
 components/navbar/SavesPanel.tsx              |  24 +-
 components/popup/Popup.tsx                    |   4 +
 components/popup/PopupUnlockPages.tsx         |  52 ++
 messages/de.json                              |   5 +
 messages/en.json                              |   5 +
 messages/es.json                              |   5 +
 messages/fr.json                              |   5 +
 messages/ja.json                              |   5 +
 messages/ko.json                              |   5 +
 messages/pl.json                              |   5 +
 messages/zh.json                              |   5 +
 src/context/ProjectContext.tsx                |  43 +-
 src/lib/adapters/scriptio/scriptio-adapter.ts |   2 +
 src/lib/editor/use-document-editor.ts         |  21 +-
 src/lib/project/project-doc.ts                |  15 +
 src/lib/project/project-repository.ts         |  72 +++
 .../extensions/pagination-extension.ts        | 469 ++++++++++++++++--
 src/lib/screenplay/page-locking.ts            |  28 ++
 src/lib/screenplay/popup.ts                   |  15 +-
 src/lib/utils/hooks.ts                        |  30 ++
 22 files changed, 897 insertions(+), 97 deletions(-)
 create mode 100644 components/popup/PopupUnlockPages.tsx
 create mode 100644 src/lib/screenplay/page-locking.ts

diff --git a/components/editor/CommentCards.tsx b/components/editor/CommentCards.tsx
index 29571f3e..6071f4ab 100644
--- a/components/editor/CommentCards.tsx
+++ b/components/editor/CommentCards.tsx
@@ -3,44 +3,29 @@
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
 import { Comment, CommentReply } from "@src/lib/utils/types";
 import { Send, Trash2, X } from "lucide-react";
-import { useUser } from "@src/lib/utils/hooks";
+import { useFormatTimestamp, useUser } from "@src/lib/utils/hooks";
 import { getCommentPositions } from "@src/lib/screenplay/extensions/comment-highlight-extension";
 import { useViewContext } from "@src/context/ViewContext";
 import { Editor } from "@tiptap/react";
 import { Transaction } from "@tiptap/pm/state";
 import styles from "./CommentCard.module.css";
 
-function formatTimestamp(ts: number): string {
-    const date = new Date(ts);
-    const now = new Date();
-    const diffMs = now.getTime() - date.getTime();
-    const diffMins = Math.floor(diffMs / 60000);
-
-    if (diffMins < 1) return "just now";
-    if (diffMins < 60) return `${diffMins}m ago`;
-
-    const diffHours = Math.floor(diffMins / 60);
-    if (diffHours < 24) return `${diffHours}h ago`;
-
-    const diffDays = Math.floor(diffHours / 24);
-    if (diffDays < 7) return `${diffDays}d ago`;
-
-    return date.toLocaleDateString();
-}
-
 // -------------------------------- //
 //          Reply bubble            //
 // -------------------------------- //
 
-const ReplyBubble = ({ reply }: { reply: CommentReply }) => (
-    <div className={styles.reply}>
-        <div className={styles.reply_header}>
-            <span className={styles.comment_author}>{reply.author}</span>
-            <span className={styles.comment_time}>{formatTimestamp(reply.createdAt)}</span>
+const ReplyBubble = ({ reply }: { reply: CommentReply }) => {
+    const formatTimestamp = useFormatTimestamp();
+    return (
+        <div className={styles.reply}>
+            <div className={styles.reply_header}>
+                <span className={styles.comment_author}>{reply.author}</span>
+                <span className={styles.comment_time}>{formatTimestamp(reply.createdAt)}</span>
+            </div>
+            <div className={styles.reply_text}>{reply.text}</div>
         </div>
-        <div className={styles.reply_text}>{reply.text}</div>
-    </div>
-);
+    );
+};
 
 // -------------------------------- //
 //          Comment card             //
@@ -62,6 +47,7 @@ const CommentCard = ({ comment, isActive, onActivate, onDeactivate, onSave, onDe
     const [draft, setDraft] = useState(comment.text);
     const [replyDraft, setReplyDraft] = useState("");
     const textareaRef = useRef<HTMLTextAreaElement>(null);
+    const formatTimestamp = useFormatTimestamp();
 
     useEffect(() => {
         if (isEditing && textareaRef.current) {
diff --git a/components/navbar/ProductionPanel.tsx b/components/navbar/ProductionPanel.tsx
index a334f3b8..dee0c271 100644
--- a/components/navbar/ProductionPanel.tsx
+++ b/components/navbar/ProductionPanel.tsx
@@ -2,13 +2,14 @@
 
 import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
 import { useTranslations } from "next-intl";
-import { Lock, X } from "lucide-react";
+import { Lock, X, Layers } from "lucide-react";
 
 import { ProjectContext } from "@src/context/ProjectContext";
 import { UserContext } from "@src/context/UserContext";
 import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
 import { computeSceneItems } from "@src/lib/screenplay/scenes";
-import { unlockScenesPopup } from "@src/lib/screenplay/popup";
+import { unlockPagesPopup, unlockScenesPopup } from "@src/lib/screenplay/popup";
+import { getPageAnchors } from "@src/lib/screenplay/extensions/pagination-extension";
 import Switch from "@components/utils/Switch";
 
 import styles from "./ProductionPanel.module.css";
@@ -37,7 +38,11 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         sceneNumberingStyle,
         skippedSceneLetters,
         persistentScenes,
+        pageLocking,
+        persistentPages,
         scenes,
+        screenplay,
+        editor,
         repository,
         isReadOnly,
     } = useContext(ProjectContext);
@@ -131,7 +136,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
             const currentScreenplay = repository.screenplay;
             const scenes = computeSceneItems(currentScreenplay);
             const uuids = scenes.map(s => s.id).filter((id): id is string => !!id);
-            
+
             // Re-read fresh persistent data
             const persistentSnapshot = repository.scenes;
 
@@ -142,23 +147,91 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                 skippedSceneLetters,
             );
 
-            console.log("[ProductionPanel] RELOCKING PROVISIONAL. Full snapshot:", currentLabels.map(l => ({
-                uuid: l.uuid,
-                label: l.label,
-                status: l.status,
-                token: l.token
-            })));
-
-            let relockedCount = 0;
             currentLabels.forEach((label) => {
                 if (label.status === "provisional") {
-                    console.log(`[ProductionPanel] -> Freezing ${label.uuid} as "${label.label}"`);
                     repository.upsertScene(label.uuid, { token: label.token });
-                    relockedCount++;
                 }
             });
+        });
+    };
+
+    // -------------- Page locking --------------
+    // Pulls anchors from the live pagination state; recomputed whenever the
+    // screenplay or the persistent maps change. Each render is cheap (a single
+    // Set traversal over the plugin state); we don't subscribe to pagination
+    // events because the production panel is only meaningful as a snapshot
+    // when the user opens it.
+    const pageAnchors = useMemo(() => {
+        if (!editor) return [];
+        return getPageAnchors(editor);
+        // `screenplay` and `persistentPages` are listed so the memo refreshes
+        // when content/locks change — they're not used inside the body.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [editor, screenplay, persistentPages, persistentScenes]);
+
+    const pageLabels = useMemo(() => {
+        if (!pageLocking || pageAnchors.length === 0) return [];
+        return computeSceneLabels(pageAnchors, persistentPages, "suffix", skippedSceneLetters);
+    }, [pageLocking, pageAnchors, persistentPages, skippedSceneLetters]);
+
+    const provisionalPageLabels = useMemo(
+        () => pageLabels.filter((l) => l.status === "provisional"),
+        [pageLabels],
+    );
 
-            console.log(`[ProductionPanel] Relock complete. Persisted ${relockedCount} tokens.`);
+    const performPageUnlock = useCallback(() => {
+        if (!repository) return;
+        repository.transact(() => {
+            repository.clearPageLocks();
+            repository.setPageLocking(false);
+        });
+    }, [repository]);
+
+    const handlePageLockingToggle = (next: boolean) => {
+        if (!repository || isReadOnly) return;
+        if (next) {
+            if (!editor) return;
+            repository.transact(() => {
+                const anchors = getPageAnchors(editor);
+                const persistentSnapshot = repository.pages;
+                // Idempotent: any anchor that already has a token keeps it.
+                // Only provisional anchors (no token yet) get a freshly-computed
+                // one. A fresh lock-on with no existing tokens assigns every
+                // page baseToken(idx+1) — same shape as scene locking.
+                const computed = computeSceneLabels(
+                    anchors,
+                    persistentSnapshot,
+                    "suffix",
+                    skippedSceneLetters,
+                );
+                computed.forEach((label) => {
+                    if (label.status === "provisional") {
+                        repository.upsertPage(label.uuid, { token: label.token });
+                    }
+                });
+                repository.setPageLocking(true);
+            });
+        } else {
+            unlockPagesPopup(performPageUnlock, userCtx);
+        }
+    };
+
+    const handlePageRelock = () => {
+        if (!repository || isReadOnly || !editor) return;
+        repository.transact(() => {
+            const anchors = getPageAnchors(editor);
+            const persistentSnapshot = repository.pages;
+            const currentLabels = computeSceneLabels(
+                anchors,
+                persistentSnapshot,
+                "suffix",
+                skippedSceneLetters,
+            );
+            currentLabels.forEach((label) => {
+                if (label.status === "provisional") {
+                    repository.upsertPage(label.uuid, { token: label.token });
+                }
+            });
         });
     };
 
@@ -217,14 +290,48 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                 )}
             </div>
 
-            {/* Page Locking (inert in v1) */}
+            {/* Page Locking */}
             <div className={styles.section}>
                 <div className={styles.row}>
                     <div className={styles.row_main}>
+                        <Layers size={14} className={styles.row_icon} />
                         <span className={styles.row_label}>{t("pageLocking")}</span>
                     </div>
-                    <Switch checked={false} onChange={() => {}} ariaLabel={t("pageLocking")} />
+                    <div className={styles.row_actions}>
+                        {pageLocking && provisionalPageLabels.length > 0 && (
+                            <button
+                                type="button"
+                                className={styles.relock_btn}
+                                onClick={handlePageRelock}
+                                disabled={isReadOnly}
+                            >
+                                {t("pageRelock")}
+                            </button>
+                        )}
+                        <Switch
+                            checked={pageLocking}
+                            onChange={handlePageLockingToggle}
+                            disabled={isReadOnly}
+                            ariaLabel={t("pageLocking")}
+                        />
+                    </div>
                 </div>
+
+                {pageLocking && provisionalPageLabels.length > 0 && (
+                    <div className={styles.provisional_box}>
+                        <div className={styles.provisional_title}>{t("pageProvisionalTitle")}</div>
+                        <div className={styles.provisional_list}>
+                            {provisionalPageLabels.map((l, idx) => (
+                                <span
+                                    key={`${l.uuid}-${idx}`}
+                                    className={styles.provisional_label}
+                                >
+                                    {l.label}
+                                </span>
+                            ))}
+                        </div>
+                    </div>
+                )}
             </div>
 
             {/* Revisions (inert in v1) */}
diff --git a/components/navbar/SavesPanel.tsx b/components/navbar/SavesPanel.tsx
index 77b3d80c..fa04eac1 100644
--- a/components/navbar/SavesPanel.tsx
+++ b/components/navbar/SavesPanel.tsx
@@ -3,7 +3,7 @@
 import { useContext, useEffect, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
 import { DashboardContext } from "@src/context/DashboardContext";
-import { useCookieUser } from "@src/lib/utils/hooks";
+import { useCookieUser, useFormatTimestamp } from "@src/lib/utils/hooks";
 import {
     X,
     Save,
@@ -35,10 +35,10 @@ interface SavesPanelProps {
 
 const SavesPanel = ({ projectId, isOpen, onClose, isPro }: SavesPanelProps) => {
     const t = useTranslations("saves");
-    const tDates = useTranslations("dates");
     const { openDashboard } = useContext(DashboardContext);
     const { user } = useCookieUser();
     const isSignedIn = !!user;
+    const formatDate = useFormatTimestamp();
 
     const handleUpgrade = () => {
         onClose();
@@ -150,26 +150,6 @@ const SavesPanel = ({ projectId, isOpen, onClose, isPro }: SavesPanelProps) => {
         setConfirmDeleteKey(null);
     };
 
-    const formatDate = (iso: string) => {
-        const date = new Date(iso);
-        const now = new Date();
-        const diffMs = now.getTime() - date.getTime();
-        const diffMins = Math.floor(diffMs / 60000);
-        const diffHours = Math.floor(diffMs / 3600000);
-        const diffDays = Math.floor(diffMs / 86400000);
-
-        if (diffMins < 1) return tDates("justNow");
-        if (diffMins < 60) return tDates("minutesAgo", { mins: diffMins });
-        if (diffHours < 24) return tDates("hoursAgo", { hours: diffHours });
-        if (diffDays < 7) return tDates("daysAgo", { days: diffDays });
-
-        return date.toLocaleDateString(undefined, {
-            month: "short",
-            day: "numeric",
-            year: date.getFullYear() !== now.getFullYear() ? "numeric" : undefined,
-        });
-    };
-
     const formatFullDate = (iso: string) => {
         return new Date(iso).toLocaleString(undefined, {
             month: "short",
diff --git a/components/popup/Popup.tsx b/components/popup/Popup.tsx
index f0950752..f1e40989 100644
--- a/components/popup/Popup.tsx
+++ b/components/popup/Popup.tsx
@@ -7,6 +7,7 @@ import {
     PopupImportFileData,
     PopupSceneData,
     PopupType,
+    PopupUnlockPagesData,
     PopupUnlockScenesData,
     PopupUploadToCloudData,
 } from "@src/lib/screenplay/popup";
@@ -14,6 +15,7 @@ import { useContext } from "react";
 import PopupCharacterItem from "./PopupCharacterItem";
 import PopupImportFile from "./PopupImportFile";
 import PopupSceneItem from "./PopupSceneItem";
+import PopupUnlockPages from "./PopupUnlockPages";
 import PopupUnlockScenes from "./PopupUnlockScenes";
 import PopupUploadToCloud from "./PopupUploadToCloud";
 
@@ -34,6 +36,8 @@ export const Popup = () => {
             return <PopupUploadToCloud {...(popup as PopupData<PopupUploadToCloudData>)} />;
         case PopupType.UnlockScenes:
             return <PopupUnlockScenes {...(popup as PopupData<PopupUnlockScenesData>)} />;
+        case PopupType.UnlockPages:
+            return <PopupUnlockPages {...(popup as PopupData<PopupUnlockPagesData>)} />;
         default:
             return null;
     }
diff --git a/components/popup/PopupUnlockPages.tsx b/components/popup/PopupUnlockPages.tsx
new file mode 100644
index 00000000..2bcef200
--- /dev/null
+++ b/components/popup/PopupUnlockPages.tsx
@@ -0,0 +1,52 @@
+"use client";
+
+import { useContext } from "react";
+import { useTranslations } from "next-intl";
+import { X, Unlock } from "lucide-react";
+
+import popup from "./Popup.module.css";
+
+import { useDraggable } from "@src/lib/utils/hooks";
+import { PopupData, PopupUnlockPagesData, closePopup } from "@src/lib/screenplay/popup";
+import { UserContext } from "@src/context/UserContext";
+
+const PopupUnlockPages = ({ data: { confirmUnlock } }: PopupData<PopupUnlockPagesData>) => {
+    const userCtx = useContext(UserContext);
+    const { position, handleMouseDown, isDragging } = useDraggable();
+    const t = useTranslations("production");
+
+    const onConfirm = () => {
+        confirmUnlock();
+        closePopup(userCtx);
+    };
+
+    return (
+        <div className={popup.window}>
+            <div
+                className={popup.container}
+                style={{ transform: `translate(${position.x}px, ${position.y}px)` }}
+            >
+                <div
+                    className={popup.header}
+                    onMouseDown={handleMouseDown}
+                    style={{ cursor: isDragging ? "grabbing" : "grab" }}
+                >
+                    <h2 className={popup.title}>{t("unlockPagesTitle")}</h2>
+                    <X className={popup.close_btn} onClick={() => closePopup(userCtx)} />
+                </div>
+                <div className={popup.info}>
+                    <p>{t("unlockPagesWarning")}</p>
+                </div>
+                <button className={popup.import_confirm} onClick={onConfirm}>
+                    <Unlock size={18} color="white" />
+                    {t("unlockPages")}
+                </button>
+                <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
+                    {t("cancel")}
+                </button>
+            </div>
+        </div>
+    );
+};
+
+export default PopupUnlockPages;
diff --git a/messages/de.json b/messages/de.json
index 0302bcda..889c2462 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -460,6 +460,11 @@
     "unlockWarning": "<b>Alle gesperrten und ausgelassenen Szenen verlieren ihre fixierte Nummerierung.</b>",
     "unlockInfo": "Dies betrifft alle Mitarbeiter. Das Drehbuch kehrt zu positionalen Szenennummern zurück. OMITTED-Szenen bleiben ausgelassen — heben Sie die Auslassung einzeln auf, um den Inhalt wiederherzustellen.",
     "unlock": "Entsperren",
+    "pageRelock": "Erneut sperren",
+    "pageProvisionalTitle": "Nicht gesperrte Seiten",
+    "unlockPagesTitle": "Seiten entsperren",
+    "unlockPagesWarning": "Alle Seiten verlieren ihre gesperrte Nummerierung und kehren zur natürlichen Paginierung zurück.",
+    "unlockPages": "Seiten entsperren",
     "cancel": "Abbrechen",
     "numberingStyleTitle": "Szenennummerierung",
     "numberingStyleHelp": "Bestimmt, wie neu eingefügte Szenen zwischen zwei gesperrten Szenen nummeriert werden.",
diff --git a/messages/en.json b/messages/en.json
index 81b9fb7e..24107f8a 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -459,6 +459,11 @@
     "unlockWarning": "All scenes will lose their locked numbering, reverting to their initial positional numbering.",
     "unlockInfo": "This affects every collaborator. The screenplay will revert to positional scene numbers. OMITTED scenes stay omitted — unomit them individually if you want their content back.",
     "unlock": "Unlock",
+    "pageRelock": "Relock",
+    "pageProvisionalTitle": "Non-locked pages",
+    "unlockPagesTitle": "Unlock pages",
+    "unlockPagesWarning": "All pages will lose their locked numbering, reverting to their natural pagination-based numbering.",
+    "unlockPages": "Unlock pages",
     "cancel": "Cancel",
     "numberingStyleTitle": "Scene numbering",
     "numberingStyleHelp": "Dictates how newly inserted scenes should be numbered between two locked scenes.",
diff --git a/messages/es.json b/messages/es.json
index 365185cb..4f1fb4b1 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -459,6 +459,11 @@
     "unlockWarning": "<b>Todas las escenas bloqueadas y omitidas perderán su numeración fija.</b>",
     "unlockInfo": "Esto afecta a todos los colaboradores. El guion volverá a una numeración posicional. Las escenas OMITTED siguen omitidas — anula la omisión individualmente si quieres recuperar su contenido.",
     "unlock": "Desbloquear",
+    "pageRelock": "Rebloquear",
+    "pageProvisionalTitle": "Páginas no bloqueadas",
+    "unlockPagesTitle": "Desbloquear páginas",
+    "unlockPagesWarning": "Todas las páginas perderán su numeración bloqueada y volverán a la paginación natural.",
+    "unlockPages": "Desbloquear páginas",
     "cancel": "Cancelar",
     "numberingStyleTitle": "Numeración de escenas",
     "numberingStyleHelp": "Determina cómo se numeran las escenas recién insertadas entre dos escenas bloqueadas.",
diff --git a/messages/fr.json b/messages/fr.json
index 0e2b96b5..2a41c334 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -460,6 +460,11 @@
     "unlockWarning": "<b>Toutes les scènes verrouillées et omises perdront leur numérotation figée.</b>",
     "unlockInfo": "Ceci affecte tous les collaborateurs. Le scénario reviendra à une numérotation positionnelle. Les scènes OMITTED restent omises — démasquez-les individuellement si vous souhaitez en récupérer le contenu.",
     "unlock": "Déverrouiller",
+    "pageRelock": "Reverrouiller",
+    "pageProvisionalTitle": "Pages non verrouillées",
+    "unlockPagesTitle": "Déverrouiller les pages",
+    "unlockPagesWarning": "Toutes les pages perdront leur numérotation verrouillée et reviendront à la pagination naturelle.",
+    "unlockPages": "Déverrouiller les pages",
     "cancel": "Annuler",
     "numberingStyleTitle": "Numérotation des scènes",
     "numberingStyleHelp": "Détermine comment les scènes nouvellement insérées sont numérotées entre deux scènes verrouillées.",
diff --git a/messages/ja.json b/messages/ja.json
index 5c473138..f8b5f921 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -459,6 +459,11 @@
     "unlockWarning": "<b>ロック済みおよび省略されたシーンの固定番号はすべて失われます。</b>",
     "unlockInfo": "この操作はすべてのコラボレーターに影響します。脚本は位置ベースの番号に戻ります。OMITTED シーンは省略のまま残ります — 内容を復元したい場合は個別に省略を解除してください。",
     "unlock": "ロック解除",
+    "pageRelock": "再ロック",
+    "pageProvisionalTitle": "未ロックのページ",
+    "unlockPagesTitle": "ページのロックを解除",
+    "unlockPagesWarning": "すべてのページのロック番号が失われ、自然なページ番号付けに戻ります。",
+    "unlockPages": "ページのロック解除",
     "cancel": "キャンセル",
     "numberingStyleTitle": "シーン番号",
     "numberingStyleHelp": "ロック済みの2つのシーンの間に挿入された新しいシーンの番号付け方法を決定します。",
diff --git a/messages/ko.json b/messages/ko.json
index 17d8160e..5e3b911f 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -459,6 +459,11 @@
     "unlockWarning": "<b>잠긴 씬과 생략된 씬의 고정 번호가 모두 사라집니다.</b>",
     "unlockInfo": "이 작업은 모든 협업자에게 영향을 미칩니다. 시나리오는 위치 기반 씬 번호로 되돌아갑니다. OMITTED 씬은 그대로 유지되며, 내용을 복원하려면 개별적으로 생략을 해제하세요.",
     "unlock": "잠금 해제",
+    "pageRelock": "다시 잠그기",
+    "pageProvisionalTitle": "잠기지 않은 페이지",
+    "unlockPagesTitle": "페이지 잠금 해제",
+    "unlockPagesWarning": "모든 페이지의 잠긴 번호가 사라지고 자연스러운 페이지 번호로 되돌아갑니다.",
+    "unlockPages": "페이지 잠금 해제",
     "cancel": "취소",
     "numberingStyleTitle": "씬 번호",
     "numberingStyleHelp": "잠긴 두 씬 사이에 새로 삽입된 씬의 번호 매김 방식을 결정합니다.",
diff --git a/messages/pl.json b/messages/pl.json
index bf9f2ea0..c78feb68 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -459,6 +459,11 @@
     "unlockWarning": "<b>Wszystkie zablokowane i pominięte sceny utracą zamrożoną numerację.</b>",
     "unlockInfo": "Wpłynie to na wszystkich współpracowników. Scenariusz powróci do numeracji pozycyjnej. Sceny OMITTED pozostają pominięte — anuluj pominięcie pojedynczo, aby odzyskać ich zawartość.",
     "unlock": "Odblokuj",
+    "pageRelock": "Zablokuj ponownie",
+    "pageProvisionalTitle": "Niezablokowane strony",
+    "unlockPagesTitle": "Odblokować strony?",
+    "unlockPagesWarning": "Wszystkie strony utracą zablokowaną numerację i powrócą do naturalnej paginacji.",
+    "unlockPages": "Odblokuj strony",
     "cancel": "Anuluj",
     "numberingStyleTitle": "Numeracja scen",
     "numberingStyleHelp": "Określa, jak numerowane są nowo wstawione sceny między dwiema zablokowanymi scenami.",
diff --git a/messages/zh.json b/messages/zh.json
index fec25d70..b1fe3406 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -459,6 +459,11 @@
     "unlockWarning": "<b>所有锁定和省略的场景都将失去固定编号。</b>",
     "unlockInfo": "此操作会影响所有协作者。剧本将恢复为按位置编号。OMITTED 场景仍保持省略状态 — 如需恢复内容,请单独取消省略。",
     "unlock": "解锁",
+    "pageRelock": "重新锁定",
+    "pageProvisionalTitle": "未锁定的页面",
+    "unlockPagesTitle": "解锁页面?",
+    "unlockPagesWarning": "所有页面将失去锁定的编号,恢复为自然分页。",
+    "unlockPages": "解锁页面",
     "cancel": "取消",
     "numberingStyleTitle": "场景编号",
     "numberingStyleHelp": "决定两个锁定场景之间新插入场景的编号方式。",
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index 9fd6b465..bc0622be 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -13,6 +13,7 @@ import { Editor } from "@tiptap/react";
 import { CharacterMap, mergeCharactersData } from "@src/lib/screenplay/characters";
 import { LocationMap, mergeLocationsData } from "@src/lib/screenplay/locations";
 import { mergeScenesData, PersistentSceneMap, Scene } from "@src/lib/screenplay/scenes";
+import { PersistentPageMap } from "@src/lib/screenplay/page-locking";
 import { ProjectMembershipPayload } from "@src/server/repository/project-repository";
 import { ProjectRole } from "@src/generated/client/browser";
 import { useUser } from "@src/lib/utils/hooks";
@@ -111,6 +112,14 @@ export interface ProjectContextType {
      *  has been persisted. */
     persistentScenes: PersistentSceneMap;
 
+    /** Page-locking master switch (production lock for page numbering). */
+    pageLocking: boolean;
+    setPageLocking: (locked: boolean) => void;
+    /** Raw persistent page-lock map (anchor data-id → PersistentPage).
+     *  Keyed by `PAGE_ONE_KEY` for page 1, by the top-level node's data-id
+     *  for subsequent pages. */
+    persistentPages: PersistentPageMap;
+
     // Search state
     searchTerm: string;
     setSearchTerm: (term: string) => void;
@@ -194,6 +203,9 @@ const defaultContextValue: ProjectContextType = {
     skippedSceneLetters: DEFAULT_SKIPPED_SCENE_LETTERS,
     setSkippedSceneLetters: () => {},
     persistentScenes: {},
+    pageLocking: false,
+    setPageLocking: () => {},
+    persistentPages: {},
     characters: {},
     locations: {},
     scenes: [],
@@ -319,6 +331,8 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
     const [skippedSceneLetters, setSkippedSceneLettersState] =
         useState<string[]>(DEFAULT_SKIPPED_SCENE_LETTERS);
     const [persistentScenes, setPersistentScenesState] = useState<PersistentSceneMap>({});
+    const [pageLocking, setPageLockingState] = useState<boolean>(false);
+    const [persistentPages, setPersistentPagesState] = useState<PersistentPageMap>({});
     const [connectionStatus, setConnectionStatus] = useState<ConnectionStatus>("disconnected");
     const [users, setUsers] = useState<CollaboratorInfo[]>([]);
 
@@ -510,10 +524,14 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             if (initialProduction.skippedSceneLetters !== undefined) {
                 setSkippedSceneLettersState(initialProduction.skippedSceneLetters);
             }
+            if (initialProduction.pageLocking !== undefined) {
+                setPageLockingState(initialProduction.pageLocking);
+            }
         }
 
-        // Read initial persistent scenes
+        // Read initial persistent scenes & pages
         setPersistentScenesState(repository.scenes);
+        setPersistentPagesState(repository.pages);
 
         // Observe layout changes
         const unsubscribeLayout = repository.observeLayout((layout: Partial<LayoutData>) => {
@@ -566,6 +584,14 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             if (production.skippedSceneLetters !== undefined) {
                 setSkippedSceneLettersState(production.skippedSceneLetters);
             }
+            if (production.pageLocking !== undefined) {
+                setPageLockingState(production.pageLocking);
+            }
+        });
+
+        // Observe page-lock changes
+        const unsubscribePages = repository.observePages((pages: PersistentPageMap) => {
+            setPersistentPagesState(pages);
         });
 
         // Observe character changes - get current screenplay from repository
@@ -610,6 +636,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             repository.unregisterScreenplayCallback(recomputeFromScreenplay);
             unsubscribeLayout();
             unsubscribeProduction();
+            unsubscribePages();
             unsubscribeCharacters();
             unsubscribeLocations();
             unsubscribeScenes();
@@ -774,6 +801,14 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         [repository],
     );
 
+    const setPageLocking = useCallback(
+        (locked: boolean) => {
+            setPageLockingState(locked);
+            repository?.setPageLocking(locked);
+        },
+        [repository],
+    );
+
     const setSceneNumberingStyle = useCallback(
         (style: "suffix" | "prefix") => {
             setSceneNumberingStyleState(style);
@@ -881,6 +916,9 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             skippedSceneLetters,
             setSkippedSceneLetters,
             persistentScenes,
+            pageLocking,
+            setPageLocking,
+            persistentPages,
             screenplay,
             scenes,
             updateScenes,
@@ -952,6 +990,9 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             skippedSceneLetters,
             setSkippedSceneLetters,
             persistentScenes,
+            pageLocking,
+            setPageLocking,
+            persistentPages,
             screenplay,
             scenes,
             updateScenes,
diff --git a/src/lib/adapters/scriptio/scriptio-adapter.ts b/src/lib/adapters/scriptio/scriptio-adapter.ts
index cb1bdcb8..fbb61d66 100644
--- a/src/lib/adapters/scriptio/scriptio-adapter.ts
+++ b/src/lib/adapters/scriptio/scriptio-adapter.ts
@@ -76,6 +76,7 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                 metadata: project.metadata().toJSON() as ProjectMetadata,
                 characters: project.characters().toJSON(),
                 scenes: project.scenes().toJSON(),
+                pages: project.pages().toJSON(),
                 locations: project.locations().toJSON(),
                 board: project.board().toJSON() as BoardData,
                 layout: project.layout().toJSON() as LayoutData,
@@ -127,6 +128,7 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                 metadata: tmpDoc.metadata().toJSON() as ProjectMetadata,
                 characters: tmpDoc.characters().toJSON(),
                 scenes: tmpDoc.scenes().toJSON(),
+                pages: tmpDoc.pages().toJSON(),
                 locations: tmpDoc.locations().toJSON(),
                 board: tmpDoc.board().toJSON() as BoardData,
                 layout: tmpDoc.layout().toJSON() as LayoutData,
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index 4d19fa14..f8ce413b 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -11,7 +11,7 @@ import { ScreenplayElement, Style, TitlePageElement } from "@src/lib/utils/enums
 import { getRandomColor } from "@src/lib/utils/misc";
 import { useUser } from "@src/lib/utils/hooks";
 import { getStylesFromMarks, SCREENPLAY_FORMATS } from "@src/lib/screenplay/editor";
-import { ScriptioPagination } from "@src/lib/screenplay/extensions/pagination-extension";
+import { ScriptioPagination, refreshPageLocking } from "@src/lib/screenplay/extensions/pagination-extension";
 import { KeybindsExtension } from "@src/lib/screenplay/extensions/keybinds-extension";
 import { executeKeybindAction, KeybindId } from "@src/lib/utils/keybinds";
 import {
@@ -79,6 +79,8 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         sceneNumberingStyle,
         skippedSceneLetters,
         persistentScenes,
+        pageLocking,
+        persistentPages,
     } = projectCtx;
 
     const projectState = repository?.getState();
@@ -175,6 +177,8 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         sceneNumberingStyle,
         skippedSceneLetters,
         persistentScenes,
+        pageLocking,
+        persistentPages,
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }), []);
     ext.highlightedCharacters = highlightedCharacters;
@@ -192,6 +196,8 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     ext.sceneNumberingStyle = sceneNumberingStyle;
     ext.skippedSceneLetters = skippedSceneLetters;
     ext.persistentScenes = persistentScenes;
+    ext.pageLocking = pageLocking;
+    ext.persistentPages = persistentPages;
 
     const lastReportedElementRef = useRef<ScreenplayElement | null>(null);
 
@@ -362,6 +368,9 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
                               },
                               footerRight: "",
                               ...SCREENPLAY_FORMATS[pageSize],
+                              getPageLocking: () => !!ext.pageLocking,
+                              getPageLocks: () => ext.persistentPages ?? {},
+                              getSkippedLetters: () => ext.skippedSceneLetters ?? [],
                           }
                         : {
                               pageGap: 20,
@@ -602,6 +611,16 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         }
     }, [editor, sceneLocking, sceneNumberingStyle, skippedSceneLetters, persistentScenes, features.sceneLocking]);
 
+    // Refresh pagination when page locking or the page-lock map changes.
+    // Pagination only reads these via getter closures on its options, so
+    // we must explicitly kick it to re-run; otherwise stale labels render
+    // until the user types.
+    useEffect(() => {
+        if (editor && config.features.paginationMode === "screenplay") {
+            refreshPageLocking(editor);
+        }
+    }, [editor, pageLocking, persistentPages, skippedSceneLetters, config.features.paginationMode]);
+
     // Refresh search highlights
     useEffect(() => {
         if (editor && features.searchHighlights) {
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index c8ecf342..c9456705 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -17,6 +17,7 @@ import type { PageFormat } from "../utils/enums";
 import type { CharacterItem } from "../screenplay/characters";
 import type { LocationItem } from "../screenplay/locations";
 import type { PersistentScene } from "../screenplay/scenes";
+import type { PersistentPage } from "../screenplay/page-locking";
 import type { Comment } from "../utils/types";
 
 // -------------------------------- //
@@ -125,6 +126,14 @@ export type ProductionData = {
      * `DEFAULT_SKIPPED_SCENE_LETTERS`.
      */
     skippedSceneLetters?: string[];
+    /**
+     * Page-locking master switch. When true, pagination freezes the numbering
+     * of each page using anchors stored in the `pages` Y.Map. Pages inserted
+     * between locks get suffix-style labels (e.g. "4A"); pages appended after
+     * the last lock continue the integer sequence; deletion of a locked page's
+     * content leaves an empty page slot in its place.
+     */
+    pageLocking?: boolean;
 };
 
 /** Letters skipped by default in newly-created projects. */
@@ -168,6 +177,7 @@ export type ProjectData = {
     titlepage?: JSONContent[];
     characters: Record<string, CharacterItem>;
     scenes: Record<string, PersistentScene>;
+    pages: Record<string, PersistentPage>;
     locations: Record<string, LocationItem>;
     metadata: ProjectMetadata;
     board: BoardData;
@@ -203,6 +213,7 @@ export class ProjectState extends Y.Doc {
         TITLEPAGE: "titlepage",
         CHARACTERS: "characters",
         SCENES: "scenes",
+        PAGES: "pages",
         LOCATIONS: "locations",
         METADATA: "metadata",
         BOARD: "board",
@@ -247,6 +258,10 @@ export class ProjectState extends Y.Doc {
         return this.getMap(this.KEYS.SCENES);
     }
 
+    pages(): Y.Map<PersistentPage> {
+        return this.getMap(this.KEYS.PAGES);
+    }
+
     board(): TypedMap<BoardData> {
         return this.getMap(this.KEYS.BOARD) as unknown as TypedMap<BoardData>;
     }
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index bc7f51de..51f79fe9 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -18,6 +18,7 @@ import {
 import { CharacterMap } from "../screenplay/characters";
 import { LocationMap } from "../screenplay/locations";
 import { PersistentScene, PersistentSceneMap } from "../screenplay/scenes";
+import { PersistentPage, PersistentPageMap } from "../screenplay/page-locking";
 import { PageFormat } from "../utils/enums";
 import { generateNodeId } from "../screenplay/nodes";
 import { JSONContent } from "@tiptap/react";
@@ -391,6 +392,10 @@ export class ProjectRepository {
         if (this.guardWrite("setSceneLocking")) return;
         this.ydoc.production().set("sceneLocking", locked);
     }
+    setPageLocking(locked: boolean) {
+        if (this.guardWrite("setPageLocking")) return;
+        this.ydoc.production().set("pageLocking", locked);
+    }
     setSceneNumberingStyle(style: "suffix" | "prefix") {
         if (this.guardWrite("setSceneNumberingStyle")) return;
         this.ydoc.production().set("sceneNumberingStyle", style);
@@ -425,6 +430,73 @@ export class ProjectRepository {
         }
     }
 
+    /**
+     * Raw persistent page-lock map keyed by anchor data-id (with the
+     * sentinel `PAGE_ONE_KEY` for page 1). Empty when page locking has
+     * never been enabled.
+     */
+    get pages(): PersistentPageMap {
+        return this.ydoc.pages().toJSON() as PersistentPageMap;
+    }
+
+    getPage(anchorId: string): PersistentPage | undefined {
+        const map = this.ydoc.pages();
+        return map.get(anchorId) as PersistentPage | undefined;
+    }
+
+    /**
+     * Create or update a page lock keyed by its anchor data-id.
+     * Fields present in `data` (including explicit `undefined`s) overwrite
+     * the existing fields; everything else is preserved. Final undefined
+     * values are stripped before writing.
+     */
+    upsertPage(anchorId: string, data: Partial<PersistentPage>): string {
+        if (this.guardWrite("upsertPage")) return anchorId;
+        const map = this.ydoc.pages();
+        const existing = (map.get(anchorId) as PersistentPage | undefined) ?? {};
+
+        const merged: PersistentPage = { ...existing };
+        const FIELDS = ["token"] as const;
+        for (const key of FIELDS) {
+            if (key in data) {
+                (merged as Record<string, unknown>)[key] = data[key];
+            }
+        }
+        for (const key of FIELDS) {
+            if (merged[key] === undefined) delete merged[key];
+        }
+
+        map.set(anchorId, merged);
+        return anchorId;
+    }
+
+    deletePage(anchorId: string): void {
+        if (this.guardWrite("deletePage")) return;
+        const map = this.ydoc.pages();
+        if (map.has(anchorId)) {
+            map.delete(anchorId);
+        }
+    }
+
+    /**
+     * Wipe every persistent page-lock entry. Used when the user toggles
+     * page locking off — pagination reverts to plain integer numbering.
+     */
+    clearPageLocks(): void {
+        if (this.guardWrite("clearPageLocks")) return;
+        const map = this.ydoc.pages();
+        const keys: string[] = [];
+        map.forEach((_, key) => keys.push(key));
+        for (const key of keys) map.delete(key);
+    }
+
+    observePages(callback: (pages: PersistentPageMap) => void): () => void {
+        const map = this.ydoc.pages();
+        const observer = () => callback(map.toJSON() as PersistentPageMap);
+        map.observe(observer);
+        return () => map.unobserve(observer);
+    }
+
     /**
      * Run a function inside a single Y.js transaction.
      * Useful for batching multiple repository mutations into one collab update.
diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index fd0fe4c8..52c1b1df 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -6,6 +6,9 @@ import { Node } from "@tiptap/pm/model";
 import { Plugin, PluginKey } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 
+import { compareTokens, computeSceneLabels, SceneToken } from "@src/lib/screenplay/scene-locking";
+import { PAGE_ONE_KEY, PersistentPageMap } from "@src/lib/screenplay/page-locking";
+
 // ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
@@ -33,6 +36,8 @@ interface NodeInfo {
     type: ScreenplayElement;
     height: number;
     positionTop: number;
+    /** data-id of the top-level node, used by page locking to anchor breaks. */
+    dataId?: string;
 }
 
 interface BreakLogic {
@@ -108,6 +113,15 @@ export interface PaginationOptions {
     customFooter: Record<PageNumber, FooterOptions>;
     /** Element types that force a page break before them. */
     startNewPageTypes: Set<string>;
+    /**
+     * Production page-lock getters. When the editor is wired with page
+     * locking, these expose the live toggle and lock map. Optional so test
+     * harnesses and benchmarks can keep their lean Pagination.configure calls.
+     */
+    getPageLocking?: () => boolean;
+    getPageLocks?: () => PersistentPageMap;
+    /** Letters skipped from generated labels (shared with scene locking). */
+    getSkippedLetters?: () => readonly string[];
 }
 
 export interface PageBreakInfo {
@@ -116,6 +130,19 @@ export interface PageBreakInfo {
     freespace: number; // empty space remaining at the bottom of the ending page's content area
     contdName: string; // non-empty only for dialogue splits: Character cue name for the (CONT'D) label
     splitNodeType: ScreenplayElement | null; // non-null when the break is mid-node (sentence split); drives overlay escape
+    /** data-id of the top-level node that begins the page after this break.
+     *  Set on every non-synthetic break; used by page locking to detect orphan locks. */
+    anchorId?: string;
+    /** True for synthetic breaks that represent an entirely empty (orphan-locked) page.
+     *  The widget renders the empty content area + the next page's chrome on top of
+     *  the normal break chrome. */
+    isEmpty?: boolean;
+    /** Display label for the page beginning after this break (e.g. "4", "4A").
+     *  Equals String(pagenum) when no page-lock is in effect. */
+    label?: string;
+    /** Display label for the page ending before this break — used by the footer of
+     *  the previous page. Undefined for the first break (footer uses page-1 label). */
+    prevLabel?: string;
 }
 
 declare module "@tiptap/core" {
@@ -183,27 +210,27 @@ function syncVars(dom: HTMLElement, o: PaginationOptions) {
 // Decoration builders
 // ---------------------------------------------------------------------------
 
-function renderHeader(pagenum: number, options: PaginationOptions): string {
+function renderHeader(pagenum: number, label: string, options: PaginationOptions): string {
     const custom = options.customHeader[pagenum];
     const left = custom?.headerLeft ?? options.headerLeft;
-    const right = (custom?.headerRight ?? options.headerRight).replace("{page}", `${pagenum}`);
+    const right = (custom?.headerRight ?? options.headerRight).replace("{page}", label);
     if (!left && !right) return "";
     return (
         `<span class="pagination-header-left">${left}</span>` + `<span class="pagination-header-right">${right}</span>`
     );
 }
 
-function renderFooter(pagenum: number, options: PaginationOptions): string {
+function renderFooter(pagenum: number, label: string, options: PaginationOptions): string {
     const custom = options.customFooter[pagenum];
     const left = custom?.footerLeft ?? options.footerLeft;
-    const right = (custom?.footerRight ?? options.footerRight).replace("{page}", `${pagenum}`);
+    const right = (custom?.footerRight ?? options.footerRight).replace("{page}", label);
     if (!left && !right) return "";
     return (
         `<span class="pagination-footer-left">${left}</span>` + `<span class="pagination-footer-right">${right}</span>`
     );
 }
 
-function createFirstPageWidget(options: PaginationOptions): HTMLElement {
+function createFirstPageWidget(firstPageLabel: string, options: PaginationOptions): HTMLElement {
     const container = document.createElement("div");
     container.className = "pagination-first-page";
     container.contentEditable = "false";
@@ -220,7 +247,7 @@ function createFirstPageWidget(options: PaginationOptions): HTMLElement {
     const headerArea = document.createElement("div");
     headerArea.className = "pagination-header-area";
     headerArea.style.height = `${options.marginTop}px`;
-    headerArea.innerHTML = renderHeader(1, options);
+    headerArea.innerHTML = renderHeader(1, firstPageLabel, options);
 
     overlay.appendChild(headerArea);
     container.appendChild(spacer);
@@ -244,9 +271,23 @@ function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOpti
     container.className = "pagination-page-break";
     container.contentEditable = "false";
 
+    const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
+    const isEmpty = !!breakInfo.isEmpty;
+
+    // Empty (orphan-locked) pages append `contentHeight` worth of blank
+    // content to the normal break chrome — the prev→empty transition is
+    // rendered here (footer of prev, gap, header of the empty page, then
+    // the empty content area). The empty→next transition is handled by
+    // the break that follows this one in the breaks array (a lock force-
+    // break, or a subsequent orphan synthetic, or the last-page widget).
+    // Splitting it this way keeps each page transition rendered exactly
+    // once and lets the synthetic absorb the previous page's freespace.
+    const emptyPageExtension = isEmpty ? contentHeight : 0;
+
     // Spacer: pushes text in the document flow past the entire page boundary.
     // Includes freespace because the spacer is the only thing that moves text.
-    const spacerHeight = breakInfo.freespace + options.marginBottom + options.pageGap + options.marginTop;
+    const spacerHeight =
+        breakInfo.freespace + options.marginBottom + options.pageGap + options.marginTop + emptyPageExtension;
     const spacer = document.createElement("div");
     spacer.className = "pagination-spacer";
     spacer.style.height = `${spacerHeight}px`;
@@ -270,11 +311,16 @@ function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOpti
         overlay.style.right = `calc(-1 * ${rightVar})`;
     }
 
+    // Labels for the surrounding pages. Defaults preserve legacy behavior
+    // (pagenum-1 / pagenum) when no labels were assigned (page locking off).
+    const prevLabel = breakInfo.prevLabel ?? String(breakInfo.pagenum - 1);
+    const thisLabel = breakInfo.label ?? String(breakInfo.pagenum);
+
     // Footer area of the ending page (fixed size = marginBottom)
     const footerArea = document.createElement("div");
     footerArea.className = "pagination-footer-area";
     footerArea.style.height = `${options.marginBottom}px`;
-    footerArea.innerHTML = renderFooter(breakInfo.pagenum - 1, options);
+    footerArea.innerHTML = renderFooter(breakInfo.pagenum - 1, prevLabel, options);
 
     // Visual gap between pages (fixed size = pageGap)
     const divider = document.createElement("div");
@@ -286,12 +332,25 @@ function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOpti
     const headerArea = document.createElement("div");
     headerArea.className = "pagination-header-area";
     headerArea.style.height = `${options.marginTop}px`;
-    headerArea.innerHTML = renderHeader(breakInfo.pagenum, options);
+    headerArea.innerHTML = renderHeader(breakInfo.pagenum, thisLabel, options);
 
     overlay.appendChild(footerArea);
     overlay.appendChild(divider);
     overlay.appendChild(headerArea);
 
+    if (isEmpty) {
+        // Empty content area for the orphan-locked page. Renders a faint
+        // label centred in the page so the user can see which locked
+        // number is being preserved. The empty→next transition (footer of
+        // this empty page, gap, header of the next page) is rendered by
+        // the break that follows this synthetic in the breaks array.
+        const emptyArea = document.createElement("div");
+        emptyArea.className = "pagination-empty-page";
+        emptyArea.style.height = `${contentHeight}px`;
+        emptyArea.textContent = thisLabel;
+        overlay.appendChild(emptyArea);
+    }
+
     // For dialogue/parenthetical splits: add (MORE) at the end of the current page
     // and CHARACTER (CONT'D) at the top of the next page.
     // Both are position:absolute inside the overlay so they don't affect flow layout.
@@ -317,7 +376,12 @@ function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOpti
     return container;
 }
 
-function createLastPageWidget(pagenum: number, freespace: number, options: PaginationOptions): HTMLElement {
+function createLastPageWidget(
+    pagenum: number,
+    label: string,
+    freespace: number,
+    options: PaginationOptions,
+): HTMLElement {
     const container = document.createElement("div");
     container.className = "pagination-last-page";
     container.contentEditable = "false";
@@ -335,7 +399,7 @@ function createLastPageWidget(pagenum: number, freespace: number, options: Pagin
     const footerArea = document.createElement("div");
     footerArea.className = "pagination-footer-area";
     footerArea.style.height = `${options.marginBottom}px`;
-    footerArea.innerHTML = renderFooter(pagenum, options);
+    footerArea.innerHTML = renderFooter(pagenum, label, options);
 
     overlay.appendChild(footerArea);
     container.appendChild(spacer);
@@ -347,39 +411,49 @@ function buildDecorations(
     doc: Node,
     breaks: PageBreakInfo[],
     lastPageFreespace: number,
+    firstPageLabel: string,
     options: PaginationOptions,
 ): DecorationSet {
     const decorations: Decoration[] = [];
 
     // First page top margin / header
     decorations.push(
-        Decoration.widget(0, createFirstPageWidget(options), {
+        Decoration.widget(0, createFirstPageWidget(firstPageLabel, options), {
             side: -1,
-            key: "page-1-header",
+            key: `page-1-header-${firstPageLabel}`,
         }),
     );
 
     // Page breaks
     // The key MUST include every value that affects the widget DOM (freespace,
-    // contdName, splitNodeType) — not just pagenum.  ProseMirror's WidgetType.eq
-    // short-circuits on matching keys and reuses the old DOM element, so a key
-    // that omits e.g. freespace causes stale spacer heights after content edits.
+    // contdName, splitNodeType, label, isEmpty) — not just pagenum.  ProseMirror's
+    // WidgetType.eq short-circuits on matching keys and reuses the old DOM element,
+    // so a key that omits e.g. freespace causes stale spacer heights after content edits.
     for (const b of breaks) {
         decorations.push(
             Decoration.widget(b.pos, createPageBreakWidget(b, options), {
                 side: -1,
-                key: `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}`,
+                key: `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}-${b.label ?? ""}-${b.prevLabel ?? ""}-${b.isEmpty ? "E" : ""}`,
             }),
         );
     }
 
-    // Last page bottom margin / footer
+    // Last page bottom margin / footer.
+    // Label of the last page = label of the most recent break (or firstPageLabel
+    // when no breaks exist).
     const lastPagenum = breaks.length > 0 ? breaks[breaks.length - 1].pagenum : 1;
+    const lastPageLabel = breaks.length > 0
+        ? breaks[breaks.length - 1].label ?? String(lastPagenum)
+        : firstPageLabel;
     decorations.push(
-        Decoration.widget(doc.content.size, createLastPageWidget(lastPagenum, lastPageFreespace, options), {
-            side: 1,
-            key: `lp-${lastPagenum}-${lastPageFreespace}`,
-        }),
+        Decoration.widget(
+            doc.content.size,
+            createLastPageWidget(lastPagenum, lastPageLabel, lastPageFreespace, options),
+            {
+                side: 1,
+                key: `lp-${lastPagenum}-${lastPageLabel}-${lastPageFreespace}`,
+            },
+        ),
     );
 
     return DecorationSet.create(doc, decorations);
@@ -554,6 +628,34 @@ interface PaginationState {
     decset: DecorationSet;
     breaks: PageBreakInfo[];
     lastPageFreespace: number;
+    firstPageLabel: string;
+}
+
+/**
+ * Compute display labels for every page using the same token math that
+ * powers scene locking. Page 1 is anchored to the sentinel PAGE_ONE_KEY;
+ * later pages are anchored to the data-id of the top-level node that
+ * begins them. Returns one label per page (length = breaks.length + 1).
+ *
+ * Synthetic empty-page breaks consume one "logical page" each — their
+ * anchorId comes from the page-lock map, and the page that physically
+ * follows the empty slot gets its own label slot in the result.
+ */
+function computePageLabels(
+    breaks: PageBreakInfo[],
+    pageLocks: PersistentPageMap,
+    skippedLetters: readonly string[],
+): string[] {
+    const anchors: string[] = [PAGE_ONE_KEY];
+    for (const b of breaks) {
+        // Empty pages anchor to the orphan lock's anchorId. Real pages anchor
+        // to the data-id of the top-level node where the page starts. If
+        // anchorId is somehow missing, fall back to a unique synthetic key
+        // so the label-computer still produces a usable result.
+        anchors.push(b.anchorId ?? `__break_${b.pos}_${b.pagenum}__`);
+    }
+    const labels = computeSceneLabels(anchors, pageLocks, "suffix", skippedLetters);
+    return labels.map((l) => l.label);
 }
 
 const createPaginationPlugin = (extension: { options: PaginationOptions; editor: Editor }) =>
@@ -564,6 +666,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 decset: DecorationSet.empty,
                 breaks: [],
                 lastPageFreespace: 0,
+                firstPageLabel: "1",
             }),
             apply(tr, value: PaginationState, oldState, newState): PaginationState {
                 const options = extension.options as PaginationOptions;
@@ -631,6 +734,21 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
 
                 const serializer = DOMSerializer.fromSchema(newState.schema);
 
+                // --- Page-lock setup ---
+                // Hot-path discipline: when locking is off (the common case),
+                // pageLocks/lockedAnchorIds stay null and the per-node check
+                // short-circuits on the first `&&` — zero allocations, zero
+                // map lookups. The set is rebuilt once per pass when locking
+                // is active; lock counts are typically tens, never thousands.
+                const pageLocking = options.getPageLocking?.() ?? false;
+                const pageLocks: PersistentPageMap | null = pageLocking
+                    ? options.getPageLocks?.() ?? null
+                    : null;
+                const lockedAnchorIds: Set<string> | null = pageLocks
+                    ? new Set(Object.keys(pageLocks).filter((k) => k !== PAGE_ONE_KEY))
+                    : null;
+                const skippedLetters = options.getSkippedLetters?.() ?? [];
+
                 const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
                 const breaks: PageBreakInfo[] = [];
                 let pagePos = 0;
@@ -673,6 +791,8 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                         lastCharName = node.textContent.trim();
                     }
 
+                    const dataId: string | undefined = node.attrs["data-id"];
+
                     // --- Force page break for "start new page" elements ---
                     // If this node type is configured to start a new page and we're
                     // not already at the top of a page, insert a break before it.
@@ -684,6 +804,24 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                             freespace: Math.max(0, freespace),
                             contdName: "",
                             splitNodeType: null,
+                            anchorId: dataId,
+                        });
+                        pagePos = 0;
+                        lastNodes = new CircularBuffer(3);
+                    }
+
+                    // --- Force page break for locked page anchors ---
+                    // O(1) Set.has when locking is on; the leading `lockedAnchorIds &&`
+                    // short-circuits to false when locking is disabled — hot-path safe.
+                    if (lockedAnchorIds && dataId && pagePos > 0 && lockedAnchorIds.has(dataId)) {
+                        const freespace = contentHeight - pagePos;
+                        breaks.push({
+                            pos,
+                            pagenum: ++pagenum,
+                            freespace: Math.max(0, freespace),
+                            contdName: "",
+                            splitNodeType: null,
+                            anchorId: dataId,
                         });
                         pagePos = 0;
                         lastNodes = new CircularBuffer(3);
@@ -693,7 +831,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                     pagePos += height;
 
                     // We keep the last 3 nodes for orphan resolution on page break
-                    lastNodes.push({ pos, type: nodeType, height, positionTop: pagePos - height });
+                    lastNodes.push({ pos, type: nodeType, height, positionTop: pagePos - height, dataId });
 
                     // Page break needed — record it and reset page position
                     if (pagePos > contentHeight) {
@@ -721,11 +859,13 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                                     contdName: logic.showMoreContd ? lastCharName : "",
                                     // splitNodeType drives the overlay padding-escape in createPageBreakWidget.
                                     splitNodeType: nodeType,
+                                    // Anchor for page locking: the node being split owns both halves.
+                                    anchorId: dataId,
                                 });
                                 // The bottom half of the split node is the first item on the new page.
                                 pagePos = split.bottomHeight;
                                 lastNodes = new CircularBuffer(3);
-                                lastNodes.push({ pos, type: nodeType, height: split.bottomHeight, positionTop: 0 });
+                                lastNodes.push({ pos, type: nodeType, height: split.bottomHeight, positionTop: 0, dataId });
                                 continue; // split handled — skip orphan resolution for this node
                             }
                         }
@@ -741,6 +881,16 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                         for (let back = 1; back <= 2; back++) {
                             const prev = lastNodes.at(back); // at(1) = last fitted, at(2) = one before
                             if (!prev) break;
+                            // A locked anchor owns its page and must never be displaced by
+                            // walkback — otherwise the next overflow would yank it onto an
+                            // A page and the locked frame would lose its head.
+                            if (
+                                lockedAnchorIds &&
+                                prev.dataId &&
+                                lockedAnchorIds.has(prev.dataId)
+                            ) {
+                                break;
+                            }
                             if (BREAK_LOGIC[prev.type]?.keepWithNext) {
                                 breakPos = prev.pos;
                                 carryHeight += prev.height;
@@ -766,12 +916,18 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                             (firstMovingType === ScreenplayElement.Dialogue ||
                                 firstMovingType === ScreenplayElement.Parenthetical);
 
+                        // Anchor = data-id of the first node that moved to the new page.
+                        // When backCount==0 the current node is the one moving (no walkback);
+                        // otherwise the carried-back node from the buffer owns the anchor.
+                        const anchorDataId = backCount === 0 ? dataId : firstMovingNode?.dataId;
+
                         const breakInfo: PageBreakInfo = {
                             pos: breakPos,
                             pagenum: pagenum + 1,
                             freespace: Math.max(0, freespace),
                             contdName: isDialogueSplit ? lastCharName : "",
                             splitNodeType: null,
+                            anchorId: anchorDataId,
                         };
                         breaks.push(breakInfo);
                         pagenum++;
@@ -812,26 +968,218 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 }
 
                 // Compute remaining space on the last page so the last-page widget
-                // can pad it to full page height.
-                const lastPageFreespace = Math.max(0, contentHeight - pagePos);
+                // can pad it to full page height. Mutable because orphan handling
+                // may consume it: when an orphan synthetic empty page lands at
+                // doc end, it absorbs this freespace so the last real page stays
+                // at its full height and the empty page renders after it.
+                let lastPageFreespace = Math.max(0, contentHeight - pagePos);
+
+                // --- Orphan page handling ---
+                // A locked page whose anchor data-id is no longer present in the doc
+                // becomes an "orphan" — we insert a synthetic empty-page break so the
+                // page still appears in the layout (preserving its locked number).
+                // Orphans are placed at the doc position of the next surviving lock
+                // (or doc end) and consume a full content-height of vertical space.
+                if (pageLocks) {
+                    const seenAnchors = new Set<string>();
+                    for (const b of breaks) {
+                        if (b.anchorId) seenAnchors.add(b.anchorId);
+                    }
+
+                    // Tokens for ordered comparison. Provisional pages (no token in
+                    // the lock map) aren't relevant here — only locked entries can be
+                    // orphans. We need the orphan list in TOKEN order so insertions
+                    // happen at the right spots.
+                    type OrphanEntry = { anchorId: string; token: SceneToken };
+                    const orphans: OrphanEntry[] = [];
+                    for (const [anchorId, page] of Object.entries(pageLocks)) {
+                        if (anchorId === PAGE_ONE_KEY) continue;
+                        if (!page?.token) continue;
+                        if (seenAnchors.has(anchorId)) continue;
+                        orphans.push({ anchorId, token: page.token });
+                    }
+
+                    if (orphans.length > 0) {
+                        // Build an ordered list of live-locked anchors keyed by token,
+                        // so we can find the "next live lock after orphan X" quickly.
+                        type LiveLock = { anchorId: string; token: SceneToken; pos: number };
+                        const liveLocks: LiveLock[] = [];
+                        for (const b of breaks) {
+                            if (!b.anchorId) continue;
+                            const lock = pageLocks[b.anchorId];
+                            if (lock?.token) liveLocks.push({ anchorId: b.anchorId, token: lock.token, pos: b.pos });
+                        }
+                        liveLocks.sort((a, b) => compareTokens(a.token, b.token));
+                        orphans.sort((a, b) => compareTokens(a.token, b.token));
+
+                        const docSize = newState.doc.content.size;
+
+                        for (const orphan of orphans) {
+                            // Token-gap segment this orphan belongs in: bounded by the
+                            // greatest live lock with a smaller token (prev) and the
+                            // smallest live lock with a larger token (next). Positions
+                            // of those bounding locks define the doc-position window
+                            // where this orphan can be slotted in.
+                            let prevLive: LiveLock | null = null;
+                            let nextLive: LiveLock | null = null;
+                            for (const l of liveLocks) {
+                                if (compareTokens(l.token, orphan.token) < 0) {
+                                    if (!prevLive || compareTokens(prevLive.token, l.token) < 0) {
+                                        prevLive = l;
+                                    }
+                                } else if (compareTokens(l.token, orphan.token) > 0) {
+                                    if (!nextLive || compareTokens(l.token, nextLive.token) < 0) {
+                                        nextLive = l;
+                                    }
+                                }
+                            }
+                            const segmentStart = prevLive?.pos ?? 0;
+                            const segmentEnd = nextLive?.pos ?? docSize;
+
+                            // First try to consume an existing provisional break inside
+                            // this segment. That break is the natural overflow from the
+                            // previous page — by re-anchoring it to the orphan, we make
+                            // the overflow content flow INTO the empty deleted-page slot
+                            // (Final Draft-style) instead of producing a phantom A page
+                            // alongside a separately-rendered empty page.
+                            let consumed = false;
+                            for (let j = 0; j < breaks.length; j++) {
+                                const b = breaks[j];
+                                if (b.pos < segmentStart) continue;
+                                if (b.pos >= segmentEnd) break;
+                                const bLock = b.anchorId ? pageLocks[b.anchorId] : undefined;
+                                if (bLock?.token) continue; // already a locked break — skip
+                                // Provisional in the orphan's segment: reassign anchorId
+                                // so the label flips from "NA" to the orphan's frozen label.
+                                b.anchorId = orphan.anchorId;
+                                liveLocks.push({
+                                    anchorId: orphan.anchorId,
+                                    token: orphan.token,
+                                    pos: b.pos,
+                                });
+                                liveLocks.sort((a, b) => compareTokens(a.token, b.token));
+                                consumed = true;
+                                break;
+                            }
+
+                            if (consumed) continue;
+
+                            // No provisional to absorb the orphan — fall back to a
+                            // synthetic empty-page break at the segment's end position.
+                            //
+                            // Insert index walks the breaks list. We want the synthetic
+                            // to land at segmentEnd, AFTER any break at the same pos
+                            // whose token is smaller (so multiple orphans at one
+                            // segmentEnd line up in token order: orphan-2, orphan-3,
+                            // then the live lock that bounds the segment).
+                            let insertIdx = breaks.length;
+                            for (let j = 0; j < breaks.length; j++) {
+                                const b = breaks[j];
+                                if (b.pos > segmentEnd) {
+                                    insertIdx = j;
+                                    break;
+                                }
+                                if (b.pos === segmentEnd) {
+                                    const bLock = b.anchorId ? pageLocks[b.anchorId] : undefined;
+                                    if (
+                                        bLock?.token &&
+                                        compareTokens(orphan.token, bLock.token) < 0
+                                    ) {
+                                        insertIdx = j;
+                                        break;
+                                    }
+                                }
+                            }
+
+                            // Freespace transfer: the synthetic empty page's widget
+                            // renders the prev→empty transition (footer of previous
+                            // page + chrome + empty content area). For the previous
+                            // page to keep its full height, the synthetic must absorb
+                            // its bottom freespace. That freespace currently lives on
+                            // the break that the synthetic is being inserted BEFORE
+                            // (either a lock force-break at the same pos, or the last-
+                            // page widget at doc end). Transfer it, then zero out the
+                            // donor — its "previous page" is now the empty synthetic,
+                            // which already gets a full `contentHeight` slot, so no
+                            // additional freespace is needed there.
+                            let syntheticFreespace = 0;
+                            if (
+                                insertIdx < breaks.length &&
+                                breaks[insertIdx].pos === segmentEnd
+                            ) {
+                                syntheticFreespace = breaks[insertIdx].freespace;
+                                breaks[insertIdx].freespace = 0;
+                            } else if (insertIdx === breaks.length) {
+                                // Doc end — the synthetic is the new "last empty page",
+                                // and the existing last-page widget would have padded
+                                // out the freespace below the previous real page.
+                                // Transfer that to the synthetic.
+                                syntheticFreespace = lastPageFreespace;
+                                lastPageFreespace = 0;
+                            }
+
+                            const synthetic: PageBreakInfo = {
+                                pos: segmentEnd,
+                                pagenum: 0, // re-numbered below
+                                freespace: syntheticFreespace,
+                                contdName: "",
+                                splitNodeType: null,
+                                anchorId: orphan.anchorId,
+                                isEmpty: true,
+                            };
+                            breaks.splice(insertIdx, 0, synthetic);
+                            liveLocks.push({
+                                anchorId: orphan.anchorId,
+                                token: orphan.token,
+                                pos: segmentEnd,
+                            });
+                            liveLocks.sort((a, b) => compareTokens(a.token, b.token));
+                        }
+
+                        // Renumber pagenums after insertions (synthetic breaks have pagenum: 0).
+                        for (let i = 0; i < breaks.length; i++) {
+                            breaks[i].pagenum = i + 2; // page 1 has no break; first break starts page 2.
+                        }
+                    }
+                }
+
+                // --- Label assignment ---
+                // Run computeSceneLabels over [page1Anchor, ...breakAnchors] so locked
+                // pages keep their frozen labels, provisional inserts get suffix labels
+                // (e.g. "4A"), and pages past the last lock continue the integer sequence.
+                let firstPageLabel = "1";
+                if (pageLocks) {
+                    const labels = computePageLabels(breaks, pageLocks, skippedLetters);
+                    firstPageLabel = labels[0];
+                    for (let i = 0; i < breaks.length; i++) {
+                        const label = labels[i + 1];
+                        const prevLabel = labels[i];
+                        breaks[i].label = label;
+                        breaks[i].prevLabel = prevLabel;
+                    }
+                }
 
                 // Check if breaks actually changed compared to mapped old breaks.
                 const breaksChanged =
                     fullRemeasure ||
                     lastPageFreespace !== value.lastPageFreespace ||
+                    firstPageLabel !== value.firstPageLabel ||
                     breaks.length !== mappedOldBreaks.length ||
                     breaks.some(
                         (b, i) =>
                             b.pos !== mappedOldBreaks[i].pos ||
                             b.freespace !== mappedOldBreaks[i].freespace ||
-                            b.contdName !== mappedOldBreaks[i].contdName,
+                            b.contdName !== mappedOldBreaks[i].contdName ||
+                            b.label !== mappedOldBreaks[i].label ||
+                            b.prevLabel !== mappedOldBreaks[i].prevLabel ||
+                            !!b.isEmpty !== !!mappedOldBreaks[i].isEmpty,
                     );
 
                 const decset = breaksChanged
-                    ? buildDecorations(newState.doc, breaks, lastPageFreespace, options)
+                    ? buildDecorations(newState.doc, breaks, lastPageFreespace, firstPageLabel, options)
                     : value.decset.map(tr.mapping, tr.doc);
 
-                return { decset, breaks, lastPageFreespace };
+                return { decset, breaks, lastPageFreespace, firstPageLabel };
             },
         },
         appendTransaction() {
@@ -927,6 +1275,20 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                 .pagination-footer-right {
                     text-align: right;
                 }
+
+                .pagination-empty-page {
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    background: var(--editor-script-bg);
+                    color: var(--secondary-text);
+                    font-size: 0.85rem;
+                    font-weight: 600;
+                    letter-spacing: 0.08em;
+                    opacity: 0.35;
+                    text-transform: uppercase;
+                    box-sizing: border-box;
+                }
             `;
             document.head.appendChild(style);
         }
@@ -1062,3 +1424,52 @@ export function getPageForPos(editor: Editor, pos: number): number {
     }
     return page;
 }
+
+/**
+ * Returns the display label (e.g. "4", "4A") for the page containing
+ * the given document position. Falls back to the integer pagenum when
+ * page locking isn't active.
+ */
+export function getPageLabelForPos(editor: Editor, pos: number): string {
+    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
+    if (!state) return "1";
+    if (state.breaks.length === 0) return state.firstPageLabel;
+    let label = state.firstPageLabel;
+    for (const b of state.breaks) {
+        if (b.pos > pos) break;
+        label = b.label ?? String(b.pagenum);
+    }
+    return label;
+}
+
+/**
+ * Returns the ordered list of page anchors for the current document
+ * (page 1 sentinel first, then the data-id of each subsequent page's
+ * first top-level node). Used by the ProductionPanel to snapshot the
+ * current layout when locking pages and to compute provisional labels.
+ *
+ * Synthetic empty-page breaks contribute their orphan anchor id, so the
+ * sequence stays aligned with what the user sees in the editor.
+ */
+export function getPageAnchors(editor: Editor): string[] {
+    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
+    if (!state) return [PAGE_ONE_KEY];
+    const out: string[] = [PAGE_ONE_KEY];
+    for (const b of state.breaks) {
+        if (b.anchorId) out.push(b.anchorId);
+    }
+    return out;
+}
+
+/**
+ * Force a pagination recompute. Call when the page-lock map or the
+ * page-locking toggle changes — layout may shift even though the
+ * document content did not.
+ */
+export function refreshPageLocking(editor: Editor | null): void {
+    if (!editor || !editor.view) return;
+    const tr = editor.state.tr;
+    tr.setMeta("forcePaginationUpdate", true);
+    tr.setMeta("addToHistory", false);
+    editor.view.dispatch(tr);
+}
diff --git a/src/lib/screenplay/page-locking.ts b/src/lib/screenplay/page-locking.ts
new file mode 100644
index 00000000..5729c932
--- /dev/null
+++ b/src/lib/screenplay/page-locking.ts
@@ -0,0 +1,28 @@
+/**
+ * Page-locking primitives.
+ *
+ * Page locks are anchored to the top-level node that begins each locked page
+ * (every screenplay node already carries a stable `data-id`). The first page
+ * has no anchor node — it is keyed by the sentinel `PAGE_ONE_KEY` so the lock
+ * map can always describe page 1 explicitly.
+ *
+ * Numbering uses the same `SceneToken` machinery as scene locking. We pass
+ * the ordered list of page anchors to `computeSceneLabels`; locked pages get
+ * their frozen token, intermediate provisional pages get suffix labels
+ * ("4A", "4B"), and pages appended after the last lock get the next integer.
+ *
+ * Token math, label compilation, and order comparison all live in
+ * `scene-locking.ts` and are re-used here unchanged.
+ */
+
+import type { SceneToken } from "./scene-locking";
+
+/** Sentinel key used for the first page (which has no anchor node). */
+export const PAGE_ONE_KEY = "__page1__";
+
+export type PersistentPage = {
+    /** Frozen structural position under production page-lock. */
+    token?: SceneToken;
+};
+
+export type PersistentPageMap = { [anchorId: string]: PersistentPage };
diff --git a/src/lib/screenplay/popup.ts b/src/lib/screenplay/popup.ts
index e9b54903..0cb26320 100644
--- a/src/lib/screenplay/popup.ts
+++ b/src/lib/screenplay/popup.ts
@@ -25,6 +25,10 @@ export type PopupUnlockScenesData = {
     confirmUnlock: () => void;
 };
 
+export type PopupUnlockPagesData = {
+    confirmUnlock: () => void;
+};
+
 // ------------------------------ //
 //         GENERIC POPUP          //
 // ------------------------------ //
@@ -33,7 +37,8 @@ export type PopupUnionData =
     | PopupCharacterData
     | PopupSceneData
     | PopupUploadToCloudData
-    | PopupUnlockScenesData;
+    | PopupUnlockScenesData
+    | PopupUnlockPagesData;
 
 export enum PopupType {
     NewCharacter,
@@ -42,6 +47,7 @@ export enum PopupType {
     EditScene,
     UploadToCloud,
     UnlockScenes,
+    UnlockPages,
 }
 
 export type PopupData<DataType extends PopupUnionData> = {
@@ -98,3 +104,10 @@ export const unlockScenesPopup = (confirmUnlock: () => void, userCtx: UserContex
         data: { confirmUnlock },
     });
 };
+
+export const unlockPagesPopup = (confirmUnlock: () => void, userCtx: UserContextType) => {
+    userCtx.updatePopup({
+        type: PopupType.UnlockPages,
+        data: { confirmUnlock },
+    });
+};
diff --git a/src/lib/utils/hooks.ts b/src/lib/utils/hooks.ts
index 4d6c8b17..2f8be8f6 100644
--- a/src/lib/utils/hooks.ts
+++ b/src/lib/utils/hooks.ts
@@ -13,6 +13,7 @@ import { DEFAULT_KEYBINDS, executeKeybindAction, KeybindId } from "./keybinds";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { ProjectRole } from "../../generated/client/browser";
 import { isTauri } from "@tauri-apps/api/core";
+import { useTranslations } from "next-intl";
 
 interface Position {
     x: number;
@@ -502,6 +503,34 @@ const useDesktopBridgeAuth = () => {
     return { completeBridgeAuth };
 };
 
+const useFormatTimestamp = () => {
+    const t = useTranslations("dates");
+    return useCallback(
+        (ts: number | string | Date): string => {
+            const date = new Date(ts);
+            const now = new Date();
+            const diffMs = now.getTime() - date.getTime();
+            const diffMins = Math.floor(diffMs / 60000);
+
+            if (diffMins < 1) return t("justNow");
+            if (diffMins < 60) return t("minutesAgo", { mins: diffMins });
+
+            const diffHours = Math.floor(diffMins / 60);
+            if (diffHours < 24) return t("hoursAgo", { hours: diffHours });
+
+            const diffDays = Math.floor(diffHours / 24);
+            if (diffDays < 7) return t("daysAgo", { days: diffDays });
+
+            return date.toLocaleDateString(undefined, {
+                month: "short",
+                day: "numeric",
+                year: date.getFullYear() !== now.getFullYear() ? "numeric" : undefined,
+            });
+        },
+        [t],
+    );
+};
+
 export {
     useDraggable,
     useUser,
@@ -518,4 +547,5 @@ export {
     useCachedProjectInfo,
     useProjectIdFromUrl,
     useDesktopBridgeAuth,
+    useFormatTimestamp,
 };

From 000808973b1574a147fcaa7b16c1ce169913159c Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Tue, 26 May 2026 01:36:59 +0200
Subject: [PATCH 56/76] fixed page locking, fixed page numbering in pdf export

---
 src/lib/adapters/pdf/pdf-adapter.ts           | 32 +++++++-
 src/lib/adapters/pdf/pdf.worker.ts            | 23 +++++-
 .../extensions/pagination-extension.ts        | 82 ++++++++++++++++++-
 3 files changed, 131 insertions(+), 6 deletions(-)

diff --git a/src/lib/adapters/pdf/pdf-adapter.ts b/src/lib/adapters/pdf/pdf-adapter.ts
index 245e84e5..b3fb8875 100644
--- a/src/lib/adapters/pdf/pdf-adapter.ts
+++ b/src/lib/adapters/pdf/pdf-adapter.ts
@@ -153,7 +153,12 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
 
             // ── Direct-child pagination widget → explicit page break ──
             if (el.classList.contains("pagination-page-break")) {
-                allLines.push({ runs: [], y: 0, type: "__page_break__" });
+                allLines.push({
+                    runs: [],
+                    y: 0,
+                    type: "__page_break__",
+                    pageLabel: this.extractPageLabel(el),
+                });
                 continue;
             }
 
@@ -224,7 +229,12 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
                 }
 
                 // Emit page break sentinel
-                allLines.push({ runs: [], y: 0, type: "__page_break__" });
+                allLines.push({
+                    runs: [],
+                    y: 0,
+                    type: "__page_break__",
+                    pageLabel: this.extractPageLabel(splitWidget),
+                });
 
                 // Collect lines AFTER the split widget
                 const afterLines = this.collectParagraphLines(el, nodeType, splitWidget, "after");
@@ -574,6 +584,24 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
         }
     }
 
+    /**
+     * Read the user-visible page label out of a `.pagination-page-break`
+     * widget. The widget renders its destination page's header inside
+     * `.pagination-header-area > .pagination-header-right` (the configured
+     * headerRight template, with `{page}` already substituted) — so the
+     * textContent IS the final label string the user sees. Under page
+     * locking this string is the frozen "4A." form; otherwise it's the
+     * default sequential "4.". Returns undefined when no header is
+     * present so the worker falls back to its integer pageNumber.
+     */
+    private extractPageLabel(widget: HTMLElement): string | undefined {
+        const right = widget.querySelector(
+            ".pagination-header-area .pagination-header-right",
+        ) as HTMLElement | null;
+        if (!right) return undefined;
+        return right.textContent?.trim() ?? undefined;
+    }
+
     // ── VisualLine[] → PDF ───────────────────────────────────────────────────
 
     /**
diff --git a/src/lib/adapters/pdf/pdf.worker.ts b/src/lib/adapters/pdf/pdf.worker.ts
index 4314db7a..5bd6f7d8 100644
--- a/src/lib/adapters/pdf/pdf.worker.ts
+++ b/src/lib/adapters/pdf/pdf.worker.ts
@@ -19,6 +19,12 @@ export interface VisualLine {
     runs: TextRun[];
     y: number; // browser Y position in pixels (for line-spacing within a page)
     type?: string; // e.g. "dialogue", "character", "scene", "__page_break__"
+    /** Header text for the page that begins AFTER this sentinel.
+     *  Only set on `__page_break__` lines. Carries the user-visible page
+     *  label ("4.", "4A.", a custom-templated string) read straight from
+     *  the pagination widget's DOM, so page-lock labels propagate to PDF
+     *  exports unchanged. */
+    pageLabel?: string;
 }
 
 /** Font file descriptor for registration in jsPDF. */
@@ -284,7 +290,7 @@ async function renderLines(
 
             // Page number header on pages 2+
             if (showPageNumbers) {
-                drawPageHeader(doc, currentPage, pageSize);
+                drawPageHeader(doc, currentPage, pageSize, line.pageLabel);
             }
 
             // Draw Character Name (CONT'D) at the top of the new page
@@ -415,12 +421,23 @@ async function drawMultiFontText(
     }
 }
 
-function drawPageHeader(doc: jsPDF, pageNumber: number, pageSize: { width: number; height: number }): void {
+function drawPageHeader(
+    doc: jsPDF,
+    pageNumber: number,
+    pageSize: { width: number; height: number },
+    label?: string,
+): void {
     if (pageNumber <= 1) return;
+    // Prefer the label captured from the pagination widget — under page
+    // locking this carries the frozen "4A." style label, otherwise it's the
+    // sequential "4." rendered by the default headerRight template. An empty
+    // string means the editor's custom header is intentionally blank (e.g.
+    // page 1's customHeader override) — honour that and skip drawing.
+    const text = label ?? `${pageNumber}.`;
+    if (!text) return;
     doc.setFont("CourierPrime", "normal");
     doc.setFontSize(FONT_SIZE);
     doc.setTextColor(0, 0, 0);
-    const text = `${pageNumber}.`;
     doc.text(text, pageSize.width - PAGE_RIGHT, HEADER_Y, {
         align: "right",
         baseline: "top",
diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index 52c1b1df..108f0166 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -3,8 +3,9 @@ import { CircularBuffer } from "@src/lib/utils/circular-buffer";
 import { ScreenplayElement } from "@src/lib/utils/enums";
 import { Editor, Extension } from "@tiptap/core";
 import { Node } from "@tiptap/pm/model";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
+import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
+import { ySyncPluginKey } from "@tiptap/y-tiptap";
 
 import { compareTokens, computeSceneLabels, SceneToken } from "@src/lib/screenplay/scene-locking";
 import { PAGE_ONE_KEY, PersistentPageMap } from "@src/lib/screenplay/page-locking";
@@ -1185,6 +1186,46 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
         appendTransaction() {
             return null;
         },
+        filterTransaction(tr) {
+            // Page-lock guard: prevent content from spilling upward out of a
+            // locked page. The signature of that spill — Backspace at the
+            // start of a locked anchor, Delete at the end of the node before
+            // it, or a selection delete that swallows the anchor — is the
+            // locked anchor's data-id disappearing from the top-level node
+            // list. If that would happen, reject the transaction so the
+            // cursor stays put and no content moves across the lock.
+            if (!tr.docChanged) return true;
+
+            // Allow yjs sync (remote updates and yjs-based undo/redo) through
+            // unconditionally — cross-peer consistency must not be blocked by
+            // local lock enforcement, and the lock map itself lives in the
+            // Yjs doc so peers agree on which pages are locked.
+            if (tr.getMeta(ySyncPluginKey)) return true;
+
+            const opts = extension.options as PaginationOptions;
+            if (!opts.getPageLocking?.()) return true;
+
+            const pageLocks = opts.getPageLocks?.();
+            if (!pageLocks) return true;
+
+            // PAGE_ONE_KEY has no node to defend — page 1 can't lose its
+            // lock through doc edits.
+            const lockedAnchors: string[] = [];
+            for (const key of Object.keys(pageLocks)) {
+                if (key !== PAGE_ONE_KEY) lockedAnchors.push(key);
+            }
+            if (lockedAnchors.length === 0) return true;
+
+            const present = new Set<string>();
+            tr.doc.forEach((node) => {
+                const dataId = node.attrs?.["data-id"];
+                if (typeof dataId === "string") present.add(dataId);
+            });
+            for (const anchor of lockedAnchors) {
+                if (!present.has(anchor)) return false;
+            }
+            return true;
+        },
         props: {
             decorations(state) {
                 return (paginationKey.getState(state) as PaginationState)?.decset ?? DecorationSet.empty;
@@ -1316,6 +1357,45 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
         return [createPaginationPlugin(this)];
     },
 
+    addKeyboardShortcuts() {
+        return {
+            Backspace: ({ editor }) => {
+                // joinBackward has a variant — joinMaybeClear — that deletes
+                // the PREVIOUS block instead of the current one. It fires when
+                // both blocks are empty. If that previous block is a locked
+                // page anchor, the plugin's filterTransaction rejects the
+                // resulting transaction (the anchor's data-id would go
+                // missing), and the user sees the cursor stuck on the second
+                // empty line. Patch the case by deleting the current empty
+                // block ourselves and parking the cursor inside the preserved
+                // anchor — the natural "step up one line" behavior.
+                const { state, view } = editor;
+                const { $from, empty } = state.selection;
+                if (!empty || $from.parentOffset !== 0) return false;
+                if ($from.parent.textContent.length !== 0) return false;
+
+                const opts = this.options as PaginationOptions;
+                if (!opts.getPageLocking?.()) return false;
+                const pageLocks = opts.getPageLocks?.();
+                if (!pageLocks) return false;
+
+                const curStart = $from.before();
+                if (curStart === 0) return false;
+
+                const prev = state.doc.resolve(curStart).nodeBefore;
+                if (!prev || prev.textContent.length !== 0) return false;
+
+                const prevDataId = prev.attrs?.["data-id"];
+                if (typeof prevDataId !== "string" || !pageLocks[prevDataId]) return false;
+
+                const tr = state.tr.delete(curStart, $from.after());
+                tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
+                view.dispatch(tr);
+                return true;
+            },
+        };
+    },
+
     addCommands() {
         return {
             updatePageSize:

From 4e716f40b43dfa086b24c6ee6cd5c3656454b430 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Thu, 28 May 2026 01:07:13 +0200
Subject: [PATCH 57/76] fixes to page locking, fixing to last page in
 pagination, fix to redirect

---
 README.md                                     |   8 +-
 components/navbar/ProductionPanel.tsx         |  26 +-
 src/lib/editor/use-document-editor.ts         |   9 +-
 src/lib/project/project-repository.ts         |   2 +-
 .../extensions/pagination-extension.ts        | 249 ++++++++++++++++--
 src/lib/screenplay/page-locking.ts            |   6 +
 src/lib/utils/redirects.ts                    |   6 +-
 styles/scriptio.css                           |   9 +
 8 files changed, 273 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index 0eaac3cd..9f139bfa 100644
--- a/README.md
+++ b/README.md
@@ -19,16 +19,18 @@
 - **Cloud Synchronization**
 - **Real-time Collaboration**
 - **Cross-platform** (Windows, MacOS, browser)
-- **Industry-standard Formats** (PDF, Fountain, Final Draft)
+- **Industry Formatting** (layout, page breaks, dual dialogue)
+- **Compatibility Formats** (PDF, Fountain, Final Draft)
+- **Production Ready** (revisions, scene & page locking)
 - **Scene Management** (easy navigation, reordering)
 - **Character Management** (color highlighting, synopsis)
 - **Beat Board** (story cards, outlining)
-- **Smart formatting** (context aware auto-completion)
+- **Smart Editor** (context aware auto-completion, spellchecker)
 - **Customization** (themes & custom keybinds)
 - **Statistics** (distribution, frequency)
 - **Search & Replace** (advanced filtering)
 - **Script Comments** (inline annotations)
-- **Focus mode** (distraction-free writing)
+- **Focus Mode** (distraction-free writing)
 
 # Core Values
 
diff --git a/components/navbar/ProductionPanel.tsx b/components/navbar/ProductionPanel.tsx
index dee0c271..afc9c664 100644
--- a/components/navbar/ProductionPanel.tsx
+++ b/components/navbar/ProductionPanel.tsx
@@ -9,7 +9,7 @@ import { UserContext } from "@src/context/UserContext";
 import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
 import { computeSceneItems } from "@src/lib/screenplay/scenes";
 import { unlockPagesPopup, unlockScenesPopup } from "@src/lib/screenplay/popup";
-import { getPageAnchors } from "@src/lib/screenplay/extensions/pagination-extension";
+import { getPageAnchors, getPageAnchorInfo } from "@src/lib/screenplay/extensions/pagination-extension";
 import Switch from "@components/utils/Switch";
 
 import styles from "./ProductionPanel.module.css";
@@ -192,7 +192,8 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         if (next) {
             if (!editor) return;
             repository.transact(() => {
-                const anchors = getPageAnchors(editor);
+                const anchorInfos = getPageAnchorInfo(editor);
+                const anchors = anchorInfos.map((a) => a.anchorId);
                 const persistentSnapshot = repository.pages;
                 // Idempotent: any anchor that already has a token keeps it.
                 // Only provisional anchors (no token yet) get a freshly-computed
@@ -204,9 +205,16 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                     "suffix",
                     skippedSceneLetters,
                 );
-                computed.forEach((label) => {
+                computed.forEach((label, idx) => {
                     if (label.status === "provisional") {
-                        repository.upsertPage(label.uuid, { token: label.token });
+                        // splitOffset is captured alongside the token so the
+                        // pagination plugin can reproduce mid-node splits
+                        // (straddling dialogues) on recompute instead of
+                        // force-pushing the whole anchor node forward.
+                        repository.upsertPage(label.uuid, {
+                            token: label.token,
+                            splitOffset: anchorInfos[idx]?.splitOffset,
+                        });
                     }
                 });
                 repository.setPageLocking(true);
@@ -219,7 +227,8 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
     const handlePageRelock = () => {
         if (!repository || isReadOnly || !editor) return;
         repository.transact(() => {
-            const anchors = getPageAnchors(editor);
+            const anchorInfos = getPageAnchorInfo(editor);
+            const anchors = anchorInfos.map((a) => a.anchorId);
             const persistentSnapshot = repository.pages;
             const currentLabels = computeSceneLabels(
                 anchors,
@@ -227,9 +236,12 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                 "suffix",
                 skippedSceneLetters,
             );
-            currentLabels.forEach((label) => {
+            currentLabels.forEach((label, idx) => {
                 if (label.status === "provisional") {
-                    repository.upsertPage(label.uuid, { token: label.token });
+                    repository.upsertPage(label.uuid, {
+                        token: label.token,
+                        splitOffset: anchorInfos[idx]?.splitOffset,
+                    });
                 }
             });
         });
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index f8ce413b..c1eb331f 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -371,6 +371,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
                               getPageLocking: () => !!ext.pageLocking,
                               getPageLocks: () => ext.persistentPages ?? {},
                               getSkippedLetters: () => ext.skippedSceneLetters ?? [],
+                              getScenes: () => ext.repository?.scenes ?? {},
                           }
                         : {
                               pageGap: 20,
@@ -615,11 +616,17 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     // Pagination only reads these via getter closures on its options, so
     // we must explicitly kick it to re-run; otherwise stale labels render
     // until the user types.
+    //
+    // persistentScenes is included so toggling a scene's `omitted` flag
+    // re-runs pagination immediately: omitted body paragraphs collapse to
+    // zero height in the layout (mirroring the visual display:none from
+    // scene-locking-extension), so the page they sit on must shrink/grow
+    // without waiting for the next keystroke.
     useEffect(() => {
         if (editor && config.features.paginationMode === "screenplay") {
             refreshPageLocking(editor);
         }
-    }, [editor, pageLocking, persistentPages, skippedSceneLetters, config.features.paginationMode]);
+    }, [editor, pageLocking, persistentPages, persistentScenes, skippedSceneLetters, config.features.paginationMode]);
 
     // Refresh search highlights
     useEffect(() => {
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index 51f79fe9..f8b37bc7 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -456,7 +456,7 @@ export class ProjectRepository {
         const existing = (map.get(anchorId) as PersistentPage | undefined) ?? {};
 
         const merged: PersistentPage = { ...existing };
-        const FIELDS = ["token"] as const;
+        const FIELDS = ["token", "splitOffset"] as const;
         for (const key of FIELDS) {
             if (key in data) {
                 (merged as Record<string, unknown>)[key] = data[key];
diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index 108f0166..7df545d9 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -9,6 +9,7 @@ import { ySyncPluginKey } from "@tiptap/y-tiptap";
 
 import { compareTokens, computeSceneLabels, SceneToken } from "@src/lib/screenplay/scene-locking";
 import { PAGE_ONE_KEY, PersistentPageMap } from "@src/lib/screenplay/page-locking";
+import type { PersistentSceneMap } from "@src/lib/screenplay/scenes";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -123,6 +124,11 @@ export interface PaginationOptions {
     getPageLocks?: () => PersistentPageMap;
     /** Letters skipped from generated labels (shared with scene locking). */
     getSkippedLetters?: () => readonly string[];
+    /** Persistent scene map. Used to detect omitted scenes so their hidden
+     *  body paragraphs contribute zero height to the page layout — without
+     *  this, omission would visually collapse the body but pagination would
+     *  still allocate full height, leaving the page short on real content. */
+    getScenes?: () => PersistentSceneMap;
 }
 
 export interface PageBreakInfo {
@@ -144,6 +150,11 @@ export interface PageBreakInfo {
     /** Display label for the page ending before this break — used by the footer of
      *  the previous page. Undefined for the first break (footer uses page-1 label). */
     prevLabel?: string;
+    /** Character offset within the anchor node where the break occurs.
+     *  Set for sentence-split breaks (mid-node) — both the original split and
+     *  the locked re-application of it — and read by the production panel when
+     *  freezing page locks so the split can be reproduced on later recomputes. */
+    splitOffset?: number;
 }
 
 declare module "@tiptap/core" {
@@ -551,6 +562,8 @@ const setupTestDiv = (editorDom: HTMLElement, _: PaginationOptions): HTMLElement
 interface SplitResult {
     /** Absolute document position of the split point (inside the straddling node's text). */
     pos: number;
+    /** Character offset within the node's text where the split occurs (= pos - nodeDocPos - 1). */
+    offset: number;
     /** Rendered height of the portion staying on the current page. */
     topHeight: number;
     /** Rendered height of the portion moving to the next page. */
@@ -611,7 +624,12 @@ function trySplitNode(
             // The split position in document space:
             // nodeDocPos + 1 skips the node's opening token; topText.length then walks
             // through the text characters (marks are zero-width in ProseMirror's position space).
-            return { pos: nodeDocPos + 1 + topText.length, topHeight, bottomHeight };
+            return {
+                pos: nodeDocPos + 1 + topText.length,
+                offset: topText.length,
+                topHeight,
+                bottomHeight,
+            };
         }
     }
 
@@ -748,7 +766,16 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 const lockedAnchorIds: Set<string> | null = pageLocks
                     ? new Set(Object.keys(pageLocks).filter((k) => k !== PAGE_ONE_KEY))
                     : null;
+                // Tracks locked anchors already consumed by a break in this pass.
+                // ProseMirror's split (Enter at position 0 of a node) duplicates
+                // node attrs across both halves — including data-id — so until
+                // node-id-dedup-extension runs in appendTransaction we transiently
+                // see the same locked anchor twice. Without this set, both halves
+                // would each force a page break, briefly rendering a phantom page
+                // with the same locked label until the dedup transaction fires.
+                const consumedAnchors = new Set<string>();
                 const skippedLetters = options.getSkippedLetters?.() ?? [];
+                const scenesMap = options.getScenes?.() ?? null;
 
                 const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
                 const breaks: PageBreakInfo[] = [];
@@ -761,6 +788,24 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 // with "CHARACTER (CONT'D)" on the next page.
                 let lastCharName = "";
 
+                // Tracks whether the currently-open scene is OMITTED. Body
+                // paragraphs under an omitted scene are hidden via decorations
+                // (display:none) but still present in the document — pagination
+                // must mirror the visual collapse by treating them as zero-
+                // height, otherwise the page they sit on appears short while
+                // the layout still allocates their original height.
+                let currentSceneOmitted = false;
+
+                // Set when the short-circuit exits the per-node loop early.
+                // pagePos at that point reflects only the carry node(s) sitting
+                // on the new page right after the matched break — not the real
+                // last page — so the post-loop freespace computation must NOT
+                // derive from pagePos. The previous pass's lastPageFreespace is
+                // still authoritative because the short-circuit condition (matching
+                // pos / freespace / contdName past maxChangedPos) guarantees every
+                // subsequent page is byte-identical to the previous layout.
+                let shortCircuited = false;
+
                 let lastNodes: CircularBuffer<NodeInfo> = new CircularBuffer(3);
                 for (let i = 0; i < childCount; i++) {
                     const node = newState.doc.child(i);
@@ -794,6 +839,15 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
 
                     const dataId: string | undefined = node.attrs["data-id"];
 
+                    // Update the omitted-scene flag at each Scene boundary. Body
+                    // paragraphs that follow stay flagged until the next Scene
+                    // resets it. Scene headings themselves always render (with
+                    // the OMITTED overlay sitting on top) so their height is
+                    // kept regardless.
+                    if (nodeType === ScreenplayElement.Scene) {
+                        currentSceneOmitted = !!(scenesMap && dataId && scenesMap[dataId]?.omitted);
+                    }
+
                     // --- Force page break for "start new page" elements ---
                     // If this node type is configured to start a new page and we're
                     // not already at the top of a page, insert a break before it.
@@ -814,25 +868,109 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                     // --- Force page break for locked page anchors ---
                     // O(1) Set.has when locking is on; the leading `lockedAnchorIds &&`
                     // short-circuits to false when locking is disabled — hot-path safe.
-                    if (lockedAnchorIds && dataId && pagePos > 0 && lockedAnchorIds.has(dataId)) {
-                        const freespace = contentHeight - pagePos;
-                        breaks.push({
-                            pos,
-                            pagenum: ++pagenum,
-                            freespace: Math.max(0, freespace),
-                            contdName: "",
-                            splitNodeType: null,
-                            anchorId: dataId,
-                        });
-                        pagePos = 0;
-                        lastNodes = new CircularBuffer(3);
+                    // The `consumedAnchors` guard ignores the transient duplicate
+                    // data-id that appears after Enter splits a locked anchor — only
+                    // the first occurrence in doc order is honored as the lock site,
+                    // matching the post-dedup state and avoiding a phantom break.
+                    if (
+                        lockedAnchorIds &&
+                        dataId &&
+                        lockedAnchorIds.has(dataId) &&
+                        !consumedAnchors.has(dataId)
+                    ) {
+                        consumedAnchors.add(dataId);
+                        const lockInfo = pageLocks?.[dataId];
+                        const splitOffset = lockInfo?.splitOffset;
+                        const textLen = node.textContent?.length ?? 0;
+
+                        if (
+                            pagePos > 0 &&
+                            splitOffset != null &&
+                            splitOffset > 0 &&
+                            splitOffset < textLen
+                        ) {
+                            // The lock was originally created on a mid-node sentence split
+                            // (straddling dialogue or action). Reproduce that split here:
+                            // top portion stays on the current page, break goes at the
+                            // stored offset, bottom portion starts the locked page. Without
+                            // this branch the whole node would be force-pushed to the next
+                            // page, making the locked page taller than its frozen layout
+                            // and forcing a phantom "A" page to be inserted before it.
+                            if (!element) element = serializer.serializeNode(node) as HTMLElement;
+
+                            const topText = node.textContent.slice(0, splitOffset);
+                            const topElement = element.cloneNode(false) as HTMLElement;
+                            topElement.textContent = topText;
+                            const topHeight = getHTMLHeight(
+                                topElement,
+                                editorDOM,
+                                node.type.name,
+                                options,
+                            );
+                            const bottomHeight = Math.max(0, height - topHeight);
+
+                            pagePos += topHeight;
+                            const freespace = contentHeight - pagePos;
+
+                            breaks.push({
+                                pos: pos + 1 + splitOffset,
+                                pagenum: ++pagenum,
+                                freespace: Math.max(0, freespace),
+                                contdName: logic?.showMoreContd ? lastCharName : "",
+                                splitNodeType: nodeType,
+                                anchorId: dataId,
+                                splitOffset,
+                            });
+
+                            pagePos = bottomHeight;
+                            lastNodes = new CircularBuffer(3);
+                            lastNodes.push({
+                                pos,
+                                type: nodeType,
+                                height: bottomHeight,
+                                positionTop: 0,
+                                dataId,
+                            });
+                            continue;
+                        }
+
+                        if (pagePos > 0) {
+                            // Whole-node lock: force break before the anchor so the locked
+                            // page begins exactly with this node.
+                            const freespace = contentHeight - pagePos;
+                            breaks.push({
+                                pos,
+                                pagenum: ++pagenum,
+                                freespace: Math.max(0, freespace),
+                                contdName: "",
+                                splitNodeType: null,
+                                anchorId: dataId,
+                            });
+                            pagePos = 0;
+                            lastNodes = new CircularBuffer(3);
+                        }
                     }
 
+                    // Omitted-scene body paragraphs are visually hidden by
+                    // scene-locking decorations (display:none) but still live in
+                    // the document. Treat them as zero-height so pagination
+                    // matches what the user actually sees on the page. The
+                    // measured height stays cached for cheap restoration when
+                    // the scene is un-omitted.
+                    const effectiveHeight =
+                        currentSceneOmitted && nodeType !== ScreenplayElement.Scene ? 0 : height;
+
                     // Accumulate height on current page
-                    pagePos += height;
+                    pagePos += effectiveHeight;
 
                     // We keep the last 3 nodes for orphan resolution on page break
-                    lastNodes.push({ pos, type: nodeType, height, positionTop: pagePos - height, dataId });
+                    lastNodes.push({
+                        pos,
+                        type: nodeType,
+                        height: effectiveHeight,
+                        positionTop: pagePos - effectiveHeight,
+                        dataId,
+                    });
 
                     // Page break needed — record it and reset page position
                     if (pagePos > contentHeight) {
@@ -862,6 +1000,10 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                                     splitNodeType: nodeType,
                                     // Anchor for page locking: the node being split owns both halves.
                                     anchorId: dataId,
+                                    // splitOffset is captured by the production panel when locking,
+                                    // so the same mid-node split can be reproduced on later recomputes
+                                    // instead of force-pushing the whole node onto the locked page.
+                                    splitOffset: split.offset,
                                 });
                                 // The bottom half of the split node is the first item on the new page.
                                 pagePos = split.bottomHeight;
@@ -962,6 +1104,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                                     // Spread preserves all fields (contdName, splitNodeType, …); override pagenum only.
                                     breaks.push({ ...mappedOldBreaks[j], pagenum });
                                 }
+                                shortCircuited = true;
                                 break;
                             }
                         }
@@ -973,7 +1116,17 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 // may consume it: when an orphan synthetic empty page lands at
                 // doc end, it absorbs this freespace so the last real page stays
                 // at its full height and the empty page renders after it.
-                let lastPageFreespace = Math.max(0, contentHeight - pagePos);
+                //
+                // When the per-node loop short-circuited, pagePos is the carry
+                // height after the matched break — NOT the height of the real
+                // last page — so deriving from it would make the last page's
+                // spacer grow or shrink with every edit on earlier pages. The
+                // short-circuit condition guarantees content past that break
+                // is identical to the previous pass, so the previously stored
+                // freespace is still the correct answer.
+                let lastPageFreespace = shortCircuited
+                    ? value.lastPageFreespace
+                    : Math.max(0, contentHeight - pagePos);
 
                 // --- Orphan page handling ---
                 // A locked page whose anchor data-id is no longer present in the doc
@@ -1360,19 +1513,18 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
     addKeyboardShortcuts() {
         return {
             Backspace: ({ editor }) => {
-                // joinBackward has a variant — joinMaybeClear — that deletes
-                // the PREVIOUS block instead of the current one. It fires when
-                // both blocks are empty. If that previous block is a locked
-                // page anchor, the plugin's filterTransaction rejects the
-                // resulting transaction (the anchor's data-id would go
-                // missing), and the user sees the cursor stuck on the second
-                // empty line. Patch the case by deleting the current empty
-                // block ourselves and parking the cursor inside the preserved
-                // anchor — the natural "step up one line" behavior.
+                // ProseMirror's joinMaybeClear (a joinBackward variant) deletes
+                // the PREVIOUS block instead of the current one whenever the
+                // previous block is empty and the two blocks share a type. If
+                // that empty previous block is a locked page anchor the plugin's
+                // filterTransaction rejects the resulting transaction — the
+                // anchor's data-id would disappear — and the cursor appears
+                // stuck. Patch both flavors of the case (empty current and
+                // non-empty current) so the locked anchor survives and the user
+                // still gets the natural "step up one line" / "merge up" feel.
                 const { state, view } = editor;
                 const { $from, empty } = state.selection;
                 if (!empty || $from.parentOffset !== 0) return false;
-                if ($from.parent.textContent.length !== 0) return false;
 
                 const opts = this.options as PaginationOptions;
                 if (!opts.getPageLocking?.()) return false;
@@ -1388,7 +1540,22 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                 const prevDataId = prev.attrs?.["data-id"];
                 if (typeof prevDataId !== "string" || !pageLocks[prevDataId]) return false;
 
-                const tr = state.tr.delete(curStart, $from.after());
+                const tr = state.tr;
+                if ($from.parent.textContent.length === 0) {
+                    // Both blocks empty: drop the current empty block — the
+                    // locked anchor stays put and the cursor parks inside it.
+                    tr.delete(curStart, $from.after());
+                } else {
+                    // Current has text: merge it INTO the empty previous block
+                    // via tr.join, which keeps the before node's structure
+                    // (and its locked data-id) and absorbs after's content.
+                    // join requires both children to share a type; for cross-
+                    // type cases we bail out and let the default chain do
+                    // whatever fallback it has — those cases don't trip
+                    // joinMaybeClear in the first place.
+                    if (prev.type !== $from.parent.type) return false;
+                    tr.join(curStart);
+                }
                 tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
                 view.dispatch(tr);
                 return true;
@@ -1541,6 +1708,34 @@ export function getPageAnchors(editor: Editor): string[] {
     return out;
 }
 
+export interface PageAnchorInfo {
+    anchorId: string;
+    /** Character offset within the anchor node where the page begins.
+     *  Set when the page starts on the bottom half of a sentence-split node;
+     *  undefined for whole-node anchors. Frozen into the page lock so the
+     *  split survives recomputes. */
+    splitOffset?: number;
+}
+
+/**
+ * Same ordering as {@link getPageAnchors} but each entry also carries the
+ * splitOffset (when the page begins mid-node). Used by the production panel
+ * when first locking pages so the lock map can reproduce mid-node splits
+ * on subsequent recomputes.
+ */
+export function getPageAnchorInfo(editor: Editor): PageAnchorInfo[] {
+    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
+    if (!state) return [{ anchorId: PAGE_ONE_KEY }];
+    const out: PageAnchorInfo[] = [{ anchorId: PAGE_ONE_KEY }];
+    for (const b of state.breaks) {
+        if (!b.anchorId) continue;
+        const entry: PageAnchorInfo = { anchorId: b.anchorId };
+        if (b.splitOffset != null) entry.splitOffset = b.splitOffset;
+        out.push(entry);
+    }
+    return out;
+}
+
 /**
  * Force a pagination recompute. Call when the page-lock map or the
  * page-locking toggle changes — layout may shift even though the
diff --git a/src/lib/screenplay/page-locking.ts b/src/lib/screenplay/page-locking.ts
index 5729c932..8c538add 100644
--- a/src/lib/screenplay/page-locking.ts
+++ b/src/lib/screenplay/page-locking.ts
@@ -23,6 +23,12 @@ export const PAGE_ONE_KEY = "__page1__";
 export type PersistentPage = {
     /** Frozen structural position under production page-lock. */
     token?: SceneToken;
+    /** Character offset within the anchor node where the locked page begins.
+     *  Set when the page was originally split mid-node at a sentence boundary
+     *  (straddling dialogue/action). Preserves the split on recompute so the
+     *  locked page doesn't inherit the whole anchor node and overflow into a
+     *  phantom "A" page. */
+    splitOffset?: number;
 };
 
 export type PersistentPageMap = { [anchorId: string]: PersistentPage };
diff --git a/src/lib/utils/redirects.ts b/src/lib/utils/redirects.ts
index d1da9414..f3b8921d 100644
--- a/src/lib/utils/redirects.ts
+++ b/src/lib/utils/redirects.ts
@@ -1,11 +1,11 @@
-import { redirect } from "next/navigation";
+import { redirect, RedirectType } from "next/navigation";
 
 export const redirectHome = () => {
-    redirect("/projects");
+    redirect("/projects", RedirectType.replace);
 };
 
 export const redirectProject = (projectId: string) => {
-    redirect(`/projects?projectId=${projectId}`);
+    redirect(`/projects?projectId=${projectId}`, RedirectType.replace);
 };
 
 // Legacy aliases for backwards compatibility during migration
diff --git a/styles/scriptio.css b/styles/scriptio.css
index 82ed8f4d..ebfeaa2e 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -238,6 +238,15 @@
     [data-omitted-body="true"] {
         display: none;
     }
+    /* Both the OMITTED overlay and the scene-number widgets are spans inside
+       the scene heading, which the `.ProseMirror > p span` rule above pins to
+       --editor-text. Re-grey them here so they share the omitted scene's
+       --secondary-text color instead of standing out at full text color. */
+    .scene-omitted-overlay,
+    .scene[data-omitted-overlay="true"] .scene-label-left,
+    .scene[data-omitted-overlay="true"] .scene-label-right {
+        color: var(--secondary-text);
+    }
     .scene-omitted-overlay {
         user-select: none;
         pointer-events: none;

From 08215530b8d28b51d337c7c2872f4e25ae481cf1 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Thu, 28 May 2026 15:32:31 +0200
Subject: [PATCH 58/76] scene omit tweaks, tweaked translations, etc

---
 .../project/ProductionSettings.module.css     |  7 +-
 .../editor/sidebar/ContextMenu.module.css     |  2 -
 components/editor/sidebar/ContextMenu.tsx     | 16 ++--
 components/popup/Popup.module.css             | 19 +++-
 components/popup/PopupImportFile.tsx          | 14 +--
 components/popup/PopupUnlockPages.tsx         | 16 ++--
 components/popup/PopupUnlockScenes.tsx        | 16 ++--
 components/popup/PopupUploadToCloud.tsx       | 30 ++++---
 components/utils/ColorPicker.module.css       |  4 +-
 components/utils/Form.module.css              |  1 +
 components/utils/ModalBtn.module.css          | 14 ++-
 messages/de.json                              |  2 +-
 messages/en.json                              |  4 +-
 messages/es.json                              |  2 +-
 messages/fr.json                              |  2 +-
 messages/ja.json                              |  2 +-
 messages/ko.json                              |  2 +-
 messages/pl.json                              |  2 +-
 messages/zh.json                              |  2 +-
 src/lib/adapters/pdf/pdf-adapter.ts           |  3 +-
 src/lib/editor/use-document-editor.ts         | 24 +++--
 src/lib/project/project-repository.ts         | 11 ++-
 .../extensions/scene-locking-extension.ts     | 38 ++------
 src/lib/screenplay/scene-locking.ts           | 87 +++++++++++++++++--
 src/lib/screenplay/scenes.ts                  |  2 +
 styles/scriptio.css                           | 30 ++-----
 26 files changed, 215 insertions(+), 137 deletions(-)

diff --git a/components/dashboard/project/ProductionSettings.module.css b/components/dashboard/project/ProductionSettings.module.css
index f0669ec1..ea66a6c8 100644
--- a/components/dashboard/project/ProductionSettings.module.css
+++ b/components/dashboard/project/ProductionSettings.module.css
@@ -6,7 +6,7 @@
 }
 
 .styleName {
-    font-size: 0.7rem;
+    font-size: 0.85rem;
     color: var(--secondary-text);
     text-transform: uppercase;
     letter-spacing: 0.06em;
@@ -18,12 +18,15 @@
     align-items: center;
     gap: 6px;
     margin-left: auto;
-    font-family: var(--font-screenplay);
     font-size: 0.9rem;
     font-weight: 600;
     color: var(--primary-text);
 }
 
+.styleExample span {
+    font-family: var(--font-screenplay);
+}
+
 .arrowIcon {
     opacity: 0.5;
 }
diff --git a/components/editor/sidebar/ContextMenu.module.css b/components/editor/sidebar/ContextMenu.module.css
index 02a9ffc8..fa554e32 100644
--- a/components/editor/sidebar/ContextMenu.module.css
+++ b/components/editor/sidebar/ContextMenu.module.css
@@ -18,10 +18,8 @@
     align-items: center;
     gap: 10px;
 
-    border-radius: 6px;
     padding-block: 6px;
     padding-inline: 12px;
-    margin-inline: 6px;
 
     font-size: 14px;
     cursor: pointer;
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index 0aa60f00..387eb583 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -117,13 +117,13 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
     const canUnomit = !!scene.id && !!scene.omitted;
 
     const handleOmit = () => {
-        if (!repository || !scene.id) return;
-        omitSceneByUuid(repository, scene.id);
+        if (!editor || !repository || !scene.id) return;
+        omitSceneByUuid(editor, repository, scene.id);
     };
 
     const handleUnomit = () => {
-        if (!repository || !scene.id) return;
-        unomitSceneByUuid(repository, scene.id);
+        if (!editor || !repository || !scene.id) return;
+        unomitSceneByUuid(editor, repository, scene.id);
     };
 
     return (
@@ -508,14 +508,14 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
     })();
 
     const handleOmitScene = () => {
-        if (!repository || !sceneInfo) return;
-        omitSceneByUuid(repository, sceneInfo.uuid);
+        if (!editor || !repository || !sceneInfo) return;
+        omitSceneByUuid(editor, repository, sceneInfo.uuid);
         updateContextMenu(undefined);
     };
 
     const handleUnomitScene = () => {
-        if (!repository || !sceneInfo) return;
-        unomitSceneByUuid(repository, sceneInfo.uuid);
+        if (!editor || !repository || !sceneInfo) return;
+        unomitSceneByUuid(editor, repository, sceneInfo.uuid);
         updateContextMenu(undefined);
     };
 
diff --git a/components/popup/Popup.module.css b/components/popup/Popup.module.css
index e8759d59..96ac22b3 100644
--- a/components/popup/Popup.module.css
+++ b/components/popup/Popup.module.css
@@ -1,11 +1,11 @@
 .container {
     position: absolute;
     width: 500px;
-    min-height: 250px;
-    padding: 16px;
+    padding: 20px;
+    padding-bottom: 24px;
+    background-color: var(--primary);
     border: 2px solid var(--separator);
     box-shadow: 0 5px 30px rgba(0, 0, 0, 0.3);
-    background-color: var(--primary);
     border-radius: 12px;
     pointer-events: auto;
 }
@@ -49,7 +49,7 @@
     display: flex;
     flex-direction: column;
     gap: 18px;
-    margin-bottom: 32px;
+    margin-bottom: 20px;
 }
 
 .info_btns {
@@ -115,6 +115,17 @@
    these classes STANDALONE — do not pair with form.btn, since its
    !important border/radius rules would override the composed styling. */
 
+.buttons {
+    display: flex;
+    gap: 10px;
+}
+
+.buttons > * {
+    flex: 1;
+    width: auto !important;
+    margin-top: 0 !important;
+}
+
 .confirm {
     composes: modalBtn from "../utils/ModalBtn.module.css";
     width: 100% !important;
diff --git a/components/popup/PopupImportFile.tsx b/components/popup/PopupImportFile.tsx
index d788ebf3..2eb1c11c 100644
--- a/components/popup/PopupImportFile.tsx
+++ b/components/popup/PopupImportFile.tsx
@@ -37,12 +37,14 @@ const PopupImportFile = ({ data: { confirmImport } }: PopupData<PopupImportFileD
                         {t("info")}
                     </p>
                 </div>
-                <button className={popup.import_confirm} onClick={onConfirmImport}>
-                    {t("yesImport")}
-                </button>
-                <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
-                    {t("no")}
-                </button>
+                <div className={popup.buttons}>
+                    <button className={popup.import_confirm} onClick={onConfirmImport}>
+                        {t("yesImport")}
+                    </button>
+                    <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
+                        {t("no")}
+                    </button>
+                </div>
             </div>
         </div>
     );
diff --git a/components/popup/PopupUnlockPages.tsx b/components/popup/PopupUnlockPages.tsx
index 2bcef200..e9b2fc29 100644
--- a/components/popup/PopupUnlockPages.tsx
+++ b/components/popup/PopupUnlockPages.tsx
@@ -37,13 +37,15 @@ const PopupUnlockPages = ({ data: { confirmUnlock } }: PopupData<PopupUnlockPage
                 <div className={popup.info}>
                     <p>{t("unlockPagesWarning")}</p>
                 </div>
-                <button className={popup.import_confirm} onClick={onConfirm}>
-                    <Unlock size={18} color="white" />
-                    {t("unlockPages")}
-                </button>
-                <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
-                    {t("cancel")}
-                </button>
+                <div className={popup.buttons}>
+                    <button className={popup.import_confirm} onClick={onConfirm}>
+                        <Unlock size={18} color="white" />
+                        {t("unlockPages")}
+                    </button>
+                    <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
+                        {t("cancel")}
+                    </button>
+                </div>
             </div>
         </div>
     );
diff --git a/components/popup/PopupUnlockScenes.tsx b/components/popup/PopupUnlockScenes.tsx
index 930b6dcf..607a0bf1 100644
--- a/components/popup/PopupUnlockScenes.tsx
+++ b/components/popup/PopupUnlockScenes.tsx
@@ -37,13 +37,15 @@ const PopupUnlockScenes = ({ data: { confirmUnlock } }: PopupData<PopupUnlockSce
                 <div className={popup.info}>
                     <p>{t("unlockWarning")}</p>
                 </div>
-                <button className={popup.import_confirm} onClick={onConfirm}>
-                    <Unlock size={18} color="white" />
-                    {t("unlock")}
-                </button>
-                <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
-                    {t("cancel")}
-                </button>
+                <div className={popup.buttons}>
+                    <button className={popup.import_confirm} onClick={onConfirm}>
+                        <Unlock size={18} color="white" />
+                        {t("unlock")}
+                    </button>
+                    <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
+                        {t("cancel")}
+                    </button>
+                </div>
             </div>
         </div>
     );
diff --git a/components/popup/PopupUploadToCloud.tsx b/components/popup/PopupUploadToCloud.tsx
index 58218b8e..08f8d28f 100644
--- a/components/popup/PopupUploadToCloud.tsx
+++ b/components/popup/PopupUploadToCloud.tsx
@@ -55,20 +55,22 @@ const PopupUploadToCloud = ({ data: { projectId } }: PopupData<PopupUploadToClou
                     <p>{t("body")}</p>
                 </div>
                 {info && <FormInfo info={info} />}
-                <button
-                    className={popup.confirm}
-                    onClick={onConfirm}
-                    disabled={isUploading}
-                >
-                    {isUploading ? t("uploading") : t("confirm")}
-                </button>
-                <button
-                    className={popup.cancel}
-                    onClick={onCancel}
-                    disabled={isUploading}
-                >
-                    {t("cancel")}
-                </button>
+                <div className={popup.buttons}>
+                    <button
+                        className={popup.confirm}
+                        onClick={onConfirm}
+                        disabled={isUploading}
+                    >
+                        {isUploading ? t("uploading") : t("confirm")}
+                    </button>
+                    <button
+                        className={popup.cancel}
+                        onClick={onCancel}
+                        disabled={isUploading}
+                    >
+                        {t("cancel")}
+                    </button>
+                </div>
             </div>
         </div>
     );
diff --git a/components/utils/ColorPicker.module.css b/components/utils/ColorPicker.module.css
index 784bb451..3ae29462 100644
--- a/components/utils/ColorPicker.module.css
+++ b/components/utils/ColorPicker.module.css
@@ -6,7 +6,7 @@
 .trigger {
     width: 26px;
     height: 26px;
-    border-radius: 6px;
+    border-radius: 50%;
     cursor: pointer;
     display: flex;
     align-items: center;
@@ -20,7 +20,7 @@
 }
 
 .trigger_empty {
-    border: 3px solid var(--secondary-text);
+    border: 4px solid var(--secondary-text);
     position: relative;
 }
 
diff --git a/components/utils/Form.module.css b/components/utils/Form.module.css
index 3f1571f5..1181c450 100644
--- a/components/utils/Form.module.css
+++ b/components/utils/Form.module.css
@@ -112,6 +112,7 @@
     font-size: 1.15rem;
     border-radius: 7px;
     padding: 8px;
+    background-color: var(--secondary);
 }
 
 .input::placeholder {
diff --git a/components/utils/ModalBtn.module.css b/components/utils/ModalBtn.module.css
index ad9928ad..2d38fd12 100644
--- a/components/utils/ModalBtn.module.css
+++ b/components/utils/ModalBtn.module.css
@@ -3,16 +3,22 @@
     align-items: center;
     justify-content: center;
     gap: 8px;
+    width: 100%;
     padding: 10px 16px;
     border-radius: 40px;
     border: none;
     font-size: 0.9rem;
     font-weight: 500;
     cursor: pointer;
+    font-weight: bold;
     transition: opacity 0.2s ease;
-    transform: translateZ(0);
     backface-visibility: hidden;
-    width: 100%;
+    background-color: var(--secondary);
+    color: var(--primary-text);
+}
+
+.modalBtn:hover:not(:disabled) {
+    opacity: 0.85;
 }
 
 .modalBtn:disabled {
@@ -22,6 +28,7 @@
 
 .modalBtnDanger {
     background: var(--error);
+    font-weight: bold;
     color: white;
 }
 
@@ -37,6 +44,5 @@
 }
 
 .modalBtnCancel:hover:not(:disabled) {
-    color: var(--primary-text);
-    border-color: var(--primary-text);
+    opacity: 0.7;
 }
diff --git a/messages/de.json b/messages/de.json
index 889c2462..5350ca71 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -383,7 +383,7 @@
     "paste": "Einfügen",
     "highlight": "Hervorheben",
     "addCharacter": "Charakter hinzufügen",
-    "addComment": "Kommentar hinzufügen",
+    "addComment": "Kommentieren",
     "searchOnWeb": "Im Web suchen",
     "noSuggestions": "Keine Vorschläge",
     "addToDictionary": "Zum Wörterbuch hinzufügen",
diff --git a/messages/en.json b/messages/en.json
index 24107f8a..4aade80b 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -382,10 +382,10 @@
     "paste": "Paste",
     "highlight": "Highlight",
     "addCharacter": "Add character",
-    "addComment": "Add Comment",
+    "addComment": "Comment",
     "searchOnWeb": "Search on web",
     "noSuggestions": "No suggestions",
-    "addToDictionary": "Add to Dictionary",
+    "addToDictionary": "Add to dictionary",
     "makeDualDialogue": "Make dual dialogue",
     "shelve": "Shelve",
     "shelveScene": "Shelve scene",
diff --git a/messages/es.json b/messages/es.json
index 4f1fb4b1..534460e6 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -382,7 +382,7 @@
     "paste": "Pegar",
     "highlight": "Resaltar",
     "addCharacter": "Añadir personaje",
-    "addComment": "Añadir comentario",
+    "addComment": "Comentar",
     "searchOnWeb": "Buscar en la web",
     "noSuggestions": "Sin sugerencias",
     "addToDictionary": "Añadir al diccionario",
diff --git a/messages/fr.json b/messages/fr.json
index 2a41c334..b38866ca 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -383,7 +383,7 @@
     "paste": "Coller",
     "highlight": "Surligner",
     "addCharacter": "Ajouter un personnage",
-    "addComment": "Ajouter un commentaire",
+    "addComment": "Commenter",
     "searchOnWeb": "Rechercher sur le web",
     "noSuggestions": "Aucune suggestion",
     "addToDictionary": "Ajouter au dictionnaire",
diff --git a/messages/ja.json b/messages/ja.json
index f8b5f921..997b31f8 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -382,7 +382,7 @@
     "paste": "貼り付け",
     "highlight": "ハイライト",
     "addCharacter": "登場人物を追加",
-    "addComment": "コメントを追加",
+    "addComment": "コメント",
     "searchOnWeb": "ウェブ検索",
     "noSuggestions": "候補なし",
     "addToDictionary": "辞書に追加",
diff --git a/messages/ko.json b/messages/ko.json
index 5e3b911f..98e6f3f8 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -382,7 +382,7 @@
     "paste": "붙여넣기",
     "highlight": "하이라이트",
     "addCharacter": "인물 추가",
-    "addComment": "댓글 추가",
+    "addComment": "댓글",
     "searchOnWeb": "웹 검색",
     "noSuggestions": "제안 없음",
     "addToDictionary": "사전에 추가",
diff --git a/messages/pl.json b/messages/pl.json
index c78feb68..1caf69ba 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -382,7 +382,7 @@
     "paste": "Wklej",
     "highlight": "Wyróżnij",
     "addCharacter": "Dodaj postać",
-    "addComment": "Dodaj komentarz",
+    "addComment": "Komentuj",
     "searchOnWeb": "Szukaj w sieci",
     "noSuggestions": "Brak sugestii",
     "addToDictionary": "Dodaj do słownika",
diff --git a/messages/zh.json b/messages/zh.json
index b1fe3406..ac973006 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -382,7 +382,7 @@
     "paste": "粘贴",
     "highlight": "高亮",
     "addCharacter": "添加角色",
-    "addComment": "添加评论",
+    "addComment": "评论",
     "searchOnWeb": "网页搜索",
     "noSuggestions": "无建议",
     "addToDictionary": "添加到字典",
diff --git a/src/lib/adapters/pdf/pdf-adapter.ts b/src/lib/adapters/pdf/pdf-adapter.ts
index b3fb8875..2e91f293 100644
--- a/src/lib/adapters/pdf/pdf-adapter.ts
+++ b/src/lib/adapters/pdf/pdf-adapter.ts
@@ -185,7 +185,6 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
                           (el.querySelector(".scene-label-right") as HTMLElement | null)?.textContent
                               ?.trim() ||
                           String(sceneCount),
-                      omitted: el.getAttribute("data-omitted-overlay") === "true",
                   }
                 : undefined;
 
@@ -500,7 +499,7 @@ export class PDFAdapter extends ProjectAdapter<PDFExportOptions> {
         el: HTMLElement,
         paragraphLines: VisualLine[],
         options: PDFExportOptions,
-        sceneInfo?: { label: string; omitted: boolean },
+        sceneInfo?: { label: string },
     ): void {
         const firstLine = paragraphLines[0];
         const lastLine = paragraphLines[paragraphLines.length - 1];
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index c1eb331f..81429b13 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -31,6 +31,7 @@ import {
     createSceneLockingExtension,
     refreshSceneLocking,
 } from "@src/lib/screenplay/extensions/scene-locking-extension";
+import { SCENE_OMIT_UNDO_ORIGIN } from "@src/lib/screenplay/scene-locking";
 import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
 import { CommentMark } from "@src/lib/screenplay/extensions/comment-highlight-extension";
 import { createSpellcheckExtension, refreshSpellcheck } from "@src/lib/spellcheck/spellcheck-extension";
@@ -553,11 +554,20 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         }
     }, [userInfo, provider]);
 
-    // Fix Yjs undo cursor restoration: y-tiptap's stack-item-popped fires AFTER
-    // the undo transaction commits, so beforeTransactionSelection is captured wrong
-    // by beforeAllTransactions. Patch undo/redo to pre-set it from the stack item.
+    // Post-mount UndoManager setup. y-tiptap's UndoManager is constructed to
+    // track only the editor XmlFragment (scope) and only `ySyncPluginKey`
+    // (origin), and y-tiptap's stack-item-popped fires AFTER the undo
+    // transaction commits — so a few tweaks are needed:
+    //   - addToScope(scenes): scene metadata lives in a separate Y.Map; without
+    //     this the UndoManager silently ignores every mutation to it.
+    //   - trackedOrigins.add(SCENE_OMIT_UNDO_ORIGIN): omit/unomit bundle a PM
+    //     dispatch and a Map.set into one Yjs transaction tagged with this
+    //     symbol so Ctrl+Z reverts both halves atomically.
+    //   - undo/redo patch: pre-seed beforeTransactionSelection from the
+    //     popped stack item so the cursor restores correctly (y-tiptap
+    //     otherwise captures it after the fact).
     useEffect(() => {
-        if (!editor || !isYjsReady) return;
+        if (!editor || !isYjsReady || !projectState) return;
 
         const state = editor.state;
         const yUndoState = yUndoPluginKey.getState(state);
@@ -566,6 +576,9 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
 
         const um = yUndoState.undoManager;
         const binding = ySyncState.binding;
+        um.addToScope([projectState.scenes()]);
+        um.trackedOrigins.add(SCENE_OMIT_UNDO_ORIGIN);
+
         const originalUndo = um.undo.bind(um);
         const originalRedo = um.redo.bind(um);
 
@@ -588,8 +601,9 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         return () => {
             um.undo = originalUndo;
             um.redo = originalRedo;
+            um.trackedOrigins.delete(SCENE_OMIT_UNDO_ORIGIN);
         };
-    }, [editor, isYjsReady]);
+    }, [editor, isYjsReady, projectState]);
 
     // Refresh character highlights
     useEffect(() => {
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index f8b37bc7..4ea322ac 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -259,7 +259,7 @@ export class ProjectRepository {
         const existing = (map.get(sceneId) as PersistentScene | undefined) ?? {};
 
         const merged: PersistentScene = { ...existing };
-        const FIELDS = ["synopsis", "color", "token", "omitted"] as const;
+        const FIELDS = ["synopsis", "color", "token", "omitted", "originalHeading"] as const;
         for (const key of FIELDS) {
             if (key in data) {
                 (merged as Record<string, unknown>)[key] = data[key];
@@ -500,10 +500,15 @@ export class ProjectRepository {
     /**
      * Run a function inside a single Y.js transaction.
      * Useful for batching multiple repository mutations into one collab update.
+     *
+     * Pass `origin` to tag the transaction — required for the Y.UndoManager
+     * to track the changes (the manager ignores transactions whose origin is
+     * not in its `trackedOrigins` set). Custom origins must also be added to
+     * the editor's `trackedOrigins` set; see `use-document-editor.ts`.
      */
-    transact(fn: () => void): void {
+    transact(fn: () => void, origin?: unknown): void {
         if (this.guardWrite("transact")) return;
-        this.ydoc.transact(fn);
+        this.ydoc.transact(fn, origin);
     }
 
     // -------------------------------- //
diff --git a/src/lib/screenplay/extensions/scene-locking-extension.ts b/src/lib/screenplay/extensions/scene-locking-extension.ts
index fec51525..24c445da 100644
--- a/src/lib/screenplay/extensions/scene-locking-extension.ts
+++ b/src/lib/screenplay/extensions/scene-locking-extension.ts
@@ -71,14 +71,6 @@ const buildLabelWidget = (label: string, side: "left" | "right"): HTMLElement =>
     return span;
 };
 
-const buildOmittedWidget = (): HTMLElement => {
-    const span = document.createElement("span");
-    span.className = "scene-omitted-overlay";
-    span.contentEditable = "false";
-    span.textContent = "OMITTED";
-    return span;
-};
-
 const hasAnyOmitted = (scenes: Record<string, PersistentScene>): boolean => {
     for (const key in scenes) {
         if (scenes[key]?.omitted) return true;
@@ -131,39 +123,21 @@ const computeDecorations = (
         }
     }
 
-    // OMITTED decorations are independent of production lock — the user can
-    // omit any scene at any time and the original heading + body are kept
-    // in the document; we just hide them visually until they unomit.
+    // OMITTED decorations are independent of production lock. The heading
+    // text itself is replaced with "OMITTED" inside the document by
+    // `omitSceneByUuid` (the original is preserved in scene metadata), so
+    // here we only need to grey the heading via `data-scene-omitted` and
+    // collapse the body paragraphs via `data-omitted-body`.
     for (let i = 0; i < entries.length; i++) {
         const entry = entries[i];
         if (!scenes[entry.uuid]?.omitted) continue;
 
         decorations.push(
             Decoration.node(entry.pos, entry.pos + entry.nodeSize, {
-                "data-omitted-overlay": "true",
+                "data-scene-omitted": "true",
             }),
         );
-        decorations.push(
-            Decoration.widget(entry.pos + 1, () => buildOmittedWidget(), {
-                side: -1,
-                key: `scene-omitted-${entry.uuid}`,
-            }),
-        );
-
-        // Hide the original heading text behind the OMITTED widget. Skip
-        // empty headings — there's nothing to hide and the inline range
-        // would be degenerate.
-        if (entry.nodeSize > 2) {
-            decorations.push(
-                Decoration.inline(entry.pos + 1, entry.pos + entry.nodeSize - 1, {
-                    class: "scene-heading-omitted-text",
-                }),
-            );
-        }
 
-        // Hide every top-level paragraph between this heading and the next
-        // scene heading. We tag them with `data-omitted-body` so CSS can
-        // collapse them while leaving the underlying document untouched.
         const nextEntry = entries[i + 1];
         const bodyEnd = nextEntry ? nextEntry.pos : doc.content.size;
         const bodyStart = entry.pos + entry.nodeSize;
diff --git a/src/lib/screenplay/scene-locking.ts b/src/lib/screenplay/scene-locking.ts
index cc14d023..acf6cd8f 100644
--- a/src/lib/screenplay/scene-locking.ts
+++ b/src/lib/screenplay/scene-locking.ts
@@ -45,7 +45,21 @@
  * Together these give:  1 < 1aA < 1A < 1AA < 1AB < 1B < 2.
  */
 
+import type { Editor } from "@tiptap/core";
+import type { Node } from "@tiptap/pm/model";
+
 import type { ProjectRepository } from "../project/project-repository";
+import { ScreenplayElement } from "../utils/enums";
+
+const OMITTED_HEADING_TEXT = "OMITTED";
+
+/**
+ * Yjs transaction origin used by `omitSceneByUuid` / `unomitSceneByUuid` so
+ * the editor's UndoManager records both the document edit and the scene
+ * metadata change as a single, atomic undo step. `use-document-editor`
+ * registers this symbol in the UndoManager's `trackedOrigins`.
+ */
+export const SCENE_OMIT_UNDO_ORIGIN = Symbol("scene-omit-undo");
 
 // --------------------------------------------------------------------------
 //                                TYPES
@@ -459,19 +473,74 @@ export const computeSceneLabels = (
 //                              ACTIONS
 // --------------------------------------------------------------------------
 
+/** Locate the scene heading node in the document by its `data-id` UUID. */
+const findSceneHeadingByUuid = (
+    editor: Editor,
+    uuid: string,
+): { node: Node; pos: number } | null => {
+    let result: { node: Node; pos: number } | null = null;
+    editor.state.doc.descendants((node, pos) => {
+        if (result) return false;
+        if (node.attrs?.class === ScreenplayElement.Scene && node.attrs?.["data-id"] === uuid) {
+            result = { node, pos };
+            return false;
+        }
+        return true;
+    });
+    return result;
+};
+
 /**
- * Mark a scene as OMITTED. The scene's heading text and body content are
- * preserved in the document; the editor overlays "OMITTED" and hides the
- * underlying content via decorations so the original screenplay survives an
- * unomit. Works regardless of production lock state.
+ * Mark a scene as OMITTED. The heading's current text is saved into the
+ * scene's `originalHeading` metadata and the heading content in the
+ * document is replaced with "OMITTED" — so the heading remains a normal
+ * editable paragraph (cursor + Enter behave naturally) while the body
+ * paragraphs are still visually collapsed via decorations.
+ *
+ * Both the document edit and the metadata update are wrapped in a single
+ * Yjs transaction so Ctrl+Z reverts them atomically.
  */
-export const omitSceneByUuid = (repository: ProjectRepository, uuid: string): void => {
-    repository.upsertScene(uuid, { omitted: true });
+export const omitSceneByUuid = (
+    editor: Editor,
+    repository: ProjectRepository,
+    uuid: string,
+): void => {
+    const heading = findSceneHeadingByUuid(editor, uuid);
+    if (!heading) return;
+
+    const currentText = heading.node.textContent;
+    repository.transact(() => {
+        const headingStart = heading.pos + 1;
+        const headingEnd = heading.pos + heading.node.nodeSize - 1;
+        const tr = editor.state.tr.insertText(OMITTED_HEADING_TEXT, headingStart, headingEnd);
+        editor.view.dispatch(tr);
+        repository.upsertScene(uuid, { omitted: true, originalHeading: currentText });
+    }, SCENE_OMIT_UNDO_ORIGIN);
 };
 
-/** Clear an OMITTED scene's `omitted` flag, restoring the heading + body. */
-export const unomitSceneByUuid = (repository: ProjectRepository, uuid: string): void => {
+/**
+ * Clear an OMITTED scene's flag and restore its original heading text from
+ * `originalHeading` metadata. Inverse of `omitSceneByUuid`, batched in a
+ * single Yjs transaction for atomic undo.
+ */
+export const unomitSceneByUuid = (
+    editor: Editor,
+    repository: ProjectRepository,
+    uuid: string,
+): void => {
     const scene = repository.getScene(uuid);
     if (!scene?.omitted) return;
-    repository.upsertScene(uuid, { omitted: undefined });
+    const heading = findSceneHeadingByUuid(editor, uuid);
+    if (!heading) return;
+
+    const restoreText = scene.originalHeading ?? "";
+    repository.transact(() => {
+        const headingStart = heading.pos + 1;
+        const headingEnd = heading.pos + heading.node.nodeSize - 1;
+        const tr = restoreText.length > 0
+            ? editor.state.tr.insertText(restoreText, headingStart, headingEnd)
+            : editor.state.tr.delete(headingStart, headingEnd);
+        editor.view.dispatch(tr);
+        repository.upsertScene(uuid, { omitted: undefined, originalHeading: undefined });
+    }, SCENE_OMIT_UNDO_ORIGIN);
 };
diff --git a/src/lib/screenplay/scenes.ts b/src/lib/screenplay/scenes.ts
index c89fa974..ce1b89b0 100644
--- a/src/lib/screenplay/scenes.ts
+++ b/src/lib/screenplay/scenes.ts
@@ -70,6 +70,8 @@ export type PersistentScene = {
     token?: SceneToken;
     /** True when the scene is an OMITTED placeholder (only meaningful with `token`). */
     omitted?: boolean;
+    /** Original heading text saved when the scene was omitted, restored on unomit. */
+    originalHeading?: string;
 };
 
 /**
diff --git a/styles/scriptio.css b/styles/scriptio.css
index ebfeaa2e..1629bc7a 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -226,32 +226,20 @@
         display: none;
     }
 
-    /* OMITTED scene placeholder. The heading text and body paragraphs are
-       preserved in the document so the user can restore them; we just hide
-       them visually and overlay "OMITTED" in place of the heading. */
-    .scene[data-omitted-overlay="true"] {
+    /* OMITTED scene: heading text is rewritten to "OMITTED" in the document
+       by `omitSceneByUuid` (original preserved in scene metadata), so the
+       heading is a normal editable paragraph. We just grey it and collapse
+       the body paragraphs; the scene-number widgets are re-greyed because
+       the generic `.ProseMirror > p span` rule above pins them to
+       --editor-text. */
+    .scene[data-scene-omitted="true"],
+    .scene[data-scene-omitted="true"] .scene-label-left,
+    .scene[data-scene-omitted="true"] .scene-label-right {
         color: var(--secondary-text);
     }
-    .scene-heading-omitted-text {
-        display: none;
-    }
     [data-omitted-body="true"] {
         display: none;
     }
-    /* Both the OMITTED overlay and the scene-number widgets are spans inside
-       the scene heading, which the `.ProseMirror > p span` rule above pins to
-       --editor-text. Re-grey them here so they share the omitted scene's
-       --secondary-text color instead of standing out at full text color. */
-    .scene-omitted-overlay,
-    .scene[data-omitted-overlay="true"] .scene-label-left,
-    .scene[data-omitted-overlay="true"] .scene-label-right {
-        color: var(--secondary-text);
-    }
-    .scene-omitted-overlay {
-        user-select: none;
-        pointer-events: none;
-        font-style: normal;
-    }
 
     /* Normal weight scene headings (when bold disabled) */
     &.scene-heading-normal .scene {

From 79e089a7f6e6ffb21e25f41215cfa8f44742df5f Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 1 Jun 2026 01:44:59 +0200
Subject: [PATCH 59/76] fixed pagination issue because of font lazy loading,
 removed top margin of top-page nodes

---
 .../extensions/pagination-extension.ts        | 157 ++++++++++++------
 styles/scriptio.css                           |  11 ++
 2 files changed, 119 insertions(+), 49 deletions(-)

diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index 7df545d9..cc8a29ed 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -454,9 +454,7 @@ function buildDecorations(
     // Label of the last page = label of the most recent break (or firstPageLabel
     // when no breaks exist).
     const lastPagenum = breaks.length > 0 ? breaks[breaks.length - 1].pagenum : 1;
-    const lastPageLabel = breaks.length > 0
-        ? breaks[breaks.length - 1].label ?? String(lastPagenum)
-        : firstPageLabel;
+    const lastPageLabel = breaks.length > 0 ? (breaks[breaks.length - 1].label ?? String(lastPagenum)) : firstPageLabel;
     decorations.push(
         Decoration.widget(
             doc.content.size,
@@ -677,7 +675,11 @@ function computePageLabels(
     return labels.map((l) => l.label);
 }
 
-const createPaginationPlugin = (extension: { options: PaginationOptions; editor: Editor }) =>
+const createPaginationPlugin = (extension: {
+    options: PaginationOptions;
+    editor: Editor;
+    storage: { fontsReady: boolean };
+}) =>
     new Plugin({
         key: paginationKey,
         state: {
@@ -688,6 +690,14 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 firstPageLabel: "1",
             }),
             apply(tr, value: PaginationState, oldState, newState): PaginationState {
+                // Wait for the screenplay fonts to finish loading before doing
+                // anything. Measuring against the OS monospace fallback writes
+                // wrong heights into the cache; gating here keeps the cache
+                // empty until the real font is in play. onCreate dispatches a
+                // forcePaginationUpdate once fonts.ready resolves, which is
+                // what eventually pulls us past this guard.
+                if (!extension.storage.fontsReady) return value;
+
                 const options = extension.options as PaginationOptions;
                 const formatUpdate = tr.getMeta("pageFormatUpdate");
                 const forceUpdate = tr.getMeta("forcePaginationUpdate");
@@ -760,9 +770,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 // map lookups. The set is rebuilt once per pass when locking
                 // is active; lock counts are typically tens, never thousands.
                 const pageLocking = options.getPageLocking?.() ?? false;
-                const pageLocks: PersistentPageMap | null = pageLocking
-                    ? options.getPageLocks?.() ?? null
-                    : null;
+                const pageLocks: PersistentPageMap | null = pageLocking ? (options.getPageLocks?.() ?? null) : null;
                 const lockedAnchorIds: Set<string> | null = pageLocks
                     ? new Set(Object.keys(pageLocks).filter((k) => k !== PAGE_ONE_KEY))
                     : null;
@@ -872,23 +880,13 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                     // data-id that appears after Enter splits a locked anchor — only
                     // the first occurrence in doc order is honored as the lock site,
                     // matching the post-dedup state and avoiding a phantom break.
-                    if (
-                        lockedAnchorIds &&
-                        dataId &&
-                        lockedAnchorIds.has(dataId) &&
-                        !consumedAnchors.has(dataId)
-                    ) {
+                    if (lockedAnchorIds && dataId && lockedAnchorIds.has(dataId) && !consumedAnchors.has(dataId)) {
                         consumedAnchors.add(dataId);
                         const lockInfo = pageLocks?.[dataId];
                         const splitOffset = lockInfo?.splitOffset;
                         const textLen = node.textContent?.length ?? 0;
 
-                        if (
-                            pagePos > 0 &&
-                            splitOffset != null &&
-                            splitOffset > 0 &&
-                            splitOffset < textLen
-                        ) {
+                        if (pagePos > 0 && splitOffset != null && splitOffset > 0 && splitOffset < textLen) {
                             // The lock was originally created on a mid-node sentence split
                             // (straddling dialogue or action). Reproduce that split here:
                             // top portion stays on the current page, break goes at the
@@ -901,12 +899,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                             const topText = node.textContent.slice(0, splitOffset);
                             const topElement = element.cloneNode(false) as HTMLElement;
                             topElement.textContent = topText;
-                            const topHeight = getHTMLHeight(
-                                topElement,
-                                editorDOM,
-                                node.type.name,
-                                options,
-                            );
+                            const topHeight = getHTMLHeight(topElement, editorDOM, node.type.name, options);
                             const bottomHeight = Math.max(0, height - topHeight);
 
                             pagePos += topHeight;
@@ -957,8 +950,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                     // matches what the user actually sees on the page. The
                     // measured height stays cached for cheap restoration when
                     // the scene is un-omitted.
-                    const effectiveHeight =
-                        currentSceneOmitted && nodeType !== ScreenplayElement.Scene ? 0 : height;
+                    const effectiveHeight = currentSceneOmitted && nodeType !== ScreenplayElement.Scene ? 0 : height;
 
                     // Accumulate height on current page
                     pagePos += effectiveHeight;
@@ -1008,7 +1000,13 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                                 // The bottom half of the split node is the first item on the new page.
                                 pagePos = split.bottomHeight;
                                 lastNodes = new CircularBuffer(3);
-                                lastNodes.push({ pos, type: nodeType, height: split.bottomHeight, positionTop: 0, dataId });
+                                lastNodes.push({
+                                    pos,
+                                    type: nodeType,
+                                    height: split.bottomHeight,
+                                    positionTop: 0,
+                                    dataId,
+                                });
                                 continue; // split handled — skip orphan resolution for this node
                             }
                         }
@@ -1027,11 +1025,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                             // A locked anchor owns its page and must never be displaced by
                             // walkback — otherwise the next overflow would yank it onto an
                             // A page and the locked frame would lose its head.
-                            if (
-                                lockedAnchorIds &&
-                                prev.dataId &&
-                                lockedAnchorIds.has(prev.dataId)
-                            ) {
+                            if (lockedAnchorIds && prev.dataId && lockedAnchorIds.has(prev.dataId)) {
                                 break;
                             }
                             if (BREAK_LOGIC[prev.type]?.keepWithNext) {
@@ -1124,9 +1118,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                 // short-circuit condition guarantees content past that break
                 // is identical to the previous pass, so the previously stored
                 // freespace is still the correct answer.
-                let lastPageFreespace = shortCircuited
-                    ? value.lastPageFreespace
-                    : Math.max(0, contentHeight - pagePos);
+                let lastPageFreespace = shortCircuited ? value.lastPageFreespace : Math.max(0, contentHeight - pagePos);
 
                 // --- Orphan page handling ---
                 // A locked page whose anchor data-id is no longer present in the doc
@@ -1235,10 +1227,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                                 }
                                 if (b.pos === segmentEnd) {
                                     const bLock = b.anchorId ? pageLocks[b.anchorId] : undefined;
-                                    if (
-                                        bLock?.token &&
-                                        compareTokens(orphan.token, bLock.token) < 0
-                                    ) {
+                                    if (bLock?.token && compareTokens(orphan.token, bLock.token) < 0) {
                                         insertIdx = j;
                                         break;
                                     }
@@ -1257,10 +1246,7 @@ const createPaginationPlugin = (extension: { options: PaginationOptions; editor:
                             // which already gets a full `contentHeight` slot, so no
                             // additional freespace is needed there.
                             let syntheticFreespace = 0;
-                            if (
-                                insertIdx < breaks.length &&
-                                breaks[insertIdx].pos === segmentEnd
-                            ) {
+                            if (insertIdx < breaks.length && breaks[insertIdx].pos === segmentEnd) {
                                 syntheticFreespace = breaks[insertIdx].freespace;
                                 breaks[insertIdx].freespace = 0;
                             } else if (insertIdx === breaks.length) {
@@ -1398,7 +1384,15 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
     },
 
     addStorage() {
-        return { initTimer: null as ReturnType<typeof setTimeout> | null };
+        return {
+            initTimer: null as ReturnType<typeof setTimeout> | null,
+            /** False until the screenplay @font-face fonts have finished loading.
+             *  The plugin's `apply` checks this flag and skips height measurement
+             *  while it is false, so the cache never picks up bad heights taken
+             *  with a fallback monospace font (Consolas etc.) that produces a
+             *  different line-wrap from CourierPrime. */
+            fontsReady: false,
+        };
     },
 
     onCreate() {
@@ -1489,14 +1483,79 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
 
         setupTestDiv(editorDOM, this.options);
 
-        // Trigger initial pagination after editor is ready
-        this.storage.initTimer = setTimeout(() => {
-            this.storage.initTimer = null;
+        // The screenplay @font-face fonts (CourierPrime + fallbacks) load
+        // asynchronously. Until the real font is applied, the test div lays
+        // text out in the OS monospace fallback (Consolas on Windows), whose
+        // slightly different character widths cause text to wrap to a
+        // different number of lines. Heights measured against the fallback
+        // disagree with what the editor will eventually render — and once
+        // cached, they keep that disagreement alive (hence the cold-open vs
+        // hard-refresh mismatch, and the shrink-on-edit symptom when a
+        // cache-miss re-measures against the now-loaded real font).
+        //
+        // We defer the first pagination run until the font is genuinely
+        // usable; until then the plugin's `apply` returns the empty initial
+        // state (no measurement, no cache writes). Once ready we flip the flag
+        // and dispatch a single force update — every subsequent measurement
+        // happens against the real font, so the heightCache fills with correct
+        // values from the start.
+        //
+        // IMPORTANT: `document.fonts.ready` is NOT enough on Chrome. Chrome
+        // loads @font-face fonts lazily (only once a rendered element needs
+        // them), so at the moment the editor mounts nothing has triggered the
+        // CourierPrime fetch yet — `fonts.ready` resolves reporting
+        // status:"loaded" while `fonts.check('12pt "CourierPrime"')` is still
+        // false and zero faces are actually loaded. Firefox eagerly starts the
+        // load, which is why it worked there but not here. The fix is to
+        // ACTIVELY request the faces with `document.fonts.load(...)`, which
+        // forces the fetch and resolves only once they are usable for layout.
+        const triggerInitialPagination = () => {
+            if (this.editor.isDestroyed) return;
+            this.storage.fontsReady = true;
             const tr = this.editor.state.tr;
             tr.setMeta("forcePaginationUpdate", true);
             tr.setMeta("addToHistory", false);
             this.editor.view.dispatch(tr);
-        }, 0);
+        };
+
+        const fontsApi = typeof document !== "undefined" ? document.fonts : null;
+        if (fontsApi && typeof fontsApi.load === "function") {
+            // Actively request every CourierPrime variant the screenplay uses.
+            // `load()` forces the fetch (even on Chrome's lazy loader) and
+            // resolves once the faces are usable for measurement. `.catch` per
+            // spec keeps one failed variant from blocking the others, and a
+            // safety timeout guarantees pagination still runs if the network
+            // never delivers a font — better a fallback-font layout than a
+            // permanently blank document.
+            const specs = [
+                '12pt "CourierPrime"',
+                'bold 12pt "CourierPrime"',
+                'italic 12pt "CourierPrime"',
+                'bold italic 12pt "CourierPrime"',
+            ];
+            let fired = false;
+            const fireOnce = () => {
+                if (fired) return;
+                fired = true;
+                if (this.storage.initTimer != null) {
+                    clearTimeout(this.storage.initTimer);
+                    this.storage.initTimer = null;
+                }
+                triggerInitialPagination();
+            };
+            Promise.all(specs.map((s) => fontsApi.load(s).catch(() => undefined)))
+                .then(() => fireOnce())
+                .catch(() => fireOnce());
+            // Safety net: never wait more than 3s on the font fetch.
+            this.storage.initTimer = setTimeout(() => fireOnce(), 3000);
+        } else {
+            // No FontFaceSet API (SSR, very old browsers): fall back to the
+            // legacy setTimeout(0) trigger so pagination still runs.
+            this.storage.initTimer = setTimeout(() => {
+                this.storage.initTimer = null;
+                triggerInitialPagination();
+            }, 0);
+        }
     },
 
     onDestroy() {
diff --git a/styles/scriptio.css b/styles/scriptio.css
index 1629bc7a..d27d2064 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -68,6 +68,17 @@
         box-sizing: border-box;
     }
 
+    /* Suppress the first paragraph's margin-top when it sits directly under
+       a pagination widget. Without this, the page-break div's margin-bottom
+       (0) collapses with the next paragraph's margin-top (16) and leaves a
+       wasted 16px gap at the top of every page. Pagination's break decisions
+       use measured outer heights in isolation, so removing the margin only
+       affects rendering — same paragraphs per page, no determinism hit. */
+    > .pagination-page-break + p,
+    > .pagination-first-page + p {
+        margin-top: 0 !important;
+    }
+
     /* Spans inside paragraphs - NO display/width overrides
        These must remain inline (default) to not break text flow */
     > p span,

From 8e618cff895d7591aa53ddbc8fe106232e471ff9 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 1 Jun 2026 02:50:47 +0200
Subject: [PATCH 60/76] added a centralized draft locking button, added a
 settings button to production panel

---
 components/navbar/ProductionPanel.module.css |   6 +
 components/navbar/ProductionPanel.tsx        | 258 ++++++++++++-------
 components/navbar/ScreenplaySearch.tsx       |  17 ++
 components/popup/Popup.tsx                   |   4 +
 components/popup/PopupUnlockDraft.tsx        |  54 ++++
 components/popup/PopupUnlockScenes.tsx       |   2 +-
 messages/de.json                             |   8 +-
 messages/en.json                             |   6 +
 messages/es.json                             |   8 +-
 messages/fr.json                             |   8 +-
 messages/ja.json                             |   8 +-
 messages/ko.json                             |   8 +-
 messages/pl.json                             |   8 +-
 messages/zh.json                             |   8 +-
 src/lib/screenplay/popup.ts                  |  15 +-
 15 files changed, 315 insertions(+), 103 deletions(-)
 create mode 100644 components/popup/PopupUnlockDraft.tsx

diff --git a/components/navbar/ProductionPanel.module.css b/components/navbar/ProductionPanel.module.css
index 1f45f8e5..0de9f091 100644
--- a/components/navbar/ProductionPanel.module.css
+++ b/components/navbar/ProductionPanel.module.css
@@ -27,6 +27,12 @@
     color: var(--primary-text);
 }
 
+.header_actions {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+}
+
 .close_btn {
     display: flex;
     align-items: center;
diff --git a/components/navbar/ProductionPanel.tsx b/components/navbar/ProductionPanel.tsx
index afc9c664..b2297d47 100644
--- a/components/navbar/ProductionPanel.tsx
+++ b/components/navbar/ProductionPanel.tsx
@@ -2,13 +2,14 @@
 
 import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
 import { useTranslations } from "next-intl";
-import { Lock, X, Layers } from "lucide-react";
+import { X, BookOpen, Clapperboard, PencilLine, Settings } from "lucide-react";
 
 import { ProjectContext } from "@src/context/ProjectContext";
 import { UserContext } from "@src/context/UserContext";
+import { DashboardContext } from "@src/context/DashboardContext";
 import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
 import { computeSceneItems } from "@src/lib/screenplay/scenes";
-import { unlockPagesPopup, unlockScenesPopup } from "@src/lib/screenplay/popup";
+import { unlockDraftPopup, unlockPagesPopup, unlockScenesPopup } from "@src/lib/screenplay/popup";
 import { getPageAnchors, getPageAnchorInfo } from "@src/lib/screenplay/extensions/pagination-extension";
 import Switch from "@components/utils/Switch";
 
@@ -47,9 +48,15 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         isReadOnly,
     } = useContext(ProjectContext);
     const userCtx = useContext(UserContext);
+    const { openDashboard } = useContext(DashboardContext);
 
     const panelRef = useRef<HTMLDivElement>(null);
 
+    const handleOpenSettings = () => {
+        onClose();
+        openDashboard("Production");
+    };
+
     // Click outside to close
     useEffect(() => {
         if (!isOpen) return;
@@ -94,36 +101,45 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         });
     }, [repository]);
 
+    // Writes-only scene relock: assigns a frozen token to every scene that
+    // `computeSceneLabels` reports as provisional. Idempotent — scenes that
+    // already hold a token keep it. Must be called inside `repository.transact`
+    // so it can be composed with the page writes for a combined draft lock.
+    const relockScenesWrites = useCallback(() => {
+        if (!repository) return;
+        const currentScreenplay = repository.screenplay;
+        const scenes = computeSceneItems(currentScreenplay);
+        const uuids = scenes.map((s) => s.id).filter((id): id is string => !!id);
+
+        // Re-read fresh persistent data
+        const persistentSnapshot = repository.scenes;
+
+        const currentLabels = computeSceneLabels(
+            uuids,
+            persistentSnapshot,
+            sceneNumberingStyle,
+            skippedSceneLetters,
+        );
+
+        currentLabels.forEach((label) => {
+            if (label.status === "provisional") {
+                repository.upsertScene(label.uuid, { token: label.token });
+            }
+        });
+    }, [repository, sceneNumberingStyle, skippedSceneLetters]);
+
+    // Lock = freeze the current provisional tokens, then flip the flag on.
+    const lockScenesWrites = useCallback(() => {
+        if (!repository) return;
+        relockScenesWrites();
+        repository.setSceneLocking(true);
+    }, [repository, relockScenesWrites]);
+
     const handleSceneLockingToggle = (next: boolean) => {
         if (!repository || isReadOnly) return;
         if (next) {
             repository.transact(() => {
-                const currentScreenplay = repository.screenplay;
-                const scenes = computeSceneItems(currentScreenplay);
-                const uuids = scenes.map(s => s.id).filter((id): id is string => !!id);
-
-                // Idempotent: any scene that already has a token (e.g. left
-                // over from an earlier session, or that survived an unlock
-                // in read-only mode) keeps its frozen label. Only scenes
-                // computed as provisional by `computeSceneLabels` get a new
-                // token written. On a fresh lock-on with no existing
-                // tokens, this falls through to baseToken(idx+1) for every
-                // scene, matching the previous behaviour.
-                const persistentSnapshot = repository.scenes;
-                const labels = computeSceneLabels(
-                    uuids,
-                    persistentSnapshot,
-                    sceneNumberingStyle,
-                    skippedSceneLetters,
-                );
-
-                labels.forEach((label) => {
-                    if (label.status === "provisional") {
-                        repository.upsertScene(label.uuid, { token: label.token });
-                    }
-                });
-
-                repository.setSceneLocking(true);
+                lockScenesWrites();
             });
         } else {
             unlockScenesPopup(performUnlock, userCtx);
@@ -133,25 +149,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
     const handleRelock = () => {
         if (!repository || isReadOnly) return;
         repository.transact(() => {
-            const currentScreenplay = repository.screenplay;
-            const scenes = computeSceneItems(currentScreenplay);
-            const uuids = scenes.map(s => s.id).filter((id): id is string => !!id);
-
-            // Re-read fresh persistent data
-            const persistentSnapshot = repository.scenes;
-
-            const currentLabels = computeSceneLabels(
-                uuids,
-                persistentSnapshot,
-                sceneNumberingStyle,
-                skippedSceneLetters,
-            );
-
-            currentLabels.forEach((label) => {
-                if (label.status === "provisional") {
-                    repository.upsertScene(label.uuid, { token: label.token });
-                }
-            });
+            relockScenesWrites();
         });
     };
 
@@ -187,37 +185,45 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         });
     }, [repository]);
 
+    // Writes-only page relock. Idempotent: any anchor that already has a token
+    // keeps it; only provisional anchors (no token yet) get a freshly-computed
+    // one. splitOffset is captured alongside the token so the pagination plugin
+    // can reproduce mid-node splits (straddling dialogues) on recompute instead
+    // of force-pushing the whole anchor node forward. Must be called inside
+    // `repository.transact`.
+    const relockPagesWrites = useCallback(() => {
+        if (!repository || !editor) return;
+        const anchorInfos = getPageAnchorInfo(editor);
+        const anchors = anchorInfos.map((a) => a.anchorId);
+        const persistentSnapshot = repository.pages;
+        const currentLabels = computeSceneLabels(
+            anchors,
+            persistentSnapshot,
+            "suffix",
+            skippedSceneLetters,
+        );
+        currentLabels.forEach((label, idx) => {
+            if (label.status === "provisional") {
+                repository.upsertPage(label.uuid, {
+                    token: label.token,
+                    splitOffset: anchorInfos[idx]?.splitOffset,
+                });
+            }
+        });
+    }, [repository, editor, skippedSceneLetters]);
+
+    const lockPagesWrites = useCallback(() => {
+        if (!repository || !editor) return;
+        relockPagesWrites();
+        repository.setPageLocking(true);
+    }, [repository, editor, relockPagesWrites]);
+
     const handlePageLockingToggle = (next: boolean) => {
         if (!repository || isReadOnly) return;
         if (next) {
             if (!editor) return;
             repository.transact(() => {
-                const anchorInfos = getPageAnchorInfo(editor);
-                const anchors = anchorInfos.map((a) => a.anchorId);
-                const persistentSnapshot = repository.pages;
-                // Idempotent: any anchor that already has a token keeps it.
-                // Only provisional anchors (no token yet) get a freshly-computed
-                // one. A fresh lock-on with no existing tokens assigns every
-                // page baseToken(idx+1) — same shape as scene locking.
-                const computed = computeSceneLabels(
-                    anchors,
-                    persistentSnapshot,
-                    "suffix",
-                    skippedSceneLetters,
-                );
-                computed.forEach((label, idx) => {
-                    if (label.status === "provisional") {
-                        // splitOffset is captured alongside the token so the
-                        // pagination plugin can reproduce mid-node splits
-                        // (straddling dialogues) on recompute instead of
-                        // force-pushing the whole anchor node forward.
-                        repository.upsertPage(label.uuid, {
-                            token: label.token,
-                            splitOffset: anchorInfos[idx]?.splitOffset,
-                        });
-                    }
-                });
-                repository.setPageLocking(true);
+                lockPagesWrites();
             });
         } else {
             unlockPagesPopup(performPageUnlock, userCtx);
@@ -227,23 +233,49 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
     const handlePageRelock = () => {
         if (!repository || isReadOnly || !editor) return;
         repository.transact(() => {
-            const anchorInfos = getPageAnchorInfo(editor);
-            const anchors = anchorInfos.map((a) => a.anchorId);
-            const persistentSnapshot = repository.pages;
-            const currentLabels = computeSceneLabels(
-                anchors,
-                persistentSnapshot,
-                "suffix",
-                skippedSceneLetters,
-            );
-            currentLabels.forEach((label, idx) => {
-                if (label.status === "provisional") {
-                    repository.upsertPage(label.uuid, {
-                        token: label.token,
-                        splitOffset: anchorInfos[idx]?.splitOffset,
-                    });
-                }
+            relockPagesWrites();
+        });
+    };
+
+    // -------------- Draft locking (scenes + pages together) --------------
+    // The draft toggle reflects whether *everything* is locked. Turning it on
+    // locks scenes and pages in a single transaction (each write is idempotent,
+    // so a partially-locked draft is brought fully in line); turning it off
+    // clears both via one confirmation popup.
+    const draftLocking = sceneLocking && pageLocking;
+
+    const hasProvisionalDraft =
+        (sceneLocking && provisionalLabels.length > 0) ||
+        (pageLocking && provisionalPageLabels.length > 0);
+
+    const performDraftUnlock = useCallback(() => {
+        if (!repository) return;
+        repository.transact(() => {
+            repository.clearSceneLocks();
+            repository.setSceneLocking(false);
+            repository.clearPageLocks();
+            repository.setPageLocking(false);
+        });
+    }, [repository]);
+
+    const handleDraftLockingToggle = (next: boolean) => {
+        if (!repository || isReadOnly) return;
+        if (next) {
+            if (!editor) return;
+            repository.transact(() => {
+                lockScenesWrites();
+                lockPagesWrites();
             });
+        } else {
+            unlockDraftPopup(performDraftUnlock, userCtx);
+        }
+    };
+
+    const handleDraftRelock = () => {
+        if (!repository || isReadOnly) return;
+        repository.transact(() => {
+            if (sceneLocking) relockScenesWrites();
+            if (pageLocking) relockPagesWrites();
         });
     };
 
@@ -253,16 +285,54 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         <div className={styles.container} ref={panelRef}>
             <div className={styles.header}>
                 <span className={styles.title}>{t("title")}</span>
-                <button className={styles.close_btn} onClick={onClose} aria-label="Close">
-                    <X size={16} />
-                </button>
+                <div className={styles.header_actions}>
+                    <button
+                        className={styles.close_btn}
+                        onClick={handleOpenSettings}
+                        aria-label={t("settings")}
+                        title={t("settings")}
+                    >
+                        <Settings size={16} />
+                    </button>
+                    <button className={styles.close_btn} onClick={onClose} aria-label="Close">
+                        <X size={16} />
+                    </button>
+                </div>
+            </div>
+
+            {/* Draft Locking (scenes + pages together) */}
+            <div className={styles.section}>
+                <div className={styles.row}>
+                    <div className={styles.row_main}>
+                        <PencilLine size={14} className={styles.row_icon} />
+                        <span className={styles.row_label}>{t("draftLocking")}</span>
+                    </div>
+                    <div className={styles.row_actions}>
+                        {draftLocking && hasProvisionalDraft && (
+                            <button
+                                type="button"
+                                className={styles.relock_btn}
+                                onClick={handleDraftRelock}
+                                disabled={isReadOnly}
+                            >
+                                {t("draftRelock")}
+                            </button>
+                        )}
+                        <Switch
+                            checked={draftLocking}
+                            onChange={handleDraftLockingToggle}
+                            disabled={isReadOnly}
+                            ariaLabel={t("draftLocking")}
+                        />
+                    </div>
+                </div>
             </div>
 
             {/* Scene Locking */}
             <div className={styles.section}>
                 <div className={styles.row}>
                     <div className={styles.row_main}>
-                        <Lock size={14} className={styles.row_icon} />
+                        <Clapperboard size={14} className={styles.row_icon} />
                         <span className={styles.row_label}>{t("sceneLocking")}</span>
                     </div>
                     <div className={styles.row_actions}>
@@ -306,7 +376,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
             <div className={styles.section}>
                 <div className={styles.row}>
                     <div className={styles.row_main}>
-                        <Layers size={14} className={styles.row_icon} />
+                        <BookOpen size={14} className={styles.row_icon} />
                         <span className={styles.row_label}>{t("pageLocking")}</span>
                     </div>
                     <div className={styles.row_actions}>
diff --git a/components/navbar/ScreenplaySearch.tsx b/components/navbar/ScreenplaySearch.tsx
index c91b71ca..b6337444 100644
--- a/components/navbar/ScreenplaySearch.tsx
+++ b/components/navbar/ScreenplaySearch.tsx
@@ -88,6 +88,23 @@ const ScreenplaySearch = () => {
         setReplaceValue("");
     }, [setSearchTerm]);
 
+    // Click outside to close — only when the search field is empty. If there's
+    // an in-progress search, keep the panel open so it isn't lost on a stray
+    // click. Reads the live input value (uncontrolled) rather than the debounced
+    // context term so it stays accurate before the debounce fires.
+    useEffect(() => {
+        if (!isOpen) return;
+        const handleClickOutside = (e: MouseEvent) => {
+            if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
+                if (!inputRef.current?.value) {
+                    handleClose();
+                }
+            }
+        };
+        document.addEventListener("mousedown", handleClickOutside);
+        return () => document.removeEventListener("mousedown", handleClickOutside);
+    }, [isOpen, handleClose]);
+
     // Use uncontrolled input with debounced updates to context
     const handleSearchChange = useCallback(
         (e: React.ChangeEvent<HTMLInputElement>) => {
diff --git a/components/popup/Popup.tsx b/components/popup/Popup.tsx
index f1e40989..9555e7a5 100644
--- a/components/popup/Popup.tsx
+++ b/components/popup/Popup.tsx
@@ -7,6 +7,7 @@ import {
     PopupImportFileData,
     PopupSceneData,
     PopupType,
+    PopupUnlockDraftData,
     PopupUnlockPagesData,
     PopupUnlockScenesData,
     PopupUploadToCloudData,
@@ -15,6 +16,7 @@ import { useContext } from "react";
 import PopupCharacterItem from "./PopupCharacterItem";
 import PopupImportFile from "./PopupImportFile";
 import PopupSceneItem from "./PopupSceneItem";
+import PopupUnlockDraft from "./PopupUnlockDraft";
 import PopupUnlockPages from "./PopupUnlockPages";
 import PopupUnlockScenes from "./PopupUnlockScenes";
 import PopupUploadToCloud from "./PopupUploadToCloud";
@@ -38,6 +40,8 @@ export const Popup = () => {
             return <PopupUnlockScenes {...(popup as PopupData<PopupUnlockScenesData>)} />;
         case PopupType.UnlockPages:
             return <PopupUnlockPages {...(popup as PopupData<PopupUnlockPagesData>)} />;
+        case PopupType.UnlockDraft:
+            return <PopupUnlockDraft {...(popup as PopupData<PopupUnlockDraftData>)} />;
         default:
             return null;
     }
diff --git a/components/popup/PopupUnlockDraft.tsx b/components/popup/PopupUnlockDraft.tsx
new file mode 100644
index 00000000..6cca7f57
--- /dev/null
+++ b/components/popup/PopupUnlockDraft.tsx
@@ -0,0 +1,54 @@
+"use client";
+
+import { useContext } from "react";
+import { useTranslations } from "next-intl";
+import { X, Unlock } from "lucide-react";
+
+import popup from "./Popup.module.css";
+
+import { useDraggable } from "@src/lib/utils/hooks";
+import { PopupData, PopupUnlockDraftData, closePopup } from "@src/lib/screenplay/popup";
+import { UserContext } from "@src/context/UserContext";
+
+const PopupUnlockDraft = ({ data: { confirmUnlock } }: PopupData<PopupUnlockDraftData>) => {
+    const userCtx = useContext(UserContext);
+    const { position, handleMouseDown, isDragging } = useDraggable();
+    const t = useTranslations("production");
+
+    const onConfirm = () => {
+        confirmUnlock();
+        closePopup(userCtx);
+    };
+
+    return (
+        <div className={popup.window}>
+            <div
+                className={popup.container}
+                style={{ transform: `translate(${position.x}px, ${position.y}px)` }}
+            >
+                <div
+                    className={popup.header}
+                    onMouseDown={handleMouseDown}
+                    style={{ cursor: isDragging ? "grabbing" : "grab" }}
+                >
+                    <h2 className={popup.title}>{t("unlockDraftTitle")}</h2>
+                    <X className={popup.close_btn} onClick={() => closePopup(userCtx)} />
+                </div>
+                <div className={popup.info}>
+                    <p>{t("unlockDraftWarning")}</p>
+                </div>
+                <div className={popup.buttons}>
+                    <button className={popup.import_confirm} onClick={onConfirm}>
+                        <Unlock size={18} color="white" />
+                        {t("unlockDraft")}
+                    </button>
+                    <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
+                        {t("cancel")}
+                    </button>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default PopupUnlockDraft;
diff --git a/components/popup/PopupUnlockScenes.tsx b/components/popup/PopupUnlockScenes.tsx
index 607a0bf1..dcedfafe 100644
--- a/components/popup/PopupUnlockScenes.tsx
+++ b/components/popup/PopupUnlockScenes.tsx
@@ -35,7 +35,7 @@ const PopupUnlockScenes = ({ data: { confirmUnlock } }: PopupData<PopupUnlockSce
                     <X className={popup.close_btn} onClick={() => closePopup(userCtx)} />
                 </div>
                 <div className={popup.info}>
-                    <p>{t("unlockWarning")}</p>
+                    <p>{t.rich("unlockWarning", { b: (chunks) => <b>{chunks}</b> })}</p>
                 </div>
                 <div className={popup.buttons}>
                     <button className={popup.import_confirm} onClick={onConfirm}>
diff --git a/messages/de.json b/messages/de.json
index 5350ca71..1a6df769 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -451,10 +451,16 @@
   },
   "production": {
     "title": "Produktion",
+    "draftLocking": "Entwurf sperren",
+    "draftRelock": "Erneut sperren",
+    "settings": "Produktionseinstellungen",
+    "unlockDraftTitle": "Entwurf entsperren",
+    "unlockDraftWarning": "Sowohl Szenen als auch Seiten verlieren ihre gesperrte Nummerierung und kehren zu ihrer natürlichen Nummerierung zurück.",
+    "unlockDraft": "Entwurf entsperren",
     "sceneLocking": "Szenen sperren",
     "pageLocking": "Seiten sperren",
     "revisions": "Revisionen",
-    "relock": "Sperren",
+    "relock": "Erneut sperren",
     "provisionalTitle": "Nicht gesperrte Szenen",
     "unlockTitle": "Szenennummern entsperren?",
     "unlockWarning": "<b>Alle gesperrten und ausgelassenen Szenen verlieren ihre fixierte Nummerierung.</b>",
diff --git a/messages/en.json b/messages/en.json
index 4aade80b..fa5cecd2 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -450,6 +450,12 @@
   },
   "production": {
     "title": "Production",
+    "draftLocking": "Draft locking",
+    "draftRelock": "Relock",
+    "settings": "Production settings",
+    "unlockDraftTitle": "Unlock draft",
+    "unlockDraftWarning": "Both scenes and pages will lose their locked numbering, reverting to their natural numbering.",
+    "unlockDraft": "Unlock draft",
     "sceneLocking": "Scene locking",
     "pageLocking": "Page locking",
     "revisions": "Revisions",
diff --git a/messages/es.json b/messages/es.json
index 534460e6..664070f1 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -450,10 +450,16 @@
   },
   "production": {
     "title": "Producción",
+    "draftLocking": "Bloquear borrador",
+    "draftRelock": "Volver a bloquear",
+    "settings": "Ajustes de producción",
+    "unlockDraftTitle": "Desbloquear borrador",
+    "unlockDraftWarning": "Tanto las escenas como las páginas perderán su numeración bloqueada y volverán a su numeración natural.",
+    "unlockDraft": "Desbloquear borrador",
     "sceneLocking": "Bloquear escenas",
     "pageLocking": "Bloquear páginas",
     "revisions": "Revisiones",
-    "relock": "Bloquear",
+    "relock": "Volver a bloquear",
     "provisionalTitle": "Escenas no bloqueadas",
     "unlockTitle": "¿Desbloquear los números de escena?",
     "unlockWarning": "<b>Todas las escenas bloqueadas y omitidas perderán su numeración fija.</b>",
diff --git a/messages/fr.json b/messages/fr.json
index b38866ca..a586e6c7 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -451,10 +451,16 @@
   },
   "production": {
     "title": "Production",
+    "draftLocking": "Verrouillage du brouillon",
+    "draftRelock": "Reverrouiller",
+    "settings": "Paramètres de production",
+    "unlockDraftTitle": "Déverrouiller le brouillon",
+    "unlockDraftWarning": "Les scènes et les pages perdront leur numérotation verrouillée et reviendront à leur numérotation naturelle.",
+    "unlockDraft": "Déverrouiller le brouillon",
     "sceneLocking": "Verrouillage des scènes",
     "pageLocking": "Verrouillage des pages",
     "revisions": "Révisions",
-    "relock": "Verrouiller",
+    "relock": "Reverrouiller",
     "provisionalTitle": "Scènes non verrouillées",
     "unlockTitle": "Déverrouiller les numéros de scène ?",
     "unlockWarning": "<b>Toutes les scènes verrouillées et omises perdront leur numérotation figée.</b>",
diff --git a/messages/ja.json b/messages/ja.json
index 997b31f8..19e3a584 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -450,10 +450,16 @@
   },
   "production": {
     "title": "プロダクション",
+    "draftLocking": "ドラフトロック",
+    "draftRelock": "再ロック",
+    "settings": "制作設定",
+    "unlockDraftTitle": "ドラフトのロック解除",
+    "unlockDraftWarning": "シーンとページの両方がロックされた番号を失い、それぞれの自然な番号に戻ります。",
+    "unlockDraft": "ドラフトのロック解除",
     "sceneLocking": "シーンロック",
     "pageLocking": "ページロック",
     "revisions": "改訂",
-    "relock": "ロック",
+    "relock": "再ロック",
     "provisionalTitle": "未ロックのシーン",
     "unlockTitle": "シーン番号のロックを解除しますか？",
     "unlockWarning": "<b>ロック済みおよび省略されたシーンの固定番号はすべて失われます。</b>",
diff --git a/messages/ko.json b/messages/ko.json
index 98e6f3f8..6894a717 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -450,10 +450,16 @@
   },
   "production": {
     "title": "프로덕션",
+    "draftLocking": "드래프트 잠금",
+    "draftRelock": "다시 잠그기",
+    "settings": "프로덕션 설정",
+    "unlockDraftTitle": "드래프트 잠금 해제",
+    "unlockDraftWarning": "씬과 페이지 모두 잠긴 번호를 잃고 각자의 자연스러운 번호로 되돌아갑니다.",
+    "unlockDraft": "드래프트 잠금 해제",
     "sceneLocking": "씬 잠금",
     "pageLocking": "페이지 잠금",
     "revisions": "개정",
-    "relock": "잠그기",
+    "relock": "다시 잠그기",
     "provisionalTitle": "잠기지 않은 씬",
     "unlockTitle": "씬 번호 잠금을 해제하시겠습니까?",
     "unlockWarning": "<b>잠긴 씬과 생략된 씬의 고정 번호가 모두 사라집니다.</b>",
diff --git a/messages/pl.json b/messages/pl.json
index 1caf69ba..ceb50352 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -450,10 +450,16 @@
   },
   "production": {
     "title": "Produkcja",
+    "draftLocking": "Blokowanie wersji roboczej",
+    "draftRelock": "Zablokuj ponownie",
+    "settings": "Ustawienia produkcji",
+    "unlockDraftTitle": "Odblokuj wersję roboczą",
+    "unlockDraftWarning": "Zarówno sceny, jak i strony stracą swoją zablokowaną numerację i powrócą do swojej naturalnej numeracji.",
+    "unlockDraft": "Odblokuj wersję roboczą",
     "sceneLocking": "Blokowanie scen",
     "pageLocking": "Blokowanie stron",
     "revisions": "Wersje",
-    "relock": "Zablokuj",
+    "relock": "Zablokuj ponownie",
     "provisionalTitle": "Niezablokowane sceny",
     "unlockTitle": "Odblokować numery scen?",
     "unlockWarning": "<b>Wszystkie zablokowane i pominięte sceny utracą zamrożoną numerację.</b>",
diff --git a/messages/zh.json b/messages/zh.json
index ac973006..40374b13 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -450,10 +450,16 @@
   },
   "production": {
     "title": "制作",
+    "draftLocking": "锁定草稿",
+    "draftRelock": "重新锁定",
+    "settings": "制作设置",
+    "unlockDraftTitle": "解锁草稿",
+    "unlockDraftWarning": "场景和页面都将失去其锁定的编号，恢复为各自的自然编号。",
+    "unlockDraft": "解锁草稿",
     "sceneLocking": "锁定场景",
     "pageLocking": "锁定页面",
     "revisions": "修订",
-    "relock": "锁定",
+    "relock": "重新锁定",
     "provisionalTitle": "未锁定的场景",
     "unlockTitle": "解锁场景编号?",
     "unlockWarning": "<b>所有锁定和省略的场景都将失去固定编号。</b>",
diff --git a/src/lib/screenplay/popup.ts b/src/lib/screenplay/popup.ts
index 0cb26320..82bdb1ed 100644
--- a/src/lib/screenplay/popup.ts
+++ b/src/lib/screenplay/popup.ts
@@ -29,6 +29,10 @@ export type PopupUnlockPagesData = {
     confirmUnlock: () => void;
 };
 
+export type PopupUnlockDraftData = {
+    confirmUnlock: () => void;
+};
+
 // ------------------------------ //
 //         GENERIC POPUP          //
 // ------------------------------ //
@@ -38,7 +42,8 @@ export type PopupUnionData =
     | PopupSceneData
     | PopupUploadToCloudData
     | PopupUnlockScenesData
-    | PopupUnlockPagesData;
+    | PopupUnlockPagesData
+    | PopupUnlockDraftData;
 
 export enum PopupType {
     NewCharacter,
@@ -48,6 +53,7 @@ export enum PopupType {
     UploadToCloud,
     UnlockScenes,
     UnlockPages,
+    UnlockDraft,
 }
 
 export type PopupData<DataType extends PopupUnionData> = {
@@ -111,3 +117,10 @@ export const unlockPagesPopup = (confirmUnlock: () => void, userCtx: UserContext
         data: { confirmUnlock },
     });
 };
+
+export const unlockDraftPopup = (confirmUnlock: () => void, userCtx: UserContextType) => {
+    userCtx.updatePopup({
+        type: PopupType.UnlockDraft,
+        data: { confirmUnlock },
+    });
+};

From cb0856d99a666890a1fbb9aed7c0bcff46502aba Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 8 Jun 2026 02:23:41 +0200
Subject: [PATCH 61/76] page locking, fixed scene omitting, etc

---
 .../EditorSidebarNavigation.module.css        |  15 +-
 .../navbar/ViewOptionsDropdown.module.css     |   7 +-
 components/navbar/ViewOptionsDropdown.tsx     |  10 +
 components/project/SplitPanelContainer.tsx    |  13 +
 messages/de.json                              |   1 +
 messages/en.json                              |   1 +
 messages/es.json                              |   1 +
 messages/fr.json                              |   1 +
 messages/ja.json                              |   1 +
 messages/ko.json                              |   1 +
 messages/pl.json                              |   1 +
 messages/zh.json                              |   1 +
 src/context/ViewContext.tsx                   |  11 +-
 src/lib/editor/use-document-editor.ts         |  25 +-
 src/lib/project/project-repository.ts         |   5 +-
 .../extensions/pagination-extension.ts        | 441 +++++++++--------
 .../extensions/scene-locking-extension.ts     |  33 +-
 src/lib/screenplay/page-locking.ts            |  16 +
 src/lib/screenplay/scene-locking.ts           | 180 ++++++-
 src/lib/screenplay/scenes.ts                  |  15 +
 .../repro/omitted-scene-cut-restore.test.ts   | 468 ++++++++++++++++++
 .../repro/page-lock-edit-drops-break.test.ts  | 157 ++++++
 styles/scriptio.css                           |   9 +-
 23 files changed, 1138 insertions(+), 275 deletions(-)
 create mode 100644 src/tests/repro/omitted-scene-cut-restore.test.ts
 create mode 100644 src/tests/repro/page-lock-edit-drops-break.test.ts

diff --git a/components/editor/sidebar/EditorSidebarNavigation.module.css b/components/editor/sidebar/EditorSidebarNavigation.module.css
index 6587655f..d10e97fa 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.module.css
+++ b/components/editor/sidebar/EditorSidebarNavigation.module.css
@@ -91,25 +91,27 @@
 .tab_bar {
     display: flex;
     flex-direction: row;
+    justify-content: center;
     border-top: 1px solid var(--separator);
     margin-top: auto;
     padding-top: 4px;
     padding-inline: 12px;
-    gap: 4px;
+    gap: 8px;
 }
 
 .tab_btn {
-    flex: 1;
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 8px 0;
+    padding: 8px 12px;
     border-radius: 8px;
     cursor: pointer;
     color: var(--secondary-text);
     background: none;
     border: none;
-    transition: color 0.15s, background-color 0.15s;
+    transition:
+        color 0.15s,
+        background-color 0.15s;
 }
 
 .tab_btn:hover {
@@ -119,4 +121,9 @@
 
 .tab_btn_active {
     color: var(--primary-text);
+    background-color: var(--editor-sidebar-hover);
+}
+
+.tab_btn_active:hover {
+    color: var(--primary-text);
 }
diff --git a/components/navbar/ViewOptionsDropdown.module.css b/components/navbar/ViewOptionsDropdown.module.css
index 4f458720..963402b1 100644
--- a/components/navbar/ViewOptionsDropdown.module.css
+++ b/components/navbar/ViewOptionsDropdown.module.css
@@ -68,11 +68,16 @@
         color 0.15s ease;
 }
 
-.dropdown_item:hover {
+.dropdown_item:hover:not(:disabled) {
     background-color: var(--secondary-hover);
     color: var(--primary-text);
 }
 
+.dropdown_item:disabled {
+    opacity: 0.4;
+    cursor: default;
+}
+
 .dropdown_item_active {
     background-color: var(--secondary-hover);
     color: var(--primary-text);
diff --git a/components/navbar/ViewOptionsDropdown.tsx b/components/navbar/ViewOptionsDropdown.tsx
index 2eeac571..a0aa77b4 100644
--- a/components/navbar/ViewOptionsDropdown.tsx
+++ b/components/navbar/ViewOptionsDropdown.tsx
@@ -13,6 +13,7 @@ import {
     Minimize,
     PanelRight,
     PanelRightClose,
+    ArrowLeftRight,
     Eye,
 } from "lucide-react";
 
@@ -31,6 +32,7 @@ const ViewOptionsDropdown = () => {
         isSplit,
         primaryPanel,
         setSecondaryPanel,
+        swapPanels,
     } = useViewContext();
 
     const handleSplitToggle = useCallback(() => {
@@ -142,6 +144,14 @@ const ViewOptionsDropdown = () => {
                         {isSplit ? <PanelRightClose size={16} /> : <PanelRight size={16} />}
                         <span className={styles.item_label}>{isSplit ? t("unsplitPanel") : t("splitPanel")}</span>
                     </button>
+                    <button
+                        className={styles.dropdown_item}
+                        onClick={swapPanels}
+                        disabled={!isSplit}
+                    >
+                        <ArrowLeftRight size={16} />
+                        <span className={styles.item_label}>{t("swapPanels")}</span>
+                    </button>
                 </div>
             )}
         </div>
diff --git a/components/project/SplitPanelContainer.tsx b/components/project/SplitPanelContainer.tsx
index 33776f47..c2156b81 100644
--- a/components/project/SplitPanelContainer.tsx
+++ b/components/project/SplitPanelContainer.tsx
@@ -13,6 +13,7 @@ import DragHandle from "./DragHandle";
 import { SuggestionData } from "@components/editor/SuggestionMenu";
 import {
     Archive,
+    ArrowLeftRight,
     ChevronLeft,
     ChevronRight,
     Clapperboard,
@@ -82,6 +83,7 @@ const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; si
         isSplit,
         primaryPanel,
         setSecondaryPanel,
+        swapPanels,
         isEndlessScroll,
         setIsEndlessScroll,
         showComments,
@@ -177,6 +179,17 @@ const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; si
                         {isSplit ? <PanelRightClose size={14} /> : <PanelRight size={14} />}
                         <span className={dropdown.item_label}>{isSplit ? t("unsplitPanel") : t("splitPanel")}</span>
                     </button>
+                    <button
+                        className={dropdown.dropdown_item}
+                        onClick={() => {
+                            swapPanels();
+                            setIsOpen(false);
+                        }}
+                        disabled={!isSplit}
+                    >
+                        <ArrowLeftRight size={14} />
+                        <span className={dropdown.item_label}>{t("swapPanels")}</span>
+                    </button>
                     <div className={styles.panel_switcher_separator} />
                     {SWITCHABLE_PANELS.map(({ type, icon: Icon, labelKey }) => (
                         <button
diff --git a/messages/de.json b/messages/de.json
index 1a6df769..2368073f 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -14,6 +14,7 @@
     "focusMode": "Fokus-Modus",
     "splitPanel": "Panel teilen",
     "unsplitPanel": "Panel schließen",
+    "swapPanels": "Panels tauschen",
     "draftEditor": "Entwurfseditor",
     "viewOnly": "Nur ansehen",
     "viewOnlyHint": "Sie haben Lesezugriff. Die Bearbeitung ist deaktiviert."
diff --git a/messages/en.json b/messages/en.json
index fa5cecd2..b04f5b97 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -13,6 +13,7 @@
     "focusMode": "Focus Mode",
     "splitPanel": "Split Panel",
     "unsplitPanel": "Unsplit Panel",
+    "swapPanels": "Swap Panels",
     "draftEditor": "Draft Editor",
     "viewOnly": "View only",
     "viewOnlyHint": "You have viewer access. Editing is disabled."
diff --git a/messages/es.json b/messages/es.json
index 664070f1..9688fd45 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -13,6 +13,7 @@
     "focusMode": "Modo concentración",
     "splitPanel": "Dividir panel",
     "unsplitPanel": "Unir panel",
+    "swapPanels": "Intercambiar paneles",
     "draftEditor": "Editor de borrador",
     "viewOnly": "Solo lectura",
     "viewOnlyHint": "Tienes acceso de solo visualización. La edición está desactivada."
diff --git a/messages/fr.json b/messages/fr.json
index a586e6c7..b3b62b77 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -14,6 +14,7 @@
     "focusMode": "Mode concentration",
     "splitPanel": "Diviser le panneau",
     "unsplitPanel": "Fermer le panneau divisé",
+    "swapPanels": "Inverser les panneaux",
     "draftEditor": "Éditeur de brouillon",
     "viewOnly": "Vue seule",
     "viewOnlyHint": "Vous avez un accès visiteur. La modification est désactivée."
diff --git a/messages/ja.json b/messages/ja.json
index 19e3a584..fed7484d 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -13,6 +13,7 @@
     "focusMode": "集中モード",
     "splitPanel": "パネルを分割",
     "unsplitPanel": "パネルを閉じる",
+    "swapPanels": "パネルを入れ替え",
     "draftEditor": "下書きエディター",
     "viewOnly": "閲覧のみ",
     "viewOnlyHint": "閲覧者アクセスです。編集は無効になっています。"
diff --git a/messages/ko.json b/messages/ko.json
index 6894a717..4f0b4e6b 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -13,6 +13,7 @@
     "focusMode": "집중 모드",
     "splitPanel": "패널 분할",
     "unsplitPanel": "패널 통합",
+    "swapPanels": "패널 교체",
     "draftEditor": "초안 편집기",
     "viewOnly": "보기 전용",
     "viewOnlyHint": "뷰어 권한이 있습니다. 편집이 비활성화되었습니다."
diff --git a/messages/pl.json b/messages/pl.json
index ceb50352..b49b4af6 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -13,6 +13,7 @@
     "focusMode": "Tryb skupienia",
     "splitPanel": "Podziel panel",
     "unsplitPanel": "Zamknij panel",
+    "swapPanels": "Zamień panele",
     "draftEditor": "Edytor szkiców",
     "viewOnly": "Tylko podgląd",
     "viewOnlyHint": "Masz dostęp gościa. Edytowanie jest wyłączone."
diff --git a/messages/zh.json b/messages/zh.json
index 40374b13..cab5009f 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -13,6 +13,7 @@
     "focusMode": "聚焦模式",
     "splitPanel": "分割面板",
     "unsplitPanel": "合并面板",
+    "swapPanels": "交换面板",
     "draftEditor": "草稿编辑器",
     "viewOnly": "仅查看",
     "viewOnlyHint": "您拥有访客权限，编辑功能已禁用。"
diff --git a/src/context/ViewContext.tsx b/src/context/ViewContext.tsx
index 2b546fb8..4184b4b0 100644
--- a/src/context/ViewContext.tsx
+++ b/src/context/ViewContext.tsx
@@ -24,6 +24,7 @@ interface ViewContextType {
     setFocusedSide: (side: SplitSide) => void;
     setFocusedPanel: (panel: PanelType) => void;
     setSidePanel: (side: SplitSide, panel: PanelType) => void;
+    swapPanels: () => void;
     setIsEndlessScroll: (value: boolean | ((prev: boolean) => boolean)) => void;
     setShowComments: (value: boolean | ((prev: boolean) => boolean)) => void;
     setLeftSidebarOpen: (value: boolean | ((prev: boolean) => boolean)) => void;
@@ -163,6 +164,13 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
         [primaryPanel, secondaryPanel],
     );
 
+    const swapPanels = useCallback(() => {
+        if (!secondaryPanel) return;
+        setPrimaryPanelState(secondaryPanel);
+        setSecondaryPanelState(primaryPanel);
+        setFocusedSideState((prev) => (prev === "primary" ? "secondary" : "primary"));
+    }, [primaryPanel, secondaryPanel]);
+
     const value = useMemo(
         () => ({
             primaryPanel,
@@ -183,12 +191,13 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
             setFocusedSide,
             setFocusedPanel,
             setSidePanel,
+            swapPanels,
             setIsEndlessScroll,
             setShowComments,
             setLeftSidebarOpen,
             setRightSidebarOpen,
         }),
-        [primaryPanel, secondaryPanel, splitRatio, isSplit, visiblePanels, mountedPanels, focusedSide, focusedPanel, isEndlessScroll, showComments, leftSidebarOpen, rightSidebarOpen, setPrimaryPanel, setSecondaryPanel, setFocusedSide, setFocusedPanel, setSidePanel, setIsEndlessScroll, setShowComments],
+        [primaryPanel, secondaryPanel, splitRatio, isSplit, visiblePanels, mountedPanels, focusedSide, focusedPanel, isEndlessScroll, showComments, leftSidebarOpen, rightSidebarOpen, setPrimaryPanel, setSecondaryPanel, setFocusedSide, setFocusedPanel, setSidePanel, swapPanels, setIsEndlessScroll, setShowComments],
     );
 
     return <ViewContext.Provider value={value}>{children}</ViewContext.Provider>;
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index 81429b13..1f582e9b 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -31,7 +31,7 @@ import {
     createSceneLockingExtension,
     refreshSceneLocking,
 } from "@src/lib/screenplay/extensions/scene-locking-extension";
-import { SCENE_OMIT_UNDO_ORIGIN } from "@src/lib/screenplay/scene-locking";
+import { computeAbsorbedPageTokens, SCENE_OMIT_UNDO_ORIGIN } from "@src/lib/screenplay/scene-locking";
 import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
 import { CommentMark } from "@src/lib/screenplay/extensions/comment-highlight-extension";
 import { createSpellcheckExtension, refreshSpellcheck } from "@src/lib/spellcheck/spellcheck-extension";
@@ -372,7 +372,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
                               getPageLocking: () => !!ext.pageLocking,
                               getPageLocks: () => ext.persistentPages ?? {},
                               getSkippedLetters: () => ext.skippedSceneLetters ?? [],
-                              getScenes: () => ext.repository?.scenes ?? {},
+                              getOmittedPages: () => computeAbsorbedPageTokens(ext.repository?.scenes ?? {}),
                           }
                         : {
                               pageGap: 20,
@@ -558,8 +558,12 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     // track only the editor XmlFragment (scope) and only `ySyncPluginKey`
     // (origin), and y-tiptap's stack-item-popped fires AFTER the undo
     // transaction commits — so a few tweaks are needed:
-    //   - addToScope(scenes): scene metadata lives in a separate Y.Map; without
-    //     this the UndoManager silently ignores every mutation to it.
+    //   - addToScope(scenes, pages): scene metadata and page locks each live in
+    //     a separate Y.Map; without this the UndoManager silently ignores every
+    //     mutation to them. Pages must be in scope too — omit deletes in-body
+    //     page locks and re-homes the successor lock, and undo must revert those
+    //     alongside the doc edit, otherwise the restored body's anchor stays
+    //     unlocked and a phantom page appears (undo would differ from Unomit).
     //   - trackedOrigins.add(SCENE_OMIT_UNDO_ORIGIN): omit/unomit bundle a PM
     //     dispatch and a Map.set into one Yjs transaction tagged with this
     //     symbol so Ctrl+Z reverts both halves atomically.
@@ -576,7 +580,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
 
         const um = yUndoState.undoManager;
         const binding = ySyncState.binding;
-        um.addToScope([projectState.scenes()]);
+        um.addToScope([projectState.scenes(), projectState.pages()]);
         um.trackedOrigins.add(SCENE_OMIT_UNDO_ORIGIN);
 
         const originalUndo = um.undo.bind(um);
@@ -629,18 +633,13 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     // Refresh pagination when page locking or the page-lock map changes.
     // Pagination only reads these via getter closures on its options, so
     // we must explicitly kick it to re-run; otherwise stale labels render
-    // until the user types.
-    //
-    // persistentScenes is included so toggling a scene's `omitted` flag
-    // re-runs pagination immediately: omitted body paragraphs collapse to
-    // zero height in the layout (mirroring the visual display:none from
-    // scene-locking-extension), so the page they sit on must shrink/grow
-    // without waiting for the next keystroke.
+    // until the user types. (Omitting a scene re-homes locks in this map, so
+    // this also covers the omitted-scene case.)
     useEffect(() => {
         if (editor && config.features.paginationMode === "screenplay") {
             refreshPageLocking(editor);
         }
-    }, [editor, pageLocking, persistentPages, persistentScenes, skippedSceneLetters, config.features.paginationMode]);
+    }, [editor, pageLocking, persistentPages, skippedSceneLetters, config.features.paginationMode]);
 
     // Refresh search highlights
     useEffect(() => {
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index 4ea322ac..e484ee36 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -259,7 +259,10 @@ export class ProjectRepository {
         const existing = (map.get(sceneId) as PersistentScene | undefined) ?? {};
 
         const merged: PersistentScene = { ...existing };
-        const FIELDS = ["synopsis", "color", "token", "omitted", "originalHeading"] as const;
+        const FIELDS = [
+            "synopsis", "color", "token", "omitted", "originalHeading",
+            "omittedBody", "omittedPageLocks", "reanchoredSuccessor",
+        ] as const;
         for (const key of FIELDS) {
             if (key in data) {
                 (merged as Record<string, unknown>)[key] = data[key];
diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index cc8a29ed..caafff38 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -7,9 +7,15 @@ import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import { ySyncPluginKey } from "@tiptap/y-tiptap";
 
-import { compareTokens, computeSceneLabels, SceneToken } from "@src/lib/screenplay/scene-locking";
-import { PAGE_ONE_KEY, PersistentPageMap } from "@src/lib/screenplay/page-locking";
-import type { PersistentSceneMap } from "@src/lib/screenplay/scenes";
+import {
+    buildSceneAlphabet,
+    compareTokens,
+    compileSceneLabel,
+    computeSceneLabels,
+    SceneLabel,
+    SceneToken,
+} from "@src/lib/screenplay/scene-locking";
+import { PAGE_COLLAPSE_META, PAGE_ONE_KEY, PersistentPageMap, SCENE_OMIT_META } from "@src/lib/screenplay/page-locking";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -124,11 +130,11 @@ export interface PaginationOptions {
     getPageLocks?: () => PersistentPageMap;
     /** Letters skipped from generated labels (shared with scene locking). */
     getSkippedLetters?: () => readonly string[];
-    /** Persistent scene map. Used to detect omitted scenes so their hidden
-     *  body paragraphs contribute zero height to the page layout — without
-     *  this, omission would visually collapse the body but pagination would
-     *  still allocate full height, leaving the page short on real content. */
-    getScenes?: () => PersistentSceneMap;
+    /** Tokens of locked pages that an omitted scene collapsed out of the
+     *  document. Rendered as a combined range on the preceding surviving page
+     *  (e.g. "4-5") so omitting a full page doesn't leave a gap in the
+     *  numbering. Empty/absent when no scene is omitted. */
+    getOmittedPages?: () => SceneToken[];
 }
 
 export interface PageBreakInfo {
@@ -662,7 +668,7 @@ function computePageLabels(
     breaks: PageBreakInfo[],
     pageLocks: PersistentPageMap,
     skippedLetters: readonly string[],
-): string[] {
+): SceneLabel[] {
     const anchors: string[] = [PAGE_ONE_KEY];
     for (const b of breaks) {
         // Empty pages anchor to the orphan lock's anchorId. Real pages anchor
@@ -671,8 +677,7 @@ function computePageLabels(
         // so the label-computer still produces a usable result.
         anchors.push(b.anchorId ?? `__break_${b.pos}_${b.pagenum}__`);
     }
-    const labels = computeSceneLabels(anchors, pageLocks, "suffix", skippedLetters);
-    return labels.map((l) => l.label);
+    return computeSceneLabels(anchors, pageLocks, "suffix", skippedLetters);
 }
 
 const createPaginationPlugin = (extension: {
@@ -783,7 +788,6 @@ const createPaginationPlugin = (extension: {
                 // with the same locked label until the dedup transaction fires.
                 const consumedAnchors = new Set<string>();
                 const skippedLetters = options.getSkippedLetters?.() ?? [];
-                const scenesMap = options.getScenes?.() ?? null;
 
                 const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
                 const breaks: PageBreakInfo[] = [];
@@ -796,14 +800,6 @@ const createPaginationPlugin = (extension: {
                 // with "CHARACTER (CONT'D)" on the next page.
                 let lastCharName = "";
 
-                // Tracks whether the currently-open scene is OMITTED. Body
-                // paragraphs under an omitted scene are hidden via decorations
-                // (display:none) but still present in the document — pagination
-                // must mirror the visual collapse by treating them as zero-
-                // height, otherwise the page they sit on appears short while
-                // the layout still allocates their original height.
-                let currentSceneOmitted = false;
-
                 // Set when the short-circuit exits the per-node loop early.
                 // pagePos at that point reflects only the carry node(s) sitting
                 // on the new page right after the matched break — not the real
@@ -847,15 +843,6 @@ const createPaginationPlugin = (extension: {
 
                     const dataId: string | undefined = node.attrs["data-id"];
 
-                    // Update the omitted-scene flag at each Scene boundary. Body
-                    // paragraphs that follow stay flagged until the next Scene
-                    // resets it. Scene headings themselves always render (with
-                    // the OMITTED overlay sitting on top) so their height is
-                    // kept regardless.
-                    if (nodeType === ScreenplayElement.Scene) {
-                        currentSceneOmitted = !!(scenesMap && dataId && scenesMap[dataId]?.omitted);
-                    }
-
                     // --- Force page break for "start new page" elements ---
                     // If this node type is configured to start a new page and we're
                     // not already at the top of a page, insert a break before it.
@@ -944,23 +931,15 @@ const createPaginationPlugin = (extension: {
                         }
                     }
 
-                    // Omitted-scene body paragraphs are visually hidden by
-                    // scene-locking decorations (display:none) but still live in
-                    // the document. Treat them as zero-height so pagination
-                    // matches what the user actually sees on the page. The
-                    // measured height stays cached for cheap restoration when
-                    // the scene is un-omitted.
-                    const effectiveHeight = currentSceneOmitted && nodeType !== ScreenplayElement.Scene ? 0 : height;
-
                     // Accumulate height on current page
-                    pagePos += effectiveHeight;
+                    pagePos += height;
 
                     // We keep the last 3 nodes for orphan resolution on page break
                     lastNodes.push({
                         pos,
                         type: nodeType,
-                        height: effectiveHeight,
-                        positionTop: pagePos - effectiveHeight,
+                        height,
+                        positionTop: pagePos - height,
                         dataId,
                     });
 
@@ -1118,184 +1097,159 @@ const createPaginationPlugin = (extension: {
                 // short-circuit condition guarantees content past that break
                 // is identical to the previous pass, so the previously stored
                 // freespace is still the correct answer.
-                let lastPageFreespace = shortCircuited ? value.lastPageFreespace : Math.max(0, contentHeight - pagePos);
-
-                // --- Orphan page handling ---
-                // A locked page whose anchor data-id is no longer present in the doc
-                // becomes an "orphan" — we insert a synthetic empty-page break so the
-                // page still appears in the layout (preserving its locked number).
-                // Orphans are placed at the doc position of the next surviving lock
-                // (or doc end) and consume a full content-height of vertical space.
+                const lastPageFreespace = shortCircuited
+                    ? value.lastPageFreespace
+                    : Math.max(0, contentHeight - pagePos);
+
+                // --- Orphan page collection ---
+                // A locked page whose anchor data-id is no longer present in the
+                // doc is an "orphan" — e.g. the user emptied a locked page and
+                // collapsed it (see PAGE_COLLAPSE_META), or a collaborator's edit
+                // removed its anchor. Its frozen number must not vanish, so its
+                // token is folded into the FOLLOWING surviving page as a range
+                // ("5-6") — or reclaimed by a provisional page grown into the
+                // gap — by the absorb pipeline below, exactly like an omitted
+                // scene's removed pages.
+                const orphanTokens: SceneToken[] = [];
                 if (pageLocks) {
                     const seenAnchors = new Set<string>();
                     for (const b of breaks) {
                         if (b.anchorId) seenAnchors.add(b.anchorId);
                     }
-
-                    // Tokens for ordered comparison. Provisional pages (no token in
-                    // the lock map) aren't relevant here — only locked entries can be
-                    // orphans. We need the orphan list in TOKEN order so insertions
-                    // happen at the right spots.
-                    type OrphanEntry = { anchorId: string; token: SceneToken };
-                    const orphans: OrphanEntry[] = [];
                     for (const [anchorId, page] of Object.entries(pageLocks)) {
-                        if (anchorId === PAGE_ONE_KEY) continue;
-                        if (!page?.token) continue;
+                        if (anchorId === PAGE_ONE_KEY || !page?.token) continue;
                         if (seenAnchors.has(anchorId)) continue;
-                        orphans.push({ anchorId, token: page.token });
+                        orphanTokens.push(page.token);
+                    }
+                }
+
+                // --- Label assignment ---
+                // Run computeSceneLabels over [page1Anchor, ...breakAnchors] so locked
+                // pages keep their frozen labels, provisional inserts get suffix labels
+                // (e.g. "4A"), and pages past the last lock continue the integer sequence.
+                let firstPageLabel = "1";
+                if (pageLocks) {
+                    // Omitted scenes collapse whole locked pages out of the
+                    // document. Each such removed page contributes an "absorbed"
+                    // token we must keep visible so the numbering doesn't jump
+                    // ("14" then "16"). Two outcomes per token, decided below:
+                    //   1. RECLAIM — if content has grown a provisional (unlocked)
+                    //      page back into the gap where the token belongs, hand the
+                    //      token to that page so it becomes a real numbered page
+                    //      again ("15"). This is what lets a collapsed "15-16"
+                    //      revert to a fresh "15" + "16" as the user types.
+                    //   2. FOLD — no provisional page available: fold the token
+                    //      into the FOLLOWING surviving page as the low end of a
+                    //      range. Deleting page 15 makes the next page read
+                    //      "15-16"; deleting 14 too makes it "14-16".
+                    // Two sources feed this: omitted scenes (their locks were
+                    // deleted from the map; tokens come via getOmittedPages) and
+                    // orphan locks still in the map (collapsed/deleted pages).
+                    const absorbed = [...(options.getOmittedPages?.() ?? []), ...orphanTokens].sort(compareTokens);
+
+                    // Per-page frozen token (null for provisional pages). Page 0
+                    // is page 1 (PAGE_ONE_KEY); page p>0 starts at breaks[p-1].
+                    const pageCount = breaks.length + 1;
+                    const lockedTok: (SceneToken | null)[] = new Array(pageCount);
+                    for (let p = 0; p < pageCount; p++) {
+                        const anchor = p === 0 ? PAGE_ONE_KEY : breaks[p - 1].anchorId;
+                        lockedTok[p] = (anchor ? pageLocks[anchor]?.token : undefined) ?? null;
                     }
 
-                    if (orphans.length > 0) {
-                        // Build an ordered list of live-locked anchors keyed by token,
-                        // so we can find the "next live lock after orphan X" quickly.
-                        type LiveLock = { anchorId: string; token: SceneToken; pos: number };
-                        const liveLocks: LiveLock[] = [];
-                        for (const b of breaks) {
-                            if (!b.anchorId) continue;
-                            const lock = pageLocks[b.anchorId];
-                            if (lock?.token) liveLocks.push({ anchorId: b.anchorId, token: lock.token, pos: b.pos });
+                    const synthetic: Record<string, { token: SceneToken }> = {};
+                    const leftover: SceneToken[] = [];
+                    if (absorbed.length > 0) {
+                        // Nearest locked token before / after each page, so we can
+                        // tell which gap a provisional page sits in.
+                        const prevLockedArr: (SceneToken | null)[] = new Array(pageCount);
+                        const nextLockedArr: (SceneToken | null)[] = new Array(pageCount);
+                        let seen: SceneToken | null = null;
+                        for (let p = 0; p < pageCount; p++) {
+                            prevLockedArr[p] = seen;
+                            if (lockedTok[p]) seen = lockedTok[p];
+                        }
+                        seen = null;
+                        for (let p = pageCount - 1; p >= 0; p--) {
+                            nextLockedArr[p] = seen;
+                            if (lockedTok[p]) seen = lockedTok[p];
                         }
-                        liveLocks.sort((a, b) => compareTokens(a.token, b.token));
-                        orphans.sort((a, b) => compareTokens(a.token, b.token));
-
-                        const docSize = newState.doc.content.size;
-
-                        for (const orphan of orphans) {
-                            // Token-gap segment this orphan belongs in: bounded by the
-                            // greatest live lock with a smaller token (prev) and the
-                            // smallest live lock with a larger token (next). Positions
-                            // of those bounding locks define the doc-position window
-                            // where this orphan can be slotted in.
-                            let prevLive: LiveLock | null = null;
-                            let nextLive: LiveLock | null = null;
-                            for (const l of liveLocks) {
-                                if (compareTokens(l.token, orphan.token) < 0) {
-                                    if (!prevLive || compareTokens(prevLive.token, l.token) < 0) {
-                                        prevLive = l;
-                                    }
-                                } else if (compareTokens(l.token, orphan.token) > 0) {
-                                    if (!nextLive || compareTokens(l.token, nextLive.token) < 0) {
-                                        nextLive = l;
-                                    }
-                                }
-                            }
-                            const segmentStart = prevLive?.pos ?? 0;
-                            const segmentEnd = nextLive?.pos ?? docSize;
-
-                            // First try to consume an existing provisional break inside
-                            // this segment. That break is the natural overflow from the
-                            // previous page — by re-anchoring it to the orphan, we make
-                            // the overflow content flow INTO the empty deleted-page slot
-                            // (Final Draft-style) instead of producing a phantom A page
-                            // alongside a separately-rendered empty page.
-                            let consumed = false;
-                            for (let j = 0; j < breaks.length; j++) {
-                                const b = breaks[j];
-                                if (b.pos < segmentStart) continue;
-                                if (b.pos >= segmentEnd) break;
-                                const bLock = b.anchorId ? pageLocks[b.anchorId] : undefined;
-                                if (bLock?.token) continue; // already a locked break — skip
-                                // Provisional in the orphan's segment: reassign anchorId
-                                // so the label flips from "NA" to the orphan's frozen label.
-                                b.anchorId = orphan.anchorId;
-                                liveLocks.push({
-                                    anchorId: orphan.anchorId,
-                                    token: orphan.token,
-                                    pos: b.pos,
-                                });
-                                liveLocks.sort((a, b) => compareTokens(a.token, b.token));
-                                consumed = true;
-                                break;
-                            }
 
-                            if (consumed) continue;
-
-                            // No provisional to absorb the orphan — fall back to a
-                            // synthetic empty-page break at the segment's end position.
-                            //
-                            // Insert index walks the breaks list. We want the synthetic
-                            // to land at segmentEnd, AFTER any break at the same pos
-                            // whose token is smaller (so multiple orphans at one
-                            // segmentEnd line up in token order: orphan-2, orphan-3,
-                            // then the live lock that bounds the segment).
-                            let insertIdx = breaks.length;
-                            for (let j = 0; j < breaks.length; j++) {
-                                const b = breaks[j];
-                                if (b.pos > segmentEnd) {
-                                    insertIdx = j;
-                                    break;
-                                }
-                                if (b.pos === segmentEnd) {
-                                    const bLock = b.anchorId ? pageLocks[b.anchorId] : undefined;
-                                    if (bLock?.token && compareTokens(orphan.token, bLock.token) < 0) {
-                                        insertIdx = j;
+                        const consumed = new Set<number>();
+                        for (const t of absorbed) {
+                            let placed = false;
+                            // Page 0 is page 1 and never reclaims an absorbed
+                            // number; start at the first real break.
+                            for (let p = 1; p < pageCount; p++) {
+                                if (consumed.has(p) || lockedTok[p]) continue;
+                                const before = prevLockedArr[p];
+                                const after = nextLockedArr[p];
+                                // Provisional page p is in t's gap when t sorts
+                                // strictly between the locks bounding p.
+                                if (
+                                    (before === null || compareTokens(before, t) < 0) &&
+                                    (after === null || compareTokens(t, after) < 0)
+                                ) {
+                                    const anchor = breaks[p - 1].anchorId;
+                                    if (anchor) {
+                                        synthetic[anchor] = { token: t };
+                                        consumed.add(p);
+                                        placed = true;
                                         break;
                                     }
                                 }
                             }
+                            if (!placed) leftover.push(t);
+                        }
+                    }
 
-                            // Freespace transfer: the synthetic empty page's widget
-                            // renders the prev→empty transition (footer of previous
-                            // page + chrome + empty content area). For the previous
-                            // page to keep its full height, the synthetic must absorb
-                            // its bottom freespace. That freespace currently lives on
-                            // the break that the synthetic is being inserted BEFORE
-                            // (either a lock force-break at the same pos, or the last-
-                            // page widget at doc end). Transfer it, then zero out the
-                            // donor — its "previous page" is now the empty synthetic,
-                            // which already gets a full `contentHeight` slot, so no
-                            // additional freespace is needed there.
-                            let syntheticFreespace = 0;
-                            if (insertIdx < breaks.length && breaks[insertIdx].pos === segmentEnd) {
-                                syntheticFreespace = breaks[insertIdx].freespace;
-                                breaks[insertIdx].freespace = 0;
-                            } else if (insertIdx === breaks.length) {
-                                // Doc end — the synthetic is the new "last empty page",
-                                // and the existing last-page widget would have padded
-                                // out the freespace below the previous real page.
-                                // Transfer that to the synthetic.
-                                syntheticFreespace = lastPageFreespace;
-                                lastPageFreespace = 0;
+                    // Reclaimed pages join the lock map for label computation so
+                    // they get their absorbed number (and following provisional
+                    // pages suffix off it: "18", "18A", …).
+                    const labelLocks =
+                        Object.keys(synthetic).length > 0 ? { ...pageLocks, ...synthetic } : pageLocks;
+                    const pageLabels = computePageLabels(breaks, labelLocks, skippedLetters);
+
+                    // Fold the unreclaimed tokens into the FOLLOWING surviving
+                    // page — the first page whose token is larger — so the
+                    // removed number becomes the low end of that page's range
+                    // ("15-16", then "14-16" as more are removed). A removed
+                    // page past the last surviving page has no follower; it
+                    // falls back to the last page as the high end instead.
+                    if (leftover.length > 0) {
+                        const alphabet = buildSceneAlphabet(skippedLetters);
+                        const bucket = new Map<number, SceneToken[]>();
+                        for (const t of leftover) {
+                            let attach = pageLabels.length - 1;
+                            for (let p = 0; p < pageLabels.length; p++) {
+                                if (compareTokens(pageLabels[p].token, t) > 0) {
+                                    attach = p;
+                                    break;
+                                }
                             }
-
-                            const synthetic: PageBreakInfo = {
-                                pos: segmentEnd,
-                                pagenum: 0, // re-numbered below
-                                freespace: syntheticFreespace,
-                                contdName: "",
-                                splitNodeType: null,
-                                anchorId: orphan.anchorId,
-                                isEmpty: true,
-                            };
-                            breaks.splice(insertIdx, 0, synthetic);
-                            liveLocks.push({
-                                anchorId: orphan.anchorId,
-                                token: orphan.token,
-                                pos: segmentEnd,
-                            });
-                            liveLocks.sort((a, b) => compareTokens(a.token, b.token));
+                            const list = bucket.get(attach);
+                            if (list) list.push(t);
+                            else bucket.set(attach, [t]);
                         }
-
-                        // Renumber pagenums after insertions (synthetic breaks have pagenum: 0).
-                        for (let i = 0; i < breaks.length; i++) {
-                            breaks[i].pagenum = i + 2; // page 1 has no break; first break starts page 2.
+                        // A page's range spans the min..max of its own token plus
+                        // every number it absorbed — "14-16" for own 16 absorbing
+                        // 14 and 15, "14-15" for a trailing own 14 absorbing 15.
+                        for (const [p, tokens] of bucket) {
+                            let lo = pageLabels[p].token;
+                            let hi = pageLabels[p].token;
+                            for (const t of tokens) {
+                                if (compareTokens(t, lo) < 0) lo = t;
+                                if (compareTokens(t, hi) > 0) hi = t;
+                            }
+                            const loLabel = compileSceneLabel(lo, alphabet);
+                            const hiLabel = compileSceneLabel(hi, alphabet);
+                            pageLabels[p].label = loLabel === hiLabel ? loLabel : `${loLabel}-${hiLabel}`;
                         }
                     }
-                }
 
-                // --- Label assignment ---
-                // Run computeSceneLabels over [page1Anchor, ...breakAnchors] so locked
-                // pages keep their frozen labels, provisional inserts get suffix labels
-                // (e.g. "4A"), and pages past the last lock continue the integer sequence.
-                let firstPageLabel = "1";
-                if (pageLocks) {
-                    const labels = computePageLabels(breaks, pageLocks, skippedLetters);
-                    firstPageLabel = labels[0];
+                    firstPageLabel = pageLabels[0].label;
                     for (let i = 0; i < breaks.length; i++) {
-                        const label = labels[i + 1];
-                        const prevLabel = labels[i];
-                        breaks[i].label = label;
-                        breaks[i].prevLabel = prevLabel;
+                        breaks[i].label = pageLabels[i + 1].label;
+                        breaks[i].prevLabel = pageLabels[i].label;
                     }
                 }
 
@@ -1315,9 +1269,29 @@ const createPaginationPlugin = (extension: {
                             !!b.isEmpty !== !!mappedOldBreaks[i].isEmpty,
                     );
 
-                const decset = breaksChanged
-                    ? buildDecorations(newState.doc, breaks, lastPageFreespace, firstPageLabel, options)
-                    : value.decset.map(tr.mapping, tr.doc);
+                let decset: DecorationSet;
+                if (breaksChanged) {
+                    decset = buildDecorations(newState.doc, breaks, lastPageFreespace, firstPageLabel, options);
+                } else {
+                    // Fast path: the set of breaks is unchanged, so remap the
+                    // existing decorations instead of rebuilding. This matters for
+                    // long scripts — a rebuild re-creates every break widget's DOM
+                    // subtree on each keystroke (hundreds of throwaway elements on a
+                    // 200-page doc), whereas `map` just re-anchors the existing set.
+                    const mapped = value.decset.map(tr.mapping, tr.doc);
+                    // BUT `DecorationSet.map` silently drops a *widget* whose anchor
+                    // sits at a position a replace step touches — e.g. editing a
+                    // page's last node, which hosts the following page break at its
+                    // trailing boundary (realigning it or re-applying its element
+                    // type with no height change keeps `breaks` identical, so we land
+                    // here). The lost break makes the next page merge upward into a
+                    // too-tall page. `map` never adds decorations, so a drop shows up
+                    // as a smaller count — only then do we pay for a full rebuild.
+                    decset =
+                        mapped.find().length === value.decset.find().length
+                            ? mapped
+                            : buildDecorations(newState.doc, breaks, lastPageFreespace, firstPageLabel, options);
+                }
 
                 return { decset, breaks, lastPageFreespace, firstPageLabel };
             },
@@ -1329,10 +1303,10 @@ const createPaginationPlugin = (extension: {
             // Page-lock guard: prevent content from spilling upward out of a
             // locked page. The signature of that spill — Backspace at the
             // start of a locked anchor, Delete at the end of the node before
-            // it, or a selection delete that swallows the anchor — is the
-            // locked anchor's data-id disappearing from the top-level node
-            // list. If that would happen, reject the transaction so the
-            // cursor stays put and no content moves across the lock.
+            // it, or a selection delete that swallows the anchor — is a locked
+            // anchor's data-id disappearing as a RESULT of this transaction. If
+            // that would happen, reject it so the cursor stays put and no
+            // content moves across the lock.
             if (!tr.docChanged) return true;
 
             // Allow yjs sync (remote updates and yjs-based undo/redo) through
@@ -1341,6 +1315,16 @@ const createPaginationPlugin = (extension: {
             // Yjs doc so peers agree on which pages are locked.
             if (tr.getMeta(ySyncPluginKey)) return true;
 
+            // Scene omit/unomit removes (or restores) an entire scene and
+            // re-homes any page locks inside it, so it is allowed to make a
+            // locked anchor's data-id disappear. See SCENE_OMIT_META.
+            if (tr.getMeta(SCENE_OMIT_META)) return true;
+
+            // Collapsing an emptied locked page deliberately deletes that page's
+            // (now empty) anchor node and merges the cursor up to the previous
+            // page. See PAGE_COLLAPSE_META and the Backspace handler.
+            if (tr.getMeta(PAGE_COLLAPSE_META)) return true;
+
             const opts = extension.options as PaginationOptions;
             if (!opts.getPageLocking?.()) return true;
 
@@ -1355,13 +1339,36 @@ const createPaginationPlugin = (extension: {
             }
             if (lockedAnchors.length === 0) return true;
 
-            const present = new Set<string>();
+            // Fast path: scan the resulting doc once. If every locked anchor is
+            // still present, nothing crossed a lock — allow it. This is the
+            // common case on every keystroke.
+            const after = new Set<string>();
             tr.doc.forEach((node) => {
                 const dataId = node.attrs?.["data-id"];
-                if (typeof dataId === "string") present.add(dataId);
+                if (typeof dataId === "string") after.add(dataId);
             });
+            let someMissing = false;
             for (const anchor of lockedAnchors) {
-                if (!present.has(anchor)) return false;
+                if (!after.has(anchor)) {
+                    someMissing = true;
+                    break;
+                }
+            }
+            if (!someMissing) return true;
+
+            // A locked anchor is missing from the result. Only reject if THIS
+            // transaction is what removed it (present before, gone after). An
+            // anchor that was already gone (an orphan-collapsed page whose lock
+            // lingers in the map so its number is absorbed) must not block
+            // further edits — otherwise every keystroke after a collapse would
+            // be rejected.
+            const before = new Set<string>();
+            tr.before.forEach((node) => {
+                const dataId = node.attrs?.["data-id"];
+                if (typeof dataId === "string") before.add(dataId);
+            });
+            for (const anchor of lockedAnchors) {
+                if (before.has(anchor) && !after.has(anchor)) return false;
             }
             return true;
         },
@@ -1593,6 +1600,28 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                 const curStart = $from.before();
                 if (curStart === 0) return false;
 
+                // Collapse case: the current block is itself a locked page anchor
+                // and is now empty (the page's last element was just deleted).
+                // Default joinBackward would remove the anchor's data-id and the
+                // guard would reject it, leaving a blank page with a stranded
+                // empty node. Instead delete the empty anchor node and drop the
+                // cursor at the end of the previous page. The lock stays in the
+                // map as an orphan so the page's frozen number is absorbed into
+                // the following page as a range (e.g. "5-6") rather than vanishing.
+                const curDataId = $from.parent.attrs?.["data-id"];
+                if (
+                    $from.parent.textContent.length === 0 &&
+                    typeof curDataId === "string" &&
+                    pageLocks[curDataId]
+                ) {
+                    const tr = state.tr;
+                    tr.delete(curStart, $from.after());
+                    tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
+                    tr.setMeta(PAGE_COLLAPSE_META, true);
+                    view.dispatch(tr);
+                    return true;
+                }
+
                 const prev = state.doc.resolve(curStart).nodeBefore;
                 if (!prev || prev.textContent.length !== 0) return false;
 
diff --git a/src/lib/screenplay/extensions/scene-locking-extension.ts b/src/lib/screenplay/extensions/scene-locking-extension.ts
index 24c445da..bb7b70f0 100644
--- a/src/lib/screenplay/extensions/scene-locking-extension.ts
+++ b/src/lib/screenplay/extensions/scene-locking-extension.ts
@@ -31,12 +31,11 @@ const collectSceneEntries = (doc: Node): SceneEntry[] => {
 };
 
 /**
- * Does any step in this transaction touch a Scene node or any node that sits
- * between Scene boundaries? Used as a cheap early-exit so we don't rebuild
- * decorations on every keystroke inside an action paragraph far away from
- * any omitted scene. We have to be conservative when omitted scenes exist
- * because hiding the body of an omitted scene means body-paragraph edits
- * must trigger decoration recomputation too.
+ * Does any step in this transaction touch a Scene node? Used as a cheap
+ * early-exit so we don't rebuild scene-number / OMITTED heading decorations on
+ * every keystroke inside an action paragraph. Both kinds of decoration are
+ * anchored on the Scene heading nodes, so only edits that touch a Scene node
+ * can change them.
  */
 const didSceneNodesChange = (tr: Transaction): boolean => {
     if (!tr.docChanged) return false;
@@ -123,11 +122,10 @@ const computeDecorations = (
         }
     }
 
-    // OMITTED decorations are independent of production lock. The heading
-    // text itself is replaced with "OMITTED" inside the document by
-    // `omitSceneByUuid` (the original is preserved in scene metadata), so
-    // here we only need to grey the heading via `data-scene-omitted` and
-    // collapse the body paragraphs via `data-omitted-body`.
+    // OMITTED decorations are independent of production lock. The heading text
+    // is replaced with "OMITTED" in the document and the body is cut out and
+    // parked in scene metadata by `omitSceneByUuid`, so here we only grey the
+    // remaining one-line heading via `data-scene-omitted`.
     for (let i = 0; i < entries.length; i++) {
         const entry = entries[i];
         if (!scenes[entry.uuid]?.omitted) continue;
@@ -137,19 +135,6 @@ const computeDecorations = (
                 "data-scene-omitted": "true",
             }),
         );
-
-        const nextEntry = entries[i + 1];
-        const bodyEnd = nextEntry ? nextEntry.pos : doc.content.size;
-        const bodyStart = entry.pos + entry.nodeSize;
-        doc.forEach((node, pos) => {
-            if (pos >= bodyStart && pos < bodyEnd) {
-                decorations.push(
-                    Decoration.node(pos, pos + node.nodeSize, {
-                        "data-omitted-body": "true",
-                    }),
-                );
-            }
-        });
     }
 
     return DecorationSet.create(doc, decorations);
diff --git a/src/lib/screenplay/page-locking.ts b/src/lib/screenplay/page-locking.ts
index 8c538add..ef32421d 100644
--- a/src/lib/screenplay/page-locking.ts
+++ b/src/lib/screenplay/page-locking.ts
@@ -20,6 +20,22 @@ import type { SceneToken } from "./scene-locking";
 /** Sentinel key used for the first page (which has no anchor node). */
 export const PAGE_ONE_KEY = "__page1__";
 
+/** Transaction meta flag set by scene omit/unomit. The pagination plugin's
+ *  `filterTransaction` normally rejects any local edit that makes a locked
+ *  page anchor's data-id disappear (content must not cross a lock). Omitting a
+ *  scene legitimately removes a whole scene — including any locked anchors
+ *  inside it — so the omit transaction carries this flag to bypass that guard.
+ *  The omit also re-homes the affected page locks so nothing is left orphaned. */
+export const SCENE_OMIT_META = "scene-omit";
+
+/** Transaction meta flag set by the Backspace handler when it collapses an
+ *  emptied locked page (deletes the page's only, now-empty, anchor node and
+ *  moves the cursor up to the previous page). Like SCENE_OMIT_META it lets the
+ *  pagination `filterTransaction` allow a locked anchor's data-id to disappear.
+ *  The lock itself is left in the map as an orphan so the page's frozen number
+ *  is absorbed into the following page as a range instead of vanishing. */
+export const PAGE_COLLAPSE_META = "page-collapse";
+
 export type PersistentPage = {
     /** Frozen structural position under production page-lock. */
     token?: SceneToken;
diff --git a/src/lib/screenplay/scene-locking.ts b/src/lib/screenplay/scene-locking.ts
index acf6cd8f..16eed42b 100644
--- a/src/lib/screenplay/scene-locking.ts
+++ b/src/lib/screenplay/scene-locking.ts
@@ -45,11 +45,12 @@
  * Together these give:  1 < 1aA < 1A < 1AA < 1AB < 1B < 2.
  */
 
-import type { Editor } from "@tiptap/core";
+import type { Editor, JSONContent } from "@tiptap/core";
 import type { Node } from "@tiptap/pm/model";
 
 import type { ProjectRepository } from "../project/project-repository";
 import { ScreenplayElement } from "../utils/enums";
+import { SCENE_OMIT_META } from "./page-locking";
 
 const OMITTED_HEADING_TEXT = "OMITTED";
 
@@ -469,6 +470,50 @@ export const computeSceneLabels = (
     return result;
 };
 
+/**
+ * Minimal shape of a persistent scene needed to derive absorbed page numbers.
+ * `PersistentScene` is structurally compatible; typed locally to avoid a
+ * circular import with `scenes.ts` (which imports from this module).
+ */
+type OmittableScene = {
+    omitted?: boolean;
+    omittedPageLocks?: { token: SceneToken }[];
+    reanchoredSuccessor?: string;
+};
+
+/**
+ * Collect the page tokens of locked pages that an omitted scene removed from
+ * the document but that could NOT be re-homed onto a following scene.
+ *
+ * Omitting a scene whose body fills one or more locked pages deletes those
+ * pages' locks. `omitSceneByUuid` re-homes the *earliest* such lock onto the
+ * next scene heading when that heading isn't itself locked, so it survives as
+ * a real page; every other removed page would otherwise vanish, leaving a gap
+ * in the numbering (e.g. "4" then "6"). These leftover tokens are returned so
+ * pagination can fold them into the preceding surviving page as a combined
+ * range label ("4-5") instead of dropping them.
+ */
+export const computeAbsorbedPageTokens = (
+    scenes: Record<string, OmittableScene | undefined>,
+): SceneToken[] => {
+    const out: SceneToken[] = [];
+    for (const scene of Object.values(scenes)) {
+        if (!scene?.omitted) continue;
+        const locks = scene.omittedPageLocks;
+        if (!locks || locks.length === 0) continue;
+        const tokens = locks.map((l) => l.token);
+        if (scene.reanchoredSuccessor) {
+            // The earliest lock was re-homed onto the following scene heading,
+            // so it survives as a real page — only the remaining locks collapsed.
+            const min = tokens.reduce((m, t) => (compareTokens(t, m) < 0 ? t : m), tokens[0]);
+            for (const t of tokens) if (compareTokens(t, min) !== 0) out.push(t);
+        } else {
+            out.push(...tokens);
+        }
+    }
+    return out;
+};
+
 // --------------------------------------------------------------------------
 //                              ACTIONS
 // --------------------------------------------------------------------------
@@ -491,14 +536,18 @@ const findSceneHeadingByUuid = (
 };
 
 /**
- * Mark a scene as OMITTED. The heading's current text is saved into the
- * scene's `originalHeading` metadata and the heading content in the
- * document is replaced with "OMITTED" — so the heading remains a normal
- * editable paragraph (cursor + Enter behave naturally) while the body
- * paragraphs are still visually collapsed via decorations.
+ * Mark a scene as OMITTED. The heading text is replaced with "OMITTED" (the
+ * original is saved in `originalHeading`) and the scene's body is *cut out of
+ * the document* and parked in `omittedBody` as serialized ProseMirror JSON.
+ *
+ * Removing the body — rather than hiding it in place — means an omitted scene
+ * is just a one-line heading as far as the rest of the editor is concerned:
+ * pagination, PDF export and decorations need no special "omitted body" path.
+ * The body's nodes keep their attrs (including `data-id`) so unomit restores
+ * them verbatim.
  *
- * Both the document edit and the metadata update are wrapped in a single
- * Yjs transaction so Ctrl+Z reverts them atomically.
+ * Both the document edit and the metadata update are wrapped in a single Yjs
+ * transaction so Ctrl+Z reverts them atomically.
  */
 export const omitSceneByUuid = (
     editor: Editor,
@@ -508,20 +557,83 @@ export const omitSceneByUuid = (
     const heading = findSceneHeadingByUuid(editor, uuid);
     if (!heading) return;
 
+    const doc = editor.state.doc;
     const currentText = heading.node.textContent;
+    const headingEnd = heading.pos + heading.node.nodeSize;
+
+    // The body runs from the end of this heading to the next scene heading (or
+    // the end of the document).
+    let bodyEnd = doc.content.size;
+    doc.forEach((node, pos) => {
+        if (pos > heading.pos && bodyEnd === doc.content.size && node.attrs?.class === ScreenplayElement.Scene) {
+            bodyEnd = pos;
+        }
+    });
+
+    // Snapshot the body as JSON before it is removed.
+    const omittedBody: JSONContent[] = [];
+    doc.forEach((node, pos) => {
+        if (pos >= headingEnd && pos < bodyEnd) omittedBody.push(node.toJSON());
+    });
+
+    // If the body crosses one or more locked page breaks, its locked anchor
+    // nodes are about to be removed. Collect them, then re-home the earliest
+    // (lowest) lock onto the following scene heading so that scene stays pinned
+    // to its locked page (no content spills upward); the rest collapse. The
+    // originals are saved so unomit can restore the exact locked layout.
+    const pageLocks = repository.pages;
+    const omittedPageLocks: { anchorId: string; token: SceneToken; splitOffset?: number }[] = [];
+    doc.forEach((node, pos) => {
+        if (pos < headingEnd || pos >= bodyEnd) return;
+        const id = node.attrs?.["data-id"] as string | undefined;
+        const lock = id ? pageLocks[id] : undefined;
+        if (id && lock?.token) omittedPageLocks.push({ anchorId: id, token: lock.token, splitOffset: lock.splitOffset });
+    });
+
+    const successorId =
+        bodyEnd < doc.content.size ? (doc.nodeAt(bodyEnd)?.attrs?.["data-id"] as string | undefined) : undefined;
+    const primaryToken = omittedPageLocks.reduce<SceneToken | undefined>(
+        (min, l) => (min === undefined || compareTokens(l.token, min) < 0 ? l.token : min),
+        undefined,
+    );
+    const reanchoredSuccessor =
+        primaryToken && successorId && !pageLocks[successorId]?.token ? successorId : undefined;
+
     repository.transact(() => {
+        // Re-home page locks before the doc edit so the layout settles cleanly.
+        for (const l of omittedPageLocks) repository.deletePage(l.anchorId);
+        if (reanchoredSuccessor && primaryToken) repository.upsertPage(reanchoredSuccessor, { token: primaryToken });
+
+        // Commit the scene metadata BEFORE dispatching the doc edit: pagination
+        // runs synchronously inside dispatch and reads the omitted-scene info
+        // (via computeAbsorbedPageTokens) to render the combined "4-5" range.
+        // Setting it first means the correct labels appear on the first pass —
+        // no flash of the gapped numbering that would otherwise show until the
+        // page-lock effect kicks a second recompute.
+        repository.upsertScene(uuid, {
+            omitted: true,
+            originalHeading: currentText,
+            omittedBody,
+            omittedPageLocks: omittedPageLocks.length > 0 ? omittedPageLocks : undefined,
+            reanchoredSuccessor,
+        });
+
+        const tr = editor.state.tr;
+        tr.setMeta(SCENE_OMIT_META, true);
+        // Delete the body first (it sits after the heading, so the heading's own
+        // positions stay valid), then swap in the OMITTED heading text.
+        if (bodyEnd > headingEnd) tr.delete(headingEnd, bodyEnd);
         const headingStart = heading.pos + 1;
-        const headingEnd = heading.pos + heading.node.nodeSize - 1;
-        const tr = editor.state.tr.insertText(OMITTED_HEADING_TEXT, headingStart, headingEnd);
+        const headingTextEnd = heading.pos + heading.node.nodeSize - 1;
+        tr.insertText(OMITTED_HEADING_TEXT, headingStart, headingTextEnd);
         editor.view.dispatch(tr);
-        repository.upsertScene(uuid, { omitted: true, originalHeading: currentText });
     }, SCENE_OMIT_UNDO_ORIGIN);
 };
 
 /**
- * Clear an OMITTED scene's flag and restore its original heading text from
- * `originalHeading` metadata. Inverse of `omitSceneByUuid`, batched in a
- * single Yjs transaction for atomic undo.
+ * Clear an OMITTED scene's flag, restore its original heading text, and
+ * re-insert its saved body right after the heading. Inverse of
+ * `omitSceneByUuid`, batched in a single Yjs transaction for atomic undo.
  */
 export const unomitSceneByUuid = (
     editor: Editor,
@@ -534,13 +646,43 @@ export const unomitSceneByUuid = (
     if (!heading) return;
 
     const restoreText = scene.originalHeading ?? "";
+    const bodyJSON = scene.omittedBody ?? [];
+    const savedPageLocks = scene.omittedPageLocks ?? [];
+    const reanchoredSuccessor = scene.reanchoredSuccessor;
+
     repository.transact(() => {
+        // Undo the omit's lock re-homing first: drop the lock parked on the
+        // successor heading, then restore the body's original locked anchors.
+        if (reanchoredSuccessor) repository.deletePage(reanchoredSuccessor);
+        for (const l of savedPageLocks) repository.upsertPage(l.anchorId, { token: l.token, splitOffset: l.splitOffset });
+
+        // Clear the omitted metadata BEFORE the doc edit so the pagination run
+        // inside dispatch no longer absorbs these (now-restored) page numbers
+        // into a range — mirrors the ordering in `omitSceneByUuid`.
+        repository.upsertScene(uuid, {
+            omitted: undefined,
+            originalHeading: undefined,
+            omittedBody: undefined,
+            omittedPageLocks: undefined,
+            reanchoredSuccessor: undefined,
+        });
+
+        const tr = editor.state.tr;
+        tr.setMeta(SCENE_OMIT_META, true);
         const headingStart = heading.pos + 1;
-        const headingEnd = heading.pos + heading.node.nodeSize - 1;
-        const tr = restoreText.length > 0
-            ? editor.state.tr.insertText(restoreText, headingStart, headingEnd)
-            : editor.state.tr.delete(headingStart, headingEnd);
+        const headingTextEnd = heading.pos + heading.node.nodeSize - 1;
+        if (restoreText.length > 0) tr.insertText(restoreText, headingStart, headingTextEnd);
+        else tr.delete(headingStart, headingTextEnd);
+
+        if (bodyJSON.length > 0) {
+            // Use the editor's own schema to rebuild nodes so they share its
+            // prosemirror-model instance (a bare `Node.fromJSON` can pull in a
+            // second copy of the model and fail the Fragment check).
+            const nodes = bodyJSON.map((json) => editor.schema.nodeFromJSON(json));
+            // Map the post-heading position through the heading-text edit above.
+            const insertPos = tr.mapping.map(heading.pos + heading.node.nodeSize);
+            tr.insert(insertPos, nodes);
+        }
         editor.view.dispatch(tr);
-        repository.upsertScene(uuid, { omitted: undefined, originalHeading: undefined });
     }, SCENE_OMIT_UNDO_ORIGIN);
 };
diff --git a/src/lib/screenplay/scenes.ts b/src/lib/screenplay/scenes.ts
index ce1b89b0..e98a483a 100644
--- a/src/lib/screenplay/scenes.ts
+++ b/src/lib/screenplay/scenes.ts
@@ -72,6 +72,21 @@ export type PersistentScene = {
     omitted?: boolean;
     /** Original heading text saved when the scene was omitted, restored on unomit. */
     originalHeading?: string;
+    /** The scene's body nodes (serialized ProseMirror JSON) captured when the
+     *  scene was omitted. Omitting cuts the body out of the document and parks
+     *  it here; unomitting re-inserts it right after the heading. Keeping it out
+     *  of the document means an omitted scene paginates like a one-line heading
+     *  with no special handling. */
+    omittedBody?: JSONContent[];
+    /** Page locks whose anchor nodes lived inside the cut body, saved so unomit
+     *  can restore them. Only set when the omitted scene crossed a locked page
+     *  break. */
+    omittedPageLocks?: { anchorId: string; token: SceneToken; splitOffset?: number }[];
+    /** When the omitted scene crossed a locked page break, the lock is re-homed
+     *  onto the following scene heading (`reanchoredSuccessor`) so it stays
+     *  pinned to its locked page instead of spilling upward. unomit removes that
+     *  re-homed lock before restoring `omittedPageLocks`. */
+    reanchoredSuccessor?: string;
 };
 
 /**
diff --git a/src/tests/repro/omitted-scene-cut-restore.test.ts b/src/tests/repro/omitted-scene-cut-restore.test.ts
new file mode 100644
index 00000000..192f64fc
--- /dev/null
+++ b/src/tests/repro/omitted-scene-cut-restore.test.ts
@@ -0,0 +1,468 @@
+import { describe, it, expect } from "vitest";
+import { Editor } from "@tiptap/core";
+
+import { BASE_EXTENSIONS } from "@src/lib/screenplay/editor";
+import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
+import { createSceneLockingExtension } from "@src/lib/screenplay/extensions/scene-locking-extension";
+import {
+    ScriptioPagination,
+    getPageAnchorInfo,
+    paginationKey,
+} from "@src/lib/screenplay/extensions/pagination-extension";
+import {
+    omitSceneByUuid,
+    unomitSceneByUuid,
+    computeSceneLabels,
+    computeAbsorbedPageTokens,
+} from "@src/lib/screenplay/scene-locking";
+import type { ProjectRepository } from "@src/lib/project/project-repository";
+import type { PersistentScene } from "@src/lib/screenplay/scenes";
+import { PersistentPageMap } from "@src/lib/screenplay/page-locking";
+
+const LINE = 16;
+
+function injectStyle() {
+    const id = "repro-style";
+    if (document.getElementById(id)) return;
+    const s = document.createElement("style");
+    s.id = id;
+    s.textContent = `
+        .ProseMirror > p, #pagination-test-div > p {
+            display: block; width: 100%; line-height: ${LINE}px !important;
+            margin-top: ${LINE}px; margin-bottom: 0; min-height: ${LINE}px;
+            font-size: 12px; box-sizing: border-box; white-space: pre-wrap; padding: 0;
+        }
+        .ProseMirror > .pagination-page-break + p,
+        .ProseMirror > .pagination-first-page + p { margin-top: 0 !important; }
+    `;
+    document.head.appendChild(s);
+}
+
+// Minimal stand-in for ProjectRepository covering only what omit/unomit use,
+// including the page-lock map (so re-homing locks is exercised end to end).
+const SCENE_FIELDS = [
+    "synopsis", "color", "token", "omitted", "originalHeading",
+    "omittedBody", "omittedPageLocks", "reanchoredSuccessor",
+] as const;
+function makeRepo() {
+    const scenes: Record<string, PersistentScene> = {};
+    const pages: PersistentPageMap = {};
+    let pageLocking = false;
+    return {
+        scenes,
+        pages,
+        get pageLocking() { return pageLocking; },
+        setPageLocking: (v: boolean) => { pageLocking = v; },
+        getScene: (id: string) => scenes[id],
+        upsertScene: (id: string, data: Partial<PersistentScene>) => {
+            const merged: PersistentScene = { ...(scenes[id] ?? {}) };
+            for (const k of SCENE_FIELDS) if (k in data) (merged as Record<string, unknown>)[k] = data[k];
+            for (const k of SCENE_FIELDS) if (merged[k] === undefined) delete merged[k];
+            scenes[id] = merged;
+            return id;
+        },
+        getPage: (id: string) => pages[id],
+        upsertPage: (id: string, data: { token?: unknown; splitOffset?: number }) => {
+            const merged = { ...(pages[id] ?? {}) } as Record<string, unknown>;
+            for (const k of ["token", "splitOffset"] as const) if (k in data) merged[k] = data[k];
+            for (const k of ["token", "splitOffset"] as const) if (merged[k] === undefined) delete merged[k];
+            pages[id] = merged as PersistentPageMap[string];
+            return id;
+        },
+        deletePage: (id: string) => { delete pages[id]; },
+        transact: (fn: () => void) => fn(),
+    };
+}
+
+async function makeEditor(content: object[]) {
+    injectStyle();
+    const el = document.createElement("div");
+    document.body.appendChild(el);
+    const repo = makeRepo();
+
+    const editor = new Editor({
+        element: el,
+        injectCSS: false,
+        autofocus: false,
+        content: { type: "doc", content },
+        extensions: [
+            ...BASE_EXTENSIONS,
+            createNodeIdDedupExtension({ duplicatePersistentScene: () => {} }),
+            createSceneLockingExtension({
+                getSceneLocking: () => true,
+                getScenes: () => repo.scenes,
+                getNumberingStyle: () => "suffix",
+                getSkippedLetters: () => [],
+            }),
+            ScriptioPagination.configure({
+                pageHeight: 200, pageWidth: 600, marginTop: 0, marginBottom: 0,
+                marginLeft: 0, marginRight: 0, pageGap: 10,
+                getPageLocking: () => repo.pageLocking,
+                getPageLocks: () => repo.pages,
+                getSkippedLetters: () => [],
+                getOmittedPages: () => computeAbsorbedPageTokens(repo.scenes),
+            }),
+        ],
+    });
+    await new Promise((r) => setTimeout(r, 80));
+    (editor.storage as unknown as Record<string, { fontsReady: boolean }>).Pagination.fontsReady = true;
+    forcePagination(editor);
+    return { editor, repo: repo as unknown as ProjectRepository };
+}
+
+function forcePagination(editor: Editor) {
+    const tr = editor.state.tr;
+    tr.setMeta("forcePaginationUpdate", true);
+    tr.setMeta("addToHistory", false);
+    editor.view.dispatch(tr);
+}
+
+function breaksOf(editor: Editor) {
+    const st = paginationKey.getState(editor.state) as { breaks: { pos: number; anchorId?: string }[] } | undefined;
+    return st?.breaks ?? [];
+}
+
+function pageStateOf(editor: Editor) {
+    return paginationKey.getState(editor.state) as
+        | { breaks: { pos: number; anchorId?: string; label?: string; prevLabel?: string }[]; firstPageLabel: string }
+        | undefined;
+}
+
+function childTypes(editor: Editor) {
+    const out: string[] = [];
+    editor.state.doc.forEach((n) => out.push(n.type.name));
+    return out;
+}
+
+function lockAllPages(editor: Editor, repo: ProjectRepository) {
+    const infos = getPageAnchorInfo(editor);
+    const anchors = infos.map((a) => a.anchorId);
+    const labels = computeSceneLabels(anchors, {}, "suffix", []);
+    const pages = (repo as unknown as { pages: PersistentPageMap }).pages;
+    for (const k of Object.keys(pages)) delete pages[k];
+    labels.forEach((l, i) => { pages[anchors[i]] = { token: l.token, splitOffset: infos[i]?.splitOffset }; });
+    (repo as unknown as { setPageLocking: (v: boolean) => void }).setPageLocking(true);
+    forcePagination(editor);
+}
+
+const scene = (id: string, text: string) => ({ type: "scene", attrs: { "data-id": id, class: "scene" }, content: [{ type: "text", text }] });
+const action = (id: string, text: string) => ({ type: "action", attrs: { "data-id": id, class: "action" }, content: [{ type: "text", text }] });
+
+describe("omitted scene: body is cut from the doc and restored on unomit", () => {
+    it("omit removes body nodes and parks them; unomit restores verbatim", async () => {
+        const { editor, repo } = await makeEditor([
+            scene("s1", "INT. KITCHEN - DAY"),
+            action("a1", "She enters."),
+            action("a2", "She cooks."),
+            scene("s2", "EXT. STREET - NIGHT"),
+            action("a3", "He waits."),
+        ]);
+
+        expect(childTypes(editor)).toEqual(["scene", "action", "action", "scene", "action"]);
+
+        omitSceneByUuid(editor, repo, "s1");
+
+        // Body of s1 (a1, a2) is gone from the doc; s2 + its body remain.
+        expect(childTypes(editor)).toEqual(["scene", "scene", "action"]);
+        // Heading text replaced; original + body parked in metadata.
+        const sc = repo.getScene("s1")!;
+        expect(sc.omitted).toBe(true);
+        expect(sc.originalHeading).toBe("INT. KITCHEN - DAY");
+        expect(sc.omittedBody?.length).toBe(2);
+        expect(editor.state.doc.child(0).textContent).toBe("OMITTED");
+
+        unomitSceneByUuid(editor, repo, "s1");
+
+        // Doc structure and heading text restored; body data-ids preserved.
+        expect(childTypes(editor)).toEqual(["scene", "action", "action", "scene", "action"]);
+        expect(editor.state.doc.child(0).textContent).toBe("INT. KITCHEN - DAY");
+        expect(editor.state.doc.child(1).attrs["data-id"]).toBe("a1");
+        expect(editor.state.doc.child(2).attrs["data-id"]).toBe("a2");
+        const sc2 = repo.getScene("s1")!;
+        expect(sc2.omitted).toBeUndefined();
+        expect(sc2.omittedBody).toBeUndefined();
+    });
+
+    it("with locked pages: omit keeps the next scene on its page; unomit adds no phantom", async () => {
+        // Page 1 holds scene s1 + body filling it; s2 begins page 2.
+        // (contentHeight 200, ~32px/node → 6 nodes fill page 1: s1 + 5 actions.)
+        const body1 = Array.from({ length: 5 }, (_, i) => action(`a${i}`, `line ${i}`));
+        const { editor, repo } = await makeEditor([
+            scene("s1", "INT. ONE"),
+            ...body1,
+            scene("s2", "INT. TWO"),
+            action("b0", "two body 0"),
+            action("b1", "two body 1"),
+        ]);
+
+        lockAllPages(editor, repo);
+        const beforeBreaks = breaksOf(editor).length;
+        expect(beforeBreaks).toBeGreaterThanOrEqual(1);
+        // s2 anchors a locked break (it begins a page).
+        expect(breaksOf(editor).some((b) => b.anchorId === "s2")).toBe(true);
+
+        omitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // s2 still begins a page (its locked break survives) — the heading stuck
+        // to its locked page rather than spilling upward.
+        expect(breaksOf(editor).some((b) => b.anchorId === "s2")).toBe(true);
+
+        unomitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // Back to the original break count — no leftover phantom page.
+        expect(breaksOf(editor).length).toBe(beforeBreaks);
+    });
+
+    it("scene crossing a locked page break: omit works, content removed, no upward spill", async () => {
+        // s1 + body spans into a locked page 2 (so a BODY node anchors page 2),
+        // then s2 sits lower. contentHeight 200, ~32px/node → 6 nodes per page.
+        // Page 1: s1 + a0..a4 (6 nodes). Page 2 anchor = a5 (a body node).
+        const body1 = Array.from({ length: 8 }, (_, i) => action(`a${i}`, `line ${i}`));
+        const { editor, repo } = await makeEditor([
+            scene("s1", "INT. ONE"),
+            ...body1,
+            scene("s2", "INT. TWO"),
+            action("b0", "two body 0"),
+        ]);
+
+        lockAllPages(editor, repo);
+        // The page-2 anchor is a body node of s1 (it crosses the lock).
+        const lockedBefore = breaksOf(editor).filter((b) => b.anchorId && b.anchorId.startsWith("a"));
+        expect(lockedBefore.length).toBeGreaterThanOrEqual(1);
+        const beforeBreaks = breaksOf(editor).length;
+
+        omitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // Omit actually applied: the body is gone and the heading reads OMITTED.
+        expect(childTypes(editor)).toEqual(["scene", "scene", "action"]);
+        expect(editor.state.doc.child(0).textContent).toBe("OMITTED");
+        // The lock re-homed onto s2 so it stays pinned to its page — no s1 body
+        // anchor lingers, and s2 does not spill up onto page 1.
+        const afterBreaks = breaksOf(editor);
+        expect(afterBreaks.some((b) => b.anchorId === "s2")).toBe(true);
+        expect(afterBreaks.some((b) => b.anchorId && b.anchorId.startsWith("a"))).toBe(false);
+
+        unomitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // Original structure and locked layout restored.
+        expect(editor.state.doc.child(0).textContent).toBe("INT. ONE");
+        expect(breaksOf(editor).length).toBe(beforeBreaks);
+        expect(breaksOf(editor).some((b) => b.anchorId && b.anchorId.startsWith("a"))).toBe(true);
+    });
+
+    it("omitting a full locked page before another locked page combines the number (no jump)", async () => {
+        // Page 1: s1 + a0..a4 (6 nodes). Page 2: a5..a10 (6 body nodes of s1).
+        // Page 3: s2 + b0. With every page locked, page 2's anchor (a5) is a
+        // body node of s1, and s2 begins its own locked page 3.
+        const body1 = Array.from({ length: 11 }, (_, i) => action(`a${i}`, `line ${i}`));
+        const { editor, repo } = await makeEditor([
+            scene("s1", "INT. ONE"),
+            ...body1,
+            scene("s2", "INT. TWO"),
+            action("b0", "two body 0"),
+        ]);
+
+        lockAllPages(editor, repo);
+        // Sanity: page 2 anchored by a body node, page 3 anchored by s2.
+        expect(breaksOf(editor).some((b) => b.anchorId === "a5")).toBe(true);
+        expect(breaksOf(editor).some((b) => b.anchorId === "s2")).toBe(true);
+
+        omitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // s1's whole body (including the page-2 anchor a5) is gone; s2 stays
+        // pinned to its locked page. The successor s2 is ALREADY locked, so the
+        // removed page 2 can't be re-homed — it is absorbed into the FOLLOWING
+        // surviving page (s2) as the low end of a range instead of vanishing.
+        const st = pageStateOf(editor)!;
+        const s2Break = st.breaks.find((b) => b.anchorId === "s2");
+        expect(s2Break).toBeDefined();
+        // Before the fix the first page read "1" and the next jumped to "3".
+        expect(st.firstPageLabel).toBe("1");
+        expect(s2Break!.label).toBe("2-3");
+        expect(s2Break!.prevLabel).toBe("1");
+
+        unomitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // Restoring the scene clears the absorption: plain 1 / 2 / 3 numbering.
+        const restored = pageStateOf(editor)!;
+        expect(restored.firstPageLabel).toBe("1");
+        expect(computeAbsorbedPageTokens(repo.scenes)).toHaveLength(0);
+    });
+
+    it("a collapsed page number is reclaimed when content grows back into the gap", async () => {
+        // page 1: s0 + a0 + a1 + s1 heading + c0 + c1 (6 nodes, locked t1).
+        // page 2: c2..c7 (s1 body — anchored by body node c2, locked t2).
+        // page 3: s2 + d0 (locked t3).
+        // s1 starts on page 1 and spills its body onto page 2, so the page-2
+        // anchor is a *body* node that omit removes (forcing a collapse) — not
+        // the heading, which survives as the OMITTED marker.
+        const sceneBody = Array.from({ length: 8 }, (_, i) => action(`c${i}`, `c line ${i}`));
+        const { editor, repo } = await makeEditor([
+            scene("s0", "INT. ZERO"),
+            action("a0", "a0"),
+            action("a1", "a1"),
+            scene("s1", "INT. ONE"),
+            ...sceneBody,
+            scene("s2", "INT. TWO"),
+            action("d0", "d0"),
+        ]);
+
+        lockAllPages(editor, repo);
+        // Page 2 anchored by a body node of s1 (so omit collapses it), page 3 by s2.
+        expect(breaksOf(editor).some((b) => b.anchorId === "c2")).toBe(true);
+        expect(breaksOf(editor).some((b) => b.anchorId === "s2")).toBe(true);
+
+        omitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // Collapsed: page 1 stays "1"; the removed page 2 folds into the
+        // following surviving page (s2) as "2-3".
+        const collapsed = pageStateOf(editor)!;
+        expect(collapsed.firstPageLabel).toBe("1");
+        expect(collapsed.breaks.map((b) => b.label)).toEqual(["2-3"]);
+
+        // Grow page 1: insert actions before the OMITTED heading so the heading
+        // overflows into the gap, creating a provisional page there.
+        let insertPos = -1;
+        editor.state.doc.forEach((n, offset, index) => {
+            if (index === 3) insertPos = offset; // the OMITTED (s1) heading
+        });
+        for (let i = 0; i < 3; i++) {
+            const growNode = editor.schema.nodeFromJSON(action(`g${i}`, `grow ${i}`));
+            editor.view.dispatch(editor.state.tr.insert(insertPos, growNode));
+        }
+        forcePagination(editor);
+
+        // The new physical page in the gap reclaims the absorbed "2": page 1 is
+        // back to plain "1", a real "2" page appears, and s2 is still "3".
+        const grown = pageStateOf(editor)!;
+        expect(grown.firstPageLabel).toBe("1");
+        expect(grown.breaks.map((b) => b.label)).toEqual(["2", "3"]);
+    });
+
+    it("removing several locked pages accumulates the range, and inserts after it suffix off the survivor", async () => {
+        // s1 spans pages 1-3 (body anchors page 2 = a5 and page 3 = a11); s2
+        // fills page 4; s3 is page 5. Omitting s1 removes the page-2 and page-3
+        // anchors at once, so the survivor (s2) must read "2-4". Then inserting
+        // content between s2 and the next locked page (s3) creates a provisional
+        // page that suffixes off s2's own number ("4A").
+        const body1 = Array.from({ length: 17 }, (_, i) => action(`a${i}`, `line ${i}`));
+        const body2 = Array.from({ length: 5 }, (_, i) => action(`b${i}`, `b line ${i}`));
+        const { editor, repo } = await makeEditor([
+            scene("s1", "INT. ONE"),
+            ...body1,
+            scene("s2", "INT. TWO"),
+            ...body2,
+            scene("s3", "INT. THREE"),
+        ]);
+
+        lockAllPages(editor, repo);
+        // Pages 2 and 3 anchored by body nodes of s1; page 4 by s2; page 5 by s3.
+        expect(breaksOf(editor).some((b) => b.anchorId === "a5")).toBe(true);
+        expect(breaksOf(editor).some((b) => b.anchorId === "a11")).toBe(true);
+        expect(breaksOf(editor).some((b) => b.anchorId === "s2")).toBe(true);
+        expect(breaksOf(editor).some((b) => b.anchorId === "s3")).toBe(true);
+
+        omitSceneByUuid(editor, repo, "s1");
+        forcePagination(editor);
+
+        // Two removed pages (2 and 3) accumulate into the following survivor
+        // (s2 = "4") as "2-4"; s3 stays "5".
+        const st = pageStateOf(editor)!;
+        expect(st.firstPageLabel).toBe("1");
+        expect(st.breaks.map((b) => b.label)).toEqual(["2-4", "5"]);
+
+        // Insert content between s2's page and s3 so s2's page overflows. The new
+        // page sits past the absorbed numbers (2, 3) but before s3, so it does
+        // NOT reclaim them — it is a provisional suffix of s2's own number: "4A".
+        let beforeS3 = -1;
+        editor.state.doc.forEach((n, offset) => {
+            if (n.attrs?.["data-id"] === "s3") beforeS3 = offset;
+        });
+        for (let i = 0; i < 3; i++) {
+            const n = editor.schema.nodeFromJSON(action(`e${i}`, `extra ${i}`));
+            editor.view.dispatch(editor.state.tr.insert(beforeS3, n));
+            beforeS3 += n.nodeSize;
+        }
+        forcePagination(editor);
+
+        const after = pageStateOf(editor)!;
+        expect(after.firstPageLabel).toBe("1");
+        expect(after.breaks.map((b) => b.label)).toEqual(["2-4", "4A", "5"]);
+    });
+
+    it("deleting the last (empty) element of a locked page collapses it and moves the cursor up", async () => {
+        // page1: s1 + a0..a4 (6). page2: x0 + f0..f4 (6, anchor x0). page3: s2.
+        const fillers = Array.from({ length: 5 }, (_, i) => action(`f${i}`, `f ${i}`));
+        const { editor, repo } = await makeEditor([
+            scene("s1", "INT. ONE"),
+            action("a0", "a0"),
+            action("a1", "a1"),
+            action("a2", "a2"),
+            action("a3", "a3"),
+            action("a4", "a4"),
+            action("x0", "page two"),
+            ...fillers,
+            scene("s2", "INT. TWO"),
+        ]);
+
+        lockAllPages(editor, repo);
+        expect(breaksOf(editor).some((b) => b.anchorId === "x0")).toBe(true);
+        expect(breaksOf(editor).some((b) => b.anchorId === "s2")).toBe(true);
+
+        // Reduce page 2 to just its locked anchor x0: delete the body f0..f4
+        // (allowed — they are not locked anchors).
+        let f0start = -1;
+        let f4end = -1;
+        editor.state.doc.forEach((n, off) => {
+            if (n.attrs?.["data-id"] === "f0") f0start = off;
+            if (n.attrs?.["data-id"] === "f4") f4end = off + n.nodeSize;
+        });
+        editor.view.dispatch(editor.state.tr.delete(f0start, f4end));
+
+        // Empty x0 so the locked page holds a single empty node — this is the
+        // "last element" the user is trying to delete.
+        let x0pos = -1;
+        let x0size = 0;
+        editor.state.doc.forEach((n, off) => {
+            if (n.attrs?.["data-id"] === "x0") {
+                x0pos = off;
+                x0size = n.content.size;
+            }
+        });
+        editor.view.dispatch(editor.state.tr.delete(x0pos + 1, x0pos + 1 + x0size));
+
+        // Cursor at the start of the empty locked anchor, then Backspace (a real
+        // keydown so the extension's keymap handler runs). The page must collapse
+        // — not stay blank with a stranded empty node.
+        editor.commands.focus();
+        editor.commands.setTextSelection(x0pos + 1);
+        editor.view.dom.dispatchEvent(
+            new KeyboardEvent("keydown", {
+                key: "Backspace",
+                code: "Backspace",
+                keyCode: 8,
+                which: 8,
+                bubbles: true,
+                cancelable: true,
+            }),
+        );
+        forcePagination(editor);
+
+        // x0 is gone, the cursor sits at the end of the previous page, and the
+        // collapsed page's number folds into the following page ("2-3").
+        const kids: string[] = [];
+        editor.state.doc.forEach((n) => kids.push(n.attrs["data-id"]));
+        expect(kids).not.toContain("x0");
+        expect(editor.state.selection.from).toBe(x0pos - 1);
+        const st = pageStateOf(editor)!;
+        expect(st.firstPageLabel).toBe("1");
+        expect(st.breaks.map((b) => b.label)).toEqual(["2-3"]);
+    });
+});
diff --git a/src/tests/repro/page-lock-edit-drops-break.test.ts b/src/tests/repro/page-lock-edit-drops-break.test.ts
new file mode 100644
index 00000000..884ee2b2
--- /dev/null
+++ b/src/tests/repro/page-lock-edit-drops-break.test.ts
@@ -0,0 +1,157 @@
+import { describe, it, expect } from "vitest";
+import { Editor } from "@tiptap/core";
+
+import { BASE_EXTENSIONS, applyElement } from "@src/lib/screenplay/editor";
+import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
+import {
+    ScriptioPagination,
+    getPageAnchorInfo,
+    paginationKey,
+} from "@src/lib/screenplay/extensions/pagination-extension";
+import { PersistentPageMap } from "@src/lib/screenplay/page-locking";
+import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
+import { ScreenplayElement } from "@src/lib/utils/enums";
+
+const LINE = 16;
+
+function injectStyle() {
+    const id = "repro-style";
+    if (document.getElementById(id)) return;
+    const s = document.createElement("style");
+    s.id = id;
+    s.textContent = `
+        .ProseMirror > p, #pagination-test-div > p {
+            display: block; width: 100%; line-height: ${LINE}px !important;
+            margin-top: ${LINE}px; margin-bottom: 0; min-height: ${LINE}px;
+            font-size: 12px; box-sizing: border-box; white-space: pre-wrap; padding: 0;
+        }
+        .ProseMirror > p.dialogue, #pagination-test-div > p.dialogue { margin-top: 0; }
+        .ProseMirror > p.parenthetical, #pagination-test-div > p.parenthetical { margin-top: 0; }
+        .ProseMirror > .pagination-page-break + p,
+        .ProseMirror > .pagination-first-page + p { margin-top: 0 !important; }
+    `;
+    document.head.appendChild(s);
+}
+
+type LockState = { locking: boolean; locks: PersistentPageMap };
+
+async function makeEditor(n: number) {
+    injectStyle();
+    const el = document.createElement("div");
+    document.body.appendChild(el);
+    const lockState: LockState = { locking: false, locks: {} };
+
+    const content: object[] = [];
+    for (let i = 0; i < n; i++) {
+        content.push({ type: "action", attrs: { "data-id": `n${i}`, class: "action" }, content: [{ type: "text", text: `L${i}` }] });
+    }
+
+    const editor = new Editor({
+        element: el,
+        injectCSS: false,
+        autofocus: false,
+        content: { type: "doc", content },
+        extensions: [
+            ...BASE_EXTENSIONS,
+            createNodeIdDedupExtension({ duplicatePersistentScene: () => {} }),
+            ScriptioPagination.configure({
+                pageHeight: 200, pageWidth: 600, marginTop: 0, marginBottom: 0,
+                marginLeft: 0, marginRight: 0, pageGap: 10,
+                getPageLocking: () => lockState.locking,
+                getPageLocks: () => lockState.locks,
+                getSkippedLetters: () => [],
+            }),
+        ],
+    });
+    await new Promise((r) => setTimeout(r, 80));
+    (editor.storage as unknown as Record<string, { fontsReady: boolean }>).Pagination.fontsReady = true;
+    return { editor, lockState };
+}
+
+function force(editor: Editor) {
+    const tr = editor.state.tr;
+    tr.setMeta("forcePaginationUpdate", true);
+    tr.setMeta("addToHistory", false);
+    editor.view.dispatch(tr);
+}
+
+function breaksOf(editor: Editor) {
+    const st = paginationKey.getState(editor.state) as
+        | { breaks: { pos: number; freespace: number; anchorId?: string; label?: string }[] }
+        | undefined;
+    return st?.breaks ?? [];
+}
+
+function lockAllPages(editor: Editor, lockState: LockState) {
+    const anchorInfos = getPageAnchorInfo(editor);
+    const anchors = anchorInfos.map((a) => a.anchorId);
+    const labels = computeSceneLabels(anchors, {}, "suffix", []);
+    const locks: PersistentPageMap = {};
+    labels.forEach((l, idx) => {
+        locks[anchors[idx]] = { token: l.token, splitOffset: anchorInfos[idx]?.splitOffset };
+    });
+    lockState.locks = locks;
+    lockState.locking = true;
+    force(editor);
+}
+
+function lastNodeOfPage1Pos(editor: Editor) {
+    const first = breaksOf(editor)[0];
+    let pos = -1;
+    editor.state.doc.forEach((node, p) => {
+        if (p + node.nodeSize === first.pos) pos = p;
+    });
+    return pos;
+}
+
+function domBreakCount(editor: Editor) {
+    return (editor.view.dom as HTMLElement).querySelectorAll(".pagination-page-break").length;
+}
+
+function fullPasses(editor: Editor) {
+    return (editor.storage as unknown as Record<string, { fullPasses: number }>).Pagination.fullPasses;
+}
+
+function breakPositions(editor: Editor) {
+    return breaksOf(editor)
+        .map((b) => `${b.pos}:${b.label ?? ""}`)
+        .join(",");
+}
+
+
+describe("page-lock: editing last node of page 1 via REAL commands", () => {
+    async function setup() {
+        const { editor, lockState } = await makeEditor(20);
+        force(editor);
+        lockAllPages(editor, lockState);
+        return { editor, lockState };
+    }
+
+    // Regression: editing the last node of a page (no height change, so the
+    // breaks array is identical) must not drop the page-break *widget* between
+    // page 1 and the locked page 2. The DOM widget count must always match the
+    // breaks array; before the fix it dropped by one (visual page merge).
+
+    it("alignment change (updateAttributes) on last node of page 1", async () => {
+        const { editor } = await setup();
+        const before = breaksOf(editor).length;
+        const lp = lastNodeOfPage1Pos(editor);
+        const node = editor.state.doc.nodeAt(lp)!;
+        editor.commands.setTextSelection(lp + 1);
+        editor.chain().focus().updateAttributes(node.type.name, { textAlign: "center" }).run();
+        const after = breaksOf(editor).length;
+        expect(after).toBe(before);
+        expect(domBreakCount(editor)).toBe(after);
+    });
+
+    it("re-apply Action type (applyElement) on last node of page 1", async () => {
+        const { editor } = await setup();
+        const before = breaksOf(editor).length;
+        const lp = lastNodeOfPage1Pos(editor);
+        editor.commands.setTextSelection(lp + 1);
+        applyElement(editor, ScreenplayElement.Action);
+        const after = breaksOf(editor).length;
+        expect(after).toBe(before);
+        expect(domBreakCount(editor)).toBe(after);
+    });
+});
diff --git a/styles/scriptio.css b/styles/scriptio.css
index d27d2064..2c7ae64d 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -238,9 +238,9 @@
     }
 
     /* OMITTED scene: heading text is rewritten to "OMITTED" in the document
-       by `omitSceneByUuid` (original preserved in scene metadata), so the
-       heading is a normal editable paragraph. We just grey it and collapse
-       the body paragraphs; the scene-number widgets are re-greyed because
+       by `omitSceneByUuid` (original preserved in scene metadata) and the body
+       is cut out of the document entirely, so the omitted scene is just a
+       greyed one-line heading. The scene-number widgets are re-greyed because
        the generic `.ProseMirror > p span` rule above pins them to
        --editor-text. */
     .scene[data-scene-omitted="true"],
@@ -248,9 +248,6 @@
     .scene[data-scene-omitted="true"] .scene-label-right {
         color: var(--secondary-text);
     }
-    [data-omitted-body="true"] {
-        display: none;
-    }
 
     /* Normal weight scene headings (when bold disabled) */
     &.scene-heading-normal .scene {

From d9172ad3fb9006f39a8ab8bfe7bfd798e55aef5b Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 8 Jun 2026 03:28:19 +0200
Subject: [PATCH 62/76] added document hierarchy

---
 components/board/BoardCanvas.tsx              |  14 +-
 components/editor/BoardPanel.tsx              |  38 +++
 components/editor/TreeDocumentPanel.tsx       |  53 ++++
 .../sidebar/DocumentTreeItem.module.css       | 181 ++++++++++++
 .../editor/sidebar/DocumentTreeItem.tsx       | 270 ++++++++++++++++++
 .../sidebar/DocumentTreeSidebarView.tsx       | 224 +++++++++++++++
 .../EditorSidebarNavigation.module.css        |  39 +++
 .../sidebar/EditorSidebarNavigation.tsx       |  13 +-
 components/project/SplitPanelContainer.tsx    |  13 +-
 messages/de.json                              |  14 +-
 messages/en.json                              |  14 +-
 messages/es.json                              |  14 +-
 messages/fr.json                              |  14 +-
 messages/ja.json                              |  14 +-
 messages/ko.json                              |  14 +-
 messages/pl.json                              |  14 +-
 messages/zh.json                              |  14 +-
 src/context/ProjectContext.tsx                |  39 +++
 src/context/ViewContext.tsx                   |   2 +-
 src/lib/adapters/screenplay-adapter.ts        |  10 +-
 src/lib/adapters/scriptio/scriptio-adapter.ts |   5 +-
 src/lib/document-tree/document-tree-config.ts |  32 +++
 src/lib/import/import-project.ts              |   7 +-
 src/lib/project/project-doc.ts                |  45 ++-
 src/lib/project/project-repository.ts         | 141 +++++++++
 src/lib/project/project-state.ts              |   2 +
 src/tests/project/document-tree.test.ts       | 113 ++++++++
 27 files changed, 1307 insertions(+), 46 deletions(-)
 create mode 100644 components/editor/BoardPanel.tsx
 create mode 100644 components/editor/TreeDocumentPanel.tsx
 create mode 100644 components/editor/sidebar/DocumentTreeItem.module.css
 create mode 100644 components/editor/sidebar/DocumentTreeItem.tsx
 create mode 100644 components/editor/sidebar/DocumentTreeSidebarView.tsx
 create mode 100644 src/lib/document-tree/document-tree-config.ts
 create mode 100644 src/tests/project/document-tree.test.ts

diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index b0dee478..e7a660e3 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -35,7 +35,7 @@ interface ArrowContextMenuState {
     arrow: BoardArrowData;
 }
 
-const BoardCanvas = ({ isVisible }: { isVisible: boolean }) => {
+const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }) => {
     const { repository, isYjsReady, isReadOnly } = useContext(ProjectContext);
     const t = useTranslations("board");
     const projectState = repository?.getState();
@@ -125,7 +125,7 @@ const BoardCanvas = ({ isVisible }: { isVisible: boolean }) => {
     useEffect(() => {
         if (!projectState || !isYjsReady) return;
 
-        const boardMap = projectState.board();
+        const boardMap = projectState.boardData(docId);
 
         const syncCards = () => {
             const cardsData = boardMap.get("cards");
@@ -176,26 +176,26 @@ const BoardCanvas = ({ isVisible }: { isVisible: boolean }) => {
         return () => {
             boardMap.unobserve(syncCards);
         };
-    }, [projectState, isYjsReady, centerCameraOnCards]);
+    }, [projectState, isYjsReady, docId, centerCameraOnCards]);
 
     // Save cards to Yjs
     const saveCards = useCallback(
         (newCards: BoardCardData[]) => {
             if (!projectState || !isYjsReady || isReadOnly) return;
-            const boardMap = projectState.board();
+            const boardMap = projectState.boardData(docId);
             boardMap.set("cards", JSON.stringify(newCards));
         },
-        [projectState, isYjsReady, isReadOnly],
+        [projectState, isYjsReady, isReadOnly, docId],
     );
 
     // Save arrows to Yjs
     const saveArrows = useCallback(
         (newArrows: BoardArrowData[]) => {
             if (!projectState || !isYjsReady || isReadOnly) return;
-            const boardMap = projectState.board();
+            const boardMap = projectState.boardData(docId);
             boardMap.set("arrows", JSON.stringify(newArrows));
         },
-        [projectState, isYjsReady, isReadOnly],
+        [projectState, isYjsReady, isReadOnly, docId],
     );
 
     // Handle keyboard events for snapping
diff --git a/components/editor/BoardPanel.tsx b/components/editor/BoardPanel.tsx
new file mode 100644
index 00000000..0424e93c
--- /dev/null
+++ b/components/editor/BoardPanel.tsx
@@ -0,0 +1,38 @@
+"use client";
+
+import { useContext } from "react";
+import { useTranslations } from "next-intl";
+import { ProjectContext } from "@src/context/ProjectContext";
+import BoardCanvas from "@components/board/BoardCanvas";
+import { LayoutDashboard } from "lucide-react";
+
+import styles from "./EditorPanel.module.css";
+
+const EmptyBoardState = () => {
+    const t = useTranslations("editorSidebar");
+
+    return (
+        <div className={styles.editor_panel} style={{ alignItems: "center", justifyContent: "center" }}>
+            <LayoutDashboard size={32} style={{ opacity: 0.3, marginBottom: 12 }} />
+            <p style={{ opacity: 0.5, fontSize: 13 }}>{t("documentsEmpty")}</p>
+        </div>
+    );
+};
+
+/**
+ * Renders the board document currently selected in the document tree. The
+ * "board" panel is doc-aware: it reads `activeDocument` and mounts a fresh
+ * BoardCanvas (keyed by id) for the active board, or an empty state when the
+ * active document isn't a board.
+ */
+const BoardPanel = ({ isVisible }: { isVisible: boolean }) => {
+    const { activeDocument } = useContext(ProjectContext);
+
+    if (!activeDocument || activeDocument.type !== "board") {
+        return <EmptyBoardState />;
+    }
+
+    return <BoardCanvas key={activeDocument.docId} docId={activeDocument.docId} isVisible={isVisible} />;
+};
+
+export default BoardPanel;
diff --git a/components/editor/TreeDocumentPanel.tsx b/components/editor/TreeDocumentPanel.tsx
new file mode 100644
index 00000000..b0149521
--- /dev/null
+++ b/components/editor/TreeDocumentPanel.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+import { useContext, useMemo, useCallback } from "react";
+import { useTranslations } from "next-intl";
+import { ProjectContext } from "@src/context/ProjectContext";
+import { createDocumentTreeConfig } from "@src/lib/document-tree/document-tree-config";
+import DocumentEditorPanel from "./DocumentEditorPanel";
+import { FileText } from "lucide-react";
+
+import styles from "./EditorPanel.module.css";
+
+const EmptyDocumentState = () => {
+    const t = useTranslations("editorSidebar");
+
+    return (
+        <div className={styles.editor_panel} style={{ alignItems: "center", justifyContent: "center" }}>
+            <FileText size={32} style={{ opacity: 0.3, marginBottom: 12 }} />
+            <p style={{ opacity: 0.5, fontSize: 13 }}>{t("documentsEmpty")}</p>
+        </div>
+    );
+};
+
+const TreeDocumentPanel = ({ isVisible }: { isVisible: boolean }) => {
+    const { activeDocument, updateDocumentEditor } = useContext(ProjectContext);
+
+    const config = useMemo(() => {
+        if (!activeDocument || activeDocument.type !== "editor") return null;
+        return createDocumentTreeConfig(activeDocument.docId);
+    }, [activeDocument]);
+
+    const handleEditorCreated = useCallback(
+        (editor: import("@tiptap/react").Editor | null) => {
+            updateDocumentEditor(editor);
+        },
+        [updateDocumentEditor],
+    );
+
+    if (!config || !activeDocument || activeDocument.type !== "editor") {
+        return <EmptyDocumentState />;
+    }
+
+    return (
+        <DocumentEditorPanel
+            key={activeDocument.docId}
+            config={config}
+            isVisible={isVisible}
+            onEditorCreated={handleEditorCreated}
+            focusedTypeOverride="draft"
+        />
+    );
+};
+
+export default TreeDocumentPanel;
diff --git a/components/editor/sidebar/DocumentTreeItem.module.css b/components/editor/sidebar/DocumentTreeItem.module.css
new file mode 100644
index 00000000..58f2e07d
--- /dev/null
+++ b/components/editor/sidebar/DocumentTreeItem.module.css
@@ -0,0 +1,181 @@
+.row {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 8px;
+    padding-right: 16px;
+    /* Fixed height so swapping the title for a rename input or a delete-confirm
+       row never changes the row's size (no layout shift while editing). */
+    min-height: 30px;
+    box-sizing: border-box;
+    font-size: 12px;
+    color: var(--secondary-text);
+    cursor: pointer;
+}
+
+.row:hover {
+    background-color: var(--editor-sidebar-hover);
+    color: var(--primary-text);
+}
+
+.row_active {
+    color: var(--primary-text);
+    background-color: var(--editor-sidebar-hover);
+}
+
+/* Drop indicators */
+.row_drop_into {
+    background-color: var(--editor-style-bg-hover);
+    box-shadow: inset 0 0 0 1px var(--primary-text);
+}
+
+.row_drop_before::before,
+.row_drop_after::after {
+    content: "";
+    position: absolute;
+    left: 8px;
+    right: 8px;
+    height: 2px;
+    background-color: var(--primary-text);
+    pointer-events: none;
+}
+
+.row_drop_before::before {
+    top: 0;
+}
+
+.row_drop_after::after {
+    bottom: 0;
+}
+
+.chevron {
+    flex-shrink: 0;
+    color: var(--secondary-text);
+    transition: transform 0.2s ease;
+}
+
+.chevron_expanded {
+    transform: rotate(90deg);
+}
+
+.chevron_placeholder {
+    flex-shrink: 0;
+    width: 13px;
+}
+
+.type_icon {
+    flex-shrink: 0;
+    color: var(--secondary-text);
+}
+
+.title {
+    flex: 1;
+    min-width: 0;
+    overflow-x: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.rename_input {
+    flex: 1;
+    min-width: 0;
+    font-size: 12px;
+    background: var(--editor-sidebar-hover);
+    border: 1px solid var(--separator);
+    border-radius: 4px;
+    padding: 0 6px;
+    color: var(--primary-text);
+    outline: none;
+    line-height: inherit;
+}
+
+.actions {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 4px;
+    flex-shrink: 0;
+    opacity: 0;
+    transition: opacity 0.15s;
+}
+
+.row:hover .actions,
+.row_active .actions {
+    opacity: 1;
+}
+
+.action_btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 3px;
+    border-radius: 4px;
+    border: none;
+    background: none;
+    color: var(--secondary-text);
+    cursor: pointer;
+    flex-shrink: 0;
+}
+
+.action_btn:hover {
+    background-color: var(--editor-style-bg-hover);
+    color: var(--primary-text);
+}
+
+.action_btn_danger:hover {
+    background-color: var(--error, #e53e3e);
+    color: #fff;
+}
+
+/* Inline delete confirmation */
+.confirm_row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 6px;
+    flex: 1;
+    min-width: 0;
+}
+
+.confirm_text {
+    flex: 1;
+    min-width: 0;
+    font-size: 0.72rem;
+    color: var(--secondary-text);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.confirm_btns {
+    display: flex;
+    gap: 6px;
+    flex-shrink: 0;
+}
+
+.confirm_yes,
+.confirm_no {
+    padding: 3px 10px;
+    border: none;
+    border-radius: 5px;
+    font-size: 0.72rem;
+    font-weight: 500;
+    cursor: pointer;
+    transition: opacity 0.1s ease;
+}
+
+.confirm_yes {
+    background-color: var(--error, #e53e3e);
+    color: #fff;
+}
+
+.confirm_no {
+    background-color: var(--tertiary);
+    color: var(--primary-text);
+}
+
+.confirm_yes:hover,
+.confirm_no:hover {
+    opacity: 0.85;
+}
diff --git a/components/editor/sidebar/DocumentTreeItem.tsx b/components/editor/sidebar/DocumentTreeItem.tsx
new file mode 100644
index 00000000..35ba2cc0
--- /dev/null
+++ b/components/editor/sidebar/DocumentTreeItem.tsx
@@ -0,0 +1,270 @@
+"use client";
+
+import { useCallback, useRef, useState } from "react";
+import { useTranslations } from "next-intl";
+import { DocumentNode, DocumentNodeType } from "@src/lib/project/project-state";
+import { join } from "@src/lib/utils/misc";
+import {
+    ChevronRight,
+    FilePlus,
+    FileText,
+    Folder,
+    FolderPlus,
+    LayoutDashboard,
+    Pencil,
+    Trash2,
+} from "lucide-react";
+
+import styles from "./DocumentTreeItem.module.css";
+
+const TYPE_ICONS: Record<DocumentNodeType, typeof FileText> = {
+    folder: Folder,
+    editor: FileText,
+    board: LayoutDashboard,
+};
+
+export type DropPosition = "into" | "before" | "after";
+
+export interface DocumentTreeItemProps {
+    node: DocumentNode;
+    depth: number;
+    childrenOf: (parentId: string) => DocumentNode[];
+    expanded: Set<string>;
+    onToggle: (id: string) => void;
+    activeDocId: string | null;
+    onOpen: (node: DocumentNode) => void;
+    onCreateChild: (parentId: string, type: "folder" | "editor") => void;
+    onRename: (id: string, title: string) => void;
+    onDelete: (id: string) => void;
+    // Drag & drop
+    draggingId: string | null;
+    dropTarget: { id: string; pos: DropPosition } | null;
+    onDragStart: (id: string) => void;
+    onDragOverNode: (id: string, pos: DropPosition) => void;
+    onDropNode: (id: string) => void;
+    onDragEnd: () => void;
+}
+
+const INDENT = 14;
+
+const DocumentTreeItem = ({
+    node,
+    depth,
+    childrenOf,
+    expanded,
+    onToggle,
+    activeDocId,
+    onOpen,
+    onCreateChild,
+    onRename,
+    onDelete,
+    draggingId,
+    dropTarget,
+    onDragStart,
+    onDragOverNode,
+    onDropNode,
+    onDragEnd,
+}: DocumentTreeItemProps) => {
+    const t = useTranslations("editorSidebar");
+    const [isRenaming, setIsRenaming] = useState(false);
+    const [renameValue, setRenameValue] = useState("");
+    const [confirmingDelete, setConfirmingDelete] = useState(false);
+    const renameInputRef = useRef<HTMLInputElement>(null);
+
+    const Icon = TYPE_ICONS[node.type];
+    const isFolder = node.type === "folder";
+    const isOpen = expanded.has(node.id);
+    const isActive = node.type === "editor" && activeDocId === node.id;
+    const busy = isRenaming || confirmingDelete;
+
+    const handleRowClick = useCallback(() => {
+        if (busy) return;
+        if (isFolder) onToggle(node.id);
+        else onOpen(node);
+    }, [busy, isFolder, node, onToggle, onOpen]);
+
+    const startRename = useCallback(
+        (e: React.MouseEvent) => {
+            e.stopPropagation();
+            setRenameValue(node.title);
+            setIsRenaming(true);
+            setTimeout(() => renameInputRef.current?.select(), 0);
+        },
+        [node.title],
+    );
+
+    const commitRename = useCallback(() => {
+        const trimmed = renameValue.trim();
+        if (trimmed) onRename(node.id, trimmed);
+        setIsRenaming(false);
+    }, [renameValue, node.id, onRename]);
+
+    const handleDragOver = useCallback(
+        (e: React.DragEvent) => {
+            if (!draggingId || draggingId === node.id) return;
+            e.preventDefault();
+            e.stopPropagation();
+            const rect = e.currentTarget.getBoundingClientRect();
+            const y = e.clientY - rect.top;
+            let pos: DropPosition;
+            if (isFolder) {
+                if (y < rect.height * 0.25) pos = "before";
+                else if (y > rect.height * 0.75) pos = "after";
+                else pos = "into";
+            } else {
+                pos = y < rect.height / 2 ? "before" : "after";
+            }
+            onDragOverNode(node.id, pos);
+        },
+        [draggingId, node.id, isFolder, onDragOverNode],
+    );
+
+    const isDropTarget = dropTarget?.id === node.id;
+    const rowClass = join(
+        styles.row,
+        isActive ? styles.row_active : "",
+        isDropTarget && dropTarget?.pos === "into" ? styles.row_drop_into : "",
+        isDropTarget && dropTarget?.pos === "before" ? styles.row_drop_before : "",
+        isDropTarget && dropTarget?.pos === "after" ? styles.row_drop_after : "",
+    );
+
+    return (
+        <>
+            <div
+                className={rowClass}
+                style={{ paddingLeft: 12 + depth * INDENT, opacity: draggingId === node.id ? 0.4 : 1 }}
+                onClick={handleRowClick}
+                draggable={!busy}
+                onDragStart={(e) => {
+                    e.dataTransfer.effectAllowed = "move";
+                    onDragStart(node.id);
+                }}
+                onDragOver={handleDragOver}
+                onDrop={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    onDropNode(node.id);
+                }}
+                onDragEnd={onDragEnd}
+            >
+                {isFolder ? (
+                    <ChevronRight
+                        size={13}
+                        className={join(styles.chevron, isOpen ? styles.chevron_expanded : "")}
+                    />
+                ) : (
+                    <span className={styles.chevron_placeholder} />
+                )}
+                <Icon size={14} className={styles.type_icon} />
+
+                {isRenaming ? (
+                    <input
+                        ref={renameInputRef}
+                        className={styles.rename_input}
+                        value={renameValue}
+                        draggable={false}
+                        onChange={(e) => setRenameValue(e.target.value)}
+                        onBlur={commitRename}
+                        onMouseDown={(e) => e.stopPropagation()}
+                        onClick={(e) => e.stopPropagation()}
+                        onKeyDown={(e) => {
+                            if (e.key === "Enter") commitRename();
+                            else if (e.key === "Escape") setIsRenaming(false);
+                        }}
+                    />
+                ) : confirmingDelete ? (
+                    <div className={styles.confirm_row} onClick={(e) => e.stopPropagation()}>
+                        <span className={styles.confirm_text}>
+                            {isFolder ? t("confirmDeleteFolder") : t("confirmDelete")}
+                        </span>
+                        <div className={styles.confirm_btns}>
+                            <button
+                                className={styles.confirm_yes}
+                                onClick={() => {
+                                    setConfirmingDelete(false);
+                                    onDelete(node.id);
+                                }}
+                            >
+                                {t("delete")}
+                            </button>
+                            <button className={styles.confirm_no} onClick={() => setConfirmingDelete(false)}>
+                                {t("cancel")}
+                            </button>
+                        </div>
+                    </div>
+                ) : (
+                    <>
+                        <span className={join(styles.title, "unselectable")}>{node.title}</span>
+                        <div className={styles.actions}>
+                            {isFolder && (
+                                <>
+                                    <button
+                                        className={styles.action_btn}
+                                        title={t("newDocument")}
+                                        onClick={(e) => {
+                                            e.stopPropagation();
+                                            if (!isOpen) onToggle(node.id);
+                                            onCreateChild(node.id, "editor");
+                                        }}
+                                    >
+                                        <FilePlus size={12} />
+                                    </button>
+                                    <button
+                                        className={styles.action_btn}
+                                        title={t("newFolder")}
+                                        onClick={(e) => {
+                                            e.stopPropagation();
+                                            if (!isOpen) onToggle(node.id);
+                                            onCreateChild(node.id, "folder");
+                                        }}
+                                    >
+                                        <FolderPlus size={12} />
+                                    </button>
+                                </>
+                            )}
+                            <button className={styles.action_btn} title={t("rename")} onClick={startRename}>
+                                <Pencil size={12} />
+                            </button>
+                            <button
+                                className={join(styles.action_btn, styles.action_btn_danger)}
+                                title={t("delete")}
+                                onClick={(e) => {
+                                    e.stopPropagation();
+                                    setConfirmingDelete(true);
+                                }}
+                            >
+                                <Trash2 size={12} />
+                            </button>
+                        </div>
+                    </>
+                )}
+            </div>
+
+            {isFolder &&
+                isOpen &&
+                childrenOf(node.id).map((child) => (
+                    <DocumentTreeItem
+                        key={child.id}
+                        node={child}
+                        depth={depth + 1}
+                        childrenOf={childrenOf}
+                        expanded={expanded}
+                        onToggle={onToggle}
+                        activeDocId={activeDocId}
+                        onOpen={onOpen}
+                        onCreateChild={onCreateChild}
+                        onRename={onRename}
+                        onDelete={onDelete}
+                        draggingId={draggingId}
+                        dropTarget={dropTarget}
+                        onDragStart={onDragStart}
+                        onDragOverNode={onDragOverNode}
+                        onDropNode={onDropNode}
+                        onDragEnd={onDragEnd}
+                    />
+                ))}
+        </>
+    );
+};
+
+export default DocumentTreeItem;
diff --git a/components/editor/sidebar/DocumentTreeSidebarView.tsx b/components/editor/sidebar/DocumentTreeSidebarView.tsx
new file mode 100644
index 00000000..9da6ed06
--- /dev/null
+++ b/components/editor/sidebar/DocumentTreeSidebarView.tsx
@@ -0,0 +1,224 @@
+"use client";
+
+import { useCallback, useContext, useMemo, useState } from "react";
+import { useTranslations } from "next-intl";
+import { ProjectContext } from "@src/context/ProjectContext";
+import { useViewContext } from "@src/context/ViewContext";
+import { DocumentNode } from "@src/lib/project/project-state";
+import { join } from "@src/lib/utils/misc";
+import { FilePlus, FolderPlus, FolderTree, LayoutDashboard } from "lucide-react";
+import DocumentTreeItem, { DropPosition } from "./DocumentTreeItem";
+
+import form from "./../../utils/Form.module.css";
+import sidebar_nav from "./EditorSidebarNavigation.module.css";
+
+const DocumentTreeSidebarView = () => {
+    const t = useTranslations("editorSidebar");
+    const { documents, repository, activeDocument, setActiveDocument } = useContext(ProjectContext);
+    const { setSecondaryPanel } = useViewContext();
+
+    const [expanded, setExpanded] = useState<Set<string>>(new Set());
+    const [draggingId, setDraggingId] = useState<string | null>(null);
+    const [dropTarget, setDropTarget] = useState<{ id: string; pos: DropPosition } | null>(null);
+    const [rootDrop, setRootDrop] = useState(false);
+
+    // Children of a parent (null = root), sorted by fractional `order`.
+    const childrenOf = useCallback(
+        (parentId: string | null): DocumentNode[] =>
+            Object.values(documents)
+                .filter((n) => (n.parentId ?? null) === (parentId ?? null))
+                .sort((a, b) => a.order - b.order),
+        [documents],
+    );
+
+    const roots = useMemo(() => childrenOf(null), [childrenOf]);
+
+    const appendOrder = useCallback(
+        (parentId: string | null, excludeId?: string) => {
+            const kids = childrenOf(parentId).filter((n) => n.id !== excludeId);
+            return kids.length ? kids[kids.length - 1].order + 1 : 0;
+        },
+        [childrenOf],
+    );
+
+    const toggle = useCallback((id: string) => {
+        setExpanded((prev) => {
+            const next = new Set(prev);
+            if (next.has(id)) next.delete(id);
+            else next.add(id);
+            return next;
+        });
+    }, []);
+
+    const openDocument = useCallback(
+        (node: DocumentNode) => {
+            if (node.type === "board") {
+                setActiveDocument({ docId: node.id, type: "board" });
+                setSecondaryPanel("board");
+            } else if (node.type === "editor") {
+                setActiveDocument({ docId: node.id, type: "editor" });
+                setSecondaryPanel("document");
+            }
+        },
+        [setActiveDocument, setSecondaryPanel],
+    );
+
+    const createChild = useCallback(
+        (parentId: string | null, type: "folder" | "editor") => {
+            if (!repository) return;
+            if (type === "folder") repository.createFolder(t("untitledFolder"), parentId);
+            else repository.createEditorDocument(t("untitledDocument"), parentId);
+        },
+        [repository, t],
+    );
+
+    const createBoard = useCallback(() => {
+        repository?.createBoardDocument(t("boardTitle"), null);
+    }, [repository, t]);
+
+    const renameDocument = useCallback(
+        (id: string, title: string) => repository?.renameDocument(id, title),
+        [repository],
+    );
+
+    const deleteDocument = useCallback(
+        (id: string) => {
+            if (!repository) return;
+            // Clear the open document if it (or one of its descendants) is being removed.
+            const removed = new Set<string>();
+            const stack = [id];
+            while (stack.length) {
+                const cur = stack.pop()!;
+                removed.add(cur);
+                for (const n of Object.values(documents)) if (n.parentId === cur) stack.push(n.id);
+            }
+            if (activeDocument && removed.has(activeDocument.docId)) setActiveDocument(null);
+            repository.deleteDocument(id);
+        },
+        [repository, documents, activeDocument, setActiveDocument],
+    );
+
+    // ---- Drag & drop ----
+    const onDragStart = useCallback((id: string) => setDraggingId(id), []);
+
+    const onDragOverNode = useCallback(
+        (id: string, pos: DropPosition) => {
+            setRootDrop(false);
+            setDropTarget((prev) => (prev?.id === id && prev.pos === pos ? prev : { id, pos }));
+        },
+        [],
+    );
+
+    const resetDrag = useCallback(() => {
+        setDraggingId(null);
+        setDropTarget(null);
+        setRootDrop(false);
+    }, []);
+
+    const onDropNode = useCallback(
+        (targetId: string) => {
+            const dragId = draggingId;
+            const target = documents[targetId];
+            const pos = dropTarget?.pos;
+            resetDrag();
+            if (!repository || !dragId || !target || !pos || dragId === targetId) return;
+
+            if (pos === "into") {
+                repository.moveDocument(dragId, target.id, appendOrder(target.id, dragId));
+                setExpanded((prev) => new Set(prev).add(target.id));
+                return;
+            }
+
+            const parentId = target.parentId ?? null;
+            const siblings = childrenOf(parentId).filter((n) => n.id !== dragId);
+            const idx = siblings.findIndex((n) => n.id === targetId);
+            let order: number;
+            if (pos === "before") {
+                const prev = siblings[idx - 1];
+                order = prev ? (prev.order + target.order) / 2 : target.order - 1;
+            } else {
+                const next = siblings[idx + 1];
+                order = next ? (target.order + next.order) / 2 : target.order + 1;
+            }
+            repository.moveDocument(dragId, parentId, order);
+        },
+        [draggingId, documents, dropTarget, repository, appendOrder, childrenOf, resetDrag],
+    );
+
+    const onDropRoot = useCallback(() => {
+        const dragId = draggingId;
+        resetDrag();
+        if (!repository || !dragId) return;
+        repository.moveDocument(dragId, null, appendOrder(null, dragId));
+    }, [draggingId, repository, appendOrder, resetDrag]);
+
+    return (
+        <>
+            <div className={sidebar_nav.list_header}>
+                <FolderTree size={18} />
+                <p className={form.label}>{t("documents")}</p>
+                <div className={sidebar_nav.header_spacer} />
+                <div className={sidebar_nav.header_actions}>
+                    <button
+                        className={sidebar_nav.header_btn}
+                        title={t("newDocument")}
+                        onClick={() => createChild(null, "editor")}
+                    >
+                        <FilePlus size={15} />
+                    </button>
+                    <button
+                        className={sidebar_nav.header_btn}
+                        title={t("newFolder")}
+                        onClick={() => createChild(null, "folder")}
+                    >
+                        <FolderPlus size={15} />
+                    </button>
+                    <button className={sidebar_nav.header_btn} title={t("newBoard")} onClick={createBoard}>
+                        <LayoutDashboard size={15} />
+                    </button>
+                </div>
+            </div>
+            <div
+                className={join(sidebar_nav.list, sidebar_nav.scene_list, rootDrop ? sidebar_nav.tree_root_drop : "")}
+                onDragOver={(e) => {
+                    if (!draggingId) return;
+                    e.preventDefault();
+                    setDropTarget(null);
+                    setRootDrop(true);
+                }}
+                onDrop={(e) => {
+                    e.preventDefault();
+                    onDropRoot();
+                }}
+            >
+                {roots.length !== 0 ? (
+                    roots.map((node) => (
+                        <DocumentTreeItem
+                            key={node.id}
+                            node={node}
+                            depth={0}
+                            childrenOf={childrenOf}
+                            expanded={expanded}
+                            onToggle={toggle}
+                            activeDocId={activeDocument?.docId ?? null}
+                            onOpen={openDocument}
+                            onCreateChild={createChild}
+                            onRename={renameDocument}
+                            onDelete={deleteDocument}
+                            draggingId={draggingId}
+                            dropTarget={dropTarget}
+                            onDragStart={onDragStart}
+                            onDragOverNode={onDragOverNode}
+                            onDropNode={onDropNode}
+                            onDragEnd={resetDrag}
+                        />
+                    ))
+                ) : (
+                    <div className={sidebar_nav.empty_state}>{t("documentsEmpty")}</div>
+                )}
+            </div>
+        </>
+    );
+};
+
+export default DocumentTreeSidebarView;
diff --git a/components/editor/sidebar/EditorSidebarNavigation.module.css b/components/editor/sidebar/EditorSidebarNavigation.module.css
index d10e97fa..bf020344 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.module.css
+++ b/components/editor/sidebar/EditorSidebarNavigation.module.css
@@ -82,6 +82,45 @@
     font-size: 1rem;
 }
 
+/* Header action buttons (e.g. document-tree create buttons) */
+.header_spacer {
+    flex: 1;
+}
+
+.header_actions {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 2px;
+    padding-right: 16px;
+}
+
+.header_btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 4px;
+    border-radius: 6px;
+    border: none;
+    background: none;
+    color: var(--secondary-text);
+    cursor: pointer;
+    transition:
+        color 0.15s,
+        background-color 0.15s;
+}
+
+.header_btn:hover {
+    background-color: var(--editor-sidebar-hover);
+    color: var(--primary-text);
+}
+
+/* Drop-to-root target highlight */
+.tree_root_drop {
+    box-shadow: inset 0 0 0 1px var(--primary-text);
+    border-radius: 8px;
+}
+
 .list_fill {
     min-height: 30px;
     height: 100%;
diff --git a/components/editor/sidebar/EditorSidebarNavigation.tsx b/components/editor/sidebar/EditorSidebarNavigation.tsx
index dae8d2db..a4f5d422 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.tsx
+++ b/components/editor/sidebar/EditorSidebarNavigation.tsx
@@ -8,10 +8,11 @@ import { useViewContext } from "@src/context/ViewContext";
 import { Scene } from "@src/lib/screenplay/scenes";
 import { focusOnPosition } from "@src/lib/screenplay/editor";
 import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
-import { Archive, Clapperboard, MessageSquare } from "lucide-react";
+import { Archive, Clapperboard, FolderTree, MessageSquare } from "lucide-react";
 import SidebarSceneItem from "./SidebarSceneItem";
 import ShelfSidebarView from "./ShelfSidebarView";
 import CommentSidebarView from "./CommentSidebarView";
+import DocumentTreeSidebarView from "./DocumentTreeSidebarView";
 
 import form from "./../../utils/Form.module.css";
 import sidebar_nav from "./EditorSidebarNavigation.module.css";
@@ -29,7 +30,7 @@ const EditorSidebarNavigation = () => {
     } = useContext(ProjectContext);
     const { leftSidebarOpen } = useViewContext();
 
-    const [activeTab, setActiveTab] = useState<"scenes" | "shelf" | "comments">("scenes");
+    const [activeTab, setActiveTab] = useState<"scenes" | "shelf" | "comments" | "documents">("scenes");
 
     const [dragIndex, setDragIndex] = useState<number | null>(null);
     // indicatorIndex represents the gap where the item will be inserted.
@@ -256,6 +257,8 @@ const EditorSidebarNavigation = () => {
                         </>
                     ) : activeTab === "shelf" ? (
                         <ShelfSidebarView />
+                    ) : activeTab === "documents" ? (
+                        <DocumentTreeSidebarView />
                     ) : (
                         <CommentSidebarView />
                     )}
@@ -266,6 +269,12 @@ const EditorSidebarNavigation = () => {
                         >
                             <Clapperboard size={16} />
                         </button>
+                        <button
+                            className={join(sidebar_nav.tab_btn, activeTab === "documents" ? sidebar_nav.tab_btn_active : "")}
+                            onClick={() => setActiveTab("documents")}
+                        >
+                            <FolderTree size={16} />
+                        </button>
                         <button
                             className={join(sidebar_nav.tab_btn, activeTab === "comments" ? sidebar_nav.tab_btn_active : "")}
                             onClick={() => setActiveTab("comments")}
diff --git a/components/project/SplitPanelContainer.tsx b/components/project/SplitPanelContainer.tsx
index c2156b81..87611b63 100644
--- a/components/project/SplitPanelContainer.tsx
+++ b/components/project/SplitPanelContainer.tsx
@@ -7,7 +7,8 @@ import { PanelType, useViewContext } from "@src/context/ViewContext";
 import EditorPanel from "@components/editor/EditorPanel";
 import TitlePagePanel from "@components/editor/TitlePagePanel";
 import DraftEditorPanel from "@components/editor/DraftEditorPanel";
-import BoardCanvas from "@components/board/BoardCanvas";
+import TreeDocumentPanel from "@components/editor/TreeDocumentPanel";
+import BoardPanel from "@components/editor/BoardPanel";
 import StatisticsClientPage from "@components/projects/stats/StatisticsClientPage";
 import DragHandle from "./DragHandle";
 import { SuggestionData } from "@components/editor/SuggestionMenu";
@@ -18,7 +19,6 @@ import {
     ChevronRight,
     Clapperboard,
     FileText,
-    LayoutDashboard,
     Maximize,
     Menu,
     MessageSquare,
@@ -58,19 +58,22 @@ const PanelRenderer = ({
                 />
             );
         case "board":
-            return <BoardCanvas isVisible={isVisible} />;
+            return <BoardPanel isVisible={isVisible} />;
         case "statistics":
             return <StatisticsClientPage />;
         case "title":
             return <TitlePagePanel isVisible={isVisible} />;
         case "draft":
             return <DraftEditorPanel isVisible={isVisible} />;
+        case "document":
+            return <TreeDocumentPanel isVisible={isVisible} />;
     }
 };
 
+// Boards and tree documents are opened from the document-tree sidebar (they are
+// per-document), so they are not listed here.
 const SWITCHABLE_PANELS: { type: PanelType; icon: typeof Clapperboard; labelKey: string }[] = [
     { type: "screenplay", icon: Clapperboard, labelKey: "screenplay" },
-    { type: "board", icon: LayoutDashboard, labelKey: "board" },
     { type: "title", icon: FileText, labelKey: "titlePage" },
     { type: "draft", icon: Archive, labelKey: "draftEditor" },
 ];
@@ -252,7 +255,7 @@ const SplitPanelContainer = ({
         };
     }, [isSplit, splitRatio]);
 
-    const allPanels: PanelType[] = ["screenplay", "board", "statistics", "title", "draft"];
+    const allPanels: PanelType[] = ["screenplay", "board", "statistics", "title", "draft", "document"];
 
     return (
         <div className={styles.split_panel_container} style={gridStyle}>
diff --git a/messages/de.json b/messages/de.json
index 2368073f..2d3cc8c0 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -212,7 +212,19 @@
     "scenesEmpty": "Noch keine Szenen",
     "comments": "Kommentare",
     "commentsEmpty": "Keine aktiven Kommentare",
-    "shelfEmptySelection": "Wählen Sie eine Version aus der Ablage zur Bearbeitung aus"
+    "shelfEmptySelection": "Wählen Sie eine Version aus der Ablage zur Bearbeitung aus",
+    "documents": "Dokumente",
+    "documentsEmpty": "Noch keine Dokumente",
+    "newFolder": "Neuer Ordner",
+    "newDocument": "Neues Dokument",
+    "newBoard": "Neues Board",
+    "untitledFolder": "Neuer Ordner",
+    "untitledDocument": "Unbenannt",
+    "boardTitle": "Board",
+    "rename": "Umbenennen",
+    "delete": "Löschen",
+    "confirmDelete": "Dieses Dokument löschen?",
+    "confirmDeleteFolder": "Ordner und Inhalt löschen?"
   },
   "formatDropdown": {
     "elements": {
diff --git a/messages/en.json b/messages/en.json
index b04f5b97..97d31a8f 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -211,7 +211,19 @@
     "goTo": "Go to in screenplay",
     "confirmRestore": "This will replace the matching content in your screenplay.",
     "restore": "Restore",
-    "cancel": "Cancel"
+    "cancel": "Cancel",
+    "documents": "Documents",
+    "documentsEmpty": "No documents yet",
+    "newFolder": "New folder",
+    "newDocument": "New document",
+    "newBoard": "New board",
+    "untitledFolder": "New folder",
+    "untitledDocument": "Untitled",
+    "boardTitle": "Board",
+    "rename": "Rename",
+    "delete": "Delete",
+    "confirmDelete": "Delete this document?",
+    "confirmDeleteFolder": "Delete folder and its contents?"
   },
   "formatDropdown": {
     "elements": {
diff --git a/messages/es.json b/messages/es.json
index 9688fd45..174999f8 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -211,7 +211,19 @@
     "scenesEmpty": "Aún no hay escenas",
     "comments": "Comentarios",
     "commentsEmpty": "No hay comentarios activos",
-    "shelfEmptySelection": "Selecciona una versión del estante para editar"
+    "shelfEmptySelection": "Selecciona una versión del estante para editar",
+    "documents": "Documentos",
+    "documentsEmpty": "Aún no hay documentos",
+    "newFolder": "Nueva carpeta",
+    "newDocument": "Nuevo documento",
+    "newBoard": "Nuevo tablero",
+    "untitledFolder": "Nueva carpeta",
+    "untitledDocument": "Sin título",
+    "boardTitle": "Tablero",
+    "rename": "Renombrar",
+    "delete": "Eliminar",
+    "confirmDelete": "¿Eliminar este documento?",
+    "confirmDeleteFolder": "¿Eliminar la carpeta y su contenido?"
   },
   "formatDropdown": {
     "elements": {
diff --git a/messages/fr.json b/messages/fr.json
index b3b62b77..e4b22f46 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -212,7 +212,19 @@
     "scenesEmpty": "Aucune scène pour le moment",
     "comments": "Commentaires",
     "commentsEmpty": "Aucun commentaire actif",
-    "shelfEmptySelection": "Sélectionnez une version sur l'étagère pour la modifier"
+    "shelfEmptySelection": "Sélectionnez une version sur l'étagère pour la modifier",
+    "documents": "Documents",
+    "documentsEmpty": "Aucun document",
+    "newFolder": "Nouveau dossier",
+    "newDocument": "Nouveau document",
+    "newBoard": "Nouveau tableau",
+    "untitledFolder": "Nouveau dossier",
+    "untitledDocument": "Sans titre",
+    "boardTitle": "Tableau",
+    "rename": "Renommer",
+    "delete": "Supprimer",
+    "confirmDelete": "Supprimer ce document ?",
+    "confirmDeleteFolder": "Supprimer le dossier et son contenu ?"
   },
   "formatDropdown": {
     "elements": {
diff --git a/messages/ja.json b/messages/ja.json
index fed7484d..48b4abb3 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -211,7 +211,19 @@
     "scenesEmpty": "まだシーンはありません",
     "comments": "コメント",
     "commentsEmpty": "アクティブなコメントはありません",
-    "shelfEmptySelection": "編集するシェルフのバージョンを選択してください"
+    "shelfEmptySelection": "編集するシェルフのバージョンを選択してください",
+    "documents": "ドキュメント",
+    "documentsEmpty": "ドキュメントがありません",
+    "newFolder": "新しいフォルダ",
+    "newDocument": "新しいドキュメント",
+    "newBoard": "新しいボード",
+    "untitledFolder": "新しいフォルダ",
+    "untitledDocument": "無題",
+    "boardTitle": "ボード",
+    "rename": "名前を変更",
+    "delete": "削除",
+    "confirmDelete": "このドキュメントを削除しますか？",
+    "confirmDeleteFolder": "フォルダとその内容を削除しますか？"
   },
   "formatDropdown": {
     "elements": {
diff --git a/messages/ko.json b/messages/ko.json
index 4f0b4e6b..d3e612a0 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -211,7 +211,19 @@
     "scenesEmpty": "아직 씬이 없습니다",
     "comments": "코멘트",
     "commentsEmpty": "활성 코멘트가 없습니다",
-    "shelfEmptySelection": "편집할 보관함 버전을 선택하세요"
+    "shelfEmptySelection": "편집할 보관함 버전을 선택하세요",
+    "documents": "문서",
+    "documentsEmpty": "아직 문서가 없습니다",
+    "newFolder": "새 폴더",
+    "newDocument": "새 문서",
+    "newBoard": "새 보드",
+    "untitledFolder": "새 폴더",
+    "untitledDocument": "제목 없음",
+    "boardTitle": "보드",
+    "rename": "이름 바꾸기",
+    "delete": "삭제",
+    "confirmDelete": "이 문서를 삭제하시겠습니까?",
+    "confirmDeleteFolder": "폴더와 내용을 삭제하시겠습니까?"
   },
   "formatDropdown": {
     "elements": {
diff --git a/messages/pl.json b/messages/pl.json
index b49b4af6..fb801a1d 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -211,7 +211,19 @@
     "scenesEmpty": "Brak scen",
     "comments": "Komentarze",
     "commentsEmpty": "Brak aktywnych komentarzy",
-    "shelfEmptySelection": "Wybierz wersję z półki do edycji"
+    "shelfEmptySelection": "Wybierz wersję z półki do edycji",
+    "documents": "Dokumenty",
+    "documentsEmpty": "Brak dokumentów",
+    "newFolder": "Nowy folder",
+    "newDocument": "Nowy dokument",
+    "newBoard": "Nowa tablica",
+    "untitledFolder": "Nowy folder",
+    "untitledDocument": "Bez tytułu",
+    "boardTitle": "Tablica",
+    "rename": "Zmień nazwę",
+    "delete": "Usuń",
+    "confirmDelete": "Usunąć ten dokument?",
+    "confirmDeleteFolder": "Usunąć folder i jego zawartość?"
   },
   "formatDropdown": {
     "elements": {
diff --git a/messages/zh.json b/messages/zh.json
index cab5009f..570c97de 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -211,7 +211,19 @@
     "scenesEmpty": "暂无场景",
     "comments": "评论",
     "commentsEmpty": "没有活动的评论",
-    "shelfEmptySelection": "选择要编辑的搁置版本"
+    "shelfEmptySelection": "选择要编辑的搁置版本",
+    "documents": "文档",
+    "documentsEmpty": "还没有文档",
+    "newFolder": "新建文件夹",
+    "newDocument": "新建文档",
+    "newBoard": "新建白板",
+    "untitledFolder": "新建文件夹",
+    "untitledDocument": "无标题",
+    "boardTitle": "白板",
+    "rename": "重命名",
+    "delete": "删除",
+    "confirmDelete": "删除此文档？",
+    "confirmDeleteFolder": "删除文件夹及其内容？"
   },
   "formatDropdown": {
     "elements": {
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index bc0622be..d18fe37d 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -28,6 +28,7 @@ import {
     DEFAULT_PAGE_MARGINS,
     DEFAULT_SKIPPED_SCENE_LETTERS,
     ShelfEntry,
+    DocumentNode,
     ProjectStatus,
 } from "@src/lib/project/project-state";
 import { Screenplay } from "@src/lib/utils/types";
@@ -154,6 +155,13 @@ export interface ProjectContextType {
     shelfEntries: Record<string, ShelfEntry>;
     activeShelfVersion: { nodeId: string; versionId: string } | null;
     setActiveShelfVersion: (v: { nodeId: string; versionId: string } | null) => void;
+
+    // Document tree (folders + editor/board documents)
+    documents: Record<string, DocumentNode>;
+    activeDocument: { docId: string; type: "editor" | "board" } | null;
+    setActiveDocument: (v: { docId: string; type: "editor" | "board" } | null) => void;
+    documentEditor: Editor | null;
+    updateDocumentEditor: (editor: Editor | null) => void;
 }
 
 // -------------------------------- //
@@ -248,6 +256,12 @@ const defaultContextValue: ProjectContextType = {
     shelfEntries: {},
     activeShelfVersion: null,
     setActiveShelfVersion: () => {},
+    // Document tree defaults
+    documents: {},
+    activeDocument: null,
+    setActiveDocument: () => {},
+    documentEditor: null,
+    updateDocumentEditor: () => {},
 };
 
 export const ProjectContext = createContext<ProjectContextType>(defaultContextValue);
@@ -378,6 +392,14 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         versionId: string;
     } | null>(null);
 
+    // Document-tree state
+    const [documents, setDocuments] = useState<Record<string, DocumentNode>>({});
+    const [activeDocument, setActiveDocument] = useState<{ docId: string; type: "editor" | "board" } | null>(
+        null,
+    );
+    const [documentEditor, setDocumentEditor] = useState<Editor | null>(null);
+    const updateDocumentEditor = useCallback((editor: Editor | null) => setDocumentEditor(editor), []);
+
     // Create repository instance when ydoc is available (dynamically imported)
     useEffect(() => {
         if (!ydoc) {
@@ -632,6 +654,12 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setShelfEntries(entries);
         });
 
+        // Observe document-tree changes
+        setDocuments(repository.documents);
+        const unsubscribeDocuments = repository.observeDocuments((docs) => {
+            setDocuments(docs);
+        });
+
         return () => {
             repository.unregisterScreenplayCallback(recomputeFromScreenplay);
             unsubscribeLayout();
@@ -642,6 +670,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             unsubscribeScenes();
             unsubscribeMetadata();
             unsubscribeShelf();
+            unsubscribeDocuments();
         };
     }, [repository, updateCharacters, updateLocations, updateScenes, updateScreenplay]);
 
@@ -947,6 +976,11 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             shelfEntries,
             activeShelfVersion,
             setActiveShelfVersion,
+            documents,
+            activeDocument,
+            setActiveDocument,
+            documentEditor,
+            updateDocumentEditor,
         }),
         [
             project,
@@ -1021,6 +1055,11 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             shelfEntries,
             activeShelfVersion,
             setActiveShelfVersion,
+            documents,
+            activeDocument,
+            setActiveDocument,
+            documentEditor,
+            updateDocumentEditor,
         ],
     );
 
diff --git a/src/context/ViewContext.tsx b/src/context/ViewContext.tsx
index 4184b4b0..58375b79 100644
--- a/src/context/ViewContext.tsx
+++ b/src/context/ViewContext.tsx
@@ -2,7 +2,7 @@
 
 import { createContext, useCallback, useContext, useMemo, useState, ReactNode } from "react";
 
-export type PanelType = "screenplay" | "board" | "statistics" | "title" | "draft";
+export type PanelType = "screenplay" | "board" | "statistics" | "title" | "draft" | "document";
 export type SplitSide = "primary" | "secondary";
 
 interface ViewContextType {
diff --git a/src/lib/adapters/screenplay-adapter.ts b/src/lib/adapters/screenplay-adapter.ts
index 432f0ce3..9c74bc55 100644
--- a/src/lib/adapters/screenplay-adapter.ts
+++ b/src/lib/adapters/screenplay-adapter.ts
@@ -2,7 +2,7 @@ import FileSaver from "file-saver";
 import { isTauri } from "@tauri-apps/api/core";
 import { replaceScreenplay } from "../screenplay/editor";
 import { Editor } from "@tiptap/react";
-import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState } from "../project/project-state";
+import { LayoutData, ProjectData, ProjectMetadata, ProjectState } from "../project/project-state";
 import { ProjectRepository } from "../project/project-repository";
 
 export type BaseExportOptions = {
@@ -108,14 +108,6 @@ export abstract class ProjectAdapter<TExportOptions extends BaseExportOptions =
                         });
                     }
 
-                    if (project.board) {
-                        const boardMap = ydoc.board();
-                        boardMap.clear();
-                        Object.entries(project.board).forEach(([key, value]) => {
-                            boardMap.set(key as keyof BoardData, value);
-                        });
-                    }
-
                     if (project.layout) {
                         const layoutMap = ydoc.layout();
                         Object.entries(project.layout).forEach(([key, value]) => {
diff --git a/src/lib/adapters/scriptio/scriptio-adapter.ts b/src/lib/adapters/scriptio/scriptio-adapter.ts
index fbb61d66..474ef582 100644
--- a/src/lib/adapters/scriptio/scriptio-adapter.ts
+++ b/src/lib/adapters/scriptio/scriptio-adapter.ts
@@ -1,4 +1,4 @@
-import { BoardData, LayoutData, ProductionData, ProjectData, ProjectMetadata, ProjectState, screenplayOf, titlepageOf } from "@src/lib/project/project-state";
+import { LayoutData, ProductionData, ProjectData, ProjectMetadata, ProjectState, screenplayOf, titlepageOf } from "@src/lib/project/project-state";
 import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { replaceScreenplay } from "../../screenplay/editor";
 import { Editor } from "@tiptap/react";
@@ -78,7 +78,6 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                 scenes: project.scenes().toJSON(),
                 pages: project.pages().toJSON(),
                 locations: project.locations().toJSON(),
-                board: project.board().toJSON() as BoardData,
                 layout: project.layout().toJSON() as LayoutData,
                 production: project.production().toJSON() as ProductionData,
                 comments: project.comments().toJSON(),
@@ -130,7 +129,6 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                 scenes: tmpDoc.scenes().toJSON(),
                 pages: tmpDoc.pages().toJSON(),
                 locations: tmpDoc.locations().toJSON(),
-                board: tmpDoc.board().toJSON() as BoardData,
                 layout: tmpDoc.layout().toJSON() as LayoutData,
                 production: tmpDoc.production().toJSON() as ProductionData,
                 comments: tmpDoc.comments().toJSON(),
@@ -173,7 +171,6 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
                     ydoc.characters().clear();
                     ydoc.scenes().clear();
                     ydoc.locations().clear();
-                    ydoc.board().clear();
                     ydoc.layout().clear();
                     ydoc.production().clear();
                     ydoc.comments().clear();
diff --git a/src/lib/document-tree/document-tree-config.ts b/src/lib/document-tree/document-tree-config.ts
new file mode 100644
index 00000000..9b1f5a0c
--- /dev/null
+++ b/src/lib/document-tree/document-tree-config.ts
@@ -0,0 +1,32 @@
+import { DocumentEditorConfig } from "../editor/document-editor-config";
+import { BASE_EXTENSIONS } from "../screenplay/editor";
+
+/**
+ * Editor config for a document-tree `editor` node. Mirrors the shelf editor
+ * config but binds to the node's own `documentFragment(docId)` so each
+ * document edits its own isolated Y.XmlFragment.
+ */
+export function createDocumentTreeConfig(docId: string): DocumentEditorConfig {
+    return {
+        type: "screenplay",
+        baseExtensions: BASE_EXTENSIONS,
+        getFragment: (s) => s.documentFragment(docId),
+        getCommentsMap: () => null,
+        features: {
+            comments: false,
+            shelving: false,
+            characterHighlights: false,
+            searchHighlights: false,
+            sceneBookmarks: false,
+            sceneLocking: false,
+            nodeIdDedup: true,
+            suggestions: false,
+            orphanPrevention: false,
+            keybinds: false,
+            fountain: false,
+            contd: false,
+            spellcheck: false,
+            paginationMode: "screenplay",
+        },
+    };
+}
diff --git a/src/lib/import/import-project.ts b/src/lib/import/import-project.ts
index 97f4f177..2bdf31b3 100644
--- a/src/lib/import/import-project.ts
+++ b/src/lib/import/import-project.ts
@@ -3,7 +3,7 @@
  * Creates remote projects for logged-in users, local projects for offline/desktop.
  */
 
-import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState } from "@src/lib/project/project-state";
+import { LayoutData, ProjectData, ProjectMetadata, ProjectState } from "@src/lib/project/project-state";
 import { CURRENT_PROJECT_VERSION } from "@src/lib/project/migrations/project-migrations";
 import { getAdapterByFilename } from "@src/lib/adapters/registry";
 import { createCachedProject, createCachedProjectWithId } from "@src/lib/persistence/storage-provider/local-persistence";
@@ -120,11 +120,6 @@ async function createLocalYjsDocument(projectId: string, projectData: ProjectDat
             Object.entries(projectData.scenes).forEach(([key, value]) => scenesMap.set(key, value));
         }
 
-        if (projectData.board) {
-            const boardMap = ydoc.board();
-            Object.entries(projectData.board).forEach(([key, value]) => boardMap.set(key as keyof BoardData, value));
-        }
-
         if (projectData.layout) {
             const layoutMap = ydoc.layout();
             Object.entries(projectData.layout).forEach(([key, value]) => layoutMap.set(key as keyof LayoutData, value));
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index c9456705..59477a48 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -168,6 +168,32 @@ export type BoardData = {
     arrows: string;
 };
 
+// -------------------------------- //
+//        DOCUMENT TREE             //
+// -------------------------------- //
+
+/** Kinds of nodes the user can create in the document hierarchy. */
+export type DocumentNodeType = "folder" | "editor" | "board";
+
+/**
+ * A node in the project's document hierarchy. The tree is stored flat in the
+ * `documents` Y.Map keyed by `id`; hierarchy is reconstructed from `parentId`,
+ * siblings ordered by ascending `order` (fractional float so moves never
+ * rewrite neighbours).
+ *
+ * - `editor` nodes own a dedicated Y.XmlFragment (`doc_<id>`).
+ * - `board` nodes own a dedicated board data map (`board_<id>`), read via
+ *   `boardData(id)`. Projects can hold any number of boards.
+ * - `folder` nodes just group children.
+ */
+export type DocumentNode = {
+    id: string;
+    type: DocumentNodeType;
+    title: string;
+    parentId: string | null;
+    order: number;
+};
+
 // -------------------------------- //
 //          PROJECT DATA            //
 // -------------------------------- //
@@ -180,7 +206,7 @@ export type ProjectData = {
     pages: Record<string, PersistentPage>;
     locations: Record<string, LocationItem>;
     metadata: ProjectMetadata;
-    board: BoardData;
+    documents?: Record<string, DocumentNode>;
     layout: LayoutData;
     production: ProductionData;
     comments?: Record<string, Comment>;
@@ -216,7 +242,7 @@ export class ProjectState extends Y.Doc {
         PAGES: "pages",
         LOCATIONS: "locations",
         METADATA: "metadata",
-        BOARD: "board",
+        DOCUMENTS: "documents",
         LAYOUT: "layout",
         PRODUCTION: "production",
         COMMENTS: "comments",
@@ -262,8 +288,19 @@ export class ProjectState extends Y.Doc {
         return this.getMap(this.KEYS.PAGES);
     }
 
-    board(): TypedMap<BoardData> {
-        return this.getMap(this.KEYS.BOARD) as unknown as TypedMap<BoardData>;
+    /** Document-hierarchy nodes (folders, editor docs, boards) keyed by node id. */
+    documents(): Y.Map<DocumentNode> {
+        return this.getMap(this.KEYS.DOCUMENTS);
+    }
+
+    /** Content fragment for an `editor` document node. */
+    documentFragment(docId: string): Y.XmlFragment {
+        return this.getXmlFragment(`doc_${docId}`);
+    }
+
+    /** Per-board data map (cards + arrows) for a `board` document node. */
+    boardData(docId: string): TypedMap<BoardData> {
+        return this.getMap(`board_${docId}`) as unknown as TypedMap<BoardData>;
     }
 
     layout(): TypedMap<LayoutData> {
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index e484ee36..abededee 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -13,6 +13,7 @@ import {
     ShelfEntry,
     ShelfEntryType,
     ShelfVersionMeta,
+    DocumentNode,
     screenplayOf,
 } from "./project-state";
 import { CharacterMap } from "../screenplay/characters";
@@ -707,6 +708,146 @@ export class ProjectRepository {
         map.observe(observer);
         return () => map.unobserve(observer);
     }
+
+    // -------------------------------- //
+    //          DOCUMENT TREE           //
+    // -------------------------------- //
+
+    /** All document-hierarchy nodes keyed by node id. */
+    get documents(): Record<string, DocumentNode> {
+        return this.ydoc.documents().toJSON() as Record<string, DocumentNode>;
+    }
+
+    getDocumentNode(id: string): DocumentNode | undefined {
+        return this.ydoc.documents().get(id) as DocumentNode | undefined;
+    }
+
+    observeDocuments(callback: (documents: Record<string, DocumentNode>) => void): () => void {
+        const map = this.ydoc.documents();
+        const observer = () => callback(map.toJSON() as Record<string, DocumentNode>);
+        map.observe(observer);
+        return () => map.unobserve(observer);
+    }
+
+    /** Append position = one past the greatest order among the parent's children. */
+    private nextDocumentOrder(parentId: string | null): number {
+        let max = -1;
+        this.ydoc.documents().forEach((node) => {
+            if (node.parentId === parentId && node.order > max) max = node.order;
+        });
+        return max + 1;
+    }
+
+    /** Is `ancestorId` an ancestor of `nodeId`? Used to block cyclic moves. */
+    private isDocumentAncestor(nodeId: string, ancestorId: string): boolean {
+        const map = this.ydoc.documents();
+        const seen = new Set<string>();
+        let cur = map.get(nodeId) as DocumentNode | undefined;
+        while (cur && cur.parentId) {
+            if (seen.has(cur.id)) break;
+            seen.add(cur.id);
+            if (cur.parentId === ancestorId) return true;
+            cur = map.get(cur.parentId) as DocumentNode | undefined;
+        }
+        return false;
+    }
+
+    createFolder(title: string, parentId: string | null = null): string {
+        if (this.guardWrite("createFolder")) return "";
+        const id = uuidv7();
+        this.ydoc
+            .documents()
+            .set(id, { id, type: "folder", title, parentId, order: this.nextDocumentOrder(parentId) });
+        return id;
+    }
+
+    /**
+     * Create an `editor` document node. Its content lives in a dedicated
+     * Y.XmlFragment (`doc_<id>`) which is left empty — an empty fragment binds
+     * to a fresh screenplay editor exactly like a brand-new project's main
+     * screenplay, so no seeding is required.
+     */
+    createEditorDocument(title: string, parentId: string | null = null): string {
+        if (this.guardWrite("createEditorDocument")) return "";
+        const id = uuidv7();
+        this.ydoc
+            .documents()
+            .set(id, { id, type: "editor", title, parentId, order: this.nextDocumentOrder(parentId) });
+        return id;
+    }
+
+    /**
+     * Create a `board` document node. Each board owns a dedicated data map
+     * (`board_<id>`, read via `boardData(id)`); a project may hold any number
+     * of boards. Returns the new board node id.
+     */
+    createBoardDocument(title: string, parentId: string | null = null): string {
+        if (this.guardWrite("createBoardDocument")) return "";
+        const id = uuidv7();
+        this.ydoc
+            .documents()
+            .set(id, { id, type: "board", title, parentId, order: this.nextDocumentOrder(parentId) });
+        return id;
+    }
+
+    renameDocument(id: string, title: string): void {
+        if (this.guardWrite("renameDocument")) return;
+        const map = this.ydoc.documents();
+        const node = map.get(id) as DocumentNode | undefined;
+        if (!node) return;
+        map.set(id, { ...node, title });
+    }
+
+    /**
+     * Move a node under a new parent at the given fractional order. No-ops on a
+     * move that would create a cycle (into itself or one of its descendants).
+     */
+    moveDocument(id: string, newParentId: string | null, order: number): void {
+        if (this.guardWrite("moveDocument")) return;
+        const map = this.ydoc.documents();
+        const node = map.get(id) as DocumentNode | undefined;
+        if (!node) return;
+        if (newParentId !== null && (newParentId === id || this.isDocumentAncestor(newParentId, id))) {
+            return;
+        }
+        map.set(id, { ...node, parentId: newParentId, order });
+    }
+
+    /**
+     * Delete a node and all its descendants in one transaction. Editor nodes
+     * have their content fragment cleared; board nodes have their per-board
+     * data map cleared.
+     */
+    deleteDocument(id: string): void {
+        if (this.guardWrite("deleteDocument")) return;
+        const map = this.ydoc.documents();
+        if (!map.has(id)) return;
+
+        const all = map.toJSON() as Record<string, DocumentNode>;
+        const toDelete: string[] = [];
+        const stack = [id];
+        while (stack.length > 0) {
+            const cur = stack.pop()!;
+            toDelete.push(cur);
+            for (const node of Object.values(all)) {
+                if (node.parentId === cur) stack.push(node.id);
+            }
+        }
+
+        this.ydoc.transact(() => {
+            for (const nid of toDelete) {
+                const node = all[nid];
+                if (!node) continue;
+                if (node.type === "editor") {
+                    const frag = this.ydoc.documentFragment(nid);
+                    if (frag.length > 0) frag.delete(0, frag.length);
+                } else if (node.type === "board") {
+                    this.ydoc.boardData(nid).clear();
+                }
+                map.delete(nid);
+            }
+        });
+    }
 }
 
 /**
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index aadb2a33..9992d9c7 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -38,6 +38,8 @@ export type {
     BoardCardData,
     BoardArrowData,
     BoardData,
+    DocumentNode,
+    DocumentNodeType,
     ProjectData,
     TypedMap,
 } from "./project-doc";
diff --git a/src/tests/project/document-tree.test.ts b/src/tests/project/document-tree.test.ts
new file mode 100644
index 00000000..0b269b87
--- /dev/null
+++ b/src/tests/project/document-tree.test.ts
@@ -0,0 +1,113 @@
+import { describe, expect, it } from "vitest";
+import * as Y from "yjs";
+
+import { ProjectState, DocumentNode } from "@src/lib/project/project-state";
+import { createProjectRepository } from "@src/lib/project/project-repository";
+
+function makeRepo() {
+    const ydoc = new ProjectState();
+    const repo = createProjectRepository(ydoc)!;
+    return { ydoc, repo };
+}
+
+describe("document tree repository", () => {
+    it("creates nested folders and an editor document", () => {
+        const { repo } = makeRepo();
+        const f1 = repo.createFolder("Act One");
+        const f2 = repo.createFolder("Sequence", f1);
+        const d1 = repo.createEditorDocument("Outline", f2);
+
+        const docs = repo.documents;
+        expect(docs[f1].parentId).toBe(null);
+        expect(docs[f2].parentId).toBe(f1);
+        expect(docs[d1].parentId).toBe(f2);
+        expect(docs[d1].type).toBe("editor");
+        expect(docs[f1].type).toBe("folder");
+    });
+
+    it("appends siblings in ascending order", () => {
+        const { repo } = makeRepo();
+        const a = repo.createEditorDocument("A");
+        const b = repo.createEditorDocument("B");
+        const c = repo.createEditorDocument("C");
+        const docs = repo.documents;
+        expect(docs[a].order).toBeLessThan(docs[b].order);
+        expect(docs[b].order).toBeLessThan(docs[c].order);
+    });
+
+    it("moveDocument reparents, reorders, and blocks cyclic moves", () => {
+        const { repo } = makeRepo();
+        const parent = repo.createFolder("P");
+        const child = repo.createFolder("C", parent);
+        const doc = repo.createEditorDocument("D");
+
+        repo.moveDocument(doc, parent, 5);
+        expect(repo.documents[doc].parentId).toBe(parent);
+        expect(repo.documents[doc].order).toBe(5);
+
+        // Moving a folder into one of its own descendants must be a no-op.
+        repo.moveDocument(parent, child, 0);
+        expect(repo.documents[parent].parentId).toBe(null);
+    });
+
+    it("renames a node", () => {
+        const { repo } = makeRepo();
+        const id = repo.createFolder("Old");
+        repo.renameDocument(id, "New");
+        expect(repo.documents[id].title).toBe("New");
+    });
+
+    it("deletes a folder subtree and clears editor fragments", () => {
+        const { ydoc, repo } = makeRepo();
+        const folder = repo.createFolder("F");
+        const sub = repo.createFolder("Sub", folder);
+        const doc = repo.createEditorDocument("D", sub);
+
+        // Give the editor document some content in its fragment.
+        const frag = ydoc.documentFragment(doc);
+        frag.insert(0, [new Y.XmlElement("action")]);
+        expect(frag.length).toBe(1);
+
+        repo.deleteDocument(folder);
+        const docs = repo.documents;
+        expect(docs[folder]).toBeUndefined();
+        expect(docs[sub]).toBeUndefined();
+        expect(docs[doc]).toBeUndefined();
+        expect(ydoc.documentFragment(doc).length).toBe(0);
+    });
+
+    it("createBoardDocument creates independent boards", () => {
+        const { repo } = makeRepo();
+        const b1 = repo.createBoardDocument("Board A");
+        const b2 = repo.createBoardDocument("Board B");
+        expect(b1).not.toBe(b2);
+        const boards = Object.values(repo.documents).filter((n: DocumentNode) => n.type === "board");
+        expect(boards).toHaveLength(2);
+    });
+
+    it("deleting a board node clears its own board data map", () => {
+        const { ydoc, repo } = makeRepo();
+        const b1 = repo.createBoardDocument("Board A");
+        const b2 = repo.createBoardDocument("Board B");
+        ydoc.boardData(b1).set("cards", JSON.stringify([{ id: "x" }]));
+        ydoc.boardData(b2).set("cards", JSON.stringify([{ id: "y" }]));
+
+        repo.deleteDocument(b1);
+        expect(repo.documents[b1]).toBeUndefined();
+        expect(ydoc.boardData(b1).get("cards")).toBeUndefined();
+        // The other board is untouched.
+        expect(repo.documents[b2]).toBeDefined();
+        expect(ydoc.boardData(b2).get("cards")).toBe(JSON.stringify([{ id: "y" }]));
+    });
+
+    it("observeDocuments fires on changes", () => {
+        const { repo } = makeRepo();
+        let received: Record<string, DocumentNode> = {};
+        const unsubscribe = repo.observeDocuments((docs) => {
+            received = docs;
+        });
+        const id = repo.createFolder("Watched");
+        expect(received[id]?.title).toBe("Watched");
+        unsubscribe();
+    });
+});

From c3d1df5adc6855ee0584ec34a7081fced65277f3 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Tue, 9 Jun 2026 02:23:26 +0200
Subject: [PATCH 63/76] improved document and view management, added outline
 feature

---
 components/board/BoardCanvas.tsx              |  57 +++-
 components/editor/BoardPanel.tsx              |  17 +-
 components/editor/DocumentEditorPanel.tsx     |  22 +-
 components/editor/TreeDocumentPanel.tsx       |  13 +-
 .../editor/outline/OutlineItem.module.css     | 139 ++++++++
 components/editor/outline/OutlineItem.tsx     | 149 +++++++++
 components/editor/outline/OutlinePanel.tsx    |  37 +++
 .../editor/outline/OutlineView.module.css     |  28 ++
 components/editor/outline/OutlineView.tsx     | 314 ++++++++++++++++++
 .../editor/sidebar/ContextMenu.module.css     |  29 ++
 components/editor/sidebar/ContextMenu.tsx     |  47 ++-
 .../sidebar/DocumentTreeItem.module.css       |  22 +-
 .../editor/sidebar/DocumentTreeItem.tsx       | 156 ++++-----
 .../sidebar/DocumentTreeSidebarView.tsx       | 219 ++++++++----
 .../EditorSidebarNavigation.module.css        |  39 ---
 .../editor/sidebar/SidebarItem.module.css     |  12 +
 .../editor/sidebar/SidebarSceneItem.tsx       |   4 +-
 components/navbar/ViewOptionsDropdown.tsx     |  20 +-
 .../project/SplitPanelContainer.module.css    |  15 +-
 components/project/SplitPanelContainer.tsx    | 174 +++++++---
 messages/de.json                              |  11 +
 messages/en.json                              |  11 +
 messages/es.json                              |  11 +
 messages/fr.json                              |  11 +
 messages/ja.json                              |  11 +
 messages/ko.json                              |  11 +
 messages/pl.json                              |  11 +
 messages/zh.json                              |  11 +
 src/context/ProjectContext.tsx                |  40 ++-
 src/context/ViewContext.tsx                   | 115 ++++---
 src/lib/document-tree/document-tree-config.ts |   1 +
 src/lib/editor/document-editor-config.ts      |  10 +-
 src/lib/project/project-doc.ts                |  50 +++
 src/lib/project/project-repository.ts         | 133 +++++++-
 src/lib/project/project-state.ts              |   3 +
 src/lib/utils/colors.ts                       |  16 +
 36 files changed, 1633 insertions(+), 336 deletions(-)
 create mode 100644 components/editor/outline/OutlineItem.module.css
 create mode 100644 components/editor/outline/OutlineItem.tsx
 create mode 100644 components/editor/outline/OutlinePanel.tsx
 create mode 100644 components/editor/outline/OutlineView.module.css
 create mode 100644 components/editor/outline/OutlineView.tsx
 create mode 100644 src/lib/utils/colors.ts

diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index e7a660e3..9927b30d 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -6,25 +6,14 @@ import { BoardCardData, BoardArrowData } from "@src/lib/project/project-state";
 import BoardCard from "./BoardCard";
 import styles from "./BoardCanvas.module.css";
 import { v7 as uuidv7 } from "uuid";
-import { Trash2, Plus, Minus, Copy } from "lucide-react";
+import { Trash2, Plus, Minus, Copy, ListTree } from "lucide-react";
 import { useTranslations } from "next-intl";
+import { DEFAULT_ITEM_COLORS } from "@src/lib/utils/colors";
 
 const GRID_SIZE = 20;
 const MIN_SCALE = 0.25;
 const MAX_SCALE = 2;
 
-const DEFAULT_CARD_COLORS = [
-    "#ef4444",
-    "#f97316",
-    "#eab308",
-    "#22c55e",
-    "#06b6d4",
-    "#3b82f6",
-    "#8b5cf6",
-    "#ec4899",
-    "#6b7280",
-];
-
 interface CardContextMenuState {
     position: { x: number; y: number };
     card: BoardCardData;
@@ -36,7 +25,8 @@ interface ArrowContextMenuState {
 }
 
 const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }) => {
-    const { repository, isYjsReady, isReadOnly } = useContext(ProjectContext);
+    const { repository, isYjsReady, isReadOnly, boardFocusCardId, setBoardFocusCardId } =
+        useContext(ProjectContext);
     const t = useTranslations("board");
     const projectState = repository?.getState();
     const containerRef = useRef<HTMLDivElement>(null);
@@ -121,6 +111,17 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         setOffset({ x: newOffsetX, y: newOffsetY });
     }, []);
 
+    // Focus a specific card when navigated to from the Outline. Waits until the
+    // board's cards have loaded and the target exists on this board, then centers
+    // on it and clears the request so it fires once.
+    useEffect(() => {
+        if (!boardFocusCardId || !isVisible) return;
+        const card = cards.find((c) => c.id === boardFocusCardId);
+        if (!card) return;
+        centerCameraOnCards([card]);
+        setBoardFocusCardId(null);
+    }, [boardFocusCardId, isVisible, cards, centerCameraOnCards, setBoardFocusCardId]);
+
     // Sync cards with Yjs
     useEffect(() => {
         if (!projectState || !isYjsReady) return;
@@ -475,7 +476,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const x = (e.clientX - rect.left - offset.x) / scale;
             const y = (e.clientY - rect.top - offset.y) / scale;
 
-            const randomColor = DEFAULT_CARD_COLORS[Math.floor(Math.random() * DEFAULT_CARD_COLORS.length)];
+            const randomColor = DEFAULT_ITEM_COLORS[Math.floor(Math.random() * DEFAULT_ITEM_COLORS.length)];
 
             const newCard: BoardCardData = {
                 id: uuidv7(),
@@ -571,6 +572,23 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         [cards, saveCards],
     );
 
+    // Send card to the Outline view
+    const handleSendToOutline = useCallback(
+        (card: BoardCardData) => {
+            repository?.addOutlineItem({
+                source: "card",
+                refDocId: docId,
+                refId: card.id,
+                title: card.title,
+                preview: card.description,
+                color: card.color,
+                parentId: null,
+            });
+            setCardContextMenu(null);
+        },
+        [repository, docId],
+    );
+
     // Context menu for card
     const handleCardContextMenu = useCallback((e: React.MouseEvent, card: BoardCardData) => {
         setCardContextMenu({
@@ -917,7 +935,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                         }}
                     >
                         <div className={styles.context_menu_colors}>
-                            {DEFAULT_CARD_COLORS.map((color) => (
+                            {DEFAULT_ITEM_COLORS.map((color) => (
                                 <button
                                     key={color}
                                     className={`${styles.context_menu_color_swatch} ${cardContextMenu.card.color === color ? styles.context_menu_color_swatch_active : ""}`}
@@ -933,6 +951,13 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                             <Copy size={16} />
                             <p className="unselectable">{t("duplicate")}</p>
                         </div>
+                        <div
+                            className={styles.context_menu_item}
+                            onClick={() => handleSendToOutline(cardContextMenu.card)}
+                        >
+                            <ListTree size={16} />
+                            <p className="unselectable">{t("sendToOutline")}</p>
+                        </div>
                         <div
                             className={styles.context_menu_item}
                             onClick={() => handleDeleteCard(cardContextMenu.card.id)}
diff --git a/components/editor/BoardPanel.tsx b/components/editor/BoardPanel.tsx
index 0424e93c..5bf8d9c6 100644
--- a/components/editor/BoardPanel.tsx
+++ b/components/editor/BoardPanel.tsx
@@ -1,8 +1,6 @@
 "use client";
 
-import { useContext } from "react";
 import { useTranslations } from "next-intl";
-import { ProjectContext } from "@src/context/ProjectContext";
 import BoardCanvas from "@components/board/BoardCanvas";
 import { LayoutDashboard } from "lucide-react";
 
@@ -20,19 +18,16 @@ const EmptyBoardState = () => {
 };
 
 /**
- * Renders the board document currently selected in the document tree. The
- * "board" panel is doc-aware: it reads `activeDocument` and mounts a fresh
- * BoardCanvas (keyed by id) for the active board, or an empty state when the
- * active document isn't a board.
+ * Renders the board bound to this panel side (`docId`). Each side carries its
+ * own docId, so two boards can be open at once. A fresh BoardCanvas is mounted
+ * per docId; an empty state shows when the side has no document.
  */
-const BoardPanel = ({ isVisible }: { isVisible: boolean }) => {
-    const { activeDocument } = useContext(ProjectContext);
-
-    if (!activeDocument || activeDocument.type !== "board") {
+const BoardPanel = ({ isVisible, docId }: { isVisible: boolean; docId: string | null }) => {
+    if (!docId) {
         return <EmptyBoardState />;
     }
 
-    return <BoardCanvas key={activeDocument.docId} docId={activeDocument.docId} isVisible={isVisible} />;
+    return <BoardCanvas key={docId} docId={docId} isVisible={isVisible} />;
 };
 
 export default BoardPanel;
diff --git a/components/editor/DocumentEditorPanel.tsx b/components/editor/DocumentEditorPanel.tsx
index 24603169..60a053a6 100644
--- a/components/editor/DocumentEditorPanel.tsx
+++ b/components/editor/DocumentEditorPanel.tsx
@@ -500,6 +500,24 @@ const DocumentEditorPanel = ({
                 }
             }
 
+            // Detect a scene heading at the caret to offer "Send to outline".
+            // Independent of `shelving` so it works in editor documents too.
+            let outlineScene: { refDocId: string; refId: string; title: string } | undefined;
+            if (config.documentId) {
+                const $pos = editor.state.doc.resolve(from);
+                if ($pos.depth >= 1) {
+                    const node = $pos.node(1);
+                    const dataId = node.attrs?.["data-id"] as string | undefined;
+                    if (node.attrs?.class === ScreenplayElement.Scene && dataId) {
+                        outlineScene = {
+                            refDocId: config.documentId,
+                            refId: dataId,
+                            title: node.textContent.toUpperCase(),
+                        };
+                    }
+                }
+            }
+
             const onAddComment = () => {
                 if (!editor) return;
                 const commentId = commentOps.addComment({
@@ -516,10 +534,10 @@ const DocumentEditorPanel = ({
             updateContextMenu({
                 type: ContextMenuType.EditorContextMenu,
                 position: { x: e.clientX, y: e.clientY },
-                typeSpecificProps: { from, to, onAddComment, spellError, nodePos, nodeClass },
+                typeSpecificProps: { from, to, onAddComment, spellError, nodePos, nodeClass, outlineScene },
             });
         },
-        [editor, updateContextMenu, commentOps, user, config.features.shelving],
+        [editor, updateContextMenu, commentOps, user, config.features.shelving, config.documentId],
     );
 
     // Clear active comment on mousedown
diff --git a/components/editor/TreeDocumentPanel.tsx b/components/editor/TreeDocumentPanel.tsx
index b0149521..bae21f7b 100644
--- a/components/editor/TreeDocumentPanel.tsx
+++ b/components/editor/TreeDocumentPanel.tsx
@@ -20,13 +20,10 @@ const EmptyDocumentState = () => {
     );
 };
 
-const TreeDocumentPanel = ({ isVisible }: { isVisible: boolean }) => {
-    const { activeDocument, updateDocumentEditor } = useContext(ProjectContext);
+const TreeDocumentPanel = ({ isVisible, docId }: { isVisible: boolean; docId: string | null }) => {
+    const { updateDocumentEditor } = useContext(ProjectContext);
 
-    const config = useMemo(() => {
-        if (!activeDocument || activeDocument.type !== "editor") return null;
-        return createDocumentTreeConfig(activeDocument.docId);
-    }, [activeDocument]);
+    const config = useMemo(() => (docId ? createDocumentTreeConfig(docId) : null), [docId]);
 
     const handleEditorCreated = useCallback(
         (editor: import("@tiptap/react").Editor | null) => {
@@ -35,13 +32,13 @@ const TreeDocumentPanel = ({ isVisible }: { isVisible: boolean }) => {
         [updateDocumentEditor],
     );
 
-    if (!config || !activeDocument || activeDocument.type !== "editor") {
+    if (!config || !docId) {
         return <EmptyDocumentState />;
     }
 
     return (
         <DocumentEditorPanel
-            key={activeDocument.docId}
+            key={docId}
             config={config}
             isVisible={isVisible}
             onEditorCreated={handleEditorCreated}
diff --git a/components/editor/outline/OutlineItem.module.css b/components/editor/outline/OutlineItem.module.css
new file mode 100644
index 00000000..cceb06b9
--- /dev/null
+++ b/components/editor/outline/OutlineItem.module.css
@@ -0,0 +1,139 @@
+.block {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    align-items: stretch;
+    gap: 10px;
+    box-sizing: border-box;
+    padding: 10px 12px;
+    border: 1px solid var(--separator);
+    border-radius: 8px;
+    background-color: var(--main-bg);
+    cursor: pointer;
+    transition:
+        background-color 0.12s ease,
+        border-color 0.12s ease;
+    overflow: hidden;
+}
+
+.block:hover {
+    background-color: var(--editor-sidebar-hover);
+}
+
+.block_missing {
+    opacity: 0.6;
+}
+
+/* Drop indicators */
+.block_drop_into {
+    background-color: var(--editor-style-bg-hover);
+    box-shadow: inset 0 0 0 2px var(--tertiary-hover);
+}
+
+.block_drop_before::before,
+.block_drop_after::after {
+    content: "";
+    position: absolute;
+    left: 4px;
+    right: 4px;
+    height: 2px;
+    background-color: var(--tertiary-hover);
+    pointer-events: none;
+}
+
+.block_drop_before::before {
+    top: -4px;
+}
+
+.block_drop_after::after {
+    bottom: -4px;
+}
+
+.color_bar {
+    flex-shrink: 0;
+    width: 4px;
+    border-radius: 2px;
+    align-self: stretch;
+}
+
+.body {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 3px;
+}
+
+.title_row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 8px;
+    min-width: 0;
+}
+
+.type_icon {
+    flex-shrink: 0;
+    color: var(--secondary-text);
+}
+
+.title {
+    flex: 1;
+    min-width: 0;
+    font-size: 13px;
+    font-weight: 600;
+    color: var(--primary-text);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.unlinked {
+    flex-shrink: 0;
+    display: inline-flex;
+    align-items: center;
+    gap: 3px;
+    padding: 1px 6px;
+    border-radius: 10px;
+    font-size: 10px;
+    font-weight: 500;
+    text-transform: uppercase;
+    letter-spacing: 0.03em;
+    color: var(--secondary-text);
+    background-color: var(--editor-style-bg-hover);
+}
+
+.remove_btn {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 3px;
+    border: none;
+    border-radius: 4px;
+    background: none;
+    color: var(--secondary-text);
+    cursor: pointer;
+    opacity: 0;
+    transition:
+        opacity 0.12s ease,
+        background-color 0.12s ease;
+}
+
+.block:hover .remove_btn {
+    opacity: 1;
+}
+
+.remove_btn:hover {
+    background-color: var(--editor-style-bg-hover);
+    color: var(--primary-text);
+}
+
+.preview {
+    margin: 0;
+    font-size: 12px;
+    color: var(--secondary-text);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
diff --git a/components/editor/outline/OutlineItem.tsx b/components/editor/outline/OutlineItem.tsx
new file mode 100644
index 00000000..41255365
--- /dev/null
+++ b/components/editor/outline/OutlineItem.tsx
@@ -0,0 +1,149 @@
+"use client";
+
+import { useCallback } from "react";
+import { useTranslations } from "next-intl";
+import { OutlineItem as OutlineItemType } from "@src/lib/project/project-state";
+import { join } from "@src/lib/utils/misc";
+import { Film, Unlink, X } from "lucide-react";
+import type { ResolvedOutline } from "./OutlineView";
+
+import styles from "./OutlineItem.module.css";
+
+export type DropPosition = "into" | "before" | "after";
+
+export interface OutlineItemProps {
+    node: OutlineItemType;
+    depth: number;
+    childrenOf: (parentId: string | null) => OutlineItemType[];
+    resolved: Record<string, ResolvedOutline>;
+    onNavigate: (node: OutlineItemType) => void;
+    onRemove: (id: string) => void;
+    // Drag & drop
+    draggingId: string | null;
+    dropTarget: { id: string; pos: DropPosition } | null;
+    onDragStart: (id: string) => void;
+    onDragOverNode: (id: string, pos: DropPosition) => void;
+    onDropNode: (id: string) => void;
+    onDragEnd: () => void;
+}
+
+const INDENT = 36;
+
+const OutlineItem = ({
+    node,
+    depth,
+    childrenOf,
+    resolved,
+    onNavigate,
+    onRemove,
+    draggingId,
+    dropTarget,
+    onDragStart,
+    onDragOverNode,
+    onDropNode,
+    onDragEnd,
+}: OutlineItemProps) => {
+    const t = useTranslations("outline");
+
+    const r = resolved[node.id] ?? { title: node.title, preview: node.preview, color: node.color, missing: true };
+    const isCard = node.source === "card";
+    const children = childrenOf(node.id);
+
+    // Every block can nest children, so use folder-style drop thresholds:
+    // top 25% = before, middle 50% = into, bottom 25% = after.
+    const handleDragOver = useCallback(
+        (e: React.DragEvent) => {
+            if (!draggingId || draggingId === node.id) return;
+            e.preventDefault();
+            e.stopPropagation();
+            const rect = e.currentTarget.getBoundingClientRect();
+            const y = e.clientY - rect.top;
+            let pos: DropPosition;
+            if (y < rect.height * 0.25) pos = "before";
+            else if (y > rect.height * 0.75) pos = "after";
+            else pos = "into";
+            onDragOverNode(node.id, pos);
+        },
+        [draggingId, node.id, onDragOverNode],
+    );
+
+    const isDropTarget = dropTarget?.id === node.id;
+    const blockClass = join(
+        styles.block,
+        r.missing ? styles.block_missing : "",
+        isDropTarget && dropTarget?.pos === "into" ? styles.block_drop_into : "",
+        isDropTarget && dropTarget?.pos === "before" ? styles.block_drop_before : "",
+        isDropTarget && dropTarget?.pos === "after" ? styles.block_drop_after : "",
+    );
+
+    return (
+        <>
+            <div style={{ paddingLeft: depth * INDENT }}>
+                <div
+                    className={blockClass}
+                    style={{ opacity: draggingId === node.id ? 0.4 : 1 }}
+                    onClick={() => onNavigate(node)}
+                    draggable
+                    onDragStart={(e) => {
+                        e.dataTransfer.effectAllowed = "move";
+                        onDragStart(node.id);
+                    }}
+                    onDragOver={handleDragOver}
+                    onDrop={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        onDropNode(node.id);
+                    }}
+                    onDragEnd={onDragEnd}
+                >
+                    {isCard && node.color && (
+                        <span className={styles.color_bar} style={{ backgroundColor: node.color }} />
+                    )}
+                    <div className={styles.body}>
+                        <div className={styles.title_row}>
+                            {!isCard && <Film size={14} className={styles.type_icon} />}
+                            <span className={join(styles.title, "unselectable")}>{r.title || t("untitled")}</span>
+                            {r.missing && (
+                                <span className={styles.unlinked} title={t("unlinkedHint")}>
+                                    <Unlink size={11} />
+                                    {t("unlinked")}
+                                </span>
+                            )}
+                            <button
+                                className={styles.remove_btn}
+                                title={t("removeFromOutline")}
+                                onClick={(e) => {
+                                    e.stopPropagation();
+                                    onRemove(node.id);
+                                }}
+                            >
+                                <X size={14} />
+                            </button>
+                        </div>
+                        {r.preview && <p className={join(styles.preview, "unselectable")}>{r.preview}</p>}
+                    </div>
+                </div>
+            </div>
+
+            {children.map((child) => (
+                <OutlineItem
+                    key={child.id}
+                    node={child}
+                    depth={depth + 1}
+                    childrenOf={childrenOf}
+                    resolved={resolved}
+                    onNavigate={onNavigate}
+                    onRemove={onRemove}
+                    draggingId={draggingId}
+                    dropTarget={dropTarget}
+                    onDragStart={onDragStart}
+                    onDragOverNode={onDragOverNode}
+                    onDropNode={onDropNode}
+                    onDragEnd={onDragEnd}
+                />
+            ))}
+        </>
+    );
+};
+
+export default OutlineItem;
diff --git a/components/editor/outline/OutlinePanel.tsx b/components/editor/outline/OutlinePanel.tsx
new file mode 100644
index 00000000..fdd99f74
--- /dev/null
+++ b/components/editor/outline/OutlinePanel.tsx
@@ -0,0 +1,37 @@
+"use client";
+
+import { useContext } from "react";
+import { useTranslations } from "next-intl";
+import { ProjectContext } from "@src/context/ProjectContext";
+import OutlineView from "./OutlineView";
+import { ListTree } from "lucide-react";
+
+import styles from "../EditorPanel.module.css";
+
+const EmptyOutlineState = () => {
+    const t = useTranslations("outline");
+
+    return (
+        <div className={styles.editor_panel} style={{ alignItems: "center", justifyContent: "center" }}>
+            <ListTree size={32} style={{ opacity: 0.3, marginBottom: 12 }} />
+            <p style={{ opacity: 0.5, fontSize: 13, maxWidth: 280, textAlign: "center" }}>{t("empty")}</p>
+        </div>
+    );
+};
+
+/**
+ * The Outline view: a project-wide, ordered, nestable list of blocks that
+ * reference scene headings and board cards. Writers reorder/indent blocks to
+ * sequence their story beats. Shows an empty state until something is sent here.
+ */
+const OutlinePanel = ({ isVisible }: { isVisible: boolean }) => {
+    const { outline } = useContext(ProjectContext);
+
+    if (Object.keys(outline).length === 0) {
+        return <EmptyOutlineState />;
+    }
+
+    return <OutlineView isVisible={isVisible} />;
+};
+
+export default OutlinePanel;
diff --git a/components/editor/outline/OutlineView.module.css b/components/editor/outline/OutlineView.module.css
new file mode 100644
index 00000000..33758909
--- /dev/null
+++ b/components/editor/outline/OutlineView.module.css
@@ -0,0 +1,28 @@
+.outline_panel {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-height: 0;
+    background-color: var(--main-bg);
+}
+
+.outline_scroll {
+    position: relative;
+    flex: 1;
+    min-height: 0;
+    overflow-y: auto;
+    overflow-x: clip;
+    scrollbar-gutter: stable;
+}
+
+.outline_list {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    width: 100%;
+    max-width: 760px;
+    margin: 0 auto;
+    padding: 16px;
+    box-sizing: border-box;
+}
diff --git a/components/editor/outline/OutlineView.tsx b/components/editor/outline/OutlineView.tsx
new file mode 100644
index 00000000..ea245791
--- /dev/null
+++ b/components/editor/outline/OutlineView.tsx
@@ -0,0 +1,314 @@
+"use client";
+
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { ProjectContext } from "@src/context/ProjectContext";
+import { SplitSide, useViewContext } from "@src/context/ViewContext";
+import { BoardCardData, MAIN_SCREENPLAY_REF, OutlineItem } from "@src/lib/project/project-state";
+import { TransientScene } from "@src/lib/screenplay/scenes";
+import { focusOnPosition } from "@src/lib/screenplay/editor";
+import OutlineBlock, { DropPosition } from "./OutlineItem";
+
+import styles from "./OutlineView.module.css";
+
+/** Live-resolved display data for an outline block. */
+export type ResolvedOutline = {
+    title: string;
+    preview: string;
+    color?: string;
+    /** True when the referenced source element no longer exists. */
+    missing: boolean;
+    /** Editor position of a resolved scene (for navigation). */
+    position?: number;
+};
+
+const PREVIEW_MAX = 80;
+
+const truncate = (text: string) => {
+    const clean = text.replace(/\s+/g, " ").trim();
+    return clean.length > PREVIEW_MAX ? clean.slice(0, PREVIEW_MAX).trimEnd() + "…" : clean;
+};
+
+const parseCards = (raw: unknown): BoardCardData[] => {
+    if (!raw) return [];
+    try {
+        return typeof raw === "string" ? (JSON.parse(raw) as BoardCardData[]) : (raw as BoardCardData[]);
+    } catch {
+        return [];
+    }
+};
+
+const OutlineView = ({ isVisible }: { isVisible: boolean }) => {
+    const { outline, repository, scenes, editor, documentEditor, setBoardFocusCardId } =
+        useContext(ProjectContext);
+    const { isSplit, primaryPanel, setSidePanel, setFocusedSide, setSideDocument } = useViewContext();
+    const projectState = repository?.getState();
+
+    const [draggingId, setDraggingId] = useState<string | null>(null);
+    const [dropTarget, setDropTarget] = useState<{ id: string; pos: DropPosition } | null>(null);
+
+    // Children of a parent (null = root), sorted by fractional `order`.
+    const childrenOf = useCallback(
+        (parentId: string | null): OutlineItem[] =>
+            Object.values(outline)
+                .filter((n) => (n.parentId ?? null) === (parentId ?? null))
+                .sort((a, b) => a.order - b.order),
+        [outline],
+    );
+
+    const roots = useMemo(() => childrenOf(null), [childrenOf]);
+
+    const appendOrder = useCallback(
+        (parentId: string | null, excludeId?: string) => {
+            const kids = childrenOf(parentId).filter((n) => n.id !== excludeId);
+            return kids.length ? kids[kids.length - 1].order + 1 : 0;
+        },
+        [childrenOf],
+    );
+
+    // ---- Live resolution of references ----
+
+    // Distinct source documents referenced by current blocks.
+    const cardBoardIds = useMemo(
+        () => [...new Set(Object.values(outline).filter((i) => i.source === "card").map((i) => i.refDocId))],
+        [outline],
+    );
+    const editorDocIds = useMemo(
+        () =>
+            [
+                ...new Set(
+                    Object.values(outline)
+                        .filter((i) => i.source === "scene" && i.refDocId !== MAIN_SCREENPLAY_REF)
+                        .map((i) => i.refDocId),
+                ),
+            ],
+        [outline],
+    );
+
+    // Bump a counter whenever a referenced board / editor-doc changes, so the
+    // resolver recomputes. Main-screenplay scenes come from `scenes` (reactive).
+    const [sourceVersion, setSourceVersion] = useState(0);
+    const cardKey = cardBoardIds.join(",");
+    const editorKey = editorDocIds.join(",");
+    useEffect(() => {
+        if (!projectState) return;
+        const bump = () => setSourceVersion((v) => v + 1);
+        const unsubs: (() => void)[] = [];
+        for (const id of cardBoardIds) {
+            const map = projectState.boardData(id);
+            map.observe(bump);
+            unsubs.push(() => map.unobserve(bump));
+        }
+        for (const id of editorDocIds) {
+            const frag = projectState.documentFragment(id);
+            frag.observe(bump);
+            unsubs.push(() => frag.unobserve(bump));
+        }
+        return () => unsubs.forEach((u) => u());
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [projectState, cardKey, editorKey]);
+
+    const resolved = useMemo<Record<string, ResolvedOutline>>(() => {
+        const out: Record<string, ResolvedOutline> = {};
+
+        // Lookups for the main screenplay scenes (already live via context).
+        const mainScenes = new Map(scenes.filter((s) => s.id).map((s) => [s.id as string, s]));
+
+        // Parse each referenced editor document's scenes once.
+        const editorScenes = new Map<string, Map<string, TransientScene>>();
+        for (const id of editorDocIds) {
+            const list = repository?.getEditorDocumentScenes(id) ?? [];
+            editorScenes.set(id, new Map(list.filter((s) => s.id).map((s) => [s.id as string, s])));
+        }
+
+        // Parse each referenced board's cards once.
+        const boardCards = new Map<string, Map<string, BoardCardData>>();
+        for (const id of cardBoardIds) {
+            const cards = parseCards(projectState?.boardData(id).get("cards"));
+            boardCards.set(id, new Map(cards.map((c) => [c.id, c])));
+        }
+
+        for (const item of Object.values(outline)) {
+            if (item.source === "card") {
+                const card = boardCards.get(item.refDocId)?.get(item.refId);
+                out[item.id] = card
+                    ? { title: card.title, preview: truncate(card.description), color: card.color, missing: false }
+                    : { title: item.title, preview: item.preview, color: item.color, missing: true };
+            } else {
+                const scene =
+                    item.refDocId === MAIN_SCREENPLAY_REF
+                        ? mainScenes.get(item.refId)
+                        : editorScenes.get(item.refDocId)?.get(item.refId);
+                if (scene) {
+                    const synopsis = "synopsis" in scene ? (scene.synopsis as string | undefined) : undefined;
+                    const color = "color" in scene ? (scene.color as string | undefined) : undefined;
+                    out[item.id] = {
+                        title: scene.title,
+                        preview: truncate(synopsis || scene.preview),
+                        color,
+                        missing: false,
+                        position: scene.position,
+                    };
+                } else {
+                    out[item.id] = { title: item.title, preview: item.preview, color: item.color, missing: true };
+                }
+            }
+        }
+        return out;
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [outline, scenes, sourceVersion, cardKey, editorKey, repository, projectState]);
+
+    // Keep each block's cached snapshot fresh so the "unlinked" fallback shows
+    // the last-known title/preview/color. Only writes when a resolved value
+    // actually changed (and the source still exists), so it settles quickly.
+    // Gated on visibility to avoid background writes for an unseen panel.
+    useEffect(() => {
+        if (!repository || !isVisible) return;
+        for (const item of Object.values(outline)) {
+            const r = resolved[item.id];
+            if (!r || r.missing) continue;
+            if (r.title !== item.title || r.preview !== item.preview || (r.color ?? undefined) !== (item.color ?? undefined)) {
+                repository.refreshOutlineSnapshot(item.id, { title: r.title, preview: r.preview, color: r.color });
+            }
+        }
+    }, [repository, outline, resolved, isVisible]);
+
+    // ---- Navigation ----
+
+    // Best-effort focus of a freshly opened document editor needs the latest
+    // instance, so track it in a ref.
+    const documentEditorRef = useRef(documentEditor);
+    documentEditorRef.current = documentEditor;
+
+    const navigate = useCallback(
+        (item: OutlineItem) => {
+            const r = resolved[item.id];
+            if (!r || r.missing) return;
+
+            // Open in the panel next to the Outline, leaving the Outline in place.
+            // When unsplit there's only one panel, so the target takes it over.
+            const targetSide: SplitSide = isSplit ? (primaryPanel === "outline" ? "secondary" : "primary") : "primary";
+
+            if (item.source === "card") {
+                setSideDocument(targetSide, item.refDocId, "board");
+                setBoardFocusCardId(item.refId);
+                return;
+            }
+
+            // Scene
+            if (item.refDocId === MAIN_SCREENPLAY_REF) {
+                setSidePanel(targetSide, "screenplay");
+                setFocusedSide(targetSide);
+                if (editor && r.position !== undefined) focusOnPosition(editor, r.position);
+                return;
+            }
+
+            // Scene inside an editor document.
+            setSideDocument(targetSide, item.refDocId, "document");
+            if (r.position !== undefined) {
+                const pos = r.position;
+                window.setTimeout(() => {
+                    const ed = documentEditorRef.current;
+                    if (ed) focusOnPosition(ed, pos);
+                }, 350);
+            }
+        },
+        [resolved, editor, isSplit, primaryPanel, setSideDocument, setSidePanel, setFocusedSide, setBoardFocusCardId],
+    );
+
+    const remove = useCallback(
+        (id: string) => {
+            repository?.deleteOutlineItem(id);
+        },
+        [repository],
+    );
+
+    // ---- Drag & drop (mirrors DocumentTreeSidebarView) ----
+
+    const onDragStart = useCallback((id: string) => setDraggingId(id), []);
+
+    const onDragOverNode = useCallback((id: string, pos: DropPosition) => {
+        setDropTarget((prev) => (prev?.id === id && prev.pos === pos ? prev : { id, pos }));
+    }, []);
+
+    const resetDrag = useCallback(() => {
+        setDraggingId(null);
+        setDropTarget(null);
+    }, []);
+
+    const onDropNode = useCallback(
+        (targetId: string) => {
+            const dragId = draggingId;
+            const target = outline[targetId];
+            const pos = dropTarget?.pos;
+            resetDrag();
+            if (!repository || !dragId || !target || !pos || dragId === targetId) return;
+
+            if (pos === "into") {
+                repository.moveOutlineItem(dragId, target.id, appendOrder(target.id, dragId));
+                return;
+            }
+
+            const parentId = target.parentId ?? null;
+            const siblings = childrenOf(parentId).filter((n) => n.id !== dragId);
+            const idx = siblings.findIndex((n) => n.id === targetId);
+            let order: number;
+            if (pos === "before") {
+                const prev = siblings[idx - 1];
+                order = prev ? (prev.order + target.order) / 2 : target.order - 1;
+            } else {
+                const next = siblings[idx + 1];
+                order = next ? (target.order + next.order) / 2 : target.order + 1;
+            }
+            repository.moveOutlineItem(dragId, parentId, order);
+        },
+        [draggingId, outline, dropTarget, repository, appendOrder, childrenOf, resetDrag],
+    );
+
+    const onDropRoot = useCallback(() => {
+        const dragId = draggingId;
+        resetDrag();
+        if (!repository || !dragId) return;
+        repository.moveOutlineItem(dragId, null, appendOrder(null, dragId));
+    }, [draggingId, repository, appendOrder, resetDrag]);
+
+    return (
+        <div className={styles.outline_panel}>
+            <div
+                className={styles.outline_scroll}
+                onDragOver={(e) => {
+                    if (!draggingId) return;
+                    // Over empty space (not a block): clear the block indicator;
+                    // dropping here still moves the item to the root level.
+                    e.preventDefault();
+                    setDropTarget(null);
+                }}
+                onDrop={(e) => {
+                    e.preventDefault();
+                    onDropRoot();
+                }}
+            >
+                <div className={styles.outline_list}>
+                    {roots.map((node) => (
+                        <OutlineBlock
+                            key={node.id}
+                            node={node}
+                            depth={0}
+                            childrenOf={childrenOf}
+                            resolved={resolved}
+                            onNavigate={navigate}
+                            onRemove={remove}
+                            draggingId={draggingId}
+                            dropTarget={dropTarget}
+                            onDragStart={onDragStart}
+                            onDragOverNode={onDragOverNode}
+                            onDropNode={onDropNode}
+                            onDragEnd={resetDrag}
+                        />
+                    ))}
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default OutlineView;
diff --git a/components/editor/sidebar/ContextMenu.module.css b/components/editor/sidebar/ContextMenu.module.css
index fa554e32..3911f80a 100644
--- a/components/editor/sidebar/ContextMenu.module.css
+++ b/components/editor/sidebar/ContextMenu.module.css
@@ -56,6 +56,35 @@
     margin: 2px 0;
 }
 
+/* Right-click color picker (document tree items) */
+.colors {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    padding: 10px 12px;
+}
+
+.color_swatch {
+    width: 20px;
+    height: 20px;
+    padding: 0;
+    border: 2px solid transparent;
+    border-radius: 50%;
+    cursor: pointer;
+    transition:
+        transform 0.15s ease,
+        border-color 0.15s ease;
+}
+
+.color_swatch:hover {
+    transform: scale(1.15);
+}
+
+.color_swatch_active {
+    border-color: var(--primary-text);
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3);
+}
+
 .suggestion_item {
     display: flex;
     align-items: center;
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index 387eb583..b2ffe784 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -24,6 +24,7 @@ import {
     EyeOff,
     Eye,
     Highlighter,
+    ListTree,
     Loader2,
     LucideIcon,
     MessageSquarePlus,
@@ -36,6 +37,7 @@ import { makeDualDialogue } from "@src/lib/screenplay/dual-dialogue";
 import { extractShelveCandidate } from "@src/lib/shelf/shelf-utils";
 import { omitSceneByUuid, unomitSceneByUuid } from "@src/lib/screenplay/scene-locking";
 import { ScreenplayElement } from "@src/lib/utils/enums";
+import { MAIN_SCREENPLAY_REF } from "@src/lib/project/project-state";
 
 /* ==================== */
 /*     Context menu     */
@@ -126,6 +128,19 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
         unomitSceneByUuid(editor, repository, scene.id);
     };
 
+    const handleSendToOutline = () => {
+        if (!repository || !scene.id) return;
+        repository.addOutlineItem({
+            source: "scene",
+            refDocId: MAIN_SCREENPLAY_REF,
+            refId: scene.id,
+            title: scene.title,
+            preview: scene.synopsis || scene.preview,
+            color: scene.color,
+            parentId: null,
+        });
+    };
+
     return (
         <>
             <ContextMenuItem
@@ -140,6 +155,13 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
             {!isReadOnly && (
                 <>
                     <div className={context.menu_separator} />
+                    {scene.id && (
+                        <ContextMenuItem
+                            text={t("sendToOutline")}
+                            icon={ListTree}
+                            action={handleSendToOutline}
+                        />
+                    )}
                     <ContextMenuItem text={t("edit")} icon={Pencil} action={() => editScenePopup(scene, userCtx)} />
                     <ContextMenuItem
                         text={t("cut")}
@@ -474,6 +496,8 @@ export type EditorContextMenuProps = {
     spellError?: { word: string; from: number; to: number };
     nodePos?: number;
     nodeClass?: string;
+    /** Present when the caret sits on a scene heading that can be sent to the Outline. */
+    outlineScene?: { refDocId: string; refId: string; title: string };
 };
 
 const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
@@ -482,9 +506,22 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
         useContext(ProjectContext);
     const { worker } = useSpellcheck();
     const { updateContextMenu } = useContext(UserContext);
-    const { from, to, onAddComment, spellError, nodePos, nodeClass } = props;
+    const { from, to, onAddComment, spellError, nodePos, nodeClass, outlineScene } = props;
     const hasSelection = from !== to;
 
+    const handleSendToOutline = () => {
+        if (!repository || !outlineScene) return;
+        repository.addOutlineItem({
+            source: "scene",
+            refDocId: outlineScene.refDocId,
+            refId: outlineScene.refId,
+            title: outlineScene.title,
+            preview: "",
+            parentId: null,
+        });
+        updateContextMenu(undefined);
+    };
+
     // Resolve scene UUID + lock state if right-clicked on a scene heading.
     // `nodePos` is the cursor position inside the paragraph (from the editor
     // dispatcher), so we resolve up to the depth-1 ancestor — the scene <p>
@@ -682,6 +719,14 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
                 </>
             )}
 
+            {/* Send a scene heading to the Outline */}
+            {outlineScene && !isReadOnly && (
+                <>
+                    <div className={context.menu_separator} />
+                    <ContextMenuItem text={t("sendToOutline")} icon={ListTree} action={handleSendToOutline} />
+                </>
+            )}
+
             {/* Production: Omit / Unomit on a locked scene heading */}
             {sceneInfo && !isReadOnly && (
                 <>
diff --git a/components/editor/sidebar/DocumentTreeItem.module.css b/components/editor/sidebar/DocumentTreeItem.module.css
index 58f2e07d..85223270 100644
--- a/components/editor/sidebar/DocumentTreeItem.module.css
+++ b/components/editor/sidebar/DocumentTreeItem.module.css
@@ -24,10 +24,21 @@
     background-color: var(--editor-sidebar-hover);
 }
 
+/* Slim accent bar on the left edge showing the node's color. */
+.color_bar {
+    position: absolute;
+    left: 0;
+    top: 4px;
+    bottom: 4px;
+    width: 3px;
+    border-radius: 0 3px 3px 0;
+    pointer-events: none;
+}
+
 /* Drop indicators */
 .row_drop_into {
     background-color: var(--editor-style-bg-hover);
-    box-shadow: inset 0 0 0 1px var(--primary-text);
+    box-shadow: inset 0 0 0 1px var(--tertiary-hover);
 }
 
 .row_drop_before::before,
@@ -37,16 +48,19 @@
     left: 8px;
     right: 8px;
     height: 2px;
-    background-color: var(--primary-text);
+    background-color: var(--tertiary-hover);
     pointer-events: none;
 }
 
+/* Centered on the row boundary so "after A" and "before B" (the same gap, which
+   the cursor alternates between) render at the exact same position — one line,
+   not two offset by a pixel. */
 .row_drop_before::before {
-    top: 0;
+    top: -1px;
 }
 
 .row_drop_after::after {
-    bottom: 0;
+    bottom: -1px;
 }
 
 .chevron {
diff --git a/components/editor/sidebar/DocumentTreeItem.tsx b/components/editor/sidebar/DocumentTreeItem.tsx
index 35ba2cc0..4960f132 100644
--- a/components/editor/sidebar/DocumentTreeItem.tsx
+++ b/components/editor/sidebar/DocumentTreeItem.tsx
@@ -1,19 +1,10 @@
 "use client";
 
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useRef } from "react";
 import { useTranslations } from "next-intl";
 import { DocumentNode, DocumentNodeType } from "@src/lib/project/project-state";
 import { join } from "@src/lib/utils/misc";
-import {
-    ChevronRight,
-    FilePlus,
-    FileText,
-    Folder,
-    FolderPlus,
-    LayoutDashboard,
-    Pencil,
-    Trash2,
-} from "lucide-react";
+import { ChevronRight, FileText, Folder, LayoutDashboard } from "lucide-react";
 
 import styles from "./DocumentTreeItem.module.css";
 
@@ -25,17 +16,30 @@ const TYPE_ICONS: Record<DocumentNodeType, typeof FileText> = {
 
 export type DropPosition = "into" | "before" | "after";
 
+/**
+ * dataTransfer MIME used when dragging an `editor`/`board` document out of the
+ * tree onto a panel to open it there. Reordering within the tree uses internal
+ * React state, so this only matters for cross-target (panel) drops.
+ */
+export const DOC_DND_MIME = "application/x-scriptio-doc";
+
 export interface DocumentTreeItemProps {
     node: DocumentNode;
     depth: number;
     childrenOf: (parentId: string) => DocumentNode[];
     expanded: Set<string>;
     onToggle: (id: string) => void;
-    activeDocId: string | null;
+    openDocIds: Set<string>;
     onOpen: (node: DocumentNode) => void;
-    onCreateChild: (parentId: string, type: "folder" | "editor") => void;
-    onRename: (id: string, title: string) => void;
-    onDelete: (id: string) => void;
+    onContextMenu: (node: DocumentNode, e: React.MouseEvent) => void;
+    // Inline rename (state lifted to the view so the context menu can trigger it).
+    renamingId: string | null;
+    onRenameCommit: (id: string, title: string) => void;
+    onRenameCancel: () => void;
+    // Inline delete confirmation (state lifted to the view).
+    confirmingDeleteId: string | null;
+    onConfirmDelete: (id: string) => void;
+    onCancelDelete: () => void;
     // Drag & drop
     draggingId: string | null;
     dropTarget: { id: string; pos: DropPosition } | null;
@@ -53,11 +57,15 @@ const DocumentTreeItem = ({
     childrenOf,
     expanded,
     onToggle,
-    activeDocId,
+    openDocIds,
     onOpen,
-    onCreateChild,
-    onRename,
-    onDelete,
+    onContextMenu,
+    renamingId,
+    onRenameCommit,
+    onRenameCancel,
+    confirmingDeleteId,
+    onConfirmDelete,
+    onCancelDelete,
     draggingId,
     dropTarget,
     onDragStart,
@@ -66,15 +74,14 @@ const DocumentTreeItem = ({
     onDragEnd,
 }: DocumentTreeItemProps) => {
     const t = useTranslations("editorSidebar");
-    const [isRenaming, setIsRenaming] = useState(false);
-    const [renameValue, setRenameValue] = useState("");
-    const [confirmingDelete, setConfirmingDelete] = useState(false);
     const renameInputRef = useRef<HTMLInputElement>(null);
 
     const Icon = TYPE_ICONS[node.type];
     const isFolder = node.type === "folder";
     const isOpen = expanded.has(node.id);
-    const isActive = node.type === "editor" && activeDocId === node.id;
+    const isActive = openDocIds.has(node.id);
+    const isRenaming = renamingId === node.id;
+    const confirmingDelete = confirmingDeleteId === node.id;
     const busy = isRenaming || confirmingDelete;
 
     const handleRowClick = useCallback(() => {
@@ -83,21 +90,9 @@ const DocumentTreeItem = ({
         else onOpen(node);
     }, [busy, isFolder, node, onToggle, onOpen]);
 
-    const startRename = useCallback(
-        (e: React.MouseEvent) => {
-            e.stopPropagation();
-            setRenameValue(node.title);
-            setIsRenaming(true);
-            setTimeout(() => renameInputRef.current?.select(), 0);
-        },
-        [node.title],
-    );
-
     const commitRename = useCallback(() => {
-        const trimmed = renameValue.trim();
-        if (trimmed) onRename(node.id, trimmed);
-        setIsRenaming(false);
-    }, [renameValue, node.id, onRename]);
+        onRenameCommit(node.id, (renameInputRef.current?.value ?? "").trim());
+    }, [node.id, onRenameCommit]);
 
     const handleDragOver = useCallback(
         (e: React.DragEvent) => {
@@ -134,9 +129,19 @@ const DocumentTreeItem = ({
                 className={rowClass}
                 style={{ paddingLeft: 12 + depth * INDENT, opacity: draggingId === node.id ? 0.4 : 1 }}
                 onClick={handleRowClick}
+                onContextMenu={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    onContextMenu(node, e);
+                }}
                 draggable={!busy}
                 onDragStart={(e) => {
-                    e.dataTransfer.effectAllowed = "move";
+                    e.dataTransfer.effectAllowed = "copyMove";
+                    // Openable documents carry their id/type so they can be
+                    // dropped onto a panel to open there (folders cannot).
+                    if (node.type === "editor" || node.type === "board") {
+                        e.dataTransfer.setData(DOC_DND_MIME, JSON.stringify({ id: node.id, type: node.type }));
+                    }
                     onDragStart(node.id);
                 }}
                 onDragOver={handleDragOver}
@@ -147,6 +152,7 @@ const DocumentTreeItem = ({
                 }}
                 onDragEnd={onDragEnd}
             >
+                {node.color && <span className={styles.color_bar} style={{ backgroundColor: node.color }} />}
                 {isFolder ? (
                     <ChevronRight
                         size={13}
@@ -161,15 +167,16 @@ const DocumentTreeItem = ({
                     <input
                         ref={renameInputRef}
                         className={styles.rename_input}
-                        value={renameValue}
+                        defaultValue={node.title}
                         draggable={false}
-                        onChange={(e) => setRenameValue(e.target.value)}
+                        autoFocus
+                        onFocus={(e) => e.currentTarget.select()}
                         onBlur={commitRename}
                         onMouseDown={(e) => e.stopPropagation()}
                         onClick={(e) => e.stopPropagation()}
                         onKeyDown={(e) => {
                             if (e.key === "Enter") commitRename();
-                            else if (e.key === "Escape") setIsRenaming(false);
+                            else if (e.key === "Escape") onRenameCancel();
                         }}
                     />
                 ) : confirmingDelete ? (
@@ -178,65 +185,16 @@ const DocumentTreeItem = ({
                             {isFolder ? t("confirmDeleteFolder") : t("confirmDelete")}
                         </span>
                         <div className={styles.confirm_btns}>
-                            <button
-                                className={styles.confirm_yes}
-                                onClick={() => {
-                                    setConfirmingDelete(false);
-                                    onDelete(node.id);
-                                }}
-                            >
+                            <button className={styles.confirm_yes} onClick={() => onConfirmDelete(node.id)}>
                                 {t("delete")}
                             </button>
-                            <button className={styles.confirm_no} onClick={() => setConfirmingDelete(false)}>
+                            <button className={styles.confirm_no} onClick={onCancelDelete}>
                                 {t("cancel")}
                             </button>
                         </div>
                     </div>
                 ) : (
-                    <>
-                        <span className={join(styles.title, "unselectable")}>{node.title}</span>
-                        <div className={styles.actions}>
-                            {isFolder && (
-                                <>
-                                    <button
-                                        className={styles.action_btn}
-                                        title={t("newDocument")}
-                                        onClick={(e) => {
-                                            e.stopPropagation();
-                                            if (!isOpen) onToggle(node.id);
-                                            onCreateChild(node.id, "editor");
-                                        }}
-                                    >
-                                        <FilePlus size={12} />
-                                    </button>
-                                    <button
-                                        className={styles.action_btn}
-                                        title={t("newFolder")}
-                                        onClick={(e) => {
-                                            e.stopPropagation();
-                                            if (!isOpen) onToggle(node.id);
-                                            onCreateChild(node.id, "folder");
-                                        }}
-                                    >
-                                        <FolderPlus size={12} />
-                                    </button>
-                                </>
-                            )}
-                            <button className={styles.action_btn} title={t("rename")} onClick={startRename}>
-                                <Pencil size={12} />
-                            </button>
-                            <button
-                                className={join(styles.action_btn, styles.action_btn_danger)}
-                                title={t("delete")}
-                                onClick={(e) => {
-                                    e.stopPropagation();
-                                    setConfirmingDelete(true);
-                                }}
-                            >
-                                <Trash2 size={12} />
-                            </button>
-                        </div>
-                    </>
+                    <span className={join(styles.title, "unselectable")}>{node.title}</span>
                 )}
             </div>
 
@@ -250,11 +208,15 @@ const DocumentTreeItem = ({
                         childrenOf={childrenOf}
                         expanded={expanded}
                         onToggle={onToggle}
-                        activeDocId={activeDocId}
+                        openDocIds={openDocIds}
                         onOpen={onOpen}
-                        onCreateChild={onCreateChild}
-                        onRename={onRename}
-                        onDelete={onDelete}
+                        onContextMenu={onContextMenu}
+                        renamingId={renamingId}
+                        onRenameCommit={onRenameCommit}
+                        onRenameCancel={onRenameCancel}
+                        confirmingDeleteId={confirmingDeleteId}
+                        onConfirmDelete={onConfirmDelete}
+                        onCancelDelete={onCancelDelete}
                         draggingId={draggingId}
                         dropTarget={dropTarget}
                         onDragStart={onDragStart}
diff --git a/components/editor/sidebar/DocumentTreeSidebarView.tsx b/components/editor/sidebar/DocumentTreeSidebarView.tsx
index 9da6ed06..c1a4de20 100644
--- a/components/editor/sidebar/DocumentTreeSidebarView.tsx
+++ b/components/editor/sidebar/DocumentTreeSidebarView.tsx
@@ -1,26 +1,41 @@
 "use client";
 
-import { useCallback, useContext, useMemo, useState } from "react";
+import { useCallback, useContext, useEffect, useMemo, useState } from "react";
 import { useTranslations } from "next-intl";
 import { ProjectContext } from "@src/context/ProjectContext";
 import { useViewContext } from "@src/context/ViewContext";
 import { DocumentNode } from "@src/lib/project/project-state";
+import { DEFAULT_ITEM_COLORS } from "@src/lib/utils/colors";
 import { join } from "@src/lib/utils/misc";
-import { FilePlus, FolderPlus, FolderTree, LayoutDashboard } from "lucide-react";
+import { FilePlus, FolderPlus, FolderTree, LayoutDashboard, Pencil, Trash2 } from "lucide-react";
 import DocumentTreeItem, { DropPosition } from "./DocumentTreeItem";
+import { ContextMenuItem } from "./ContextMenu";
 
 import form from "./../../utils/Form.module.css";
 import sidebar_nav from "./EditorSidebarNavigation.module.css";
+import context from "./ContextMenu.module.css";
+
+type MenuState = { x: number; y: number; node: DocumentNode | null };
 
 const DocumentTreeSidebarView = () => {
     const t = useTranslations("editorSidebar");
-    const { documents, repository, activeDocument, setActiveDocument } = useContext(ProjectContext);
-    const { setSecondaryPanel } = useViewContext();
+    const { documents, repository } = useContext(ProjectContext);
+    const { setSideDocument, closeDocument, primaryDocId, secondaryDocId } = useViewContext();
+
+    // Documents currently open in a panel — highlighted in the tree.
+    const openDocIds = useMemo(
+        () => new Set([primaryDocId, secondaryDocId].filter((id): id is string => !!id)),
+        [primaryDocId, secondaryDocId],
+    );
 
     const [expanded, setExpanded] = useState<Set<string>>(new Set());
     const [draggingId, setDraggingId] = useState<string | null>(null);
     const [dropTarget, setDropTarget] = useState<{ id: string; pos: DropPosition } | null>(null);
-    const [rootDrop, setRootDrop] = useState(false);
+
+    // Right-click menu + inline edit state (lifted here so the menu can drive it).
+    const [menu, setMenu] = useState<MenuState | null>(null);
+    const [renamingId, setRenamingId] = useState<string | null>(null);
+    const [confirmingDeleteId, setConfirmingDeleteId] = useState<string | null>(null);
 
     // Children of a parent (null = root), sorted by fractional `order`.
     const childrenOf = useCallback(
@@ -52,39 +67,27 @@ const DocumentTreeSidebarView = () => {
 
     const openDocument = useCallback(
         (node: DocumentNode) => {
-            if (node.type === "board") {
-                setActiveDocument({ docId: node.id, type: "board" });
-                setSecondaryPanel("board");
-            } else if (node.type === "editor") {
-                setActiveDocument({ docId: node.id, type: "editor" });
-                setSecondaryPanel("document");
-            }
+            if (node.type === "board") setSideDocument("secondary", node.id, "board");
+            else if (node.type === "editor") setSideDocument("secondary", node.id, "document");
         },
-        [setActiveDocument, setSecondaryPanel],
+        [setSideDocument],
     );
 
-    const createChild = useCallback(
-        (parentId: string | null, type: "folder" | "editor") => {
+    const createInside = useCallback(
+        (parentId: string | null, type: "folder" | "editor" | "board") => {
             if (!repository) return;
+            if (parentId) setExpanded((prev) => new Set(prev).add(parentId));
             if (type === "folder") repository.createFolder(t("untitledFolder"), parentId);
+            else if (type === "board") repository.createBoardDocument(t("boardTitle"), parentId);
             else repository.createEditorDocument(t("untitledDocument"), parentId);
         },
         [repository, t],
     );
 
-    const createBoard = useCallback(() => {
-        repository?.createBoardDocument(t("boardTitle"), null);
-    }, [repository, t]);
-
-    const renameDocument = useCallback(
-        (id: string, title: string) => repository?.renameDocument(id, title),
-        [repository],
-    );
-
     const deleteDocument = useCallback(
         (id: string) => {
             if (!repository) return;
-            // Clear the open document if it (or one of its descendants) is being removed.
+            // Clear the open document if it (or a descendant) is being removed.
             const removed = new Set<string>();
             const stack = [id];
             while (stack.length) {
@@ -92,27 +95,66 @@ const DocumentTreeSidebarView = () => {
                 removed.add(cur);
                 for (const n of Object.values(documents)) if (n.parentId === cur) stack.push(n.id);
             }
-            if (activeDocument && removed.has(activeDocument.docId)) setActiveDocument(null);
+            removed.forEach((rid) => closeDocument(rid));
             repository.deleteDocument(id);
+            setConfirmingDeleteId(null);
         },
-        [repository, documents, activeDocument, setActiveDocument],
+        [repository, documents, closeDocument],
     );
 
-    // ---- Drag & drop ----
-    const onDragStart = useCallback((id: string) => setDraggingId(id), []);
+    const commitRename = useCallback(
+        (id: string, title: string) => {
+            if (title) repository?.renameDocument(id, title);
+            setRenamingId(null);
+        },
+        [repository],
+    );
 
-    const onDragOverNode = useCallback(
-        (id: string, pos: DropPosition) => {
-            setRootDrop(false);
-            setDropTarget((prev) => (prev?.id === id && prev.pos === pos ? prev : { id, pos }));
+    // Right-click color picker. Clicking the active color again clears it.
+    const setColor = useCallback(
+        (id: string, color: string) => {
+            const current = documents[id]?.color;
+            repository?.setDocumentColor(id, current === color ? undefined : color);
+            setMenu(null);
         },
-        [],
+        [repository, documents],
     );
 
+    // ---- Right-click menu ----
+    const openMenu = useCallback((node: DocumentNode | null, e: React.MouseEvent) => {
+        e.preventDefault();
+        setMenu({ x: e.clientX, y: e.clientY, node });
+    }, []);
+
+    // Close the menu on any left-click, scroll, resize, or Escape.
+    useEffect(() => {
+        if (!menu) return;
+        const close = () => setMenu(null);
+        const onKey = (e: KeyboardEvent) => {
+            if (e.key === "Escape") setMenu(null);
+        };
+        window.addEventListener("click", close);
+        window.addEventListener("resize", close);
+        window.addEventListener("scroll", close, true);
+        window.addEventListener("keydown", onKey);
+        return () => {
+            window.removeEventListener("click", close);
+            window.removeEventListener("resize", close);
+            window.removeEventListener("scroll", close, true);
+            window.removeEventListener("keydown", onKey);
+        };
+    }, [menu]);
+
+    // ---- Drag & drop ----
+    const onDragStart = useCallback((id: string) => setDraggingId(id), []);
+
+    const onDragOverNode = useCallback((id: string, pos: DropPosition) => {
+        setDropTarget((prev) => (prev?.id === id && prev.pos === pos ? prev : { id, pos }));
+    }, []);
+
     const resetDrag = useCallback(() => {
         setDraggingId(null);
         setDropTarget(null);
-        setRootDrop(false);
     }, []);
 
     const onDropNode = useCallback(
@@ -152,39 +194,89 @@ const DocumentTreeSidebarView = () => {
         repository.moveDocument(dragId, null, appendOrder(null, dragId));
     }, [draggingId, repository, appendOrder, resetDrag]);
 
+    const renderMenu = () => {
+        if (!menu) return null;
+        const node = menu.node;
+        const left = Math.min(menu.x, window.innerWidth - 230);
+        const top = Math.min(menu.y, window.innerHeight - 220);
+        // Where create actions should put new nodes: inside a right-clicked
+        // folder, otherwise at the root.
+        const parentId = node?.type === "folder" ? node.id : null;
+        const showCreate = !node || node.type === "folder";
+        const showEdit = !!node;
+
+        return (
+            <div
+                className={context.menu}
+                style={{ top, left }}
+                onContextMenu={(e) => e.preventDefault()}
+            >
+                {showCreate && (
+                    <>
+                        <ContextMenuItem
+                            text={t("newDocument")}
+                            icon={FilePlus}
+                            action={() => createInside(parentId, "editor")}
+                        />
+                        <ContextMenuItem
+                            text={t("newFolder")}
+                            icon={FolderPlus}
+                            action={() => createInside(parentId, "folder")}
+                        />
+                        <ContextMenuItem
+                            text={t("newBoard")}
+                            icon={LayoutDashboard}
+                            action={() => createInside(parentId, "board")}
+                        />
+                    </>
+                )}
+                {showCreate && showEdit && <div className={context.menu_separator} />}
+                {showEdit && node && (
+                    <>
+                        <div className={context.colors}>
+                            {DEFAULT_ITEM_COLORS.map((color) => (
+                                <button
+                                    key={color}
+                                    className={join(
+                                        context.color_swatch,
+                                        node.color === color ? context.color_swatch_active : "",
+                                    )}
+                                    style={{ backgroundColor: color }}
+                                    onClick={() => setColor(node.id, color)}
+                                />
+                            ))}
+                        </div>
+                        <ContextMenuItem
+                            text={t("rename")}
+                            icon={Pencil}
+                            action={() => setRenamingId(node.id)}
+                        />
+                        <ContextMenuItem
+                            text={t("delete")}
+                            icon={Trash2}
+                            action={() => setConfirmingDeleteId(node.id)}
+                        />
+                    </>
+                )}
+            </div>
+        );
+    };
+
     return (
         <>
             <div className={sidebar_nav.list_header}>
                 <FolderTree size={18} />
                 <p className={form.label}>{t("documents")}</p>
-                <div className={sidebar_nav.header_spacer} />
-                <div className={sidebar_nav.header_actions}>
-                    <button
-                        className={sidebar_nav.header_btn}
-                        title={t("newDocument")}
-                        onClick={() => createChild(null, "editor")}
-                    >
-                        <FilePlus size={15} />
-                    </button>
-                    <button
-                        className={sidebar_nav.header_btn}
-                        title={t("newFolder")}
-                        onClick={() => createChild(null, "folder")}
-                    >
-                        <FolderPlus size={15} />
-                    </button>
-                    <button className={sidebar_nav.header_btn} title={t("newBoard")} onClick={createBoard}>
-                        <LayoutDashboard size={15} />
-                    </button>
-                </div>
             </div>
             <div
-                className={join(sidebar_nav.list, sidebar_nav.scene_list, rootDrop ? sidebar_nav.tree_root_drop : "")}
+                className={join(sidebar_nav.list, sidebar_nav.scene_list)}
+                onContextMenu={(e) => openMenu(null, e)}
                 onDragOver={(e) => {
                     if (!draggingId) return;
+                    // Over empty list space (not a row): clear the row indicator;
+                    // dropping here still moves the item to the root level.
                     e.preventDefault();
                     setDropTarget(null);
-                    setRootDrop(true);
                 }}
                 onDrop={(e) => {
                     e.preventDefault();
@@ -200,11 +292,15 @@ const DocumentTreeSidebarView = () => {
                             childrenOf={childrenOf}
                             expanded={expanded}
                             onToggle={toggle}
-                            activeDocId={activeDocument?.docId ?? null}
+                            openDocIds={openDocIds}
                             onOpen={openDocument}
-                            onCreateChild={createChild}
-                            onRename={renameDocument}
-                            onDelete={deleteDocument}
+                            onContextMenu={openMenu}
+                            renamingId={renamingId}
+                            onRenameCommit={commitRename}
+                            onRenameCancel={() => setRenamingId(null)}
+                            confirmingDeleteId={confirmingDeleteId}
+                            onConfirmDelete={deleteDocument}
+                            onCancelDelete={() => setConfirmingDeleteId(null)}
                             draggingId={draggingId}
                             dropTarget={dropTarget}
                             onDragStart={onDragStart}
@@ -217,6 +313,7 @@ const DocumentTreeSidebarView = () => {
                     <div className={sidebar_nav.empty_state}>{t("documentsEmpty")}</div>
                 )}
             </div>
+            {renderMenu()}
         </>
     );
 };
diff --git a/components/editor/sidebar/EditorSidebarNavigation.module.css b/components/editor/sidebar/EditorSidebarNavigation.module.css
index bf020344..d10e97fa 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.module.css
+++ b/components/editor/sidebar/EditorSidebarNavigation.module.css
@@ -82,45 +82,6 @@
     font-size: 1rem;
 }
 
-/* Header action buttons (e.g. document-tree create buttons) */
-.header_spacer {
-    flex: 1;
-}
-
-.header_actions {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: 2px;
-    padding-right: 16px;
-}
-
-.header_btn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 4px;
-    border-radius: 6px;
-    border: none;
-    background: none;
-    color: var(--secondary-text);
-    cursor: pointer;
-    transition:
-        color 0.15s,
-        background-color 0.15s;
-}
-
-.header_btn:hover {
-    background-color: var(--editor-sidebar-hover);
-    color: var(--primary-text);
-}
-
-/* Drop-to-root target highlight */
-.tree_root_drop {
-    box-shadow: inset 0 0 0 1px var(--primary-text);
-    border-radius: 8px;
-}
-
 .list_fill {
     min-height: 30px;
     height: 100%;
diff --git a/components/editor/sidebar/SidebarItem.module.css b/components/editor/sidebar/SidebarItem.module.css
index c4e9b35d..55e1d4aa 100644
--- a/components/editor/sidebar/SidebarItem.module.css
+++ b/components/editor/sidebar/SidebarItem.module.css
@@ -1,4 +1,5 @@
 .container {
+    position: relative;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -17,6 +18,17 @@
     border-bottom: 1px solid var(--separator);
 }
 
+/* Slim accent bar on the left edge showing the scene's color. */
+.color_bar {
+    position: absolute;
+    left: 0;
+    top: 4px;
+    bottom: 4px;
+    width: 3px;
+    border-radius: 0 3px 3px 0;
+    pointer-events: none;
+}
+
 .data {
     display: flex;
     flex-direction: row;
diff --git a/components/editor/sidebar/SidebarSceneItem.tsx b/components/editor/sidebar/SidebarSceneItem.tsx
index 50742965..feba9a69 100644
--- a/components/editor/sidebar/SidebarSceneItem.tsx
+++ b/components/editor/sidebar/SidebarSceneItem.tsx
@@ -64,11 +64,9 @@ const SidebarSceneItem = memo(({ scene, index, showDropIndicator, isDragging, is
             onDoubleClick={handleDoubleClick}
             className={containerClass}
         >
+            {scene.color && <span className={nav_item.color_bar} style={{ backgroundColor: scene.color }} />}
             <div className={nav_item.header}>
                 <div className={nav_item.title_row}>
-                    {scene.color && (
-                        <span className={nav_item.color_indicator} style={{ backgroundColor: scene.color }} />
-                    )}
                     <p className={join(nav_item.title, "unselectable")}>
                         <span className={nav_item.scene_number}>{label}.</span> {titleText}
                     </p>
diff --git a/components/navbar/ViewOptionsDropdown.tsx b/components/navbar/ViewOptionsDropdown.tsx
index a0aa77b4..4684915c 100644
--- a/components/navbar/ViewOptionsDropdown.tsx
+++ b/components/navbar/ViewOptionsDropdown.tsx
@@ -15,6 +15,7 @@ import {
     PanelRightClose,
     ArrowLeftRight,
     Eye,
+    ListTree,
 } from "lucide-react";
 
 import styles from "./ViewOptionsDropdown.module.css";
@@ -33,16 +34,17 @@ const ViewOptionsDropdown = () => {
         primaryPanel,
         setSecondaryPanel,
         swapPanels,
+        focusedPanel,
+        setFocusedPanel,
     } = useViewContext();
 
     const handleSplitToggle = useCallback(() => {
         if (isSplit) {
             setSecondaryPanel(null);
         } else {
-            const other: PanelType =
-                primaryPanel === "screenplay" ? "board"
-                : primaryPanel === "title" ? "screenplay"
-                : "screenplay";
+            // Default the new side to a singleton view (documents need a docId,
+            // which only opening from the sidebar/outline provides).
+            const other: PanelType = primaryPanel === "screenplay" ? "title" : "screenplay";
             setSecondaryPanel(other);
         }
     }, [isSplit, primaryPanel, setSecondaryPanel]);
@@ -112,6 +114,16 @@ const ViewOptionsDropdown = () => {
 
             {isOpen && (
                 <div className={styles.dropdown_menu}>
+                    <button
+                        className={`${styles.dropdown_item} ${focusedPanel === "outline" ? styles.dropdown_item_active : ""}`}
+                        onClick={() => {
+                            setFocusedPanel("outline");
+                            setIsOpen(false);
+                        }}
+                    >
+                        <ListTree size={16} />
+                        <span className={styles.item_label}>{t("outline")}</span>
+                    </button>
                     <button
                         className={`${styles.dropdown_item} ${isEndlessScroll ? styles.dropdown_item_active : ""}`}
                         onClick={() => setIsEndlessScroll(!isEndlessScroll)}
diff --git a/components/project/SplitPanelContainer.module.css b/components/project/SplitPanelContainer.module.css
index 74a5f69c..7911d9c7 100644
--- a/components/project/SplitPanelContainer.module.css
+++ b/components/project/SplitPanelContainer.module.css
@@ -17,11 +17,24 @@
 }
 
 .panel_focused {
-    outline: 2px solid var(--primary-text, rgba(100, 150, 255, 0.35));
+    outline: 2px solid var(--secondary);
     outline-offset: -2px;
     border-radius: 4px;
 }
 
+/* Overlay shown on top of panel content while a document is dragged over it.
+   pointer-events:none lets the drag events fall through to the panel beneath. */
+.panel_drop_overlay {
+    position: absolute;
+    inset: 0;
+    z-index: 50;
+    pointer-events: none;
+    border: 2px dashed var(--tertiary-hover);
+    border-radius: 4px;
+    background-color: var(--editor-style-bg-hover);
+    opacity: 0.5;
+}
+
 /* Mounted-but-hidden panels: kept alive in the DOM so editors
    don't reinitialise; pulled out of grid flow via absolute positioning.
    visibility:hidden (not display:none) preserves layout for ProseMirror. */
diff --git a/components/project/SplitPanelContainer.tsx b/components/project/SplitPanelContainer.tsx
index 87611b63..6ae9698c 100644
--- a/components/project/SplitPanelContainer.tsx
+++ b/components/project/SplitPanelContainer.tsx
@@ -3,22 +3,24 @@
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
 import { UserContext } from "@src/context/UserContext";
-import { PanelType, useViewContext } from "@src/context/ViewContext";
+import { PanelType, SplitSide, useViewContext } from "@src/context/ViewContext";
+import { DOC_DND_MIME } from "@components/editor/sidebar/DocumentTreeItem";
 import EditorPanel from "@components/editor/EditorPanel";
 import TitlePagePanel from "@components/editor/TitlePagePanel";
 import DraftEditorPanel from "@components/editor/DraftEditorPanel";
 import TreeDocumentPanel from "@components/editor/TreeDocumentPanel";
 import BoardPanel from "@components/editor/BoardPanel";
+import OutlinePanel from "@components/editor/outline/OutlinePanel";
 import StatisticsClientPage from "@components/projects/stats/StatisticsClientPage";
 import DragHandle from "./DragHandle";
 import { SuggestionData } from "@components/editor/SuggestionMenu";
 import {
-    Archive,
     ArrowLeftRight,
     ChevronLeft,
     ChevronRight,
     Clapperboard,
     FileText,
+    ListTree,
     Maximize,
     Menu,
     MessageSquare,
@@ -57,25 +59,31 @@ const PanelRenderer = ({
                     updateSuggestionData={updateSuggestionData}
                 />
             );
-        case "board":
-            return <BoardPanel isVisible={isVisible} />;
         case "statistics":
             return <StatisticsClientPage />;
         case "title":
             return <TitlePagePanel isVisible={isVisible} />;
         case "draft":
             return <DraftEditorPanel isVisible={isVisible} />;
-        case "document":
-            return <TreeDocumentPanel isVisible={isVisible} />;
+        case "outline":
+            return <OutlinePanel isVisible={isVisible} />;
+        default:
+            // board/document are document panels, rendered per-side (not here).
+            return null;
     }
 };
 
+// Singleton view panels are kept mounted and swapped in/out via CSS so heavy
+// editors don't reinitialise. Board/editor documents are rendered per-side
+// instead, so two documents can be open at once.
+const SINGLETON_PANELS: PanelType[] = ["screenplay", "statistics", "title", "draft", "outline"];
+
 // Boards and tree documents are opened from the document-tree sidebar (they are
 // per-document), so they are not listed here.
 const SWITCHABLE_PANELS: { type: PanelType; icon: typeof Clapperboard; labelKey: string }[] = [
     { type: "screenplay", icon: Clapperboard, labelKey: "screenplay" },
     { type: "title", icon: FileText, labelKey: "titlePage" },
-    { type: "draft", icon: Archive, labelKey: "draftEditor" },
+    { type: "outline", icon: ListTree, labelKey: "outline" },
 ];
 
 const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; side: "primary" | "secondary" }) => {
@@ -100,8 +108,9 @@ const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; si
         if (isSplit) {
             setSecondaryPanel(null);
         } else {
-            const other: PanelType =
-                primaryPanel === "screenplay" ? "board" : primaryPanel === "title" ? "screenplay" : "screenplay";
+            // Default the new side to a singleton view (documents need a docId,
+            // which only opening from the sidebar/outline provides).
+            const other: PanelType = primaryPanel === "screenplay" ? "title" : "screenplay";
             setSecondaryPanel(other);
         }
     }, [isSplit, primaryPanel, setSecondaryPanel]);
@@ -238,8 +247,51 @@ const SplitPanelContainer = ({
     suggestionData,
     updateSuggestionData,
 }: SplitPanelContainerProps) => {
-    const { primaryPanel, secondaryPanel, splitRatio, isSplit, mountedPanels, focusedSide, setFocusedSide } =
-        useViewContext();
+    const {
+        primaryPanel,
+        secondaryPanel,
+        primaryDocId,
+        secondaryDocId,
+        splitRatio,
+        isSplit,
+        mountedPanels,
+        focusedSide,
+        setFocusedSide,
+        setSideDocument,
+    } = useViewContext();
+
+    // Side currently highlighted while a document is dragged from the sidebar.
+    const [docDragOverSide, setDocDragOverSide] = useState<SplitSide | null>(null);
+
+    // Capture-phase so the panel claims a document drop before the editor's own
+    // drop handling sees it; non-document drags fall through untouched.
+    const handleDocDragOver = useCallback(
+        (side: SplitSide) => (e: React.DragEvent) => {
+            if (!e.dataTransfer.types.includes(DOC_DND_MIME)) return;
+            e.preventDefault();
+            e.dataTransfer.dropEffect = "copy";
+            setDocDragOverSide((prev) => (prev === side ? prev : side));
+        },
+        [],
+    );
+
+    const handleDocDrop = useCallback(
+        (side: SplitSide) => (e: React.DragEvent) => {
+            const raw = e.dataTransfer.getData(DOC_DND_MIME);
+            if (!raw) return;
+            e.preventDefault();
+            e.stopPropagation();
+            setDocDragOverSide(null);
+            let data: { id: string; type: "editor" | "board" };
+            try {
+                data = JSON.parse(raw);
+            } catch {
+                return;
+            }
+            setSideDocument(side, data.id, data.type === "board" ? "board" : "document");
+        },
+        [setSideDocument],
+    );
 
     const gridStyle = useMemo(() => {
         if (!isSplit) {
@@ -255,38 +307,60 @@ const SplitPanelContainer = ({
         };
     }, [isSplit, splitRatio]);
 
-    const allPanels: PanelType[] = ["screenplay", "board", "statistics", "title", "draft", "document"];
+    // Shared wrapper for one slot: focus styling, document drop target, switcher.
+    const renderShell = (opts: {
+        keyId: string;
+        panelKind: PanelType;
+        side: SplitSide;
+        isPrimary: boolean;
+        isVisible: boolean;
+        content: React.ReactNode;
+    }) => {
+        const { keyId, panelKind, side, isPrimary, isVisible, content } = opts;
+        const isFocused = isSplit && isVisible && focusedSide === side;
+        const isDocDropTarget = isVisible && docDragOverSide === side;
+        const panelClass = !isVisible
+            ? styles.panel_hidden
+            : `${styles.panel}${isFocused ? ` ${styles.panel_focused}` : ""}`;
+
+        return (
+            <div
+                key={keyId}
+                className={panelClass}
+                style={isVisible ? { order: isPrimary ? 0 : 2, position: "relative" } : undefined}
+                onPointerDown={isVisible && isSplit ? () => setFocusedSide(side) : undefined}
+                onDragOverCapture={isVisible ? handleDocDragOver(side) : undefined}
+                onDropCapture={isVisible ? handleDocDrop(side) : undefined}
+                onDragLeave={
+                    isVisible
+                        ? (e) => {
+                              if (!e.currentTarget.contains(e.relatedTarget as Node)) setDocDragOverSide(null);
+                          }
+                        : undefined
+                }
+            >
+                {isDocDropTarget && <div className={styles.panel_drop_overlay} />}
+                {isVisible && <PanelSwitcherMenu currentPanel={panelKind} side={side} />}
+                {content}
+            </div>
+        );
+    };
 
     return (
         <div className={styles.split_panel_container} style={gridStyle}>
-            {allPanels.map((panel) => {
+            {/* Singleton view panels — kept mounted, shown/hidden via CSS. */}
+            {SINGLETON_PANELS.map((panel) => {
+                if (!mountedPanels.has(panel)) return null;
                 const isPrimary = panel === primaryPanel;
                 const isSecondary = panel === secondaryPanel;
                 const isVisible = isPrimary || isSecondary;
-
-                // Lazy mount: only render panels that have been visited at least once
-                if (!mountedPanels.has(panel)) return null;
-
-                const isFocused =
-                    isSplit && isVisible && (isPrimary ? focusedSide === "primary" : focusedSide === "secondary");
-                const panelClass = !isVisible
-                    ? styles.panel_hidden
-                    : isFocused
-                      ? `${styles.panel} ${styles.panel_focused}`
-                      : styles.panel;
-
-                return (
-                    <div
-                        key={panel}
-                        className={panelClass}
-                        style={isVisible ? { order: isPrimary ? 0 : 2, position: "relative" } : undefined}
-                        onPointerDown={
-                            isVisible && isSplit ? () => setFocusedSide(isPrimary ? "primary" : "secondary") : undefined
-                        }
-                    >
-                        {isVisible && (
-                            <PanelSwitcherMenu currentPanel={panel} side={isPrimary ? "primary" : "secondary"} />
-                        )}
+                return renderShell({
+                    keyId: panel,
+                    panelKind: panel,
+                    side: isPrimary ? "primary" : "secondary",
+                    isPrimary,
+                    isVisible,
+                    content: (
                         <PanelRenderer
                             panel={panel}
                             isVisible={isVisible}
@@ -295,9 +369,31 @@ const SplitPanelContainer = ({
                             suggestionData={suggestionData}
                             updateSuggestionData={updateSuggestionData}
                         />
-                    </div>
-                );
+                    ),
+                });
             })}
+
+            {/* Document panels — one per side, each bound to its own docId so two
+                documents (e.g. two boards, or a board + an editor) can be open. */}
+            {(["primary", "secondary"] as SplitSide[]).map((side) => {
+                const panelKind = side === "primary" ? primaryPanel : secondaryPanel;
+                if (panelKind !== "board" && panelKind !== "document") return null;
+                const docId = side === "primary" ? primaryDocId : secondaryDocId;
+                return renderShell({
+                    keyId: `doc-${side}`,
+                    panelKind,
+                    side,
+                    isPrimary: side === "primary",
+                    isVisible: true,
+                    content:
+                        panelKind === "board" ? (
+                            <BoardPanel isVisible docId={docId} />
+                        ) : (
+                            <TreeDocumentPanel isVisible docId={docId} />
+                        ),
+                });
+            })}
+
             {isSplit && (
                 <div style={{ order: 1, height: "100%" }}>
                     <DragHandle />
diff --git a/messages/de.json b/messages/de.json
index 2d3cc8c0..20a69cd3 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "Gliederung",
+    "empty": "Sende Szenen und Karten hierher, um deine Geschichte zu gliedern.",
+    "untitled": "Ohne Titel",
+    "unlinked": "Getrennt",
+    "unlinkedHint": "Die Quelle dieses Blocks existiert nicht mehr.",
+    "removeFromOutline": "Aus Gliederung entfernen"
+  },
   "navbar": {
+    "outline": "Gliederung",
     "screenplay": "Drehbuch",
     "board": "Board",
     "titlePage": "Titelseite",
@@ -387,6 +396,7 @@
     "dangerZoneTitle": "Gefahrenzone"
   },
   "contextMenu": {
+    "sendToOutline": "An Gliederung senden",
     "goToScene": "Zur Szene gehen",
     "edit": "Bearbeiten",
     "copy": "Kopieren",
@@ -450,6 +460,7 @@
     }
   },
   "board": {
+    "sendToOutline": "An Gliederung senden",
     "duplicate": "Duplizieren",
     "delete": "Löschen",
     "hints": {
diff --git a/messages/en.json b/messages/en.json
index 97d31a8f..6dcdfedc 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "Outline",
+    "empty": "Send scenes and cards here to start outlining your story.",
+    "untitled": "Untitled",
+    "unlinked": "Unlinked",
+    "unlinkedHint": "The source of this block no longer exists.",
+    "removeFromOutline": "Remove from outline"
+  },
   "navbar": {
+    "outline": "Outline",
     "screenplay": "Screenplay",
     "board": "Board",
     "titlePage": "Title Page",
@@ -386,6 +395,7 @@
     "dangerZoneTitle": "Danger zone"
   },
   "contextMenu": {
+    "sendToOutline": "Send to outline",
     "goToScene": "Go to scene",
     "edit": "Edit",
     "copy": "Copy",
@@ -449,6 +459,7 @@
     }
   },
   "board": {
+    "sendToOutline": "Send to outline",
     "duplicate": "Duplicate",
     "delete": "Delete",
     "hints": {
diff --git a/messages/es.json b/messages/es.json
index 174999f8..449d2c74 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "Esquema",
+    "empty": "Envía escenas y tarjetas aquí para empezar a esquematizar tu historia.",
+    "untitled": "Sin título",
+    "unlinked": "Desvinculado",
+    "unlinkedHint": "La fuente de este bloque ya no existe.",
+    "removeFromOutline": "Quitar del esquema"
+  },
   "navbar": {
+    "outline": "Esquema",
     "screenplay": "Guión",
     "board": "Tablero",
     "titlePage": "Portada",
@@ -386,6 +395,7 @@
     "dangerZoneTitle": "Zona de peligro"
   },
   "contextMenu": {
+    "sendToOutline": "Enviar al esquema",
     "goToScene": "Ir a la escena",
     "edit": "Editar",
     "copy": "Copiar",
@@ -449,6 +459,7 @@
     }
   },
   "board": {
+    "sendToOutline": "Enviar al esquema",
     "duplicate": "Duplicar",
     "delete": "Eliminar",
     "hints": {
diff --git a/messages/fr.json b/messages/fr.json
index e4b22f46..7e11c07b 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "Séquencier",
+    "empty": "Envoyez des scènes et des cartes ici pour commencer à structurer votre histoire.",
+    "untitled": "Sans titre",
+    "unlinked": "Détaché",
+    "unlinkedHint": "La source de ce bloc n'existe plus.",
+    "removeFromOutline": "Retirer du séquencier"
+  },
   "navbar": {
+    "outline": "Séquencier",
     "screenplay": "Scénario",
     "board": "Tableau",
     "titlePage": "Page de titre",
@@ -387,6 +396,7 @@
     "dangerZoneTitle": "Zone dangereuse"
   },
   "contextMenu": {
+    "sendToOutline": "Envoyer vers le séquencier",
     "goToScene": "Aller à la scène",
     "edit": "Modifier",
     "copy": "Copier",
@@ -450,6 +460,7 @@
     }
   },
   "board": {
+    "sendToOutline": "Envoyer vers le séquencier",
     "duplicate": "Dupliquer",
     "delete": "Supprimer",
     "hints": {
diff --git a/messages/ja.json b/messages/ja.json
index 48b4abb3..039fc425 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "アウトライン",
+    "empty": "シーンやカードをここに送って、ストーリーの構成を始めましょう。",
+    "untitled": "無題",
+    "unlinked": "リンク解除",
+    "unlinkedHint": "このブロックの参照元は存在しなくなりました。",
+    "removeFromOutline": "アウトラインから削除"
+  },
   "navbar": {
+    "outline": "アウトライン",
     "screenplay": "脚本",
     "board": "ボード",
     "titlePage": "タイトルページ",
@@ -386,6 +395,7 @@
     "dangerZoneTitle": "危険ゾーン"
   },
   "contextMenu": {
+    "sendToOutline": "アウトラインに送る",
     "goToScene": "シーンへ移動",
     "edit": "編集",
     "copy": "コピー",
@@ -449,6 +459,7 @@
     }
   },
   "board": {
+    "sendToOutline": "アウトラインに送る",
     "duplicate": "複製",
     "delete": "削除",
     "hints": {
diff --git a/messages/ko.json b/messages/ko.json
index d3e612a0..9b4336b2 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "아웃라인",
+    "empty": "장면과 카드를 여기로 보내 이야기 구성을 시작하세요.",
+    "untitled": "제목 없음",
+    "unlinked": "연결 해제됨",
+    "unlinkedHint": "이 블록의 원본이 더 이상 존재하지 않습니다.",
+    "removeFromOutline": "아웃라인에서 제거"
+  },
   "navbar": {
+    "outline": "아웃라인",
     "screenplay": "시나리오",
     "board": "보드",
     "titlePage": "타이틀 페이지",
@@ -386,6 +395,7 @@
     "dangerZoneTitle": "위험 구역"
   },
   "contextMenu": {
+    "sendToOutline": "아웃라인으로 보내기",
     "goToScene": "장면으로 이동",
     "edit": "편집",
     "copy": "복사",
@@ -449,6 +459,7 @@
     }
   },
   "board": {
+    "sendToOutline": "아웃라인으로 보내기",
     "duplicate": "복제",
     "delete": "삭제",
     "hints": {
diff --git a/messages/pl.json b/messages/pl.json
index fb801a1d..f5bf623a 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "Konspekt",
+    "empty": "Wyślij tu sceny i karty, aby rozpocząć tworzenie konspektu historii.",
+    "untitled": "Bez tytułu",
+    "unlinked": "Odłączony",
+    "unlinkedHint": "Źródło tego bloku już nie istnieje.",
+    "removeFromOutline": "Usuń z konspektu"
+  },
   "navbar": {
+    "outline": "Konspekt",
     "screenplay": "Scenariusz",
     "board": "Tablica",
     "titlePage": "Strona tytułowa",
@@ -386,6 +395,7 @@
     "dangerZoneTitle": "Strefa niebezpieczeństwa"
   },
   "contextMenu": {
+    "sendToOutline": "Wyślij do konspektu",
     "goToScene": "Idź do sceny",
     "edit": "Edytuj",
     "copy": "Kopiuj",
@@ -449,6 +459,7 @@
     }
   },
   "board": {
+    "sendToOutline": "Wyślij do konspektu",
     "duplicate": "Powiel",
     "delete": "Usuń",
     "hints": {
diff --git a/messages/zh.json b/messages/zh.json
index 570c97de..d4153ccb 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -1,5 +1,14 @@
 {
+  "outline": {
+    "title": "大纲",
+    "empty": "将场景和卡片发送到这里，开始梳理你的故事大纲。",
+    "untitled": "无标题",
+    "unlinked": "已断开",
+    "unlinkedHint": "此区块的来源已不存在。",
+    "removeFromOutline": "从大纲中移除"
+  },
   "navbar": {
+    "outline": "大纲",
     "screenplay": "剧本",
     "board": "剧本板",
     "titlePage": "扉页",
@@ -386,6 +395,7 @@
     "dangerZoneTitle": "危险区域"
   },
   "contextMenu": {
+    "sendToOutline": "发送到大纲",
     "goToScene": "跳转到场景",
     "edit": "编辑",
     "copy": "复制",
@@ -449,6 +459,7 @@
     }
   },
   "board": {
+    "sendToOutline": "发送到大纲",
     "duplicate": "复制",
     "delete": "删除",
     "hints": {
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index d18fe37d..6dd24902 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -29,6 +29,7 @@ import {
     DEFAULT_SKIPPED_SCENE_LETTERS,
     ShelfEntry,
     DocumentNode,
+    OutlineItem,
     ProjectStatus,
 } from "@src/lib/project/project-state";
 import { Screenplay } from "@src/lib/utils/types";
@@ -158,10 +159,15 @@ export interface ProjectContextType {
 
     // Document tree (folders + editor/board documents)
     documents: Record<string, DocumentNode>;
-    activeDocument: { docId: string; type: "editor" | "board" } | null;
-    setActiveDocument: (v: { docId: string; type: "editor" | "board" } | null) => void;
     documentEditor: Editor | null;
     updateDocumentEditor: (editor: Editor | null) => void;
+
+    // Outline view (project-wide ordered list of scene/card references)
+    outline: Record<string, OutlineItem>;
+    /** A board card to focus next time its board canvas mounts/becomes visible
+     *  (set when navigating to a card from the Outline). Cleared by the canvas. */
+    boardFocusCardId: string | null;
+    setBoardFocusCardId: (cardId: string | null) => void;
 }
 
 // -------------------------------- //
@@ -258,10 +264,12 @@ const defaultContextValue: ProjectContextType = {
     setActiveShelfVersion: () => {},
     // Document tree defaults
     documents: {},
-    activeDocument: null,
-    setActiveDocument: () => {},
     documentEditor: null,
     updateDocumentEditor: () => {},
+    // Outline defaults
+    outline: {},
+    boardFocusCardId: null,
+    setBoardFocusCardId: () => {},
 };
 
 export const ProjectContext = createContext<ProjectContextType>(defaultContextValue);
@@ -394,12 +402,13 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
 
     // Document-tree state
     const [documents, setDocuments] = useState<Record<string, DocumentNode>>({});
-    const [activeDocument, setActiveDocument] = useState<{ docId: string; type: "editor" | "board" } | null>(
-        null,
-    );
     const [documentEditor, setDocumentEditor] = useState<Editor | null>(null);
     const updateDocumentEditor = useCallback((editor: Editor | null) => setDocumentEditor(editor), []);
 
+    // Outline state
+    const [outline, setOutline] = useState<Record<string, OutlineItem>>({});
+    const [boardFocusCardId, setBoardFocusCardId] = useState<string | null>(null);
+
     // Create repository instance when ydoc is available (dynamically imported)
     useEffect(() => {
         if (!ydoc) {
@@ -660,6 +669,12 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setDocuments(docs);
         });
 
+        // Observe outline changes
+        setOutline(repository.outlineItems);
+        const unsubscribeOutline = repository.observeOutline((items) => {
+            setOutline(items);
+        });
+
         return () => {
             repository.unregisterScreenplayCallback(recomputeFromScreenplay);
             unsubscribeLayout();
@@ -671,6 +686,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             unsubscribeMetadata();
             unsubscribeShelf();
             unsubscribeDocuments();
+            unsubscribeOutline();
         };
     }, [repository, updateCharacters, updateLocations, updateScenes, updateScreenplay]);
 
@@ -977,10 +993,11 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             activeShelfVersion,
             setActiveShelfVersion,
             documents,
-            activeDocument,
-            setActiveDocument,
             documentEditor,
             updateDocumentEditor,
+            outline,
+            boardFocusCardId,
+            setBoardFocusCardId,
         }),
         [
             project,
@@ -1056,10 +1073,11 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             activeShelfVersion,
             setActiveShelfVersion,
             documents,
-            activeDocument,
-            setActiveDocument,
             documentEditor,
             updateDocumentEditor,
+            outline,
+            boardFocusCardId,
+            setBoardFocusCardId,
         ],
     );
 
diff --git a/src/context/ViewContext.tsx b/src/context/ViewContext.tsx
index 58375b79..520f3e8a 100644
--- a/src/context/ViewContext.tsx
+++ b/src/context/ViewContext.tsx
@@ -2,12 +2,18 @@
 
 import { createContext, useCallback, useContext, useMemo, useState, ReactNode } from "react";
 
-export type PanelType = "screenplay" | "board" | "statistics" | "title" | "draft" | "document";
+export type PanelType = "screenplay" | "board" | "statistics" | "title" | "draft" | "document" | "outline";
 export type SplitSide = "primary" | "secondary";
 
+/** Panel kinds that display a specific document, and so carry a docId per side. */
+export type DocumentPanelKind = "board" | "document";
+
 interface ViewContextType {
     primaryPanel: PanelType;
     secondaryPanel: PanelType | null;
+    /** Document shown on each side when its panel is a board/editor document. */
+    primaryDocId: string | null;
+    secondaryDocId: string | null;
     splitRatio: number;
     isSplit: boolean;
     visiblePanels: PanelType[];
@@ -24,6 +30,10 @@ interface ViewContextType {
     setFocusedSide: (side: SplitSide) => void;
     setFocusedPanel: (panel: PanelType) => void;
     setSidePanel: (side: SplitSide, panel: PanelType) => void;
+    /** Open a specific document (board/editor) on a given side and focus it. */
+    setSideDocument: (side: SplitSide, docId: string, kind: DocumentPanelKind) => void;
+    /** Clear a document from any side currently showing it (e.g. after delete). */
+    closeDocument: (docId: string) => void;
     swapPanels: () => void;
     setIsEndlessScroll: (value: boolean | ((prev: boolean) => boolean)) => void;
     setShowComments: (value: boolean | ((prev: boolean) => boolean)) => void;
@@ -38,6 +48,10 @@ export const useViewContext = () => useContext(ViewContext);
 export const ViewProvider = ({ children }: { children: ReactNode }) => {
     const [primaryPanel, setPrimaryPanelState] = useState<PanelType>("screenplay");
     const [secondaryPanel, setSecondaryPanelState] = useState<PanelType | null>(null);
+    // Per-side document binding. Only meaningful when the side's panel is a
+    // board/editor document; null for singleton views (screenplay, title, …).
+    const [primaryDocId, setPrimaryDocId] = useState<string | null>(null);
+    const [secondaryDocId, setSecondaryDocId] = useState<string | null>(null);
     const [splitRatio, setSplitRatio] = useState(0.5);
     const [mountedPanels, setMountedPanels] = useState<Set<PanelType>>(() => new Set(["screenplay", "title"]));
     const [focusedSide, setFocusedSideState] = useState<SplitSide>("primary");
@@ -59,9 +73,10 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
         return panels;
     }, [primaryPanel, secondaryPanel]);
 
-    const setPrimaryPanel = useCallback((panel: PanelType) => {
-        setPrimaryPanelState(panel);
-        setSecondaryPanelState(null);
+    // Mount a singleton panel so the keep-alive renderer keeps it in the DOM.
+    // Document panels (board/document) are rendered per-side, so they don't need
+    // a mount entry.
+    const mount = useCallback((panel: PanelType) => {
         setMountedPanels((prev) => {
             if (prev.has(panel)) return prev;
             const next = new Set(prev);
@@ -70,22 +85,29 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
         });
     }, []);
 
+    const setPrimaryPanel = useCallback(
+        (panel: PanelType) => {
+            setPrimaryPanelState(panel);
+            setPrimaryDocId(null);
+            setSecondaryPanelState(null);
+            setSecondaryDocId(null);
+            mount(panel);
+        },
+        [mount],
+    );
+
     const setSecondaryPanel = useCallback(
         (panel: PanelType | null) => {
             if (panel === primaryPanel) return;
             setSecondaryPanelState(panel);
+            setSecondaryDocId(null);
             if (panel) {
-                setMountedPanels((prev) => {
-                    if (prev.has(panel)) return prev;
-                    const next = new Set(prev);
-                    next.add(panel);
-                    return next;
-                });
+                mount(panel);
             } else {
                 setFocusedSideState("primary");
             }
         },
-        [primaryPanel],
+        [primaryPanel, mount],
     );
 
     const setFocusedSide = useCallback(
@@ -98,53 +120,43 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
 
     const setFocusedPanel = useCallback(
         (panel: PanelType) => {
-            // Mount the panel lazily
-            setMountedPanels((prev) => {
-                if (prev.has(panel)) return prev;
-                const next = new Set(prev);
-                next.add(panel);
-                return next;
-            });
+            mount(panel);
 
             if (!secondaryPanel) {
-                // Not split: set as primary
                 setPrimaryPanelState(panel);
+                setPrimaryDocId(null);
                 return;
             }
 
-            // Split mode: update the focused side's panel
             const currentOnFocused = focusedSide === "primary" ? primaryPanel : secondaryPanel;
             if (panel === currentOnFocused) return;
 
             const currentOnOther = focusedSide === "primary" ? secondaryPanel : primaryPanel;
 
             if (panel === currentOnOther) {
-                // Requested panel is on the other side — swap
+                // Requested panel is on the other side — swap both sides (panels + docs).
                 setPrimaryPanelState(secondaryPanel);
                 setSecondaryPanelState(primaryPanel);
+                setPrimaryDocId(secondaryDocId);
+                setSecondaryDocId(primaryDocId);
+            } else if (focusedSide === "primary") {
+                setPrimaryPanelState(panel);
+                setPrimaryDocId(null);
             } else {
-                // Replace the focused side's panel
-                if (focusedSide === "primary") {
-                    setPrimaryPanelState(panel);
-                } else {
-                    setSecondaryPanelState(panel);
-                }
+                setSecondaryPanelState(panel);
+                setSecondaryDocId(null);
             }
         },
-        [focusedSide, primaryPanel, secondaryPanel],
+        [focusedSide, primaryPanel, secondaryPanel, primaryDocId, secondaryDocId, mount],
     );
 
     const setSidePanel = useCallback(
         (side: SplitSide, panel: PanelType) => {
-            setMountedPanels((prev) => {
-                if (prev.has(panel)) return prev;
-                const next = new Set(prev);
-                next.add(panel);
-                return next;
-            });
+            mount(panel);
 
             if (!secondaryPanel) {
                 setPrimaryPanelState(panel);
+                setPrimaryDocId(null);
                 return;
             }
 
@@ -155,26 +167,53 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
             if (panel === currentOnOther) {
                 setPrimaryPanelState(secondaryPanel);
                 setSecondaryPanelState(primaryPanel);
+                setPrimaryDocId(secondaryDocId);
+                setSecondaryDocId(primaryDocId);
             } else if (side === "primary") {
                 setPrimaryPanelState(panel);
+                setPrimaryDocId(null);
             } else {
                 setSecondaryPanelState(panel);
+                setSecondaryDocId(null);
             }
         },
-        [primaryPanel, secondaryPanel],
+        [primaryPanel, secondaryPanel, primaryDocId, secondaryDocId, mount],
     );
 
+    const setSideDocument = useCallback((side: SplitSide, docId: string, kind: DocumentPanelKind) => {
+        // Documents can live on both sides simultaneously (e.g. two boards), so
+        // this sets the side's panel + doc directly without the de-duplication
+        // swap logic that the singleton setters use.
+        if (side === "primary") {
+            setPrimaryPanelState(kind);
+            setPrimaryDocId(docId);
+        } else {
+            setSecondaryPanelState(kind);
+            setSecondaryDocId(docId);
+        }
+        setFocusedSideState(side);
+    }, []);
+
+    const closeDocument = useCallback((docId: string) => {
+        setPrimaryDocId((prev) => (prev === docId ? null : prev));
+        setSecondaryDocId((prev) => (prev === docId ? null : prev));
+    }, []);
+
     const swapPanels = useCallback(() => {
         if (!secondaryPanel) return;
         setPrimaryPanelState(secondaryPanel);
         setSecondaryPanelState(primaryPanel);
+        setPrimaryDocId(secondaryDocId);
+        setSecondaryDocId(primaryDocId);
         setFocusedSideState((prev) => (prev === "primary" ? "secondary" : "primary"));
-    }, [primaryPanel, secondaryPanel]);
+    }, [primaryPanel, secondaryPanel, primaryDocId, secondaryDocId]);
 
     const value = useMemo(
         () => ({
             primaryPanel,
             secondaryPanel,
+            primaryDocId,
+            secondaryDocId,
             splitRatio,
             isSplit,
             visiblePanels,
@@ -191,13 +230,15 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
             setFocusedSide,
             setFocusedPanel,
             setSidePanel,
+            setSideDocument,
+            closeDocument,
             swapPanels,
             setIsEndlessScroll,
             setShowComments,
             setLeftSidebarOpen,
             setRightSidebarOpen,
         }),
-        [primaryPanel, secondaryPanel, splitRatio, isSplit, visiblePanels, mountedPanels, focusedSide, focusedPanel, isEndlessScroll, showComments, leftSidebarOpen, rightSidebarOpen, setPrimaryPanel, setSecondaryPanel, setFocusedSide, setFocusedPanel, setSidePanel, swapPanels, setIsEndlessScroll, setShowComments],
+        [primaryPanel, secondaryPanel, primaryDocId, secondaryDocId, splitRatio, isSplit, visiblePanels, mountedPanels, focusedSide, focusedPanel, isEndlessScroll, showComments, leftSidebarOpen, rightSidebarOpen, setPrimaryPanel, setSecondaryPanel, setFocusedSide, setFocusedPanel, setSidePanel, setSideDocument, closeDocument, swapPanels, setIsEndlessScroll, setShowComments],
     );
 
     return <ViewContext.Provider value={value}>{children}</ViewContext.Provider>;
diff --git a/src/lib/document-tree/document-tree-config.ts b/src/lib/document-tree/document-tree-config.ts
index 9b1f5a0c..61d8dac8 100644
--- a/src/lib/document-tree/document-tree-config.ts
+++ b/src/lib/document-tree/document-tree-config.ts
@@ -9,6 +9,7 @@ import { BASE_EXTENSIONS } from "../screenplay/editor";
 export function createDocumentTreeConfig(docId: string): DocumentEditorConfig {
     return {
         type: "screenplay",
+        documentId: docId,
         baseExtensions: BASE_EXTENSIONS,
         getFragment: (s) => s.documentFragment(docId),
         getCommentsMap: () => null,
diff --git a/src/lib/editor/document-editor-config.ts b/src/lib/editor/document-editor-config.ts
index b1a61dda..9c512b3d 100644
--- a/src/lib/editor/document-editor-config.ts
+++ b/src/lib/editor/document-editor-config.ts
@@ -1,6 +1,6 @@
 import * as Y from "yjs";
 import type { AnyExtension } from "@tiptap/core";
-import { ProjectState } from "@src/lib/project/project-state";
+import { MAIN_SCREENPLAY_REF, ProjectState } from "@src/lib/project/project-state";
 import type { Comment } from "@src/lib/utils/types";
 import { BASE_EXTENSIONS } from "@src/lib/screenplay/editor";
 import { TITLEPAGE_BASE_EXTENSIONS } from "@src/lib/titlepage/editor";
@@ -41,6 +41,13 @@ export interface DocumentEditorFeatures {
 export interface DocumentEditorConfig {
     /** Logical type for conditional behaviour in the hook/panel. */
     type: "screenplay" | "title";
+    /**
+     * Identifier of the document this editor edits, used to attribute scenes
+     * sent to the Outline. `MAIN_SCREENPLAY_REF` for the main screenplay, the
+     * document-tree node id for editor documents, `undefined` otherwise (drafts,
+     * title page) — those cannot send scenes to the Outline.
+     */
+    documentId?: string;
     /** Base Tiptap extensions (defines the ProseMirror schema). */
     baseExtensions: AnyExtension[];
     /**
@@ -60,6 +67,7 @@ export interface DocumentEditorConfig {
 
 export const SCREENPLAY_EDITOR_CONFIG: DocumentEditorConfig = {
     type: "screenplay",
+    documentId: MAIN_SCREENPLAY_REF,
     baseExtensions: BASE_EXTENSIONS,  // CommentMark added dynamically by hook when features.comments=true
     getFragment: (s) => s.screenplayFragment(),
     getCommentsMap: (s) => s.comments(),
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index 59477a48..596b2692 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -192,6 +192,49 @@ export type DocumentNode = {
     title: string;
     parentId: string | null;
     order: number;
+    /** Optional accent color (hex) set via the sidebar right-click color picker. */
+    color?: string;
+};
+
+// -------------------------------- //
+//            OUTLINE               //
+// -------------------------------- //
+
+/**
+ * Kind of source element an outline block references. Extensible — board cards
+ * will later come in image/voice/link flavours, which become new source kinds
+ * without a schema rewrite.
+ */
+export type OutlineItemSource = "scene" | "card";
+
+/**
+ * Sentinel `refDocId` for scenes that live in the project's main screenplay
+ * fragment (as opposed to a per-document `editor` fragment).
+ */
+export const MAIN_SCREENPLAY_REF = "screenplay";
+
+/**
+ * A block in the project's Outline view. Like the document tree, the outline is
+ * stored flat in the `outline` Y.Map keyed by `id`; hierarchy is reconstructed
+ * from `parentId`, siblings ordered by ascending `order` (fractional float so
+ * moves never rewrite neighbours). Any block can nest children.
+ *
+ * Each block references a live source element via (`source`, `refDocId`,
+ * `refId`); `title`/`preview`/`color` are a cached snapshot kept in sync by the
+ * Outline view's resolver and shown (greyed) when the source no longer exists.
+ */
+export type OutlineItem = {
+    id: string;
+    parentId: string | null;
+    order: number;
+    source: OutlineItemSource;
+    /** card: board docId · scene: MAIN_SCREENPLAY_REF or the editor doc id. */
+    refDocId: string;
+    /** card: card id · scene: scene heading `data-id`. */
+    refId: string;
+    title: string;
+    preview: string;
+    color?: string;
 };
 
 // -------------------------------- //
@@ -207,6 +250,7 @@ export type ProjectData = {
     locations: Record<string, LocationItem>;
     metadata: ProjectMetadata;
     documents?: Record<string, DocumentNode>;
+    outline?: Record<string, OutlineItem>;
     layout: LayoutData;
     production: ProductionData;
     comments?: Record<string, Comment>;
@@ -243,6 +287,7 @@ export class ProjectState extends Y.Doc {
         LOCATIONS: "locations",
         METADATA: "metadata",
         DOCUMENTS: "documents",
+        OUTLINE: "outline",
         LAYOUT: "layout",
         PRODUCTION: "production",
         COMMENTS: "comments",
@@ -293,6 +338,11 @@ export class ProjectState extends Y.Doc {
         return this.getMap(this.KEYS.DOCUMENTS);
     }
 
+    /** Outline blocks keyed by block id. */
+    outline(): Y.Map<OutlineItem> {
+        return this.getMap(this.KEYS.OUTLINE);
+    }
+
     /** Content fragment for an `editor` document node. */
     documentFragment(docId: string): Y.XmlFragment {
         return this.getXmlFragment(`doc_${docId}`);
diff --git a/src/lib/project/project-repository.ts b/src/lib/project/project-repository.ts
index abededee..f1f30b63 100644
--- a/src/lib/project/project-repository.ts
+++ b/src/lib/project/project-repository.ts
@@ -14,11 +14,12 @@ import {
     ShelfEntryType,
     ShelfVersionMeta,
     DocumentNode,
+    OutlineItem,
     screenplayOf,
 } from "./project-state";
 import { CharacterMap } from "../screenplay/characters";
 import { LocationMap } from "../screenplay/locations";
-import { PersistentScene, PersistentSceneMap } from "../screenplay/scenes";
+import { computeSceneItems, PersistentScene, PersistentSceneMap, TransientScene } from "../screenplay/scenes";
 import { PersistentPage, PersistentPageMap } from "../screenplay/page-locking";
 import { PageFormat } from "../utils/enums";
 import { generateNodeId } from "../screenplay/nodes";
@@ -798,6 +799,15 @@ export class ProjectRepository {
         map.set(id, { ...node, title });
     }
 
+    /** Set (or clear, with `undefined`) a document node's accent color. */
+    setDocumentColor(id: string, color: string | undefined): void {
+        if (this.guardWrite("setDocumentColor")) return;
+        const map = this.ydoc.documents();
+        const node = map.get(id) as DocumentNode | undefined;
+        if (!node) return;
+        map.set(id, { ...node, color });
+    }
+
     /**
      * Move a node under a new parent at the given fractional order. No-ops on a
      * move that would create a cycle (into itself or one of its descendants).
@@ -848,6 +858,127 @@ export class ProjectRepository {
             }
         });
     }
+
+    // -------------------------------- //
+    //            OUTLINE               //
+    // -------------------------------- //
+
+    /** All outline blocks keyed by block id. */
+    get outlineItems(): Record<string, OutlineItem> {
+        return this.ydoc.outline().toJSON() as Record<string, OutlineItem>;
+    }
+
+    observeOutline(callback: (outline: Record<string, OutlineItem>) => void): () => void {
+        const map = this.ydoc.outline();
+        const observer = () => callback(map.toJSON() as Record<string, OutlineItem>);
+        map.observe(observer);
+        return () => map.unobserve(observer);
+    }
+
+    /** Append position = one past the greatest order among the parent's children. */
+    private nextOutlineOrder(parentId: string | null): number {
+        let max = -1;
+        this.ydoc.outline().forEach((item) => {
+            if (item.parentId === parentId && item.order > max) max = item.order;
+        });
+        return max + 1;
+    }
+
+    /** Is `ancestorId` an ancestor of `itemId`? Used to block cyclic moves. */
+    private isOutlineAncestor(itemId: string, ancestorId: string): boolean {
+        const map = this.ydoc.outline();
+        const seen = new Set<string>();
+        let cur = map.get(itemId) as OutlineItem | undefined;
+        while (cur && cur.parentId) {
+            if (seen.has(cur.id)) break;
+            seen.add(cur.id);
+            if (cur.parentId === ancestorId) return true;
+            cur = map.get(cur.parentId) as OutlineItem | undefined;
+        }
+        return false;
+    }
+
+    /**
+     * Add a block to the outline at the end of the root (or a given parent).
+     * De-duplicates: if a block already references the same source element, the
+     * existing block's id is returned and nothing is added.
+     */
+    addOutlineItem(item: Omit<OutlineItem, "id" | "order">): string {
+        if (this.guardWrite("addOutlineItem")) return "";
+        const map = this.ydoc.outline();
+
+        let existingId = "";
+        map.forEach((existing) => {
+            if (
+                existing.source === item.source &&
+                existing.refDocId === item.refDocId &&
+                existing.refId === item.refId
+            ) {
+                existingId = existing.id;
+            }
+        });
+        if (existingId) return existingId;
+
+        const id = uuidv7();
+        map.set(id, { ...item, id, order: this.nextOutlineOrder(item.parentId ?? null) });
+        return id;
+    }
+
+    /**
+     * Move a block under a new parent at the given fractional order. No-ops on a
+     * move that would create a cycle (into itself or one of its descendants).
+     */
+    moveOutlineItem(id: string, newParentId: string | null, order: number): void {
+        if (this.guardWrite("moveOutlineItem")) return;
+        const map = this.ydoc.outline();
+        const item = map.get(id) as OutlineItem | undefined;
+        if (!item) return;
+        if (newParentId !== null && (newParentId === id || this.isOutlineAncestor(newParentId, id))) {
+            return;
+        }
+        map.set(id, { ...item, parentId: newParentId, order });
+    }
+
+    /** Patch the cached display snapshot of a block (title/preview/color). */
+    refreshOutlineSnapshot(id: string, snapshot: Pick<OutlineItem, "title" | "preview" | "color">): void {
+        if (this.guardWrite("refreshOutlineSnapshot")) return;
+        const map = this.ydoc.outline();
+        const item = map.get(id) as OutlineItem | undefined;
+        if (!item) return;
+        map.set(id, { ...item, ...snapshot });
+    }
+
+    /**
+     * Remove a block from the outline. Its children are promoted to the removed
+     * block's parent so other referenced beats are not destroyed.
+     */
+    deleteOutlineItem(id: string): void {
+        if (this.guardWrite("deleteOutlineItem")) return;
+        const map = this.ydoc.outline();
+        const target = map.get(id) as OutlineItem | undefined;
+        if (!target) return;
+
+        this.ydoc.transact(() => {
+            map.forEach((child) => {
+                if (child.parentId === id) {
+                    map.set(child.id, { ...child, parentId: target.parentId });
+                }
+            });
+            map.delete(id);
+        });
+    }
+
+    /**
+     * Parse an `editor` document's content into transient scenes (heading text +
+     * preview + position), so the outline can resolve scene references that live
+     * in document-tree editor docs rather than the main screenplay.
+     */
+    getEditorDocumentScenes(docId: string): TransientScene[] {
+        const fragment = this.ydoc.documentFragment(docId);
+        const root = yXmlFragmentToProseMirrorRootNode(fragment, ScreenplaySchema);
+        const content = root.content.toJSON() as Screenplay;
+        return computeSceneItems(content);
+    }
 }
 
 /**
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 9992d9c7..d033c1c7 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -24,6 +24,7 @@ export {
     DEFAULT_ELEMENT_STYLES,
     DEFAULT_SKIPPED_SCENE_LETTERS,
     TOGGLEABLE_SCENE_LETTERS,
+    MAIN_SCREENPLAY_REF,
 } from "./project-doc";
 export type {
     ShelfEntryType,
@@ -40,6 +41,8 @@ export type {
     BoardData,
     DocumentNode,
     DocumentNodeType,
+    OutlineItem,
+    OutlineItemSource,
     ProjectData,
     TypedMap,
 } from "./project-doc";
diff --git a/src/lib/utils/colors.ts b/src/lib/utils/colors.ts
new file mode 100644
index 00000000..4b93aaf4
--- /dev/null
+++ b/src/lib/utils/colors.ts
@@ -0,0 +1,16 @@
+/**
+ * Shared color palette offered in the right-click color pickers (board cards,
+ * document-tree items, …). Keeping one source of truth means every picker shows
+ * the same swatches.
+ */
+export const DEFAULT_ITEM_COLORS = [
+    "#ef4444", // red
+    "#f97316", // orange
+    "#eab308", // yellow
+    "#22c55e", // green
+    "#06b6d4", // cyan
+    "#3b82f6", // blue
+    "#8b5cf6", // purple
+    "#ec4899", // pink
+    "#6b7280", // gray
+];

From 6f40b47ee45d7996602b5842497bafc381350798 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Wed, 10 Jun 2026 04:12:30 +0200
Subject: [PATCH 64/76] refactored view options, improved panel splitting
 behaviour, fixed element margins in endless scroll mode

---
 components/board/BoardCanvas.module.css       |  38 ++-
 components/board/BoardCanvas.tsx              |   4 +-
 components/editor/DocumentEditorPanel.tsx     |  10 +
 .../editor/sidebar/DocumentTreeItem.tsx       |   6 +-
 .../sidebar/DocumentTreeSidebarView.tsx       |   9 +-
 .../EditorSidebarNavigation.module.css        |   2 +-
 components/navbar/ProductionPanel.module.css  |  32 +-
 components/navbar/ProductionPanel.tsx         |  55 ++--
 components/navbar/ViewOptionsDropdown.tsx     |  76 +----
 components/project/EditorFooter.module.css    |  65 ++++
 components/project/EditorFooter.tsx           | 147 +++++++++
 components/project/ProjectWorkspace.tsx       |   4 +
 .../project/SplitPanelContainer.module.css    |  13 +
 components/project/SplitPanelContainer.tsx    | 129 +++-----
 components/project/WritingTimer.module.css    | 223 +++++++++++++
 components/project/WritingTimer.tsx           | 304 ++++++++++++++++++
 messages/de.json                              |  13 +-
 messages/en.json                              |  13 +-
 messages/es.json                              |  13 +-
 messages/fr.json                              |  13 +-
 messages/ja.json                              |  13 +-
 messages/ko.json                              |  13 +-
 messages/pl.json                              |  13 +-
 messages/zh.json                              |  13 +-
 src/context/ProjectContext.tsx                |  14 +-
 src/context/ViewContext.tsx                   |  28 +-
 styles/scriptio.css                           |  11 +-
 27 files changed, 1044 insertions(+), 230 deletions(-)
 create mode 100644 components/project/EditorFooter.module.css
 create mode 100644 components/project/EditorFooter.tsx
 create mode 100644 components/project/WritingTimer.module.css
 create mode 100644 components/project/WritingTimer.tsx

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index 157042be..e943ad0e 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -285,18 +285,24 @@
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3);
 }
 
-/* Zoom controls - matching navbar button style */
+/* Zoom controls - styled like the panel switcher buttons (secondary pill, no
+   border, secondary-hover on hover) and sitting in the same top toolbar row,
+   just to their right. The anchor is at top:8/left:8; the primary side has two
+   20px buttons + 4px gap ending ~52px, so left:56px keeps a matching 4px gap.
+   z-index sits above the board's top shadow gradient (z-index:10). */
 .zoom_controls {
     position: absolute;
-    bottom: 24px;
-    left: 24px;
+    top: 8px;
+    left: 56px;
+    z-index: 11;
     display: flex;
     align-items: center;
-    gap: 4px;
-    padding: 6px 12px;
-    border-radius: 64px;
-    border: 2px solid var(--tertiary);
+    gap: 2px;
+    height: 36px;
+    padding: 0 4px;
+    border-radius: 16px;
     background-color: var(--secondary);
+    color: var(--secondary-text);
     user-select: none;
 }
 
@@ -304,36 +310,36 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 28px;
+    width: 26px;
     height: 28px;
     border: none;
-    border-radius: 50%;
+    border-radius: 14px;
     background: transparent;
-    color: var(--primary-text);
+    color: var(--secondary-text);
     cursor: pointer;
     transition: background-color 0.15s ease;
 }
 
 .zoom_btn:hover {
-    background-color: var(--tertiary);
+    background-color: var(--secondary-hover);
 }
 
 .zoom_level {
-    min-width: 50px;
+    min-width: 38px;
     text-align: center;
-    font-size: 13px;
-    color: var(--primary-text);
+    font-size: 12px;
     font-weight: 500;
+    color: var(--secondary-text);
 }
 
 /* Hints in corner with low opacity */
 .hints {
     position: absolute;
     bottom: 24px;
-    right: 24px;
+    left: 24px;
     display: flex;
     flex-direction: column;
-    align-items: flex-end;
+    align-items: flex-start;
     gap: 4px;
     font-size: 12px;
     color: var(--secondary-text);
diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index 9927b30d..ad1ed280 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -989,11 +989,11 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
 
                 <div className={styles.zoom_controls}>
                     <button className={styles.zoom_btn} onClick={() => zoomFromCenter(false)}>
-                        <Minus />
+                        <Minus size={14} />
                     </button>
                     <span className={styles.zoom_level}>{Math.round(scale * 100)}%</span>
                     <button className={styles.zoom_btn} onClick={() => zoomFromCenter(true)}>
-                        <Plus />
+                        <Plus size={14} />
                     </button>
                 </div>
 
diff --git a/components/editor/DocumentEditorPanel.tsx b/components/editor/DocumentEditorPanel.tsx
index 60a053a6..0ebdd658 100644
--- a/components/editor/DocumentEditorPanel.tsx
+++ b/components/editor/DocumentEditorPanel.tsx
@@ -139,6 +139,16 @@ const DocumentEditorPanel = ({
         editor.setEditable(!isReadOnly);
     }, [editor, isReadOnly]);
 
+    // Marker class on the editor DOM so global CSS (scriptio.css) can drop the
+    // first-of-page top-margin reset in endless-scroll mode. There the page-break
+    // widgets are hidden, so the reset would otherwise make each page's first
+    // node stick to the previous page's content.
+    useEffect(() => {
+        const el = editor?.view?.dom;
+        if (!el) return;
+        el.classList.toggle("endless-scroll", isEndlessScroll);
+    }, [editor, isEndlessScroll]);
+
     // Ready state
     useEffect(() => {
         if (editor && isYjsReady) {
diff --git a/components/editor/sidebar/DocumentTreeItem.tsx b/components/editor/sidebar/DocumentTreeItem.tsx
index 4960f132..0c5ceaea 100644
--- a/components/editor/sidebar/DocumentTreeItem.tsx
+++ b/components/editor/sidebar/DocumentTreeItem.tsx
@@ -161,7 +161,11 @@ const DocumentTreeItem = ({
                 ) : (
                     <span className={styles.chevron_placeholder} />
                 )}
-                <Icon size={14} className={styles.type_icon} />
+                <Icon
+                    size={14}
+                    className={styles.type_icon}
+                    style={node.color ? { color: node.color } : undefined}
+                />
 
                 {isRenaming ? (
                     <input
diff --git a/components/editor/sidebar/DocumentTreeSidebarView.tsx b/components/editor/sidebar/DocumentTreeSidebarView.tsx
index c1a4de20..b8bb12c0 100644
--- a/components/editor/sidebar/DocumentTreeSidebarView.tsx
+++ b/components/editor/sidebar/DocumentTreeSidebarView.tsx
@@ -77,9 +77,12 @@ const DocumentTreeSidebarView = () => {
         (parentId: string | null, type: "folder" | "editor" | "board") => {
             if (!repository) return;
             if (parentId) setExpanded((prev) => new Set(prev).add(parentId));
-            if (type === "folder") repository.createFolder(t("untitledFolder"), parentId);
-            else if (type === "board") repository.createBoardDocument(t("boardTitle"), parentId);
-            else repository.createEditorDocument(t("untitledDocument"), parentId);
+            let id: string;
+            if (type === "folder") id = repository.createFolder(t("untitledFolder"), parentId);
+            else if (type === "board") id = repository.createBoardDocument(t("boardTitle"), parentId);
+            else id = repository.createEditorDocument(t("untitledDocument"), parentId);
+            // Drop the new node straight into inline rename so the writer can name it instantly.
+            if (id) setRenamingId(id);
         },
         [repository, t],
     );
diff --git a/components/editor/sidebar/EditorSidebarNavigation.module.css b/components/editor/sidebar/EditorSidebarNavigation.module.css
index d10e97fa..30118f7a 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.module.css
+++ b/components/editor/sidebar/EditorSidebarNavigation.module.css
@@ -10,7 +10,7 @@
     display: flex;
     flex-direction: column;
     gap: 20px;
-    padding: 0 15px 30px 30px;
+    padding: 0 15px 20px 30px;
     width: var(--navigation-sidebar-width);
     min-height: 0;
     overflow: hidden;
diff --git a/components/navbar/ProductionPanel.module.css b/components/navbar/ProductionPanel.module.css
index 0de9f091..db741973 100644
--- a/components/navbar/ProductionPanel.module.css
+++ b/components/navbar/ProductionPanel.module.css
@@ -9,7 +9,9 @@
     display: flex;
     flex-direction: column;
     border-radius: 16px;
-    overflow: hidden;
+    /* Not `hidden`: the revision dropdown menu in the last section needs to
+       extend past the panel's bottom edge without being clipped. */
+    overflow: visible;
 }
 
 .header {
@@ -162,19 +164,27 @@
     cursor: not-allowed;
 }
 
-/* Revision swatches */
-.swatches {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 6px;
+/* Revision color dropdown */
+.revision_select {
     margin-top: 10px;
+    padding: 8px 12px;
+    font-size: 0.85rem;
+    background: var(--secondary);
+    border: 1px solid var(--separator);
+    border-radius: 8px;
+    color: var(--primary-text);
 }
 
-.swatch {
-    width: 18px;
-    height: 18px;
+.revision_option {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
+.revision_dot {
+    width: 14px;
+    height: 14px;
     border-radius: 50%;
     border: 1px solid var(--separator);
-    opacity: 0.5;
-    cursor: not-allowed;
+    flex-shrink: 0;
 }
diff --git a/components/navbar/ProductionPanel.tsx b/components/navbar/ProductionPanel.tsx
index b2297d47..d00b815e 100644
--- a/components/navbar/ProductionPanel.tsx
+++ b/components/navbar/ProductionPanel.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
 import { X, BookOpen, Clapperboard, PencilLine, Settings } from "lucide-react";
 
@@ -12,6 +12,7 @@ import { computeSceneItems } from "@src/lib/screenplay/scenes";
 import { unlockDraftPopup, unlockPagesPopup, unlockScenesPopup } from "@src/lib/screenplay/popup";
 import { getPageAnchors, getPageAnchorInfo } from "@src/lib/screenplay/extensions/pagination-extension";
 import Switch from "@components/utils/Switch";
+import Dropdown, { DropdownOption } from "@components/utils/Dropdown";
 
 import styles from "./ProductionPanel.module.css";
 
@@ -20,16 +21,18 @@ interface ProductionPanelProps {
     onClose: () => void;
 }
 
-const REVISION_COLORS = [
-    "#ffffff", // white
-    "#bbdfff", // blue
-    "#ffb6c1", // pink
-    "#ffea7a", // yellow
-    "#a5d6a7", // green
-    "#d4a017", // goldenrod
-    "#e0c58b", // buff
-    "#fa8072", // salmon
-    "#9b1c2a", // cherry
+// Standard production revision color order. Names stay in English on purpose —
+// they're surfaced verbatim in the printed page headers.
+const REVISION_COLORS: { name: string; value: string }[] = [
+    { name: "White", value: "#ffffff" },
+    { name: "Blue", value: "#bbdfff" },
+    { name: "Pink", value: "#ffb6c1" },
+    { name: "Yellow", value: "#ffea7a" },
+    { name: "Green", value: "#a5d6a7" },
+    { name: "Goldenrod", value: "#d4a017" },
+    { name: "Buff", value: "#e0c58b" },
+    { name: "Salmon", value: "#fa8072" },
+    { name: "Cherry", value: "#9b1c2a" },
 ];
 
 const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
@@ -52,6 +55,20 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
 
     const panelRef = useRef<HTMLDivElement>(null);
 
+    // Revisions are inert in v1: this only tracks the previewed color locally
+    // until revision tracking is wired to the repository.
+    const [revisionColor, setRevisionColor] = useState(REVISION_COLORS[0].name);
+
+    const revisionOptions: DropdownOption[] = REVISION_COLORS.map((c) => ({
+        value: c.name,
+        label: (
+            <span className={styles.revision_option}>
+                <span className={styles.revision_dot} style={{ backgroundColor: c.value }} />
+                {c.name}
+            </span>
+        ),
+    }));
+
     const handleOpenSettings = () => {
         onClose();
         openDashboard("Production");
@@ -424,16 +441,12 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                     </div>
                     <Switch checked={false} onChange={() => {}} ariaLabel={t("revisions")} />
                 </div>
-                <div className={styles.swatches}>
-                    {REVISION_COLORS.map((color, idx) => (
-                        <span
-                            key={idx}
-                            className={styles.swatch}
-                            style={{ backgroundColor: color }}
-                            aria-disabled
-                        />
-                    ))}
-                </div>
+                <Dropdown
+                    value={revisionColor}
+                    onChange={setRevisionColor}
+                    options={revisionOptions}
+                    className={styles.revision_select}
+                />
             </div>
         </div>
     );
diff --git a/components/navbar/ViewOptionsDropdown.tsx b/components/navbar/ViewOptionsDropdown.tsx
index 4684915c..78e77d81 100644
--- a/components/navbar/ViewOptionsDropdown.tsx
+++ b/components/navbar/ViewOptionsDropdown.tsx
@@ -1,16 +1,10 @@
 "use client";
 
-import { useContext, useState, useRef, useEffect, useCallback } from "react";
+import { useState, useRef, useEffect, useCallback } from "react";
 import { useTranslations } from "next-intl";
-import { UserContext } from "@src/context/UserContext";
 import { PanelType, useViewContext } from "@src/context/ViewContext";
 import {
     ChevronDown,
-    Scroll,
-    MessageSquare,
-    MessageSquareOff,
-    Maximize,
-    Minimize,
     PanelRight,
     PanelRightClose,
     ArrowLeftRight,
@@ -22,14 +16,7 @@ import styles from "./ViewOptionsDropdown.module.css";
 
 const ViewOptionsDropdown = () => {
     const t = useTranslations("navbar");
-    const { isZenMode, updateIsZenMode } = useContext(UserContext);
     const {
-        isEndlessScroll,
-        setIsEndlessScroll,
-        showComments,
-        setShowComments,
-        setLeftSidebarOpen,
-        setRightSidebarOpen,
         isSplit,
         primaryPanel,
         setSecondaryPanel,
@@ -50,7 +37,6 @@ const ViewOptionsDropdown = () => {
     }, [isSplit, primaryPanel, setSecondaryPanel]);
 
     const [isOpen, setIsOpen] = useState(false);
-    const sidebarsBeforeFocus = useRef<{ left: boolean; right: boolean } | null>(null);
     const dropdownRef = useRef<HTMLDivElement>(null);
 
     // Close dropdown when clicking outside
@@ -67,41 +53,6 @@ const ViewOptionsDropdown = () => {
         return () => window.removeEventListener("mousedown", handleClickOutside);
     }, [isOpen]);
 
-    const enterFocusMode = useCallback(() => {
-        setLeftSidebarOpen((prev) => {
-            setRightSidebarOpen((prevRight) => {
-                sidebarsBeforeFocus.current = { left: prev, right: prevRight };
-                return false;
-            });
-            return false;
-        });
-        updateIsZenMode(true);
-        document.documentElement.requestFullscreen?.();
-    }, [updateIsZenMode, setLeftSidebarOpen, setRightSidebarOpen]);
-
-    const exitFocusMode = useCallback(() => {
-        updateIsZenMode(false);
-        if (document.fullscreenElement) {
-            document.exitFullscreen();
-        }
-        if (sidebarsBeforeFocus.current) {
-            setLeftSidebarOpen(sidebarsBeforeFocus.current.left);
-            setRightSidebarOpen(sidebarsBeforeFocus.current.right);
-            sidebarsBeforeFocus.current = null;
-        }
-    }, [updateIsZenMode, setLeftSidebarOpen, setRightSidebarOpen]);
-
-    // Sync zen mode state when user exits fullscreen via Escape
-    useEffect(() => {
-        const onFullscreenChange = () => {
-            if (!document.fullscreenElement && isZenMode) {
-                exitFocusMode();
-            }
-        };
-        document.addEventListener("fullscreenchange", onFullscreenChange);
-        return () => document.removeEventListener("fullscreenchange", onFullscreenChange);
-    }, [isZenMode, exitFocusMode]);
-
     return (
         <div className={styles.container} ref={dropdownRef}>
             <button className={styles.trigger} onClick={() => setIsOpen(!isOpen)}>
@@ -124,31 +75,6 @@ const ViewOptionsDropdown = () => {
                         <ListTree size={16} />
                         <span className={styles.item_label}>{t("outline")}</span>
                     </button>
-                    <button
-                        className={`${styles.dropdown_item} ${isEndlessScroll ? styles.dropdown_item_active : ""}`}
-                        onClick={() => setIsEndlessScroll(!isEndlessScroll)}
-                    >
-                        <Scroll size={16} />
-                        <span className={styles.item_label}>{t("endlessScroll")}</span>
-                    </button>
-                    <button
-                        className={`${styles.dropdown_item} ${!showComments ? styles.dropdown_item_active : ""}`}
-                        onClick={() => setShowComments(!showComments)}
-                    >
-                        {showComments ? (
-                            <MessageSquare size={16} />
-                        ) : (
-                            <MessageSquareOff size={16} />
-                        )}
-                        <span className={styles.item_label}>{t("toggleComments")}</span>
-                    </button>
-                    <button
-                        className={`${styles.dropdown_item} ${isZenMode ? styles.dropdown_item_active : ""}`}
-                        onClick={isZenMode ? exitFocusMode : enterFocusMode}
-                    >
-                        {isZenMode ? <Minimize size={16} /> : <Maximize size={16} />}
-                        <span className={styles.item_label}>{t("focusMode")}</span>
-                    </button>
                     <button
                         className={`${styles.dropdown_item} ${isSplit ? styles.dropdown_item_active : ""}`}
                         onClick={handleSplitToggle}
diff --git a/components/project/EditorFooter.module.css b/components/project/EditorFooter.module.css
new file mode 100644
index 00000000..10d619cf
--- /dev/null
+++ b/components/project/EditorFooter.module.css
@@ -0,0 +1,65 @@
+/* Rounded pill floating over the bottom-right corner of the panel area (just
+   inside the right sidebar). It overlays the content — no full-width bar. */
+.bubble_right {
+    position: absolute;
+    bottom: 20px;
+    right: 16px;
+    z-index: 6;
+    display: flex;
+    align-items: center;
+    gap: 2px;
+    padding: 3px 5px;
+    background-color: var(--secondary);
+    border-radius: 18px;
+    box-shadow: var(--panel-shadow);
+    color: var(--secondary-text);
+    font-size: 11px;
+    user-select: none;
+}
+
+/* Page-count readout, sitting left of the action icons. */
+.pages {
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    padding: 0 8px 0 6px;
+    white-space: nowrap;
+}
+
+.divider {
+    width: 1px;
+    align-self: stretch;
+    margin: 4px 3px;
+    background-color: var(--separator);
+}
+
+.action {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 24px;
+    padding: 0;
+    border: none;
+    border-radius: 14px;
+    background: transparent;
+    color: var(--secondary-text);
+    cursor: pointer;
+    opacity: 0.7;
+    transition:
+        opacity 0.15s ease,
+        background-color 0.15s ease,
+        color 0.15s ease;
+}
+
+.action:hover {
+    opacity: 1;
+    background-color: var(--secondary-hover);
+    color: var(--primary-text);
+}
+
+.action_active {
+    opacity: 1;
+    color: var(--primary-text);
+    background-color: var(--secondary-hover);
+}
diff --git a/components/project/EditorFooter.tsx b/components/project/EditorFooter.tsx
new file mode 100644
index 00000000..be03ceec
--- /dev/null
+++ b/components/project/EditorFooter.tsx
@@ -0,0 +1,147 @@
+"use client";
+
+import { useCallback, useContext, useEffect, useRef, useState } from "react";
+import { useTranslations } from "next-intl";
+import type { Editor } from "@tiptap/react";
+import { FileText, Maximize, MessageSquare, MessageSquareOff, Minimize, Scroll } from "lucide-react";
+
+import { ProjectContext } from "@src/context/ProjectContext";
+import { UserContext } from "@src/context/UserContext";
+import { useViewContext } from "@src/context/ViewContext";
+import { paginationKey } from "@src/lib/screenplay/extensions/pagination-extension";
+import { join } from "@src/lib/utils/misc";
+import WritingTimer from "./WritingTimer";
+
+import styles from "./EditorFooter.module.css";
+
+/**
+ * Track the screenplay's page count by reading the pagination plugin state.
+ * Page count = number of page breaks + 1. Recomputed on every transaction
+ * (cheap field read), but state only changes when the count actually does, so
+ * the footer re-renders rarely.
+ */
+const useScreenplayPageCount = (editor: Editor | null): number | null => {
+    const [count, setCount] = useState<number | null>(null);
+
+    useEffect(() => {
+        // No editor yet: `count` starts null, and the footer unmounts alongside
+        // the editor, so no explicit reset is needed here.
+        if (!editor || editor.isDestroyed) return;
+        const read = () => {
+            const state = paginationKey.getState(editor.state) as { breaks?: unknown[] } | undefined;
+            const next = state?.breaks ? state.breaks.length + 1 : null;
+            setCount((prev) => (prev === next ? prev : next));
+        };
+        read();
+        editor.on("transaction", read);
+        return () => {
+            editor.off("transaction", read);
+        };
+    }, [editor]);
+
+    return count;
+};
+
+/**
+ * Subtle status bar at the bottom of the panel area: the screenplay page count
+ * plus icon toggles for the view modes (endless scroll, comments, focus mode).
+ */
+const EditorFooter = () => {
+    const t = useTranslations("navbar");
+    const { editor } = useContext(ProjectContext);
+    const { isZenMode, updateIsZenMode } = useContext(UserContext);
+    const {
+        isEndlessScroll,
+        setIsEndlessScroll,
+        showComments,
+        setShowComments,
+        setLeftSidebarOpen,
+        setRightSidebarOpen,
+    } = useViewContext();
+
+    const pageCount = useScreenplayPageCount(editor);
+
+    // Sidebar open-state captured on entering focus mode so it can be restored on exit.
+    const sidebarsBeforeFocus = useRef<{ left: boolean; right: boolean } | null>(null);
+
+    const enterFocusMode = useCallback(() => {
+        setLeftSidebarOpen((prev) => {
+            setRightSidebarOpen((prevRight) => {
+                sidebarsBeforeFocus.current = { left: prev, right: prevRight };
+                return false;
+            });
+            return false;
+        });
+        updateIsZenMode(true);
+        document.documentElement.requestFullscreen?.();
+    }, [updateIsZenMode, setLeftSidebarOpen, setRightSidebarOpen]);
+
+    const exitFocusMode = useCallback(() => {
+        updateIsZenMode(false);
+        if (document.fullscreenElement) {
+            document.exitFullscreen();
+        }
+        if (sidebarsBeforeFocus.current) {
+            setLeftSidebarOpen(sidebarsBeforeFocus.current.left);
+            setRightSidebarOpen(sidebarsBeforeFocus.current.right);
+            sidebarsBeforeFocus.current = null;
+        }
+    }, [updateIsZenMode, setLeftSidebarOpen, setRightSidebarOpen]);
+
+    // Keep zen state in sync when the user leaves fullscreen via Escape.
+    useEffect(() => {
+        const onFullscreenChange = () => {
+            if (!document.fullscreenElement && isZenMode) {
+                exitFocusMode();
+            }
+        };
+        document.addEventListener("fullscreenchange", onFullscreenChange);
+        return () => document.removeEventListener("fullscreenchange", onFullscreenChange);
+    }, [isZenMode, exitFocusMode]);
+
+    return (
+        <div className={styles.bubble_right}>
+            {pageCount !== null && (
+                <>
+                    <span className={styles.pages}>
+                        <FileText size={13} />
+                        {t("pageCount", { count: pageCount })}
+                    </span>
+                    <span className={styles.divider} />
+                </>
+            )}
+
+            <WritingTimer triggerClassName={styles.action} triggerActiveClassName={styles.action_active} />
+
+            <button
+                type="button"
+                className={join(styles.action, isEndlessScroll ? styles.action_active : "")}
+                onClick={() => setIsEndlessScroll((prev) => !prev)}
+                title={t("endlessScroll")}
+                aria-label={t("endlessScroll")}
+            >
+                <Scroll size={14} />
+            </button>
+            <button
+                type="button"
+                className={join(styles.action, !showComments ? styles.action_active : "")}
+                onClick={() => setShowComments((prev) => !prev)}
+                title={t("toggleComments")}
+                aria-label={t("toggleComments")}
+            >
+                {showComments ? <MessageSquare size={14} /> : <MessageSquareOff size={14} />}
+            </button>
+            <button
+                type="button"
+                className={join(styles.action, isZenMode ? styles.action_active : "")}
+                onClick={isZenMode ? exitFocusMode : enterFocusMode}
+                title={t("focusMode")}
+                aria-label={t("focusMode")}
+            >
+                {isZenMode ? <Minimize size={14} /> : <Maximize size={14} />}
+            </button>
+        </div>
+    );
+};
+
+export default EditorFooter;
diff --git a/components/project/ProjectWorkspace.tsx b/components/project/ProjectWorkspace.tsx
index de55bfe5..05aa309a 100644
--- a/components/project/ProjectWorkspace.tsx
+++ b/components/project/ProjectWorkspace.tsx
@@ -8,6 +8,7 @@ import ContextMenu from "@components/editor/sidebar/ContextMenu";
 import SuggestionMenu, { SuggestionData } from "@components/editor/SuggestionMenu";
 import { Popup } from "@components/popup/Popup";
 import SplitPanelContainer from "./SplitPanelContainer";
+import EditorFooter from "./EditorFooter";
 import styles from "./ProjectWorkspace.module.css";
 import { ChevronLeft, ChevronRight } from "lucide-react";
 
@@ -44,6 +45,9 @@ const ProjectWorkspace = () => {
                 <div className={styles.right_sidebar_toggle} onClick={() => setRightSidebarOpen((prev) => !prev)}>
                     {rightSidebarOpen ? <ChevronRight size={14} /> : <ChevronLeft size={14} />}
                 </div>
+
+                {/* Floating page-count + view-mode bubbles */}
+                <EditorFooter />
             </div>
 
             {/* Right sidebar */}
diff --git a/components/project/SplitPanelContainer.module.css b/components/project/SplitPanelContainer.module.css
index 7911d9c7..ef54dcf8 100644
--- a/components/project/SplitPanelContainer.module.css
+++ b/components/project/SplitPanelContainer.module.css
@@ -33,6 +33,19 @@
     border-radius: 4px;
     background-color: var(--editor-style-bg-hover);
     opacity: 0.5;
+    transition:
+        left 0.12s ease,
+        right 0.12s ease;
+}
+
+/* Edge variants preview a split: the overlay shrinks to the half the dropped
+   document would occupy, hinting that the panel will divide rather than swap. */
+.panel_drop_overlay_left {
+    right: 50%;
+}
+
+.panel_drop_overlay_right {
+    left: 50%;
 }
 
 /* Mounted-but-hidden panels: kept alive in the DOM so editors
diff --git a/components/project/SplitPanelContainer.tsx b/components/project/SplitPanelContainer.tsx
index 6ae9698c..550b88d3 100644
--- a/components/project/SplitPanelContainer.tsx
+++ b/components/project/SplitPanelContainer.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
-import { UserContext } from "@src/context/UserContext";
-import { PanelType, SplitSide, useViewContext } from "@src/context/ViewContext";
+import { DocumentPanelKind, PanelType, SplitSide, useViewContext } from "@src/context/ViewContext";
+import { join } from "@src/lib/utils/misc";
 import { DOC_DND_MIME } from "@components/editor/sidebar/DocumentTreeItem";
 import EditorPanel from "@components/editor/EditorPanel";
 import TitlePagePanel from "@components/editor/TitlePagePanel";
@@ -21,14 +21,9 @@ import {
     Clapperboard,
     FileText,
     ListTree,
-    Maximize,
     Menu,
-    MessageSquare,
-    MessageSquareOff,
-    Minimize,
     PanelRight,
     PanelRightClose,
-    Scroll,
 } from "lucide-react";
 import styles from "./SplitPanelContainer.module.css";
 import dropdown from "@components/navbar/ViewOptionsDropdown.module.css";
@@ -88,20 +83,14 @@ const SWITCHABLE_PANELS: { type: PanelType; icon: typeof Clapperboard; labelKey:
 
 const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; side: "primary" | "secondary" }) => {
     const t = useTranslations("navbar");
-    const { isZenMode, updateIsZenMode } = useContext(UserContext);
     const {
         setSidePanel,
         isSplit,
         primaryPanel,
         setSecondaryPanel,
         swapPanels,
-        isEndlessScroll,
-        setIsEndlessScroll,
-        showComments,
-        setShowComments,
         leftSidebarOpen,
         setLeftSidebarOpen,
-        setRightSidebarOpen,
     } = useViewContext();
 
     const handleSplitToggle = useCallback(() => {
@@ -116,7 +105,6 @@ const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; si
     }, [isSplit, primaryPanel, setSecondaryPanel]);
     const [isOpen, setIsOpen] = useState(false);
     const ref = useRef<HTMLDivElement>(null);
-    const sidebarsBeforeFocus = useRef<{ left: boolean; right: boolean } | null>(null);
 
     useEffect(() => {
         if (!isOpen) return;
@@ -135,40 +123,6 @@ const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; si
         [currentPanel, side, setSidePanel],
     );
 
-    const enterFocusMode = useCallback(() => {
-        setLeftSidebarOpen((prev) => {
-            setRightSidebarOpen((prevRight) => {
-                sidebarsBeforeFocus.current = { left: prev, right: prevRight };
-                return false;
-            });
-            return false;
-        });
-        updateIsZenMode(true);
-        document.documentElement.requestFullscreen?.();
-    }, [updateIsZenMode, setLeftSidebarOpen, setRightSidebarOpen]);
-
-    const exitFocusMode = useCallback(() => {
-        updateIsZenMode(false);
-        if (document.fullscreenElement) {
-            document.exitFullscreen();
-        }
-        if (sidebarsBeforeFocus.current) {
-            setLeftSidebarOpen(sidebarsBeforeFocus.current.left);
-            setRightSidebarOpen(sidebarsBeforeFocus.current.right);
-            sidebarsBeforeFocus.current = null;
-        }
-    }, [updateIsZenMode, setLeftSidebarOpen, setRightSidebarOpen]);
-
-    useEffect(() => {
-        const onFullscreenChange = () => {
-            if (!document.fullscreenElement && isZenMode) {
-                exitFocusMode();
-            }
-        };
-        document.addEventListener("fullscreenchange", onFullscreenChange);
-        return () => document.removeEventListener("fullscreenchange", onFullscreenChange);
-    }, [isZenMode, exitFocusMode]);
-
     return (
         <div ref={ref} className={styles.panel_switcher_anchor}>
             {side === "primary" && (
@@ -213,34 +167,28 @@ const PanelSwitcherMenu = ({ currentPanel, side }: { currentPanel: PanelType; si
                             <span className={dropdown.item_label}>{t(labelKey as Parameters<typeof t>[0])}</span>
                         </button>
                     ))}
-                    <div className={styles.panel_switcher_separator} />
-                    <button
-                        className={`${dropdown.dropdown_item} ${isEndlessScroll ? dropdown.dropdown_item_active : ""}`}
-                        onClick={() => setIsEndlessScroll(!isEndlessScroll)}
-                    >
-                        <Scroll size={14} />
-                        <span className={dropdown.item_label}>{t("endlessScroll")}</span>
-                    </button>
-                    <button
-                        className={`${dropdown.dropdown_item} ${!showComments ? dropdown.dropdown_item_active : ""}`}
-                        onClick={() => setShowComments(!showComments)}
-                    >
-                        {showComments ? <MessageSquare size={14} /> : <MessageSquareOff size={14} />}
-                        <span className={dropdown.item_label}>{t("toggleComments")}</span>
-                    </button>
-                    <button
-                        className={`${dropdown.dropdown_item} ${isZenMode ? dropdown.dropdown_item_active : ""}`}
-                        onClick={isZenMode ? exitFocusMode : enterFocusMode}
-                    >
-                        {isZenMode ? <Minimize size={14} /> : <Maximize size={14} />}
-                        <span className={dropdown.item_label}>{t("focusMode")}</span>
-                    </button>
                 </div>
             )}
         </div>
     );
 };
 
+// Drop zone within a panel: "center" replaces the panel's content, while the
+// "left"/"right" edges split it and open the document on that side.
+type DropZone = "left" | "center" | "right";
+
+// Fraction of the panel width on each side that counts as a split edge.
+const SPLIT_EDGE_RATIO = 0.3;
+
+const computeDropZone = (e: React.DragEvent, allowSplit: boolean): DropZone => {
+    if (!allowSplit) return "center";
+    const rect = e.currentTarget.getBoundingClientRect();
+    const x = e.clientX - rect.left;
+    if (x < rect.width * SPLIT_EDGE_RATIO) return "left";
+    if (x > rect.width * (1 - SPLIT_EDGE_RATIO)) return "right";
+    return "center";
+};
+
 const SplitPanelContainer = ({
     suggestions,
     updateSuggestions,
@@ -258,10 +206,13 @@ const SplitPanelContainer = ({
         focusedSide,
         setFocusedSide,
         setSideDocument,
+        splitWithDocument,
     } = useViewContext();
 
-    // Side currently highlighted while a document is dragged from the sidebar.
-    const [docDragOverSide, setDocDragOverSide] = useState<SplitSide | null>(null);
+    // Where a document dragged from the sidebar would land: which side it is over
+    // and which zone of that side ("center" replaces the panel; "left"/"right"
+    // splits, opening the document on that edge).
+    const [docDragOver, setDocDragOver] = useState<{ side: SplitSide; zone: DropZone } | null>(null);
 
     // Capture-phase so the panel claims a document drop before the editor's own
     // drop handling sees it; non-document drags fall through untouched.
@@ -270,9 +221,11 @@ const SplitPanelContainer = ({
             if (!e.dataTransfer.types.includes(DOC_DND_MIME)) return;
             e.preventDefault();
             e.dataTransfer.dropEffect = "copy";
-            setDocDragOverSide((prev) => (prev === side ? prev : side));
+            // Edge zones only split when there is room for a second panel.
+            const zone = computeDropZone(e, !isSplit);
+            setDocDragOver((prev) => (prev?.side === side && prev.zone === zone ? prev : { side, zone }));
         },
-        [],
+        [isSplit],
     );
 
     const handleDocDrop = useCallback(
@@ -281,16 +234,22 @@ const SplitPanelContainer = ({
             if (!raw) return;
             e.preventDefault();
             e.stopPropagation();
-            setDocDragOverSide(null);
+            const zone = computeDropZone(e, !isSplit);
+            setDocDragOver(null);
             let data: { id: string; type: "editor" | "board" };
             try {
                 data = JSON.parse(raw);
             } catch {
                 return;
             }
-            setSideDocument(side, data.id, data.type === "board" ? "board" : "document");
+            const kind: DocumentPanelKind = data.type === "board" ? "board" : "document";
+            if (zone === "center") {
+                setSideDocument(side, data.id, kind);
+            } else {
+                splitWithDocument(data.id, kind, zone === "left" ? "primary" : "secondary");
+            }
         },
-        [setSideDocument],
+        [isSplit, setSideDocument, splitWithDocument],
     );
 
     const gridStyle = useMemo(() => {
@@ -318,7 +277,7 @@ const SplitPanelContainer = ({
     }) => {
         const { keyId, panelKind, side, isPrimary, isVisible, content } = opts;
         const isFocused = isSplit && isVisible && focusedSide === side;
-        const isDocDropTarget = isVisible && docDragOverSide === side;
+        const dropZone = isVisible && docDragOver?.side === side ? docDragOver.zone : null;
         const panelClass = !isVisible
             ? styles.panel_hidden
             : `${styles.panel}${isFocused ? ` ${styles.panel_focused}` : ""}`;
@@ -334,12 +293,20 @@ const SplitPanelContainer = ({
                 onDragLeave={
                     isVisible
                         ? (e) => {
-                              if (!e.currentTarget.contains(e.relatedTarget as Node)) setDocDragOverSide(null);
+                              if (!e.currentTarget.contains(e.relatedTarget as Node)) setDocDragOver(null);
                           }
                         : undefined
                 }
             >
-                {isDocDropTarget && <div className={styles.panel_drop_overlay} />}
+                {dropZone && (
+                    <div
+                        className={join(
+                            styles.panel_drop_overlay,
+                            dropZone === "left" ? styles.panel_drop_overlay_left : "",
+                            dropZone === "right" ? styles.panel_drop_overlay_right : "",
+                        )}
+                    />
+                )}
                 {isVisible && <PanelSwitcherMenu currentPanel={panelKind} side={side} />}
                 {content}
             </div>
diff --git a/components/project/WritingTimer.module.css b/components/project/WritingTimer.module.css
new file mode 100644
index 00000000..46b4f7ba
--- /dev/null
+++ b/components/project/WritingTimer.module.css
@@ -0,0 +1,223 @@
+.anchor {
+    position: relative;
+    display: flex;
+    align-items: center;
+    gap: 6px;
+}
+
+.time {
+    font-size: 11px;
+    font-variant-numeric: tabular-nums;
+    color: var(--secondary-text);
+    min-width: 38px;
+    text-align: center;
+}
+
+.time_done {
+    color: var(--primary-text);
+    font-weight: 600;
+}
+
+/* Popover opens above the footer pill. */
+.panel {
+    position: absolute;
+    bottom: calc(100% + 10px);
+    right: 0;
+    z-index: 20;
+    width: 220px;
+    padding: 14px;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    background-color: var(--secondary);
+    border: 1px solid var(--separator);
+    border-radius: 14px;
+    box-shadow: var(--panel-shadow);
+    color: var(--secondary-text);
+    cursor: default;
+}
+
+.title {
+    font-size: 12px;
+    font-weight: 600;
+    color: var(--primary-text);
+}
+
+.tabs {
+    display: flex;
+    gap: 4px;
+    padding: 3px;
+    background-color: var(--main-bg);
+    border-radius: 8px;
+}
+
+.tab {
+    flex: 1;
+    padding: 5px 8px;
+    border: none;
+    border-radius: 6px;
+    background: transparent;
+    color: var(--secondary-text);
+    font-size: 11px;
+    cursor: pointer;
+    transition:
+        background-color 0.15s ease,
+        color 0.15s ease;
+}
+
+.tab:hover:not(:disabled) {
+    color: var(--primary-text);
+}
+
+.tab_active {
+    background-color: var(--secondary-hover);
+    color: var(--primary-text);
+}
+
+.tab:disabled {
+    cursor: default;
+    opacity: 0.5;
+}
+
+/* Big time flanked by up/down minute steppers (countdown setup only). */
+.stepper_group {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 4px;
+}
+
+.stepper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 32px;
+    height: 20px;
+    border: none;
+    border-radius: 8px;
+    background-color: var(--main-bg);
+    color: var(--secondary-text);
+    cursor: pointer;
+    transition:
+        background-color 0.15s ease,
+        color 0.15s ease;
+}
+
+.stepper:hover {
+    background-color: var(--secondary-hover);
+    color: var(--primary-text);
+}
+
+/* The display and its edit input occupy an identical fixed box so swapping
+   between them (on click) causes no layout shift: same width, height, border
+   (the display's is transparent), font, and box-sizing. A fixed height avoids
+   the input's intrinsic font-based height differing from the div's. */
+.display,
+.display_input {
+    box-sizing: border-box;
+    width: 130px;
+    height: 44px;
+    padding: 0;
+    font-family: inherit;
+    font-size: 30px;
+    font-weight: 600;
+    font-variant-numeric: tabular-nums;
+    letter-spacing: 1px;
+    text-align: center;
+    color: var(--primary-text);
+    border: 1px solid transparent;
+    border-radius: 8px;
+}
+
+/* Center the div text to match the input's intrinsic vertical centering. */
+.display {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.display_done {
+    color: var(--tertiary-hover);
+}
+
+/* Click-to-edit affordance on the countdown display. */
+.display_editable {
+    cursor: text;
+    transition: background-color 0.15s ease;
+}
+
+.display_editable:hover {
+    background-color: var(--main-bg);
+}
+
+.display_input {
+    background-color: var(--main-bg);
+    border-color: var(--tertiary-hover);
+    outline: none;
+}
+
+.presets {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+}
+
+.chip {
+    flex: 1 1 calc(25% - 6px);
+    padding: 6px 0;
+    border: 1px solid var(--separator);
+    border-radius: 8px;
+    background: transparent;
+    color: var(--secondary-text);
+    font-size: 11px;
+    cursor: pointer;
+    transition:
+        background-color 0.15s ease,
+        color 0.15s ease,
+        border-color 0.15s ease;
+}
+
+.chip:hover {
+    color: var(--primary-text);
+    border-color: var(--tertiary-hover);
+}
+
+.chip_active {
+    background-color: var(--secondary-hover);
+    border-color: var(--tertiary-hover);
+    color: var(--primary-text);
+}
+
+.controls {
+    display: flex;
+    gap: 8px;
+}
+
+.btn {
+    flex: 1;
+    padding: 8px 0;
+    border: none;
+    border-radius: 9px;
+    background-color: var(--main-bg);
+    color: var(--primary-text);
+    font-size: 11px;
+    font-weight: 500;
+    cursor: pointer;
+    transition:
+        opacity 0.15s ease,
+        background-color 0.15s ease;
+}
+
+.btn:hover {
+    background-color: var(--secondary-hover);
+}
+
+.btn_primary {
+    background-color: var(--tertiary-hover);
+    color: var(--primary-text);
+}
+
+.btn_primary:hover {
+    opacity: 0.9;
+    background-color: var(--tertiary-hover);
+}
diff --git a/components/project/WritingTimer.tsx b/components/project/WritingTimer.tsx
new file mode 100644
index 00000000..2fa0dfdc
--- /dev/null
+++ b/components/project/WritingTimer.tsx
@@ -0,0 +1,304 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+import { useTranslations } from "next-intl";
+import { ChevronDown, ChevronUp, Timer } from "lucide-react";
+import { join } from "@src/lib/utils/misc";
+
+import styles from "./WritingTimer.module.css";
+
+type TimerMode = "countdown" | "stopwatch";
+
+const PRESETS = [10, 15, 25, 45];
+// Minutes added/removed per stepper click, and the allowed duration range (sec).
+const STEP = 5;
+const MIN_SECONDS = 30;
+const MAX_SECONDS = 180 * 60;
+
+const clampSeconds = (sec: number) => Math.min(MAX_SECONDS, Math.max(MIN_SECONDS, Math.round(sec)));
+
+/** Parse a manually typed duration: "M", "M:SS", or "H:MM:SS". Returns total
+ *  seconds, or null if unparseable. A bare number is read as minutes. */
+const parseClock = (raw: string): number | null => {
+    const s = raw.trim();
+    if (!s) return null;
+    const parts = s.split(":");
+    if (parts.length > 3) return null;
+    const nums = parts.map((p) => Number(p));
+    if (nums.some((n) => !Number.isFinite(n) || n < 0)) return null;
+    if (nums.length === 1) return nums[0] * 60;
+    if (nums.length === 2) return nums[0] * 60 + nums[1];
+    return nums[0] * 3600 + nums[1] * 60 + nums[2];
+};
+
+/** Gentle two-note chime when a countdown completes. Synthesised so no audio
+ *  asset is needed; failures (autoplay policy, no WebAudio) are ignored. */
+const playChime = () => {
+    try {
+        const Ctx =
+            window.AudioContext ||
+            (window as unknown as { webkitAudioContext?: typeof AudioContext }).webkitAudioContext;
+        if (!Ctx) return;
+        const ctx = new Ctx();
+        const now = ctx.currentTime;
+        [880, 1175].forEach((freq, i) => {
+            const osc = ctx.createOscillator();
+            const gain = ctx.createGain();
+            osc.type = "sine";
+            osc.frequency.value = freq;
+            const t0 = now + i * 0.18;
+            gain.gain.setValueAtTime(0.0001, t0);
+            gain.gain.exponentialRampToValueAtTime(0.2, t0 + 0.02);
+            gain.gain.exponentialRampToValueAtTime(0.0001, t0 + 0.35);
+            osc.connect(gain);
+            gain.connect(ctx.destination);
+            osc.start(t0);
+            osc.stop(t0 + 0.4);
+        });
+        setTimeout(() => ctx.close().catch(() => {}), 1000);
+    } catch {
+        // Audio is a nice-to-have; ignore failures.
+    }
+};
+
+const formatClock = (ms: number, roundUp: boolean): string => {
+    const totalSec = Math.max(0, roundUp ? Math.ceil(ms / 1000) : Math.floor(ms / 1000));
+    const h = Math.floor(totalSec / 3600);
+    const m = Math.floor((totalSec % 3600) / 60);
+    const s = totalSec % 60;
+    const pad = (n: number) => String(n).padStart(2, "0");
+    return h > 0 ? `${h}:${pad(m)}:${pad(s)}` : `${pad(m)}:${pad(s)}`;
+};
+
+interface WritingTimerProps {
+    /** Shared footer action-button classes, so the trigger matches the others. */
+    triggerClassName: string;
+    triggerActiveClassName: string;
+}
+
+/**
+ * Writing-session timer: a footer icon that opens a popover to run either a
+ * countdown (set a duration, get a chime at zero) or a count-up stopwatch.
+ * Timer state is local and ephemeral — it lives as long as the footer is
+ * mounted but is not persisted across reloads.
+ */
+const WritingTimer = ({ triggerClassName, triggerActiveClassName }: WritingTimerProps) => {
+    const t = useTranslations("timer");
+
+    const [open, setOpen] = useState(false);
+    const [mode, setMode] = useState<TimerMode>("countdown");
+    const [durationSec, setDurationSec] = useState(25 * 60);
+    const [running, setRunning] = useState(false);
+    const [elapsedMs, setElapsedMs] = useState(0);
+    const [completed, setCompleted] = useState(false);
+    // Manual editing of the countdown duration via the display field.
+    const [editing, setEditing] = useState(false);
+    const [editValue, setEditValue] = useState("");
+
+    const anchorRef = useRef<HTMLDivElement>(null);
+    // Timestamp such that elapsed = Date.now() - startTsRef while running.
+    const startTsRef = useRef(0);
+
+    const targetMs = durationSec * 1000;
+    const isIdle = !running && elapsedMs === 0 && !completed;
+    const isActive = running || elapsedMs > 0;
+    // Duration is only adjustable before a countdown starts.
+    const canSetDuration = mode === "countdown" && isIdle;
+    const displayMs = mode === "countdown" ? Math.max(0, targetMs - elapsedMs) : elapsedMs;
+    const clock = formatClock(displayMs, mode === "countdown");
+
+    // Tick while running.
+    useEffect(() => {
+        if (!running) return;
+        const id = setInterval(() => setElapsedMs(Date.now() - startTsRef.current), 250);
+        return () => clearInterval(id);
+    }, [running]);
+
+    // Countdown completion.
+    useEffect(() => {
+        if (mode === "countdown" && running && elapsedMs >= targetMs) {
+            setRunning(false);
+            setElapsedMs(targetMs);
+            setCompleted(true);
+            playChime();
+        }
+    }, [mode, running, elapsedMs, targetMs]);
+
+    // Close the popover on outside click.
+    useEffect(() => {
+        if (!open) return;
+        const onDown = (e: MouseEvent) => {
+            if (anchorRef.current && !anchorRef.current.contains(e.target as Node)) {
+                setOpen(false);
+                setEditing(false);
+            }
+        };
+        window.addEventListener("mousedown", onDown);
+        return () => window.removeEventListener("mousedown", onDown);
+    }, [open]);
+
+    const start = () => {
+        setEditing(false);
+        setCompleted(false);
+        startTsRef.current = Date.now() - elapsedMs;
+        setRunning(true);
+    };
+    const pause = () => setRunning(false);
+    const reset = () => {
+        setEditing(false);
+        setRunning(false);
+        setElapsedMs(0);
+        setCompleted(false);
+    };
+    const adjustDuration = (deltaMin: number) =>
+        setDurationSec((s) => clampSeconds(s + deltaMin * 60));
+
+    const selectMode = (next: TimerMode) => {
+        if (next === mode) return;
+        reset();
+        setMode(next);
+    };
+
+    const toggleOpen = () => {
+        setOpen((o) => !o);
+        setEditing(false);
+    };
+
+    const startEdit = () => {
+        setEditValue(formatClock(durationSec * 1000, false));
+        setEditing(true);
+    };
+    const commitEdit = () => {
+        const parsed = parseClock(editValue);
+        if (parsed !== null) setDurationSec(clampSeconds(parsed));
+        setEditing(false);
+    };
+
+    return (
+        <div className={styles.anchor} ref={anchorRef}>
+            <button
+                type="button"
+                className={join(triggerClassName, open || isActive ? triggerActiveClassName : "")}
+                onClick={toggleOpen}
+                title={t("title")}
+                aria-label={t("title")}
+            >
+                <Timer size={14} />
+            </button>
+
+            {isActive && <span className={join(styles.time, completed ? styles.time_done : "")}>{clock}</span>}
+
+            {open && (
+                <div className={styles.panel}>
+                    <span className={styles.title}>{t("title")}</span>
+
+                    <div className={styles.tabs}>
+                        <button
+                            type="button"
+                            className={join(styles.tab, mode === "countdown" ? styles.tab_active : "")}
+                            onClick={() => selectMode("countdown")}
+                            disabled={isActive}
+                        >
+                            {t("countdown")}
+                        </button>
+                        <button
+                            type="button"
+                            className={join(styles.tab, mode === "stopwatch" ? styles.tab_active : "")}
+                            onClick={() => selectMode("stopwatch")}
+                            disabled={isActive}
+                        >
+                            {t("stopwatch")}
+                        </button>
+                    </div>
+
+                    <div className={styles.stepper_group}>
+                        {canSetDuration && (
+                            <button
+                                type="button"
+                                className={styles.stepper}
+                                onClick={() => adjustDuration(STEP)}
+                                aria-label={`+${STEP} ${t("minutesShort")}`}
+                            >
+                                <ChevronUp size={16} />
+                            </button>
+                        )}
+                        {editing ? (
+                            <input
+                                className={styles.display_input}
+                                value={editValue}
+                                autoFocus
+                                inputMode="numeric"
+                                onChange={(e) => setEditValue(e.target.value)}
+                                onFocus={(e) => e.currentTarget.select()}
+                                onBlur={commitEdit}
+                                onKeyDown={(e) => {
+                                    if (e.key === "Enter") commitEdit();
+                                    else if (e.key === "Escape") setEditing(false);
+                                }}
+                            />
+                        ) : (
+                            <div
+                                className={join(
+                                    styles.display,
+                                    canSetDuration ? styles.display_editable : "",
+                                    completed ? styles.display_done : "",
+                                )}
+                                onClick={canSetDuration ? startEdit : undefined}
+                            >
+                                {clock}
+                            </div>
+                        )}
+                        {canSetDuration && (
+                            <button
+                                type="button"
+                                className={styles.stepper}
+                                onClick={() => adjustDuration(-STEP)}
+                                aria-label={`-${STEP} ${t("minutesShort")}`}
+                            >
+                                <ChevronDown size={16} />
+                            </button>
+                        )}
+                    </div>
+
+                    {canSetDuration && (
+                        <div className={styles.presets}>
+                            {PRESETS.map((m) => (
+                                <button
+                                    key={m}
+                                    type="button"
+                                    className={join(styles.chip, durationSec === m * 60 ? styles.chip_active : "")}
+                                    onClick={() => setDurationSec(m * 60)}
+                                >
+                                    {m} {t("minutesShort")}
+                                </button>
+                            ))}
+                        </div>
+                    )}
+
+                    <div className={styles.controls}>
+                        {running ? (
+                            <button type="button" className={styles.btn} onClick={pause}>
+                                {t("pause")}
+                            </button>
+                        ) : isActive && !completed ? (
+                            <button type="button" className={join(styles.btn, styles.btn_primary)} onClick={start}>
+                                {t("resume")}
+                            </button>
+                        ) : !completed ? (
+                            <button type="button" className={join(styles.btn, styles.btn_primary)} onClick={start}>
+                                {t("start")}
+                            </button>
+                        ) : null}
+                        {isActive && (
+                            <button type="button" className={styles.btn} onClick={reset}>
+                                {t("reset")}
+                            </button>
+                        )}
+                    </div>
+                </div>
+            )}
+        </div>
+    );
+};
+
+export default WritingTimer;
diff --git a/messages/de.json b/messages/de.json
index 20a69cd3..5cd39367 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -26,7 +26,18 @@
     "swapPanels": "Panels tauschen",
     "draftEditor": "Entwurfseditor",
     "viewOnly": "Nur ansehen",
-    "viewOnlyHint": "Sie haben Lesezugriff. Die Bearbeitung ist deaktiviert."
+    "viewOnlyHint": "Sie haben Lesezugriff. Die Bearbeitung ist deaktiviert.",
+    "pageCount": "{count, plural, one {# Seite} other {# Seiten}}"
+  },
+  "timer": {
+    "title": "Schreibsitzung",
+    "countdown": "Countdown",
+    "stopwatch": "Stoppuhr",
+    "start": "Starten",
+    "pause": "Pause",
+    "resume": "Fortsetzen",
+    "reset": "Zurücksetzen",
+    "minutesShort": "Min"
   },
   "common": {
     "save": "Änderungen speichern",
diff --git a/messages/en.json b/messages/en.json
index 6dcdfedc..c72afd3c 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -25,7 +25,18 @@
     "swapPanels": "Swap Panels",
     "draftEditor": "Draft Editor",
     "viewOnly": "View only",
-    "viewOnlyHint": "You have viewer access. Editing is disabled."
+    "viewOnlyHint": "You have viewer access. Editing is disabled.",
+    "pageCount": "{count, plural, one {# page} other {# pages}}"
+  },
+  "timer": {
+    "title": "Writing session",
+    "countdown": "Countdown",
+    "stopwatch": "Stopwatch",
+    "start": "Start",
+    "pause": "Pause",
+    "resume": "Resume",
+    "reset": "Reset",
+    "minutesShort": "min"
   },
   "common": {
     "save": "Save",
diff --git a/messages/es.json b/messages/es.json
index 449d2c74..d212320a 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -25,7 +25,18 @@
     "swapPanels": "Intercambiar paneles",
     "draftEditor": "Editor de borrador",
     "viewOnly": "Solo lectura",
-    "viewOnlyHint": "Tienes acceso de solo visualización. La edición está desactivada."
+    "viewOnlyHint": "Tienes acceso de solo visualización. La edición está desactivada.",
+    "pageCount": "{count, plural, one {# página} other {# páginas}}"
+  },
+  "timer": {
+    "title": "Sesión de escritura",
+    "countdown": "Cuenta atrás",
+    "stopwatch": "Cronómetro",
+    "start": "Iniciar",
+    "pause": "Pausar",
+    "resume": "Reanudar",
+    "reset": "Reiniciar",
+    "minutesShort": "min"
   },
   "common": {
     "save": "Guardar cambios",
diff --git a/messages/fr.json b/messages/fr.json
index 7e11c07b..df70cb12 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -26,7 +26,18 @@
     "swapPanels": "Inverser les panneaux",
     "draftEditor": "Éditeur de brouillon",
     "viewOnly": "Vue seule",
-    "viewOnlyHint": "Vous avez un accès visiteur. La modification est désactivée."
+    "viewOnlyHint": "Vous avez un accès visiteur. La modification est désactivée.",
+    "pageCount": "{count, plural, one {# page} other {# pages}}"
+  },
+  "timer": {
+    "title": "Session d'écriture",
+    "countdown": "Compte à rebours",
+    "stopwatch": "Chronomètre",
+    "start": "Démarrer",
+    "pause": "Pause",
+    "resume": "Reprendre",
+    "reset": "Réinitialiser",
+    "minutesShort": "min"
   },
   "common": {
     "save": "Enregistrer",
diff --git a/messages/ja.json b/messages/ja.json
index 039fc425..02b93ce6 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -25,7 +25,18 @@
     "swapPanels": "パネルを入れ替え",
     "draftEditor": "下書きエディター",
     "viewOnly": "閲覧のみ",
-    "viewOnlyHint": "閲覧者アクセスです。編集は無効になっています。"
+    "viewOnlyHint": "閲覧者アクセスです。編集は無効になっています。",
+    "pageCount": "{count}ページ"
+  },
+  "timer": {
+    "title": "執筆セッション",
+    "countdown": "カウントダウン",
+    "stopwatch": "ストップウォッチ",
+    "start": "開始",
+    "pause": "一時停止",
+    "resume": "再開",
+    "reset": "リセット",
+    "minutesShort": "分"
   },
   "common": {
     "save": "変更を保存",
diff --git a/messages/ko.json b/messages/ko.json
index 9b4336b2..8d464cfc 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -25,7 +25,18 @@
     "swapPanels": "패널 교체",
     "draftEditor": "초안 편집기",
     "viewOnly": "보기 전용",
-    "viewOnlyHint": "뷰어 권한이 있습니다. 편집이 비활성화되었습니다."
+    "viewOnlyHint": "뷰어 권한이 있습니다. 편집이 비활성화되었습니다.",
+    "pageCount": "{count}페이지"
+  },
+  "timer": {
+    "title": "글쓰기 세션",
+    "countdown": "카운트다운",
+    "stopwatch": "스톱워치",
+    "start": "시작",
+    "pause": "일시정지",
+    "resume": "계속",
+    "reset": "초기화",
+    "minutesShort": "분"
   },
   "common": {
     "save": "변경사항 저장",
diff --git a/messages/pl.json b/messages/pl.json
index f5bf623a..d91a6f95 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -25,7 +25,18 @@
     "swapPanels": "Zamień panele",
     "draftEditor": "Edytor szkiców",
     "viewOnly": "Tylko podgląd",
-    "viewOnlyHint": "Masz dostęp gościa. Edytowanie jest wyłączone."
+    "viewOnlyHint": "Masz dostęp gościa. Edytowanie jest wyłączone.",
+    "pageCount": "{count, plural, one {# strona} few {# strony} other {# stron}}"
+  },
+  "timer": {
+    "title": "Sesja pisania",
+    "countdown": "Odliczanie",
+    "stopwatch": "Stoper",
+    "start": "Start",
+    "pause": "Pauza",
+    "resume": "Wznów",
+    "reset": "Resetuj",
+    "minutesShort": "min"
   },
   "common": {
     "save": "Zapisz zmiany",
diff --git a/messages/zh.json b/messages/zh.json
index d4153ccb..3bd3101e 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -25,7 +25,18 @@
     "swapPanels": "交换面板",
     "draftEditor": "草稿编辑器",
     "viewOnly": "仅查看",
-    "viewOnlyHint": "您拥有访客权限，编辑功能已禁用。"
+    "viewOnlyHint": "您拥有访客权限，编辑功能已禁用。",
+    "pageCount": "{count} 页"
+  },
+  "timer": {
+    "title": "写作计时",
+    "countdown": "倒计时",
+    "stopwatch": "秒表",
+    "start": "开始",
+    "pause": "暂停",
+    "resume": "继续",
+    "reset": "重置",
+    "minutesShort": "分钟"
   },
   "common": {
     "save": "保存",
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index 6dd24902..5229e0c0 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -17,6 +17,7 @@ import { PersistentPageMap } from "@src/lib/screenplay/page-locking";
 import { ProjectMembershipPayload } from "@src/server/repository/project-repository";
 import { ProjectRole } from "@src/generated/client/browser";
 import { useUser } from "@src/lib/utils/hooks";
+import { getCloudToken } from "@src/lib/utils/requests";
 import {
     CollaboratorInfo,
     ConnectionStatus,
@@ -446,14 +447,11 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setProject((prev) => (prev ? { ...prev, role: newRole as ProjectRole } : prev));
             if (project?.project.id) {
                 try {
-                    const res = await fetch(`/api/projects/${project.project.id}/cloud-token`);
-                    if (res.ok) {
-                        const { token } = (await res.json()) as { token: string };
-                        if (token) {
-                            // Update token silently so future reconnects use the new role
-                            // We don't force reconnect because the DO already updated our active session
-                            await provider.updateToken(token, false);
-                        }
+                    const { token } = await getCloudToken(project.project.id);
+                    if (token) {
+                        // Update token silently so future reconnects use the new role.
+                        // We don't force reconnect because the DO already updated our active session.
+                        await provider.updateToken(token, false);
                     }
                 } catch (e) {
                     console.warn("Failed to fetch new token on role change", e);
diff --git a/src/context/ViewContext.tsx b/src/context/ViewContext.tsx
index 520f3e8a..ef08bbea 100644
--- a/src/context/ViewContext.tsx
+++ b/src/context/ViewContext.tsx
@@ -32,6 +32,12 @@ interface ViewContextType {
     setSidePanel: (side: SplitSide, panel: PanelType) => void;
     /** Open a specific document (board/editor) on a given side and focus it. */
     setSideDocument: (side: SplitSide, docId: string, kind: DocumentPanelKind) => void;
+    /**
+     * Split the single panel and open a document on one side, keeping the
+     * currently-shown panel on the other. `side` is where the new document
+     * goes. Assumes the view is not already split.
+     */
+    splitWithDocument: (docId: string, kind: DocumentPanelKind, side: SplitSide) => void;
     /** Clear a document from any side currently showing it (e.g. after delete). */
     closeDocument: (docId: string) => void;
     swapPanels: () => void;
@@ -194,6 +200,25 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
         setFocusedSideState(side);
     }, []);
 
+    const splitWithDocument = useCallback(
+        (docId: string, kind: DocumentPanelKind, side: SplitSide) => {
+            if (side === "primary") {
+                // New document takes the left; the existing panel slides right.
+                setSecondaryPanelState(primaryPanel);
+                setSecondaryDocId(primaryDocId);
+                setPrimaryPanelState(kind);
+                setPrimaryDocId(docId);
+                setFocusedSideState("primary");
+            } else {
+                // Existing panel stays on the left; new document opens on the right.
+                setSecondaryPanelState(kind);
+                setSecondaryDocId(docId);
+                setFocusedSideState("secondary");
+            }
+        },
+        [primaryPanel, primaryDocId],
+    );
+
     const closeDocument = useCallback((docId: string) => {
         setPrimaryDocId((prev) => (prev === docId ? null : prev));
         setSecondaryDocId((prev) => (prev === docId ? null : prev));
@@ -231,6 +256,7 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
             setFocusedPanel,
             setSidePanel,
             setSideDocument,
+            splitWithDocument,
             closeDocument,
             swapPanels,
             setIsEndlessScroll,
@@ -238,7 +264,7 @@ export const ViewProvider = ({ children }: { children: ReactNode }) => {
             setLeftSidebarOpen,
             setRightSidebarOpen,
         }),
-        [primaryPanel, secondaryPanel, primaryDocId, secondaryDocId, splitRatio, isSplit, visiblePanels, mountedPanels, focusedSide, focusedPanel, isEndlessScroll, showComments, leftSidebarOpen, rightSidebarOpen, setPrimaryPanel, setSecondaryPanel, setFocusedSide, setFocusedPanel, setSidePanel, setSideDocument, closeDocument, swapPanels, setIsEndlessScroll, setShowComments],
+        [primaryPanel, secondaryPanel, primaryDocId, secondaryDocId, splitRatio, isSplit, visiblePanels, mountedPanels, focusedSide, focusedPanel, isEndlessScroll, showComments, leftSidebarOpen, rightSidebarOpen, setPrimaryPanel, setSecondaryPanel, setFocusedSide, setFocusedPanel, setSidePanel, setSideDocument, splitWithDocument, closeDocument, swapPanels, setIsEndlessScroll, setShowComments],
     );
 
     return <ViewContext.Provider value={value}>{children}</ViewContext.Provider>;
diff --git a/styles/scriptio.css b/styles/scriptio.css
index 2c7ae64d..9e2d0fe7 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -73,8 +73,15 @@
        (0) collapses with the next paragraph's margin-top (16) and leaves a
        wasted 16px gap at the top of every page. Pagination's break decisions
        use measured outer heights in isolation, so removing the margin only
-       affects rendering — same paragraphs per page, no determinism hit. */
-    > .pagination-page-break + p,
+       affects rendering — same paragraphs per page, no determinism hit.
+
+       In endless-scroll mode the page-break widgets are hidden (display:none),
+       so there is no gap to collapse and zeroing the margin would make each
+       page's first node stick to the previous page's content. The
+       `:not(.endless-scroll)` guard skips it there so the node keeps its
+       natural top margin. The first-page widget is still shown in endless
+       scroll, so its following paragraph keeps the reset. */
+    &:not(.endless-scroll) > .pagination-page-break + p,
     > .pagination-first-page + p {
         margin-top: 0 !important;
     }

From a622dc8456f0bd58e71b6337a5742d31f1bae99c Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Wed, 10 Jun 2026 17:27:18 +0200
Subject: [PATCH 65/76] asset handling wip for boards, added advanced section
 to production panel

---
 components/board/BoardCanvas.module.css       |  29 +++
 components/board/BoardCanvas.tsx              | 123 ++++++++++--
 components/board/BoardCard.tsx                | 109 +++++-----
 components/navbar/ProductionPanel.module.css  | 102 ++++++++++
 components/navbar/ProductionPanel.tsx         |  87 ++++----
 components/project/WritingTimer.tsx           |   2 +-
 messages/de.json                              |   2 +
 messages/en.json                              |   2 +
 messages/es.json                              |   2 +
 messages/fr.json                              |   2 +
 messages/ja.json                              |   2 +
 messages/ko.json                              |   2 +
 messages/pl.json                              |   2 +
 messages/zh.json                              |   2 +
 src/context/ProjectContext.tsx                |   9 +
 src/lib/adapters/scriptio/scriptio-adapter.ts |  73 ++-----
 src/lib/assets/asset-gc.ts                    |  79 ++++++++
 src/lib/assets/asset-hash.ts                  |  19 ++
 src/lib/assets/asset-store.ts                 |  88 +++++++++
 src/lib/assets/use-asset-gc.ts                |  31 +++
 src/lib/assets/use-asset-url.ts               |  71 +++++++
 src/lib/import/import-project.ts              |  73 ++-----
 .../indexeddb-storage-provider.ts             | 121 +++++++++++-
 .../storage-provider/local-persistence.ts     |  10 +-
 .../migrations/store-migrations.ts            |  23 ++-
 .../storage-provider/storage-provider.ts      |  35 ++++
 src/lib/project/project-doc.ts                |  16 ++
 src/lib/project/project-state.ts              | 187 +++++++++++++++++-
 src/tests/assets/assets.test.ts               | 183 +++++++++++++++++
 .../migrations/store-migration-runner.test.ts |   1 +
 src/tests/project/scriptio-roundtrip.test.ts  | 172 ++++++++++++++++
 31 files changed, 1425 insertions(+), 234 deletions(-)
 create mode 100644 src/lib/assets/asset-gc.ts
 create mode 100644 src/lib/assets/asset-hash.ts
 create mode 100644 src/lib/assets/asset-store.ts
 create mode 100644 src/lib/assets/use-asset-gc.ts
 create mode 100644 src/lib/assets/use-asset-url.ts
 create mode 100644 src/tests/assets/assets.test.ts
 create mode 100644 src/tests/project/scriptio-roundtrip.test.ts

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index e943ad0e..0b566473 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -32,6 +32,12 @@
     cursor: grabbing;
 }
 
+/* Highlight the canvas while an image file is dragged over it. */
+.container.drag_over {
+    outline: 2px dashed var(--secondary-text);
+    outline-offset: -8px;
+}
+
 .grid {
     position: absolute;
     inset: 0;
@@ -76,6 +82,29 @@
     z-index: 1000;
 }
 
+/* Image resource card: bare image, no colored header/border chrome. */
+.card.image_card {
+    border: 1px solid rgba(0, 0, 0, 0.12);
+    background-color: var(--main-bg);
+    padding: 0;
+    overflow: hidden;
+}
+
+.card_image {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+    display: block;
+    pointer-events: none;
+    user-select: none;
+}
+
+.card_image_placeholder {
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.05);
+}
+
 .card_header {
     position: relative;
     display: flex;
diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index ad1ed280..e83497f4 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -9,10 +9,14 @@ import { v7 as uuidv7 } from "uuid";
 import { Trash2, Plus, Minus, Copy, ListTree } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { DEFAULT_ITEM_COLORS } from "@src/lib/utils/colors";
+import { importImageFile } from "@src/lib/assets/asset-store";
+import { scheduleAssetGc } from "@src/lib/assets/asset-gc";
 
 const GRID_SIZE = 20;
 const MIN_SCALE = 0.25;
 const MAX_SCALE = 2;
+/** Largest edge (in canvas px) an image card is sized to on first drop. */
+const MAX_IMAGE_CARD_SIZE = 400;
 
 interface CardContextMenuState {
     position: { x: number; y: number };
@@ -25,7 +29,7 @@ interface ArrowContextMenuState {
 }
 
 const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }) => {
-    const { repository, isYjsReady, isReadOnly, boardFocusCardId, setBoardFocusCardId } =
+    const { projectId, repository, isYjsReady, isReadOnly, boardFocusCardId, setBoardFocusCardId } =
         useContext(ProjectContext);
     const t = useTranslations("board");
     const projectState = repository?.getState();
@@ -37,6 +41,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
     const [offset, setOffset] = useState({ x: 0, y: 0 });
     const [scale, setScale] = useState(1);
     const [isPanning, setIsPanning] = useState(false);
+    const [isDraggingFile, setIsDraggingFile] = useState(false);
     const [isSnapping, setIsSnapping] = useState(true);
     const [cardContextMenu, setCardContextMenu] = useState<CardContextMenuState | null>(null);
     const [arrowContextMenu, setArrowContextMenu] = useState<ArrowContextMenuState | null>(null);
@@ -496,6 +501,73 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         [cards, offset, scale, isSnapping, saveCards],
     );
 
+    // Highlight the canvas while an OS file drag hovers over it.
+    const handleDragOver = useCallback(
+        (e: React.DragEvent) => {
+            if (isReadOnly) return;
+            if (!Array.from(e.dataTransfer.types).includes("Files")) return;
+            e.preventDefault();
+            e.dataTransfer.dropEffect = "copy";
+            setIsDraggingFile(true);
+        },
+        [isReadOnly],
+    );
+
+    const handleDragLeave = useCallback((e: React.DragEvent) => {
+        // Ignore leave events fired when moving between the container's children.
+        if (!e.currentTarget.contains(e.relatedTarget as Node | null)) setIsDraggingFile(false);
+    }, []);
+
+    // Drop image files → store each in IndexedDB (deduped) and drop an image
+    // card referencing its hash at the cursor.
+    const handleDrop = useCallback(
+        async (e: React.DragEvent) => {
+            e.preventDefault();
+            setIsDraggingFile(false);
+            if (isReadOnly || !projectId) return;
+
+            const files = Array.from(e.dataTransfer.files).filter((f) => f.type.startsWith("image/"));
+            if (files.length === 0) return;
+
+            const container = containerRef.current;
+            if (!container) return;
+            const rect = container.getBoundingClientRect();
+            const dropX = (e.clientX - rect.left - offset.x) / scale;
+            const dropY = (e.clientY - rect.top - offset.y) / scale;
+
+            const created: BoardCardData[] = [];
+            for (const file of files) {
+                try {
+                    const { hash, width, height } = await importImageFile(projectId, file);
+                    const fit = Math.min(1, MAX_IMAGE_CARD_SIZE / Math.max(width, height, 1));
+                    const i = created.length;
+                    created.push({
+                        id: uuidv7(),
+                        type: "image",
+                        assetId: hash,
+                        title: "",
+                        description: "",
+                        color: "transparent",
+                        x: dropX + i * 24,
+                        y: dropY + i * 24,
+                        width: Math.max(60, Math.round(width * fit)),
+                        height: Math.max(60, Math.round(height * fit)),
+                    });
+                } catch (err) {
+                    console.error("[BoardCanvas] Failed to import image:", err);
+                }
+            }
+            if (created.length === 0) return;
+
+            setCards((prev) => {
+                const next = [...prev, ...created];
+                saveCards(next);
+                return next;
+            });
+        },
+        [isReadOnly, projectId, offset, scale, saveCards],
+    );
+
     // Update card (with multi-drag support)
     const handleUpdateCard = useCallback(
         (updatedCard: BoardCardData) => {
@@ -540,8 +612,10 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             setArrows(newArrows);
             saveArrows(newArrows);
             setCardContextMenu(null);
+            // Deleting an image card may orphan its asset — reconcile (debounced).
+            if (projectId && projectState) scheduleAssetGc(projectId, projectState);
         },
-        [cards, arrows, saveCards, saveArrows],
+        [cards, arrows, saveCards, saveArrows, projectId, projectState],
     );
 
     // Change card color
@@ -769,10 +843,13 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             <div className={styles.board_shadow} />
             <div
                 ref={containerRef}
-                className={`${styles.container} ${isPanning ? styles.panning : ""}`}
+                className={`${styles.container} ${isPanning ? styles.panning : ""} ${isDraggingFile ? styles.drag_over : ""}`}
                 onMouseDown={handleContainerMouseDown}
                 onDoubleClick={handleDoubleClick}
                 onWheel={handleWheel}
+                onDragOver={handleDragOver}
+                onDragLeave={handleDragLeave}
+                onDrop={handleDrop}
             >
                 <div className={styles.grid} style={gridPattern} />
 
@@ -899,6 +976,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                         <BoardCard
                             key={card.id}
                             card={card}
+                            projectId={projectId}
                             scale={scale}
                             isSnapping={isSnapping}
                             gridSize={GRID_SIZE}
@@ -934,16 +1012,19 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                             left: cardContextMenu.position.x,
                         }}
                     >
-                        <div className={styles.context_menu_colors}>
-                            {DEFAULT_ITEM_COLORS.map((color) => (
-                                <button
-                                    key={color}
-                                    className={`${styles.context_menu_color_swatch} ${cardContextMenu.card.color === color ? styles.context_menu_color_swatch_active : ""}`}
-                                    style={{ backgroundColor: color }}
-                                    onClick={() => handleChangeCardColor(cardContextMenu.card.id, color)}
-                                />
-                            ))}
-                        </div>
+                        {/* Color + outline apply to text notes; image cards have neither. */}
+                        {cardContextMenu.card.type !== "image" && (
+                            <div className={styles.context_menu_colors}>
+                                {DEFAULT_ITEM_COLORS.map((color) => (
+                                    <button
+                                        key={color}
+                                        className={`${styles.context_menu_color_swatch} ${cardContextMenu.card.color === color ? styles.context_menu_color_swatch_active : ""}`}
+                                        style={{ backgroundColor: color }}
+                                        onClick={() => handleChangeCardColor(cardContextMenu.card.id, color)}
+                                    />
+                                ))}
+                            </div>
+                        )}
                         <div
                             className={styles.context_menu_item}
                             onClick={() => handleDuplicateCard(cardContextMenu.card)}
@@ -951,13 +1032,15 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                             <Copy size={16} />
                             <p className="unselectable">{t("duplicate")}</p>
                         </div>
-                        <div
-                            className={styles.context_menu_item}
-                            onClick={() => handleSendToOutline(cardContextMenu.card)}
-                        >
-                            <ListTree size={16} />
-                            <p className="unselectable">{t("sendToOutline")}</p>
-                        </div>
+                        {cardContextMenu.card.type !== "image" && (
+                            <div
+                                className={styles.context_menu_item}
+                                onClick={() => handleSendToOutline(cardContextMenu.card)}
+                            >
+                                <ListTree size={16} />
+                                <p className="unselectable">{t("sendToOutline")}</p>
+                            </div>
+                        )}
                         <div
                             className={styles.context_menu_item}
                             onClick={() => handleDeleteCard(cardContextMenu.card.id)}
diff --git a/components/board/BoardCard.tsx b/components/board/BoardCard.tsx
index d8de0bb4..60166e9f 100644
--- a/components/board/BoardCard.tsx
+++ b/components/board/BoardCard.tsx
@@ -4,9 +4,11 @@ import { useRef, useState, useCallback, useEffect } from "react";
 import styles from "./BoardCanvas.module.css";
 import { useTranslations } from "next-intl";
 import { BoardCardData } from "@src/lib/project/project-state";
+import { useAssetUrl } from "@src/lib/assets/use-asset-url";
 
 interface BoardCardProps {
     card: BoardCardData;
+    projectId: string;
     scale: number;
     isSnapping: boolean;
     gridSize: number;
@@ -20,6 +22,7 @@ interface BoardCardProps {
 
 const BoardCard = ({
     card,
+    projectId,
     scale,
     isSnapping,
     gridSize,
@@ -30,6 +33,9 @@ const BoardCard = ({
     isConnecting,
     isSelected,
 }: BoardCardProps) => {
+    const isImage = card.type === "image";
+    // Only resolves bytes for image cards (null assetId is a no-op for text notes).
+    const imageUrl = useAssetUrl(projectId, isImage ? card.assetId : null);
     const t = useTranslations("board");
     const cardRef = useRef<HTMLDivElement>(null);
     const [isDragging, setIsDragging] = useState(false);
@@ -237,63 +243,74 @@ const BoardCard = ({
     return (
         <div
             ref={cardRef}
-            className={`${styles.card} ${isDragging ? styles.card_dragging : ""} ${isConnecting ? styles.card_connecting : ""} ${isSelected ? styles.card_selected : ""}`}
+            className={`${styles.card} ${isImage ? styles.image_card : ""} ${isDragging ? styles.card_dragging : ""} ${isConnecting ? styles.card_connecting : ""} ${isSelected ? styles.card_selected : ""}`}
             style={{
                 left: card.x,
                 top: card.y,
                 width: card.width,
                 height: card.height,
-                borderColor: card.color,
-                backgroundColor: card.color,
+                ...(isImage ? {} : { borderColor: card.color, backgroundColor: card.color }),
             }}
             onMouseDown={handleMouseDown}
             onMouseUp={handleCardMouseUp}
-            onDoubleClick={handleDoubleClick}
+            onDoubleClick={isImage ? undefined : handleDoubleClick}
             onContextMenu={handleRightClick}
         >
-            <div className={styles.card_header} style={{ backgroundColor: card.color }}>
-                {isEditingTitle ? (
-                    <input
-                        type="text"
-                        className={styles.card_header_title_input}
-                        value={localTitle}
-                        onChange={(e) => setLocalTitle(e.target.value)}
-                        onBlur={handleTitleBlur}
-                        onKeyDown={handleTitleKeyDown}
-                        onClick={(e) => e.stopPropagation()}
-                        onMouseDown={(e) => e.stopPropagation()}
-                        placeholder={t("titlePlaceholder")}
-                        autoFocus
-                    />
+            {isImage ? (
+                imageUrl ? (
+                    // Blob object URLs can't be optimized by next/image; a plain <img> is correct here.
+                    // eslint-disable-next-line @next/next/no-img-element
+                    <img src={imageUrl} alt="" draggable={false} className={styles.card_image} />
                 ) : (
-                    <span className={styles.card_header_title} onDoubleClick={handleTitleDoubleClick}>
-                        {card.title || t("untitled")}
-                    </span>
-                )}
-            </div>
-
-            <div
-                className={styles.card_content}
-                style={{ backgroundColor: `color-mix(in srgb, ${card.color} 20%, white)` }}
-                onDoubleClick={handleDoubleClick}
-            >
-                <p className={styles.card_description} style={{ display: isEditing ? "none" : undefined }}>
-                    {card.description}
-                </p>
-                {isEditing && (
-                    <textarea
-                        className={styles.card_description_input}
-                        value={localDescription}
-                        onChange={(e) => setLocalDescription(e.target.value)}
-                        onBlur={handleDescriptionBlur}
-                        onKeyDown={handleDescriptionKeyDown}
-                        onClick={(e) => e.stopPropagation()}
-                        onMouseDown={(e) => e.stopPropagation()}
-                        placeholder={t("descriptionPlaceholder")}
-                        autoFocus
-                    />
-                )}
-            </div>
+                    <div className={styles.card_image_placeholder} />
+                )
+            ) : (
+                <>
+                    <div className={styles.card_header} style={{ backgroundColor: card.color }}>
+                        {isEditingTitle ? (
+                            <input
+                                type="text"
+                                className={styles.card_header_title_input}
+                                value={localTitle}
+                                onChange={(e) => setLocalTitle(e.target.value)}
+                                onBlur={handleTitleBlur}
+                                onKeyDown={handleTitleKeyDown}
+                                onClick={(e) => e.stopPropagation()}
+                                onMouseDown={(e) => e.stopPropagation()}
+                                placeholder={t("titlePlaceholder")}
+                                autoFocus
+                            />
+                        ) : (
+                            <span className={styles.card_header_title} onDoubleClick={handleTitleDoubleClick}>
+                                {card.title || t("untitled")}
+                            </span>
+                        )}
+                    </div>
+
+                    <div
+                        className={styles.card_content}
+                        style={{ backgroundColor: `color-mix(in srgb, ${card.color} 20%, white)` }}
+                        onDoubleClick={handleDoubleClick}
+                    >
+                        <p className={styles.card_description} style={{ display: isEditing ? "none" : undefined }}>
+                            {card.description}
+                        </p>
+                        {isEditing && (
+                            <textarea
+                                className={styles.card_description_input}
+                                value={localDescription}
+                                onChange={(e) => setLocalDescription(e.target.value)}
+                                onBlur={handleDescriptionBlur}
+                                onKeyDown={handleDescriptionKeyDown}
+                                onClick={(e) => e.stopPropagation()}
+                                onMouseDown={(e) => e.stopPropagation()}
+                                placeholder={t("descriptionPlaceholder")}
+                                autoFocus
+                            />
+                        )}
+                    </div>
+                </>
+            )}
 
             <div className={styles.card_resize_handle} onMouseDown={handleResizeStart} />
 
diff --git a/components/navbar/ProductionPanel.module.css b/components/navbar/ProductionPanel.module.css
index db741973..d68d5454 100644
--- a/components/navbar/ProductionPanel.module.css
+++ b/components/navbar/ProductionPanel.module.css
@@ -97,6 +97,108 @@
     text-overflow: ellipsis;
 }
 
+/* Info hint — icon next to a label that reveals a small explanatory popover
+   on hover/focus. */
+.hint {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    flex-shrink: 0;
+    outline: none;
+}
+
+.hint_icon {
+    color: var(--secondary-text);
+    cursor: help;
+    display: block;
+}
+
+.hint:hover .hint_icon,
+.hint:focus .hint_icon {
+    color: var(--primary-text);
+}
+
+.hint_popover {
+    position: absolute;
+    top: calc(100% + 8px);
+    left: 0;
+    z-index: 200;
+    width: 240px;
+    padding: 8px 10px;
+    background-color: var(--secondary);
+    border: 1px solid var(--separator);
+    border-radius: 8px;
+    box-shadow: 0 6px 18px rgba(0, 0, 0, 0.18);
+    font-size: 0.72rem;
+    line-height: 1.45;
+    color: var(--secondary-text);
+    white-space: normal;
+    opacity: 0;
+    visibility: hidden;
+    transition: opacity 0.12s ease;
+    pointer-events: none;
+}
+
+.hint:hover .hint_popover,
+.hint:focus .hint_popover {
+    opacity: 1;
+    visibility: visible;
+}
+
+/* Draft locking section drops its own bottom border: the Advanced divider
+   below provides the separating line instead. */
+.section_flush {
+    border-bottom: none;
+}
+
+/* Advanced — a labeled, clickable divider. The flanking lines replace a plain
+   separator, with the toggle label resting on the line. */
+.advanced_divider {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    width: 100%;
+    padding: 2px 16px 12px;
+    border: none;
+    background: none;
+    cursor: pointer;
+    color: var(--secondary-text);
+}
+
+.advanced_divider::before,
+.advanced_divider::after {
+    content: "";
+    flex: 1;
+    height: 1px;
+    background-color: var(--separator);
+}
+
+.advanced_divider_label {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 0.68rem;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.06em;
+    white-space: nowrap;
+    transition: color 0.12s ease;
+}
+
+.advanced_divider:hover .advanced_divider_label {
+    color: var(--primary-text);
+}
+
+.advanced_chevron {
+    color: inherit;
+    flex-shrink: 0;
+    transition: transform 0.15s ease;
+}
+
+.advanced_chevron_open {
+    transform: rotate(180deg);
+}
+
 /* Provisional labels preview — boxed sub-section under the locking toggle. */
 .provisional_box {
     margin-top: 10px;
diff --git a/components/navbar/ProductionPanel.tsx b/components/navbar/ProductionPanel.tsx
index d00b815e..3c8183a4 100644
--- a/components/navbar/ProductionPanel.tsx
+++ b/components/navbar/ProductionPanel.tsx
@@ -2,7 +2,7 @@
 
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
-import { X, BookOpen, Clapperboard, PencilLine, Settings } from "lucide-react";
+import { X, BookOpen, Clapperboard, PencilLine, Settings, Info, ChevronDown } from "lucide-react";
 
 import { ProjectContext } from "@src/context/ProjectContext";
 import { UserContext } from "@src/context/UserContext";
@@ -59,6 +59,10 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
     // until revision tracking is wired to the repository.
     const [revisionColor, setRevisionColor] = useState(REVISION_COLORS[0].name);
 
+    // Scene/page/revision controls are tucked under a collapsed "Advanced"
+    // section — the draft toggle covers the common case on its own.
+    const [advancedOpen, setAdvancedOpen] = useState(false);
+
     const revisionOptions: DropdownOption[] = REVISION_COLORS.map((c) => ({
         value: c.name,
         label: (
@@ -86,28 +90,17 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         return () => document.removeEventListener("mousedown", handleClickOutside);
     }, [isOpen, onClose]);
 
-    const sceneUuids = useMemo(
-        () => scenes.map((s) => s.id).filter((id): id is string => !!id),
-        [scenes],
-    );
+    const sceneUuids = useMemo(() => scenes.map((s) => s.id).filter((id): id is string => !!id), [scenes]);
 
     const labels = useMemo(
         () =>
             sceneLocking
-                ? computeSceneLabels(
-                      sceneUuids,
-                      persistentScenes,
-                      sceneNumberingStyle,
-                      skippedSceneLetters,
-                  )
+                ? computeSceneLabels(sceneUuids, persistentScenes, sceneNumberingStyle, skippedSceneLetters)
                 : [],
         [sceneLocking, sceneUuids, persistentScenes, sceneNumberingStyle, skippedSceneLetters],
     );
 
-    const provisionalLabels = useMemo(
-        () => labels.filter((l) => l.status === "provisional"),
-        [labels],
-    );
+    const provisionalLabels = useMemo(() => labels.filter((l) => l.status === "provisional"), [labels]);
 
     // Stable across renders: the popup keeps a reference to this callback.
     const performUnlock = useCallback(() => {
@@ -131,12 +124,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         // Re-read fresh persistent data
         const persistentSnapshot = repository.scenes;
 
-        const currentLabels = computeSceneLabels(
-            uuids,
-            persistentSnapshot,
-            sceneNumberingStyle,
-            skippedSceneLetters,
-        );
+        const currentLabels = computeSceneLabels(uuids, persistentSnapshot, sceneNumberingStyle, skippedSceneLetters);
 
         currentLabels.forEach((label) => {
             if (label.status === "provisional") {
@@ -189,10 +177,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         return computeSceneLabels(pageAnchors, persistentPages, "suffix", skippedSceneLetters);
     }, [pageLocking, pageAnchors, persistentPages, skippedSceneLetters]);
 
-    const provisionalPageLabels = useMemo(
-        () => pageLabels.filter((l) => l.status === "provisional"),
-        [pageLabels],
-    );
+    const provisionalPageLabels = useMemo(() => pageLabels.filter((l) => l.status === "provisional"), [pageLabels]);
 
     const performPageUnlock = useCallback(() => {
         if (!repository) return;
@@ -213,12 +198,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
         const anchorInfos = getPageAnchorInfo(editor);
         const anchors = anchorInfos.map((a) => a.anchorId);
         const persistentSnapshot = repository.pages;
-        const currentLabels = computeSceneLabels(
-            anchors,
-            persistentSnapshot,
-            "suffix",
-            skippedSceneLetters,
-        );
+        const currentLabels = computeSceneLabels(anchors, persistentSnapshot, "suffix", skippedSceneLetters);
         currentLabels.forEach((label, idx) => {
             if (label.status === "provisional") {
                 repository.upsertPage(label.uuid, {
@@ -262,8 +242,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
     const draftLocking = sceneLocking && pageLocking;
 
     const hasProvisionalDraft =
-        (sceneLocking && provisionalLabels.length > 0) ||
-        (pageLocking && provisionalPageLabels.length > 0);
+        (sceneLocking && provisionalLabels.length > 0) || (pageLocking && provisionalPageLabels.length > 0);
 
     const performDraftUnlock = useCallback(() => {
         if (!repository) return;
@@ -318,11 +297,16 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
             </div>
 
             {/* Draft Locking (scenes + pages together) */}
-            <div className={styles.section}>
+            <div className={`${styles.section} ${styles.section_flush}`}>
                 <div className={styles.row}>
                     <div className={styles.row_main}>
-                        <PencilLine size={14} className={styles.row_icon} />
                         <span className={styles.row_label}>{t("draftLocking")}</span>
+                        <span className={styles.hint} tabIndex={0}>
+                            <Info size={14} className={styles.hint_icon} />
+                            <span className={styles.hint_popover} role="tooltip">
+                                {t("draftLockingHint")}
+                            </span>
+                        </span>
                     </div>
                     <div className={styles.row_actions}>
                         {draftLocking && hasProvisionalDraft && (
@@ -345,11 +329,29 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                 </div>
             </div>
 
+            {/* Advanced — a labeled separator that folds the scene/page/revision
+                controls. The label sits on the divider line under Draft locking. */}
+            <button
+                type="button"
+                className={styles.advanced_divider}
+                onClick={() => setAdvancedOpen((open) => !open)}
+                aria-expanded={advancedOpen}
+            >
+                <span className={styles.advanced_divider_label}>
+                    {t("advanced")}
+                    <ChevronDown
+                        size={13}
+                        className={`${styles.advanced_chevron} ${advancedOpen ? styles.advanced_chevron_open : ""}`}
+                    />
+                </span>
+            </button>
+
+            {advancedOpen && (
+                <>
             {/* Scene Locking */}
             <div className={styles.section}>
                 <div className={styles.row}>
                     <div className={styles.row_main}>
-                        <Clapperboard size={14} className={styles.row_icon} />
                         <span className={styles.row_label}>{t("sceneLocking")}</span>
                     </div>
                     <div className={styles.row_actions}>
@@ -377,10 +379,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                         <div className={styles.provisional_title}>{t("provisionalTitle")}</div>
                         <div className={styles.provisional_list}>
                             {provisionalLabels.map((l, idx) => (
-                                <span
-                                    key={`${l.uuid}-${idx}`}
-                                    className={styles.provisional_label}
-                                >
+                                <span key={`${l.uuid}-${idx}`} className={styles.provisional_label}>
                                     {l.label}
                                 </span>
                             ))}
@@ -393,7 +392,6 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
             <div className={styles.section}>
                 <div className={styles.row}>
                     <div className={styles.row_main}>
-                        <BookOpen size={14} className={styles.row_icon} />
                         <span className={styles.row_label}>{t("pageLocking")}</span>
                     </div>
                     <div className={styles.row_actions}>
@@ -421,10 +419,7 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                         <div className={styles.provisional_title}>{t("pageProvisionalTitle")}</div>
                         <div className={styles.provisional_list}>
                             {provisionalPageLabels.map((l, idx) => (
-                                <span
-                                    key={`${l.uuid}-${idx}`}
-                                    className={styles.provisional_label}
-                                >
+                                <span key={`${l.uuid}-${idx}`} className={styles.provisional_label}>
                                     {l.label}
                                 </span>
                             ))}
@@ -448,6 +443,8 @@ const ProductionPanel = ({ isOpen, onClose }: ProductionPanelProps) => {
                     className={styles.revision_select}
                 />
             </div>
+                </>
+            )}
         </div>
     );
 };
diff --git a/components/project/WritingTimer.tsx b/components/project/WritingTimer.tsx
index 2fa0dfdc..5485e6bb 100644
--- a/components/project/WritingTimer.tsx
+++ b/components/project/WritingTimer.tsx
@@ -12,7 +12,7 @@ type TimerMode = "countdown" | "stopwatch";
 const PRESETS = [10, 15, 25, 45];
 // Minutes added/removed per stepper click, and the allowed duration range (sec).
 const STEP = 5;
-const MIN_SECONDS = 30;
+const MIN_SECONDS = 1;
 const MAX_SECONDS = 180 * 60;
 
 const clampSeconds = (sec: number) => Math.min(MAX_SECONDS, Math.max(MIN_SECONDS, Math.round(sec)));
diff --git a/messages/de.json b/messages/de.json
index 5cd39367..baff18ef 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -487,6 +487,8 @@
   "production": {
     "title": "Produktion",
     "draftLocking": "Entwurf sperren",
+    "draftLockingHint": "Beim Sperren eines Entwurfs werden die aktuellen Szenen und Seiten automatisch gesperrt und zur nächsten Revision gewechselt. Öffnen Sie den Bereich „Erweitert“, um diese manuell zu konfigurieren.",
+    "advanced": "Erweitert",
     "draftRelock": "Erneut sperren",
     "settings": "Produktionseinstellungen",
     "unlockDraftTitle": "Entwurf entsperren",
diff --git a/messages/en.json b/messages/en.json
index c72afd3c..230c0599 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -486,6 +486,8 @@
   "production": {
     "title": "Production",
     "draftLocking": "Draft locking",
+    "draftLockingHint": "Locking a draft automatically locks current scenes, pages and switches to the next revision. Open the Advanced section to configure these manually.",
+    "advanced": "Advanced",
     "draftRelock": "Relock",
     "settings": "Production settings",
     "unlockDraftTitle": "Unlock draft",
diff --git a/messages/es.json b/messages/es.json
index d212320a..f952198f 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -486,6 +486,8 @@
   "production": {
     "title": "Producción",
     "draftLocking": "Bloquear borrador",
+    "draftLockingHint": "Bloquear un borrador bloquea automáticamente las escenas y páginas actuales y pasa a la siguiente revisión. Abre la sección Avanzado para configurarlas manualmente.",
+    "advanced": "Avanzado",
     "draftRelock": "Volver a bloquear",
     "settings": "Ajustes de producción",
     "unlockDraftTitle": "Desbloquear borrador",
diff --git a/messages/fr.json b/messages/fr.json
index df70cb12..e6f11028 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -487,6 +487,8 @@
   "production": {
     "title": "Production",
     "draftLocking": "Verrouillage du brouillon",
+    "draftLockingHint": "Verrouiller un brouillon verrouille automatiquement les scènes et pages actuelles et passe à la révision suivante. Ouvrez la section Avancé pour les configurer manuellement.",
+    "advanced": "Avancé",
     "draftRelock": "Reverrouiller",
     "settings": "Paramètres de production",
     "unlockDraftTitle": "Déverrouiller le brouillon",
diff --git a/messages/ja.json b/messages/ja.json
index 02b93ce6..314543d3 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -486,6 +486,8 @@
   "production": {
     "title": "プロダクション",
     "draftLocking": "ドラフトロック",
+    "draftLockingHint": "ドラフトをロックすると、現在のシーンとページが自動的にロックされ、次のリビジョンに切り替わります。手動で設定するには「詳細設定」セクションを開いてください。",
+    "advanced": "詳細設定",
     "draftRelock": "再ロック",
     "settings": "制作設定",
     "unlockDraftTitle": "ドラフトのロック解除",
diff --git a/messages/ko.json b/messages/ko.json
index 8d464cfc..fa4c2f24 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -486,6 +486,8 @@
   "production": {
     "title": "프로덕션",
     "draftLocking": "드래프트 잠금",
+    "draftLockingHint": "드래프트를 잠그면 현재 씬과 페이지가 자동으로 잠기고 다음 리비전으로 전환됩니다. 수동으로 설정하려면 고급 섹션을 여세요.",
+    "advanced": "고급",
     "draftRelock": "다시 잠그기",
     "settings": "프로덕션 설정",
     "unlockDraftTitle": "드래프트 잠금 해제",
diff --git a/messages/pl.json b/messages/pl.json
index d91a6f95..2c0c51f3 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -486,6 +486,8 @@
   "production": {
     "title": "Produkcja",
     "draftLocking": "Blokowanie wersji roboczej",
+    "draftLockingHint": "Zablokowanie wersji roboczej automatycznie blokuje bieżące sceny i strony oraz przełącza na następną wersję. Otwórz sekcję Zaawansowane, aby skonfigurować je ręcznie.",
+    "advanced": "Zaawansowane",
     "draftRelock": "Zablokuj ponownie",
     "settings": "Ustawienia produkcji",
     "unlockDraftTitle": "Odblokuj wersję roboczą",
diff --git a/messages/zh.json b/messages/zh.json
index 3bd3101e..3453b649 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -486,6 +486,8 @@
   "production": {
     "title": "制作",
     "draftLocking": "锁定草稿",
+    "draftLockingHint": "锁定草稿会自动锁定当前场景、页面并切换到下一个修订版本。打开「高级」部分可手动配置这些选项。",
+    "advanced": "高级",
     "draftRelock": "重新锁定",
     "settings": "制作设置",
     "unlockDraftTitle": "解锁草稿",
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index 5229e0c0..3d28f118 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -36,6 +36,7 @@ import {
 import { Screenplay } from "@src/lib/utils/types";
 import { ScreenplayElement, TitlePageElement, Style, PageFormat } from "@src/lib/utils/enums";
 import { SearchMatch } from "@src/lib/screenplay/extensions/search-highlight-extension";
+import { useAssetGc } from "@src/lib/assets/use-asset-gc";
 
 // Import types only - these don't cause module loading
 import type { ThrottledWebsocketProvider } from "@src/lib/cloud/utils";
@@ -47,6 +48,8 @@ import type { ProjectRepository } from "@src/lib/project/project-repository";
 
 export interface ProjectContextType {
     // Project data
+    /** The active project's id (stable for the provider's lifetime). */
+    projectId: string;
     project: ProjectMembershipPayload | null;
     updateProject: (project: ProjectMembershipPayload) => void;
 
@@ -176,6 +179,7 @@ export interface ProjectContextType {
 // -------------------------------- //
 
 const defaultContextValue: ProjectContextType = {
+    projectId: "",
     project: null,
     updateProject: () => {},
     repository: null,
@@ -437,6 +441,9 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         repository?.setReadOnly(isReadOnly);
     }, [repository, isReadOnly]);
 
+    // Keep IndexedDB image assets reconciled with the document (orphan sweep).
+    useAssetGc(projectId, repository, isYjsReady);
+
     // The DO pushes a role-changed message whenever an admin updates this
     // user's role. Mirror it into local state so isReadOnly flips and the
     // editor/repository gates apply immediately, without waiting for an SWR
@@ -918,6 +925,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
 
     const contextValue = useMemo<ProjectContextType>(
         () => ({
+            projectId,
             project,
             updateProject,
             repository,
@@ -998,6 +1006,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setBoardFocusCardId,
         }),
         [
+            projectId,
             project,
             updateProject,
             repository,
diff --git a/src/lib/adapters/scriptio/scriptio-adapter.ts b/src/lib/adapters/scriptio/scriptio-adapter.ts
index 474ef582..98245d85 100644
--- a/src/lib/adapters/scriptio/scriptio-adapter.ts
+++ b/src/lib/adapters/scriptio/scriptio-adapter.ts
@@ -1,4 +1,4 @@
-import { LayoutData, ProductionData, ProjectData, ProjectMetadata, ProjectState, screenplayOf, titlepageOf } from "@src/lib/project/project-state";
+import { ProjectData, ProjectState, applyProjectData, clearProjectData, projectDataOf } from "@src/lib/project/project-state";
 import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { replaceScreenplay } from "../../screenplay/editor";
 import { Editor } from "@tiptap/react";
@@ -69,20 +69,9 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
         if (isReadable) {
             // Human-readable path: serialize the full project as indented JSON.
             // This produces a larger file but makes the content inspectable
-            // with any text editor.
-            const data: ProjectData = {
-                screenplay: screenplayOf(project),
-                titlepage: titlepageOf(project),
-                metadata: project.metadata().toJSON() as ProjectMetadata,
-                characters: project.characters().toJSON(),
-                scenes: project.scenes().toJSON(),
-                pages: project.pages().toJSON(),
-                locations: project.locations().toJSON(),
-                layout: project.layout().toJSON() as LayoutData,
-                production: project.production().toJSON() as ProductionData,
-                comments: project.comments().toJSON(),
-            };
-            payload = new TextEncoder().encode(JSON.stringify(data, null, 2));
+            // with any text editor. `projectDataOf` captures every map and
+            // fragment, so the readable export is just as lossless as binary.
+            payload = new TextEncoder().encode(JSON.stringify(projectDataOf(project), null, 2));
         } else {
             // Binary path: zlib-compress the raw Yjs state.
             // Preserves the full CRDT document, including collaboration history.
@@ -121,18 +110,7 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
             const decompressed = fflate.unzlibSync(payload);
             Y.applyUpdate(tmpDoc, decompressed);
 
-            return {
-                screenplay: screenplayOf(tmpDoc),
-                titlepage: titlepageOf(tmpDoc),
-                metadata: tmpDoc.metadata().toJSON() as ProjectMetadata,
-                characters: tmpDoc.characters().toJSON(),
-                scenes: tmpDoc.scenes().toJSON(),
-                pages: tmpDoc.pages().toJSON(),
-                locations: tmpDoc.locations().toJSON(),
-                layout: tmpDoc.layout().toJSON() as LayoutData,
-                production: tmpDoc.production().toJSON() as ProductionData,
-                comments: tmpDoc.comments().toJSON(),
-            };
+            return projectDataOf(tmpDoc);
         } catch (error) {
             console.error("Failed to parse .scriptio file", error);
             throw new Error("Invalid Scriptio file format");
@@ -152,32 +130,21 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
         const payload = data.subarray(payloadOffset);
         const isReadable = (flags & FLAG_READABLE_JSON) !== 0;
 
-        if (!isReadable && repository) {
+        if (repository) {
             const ydoc = repository.getState() as ProjectState;
             try {
-                const decompressed = fflate.unzlibSync(payload);
-
-                // To truly "replace" the state, we clear existing content
-                // to avoid merging with the previous project data.
-                ydoc.transact(() => {
-                    // Fragments - delete all content
-                    const screenplay = ydoc.screenplayFragment();
-                    if (screenplay.length > 0) screenplay.delete(0, screenplay.length);
-                    const titlepage = ydoc.titlepageFragment();
-                    if (titlepage.length > 0) titlepage.delete(0, titlepage.length);
-
-                    // Maps - clear all entries
-                    ydoc.metadata().clear();
-                    ydoc.characters().clear();
-                    ydoc.scenes().clear();
-                    ydoc.locations().clear();
-                    ydoc.layout().clear();
-                    ydoc.production().clear();
-                    ydoc.comments().clear();
-                });
-
-                // Apply the new state
-                Y.applyUpdate(ydoc, decompressed);
+                // Truly "replace" the project: wipe every existing map and
+                // fragment first so the import never merges with prior data.
+                clearProjectData(ydoc);
+
+                if (isReadable) {
+                    const json = new TextDecoder().decode(payload);
+                    applyProjectData(ydoc, JSON.parse(json) as ProjectData);
+                } else {
+                    // Applying the raw Yjs update preserves the full CRDT state,
+                    // including any collaboration history baked into the file.
+                    Y.applyUpdate(ydoc, fflate.unzlibSync(payload));
+                }
 
                 // Refresh editors if provided
                 const projectData = this.convertFrom(rawContent);
@@ -190,11 +157,11 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
 
                 return;
             } catch (error) {
-                console.warn("Failed to apply binary Scriptio update directly, falling back to base import.", error);
+                console.warn("Failed to apply Scriptio update directly, falling back to base import.", error);
             }
         }
 
-        // Fallback to the base implementation for readable JSON or if repository is missing
+        // Fallback to the base implementation if no repository is available.
         super.import(rawContent, editor, titlePageEditor, repository);
     }
 }
diff --git a/src/lib/assets/asset-gc.ts b/src/lib/assets/asset-gc.ts
new file mode 100644
index 00000000..7bd30100
--- /dev/null
+++ b/src/lib/assets/asset-gc.ts
@@ -0,0 +1,79 @@
+/**
+ * Asset garbage collection (reconcile-from-doc / mark-sweep).
+ *
+ * Image bytes live in IndexedDB, decoupled from Yjs; the board cards only carry
+ * the `assetId` (SHA-256). The set of assetIds referenced across every board in
+ * the document is therefore the source of truth for what is still in use. GC
+ * computes that set and deletes any stored blob not in it — robust against
+ * collaboration and crashes, with no persisted reference counter to drift.
+ */
+
+import type { BoardCardData } from "../project/project-doc";
+import type { ProjectState } from "../project/project-state";
+import { getStorageProvider } from "../persistence/storage-provider/storage-provider";
+
+/** Every asset hash referenced by an image card across all board documents. */
+export function collectReferencedHashes(ydoc: ProjectState): Set<string> {
+    const referenced = new Set<string>();
+    ydoc.documents().forEach((node) => {
+        if (node.type !== "board") return;
+        const raw = ydoc.boardData(node.id).get("cards");
+        if (!raw) return;
+        try {
+            const cards = JSON.parse(raw) as BoardCardData[];
+            for (const card of cards) {
+                if (card.type === "image" && card.assetId) referenced.add(card.assetId);
+            }
+        } catch {
+            // A malformed cards blob shouldn't make us delete live assets — skip.
+            // (Conservative: treat as "references unknown", handled below.)
+            throw new SkipGcError();
+        }
+    });
+    return referenced;
+}
+
+/** Internal sentinel: a parse failure means we can't safely reconcile this run. */
+class SkipGcError extends Error {}
+
+/**
+ * Delete every stored asset of `projectId` whose hash is not referenced by any
+ * board card in `ydoc`. No-ops safely if a board's cards blob can't be parsed.
+ */
+export async function gcProjectAssets(projectId: string, ydoc: ProjectState): Promise<void> {
+    let referenced: Set<string>;
+    try {
+        referenced = collectReferencedHashes(ydoc);
+    } catch (e) {
+        if (e instanceof SkipGcError) return;
+        throw e;
+    }
+
+    const provider = await getStorageProvider();
+    const stored = await provider.listAssetHashes(projectId);
+    const orphans = stored.filter((hash) => !referenced.has(hash));
+    await Promise.all(orphans.map((hash) => provider.deleteAsset(projectId, hash)));
+}
+
+// ── Debounced scheduler ──────────────────────────────────────────────────────
+
+const GC_DEBOUNCE_MS = 1500;
+const pending = new Map<string, ReturnType<typeof setTimeout>>();
+
+/**
+ * Schedule a debounced project-wide reconcile (per projectId). Rapid edits — a
+ * burst of card deletions, say — coalesce into a single sweep.
+ */
+export function scheduleAssetGc(projectId: string, ydoc: ProjectState): void {
+    const existing = pending.get(projectId);
+    if (existing) clearTimeout(existing);
+    pending.set(
+        projectId,
+        setTimeout(() => {
+            pending.delete(projectId);
+            void gcProjectAssets(projectId, ydoc).catch((e) =>
+                console.warn("[assets] GC failed:", e),
+            );
+        }, GC_DEBOUNCE_MS),
+    );
+}
diff --git a/src/lib/assets/asset-hash.ts b/src/lib/assets/asset-hash.ts
new file mode 100644
index 00000000..59be747f
--- /dev/null
+++ b/src/lib/assets/asset-hash.ts
@@ -0,0 +1,19 @@
+/**
+ * SHA-256 hashing for content-addressed assets.
+ *
+ * Assets (board images) are keyed by the hex SHA-256 of their bytes so the same
+ * image dropped twice is stored once. Uses the Web Crypto API, available in both
+ * the browser and the Tauri webview. This is the single client-side hashing
+ * helper — reuse it for the future cloud R2 upload path too.
+ */
+
+/** Hex SHA-256 digest of a byte buffer. */
+export async function sha256Hex(buffer: ArrayBuffer): Promise<string> {
+    const digest = await crypto.subtle.digest("SHA-256", buffer);
+    const bytes = new Uint8Array(digest);
+    let hex = "";
+    for (const byte of bytes) {
+        hex += byte.toString(16).padStart(2, "0");
+    }
+    return hex;
+}
diff --git a/src/lib/assets/asset-store.ts b/src/lib/assets/asset-store.ts
new file mode 100644
index 00000000..d2b8508a
--- /dev/null
+++ b/src/lib/assets/asset-store.ts
@@ -0,0 +1,88 @@
+/**
+ * Local asset store façade.
+ *
+ * The single chokepoint for reading/writing board image bytes, decoupled from
+ * the Yjs document. Assets are stored in IndexedDB content-addressed by SHA-256
+ * (so duplicates collapse) and scoped per project. A future cloud variant will
+ * extend this seam to also upload to / fetch from R2.
+ */
+
+import { getStorageProvider } from "../persistence/storage-provider/storage-provider";
+import { sha256Hex } from "./asset-hash";
+
+export interface AssetMeta {
+    /** SHA-256 hex — the assetId referenced by board cards. */
+    hash: string;
+    mime: string;
+    width: number;
+    height: number;
+}
+
+/** Read the intrinsic pixel size of an image file, with a decode fallback. */
+async function decodeImageSize(file: Blob): Promise<{ width: number; height: number }> {
+    if (typeof createImageBitmap === "function") {
+        try {
+            const bitmap = await createImageBitmap(file);
+            const size = { width: bitmap.width, height: bitmap.height };
+            bitmap.close();
+            return size;
+        } catch {
+            // fall through to the <img> path
+        }
+    }
+
+    const url = URL.createObjectURL(file);
+    try {
+        return await new Promise<{ width: number; height: number }>((resolve, reject) => {
+            const img = new Image();
+            img.onload = () => resolve({ width: img.naturalWidth, height: img.naturalHeight });
+            img.onerror = () => reject(new Error("Failed to decode image"));
+            img.src = url;
+        });
+    } finally {
+        URL.revokeObjectURL(url);
+    }
+}
+
+/**
+ * Store an image file for a project and return its metadata. Idempotent: if an
+ * asset with the same bytes already exists it is returned unchanged (dedup).
+ */
+export async function importImageFile(projectId: string, file: File): Promise<AssetMeta> {
+    const buffer = await file.arrayBuffer();
+    const hash = await sha256Hex(buffer);
+    const mime = file.type || "image/png";
+
+    const provider = await getStorageProvider();
+
+    const existing = await provider.getAsset(projectId, hash);
+    if (existing) {
+        return { hash, mime: existing.mime, width: existing.width, height: existing.height };
+    }
+
+    const { width, height } = await decodeImageSize(file);
+    await provider.putAsset({
+        key: `${projectId}/${hash}`,
+        projectId,
+        hash,
+        mime,
+        size: file.size,
+        width,
+        height,
+        data: buffer,
+        createdAt: Date.now(),
+    });
+
+    return { hash, mime, width, height };
+}
+
+/**
+ * Resolve an asset to an object URL for rendering, or null if it isn't stored
+ * locally. Callers own the URL and must `URL.revokeObjectURL` it when done.
+ */
+export async function loadAssetObjectUrl(projectId: string, hash: string): Promise<string | null> {
+    const provider = await getStorageProvider();
+    const asset = await provider.getAsset(projectId, hash);
+    if (!asset) return null;
+    return URL.createObjectURL(new Blob([asset.data], { type: asset.mime }));
+}
diff --git a/src/lib/assets/use-asset-gc.ts b/src/lib/assets/use-asset-gc.ts
new file mode 100644
index 00000000..024253fa
--- /dev/null
+++ b/src/lib/assets/use-asset-gc.ts
@@ -0,0 +1,31 @@
+"use client";
+
+/**
+ * Mount once per project (in ProjectProvider) to keep IndexedDB assets in sync
+ * with the document. Runs a reconcile when the project becomes ready (clears
+ * orphans left by prior sessions, remote deletions, or crashes) and again,
+ * debounced, whenever the document tree changes — board/folder deletions clear
+ * their board maps, which can orphan images. Per-card deletions are handled
+ * separately in BoardCanvas (they don't touch the documents map).
+ */
+
+import { useEffect } from "react";
+import type { ProjectRepository } from "../project/project-repository";
+import { gcProjectAssets, scheduleAssetGc } from "./asset-gc";
+
+export function useAssetGc(
+    projectId: string | null,
+    repository: ProjectRepository | null,
+    isReady: boolean,
+): void {
+    useEffect(() => {
+        if (!projectId || !repository || !isReady) return;
+        const ydoc = repository.getState();
+
+        void gcProjectAssets(projectId, ydoc).catch((e) =>
+            console.warn("[assets] initial GC failed:", e),
+        );
+
+        return repository.observeDocuments(() => scheduleAssetGc(projectId, ydoc));
+    }, [projectId, repository, isReady]);
+}
diff --git a/src/lib/assets/use-asset-url.ts b/src/lib/assets/use-asset-url.ts
new file mode 100644
index 00000000..713e50d3
--- /dev/null
+++ b/src/lib/assets/use-asset-url.ts
@@ -0,0 +1,71 @@
+"use client";
+
+/**
+ * Resolve a board image asset to an object URL for rendering.
+ *
+ * Backed by a module-level, ref-counted cache keyed by `${projectId}/${hash}`,
+ * so the same image used by several cards shares one object URL (no flicker) and
+ * the URL is revoked only when the last consumer unmounts (no leaks).
+ */
+
+import { useEffect, useState } from "react";
+import { loadAssetObjectUrl } from "./asset-store";
+
+interface CacheEntry {
+    refCount: number;
+    promise: Promise<string | null>;
+}
+
+const cache = new Map<string, CacheEntry>();
+
+const cacheKey = (projectId: string, hash: string) => `${projectId}/${hash}`;
+
+function acquire(projectId: string, hash: string): Promise<string | null> {
+    const key = cacheKey(projectId, hash);
+    let entry = cache.get(key);
+    if (!entry) {
+        entry = { refCount: 0, promise: loadAssetObjectUrl(projectId, hash) };
+        cache.set(key, entry);
+    }
+    entry.refCount++;
+    return entry.promise;
+}
+
+function release(projectId: string, hash: string): void {
+    const key = cacheKey(projectId, hash);
+    const entry = cache.get(key);
+    if (!entry) return;
+    entry.refCount--;
+    if (entry.refCount <= 0) {
+        cache.delete(key);
+        void entry.promise.then((url) => {
+            if (url) URL.revokeObjectURL(url);
+        });
+    }
+}
+
+/** Object URL for the asset, or null while loading / when not stored locally. */
+export function useAssetUrl(
+    projectId: string | null | undefined,
+    assetId: string | null | undefined,
+): string | null {
+    // Tag the loaded URL with its key so a stale image is never shown while a
+    // new asset loads (and so the no-asset case returns null without setState).
+    const key = projectId && assetId ? cacheKey(projectId, assetId) : null;
+    const [loaded, setLoaded] = useState<{ key: string; url: string } | null>(null);
+
+    useEffect(() => {
+        if (!projectId || !assetId) return;
+        const k = cacheKey(projectId, assetId);
+        let active = true;
+        void acquire(projectId, assetId).then((resolved) => {
+            if (active && resolved) setLoaded({ key: k, url: resolved });
+        });
+        return () => {
+            active = false;
+            release(projectId, assetId);
+        };
+    }, [projectId, assetId]);
+
+    return key && loaded?.key === key ? loaded.url : null;
+}
diff --git a/src/lib/import/import-project.ts b/src/lib/import/import-project.ts
index 2bdf31b3..4e9c3321 100644
--- a/src/lib/import/import-project.ts
+++ b/src/lib/import/import-project.ts
@@ -3,14 +3,11 @@
  * Creates remote projects for logged-in users, local projects for offline/desktop.
  */
 
-import { LayoutData, ProjectData, ProjectMetadata, ProjectState } from "@src/lib/project/project-state";
+import { ProjectData, ProjectState, applyProjectData } from "@src/lib/project/project-state";
 import { CURRENT_PROJECT_VERSION } from "@src/lib/project/migrations/project-migrations";
 import { getAdapterByFilename } from "@src/lib/adapters/registry";
 import { createCachedProject, createCachedProjectWithId } from "@src/lib/persistence/storage-provider/local-persistence";
 import { writeYjsDocumentLocally } from "@src/lib/persistence/y-local-provider";
-import { prosemirrorJSONToYXmlFragment } from "y-prosemirror";
-import { ScreenplaySchema } from "@src/lib/screenplay/editor";
-import { TitlePageSchema } from "@src/lib/titlepage/editor";
 import { Editor } from "@tiptap/react";
 import { createProject } from "@src/lib/utils/requests";
 import { CreateProjectBody } from "@src/lib/utils/api-bodies";
@@ -74,62 +71,18 @@ export async function importFileIntoProject(
 async function createLocalYjsDocument(projectId: string, projectData: ProjectData): Promise<void> {
     const ydoc = new ProjectState();
 
-    ydoc.transact(() => {
-        // Screenplay fragment
-        const screenplayFragment = ydoc.screenplayFragment();
-        prosemirrorJSONToYXmlFragment(
-            ScreenplaySchema,
-            { type: "doc", content: projectData.screenplay },
-            screenplayFragment,
-        );
-
-        // Titlepage fragment
-        if (projectData.titlepage) {
-            const titlepageFragment = ydoc.titlepageFragment();
-            prosemirrorJSONToYXmlFragment(
-                TitlePageSchema,
-                { type: "doc", content: projectData.titlepage },
-                titlepageFragment,
-            );
-        }
-
-        // Maps
-        const metadataMap = ydoc.metadata();
-        if (projectData.metadata) {
-            Object.entries(projectData.metadata).forEach(([key, value]) => metadataMap.set(key as keyof ProjectMetadata, value));
-        }
-        // Stamp the schema version: preserves the imported file's version if it
-        // had one (so future-version files surface a migration error on open),
-        // otherwise marks the doc as current so it skips migration on first load.
-        if (metadataMap.get("version") === undefined) {
-            metadataMap.set("version", CURRENT_PROJECT_VERSION);
-        }
-
-        if (projectData.characters) {
-            const charactersMap = ydoc.characters();
-            Object.entries(projectData.characters).forEach(([key, value]) => charactersMap.set(key, value));
-        }
-
-        if (projectData.locations) {
-            const locationsMap = ydoc.locations();
-            Object.entries(projectData.locations).forEach(([key, value]) => locationsMap.set(key, value));
-        }
-
-        if (projectData.scenes) {
-            const scenesMap = ydoc.scenes();
-            Object.entries(projectData.scenes).forEach(([key, value]) => scenesMap.set(key, value));
-        }
-
-        if (projectData.layout) {
-            const layoutMap = ydoc.layout();
-            Object.entries(projectData.layout).forEach(([key, value]) => layoutMap.set(key as keyof LayoutData, value));
-        }
-
-        if (projectData.comments) {
-            const commentsMap = ydoc.comments();
-            Object.entries(projectData.comments).forEach(([key, value]) => commentsMap.set(key, value));
-        }
-    });
+    // Write every map and fragment the adapter produced. Adapters that only
+    // parse a screenplay (fountain/fdx) supply a partial `ProjectData`;
+    // `applyProjectData` ignores the keys they leave out.
+    applyProjectData(ydoc, projectData);
+
+    // Stamp the schema version: preserves the imported file's version if it had
+    // one (so future-version files surface a migration error on open), otherwise
+    // marks the doc as current so it skips migration on first load.
+    const metadataMap = ydoc.metadata();
+    if (metadataMap.get("version") === undefined) {
+        ydoc.transact(() => metadataMap.set("version", CURRENT_PROJECT_VERSION));
+    }
 
     await writeYjsDocumentLocally(projectId, ydoc);
     ydoc.destroy();
diff --git a/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts b/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
index 04d37191..28443517 100644
--- a/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
+++ b/src/lib/persistence/storage-provider/indexeddb-storage-provider.ts
@@ -7,8 +7,12 @@
  */
 
 import type { InstalledDictionary, UserSettings } from "@src/lib/utils/types";
-import { CachedProject, ProjectEntryInput, StorageProvider } from "./storage-provider";
-import { CURRENT_STORE_VERSION, STORE_NAMES } from "./migrations/store-migrations";
+import { CachedProject, ProjectEntryInput, StorageProvider, StoredAsset } from "./storage-provider";
+import {
+    ASSETS_BY_PROJECT_INDEX,
+    CURRENT_STORE_VERSION,
+    STORE_NAMES,
+} from "./migrations/store-migrations";
 import { runStoreMigrations } from "./migrations/store-migration-runner";
 import { StoreVersionTooNewError } from "./migrations/errors";
 
@@ -17,8 +21,12 @@ const PROJECTS_STORE = STORE_NAMES.PROJECTS;
 const SETTINGS_STORE = STORE_NAMES.SETTINGS;
 const DICTIONARIES_STORE = STORE_NAMES.DICTIONARIES;
 const MIGRATION_BACKUPS_STORE = STORE_NAMES.MIGRATION_BACKUPS;
+const ASSETS_STORE = STORE_NAMES.ASSETS;
 const SETTINGS_KEY = "global";
 
+/** Primary key for an asset record: `${projectId}/${hash}`. */
+const assetKey = (projectId: string, hash: string): string => `${projectId}/${hash}`;
+
 interface BrowserStoredProject {
     id: string;
     title: string;
@@ -340,4 +348,113 @@ export class IndexedDBStorageProvider implements StorageProvider {
             tx.onerror = () => reject(tx.error);
         });
     }
+
+    // ── Assets ────────────────────────────────────────────────────────────────
+
+    async putAsset(asset: StoredAsset): Promise<void> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const tx = db.transaction(ASSETS_STORE, "readwrite");
+            tx.objectStore(ASSETS_STORE).put(asset);
+            tx.oncomplete = () => resolve();
+            tx.onerror = () => reject(tx.error);
+        });
+    }
+
+    async hasAsset(projectId: string, hash: string): Promise<boolean> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const req = db
+                .transaction(ASSETS_STORE, "readonly")
+                .objectStore(ASSETS_STORE)
+                .getKey(assetKey(projectId, hash));
+            req.onsuccess = () => resolve(req.result !== undefined);
+            req.onerror = () => reject(req.error);
+        });
+    }
+
+    async getAsset(projectId: string, hash: string): Promise<StoredAsset | null> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const req = db
+                .transaction(ASSETS_STORE, "readonly")
+                .objectStore(ASSETS_STORE)
+                .get(assetKey(projectId, hash));
+            req.onsuccess = () => resolve((req.result as StoredAsset | undefined) ?? null);
+            req.onerror = () => reject(req.error);
+        });
+    }
+
+    async listAssetHashes(projectId: string): Promise<string[]> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const hashes: string[] = [];
+            const index = db
+                .transaction(ASSETS_STORE, "readonly")
+                .objectStore(ASSETS_STORE)
+                .index(ASSETS_BY_PROJECT_INDEX);
+            const req = index.openCursor(IDBKeyRange.only(projectId));
+            req.onsuccess = () => {
+                const cursor = req.result;
+                if (cursor) {
+                    hashes.push((cursor.value as StoredAsset).hash);
+                    cursor.continue();
+                } else {
+                    resolve(hashes);
+                }
+            };
+            req.onerror = () => reject(req.error);
+        });
+    }
+
+    async deleteAsset(projectId: string, hash: string): Promise<void> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const tx = db.transaction(ASSETS_STORE, "readwrite");
+            tx.objectStore(ASSETS_STORE).delete(assetKey(projectId, hash));
+            tx.oncomplete = () => resolve();
+            tx.onerror = () => reject(tx.error);
+        });
+    }
+
+    async deleteProjectAssets(projectId: string): Promise<void> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const tx = db.transaction(ASSETS_STORE, "readwrite");
+            const store = tx.objectStore(ASSETS_STORE);
+            const req = store.index(ASSETS_BY_PROJECT_INDEX).openCursor(IDBKeyRange.only(projectId));
+            req.onsuccess = () => {
+                const cursor = req.result;
+                if (cursor) {
+                    cursor.delete();
+                    cursor.continue();
+                }
+            };
+            tx.oncomplete = () => resolve();
+            tx.onerror = () => reject(tx.error);
+        });
+    }
+
+    async copyProjectAssets(fromProjectId: string, toProjectId: string): Promise<void> {
+        const db = await getBrowserDb();
+        return new Promise((resolve, reject) => {
+            const tx = db.transaction(ASSETS_STORE, "readwrite");
+            const store = tx.objectStore(ASSETS_STORE);
+            const req = store.index(ASSETS_BY_PROJECT_INDEX).openCursor(IDBKeyRange.only(fromProjectId));
+            req.onsuccess = () => {
+                const cursor = req.result;
+                if (cursor) {
+                    const src = cursor.value as StoredAsset;
+                    store.put({
+                        ...src,
+                        key: assetKey(toProjectId, src.hash),
+                        projectId: toProjectId,
+                    });
+                    cursor.continue();
+                }
+            };
+            tx.oncomplete = () => resolve();
+            tx.onerror = () => reject(tx.error);
+        });
+    }
 }
diff --git a/src/lib/persistence/storage-provider/local-persistence.ts b/src/lib/persistence/storage-provider/local-persistence.ts
index 1162f684..5f088766 100644
--- a/src/lib/persistence/storage-provider/local-persistence.ts
+++ b/src/lib/persistence/storage-provider/local-persistence.ts
@@ -58,7 +58,11 @@ export async function touchCachedProject(id: string): Promise<void> {
 }
 
 export async function deleteCachedProject(id: string): Promise<void> {
-    return (await getStorageProvider()).delete(id);
+    const provider = await getStorageProvider();
+    await provider.delete(id);
+    // Reclaim the project's binary assets (board images). This is the chokepoint
+    // every deletion flow funnels through (DangerZone + discardCloudProjectData).
+    await provider.deleteProjectAssets(id);
 }
 
 export async function isCachedProject(projectId: string): Promise<boolean> {
@@ -124,6 +128,10 @@ export async function migrateToCachedProject(
     newProvider.destroy();
     newDoc.destroy();
 
+    // 3b. Copy the project's binary assets to the new id (they are keyed by
+    // projectId, so the copied board cards would otherwise reference nothing).
+    await (await getStorageProvider()).copyProjectAssets(oldProjectId, newProject.id);
+
     // 4. Clean up old project data
     await discardCloudProjectData(oldProjectId);
 
diff --git a/src/lib/persistence/storage-provider/migrations/store-migrations.ts b/src/lib/persistence/storage-provider/migrations/store-migrations.ts
index c82909ef..3fbc4130 100644
--- a/src/lib/persistence/storage-provider/migrations/store-migrations.ts
+++ b/src/lib/persistence/storage-provider/migrations/store-migrations.ts
@@ -25,17 +25,23 @@ export const STORE_NAMES = {
     SETTINGS: "settings",
     DICTIONARIES: "dictionaries",
     MIGRATION_BACKUPS: "migration_backups",
+    ASSETS: "assets",
 } as const;
 
+/** Index on the `assets` store used to list/delete every asset of a project. */
+export const ASSETS_BY_PROJECT_INDEX = "byProject";
+
 /**
- * v0 → v1: baseline. Creates the three original stores. This is the schema
- * shipped before the migration framework existed; users already on v1 skip
- * this step.
+ * v0 → v1: baseline. Creates the original stores, including the binary
+ * `assets` store (board image resources, content-addressed by SHA-256, keyed
+ * `${projectId}/${hash}` with a `byProject` index). The app isn't released
+ * yet, so this is folded into the baseline rather than a separate migration
+ * step — existing local databases should just be reset.
  */
 const baselineV1: StoreMigration = {
     from: 0,
     to: 1,
-    description: "Baseline: create cached_projects, settings, dictionaries",
+    description: "Baseline: create cached_projects, settings, dictionaries, assets",
     run: (db) => {
         if (!db.objectStoreNames.contains(STORE_NAMES.PROJECTS)) {
             db.createObjectStore(STORE_NAMES.PROJECTS, { keyPath: "id" });
@@ -46,6 +52,10 @@ const baselineV1: StoreMigration = {
         if (!db.objectStoreNames.contains(STORE_NAMES.DICTIONARIES)) {
             db.createObjectStore(STORE_NAMES.DICTIONARIES, { keyPath: "code" });
         }
+        if (!db.objectStoreNames.contains(STORE_NAMES.ASSETS)) {
+            const assets = db.createObjectStore(STORE_NAMES.ASSETS, { keyPath: "key" });
+            assets.createIndex(ASSETS_BY_PROJECT_INDEX, "projectId", { unique: false });
+        }
     },
 };
 
@@ -65,7 +75,10 @@ const addMigrationBackupsStore: StoreMigration = {
     },
 };
 
-export const STORE_MIGRATIONS: StoreMigration[] = [baselineV1, addMigrationBackupsStore];
+export const STORE_MIGRATIONS: StoreMigration[] = [
+    baselineV1,
+    addMigrationBackupsStore,
+];
 
 export const CURRENT_STORE_VERSION =
     STORE_MIGRATIONS.length === 0 ? 1 : STORE_MIGRATIONS[STORE_MIGRATIONS.length - 1].to;
diff --git a/src/lib/persistence/storage-provider/storage-provider.ts b/src/lib/persistence/storage-provider/storage-provider.ts
index 4e5d4649..e5fe5023 100644
--- a/src/lib/persistence/storage-provider/storage-provider.ts
+++ b/src/lib/persistence/storage-provider/storage-provider.ts
@@ -25,6 +25,29 @@ export interface ProjectEntryInput {
     updatedAt: Date;
 }
 
+/**
+ * A binary resource (currently board images) stored locally, decoupled from the
+ * Yjs document. Content-addressed by SHA-256 so the same bytes are stored once.
+ * Scoped per project: the primary key is `${projectId}/${hash}`.
+ */
+export interface StoredAsset {
+    /** Primary key: `${projectId}/${hash}`. */
+    key: string;
+    /** Owning project id (indexed, for per-project list/delete). */
+    projectId: string;
+    /** SHA-256 hex digest of `blob` — this is the assetId referenced by cards. */
+    hash: string;
+    mime: string;
+    size: number;
+    /** Intrinsic pixel dimensions, used to size the card on first drop. */
+    width: number;
+    height: number;
+    /** Raw image bytes. Stored as ArrayBuffer (not Blob) for WebKit IndexedDB
+     *  compatibility, matching the dictionaries/migration-backup stores. */
+    data: ArrayBuffer;
+    createdAt: number;
+}
+
 export interface StorageProvider {
     // Project CRUD
     createProject(id: string, title: string, description?: string, synced?: boolean, author?: string): Promise<void>;
@@ -54,6 +77,18 @@ export interface StorageProvider {
     saveMigrationBackup(projectId: string, snapshot: Uint8Array, fromVersion: number): Promise<void>;
     loadMigrationBackup(projectId: string): Promise<{ snapshot: Uint8Array; fromVersion: number } | null>;
     clearMigrationBackup(projectId: string): Promise<void>;
+
+    // Assets: content-addressed binary resources (board images), per project.
+    putAsset(asset: StoredAsset): Promise<void>;
+    hasAsset(projectId: string, hash: string): Promise<boolean>;
+    getAsset(projectId: string, hash: string): Promise<StoredAsset | null>;
+    /** SHA-256 hashes of every asset stored for a project. */
+    listAssetHashes(projectId: string): Promise<string[]>;
+    deleteAsset(projectId: string, hash: string): Promise<void>;
+    /** Remove every asset belonging to a project (called on project deletion). */
+    deleteProjectAssets(projectId: string): Promise<void>;
+    /** Duplicate every asset of `fromProjectId` under `toProjectId` (id-changing copy). */
+    copyProjectAssets(fromProjectId: string, toProjectId: string): Promise<void>;
 }
 
 // Singleton cache
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index 596b2692..8c20cd45 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -155,6 +155,14 @@ export interface BoardCardData {
     y: number;
     width: number;
     height: number;
+    /** Card kind. `undefined`/"text" is the default note card; "image" renders a resource. */
+    type?: "text" | "image";
+    /**
+     * For `type: "image"` cards: the SHA-256 hash of the source image, which is
+     * stored separately in IndexedDB (decoupled from Yjs). The bytes never live
+     * in the document — only this reference does.
+     */
+    assetId?: string;
 }
 
 export interface BoardArrowData {
@@ -255,6 +263,14 @@ export type ProjectData = {
     production: ProductionData;
     comments?: Record<string, Comment>;
     shelf?: Record<string, ShelfEntry>;
+    /** Per-project custom dictionary words (keys are words, values are true). */
+    dictionary?: Record<string, boolean>;
+    /** Content of every `editor` document node's fragment, keyed by node id. */
+    documentContent?: Record<string, JSONContent[]>;
+    /** Board data (cards + arrows) for every `board` node, keyed by node id. */
+    boards?: Record<string, BoardData>;
+    /** Content of every shelf version, keyed by `${nodeId}::${versionId}`. */
+    shelfContent?: Record<string, JSONContent[]>;
 };
 
 /**
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index d033c1c7..120c06ef 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -9,11 +9,12 @@ import * as Y from "yjs";
 import type { ThrottledWebsocketProvider } from "../cloud/utils";
 import { ScreenplaySchema } from "../screenplay/editor";
 import { TitlePageSchema } from "../titlepage/editor";
-import { yXmlFragmentToProseMirrorRootNode } from "y-prosemirror";
+import { prosemirrorJSONToYXmlFragment, yXmlFragmentToProseMirrorRootNode } from "y-prosemirror";
 import type { YjsLocalProvider } from "../persistence/y-local-provider";
 import type { ProjectMigrationOutcome } from "./migrations/project-migration-runner";
 
 import { ProjectState } from "./project-doc";
+import type { BoardData, ProjectData } from "./project-doc";
 
 // Re-export all schema types & the class so existing consumers continue to
 // import from "@src/lib/project/project-state" without changes.
@@ -141,6 +142,190 @@ export const titlepageOf = (ydoc: ProjectState): JSONContent[] => {
     return proseMirrorNode.content.toJSON() as JSONContent[];
 };
 
+// -------------------------------- //
+//   FULL PROJECT (DE)SERIALIZATION //
+// -------------------------------- //
+
+/** Convert a screenplay-schema Y.XmlFragment (editor docs, shelf versions) to JSON. */
+const fragmentContentOf = (fragment: Y.XmlFragment): JSONContent[] =>
+    yXmlFragmentToProseMirrorRootNode(fragment, ScreenplaySchema).content.toJSON() as JSONContent[];
+
+/** Content of every `editor` document node's fragment, keyed by node id. */
+const documentContentOf = (ydoc: ProjectState): Record<string, JSONContent[]> => {
+    const result: Record<string, JSONContent[]> = {};
+    ydoc.documents().forEach((node) => {
+        if (node.type === "editor") result[node.id] = fragmentContentOf(ydoc.documentFragment(node.id));
+    });
+    return result;
+};
+
+/** Board data (cards + arrows) for every `board` node, keyed by node id. */
+const boardsOf = (ydoc: ProjectState): Record<string, BoardData> => {
+    const result: Record<string, BoardData> = {};
+    ydoc.documents().forEach((node) => {
+        if (node.type === "board") result[node.id] = ydoc.boardData(node.id).toJSON();
+    });
+    return result;
+};
+
+/** Content of every shelf version, keyed by `${nodeId}::${versionId}`. */
+const shelfContentOf = (ydoc: ProjectState): Record<string, JSONContent[]> => {
+    const result: Record<string, JSONContent[]> = {};
+    ydoc.shelf().forEach((entry, nodeId) => {
+        for (const version of entry.versions) {
+            result[`${nodeId}::${version.id}`] = fragmentContentOf(ydoc.shelfFragment(nodeId, version.id));
+        }
+    });
+    return result;
+};
+
+/**
+ * Serialize the entire project Y.Doc to a plain `ProjectData` — every map, both
+ * screenplay/title-page fragments, and the dynamic per-document / per-board /
+ * per-shelf-version content. Browser-only (uses ProseMirror conversion).
+ */
+export const projectDataOf = (ydoc: ProjectState): ProjectData => ({
+    screenplay: screenplayOf(ydoc),
+    titlepage: titlepageOf(ydoc),
+    metadata: ydoc.metadata().toJSON(),
+    characters: ydoc.characters().toJSON(),
+    scenes: ydoc.scenes().toJSON(),
+    pages: ydoc.pages().toJSON(),
+    locations: ydoc.locations().toJSON(),
+    layout: ydoc.layout().toJSON(),
+    production: ydoc.production().toJSON(),
+    comments: ydoc.comments().toJSON(),
+    documents: ydoc.documents().toJSON(),
+    outline: ydoc.outline().toJSON(),
+    shelf: ydoc.shelf().toJSON(),
+    dictionary: ydoc.dictionary().toJSON(),
+    documentContent: documentContentOf(ydoc),
+    boards: boardsOf(ydoc),
+    shelfContent: shelfContentOf(ydoc),
+});
+
+/** Loosened Y.Map view used to bulk-write a record into a typed/plain map. */
+const asMap = (m: object): Y.Map<unknown> => m as unknown as Y.Map<unknown>;
+
+const fillMap = (map: Y.Map<unknown>, record: Record<string, unknown> | undefined): void => {
+    if (!record) return;
+    for (const [key, value] of Object.entries(record)) map.set(key, value);
+};
+
+/**
+ * Write a (possibly partial) `ProjectData` into `ydoc`. Additive — it sets the
+ * keys/fragments present in `data` without removing what is already there, so a
+ * caller that needs a clean replace should `clearProjectData(ydoc)` first.
+ * Browser-only (rebuilds fragments via ProseMirror).
+ */
+export const applyProjectData = (ydoc: ProjectState, data: Partial<ProjectData>): void => {
+    ydoc.transact(() => {
+        if (data.screenplay && data.screenplay.length > 0) {
+            prosemirrorJSONToYXmlFragment(
+                ScreenplaySchema,
+                { type: "doc", content: data.screenplay },
+                ydoc.screenplayFragment(),
+            );
+        }
+        if (data.titlepage && data.titlepage.length > 0) {
+            prosemirrorJSONToYXmlFragment(
+                TitlePageSchema,
+                { type: "doc", content: data.titlepage },
+                ydoc.titlepageFragment(),
+            );
+        }
+
+        fillMap(asMap(ydoc.metadata()), data.metadata);
+        fillMap(asMap(ydoc.characters()), data.characters);
+        fillMap(asMap(ydoc.locations()), data.locations);
+        fillMap(asMap(ydoc.scenes()), data.scenes);
+        fillMap(asMap(ydoc.pages()), data.pages);
+        fillMap(asMap(ydoc.layout()), data.layout);
+        fillMap(asMap(ydoc.production()), data.production);
+        fillMap(asMap(ydoc.comments()), data.comments);
+        fillMap(asMap(ydoc.documents()), data.documents);
+        fillMap(asMap(ydoc.outline()), data.outline);
+        fillMap(asMap(ydoc.shelf()), data.shelf);
+        fillMap(asMap(ydoc.dictionary()), data.dictionary);
+
+        if (data.documentContent) {
+            for (const [id, content] of Object.entries(data.documentContent)) {
+                if (content.length === 0) continue;
+                prosemirrorJSONToYXmlFragment(
+                    ScreenplaySchema,
+                    { type: "doc", content },
+                    ydoc.documentFragment(id),
+                );
+            }
+        }
+        if (data.boards) {
+            for (const [id, board] of Object.entries(data.boards)) {
+                const map = ydoc.boardData(id);
+                for (const [key, value] of Object.entries(board)) {
+                    map.set(key as keyof BoardData, value as BoardData[keyof BoardData]);
+                }
+            }
+        }
+        if (data.shelfContent) {
+            for (const [key, content] of Object.entries(data.shelfContent)) {
+                if (content.length === 0) continue;
+                const sep = key.indexOf("::");
+                const nodeId = key.slice(0, sep);
+                const versionId = key.slice(sep + 2);
+                prosemirrorJSONToYXmlFragment(
+                    ScreenplaySchema,
+                    { type: "doc", content },
+                    ydoc.shelfFragment(nodeId, versionId),
+                );
+            }
+        }
+    });
+};
+
+/**
+ * Remove every shared type's content from `ydoc` — both fragments, all maps, and
+ * the dynamic per-document / per-board / per-shelf fragments — so an imported
+ * state can fully replace the existing project instead of merging with it.
+ */
+export const clearProjectData = (ydoc: ProjectState): void => {
+    ydoc.transact(() => {
+        const screenplay = ydoc.screenplayFragment();
+        if (screenplay.length > 0) screenplay.delete(0, screenplay.length);
+        const titlepage = ydoc.titlepageFragment();
+        if (titlepage.length > 0) titlepage.delete(0, titlepage.length);
+
+        // Clear dynamic fragments before their owning maps, while the nodes that
+        // reference them can still be enumerated.
+        ydoc.documents().forEach((node) => {
+            if (node.type === "editor") {
+                const frag = ydoc.documentFragment(node.id);
+                if (frag.length > 0) frag.delete(0, frag.length);
+            } else if (node.type === "board") {
+                ydoc.boardData(node.id).clear();
+            }
+        });
+        ydoc.shelf().forEach((entry, nodeId) => {
+            for (const version of entry.versions) {
+                const frag = ydoc.shelfFragment(nodeId, version.id);
+                if (frag.length > 0) frag.delete(0, frag.length);
+            }
+        });
+
+        ydoc.metadata().clear();
+        ydoc.characters().clear();
+        ydoc.scenes().clear();
+        ydoc.pages().clear();
+        ydoc.locations().clear();
+        ydoc.layout().clear();
+        ydoc.production().clear();
+        ydoc.comments().clear();
+        ydoc.documents().clear();
+        ydoc.outline().clear();
+        ydoc.shelf().clear();
+        ydoc.dictionary().clear();
+    });
+};
+
 // -------------------------------- //
 //        SESSION CACHE             //
 // -------------------------------- //
diff --git a/src/tests/assets/assets.test.ts b/src/tests/assets/assets.test.ts
new file mode 100644
index 00000000..084b6882
--- /dev/null
+++ b/src/tests/assets/assets.test.ts
@@ -0,0 +1,183 @@
+import { beforeAll, describe, it, expect } from "vitest";
+
+import { sha256Hex } from "@src/lib/assets/asset-hash";
+import { importImageFile, loadAssetObjectUrl } from "@src/lib/assets/asset-store";
+import { collectReferencedHashes, gcProjectAssets } from "@src/lib/assets/asset-gc";
+import {
+    getStorageProvider,
+    type StoredAsset,
+} from "@src/lib/persistence/storage-provider/storage-provider";
+import { ProjectState } from "@src/lib/project/project-state";
+import { createProjectRepository } from "@src/lib/project/project-repository";
+
+const pid = () => `test-${Math.random().toString(36).slice(2)}`;
+
+// The `assets` store is part of the baseline schema. A browser profile carrying
+// a stale `scriptio-local` from before the store existed would lack it (we don't
+// bump the store version — greenfield assumption), so reset it for a clean run.
+beforeAll(async () => {
+    await new Promise<void>((resolve) => {
+        const req = indexedDB.deleteDatabase("scriptio-local");
+        req.onsuccess = () => resolve();
+        req.onerror = () => resolve();
+        req.onblocked = () => resolve();
+    });
+});
+
+/** Base fields shared by the board cards used in GC tests. */
+const cardBase = { title: "", description: "", color: "", x: 0, y: 0, width: 1, height: 1 };
+
+async function putDummyAsset(projectId: string, hash: string): Promise<void> {
+    const provider = await getStorageProvider();
+    await provider.putAsset({
+        key: `${projectId}/${hash}`,
+        projectId,
+        hash,
+        mime: "image/png",
+        size: 3,
+        width: 1,
+        height: 1,
+        data: new TextEncoder().encode("abc").buffer as ArrayBuffer,
+        createdAt: Date.now(),
+    });
+}
+
+/** A real, decodable PNG so importImageFile's intrinsic-size decode succeeds. */
+async function makePngFile(name: string, w: number, h: number, fill: string): Promise<File> {
+    const canvas = document.createElement("canvas");
+    canvas.width = w;
+    canvas.height = h;
+    const ctx = canvas.getContext("2d")!;
+    ctx.fillStyle = fill;
+    ctx.fillRect(0, 0, w, h);
+    const blob = await new Promise<Blob>((resolve) => canvas.toBlob((b) => resolve(b!), "image/png"));
+    return new File([blob], name, { type: "image/png" });
+}
+
+describe("sha256Hex", () => {
+    it("is deterministic and matches the known vector for 'abc'", async () => {
+        const enc = (s: string) => new TextEncoder().encode(s).buffer as ArrayBuffer;
+        expect(await sha256Hex(enc("hello"))).toBe(await sha256Hex(enc("hello")));
+        expect(await sha256Hex(enc("hello"))).not.toBe(await sha256Hex(enc("world")));
+        expect(await sha256Hex(enc("abc"))).toBe(
+            "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
+        );
+    });
+});
+
+describe("asset storage provider", () => {
+    it("stores, lists, copies and deletes assets scoped per project", async () => {
+        const provider = await getStorageProvider();
+        const p1 = pid();
+        const p2 = pid();
+
+        const asset: StoredAsset = {
+            key: `${p1}/h1`,
+            projectId: p1,
+            hash: "h1",
+            mime: "image/png",
+            size: 3,
+            width: 2,
+            height: 4,
+            data: new TextEncoder().encode("abc").buffer as ArrayBuffer,
+            createdAt: Date.now(),
+        };
+        await provider.putAsset(asset);
+
+        expect(await provider.hasAsset(p1, "h1")).toBe(true);
+        expect(await provider.hasAsset(p1, "missing")).toBe(false);
+        expect((await provider.getAsset(p1, "h1"))?.height).toBe(4);
+        expect(await provider.listAssetHashes(p1)).toEqual(["h1"]);
+
+        // copy isolates by project key
+        await provider.copyProjectAssets(p1, p2);
+        expect(await provider.hasAsset(p2, "h1")).toBe(true);
+
+        // deleting one project leaves the other intact
+        await provider.deleteProjectAssets(p1);
+        expect(await provider.listAssetHashes(p1)).toEqual([]);
+        expect(await provider.hasAsset(p2, "h1")).toBe(true);
+
+        await provider.deleteProjectAssets(p2);
+    });
+});
+
+describe("importImageFile", () => {
+    it("dedups identical bytes and captures intrinsic dimensions", async () => {
+        const provider = await getStorageProvider();
+        const p = pid();
+        const file = await makePngFile("x.png", 20, 10, "#f00");
+
+        const first = await importImageFile(p, file);
+        expect(first.width).toBe(20);
+        expect(first.height).toBe(10);
+
+        const second = await importImageFile(p, file);
+        expect(second.hash).toBe(first.hash);
+        // Still exactly one stored record despite two imports.
+        expect(await provider.listAssetHashes(p)).toEqual([first.hash]);
+
+        const url = await loadAssetObjectUrl(p, first.hash);
+        expect(url).toMatch(/^blob:/);
+        if (url) URL.revokeObjectURL(url);
+
+        await provider.deleteProjectAssets(p);
+    });
+});
+
+describe("asset GC (reconcile from doc)", () => {
+    it("collects image assetIds across every board, ignoring text cards", () => {
+        const ydoc = new ProjectState();
+        const repo = createProjectRepository(ydoc)!;
+        const b1 = repo.createBoardDocument("B1");
+        const b2 = repo.createBoardDocument("B2");
+
+        ydoc.boardData(b1).set(
+            "cards",
+            JSON.stringify([
+                { id: "c1", type: "image", assetId: "A", ...cardBase },
+                { id: "c2", ...cardBase }, // plain text card — no assetId
+            ]),
+        );
+        ydoc.boardData(b2).set(
+            "cards",
+            JSON.stringify([{ id: "c3", type: "image", assetId: "B", ...cardBase }]),
+        );
+
+        expect(collectReferencedHashes(ydoc)).toEqual(new Set(["A", "B"]));
+        ydoc.destroy();
+    });
+
+    it("deletes only unreferenced assets, project-wide", async () => {
+        const provider = await getStorageProvider();
+        const p = pid();
+        const ydoc = new ProjectState();
+        const repo = createProjectRepository(ydoc)!;
+        const board = repo.createBoardDocument("B1");
+
+        ydoc.boardData(board).set(
+            "cards",
+            JSON.stringify([
+                { id: "c1", type: "image", assetId: "A", ...cardBase },
+                { id: "c2", type: "image", assetId: "B", ...cardBase },
+            ]),
+        );
+        await putDummyAsset(p, "A");
+        await putDummyAsset(p, "B");
+        await putDummyAsset(p, "C"); // never referenced
+
+        await gcProjectAssets(p, ydoc);
+        expect((await provider.listAssetHashes(p)).sort()).toEqual(["A", "B"]);
+
+        // Drop the only card referencing A → A becomes collectable, B stays.
+        ydoc.boardData(board).set(
+            "cards",
+            JSON.stringify([{ id: "c2", type: "image", assetId: "B", ...cardBase }]),
+        );
+        await gcProjectAssets(p, ydoc);
+        expect(await provider.listAssetHashes(p)).toEqual(["B"]);
+
+        await provider.deleteProjectAssets(p);
+        ydoc.destroy();
+    });
+});
diff --git a/src/tests/migrations/store-migration-runner.test.ts b/src/tests/migrations/store-migration-runner.test.ts
index 0bba24ca..e196d899 100644
--- a/src/tests/migrations/store-migration-runner.test.ts
+++ b/src/tests/migrations/store-migration-runner.test.ts
@@ -73,6 +73,7 @@ describe("runStoreMigrations", () => {
                 STORE_NAMES.SETTINGS,
                 STORE_NAMES.DICTIONARIES,
                 STORE_NAMES.MIGRATION_BACKUPS,
+                STORE_NAMES.ASSETS,
             ].sort(),
         );
         db.close();
diff --git a/src/tests/project/scriptio-roundtrip.test.ts b/src/tests/project/scriptio-roundtrip.test.ts
new file mode 100644
index 00000000..ea4269cd
--- /dev/null
+++ b/src/tests/project/scriptio-roundtrip.test.ts
@@ -0,0 +1,172 @@
+import { describe, expect, it } from "vitest";
+import { prosemirrorJSONToYXmlFragment } from "y-prosemirror";
+
+import {
+    ProjectState,
+    applyProjectData,
+    clearProjectData,
+    projectDataOf,
+} from "@src/lib/project/project-state";
+import { createProjectRepository } from "@src/lib/project/project-repository";
+import { ScreenplaySchema } from "@src/lib/screenplay/editor";
+import { ScriptioAdapter } from "@src/lib/adapters/scriptio/scriptio-adapter";
+
+const action = (id: string, text: string) => ({
+    type: "action",
+    attrs: { "data-id": id, class: "action" },
+    content: [{ type: "text", text }],
+});
+
+/**
+ * Build a project that exercises every shared type the adapter must preserve:
+ * screenplay + title-page fragments, all the metadata-ish maps, the document
+ * tree (folder / editor / board), an editor doc's own content, a board's data,
+ * the outline, a shelf entry with version content, and the custom dictionary.
+ */
+function buildPopulatedProject(): ProjectState {
+    const ydoc = new ProjectState();
+    const repo = createProjectRepository(ydoc)!;
+
+    repo.transact(() => {
+        // Screenplay
+        prosemirrorJSONToYXmlFragment(
+            ScreenplaySchema,
+            { type: "doc", content: [action("a1", "Hello world"), action("a2", "Second line")] },
+            ydoc.screenplayFragment(),
+        );
+
+        // Maps reachable through the repository
+        repo.setTitle("My Script");
+        repo.setAuthor("Ada");
+        ydoc.characters().set("c1", { name: "ALICE" } as never);
+        ydoc.locations().set("l1", { name: "OFFICE" } as never);
+        repo.upsertScene("s1", { synopsis: "Opening", color: "#ff0000" });
+        repo.upsertPage("p1", { splitOffset: 3 });
+        repo.setPageSize("A4" as never);
+        repo.setSceneLocking(true);
+        repo.setSkippedSceneLetters(["I", "O", "Q"]);
+        repo.addComment({ content: "note", resolved: false } as never);
+        ydoc.dictionary().set("zoetrope", true);
+    });
+
+    // Document tree: folder > editor doc + board
+    const folder = repo.createFolder("Act One");
+    const editorDoc = repo.createEditorDocument("Beat Sheet", folder);
+    const board = repo.createBoardDocument("Corkboard", folder);
+
+    // Editor doc content lives in its own fragment
+    repo.transact(() => {
+        prosemirrorJSONToYXmlFragment(
+            ScreenplaySchema,
+            { type: "doc", content: [action("b1", "Beat one")] },
+            ydoc.documentFragment(editorDoc),
+        );
+        ydoc.boardData(board).set("cards", JSON.stringify([{ id: "k1", title: "Idea" }]));
+        ydoc.boardData(board).set("arrows", JSON.stringify([]));
+    });
+
+    // Outline references the main screenplay
+    repo.addOutlineItem({
+        parentId: null,
+        source: "scene",
+        refDocId: "screenplay",
+        refId: "s1",
+        title: "Opening",
+        preview: "Hello world",
+    });
+
+    // Shelf entry with one version (writes a shelf_<node>_<version> fragment)
+    repo.shelveNode("s1", "Opening", "scene", [action("v1", "Shelved opening")]);
+
+    return ydoc;
+}
+
+const baseOptions = { title: "My Script", author: "Ada", includeNotes: false };
+
+async function exportBuffer(project: ProjectState, readable: boolean): Promise<ArrayBuffer> {
+    const adapter = new ScriptioAdapter();
+    const blob = await adapter.convertTo(project, { ...baseOptions, readable });
+    return blob.arrayBuffer();
+}
+
+/** Fields that should survive an export/import round trip untouched. */
+function snapshot(data: ReturnType<typeof projectDataOf>) {
+    return {
+        screenplay: data.screenplay,
+        titlepage: data.titlepage,
+        metadata: data.metadata,
+        characters: data.characters,
+        scenes: data.scenes,
+        pages: data.pages,
+        locations: data.locations,
+        layout: data.layout,
+        production: data.production,
+        comments: data.comments,
+        documents: data.documents,
+        outline: data.outline,
+        shelf: data.shelf,
+        dictionary: data.dictionary,
+        documentContent: data.documentContent,
+        boards: data.boards,
+        shelfContent: data.shelfContent,
+    };
+}
+
+describe("scriptio adapter full round trip", () => {
+    for (const readable of [false, true]) {
+        const label = readable ? "readable JSON" : "binary";
+
+        it(`preserves every shared type (${label})`, async () => {
+            const original = buildPopulatedProject();
+            const before = snapshot(projectDataOf(original));
+
+            const adapter = new ScriptioAdapter();
+            const buffer = await exportBuffer(original, readable);
+            const parsed = adapter.convertFrom(buffer);
+
+            // Rebuild a fresh document from the parsed data, exactly like the
+            // new-project import path does.
+            const rebuilt = new ProjectState();
+            applyProjectData(rebuilt, parsed);
+            const after = snapshot(projectDataOf(rebuilt));
+
+            expect(after).toEqual(before);
+
+            original.destroy();
+            rebuilt.destroy();
+        });
+    }
+
+    it("clearProjectData wipes maps and dynamic fragments before a replace", () => {
+        const ydoc = buildPopulatedProject();
+        clearProjectData(ydoc);
+
+        expect(ydoc.documents().size).toBe(0);
+        expect(ydoc.shelf().size).toBe(0);
+        expect(ydoc.scenes().size).toBe(0);
+        expect(ydoc.dictionary().size).toBe(0);
+        expect(ydoc.screenplayFragment().length).toBe(0);
+
+        ydoc.destroy();
+    });
+
+    it("clear-then-apply replaces rather than merges (no stale entries)", () => {
+        const original = buildPopulatedProject();
+        const exported = projectDataOf(original);
+
+        // Target already holds unrelated data that must not survive the import.
+        const target = buildPopulatedProject();
+        target.scenes().set("stale", { synopsis: "old" } as never);
+        target.dictionary().set("stale-word", true);
+
+        clearProjectData(target);
+        applyProjectData(target, exported);
+
+        expect(target.scenes().has("stale")).toBe(false);
+        expect(target.dictionary().has("stale-word")).toBe(false);
+        expect(projectDataOf(target).scenes).toEqual(exported.scenes);
+
+        original.destroy();
+        target.destroy();
+    });
+});

From e31a258474c8b7f382e28d59e6cd359686b66d7f Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Thu, 11 Jun 2026 01:41:03 +0200
Subject: [PATCH 66/76] changed .scriptio file format to zipped folder, fixed
 image handling in board canvas

---
 components/board/BoardCanvas.tsx              | 128 +++++--
 .../dashboard/project/ExportProject.tsx       |   3 +-
 src/lib/adapters/scriptio/scriptio-adapter.ts | 358 +++++++++++++-----
 src/lib/import/import-project.ts              |  25 +-
 src/tests/assets/assets.test.ts               |  70 ++++
 src/tests/project/scriptio-roundtrip.test.ts  |  47 +++
 6 files changed, 494 insertions(+), 137 deletions(-)

diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index e83497f4..f10a263f 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -55,7 +55,9 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         }
     }
     const [isCameraReady, setIsCameraReady] = useState(false);
-    const [connectingFrom, setConnectingFrom] = useState<{ cardId: string; side: string } | null>(null);
+    const [connectingFrom, setConnectingFrom] = useState<{ cardId: string; side: string } | null>(
+        null,
+    );
     const [connectingLine, setConnectingLine] = useState<{ x: number; y: number } | null>(null);
     const [selectedCardIds, setSelectedCardIds] = useState<Set<string>>(new Set());
     const [selectionRect, setSelectionRect] = useState<{
@@ -137,7 +139,8 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const cardsData = boardMap.get("cards");
             if (cardsData) {
                 try {
-                    const parsed = typeof cardsData === "string" ? JSON.parse(cardsData) : cardsData;
+                    const parsed =
+                        typeof cardsData === "string" ? JSON.parse(cardsData) : cardsData;
                     setCards(parsed);
 
                     // Center camera on first load
@@ -168,7 +171,8 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const arrowsData = boardMap.get("arrows");
             if (arrowsData) {
                 try {
-                    const parsed = typeof arrowsData === "string" ? JSON.parse(arrowsData) : arrowsData;
+                    const parsed =
+                        typeof arrowsData === "string" ? JSON.parse(arrowsData) : arrowsData;
                     setArrows(parsed);
                 } catch (e) {
                     console.error("[BoardCanvas] Failed to parse arrows:", e);
@@ -387,7 +391,12 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                         const cardRight = card.x + card.width;
                         const cardBottom = card.y + card.height;
 
-                        if (card.x < right && cardRight > left && card.y < bottom && cardBottom > top) {
+                        if (
+                            card.x < right &&
+                            cardRight > left &&
+                            card.y < bottom &&
+                            cardBottom > top
+                        ) {
                             selected.add(card.id);
                         }
                     }
@@ -481,7 +490,8 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const x = (e.clientX - rect.left - offset.x) / scale;
             const y = (e.clientY - rect.top - offset.y) / scale;
 
-            const randomColor = DEFAULT_ITEM_COLORS[Math.floor(Math.random() * DEFAULT_ITEM_COLORS.length)];
+            const randomColor =
+                DEFAULT_ITEM_COLORS[Math.floor(Math.random() * DEFAULT_ITEM_COLORS.length)];
 
             const newCard: BoardCardData = {
                 id: uuidv7(),
@@ -526,7 +536,9 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             setIsDraggingFile(false);
             if (isReadOnly || !projectId) return;
 
-            const files = Array.from(e.dataTransfer.files).filter((f) => f.type.startsWith("image/"));
+            const files = Array.from(e.dataTransfer.files).filter((f) =>
+                f.type.startsWith("image/"),
+            );
             if (files.length === 0) return;
 
             const container = containerRef.current;
@@ -559,11 +571,9 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             }
             if (created.length === 0) return;
 
-            setCards((prev) => {
-                const next = [...prev, ...created];
-                saveCards(next);
-                return next;
-            });
+            const newCards = [...cardsRef.current, ...created];
+            setCards(newCards);
+            saveCards(newCards);
         },
         [isReadOnly, projectId, offset, scale, saveCards],
     );
@@ -579,11 +589,14 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                     const dy = updatedCard.y - oldCard.y;
                     // Only apply multi-drag for position changes, not resize
                     if (dx !== 0 || dy !== 0) {
-                        const isResize = updatedCard.width !== oldCard.width || updatedCard.height !== oldCard.height;
+                        const isResize =
+                            updatedCard.width !== oldCard.width ||
+                            updatedCard.height !== oldCard.height;
                         if (!isResize) {
                             const newCards = cards.map((c) => {
                                 if (c.id === updatedCard.id) return updatedCard;
-                                if (selectedCardIds.has(c.id)) return { ...c, x: c.x + dx, y: c.y + dy };
+                                if (selectedCardIds.has(c.id))
+                                    return { ...c, x: c.x + dx, y: c.y + dy };
                                 return c;
                             });
                             setCards(newCards);
@@ -693,26 +706,32 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
     );
 
     // Get connection point position for a card
-    const getConnectionPoint = useCallback((card: BoardCardData, side: "top" | "right" | "bottom" | "left") => {
-        const centerX = card.x + card.width / 2;
-        const centerY = card.y + card.height / 2;
-
-        switch (side) {
-            case "top":
-                return { x: centerX, y: card.y };
-            case "right":
-                return { x: card.x + card.width, y: centerY };
-            case "bottom":
-                return { x: centerX, y: card.y + card.height };
-            case "left":
-                return { x: card.x, y: centerY };
-        }
-    }, []);
+    const getConnectionPoint = useCallback(
+        (card: BoardCardData, side: "top" | "right" | "bottom" | "left") => {
+            const centerX = card.x + card.width / 2;
+            const centerY = card.y + card.height / 2;
+
+            switch (side) {
+                case "top":
+                    return { x: centerX, y: card.y };
+                case "right":
+                    return { x: card.x + card.width, y: centerY };
+                case "bottom":
+                    return { x: centerX, y: card.y + card.height };
+                case "left":
+                    return { x: card.x, y: centerY };
+            }
+        },
+        [],
+    );
 
     // Calculate best connection points between two cards with perpendicular tangent directions
     const getArrowPoints = useCallback(
         (fromCard: BoardCardData, toCard: BoardCardData) => {
-            const fromCenter = { x: fromCard.x + fromCard.width / 2, y: fromCard.y + fromCard.height / 2 };
+            const fromCenter = {
+                x: fromCard.x + fromCard.width / 2,
+                y: fromCard.y + fromCard.height / 2,
+            };
             const toCenter = { x: toCard.x + toCard.width / 2, y: toCard.y + toCard.height / 2 };
 
             const dx = toCenter.x - fromCenter.x;
@@ -756,10 +775,13 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
     );
 
     // Handle starting a connection from a card
-    const handleStartConnection = useCallback((cardId: string, side: string, initialX: number, initialY: number) => {
-        setConnectingFrom({ cardId, side });
-        setConnectingLine({ x: initialX, y: initialY });
-    }, []);
+    const handleStartConnection = useCallback(
+        (cardId: string, side: string, initialX: number, initialY: number) => {
+            setConnectingFrom({ cardId, side });
+            setConnectingLine({ x: initialX, y: initialY });
+        },
+        [],
+    );
 
     // Handle mouse move while connecting
     const handleConnectionMouseMove = useCallback(
@@ -870,7 +892,10 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                             const points = getArrowPoints(fromCard, toCard);
 
                             // Calculate distance for control point offset (perpendicular to border)
-                            const dist = Math.hypot(points.to.x - points.from.x, points.to.y - points.from.y);
+                            const dist = Math.hypot(
+                                points.to.x - points.from.x,
+                                points.to.y - points.from.y,
+                            );
                             const controlDist = Math.max(50, dist * 0.4);
 
                             // Control points extend perpendicular to the borders
@@ -886,10 +911,22 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
 
                             // Arrowhead points matching original marker shape: M 0 0 L 12 4 L 0 8 L 3 4 Z
                             // Back corners (perpendicular to arrow direction)
-                            const ax1 = points.to.x - arrowLength * Math.cos(angle) + arrowWidth * Math.sin(angle);
-                            const ay1 = points.to.y - arrowLength * Math.sin(angle) - arrowWidth * Math.cos(angle);
-                            const ax2 = points.to.x - arrowLength * Math.cos(angle) - arrowWidth * Math.sin(angle);
-                            const ay2 = points.to.y - arrowLength * Math.sin(angle) + arrowWidth * Math.cos(angle);
+                            const ax1 =
+                                points.to.x -
+                                arrowLength * Math.cos(angle) +
+                                arrowWidth * Math.sin(angle);
+                            const ay1 =
+                                points.to.y -
+                                arrowLength * Math.sin(angle) -
+                                arrowWidth * Math.cos(angle);
+                            const ax2 =
+                                points.to.x -
+                                arrowLength * Math.cos(angle) -
+                                arrowWidth * Math.sin(angle);
+                            const ay2 =
+                                points.to.y -
+                                arrowLength * Math.sin(angle) +
+                                arrowWidth * Math.cos(angle);
                             // Inner notch (25% from back toward tip)
                             const notchDepth = arrowLength * 0.75;
                             const axm = points.to.x - notchDepth * Math.cos(angle);
@@ -920,7 +957,11 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                                         strokeWidth={2.5}
                                     />
                                     {/* Arrowhead */}
-                                    <path className={styles.arrow_head} d={arrowheadD} fill="var(--secondary-text)" />
+                                    <path
+                                        className={styles.arrow_head}
+                                        d={arrowheadD}
+                                        fill="var(--secondary-text)"
+                                    />
                                 </g>
                             );
                         })}
@@ -951,7 +992,10 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                                 }
 
                                 const fromPoint = getConnectionPoint(fromCard, fromSide);
-                                const dist = Math.hypot(connectingLine.x - fromPoint.x, connectingLine.y - fromPoint.y);
+                                const dist = Math.hypot(
+                                    connectingLine.x - fromPoint.x,
+                                    connectingLine.y - fromPoint.y,
+                                );
                                 const controlDist = Math.max(30, dist * 0.3);
 
                                 const cx = fromPoint.x + fromDir.x * controlDist;
@@ -1020,7 +1064,9 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                                         key={color}
                                         className={`${styles.context_menu_color_swatch} ${cardContextMenu.card.color === color ? styles.context_menu_color_swatch_active : ""}`}
                                         style={{ backgroundColor: color }}
-                                        onClick={() => handleChangeCardColor(cardContextMenu.card.id, color)}
+                                        onClick={() =>
+                                            handleChangeCardColor(cardContextMenu.card.id, color)
+                                        }
                                     />
                                 ))}
                             </div>
diff --git a/components/dashboard/project/ExportProject.tsx b/components/dashboard/project/ExportProject.tsx
index 7ceb25f1..affeb671 100644
--- a/components/dashboard/project/ExportProject.tsx
+++ b/components/dashboard/project/ExportProject.tsx
@@ -71,7 +71,7 @@ const ExportProject = () => {
 
         const confirmImport = async () => {
             try {
-                await importFileIntoProject(file, editor, titlePageEditor, repository);
+                await importFileIntoProject(file, projectId, editor, titlePageEditor, repository);
             } catch (error) {
                 console.error("Import failed:", error);
             }
@@ -127,6 +127,7 @@ const ExportProject = () => {
             const scriptioOptions: ScriptioExportOptions = {
                 ...baseOptions,
                 readable: readableExport,
+                projectId,
             };
             await adapter.export(ydoc, scriptioOptions as BaseExportOptions);
         } else {
diff --git a/src/lib/adapters/scriptio/scriptio-adapter.ts b/src/lib/adapters/scriptio/scriptio-adapter.ts
index 98245d85..bb415c9f 100644
--- a/src/lib/adapters/scriptio/scriptio-adapter.ts
+++ b/src/lib/adapters/scriptio/scriptio-adapter.ts
@@ -3,120 +3,301 @@ import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
 import { replaceScreenplay } from "../../screenplay/editor";
 import { Editor } from "@tiptap/react";
 import { ProjectRepository } from "../../project/project-repository";
-import { CURRENT_PROJECT_VERSION } from "../../project/migrations/project-migrations";
+import { collectReferencedHashes } from "@src/lib/assets/asset-gc";
+import {
+    getStorageProvider,
+    type StoredAsset,
+} from "@src/lib/persistence/storage-provider/storage-provider";
 import * as fflate from "fflate";
 import * as Y from "yjs";
 
-// ─── File Header ──────────────────────────────────────────────────────────────
+// ─── Container format ──────────────────────────────────────────────────────────
 //
-//  Offset  Size  Description
-//  ──────  ────  ──────────────────────────────────────────────────────────────
-//   0       8    Magic bytes: ASCII "SCRIPTIO"
-//   8       1    Version (u8):  see CURRENT_PROJECT_VERSION
-//   9       1    Flags   (u8):  bit 0 → 0 = zlib-compressed binary Yjs state
-//                                        1 = human-readable JSON (ProjectData)
-//  10       …    Payload
+// A `.scriptio` file is a ZIP archive:
 //
-const MAGIC = new Uint8Array([0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x49, 0x4f]); // "SCRIPTIO"
-const HEADER_SIZE = MAGIC.length + 1 + 1; // 8 magic + 1 version + 1 flags = 10 bytes
+//   mimetype               `application/vnd.scriptio+zip`. First entry, STORED
+//                          (uncompressed) so the type is sniffable by content at
+//                          a fixed offset — the EPUB/ODF/OOXML convention.
+//   document.json   ─┐     Exactly one document entry, named by its type:
+//   document.ydoc   ─┘       · document.json — readable export: the project
+//                              serialized as JSON (ProjectData). A snapshot, so
+//                              it carries no CRDT collaboration history.
+//                            · document.ydoc — binary export: the raw Yjs
+//                              document update, preserving the full CRDT state.
+//                          Either way the bytes are deflated by the ZIP itself;
+//                          there is no inner header — the entry name says how to
+//                          read it, and the schema version lives in the doc's
+//                          `metadata.version` (the migration runner gates on it).
+//   assets/manifest.json   Metadata for every bundled asset (mime, size, dims).
+//   assets/<hash>.<ext>    Raw bytes of each board image, content-addressed by
+//                          its SHA-256 (the `assetId` referenced by board cards).
+//
+// Image bytes are decoupled from the Yjs document (they live in IndexedDB at
+// runtime); bundling them under `assets/` is what makes an exported project
+// self-contained.
+
+// ZIP local-file-header magic ("PK\x03\x04"), used to recognise the archive.
+const ZIP_MAGIC = [0x50, 0x4b, 0x03, 0x04];
 
-const FLAG_READABLE_JSON = 0x01; // bit 0: payload is UTF-8 JSON, not compressed Yjs
+/**
+ * Content type identifying the archive. Written as the first entry, uncompressed,
+ * so a sniffer (libmagic/`file`, the OS) can recognise a `.scriptio` by content
+ * even if it's renamed — the same trick EPUB and OpenDocument use. The `+zip`
+ * suffix (RFC 6839) advertises the ZIP-based structure.
+ */
+const SCRIPTIO_MIMETYPE = "application/vnd.scriptio+zip";
+
+const ZIP_MIMETYPE_ENTRY = "mimetype";
+const ZIP_DOCUMENT_JSON = "document.json"; // readable export (ProjectData JSON)
+const ZIP_DOCUMENT_YDOC = "document.ydoc"; // binary export (raw Yjs update)
+const ZIP_ASSET_DIR = "assets/";
+const ZIP_ASSET_MANIFEST = "assets/manifest.json";
 
 export type ScriptioExportOptions = BaseExportOptions & {
-    /** When true, the payload is indented JSON (ProjectData) instead of compressed binary Yjs state. */
+    /** When true, the document is indented JSON (ProjectData) instead of binary Yjs state. */
     readable?: boolean;
+    /**
+     * Owning project id, used to read the project's board image assets from
+     * local storage and bundle them under `assets/`. When omitted, the archive
+     * carries the document only (no assets).
+     */
+    projectId?: string;
 };
 
-function buildHeader(version: number, flags: number): Uint8Array {
-    const header = new Uint8Array(HEADER_SIZE);
-    header.set(MAGIC, 0);
-    header[MAGIC.length] = version;
-    header[MAGIC.length + 1] = flags;
-    return header;
+interface AssetManifestEntry {
+    /** ZIP entry path of the bytes, e.g. `assets/<hash>.png`. */
+    file: string;
+    /** SHA-256 hex — the assetId referenced by board cards. */
+    hash: string;
+    mime: string;
+    width: number;
+    height: number;
+    size: number;
+}
+
+interface AssetManifest {
+    version: 1;
+    assets: AssetManifestEntry[];
+}
+
+/** Does this buffer start with the ZIP local-file-header magic? */
+function isZipArchive(data: Uint8Array): boolean {
+    return data.length >= ZIP_MAGIC.length && ZIP_MAGIC.every((b, i) => data[i] === b);
 }
 
-function parseHeader(data: Uint8Array): { version: number; flags: number; payloadOffset: number } {
-    if (data.length < HEADER_SIZE) {
-        throw new Error("File is too short to be a valid .scriptio file");
+/** File extension (with leading dot) for a bundled asset of the given mime. */
+function extensionForMime(mime: string): string {
+    switch (mime) {
+        case "image/png":
+            return ".png";
+        case "image/jpeg":
+            return ".jpg";
+        case "image/gif":
+            return ".gif";
+        case "image/webp":
+            return ".webp";
+        case "image/avif":
+            return ".avif";
+        case "image/bmp":
+            return ".bmp";
+        case "image/svg+xml":
+            return ".svg";
+        default:
+            return "";
     }
+}
+
+// ── Reading the document entry ───────────────────────────────────────────────────
+
+/** Decompress just the document entry (skip assets) from a ZIP archive. */
+function unzipDocument(data: Uint8Array): fflate.Unzipped {
+    if (!isZipArchive(data)) throw new Error("Not a .scriptio archive");
+    return fflate.unzipSync(data, {
+        filter: (f) => f.name === ZIP_DOCUMENT_JSON || f.name === ZIP_DOCUMENT_YDOC,
+    });
+}
+
+/** Read a Yjs update into a throwaway doc and serialize it to ProjectData. */
+function projectDataFromYjsUpdate(update: Uint8Array): ProjectData {
+    const tmpDoc = new ProjectState();
+    try {
+        Y.applyUpdate(tmpDoc, update);
+        return projectDataOf(tmpDoc);
+    } finally {
+        tmpDoc.destroy();
+    }
+}
 
-    for (let i = 0; i < MAGIC.length; i++) {
-        if (data[i] !== MAGIC[i]) {
-            throw new Error("Invalid .scriptio file: magic bytes not found");
+/** Parse the document entry of a ZIP archive into ProjectData. */
+function parseZipDocument(unzipped: fflate.Unzipped): ProjectData {
+    const json = unzipped[ZIP_DOCUMENT_JSON];
+    if (json) {
+        try {
+            return JSON.parse(fflate.strFromU8(json)) as ProjectData;
+        } catch (error) {
+            console.error("Failed to parse readable Scriptio document", error);
+            throw new Error("Invalid Scriptio file format");
         }
     }
 
-    const version = data[MAGIC.length];
-    if (version > CURRENT_PROJECT_VERSION) {
-        throw new Error(`Unsupported .scriptio file version: ${version}. Please update Scriptio.`);
+    const ydoc = unzipped[ZIP_DOCUMENT_YDOC];
+    if (ydoc) {
+        try {
+            return projectDataFromYjsUpdate(ydoc);
+        } catch (error) {
+            console.error("Failed to parse Scriptio document", error);
+            throw new Error("Invalid Scriptio file format");
+        }
     }
 
-    const flags = data[MAGIC.length + 1];
-    return { version, flags, payloadOffset: HEADER_SIZE };
+    throw new Error("Invalid .scriptio archive: missing document entry");
 }
 
-export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
-    label = "Scriptio";
-    extension = "scriptio";
+// ── Asset bundling ───────────────────────────────────────────────────────────────
 
-    convertTo(project: ProjectState, options: ScriptioExportOptions): Promise<Blob> {
-        const isReadable = options.readable ?? false;
-        const flags = isReadable ? FLAG_READABLE_JSON : 0x00;
-        const header = buildHeader(CURRENT_PROJECT_VERSION, flags);
-
-        let payload: Uint8Array;
-
-        if (isReadable) {
-            // Human-readable path: serialize the full project as indented JSON.
-            // This produces a larger file but makes the content inspectable
-            // with any text editor. `projectDataOf` captures every map and
-            // fragment, so the readable export is just as lossless as binary.
-            payload = new TextEncoder().encode(JSON.stringify(projectDataOf(project), null, 2));
-        } else {
-            // Binary path: zlib-compress the raw Yjs state.
-            // Preserves the full CRDT document, including collaboration history.
-            const yjsState = Y.encodeStateAsUpdate(project);
-            payload = fflate.zlibSync(yjsState, { level: 9 });
-        }
+/**
+ * Read the project's board image assets from local storage and turn them into
+ * ZIP entries (raw bytes + a manifest). Returns an empty map when the project
+ * references no images or none are stored locally.
+ */
+async function buildAssetEntries(
+    projectId: string,
+    project: ProjectState,
+): Promise<fflate.Zippable> {
+    const entries: fflate.Zippable = {};
+
+    let referenced: Set<string>;
+    try {
+        referenced = collectReferencedHashes(project);
+    } catch {
+        // A board with an unparseable cards blob — bundle the document anyway.
+        return entries;
+    }
+    if (referenced.size === 0) return entries;
+
+    const provider = await getStorageProvider();
+    const manifest: AssetManifest = { version: 1, assets: [] };
 
-        const file = new Uint8Array(header.length + payload.length);
-        file.set(header, 0);
-        file.set(payload, header.length);
+    for (const hash of referenced) {
+        const asset = await provider.getAsset(projectId, hash);
+        if (!asset) continue; // referenced but not stored locally — skip
 
-        return Promise.resolve(new Blob([file], { type: "application/octet-stream" }));
+        const file = `${ZIP_ASSET_DIR}${hash}${extensionForMime(asset.mime)}`;
+        // Images are already compressed; storing them with level 0 avoids a
+        // pointless second deflate pass over the whole archive's bytes.
+        entries[file] = [new Uint8Array(asset.data), { level: 0 }];
+        manifest.assets.push({
+            file,
+            hash,
+            mime: asset.mime,
+            width: asset.width,
+            height: asset.height,
+            size: asset.size,
+        });
     }
 
-    convertFrom(rawContent: ArrayBuffer): ProjectData {
-        const data = new Uint8Array(rawContent);
-        const { flags, payloadOffset } = parseHeader(data);
-        const payload = data.subarray(payloadOffset);
+    if (manifest.assets.length > 0) {
+        entries[ZIP_ASSET_MANIFEST] = fflate.strToU8(JSON.stringify(manifest, null, 2));
+    }
+    return entries;
+}
+
+/**
+ * Restore the board image assets bundled in a `.scriptio` archive into local
+ * storage under `projectId`. No-ops for archives without an asset manifest, and
+ * safe to call for any imported file — non-archive content is ignored.
+ */
+export async function restoreScriptioAssets(
+    projectId: string,
+    rawContent: ArrayBuffer,
+): Promise<void> {
+    const data = new Uint8Array(rawContent);
+    if (!isZipArchive(data)) return;
+
+    let unzipped: fflate.Unzipped;
+    try {
+        unzipped = fflate.unzipSync(data, { filter: (f) => f.name.startsWith(ZIP_ASSET_DIR) });
+    } catch (error) {
+        console.warn("[Scriptio] Failed to read bundled assets:", error);
+        return;
+    }
+
+    const manifestBytes = unzipped[ZIP_ASSET_MANIFEST];
+    if (!manifestBytes) return;
+
+    let manifest: AssetManifest;
+    try {
+        manifest = JSON.parse(fflate.strFromU8(manifestBytes)) as AssetManifest;
+    } catch (error) {
+        console.warn("[Scriptio] Invalid asset manifest:", error);
+        return;
+    }
+
+    const provider = await getStorageProvider();
+    await Promise.all(
+        manifest.assets.map(async (entry) => {
+            const bytes = unzipped[entry.file];
+            if (!bytes) return;
+
+            // `slice()` copies the bytes into a standalone ArrayBuffer so the
+            // stored asset doesn't retain the entire decompressed archive.
+            const asset: StoredAsset = {
+                key: `${projectId}/${entry.hash}`,
+                projectId,
+                hash: entry.hash,
+                mime: entry.mime,
+                size: entry.size ?? bytes.byteLength,
+                width: entry.width,
+                height: entry.height,
+                data: bytes.slice().buffer,
+                createdAt: Date.now(),
+            };
+            await provider.putAsset(asset);
+        }),
+    );
+}
+
+export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
+    label = "Scriptio";
+    extension = "scriptio";
+
+    async convertTo(project: ProjectState, options: ScriptioExportOptions): Promise<Blob> {
+        const readable = options.readable ?? false;
+
+        // Readable: pretty-printed ProjectData JSON (a snapshot, no CRDT history).
+        // Binary: the raw Yjs update, preserving full collaboration history. The
+        // ZIP deflates either one — there's no inner header.
+        const documentName = readable ? ZIP_DOCUMENT_JSON : ZIP_DOCUMENT_YDOC;
+        const documentBytes = readable
+            ? fflate.strToU8(JSON.stringify(projectDataOf(project), null, 2))
+            : new Uint8Array(Y.encodeStateAsUpdate(project));
 
-        const isReadable = (flags & FLAG_READABLE_JSON) !== 0;
+        // Insertion order is preserved by fflate, so `mimetype` stays first.
+        // Stored (level 0) and first, its value lands at the fixed byte offset
+        // where content sniffers expect it.
+        const zipEntries: fflate.Zippable = {
+            [ZIP_MIMETYPE_ENTRY]: [fflate.strToU8(SCRIPTIO_MIMETYPE), { level: 0 }],
+            [documentName]: [documentBytes, { level: 9 }],
+        };
 
-        if (isReadable) {
-            // JSON path: decode UTF-8 and parse directly into ProjectData.
+        if (options.projectId) {
             try {
-                const json = new TextDecoder().decode(payload);
-                return JSON.parse(json) as ProjectData;
+                Object.assign(zipEntries, await buildAssetEntries(options.projectId, project));
             } catch (error) {
-                console.error("Failed to parse readable .scriptio file", error);
-                throw new Error("Invalid Scriptio file format");
+                // Never fail the whole export over an asset read hiccup — the
+                // document is the essential part.
+                console.warn("[Scriptio] Failed to bundle assets:", error);
             }
         }
 
-        // Binary path: decompress Yjs state, apply to a temporary doc, read fields.
-        const tmpDoc = new ProjectState();
-        try {
-            const decompressed = fflate.unzlibSync(payload);
-            Y.applyUpdate(tmpDoc, decompressed);
+        const archive = fflate.zipSync(zipEntries, { level: 6 });
+        // Re-wrap as an ArrayBuffer-backed view: fflate types its output as
+        // Uint8Array<ArrayBufferLike>, which BlobPart won't accept directly.
+        return new Blob([new Uint8Array(archive)], { type: SCRIPTIO_MIMETYPE });
+    }
 
-            return projectDataOf(tmpDoc);
-        } catch (error) {
-            console.error("Failed to parse .scriptio file", error);
-            throw new Error("Invalid Scriptio file format");
-        } finally {
-            tmpDoc.destroy();
-        }
+    convertFrom(rawContent: ArrayBuffer): ProjectData {
+        return parseZipDocument(unzipDocument(new Uint8Array(rawContent)));
     }
 
     public import(
@@ -125,25 +306,24 @@ export class ScriptioAdapter extends ProjectAdapter<ScriptioExportOptions> {
         titlePageEditor?: Editor | null,
         repository?: ProjectRepository | null,
     ): void {
-        const data = new Uint8Array(rawContent);
-        const { flags, payloadOffset } = parseHeader(data);
-        const payload = data.subarray(payloadOffset);
-        const isReadable = (flags & FLAG_READABLE_JSON) !== 0;
-
         if (repository) {
             const ydoc = repository.getState() as ProjectState;
             try {
+                const unzipped = unzipDocument(new Uint8Array(rawContent));
+
                 // Truly "replace" the project: wipe every existing map and
                 // fragment first so the import never merges with prior data.
                 clearProjectData(ydoc);
 
-                if (isReadable) {
-                    const json = new TextDecoder().decode(payload);
-                    applyProjectData(ydoc, JSON.parse(json) as ProjectData);
-                } else {
+                const ydocUpdate = unzipped[ZIP_DOCUMENT_YDOC];
+                if (ydocUpdate) {
                     // Applying the raw Yjs update preserves the full CRDT state,
                     // including any collaboration history baked into the file.
-                    Y.applyUpdate(ydoc, fflate.unzlibSync(payload));
+                    Y.applyUpdate(ydoc, ydocUpdate);
+                } else {
+                    const json = unzipped[ZIP_DOCUMENT_JSON];
+                    if (!json) throw new Error("Invalid .scriptio archive: missing document entry");
+                    applyProjectData(ydoc, JSON.parse(fflate.strFromU8(json)) as ProjectData);
                 }
 
                 // Refresh editors if provided
diff --git a/src/lib/import/import-project.ts b/src/lib/import/import-project.ts
index 4e9c3321..16efc25a 100644
--- a/src/lib/import/import-project.ts
+++ b/src/lib/import/import-project.ts
@@ -6,6 +6,7 @@
 import { ProjectData, ProjectState, applyProjectData } from "@src/lib/project/project-state";
 import { CURRENT_PROJECT_VERSION } from "@src/lib/project/migrations/project-migrations";
 import { getAdapterByFilename } from "@src/lib/adapters/registry";
+import { restoreScriptioAssets } from "@src/lib/adapters/scriptio/scriptio-adapter";
 import { createCachedProject, createCachedProjectWithId } from "@src/lib/persistence/storage-provider/local-persistence";
 import { writeYjsDocumentLocally } from "@src/lib/persistence/y-local-provider";
 import { Editor } from "@tiptap/react";
@@ -25,13 +26,12 @@ export interface ImportResult {
 /**
  * Parse a file and extract project content.
  */
-async function parseFile(file: File): Promise<ProjectData> {
-    const adapter = getAdapterByFilename(file.name);
+function parseProjectData(filename: string, content: ArrayBuffer): ProjectData {
+    const adapter = getAdapterByFilename(filename);
     if (!adapter) {
-        throw new Error(`Unsupported file type: ${file.name.split(".").pop()}`);
+        throw new Error(`Unsupported file type: ${filename.split(".").pop()}`);
     }
 
-    const content = await file.arrayBuffer();
     const projectData = adapter.convertFrom(content) as ProjectData;
 
     if (!projectData.screenplay || projectData.screenplay.length === 0) {
@@ -43,9 +43,14 @@ async function parseFile(file: File): Promise<ProjectData> {
 
 /**
  * Import a file into an existing project.
+ *
+ * `projectId` identifies the target project so bundled board image assets land
+ * under the right key in local storage; it's the currently-open project, not
+ * the (possibly different) id stamped inside the imported file.
  */
 export async function importFileIntoProject(
     file: File,
+    projectId: string,
     editor?: Editor | null,
     titlePageEditor?: Editor | null,
     repository?: ProjectRepository | null,
@@ -62,6 +67,8 @@ export async function importFileIntoProject(
 
     const content = await file.arrayBuffer();
     adapter.import(content, editor, titlePageEditor, repository);
+    // Restore any bundled board image assets (no-op for non-Scriptio files).
+    await restoreScriptioAssets(projectId, content);
     if (editor) editor.commands.focus();
 }
 
@@ -123,8 +130,10 @@ export async function importFileAsProject(
     isPro?: boolean,
 ): Promise<ImportResult> {
     try {
-        // Parse the file content
-        const projectData = await parseFile(file);
+        // Parse the file content (kept as a buffer so bundled assets can be
+        // restored after the new project id is known).
+        const content = await file.arrayBuffer();
+        const projectData = parseProjectData(file.name, content);
 
         // Create project title from filename if not provided
         const projectTitle = title || file.name.replace(/\.[^/.]+$/, "");
@@ -158,6 +167,10 @@ export async function importFileAsProject(
         // Create Yjs document with the project content
         await createLocalYjsDocument(projectId, projectData);
 
+        // Restore any bundled board image assets under the new project id
+        // (no-op for non-Scriptio files).
+        await restoreScriptioAssets(projectId, content);
+
         return {
             success: true,
             projectId,
diff --git a/src/tests/assets/assets.test.ts b/src/tests/assets/assets.test.ts
index 084b6882..48d84e56 100644
--- a/src/tests/assets/assets.test.ts
+++ b/src/tests/assets/assets.test.ts
@@ -9,6 +9,7 @@ import {
 } from "@src/lib/persistence/storage-provider/storage-provider";
 import { ProjectState } from "@src/lib/project/project-state";
 import { createProjectRepository } from "@src/lib/project/project-repository";
+import { ScriptioAdapter, restoreScriptioAssets } from "@src/lib/adapters/scriptio/scriptio-adapter";
 
 const pid = () => `test-${Math.random().toString(36).slice(2)}`;
 
@@ -181,3 +182,72 @@ describe("asset GC (reconcile from doc)", () => {
         ydoc.destroy();
     });
 });
+
+describe("scriptio asset bundling", () => {
+    it("bundles board image assets into the archive and restores them", async () => {
+        const provider = await getStorageProvider();
+        const src = pid();
+
+        // A board referencing a real stored image.
+        const file = await makePngFile("pic.png", 12, 8, "#0f0");
+        const { hash } = await importImageFile(src, file);
+
+        const ydoc = new ProjectState();
+        const repo = createProjectRepository(ydoc)!;
+        const board = repo.createBoardDocument("B");
+        ydoc.boardData(board).set(
+            "cards",
+            JSON.stringify([{ id: "c1", type: "image", assetId: hash, ...cardBase }]),
+        );
+
+        const adapter = new ScriptioAdapter();
+        const blob = await adapter.convertTo(ydoc, {
+            title: "t",
+            author: "a",
+            includeNotes: false,
+            projectId: src,
+        });
+        const buffer = await blob.arrayBuffer();
+
+        // The document still parses out of the zip and carries the board card.
+        const parsed = adapter.convertFrom(buffer);
+        expect(parsed.boards?.[board]?.cards).toContain(hash);
+
+        // Assets restore into a *different* project id (the import target).
+        const dest = pid();
+        expect(await provider.hasAsset(dest, hash)).toBe(false);
+        await restoreScriptioAssets(dest, buffer);
+
+        const restored = await provider.getAsset(dest, hash);
+        expect(restored?.width).toBe(12);
+        expect(restored?.height).toBe(8);
+        expect(restored?.mime).toBe("image/png");
+        // Bytes survive the round trip intact.
+        expect(await sha256Hex(restored!.data)).toBe(hash);
+
+        await provider.deleteProjectAssets(src);
+        await provider.deleteProjectAssets(dest);
+        ydoc.destroy();
+    });
+
+    it("exports a document with no assets and restore is a no-op", async () => {
+        const ydoc = new ProjectState();
+        const repo = createProjectRepository(ydoc)!;
+        repo.createBoardDocument("B"); // empty board, no image cards
+
+        const adapter = new ScriptioAdapter();
+        const blob = await adapter.convertTo(ydoc, {
+            title: "t",
+            author: "a",
+            includeNotes: false,
+            projectId: pid(),
+        });
+        const buffer = await blob.arrayBuffer();
+
+        const dest = pid();
+        await restoreScriptioAssets(dest, buffer); // must not throw
+        expect(await (await getStorageProvider()).listAssetHashes(dest)).toEqual([]);
+
+        ydoc.destroy();
+    });
+});
diff --git a/src/tests/project/scriptio-roundtrip.test.ts b/src/tests/project/scriptio-roundtrip.test.ts
index ea4269cd..ff715a2c 100644
--- a/src/tests/project/scriptio-roundtrip.test.ts
+++ b/src/tests/project/scriptio-roundtrip.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { prosemirrorJSONToYXmlFragment } from "y-prosemirror";
+import * as fflate from "fflate";
 
 import {
     ProjectState,
@@ -137,6 +138,52 @@ describe("scriptio adapter full round trip", () => {
         });
     }
 
+    it("names the document entry by type and writes a header-free readable JSON", async () => {
+        const project = buildPopulatedProject();
+        const adapter = new ScriptioAdapter();
+
+        const readableZip = fflate.unzipSync(
+            new Uint8Array(await (await adapter.convertTo(project, { ...baseOptions, readable: true })).arrayBuffer()),
+        );
+        expect(Object.keys(readableZip)).toContain("document.json");
+        expect(Object.keys(readableZip)).not.toContain("document.ydoc");
+
+        // The readable entry is pure JSON — no binary header to strip first.
+        const text = fflate.strFromU8(readableZip["document.json"]);
+        expect(text.trimStart().startsWith("{")).toBe(true);
+        expect(JSON.parse(text).metadata.title).toBe("My Script");
+
+        const binaryZip = fflate.unzipSync(
+            new Uint8Array(await (await adapter.convertTo(project, { ...baseOptions, readable: false })).arrayBuffer()),
+        );
+        expect(Object.keys(binaryZip)).toContain("document.ydoc");
+        expect(Object.keys(binaryZip)).not.toContain("document.json");
+
+        project.destroy();
+    });
+
+    it("writes an uncompressed mimetype as the first archive entry", async () => {
+        const project = buildPopulatedProject();
+        const adapter = new ScriptioAdapter();
+        const blob = await adapter.convertTo(project, { ...baseOptions, readable: false });
+        const bytes = new Uint8Array(await blob.arrayBuffer());
+
+        // First ZIP local file header, then its filename and (stored) content.
+        expect(Array.from(bytes.slice(0, 4))).toEqual([0x50, 0x4b, 0x03, 0x04]);
+        const nameLen = bytes[26] | (bytes[27] << 8);
+        const extraLen = bytes[28] | (bytes[29] << 8);
+        expect(new TextDecoder().decode(bytes.slice(30, 30 + nameLen))).toBe("mimetype");
+
+        // Stored (not deflated): the value appears verbatim right after the name.
+        const dataStart = 30 + nameLen + extraLen;
+        const mimetype = "application/vnd.scriptio+zip";
+        expect(new TextDecoder().decode(bytes.slice(dataStart, dataStart + mimetype.length))).toBe(
+            mimetype,
+        );
+
+        project.destroy();
+    });
+
     it("clearProjectData wipes maps and dynamic fragments before a replace", () => {
         const ydoc = buildPopulatedProject();
         clearProjectData(ydoc);

From 423f11580db2b636fbaa7a78365482b042d7d8ef Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Thu, 11 Jun 2026 02:50:20 +0200
Subject: [PATCH 67/76] added voice recording handling to boards, tweaked some
 board styling

---
 components/board/BoardCanvas.module.css       | 194 +++++++-
 components/board/BoardCanvas.tsx              | 174 +++++++-
 components/board/BoardCard.tsx                | 415 ++++++++++++++----
 components/board/use-audio-recorder.ts        | 118 +++++
 messages/de.json                              |   9 +-
 messages/en.json                              |   9 +-
 messages/es.json                              |   9 +-
 messages/fr.json                              |   9 +-
 messages/ja.json                              |   9 +-
 messages/ko.json                              |   9 +-
 messages/pl.json                              |   9 +-
 messages/zh.json                              |   9 +-
 src/lib/adapters/scriptio/scriptio-adapter.ts |  13 +
 src/lib/assets/asset-gc.ts                    |   5 +-
 src/lib/assets/asset-store.ts                 |  44 ++
 src/lib/project/project-doc.ts                |  13 +-
 src/tests/assets/assets.test.ts               |  45 +-
 styles/themes.css                             |   7 +
 18 files changed, 983 insertions(+), 117 deletions(-)
 create mode 100644 components/board/use-audio-recorder.ts

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index 0b566473..24174924 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -17,7 +17,13 @@
     pointer-events: none;
     background: linear-gradient(to bottom, var(--editor-shadow) 0%, transparent 100%);
     mask-image: linear-gradient(to right, transparent 0%, black 20%, black 80%, transparent 100%);
-    -webkit-mask-image: linear-gradient(to right, transparent 0%, black 20%, black 80%, transparent 100%);
+    -webkit-mask-image: linear-gradient(
+        to right,
+        transparent 0%,
+        black 20%,
+        black 80%,
+        transparent 100%
+    );
 }
 
 .container {
@@ -64,8 +70,6 @@
     position: absolute;
     display: flex;
     flex-direction: column;
-    border-radius: 8px;
-    border: 8px solid;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
     cursor: move;
     user-select: none;
@@ -105,6 +109,124 @@
     background-color: rgba(0, 0, 0, 0.05);
 }
 
+/* Audio voice-note card: a colored header (title) over a play/timeline row. */
+.card.audio_card {
+    overflow: hidden;
+}
+
+.audio_content {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 0 12px;
+    overflow: hidden;
+}
+
+/* Remaining-time readout next to the play button. */
+.audio_time {
+    flex-shrink: 0;
+    font-size: 12px;
+    font-variant-numeric: tabular-nums;
+    color: var(--board-card-body-text);
+    user-select: none;
+}
+
+/* Seekable timeline. The card content is always a light tint, so the track uses
+   theme greys (--separator / --secondary-text) that read across every theme.
+   `--audio-progress` (set from JS) fills the track up to the cursor on WebKit;
+   Firefox uses its native ::-moz-range-progress. */
+.audio_timeline {
+    flex: 1;
+    min-width: 0;
+    height: 16px;
+    margin: 0;
+    padding: 0;
+    cursor: pointer;
+    background: transparent;
+    -webkit-appearance: none;
+    appearance: none;
+    --audio-progress: 0%;
+}
+
+.audio_timeline::-webkit-slider-runnable-track {
+    height: 4px;
+    border-radius: 999px;
+    background: linear-gradient(
+        to right,
+        var(--secondary-text) var(--audio-progress),
+        var(--separator) var(--audio-progress)
+    );
+}
+
+.audio_timeline::-moz-range-track {
+    height: 4px;
+    border-radius: 999px;
+    background: var(--separator);
+}
+
+.audio_timeline::-moz-range-progress {
+    height: 4px;
+    border-radius: 999px;
+    background: var(--secondary-text);
+}
+
+.audio_timeline::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    box-sizing: border-box;
+    width: 12px;
+    height: 12px;
+    margin-top: -4px;
+    border: 2px solid var(--secondary);
+    border-radius: 50%;
+    background: var(--secondary-text);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
+    transition: transform 0.1s ease;
+}
+
+.audio_timeline::-moz-range-thumb {
+    box-sizing: border-box;
+    width: 12px;
+    height: 12px;
+    border: 2px solid var(--secondary);
+    border-radius: 50%;
+    background: var(--secondary-text);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
+}
+
+.audio_timeline:hover:not(:disabled)::-webkit-slider-thumb {
+    transform: scale(1.15);
+}
+
+.audio_timeline:disabled {
+    cursor: default;
+    opacity: 0.5;
+}
+
+.audio_play_btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    width: 32px;
+    height: 32px;
+    border: none;
+    border-radius: 50%;
+    background-color: var(--secondary);
+    color: var(--secondary-text);
+    cursor: pointer;
+}
+
+.audio_play_btn:hover:not(:disabled) {
+    background-color: var(--secondary-hover);
+}
+
+.audio_play_btn:disabled {
+    opacity: 0.4;
+    cursor: default;
+}
+
 .card_header {
     position: relative;
     display: flex;
@@ -286,6 +408,72 @@
     background-color: var(--context-menu-item-hover);
 }
 
+.context_menu_item_disabled {
+    opacity: 0.45;
+    cursor: default;
+}
+
+.context_menu_item_disabled:hover {
+    background-color: transparent;
+}
+
+/* Recording indicator: a pill in the top toolbar row, right of the zoom controls. */
+.recording_indicator {
+    position: absolute;
+    top: 8px;
+    left: 180px;
+    z-index: 11;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    height: 36px;
+    padding: 0 10px;
+    border-radius: 16px;
+    background-color: var(--secondary);
+    color: var(--secondary-text);
+    user-select: none;
+}
+
+.recording_dot {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background-color: #e5484d;
+    animation: recording_pulse 1s ease-in-out infinite;
+}
+
+@keyframes recording_pulse {
+    0%,
+    100% {
+        opacity: 1;
+    }
+    50% {
+        opacity: 0.3;
+    }
+}
+
+.recording_time {
+    font-size: 13px;
+    font-variant-numeric: tabular-nums;
+}
+
+.recording_stop {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 10px;
+    border: none;
+    border-radius: 12px;
+    background-color: #e5484d;
+    color: white;
+    font-size: 13px;
+    cursor: pointer;
+}
+
+.recording_stop:hover {
+    background-color: #d33b40;
+}
+
 .context_menu_colors {
     display: flex;
     flex-wrap: wrap;
diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index f10a263f..cd187e44 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -6,17 +6,33 @@ import { BoardCardData, BoardArrowData } from "@src/lib/project/project-state";
 import BoardCard from "./BoardCard";
 import styles from "./BoardCanvas.module.css";
 import { v7 as uuidv7 } from "uuid";
-import { Trash2, Plus, Minus, Copy, ListTree } from "lucide-react";
+import { Trash2, Plus, Minus, Copy, ListTree, Mic, Square } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { DEFAULT_ITEM_COLORS } from "@src/lib/utils/colors";
-import { importImageFile } from "@src/lib/assets/asset-store";
+import { importImageFile, importAudioFile } from "@src/lib/assets/asset-store";
 import { scheduleAssetGc } from "@src/lib/assets/asset-gc";
+import { useAudioRecorder } from "./use-audio-recorder";
 
 const GRID_SIZE = 20;
 const MIN_SCALE = 0.25;
 const MAX_SCALE = 2;
 /** Largest edge (in canvas px) an image card is sized to on first drop. */
 const MAX_IMAGE_CARD_SIZE = 400;
+/** Default size (in canvas px) of an audio voice-note card. */
+const AUDIO_CARD_WIDTH = 260;
+const AUDIO_CARD_HEIGHT = 96;
+
+/** A random swatch from the default palette (used for new colored cards). */
+function randomCardColor(): string {
+    return DEFAULT_ITEM_COLORS[Math.floor(Math.random() * DEFAULT_ITEM_COLORS.length)];
+}
+
+/** Seconds → `m:ss` for the recording indicator. */
+function formatRecordingTime(seconds: number): string {
+    const m = Math.floor(seconds / 60);
+    const s = seconds % 60;
+    return `${m}:${s.toString().padStart(2, "0")}`;
+}
 
 interface CardContextMenuState {
     position: { x: number; y: number };
@@ -28,6 +44,14 @@ interface ArrowContextMenuState {
     arrow: BoardArrowData;
 }
 
+interface CanvasContextMenuState {
+    /** Viewport position for placing the menu. */
+    position: { x: number; y: number };
+    /** Canvas-space coords where a new card should be created. */
+    canvasX: number;
+    canvasY: number;
+}
+
 const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }) => {
     const { projectId, repository, isYjsReady, isReadOnly, boardFocusCardId, setBoardFocusCardId } =
         useContext(ProjectContext);
@@ -45,6 +69,8 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
     const [isSnapping, setIsSnapping] = useState(true);
     const [cardContextMenu, setCardContextMenu] = useState<CardContextMenuState | null>(null);
     const [arrowContextMenu, setArrowContextMenu] = useState<ArrowContextMenuState | null>(null);
+    const [canvasContextMenu, setCanvasContextMenu] = useState<CanvasContextMenuState | null>(null);
+    const recorder = useAudioRecorder();
     const [prevIsVisible, setPrevIsVisible] = useState(isVisible);
     if (prevIsVisible !== isVisible) {
         setPrevIsVisible(isVisible);
@@ -52,6 +78,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             setIsSnapping(true);
             if (cardContextMenu) setCardContextMenu(null);
             if (arrowContextMenu) setArrowContextMenu(null);
+            if (canvasContextMenu) setCanvasContextMenu(null);
         }
     }
     const [isCameraReady, setIsCameraReady] = useState(false);
@@ -243,13 +270,14 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         const handleClick = () => {
             if (cardContextMenu) setCardContextMenu(null);
             if (arrowContextMenu) setArrowContextMenu(null);
+            if (canvasContextMenu) setCanvasContextMenu(null);
         };
 
         window.addEventListener("click", handleClick);
         return () => {
             window.removeEventListener("click", handleClick);
         };
-    }, [cardContextMenu, arrowContextMenu, isVisible]);
+    }, [cardContextMenu, arrowContextMenu, canvasContextMenu, isVisible]);
 
     // Panning with middle-click
     const handlePanMouseDown = useCallback(
@@ -334,6 +362,8 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
     const offsetRef = useRef(offset);
     const scaleRef = useRef(scale);
     const cardsRef = useRef(cards);
+    /** Canvas-space coords captured when recording starts, for the resulting card. */
+    const recordCoords = useRef({ x: 0, y: 0 });
     useEffect(() => {
         offsetRef.current = offset;
     }, [offset]);
@@ -490,14 +520,11 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const x = (e.clientX - rect.left - offset.x) / scale;
             const y = (e.clientY - rect.top - offset.y) / scale;
 
-            const randomColor =
-                DEFAULT_ITEM_COLORS[Math.floor(Math.random() * DEFAULT_ITEM_COLORS.length)];
-
             const newCard: BoardCardData = {
                 id: uuidv7(),
                 title: "",
                 description: "",
-                color: randomColor,
+                color: randomCardColor(),
                 x: isSnapping ? Math.round(x / GRID_SIZE) * GRID_SIZE : x,
                 y: isSnapping ? Math.round(y / GRID_SIZE) * GRID_SIZE : y,
                 width: 450,
@@ -536,8 +563,8 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             setIsDraggingFile(false);
             if (isReadOnly || !projectId) return;
 
-            const files = Array.from(e.dataTransfer.files).filter((f) =>
-                f.type.startsWith("image/"),
+            const files = Array.from(e.dataTransfer.files).filter(
+                (f) => f.type.startsWith("image/") || f.type.startsWith("audio/"),
             );
             if (files.length === 0) return;
 
@@ -549,10 +576,26 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
 
             const created: BoardCardData[] = [];
             for (const file of files) {
+                const i = created.length;
                 try {
+                    if (file.type.startsWith("audio/")) {
+                        const { hash } = await importAudioFile(projectId, file);
+                        created.push({
+                            id: uuidv7(),
+                            type: "audio",
+                            assetId: hash,
+                            title: "",
+                            description: "",
+                            color: randomCardColor(),
+                            x: dropX + i * 24,
+                            y: dropY + i * 24,
+                            width: AUDIO_CARD_WIDTH,
+                            height: AUDIO_CARD_HEIGHT,
+                        });
+                        continue;
+                    }
                     const { hash, width, height } = await importImageFile(projectId, file);
                     const fit = Math.min(1, MAX_IMAGE_CARD_SIZE / Math.max(width, height, 1));
-                    const i = created.length;
                     created.push({
                         id: uuidv7(),
                         type: "image",
@@ -566,7 +609,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                         height: Math.max(60, Math.round(height * fit)),
                     });
                 } catch (err) {
-                    console.error("[BoardCanvas] Failed to import image:", err);
+                    console.error("[BoardCanvas] Failed to import dropped file:", err);
                 }
             }
             if (created.length === 0) return;
@@ -578,6 +621,76 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         [isReadOnly, projectId, offset, scale, saveCards],
     );
 
+    // Right-clicking empty canvas opens a menu (record audio). Cards and arrows
+    // have their own menus, so bail when the click landed on one.
+    const handleCanvasContextMenu = useCallback(
+        (e: React.MouseEvent) => {
+            if (isReadOnly) return;
+            const target = e.target as HTMLElement;
+            if (
+                target.closest(`.${styles.card}`) ||
+                target.closest(`.${styles.arrow_group}`) ||
+                target.closest(`.${styles.context_menu}`) ||
+                target.closest(`.${styles.zoom_controls}`) ||
+                target.closest(`.${styles.hints}`)
+            )
+                return;
+
+            const container = containerRef.current;
+            if (!container) return;
+            const rect = container.getBoundingClientRect();
+            e.preventDefault();
+            setCardContextMenu(null);
+            setArrowContextMenu(null);
+            setCanvasContextMenu({
+                // Match the card/arrow menus: positioned with raw viewport coords.
+                position: { x: e.clientX, y: e.clientY },
+                canvasX: (e.clientX - rect.left - offset.x) / scale,
+                canvasY: (e.clientY - rect.top - offset.y) / scale,
+            });
+        },
+        [isReadOnly, offset, scale],
+    );
+
+    // Begin recording from the canvas menu; remember where to drop the card.
+    const handleStartRecording = useCallback(async () => {
+        if (!canvasContextMenu) return;
+        recordCoords.current = { x: canvasContextMenu.canvasX, y: canvasContextMenu.canvasY };
+        setCanvasContextMenu(null);
+        try {
+            await recorder.start();
+        } catch (err) {
+            console.error("[BoardCanvas] Microphone access failed:", err);
+        }
+    }, [canvasContextMenu, recorder]);
+
+    // Stop recording, store the clip as an asset, and drop an audio card.
+    const handleStopRecording = useCallback(async () => {
+        const blob = await recorder.stop();
+        if (!blob || !projectId) return;
+        try {
+            const { hash } = await importAudioFile(projectId, blob);
+            const { x, y } = recordCoords.current;
+            const newCard: BoardCardData = {
+                id: uuidv7(),
+                type: "audio",
+                assetId: hash,
+                title: "",
+                description: "",
+                color: randomCardColor(),
+                x,
+                y,
+                width: AUDIO_CARD_WIDTH,
+                height: AUDIO_CARD_HEIGHT,
+            };
+            const newCards = [...cardsRef.current, newCard];
+            setCards(newCards);
+            saveCards(newCards);
+        } catch (err) {
+            console.error("[BoardCanvas] Failed to store recording:", err);
+        }
+    }, [recorder, projectId, saveCards]);
+
     // Update card (with multi-drag support)
     const handleUpdateCard = useCallback(
         (updatedCard: BoardCardData) => {
@@ -868,6 +981,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                 className={`${styles.container} ${isPanning ? styles.panning : ""} ${isDraggingFile ? styles.drag_over : ""}`}
                 onMouseDown={handleContainerMouseDown}
                 onDoubleClick={handleDoubleClick}
+                onContextMenu={handleCanvasContextMenu}
                 onWheel={handleWheel}
                 onDragOver={handleDragOver}
                 onDragLeave={handleDragLeave}
@@ -1056,7 +1170,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                             left: cardContextMenu.position.x,
                         }}
                     >
-                        {/* Color + outline apply to text notes; image cards have neither. */}
+                        {/* Color applies to text + audio notes; image cards have none. */}
                         {cardContextMenu.card.type !== "image" && (
                             <div className={styles.context_menu_colors}>
                                 {DEFAULT_ITEM_COLORS.map((color) => (
@@ -1078,7 +1192,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                             <Copy size={16} />
                             <p className="unselectable">{t("duplicate")}</p>
                         </div>
-                        {cardContextMenu.card.type !== "image" && (
+                        {(cardContextMenu.card.type ?? "text") === "text" && (
                             <div
                                 className={styles.context_menu_item}
                                 onClick={() => handleSendToOutline(cardContextMenu.card)}
@@ -1097,6 +1211,40 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                     </div>
                 )}
 
+                {/* Canvas Context Menu (empty-area right-click) */}
+                {canvasContextMenu && (
+                    <div
+                        className={styles.context_menu}
+                        style={{
+                            top: canvasContextMenu.position.y,
+                            left: canvasContextMenu.position.x,
+                        }}
+                    >
+                        <div
+                            className={`${styles.context_menu_item} ${recorder.isSupported ? "" : styles.context_menu_item_disabled}`}
+                            title={recorder.isSupported ? undefined : t("audioUnsupported")}
+                            onClick={recorder.isSupported ? handleStartRecording : undefined}
+                        >
+                            <Mic size={16} />
+                            <p className="unselectable">{t("recordAudio")}</p>
+                        </div>
+                    </div>
+                )}
+
+                {/* Recording indicator */}
+                {recorder.isRecording && (
+                    <div className={styles.recording_indicator}>
+                        <span className={styles.recording_dot} />
+                        <span className={styles.recording_time}>
+                            {formatRecordingTime(recorder.elapsed)}
+                        </span>
+                        <button className={styles.recording_stop} onClick={handleStopRecording}>
+                            <Square size={12} />
+                            <span className="unselectable">{t("stopRecording")}</span>
+                        </button>
+                    </div>
+                )}
+
                 {/* Arrow Context Menu */}
                 {arrowContextMenu && (
                     <div
diff --git a/components/board/BoardCard.tsx b/components/board/BoardCard.tsx
index 60166e9f..c2b3d963 100644
--- a/components/board/BoardCard.tsx
+++ b/components/board/BoardCard.tsx
@@ -3,9 +3,281 @@
 import { useRef, useState, useCallback, useEffect } from "react";
 import styles from "./BoardCanvas.module.css";
 import { useTranslations } from "next-intl";
+import { Play, Pause } from "lucide-react";
 import { BoardCardData } from "@src/lib/project/project-state";
 import { useAssetUrl } from "@src/lib/assets/use-asset-url";
 
+/** Join truthy class names (false/undefined are skipped). */
+const cx = (...parts: (string | false | undefined)[]) => parts.filter(Boolean).join(" ");
+
+/** The card kind, defaulting legacy/undefined cards to plain text notes. */
+type CardKind = NonNullable<BoardCardData["type"]>;
+const kindOf = (card: BoardCardData): CardKind => card.type ?? "text";
+
+/** Smallest height (canvas px) a card can be resized to, by kind. */
+const minHeightFor = (kind: CardKind) => (kind === "audio" ? 76 : 100);
+
+/** Seconds → `m:ss` (clamped at 0), for the audio timer. */
+function formatTime(seconds: number): string {
+    const total = Math.max(0, Math.floor(seconds || 0));
+    const m = Math.floor(total / 60);
+    const s = total % 60;
+    return `${m}:${s.toString().padStart(2, "0")}`;
+}
+
+/**
+ * Inline color for the card chrome. Images are bare; text and audio notes carry
+ * a colored header/border like every other card.
+ */
+function cardColorStyle(card: BoardCardData): React.CSSProperties {
+    if (kindOf(card) === "image") return {};
+    return { borderColor: card.color, backgroundColor: card.color };
+}
+
+// ── Shared inline-editable title ─────────────────────────────────────────────
+
+interface TitleEditing {
+    editing: boolean;
+    value: string;
+    onChange: (value: string) => void;
+    onBlur: () => void;
+    onKeyDown: (e: React.KeyboardEvent) => void;
+    onStartEdit: (e: React.MouseEvent) => void;
+}
+
+interface EditableTitleProps extends TitleEditing {
+    /** Text shown when not editing (e.g. the title or a placeholder hint). */
+    display: string;
+    placeholder: string;
+    inputClassName: string;
+    labelClassName: string;
+    /** Optional tooltip on the read-only label. */
+    labelTitle?: string;
+}
+
+const EditableTitle = ({
+    editing,
+    value,
+    display,
+    placeholder,
+    inputClassName,
+    labelClassName,
+    labelTitle,
+    onChange,
+    onBlur,
+    onKeyDown,
+    onStartEdit,
+}: EditableTitleProps) =>
+    editing ? (
+        <input
+            type="text"
+            className={inputClassName}
+            value={value}
+            onChange={(e) => onChange(e.target.value)}
+            onBlur={onBlur}
+            onKeyDown={onKeyDown}
+            onClick={(e) => e.stopPropagation()}
+            onMouseDown={(e) => e.stopPropagation()}
+            placeholder={placeholder}
+            autoFocus
+        />
+    ) : (
+        <span className={labelClassName} onDoubleClick={onStartEdit} title={labelTitle}>
+            {display}
+        </span>
+    );
+
+// ── Card body variants ───────────────────────────────────────────────────────
+
+const ImageBody = ({ projectId, card }: { projectId: string; card: BoardCardData }) => {
+    const imageUrl = useAssetUrl(projectId, card.assetId);
+    if (!imageUrl) return <div className={styles.card_image_placeholder} />;
+    // Blob object URLs can't be optimized by next/image; a plain <img> is correct here.
+    // eslint-disable-next-line @next/next/no-img-element
+    return <img src={imageUrl} alt="" draggable={false} className={styles.card_image} />;
+};
+
+const AudioBody = ({
+    projectId,
+    card,
+    title,
+}: {
+    projectId: string;
+    card: BoardCardData;
+    title: TitleEditing;
+}) => {
+    const t = useTranslations("board");
+    const assetUrl = useAssetUrl(projectId, card.assetId);
+    const audioRef = useRef<HTMLAudioElement>(null);
+    const [isPlaying, setIsPlaying] = useState(false);
+    const [duration, setDuration] = useState(0);
+    const [currentTime, setCurrentTime] = useState(0);
+    // MediaRecorder blobs report duration as Infinity until forced to seek past
+    // the end; this flag drives the one-shot fix-up below.
+    const fixDuration = useRef(false);
+
+    const togglePlay = useCallback((e: React.MouseEvent) => {
+        e.stopPropagation();
+        const audio = audioRef.current;
+        if (!audio) return;
+        if (audio.paused) void audio.play();
+        else audio.pause();
+    }, []);
+
+    const handleLoadedMetadata = useCallback(() => {
+        const audio = audioRef.current;
+        if (!audio) return;
+        if (isFinite(audio.duration)) {
+            setDuration(audio.duration);
+        } else {
+            fixDuration.current = true;
+            audio.currentTime = 1e7; // nudge the browser to compute real duration
+        }
+    }, []);
+
+    const handleTimeUpdate = useCallback(() => {
+        const audio = audioRef.current;
+        if (!audio) return;
+        if (fixDuration.current) {
+            fixDuration.current = false;
+            setDuration(isFinite(audio.duration) ? audio.duration : 0);
+            audio.currentTime = 0;
+            setCurrentTime(0);
+            return;
+        }
+        setCurrentTime(audio.currentTime);
+    }, []);
+
+    const handleSeek = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+        const value = Number(e.target.value);
+        if (audioRef.current) audioRef.current.currentTime = value;
+        setCurrentTime(value);
+    }, []);
+
+    return (
+        <>
+            <div className={styles.card_header} style={{ backgroundColor: card.color }}>
+                <EditableTitle
+                    {...title}
+                    display={card.title || t("audioHint")}
+                    placeholder={t("titlePlaceholder")}
+                    inputClassName={styles.card_header_title_input}
+                    labelClassName={styles.card_header_title}
+                    labelTitle={t("rename")}
+                />
+            </div>
+
+            <div
+                className={styles.audio_content}
+                style={{ backgroundColor: `color-mix(in srgb, ${card.color} 20%, white)` }}
+            >
+                <button
+                    className={styles.audio_play_btn}
+                    onClick={togglePlay}
+                    onMouseDown={(e) => e.stopPropagation()}
+                    title={isPlaying ? t("pause") : t("play")}
+                    disabled={!assetUrl}
+                >
+                    {isPlaying ? <Pause size={16} /> : <Play size={16} />}
+                </button>
+                <span className={styles.audio_time}>
+                    {formatTime(duration ? duration - currentTime : 0)}
+                </span>
+                <input
+                    type="range"
+                    className={styles.audio_timeline}
+                    min={0}
+                    max={duration || 0}
+                    step={0.01}
+                    value={Math.min(currentTime, duration || 0)}
+                    onChange={handleSeek}
+                    onMouseDown={(e) => e.stopPropagation()}
+                    disabled={!assetUrl || !duration}
+                    style={
+                        {
+                            "--audio-progress": `${duration ? (Math.min(currentTime, duration) / duration) * 100 : 0}%`,
+                        } as React.CSSProperties
+                    }
+                />
+                {assetUrl && (
+                    <audio
+                        ref={audioRef}
+                        src={assetUrl}
+                        onPlay={() => setIsPlaying(true)}
+                        onPause={() => setIsPlaying(false)}
+                        onEnded={() => setIsPlaying(false)}
+                        onLoadedMetadata={handleLoadedMetadata}
+                        onTimeUpdate={handleTimeUpdate}
+                    />
+                )}
+            </div>
+        </>
+    );
+};
+
+interface DescriptionEditing {
+    editing: boolean;
+    value: string;
+    onChange: (value: string) => void;
+    onBlur: () => void;
+    onKeyDown: (e: React.KeyboardEvent) => void;
+}
+
+const TextBody = ({
+    card,
+    title,
+    description,
+    onStartEditDescription,
+}: {
+    card: BoardCardData;
+    title: TitleEditing;
+    description: DescriptionEditing;
+    onStartEditDescription: (e: React.MouseEvent) => void;
+}) => {
+    const t = useTranslations("board");
+    return (
+        <>
+            <div className={styles.card_header} style={{ backgroundColor: card.color }}>
+                <EditableTitle
+                    {...title}
+                    display={card.title || t("untitled")}
+                    placeholder={t("titlePlaceholder")}
+                    inputClassName={styles.card_header_title_input}
+                    labelClassName={styles.card_header_title}
+                />
+            </div>
+
+            <div
+                className={styles.card_content}
+                style={{ backgroundColor: `color-mix(in srgb, ${card.color} 20%, white)` }}
+                onDoubleClick={onStartEditDescription}
+            >
+                <p
+                    className={styles.card_description}
+                    style={{ display: description.editing ? "none" : undefined }}
+                >
+                    {card.description}
+                </p>
+                {description.editing && (
+                    <textarea
+                        className={styles.card_description_input}
+                        value={description.value}
+                        onChange={(e) => description.onChange(e.target.value)}
+                        onBlur={description.onBlur}
+                        onKeyDown={description.onKeyDown}
+                        onClick={(e) => e.stopPropagation()}
+                        onMouseDown={(e) => e.stopPropagation()}
+                        placeholder={t("descriptionPlaceholder")}
+                        autoFocus
+                    />
+                )}
+            </div>
+        </>
+    );
+};
+
+// ── Card container (shared chrome: drag, resize, connect, context menu) ───────
+
 interface BoardCardProps {
     card: BoardCardData;
     projectId: string;
@@ -33,10 +305,7 @@ const BoardCard = ({
     isConnecting,
     isSelected,
 }: BoardCardProps) => {
-    const isImage = card.type === "image";
-    // Only resolves bytes for image cards (null assetId is a no-op for text notes).
-    const imageUrl = useAssetUrl(projectId, isImage ? card.assetId : null);
-    const t = useTranslations("board");
+    const kind = kindOf(card);
     const cardRef = useRef<HTMLDivElement>(null);
     const [isDragging, setIsDragging] = useState(false);
     const [isEditing, setIsEditing] = useState(false);
@@ -70,7 +339,11 @@ const BoardCard = ({
 
     const handleMouseDown = useCallback(
         (e: React.MouseEvent) => {
-            if (isEditing || isEditingTitle || (e.target as HTMLElement).closest(`.${styles.card_resize_handle}`))
+            if (
+                isEditing ||
+                isEditingTitle ||
+                (e.target as HTMLElement).closest(`.${styles.card_resize_handle}`)
+            )
                 return;
             e.stopPropagation();
             e.preventDefault(); // Prevent Chromium's text selection from interfering with drag
@@ -99,11 +372,7 @@ const BoardCard = ({
                 const newX = (e.clientX - parentRect.left) / scale - dragOffset.current.x;
                 const newY = (e.clientY - parentRect.top) / scale - dragOffset.current.y;
 
-                onUpdate({
-                    ...card,
-                    x: snapToGrid(newX),
-                    y: snapToGrid(newY),
-                });
+                onUpdate({ ...card, x: snapToGrid(newX), y: snapToGrid(newY) });
             }
 
             if (isResizing) {
@@ -111,16 +380,12 @@ const BoardCard = ({
                 const dy = (e.clientY - resizeStart.current.y) / scale;
 
                 const newWidth = Math.max(150, resizeStart.current.width + dx);
-                const newHeight = Math.max(100, resizeStart.current.height + dy);
+                const newHeight = Math.max(minHeightFor(kind), resizeStart.current.height + dy);
 
-                onUpdate({
-                    ...card,
-                    width: snapToGrid(newWidth),
-                    height: snapToGrid(newHeight),
-                });
+                onUpdate({ ...card, width: snapToGrid(newWidth), height: snapToGrid(newHeight) });
             }
         },
-        [isDragging, isResizing, card, onUpdate, scale, snapToGrid],
+        [isDragging, isResizing, kind, card, onUpdate, scale, snapToGrid],
     );
 
     const handleMouseUp = useCallback(() => {
@@ -154,12 +419,12 @@ const BoardCard = ({
         }
     }, [isDragging, isResizing, handleMouseMove, handleMouseUp]);
 
-    const handleDoubleClick = useCallback((e: React.MouseEvent) => {
+    const handleStartEditDescription = useCallback((e: React.MouseEvent) => {
         e.stopPropagation();
         setIsEditing(true);
     }, []);
 
-    const handleTitleDoubleClick = useCallback((e: React.MouseEvent) => {
+    const handleStartEditTitle = useCallback((e: React.MouseEvent) => {
         e.stopPropagation();
         setIsEditingTitle(true);
     }, []);
@@ -167,20 +432,14 @@ const BoardCard = ({
     const handleTitleBlur = useCallback(() => {
         setIsEditingTitle(false);
         if (localTitle !== card.title) {
-            onUpdate({
-                ...card,
-                title: localTitle,
-            });
+            onUpdate({ ...card, title: localTitle });
         }
     }, [card, localTitle, onUpdate]);
 
     const handleDescriptionBlur = useCallback(() => {
         setIsEditing(false);
         if (localDescription !== card.description) {
-            onUpdate({
-                ...card,
-                description: localDescription,
-            });
+            onUpdate({ ...card, description: localDescription });
         }
     }, [card, localDescription, onUpdate]);
 
@@ -240,77 +499,63 @@ const BoardCard = ({
         [card.id, isConnecting, onCompleteConnection],
     );
 
+    const titleEditing: TitleEditing = {
+        editing: isEditingTitle,
+        value: localTitle,
+        onChange: setLocalTitle,
+        onBlur: handleTitleBlur,
+        onKeyDown: handleTitleKeyDown,
+        onStartEdit: handleStartEditTitle,
+    };
+
+    const renderBody = () => {
+        switch (kind) {
+            case "image":
+                return <ImageBody projectId={projectId} card={card} />;
+            case "audio":
+                return <AudioBody projectId={projectId} card={card} title={titleEditing} />;
+            default:
+                return (
+                    <TextBody
+                        card={card}
+                        title={titleEditing}
+                        description={{
+                            editing: isEditing,
+                            value: localDescription,
+                            onChange: setLocalDescription,
+                            onBlur: handleDescriptionBlur,
+                            onKeyDown: handleDescriptionKeyDown,
+                        }}
+                        onStartEditDescription={handleStartEditDescription}
+                    />
+                );
+        }
+    };
+
     return (
         <div
             ref={cardRef}
-            className={`${styles.card} ${isImage ? styles.image_card : ""} ${isDragging ? styles.card_dragging : ""} ${isConnecting ? styles.card_connecting : ""} ${isSelected ? styles.card_selected : ""}`}
+            className={cx(
+                styles.card,
+                kind === "image" && styles.image_card,
+                kind === "audio" && styles.audio_card,
+                isDragging && styles.card_dragging,
+                isConnecting && styles.card_connecting,
+                isSelected && styles.card_selected,
+            )}
             style={{
                 left: card.x,
                 top: card.y,
                 width: card.width,
                 height: card.height,
-                ...(isImage ? {} : { borderColor: card.color, backgroundColor: card.color }),
+                ...cardColorStyle(card),
             }}
             onMouseDown={handleMouseDown}
             onMouseUp={handleCardMouseUp}
-            onDoubleClick={isImage ? undefined : handleDoubleClick}
+            onDoubleClick={kind === "text" ? handleStartEditDescription : undefined}
             onContextMenu={handleRightClick}
         >
-            {isImage ? (
-                imageUrl ? (
-                    // Blob object URLs can't be optimized by next/image; a plain <img> is correct here.
-                    // eslint-disable-next-line @next/next/no-img-element
-                    <img src={imageUrl} alt="" draggable={false} className={styles.card_image} />
-                ) : (
-                    <div className={styles.card_image_placeholder} />
-                )
-            ) : (
-                <>
-                    <div className={styles.card_header} style={{ backgroundColor: card.color }}>
-                        {isEditingTitle ? (
-                            <input
-                                type="text"
-                                className={styles.card_header_title_input}
-                                value={localTitle}
-                                onChange={(e) => setLocalTitle(e.target.value)}
-                                onBlur={handleTitleBlur}
-                                onKeyDown={handleTitleKeyDown}
-                                onClick={(e) => e.stopPropagation()}
-                                onMouseDown={(e) => e.stopPropagation()}
-                                placeholder={t("titlePlaceholder")}
-                                autoFocus
-                            />
-                        ) : (
-                            <span className={styles.card_header_title} onDoubleClick={handleTitleDoubleClick}>
-                                {card.title || t("untitled")}
-                            </span>
-                        )}
-                    </div>
-
-                    <div
-                        className={styles.card_content}
-                        style={{ backgroundColor: `color-mix(in srgb, ${card.color} 20%, white)` }}
-                        onDoubleClick={handleDoubleClick}
-                    >
-                        <p className={styles.card_description} style={{ display: isEditing ? "none" : undefined }}>
-                            {card.description}
-                        </p>
-                        {isEditing && (
-                            <textarea
-                                className={styles.card_description_input}
-                                value={localDescription}
-                                onChange={(e) => setLocalDescription(e.target.value)}
-                                onBlur={handleDescriptionBlur}
-                                onKeyDown={handleDescriptionKeyDown}
-                                onClick={(e) => e.stopPropagation()}
-                                onMouseDown={(e) => e.stopPropagation()}
-                                placeholder={t("descriptionPlaceholder")}
-                                autoFocus
-                            />
-                        )}
-                    </div>
-                </>
-            )}
+            {renderBody()}
 
             <div className={styles.card_resize_handle} onMouseDown={handleResizeStart} />
 
diff --git a/components/board/use-audio-recorder.ts b/components/board/use-audio-recorder.ts
new file mode 100644
index 00000000..fbfea0a6
--- /dev/null
+++ b/components/board/use-audio-recorder.ts
@@ -0,0 +1,118 @@
+"use client";
+
+/**
+ * Minimal microphone recorder for board voice notes.
+ *
+ * Recording is gated to MP4/AAC (`audio/mp4`) so every captured clip plays in
+ * any browser and survives `.scriptio` export/import. Browsers whose
+ * `MediaRecorder` can't produce MP4 (e.g. Firefox) report `isSupported: false`;
+ * the UI then hides the record action and the user drags in an audio file
+ * instead. Dropped files keep their original format.
+ */
+
+import { useCallback, useEffect, useRef, useState } from "react";
+
+/** The single recording mime we accept — AAC in an MP4 container. */
+export const RECORDING_MIME = "audio/mp4";
+
+/** Can this browser record directly to MP4/AAC? */
+export function isAudioRecordingSupported(): boolean {
+    return (
+        typeof MediaRecorder !== "undefined" &&
+        typeof MediaRecorder.isTypeSupported === "function" &&
+        MediaRecorder.isTypeSupported(RECORDING_MIME)
+    );
+}
+
+export interface AudioRecorder {
+    /** True only when in-browser MP4/AAC recording is available. */
+    isSupported: boolean;
+    /** True while a recording is in progress. */
+    isRecording: boolean;
+    /** Elapsed recording time in whole seconds. */
+    elapsed: number;
+    /** Begin recording; resolves once the mic stream is live. */
+    start: () => Promise<void>;
+    /** Stop recording and resolve the captured clip (`null` if nothing/failed). */
+    stop: () => Promise<Blob | null>;
+    /** Stop and discard the current recording. */
+    cancel: () => void;
+}
+
+export function useAudioRecorder(): AudioRecorder {
+    // Lazy init: `false` during SSR (MediaRecorder is undefined there). Nothing
+    // depending on it is in the initial DOM, so the client value can't mismatch.
+    const [isSupported] = useState(() => isAudioRecordingSupported());
+    const [isRecording, setIsRecording] = useState(false);
+    const [elapsed, setElapsed] = useState(0);
+
+    const recorderRef = useRef<MediaRecorder | null>(null);
+    const chunksRef = useRef<Blob[]>([]);
+    const streamRef = useRef<MediaStream | null>(null);
+    const timerRef = useRef<ReturnType<typeof setInterval> | null>(null);
+
+    const teardown = useCallback(() => {
+        if (timerRef.current) {
+            clearInterval(timerRef.current);
+            timerRef.current = null;
+        }
+        streamRef.current?.getTracks().forEach((track) => track.stop());
+        streamRef.current = null;
+        recorderRef.current = null;
+        setIsRecording(false);
+    }, []);
+
+    const start = useCallback(async () => {
+        if (recorderRef.current) return;
+        const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
+        streamRef.current = stream;
+        chunksRef.current = [];
+
+        const recorder = new MediaRecorder(stream, { mimeType: RECORDING_MIME });
+        recorder.ondataavailable = (e) => {
+            if (e.data.size > 0) chunksRef.current.push(e.data);
+        };
+        recorderRef.current = recorder;
+        recorder.start();
+
+        setElapsed(0);
+        setIsRecording(true);
+        timerRef.current = setInterval(() => setElapsed((s) => s + 1), 1000);
+    }, []);
+
+    const stop = useCallback((): Promise<Blob | null> => {
+        const recorder = recorderRef.current;
+        if (!recorder) return Promise.resolve(null);
+
+        return new Promise<Blob | null>((resolve) => {
+            recorder.onstop = () => {
+                const blob = chunksRef.current.length
+                    ? new Blob(chunksRef.current, { type: RECORDING_MIME })
+                    : null;
+                chunksRef.current = [];
+                teardown();
+                resolve(blob);
+            };
+            recorder.stop();
+        });
+    }, [teardown]);
+
+    const cancel = useCallback(() => {
+        const recorder = recorderRef.current;
+        if (recorder) {
+            recorder.onstop = null;
+            try {
+                recorder.stop();
+            } catch {
+                // already inactive
+            }
+        }
+        chunksRef.current = [];
+        teardown();
+    }, [teardown]);
+
+    // Release the mic if the component unmounts mid-recording.
+    useEffect(() => () => teardown(), [teardown]);
+
+    return { isSupported, isRecording, elapsed, start, stop, cancel };
+}
diff --git a/messages/de.json b/messages/de.json
index baff18ef..6d5cdadf 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -482,7 +482,14 @@
     },
     "untitled": "Unbenannt",
     "titlePlaceholder": "Titel",
-    "descriptionPlaceholder": "Beschreibung"
+    "descriptionPlaceholder": "Beschreibung",
+    "recordAudio": "Audio aufnehmen",
+    "stopRecording": "Stopp",
+    "audioUnsupported": "Audioaufnahme wird in diesem Browser nicht unterstützt – ziehen Sie stattdessen eine Audiodatei hierher",
+    "audioHint": "Sprachnotiz",
+    "play": "Abspielen",
+    "pause": "Pause",
+    "rename": "Zum Umbenennen doppelklicken"
   },
   "production": {
     "title": "Produktion",
diff --git a/messages/en.json b/messages/en.json
index 230c0599..b1074dae 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -481,7 +481,14 @@
     },
     "untitled": "Untitled",
     "titlePlaceholder": "Title",
-    "descriptionPlaceholder": "Description"
+    "descriptionPlaceholder": "Description",
+    "recordAudio": "Record audio",
+    "stopRecording": "Stop",
+    "audioUnsupported": "Audio recording isn't supported in this browser — drag in an audio file instead",
+    "audioHint": "Voice note",
+    "play": "Play",
+    "pause": "Pause",
+    "rename": "Double-click to rename"
   },
   "production": {
     "title": "Production",
diff --git a/messages/es.json b/messages/es.json
index f952198f..dc9f87e7 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -481,7 +481,14 @@
     },
     "untitled": "Sin título",
     "titlePlaceholder": "Título",
-    "descriptionPlaceholder": "Descripción"
+    "descriptionPlaceholder": "Descripción",
+    "recordAudio": "Grabar audio",
+    "stopRecording": "Detener",
+    "audioUnsupported": "La grabación de audio no es compatible con este navegador: arrastra un archivo de audio en su lugar",
+    "audioHint": "Nota de voz",
+    "play": "Reproducir",
+    "pause": "Pausar",
+    "rename": "Doble clic para renombrar"
   },
   "production": {
     "title": "Producción",
diff --git a/messages/fr.json b/messages/fr.json
index e6f11028..7944f2e5 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -482,7 +482,14 @@
     },
     "untitled": "Sans titre",
     "titlePlaceholder": "Titre",
-    "descriptionPlaceholder": "Description"
+    "descriptionPlaceholder": "Description",
+    "recordAudio": "Enregistrer un audio",
+    "stopRecording": "Arrêter",
+    "audioUnsupported": "L'enregistrement audio n'est pas pris en charge par ce navigateur — glissez plutôt un fichier audio",
+    "audioHint": "Note vocale",
+    "play": "Lire",
+    "pause": "Pause",
+    "rename": "Double-cliquez pour renommer"
   },
   "production": {
     "title": "Production",
diff --git a/messages/ja.json b/messages/ja.json
index 314543d3..dfd4307f 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -481,7 +481,14 @@
     },
     "untitled": "無題",
     "titlePlaceholder": "タイトル",
-    "descriptionPlaceholder": "説明"
+    "descriptionPlaceholder": "説明",
+    "recordAudio": "音声を録音",
+    "stopRecording": "停止",
+    "audioUnsupported": "このブラウザは音声録音に対応していません。代わりに音声ファイルをドラッグしてください",
+    "audioHint": "ボイスメモ",
+    "play": "再生",
+    "pause": "一時停止",
+    "rename": "ダブルクリックで名前を変更"
   },
   "production": {
     "title": "プロダクション",
diff --git a/messages/ko.json b/messages/ko.json
index fa4c2f24..66a42000 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -481,7 +481,14 @@
     },
     "untitled": "제목 없음",
     "titlePlaceholder": "제목",
-    "descriptionPlaceholder": "설명"
+    "descriptionPlaceholder": "설명",
+    "recordAudio": "오디오 녹음",
+    "stopRecording": "정지",
+    "audioUnsupported": "이 브라우저에서는 오디오 녹음을 지원하지 않습니다. 대신 오디오 파일을 끌어다 놓으세요",
+    "audioHint": "음성 메모",
+    "play": "재생",
+    "pause": "일시정지",
+    "rename": "더블클릭하여 이름 변경"
   },
   "production": {
     "title": "프로덕션",
diff --git a/messages/pl.json b/messages/pl.json
index 2c0c51f3..fa8714cb 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -481,7 +481,14 @@
     },
     "untitled": "Bez tytułu",
     "titlePlaceholder": "Tytuł",
-    "descriptionPlaceholder": "Opis"
+    "descriptionPlaceholder": "Opis",
+    "recordAudio": "Nagraj dźwięk",
+    "stopRecording": "Zatrzymaj",
+    "audioUnsupported": "Nagrywanie dźwięku nie jest obsługiwane w tej przeglądarce — przeciągnij plik audio",
+    "audioHint": "Notatka głosowa",
+    "play": "Odtwórz",
+    "pause": "Wstrzymaj",
+    "rename": "Kliknij dwukrotnie, aby zmienić nazwę"
   },
   "production": {
     "title": "Produkcja",
diff --git a/messages/zh.json b/messages/zh.json
index 3453b649..c2f1eeb9 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -481,7 +481,14 @@
     },
     "untitled": "未命名",
     "titlePlaceholder": "标题",
-    "descriptionPlaceholder": "描述"
+    "descriptionPlaceholder": "描述",
+    "recordAudio": "录制音频",
+    "stopRecording": "停止",
+    "audioUnsupported": "此浏览器不支持录音，请改为拖入音频文件",
+    "audioHint": "语音备注",
+    "play": "播放",
+    "pause": "暂停",
+    "rename": "双击重命名"
   },
   "production": {
     "title": "制作",
diff --git a/src/lib/adapters/scriptio/scriptio-adapter.ts b/src/lib/adapters/scriptio/scriptio-adapter.ts
index bb415c9f..9d194e8c 100644
--- a/src/lib/adapters/scriptio/scriptio-adapter.ts
+++ b/src/lib/adapters/scriptio/scriptio-adapter.ts
@@ -102,6 +102,19 @@ function extensionForMime(mime: string): string {
             return ".bmp";
         case "image/svg+xml":
             return ".svg";
+        case "audio/mp4":
+            return ".m4a";
+        case "audio/aac":
+            return ".aac";
+        case "audio/mpeg":
+            return ".mp3";
+        case "audio/wav":
+        case "audio/x-wav":
+            return ".wav";
+        case "audio/ogg":
+            return ".ogg";
+        case "audio/webm":
+            return ".webm";
         default:
             return "";
     }
diff --git a/src/lib/assets/asset-gc.ts b/src/lib/assets/asset-gc.ts
index 7bd30100..5a679a08 100644
--- a/src/lib/assets/asset-gc.ts
+++ b/src/lib/assets/asset-gc.ts
@@ -12,7 +12,7 @@ import type { BoardCardData } from "../project/project-doc";
 import type { ProjectState } from "../project/project-state";
 import { getStorageProvider } from "../persistence/storage-provider/storage-provider";
 
-/** Every asset hash referenced by an image card across all board documents. */
+/** Every asset hash referenced by an image or audio card across all board documents. */
 export function collectReferencedHashes(ydoc: ProjectState): Set<string> {
     const referenced = new Set<string>();
     ydoc.documents().forEach((node) => {
@@ -22,7 +22,8 @@ export function collectReferencedHashes(ydoc: ProjectState): Set<string> {
         try {
             const cards = JSON.parse(raw) as BoardCardData[];
             for (const card of cards) {
-                if (card.type === "image" && card.assetId) referenced.add(card.assetId);
+                if ((card.type === "image" || card.type === "audio") && card.assetId)
+                    referenced.add(card.assetId);
             }
         } catch {
             // A malformed cards blob shouldn't make us delete live assets — skip.
diff --git a/src/lib/assets/asset-store.ts b/src/lib/assets/asset-store.ts
index d2b8508a..3be5829b 100644
--- a/src/lib/assets/asset-store.ts
+++ b/src/lib/assets/asset-store.ts
@@ -76,6 +76,50 @@ export async function importImageFile(projectId: string, file: File): Promise<As
     return { hash, mime, width, height };
 }
 
+/** The base mime type without any `;codecs=...` parameters. */
+function baseMime(mime: string): string {
+    return mime.split(";")[0].trim();
+}
+
+/**
+ * Store an audio file (a recording or a dropped file) for a project and return
+ * its metadata. Like {@link importImageFile} but audio has no intrinsic pixel
+ * size, so `width`/`height` are stored as `0`. Idempotent (dedup by SHA-256).
+ *
+ * `mime` may be passed explicitly because recorded blobs sometimes carry a
+ * `;codecs=...` suffix; it is normalized to the base type before storing.
+ */
+export async function importAudioFile(
+    projectId: string,
+    file: Blob,
+    mime?: string,
+): Promise<AssetMeta> {
+    const buffer = await file.arrayBuffer();
+    const hash = await sha256Hex(buffer);
+    const resolvedMime = baseMime(mime || file.type || "audio/mp4");
+
+    const provider = await getStorageProvider();
+
+    const existing = await provider.getAsset(projectId, hash);
+    if (existing) {
+        return { hash, mime: existing.mime, width: existing.width, height: existing.height };
+    }
+
+    await provider.putAsset({
+        key: `${projectId}/${hash}`,
+        projectId,
+        hash,
+        mime: resolvedMime,
+        size: file.size,
+        width: 0,
+        height: 0,
+        data: buffer,
+        createdAt: Date.now(),
+    });
+
+    return { hash, mime: resolvedMime, width: 0, height: 0 };
+}
+
 /**
  * Resolve an asset to an object URL for rendering, or null if it isn't stored
  * locally. Callers own the URL and must `URL.revokeObjectURL` it when done.
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index 8c20cd45..19411c2b 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -155,12 +155,15 @@ export interface BoardCardData {
     y: number;
     width: number;
     height: number;
-    /** Card kind. `undefined`/"text" is the default note card; "image" renders a resource. */
-    type?: "text" | "image";
     /**
-     * For `type: "image"` cards: the SHA-256 hash of the source image, which is
-     * stored separately in IndexedDB (decoupled from Yjs). The bytes never live
-     * in the document — only this reference does.
+     * Card kind. `undefined`/"text" is the default note card; "image" renders a
+     * picture resource; "audio" renders a voice note with a play/pause control.
+     */
+    type?: "text" | "image" | "audio";
+    /**
+     * For `type: "image"`/`"audio"` cards: the SHA-256 hash of the source bytes,
+     * which are stored separately in IndexedDB (decoupled from Yjs). The bytes
+     * never live in the document — only this reference does.
      */
     assetId?: string;
 }
diff --git a/src/tests/assets/assets.test.ts b/src/tests/assets/assets.test.ts
index 48d84e56..71519a4e 100644
--- a/src/tests/assets/assets.test.ts
+++ b/src/tests/assets/assets.test.ts
@@ -1,7 +1,7 @@
 import { beforeAll, describe, it, expect } from "vitest";
 
 import { sha256Hex } from "@src/lib/assets/asset-hash";
-import { importImageFile, loadAssetObjectUrl } from "@src/lib/assets/asset-store";
+import { importImageFile, importAudioFile, loadAssetObjectUrl } from "@src/lib/assets/asset-store";
 import { collectReferencedHashes, gcProjectAssets } from "@src/lib/assets/asset-gc";
 import {
     getStorageProvider,
@@ -230,6 +230,49 @@ describe("scriptio asset bundling", () => {
         ydoc.destroy();
     });
 
+    it("bundles board audio assets into the archive and restores them", async () => {
+        const provider = await getStorageProvider();
+        const src = pid();
+
+        // A board referencing a recorded/dropped audio clip (synthetic bytes).
+        const blobIn = new Blob([new Uint8Array([1, 2, 3, 4, 5])], { type: "audio/mp4" });
+        const { hash } = await importAudioFile(src, blobIn);
+
+        const ydoc = new ProjectState();
+        const repo = createProjectRepository(ydoc)!;
+        const board = repo.createBoardDocument("B");
+        ydoc.boardData(board).set(
+            "cards",
+            JSON.stringify([{ id: "c1", type: "audio", assetId: hash, ...cardBase }]),
+        );
+
+        const adapter = new ScriptioAdapter();
+        const blob = await adapter.convertTo(ydoc, {
+            title: "t",
+            author: "a",
+            includeNotes: false,
+            projectId: src,
+        });
+        const buffer = await blob.arrayBuffer();
+
+        const parsed = adapter.convertFrom(buffer);
+        expect(parsed.boards?.[board]?.cards).toContain(hash);
+
+        // Audio cards keep their assets referenced (GC must not drop them).
+        expect(collectReferencedHashes(ydoc).has(hash)).toBe(true);
+
+        const dest = pid();
+        await restoreScriptioAssets(dest, buffer);
+
+        const restored = await provider.getAsset(dest, hash);
+        expect(restored?.mime).toBe("audio/mp4");
+        expect(await sha256Hex(restored!.data)).toBe(hash);
+
+        await provider.deleteProjectAssets(src);
+        await provider.deleteProjectAssets(dest);
+        ydoc.destroy();
+    });
+
     it("exports a document with no assets and restore is a no-op", async () => {
         const ydoc = new ProjectState();
         const repo = createProjectRepository(ydoc)!;
diff --git a/styles/themes.css b/styles/themes.css
index ff2484af..ce4c0626 100644
--- a/styles/themes.css
+++ b/styles/themes.css
@@ -44,6 +44,7 @@ html.light {
     --editor-style-bg-active: #f1f5f9;
     --editor-element-hover: #f8fafc;
     --editor-shadow: rgba(0, 0, 0, 0.15);
+    --board-card-body-text: var(--primary-text);
 
     --editor-scroll-bg: var(--secondary);
     --editor-scroll-btn: var(--tertiary);
@@ -91,6 +92,7 @@ html.dark {
     --editor-style-bg-active: #5d5d5d;
     --editor-element-hover: #eeeeee;
     --editor-shadow: rgba(0, 0, 0, 0.4);
+    --board-card-body-text: var(--primary);
 
     --editor-scroll-bg: var(--secondary);
     --editor-scroll-btn: var(--tertiary);
@@ -142,6 +144,7 @@ html.latte {
     --editor-style-bg-active: var(--primary-hover);
     --editor-element-hover: #f8fafc;
     --editor-shadow: #c7b28563;
+    --board-card-body-text: var(--primary-text);
 
     --editor-scroll-bg: var(--secondary);
     --editor-scroll-btn: var(--tertiary);
@@ -189,6 +192,7 @@ html.wonka {
     --editor-style-bg-active: var(--primary-hover);
     --editor-element-hover: #f8fafc;
     --editor-shadow: rgba(0, 0, 0, 0.4);
+    --board-card-body-text: var(--primary);
 
     --editor-scroll-bg: var(--secondary);
     --editor-scroll-btn: var(--tertiary);
@@ -236,6 +240,7 @@ html.mint {
     --editor-style-bg-active: var(--primary-hover);
     --editor-element-hover: #f8fafc;
     --editor-shadow: #9bc29e81;
+    --board-card-body-text: var(--primary-text);
 
     --editor-scroll-bg: var(--secondary);
     --editor-scroll-btn: var(--tertiary);
@@ -283,6 +288,7 @@ html.blossom {
     --editor-style-bg-active: var(--primary-hover);
     --editor-element-hover: #f8fafc;
     --editor-shadow: #ffbaffa6;
+    --board-card-body-text: var(--primary-text);
 
     --editor-scroll-bg: var(--secondary);
     --editor-scroll-btn: var(--tertiary);
@@ -330,6 +336,7 @@ html.midnight {
     --editor-style-bg-active: #263554;
     --editor-element-hover: #c8d8f0;
     --editor-shadow: rgba(0, 0, 30, 0.6);
+    --board-card-body-text: var(--primary);
 
     --editor-scroll-bg: var(--secondary);
     --editor-scroll-btn: var(--tertiary);

From e6113128d176470c07732755754d4ba31d44596d Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Fri, 12 Jun 2026 01:16:02 +0200
Subject: [PATCH 68/76] removed hints of board canvas

---
 components/board/BoardCanvas.module.css | 16 -------
 components/board/BoardCanvas.tsx        | 57 ++++++++++++++++++-------
 messages/de.json                        |  7 +--
 messages/en.json                        |  7 +--
 messages/es.json                        |  7 +--
 messages/fr.json                        |  7 +--
 messages/ja.json                        |  7 +--
 messages/ko.json                        |  7 +--
 messages/pl.json                        |  7 +--
 messages/zh.json                        |  7 +--
 10 files changed, 49 insertions(+), 80 deletions(-)

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index 24174924..193b1112 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -549,22 +549,6 @@
     color: var(--secondary-text);
 }
 
-/* Hints in corner with low opacity */
-.hints {
-    position: absolute;
-    bottom: 24px;
-    left: 24px;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 4px;
-    font-size: 12px;
-    color: var(--secondary-text);
-    opacity: 0.5;
-    pointer-events: none;
-    user-select: none;
-}
-
 /* Arrows SVG layer */
 .arrows_svg {
     position: absolute;
diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index cd187e44..267a5041 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -302,7 +302,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             if (e.button !== 0) return;
             if ((e.target as HTMLElement).closest(`.${styles.card}`)) return;
             if ((e.target as HTMLElement).closest(`.${styles.zoom_controls}`)) return;
-            if ((e.target as HTMLElement).closest(`.${styles.hints}`)) return;
             if ((e.target as HTMLElement).closest(`.${styles.context_menu}`)) return;
 
             const container = containerRef.current;
@@ -448,9 +447,11 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         };
     }, [selectionRect !== null]); // eslint-disable-line react-hooks/exhaustive-deps
 
-    // Zoom with mouse wheel - centered on cursor
+    // Zoom with mouse wheel - centered on cursor.
+    // Attached as a native non-passive listener (see effect below) because React
+    // registers onWheel as passive, which makes preventDefault() a no-op and warns.
     const handleWheel = useCallback(
-        (e: React.WheelEvent) => {
+        (e: WheelEvent) => {
             e.preventDefault();
 
             const container = containerRef.current;
@@ -477,6 +478,13 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         [scale, offset],
     );
 
+    useEffect(() => {
+        const container = containerRef.current;
+        if (!container) return;
+        container.addEventListener("wheel", handleWheel, { passive: false });
+        return () => container.removeEventListener("wheel", handleWheel);
+    }, [handleWheel]);
+
     // Zoom from buttons - centered on viewport
     const zoomFromCenter = useCallback(
         (zoomIn: boolean) => {
@@ -508,7 +516,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             e.preventDefault();
             if ((e.target as HTMLElement).closest(`.${styles.card}`)) return;
             if ((e.target as HTMLElement).closest(`.${styles.zoom_controls}`)) return;
-            if ((e.target as HTMLElement).closest(`.${styles.hints}`)) return;
 
             // Clear selection when creating a new card
             setSelectedCardIds(new Set());
@@ -621,8 +628,8 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         [isReadOnly, projectId, offset, scale, saveCards],
     );
 
-    // Right-clicking empty canvas opens a menu (record audio). Cards and arrows
-    // have their own menus, so bail when the click landed on one.
+    // Right-clicking empty canvas opens a menu (create card / record audio).
+    // Cards and arrows have their own menus, so bail when the click landed on one.
     const handleCanvasContextMenu = useCallback(
         (e: React.MouseEvent) => {
             if (isReadOnly) return;
@@ -631,8 +638,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                 target.closest(`.${styles.card}`) ||
                 target.closest(`.${styles.arrow_group}`) ||
                 target.closest(`.${styles.context_menu}`) ||
-                target.closest(`.${styles.zoom_controls}`) ||
-                target.closest(`.${styles.hints}`)
+                target.closest(`.${styles.zoom_controls}`)
             )
                 return;
 
@@ -652,6 +658,29 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         [isReadOnly, offset, scale],
     );
 
+    // Create a text card at the spot the canvas menu was opened.
+    const handleCreateCard = useCallback(() => {
+        if (!canvasContextMenu) return;
+        const { canvasX: x, canvasY: y } = canvasContextMenu;
+        setCanvasContextMenu(null);
+        setSelectedCardIds(new Set());
+
+        const newCard: BoardCardData = {
+            id: uuidv7(),
+            title: "",
+            description: "",
+            color: randomCardColor(),
+            x: isSnapping ? Math.round(x / GRID_SIZE) * GRID_SIZE : x,
+            y: isSnapping ? Math.round(y / GRID_SIZE) * GRID_SIZE : y,
+            width: 450,
+            height: 280,
+        };
+
+        const newCards = [...cardsRef.current, newCard];
+        setCards(newCards);
+        saveCards(newCards);
+    }, [canvasContextMenu, isSnapping, saveCards]);
+
     // Begin recording from the canvas menu; remember where to drop the card.
     const handleStartRecording = useCallback(async () => {
         if (!canvasContextMenu) return;
@@ -982,7 +1011,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                 onMouseDown={handleContainerMouseDown}
                 onDoubleClick={handleDoubleClick}
                 onContextMenu={handleCanvasContextMenu}
-                onWheel={handleWheel}
                 onDragOver={handleDragOver}
                 onDragLeave={handleDragLeave}
                 onDrop={handleDrop}
@@ -1220,6 +1248,10 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                             left: canvasContextMenu.position.x,
                         }}
                     >
+                        <div className={styles.context_menu_item} onClick={handleCreateCard}>
+                            <Plus size={16} />
+                            <p className="unselectable">{t("createCard")}</p>
+                        </div>
                         <div
                             className={`${styles.context_menu_item} ${recorder.isSupported ? "" : styles.context_menu_item_disabled}`}
                             title={recorder.isSupported ? undefined : t("audioUnsupported")}
@@ -1273,13 +1305,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                         <Plus size={14} />
                     </button>
                 </div>
-
-                <div className={styles.hints}>
-                    <span>{t("hints.pan")}</span>
-                    <span>{t("hints.select")}</span>
-                    <span>{t("hints.create")}</span>
-                    <span>{t("hints.move")}</span>
-                </div>
             </div>
         </div>
     );
diff --git a/messages/de.json b/messages/de.json
index 6d5cdadf..f391fadb 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -474,12 +474,7 @@
     "sendToOutline": "An Gliederung senden",
     "duplicate": "Duplizieren",
     "delete": "Löschen",
-    "hints": {
-      "pan": "Mittelklick zum Schwenken",
-      "select": "Ziehen, um Karten auszuwählen",
-      "create": "Doppelklick zum Erstellen einer Karte",
-      "move": "Umschalt zum freien Bewegen halten"
-    },
+    "createCard": "Karte erstellen",
     "untitled": "Unbenannt",
     "titlePlaceholder": "Titel",
     "descriptionPlaceholder": "Beschreibung",
diff --git a/messages/en.json b/messages/en.json
index b1074dae..81e35559 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -473,12 +473,7 @@
     "sendToOutline": "Send to outline",
     "duplicate": "Duplicate",
     "delete": "Delete",
-    "hints": {
-      "pan": "Middle-click to pan",
-      "select": "Drag to select cards",
-      "create": "Double-click to create card",
-      "move": "Hold Shift to move freely"
-    },
+    "createCard": "Create card",
     "untitled": "Untitled",
     "titlePlaceholder": "Title",
     "descriptionPlaceholder": "Description",
diff --git a/messages/es.json b/messages/es.json
index dc9f87e7..7b8224d1 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -473,12 +473,7 @@
     "sendToOutline": "Enviar al esquema",
     "duplicate": "Duplicar",
     "delete": "Eliminar",
-    "hints": {
-      "pan": "Clic central para desplazar",
-      "select": "Arrastrar para seleccionar tarjetas",
-      "create": "Doble clic para crear tarjeta",
-      "move": "Mantener Shift para mover libremente"
-    },
+    "createCard": "Crear tarjeta",
     "untitled": "Sin título",
     "titlePlaceholder": "Título",
     "descriptionPlaceholder": "Descripción",
diff --git a/messages/fr.json b/messages/fr.json
index 7944f2e5..fd00873d 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -474,12 +474,7 @@
     "sendToOutline": "Envoyer vers le séquencier",
     "duplicate": "Dupliquer",
     "delete": "Supprimer",
-    "hints": {
-      "pan": "Clic-milieu pour déplacer",
-      "select": "Glissez pour sélectionner des cartes",
-      "create": "Double-cliquez pour créer une carte",
-      "move": "Maintenez Maj pour vous déplacer librement"
-    },
+    "createCard": "Créer une carte",
     "untitled": "Sans titre",
     "titlePlaceholder": "Titre",
     "descriptionPlaceholder": "Description",
diff --git a/messages/ja.json b/messages/ja.json
index dfd4307f..0816f9da 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -473,12 +473,7 @@
     "sendToOutline": "アウトラインに送る",
     "duplicate": "複製",
     "delete": "削除",
-    "hints": {
-      "pan": "ホイールクリックでドラッグ",
-      "select": "ドラッグでカードを選択",
-      "create": "ダブルクリックでカードを作成",
-      "move": "Shiftキーで自由移動"
-    },
+    "createCard": "カードを作成",
     "untitled": "無題",
     "titlePlaceholder": "タイトル",
     "descriptionPlaceholder": "説明",
diff --git a/messages/ko.json b/messages/ko.json
index 66a42000..921950df 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -473,12 +473,7 @@
     "sendToOutline": "아웃라인으로 보내기",
     "duplicate": "복제",
     "delete": "삭제",
-    "hints": {
-      "pan": "휠 클릭으로 드래그",
-      "select": "드래그하여 카드 선택",
-      "create": "더블 클릭하여 카드 생성",
-      "move": "Shift를 누르고 자유 이동"
-    },
+    "createCard": "카드 생성",
     "untitled": "제목 없음",
     "titlePlaceholder": "제목",
     "descriptionPlaceholder": "설명",
diff --git a/messages/pl.json b/messages/pl.json
index fa8714cb..aeb20236 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -473,12 +473,7 @@
     "sendToOutline": "Wyślij do konspektu",
     "duplicate": "Powiel",
     "delete": "Usuń",
-    "hints": {
-      "pan": "Środkowy przycisk, aby przesuwać",
-      "select": "Przeciągnij, aby zaznaczyć karty",
-      "create": "Kliknij dwukrotnie, aby utworzyć kartę",
-      "move": "Przytrzymaj Shift, aby swobodnie przesuwać"
-    },
+    "createCard": "Utwórz kartę",
     "untitled": "Bez tytułu",
     "titlePlaceholder": "Tytuł",
     "descriptionPlaceholder": "Opis",
diff --git a/messages/zh.json b/messages/zh.json
index c2f1eeb9..ea691772 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -473,12 +473,7 @@
     "sendToOutline": "发送到大纲",
     "duplicate": "复制",
     "delete": "删除",
-    "hints": {
-      "pan": "中键平移",
-      "select": "拖动选择卡片",
-      "create": "双击创建卡片",
-      "move": "Shift 自由移动"
-    },
+    "createCard": "创建卡片",
     "untitled": "未命名",
     "titlePlaceholder": "标题",
     "descriptionPlaceholder": "描述",

From 440681a99942061932daea8740c800953ecf797f Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Sat, 13 Jun 2026 03:38:08 +0200
Subject: [PATCH 69/76] fixing ci, pagination perf...

---
 .github/actions/apply-version/action.yml      |   11 +-
 .github/workflows/deploy-staging.yaml         |   12 +
 components/debug/ApplyTimingPanel.tsx         |  244 ++
 src/app/projects/layout.tsx                   |    2 +
 src/lib/screenplay/extensions/apply-timing.ts |   96 +
 .../character-highlight-extension.ts          |    5 +-
 .../extensions/comment-highlight-extension.ts |    5 +-
 .../screenplay/extensions/contd-extension.ts  |    5 +-
 .../extensions/pagination-extension.ts        | 3858 +++++++++--------
 .../extensions/placeholder-extension.ts       |    5 +-
 .../extensions/scene-bookmark-extension.ts    |    5 +-
 .../extensions/scene-locking-extension.ts     |    5 +-
 .../extensions/search-highlight-extension.ts  |    5 +-
 src/tests/repro/enter-dom-churn.test.ts       |  200 +
 styles/scriptio.css                           |   18 +-
 15 files changed, 2617 insertions(+), 1859 deletions(-)
 create mode 100644 components/debug/ApplyTimingPanel.tsx
 create mode 100644 src/lib/screenplay/extensions/apply-timing.ts
 create mode 100644 src/tests/repro/enter-dom-churn.test.ts

diff --git a/.github/actions/apply-version/action.yml b/.github/actions/apply-version/action.yml
index 5a08be3f..dfad6eda 100644
--- a/.github/actions/apply-version/action.yml
+++ b/.github/actions/apply-version/action.yml
@@ -24,19 +24,26 @@ runs:
               SEMVER=$(echo "$INPUT_VERSION" | cut -d. -f1-3)
               MAJOR=$(echo "$INPUT_VERSION" | cut -d. -f1)
               MINOR=$(echo "$INPUT_VERSION" | cut -d. -f2)
+              PATCH=$(echo "$INPUT_VERSION" | cut -d. -f3)
+              REVISION=$(echo "$INPUT_VERSION" | cut -d. -f4)
 
               if [[ "$INPUT_STAGING" == "true" ]]; then
                   PRODUCT_NAME="Scriptio (Staging)"
                   WINDOW_TITLE="Scriptio (Staging)"
                   APPSTORE_IDENTIFIER="app.scriptio.staging"
                   WINDOWS_IDENTIFIER="ArkoLogic.ScriptioStaging"
-                  MSIX_VERSION="${MAJOR}.${MINOR}.${GITHUB_RUN_NUMBER:-1}.0"
+                  # MS Store reserves the 4th version field (must stay 0). Staging's
+                  # build counter (REVISION) sits in that slot, so fold PATCH+REVISION
+                  # into the 3rd field to keep MSIX versions strictly increasing
+                  # across staging pushes and release bumps.
+                  MSIX_VERSION="${MAJOR}.${MINOR}.$(( PATCH * 10000 + REVISION )).0"
               else
                   PRODUCT_NAME="Scriptio"
                   WINDOW_TITLE="Scriptio"
                   APPSTORE_IDENTIFIER="app.scriptio"
                   WINDOWS_IDENTIFIER="ArkoLogic.Scriptio"
-                  MSIX_VERSION="$INPUT_VERSION"
+                  # Release builds carry REVISION=0, so the app version is Store-legal as-is.
+                  MSIX_VERSION="${MAJOR}.${MINOR}.${PATCH}.0"
               fi
 
               jq --arg v "$SEMVER" --arg t "$WINDOW_TITLE" --arg n "$PRODUCT_NAME" \
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index ff75f74a..c9a0c01c 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -123,6 +123,18 @@ jobs:
               run: |
                   Get-Item "src-tauri/target/msix/*.msixbundle" | Rename-Item -NewName "Scriptio_${{ needs.prepare.outputs.version }}.msixbundle"
 
+            - name: Verify MSIX package version
+              run: |
+                  $zip = "$env:APP_PATH"
+                  Copy-Item $zip bundle.zip
+                  Expand-Archive bundle.zip out -Force
+                  $line = Select-String -Path out/AppxMetadata/AppxBundleManifest.xml -Pattern 'Version="([\d.]+)"' | Select-Object -First 1
+                  $version = $line.Matches[0].Groups[1].Value
+                  Write-Host "Built MSIX Identity Version: $version"
+                  if ($version -notmatch '\.0$') {
+                      throw "MSIX revision field must be 0 (got '$version'); the MS Store reserves the 4th component."
+                  }
+
             - name: Configure Microsoft Store CLI
               uses: microsoft/microsoft-store-apppublisher@v1.1
 
diff --git a/components/debug/ApplyTimingPanel.tsx b/components/debug/ApplyTimingPanel.tsx
new file mode 100644
index 00000000..a565b688
--- /dev/null
+++ b/components/debug/ApplyTimingPanel.tsx
@@ -0,0 +1,244 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+
+import {
+    ApplyStat,
+    getApplyTimingRevision,
+    getApplyTimingStats,
+    recordTiming,
+    resetApplyTimingStats,
+} from "@src/lib/screenplay/extensions/apply-timing";
+
+/**
+ * On-screen overlay that surfaces the per-extension `apply` timing stats
+ * collected in apply-timing.ts, so the editor's hot-path cost can be watched
+ * without opening devtools (whose console logging itself adds lag).
+ *
+ * Toggle with Ctrl+Alt+P. Hidden by default; visibility is persisted in
+ * localStorage. The whole component is compiled out of production builds.
+ */
+
+const ENABLED = process.env.NODE_ENV !== "production";
+const STORAGE_KEY = "scriptio.applyTimingPanel.visible";
+const POLL_INTERVAL_MS = 400;
+
+// Name of the synthetic row holding the whole-keydown duration. Pinned at the
+// top of the panel, separate from the per-extension apply rows.
+const KEYDOWN_ROW = "keydown (total)";
+
+// Modifier/navigation keys that don't edit — skipped so they don't dilute the
+// keydown stats with ~0ms samples.
+const IGNORED_KEYS = new Set(["Shift", "Control", "Alt", "Meta", "CapsLock", "Dead"]);
+
+interface Row extends ApplyStat {
+    name: string;
+    avg: number;
+}
+
+const fmt = (ms: number): string => (ms === Infinity ? "—" : ms.toFixed(2));
+
+// Colour the slow rows so regressions jump out: green < 1ms, amber < 4ms, red beyond.
+const heatColor = (ms: number): string => {
+    if (ms >= 4) return "#ff6b6b";
+    if (ms >= 1) return "#ffd166";
+    return "#8ce99a";
+};
+
+const ApplyTimingPanel = () => {
+    const [visible, setVisible] = useState(false);
+    const [rows, setRows] = useState<Row[]>([]);
+    const lastRevision = useRef(-1);
+
+    // Restore persisted visibility once mounted (client only).
+    useEffect(() => {
+        if (!ENABLED) return;
+        setVisible(localStorage.getItem(STORAGE_KEY) === "1");
+    }, []);
+
+    // Measure the WHOLE keydown step — handlers + ProseMirror dispatch + view
+    // update + the forced reflow it triggers inline — which the per-extension
+    // `apply` times don't cover. A capture-phase listener runs first and stamps
+    // t0; a queueMicrotask fires once the entire synchronous keydown task has
+    // unwound (the inline forced reflow happens during it, so it's included),
+    // before paint. Installed on mount so samples accrue even before the panel
+    // is opened. Robust against handlers that stopPropagation.
+    useEffect(() => {
+        if (!ENABLED) return;
+        const onKeyDown = (e: KeyboardEvent) => {
+            if (IGNORED_KEYS.has(e.key)) return;
+            const t0 = performance.now();
+            queueMicrotask(() => recordTiming(KEYDOWN_ROW, performance.now() - t0));
+        };
+        window.addEventListener("keydown", onKeyDown, { capture: true });
+        return () => window.removeEventListener("keydown", onKeyDown, { capture: true });
+    }, []);
+
+    // Ctrl+Alt+P toggles the panel.
+    useEffect(() => {
+        if (!ENABLED) return;
+        const onKey = (e: KeyboardEvent) => {
+            if (e.ctrlKey && e.altKey && (e.key === "p" || e.key === "P")) {
+                e.preventDefault();
+                setVisible((v) => {
+                    const next = !v;
+                    localStorage.setItem(STORAGE_KEY, next ? "1" : "0");
+                    return next;
+                });
+            }
+        };
+        window.addEventListener("keydown", onKey);
+        return () => window.removeEventListener("keydown", onKey);
+    }, []);
+
+    // Poll the stats map on an interval rather than re-rendering on every
+    // keystroke — decoupling the panel's render cost from the edit hot path,
+    // which is the whole point of not using the console.
+    useEffect(() => {
+        if (!ENABLED || !visible) return;
+
+        const tick = () => {
+            const revision = getApplyTimingRevision();
+            if (revision === lastRevision.current) return;
+            lastRevision.current = revision;
+
+            const next: Row[] = [];
+            for (const [name, stat] of getApplyTimingStats()) {
+                next.push({
+                    name,
+                    ...stat,
+                    avg: stat.count > 0 ? stat.sum / stat.count : 0,
+                });
+            }
+            next.sort((a, b) => b.avg - a.avg);
+            setRows(next);
+        };
+
+        tick();
+        const id = window.setInterval(tick, POLL_INTERVAL_MS);
+        return () => window.clearInterval(id);
+    }, [visible]);
+
+    if (!ENABLED || !visible) return null;
+
+    const reset = () => {
+        resetApplyTimingStats();
+        lastRevision.current = -1;
+        setRows([]);
+    };
+
+    // Pin the whole-keydown row above the per-extension apply rows.
+    const keydownRow = rows.find((r) => r.name === KEYDOWN_ROW);
+    const applyRows = rows.filter((r) => r.name !== KEYDOWN_ROW);
+
+    const renderRow = (r: Row, opts?: { bold?: boolean }) => (
+        <tr key={r.name} style={opts?.bold ? { fontWeight: 600 } : undefined}>
+            <td style={tdLeft}>{r.name}</td>
+            <td style={{ ...tdRight, color: heatColor(r.last) }}>{fmt(r.last)}</td>
+            <td style={tdRight}>{fmt(r.min)}</td>
+            <td style={{ ...tdRight, color: heatColor(r.avg) }}>{fmt(r.avg)}</td>
+            <td style={{ ...tdRight, color: heatColor(r.max) }}>{fmt(r.max)}</td>
+            <td style={tdRight}>{r.count}</td>
+        </tr>
+    );
+
+    return (
+        <div style={panelStyle}>
+            <div style={headerStyle}>
+                <span style={{ fontWeight: 600 }}>apply timing (ms)</span>
+                <div style={{ display: "flex", gap: 6 }}>
+                    <button style={btnStyle} onClick={reset} title="Clear stats">
+                        reset
+                    </button>
+                    <button
+                        style={btnStyle}
+                        onClick={() => {
+                            localStorage.setItem(STORAGE_KEY, "0");
+                            setVisible(false);
+                        }}
+                        title="Hide (Ctrl+Alt+P)"
+                    >
+                        ✕
+                    </button>
+                </div>
+            </div>
+            <table style={tableStyle}>
+                <thead>
+                    <tr style={{ color: "#9aa0a6" }}>
+                        <th style={thLeft}>extension</th>
+                        <th style={thRight}>last</th>
+                        <th style={thRight}>min</th>
+                        <th style={thRight}>avg</th>
+                        <th style={thRight}>max</th>
+                        <th style={thRight}>n</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {rows.length === 0 ? (
+                        <tr>
+                            <td colSpan={6} style={{ ...tdRight, textAlign: "center", color: "#9aa0a6" }}>
+                                type to collect samples…
+                            </td>
+                        </tr>
+                    ) : (
+                        <>
+                            {keydownRow && renderRow(keydownRow, { bold: true })}
+                            {keydownRow && applyRows.length > 0 && (
+                                <tr>
+                                    <td colSpan={6} style={{ borderTop: "1px solid rgba(255,255,255,0.12)", height: 4 }} />
+                                </tr>
+                            )}
+                            {applyRows.map((r) => renderRow(r))}
+                        </>
+                    )}
+                </tbody>
+            </table>
+        </div>
+    );
+};
+
+const panelStyle: React.CSSProperties = {
+    position: "fixed",
+    bottom: 12,
+    right: 12,
+    zIndex: 99999,
+    width: 340,
+    padding: "8px 10px",
+    background: "rgba(20, 22, 26, 0.92)",
+    color: "#e8eaed",
+    font: "11px/1.4 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace",
+    borderRadius: 8,
+    boxShadow: "0 4px 16px rgba(0,0,0,0.4)",
+    backdropFilter: "blur(4px)",
+    userSelect: "none",
+    pointerEvents: "auto",
+};
+
+const headerStyle: React.CSSProperties = {
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "space-between",
+    marginBottom: 6,
+};
+
+const btnStyle: React.CSSProperties = {
+    background: "rgba(255,255,255,0.08)",
+    color: "#e8eaed",
+    border: "none",
+    borderRadius: 4,
+    padding: "2px 6px",
+    cursor: "pointer",
+    font: "inherit",
+};
+
+const tableStyle: React.CSSProperties = {
+    width: "100%",
+    borderCollapse: "collapse",
+};
+
+const thLeft: React.CSSProperties = { textAlign: "left", fontWeight: 400, paddingBottom: 2 };
+const thRight: React.CSSProperties = { textAlign: "right", fontWeight: 400, paddingBottom: 2 };
+const tdLeft: React.CSSProperties = { textAlign: "left", paddingTop: 1 };
+const tdRight: React.CSSProperties = { textAlign: "right", paddingTop: 1, fontVariantNumeric: "tabular-nums" };
+
+export default ApplyTimingPanel;
diff --git a/src/app/projects/layout.tsx b/src/app/projects/layout.tsx
index bd139936..f2813698 100644
--- a/src/app/projects/layout.tsx
+++ b/src/app/projects/layout.tsx
@@ -12,6 +12,7 @@ import { useLocale } from "@src/context/LocaleContext";
 import { useTheme } from "next-themes";
 import { ReactNode, Suspense, useEffect } from "react";
 import ProjectNavbar from "@components/navbar/ProjectNavbar";
+import ApplyTimingPanel from "@components/debug/ApplyTimingPanel";
 import { isTauri } from "@tauri-apps/api/core";
 
 /**
@@ -83,6 +84,7 @@ const ProjectLayoutInner = ({ children }: ProjectLayoutInnerProps) => {
                 {children}
             </div>
             <DashboardModal />
+            <ApplyTimingPanel />
         </ViewProvider>
     );
 };
diff --git a/src/lib/screenplay/extensions/apply-timing.ts b/src/lib/screenplay/extensions/apply-timing.ts
new file mode 100644
index 00000000..69fb7259
--- /dev/null
+++ b/src/lib/screenplay/extensions/apply-timing.ts
@@ -0,0 +1,96 @@
+import { EditorState, Transaction } from "@tiptap/pm/state";
+
+/**
+ * Performance instrumentation for ProseMirror plugin `apply` functions.
+ *
+ * The `apply` of every screenplay extension runs synchronously on each
+ * transaction. Keeping them fast is what makes writing feel smooth, so this
+ * helper wraps an `apply`, times it, and accumulates per-extension stats
+ * (count / min / max / average / last) that the on-screen debug panel reads.
+ *
+ * Only *document-changing* transactions are measured. Selection-only
+ * transactions (cursor movement, focus, hover) don't mutate the doc — every
+ * extension early-returns its cached decorations in ~0ms — so measuring them
+ * just floods the stats with meaningless near-zero samples. Restricting to
+ * `tr.docChanged` keeps the numbers about actual edits, which is what matters
+ * for typing smoothness.
+ */
+const APPLY_TIMING_ENABLED = process.env.NODE_ENV !== "production";
+
+export interface ApplyStat {
+    /** Number of measured (doc-changing) calls. */
+    count: number;
+    /** Fastest call, in milliseconds. */
+    min: number;
+    /** Slowest call, in milliseconds. */
+    max: number;
+    /** Sum of all durations — divide by `count` for the average. */
+    sum: number;
+    /** Most recent call's duration, in milliseconds. */
+    last: number;
+}
+
+/** Per-extension stats, keyed by the name passed to `timeApply`. */
+const stats = new Map<string, ApplyStat>();
+
+/** A monotonically increasing token so subscribers can cheaply detect changes. */
+let revision = 0;
+
+/** Live (mutated in place) stats map. Treat as read-only from the outside. */
+export const getApplyTimingStats = (): ReadonlyMap<string, ApplyStat> => stats;
+
+/** Current revision — bumps on every recorded sample and on reset. */
+export const getApplyTimingRevision = (): number => revision;
+
+/** Clear all accumulated stats (wired to the panel's Reset button). */
+export const resetApplyTimingStats = (): void => {
+    stats.clear();
+    revision++;
+};
+
+const record = (name: string, duration: number): void => {
+    let stat = stats.get(name);
+    if (!stat) {
+        stat = { count: 0, min: Infinity, max: 0, sum: 0, last: 0 };
+        stats.set(name, stat);
+    }
+    stat.count++;
+    stat.sum += duration;
+    stat.last = duration;
+    if (duration < stat.min) stat.min = duration;
+    if (duration > stat.max) stat.max = duration;
+    revision++;
+};
+
+/**
+ * Record a timing sample for something that isn't a plugin `apply` — e.g. the
+ * whole-keydown duration measured by the debug panel. Feeds the same stats map
+ * so it shows up as just another row, with min/max/avg/last and live updates.
+ */
+export const recordTiming = (name: string, durationMs: number): void => {
+    if (!APPLY_TIMING_ENABLED) return;
+    record(name, durationMs);
+};
+
+/** ProseMirror `StateField.apply` signature, generic over the field value. */
+type ApplyFn<T> = (tr: Transaction, value: T, oldState: EditorState, newState: EditorState) => T;
+
+/**
+ * Wrap a plugin-state `apply` so doc-changing calls are timed and recorded.
+ *
+ * Usage — replace `apply(tr, value, oldState, newState) { ... }` with
+ * `apply: timeApply("extension-name", (tr, value, oldState, newState) => { ... })`.
+ */
+export const timeApply = <T>(name: string, fn: ApplyFn<T>): ApplyFn<T> => {
+    if (!APPLY_TIMING_ENABLED) return fn;
+
+    return (tr, value, oldState, newState) => {
+        // Skip selection-only transactions — see the file header for why.
+        if (!tr.docChanged) return fn(tr, value, oldState, newState);
+
+        const start = performance.now();
+        const result = fn(tr, value, oldState, newState);
+        record(name, performance.now() - start);
+        return result;
+    };
+};
diff --git a/src/lib/screenplay/extensions/character-highlight-extension.ts b/src/lib/screenplay/extensions/character-highlight-extension.ts
index 1f93fd9e..87c72c94 100644
--- a/src/lib/screenplay/extensions/character-highlight-extension.ts
+++ b/src/lib/screenplay/extensions/character-highlight-extension.ts
@@ -3,6 +3,7 @@ import { Node } from "@tiptap/pm/model";
 import { Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import { ScreenplayElement } from "../../utils/enums";
+import { timeApply } from "./apply-timing";
 
 const characterHighlightPluginKey = new PluginKey("characterHighlight");
 
@@ -196,7 +197,7 @@ export const createCharacterHighlightExtension = (config: CharacterHighlightConf
                         init(_, { doc }) {
                             return computeHighlightDecorations(doc, getHighlightedCharacters(), getCharacterColor);
                         },
-                        apply(tr, oldDecorations, _oldState, newState) {
+                        apply: timeApply("character-highlight", (tr, oldDecorations, _oldState, newState) => {
                             // Explicit refresh (highlight toggled, color changed)
                             if (tr.getMeta("characterHighlightRefresh")) {
                                 return computeHighlightDecorations(
@@ -240,7 +241,7 @@ export const createCharacterHighlightExtension = (config: CharacterHighlightConf
                             );
 
                             return DecorationSet.create(newState.doc, [...outside, ...inside]);
-                        },
+                        }),
                     },
                     props: {
                         decorations(state) {
diff --git a/src/lib/screenplay/extensions/comment-highlight-extension.ts b/src/lib/screenplay/extensions/comment-highlight-extension.ts
index 4ef5cab0..26afea59 100644
--- a/src/lib/screenplay/extensions/comment-highlight-extension.ts
+++ b/src/lib/screenplay/extensions/comment-highlight-extension.ts
@@ -2,6 +2,7 @@ import { Editor, Mark, mergeAttributes } from "@tiptap/core";
 import { Mark as PMMark, Node } from "@tiptap/pm/model";
 import { Plugin, PluginKey } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
+import { timeApply } from "./apply-timing";
 
 declare module "@tiptap/core" {
     interface Commands<ReturnType> {
@@ -162,7 +163,7 @@ export const CommentMark = Mark.create<CommentOptions, CommentStorage>({
                     init(_, { doc }) {
                         return computeActiveCommentDecorations(doc, extensionStorage.activeCommentId);
                     },
-                    apply(tr, oldDecorations, _oldState, newState) {
+                    apply: timeApply("comment-highlight", (tr, oldDecorations, _oldState, newState) => {
                         // Only recompute when active comment changes
                         const activeCommentChanged = tr.getMeta("activeCommentChanged");
                         if (activeCommentChanged !== undefined) {
@@ -174,7 +175,7 @@ export const CommentMark = Mark.create<CommentOptions, CommentStorage>({
                             return oldDecorations.map(tr.mapping, newState.doc);
                         }
                         return oldDecorations;
-                    },
+                    }),
                 },
                 props: {
                     decorations(state) {
diff --git a/src/lib/screenplay/extensions/contd-extension.ts b/src/lib/screenplay/extensions/contd-extension.ts
index 5b5053b7..7e84d93e 100644
--- a/src/lib/screenplay/extensions/contd-extension.ts
+++ b/src/lib/screenplay/extensions/contd-extension.ts
@@ -4,6 +4,7 @@ import { Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import { ReplaceAroundStep, ReplaceStep, Step } from "@tiptap/pm/transform";
 import { STRUCTURAL_REFRESH_META, scheduleStructuralRefresh, cancelStructuralRefresh } from "./structural-refresh";
+import { timeApply } from "./apply-timing";
 
 const contdPluginKey = new PluginKey("contd");
 
@@ -102,7 +103,7 @@ export const ContdExtension = Extension.create({
                     init(_, { doc }) {
                         return computeContdDecorations(doc);
                     },
-                    apply(tr, oldDecorations, _oldState, newState) {
+                    apply: timeApply("contd", (tr, oldDecorations, _oldState, newState) => {
                         // Full recompute on deferred structural refresh
                         if (tr.getMeta(STRUCTURAL_REFRESH_META)) {
                             contdNeedsRecompute = false;
@@ -121,7 +122,7 @@ export const ContdExtension = Extension.create({
 
                         // Simple text edit within existing node — just remap positions (O(log n))
                         return oldDecorations.map(tr.mapping, newState.doc);
-                    },
+                    }),
                 },
                 view() {
                     return {
diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index caafff38..ac0bb090 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -1,1838 +1,2020 @@
-import { DOMSerializer } from "@node_modules/prosemirror-model/dist";
-import { CircularBuffer } from "@src/lib/utils/circular-buffer";
-import { ScreenplayElement } from "@src/lib/utils/enums";
-import { Editor, Extension } from "@tiptap/core";
-import { Node } from "@tiptap/pm/model";
-import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
-import { Decoration, DecorationSet } from "@tiptap/pm/view";
-import { ySyncPluginKey } from "@tiptap/y-tiptap";
-
-import {
-    buildSceneAlphabet,
-    compareTokens,
-    compileSceneLabel,
-    computeSceneLabels,
-    SceneLabel,
-    SceneToken,
-} from "@src/lib/screenplay/scene-locking";
-import { PAGE_COLLAPSE_META, PAGE_ONE_KEY, PersistentPageMap, SCENE_OMIT_META } from "@src/lib/screenplay/page-locking";
-
-// ---------------------------------------------------------------------------
-// Constants
-// ---------------------------------------------------------------------------
-
-/** Matches --line-height in scriptio.css. Used for split thresholds. */
-const LINE_HEIGHT = 16; // px
-
-/** Minimum freespace (in px) on the current page to even attempt a sentence split.
- *  Below this, it is not worth splitting — just move the whole node to the next page. */
-const MIN_SPLIT_FREESPACE = LINE_HEIGHT * 3;
-
-/** Minimum lines the bottom half of a split must have.
- *  If the remainder would be shorter, we force-fit the whole node on the next page instead. */
-const MIN_SPLIT_BOTTOM_LINES = 2;
-
-/** Sentence segmenter for straddling splits. Created once at module load. */
-const sentenceSegmenter = "Segmenter" in Intl ? new Intl.Segmenter("en", { granularity: "sentence" }) : null;
-
-// ---------------------------------------------------------------------------
-// Types
-// ---------------------------------------------------------------------------
-
-interface NodeInfo {
-    pos: number;
-    type: ScreenplayElement;
-    height: number;
-    positionTop: number;
-    /** data-id of the top-level node, used by page locking to anchor breaks. */
-    dataId?: string;
-}
-
-interface BreakLogic {
-    /** Node must not be the last on a page — pull it to the next page with its following node. */
-    keepWithNext: boolean;
-    /** Node can be split mid-text at sentence boundaries when straddling a page break. */
-    canSplit: boolean;
-    /** Minimum node height (px) before attempting a split; 0 means always try. */
-    minSplitHeight: number;
-    /** Show (MORE) and CHARACTER (CONT'D) labels around the break — true for dialogue splits. */
-    showMoreContd: boolean;
-}
-
-const BREAK_LOGIC: Partial<Record<ScreenplayElement, BreakLogic>> = {
-    // Scene headings and character cues must never be stranded at the bottom of a page.
-    [ScreenplayElement.Scene]: { keepWithNext: true, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-    [ScreenplayElement.Character]: { keepWithNext: true, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-    [ScreenplayElement.Parenthetical]: { keepWithNext: true, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-    // Action and Dialogue can straddle pages at sentence boundaries.
-    [ScreenplayElement.Action]: {
-        keepWithNext: false,
-        canSplit: true,
-        minSplitHeight: LINE_HEIGHT * 4,
-        showMoreContd: false,
-    },
-    [ScreenplayElement.Dialogue]: { keepWithNext: false, canSplit: true, minSplitHeight: 0, showMoreContd: true },
-    // Everything else just moves whole to the next page.
-    [ScreenplayElement.Transition]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-    [ScreenplayElement.Section]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-    [ScreenplayElement.Note]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-    [ScreenplayElement.None]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-    // Dual dialogue is an indivisible block — always moves whole to the next page.
-    [ScreenplayElement.DualDialogue]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
-};
-
-export interface PageSize {
-    pageHeight: number;
-    pageWidth: number;
-}
-
-export const PAGE_SIZES: Record<string, PageSize> = {
-    LETTER: { pageHeight: 1060, pageWidth: 818 },
-    A4: { pageHeight: 1123, pageWidth: 794 },
-};
-
-export type PageNumber = number;
-
-export interface HeaderOptions {
-    headerLeft: string;
-    headerRight: string;
-}
-export interface FooterOptions {
-    footerLeft: string;
-    footerRight: string;
-}
-
-export interface PaginationOptions {
-    pageHeight: number; // full physical page height in px
-    pageWidth: number; // full physical page width in px
-    pageGap: number; // visual gap between pages in px
-    pageGapBorderSize: number;
-    pageGapBorderColor: string;
-    pageBreakBackground: string;
-    marginTop: number; // page margin top in px (space reserved for header + padding)
-    marginBottom: number; // page margin bottom in px (space reserved for footer + padding)
-    marginLeft: number; // page margin left in px (used for header/footer alignment)
-    marginRight: number; // page margin right in px (used for header/footer alignment)
-    headerLeft: string;
-    headerRight: string;
-    footerLeft: string;
-    footerRight: string;
-    customHeader: Record<PageNumber, HeaderOptions>;
-    customFooter: Record<PageNumber, FooterOptions>;
-    /** Element types that force a page break before them. */
-    startNewPageTypes: Set<string>;
-    /**
-     * Production page-lock getters. When the editor is wired with page
-     * locking, these expose the live toggle and lock map. Optional so test
-     * harnesses and benchmarks can keep their lean Pagination.configure calls.
-     */
-    getPageLocking?: () => boolean;
-    getPageLocks?: () => PersistentPageMap;
-    /** Letters skipped from generated labels (shared with scene locking). */
-    getSkippedLetters?: () => readonly string[];
-    /** Tokens of locked pages that an omitted scene collapsed out of the
-     *  document. Rendered as a combined range on the preceding surviving page
-     *  (e.g. "4-5") so omitting a full page doesn't leave a gap in the
-     *  numbering. Empty/absent when no scene is omitted. */
-    getOmittedPages?: () => SceneToken[];
-}
-
-export interface PageBreakInfo {
-    pos: number; // document position of the break; may be mid-node for sentence splits
-    pagenum: number; // page number AFTER this break
-    freespace: number; // empty space remaining at the bottom of the ending page's content area
-    contdName: string; // non-empty only for dialogue splits: Character cue name for the (CONT'D) label
-    splitNodeType: ScreenplayElement | null; // non-null when the break is mid-node (sentence split); drives overlay escape
-    /** data-id of the top-level node that begins the page after this break.
-     *  Set on every non-synthetic break; used by page locking to detect orphan locks. */
-    anchorId?: string;
-    /** True for synthetic breaks that represent an entirely empty (orphan-locked) page.
-     *  The widget renders the empty content area + the next page's chrome on top of
-     *  the normal break chrome. */
-    isEmpty?: boolean;
-    /** Display label for the page beginning after this break (e.g. "4", "4A").
-     *  Equals String(pagenum) when no page-lock is in effect. */
-    label?: string;
-    /** Display label for the page ending before this break — used by the footer of
-     *  the previous page. Undefined for the first break (footer uses page-1 label). */
-    prevLabel?: string;
-    /** Character offset within the anchor node where the break occurs.
-     *  Set for sentence-split breaks (mid-node) — both the original split and
-     *  the locked re-application of it — and read by the production panel when
-     *  freezing page locks so the split can be reproduced on later recomputes. */
-    splitOffset?: number;
-}
-
-declare module "@tiptap/core" {
-    interface Commands<ReturnType> {
-        Pagination: {
-            updatePageSize: (size: Partial<PageSize>) => ReturnType;
-            updatePageHeight: (height: number) => ReturnType;
-            updatePageWidth: (width: number) => ReturnType;
-            updatePageGap: (gap: number) => ReturnType;
-            updateMargins: (margins: { top: number; bottom: number; left: number; right: number }) => ReturnType;
-            updateHeaderContent: (left: string, right: string, pageNumber?: PageNumber) => ReturnType;
-            updateFooterContent: (left: string, right: string, pageNumber?: PageNumber) => ReturnType;
-            updatePageBreakBackground: (color: string) => ReturnType;
-            updateStartNewPageTypes: (types: Set<string>) => ReturnType;
-            refreshPagination: () => ReturnType;
-        };
-    }
-}
-
-// ---------------------------------------------------------------------------
-// Default options
-// ---------------------------------------------------------------------------
-
-const defaultOptions: PaginationOptions = {
-    pageHeight: 1060,
-    pageWidth: 818,
-    pageGap: 40,
-    pageGapBorderSize: 1,
-    pageGapBorderColor: "#e5e5e5",
-    pageBreakBackground: "#ffffff",
-    marginTop: 96, // 1in
-    marginBottom: 96, // 1in
-    marginLeft: 144, // 1.5in
-    marginRight: 96, // 1in
-    headerLeft: "",
-    headerRight: "",
-    footerLeft: "",
-    footerRight: "{page}",
-    customHeader: {},
-    customFooter: {},
-    startNewPageTypes: new Set<string>(),
-};
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function syncVars(dom: HTMLElement, o: PaginationOptions) {
-    const vars: Record<string, string> = {
-        "page-height": `${o.pageHeight}px`,
-        "page-width": `${o.pageWidth}px`,
-        "page-margin-top": `${o.marginTop}px`,
-        "page-margin-bottom": `${o.marginBottom}px`,
-        "page-margin-left": `${o.marginLeft}px`,
-        "page-margin-right": `${o.marginRight}px`,
-        "page-gap": `${o.pageGap}px`,
-        "page-gap-border-size": `${o.pageGapBorderSize}px`,
-        "page-gap-border-color": o.pageGapBorderColor,
-        "page-break-background": o.pageBreakBackground,
-    };
-    Object.entries(vars).forEach(([k, v]) => dom.style.setProperty(`--${k}`, v));
-}
-
-// ---------------------------------------------------------------------------
-// Decoration builders
-// ---------------------------------------------------------------------------
-
-function renderHeader(pagenum: number, label: string, options: PaginationOptions): string {
-    const custom = options.customHeader[pagenum];
-    const left = custom?.headerLeft ?? options.headerLeft;
-    const right = (custom?.headerRight ?? options.headerRight).replace("{page}", label);
-    if (!left && !right) return "";
-    return (
-        `<span class="pagination-header-left">${left}</span>` + `<span class="pagination-header-right">${right}</span>`
-    );
-}
-
-function renderFooter(pagenum: number, label: string, options: PaginationOptions): string {
-    const custom = options.customFooter[pagenum];
-    const left = custom?.footerLeft ?? options.footerLeft;
-    const right = (custom?.footerRight ?? options.footerRight).replace("{page}", label);
-    if (!left && !right) return "";
-    return (
-        `<span class="pagination-footer-left">${left}</span>` + `<span class="pagination-footer-right">${right}</span>`
-    );
-}
-
-function createFirstPageWidget(firstPageLabel: string, options: PaginationOptions): HTMLElement {
-    const container = document.createElement("div");
-    container.className = "pagination-first-page";
-    container.contentEditable = "false";
-
-    const spacer = document.createElement("div");
-    spacer.className = "pagination-spacer";
-    spacer.style.height = `${options.marginTop}px`;
-
-    const overlay = document.createElement("div");
-    overlay.className = "pagination-overlay";
-    overlay.style.top = "0";
-    overlay.style.height = `${options.marginTop}px`;
-
-    const headerArea = document.createElement("div");
-    headerArea.className = "pagination-header-area";
-    headerArea.style.height = `${options.marginTop}px`;
-    headerArea.innerHTML = renderHeader(1, firstPageLabel, options);
-
-    overlay.appendChild(headerArea);
-    container.appendChild(spacer);
-    container.appendChild(overlay);
-    return container;
-}
-
-/**
- * Returns the CSS variable names for the left and right padding of a split node type.
- * Used to compute the negative offsets needed to make the overlay escape the parent
- * <p> element's content area and span the full page width.
- */
-function getSplitPaddingVars(nodeType: ScreenplayElement): [string, string] {
-    // Screenplay elements now use element-specific margin variables (e.g., --action-l-margin)
-    // rather than a global page margin.
-    return [`var(--${nodeType}-l-margin)`, `var(--${nodeType}-r-margin)`];
-}
-
-function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOptions): HTMLElement {
-    const container = document.createElement("div");
-    container.className = "pagination-page-break";
-    container.contentEditable = "false";
-
-    const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
-    const isEmpty = !!breakInfo.isEmpty;
-
-    // Empty (orphan-locked) pages append `contentHeight` worth of blank
-    // content to the normal break chrome — the prev→empty transition is
-    // rendered here (footer of prev, gap, header of the empty page, then
-    // the empty content area). The empty→next transition is handled by
-    // the break that follows this one in the breaks array (a lock force-
-    // break, or a subsequent orphan synthetic, or the last-page widget).
-    // Splitting it this way keeps each page transition rendered exactly
-    // once and lets the synthetic absorb the previous page's freespace.
-    const emptyPageExtension = isEmpty ? contentHeight : 0;
-
-    // Spacer: pushes text in the document flow past the entire page boundary.
-    // Includes freespace because the spacer is the only thing that moves text.
-    const spacerHeight =
-        breakInfo.freespace + options.marginBottom + options.pageGap + options.marginTop + emptyPageExtension;
-    const spacer = document.createElement("div");
-    spacer.className = "pagination-spacer";
-    spacer.style.height = `${spacerHeight}px`;
-
-    // Overlay: sits on top of the spacer (top:0, same height).
-    // Uses flex justify-content:flex-end so footer/divider/header are pushed to the bottom.
-    // The remaining space at the top is the freespace zone, covered by the overlay's background.
-    const overlay = document.createElement("div");
-    overlay.className = "pagination-overlay";
-    overlay.style.top = "0";
-    overlay.style.height = `${spacerHeight}px`;
-
-    // For mid-node splits, the widget is inserted inside a padded <p> element.
-    // The overlay's position:absolute is relative to the container, which is bounded
-    // by the <p>'s content area — so left:0/right:0 only reaches the text column edges,
-    // not the page edges. We escape the parent padding by negating it with the same CSS
-    // variables that define the node type's padding, restoring full-page coverage.
-    if (breakInfo.splitNodeType !== null) {
-        const [leftVar, rightVar] = getSplitPaddingVars(breakInfo.splitNodeType);
-        overlay.style.left = `calc(-1 * ${leftVar})`;
-        overlay.style.right = `calc(-1 * ${rightVar})`;
-    }
-
-    // Labels for the surrounding pages. Defaults preserve legacy behavior
-    // (pagenum-1 / pagenum) when no labels were assigned (page locking off).
-    const prevLabel = breakInfo.prevLabel ?? String(breakInfo.pagenum - 1);
-    const thisLabel = breakInfo.label ?? String(breakInfo.pagenum);
-
-    // Footer area of the ending page (fixed size = marginBottom)
-    const footerArea = document.createElement("div");
-    footerArea.className = "pagination-footer-area";
-    footerArea.style.height = `${options.marginBottom}px`;
-    footerArea.innerHTML = renderFooter(breakInfo.pagenum - 1, prevLabel, options);
-
-    // Visual gap between pages (fixed size = pageGap)
-    const divider = document.createElement("div");
-    divider.className = "pagination-divider";
-    divider.style.height = `${options.pageGap}px`;
-    divider.style.backgroundColor = "var(--main-bg)";
-
-    // Header area of the new page (fixed size = marginTop)
-    const headerArea = document.createElement("div");
-    headerArea.className = "pagination-header-area";
-    headerArea.style.height = `${options.marginTop}px`;
-    headerArea.innerHTML = renderHeader(breakInfo.pagenum, thisLabel, options);
-
-    overlay.appendChild(footerArea);
-    overlay.appendChild(divider);
-    overlay.appendChild(headerArea);
-
-    if (isEmpty) {
-        // Empty content area for the orphan-locked page. Renders a faint
-        // label centred in the page so the user can see which locked
-        // number is being preserved. The empty→next transition (footer of
-        // this empty page, gap, header of the next page) is rendered by
-        // the break that follows this synthetic in the breaks array.
-        const emptyArea = document.createElement("div");
-        emptyArea.className = "pagination-empty-page";
-        emptyArea.style.height = `${contentHeight}px`;
-        emptyArea.textContent = thisLabel;
-        overlay.appendChild(emptyArea);
-    }
-
-    // For dialogue/parenthetical splits: add (MORE) at the end of the current page
-    // and CHARACTER (CONT'D) at the top of the next page.
-    // Both are position:absolute inside the overlay so they don't affect flow layout.
-    if (breakInfo.contdName) {
-        // (MORE) — centred at the dialogue column, one line above the footer area.
-        // CSS: bottom: calc(100% - 1lh) positions it just after the last content line on page N.
-        // Label text comes from the --more-label CSS variable via ::after.
-        const moreEl = document.createElement("div");
-        moreEl.className = "page-more-overlay";
-        overlay.appendChild(moreEl);
-
-        // CHARACTER (CONT'D) — left-aligned at the character column, one line before the new content.
-        // CSS: top: calc(100% - 1lh) positions it just before the first content line on page N+1.
-        // textContent holds the character name; the label comes from --contd-label via ::after.
-        const contdEl = document.createElement("div");
-        contdEl.className = "page-contd-overlay";
-        contdEl.textContent = breakInfo.contdName;
-        overlay.appendChild(contdEl);
-    }
-
-    container.appendChild(spacer);
-    container.appendChild(overlay);
-    return container;
-}
-
-function createLastPageWidget(
-    pagenum: number,
-    label: string,
-    freespace: number,
-    options: PaginationOptions,
-): HTMLElement {
-    const container = document.createElement("div");
-    container.className = "pagination-last-page";
-    container.contentEditable = "false";
-
-    const spacerHeight = freespace + options.marginBottom;
-    const spacer = document.createElement("div");
-    spacer.className = "pagination-spacer";
-    spacer.style.height = `${spacerHeight}px`;
-
-    const overlay = document.createElement("div");
-    overlay.className = "pagination-overlay";
-    overlay.style.top = "0";
-    overlay.style.height = `${spacerHeight}px`;
-
-    const footerArea = document.createElement("div");
-    footerArea.className = "pagination-footer-area";
-    footerArea.style.height = `${options.marginBottom}px`;
-    footerArea.innerHTML = renderFooter(pagenum, label, options);
-
-    overlay.appendChild(footerArea);
-    container.appendChild(spacer);
-    container.appendChild(overlay);
-    return container;
-}
-
-function buildDecorations(
-    doc: Node,
-    breaks: PageBreakInfo[],
-    lastPageFreespace: number,
-    firstPageLabel: string,
-    options: PaginationOptions,
-): DecorationSet {
-    const decorations: Decoration[] = [];
-
-    // First page top margin / header
-    decorations.push(
-        Decoration.widget(0, createFirstPageWidget(firstPageLabel, options), {
-            side: -1,
-            key: `page-1-header-${firstPageLabel}`,
-        }),
-    );
-
-    // Page breaks
-    // The key MUST include every value that affects the widget DOM (freespace,
-    // contdName, splitNodeType, label, isEmpty) — not just pagenum.  ProseMirror's
-    // WidgetType.eq short-circuits on matching keys and reuses the old DOM element,
-    // so a key that omits e.g. freespace causes stale spacer heights after content edits.
-    for (const b of breaks) {
-        decorations.push(
-            Decoration.widget(b.pos, createPageBreakWidget(b, options), {
-                side: -1,
-                key: `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}-${b.label ?? ""}-${b.prevLabel ?? ""}-${b.isEmpty ? "E" : ""}`,
-            }),
-        );
-    }
-
-    // Last page bottom margin / footer.
-    // Label of the last page = label of the most recent break (or firstPageLabel
-    // when no breaks exist).
-    const lastPagenum = breaks.length > 0 ? breaks[breaks.length - 1].pagenum : 1;
-    const lastPageLabel = breaks.length > 0 ? (breaks[breaks.length - 1].label ?? String(lastPagenum)) : firstPageLabel;
-    decorations.push(
-        Decoration.widget(
-            doc.content.size,
-            createLastPageWidget(lastPagenum, lastPageLabel, lastPageFreespace, options),
-            {
-                side: 1,
-                key: `lp-${lastPagenum}-${lastPageLabel}-${lastPageFreespace}`,
-            },
-        ),
-    );
-
-    return DecorationSet.create(doc, decorations);
-}
-
-// ---------------------------------------------------------------------------
-// Height measurement
-// ---------------------------------------------------------------------------
-
-const heightCache = new Map<string, number>();
-
-const getHTMLHeight = (
-    domNode: HTMLElement,
-    editorDom: HTMLElement,
-    nodeType: string,
-    options: PaginationOptions,
-    contentSize?: number,
-): number => {
-    const textContent = domNode.textContent || "";
-    const sizePart = contentSize != null ? `${contentSize}:` : "";
-    const cacheKey = `${nodeType}:${options.pageWidth}:${options.marginLeft}:${options.marginRight}:${sizePart}${textContent}`;
-
-    if (heightCache.has(cacheKey)) {
-        return heightCache.get(cacheKey)!;
-    }
-
-    const testDiv = setupTestDiv(editorDom, options);
-    testDiv.innerHTML = domNode.outerHTML;
-
-    const rect = testDiv.getBoundingClientRect();
-    const height = Math.round(rect.height);
-
-    if (heightCache.size > 10000) heightCache.clear();
-    heightCache.set(cacheKey, height);
-
-    return height;
-};
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const setupTestDiv = (editorDom: HTMLElement, _: PaginationOptions): HTMLElement => {
-    let testDiv = document.getElementById("pagination-test-div");
-    if (!testDiv) {
-        testDiv = document.createElement("div");
-        testDiv.id = "pagination-test-div";
-        testDiv.className = "ProseMirror pagination";
-        testDiv.style.position = "fixed";
-        testDiv.style.top = "0";
-        testDiv.style.left = "-9999px";
-        testDiv.style.pointerEvents = "none";
-        testDiv.style.whiteSpace = "break-spaces";
-        testDiv.style.visibility = "hidden";
-
-        // position:fixed already establishes a block formatting context which
-        // prevents margin collapsing.  Using overflow:hidden as a belt-and-
-        // suspenders safeguard avoids the 2 px measurement error that the old
-        // 1 px transparent borders used to introduce on every height reading.
-        testDiv.style.overflow = "hidden";
-        // The .pagination class sets min-height: var(--page-height) for the editor,
-        // but the test div must shrink to fit each node's content.
-        testDiv.style.minHeight = "0";
-
-        document.body.appendChild(testDiv);
-    }
-
-    // Sync classes and CSS variables that affect layout from editor to test div.
-    // testDiv lives in <body>, not inside the editor, so it doesn't inherit the editor's CSS vars.
-    testDiv.className = editorDom.className;
-
-    // Copy all CSS variables from the live editor DOM to the test div. This includes
-    // both element margin/style vars (set by DocumentEditorPanel) and page dimension
-    // vars (set by syncVars inside each command before the transaction is dispatched).
-    // Reading from editorDom rather than from options avoids the stale-options problem:
-    // extension.options in apply() may lag behind the mutation done by the command.
-    for (let i = 0; i < editorDom.style.length; i++) {
-        const prop = editorDom.style[i];
-        if (prop.startsWith("--")) {
-            testDiv.style.setProperty(prop, editorDom.style.getPropertyValue(prop));
-        }
-    }
-
-    // Remove the pagination class whose `width: var(--page-width) !important` rule
-    // would fight our explicit width, then set the width directly from the value that
-    // syncVars already wrote to editorDom (guaranteed current for this transaction).
-    testDiv.classList.remove("pagination");
-    testDiv.style.width = editorDom.style.getPropertyValue("--page-width");
-
-    return testDiv;
-};
-
-// ---------------------------------------------------------------------------
-// Sentence splitting
-// ---------------------------------------------------------------------------
-
-interface SplitResult {
-    /** Absolute document position of the split point (inside the straddling node's text). */
-    pos: number;
-    /** Character offset within the node's text where the split occurs (= pos - nodeDocPos - 1). */
-    offset: number;
-    /** Rendered height of the portion staying on the current page. */
-    topHeight: number;
-    /** Rendered height of the portion moving to the next page. */
-    bottomHeight: number;
-}
-
-/**
- * Attempts to split a straddling Action or Dialogue node at a sentence boundary.
- *
- * Strategy: use Intl.Segmenter to break the node's text into sentences, then find the
- * longest sentence prefix whose rendered height fits within `freespace`. If the remaining
- * bottom portion would be shorter than MIN_SPLIT_BOTTOM_LINES, the split is rejected and
- * the whole node moves to the next page (same as the legacy behaviour).
- *
- * Height is measured using plain textContent (no inline marks) which is accurate for
- * monospace fonts where bold/italic do not change character widths.
- *
- * Returns null when no valid split exists.
- */
-function trySplitNode(
-    node: Node,
-    nodeDocPos: number,
-    freespace: number,
-    nodeElement: HTMLElement,
-    editorDOM: HTMLElement,
-    options: PaginationOptions,
-): SplitResult | null {
-    if (!sentenceSegmenter) return null;
-
-    const text = node.textContent as string;
-    const sentences = Array.from(sentenceSegmenter.segment(text), (s: Intl.SegmentData) => s.segment);
-
-    // A single sentence cannot be split at a boundary — move the whole node.
-    if (sentences.length <= 1) return null;
-
-    // Try progressively shorter prefixes (all-but-last, all-but-last-two, …)
-    // until one fits in the available freespace.
-    for (let i = sentences.length - 2; i >= 0; i--) {
-        const topText = sentences.slice(0, i + 1).join("");
-
-        // Measure the top half: clone the element (preserving tag + CSS class) with only the top text.
-        // Using textContent instead of innerHTML is intentional — for a monospace font, inline marks
-        // (bold, italic) do not change character widths, so the line count is the same.
-        const topElement = nodeElement.cloneNode(false) as HTMLElement;
-        topElement.textContent = topText;
-        const topHeight = getHTMLHeight(topElement, editorDOM, node.type.name, options);
-
-        if (topHeight <= freespace) {
-            // Measure the bottom half to guard against a degenerate single-line remainder.
-            const bottomText = sentences.slice(i + 1).join("");
-            const bottomElement = nodeElement.cloneNode(false) as HTMLElement;
-            bottomElement.textContent = bottomText;
-            const bottomHeight = getHTMLHeight(bottomElement, editorDOM, node.type.name, options);
-
-            // Bottom too short — not worth a split; force the whole node to the next page.
-            if (bottomHeight < LINE_HEIGHT * MIN_SPLIT_BOTTOM_LINES) return null;
-
-            // The split position in document space:
-            // nodeDocPos + 1 skips the node's opening token; topText.length then walks
-            // through the text characters (marks are zero-width in ProseMirror's position space).
-            return {
-                pos: nodeDocPos + 1 + topText.length,
-                offset: topText.length,
-                topHeight,
-                bottomHeight,
-            };
-        }
-    }
-
-    // No prefix fits — the first sentence alone is too tall; move the whole node.
-    return null;
-}
-
-// ---------------------------------------------------------------------------
-// Plugin
-// ---------------------------------------------------------------------------
-
-export const paginationKey = new PluginKey("pagination");
-
-interface PaginationState {
-    decset: DecorationSet;
-    breaks: PageBreakInfo[];
-    lastPageFreespace: number;
-    firstPageLabel: string;
-}
-
-/**
- * Compute display labels for every page using the same token math that
- * powers scene locking. Page 1 is anchored to the sentinel PAGE_ONE_KEY;
- * later pages are anchored to the data-id of the top-level node that
- * begins them. Returns one label per page (length = breaks.length + 1).
- *
- * Synthetic empty-page breaks consume one "logical page" each — their
- * anchorId comes from the page-lock map, and the page that physically
- * follows the empty slot gets its own label slot in the result.
- */
-function computePageLabels(
-    breaks: PageBreakInfo[],
-    pageLocks: PersistentPageMap,
-    skippedLetters: readonly string[],
-): SceneLabel[] {
-    const anchors: string[] = [PAGE_ONE_KEY];
-    for (const b of breaks) {
-        // Empty pages anchor to the orphan lock's anchorId. Real pages anchor
-        // to the data-id of the top-level node where the page starts. If
-        // anchorId is somehow missing, fall back to a unique synthetic key
-        // so the label-computer still produces a usable result.
-        anchors.push(b.anchorId ?? `__break_${b.pos}_${b.pagenum}__`);
-    }
-    return computeSceneLabels(anchors, pageLocks, "suffix", skippedLetters);
-}
-
-const createPaginationPlugin = (extension: {
-    options: PaginationOptions;
-    editor: Editor;
-    storage: { fontsReady: boolean };
-}) =>
-    new Plugin({
-        key: paginationKey,
-        state: {
-            init: (): PaginationState => ({
-                decset: DecorationSet.empty,
-                breaks: [],
-                lastPageFreespace: 0,
-                firstPageLabel: "1",
-            }),
-            apply(tr, value: PaginationState, oldState, newState): PaginationState {
-                // Wait for the screenplay fonts to finish loading before doing
-                // anything. Measuring against the OS monospace fallback writes
-                // wrong heights into the cache; gating here keeps the cache
-                // empty until the real font is in play. onCreate dispatches a
-                // forcePaginationUpdate once fonts.ready resolves, which is
-                // what eventually pulls us past this guard.
-                if (!extension.storage.fontsReady) return value;
-
-                const options = extension.options as PaginationOptions;
-                const formatUpdate = tr.getMeta("pageFormatUpdate");
-                const forceUpdate = tr.getMeta("forcePaginationUpdate");
-
-                // Only clear height cache on format changes (page size / margins) which
-                // affect text-wrapping widths and thus measured heights.
-                // forcePaginationUpdate (gaps, headers, startNewPage, refresh) changes
-                // layout but not node heights — the cached measurements stay valid.
-                if (formatUpdate) {
-                    heightCache.clear();
-                }
-
-                // Nothing pagination-related changed
-                if (!tr.docChanged && !forceUpdate && !formatUpdate) return value;
-
-                // UUID assignment by nodeIdDedup only changes data-id attrs — no layout impact
-                if (tr.getMeta("nodeDedupId")) return value;
-
-                const fullRemeasure = forceUpdate || formatUpdate;
-
-                // Track the furthest changed position for the short-circuit break optimization
-                let maxChangedPos = -1;
-                if (tr.docChanged && !fullRemeasure) {
-                    tr.steps.forEach((step) => {
-                        const map = step.getMap();
-                        map.forEach((_oS: number, _oE: number, _newStart: number, newEnd: number) => {
-                            if (newEnd > maxChangedPos) maxChangedPos = newEnd;
-                        });
-                    });
-                }
-
-                // Map old breaks through the transaction for short-circuit comparison
-                const mappedOldBreaks = !fullRemeasure
-                    ? value.breaks.map((b) => ({ ...b, pos: tr.mapping.map(b.pos) }))
-                    : [];
-                const oldBreakByPos = new Map<number, { info: PageBreakInfo; index: number }>();
-                mappedOldBreaks.forEach((b, i) => oldBreakByPos.set(b.pos, { info: b, index: i }));
-
-                // --- Single pass: measure heights + compute page breaks ---
-                const editor = extension.editor;
-                if (!editor.isInitialized || !extension.editor.view?.dom) return value;
-
-                const editorDOM = extension.editor.view.dom as HTMLElement;
-
-                // extension.options may lag behind the synchronous mutations done by the
-                // commands (Tiptap options-object identity issue). editorDOM's inline style
-                // is always current because syncVars writes to it inside every command,
-                // before the transaction is dispatched. Override the stale option fields.
-                const _ph = editorDOM.style.getPropertyValue("--page-height");
-                const _pw = editorDOM.style.getPropertyValue("--page-width");
-                const _mt = editorDOM.style.getPropertyValue("--page-margin-top");
-                const _mb = editorDOM.style.getPropertyValue("--page-margin-bottom");
-                const _ml = editorDOM.style.getPropertyValue("--page-margin-left");
-                const _mr = editorDOM.style.getPropertyValue("--page-margin-right");
-                if (_ph) options.pageHeight = parseFloat(_ph);
-                if (_pw) options.pageWidth = parseFloat(_pw);
-                if (_mt) options.marginTop = parseFloat(_mt);
-                if (_mb) options.marginBottom = parseFloat(_mb);
-                if (_ml) options.marginLeft = parseFloat(_ml);
-                if (_mr) options.marginRight = parseFloat(_mr);
-                const _snp = editorDOM.dataset.startNewPageTypes;
-                if (_snp) options.startNewPageTypes = new Set(JSON.parse(_snp));
-
-                const serializer = DOMSerializer.fromSchema(newState.schema);
-
-                // --- Page-lock setup ---
-                // Hot-path discipline: when locking is off (the common case),
-                // pageLocks/lockedAnchorIds stay null and the per-node check
-                // short-circuits on the first `&&` — zero allocations, zero
-                // map lookups. The set is rebuilt once per pass when locking
-                // is active; lock counts are typically tens, never thousands.
-                const pageLocking = options.getPageLocking?.() ?? false;
-                const pageLocks: PersistentPageMap | null = pageLocking ? (options.getPageLocks?.() ?? null) : null;
-                const lockedAnchorIds: Set<string> | null = pageLocks
-                    ? new Set(Object.keys(pageLocks).filter((k) => k !== PAGE_ONE_KEY))
-                    : null;
-                // Tracks locked anchors already consumed by a break in this pass.
-                // ProseMirror's split (Enter at position 0 of a node) duplicates
-                // node attrs across both halves — including data-id — so until
-                // node-id-dedup-extension runs in appendTransaction we transiently
-                // see the same locked anchor twice. Without this set, both halves
-                // would each force a page break, briefly rendering a phantom page
-                // with the same locked label until the dedup transaction fires.
-                const consumedAnchors = new Set<string>();
-                const skippedLetters = options.getSkippedLetters?.() ?? [];
-
-                const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
-                const breaks: PageBreakInfo[] = [];
-                let pagePos = 0;
-                let pagenum = 1;
-                const childCount = newState.doc.childCount;
-                let offset = 0;
-
-                // Tracks the most recent Character cue text so we can label split-dialogue breaks
-                // with "CHARACTER (CONT'D)" on the next page.
-                let lastCharName = "";
-
-                // Set when the short-circuit exits the per-node loop early.
-                // pagePos at that point reflects only the carry node(s) sitting
-                // on the new page right after the matched break — not the real
-                // last page — so the post-loop freespace computation must NOT
-                // derive from pagePos. The previous pass's lastPageFreespace is
-                // still authoritative because the short-circuit condition (matching
-                // pos / freespace / contdName past maxChangedPos) guarantees every
-                // subsequent page is byte-identical to the previous layout.
-                let shortCircuited = false;
-
-                let lastNodes: CircularBuffer<NodeInfo> = new CircularBuffer(3);
-                for (let i = 0; i < childCount; i++) {
-                    const node = newState.doc.child(i);
-                    const pos = offset;
-                    offset += node.nodeSize;
-
-                    if (!("height" in node.attrs)) continue;
-
-                    const nodeType = node.type.name as ScreenplayElement;
-                    const logic = BREAK_LOGIC[nodeType];
-
-                    // Use the module-level heightCache (keyed by content) to avoid re-serializing
-                    // unchanged nodes. Cache misses (new/edited content) trigger serialization.
-                    // element is hoisted so the split block can reuse it without a second serialize.
-                    const textContent = node.textContent || "";
-                    const cacheKey = `${node.type.name}:${options.pageWidth}:${options.marginLeft}:${options.marginRight}:${node.content.size}:${textContent}`;
-                    let height = heightCache.get(cacheKey) ?? null;
-                    let element: HTMLElement | null = null;
-
-                    if (height === null) {
-                        element = serializer.serializeNode(node) as HTMLElement;
-                        height = getHTMLHeight(element, editorDOM, node.type.name, options, node.content.size);
-                    }
-
-                    if (height == null) continue;
-
-                    // Track the most recent Character name for CONT'D labels.
-                    if (nodeType === ScreenplayElement.Character) {
-                        lastCharName = node.textContent.trim();
-                    }
-
-                    const dataId: string | undefined = node.attrs["data-id"];
-
-                    // --- Force page break for "start new page" elements ---
-                    // If this node type is configured to start a new page and we're
-                    // not already at the top of a page, insert a break before it.
-                    if (options.startNewPageTypes.has(nodeType) && pagePos > 0) {
-                        const freespace = contentHeight - pagePos;
-                        breaks.push({
-                            pos,
-                            pagenum: ++pagenum,
-                            freespace: Math.max(0, freespace),
-                            contdName: "",
-                            splitNodeType: null,
-                            anchorId: dataId,
-                        });
-                        pagePos = 0;
-                        lastNodes = new CircularBuffer(3);
-                    }
-
-                    // --- Force page break for locked page anchors ---
-                    // O(1) Set.has when locking is on; the leading `lockedAnchorIds &&`
-                    // short-circuits to false when locking is disabled — hot-path safe.
-                    // The `consumedAnchors` guard ignores the transient duplicate
-                    // data-id that appears after Enter splits a locked anchor — only
-                    // the first occurrence in doc order is honored as the lock site,
-                    // matching the post-dedup state and avoiding a phantom break.
-                    if (lockedAnchorIds && dataId && lockedAnchorIds.has(dataId) && !consumedAnchors.has(dataId)) {
-                        consumedAnchors.add(dataId);
-                        const lockInfo = pageLocks?.[dataId];
-                        const splitOffset = lockInfo?.splitOffset;
-                        const textLen = node.textContent?.length ?? 0;
-
-                        if (pagePos > 0 && splitOffset != null && splitOffset > 0 && splitOffset < textLen) {
-                            // The lock was originally created on a mid-node sentence split
-                            // (straddling dialogue or action). Reproduce that split here:
-                            // top portion stays on the current page, break goes at the
-                            // stored offset, bottom portion starts the locked page. Without
-                            // this branch the whole node would be force-pushed to the next
-                            // page, making the locked page taller than its frozen layout
-                            // and forcing a phantom "A" page to be inserted before it.
-                            if (!element) element = serializer.serializeNode(node) as HTMLElement;
-
-                            const topText = node.textContent.slice(0, splitOffset);
-                            const topElement = element.cloneNode(false) as HTMLElement;
-                            topElement.textContent = topText;
-                            const topHeight = getHTMLHeight(topElement, editorDOM, node.type.name, options);
-                            const bottomHeight = Math.max(0, height - topHeight);
-
-                            pagePos += topHeight;
-                            const freespace = contentHeight - pagePos;
-
-                            breaks.push({
-                                pos: pos + 1 + splitOffset,
-                                pagenum: ++pagenum,
-                                freespace: Math.max(0, freespace),
-                                contdName: logic?.showMoreContd ? lastCharName : "",
-                                splitNodeType: nodeType,
-                                anchorId: dataId,
-                                splitOffset,
-                            });
-
-                            pagePos = bottomHeight;
-                            lastNodes = new CircularBuffer(3);
-                            lastNodes.push({
-                                pos,
-                                type: nodeType,
-                                height: bottomHeight,
-                                positionTop: 0,
-                                dataId,
-                            });
-                            continue;
-                        }
-
-                        if (pagePos > 0) {
-                            // Whole-node lock: force break before the anchor so the locked
-                            // page begins exactly with this node.
-                            const freespace = contentHeight - pagePos;
-                            breaks.push({
-                                pos,
-                                pagenum: ++pagenum,
-                                freespace: Math.max(0, freespace),
-                                contdName: "",
-                                splitNodeType: null,
-                                anchorId: dataId,
-                            });
-                            pagePos = 0;
-                            lastNodes = new CircularBuffer(3);
-                        }
-                    }
-
-                    // Accumulate height on current page
-                    pagePos += height;
-
-                    // We keep the last 3 nodes for orphan resolution on page break
-                    lastNodes.push({
-                        pos,
-                        type: nodeType,
-                        height,
-                        positionTop: pagePos - height,
-                        dataId,
-                    });
-
-                    // Page break needed — record it and reset page position
-                    if (pagePos > contentHeight) {
-                        // freespace = how much room was left on the page before this node was added
-                        const freespaceBeforeNode = contentHeight - (pagePos - height);
-
-                        // --- Sentence split (Action / Dialogue only) ---
-                        // Tried BEFORE orphan resolution: a successful split keeps the top portion
-                        // on the current page without moving any preceding nodes.
-                        if (
-                            logic?.canSplit &&
-                            freespaceBeforeNode > MIN_SPLIT_FREESPACE &&
-                            height > logic.minSplitHeight
-                        ) {
-                            // Serialize lazily — only needed here when not already serialized above.
-                            if (!element) element = serializer.serializeNode(node) as HTMLElement;
-
-                            const split = trySplitNode(node, pos, freespaceBeforeNode, element, editorDOM, options);
-                            if (split) {
-                                breaks.push({
-                                    pos: split.pos,
-                                    pagenum: ++pagenum,
-                                    freespace: Math.max(0, freespaceBeforeNode - split.topHeight),
-                                    // contdName non-empty for dialogue: triggers (MORE)/(CONT'D) labels.
-                                    contdName: logic.showMoreContd ? lastCharName : "",
-                                    // splitNodeType drives the overlay padding-escape in createPageBreakWidget.
-                                    splitNodeType: nodeType,
-                                    // Anchor for page locking: the node being split owns both halves.
-                                    anchorId: dataId,
-                                    // splitOffset is captured by the production panel when locking,
-                                    // so the same mid-node split can be reproduced on later recomputes
-                                    // instead of force-pushing the whole node onto the locked page.
-                                    splitOffset: split.offset,
-                                });
-                                // The bottom half of the split node is the first item on the new page.
-                                pagePos = split.bottomHeight;
-                                lastNodes = new CircularBuffer(3);
-                                lastNodes.push({
-                                    pos,
-                                    type: nodeType,
-                                    height: split.bottomHeight,
-                                    positionTop: 0,
-                                    dataId,
-                                });
-                                continue; // split handled — skip orphan resolution for this node
-                            }
-                        }
-
-                        // --- Orphan resolution ---
-                        // Walk back through the buffer: if the last fitted node has keepWithNext,
-                        // slide the break back to its position (and carry its height to the next page).
-                        // Repeat once more for the double-orphan case (e.g. Character → Parenthetical).
-                        let breakPos = pos;
-                        let carryHeight = height; // cumulative height that moves to the next page
-                        let backCount = 0; // how many nodes slid back
-
-                        for (let back = 1; back <= 2; back++) {
-                            const prev = lastNodes.at(back); // at(1) = last fitted, at(2) = one before
-                            if (!prev) break;
-                            // A locked anchor owns its page and must never be displaced by
-                            // walkback — otherwise the next overflow would yank it onto an
-                            // A page and the locked frame would lose its head.
-                            if (lockedAnchorIds && prev.dataId && lockedAnchorIds.has(prev.dataId)) {
-                                break;
-                            }
-                            if (BREAK_LOGIC[prev.type]?.keepWithNext) {
-                                breakPos = prev.pos;
-                                carryHeight += prev.height;
-                                backCount = back;
-                            } else {
-                                break; // stop as soon as we find a node that is safe to end a page
-                            }
-                        }
-
-                        // freespace = space left before the first node that moved down.
-                        // lastNodes.at(backCount) is that first node; positionTop is its accumulated
-                        // page height just before it was added — i.e. the used space above it.
-                        const firstMovingNode = lastNodes.at(backCount);
-                        const freespace = contentHeight - (firstMovingNode?.positionTop ?? pagePos - height);
-
-                        // If the first node moving to the next page is Dialogue or Parenthetical,
-                        // the Character cue remains on the previous page and we need (MORE)/(CONT'D).
-                        // If the Character itself is being carried (e.g. Character → Parenthetical
-                        // double-orphan), the whole block starts fresh — no labels needed.
-                        const firstMovingType = firstMovingNode?.type;
-                        const isDialogueSplit =
-                            lastCharName !== "" &&
-                            (firstMovingType === ScreenplayElement.Dialogue ||
-                                firstMovingType === ScreenplayElement.Parenthetical);
-
-                        // Anchor = data-id of the first node that moved to the new page.
-                        // When backCount==0 the current node is the one moving (no walkback);
-                        // otherwise the carried-back node from the buffer owns the anchor.
-                        const anchorDataId = backCount === 0 ? dataId : firstMovingNode?.dataId;
-
-                        const breakInfo: PageBreakInfo = {
-                            pos: breakPos,
-                            pagenum: pagenum + 1,
-                            freespace: Math.max(0, freespace),
-                            contdName: isDialogueSplit ? lastCharName : "",
-                            splitNodeType: null,
-                            anchorId: anchorDataId,
-                        };
-                        breaks.push(breakInfo);
-                        pagenum++;
-                        pagePos = carryHeight;
-
-                        // positionTop values in the buffer are page-relative — reset and re-seed
-                        // with the carry nodes using new-page positionTop values so orphan checking
-                        // works correctly on the next break.
-                        const carryNodes: NodeInfo[] = [];
-                        let carryTop = 0;
-                        for (let back = backCount; back >= 0; back--) {
-                            const n = lastNodes.at(back)!;
-                            carryNodes.push({ ...n, positionTop: carryTop });
-                            carryTop += n.height;
-                        }
-                        lastNodes = new CircularBuffer(3);
-                        for (const n of carryNodes) lastNodes.push(n);
-
-                        // Short-circuit: past the changed range and this break matches an old break
-                        // (same position, freespace, and contdName) → layout is back in sync;
-                        // copy the remaining old breaks and stop the loop early.
-                        if (!fullRemeasure && pos > maxChangedPos) {
-                            const old = oldBreakByPos.get(breakInfo.pos);
-                            if (
-                                old &&
-                                old.info.freespace === breakInfo.freespace &&
-                                old.info.contdName === breakInfo.contdName
-                            ) {
-                                for (let j = old.index + 1; j < mappedOldBreaks.length; j++) {
-                                    pagenum++;
-                                    // Spread preserves all fields (contdName, splitNodeType, …); override pagenum only.
-                                    breaks.push({ ...mappedOldBreaks[j], pagenum });
-                                }
-                                shortCircuited = true;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                // Compute remaining space on the last page so the last-page widget
-                // can pad it to full page height. Mutable because orphan handling
-                // may consume it: when an orphan synthetic empty page lands at
-                // doc end, it absorbs this freespace so the last real page stays
-                // at its full height and the empty page renders after it.
-                //
-                // When the per-node loop short-circuited, pagePos is the carry
-                // height after the matched break — NOT the height of the real
-                // last page — so deriving from it would make the last page's
-                // spacer grow or shrink with every edit on earlier pages. The
-                // short-circuit condition guarantees content past that break
-                // is identical to the previous pass, so the previously stored
-                // freespace is still the correct answer.
-                const lastPageFreespace = shortCircuited
-                    ? value.lastPageFreespace
-                    : Math.max(0, contentHeight - pagePos);
-
-                // --- Orphan page collection ---
-                // A locked page whose anchor data-id is no longer present in the
-                // doc is an "orphan" — e.g. the user emptied a locked page and
-                // collapsed it (see PAGE_COLLAPSE_META), or a collaborator's edit
-                // removed its anchor. Its frozen number must not vanish, so its
-                // token is folded into the FOLLOWING surviving page as a range
-                // ("5-6") — or reclaimed by a provisional page grown into the
-                // gap — by the absorb pipeline below, exactly like an omitted
-                // scene's removed pages.
-                const orphanTokens: SceneToken[] = [];
-                if (pageLocks) {
-                    const seenAnchors = new Set<string>();
-                    for (const b of breaks) {
-                        if (b.anchorId) seenAnchors.add(b.anchorId);
-                    }
-                    for (const [anchorId, page] of Object.entries(pageLocks)) {
-                        if (anchorId === PAGE_ONE_KEY || !page?.token) continue;
-                        if (seenAnchors.has(anchorId)) continue;
-                        orphanTokens.push(page.token);
-                    }
-                }
-
-                // --- Label assignment ---
-                // Run computeSceneLabels over [page1Anchor, ...breakAnchors] so locked
-                // pages keep their frozen labels, provisional inserts get suffix labels
-                // (e.g. "4A"), and pages past the last lock continue the integer sequence.
-                let firstPageLabel = "1";
-                if (pageLocks) {
-                    // Omitted scenes collapse whole locked pages out of the
-                    // document. Each such removed page contributes an "absorbed"
-                    // token we must keep visible so the numbering doesn't jump
-                    // ("14" then "16"). Two outcomes per token, decided below:
-                    //   1. RECLAIM — if content has grown a provisional (unlocked)
-                    //      page back into the gap where the token belongs, hand the
-                    //      token to that page so it becomes a real numbered page
-                    //      again ("15"). This is what lets a collapsed "15-16"
-                    //      revert to a fresh "15" + "16" as the user types.
-                    //   2. FOLD — no provisional page available: fold the token
-                    //      into the FOLLOWING surviving page as the low end of a
-                    //      range. Deleting page 15 makes the next page read
-                    //      "15-16"; deleting 14 too makes it "14-16".
-                    // Two sources feed this: omitted scenes (their locks were
-                    // deleted from the map; tokens come via getOmittedPages) and
-                    // orphan locks still in the map (collapsed/deleted pages).
-                    const absorbed = [...(options.getOmittedPages?.() ?? []), ...orphanTokens].sort(compareTokens);
-
-                    // Per-page frozen token (null for provisional pages). Page 0
-                    // is page 1 (PAGE_ONE_KEY); page p>0 starts at breaks[p-1].
-                    const pageCount = breaks.length + 1;
-                    const lockedTok: (SceneToken | null)[] = new Array(pageCount);
-                    for (let p = 0; p < pageCount; p++) {
-                        const anchor = p === 0 ? PAGE_ONE_KEY : breaks[p - 1].anchorId;
-                        lockedTok[p] = (anchor ? pageLocks[anchor]?.token : undefined) ?? null;
-                    }
-
-                    const synthetic: Record<string, { token: SceneToken }> = {};
-                    const leftover: SceneToken[] = [];
-                    if (absorbed.length > 0) {
-                        // Nearest locked token before / after each page, so we can
-                        // tell which gap a provisional page sits in.
-                        const prevLockedArr: (SceneToken | null)[] = new Array(pageCount);
-                        const nextLockedArr: (SceneToken | null)[] = new Array(pageCount);
-                        let seen: SceneToken | null = null;
-                        for (let p = 0; p < pageCount; p++) {
-                            prevLockedArr[p] = seen;
-                            if (lockedTok[p]) seen = lockedTok[p];
-                        }
-                        seen = null;
-                        for (let p = pageCount - 1; p >= 0; p--) {
-                            nextLockedArr[p] = seen;
-                            if (lockedTok[p]) seen = lockedTok[p];
-                        }
-
-                        const consumed = new Set<number>();
-                        for (const t of absorbed) {
-                            let placed = false;
-                            // Page 0 is page 1 and never reclaims an absorbed
-                            // number; start at the first real break.
-                            for (let p = 1; p < pageCount; p++) {
-                                if (consumed.has(p) || lockedTok[p]) continue;
-                                const before = prevLockedArr[p];
-                                const after = nextLockedArr[p];
-                                // Provisional page p is in t's gap when t sorts
-                                // strictly between the locks bounding p.
-                                if (
-                                    (before === null || compareTokens(before, t) < 0) &&
-                                    (after === null || compareTokens(t, after) < 0)
-                                ) {
-                                    const anchor = breaks[p - 1].anchorId;
-                                    if (anchor) {
-                                        synthetic[anchor] = { token: t };
-                                        consumed.add(p);
-                                        placed = true;
-                                        break;
-                                    }
-                                }
-                            }
-                            if (!placed) leftover.push(t);
-                        }
-                    }
-
-                    // Reclaimed pages join the lock map for label computation so
-                    // they get their absorbed number (and following provisional
-                    // pages suffix off it: "18", "18A", …).
-                    const labelLocks =
-                        Object.keys(synthetic).length > 0 ? { ...pageLocks, ...synthetic } : pageLocks;
-                    const pageLabels = computePageLabels(breaks, labelLocks, skippedLetters);
-
-                    // Fold the unreclaimed tokens into the FOLLOWING surviving
-                    // page — the first page whose token is larger — so the
-                    // removed number becomes the low end of that page's range
-                    // ("15-16", then "14-16" as more are removed). A removed
-                    // page past the last surviving page has no follower; it
-                    // falls back to the last page as the high end instead.
-                    if (leftover.length > 0) {
-                        const alphabet = buildSceneAlphabet(skippedLetters);
-                        const bucket = new Map<number, SceneToken[]>();
-                        for (const t of leftover) {
-                            let attach = pageLabels.length - 1;
-                            for (let p = 0; p < pageLabels.length; p++) {
-                                if (compareTokens(pageLabels[p].token, t) > 0) {
-                                    attach = p;
-                                    break;
-                                }
-                            }
-                            const list = bucket.get(attach);
-                            if (list) list.push(t);
-                            else bucket.set(attach, [t]);
-                        }
-                        // A page's range spans the min..max of its own token plus
-                        // every number it absorbed — "14-16" for own 16 absorbing
-                        // 14 and 15, "14-15" for a trailing own 14 absorbing 15.
-                        for (const [p, tokens] of bucket) {
-                            let lo = pageLabels[p].token;
-                            let hi = pageLabels[p].token;
-                            for (const t of tokens) {
-                                if (compareTokens(t, lo) < 0) lo = t;
-                                if (compareTokens(t, hi) > 0) hi = t;
-                            }
-                            const loLabel = compileSceneLabel(lo, alphabet);
-                            const hiLabel = compileSceneLabel(hi, alphabet);
-                            pageLabels[p].label = loLabel === hiLabel ? loLabel : `${loLabel}-${hiLabel}`;
-                        }
-                    }
-
-                    firstPageLabel = pageLabels[0].label;
-                    for (let i = 0; i < breaks.length; i++) {
-                        breaks[i].label = pageLabels[i + 1].label;
-                        breaks[i].prevLabel = pageLabels[i].label;
-                    }
-                }
-
-                // Check if breaks actually changed compared to mapped old breaks.
-                const breaksChanged =
-                    fullRemeasure ||
-                    lastPageFreespace !== value.lastPageFreespace ||
-                    firstPageLabel !== value.firstPageLabel ||
-                    breaks.length !== mappedOldBreaks.length ||
-                    breaks.some(
-                        (b, i) =>
-                            b.pos !== mappedOldBreaks[i].pos ||
-                            b.freespace !== mappedOldBreaks[i].freespace ||
-                            b.contdName !== mappedOldBreaks[i].contdName ||
-                            b.label !== mappedOldBreaks[i].label ||
-                            b.prevLabel !== mappedOldBreaks[i].prevLabel ||
-                            !!b.isEmpty !== !!mappedOldBreaks[i].isEmpty,
-                    );
-
-                let decset: DecorationSet;
-                if (breaksChanged) {
-                    decset = buildDecorations(newState.doc, breaks, lastPageFreespace, firstPageLabel, options);
-                } else {
-                    // Fast path: the set of breaks is unchanged, so remap the
-                    // existing decorations instead of rebuilding. This matters for
-                    // long scripts — a rebuild re-creates every break widget's DOM
-                    // subtree on each keystroke (hundreds of throwaway elements on a
-                    // 200-page doc), whereas `map` just re-anchors the existing set.
-                    const mapped = value.decset.map(tr.mapping, tr.doc);
-                    // BUT `DecorationSet.map` silently drops a *widget* whose anchor
-                    // sits at a position a replace step touches — e.g. editing a
-                    // page's last node, which hosts the following page break at its
-                    // trailing boundary (realigning it or re-applying its element
-                    // type with no height change keeps `breaks` identical, so we land
-                    // here). The lost break makes the next page merge upward into a
-                    // too-tall page. `map` never adds decorations, so a drop shows up
-                    // as a smaller count — only then do we pay for a full rebuild.
-                    decset =
-                        mapped.find().length === value.decset.find().length
-                            ? mapped
-                            : buildDecorations(newState.doc, breaks, lastPageFreespace, firstPageLabel, options);
-                }
-
-                return { decset, breaks, lastPageFreespace, firstPageLabel };
-            },
-        },
-        appendTransaction() {
-            return null;
-        },
-        filterTransaction(tr) {
-            // Page-lock guard: prevent content from spilling upward out of a
-            // locked page. The signature of that spill — Backspace at the
-            // start of a locked anchor, Delete at the end of the node before
-            // it, or a selection delete that swallows the anchor — is a locked
-            // anchor's data-id disappearing as a RESULT of this transaction. If
-            // that would happen, reject it so the cursor stays put and no
-            // content moves across the lock.
-            if (!tr.docChanged) return true;
-
-            // Allow yjs sync (remote updates and yjs-based undo/redo) through
-            // unconditionally — cross-peer consistency must not be blocked by
-            // local lock enforcement, and the lock map itself lives in the
-            // Yjs doc so peers agree on which pages are locked.
-            if (tr.getMeta(ySyncPluginKey)) return true;
-
-            // Scene omit/unomit removes (or restores) an entire scene and
-            // re-homes any page locks inside it, so it is allowed to make a
-            // locked anchor's data-id disappear. See SCENE_OMIT_META.
-            if (tr.getMeta(SCENE_OMIT_META)) return true;
-
-            // Collapsing an emptied locked page deliberately deletes that page's
-            // (now empty) anchor node and merges the cursor up to the previous
-            // page. See PAGE_COLLAPSE_META and the Backspace handler.
-            if (tr.getMeta(PAGE_COLLAPSE_META)) return true;
-
-            const opts = extension.options as PaginationOptions;
-            if (!opts.getPageLocking?.()) return true;
-
-            const pageLocks = opts.getPageLocks?.();
-            if (!pageLocks) return true;
-
-            // PAGE_ONE_KEY has no node to defend — page 1 can't lose its
-            // lock through doc edits.
-            const lockedAnchors: string[] = [];
-            for (const key of Object.keys(pageLocks)) {
-                if (key !== PAGE_ONE_KEY) lockedAnchors.push(key);
-            }
-            if (lockedAnchors.length === 0) return true;
-
-            // Fast path: scan the resulting doc once. If every locked anchor is
-            // still present, nothing crossed a lock — allow it. This is the
-            // common case on every keystroke.
-            const after = new Set<string>();
-            tr.doc.forEach((node) => {
-                const dataId = node.attrs?.["data-id"];
-                if (typeof dataId === "string") after.add(dataId);
-            });
-            let someMissing = false;
-            for (const anchor of lockedAnchors) {
-                if (!after.has(anchor)) {
-                    someMissing = true;
-                    break;
-                }
-            }
-            if (!someMissing) return true;
-
-            // A locked anchor is missing from the result. Only reject if THIS
-            // transaction is what removed it (present before, gone after). An
-            // anchor that was already gone (an orphan-collapsed page whose lock
-            // lingers in the map so its number is absorbed) must not block
-            // further edits — otherwise every keystroke after a collapse would
-            // be rejected.
-            const before = new Set<string>();
-            tr.before.forEach((node) => {
-                const dataId = node.attrs?.["data-id"];
-                if (typeof dataId === "string") before.add(dataId);
-            });
-            for (const anchor of lockedAnchors) {
-                if (before.has(anchor) && !after.has(anchor)) return false;
-            }
-            return true;
-        },
-        props: {
-            decorations(state) {
-                return (paginationKey.getState(state) as PaginationState)?.decset ?? DecorationSet.empty;
-            },
-        },
-    });
-
-// ---------------------------------------------------------------------------
-// Extension
-// ---------------------------------------------------------------------------
-
-export const ScriptioPagination = Extension.create<PaginationOptions>({
-    name: "Pagination",
-
-    addOptions() {
-        return defaultOptions;
-    },
-
-    addStorage() {
-        return {
-            initTimer: null as ReturnType<typeof setTimeout> | null,
-            /** False until the screenplay @font-face fonts have finished loading.
-             *  The plugin's `apply` checks this flag and skips height measurement
-             *  while it is false, so the cache never picks up bad heights taken
-             *  with a fallback monospace font (Consolas etc.) that produces a
-             *  different line-wrap from CourierPrime. */
-            fontsReady: false,
-        };
-    },
-
-    onCreate() {
-        const editorDOM = this.editor.view.dom;
-
-        editorDOM.classList.add("pagination");
-        syncVars(editorDOM, this.options);
-
-        let style = document.getElementById("pagination-style");
-        if (!style) {
-            style = document.createElement("style");
-            style.id = "pagination-style";
-            style.textContent = `
-                .pagination {
-                    position: relative;
-                    width: var(--page-width) !important;
-                    margin: 0 auto !important;
-                    min-height: var(--page-height);
-                    box-sizing: border-box !important;
-                }
-
-                .pagination-first-page,
-                .pagination-page-break,
-                .pagination-last-page {
-                    position: relative;
-                    user-select: none;
-                    pointer-events: none;
-                    padding-left: 0 !important;
-                    padding-right: 0 !important;
-                    font-weight: normal !important;
-                    font-style: normal !important;
-                    text-decoration: none !important;
-                    text-transform: none !important;
-                }
-
-                .pagination-overlay {
-                    position: absolute;
-                    left: 0;
-                    right: 0;
-                    z-index: 10;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: flex-end;
-                    background: var(--editor-script-bg);
-                }
-
-                .pagination-footer-area,
-                .pagination-header-area {
-                    position: relative;
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
-                    padding: 0 var(--page-margin-right) 0 var(--page-margin-left);
-                    box-sizing: border-box;
-                    background: var(--editor-script-bg);
-                }
-
-                .pagination-divider {
-                    background: var(--main-bg);
-                }
-
-                .pagination-header-left,
-                .pagination-footer-left {
-                    text-align: left;
-                }
-
-                .pagination-header-right,
-                .pagination-footer-right {
-                    text-align: right;
-                }
-
-                .pagination-empty-page {
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    background: var(--editor-script-bg);
-                    color: var(--secondary-text);
-                    font-size: 0.85rem;
-                    font-weight: 600;
-                    letter-spacing: 0.08em;
-                    opacity: 0.35;
-                    text-transform: uppercase;
-                    box-sizing: border-box;
-                }
-            `;
-            document.head.appendChild(style);
-        }
-
-        setupTestDiv(editorDOM, this.options);
-
-        // The screenplay @font-face fonts (CourierPrime + fallbacks) load
-        // asynchronously. Until the real font is applied, the test div lays
-        // text out in the OS monospace fallback (Consolas on Windows), whose
-        // slightly different character widths cause text to wrap to a
-        // different number of lines. Heights measured against the fallback
-        // disagree with what the editor will eventually render — and once
-        // cached, they keep that disagreement alive (hence the cold-open vs
-        // hard-refresh mismatch, and the shrink-on-edit symptom when a
-        // cache-miss re-measures against the now-loaded real font).
-        //
-        // We defer the first pagination run until the font is genuinely
-        // usable; until then the plugin's `apply` returns the empty initial
-        // state (no measurement, no cache writes). Once ready we flip the flag
-        // and dispatch a single force update — every subsequent measurement
-        // happens against the real font, so the heightCache fills with correct
-        // values from the start.
-        //
-        // IMPORTANT: `document.fonts.ready` is NOT enough on Chrome. Chrome
-        // loads @font-face fonts lazily (only once a rendered element needs
-        // them), so at the moment the editor mounts nothing has triggered the
-        // CourierPrime fetch yet — `fonts.ready` resolves reporting
-        // status:"loaded" while `fonts.check('12pt "CourierPrime"')` is still
-        // false and zero faces are actually loaded. Firefox eagerly starts the
-        // load, which is why it worked there but not here. The fix is to
-        // ACTIVELY request the faces with `document.fonts.load(...)`, which
-        // forces the fetch and resolves only once they are usable for layout.
-        const triggerInitialPagination = () => {
-            if (this.editor.isDestroyed) return;
-            this.storage.fontsReady = true;
-            const tr = this.editor.state.tr;
-            tr.setMeta("forcePaginationUpdate", true);
-            tr.setMeta("addToHistory", false);
-            this.editor.view.dispatch(tr);
-        };
-
-        const fontsApi = typeof document !== "undefined" ? document.fonts : null;
-        if (fontsApi && typeof fontsApi.load === "function") {
-            // Actively request every CourierPrime variant the screenplay uses.
-            // `load()` forces the fetch (even on Chrome's lazy loader) and
-            // resolves once the faces are usable for measurement. `.catch` per
-            // spec keeps one failed variant from blocking the others, and a
-            // safety timeout guarantees pagination still runs if the network
-            // never delivers a font — better a fallback-font layout than a
-            // permanently blank document.
-            const specs = [
-                '12pt "CourierPrime"',
-                'bold 12pt "CourierPrime"',
-                'italic 12pt "CourierPrime"',
-                'bold italic 12pt "CourierPrime"',
-            ];
-            let fired = false;
-            const fireOnce = () => {
-                if (fired) return;
-                fired = true;
-                if (this.storage.initTimer != null) {
-                    clearTimeout(this.storage.initTimer);
-                    this.storage.initTimer = null;
-                }
-                triggerInitialPagination();
-            };
-            Promise.all(specs.map((s) => fontsApi.load(s).catch(() => undefined)))
-                .then(() => fireOnce())
-                .catch(() => fireOnce());
-            // Safety net: never wait more than 3s on the font fetch.
-            this.storage.initTimer = setTimeout(() => fireOnce(), 3000);
-        } else {
-            // No FontFaceSet API (SSR, very old browsers): fall back to the
-            // legacy setTimeout(0) trigger so pagination still runs.
-            this.storage.initTimer = setTimeout(() => {
-                this.storage.initTimer = null;
-                triggerInitialPagination();
-            }, 0);
-        }
-    },
-
-    onDestroy() {
-        if (this.storage.initTimer != null) {
-            clearTimeout(this.storage.initTimer);
-            this.storage.initTimer = null;
-        }
-    },
-
-    addProseMirrorPlugins() {
-        return [createPaginationPlugin(this)];
-    },
-
-    addKeyboardShortcuts() {
-        return {
-            Backspace: ({ editor }) => {
-                // ProseMirror's joinMaybeClear (a joinBackward variant) deletes
-                // the PREVIOUS block instead of the current one whenever the
-                // previous block is empty and the two blocks share a type. If
-                // that empty previous block is a locked page anchor the plugin's
-                // filterTransaction rejects the resulting transaction — the
-                // anchor's data-id would disappear — and the cursor appears
-                // stuck. Patch both flavors of the case (empty current and
-                // non-empty current) so the locked anchor survives and the user
-                // still gets the natural "step up one line" / "merge up" feel.
-                const { state, view } = editor;
-                const { $from, empty } = state.selection;
-                if (!empty || $from.parentOffset !== 0) return false;
-
-                const opts = this.options as PaginationOptions;
-                if (!opts.getPageLocking?.()) return false;
-                const pageLocks = opts.getPageLocks?.();
-                if (!pageLocks) return false;
-
-                const curStart = $from.before();
-                if (curStart === 0) return false;
-
-                // Collapse case: the current block is itself a locked page anchor
-                // and is now empty (the page's last element was just deleted).
-                // Default joinBackward would remove the anchor's data-id and the
-                // guard would reject it, leaving a blank page with a stranded
-                // empty node. Instead delete the empty anchor node and drop the
-                // cursor at the end of the previous page. The lock stays in the
-                // map as an orphan so the page's frozen number is absorbed into
-                // the following page as a range (e.g. "5-6") rather than vanishing.
-                const curDataId = $from.parent.attrs?.["data-id"];
-                if (
-                    $from.parent.textContent.length === 0 &&
-                    typeof curDataId === "string" &&
-                    pageLocks[curDataId]
-                ) {
-                    const tr = state.tr;
-                    tr.delete(curStart, $from.after());
-                    tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
-                    tr.setMeta(PAGE_COLLAPSE_META, true);
-                    view.dispatch(tr);
-                    return true;
-                }
-
-                const prev = state.doc.resolve(curStart).nodeBefore;
-                if (!prev || prev.textContent.length !== 0) return false;
-
-                const prevDataId = prev.attrs?.["data-id"];
-                if (typeof prevDataId !== "string" || !pageLocks[prevDataId]) return false;
-
-                const tr = state.tr;
-                if ($from.parent.textContent.length === 0) {
-                    // Both blocks empty: drop the current empty block — the
-                    // locked anchor stays put and the cursor parks inside it.
-                    tr.delete(curStart, $from.after());
-                } else {
-                    // Current has text: merge it INTO the empty previous block
-                    // via tr.join, which keeps the before node's structure
-                    // (and its locked data-id) and absorbs after's content.
-                    // join requires both children to share a type; for cross-
-                    // type cases we bail out and let the default chain do
-                    // whatever fallback it has — those cases don't trip
-                    // joinMaybeClear in the first place.
-                    if (prev.type !== $from.parent.type) return false;
-                    tr.join(curStart);
-                }
-                tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
-                view.dispatch(tr);
-                return true;
-            },
-        };
-    },
-
-    addCommands() {
-        return {
-            updatePageSize:
-                (size) =>
-                ({ tr }) => {
-                    Object.assign(this.options, size);
-                    syncVars(this.editor.view.dom, this.options);
-                    tr.setMeta("pageFormatUpdate", true);
-                    return true;
-                },
-            updatePageHeight:
-                (h) =>
-                ({ tr }) => {
-                    this.options.pageHeight = h;
-                    syncVars(this.editor.view.dom, this.options);
-                    tr.setMeta("pageFormatUpdate", true);
-                    return true;
-                },
-            updatePageWidth:
-                (w) =>
-                ({ tr }) => {
-                    this.options.pageWidth = w;
-                    syncVars(this.editor.view.dom, this.options);
-                    tr.setMeta("pageFormatUpdate", true);
-                    return true;
-                },
-            updatePageGap:
-                (g) =>
-                ({ tr }) => {
-                    this.options.pageGap = g;
-                    tr.setMeta("forcePaginationUpdate", true);
-                    return true;
-                },
-            updateMargins:
-                (m) =>
-                ({ tr }) => {
-                    Object.assign(this.options, {
-                        marginTop: m.top,
-                        marginBottom: m.bottom,
-                        marginLeft: m.left,
-                        marginRight: m.right,
-                    });
-                    syncVars(this.editor.view.dom, this.options);
-                    tr.setMeta("pageFormatUpdate", true);
-                    return true;
-                },
-            updateHeaderContent:
-                (l, r, p) =>
-                ({ tr }) => {
-                    if (p !== undefined) this.options.customHeader[p] = { headerLeft: l, headerRight: r };
-                    else {
-                        this.options.headerLeft = l;
-                        this.options.headerRight = r;
-                    }
-                    tr.setMeta("forcePaginationUpdate", true);
-                    return true;
-                },
-            updateFooterContent:
-                (l, r, p) =>
-                ({ tr }) => {
-                    if (p !== undefined) this.options.customFooter[p] = { footerLeft: l, footerRight: r };
-                    else {
-                        this.options.footerLeft = l;
-                        this.options.footerRight = r;
-                    }
-                    tr.setMeta("forcePaginationUpdate", true);
-                    return true;
-                },
-            updatePageBreakBackground:
-                (c) =>
-                ({ tr }) => {
-                    this.options.pageBreakBackground = c;
-                    tr.setMeta("forcePaginationUpdate", true);
-                    return true;
-                },
-            updateStartNewPageTypes:
-                (types) =>
-                ({ tr }) => {
-                    this.options.startNewPageTypes = types;
-                    this.editor.view.dom.dataset.startNewPageTypes = JSON.stringify([...types]);
-                    tr.setMeta("forcePaginationUpdate", true);
-                    return true;
-                },
-            refreshPagination:
-                () =>
-                ({ tr }) => {
-                    tr.setMeta("forcePaginationUpdate", true);
-                    return true;
-                },
-        };
-    },
-});
-
-/**
- * Returns the 1-based page number for a given document position,
- * using the pagination plugin state stored in the editor.
- * Returns 1 if pagination state is unavailable.
- */
-export function getPageForPos(editor: Editor, pos: number): number {
-    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
-    if (!state || state.breaks.length === 0) return 1;
-    let page = 1;
-    for (const b of state.breaks) {
-        if (b.pos > pos) break;
-        page = b.pagenum;
-    }
-    return page;
-}
-
-/**
- * Returns the display label (e.g. "4", "4A") for the page containing
- * the given document position. Falls back to the integer pagenum when
- * page locking isn't active.
- */
-export function getPageLabelForPos(editor: Editor, pos: number): string {
-    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
-    if (!state) return "1";
-    if (state.breaks.length === 0) return state.firstPageLabel;
-    let label = state.firstPageLabel;
-    for (const b of state.breaks) {
-        if (b.pos > pos) break;
-        label = b.label ?? String(b.pagenum);
-    }
-    return label;
-}
-
-/**
- * Returns the ordered list of page anchors for the current document
- * (page 1 sentinel first, then the data-id of each subsequent page's
- * first top-level node). Used by the ProductionPanel to snapshot the
- * current layout when locking pages and to compute provisional labels.
- *
- * Synthetic empty-page breaks contribute their orphan anchor id, so the
- * sequence stays aligned with what the user sees in the editor.
- */
-export function getPageAnchors(editor: Editor): string[] {
-    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
-    if (!state) return [PAGE_ONE_KEY];
-    const out: string[] = [PAGE_ONE_KEY];
-    for (const b of state.breaks) {
-        if (b.anchorId) out.push(b.anchorId);
-    }
-    return out;
-}
-
-export interface PageAnchorInfo {
-    anchorId: string;
-    /** Character offset within the anchor node where the page begins.
-     *  Set when the page starts on the bottom half of a sentence-split node;
-     *  undefined for whole-node anchors. Frozen into the page lock so the
-     *  split survives recomputes. */
-    splitOffset?: number;
-}
-
-/**
- * Same ordering as {@link getPageAnchors} but each entry also carries the
- * splitOffset (when the page begins mid-node). Used by the production panel
- * when first locking pages so the lock map can reproduce mid-node splits
- * on subsequent recomputes.
- */
-export function getPageAnchorInfo(editor: Editor): PageAnchorInfo[] {
-    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
-    if (!state) return [{ anchorId: PAGE_ONE_KEY }];
-    const out: PageAnchorInfo[] = [{ anchorId: PAGE_ONE_KEY }];
-    for (const b of state.breaks) {
-        if (!b.anchorId) continue;
-        const entry: PageAnchorInfo = { anchorId: b.anchorId };
-        if (b.splitOffset != null) entry.splitOffset = b.splitOffset;
-        out.push(entry);
-    }
-    return out;
-}
-
-/**
- * Force a pagination recompute. Call when the page-lock map or the
- * page-locking toggle changes — layout may shift even though the
- * document content did not.
- */
-export function refreshPageLocking(editor: Editor | null): void {
-    if (!editor || !editor.view) return;
-    const tr = editor.state.tr;
-    tr.setMeta("forcePaginationUpdate", true);
-    tr.setMeta("addToHistory", false);
-    editor.view.dispatch(tr);
-}
+import { DOMSerializer } from "@node_modules/prosemirror-model/dist";
+import { CircularBuffer } from "@src/lib/utils/circular-buffer";
+import { ScreenplayElement } from "@src/lib/utils/enums";
+import { Editor, Extension } from "@tiptap/core";
+import { Node } from "@tiptap/pm/model";
+import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
+import { Decoration, DecorationSet } from "@tiptap/pm/view";
+import { ySyncPluginKey } from "@tiptap/y-tiptap";
+
+import {
+    buildSceneAlphabet,
+    compareTokens,
+    compileSceneLabel,
+    computeSceneLabels,
+    SceneLabel,
+    SceneToken,
+} from "@src/lib/screenplay/scene-locking";
+import { PAGE_COLLAPSE_META, PAGE_ONE_KEY, PersistentPageMap, SCENE_OMIT_META } from "@src/lib/screenplay/page-locking";
+import { timeApply } from "./apply-timing";
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+/** Matches --line-height in scriptio.css. Used for split thresholds. */
+const LINE_HEIGHT = 16; // px
+
+/** Minimum freespace (in px) on the current page to even attempt a sentence split.
+ *  Below this, it is not worth splitting — just move the whole node to the next page. */
+const MIN_SPLIT_FREESPACE = LINE_HEIGHT * 3;
+
+/** Minimum lines the bottom half of a split must have.
+ *  If the remainder would be shorter, we force-fit the whole node on the next page instead. */
+const MIN_SPLIT_BOTTOM_LINES = 2;
+
+/** Sentence segmenter for straddling splits. Created once at module load. */
+const sentenceSegmenter = "Segmenter" in Intl ? new Intl.Segmenter("en", { granularity: "sentence" }) : null;
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+interface NodeInfo {
+    pos: number;
+    type: ScreenplayElement;
+    height: number;
+    positionTop: number;
+    /** data-id of the top-level node, used by page locking to anchor breaks. */
+    dataId?: string;
+}
+
+interface BreakLogic {
+    /** Node must not be the last on a page — pull it to the next page with its following node. */
+    keepWithNext: boolean;
+    /** Node can be split mid-text at sentence boundaries when straddling a page break. */
+    canSplit: boolean;
+    /** Minimum node height (px) before attempting a split; 0 means always try. */
+    minSplitHeight: number;
+    /** Show (MORE) and CHARACTER (CONT'D) labels around the break — true for dialogue splits. */
+    showMoreContd: boolean;
+}
+
+const BREAK_LOGIC: Partial<Record<ScreenplayElement, BreakLogic>> = {
+    // Scene headings and character cues must never be stranded at the bottom of a page.
+    [ScreenplayElement.Scene]: { keepWithNext: true, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+    [ScreenplayElement.Character]: { keepWithNext: true, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+    [ScreenplayElement.Parenthetical]: { keepWithNext: true, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+    // Action and Dialogue can straddle pages at sentence boundaries.
+    [ScreenplayElement.Action]: {
+        keepWithNext: false,
+        canSplit: true,
+        minSplitHeight: LINE_HEIGHT * 4,
+        showMoreContd: false,
+    },
+    [ScreenplayElement.Dialogue]: { keepWithNext: false, canSplit: true, minSplitHeight: 0, showMoreContd: true },
+    // Everything else just moves whole to the next page.
+    [ScreenplayElement.Transition]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+    [ScreenplayElement.Section]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+    [ScreenplayElement.Note]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+    [ScreenplayElement.None]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+    // Dual dialogue is an indivisible block — always moves whole to the next page.
+    [ScreenplayElement.DualDialogue]: { keepWithNext: false, canSplit: false, minSplitHeight: 0, showMoreContd: false },
+};
+
+export interface PageSize {
+    pageHeight: number;
+    pageWidth: number;
+}
+
+export const PAGE_SIZES: Record<string, PageSize> = {
+    LETTER: { pageHeight: 1060, pageWidth: 818 },
+    A4: { pageHeight: 1123, pageWidth: 794 },
+};
+
+export type PageNumber = number;
+
+export interface HeaderOptions {
+    headerLeft: string;
+    headerRight: string;
+}
+export interface FooterOptions {
+    footerLeft: string;
+    footerRight: string;
+}
+
+export interface PaginationOptions {
+    pageHeight: number; // full physical page height in px
+    pageWidth: number; // full physical page width in px
+    pageGap: number; // visual gap between pages in px
+    pageGapBorderSize: number;
+    pageGapBorderColor: string;
+    pageBreakBackground: string;
+    marginTop: number; // page margin top in px (space reserved for header + padding)
+    marginBottom: number; // page margin bottom in px (space reserved for footer + padding)
+    marginLeft: number; // page margin left in px (used for header/footer alignment)
+    marginRight: number; // page margin right in px (used for header/footer alignment)
+    headerLeft: string;
+    headerRight: string;
+    footerLeft: string;
+    footerRight: string;
+    customHeader: Record<PageNumber, HeaderOptions>;
+    customFooter: Record<PageNumber, FooterOptions>;
+    /** Element types that force a page break before them. */
+    startNewPageTypes: Set<string>;
+    /**
+     * Production page-lock getters. When the editor is wired with page
+     * locking, these expose the live toggle and lock map. Optional so test
+     * harnesses and benchmarks can keep their lean Pagination.configure calls.
+     */
+    getPageLocking?: () => boolean;
+    getPageLocks?: () => PersistentPageMap;
+    /** Letters skipped from generated labels (shared with scene locking). */
+    getSkippedLetters?: () => readonly string[];
+    /** Tokens of locked pages that an omitted scene collapsed out of the
+     *  document. Rendered as a combined range on the preceding surviving page
+     *  (e.g. "4-5") so omitting a full page doesn't leave a gap in the
+     *  numbering. Empty/absent when no scene is omitted. */
+    getOmittedPages?: () => SceneToken[];
+}
+
+export interface PageBreakInfo {
+    pos: number; // document position of the break; may be mid-node for sentence splits
+    pagenum: number; // page number AFTER this break
+    freespace: number; // empty space remaining at the bottom of the ending page's content area
+    contdName: string; // non-empty only for dialogue splits: Character cue name for the (CONT'D) label
+    splitNodeType: ScreenplayElement | null; // non-null when the break is mid-node (sentence split); drives overlay escape
+    /** data-id of the top-level node that begins the page after this break.
+     *  Set on every non-synthetic break; used by page locking to detect orphan locks. */
+    anchorId?: string;
+    /** True for synthetic breaks that represent an entirely empty (orphan-locked) page.
+     *  The widget renders the empty content area + the next page's chrome on top of
+     *  the normal break chrome. */
+    isEmpty?: boolean;
+    /** Display label for the page beginning after this break (e.g. "4", "4A").
+     *  Equals String(pagenum) when no page-lock is in effect. */
+    label?: string;
+    /** Display label for the page ending before this break — used by the footer of
+     *  the previous page. Undefined for the first break (footer uses page-1 label). */
+    prevLabel?: string;
+    /** Character offset within the anchor node where the break occurs.
+     *  Set for sentence-split breaks (mid-node) — both the original split and
+     *  the locked re-application of it — and read by the production panel when
+     *  freezing page locks so the split can be reproduced on later recomputes. */
+    splitOffset?: number;
+}
+
+declare module "@tiptap/core" {
+    interface Commands<ReturnType> {
+        Pagination: {
+            updatePageSize: (size: Partial<PageSize>) => ReturnType;
+            updatePageHeight: (height: number) => ReturnType;
+            updatePageWidth: (width: number) => ReturnType;
+            updatePageGap: (gap: number) => ReturnType;
+            updateMargins: (margins: { top: number; bottom: number; left: number; right: number }) => ReturnType;
+            updateHeaderContent: (left: string, right: string, pageNumber?: PageNumber) => ReturnType;
+            updateFooterContent: (left: string, right: string, pageNumber?: PageNumber) => ReturnType;
+            updatePageBreakBackground: (color: string) => ReturnType;
+            updateStartNewPageTypes: (types: Set<string>) => ReturnType;
+            refreshPagination: () => ReturnType;
+        };
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Default options
+// ---------------------------------------------------------------------------
+
+const defaultOptions: PaginationOptions = {
+    pageHeight: 1060,
+    pageWidth: 818,
+    pageGap: 40,
+    pageGapBorderSize: 1,
+    pageGapBorderColor: "#e5e5e5",
+    pageBreakBackground: "#ffffff",
+    marginTop: 96, // 1in
+    marginBottom: 96, // 1in
+    marginLeft: 144, // 1.5in
+    marginRight: 96, // 1in
+    headerLeft: "",
+    headerRight: "",
+    footerLeft: "",
+    footerRight: "{page}",
+    customHeader: {},
+    customFooter: {},
+    startNewPageTypes: new Set<string>(),
+};
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function syncVars(dom: HTMLElement, o: PaginationOptions) {
+    const vars: Record<string, string> = {
+        "page-height": `${o.pageHeight}px`,
+        "page-width": `${o.pageWidth}px`,
+        "page-margin-top": `${o.marginTop}px`,
+        "page-margin-bottom": `${o.marginBottom}px`,
+        "page-margin-left": `${o.marginLeft}px`,
+        "page-margin-right": `${o.marginRight}px`,
+        "page-gap": `${o.pageGap}px`,
+        "page-gap-border-size": `${o.pageGapBorderSize}px`,
+        "page-gap-border-color": o.pageGapBorderColor,
+        "page-break-background": o.pageBreakBackground,
+    };
+    Object.entries(vars).forEach(([k, v]) => dom.style.setProperty(`--${k}`, v));
+}
+
+// ---------------------------------------------------------------------------
+// Decoration builders
+// ---------------------------------------------------------------------------
+
+/**
+ * A header/footer span, built once per (class, html) and cloned on reuse.
+ *
+ * The left/right strings are HTML templates — the default page-number header
+ * is e.g. `<p class="page-number" ...>{page}.</p>` — so the content must be
+ * parsed as markup (innerHTML), not inserted as literal text. Parsing is the
+ * expensive part; a screenplay has only as many distinct strings as it has
+ * page labels, so caching the parsed span and `cloneNode`-ing it skips the
+ * HTML parse on the per-keystroke widget rebuilds. Bounded so a session that
+ * churns through many labels can't grow it without limit.
+ */
+const areaSpanCache = new Map<string, HTMLSpanElement>();
+
+function makeAreaSpan(className: string, html: string): HTMLSpanElement {
+    const key = `${className}${html}`;
+    let tpl = areaSpanCache.get(key);
+    if (!tpl) {
+        tpl = document.createElement("span");
+        tpl.className = className;
+        tpl.innerHTML = html;
+        if (areaSpanCache.size > 2000) areaSpanCache.clear();
+        areaSpanCache.set(key, tpl);
+    }
+    return tpl.cloneNode(true) as HTMLSpanElement;
+}
+
+function appendAreaSpans(area: HTMLElement, kind: "header" | "footer", left: string, right: string): void {
+    if (!left && !right) return;
+    area.appendChild(makeAreaSpan(`pagination-${kind}-left`, left));
+    area.appendChild(makeAreaSpan(`pagination-${kind}-right`, right));
+}
+
+function fillHeader(area: HTMLElement, pagenum: number, label: string, options: PaginationOptions): void {
+    const custom = options.customHeader[pagenum];
+    const left = custom?.headerLeft ?? options.headerLeft;
+    const right = (custom?.headerRight ?? options.headerRight).replace("{page}", label);
+    appendAreaSpans(area, "header", left, right);
+}
+
+function fillFooter(area: HTMLElement, pagenum: number, label: string, options: PaginationOptions): void {
+    const custom = options.customFooter[pagenum];
+    const left = custom?.footerLeft ?? options.footerLeft;
+    const right = (custom?.footerRight ?? options.footerRight).replace("{page}", label);
+    appendAreaSpans(area, "footer", left, right);
+}
+
+/**
+ * Let offscreen widgets skip style recalculation and layout entirely.
+ *
+ * A mid-document edit shifts every following page boundary, so ProseMirror
+ * relocates (recreates) every downstream break widget — content-visibility
+ * keeps the browser from doing rendering work for the ones outside the
+ * viewport, which is almost all of them. The exact intrinsic height keeps
+ * in-flow geometry (and the PDF adapter's measurements) identical while
+ * skipped.
+ *
+ * NOT applied to mid-node split widgets: their overlay escapes the container
+ * box via negative offsets, and the paint containment implied by
+ * content-visibility would clip it.
+ */
+function containOffscreen(container: HTMLElement, intrinsicHeight: number): void {
+    container.style.setProperty("content-visibility", "auto");
+    container.style.setProperty("contain-intrinsic-size", `none ${intrinsicHeight}px`);
+}
+
+function createFirstPageWidget(firstPageLabel: string, options: PaginationOptions): HTMLElement {
+    const container = document.createElement("div");
+    container.className = "pagination-first-page";
+    container.contentEditable = "false";
+
+    const spacer = document.createElement("div");
+    spacer.className = "pagination-spacer";
+    spacer.style.height = `${options.marginTop}px`;
+
+    const overlay = document.createElement("div");
+    overlay.className = "pagination-overlay";
+    overlay.style.top = "0";
+    overlay.style.height = `${options.marginTop}px`;
+
+    const headerArea = document.createElement("div");
+    headerArea.className = "pagination-header-area";
+    headerArea.style.height = `${options.marginTop}px`;
+    fillHeader(headerArea, 1, firstPageLabel, options);
+
+    overlay.appendChild(headerArea);
+    container.appendChild(spacer);
+    container.appendChild(overlay);
+    containOffscreen(container, options.marginTop);
+    return container;
+}
+
+/**
+ * Returns the CSS variable names for the left and right padding of a split node type.
+ * Used to compute the negative offsets needed to make the overlay escape the parent
+ * <p> element's content area and span the full page width.
+ */
+function getSplitPaddingVars(nodeType: ScreenplayElement): [string, string] {
+    // Screenplay elements now use element-specific margin variables (e.g., --action-l-margin)
+    // rather than a global page margin.
+    return [`var(--${nodeType}-l-margin)`, `var(--${nodeType}-r-margin)`];
+}
+
+/**
+ * Static skeleton for the page-break widget, built once and cloned per use.
+ *
+ * createPageBreakWidget runs for every break that changes on a keystroke, and
+ * the profiler showed its `createElement`/`appendChild` calls adding up. The
+ * structure (container › spacer + overlay › footer + divider + header) is
+ * identical for every break — only heights and label text differ — so the
+ * tree is assembled once here and a single native `cloneNode(true)` replaces
+ * the ~10 element-creation calls. Only the static styling lives on the
+ * skeleton; per-break heights/content are patched onto the clone.
+ *
+ * Clone layout (indices are stable — optional empty/contd nodes are appended
+ * after, so they never shift these):
+ *   clone.children[0]            = spacer
+ *   clone.children[1]            = overlay
+ *   overlay.children[0/1/2]      = footer / divider / header
+ */
+let pageBreakSkeleton: HTMLDivElement | null = null;
+
+function getPageBreakSkeleton(): HTMLDivElement {
+    if (pageBreakSkeleton) return pageBreakSkeleton;
+
+    const container = document.createElement("div");
+    container.className = "pagination-page-break";
+    container.contentEditable = "false";
+
+    const spacer = document.createElement("div");
+    spacer.className = "pagination-spacer";
+
+    const overlay = document.createElement("div");
+    overlay.className = "pagination-overlay";
+    overlay.style.top = "0";
+
+    const footerArea = document.createElement("div");
+    footerArea.className = "pagination-footer-area";
+
+    const divider = document.createElement("div");
+    divider.className = "pagination-divider";
+    divider.style.backgroundColor = "var(--main-bg)";
+
+    const headerArea = document.createElement("div");
+    headerArea.className = "pagination-header-area";
+
+    overlay.appendChild(footerArea);
+    overlay.appendChild(divider);
+    overlay.appendChild(headerArea);
+    container.appendChild(spacer);
+    container.appendChild(overlay);
+
+    pageBreakSkeleton = container;
+    return container;
+}
+
+function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOptions): HTMLElement {
+    const container = getPageBreakSkeleton().cloneNode(true) as HTMLDivElement;
+    const spacer = container.children[0] as HTMLElement;
+    const overlay = container.children[1] as HTMLElement;
+    const footerArea = overlay.children[0] as HTMLElement;
+    const divider = overlay.children[1] as HTMLElement;
+    const headerArea = overlay.children[2] as HTMLElement;
+
+    const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
+    const isEmpty = !!breakInfo.isEmpty;
+
+    // Empty (orphan-locked) pages append `contentHeight` worth of blank
+    // content to the normal break chrome — the prev→empty transition is
+    // rendered here (footer of prev, gap, header of the empty page, then
+    // the empty content area). The empty→next transition is handled by
+    // the break that follows this one in the breaks array (a lock force-
+    // break, or a subsequent orphan synthetic, or the last-page widget).
+    // Splitting it this way keeps each page transition rendered exactly
+    // once and lets the synthetic absorb the previous page's freespace.
+    const emptyPageExtension = isEmpty ? contentHeight : 0;
+
+    // Spacer: pushes text in the document flow past the entire page boundary.
+    // Includes freespace because the spacer is the only thing that moves text.
+    const spacerHeight =
+        breakInfo.freespace + options.marginBottom + options.pageGap + options.marginTop + emptyPageExtension;
+    spacer.style.height = `${spacerHeight}px`;
+
+    // Overlay: sits on top of the spacer (top:0, same height).
+    // Uses flex justify-content:flex-end so footer/divider/header are pushed to the bottom.
+    // The remaining space at the top is the freespace zone, covered by the overlay's background.
+    overlay.style.height = `${spacerHeight}px`;
+
+    // For mid-node splits, the widget is inserted inside a padded <p> element.
+    // The overlay's position:absolute is relative to the container, which is bounded
+    // by the <p>'s content area — so left:0/right:0 only reaches the text column edges,
+    // not the page edges. We escape the parent padding by negating it with the same CSS
+    // variables that define the node type's padding, restoring full-page coverage.
+    if (breakInfo.splitNodeType !== null) {
+        const [leftVar, rightVar] = getSplitPaddingVars(breakInfo.splitNodeType);
+        overlay.style.left = `calc(-1 * ${leftVar})`;
+        overlay.style.right = `calc(-1 * ${rightVar})`;
+    }
+
+    // Labels for the surrounding pages. Defaults preserve legacy behavior
+    // (pagenum-1 / pagenum) when no labels were assigned (page locking off).
+    const prevLabel = breakInfo.prevLabel ?? String(breakInfo.pagenum - 1);
+    const thisLabel = breakInfo.label ?? String(breakInfo.pagenum);
+
+    // Footer area of the ending page (fixed size = marginBottom)
+    footerArea.style.height = `${options.marginBottom}px`;
+    fillFooter(footerArea, breakInfo.pagenum - 1, prevLabel, options);
+
+    // Visual gap between pages (fixed size = pageGap)
+    divider.style.height = `${options.pageGap}px`;
+
+    // Header area of the new page (fixed size = marginTop)
+    headerArea.style.height = `${options.marginTop}px`;
+    fillHeader(headerArea, breakInfo.pagenum, thisLabel, options);
+
+    if (isEmpty) {
+        // Empty content area for the orphan-locked page. Renders a faint
+        // label centred in the page so the user can see which locked
+        // number is being preserved. The empty→next transition (footer of
+        // this empty page, gap, header of the next page) is rendered by
+        // the break that follows this synthetic in the breaks array.
+        const emptyArea = document.createElement("div");
+        emptyArea.className = "pagination-empty-page";
+        emptyArea.style.height = `${contentHeight}px`;
+        emptyArea.textContent = thisLabel;
+        overlay.appendChild(emptyArea);
+    }
+
+    // For dialogue/parenthetical splits: add (MORE) at the end of the current page
+    // and CHARACTER (CONT'D) at the top of the next page.
+    // Both are position:absolute inside the overlay so they don't affect flow layout.
+    if (breakInfo.contdName) {
+        // (MORE) — centred at the dialogue column, one line above the footer area.
+        // CSS: bottom: calc(100% - 1lh) positions it just after the last content line on page N.
+        // Label text comes from the --more-label CSS variable via ::after.
+        const moreEl = document.createElement("div");
+        moreEl.className = "page-more-overlay";
+        overlay.appendChild(moreEl);
+
+        // CHARACTER (CONT'D) — left-aligned at the character column, one line before the new content.
+        // CSS: top: calc(100% - 1lh) positions it just before the first content line on page N+1.
+        // textContent holds the character name; the label comes from --contd-label via ::after.
+        const contdEl = document.createElement("div");
+        contdEl.className = "page-contd-overlay";
+        contdEl.textContent = breakInfo.contdName;
+        overlay.appendChild(contdEl);
+    }
+
+    // spacer + overlay are already in the cloned skeleton; nothing to append.
+    // Split widgets must keep full rendering: their overlay escapes the
+    // container box, which content-visibility's paint containment would clip.
+    if (breakInfo.splitNodeType === null) {
+        containOffscreen(container, spacerHeight);
+    }
+    return container;
+}
+
+function createLastPageWidget(
+    pagenum: number,
+    label: string,
+    freespace: number,
+    options: PaginationOptions,
+): HTMLElement {
+    const container = document.createElement("div");
+    container.className = "pagination-last-page";
+    container.contentEditable = "false";
+
+    const spacerHeight = freespace + options.marginBottom;
+    const spacer = document.createElement("div");
+    spacer.className = "pagination-spacer";
+    spacer.style.height = `${spacerHeight}px`;
+
+    const overlay = document.createElement("div");
+    overlay.className = "pagination-overlay";
+    overlay.style.top = "0";
+    overlay.style.height = `${spacerHeight}px`;
+
+    const footerArea = document.createElement("div");
+    footerArea.className = "pagination-footer-area";
+    footerArea.style.height = `${options.marginBottom}px`;
+    fillFooter(footerArea, pagenum, label, options);
+
+    overlay.appendChild(footerArea);
+    container.appendChild(spacer);
+    container.appendChild(overlay);
+    containOffscreen(container, spacerHeight);
+    return container;
+}
+
+/**
+ * Compact fingerprint of every option value baked into the widget DOM
+ * (spacer heights, header/footer markup). Appended to each widget key so
+ * an option change re-keys the widgets and forces a redraw — required now
+ * that widgets are constructed lazily and a matching key keeps the old DOM.
+ */
+function widgetOptionsFingerprint(options: PaginationOptions): string {
+    const src =
+        `${options.pageHeight}|${options.pageGap}|${options.marginTop}|${options.marginBottom}|` +
+        `${options.headerLeft}|${options.headerRight}|${options.footerLeft}|${options.footerRight}|` +
+        `${JSON.stringify(options.customHeader)}|${JSON.stringify(options.customFooter)}`;
+    // djb2 — collisions are vanishingly unlikely across the handful of option
+    // states a session sees, and a false match only delays a redraw until the
+    // next forced update.
+    let hash = 5381;
+    for (let i = 0; i < src.length; i++) hash = ((hash << 5) + hash + src.charCodeAt(i)) | 0;
+    return (hash >>> 0).toString(36);
+}
+
+/**
+ * Index the previous decoration set by `pos:key` so a rebuild can reuse the
+ * *exact same* Decoration instance for any widget that hasn't changed.
+ *
+ * This is the single most important optimization on the typing hot path. A
+ * mid-document edit shifts the last page's freespace, which forces a full
+ * rebuild even though all but a couple of widgets are untouched. ProseMirror's
+ * view diffing only keeps a widget's mounted DOM in place when it sees the
+ * *same Decoration object* across updates — a freshly built `Decoration.widget`
+ * with a matching key is still torn down and re-inserted when the surrounding
+ * content is dirty. Re-inserting ~95 widget subtrees into the editor's flat
+ * sibling list is what drives the document-wide "Recalculate Style" (the
+ * pagination `apply` itself is only ~1.7 ms; the view update is ~25 ms).
+ *
+ * By handing back the previous instance for unchanged widgets, only the
+ * handful that genuinely changed (typically just the last-page widget) get
+ * recreated, and the rest keep their DOM untouched — no style invalidation.
+ */
+function buildReuseMap(mapped: DecorationSet): Map<string, Decoration> {
+    const reuse = new Map<string, Decoration>();
+    for (const d of mapped.find()) {
+        const key = d.spec.key as string | undefined;
+        if (key) reuse.set(`${d.from}:${key}`, d);
+    }
+    return reuse;
+}
+
+function buildDecorations(
+    doc: Node,
+    breaks: PageBreakInfo[],
+    lastPageFreespace: number,
+    firstPageLabel: string,
+    options: PaginationOptions,
+    reuse?: Map<string, Decoration>,
+): DecorationSet {
+    const decorations: Decoration[] = [];
+    const fp = widgetOptionsFingerprint(options);
+
+    // Push a widget, reusing the previous Decoration instance when one exists at
+    // the same position with the same key (see buildReuseMap). Reusing the
+    // instance is what lets ProseMirror keep the mounted DOM in place instead of
+    // recreating the subtree. Widget DOM is also built LAZILY (toDOM closure,
+    // not an eager node): the closure only runs for widgets actually drawn, and
+    // a function has no `parentNode`, which is the other condition prosemirror's
+    // placeWidget needs to reuse DOM across differing instances.
+    const pushWidget = (pos: number, key: string, side: number, build: () => HTMLElement) => {
+        const existing = reuse?.get(`${pos}:${key}`);
+        decorations.push(existing ?? Decoration.widget(pos, build, { side, key }));
+    };
+
+    // Mark the first in-flow node of a page so its top margin can be zeroed.
+    //
+    // This replaces the CSS adjacent-sibling rules `.pagination-page-break + p`
+    // / `.pagination-first-page + p`. Those combinators are a per-keystroke
+    // performance trap: the editor is a *flat* list of thousands of sibling
+    // <p>/widget elements, and inserting or moving any element forces Blink to
+    // re-evaluate the `+ p` match across a long run of siblings — invalidating
+    // the style of the entire tail of the document (the ~3.4k-element
+    // "Recalculate Style" seen while typing). A plain class selector carries no
+    // sibling dependency, so only the handful of nodes whose first-of-page
+    // status actually changed get restyled.
+    const markPageStart = (pos: number, cls: string) => {
+        const node = doc.resolve(pos).nodeAfter;
+        if (node) decorations.push(Decoration.node(pos, pos + node.nodeSize, { class: cls }));
+    };
+
+    // First page top margin / header
+    pushWidget(0, `page-1-header-${firstPageLabel}-${fp}`, -1, () =>
+        createFirstPageWidget(firstPageLabel, options),
+    );
+    markPageStart(0, "pagination-doc-start");
+
+    // Page breaks
+    // The key MUST include every value that affects the widget DOM (freespace,
+    // contdName, splitNodeType, label, isEmpty, options fingerprint) — not just
+    // pagenum. A matching key keeps the previously drawn DOM, so a key that
+    // omits e.g. freespace causes stale spacer heights after content edits.
+    for (const b of breaks) {
+        const key = `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}-${b.label ?? ""}-${b.prevLabel ?? ""}-${b.isEmpty ? "E" : ""}-${fp}`;
+        pushWidget(b.pos, key, -1, () => createPageBreakWidget(b, options));
+        // Only whole-node breaks start a fresh node; mid-node sentence splits
+        // (splitNodeType !== null) keep the straddling node, which never had a
+        // margin to reset — the old `> .pagination-page-break + p` rule didn't
+        // match inside-<p> widgets either.
+        if (b.splitNodeType === null) markPageStart(b.pos, "pagination-break-start");
+    }
+
+    // Last page bottom margin / footer.
+    // Label of the last page = label of the most recent break (or firstPageLabel
+    // when no breaks exist).
+    const lastPagenum = breaks.length > 0 ? breaks[breaks.length - 1].pagenum : 1;
+    const lastPageLabel = breaks.length > 0 ? (breaks[breaks.length - 1].label ?? String(lastPagenum)) : firstPageLabel;
+    pushWidget(doc.content.size, `lp-${lastPagenum}-${lastPageLabel}-${lastPageFreespace}-${fp}`, 1, () =>
+        createLastPageWidget(lastPagenum, lastPageLabel, lastPageFreespace, options),
+    );
+
+    return DecorationSet.create(doc, decorations);
+}
+
+// ---------------------------------------------------------------------------
+// Height measurement
+// ---------------------------------------------------------------------------
+
+const heightCache = new Map<string, number>();
+
+const getHTMLHeight = (
+    domNode: HTMLElement,
+    editorDom: HTMLElement,
+    nodeType: string,
+    options: PaginationOptions,
+    contentSize?: number,
+): number => {
+    const textContent = domNode.textContent || "";
+    const sizePart = contentSize != null ? `${contentSize}:` : "";
+    const cacheKey = `${nodeType}:${options.pageWidth}:${options.marginLeft}:${options.marginRight}:${sizePart}${textContent}`;
+
+    if (heightCache.has(cacheKey)) {
+        return heightCache.get(cacheKey)!;
+    }
+
+    const testDiv = setupTestDiv(editorDom, options);
+    testDiv.innerHTML = domNode.outerHTML;
+
+    const rect = testDiv.getBoundingClientRect();
+    const height = Math.round(rect.height);
+
+    if (heightCache.size > 10000) heightCache.clear();
+    heightCache.set(cacheKey, height);
+
+    return height;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const setupTestDiv = (editorDom: HTMLElement, _: PaginationOptions): HTMLElement => {
+    let testDiv = document.getElementById("pagination-test-div");
+    if (!testDiv) {
+        testDiv = document.createElement("div");
+        testDiv.id = "pagination-test-div";
+        testDiv.className = "ProseMirror pagination";
+        testDiv.style.position = "fixed";
+        testDiv.style.top = "0";
+        testDiv.style.left = "-9999px";
+        testDiv.style.pointerEvents = "none";
+        testDiv.style.whiteSpace = "break-spaces";
+        testDiv.style.visibility = "hidden";
+
+        // position:fixed already establishes a block formatting context which
+        // prevents margin collapsing.  Using overflow:hidden as a belt-and-
+        // suspenders safeguard avoids the 2 px measurement error that the old
+        // 1 px transparent borders used to introduce on every height reading.
+        testDiv.style.overflow = "hidden";
+        // The .pagination class sets min-height: var(--page-height) for the editor,
+        // but the test div must shrink to fit each node's content.
+        testDiv.style.minHeight = "0";
+
+        document.body.appendChild(testDiv);
+    }
+
+    // Sync classes and CSS variables that affect layout from editor to test div.
+    // testDiv lives in <body>, not inside the editor, so it doesn't inherit the editor's CSS vars.
+    testDiv.className = editorDom.className;
+
+    // Copy all CSS variables from the live editor DOM to the test div. This includes
+    // both element margin/style vars (set by DocumentEditorPanel) and page dimension
+    // vars (set by syncVars inside each command before the transaction is dispatched).
+    // Reading from editorDom rather than from options avoids the stale-options problem:
+    // extension.options in apply() may lag behind the mutation done by the command.
+    for (let i = 0; i < editorDom.style.length; i++) {
+        const prop = editorDom.style[i];
+        if (prop.startsWith("--")) {
+            testDiv.style.setProperty(prop, editorDom.style.getPropertyValue(prop));
+        }
+    }
+
+    // Remove the pagination class whose `width: var(--page-width) !important` rule
+    // would fight our explicit width, then set the width directly from the value that
+    // syncVars already wrote to editorDom (guaranteed current for this transaction).
+    testDiv.classList.remove("pagination");
+    testDiv.style.width = editorDom.style.getPropertyValue("--page-width");
+
+    return testDiv;
+};
+
+// ---------------------------------------------------------------------------
+// Sentence splitting
+// ---------------------------------------------------------------------------
+
+interface SplitResult {
+    /** Absolute document position of the split point (inside the straddling node's text). */
+    pos: number;
+    /** Character offset within the node's text where the split occurs (= pos - nodeDocPos - 1). */
+    offset: number;
+    /** Rendered height of the portion staying on the current page. */
+    topHeight: number;
+    /** Rendered height of the portion moving to the next page. */
+    bottomHeight: number;
+}
+
+/**
+ * Attempts to split a straddling Action or Dialogue node at a sentence boundary.
+ *
+ * Strategy: use Intl.Segmenter to break the node's text into sentences, then find the
+ * longest sentence prefix whose rendered height fits within `freespace`. If the remaining
+ * bottom portion would be shorter than MIN_SPLIT_BOTTOM_LINES, the split is rejected and
+ * the whole node moves to the next page (same as the legacy behaviour).
+ *
+ * Height is measured using plain textContent (no inline marks) which is accurate for
+ * monospace fonts where bold/italic do not change character widths.
+ *
+ * Returns null when no valid split exists.
+ */
+function trySplitNode(
+    node: Node,
+    nodeDocPos: number,
+    freespace: number,
+    nodeElement: HTMLElement,
+    editorDOM: HTMLElement,
+    options: PaginationOptions,
+): SplitResult | null {
+    if (!sentenceSegmenter) return null;
+
+    const text = node.textContent as string;
+    const sentences = Array.from(sentenceSegmenter.segment(text), (s: Intl.SegmentData) => s.segment);
+
+    // A single sentence cannot be split at a boundary — move the whole node.
+    if (sentences.length <= 1) return null;
+
+    // Try progressively shorter prefixes (all-but-last, all-but-last-two, …)
+    // until one fits in the available freespace.
+    for (let i = sentences.length - 2; i >= 0; i--) {
+        const topText = sentences.slice(0, i + 1).join("");
+
+        // Measure the top half: clone the element (preserving tag + CSS class) with only the top text.
+        // Using textContent instead of innerHTML is intentional — for a monospace font, inline marks
+        // (bold, italic) do not change character widths, so the line count is the same.
+        const topElement = nodeElement.cloneNode(false) as HTMLElement;
+        topElement.textContent = topText;
+        const topHeight = getHTMLHeight(topElement, editorDOM, node.type.name, options);
+
+        if (topHeight <= freespace) {
+            // Measure the bottom half to guard against a degenerate single-line remainder.
+            const bottomText = sentences.slice(i + 1).join("");
+            const bottomElement = nodeElement.cloneNode(false) as HTMLElement;
+            bottomElement.textContent = bottomText;
+            const bottomHeight = getHTMLHeight(bottomElement, editorDOM, node.type.name, options);
+
+            // Bottom too short — not worth a split; force the whole node to the next page.
+            if (bottomHeight < LINE_HEIGHT * MIN_SPLIT_BOTTOM_LINES) return null;
+
+            // The split position in document space:
+            // nodeDocPos + 1 skips the node's opening token; topText.length then walks
+            // through the text characters (marks are zero-width in ProseMirror's position space).
+            return {
+                pos: nodeDocPos + 1 + topText.length,
+                offset: topText.length,
+                topHeight,
+                bottomHeight,
+            };
+        }
+    }
+
+    // No prefix fits — the first sentence alone is too tall; move the whole node.
+    return null;
+}
+
+// ---------------------------------------------------------------------------
+// Plugin
+// ---------------------------------------------------------------------------
+
+export const paginationKey = new PluginKey("pagination");
+
+interface PaginationState {
+    decset: DecorationSet;
+    breaks: PageBreakInfo[];
+    lastPageFreespace: number;
+    firstPageLabel: string;
+}
+
+/**
+ * Compute display labels for every page using the same token math that
+ * powers scene locking. Page 1 is anchored to the sentinel PAGE_ONE_KEY;
+ * later pages are anchored to the data-id of the top-level node that
+ * begins them. Returns one label per page (length = breaks.length + 1).
+ *
+ * Synthetic empty-page breaks consume one "logical page" each — their
+ * anchorId comes from the page-lock map, and the page that physically
+ * follows the empty slot gets its own label slot in the result.
+ */
+function computePageLabels(
+    breaks: PageBreakInfo[],
+    pageLocks: PersistentPageMap,
+    skippedLetters: readonly string[],
+): SceneLabel[] {
+    const anchors: string[] = [PAGE_ONE_KEY];
+    for (const b of breaks) {
+        // Empty pages anchor to the orphan lock's anchorId. Real pages anchor
+        // to the data-id of the top-level node where the page starts. If
+        // anchorId is somehow missing, fall back to a unique synthetic key
+        // so the label-computer still produces a usable result.
+        anchors.push(b.anchorId ?? `__break_${b.pos}_${b.pagenum}__`);
+    }
+    return computeSceneLabels(anchors, pageLocks, "suffix", skippedLetters);
+}
+
+const createPaginationPlugin = (extension: {
+    options: PaginationOptions;
+    editor: Editor;
+    storage: { fontsReady: boolean };
+}) =>
+    new Plugin({
+        key: paginationKey,
+        state: {
+            init: (): PaginationState => ({
+                decset: DecorationSet.empty,
+                breaks: [],
+                lastPageFreespace: 0,
+                firstPageLabel: "1",
+            }),
+            apply: timeApply("pagination", (tr, value: PaginationState, oldState, newState): PaginationState => {
+                // Wait for the screenplay fonts to finish loading before doing
+                // anything. Measuring against the OS monospace fallback writes
+                // wrong heights into the cache; gating here keeps the cache
+                // empty until the real font is in play. onCreate dispatches a
+                // forcePaginationUpdate once fonts.ready resolves, which is
+                // what eventually pulls us past this guard.
+                if (!extension.storage.fontsReady) return value;
+
+                const options = extension.options as PaginationOptions;
+                const formatUpdate = tr.getMeta("pageFormatUpdate");
+                const forceUpdate = tr.getMeta("forcePaginationUpdate");
+
+                // Only clear height cache on format changes (page size / margins) which
+                // affect text-wrapping widths and thus measured heights.
+                // forcePaginationUpdate (gaps, headers, startNewPage, refresh) changes
+                // layout but not node heights — the cached measurements stay valid.
+                if (formatUpdate) {
+                    heightCache.clear();
+                }
+
+                // Nothing pagination-related changed
+                if (!tr.docChanged && !forceUpdate && !formatUpdate) return value;
+
+                // UUID assignment by nodeIdDedup only changes data-id attrs — no layout impact
+                if (tr.getMeta("nodeDedupId")) return value;
+
+                const fullRemeasure = forceUpdate || formatUpdate;
+
+                // Track the furthest changed position for the short-circuit break optimization
+                let maxChangedPos = -1;
+                if (tr.docChanged && !fullRemeasure) {
+                    tr.steps.forEach((step) => {
+                        const map = step.getMap();
+                        map.forEach((_oS: number, _oE: number, _newStart: number, newEnd: number) => {
+                            if (newEnd > maxChangedPos) maxChangedPos = newEnd;
+                        });
+                    });
+                }
+
+                // Map old breaks through the transaction for short-circuit comparison
+                const mappedOldBreaks = !fullRemeasure
+                    ? value.breaks.map((b) => ({ ...b, pos: tr.mapping.map(b.pos) }))
+                    : [];
+                const oldBreakByPos = new Map<number, { info: PageBreakInfo; index: number }>();
+                mappedOldBreaks.forEach((b, i) => oldBreakByPos.set(b.pos, { info: b, index: i }));
+
+                // --- Single pass: measure heights + compute page breaks ---
+                const editor = extension.editor;
+                if (!editor.isInitialized || !extension.editor.view?.dom) return value;
+
+                const editorDOM = extension.editor.view.dom as HTMLElement;
+
+                // extension.options may lag behind the synchronous mutations done by the
+                // commands (Tiptap options-object identity issue). editorDOM's inline style
+                // is always current because syncVars writes to it inside every command,
+                // before the transaction is dispatched. Override the stale option fields.
+                const _ph = editorDOM.style.getPropertyValue("--page-height");
+                const _pw = editorDOM.style.getPropertyValue("--page-width");
+                const _mt = editorDOM.style.getPropertyValue("--page-margin-top");
+                const _mb = editorDOM.style.getPropertyValue("--page-margin-bottom");
+                const _ml = editorDOM.style.getPropertyValue("--page-margin-left");
+                const _mr = editorDOM.style.getPropertyValue("--page-margin-right");
+                if (_ph) options.pageHeight = parseFloat(_ph);
+                if (_pw) options.pageWidth = parseFloat(_pw);
+                if (_mt) options.marginTop = parseFloat(_mt);
+                if (_mb) options.marginBottom = parseFloat(_mb);
+                if (_ml) options.marginLeft = parseFloat(_ml);
+                if (_mr) options.marginRight = parseFloat(_mr);
+                const _snp = editorDOM.dataset.startNewPageTypes;
+                if (_snp) options.startNewPageTypes = new Set(JSON.parse(_snp));
+
+                const serializer = DOMSerializer.fromSchema(newState.schema);
+
+                // --- Page-lock setup ---
+                // Hot-path discipline: when locking is off (the common case),
+                // pageLocks/lockedAnchorIds stay null and the per-node check
+                // short-circuits on the first `&&` — zero allocations, zero
+                // map lookups. The set is rebuilt once per pass when locking
+                // is active; lock counts are typically tens, never thousands.
+                const pageLocking = options.getPageLocking?.() ?? false;
+                const pageLocks: PersistentPageMap | null = pageLocking ? (options.getPageLocks?.() ?? null) : null;
+                const lockedAnchorIds: Set<string> | null = pageLocks
+                    ? new Set(Object.keys(pageLocks).filter((k) => k !== PAGE_ONE_KEY))
+                    : null;
+                // Tracks locked anchors already consumed by a break in this pass.
+                // ProseMirror's split (Enter at position 0 of a node) duplicates
+                // node attrs across both halves — including data-id — so until
+                // node-id-dedup-extension runs in appendTransaction we transiently
+                // see the same locked anchor twice. Without this set, both halves
+                // would each force a page break, briefly rendering a phantom page
+                // with the same locked label until the dedup transaction fires.
+                const consumedAnchors = new Set<string>();
+                const skippedLetters = options.getSkippedLetters?.() ?? [];
+
+                const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
+                const breaks: PageBreakInfo[] = [];
+                let pagePos = 0;
+                let pagenum = 1;
+                const childCount = newState.doc.childCount;
+                let offset = 0;
+
+                // Tracks the most recent Character cue text so we can label split-dialogue breaks
+                // with "CHARACTER (CONT'D)" on the next page.
+                let lastCharName = "";
+
+                // Set when the short-circuit exits the per-node loop early.
+                // pagePos at that point reflects only the carry node(s) sitting
+                // on the new page right after the matched break — not the real
+                // last page — so the post-loop freespace computation must NOT
+                // derive from pagePos. The previous pass's lastPageFreespace is
+                // still authoritative because the short-circuit condition (matching
+                // pos / freespace / contdName past maxChangedPos) guarantees every
+                // subsequent page is byte-identical to the previous layout.
+                let shortCircuited = false;
+
+                let lastNodes: CircularBuffer<NodeInfo> = new CircularBuffer(3);
+                for (let i = 0; i < childCount; i++) {
+                    const node = newState.doc.child(i);
+                    const pos = offset;
+                    offset += node.nodeSize;
+
+                    if (!("height" in node.attrs)) continue;
+
+                    const nodeType = node.type.name as ScreenplayElement;
+                    const logic = BREAK_LOGIC[nodeType];
+
+                    // Use the module-level heightCache (keyed by content) to avoid re-serializing
+                    // unchanged nodes. Cache misses (new/edited content) trigger serialization.
+                    // element is hoisted so the split block can reuse it without a second serialize.
+                    const textContent = node.textContent || "";
+                    const cacheKey = `${node.type.name}:${options.pageWidth}:${options.marginLeft}:${options.marginRight}:${node.content.size}:${textContent}`;
+                    let height = heightCache.get(cacheKey) ?? null;
+                    let element: HTMLElement | null = null;
+
+                    if (height === null) {
+                        element = serializer.serializeNode(node) as HTMLElement;
+                        height = getHTMLHeight(element, editorDOM, node.type.name, options, node.content.size);
+                    }
+
+                    if (height == null) continue;
+
+                    // Track the most recent Character name for CONT'D labels.
+                    if (nodeType === ScreenplayElement.Character) {
+                        lastCharName = node.textContent.trim();
+                    }
+
+                    const dataId: string | undefined = node.attrs["data-id"];
+
+                    // --- Force page break for "start new page" elements ---
+                    // If this node type is configured to start a new page and we're
+                    // not already at the top of a page, insert a break before it.
+                    if (options.startNewPageTypes.has(nodeType) && pagePos > 0) {
+                        const freespace = contentHeight - pagePos;
+                        breaks.push({
+                            pos,
+                            pagenum: ++pagenum,
+                            freespace: Math.max(0, freespace),
+                            contdName: "",
+                            splitNodeType: null,
+                            anchorId: dataId,
+                        });
+                        pagePos = 0;
+                        lastNodes = new CircularBuffer(3);
+                    }
+
+                    // --- Force page break for locked page anchors ---
+                    // O(1) Set.has when locking is on; the leading `lockedAnchorIds &&`
+                    // short-circuits to false when locking is disabled — hot-path safe.
+                    // The `consumedAnchors` guard ignores the transient duplicate
+                    // data-id that appears after Enter splits a locked anchor — only
+                    // the first occurrence in doc order is honored as the lock site,
+                    // matching the post-dedup state and avoiding a phantom break.
+                    if (lockedAnchorIds && dataId && lockedAnchorIds.has(dataId) && !consumedAnchors.has(dataId)) {
+                        consumedAnchors.add(dataId);
+                        const lockInfo = pageLocks?.[dataId];
+                        const splitOffset = lockInfo?.splitOffset;
+                        const textLen = node.textContent?.length ?? 0;
+
+                        if (pagePos > 0 && splitOffset != null && splitOffset > 0 && splitOffset < textLen) {
+                            // The lock was originally created on a mid-node sentence split
+                            // (straddling dialogue or action). Reproduce that split here:
+                            // top portion stays on the current page, break goes at the
+                            // stored offset, bottom portion starts the locked page. Without
+                            // this branch the whole node would be force-pushed to the next
+                            // page, making the locked page taller than its frozen layout
+                            // and forcing a phantom "A" page to be inserted before it.
+                            if (!element) element = serializer.serializeNode(node) as HTMLElement;
+
+                            const topText = node.textContent.slice(0, splitOffset);
+                            const topElement = element.cloneNode(false) as HTMLElement;
+                            topElement.textContent = topText;
+                            const topHeight = getHTMLHeight(topElement, editorDOM, node.type.name, options);
+                            const bottomHeight = Math.max(0, height - topHeight);
+
+                            pagePos += topHeight;
+                            const freespace = contentHeight - pagePos;
+
+                            breaks.push({
+                                pos: pos + 1 + splitOffset,
+                                pagenum: ++pagenum,
+                                freespace: Math.max(0, freespace),
+                                contdName: logic?.showMoreContd ? lastCharName : "",
+                                splitNodeType: nodeType,
+                                anchorId: dataId,
+                                splitOffset,
+                            });
+
+                            pagePos = bottomHeight;
+                            lastNodes = new CircularBuffer(3);
+                            lastNodes.push({
+                                pos,
+                                type: nodeType,
+                                height: bottomHeight,
+                                positionTop: 0,
+                                dataId,
+                            });
+                            continue;
+                        }
+
+                        if (pagePos > 0) {
+                            // Whole-node lock: force break before the anchor so the locked
+                            // page begins exactly with this node.
+                            const freespace = contentHeight - pagePos;
+                            breaks.push({
+                                pos,
+                                pagenum: ++pagenum,
+                                freespace: Math.max(0, freespace),
+                                contdName: "",
+                                splitNodeType: null,
+                                anchorId: dataId,
+                            });
+                            pagePos = 0;
+                            lastNodes = new CircularBuffer(3);
+                        }
+                    }
+
+                    // Accumulate height on current page
+                    pagePos += height;
+
+                    // We keep the last 3 nodes for orphan resolution on page break
+                    lastNodes.push({
+                        pos,
+                        type: nodeType,
+                        height,
+                        positionTop: pagePos - height,
+                        dataId,
+                    });
+
+                    // Page break needed — record it and reset page position
+                    if (pagePos > contentHeight) {
+                        // freespace = how much room was left on the page before this node was added
+                        const freespaceBeforeNode = contentHeight - (pagePos - height);
+
+                        // --- Sentence split (Action / Dialogue only) ---
+                        // Tried BEFORE orphan resolution: a successful split keeps the top portion
+                        // on the current page without moving any preceding nodes.
+                        if (
+                            logic?.canSplit &&
+                            freespaceBeforeNode > MIN_SPLIT_FREESPACE &&
+                            height > logic.minSplitHeight
+                        ) {
+                            // Serialize lazily — only needed here when not already serialized above.
+                            if (!element) element = serializer.serializeNode(node) as HTMLElement;
+
+                            const split = trySplitNode(node, pos, freespaceBeforeNode, element, editorDOM, options);
+                            if (split) {
+                                breaks.push({
+                                    pos: split.pos,
+                                    pagenum: ++pagenum,
+                                    freespace: Math.max(0, freespaceBeforeNode - split.topHeight),
+                                    // contdName non-empty for dialogue: triggers (MORE)/(CONT'D) labels.
+                                    contdName: logic.showMoreContd ? lastCharName : "",
+                                    // splitNodeType drives the overlay padding-escape in createPageBreakWidget.
+                                    splitNodeType: nodeType,
+                                    // Anchor for page locking: the node being split owns both halves.
+                                    anchorId: dataId,
+                                    // splitOffset is captured by the production panel when locking,
+                                    // so the same mid-node split can be reproduced on later recomputes
+                                    // instead of force-pushing the whole node onto the locked page.
+                                    splitOffset: split.offset,
+                                });
+                                // The bottom half of the split node is the first item on the new page.
+                                pagePos = split.bottomHeight;
+                                lastNodes = new CircularBuffer(3);
+                                lastNodes.push({
+                                    pos,
+                                    type: nodeType,
+                                    height: split.bottomHeight,
+                                    positionTop: 0,
+                                    dataId,
+                                });
+                                continue; // split handled — skip orphan resolution for this node
+                            }
+                        }
+
+                        // --- Orphan resolution ---
+                        // Walk back through the buffer: if the last fitted node has keepWithNext,
+                        // slide the break back to its position (and carry its height to the next page).
+                        // Repeat once more for the double-orphan case (e.g. Character → Parenthetical).
+                        let breakPos = pos;
+                        let carryHeight = height; // cumulative height that moves to the next page
+                        let backCount = 0; // how many nodes slid back
+
+                        for (let back = 1; back <= 2; back++) {
+                            const prev = lastNodes.at(back); // at(1) = last fitted, at(2) = one before
+                            if (!prev) break;
+                            // A locked anchor owns its page and must never be displaced by
+                            // walkback — otherwise the next overflow would yank it onto an
+                            // A page and the locked frame would lose its head.
+                            if (lockedAnchorIds && prev.dataId && lockedAnchorIds.has(prev.dataId)) {
+                                break;
+                            }
+                            if (BREAK_LOGIC[prev.type]?.keepWithNext) {
+                                breakPos = prev.pos;
+                                carryHeight += prev.height;
+                                backCount = back;
+                            } else {
+                                break; // stop as soon as we find a node that is safe to end a page
+                            }
+                        }
+
+                        // freespace = space left before the first node that moved down.
+                        // lastNodes.at(backCount) is that first node; positionTop is its accumulated
+                        // page height just before it was added — i.e. the used space above it.
+                        const firstMovingNode = lastNodes.at(backCount);
+                        const freespace = contentHeight - (firstMovingNode?.positionTop ?? pagePos - height);
+
+                        // If the first node moving to the next page is Dialogue or Parenthetical,
+                        // the Character cue remains on the previous page and we need (MORE)/(CONT'D).
+                        // If the Character itself is being carried (e.g. Character → Parenthetical
+                        // double-orphan), the whole block starts fresh — no labels needed.
+                        const firstMovingType = firstMovingNode?.type;
+                        const isDialogueSplit =
+                            lastCharName !== "" &&
+                            (firstMovingType === ScreenplayElement.Dialogue ||
+                                firstMovingType === ScreenplayElement.Parenthetical);
+
+                        // Anchor = data-id of the first node that moved to the new page.
+                        // When backCount==0 the current node is the one moving (no walkback);
+                        // otherwise the carried-back node from the buffer owns the anchor.
+                        const anchorDataId = backCount === 0 ? dataId : firstMovingNode?.dataId;
+
+                        const breakInfo: PageBreakInfo = {
+                            pos: breakPos,
+                            pagenum: pagenum + 1,
+                            freespace: Math.max(0, freespace),
+                            contdName: isDialogueSplit ? lastCharName : "",
+                            splitNodeType: null,
+                            anchorId: anchorDataId,
+                        };
+                        breaks.push(breakInfo);
+                        pagenum++;
+                        pagePos = carryHeight;
+
+                        // positionTop values in the buffer are page-relative — reset and re-seed
+                        // with the carry nodes using new-page positionTop values so orphan checking
+                        // works correctly on the next break.
+                        const carryNodes: NodeInfo[] = [];
+                        let carryTop = 0;
+                        for (let back = backCount; back >= 0; back--) {
+                            const n = lastNodes.at(back)!;
+                            carryNodes.push({ ...n, positionTop: carryTop });
+                            carryTop += n.height;
+                        }
+                        lastNodes = new CircularBuffer(3);
+                        for (const n of carryNodes) lastNodes.push(n);
+
+                        // Short-circuit: past the changed range and this break matches an old break
+                        // (same position, freespace, and contdName) → layout is back in sync;
+                        // copy the remaining old breaks and stop the loop early.
+                        if (!fullRemeasure && pos > maxChangedPos) {
+                            const old = oldBreakByPos.get(breakInfo.pos);
+                            if (
+                                old &&
+                                old.info.freespace === breakInfo.freespace &&
+                                old.info.contdName === breakInfo.contdName
+                            ) {
+                                for (let j = old.index + 1; j < mappedOldBreaks.length; j++) {
+                                    pagenum++;
+                                    // Spread preserves all fields (contdName, splitNodeType, …); override pagenum only.
+                                    breaks.push({ ...mappedOldBreaks[j], pagenum });
+                                }
+                                shortCircuited = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // Compute remaining space on the last page so the last-page widget
+                // can pad it to full page height. Mutable because orphan handling
+                // may consume it: when an orphan synthetic empty page lands at
+                // doc end, it absorbs this freespace so the last real page stays
+                // at its full height and the empty page renders after it.
+                //
+                // When the per-node loop short-circuited, pagePos is the carry
+                // height after the matched break — NOT the height of the real
+                // last page — so deriving from it would make the last page's
+                // spacer grow or shrink with every edit on earlier pages. The
+                // short-circuit condition guarantees content past that break
+                // is identical to the previous pass, so the previously stored
+                // freespace is still the correct answer.
+                const lastPageFreespace = shortCircuited
+                    ? value.lastPageFreespace
+                    : Math.max(0, contentHeight - pagePos);
+
+                // --- Orphan page collection ---
+                // A locked page whose anchor data-id is no longer present in the
+                // doc is an "orphan" — e.g. the user emptied a locked page and
+                // collapsed it (see PAGE_COLLAPSE_META), or a collaborator's edit
+                // removed its anchor. Its frozen number must not vanish, so its
+                // token is folded into the FOLLOWING surviving page as a range
+                // ("5-6") — or reclaimed by a provisional page grown into the
+                // gap — by the absorb pipeline below, exactly like an omitted
+                // scene's removed pages.
+                const orphanTokens: SceneToken[] = [];
+                if (pageLocks) {
+                    const seenAnchors = new Set<string>();
+                    for (const b of breaks) {
+                        if (b.anchorId) seenAnchors.add(b.anchorId);
+                    }
+                    for (const [anchorId, page] of Object.entries(pageLocks)) {
+                        if (anchorId === PAGE_ONE_KEY || !page?.token) continue;
+                        if (seenAnchors.has(anchorId)) continue;
+                        orphanTokens.push(page.token);
+                    }
+                }
+
+                // --- Label assignment ---
+                // Run computeSceneLabels over [page1Anchor, ...breakAnchors] so locked
+                // pages keep their frozen labels, provisional inserts get suffix labels
+                // (e.g. "4A"), and pages past the last lock continue the integer sequence.
+                let firstPageLabel = "1";
+                if (pageLocks) {
+                    // Omitted scenes collapse whole locked pages out of the
+                    // document. Each such removed page contributes an "absorbed"
+                    // token we must keep visible so the numbering doesn't jump
+                    // ("14" then "16"). Two outcomes per token, decided below:
+                    //   1. RECLAIM — if content has grown a provisional (unlocked)
+                    //      page back into the gap where the token belongs, hand the
+                    //      token to that page so it becomes a real numbered page
+                    //      again ("15"). This is what lets a collapsed "15-16"
+                    //      revert to a fresh "15" + "16" as the user types.
+                    //   2. FOLD — no provisional page available: fold the token
+                    //      into the FOLLOWING surviving page as the low end of a
+                    //      range. Deleting page 15 makes the next page read
+                    //      "15-16"; deleting 14 too makes it "14-16".
+                    // Two sources feed this: omitted scenes (their locks were
+                    // deleted from the map; tokens come via getOmittedPages) and
+                    // orphan locks still in the map (collapsed/deleted pages).
+                    const absorbed = [...(options.getOmittedPages?.() ?? []), ...orphanTokens].sort(compareTokens);
+
+                    // Per-page frozen token (null for provisional pages). Page 0
+                    // is page 1 (PAGE_ONE_KEY); page p>0 starts at breaks[p-1].
+                    const pageCount = breaks.length + 1;
+                    const lockedTok: (SceneToken | null)[] = new Array(pageCount);
+                    for (let p = 0; p < pageCount; p++) {
+                        const anchor = p === 0 ? PAGE_ONE_KEY : breaks[p - 1].anchorId;
+                        lockedTok[p] = (anchor ? pageLocks[anchor]?.token : undefined) ?? null;
+                    }
+
+                    const synthetic: Record<string, { token: SceneToken }> = {};
+                    const leftover: SceneToken[] = [];
+                    if (absorbed.length > 0) {
+                        // Nearest locked token before / after each page, so we can
+                        // tell which gap a provisional page sits in.
+                        const prevLockedArr: (SceneToken | null)[] = new Array(pageCount);
+                        const nextLockedArr: (SceneToken | null)[] = new Array(pageCount);
+                        let seen: SceneToken | null = null;
+                        for (let p = 0; p < pageCount; p++) {
+                            prevLockedArr[p] = seen;
+                            if (lockedTok[p]) seen = lockedTok[p];
+                        }
+                        seen = null;
+                        for (let p = pageCount - 1; p >= 0; p--) {
+                            nextLockedArr[p] = seen;
+                            if (lockedTok[p]) seen = lockedTok[p];
+                        }
+
+                        const consumed = new Set<number>();
+                        for (const t of absorbed) {
+                            let placed = false;
+                            // Page 0 is page 1 and never reclaims an absorbed
+                            // number; start at the first real break.
+                            for (let p = 1; p < pageCount; p++) {
+                                if (consumed.has(p) || lockedTok[p]) continue;
+                                const before = prevLockedArr[p];
+                                const after = nextLockedArr[p];
+                                // Provisional page p is in t's gap when t sorts
+                                // strictly between the locks bounding p.
+                                if (
+                                    (before === null || compareTokens(before, t) < 0) &&
+                                    (after === null || compareTokens(t, after) < 0)
+                                ) {
+                                    const anchor = breaks[p - 1].anchorId;
+                                    if (anchor) {
+                                        synthetic[anchor] = { token: t };
+                                        consumed.add(p);
+                                        placed = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            if (!placed) leftover.push(t);
+                        }
+                    }
+
+                    // Reclaimed pages join the lock map for label computation so
+                    // they get their absorbed number (and following provisional
+                    // pages suffix off it: "18", "18A", …).
+                    const labelLocks =
+                        Object.keys(synthetic).length > 0 ? { ...pageLocks, ...synthetic } : pageLocks;
+                    const pageLabels = computePageLabels(breaks, labelLocks, skippedLetters);
+
+                    // Fold the unreclaimed tokens into the FOLLOWING surviving
+                    // page — the first page whose token is larger — so the
+                    // removed number becomes the low end of that page's range
+                    // ("15-16", then "14-16" as more are removed). A removed
+                    // page past the last surviving page has no follower; it
+                    // falls back to the last page as the high end instead.
+                    if (leftover.length > 0) {
+                        const alphabet = buildSceneAlphabet(skippedLetters);
+                        const bucket = new Map<number, SceneToken[]>();
+                        for (const t of leftover) {
+                            let attach = pageLabels.length - 1;
+                            for (let p = 0; p < pageLabels.length; p++) {
+                                if (compareTokens(pageLabels[p].token, t) > 0) {
+                                    attach = p;
+                                    break;
+                                }
+                            }
+                            const list = bucket.get(attach);
+                            if (list) list.push(t);
+                            else bucket.set(attach, [t]);
+                        }
+                        // A page's range spans the min..max of its own token plus
+                        // every number it absorbed — "14-16" for own 16 absorbing
+                        // 14 and 15, "14-15" for a trailing own 14 absorbing 15.
+                        for (const [p, tokens] of bucket) {
+                            let lo = pageLabels[p].token;
+                            let hi = pageLabels[p].token;
+                            for (const t of tokens) {
+                                if (compareTokens(t, lo) < 0) lo = t;
+                                if (compareTokens(t, hi) > 0) hi = t;
+                            }
+                            const loLabel = compileSceneLabel(lo, alphabet);
+                            const hiLabel = compileSceneLabel(hi, alphabet);
+                            pageLabels[p].label = loLabel === hiLabel ? loLabel : `${loLabel}-${hiLabel}`;
+                        }
+                    }
+
+                    firstPageLabel = pageLabels[0].label;
+                    for (let i = 0; i < breaks.length; i++) {
+                        breaks[i].label = pageLabels[i + 1].label;
+                        breaks[i].prevLabel = pageLabels[i].label;
+                    }
+                }
+
+                // Check if breaks actually changed compared to mapped old breaks.
+                const breaksChanged =
+                    fullRemeasure ||
+                    lastPageFreespace !== value.lastPageFreespace ||
+                    firstPageLabel !== value.firstPageLabel ||
+                    breaks.length !== mappedOldBreaks.length ||
+                    breaks.some(
+                        (b, i) =>
+                            b.pos !== mappedOldBreaks[i].pos ||
+                            b.freespace !== mappedOldBreaks[i].freespace ||
+                            b.contdName !== mappedOldBreaks[i].contdName ||
+                            b.label !== mappedOldBreaks[i].label ||
+                            b.prevLabel !== mappedOldBreaks[i].prevLabel ||
+                            !!b.isEmpty !== !!mappedOldBreaks[i].isEmpty,
+                    );
+
+                // Always map the previous set first: it re-anchors every existing
+                // widget to its new position AND preserves the Decoration instances,
+                // which is what lets the rebuild below reuse unchanged widgets'
+                // mounted DOM (see buildReuseMap).
+                const mapped = value.decset.map(tr.mapping, tr.doc);
+
+                let decset: DecorationSet;
+                if (breaksChanged) {
+                    // Rebuild, but reuse the previous Decoration instance for every
+                    // widget whose position+key is unchanged. On a typical edit only
+                    // the last-page widget (or a break near the edit) actually
+                    // changes, so ~95 of ~96 widgets keep their DOM untouched and the
+                    // document-wide style recalc collapses to a couple of elements.
+                    decset = buildDecorations(
+                        newState.doc,
+                        breaks,
+                        lastPageFreespace,
+                        firstPageLabel,
+                        options,
+                        buildReuseMap(mapped),
+                    );
+                } else {
+                    // Fast path: the set of breaks is unchanged, so the mapped set is
+                    // already correct — no rebuild at all.
+                    // BUT `DecorationSet.map` silently drops a *widget* whose anchor
+                    // sits at a position a replace step touches — e.g. editing a
+                    // page's last node, which hosts the following page break at its
+                    // trailing boundary (realigning it or re-applying its element
+                    // type with no height change keeps `breaks` identical, so we land
+                    // here). The lost break makes the next page merge upward into a
+                    // too-tall page. `map` never adds decorations, so a drop shows up
+                    // as a smaller count — only then do we pay for a rebuild (still
+                    // reusing the survivors' instances).
+                    decset =
+                        mapped.find().length === value.decset.find().length
+                            ? mapped
+                            : buildDecorations(
+                                  newState.doc,
+                                  breaks,
+                                  lastPageFreespace,
+                                  firstPageLabel,
+                                  options,
+                                  buildReuseMap(mapped),
+                              );
+                }
+
+                return { decset, breaks, lastPageFreespace, firstPageLabel };
+            }),
+        },
+        appendTransaction() {
+            return null;
+        },
+        filterTransaction(tr) {
+            // Page-lock guard: prevent content from spilling upward out of a
+            // locked page. The signature of that spill — Backspace at the
+            // start of a locked anchor, Delete at the end of the node before
+            // it, or a selection delete that swallows the anchor — is a locked
+            // anchor's data-id disappearing as a RESULT of this transaction. If
+            // that would happen, reject it so the cursor stays put and no
+            // content moves across the lock.
+            if (!tr.docChanged) return true;
+
+            // Allow yjs sync (remote updates and yjs-based undo/redo) through
+            // unconditionally — cross-peer consistency must not be blocked by
+            // local lock enforcement, and the lock map itself lives in the
+            // Yjs doc so peers agree on which pages are locked.
+            if (tr.getMeta(ySyncPluginKey)) return true;
+
+            // Scene omit/unomit removes (or restores) an entire scene and
+            // re-homes any page locks inside it, so it is allowed to make a
+            // locked anchor's data-id disappear. See SCENE_OMIT_META.
+            if (tr.getMeta(SCENE_OMIT_META)) return true;
+
+            // Collapsing an emptied locked page deliberately deletes that page's
+            // (now empty) anchor node and merges the cursor up to the previous
+            // page. See PAGE_COLLAPSE_META and the Backspace handler.
+            if (tr.getMeta(PAGE_COLLAPSE_META)) return true;
+
+            const opts = extension.options as PaginationOptions;
+            if (!opts.getPageLocking?.()) return true;
+
+            const pageLocks = opts.getPageLocks?.();
+            if (!pageLocks) return true;
+
+            // PAGE_ONE_KEY has no node to defend — page 1 can't lose its
+            // lock through doc edits.
+            const lockedAnchors: string[] = [];
+            for (const key of Object.keys(pageLocks)) {
+                if (key !== PAGE_ONE_KEY) lockedAnchors.push(key);
+            }
+            if (lockedAnchors.length === 0) return true;
+
+            // Fast path: scan the resulting doc once. If every locked anchor is
+            // still present, nothing crossed a lock — allow it. This is the
+            // common case on every keystroke.
+            const after = new Set<string>();
+            tr.doc.forEach((node) => {
+                const dataId = node.attrs?.["data-id"];
+                if (typeof dataId === "string") after.add(dataId);
+            });
+            let someMissing = false;
+            for (const anchor of lockedAnchors) {
+                if (!after.has(anchor)) {
+                    someMissing = true;
+                    break;
+                }
+            }
+            if (!someMissing) return true;
+
+            // A locked anchor is missing from the result. Only reject if THIS
+            // transaction is what removed it (present before, gone after). An
+            // anchor that was already gone (an orphan-collapsed page whose lock
+            // lingers in the map so its number is absorbed) must not block
+            // further edits — otherwise every keystroke after a collapse would
+            // be rejected.
+            const before = new Set<string>();
+            tr.before.forEach((node) => {
+                const dataId = node.attrs?.["data-id"];
+                if (typeof dataId === "string") before.add(dataId);
+            });
+            for (const anchor of lockedAnchors) {
+                if (before.has(anchor) && !after.has(anchor)) return false;
+            }
+            return true;
+        },
+        props: {
+            decorations(state) {
+                return (paginationKey.getState(state) as PaginationState)?.decset ?? DecorationSet.empty;
+            },
+        },
+    });
+
+// ---------------------------------------------------------------------------
+// Extension
+// ---------------------------------------------------------------------------
+
+export const ScriptioPagination = Extension.create<PaginationOptions>({
+    name: "Pagination",
+
+    addOptions() {
+        return defaultOptions;
+    },
+
+    addStorage() {
+        return {
+            initTimer: null as ReturnType<typeof setTimeout> | null,
+            /** False until the screenplay @font-face fonts have finished loading.
+             *  The plugin's `apply` checks this flag and skips height measurement
+             *  while it is false, so the cache never picks up bad heights taken
+             *  with a fallback monospace font (Consolas etc.) that produces a
+             *  different line-wrap from CourierPrime. */
+            fontsReady: false,
+        };
+    },
+
+    onCreate() {
+        const editorDOM = this.editor.view.dom;
+
+        editorDOM.classList.add("pagination");
+        syncVars(editorDOM, this.options);
+
+        let style = document.getElementById("pagination-style");
+        if (!style) {
+            style = document.createElement("style");
+            style.id = "pagination-style";
+            style.textContent = `
+                .pagination {
+                    position: relative;
+                    width: var(--page-width) !important;
+                    margin: 0 auto !important;
+                    min-height: var(--page-height);
+                    box-sizing: border-box !important;
+                }
+
+                .pagination-first-page,
+                .pagination-page-break,
+                .pagination-last-page {
+                    position: relative;
+                    user-select: none;
+                    pointer-events: none;
+                    padding-left: 0 !important;
+                    padding-right: 0 !important;
+                    font-weight: normal !important;
+                    font-style: normal !important;
+                    text-decoration: none !important;
+                    text-transform: none !important;
+                }
+
+                .pagination-overlay {
+                    position: absolute;
+                    left: 0;
+                    right: 0;
+                    z-index: 10;
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: flex-end;
+                    background: var(--editor-script-bg);
+                }
+
+                .pagination-footer-area,
+                .pagination-header-area {
+                    position: relative;
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    padding: 0 var(--page-margin-right) 0 var(--page-margin-left);
+                    box-sizing: border-box;
+                    background: var(--editor-script-bg);
+                }
+
+                .pagination-divider {
+                    background: var(--main-bg);
+                }
+
+                .pagination-header-left,
+                .pagination-footer-left {
+                    text-align: left;
+                }
+
+                .pagination-header-right,
+                .pagination-footer-right {
+                    text-align: right;
+                }
+
+                .pagination-empty-page {
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    background: var(--editor-script-bg);
+                    color: var(--secondary-text);
+                    font-size: 0.85rem;
+                    font-weight: 600;
+                    letter-spacing: 0.08em;
+                    opacity: 0.35;
+                    text-transform: uppercase;
+                    box-sizing: border-box;
+                }
+            `;
+            document.head.appendChild(style);
+        }
+
+        setupTestDiv(editorDOM, this.options);
+
+        // The screenplay @font-face fonts (CourierPrime + fallbacks) load
+        // asynchronously. Until the real font is applied, the test div lays
+        // text out in the OS monospace fallback (Consolas on Windows), whose
+        // slightly different character widths cause text to wrap to a
+        // different number of lines. Heights measured against the fallback
+        // disagree with what the editor will eventually render — and once
+        // cached, they keep that disagreement alive (hence the cold-open vs
+        // hard-refresh mismatch, and the shrink-on-edit symptom when a
+        // cache-miss re-measures against the now-loaded real font).
+        //
+        // We defer the first pagination run until the font is genuinely
+        // usable; until then the plugin's `apply` returns the empty initial
+        // state (no measurement, no cache writes). Once ready we flip the flag
+        // and dispatch a single force update — every subsequent measurement
+        // happens against the real font, so the heightCache fills with correct
+        // values from the start.
+        //
+        // IMPORTANT: `document.fonts.ready` is NOT enough on Chrome. Chrome
+        // loads @font-face fonts lazily (only once a rendered element needs
+        // them), so at the moment the editor mounts nothing has triggered the
+        // CourierPrime fetch yet — `fonts.ready` resolves reporting
+        // status:"loaded" while `fonts.check('12pt "CourierPrime"')` is still
+        // false and zero faces are actually loaded. Firefox eagerly starts the
+        // load, which is why it worked there but not here. The fix is to
+        // ACTIVELY request the faces with `document.fonts.load(...)`, which
+        // forces the fetch and resolves only once they are usable for layout.
+        const triggerInitialPagination = () => {
+            if (this.editor.isDestroyed) return;
+            this.storage.fontsReady = true;
+            const tr = this.editor.state.tr;
+            tr.setMeta("forcePaginationUpdate", true);
+            tr.setMeta("addToHistory", false);
+            this.editor.view.dispatch(tr);
+        };
+
+        const fontsApi = typeof document !== "undefined" ? document.fonts : null;
+        if (fontsApi && typeof fontsApi.load === "function") {
+            // Actively request every CourierPrime variant the screenplay uses.
+            // `load()` forces the fetch (even on Chrome's lazy loader) and
+            // resolves once the faces are usable for measurement. `.catch` per
+            // spec keeps one failed variant from blocking the others, and a
+            // safety timeout guarantees pagination still runs if the network
+            // never delivers a font — better a fallback-font layout than a
+            // permanently blank document.
+            const specs = [
+                '12pt "CourierPrime"',
+                'bold 12pt "CourierPrime"',
+                'italic 12pt "CourierPrime"',
+                'bold italic 12pt "CourierPrime"',
+            ];
+            let fired = false;
+            const fireOnce = () => {
+                if (fired) return;
+                fired = true;
+                if (this.storage.initTimer != null) {
+                    clearTimeout(this.storage.initTimer);
+                    this.storage.initTimer = null;
+                }
+                triggerInitialPagination();
+            };
+            Promise.all(specs.map((s) => fontsApi.load(s).catch(() => undefined)))
+                .then(() => fireOnce())
+                .catch(() => fireOnce());
+            // Safety net: never wait more than 3s on the font fetch.
+            this.storage.initTimer = setTimeout(() => fireOnce(), 3000);
+        } else {
+            // No FontFaceSet API (SSR, very old browsers): fall back to the
+            // legacy setTimeout(0) trigger so pagination still runs.
+            this.storage.initTimer = setTimeout(() => {
+                this.storage.initTimer = null;
+                triggerInitialPagination();
+            }, 0);
+        }
+    },
+
+    onDestroy() {
+        if (this.storage.initTimer != null) {
+            clearTimeout(this.storage.initTimer);
+            this.storage.initTimer = null;
+        }
+    },
+
+    addProseMirrorPlugins() {
+        return [createPaginationPlugin(this)];
+    },
+
+    addKeyboardShortcuts() {
+        return {
+            Backspace: ({ editor }) => {
+                // ProseMirror's joinMaybeClear (a joinBackward variant) deletes
+                // the PREVIOUS block instead of the current one whenever the
+                // previous block is empty and the two blocks share a type. If
+                // that empty previous block is a locked page anchor the plugin's
+                // filterTransaction rejects the resulting transaction — the
+                // anchor's data-id would disappear — and the cursor appears
+                // stuck. Patch both flavors of the case (empty current and
+                // non-empty current) so the locked anchor survives and the user
+                // still gets the natural "step up one line" / "merge up" feel.
+                const { state, view } = editor;
+                const { $from, empty } = state.selection;
+                if (!empty || $from.parentOffset !== 0) return false;
+
+                const opts = this.options as PaginationOptions;
+                if (!opts.getPageLocking?.()) return false;
+                const pageLocks = opts.getPageLocks?.();
+                if (!pageLocks) return false;
+
+                const curStart = $from.before();
+                if (curStart === 0) return false;
+
+                // Collapse case: the current block is itself a locked page anchor
+                // and is now empty (the page's last element was just deleted).
+                // Default joinBackward would remove the anchor's data-id and the
+                // guard would reject it, leaving a blank page with a stranded
+                // empty node. Instead delete the empty anchor node and drop the
+                // cursor at the end of the previous page. The lock stays in the
+                // map as an orphan so the page's frozen number is absorbed into
+                // the following page as a range (e.g. "5-6") rather than vanishing.
+                const curDataId = $from.parent.attrs?.["data-id"];
+                if (
+                    $from.parent.textContent.length === 0 &&
+                    typeof curDataId === "string" &&
+                    pageLocks[curDataId]
+                ) {
+                    const tr = state.tr;
+                    tr.delete(curStart, $from.after());
+                    tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
+                    tr.setMeta(PAGE_COLLAPSE_META, true);
+                    view.dispatch(tr);
+                    return true;
+                }
+
+                const prev = state.doc.resolve(curStart).nodeBefore;
+                if (!prev || prev.textContent.length !== 0) return false;
+
+                const prevDataId = prev.attrs?.["data-id"];
+                if (typeof prevDataId !== "string" || !pageLocks[prevDataId]) return false;
+
+                const tr = state.tr;
+                if ($from.parent.textContent.length === 0) {
+                    // Both blocks empty: drop the current empty block — the
+                    // locked anchor stays put and the cursor parks inside it.
+                    tr.delete(curStart, $from.after());
+                } else {
+                    // Current has text: merge it INTO the empty previous block
+                    // via tr.join, which keeps the before node's structure
+                    // (and its locked data-id) and absorbs after's content.
+                    // join requires both children to share a type; for cross-
+                    // type cases we bail out and let the default chain do
+                    // whatever fallback it has — those cases don't trip
+                    // joinMaybeClear in the first place.
+                    if (prev.type !== $from.parent.type) return false;
+                    tr.join(curStart);
+                }
+                tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
+                view.dispatch(tr);
+                return true;
+            },
+        };
+    },
+
+    addCommands() {
+        return {
+            updatePageSize:
+                (size) =>
+                ({ tr }) => {
+                    Object.assign(this.options, size);
+                    syncVars(this.editor.view.dom, this.options);
+                    tr.setMeta("pageFormatUpdate", true);
+                    return true;
+                },
+            updatePageHeight:
+                (h) =>
+                ({ tr }) => {
+                    this.options.pageHeight = h;
+                    syncVars(this.editor.view.dom, this.options);
+                    tr.setMeta("pageFormatUpdate", true);
+                    return true;
+                },
+            updatePageWidth:
+                (w) =>
+                ({ tr }) => {
+                    this.options.pageWidth = w;
+                    syncVars(this.editor.view.dom, this.options);
+                    tr.setMeta("pageFormatUpdate", true);
+                    return true;
+                },
+            updatePageGap:
+                (g) =>
+                ({ tr }) => {
+                    this.options.pageGap = g;
+                    tr.setMeta("forcePaginationUpdate", true);
+                    return true;
+                },
+            updateMargins:
+                (m) =>
+                ({ tr }) => {
+                    Object.assign(this.options, {
+                        marginTop: m.top,
+                        marginBottom: m.bottom,
+                        marginLeft: m.left,
+                        marginRight: m.right,
+                    });
+                    syncVars(this.editor.view.dom, this.options);
+                    tr.setMeta("pageFormatUpdate", true);
+                    return true;
+                },
+            updateHeaderContent:
+                (l, r, p) =>
+                ({ tr }) => {
+                    if (p !== undefined) this.options.customHeader[p] = { headerLeft: l, headerRight: r };
+                    else {
+                        this.options.headerLeft = l;
+                        this.options.headerRight = r;
+                    }
+                    tr.setMeta("forcePaginationUpdate", true);
+                    return true;
+                },
+            updateFooterContent:
+                (l, r, p) =>
+                ({ tr }) => {
+                    if (p !== undefined) this.options.customFooter[p] = { footerLeft: l, footerRight: r };
+                    else {
+                        this.options.footerLeft = l;
+                        this.options.footerRight = r;
+                    }
+                    tr.setMeta("forcePaginationUpdate", true);
+                    return true;
+                },
+            updatePageBreakBackground:
+                (c) =>
+                ({ tr }) => {
+                    this.options.pageBreakBackground = c;
+                    tr.setMeta("forcePaginationUpdate", true);
+                    return true;
+                },
+            updateStartNewPageTypes:
+                (types) =>
+                ({ tr }) => {
+                    this.options.startNewPageTypes = types;
+                    this.editor.view.dom.dataset.startNewPageTypes = JSON.stringify([...types]);
+                    tr.setMeta("forcePaginationUpdate", true);
+                    return true;
+                },
+            refreshPagination:
+                () =>
+                ({ tr }) => {
+                    tr.setMeta("forcePaginationUpdate", true);
+                    return true;
+                },
+        };
+    },
+});
+
+/**
+ * Returns the 1-based page number for a given document position,
+ * using the pagination plugin state stored in the editor.
+ * Returns 1 if pagination state is unavailable.
+ */
+export function getPageForPos(editor: Editor, pos: number): number {
+    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
+    if (!state || state.breaks.length === 0) return 1;
+    let page = 1;
+    for (const b of state.breaks) {
+        if (b.pos > pos) break;
+        page = b.pagenum;
+    }
+    return page;
+}
+
+/**
+ * Returns the display label (e.g. "4", "4A") for the page containing
+ * the given document position. Falls back to the integer pagenum when
+ * page locking isn't active.
+ */
+export function getPageLabelForPos(editor: Editor, pos: number): string {
+    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
+    if (!state) return "1";
+    if (state.breaks.length === 0) return state.firstPageLabel;
+    let label = state.firstPageLabel;
+    for (const b of state.breaks) {
+        if (b.pos > pos) break;
+        label = b.label ?? String(b.pagenum);
+    }
+    return label;
+}
+
+/**
+ * Returns the ordered list of page anchors for the current document
+ * (page 1 sentinel first, then the data-id of each subsequent page's
+ * first top-level node). Used by the ProductionPanel to snapshot the
+ * current layout when locking pages and to compute provisional labels.
+ *
+ * Synthetic empty-page breaks contribute their orphan anchor id, so the
+ * sequence stays aligned with what the user sees in the editor.
+ */
+export function getPageAnchors(editor: Editor): string[] {
+    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
+    if (!state) return [PAGE_ONE_KEY];
+    const out: string[] = [PAGE_ONE_KEY];
+    for (const b of state.breaks) {
+        if (b.anchorId) out.push(b.anchorId);
+    }
+    return out;
+}
+
+export interface PageAnchorInfo {
+    anchorId: string;
+    /** Character offset within the anchor node where the page begins.
+     *  Set when the page starts on the bottom half of a sentence-split node;
+     *  undefined for whole-node anchors. Frozen into the page lock so the
+     *  split survives recomputes. */
+    splitOffset?: number;
+}
+
+/**
+ * Same ordering as {@link getPageAnchors} but each entry also carries the
+ * splitOffset (when the page begins mid-node). Used by the production panel
+ * when first locking pages so the lock map can reproduce mid-node splits
+ * on subsequent recomputes.
+ */
+export function getPageAnchorInfo(editor: Editor): PageAnchorInfo[] {
+    const state = paginationKey.getState(editor.state) as PaginationState | undefined;
+    if (!state) return [{ anchorId: PAGE_ONE_KEY }];
+    const out: PageAnchorInfo[] = [{ anchorId: PAGE_ONE_KEY }];
+    for (const b of state.breaks) {
+        if (!b.anchorId) continue;
+        const entry: PageAnchorInfo = { anchorId: b.anchorId };
+        if (b.splitOffset != null) entry.splitOffset = b.splitOffset;
+        out.push(entry);
+    }
+    return out;
+}
+
+/**
+ * Force a pagination recompute. Call when the page-lock map or the
+ * page-locking toggle changes — layout may shift even though the
+ * document content did not.
+ */
+export function refreshPageLocking(editor: Editor | null): void {
+    if (!editor || !editor.view) return;
+    const tr = editor.state.tr;
+    tr.setMeta("forcePaginationUpdate", true);
+    tr.setMeta("addToHistory", false);
+    editor.view.dispatch(tr);
+}
diff --git a/src/lib/screenplay/extensions/placeholder-extension.ts b/src/lib/screenplay/extensions/placeholder-extension.ts
index b10f7381..882fa65b 100644
--- a/src/lib/screenplay/extensions/placeholder-extension.ts
+++ b/src/lib/screenplay/extensions/placeholder-extension.ts
@@ -3,6 +3,7 @@ import { Extension, isNodeEmpty } from '@tiptap/core'
 import type { Node as ProsemirrorNode } from '@tiptap/pm/model'
 import { Plugin, PluginKey } from '@tiptap/pm/state'
 import { Decoration, DecorationSet } from '@tiptap/pm/view'
+import { timeApply } from './apply-timing'
 
 export interface PlaceholderOptions {
   /**
@@ -131,7 +132,7 @@ export const Placeholder = Extension.create<PlaceholderOptions>({
           init(_, state) {
             return computePlaceholderDecorations(state.doc, state.selection.anchor)
           },
-          apply(tr, oldDecorations, oldState, newState) {
+          apply: timeApply("placeholder", (tr, oldDecorations, oldState, newState) => {
             const oldAnchor = oldState.selection.anchor
             const newAnchor = newState.selection.anchor
 
@@ -147,7 +148,7 @@ export const Placeholder = Extension.create<PlaceholderOptions>({
             }
 
             return oldDecorations
-          },
+          }),
         },
         props: {
           decorations(state) {
diff --git a/src/lib/screenplay/extensions/scene-bookmark-extension.ts b/src/lib/screenplay/extensions/scene-bookmark-extension.ts
index 02002313..8535dd95 100644
--- a/src/lib/screenplay/extensions/scene-bookmark-extension.ts
+++ b/src/lib/screenplay/extensions/scene-bookmark-extension.ts
@@ -2,6 +2,7 @@ import { Editor, Extension } from "@tiptap/core";
 import { Node } from "@tiptap/pm/model";
 import { Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
+import { timeApply } from "./apply-timing";
 
 const sceneBookmarkPluginKey = new PluginKey("sceneBookmark");
 
@@ -94,7 +95,7 @@ export const createSceneBookmarkExtension = (config: SceneBookmarkConfig) => {
                         init(_, { doc }) {
                             return computeBookmarkDecorations(doc, getSceneColor);
                         },
-                        apply(tr, oldDecorations, _oldState, newState) {
+                        apply: timeApply("scene-bookmark", (tr, oldDecorations, _oldState, newState) => {
                             // Always recompute when explicitly refreshed (color changed from UI)
                             if (tr.getMeta("sceneBookmarkRefresh")) {
                                 return computeBookmarkDecorations(tr.doc, getSceneColor);
@@ -110,7 +111,7 @@ export const createSceneBookmarkExtension = (config: SceneBookmarkConfig) => {
                             }
 
                             return oldDecorations;
-                        },
+                        }),
                     },
                     props: {
                         decorations(state) {
diff --git a/src/lib/screenplay/extensions/scene-locking-extension.ts b/src/lib/screenplay/extensions/scene-locking-extension.ts
index bb7b70f0..30d8bb86 100644
--- a/src/lib/screenplay/extensions/scene-locking-extension.ts
+++ b/src/lib/screenplay/extensions/scene-locking-extension.ts
@@ -6,6 +6,7 @@ import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import type { PersistentScene } from "../scenes";
 import { computeSceneLabels, SceneNumberingStyle } from "../scene-locking";
 import { ScreenplayElement } from "../../utils/enums";
+import { timeApply } from "./apply-timing";
 
 const sceneLockingPluginKey = new PluginKey("sceneLocking");
 const REFRESH_META = "sceneLockingRefresh";
@@ -170,7 +171,7 @@ export const createSceneLockingExtension = (config: SceneLockingConfig) => {
                                 getSkippedLetters(),
                             );
                         },
-                        apply(tr, oldDecorations, _oldState, newState) {
+                        apply: timeApply("scene-locking", (tr, oldDecorations, _oldState, newState) => {
                             // Explicit refresh (lock toggle, lock-map change) → recompute.
                             if (tr.getMeta(REFRESH_META)) {
                                 return computeDecorations(
@@ -197,7 +198,7 @@ export const createSceneLockingExtension = (config: SceneLockingConfig) => {
                                 getNumberingStyle(),
                                 getSkippedLetters(),
                             );
-                        },
+                        }),
                     },
                     props: {
                         decorations(state) {
diff --git a/src/lib/screenplay/extensions/search-highlight-extension.ts b/src/lib/screenplay/extensions/search-highlight-extension.ts
index d2785b7f..ee6c5c03 100644
--- a/src/lib/screenplay/extensions/search-highlight-extension.ts
+++ b/src/lib/screenplay/extensions/search-highlight-extension.ts
@@ -3,6 +3,7 @@ import { Node } from "@tiptap/pm/model";
 import { Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import { ScreenplayElement } from "../../utils/enums";
+import { timeApply } from "./apply-timing";
 
 const searchHighlightPluginKey = new PluginKey("searchHighlight");
 
@@ -220,7 +221,7 @@ export const createSearchHighlightExtension = (config: SearchHighlightConfig) =>
                             onMatchesFound(result.matches);
                             return result.decorations;
                         },
-                        apply(tr, oldDecorations, _oldState, newState) {
+                        apply: timeApply("search-highlight", (tr, oldDecorations, _oldState, newState) => {
                             const searchTerm = getSearchTerm();
 
                             // Fast path: no search term and wasn't searching before
@@ -336,7 +337,7 @@ export const createSearchHighlightExtension = (config: SearchHighlightConfig) =>
                             }
 
                             return result;
-                        },
+                        }),
                     },
                     props: {
                         decorations(state) {
diff --git a/src/tests/repro/enter-dom-churn.test.ts b/src/tests/repro/enter-dom-churn.test.ts
new file mode 100644
index 00000000..f3995ede
--- /dev/null
+++ b/src/tests/repro/enter-dom-churn.test.ts
@@ -0,0 +1,200 @@
+import { describe, it, expect } from "vitest";
+import { Editor } from "@tiptap/core";
+
+import { BASE_EXTENSIONS, insertElement } from "@src/lib/screenplay/editor";
+import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
+import { ScriptioPagination, paginationKey } from "@src/lib/screenplay/extensions/pagination-extension";
+import { ScreenplayElement } from "@src/lib/utils/enums";
+
+/**
+ * Regression guards for the editor's typing hot path.
+ *
+ * A mid-document Enter shifts every following page boundary, which makes
+ * ProseMirror relocate (recreate) every downstream break widget — that part
+ * is inherent to pagination. What these tests pin down:
+ *
+ *  1. Widget KEYS must stay stable when their rendered content is unchanged
+ *     (lazy widgets are only cheap because matching keys reuse DOM). A key
+ *     regression (e.g. putting `pos` back into the key) would silently
+ *     resurrect the full-rebuild-per-keystroke storm.
+ *  2. Enter at the end of the document (the common writing position) must
+ *     cause only constant DOM churn, not O(pages).
+ *  3. Break widgets must carry content-visibility so the relocated offscreen
+ *     widgets skip style recalc + layout.
+ */
+
+const LINE = 16;
+
+function injectStyle() {
+    const id = "repro-style";
+    if (document.getElementById(id)) return;
+    const s = document.createElement("style");
+    s.id = id;
+    s.textContent = `
+        .ProseMirror > p, #pagination-test-div > p {
+            display: block; width: 100%; line-height: ${LINE}px !important;
+            margin-top: ${LINE}px; margin-bottom: 0; min-height: ${LINE}px;
+            font-size: 12px; box-sizing: border-box; white-space: pre-wrap; padding: 0;
+        }
+        .ProseMirror > .pagination-page-break + p,
+        .ProseMirror > .pagination-first-page + p { margin-top: 0 !important; }
+    `;
+    document.head.appendChild(s);
+}
+
+async function makeEditor(n: number) {
+    injectStyle();
+    const el = document.createElement("div");
+    document.body.appendChild(el);
+
+    const content: object[] = [];
+    for (let i = 0; i < n; i++) {
+        content.push({
+            type: "action",
+            attrs: { "data-id": `n${i}`, class: "action" },
+            content: [{ type: "text", text: `L${i}` }],
+        });
+    }
+
+    const editor = new Editor({
+        element: el,
+        injectCSS: false,
+        autofocus: false,
+        content: { type: "doc", content },
+        extensions: [
+            ...BASE_EXTENSIONS,
+            createNodeIdDedupExtension({ duplicatePersistentScene: () => {} }),
+            ScriptioPagination.configure({
+                pageHeight: 200, pageWidth: 600, marginTop: 0, marginBottom: 0,
+                marginLeft: 0, marginRight: 0, pageGap: 10,
+                // The page-number header is an HTML template, not plain text.
+                headerRight: `<p class="page-number">{page}.</p>`,
+            }),
+        ],
+    });
+    await new Promise((r) => setTimeout(r, 80));
+    (editor.storage as unknown as Record<string, { fontsReady: boolean }>).Pagination.fontsReady = true;
+    const tr = editor.state.tr;
+    tr.setMeta("forcePaginationUpdate", true);
+    tr.setMeta("addToHistory", false);
+    editor.view.dispatch(tr);
+    return editor;
+}
+
+function breaksOf(editor: Editor) {
+    const st = paginationKey.getState(editor.state) as { breaks: { pos: number }[] } | undefined;
+    return st?.breaks ?? [];
+}
+
+function widgetKeysOf(editor: Editor) {
+    const st = paginationKey.getState(editor.state) as {
+        decset: { find: () => { spec: { key?: string } }[] };
+    };
+    return st.decset.find().map((d) => d.spec.key ?? "?");
+}
+
+/** Counts DOM nodes added/removed inside the editor during fn(). */
+function churn(editor: Editor, fn: () => void) {
+    let added = 0;
+    let removed = 0;
+    const obs = new MutationObserver((muts) => {
+        for (const m of muts) {
+            added += m.addedNodes.length;
+            removed += m.removedNodes.length;
+        }
+    });
+    obs.observe(editor.view.dom, { childList: true, subtree: true });
+    fn();
+    for (const m of obs.takeRecords()) {
+        added += m.addedNodes.length;
+        removed += m.removedNodes.length;
+    }
+    obs.disconnect();
+    return { added, removed };
+}
+
+describe("typing hot path: DOM churn and widget key stability", () => {
+    it("Enter at end of doc causes constant churn, not O(pages)", async () => {
+        const editor = await makeEditor(600);
+        expect(breaksOf(editor).length).toBeGreaterThan(30);
+
+        const end = editor.state.doc.content.size;
+        editor.commands.setTextSelection(end - 1);
+        const r = churn(editor, () => {
+            insertElement(editor, ScreenplayElement.Action, editor.state.selection.$anchor.after());
+        });
+
+        // The new <p>, the new/re-keyed trailing break + last-page widget.
+        // Before the lazy-widget fix this was O(pages) (every widget rebuilt).
+        expect(r.added).toBeLessThan(30);
+        expect(r.removed).toBeLessThan(30);
+    });
+
+    it("Enter mid-document keeps downstream widget keys stable", async () => {
+        const editor = await makeEditor(600);
+        const breaks = breaksOf(editor);
+        expect(breaks.length).toBeGreaterThan(30);
+
+        const keysBefore = new Set(widgetKeysOf(editor));
+        editor.commands.setTextSelection(breaks[4].pos - 4);
+        insertElement(editor, ScreenplayElement.Action, editor.state.selection.$anchor.after());
+        const keysAfter = widgetKeysOf(editor);
+
+        // The cascade relocates widgets, but their rendered content (pagenum,
+        // freespace, labels) is unchanged for all but the trailing pages — so
+        // at most a few keys may differ. Key instability here would defeat
+        // every DOM-reuse optimization downstream.
+        const changed = keysAfter.filter((k) => !keysBefore.has(k));
+        expect(changed.length).toBeLessThanOrEqual(3);
+    });
+
+    it("break widgets are skippable offscreen (content-visibility)", async () => {
+        const editor = await makeEditor(600);
+        const widget = (editor.view.dom as HTMLElement).querySelector(".pagination-page-break") as HTMLElement;
+        expect(widget).toBeTruthy();
+        expect(widget.style.getPropertyValue("content-visibility")).toBe("auto");
+        expect(widget.style.getPropertyValue("contain-intrinsic-size")).toMatch(/none \d+(\.\d+)?px/);
+    });
+
+    it("header/footer HTML templates are parsed as markup, not text", async () => {
+        const editor = await makeEditor(600);
+        const dom = editor.view.dom as HTMLElement;
+
+        // The configured `<p class="page-number">{page}.</p>` header must
+        // produce a real <p> element, not a text node with literal angle
+        // brackets. Guards against the textContent regression.
+        const headerRight = dom.querySelector(".pagination-header-right") as HTMLElement;
+        expect(headerRight).toBeTruthy();
+        const pageNumberEl = headerRight.querySelector("p.page-number");
+        expect(pageNumberEl).toBeTruthy();
+        expect(headerRight.textContent).not.toContain("<p");
+        // {page} placeholder is substituted with the page label.
+        expect(pageNumberEl!.textContent).toMatch(/^\d+\.$/);
+    });
+
+    it("tags the first node of each page with a margin-reset class", async () => {
+        // These node-decoration classes replace the `.pagination-page-break + p`
+        // adjacent-sibling CSS rule (which restyled the whole document tail on
+        // every edit). The class must land on the <p> immediately after each
+        // page-break widget, and on the very first node, so the page-top margin
+        // still gets zeroed without the sibling-combinator cost.
+        const editor = await makeEditor(600);
+        const dom = editor.view.dom as HTMLElement;
+
+        // First node carries the doc-start class.
+        expect(dom.querySelector("p.pagination-doc-start")).toBeTruthy();
+
+        // Every whole-node page break is immediately followed by a
+        // pagination-break-start node.
+        const breakWidgets = Array.from(dom.querySelectorAll(".pagination-page-break"));
+        expect(breakWidgets.length).toBeGreaterThan(5);
+        let matched = 0;
+        for (const w of breakWidgets) {
+            let sib = w.nextElementSibling;
+            while (sib && sib.tagName !== "P") sib = sib.nextElementSibling;
+            if (sib && sib.classList.contains("pagination-break-start")) matched++;
+        }
+        // All non-split breaks (this fixture has no sentence splits) must match.
+        expect(matched).toBe(breakWidgets.length);
+    });
+});
diff --git a/styles/scriptio.css b/styles/scriptio.css
index 9e2d0fe7..8ceaf8bd 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -75,14 +75,22 @@
        use measured outer heights in isolation, so removing the margin only
        affects rendering — same paragraphs per page, no determinism hit.
 
+       These target classes are applied by the pagination extension as node
+       decorations (pagination-doc-start / pagination-break-start) rather than
+       via an adjacent-sibling selector (`.pagination-page-break + p`). The
+       sibling combinator forced Blink to invalidate the style of the whole
+       document tail on every structural edit — the dominant cost in the
+       per-keystroke "Recalculate Style". A plain class carries no sibling
+       dependency, so only nodes whose first-of-page status changed restyle.
+
        In endless-scroll mode the page-break widgets are hidden (display:none),
        so there is no gap to collapse and zeroing the margin would make each
        page's first node stick to the previous page's content. The
-       `:not(.endless-scroll)` guard skips it there so the node keeps its
-       natural top margin. The first-page widget is still shown in endless
-       scroll, so its following paragraph keeps the reset. */
-    &:not(.endless-scroll) > .pagination-page-break + p,
-    > .pagination-first-page + p {
+       `:not(.endless-scroll)` guard skips the break-start reset there. The
+       first-page widget is still shown in endless scroll, so pagination-doc-start
+       keeps its reset unconditionally. */
+    &:not(.endless-scroll) > p.pagination-break-start,
+    > p.pagination-doc-start {
         margin-top: 0 !important;
     }
 

From 37cbb33d389e2b77fcdee2aaa5da3fa5eeee8d65 Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Sun, 14 Jun 2026 03:06:26 +0200
Subject: [PATCH 70/76] fixed pagination issues with straddling nodes and
 performance

---
 .../extensions/pagination-extension.ts        | 133 ++++++++++++++++--
 1 file changed, 120 insertions(+), 13 deletions(-)

diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index ac0bb090..a6fb9212 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -668,6 +668,36 @@ const getHTMLHeight = (
     return height;
 };
 
+/** Element types whose screenplay CSS collapses the top margin to 0
+ *  (`.dialogue` / `.parenthetical` set `margin-top: 0`; `.dual_dialogue` is a
+ *  flex container with no margin). Every other element inherits the `> p`
+ *  rule `margin-top: var(--line-height)`. */
+const ZERO_TOP_MARGIN_TYPES = new Set<ScreenplayElement>([
+    ScreenplayElement.Dialogue,
+    ScreenplayElement.Parenthetical,
+    ScreenplayElement.DualDialogue,
+]);
+
+/**
+ * Top margin (px) the screenplay CSS gives a node type.
+ *
+ * This is the amount the `.pagination-doc-start` / `.pagination-break-start`
+ * rule strips from the first node of each page (so text starts flush at the top
+ * of the content area), and the amount a straddling node's continuation lacks
+ * (the continuation is mid-node and has no top margin). The height accounting
+ * measures every node WITH its margin, so callers subtract this where the margin
+ * is not actually rendered — keeping each page a constant height.
+ *
+ * Margins are a fixed binary in the live editor: 0 for the types above, else
+ * LINE_HEIGHT (which already mirrors the fixed `--line-height: 16px`). The
+ * `scene-heading-spacing-*` multipliers live only in the print CSS and are never
+ * applied to the editor DOM, so there is no per-instance variation to measure —
+ * a constant keeps this off the layout path entirely, the same way LINE_HEIGHT
+ * mirrors --line-height. Keep in sync with the margin-top rules in scriptio.css.
+ */
+const nodeTopMargin = (nodeType: ScreenplayElement): number =>
+    ZERO_TOP_MARGIN_TYPES.has(nodeType) ? 0 : LINE_HEIGHT;
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const setupTestDiv = (editorDom: HTMLElement, _: PaginationOptions): HTMLElement => {
     let testDiv = document.getElementById("pagination-test-div");
@@ -730,7 +760,8 @@ interface SplitResult {
     offset: number;
     /** Rendered height of the portion staying on the current page. */
     topHeight: number;
-    /** Rendered height of the portion moving to the next page. */
+    /** Rendered height of the portion continuing on the next page, excluding the
+     *  node's top margin (the continuation is mid-node and has no top margin). */
     bottomHeight: number;
 }
 
@@ -750,6 +781,7 @@ interface SplitResult {
 function trySplitNode(
     node: Node,
     nodeDocPos: number,
+    nodeMarginTop: number,
     freespace: number,
     nodeElement: HTMLElement,
     editorDOM: HTMLElement,
@@ -776,11 +808,29 @@ function trySplitNode(
         const topHeight = getHTMLHeight(topElement, editorDOM, node.type.name, options);
 
         if (topHeight <= freespace) {
-            // Measure the bottom half to guard against a degenerate single-line remainder.
+            // Height of the bottom half as it actually renders on the next page.
+            //
+            // The split is drawn as a single <p> with a block break widget inserted
+            // mid-node. That widget forces the bottom text onto a fresh line, so the
+            // continuation wraps *independently* of the top half — exactly like a
+            // standalone clone of the bottom text. We therefore measure it that way
+            // and then strip the one thing the standalone clone gets wrong: the
+            // node type's top margin (16px for Action's `.action`, 0 for Dialogue's
+            // `.dialogue`), which the continuation does not have because it is
+            // mid-node.
+            //
+            // Deriving it as (nodeHeight - topHeight) instead is only correct when
+            // the sentence boundary lands at a line boundary. When it falls mid-line
+            // the full node flows continuously (all_lines < top_lines + bottom_lines),
+            // so that formula underestimates the fresh-wrapped continuation by a line
+            // and the next page expands ~16px — the residual bug this measurement fixes.
             const bottomText = sentences.slice(i + 1).join("");
             const bottomElement = nodeElement.cloneNode(false) as HTMLElement;
             bottomElement.textContent = bottomText;
-            const bottomHeight = getHTMLHeight(bottomElement, editorDOM, node.type.name, options);
+            const bottomHeight = Math.max(
+                0,
+                getHTMLHeight(bottomElement, editorDOM, node.type.name, options) - nodeMarginTop,
+            );
 
             // Bottom too short — not worth a split; force the whole node to the next page.
             if (bottomHeight < LINE_HEIGHT * MIN_SPLIT_BOTTOM_LINES) return null;
@@ -952,6 +1002,13 @@ const createPaginationPlugin = (extension: {
                 const contentHeight = options.pageHeight - options.marginTop - options.marginBottom;
                 const breaks: PageBreakInfo[] = [];
                 let pagePos = 0;
+                // Top margin (px) stripped from the current page's first whole node by the
+                // .pagination-doc-start / .pagination-break-start CSS rule. Added back to the
+                // ending page's freespace at each break so every page stays a constant height
+                // even though the first node renders shorter than it measures. Continuation
+                // pages (after a mid-node sentence split) keep this at 0 — their first item is
+                // not a page-start node and never had a margin to strip. See nodeTopMargin.
+                let pageStartMargin = 0;
                 let pagenum = 1;
                 const childCount = newState.doc.childCount;
                 let offset = 0;
@@ -1011,11 +1068,13 @@ const createPaginationPlugin = (extension: {
                         breaks.push({
                             pos,
                             pagenum: ++pagenum,
-                            freespace: Math.max(0, freespace),
+                            // + pageStartMargin: this page's first node rendered margin-stripped.
+                            freespace: Math.max(0, freespace + pageStartMargin),
                             contdName: "",
                             splitNodeType: null,
                             anchorId: dataId,
                         });
+                        // New page's first node margin is set by the pagePos === 0 path below.
                         pagePos = 0;
                         lastNodes = new CircularBuffer(3);
                     }
@@ -1047,7 +1106,20 @@ const createPaginationPlugin = (extension: {
                             const topElement = element.cloneNode(false) as HTMLElement;
                             topElement.textContent = topText;
                             const topHeight = getHTMLHeight(topElement, editorDOM, node.type.name, options);
-                            const bottomHeight = Math.max(0, height - topHeight);
+
+                            // Bottom = the continuation as it renders on the locked page: the
+                            // bottom text wraps fresh after the block break widget, so measure it
+                            // standalone and strip the node's top margin (the mid-node continuation
+                            // has none). Deriving (height - topHeight) instead would mis-size the
+                            // page when splitOffset falls mid-line — see trySplitNode.
+                            const bottomText = node.textContent.slice(splitOffset);
+                            const bottomElement = element.cloneNode(false) as HTMLElement;
+                            bottomElement.textContent = bottomText;
+                            const bottomHeight = Math.max(
+                                0,
+                                getHTMLHeight(bottomElement, editorDOM, node.type.name, options) -
+                                    nodeTopMargin(nodeType),
+                            );
 
                             pagePos += topHeight;
                             const freespace = contentHeight - pagePos;
@@ -1055,13 +1127,17 @@ const createPaginationPlugin = (extension: {
                             breaks.push({
                                 pos: pos + 1 + splitOffset,
                                 pagenum: ++pagenum,
-                                freespace: Math.max(0, freespace),
+                                // + pageStartMargin: the ending page's first node was margin-stripped.
+                                freespace: Math.max(0, freespace + pageStartMargin),
                                 contdName: logic?.showMoreContd ? lastCharName : "",
                                 splitNodeType: nodeType,
                                 anchorId: dataId,
                                 splitOffset,
                             });
 
+                            // The locked page begins with this node's continuation (a mid-node
+                            // split is not a page-start node) — no top margin to strip.
+                            pageStartMargin = 0;
                             pagePos = bottomHeight;
                             lastNodes = new CircularBuffer(3);
                             lastNodes.push({
@@ -1081,17 +1157,26 @@ const createPaginationPlugin = (extension: {
                             breaks.push({
                                 pos,
                                 pagenum: ++pagenum,
-                                freespace: Math.max(0, freespace),
+                                // + pageStartMargin: this page's first node rendered margin-stripped.
+                                freespace: Math.max(0, freespace + pageStartMargin),
                                 contdName: "",
                                 splitNodeType: null,
                                 anchorId: dataId,
                             });
+                            // New page's first node margin is set by the pagePos === 0 path below.
                             pagePos = 0;
                             lastNodes = new CircularBuffer(3);
                         }
                     }
 
-                    // Accumulate height on current page
+                    // Accumulate height on current page.
+                    // pagePos === 0 means this whole node opens a fresh page (doc start, or a
+                    // forced/locked/orphan whole-node break reset it). Such nodes render with
+                    // their top margin stripped, so remember that margin to pad the ending
+                    // page's freespace when the next break is recorded.
+                    if (pagePos === 0) {
+                        pageStartMargin = nodeTopMargin(nodeType);
+                    }
                     pagePos += height;
 
                     // We keep the last 3 nodes for orphan resolution on page break
@@ -1119,12 +1204,21 @@ const createPaginationPlugin = (extension: {
                             // Serialize lazily — only needed here when not already serialized above.
                             if (!element) element = serializer.serializeNode(node) as HTMLElement;
 
-                            const split = trySplitNode(node, pos, freespaceBeforeNode, element, editorDOM, options);
+                            const split = trySplitNode(
+                                node,
+                                pos,
+                                nodeTopMargin(nodeType),
+                                freespaceBeforeNode,
+                                element,
+                                editorDOM,
+                                options,
+                            );
                             if (split) {
                                 breaks.push({
                                     pos: split.pos,
                                     pagenum: ++pagenum,
-                                    freespace: Math.max(0, freespaceBeforeNode - split.topHeight),
+                                    // + pageStartMargin: the ending page's first node was margin-stripped.
+                                    freespace: Math.max(0, freespaceBeforeNode - split.topHeight + pageStartMargin),
                                     // contdName non-empty for dialogue: triggers (MORE)/(CONT'D) labels.
                                     contdName: logic.showMoreContd ? lastCharName : "",
                                     // splitNodeType drives the overlay padding-escape in createPageBreakWidget.
@@ -1136,7 +1230,10 @@ const createPaginationPlugin = (extension: {
                                     // instead of force-pushing the whole node onto the locked page.
                                     splitOffset: split.offset,
                                 });
-                                // The bottom half of the split node is the first item on the new page.
+                                // The bottom half of the split node is the first item on the new
+                                // page; a mid-node continuation is not a page-start node, so it has
+                                // no top margin to strip.
+                                pageStartMargin = 0;
                                 pagePos = split.bottomHeight;
                                 lastNodes = new CircularBuffer(3);
                                 lastNodes.push({
@@ -1200,7 +1297,8 @@ const createPaginationPlugin = (extension: {
                         const breakInfo: PageBreakInfo = {
                             pos: breakPos,
                             pagenum: pagenum + 1,
-                            freespace: Math.max(0, freespace),
+                            // + pageStartMargin: the ending page's first node was margin-stripped.
+                            freespace: Math.max(0, freespace + pageStartMargin),
                             contdName: isDialogueSplit ? lastCharName : "",
                             splitNodeType: null,
                             anchorId: anchorDataId,
@@ -1209,6 +1307,13 @@ const createPaginationPlugin = (extension: {
                         pagenum++;
                         pagePos = carryHeight;
 
+                        // The first node carried onto the new page renders margin-stripped
+                        // (it gets the .pagination-break-start class). Remember its margin for
+                        // the next break's freespace — firstMovingNode carries its type, so no
+                        // node re-lookup is needed (it is the current node when backCount === 0,
+                        // otherwise the keep-with-next node carried back from the buffer).
+                        pageStartMargin = nodeTopMargin(firstMovingNode?.type ?? nodeType);
+
                         // positionTop values in the buffer are page-relative — reset and re-seed
                         // with the carry nodes using new-page positionTop values so orphan checking
                         // works correctly on the next break.
@@ -1257,9 +1362,11 @@ const createPaginationPlugin = (extension: {
                 // short-circuit condition guarantees content past that break
                 // is identical to the previous pass, so the previously stored
                 // freespace is still the correct answer.
+                // + pageStartMargin: the last page's first node also renders margin-stripped.
+                // (shortCircuited reuses the previous pass's value, already compensated.)
                 const lastPageFreespace = shortCircuited
                     ? value.lastPageFreespace
-                    : Math.max(0, contentHeight - pagePos);
+                    : Math.max(0, contentHeight - pagePos + pageStartMargin);
 
                 // --- Orphan page collection ---
                 // A locked page whose anchor data-id is no longer present in the

From 7a740015ef785b6a662564ed8d44c35e7acce5b1 Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Sun, 14 Jun 2026 03:18:38 +0200
Subject: [PATCH 71/76] tweaked visual for document sidebar

---
 .../sidebar/DocumentTreeSidebarView.tsx       | 26 +++++++++++++++-
 .../EditorSidebarNavigation.module.css        | 30 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/components/editor/sidebar/DocumentTreeSidebarView.tsx b/components/editor/sidebar/DocumentTreeSidebarView.tsx
index b8bb12c0..656d6f4c 100644
--- a/components/editor/sidebar/DocumentTreeSidebarView.tsx
+++ b/components/editor/sidebar/DocumentTreeSidebarView.tsx
@@ -313,7 +313,31 @@ const DocumentTreeSidebarView = () => {
                         />
                     ))
                 ) : (
-                    <div className={sidebar_nav.empty_state}>{t("documentsEmpty")}</div>
+                    <div className={sidebar_nav.empty_state}>
+                        <div className={sidebar_nav.empty_actions}>
+                            <button
+                                className={sidebar_nav.empty_action}
+                                onClick={() => createInside(null, "folder")}
+                            >
+                                <FolderPlus size={16} />
+                                {t("newFolder")}
+                            </button>
+                            <button
+                                className={sidebar_nav.empty_action}
+                                onClick={() => createInside(null, "editor")}
+                            >
+                                <FilePlus size={16} />
+                                {t("newDocument")}
+                            </button>
+                            <button
+                                className={sidebar_nav.empty_action}
+                                onClick={() => createInside(null, "board")}
+                            >
+                                <LayoutDashboard size={16} />
+                                {t("newBoard")}
+                            </button>
+                        </div>
+                    </div>
                 )}
             </div>
             {renderMenu()}
diff --git a/components/editor/sidebar/EditorSidebarNavigation.module.css b/components/editor/sidebar/EditorSidebarNavigation.module.css
index 30118f7a..f6bb12b0 100644
--- a/components/editor/sidebar/EditorSidebarNavigation.module.css
+++ b/components/editor/sidebar/EditorSidebarNavigation.module.css
@@ -60,12 +60,42 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
+    gap: 16px;
     padding: 20px;
     text-align: center;
     color: var(--secondary-text);
     font-size: 12px;
 }
 
+.empty_actions {
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    gap: 8px;
+    width: fit-content;
+}
+
+.empty_action {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    padding: 8px 16px;
+    border-radius: 40px;
+    cursor: pointer;
+    color: var(--secondary-text);
+    background: none;
+    border: 1px solid var(--separator);
+    font-size: 12px;
+    font-weight: 600;
+    transition: opacity 0.2s ease;
+}
+
+.empty_action:hover {
+    opacity: 0.7;
+}
+
 .scene_list {
     flex: 1;
 }

From 8c6227e37beb078d746d8ecd17ccaefe6a655e96 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 15 Jun 2026 02:29:49 +0200
Subject: [PATCH 72/76] refactoring comments, context menu, outline visuals,
 search behaviour for multi-editor

---
 components/board/BoardCanvas.module.css       |  64 ---
 components/board/BoardCanvas.tsx              | 366 ++++++--------
 components/editor/CommentCard.module.css      |  83 +++-
 components/editor/CommentCard.tsx             | 297 ++++++++++++
 components/editor/CommentCards.tsx            | 453 ------------------
 components/editor/CommentGutter.module.css    | 126 +++++
 components/editor/CommentGutter.tsx           | 227 +++++++++
 components/editor/DocumentEditorPanel.tsx     | 104 +++-
 .../editor/outline/OutlineItem.module.css     |  62 +--
 components/editor/outline/OutlineItem.tsx     |   9 +-
 .../editor/outline/OutlineView.module.css     |   4 +-
 .../editor/sidebar/CommentSidebarItem.tsx     |   8 +-
 .../editor/sidebar/CommentSidebarView.tsx     |   6 +-
 .../editor/sidebar/ContextMenu.module.css     |  93 +---
 components/editor/sidebar/ContextMenu.tsx     |  94 ++--
 .../sidebar/DocumentTreeSidebarView.tsx       | 169 +++----
 components/navbar/ProjectNavbar.tsx           |  11 +-
 components/navbar/ScreenplaySearch.tsx        |  10 +-
 components/project/EditorFooter.module.css    |   2 +-
 components/utils/ContextMenu.module.css       |  89 ++++
 components/utils/ContextMenu.tsx              |  83 ++++
 src/app/projects/layout.tsx                   |  28 +-
 src/context/ProjectContext.tsx                |  17 +
 src/lib/document-tree/document-tree-config.ts |   2 +-
 src/lib/editor/document-editor-config.ts      |   4 +-
 src/lib/editor/use-document-comments.ts       |  11 +-
 src/lib/editor/use-document-editor.ts         |  24 +-
 src/lib/screenplay/comment-anchors.ts         |  78 +++
 src/lib/screenplay/editor.ts                  |   3 +-
 .../extensions/comment-highlight-extension.ts | 219 ---------
 .../extensions/search-highlight-extension.ts  |  28 +-
 src/lib/shelf/shelf-editor-config.ts          |   2 +-
 src/lib/utils/types.ts                        |   2 +
 .../benchmarks/comment-highlight.bench.ts     |  34 --
 src/tests/project/scriptio-roundtrip.test.ts  |   2 +-
 styles/scriptio.css                           |  20 -
 36 files changed, 1456 insertions(+), 1378 deletions(-)
 create mode 100644 components/editor/CommentCard.tsx
 delete mode 100644 components/editor/CommentCards.tsx
 create mode 100644 components/editor/CommentGutter.module.css
 create mode 100644 components/editor/CommentGutter.tsx
 create mode 100644 components/utils/ContextMenu.module.css
 create mode 100644 components/utils/ContextMenu.tsx
 create mode 100644 src/lib/screenplay/comment-anchors.ts
 delete mode 100644 src/lib/screenplay/extensions/comment-highlight-extension.ts
 delete mode 100644 src/tests/benchmarks/comment-highlight.bench.ts

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index 193b1112..af8ddc56 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -380,43 +380,6 @@
 }
 
 /* Context menu - matching ContextMenu.module.css */
-.context_menu {
-    display: flex;
-    flex-direction: column;
-    width: 220px;
-    z-index: 1000;
-    position: fixed;
-    padding-block: 6px;
-    overflow-y: auto;
-    border-radius: 12px;
-    background-color: var(--context-menu-bg);
-    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
-}
-
-.context_menu_item {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-
-    padding-block: 6px;
-    padding-inline: 12px;
-    font-size: 14px;
-    cursor: pointer;
-}
-
-.context_menu_item:hover {
-    background-color: var(--context-menu-item-hover);
-}
-
-.context_menu_item_disabled {
-    opacity: 0.45;
-    cursor: default;
-}
-
-.context_menu_item_disabled:hover {
-    background-color: transparent;
-}
-
 /* Recording indicator: a pill in the top toolbar row, right of the zoom controls. */
 .recording_indicator {
     position: absolute;
@@ -474,33 +437,6 @@
     background-color: #d33b40;
 }
 
-.context_menu_colors {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 6px;
-    padding: 10px 12px;
-    border-bottom: 1px solid var(--separator);
-}
-
-.context_menu_color_swatch {
-    width: 20px;
-    height: 20px;
-    border: 2px solid transparent;
-    border-radius: 50%;
-    cursor: pointer;
-    transition:
-        transform 0.15s ease,
-        border-color 0.15s ease;
-}
-
-.context_menu_color_swatch:hover {
-    transform: scale(1.15);
-}
-
-.context_menu_color_swatch_active {
-    border-color: white;
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3);
-}
 
 /* Zoom controls - styled like the panel switcher buttons (secondary pill, no
    border, secondary-hover on hover) and sitting in the same top toolbar row,
diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index 267a5041..e9598ab1 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -2,8 +2,14 @@
 
 import { useContext, useRef, useState, useCallback, useEffect, useMemo } from "react";
 import { ProjectContext } from "@src/context/ProjectContext";
+import { UserContext } from "@src/context/UserContext";
 import { BoardCardData, BoardArrowData } from "@src/lib/project/project-state";
 import BoardCard from "./BoardCard";
+import {
+    ContextMenuItem,
+    ContextMenuSeparator,
+    ContextMenuColorRow,
+} from "@components/utils/ContextMenu";
 import styles from "./BoardCanvas.module.css";
 import { v7 as uuidv7 } from "uuid";
 import { Trash2, Plus, Minus, Copy, ListTree, Mic, Square } from "lucide-react";
@@ -34,27 +40,10 @@ function formatRecordingTime(seconds: number): string {
     return `${m}:${s.toString().padStart(2, "0")}`;
 }
 
-interface CardContextMenuState {
-    position: { x: number; y: number };
-    card: BoardCardData;
-}
-
-interface ArrowContextMenuState {
-    position: { x: number; y: number };
-    arrow: BoardArrowData;
-}
-
-interface CanvasContextMenuState {
-    /** Viewport position for placing the menu. */
-    position: { x: number; y: number };
-    /** Canvas-space coords where a new card should be created. */
-    canvasX: number;
-    canvasY: number;
-}
-
-const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }) => {
+const BoardCanvas =({ isVisible, docId }: { isVisible: boolean; docId: string }) => {
     const { projectId, repository, isYjsReady, isReadOnly, boardFocusCardId, setBoardFocusCardId } =
         useContext(ProjectContext);
+    const { updateContextMenu } = useContext(UserContext);
     const t = useTranslations("board");
     const projectState = repository?.getState();
     const containerRef = useRef<HTMLDivElement>(null);
@@ -67,19 +56,11 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
     const [isPanning, setIsPanning] = useState(false);
     const [isDraggingFile, setIsDraggingFile] = useState(false);
     const [isSnapping, setIsSnapping] = useState(true);
-    const [cardContextMenu, setCardContextMenu] = useState<CardContextMenuState | null>(null);
-    const [arrowContextMenu, setArrowContextMenu] = useState<ArrowContextMenuState | null>(null);
-    const [canvasContextMenu, setCanvasContextMenu] = useState<CanvasContextMenuState | null>(null);
     const recorder = useAudioRecorder();
     const [prevIsVisible, setPrevIsVisible] = useState(isVisible);
     if (prevIsVisible !== isVisible) {
         setPrevIsVisible(isVisible);
-        if (!isVisible) {
-            setIsSnapping(true);
-            if (cardContextMenu) setCardContextMenu(null);
-            if (arrowContextMenu) setArrowContextMenu(null);
-            if (canvasContextMenu) setCanvasContextMenu(null);
-        }
+        if (!isVisible) setIsSnapping(true);
     }
     const [isCameraReady, setIsCameraReady] = useState(false);
     const [connectingFrom, setConnectingFrom] = useState<{ cardId: string; side: string } | null>(
@@ -263,22 +244,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         };
     }, [isVisible]);
 
-    // Close context menus on click anywhere
-    useEffect(() => {
-        if (!isVisible) return;
-
-        const handleClick = () => {
-            if (cardContextMenu) setCardContextMenu(null);
-            if (arrowContextMenu) setArrowContextMenu(null);
-            if (canvasContextMenu) setCanvasContextMenu(null);
-        };
-
-        window.addEventListener("click", handleClick);
-        return () => {
-            window.removeEventListener("click", handleClick);
-        };
-    }, [cardContextMenu, arrowContextMenu, canvasContextMenu, isVisible]);
-
     // Panning with middle-click
     const handlePanMouseDown = useCallback(
         (e: React.MouseEvent) => {
@@ -302,7 +267,7 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             if (e.button !== 0) return;
             if ((e.target as HTMLElement).closest(`.${styles.card}`)) return;
             if ((e.target as HTMLElement).closest(`.${styles.zoom_controls}`)) return;
-            if ((e.target as HTMLElement).closest(`.${styles.context_menu}`)) return;
+            if ((e.target as HTMLElement).closest("[data-context-menu]")) return;
 
             const container = containerRef.current;
             if (!container) return;
@@ -628,70 +593,41 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         [isReadOnly, projectId, offset, scale, saveCards],
     );
 
-    // Right-clicking empty canvas opens a menu (create card / record audio).
-    // Cards and arrows have their own menus, so bail when the click landed on one.
-    const handleCanvasContextMenu = useCallback(
-        (e: React.MouseEvent) => {
-            if (isReadOnly) return;
-            const target = e.target as HTMLElement;
-            if (
-                target.closest(`.${styles.card}`) ||
-                target.closest(`.${styles.arrow_group}`) ||
-                target.closest(`.${styles.context_menu}`) ||
-                target.closest(`.${styles.zoom_controls}`)
-            )
-                return;
+    // Create a text card at the given canvas-space coords (from the canvas menu).
+    const handleCreateCard = useCallback(
+        (x: number, y: number) => {
+            setSelectedCardIds(new Set());
 
-            const container = containerRef.current;
-            if (!container) return;
-            const rect = container.getBoundingClientRect();
-            e.preventDefault();
-            setCardContextMenu(null);
-            setArrowContextMenu(null);
-            setCanvasContextMenu({
-                // Match the card/arrow menus: positioned with raw viewport coords.
-                position: { x: e.clientX, y: e.clientY },
-                canvasX: (e.clientX - rect.left - offset.x) / scale,
-                canvasY: (e.clientY - rect.top - offset.y) / scale,
-            });
+            const newCard: BoardCardData = {
+                id: uuidv7(),
+                title: "",
+                description: "",
+                color: randomCardColor(),
+                x: isSnapping ? Math.round(x / GRID_SIZE) * GRID_SIZE : x,
+                y: isSnapping ? Math.round(y / GRID_SIZE) * GRID_SIZE : y,
+                width: 450,
+                height: 280,
+            };
+
+            const newCards = [...cardsRef.current, newCard];
+            setCards(newCards);
+            saveCards(newCards);
         },
-        [isReadOnly, offset, scale],
+        [isSnapping, saveCards],
     );
 
-    // Create a text card at the spot the canvas menu was opened.
-    const handleCreateCard = useCallback(() => {
-        if (!canvasContextMenu) return;
-        const { canvasX: x, canvasY: y } = canvasContextMenu;
-        setCanvasContextMenu(null);
-        setSelectedCardIds(new Set());
-
-        const newCard: BoardCardData = {
-            id: uuidv7(),
-            title: "",
-            description: "",
-            color: randomCardColor(),
-            x: isSnapping ? Math.round(x / GRID_SIZE) * GRID_SIZE : x,
-            y: isSnapping ? Math.round(y / GRID_SIZE) * GRID_SIZE : y,
-            width: 450,
-            height: 280,
-        };
-
-        const newCards = [...cardsRef.current, newCard];
-        setCards(newCards);
-        saveCards(newCards);
-    }, [canvasContextMenu, isSnapping, saveCards]);
-
-    // Begin recording from the canvas menu; remember where to drop the card.
-    const handleStartRecording = useCallback(async () => {
-        if (!canvasContextMenu) return;
-        recordCoords.current = { x: canvasContextMenu.canvasX, y: canvasContextMenu.canvasY };
-        setCanvasContextMenu(null);
-        try {
-            await recorder.start();
-        } catch (err) {
-            console.error("[BoardCanvas] Microphone access failed:", err);
-        }
-    }, [canvasContextMenu, recorder]);
+    // Begin recording; remember where to drop the resulting card.
+    const handleStartRecording = useCallback(
+        async (x: number, y: number) => {
+            recordCoords.current = { x, y };
+            try {
+                await recorder.start();
+            } catch (err) {
+                console.error("[BoardCanvas] Microphone access failed:", err);
+            }
+        },
+        [recorder],
+    );
 
     // Stop recording, store the clip as an asset, and drop an audio card.
     const handleStopRecording = useCallback(async () => {
@@ -720,6 +656,49 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
         }
     }, [recorder, projectId, saveCards]);
 
+    // Right-clicking empty canvas opens a menu (create card / record audio).
+    // Cards and arrows have their own menus, so bail when the click landed on one.
+    const handleCanvasContextMenu = useCallback(
+        (e: React.MouseEvent) => {
+            if (isReadOnly) return;
+            const target = e.target as HTMLElement;
+            if (
+                target.closest(`.${styles.card}`) ||
+                target.closest(`.${styles.arrow_group}`) ||
+                target.closest("[data-context-menu]") ||
+                target.closest(`.${styles.zoom_controls}`)
+            )
+                return;
+
+            const container = containerRef.current;
+            if (!container) return;
+            const rect = container.getBoundingClientRect();
+            e.preventDefault();
+            const canvasX = (e.clientX - rect.left - offset.x) / scale;
+            const canvasY = (e.clientY - rect.top - offset.y) / scale;
+            updateContextMenu({
+                position: { x: e.clientX, y: e.clientY },
+                content: (
+                    <>
+                        <ContextMenuItem
+                            icon={Plus}
+                            text={t("createCard")}
+                            action={() => handleCreateCard(canvasX, canvasY)}
+                        />
+                        <ContextMenuItem
+                            icon={Mic}
+                            text={t("recordAudio")}
+                            action={() => handleStartRecording(canvasX, canvasY)}
+                            disabled={!recorder.isSupported}
+                            title={recorder.isSupported ? undefined : t("audioUnsupported")}
+                        />
+                    </>
+                ),
+            });
+        },
+        [isReadOnly, offset, scale, updateContextMenu, t, handleCreateCard, handleStartRecording, recorder.isSupported],
+    );
+
     // Update card (with multi-drag support)
     const handleUpdateCard = useCallback(
         (updatedCard: BoardCardData) => {
@@ -766,7 +745,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const newArrows = arrows.filter((a) => a.fromCardId !== id && a.toCardId !== id);
             setArrows(newArrows);
             saveArrows(newArrows);
-            setCardContextMenu(null);
             // Deleting an image card may orphan its asset — reconcile (debounced).
             if (projectId && projectState) scheduleAssetGc(projectId, projectState);
         },
@@ -779,7 +757,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const newCards = cards.map((c) => (c.id === id ? { ...c, color } : c));
             setCards(newCards);
             saveCards(newCards);
-            setCardContextMenu(null);
         },
         [cards, saveCards],
     );
@@ -796,7 +773,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
             const newCards = [...cards, newCard];
             setCards(newCards);
             saveCards(newCards);
-            setCardContextMenu(null);
         },
         [cards, saveCards],
     );
@@ -813,40 +789,81 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                 color: card.color,
                 parentId: null,
             });
-            setCardContextMenu(null);
         },
         [repository, docId],
     );
 
-    // Context menu for card
-    const handleCardContextMenu = useCallback((e: React.MouseEvent, card: BoardCardData) => {
-        setCardContextMenu({
-            position: { x: e.clientX, y: e.clientY },
-            card,
-        });
-    }, []);
-
-    // Context menu for arrow
-    const handleArrowContextMenu = useCallback((e: React.MouseEvent, arrow: BoardArrowData) => {
-        e.preventDefault();
-        e.stopPropagation();
-        setArrowContextMenu({
-            position: { x: e.clientX, y: e.clientY },
-            arrow,
-        });
-    }, []);
-
     // Delete arrow
     const handleDeleteArrow = useCallback(
         (id: string) => {
             const newArrows = arrows.filter((a) => a.id !== id);
             setArrows(newArrows);
             saveArrows(newArrows);
-            setArrowContextMenu(null);
         },
         [arrows, saveArrows],
     );
 
+    // Open the shared context-menu host for a card.
+    const handleCardContextMenu = useCallback(
+        (e: React.MouseEvent, card: BoardCardData) => {
+            updateContextMenu({
+                position: { x: e.clientX, y: e.clientY },
+                content: (
+                    <>
+                        {/* Color applies to text + audio notes; image cards have none. */}
+                        {card.type !== "image" && (
+                            <>
+                                <ContextMenuColorRow
+                                    colors={DEFAULT_ITEM_COLORS}
+                                    selected={card.color}
+                                    onSelect={(color) => handleChangeCardColor(card.id, color)}
+                                />
+                                <ContextMenuSeparator />
+                            </>
+                        )}
+                        <ContextMenuItem
+                            icon={Copy}
+                            text={t("duplicate")}
+                            action={() => handleDuplicateCard(card)}
+                        />
+                        {(card.type ?? "text") === "text" && (
+                            <ContextMenuItem
+                                icon={ListTree}
+                                text={t("sendToOutline")}
+                                action={() => handleSendToOutline(card)}
+                            />
+                        )}
+                        <ContextMenuItem
+                            icon={Trash2}
+                            text={t("delete")}
+                            action={() => handleDeleteCard(card.id)}
+                        />
+                    </>
+                ),
+            });
+        },
+        [updateContextMenu, t, handleChangeCardColor, handleDuplicateCard, handleSendToOutline, handleDeleteCard],
+    );
+
+    // Open the shared context-menu host for an arrow.
+    const handleArrowContextMenu = useCallback(
+        (e: React.MouseEvent, arrow: BoardArrowData) => {
+            e.preventDefault();
+            e.stopPropagation();
+            updateContextMenu({
+                position: { x: e.clientX, y: e.clientY },
+                content: (
+                    <ContextMenuItem
+                        icon={Trash2}
+                        text={t("delete")}
+                        action={() => handleDeleteArrow(arrow.id)}
+                    />
+                ),
+            });
+        },
+        [updateContextMenu, t, handleDeleteArrow],
+    );
+
     // Get connection point position for a card
     const getConnectionPoint = useCallback(
         (card: BoardCardData, side: "top" | "right" | "bottom" | "left") => {
@@ -1189,80 +1206,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                     )}
                 </div>
 
-                {/* Card Context Menu */}
-                {cardContextMenu && (
-                    <div
-                        className={styles.context_menu}
-                        style={{
-                            top: cardContextMenu.position.y,
-                            left: cardContextMenu.position.x,
-                        }}
-                    >
-                        {/* Color applies to text + audio notes; image cards have none. */}
-                        {cardContextMenu.card.type !== "image" && (
-                            <div className={styles.context_menu_colors}>
-                                {DEFAULT_ITEM_COLORS.map((color) => (
-                                    <button
-                                        key={color}
-                                        className={`${styles.context_menu_color_swatch} ${cardContextMenu.card.color === color ? styles.context_menu_color_swatch_active : ""}`}
-                                        style={{ backgroundColor: color }}
-                                        onClick={() =>
-                                            handleChangeCardColor(cardContextMenu.card.id, color)
-                                        }
-                                    />
-                                ))}
-                            </div>
-                        )}
-                        <div
-                            className={styles.context_menu_item}
-                            onClick={() => handleDuplicateCard(cardContextMenu.card)}
-                        >
-                            <Copy size={16} />
-                            <p className="unselectable">{t("duplicate")}</p>
-                        </div>
-                        {(cardContextMenu.card.type ?? "text") === "text" && (
-                            <div
-                                className={styles.context_menu_item}
-                                onClick={() => handleSendToOutline(cardContextMenu.card)}
-                            >
-                                <ListTree size={16} />
-                                <p className="unselectable">{t("sendToOutline")}</p>
-                            </div>
-                        )}
-                        <div
-                            className={styles.context_menu_item}
-                            onClick={() => handleDeleteCard(cardContextMenu.card.id)}
-                        >
-                            <Trash2 size={16} />
-                            <p className="unselectable">{t("delete")}</p>
-                        </div>
-                    </div>
-                )}
-
-                {/* Canvas Context Menu (empty-area right-click) */}
-                {canvasContextMenu && (
-                    <div
-                        className={styles.context_menu}
-                        style={{
-                            top: canvasContextMenu.position.y,
-                            left: canvasContextMenu.position.x,
-                        }}
-                    >
-                        <div className={styles.context_menu_item} onClick={handleCreateCard}>
-                            <Plus size={16} />
-                            <p className="unselectable">{t("createCard")}</p>
-                        </div>
-                        <div
-                            className={`${styles.context_menu_item} ${recorder.isSupported ? "" : styles.context_menu_item_disabled}`}
-                            title={recorder.isSupported ? undefined : t("audioUnsupported")}
-                            onClick={recorder.isSupported ? handleStartRecording : undefined}
-                        >
-                            <Mic size={16} />
-                            <p className="unselectable">{t("recordAudio")}</p>
-                        </div>
-                    </div>
-                )}
-
                 {/* Recording indicator */}
                 {recorder.isRecording && (
                     <div className={styles.recording_indicator}>
@@ -1277,25 +1220,6 @@ const BoardCanvas = ({ isVisible, docId }: { isVisible: boolean; docId: string }
                     </div>
                 )}
 
-                {/* Arrow Context Menu */}
-                {arrowContextMenu && (
-                    <div
-                        className={styles.context_menu}
-                        style={{
-                            top: arrowContextMenu.position.y,
-                            left: arrowContextMenu.position.x,
-                        }}
-                    >
-                        <div
-                            className={styles.context_menu_item}
-                            onClick={() => handleDeleteArrow(arrowContextMenu.arrow.id)}
-                        >
-                            <Trash2 size={16} />
-                            <p className="unselectable">{t("delete")}</p>
-                        </div>
-                    </div>
-                )}
-
                 <div className={styles.zoom_controls}>
                     <button className={styles.zoom_btn} onClick={() => zoomFromCenter(false)}>
                         <Minus size={14} />
diff --git a/components/editor/CommentCard.module.css b/components/editor/CommentCard.module.css
index 936f0265..3ee7951f 100644
--- a/components/editor/CommentCard.module.css
+++ b/components/editor/CommentCard.module.css
@@ -1,35 +1,43 @@
 .comment_card {
-    width: 250px;
-    background-color: var(--editor-sidebar);
-    border-radius: 12px;
-    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
-    padding: 10px 12px;
+    width: 100%;
+    background-color: var(--editor-style-bg);
+    border-radius: 10px;
+    padding: 8px 10px;
     cursor: default;
     border: 1px solid var(--separator);
-    z-index: 50;
-    transition: box-shadow 0.2s ease, border-color 0.2s ease;
-}
-
-.comment_card_active {
-    border-color: rgba(255, 213, 0, 0.5);
+    box-sizing: border-box;
 }
 
 .comment_header {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    gap: 8px;
+    min-height: 22px;
     margin-bottom: 6px;
 }
 
+.comment_meta {
+    display: flex;
+    align-items: baseline;
+    gap: 6px;
+    min-width: 0;
+}
+
 .comment_author {
     font-size: 13px;
     font-weight: 600;
     color: var(--text);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .comment_time {
     font-size: 11px;
     color: var(--text-secondary);
+    white-space: nowrap;
+    flex-shrink: 0;
 }
 
 .comment_text {
@@ -40,24 +48,31 @@
     word-wrap: break-word;
 }
 
+/* Icon actions sit in the header, hidden until the card is hovered/focused so
+   the resting thread stays uncluttered while Delete et al. remain one hover away. */
 .comment_actions {
     display: flex;
-    gap: 4px;
-    justify-content: flex-end;
-    border-top: 1px solid var(--separator);
-    padding-top: 8px;
+    gap: 2px;
+    align-items: center;
+    flex-shrink: 0;
+    opacity: 0;
+    transition: opacity 0.15s ease;
+}
+
+.comment_card:hover .comment_actions,
+.comment_card:focus-within .comment_actions {
+    opacity: 1;
 }
 
 .comment_btn {
     display: flex;
     align-items: center;
-    gap: 4px;
-    padding: 4px 8px;
+    justify-content: center;
+    padding: 3px;
     border: none;
-    border-radius: 8px;
-    font-size: 13px;
+    border-radius: 6px;
     cursor: pointer;
-    background-color: var(--editor-style-bg);
+    background-color: transparent;
     color: var(--text-secondary);
     transition: background-color 0.15s ease, color 0.15s ease;
 }
@@ -151,16 +166,40 @@
 .reply {
     padding: 6px 8px;
     border-radius: 8px;
-    background-color: var(--editor-style-bg);
+    background-color: var(--editor-sidebar);
+    border: 1px solid var(--separator);
 }
 
 .reply_header {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    gap: 8px;
+    min-height: 20px;
     margin-bottom: 2px;
 }
 
+.reply_meta {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    flex-shrink: 0;
+}
+
+/* Per-reply icon actions, revealed when that reply is hovered/focused. */
+.reply_actions {
+    display: flex;
+    gap: 2px;
+    align-items: center;
+    opacity: 0;
+    transition: opacity 0.15s ease;
+}
+
+.reply:hover .reply_actions,
+.reply:focus-within .reply_actions {
+    opacity: 1;
+}
+
 .reply_text {
     font-size: 13px;
     color: var(--text);
@@ -177,6 +216,8 @@
 
 .reply_input {
     flex: 1;
+    width: 100%;
+    box-sizing: border-box;
     padding: 5px 8px;
     border: 1px solid var(--separator);
     border-radius: 8px;
diff --git a/components/editor/CommentCard.tsx b/components/editor/CommentCard.tsx
new file mode 100644
index 00000000..3328863c
--- /dev/null
+++ b/components/editor/CommentCard.tsx
@@ -0,0 +1,297 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+import { Comment, CommentReply } from "@src/lib/utils/types";
+import { Check, Pencil, Send, Trash2 } from "lucide-react";
+import { useFormatTimestamp } from "@src/lib/utils/hooks";
+import styles from "./CommentCard.module.css";
+
+// -------------------------------- //
+//          Reply bubble            //
+// -------------------------------- //
+
+type ReplyBubbleProps = {
+    reply: CommentReply;
+    onSave: (text: string) => void;
+    onDelete: () => void;
+};
+
+const ReplyBubble = ({ reply, onSave, onDelete }: ReplyBubbleProps) => {
+    const [isEditing, setIsEditing] = useState(false);
+    const [draft, setDraft] = useState(reply.text);
+    const textareaRef = useRef<HTMLTextAreaElement>(null);
+    const formatTimestamp = useFormatTimestamp();
+
+    useEffect(() => {
+        if (isEditing && textareaRef.current) textareaRef.current.focus({ preventScroll: true });
+    }, [isEditing]);
+
+    const handleSave = () => {
+        const trimmed = draft.trim();
+        if (!trimmed) return;
+        onSave(trimmed);
+        setIsEditing(false);
+    };
+
+    const handleKeyDown = (e: React.KeyboardEvent) => {
+        if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
+            e.preventDefault();
+            handleSave();
+        }
+        if (e.key === "Escape") {
+            e.preventDefault();
+            setDraft(reply.text);
+            setIsEditing(false);
+        }
+        e.stopPropagation();
+    };
+
+    return (
+        <div className={styles.reply}>
+            <div className={styles.reply_header}>
+                <span className={styles.comment_author}>{reply.author}</span>
+                <div className={styles.reply_meta}>
+                    <span className={styles.comment_time}>{formatTimestamp(reply.createdAt)}</span>
+                    {!isEditing && (
+                        <div className={styles.reply_actions}>
+                            <button
+                                className={styles.comment_btn}
+                                onClick={() => setIsEditing(true)}
+                                title="Edit"
+                                aria-label="Edit reply"
+                            >
+                                <Pencil size={13} />
+                            </button>
+                            <button
+                                className={`${styles.comment_btn} ${styles.comment_btn_danger}`}
+                                onClick={onDelete}
+                                title="Delete"
+                                aria-label="Delete reply"
+                            >
+                                <Trash2 size={13} />
+                            </button>
+                        </div>
+                    )}
+                </div>
+            </div>
+
+            {isEditing ? (
+                <>
+                    <textarea
+                        ref={textareaRef}
+                        className={styles.reply_input}
+                        value={draft}
+                        onChange={(e) => setDraft(e.target.value)}
+                        onKeyDown={handleKeyDown}
+                        rows={2}
+                    />
+                    <div className={styles.comment_submit_row}>
+                        <button
+                            className={styles.comment_cancel_btn}
+                            onClick={() => {
+                                setDraft(reply.text);
+                                setIsEditing(false);
+                            }}
+                        >
+                            Cancel
+                        </button>
+                        <button className={styles.comment_submit_btn} onClick={handleSave}>
+                            Save
+                        </button>
+                    </div>
+                </>
+            ) : (
+                <div className={styles.reply_text}>{reply.text}</div>
+            )}
+        </div>
+    );
+};
+
+// -------------------------------- //
+//          Comment card            //
+// -------------------------------- //
+
+export type CommentCardProps = {
+    comment: Comment;
+    onUpdate: (data: Partial<Comment>) => void;
+    onDelete: () => void;
+    onResolve: () => void;
+    onReply: (text: string) => void;
+};
+
+/**
+ * A single comment within a node's discussion thread: author/time header with
+ * resolve/edit/delete actions, the comment body (editable for new or in-edit
+ * comments), its replies (each individually editable/deletable), and a reply
+ * input.
+ */
+const CommentCard = ({ comment, onUpdate, onDelete, onResolve, onReply }: CommentCardProps) => {
+    const isNew = comment.text === "";
+    const [isEditing, setIsEditing] = useState(isNew);
+    const [draft, setDraft] = useState(comment.text);
+    const [replyDraft, setReplyDraft] = useState("");
+    const textareaRef = useRef<HTMLTextAreaElement>(null);
+    const formatTimestamp = useFormatTimestamp();
+
+    const replies = comment.replies ?? [];
+
+    useEffect(() => {
+        if (isEditing && textareaRef.current) {
+            textareaRef.current.focus({ preventScroll: true });
+        }
+    }, [isEditing]);
+
+    const handleSubmit = () => {
+        const trimmed = draft.trim();
+        if (!trimmed) {
+            if (isNew) onDelete();
+            return;
+        }
+        onUpdate({ text: trimmed });
+        setIsEditing(false);
+    };
+
+    const handleCancel = () => {
+        if (isNew) {
+            onDelete();
+        } else {
+            setDraft(comment.text);
+            setIsEditing(false);
+        }
+    };
+
+    const handleReplySubmit = () => {
+        const trimmed = replyDraft.trim();
+        if (!trimmed) return;
+        onReply(trimmed);
+        setReplyDraft("");
+    };
+
+    const handleKeyDown = (e: React.KeyboardEvent) => {
+        if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
+            e.preventDefault();
+            handleSubmit();
+        }
+        if (e.key === "Escape") {
+            e.preventDefault();
+            handleCancel();
+        }
+        e.stopPropagation();
+    };
+
+    const handleReplyKeyDown = (e: React.KeyboardEvent) => {
+        if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
+            e.preventDefault();
+            handleReplySubmit();
+        }
+        e.stopPropagation();
+    };
+
+    const editReply = (replyId: string, text: string) => {
+        onUpdate({ replies: replies.map((r) => (r.id === replyId ? { ...r, text } : r)) });
+    };
+
+    const deleteReply = (replyId: string) => {
+        onUpdate({ replies: replies.filter((r) => r.id !== replyId) });
+    };
+
+    return (
+        <div className={styles.comment_card}>
+            <div className={styles.comment_header}>
+                <div className={styles.comment_meta}>
+                    <span className={styles.comment_author}>{comment.author}</span>
+                    <span className={styles.comment_time}>{formatTimestamp(comment.createdAt)}</span>
+                </div>
+
+                {/* Icon actions, revealed on card hover/focus (see CSS). */}
+                {!isEditing && (
+                    <div className={styles.comment_actions}>
+                        <button
+                            className={`${styles.comment_btn} ${styles.comment_btn_resolve}`}
+                            onClick={onResolve}
+                            title="Resolve"
+                            aria-label="Resolve"
+                        >
+                            <Check size={14} />
+                        </button>
+                        <button
+                            className={styles.comment_btn}
+                            onClick={() => setIsEditing(true)}
+                            title="Edit"
+                            aria-label="Edit"
+                        >
+                            <Pencil size={14} />
+                        </button>
+                        <button
+                            className={`${styles.comment_btn} ${styles.comment_btn_danger}`}
+                            onClick={onDelete}
+                            title="Delete"
+                            aria-label="Delete"
+                        >
+                            <Trash2 size={14} />
+                        </button>
+                    </div>
+                )}
+            </div>
+
+            {isEditing ? (
+                <>
+                    <textarea
+                        ref={textareaRef}
+                        className={styles.comment_input}
+                        value={draft}
+                        onChange={(e) => setDraft(e.target.value)}
+                        onKeyDown={handleKeyDown}
+                        placeholder="Write a comment..."
+                    />
+                    <div className={styles.comment_submit_row}>
+                        <button className={styles.comment_cancel_btn} onClick={handleCancel}>
+                            Cancel
+                        </button>
+                        <button className={styles.comment_submit_btn} onClick={handleSubmit}>
+                            Save
+                        </button>
+                    </div>
+                </>
+            ) : (
+                <>
+                    <div className={styles.comment_text}>{comment.text}</div>
+
+                    {replies.length > 0 && (
+                        <div className={styles.replies}>
+                            {replies.map((r) => (
+                                <ReplyBubble
+                                    key={r.id}
+                                    reply={r}
+                                    onSave={(text) => editReply(r.id, text)}
+                                    onDelete={() => deleteReply(r.id)}
+                                />
+                            ))}
+                        </div>
+                    )}
+
+                    <div className={styles.reply_input_row}>
+                        <textarea
+                            className={styles.reply_input}
+                            value={replyDraft}
+                            onChange={(e) => setReplyDraft(e.target.value)}
+                            onKeyDown={handleReplyKeyDown}
+                            placeholder="Reply..."
+                            rows={1}
+                        />
+                        <button
+                            className={styles.reply_send_btn}
+                            onClick={handleReplySubmit}
+                            disabled={!replyDraft.trim()}
+                            title="Send reply"
+                        >
+                            <Send size={14} />
+                        </button>
+                    </div>
+                </>
+            )}
+        </div>
+    );
+};
+
+export default CommentCard;
diff --git a/components/editor/CommentCards.tsx b/components/editor/CommentCards.tsx
deleted file mode 100644
index 6071f4ab..00000000
--- a/components/editor/CommentCards.tsx
+++ /dev/null
@@ -1,453 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useRef, useState, useMemo } from "react";
-import { Comment, CommentReply } from "@src/lib/utils/types";
-import { Send, Trash2, X } from "lucide-react";
-import { useFormatTimestamp, useUser } from "@src/lib/utils/hooks";
-import { getCommentPositions } from "@src/lib/screenplay/extensions/comment-highlight-extension";
-import { useViewContext } from "@src/context/ViewContext";
-import { Editor } from "@tiptap/react";
-import { Transaction } from "@tiptap/pm/state";
-import styles from "./CommentCard.module.css";
-
-// -------------------------------- //
-//          Reply bubble            //
-// -------------------------------- //
-
-const ReplyBubble = ({ reply }: { reply: CommentReply }) => {
-    const formatTimestamp = useFormatTimestamp();
-    return (
-        <div className={styles.reply}>
-            <div className={styles.reply_header}>
-                <span className={styles.comment_author}>{reply.author}</span>
-                <span className={styles.comment_time}>{formatTimestamp(reply.createdAt)}</span>
-            </div>
-            <div className={styles.reply_text}>{reply.text}</div>
-        </div>
-    );
-};
-
-// -------------------------------- //
-//          Comment card             //
-// -------------------------------- //
-
-type CommentCardProps = {
-    comment: Comment;
-    isActive: boolean;
-    onActivate: () => void;
-    onDeactivate: () => void;
-    onSave: (text: string) => void;
-    onDelete: () => void;
-    onReply: (text: string) => void;
-};
-
-const CommentCard = ({ comment, isActive, onActivate, onDeactivate, onSave, onDelete, onReply }: CommentCardProps) => {
-    const isNew = comment.text === "";
-    const [isEditing, setIsEditing] = useState(isNew);
-    const [draft, setDraft] = useState(comment.text);
-    const [replyDraft, setReplyDraft] = useState("");
-    const textareaRef = useRef<HTMLTextAreaElement>(null);
-    const formatTimestamp = useFormatTimestamp();
-
-    useEffect(() => {
-        if (isEditing && textareaRef.current) {
-            textareaRef.current.focus({ preventScroll: true });
-        }
-    }, [isEditing]);
-
-    const handleSubmit = () => {
-        const trimmed = draft.trim();
-        if (!trimmed) {
-            if (isNew) onDelete();
-            return;
-        }
-        onSave(trimmed);
-        setIsEditing(false);
-        onDeactivate();
-    };
-
-    const handleCancel = () => {
-        if (isNew) {
-            onDelete();
-        } else {
-            setDraft(comment.text);
-            setIsEditing(false);
-        }
-    };
-
-    const handleReplySubmit = () => {
-        const trimmed = replyDraft.trim();
-        if (!trimmed) return;
-        onReply(trimmed);
-        setReplyDraft("");
-    };
-
-    const handleKeyDown = (e: React.KeyboardEvent) => {
-        if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
-            e.preventDefault();
-            handleSubmit();
-        }
-        if (e.key === "Escape") {
-            e.preventDefault();
-            handleCancel();
-        }
-        e.stopPropagation();
-    };
-
-    const handleReplyKeyDown = (e: React.KeyboardEvent) => {
-        if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
-            e.preventDefault();
-            handleReplySubmit();
-        }
-        e.stopPropagation();
-    };
-
-    const replies = comment.replies ?? [];
-
-    // Compact card for non-active comments
-    if (!isActive && !isNew) {
-        return (
-            <div className={styles.comment_card} onMouseDown={(e) => e.stopPropagation()} onClick={(e) => { e.stopPropagation(); onActivate(); }}>
-                <div className={styles.comment_header}>
-                    <span className={styles.comment_author}>{comment.author}</span>
-                    <span className={styles.comment_time}>{formatTimestamp(comment.createdAt)}</span>
-                </div>
-                <div className={styles.comment_text}>{comment.text}</div>
-                {replies.length > 0 && (
-                    <div className={styles.comment_reply_count}>
-                        {replies.length} {replies.length === 1 ? "reply" : "replies"}
-                    </div>
-                )}
-            </div>
-        );
-    }
-
-    return (
-        <div className={`${styles.comment_card} ${styles.comment_card_active}`} onMouseDown={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}>
-            {/* Original comment */}
-            <div className={styles.comment_header}>
-                <span className={styles.comment_author}>{comment.author}</span>
-                <span className={styles.comment_time}>{formatTimestamp(comment.createdAt)}</span>
-            </div>
-
-            {isEditing ? (
-                <>
-                    <textarea
-                        ref={textareaRef}
-                        className={styles.comment_input}
-                        value={draft}
-                        onChange={(e) => setDraft(e.target.value)}
-                        onKeyDown={handleKeyDown}
-                        placeholder="Write a comment..."
-                    />
-                    <div className={styles.comment_submit_row}>
-                        <button className={styles.comment_cancel_btn} onClick={(e) => { e.stopPropagation(); handleCancel(); }}>
-                            Cancel
-                        </button>
-                        <button className={styles.comment_submit_btn} onClick={(e) => { e.stopPropagation(); handleSubmit(); }}>
-                            Save
-                        </button>
-                    </div>
-                </>
-            ) : (
-                <>
-                    <div className={styles.comment_text}>{comment.text}</div>
-
-                    {/* Replies */}
-                    {replies.length > 0 && (
-                        <div className={styles.replies}>
-                            {replies.map((r) => (
-                                <ReplyBubble key={r.id} reply={r} />
-                            ))}
-                        </div>
-                    )}
-
-                    {/* Reply input */}
-                    <div className={styles.reply_input_row}>
-                        <textarea
-                            className={styles.reply_input}
-                            value={replyDraft}
-                            onChange={(e) => setReplyDraft(e.target.value)}
-                            onKeyDown={handleReplyKeyDown}
-                            placeholder="Reply..."
-                            rows={1}
-                        />
-                        <button
-                            className={styles.reply_send_btn}
-                            onClick={(e) => { e.stopPropagation(); handleReplySubmit(); }}
-                            disabled={!replyDraft.trim()}
-                            title="Send reply"
-                        >
-                            <Send size={14} />
-                        </button>
-                    </div>
-
-                    {/* Actions: Cancel + Delete */}
-                    <div className={styles.comment_actions}>
-                        <button className={styles.comment_btn} onClick={(e) => { e.stopPropagation(); onDeactivate(); }} title="Cancel">
-                            <X size={14} /> Cancel
-                        </button>
-                        <button className={`${styles.comment_btn} ${styles.comment_btn_danger}`} onClick={(e) => { e.stopPropagation(); onDelete(); }} title="Delete">
-                            <Trash2 size={14} /> Delete
-                        </button>
-                    </div>
-                </>
-            )}
-        </div>
-    );
-};
-
-// -------------------------------- //
-//       Comment cards container     //
-// -------------------------------- //
-
-const CARD_GAP = 8;
-
-type ActiveLine = {
-    x1: number;
-    y1: number;
-    x2: number;
-    y2: number;
-    svgHeight: number;
-};
-
-export interface CommentCardsProps {
-    editor: Editor | null;
-    comments: Comment[];
-    activeCommentId: string | null;
-    setActiveCommentId: (id: string | null) => void;
-    onUpdateComment: (id: string, data: Partial<Comment>) => void;
-    onDeleteComment: (id: string) => void;
-    onAddReply: (commentId: string, text: string, author: string) => void;
-}
-
-const CommentCards = ({
-    editor,
-    comments,
-    activeCommentId,
-    setActiveCommentId,
-    onUpdateComment,
-    onDeleteComment,
-    onAddReply,
-}: CommentCardsProps) => {
-    const { user } = useUser();
-    const { showComments } = useViewContext();
-    const cardRefs = useRef<Map<string, HTMLDivElement>>(new Map());
-    const [activeLine, setActiveLine] = useState<ActiveLine | null>(null);
-
-    // Performance: RAF debouncing refs to prevent layout thrashing
-    const transactionDebounceRef = useRef<number | null>(null);
-    const resizeThrottleRef = useRef<number | null>(null);
-
-    const unresolvedComments = useMemo(
-        () => comments.filter((c) => !c.resolved),
-        [comments],
-    );
-
-    // Centralized positioning: iterate sorted cards, push down to avoid overlap.
-    // Reads positions from comment marks in the document.
-    const positionCards = useCallback(() => {
-        if (!editor || editor.isDestroyed || !editor.view?.dom || !showComments) return;
-
-        const editorDom = editor.view.dom;
-        const scrollContainer = editorDom.closest("[class*='container']") as HTMLElement | null;
-        if (!scrollContainer) return;
-
-        const containerRect = scrollContainer.getBoundingClientRect();
-        const editorRect = editorDom.getBoundingClientRect();
-        const CARD_WIDTH = 250;
-        const idealLeft = editorRect.right - containerRect.left + 12;
-        const maxLeft = containerRect.width - CARD_WIDTH - 8;
-        const left = Math.min(idealLeft, Math.max(0, maxLeft));
-        const markPositions = getCommentPositions(editor);
-
-        // Sort comments by their position in the document
-        const sorted = [...unresolvedComments]
-            .filter((c) => markPositions.has(c.id))
-            .sort((a, b) => (markPositions.get(a.id)!.from - markPositions.get(b.id)!.from));
-
-        let nextAvailableTop = 0;
-
-        for (const comment of sorted) {
-            const el = cardRefs.current.get(comment.id);
-            if (!el) continue;
-
-            const from = markPositions.get(comment.id)!.from;
-
-            try {
-                const coords = editor.view.coordsAtPos(from);
-                const idealTop = coords.top - containerRect.top + scrollContainer.scrollTop;
-                const top = Math.max(idealTop, nextAvailableTop);
-
-                el.style.top = `${top}px`;
-                el.style.left = `${left}px`;
-
-                nextAvailableTop = top + el.offsetHeight + CARD_GAP;
-            } catch {
-                // Position out of range
-            }
-        }
-
-    }, [editor, unresolvedComments, showComments]);
-
-    // Position on mount and when comments change
-    useEffect(() => {
-        positionCards();
-    }, [positionCards]);
-
-    // Reposition on document changes, window resize, and container resize (zen mode, split view, etc.)
-    useEffect(() => {
-        if (!editor || editor.isDestroyed || !showComments) return;
-
-        // Performance: Debounce transaction handler to prevent layout thrashing during typing
-        const handleTransaction = ({ transaction }: { transaction: Transaction }) => {
-            if (!transaction.docChanged) return;
-            if (transactionDebounceRef.current !== null) {
-                cancelAnimationFrame(transactionDebounceRef.current);
-            }
-            transactionDebounceRef.current = requestAnimationFrame(() => {
-                transactionDebounceRef.current = null;
-                positionCards();
-            });
-        };
-        editor.on("transaction", handleTransaction);
-        window.addEventListener("resize", positionCards);
-
-        const editorDom = editor.view?.dom;
-        const scrollContainer = editorDom?.closest("[class*='container']") as HTMLElement | null;
-        let resizeObserver: ResizeObserver | undefined;
-        if (scrollContainer) {
-            // Performance: Throttle ResizeObserver to once per animation frame
-            resizeObserver = new ResizeObserver(() => {
-                if (resizeThrottleRef.current !== null) return;
-                resizeThrottleRef.current = requestAnimationFrame(() => {
-                    resizeThrottleRef.current = null;
-                    positionCards();
-                });
-            });
-            resizeObserver.observe(scrollContainer);
-        }
-
-        return () => {
-            editor.off("transaction", handleTransaction);
-            window.removeEventListener("resize", positionCards);
-            resizeObserver?.disconnect();
-            // Cleanup pending animation frames
-            if (transactionDebounceRef.current !== null) {
-                cancelAnimationFrame(transactionDebounceRef.current);
-            }
-            if (resizeThrottleRef.current !== null) {
-                cancelAnimationFrame(resizeThrottleRef.current);
-            }
-        };
-    }, [editor, positionCards, showComments]);
-
-    // Reposition after active card changes (expanded height differs from compact)
-    // Also compute the connecting line for the active comment
-    useEffect(() => {
-        if (!showComments) {
-            requestAnimationFrame(() => setActiveLine(null));
-            return;
-        }
-
-        requestAnimationFrame(() => {
-            positionCards();
-
-            // Compute connecting line only for active comment
-            if (!activeCommentId || !editor || editor.isDestroyed || !editor.view?.dom) {
-                setActiveLine(null);
-                return;
-            }
-
-            const el = cardRefs.current.get(activeCommentId);
-            if (!el) { setActiveLine(null); return; }
-
-            const markPositions = getCommentPositions(editor);
-            const range = markPositions.get(activeCommentId);
-            if (!range) { setActiveLine(null); return; }
-
-            const editorDom = editor.view.dom;
-            const scrollContainer = editorDom.closest("[class*='container']") as HTMLElement | null;
-            if (!scrollContainer) { setActiveLine(null); return; }
-
-            try {
-                const containerRect = scrollContainer.getBoundingClientRect();
-                const fromCoords = editor.view.coordsAtPos(range.from);
-                const toCoords = editor.view.coordsAtPos(range.to);
-                const lineHeight = fromCoords.bottom - fromCoords.top;
-
-                setActiveLine({
-                    x1: toCoords.right - containerRect.left,
-                    y1: fromCoords.top - containerRect.top + scrollContainer.scrollTop + lineHeight / 2,
-                    x2: parseFloat(el.style.left),
-                    y2: parseFloat(el.style.top) + el.offsetHeight / 2,
-                    svgHeight: scrollContainer.scrollHeight,
-                });
-            } catch {
-                setActiveLine(null);
-            }
-        });
-    }, [activeCommentId, positionCards, editor, showComments]);
-
-    const setCardRef = useCallback((id: string, el: HTMLDivElement | null) => {
-        if (el) cardRefs.current.set(id, el);
-        else cardRefs.current.delete(id);
-    }, []);
-
-    if (!showComments || unresolvedComments.length === 0) return null;
-
-    return (
-        <>
-            {activeLine && (
-                <svg
-                    style={{
-                        position: "absolute",
-                        top: 0,
-                        left: 0,
-                        width: "100%",
-                        height: activeLine.svgHeight,
-                        pointerEvents: "none",
-                        zIndex: 9,
-                    }}
-                >
-                    <path
-                        d={`M ${activeLine.x1} ${activeLine.y1} C ${(activeLine.x1 + activeLine.x2) / 2} ${activeLine.y1}, ${(activeLine.x1 + activeLine.x2) / 2} ${activeLine.y2}, ${activeLine.x2} ${activeLine.y2}`}
-                        stroke="rgba(255, 213, 0, 0.4)"
-                        strokeWidth={1.5}
-                        fill="none"
-                    />
-                </svg>
-            )}
-            {unresolvedComments.map((comment) => {
-                const isActive = comment.id === activeCommentId;
-                return (
-                    <div
-                        key={comment.id}
-                        ref={(el) => setCardRef(comment.id, el)}
-                        style={{ position: "absolute", zIndex: isActive ? 11 : 10 }}
-                    >
-                        <CommentCard
-                            comment={comment}
-                            isActive={isActive}
-                            onActivate={() => setActiveCommentId(comment.id)}
-                            onDeactivate={() => setActiveCommentId(null)}
-                            onSave={(text: string) => {
-                                onUpdateComment(comment.id, { text });
-                            }}
-                            onDelete={() => {
-                                editor?.commands.unsetComment(comment.id);
-                                onDeleteComment(comment.id);
-                                setActiveCommentId(null);
-                            }}
-                            onReply={(text: string) => {
-                                onAddReply(comment.id, text, user?.username || "Anonymous");
-                            }}
-                        />
-                    </div>
-                );
-            })}
-        </>
-    );
-};
-
-export default CommentCards;
diff --git a/components/editor/CommentGutter.module.css b/components/editor/CommentGutter.module.css
new file mode 100644
index 00000000..0703ab68
--- /dev/null
+++ b/components/editor/CommentGutter.module.css
@@ -0,0 +1,126 @@
+/* ---- Margin comment icon ---- */
+
+.gutter_icon {
+    position: absolute;
+    z-index: 10;
+
+    display: flex;
+    align-items: center;
+    gap: 2px;
+    height: 22px;
+    min-width: 22px;
+    padding: 0 4px;
+
+    border: 1px solid var(--separator);
+    border-radius: 6px 6px 6px 2px;
+    background-color: var(--editor-sidebar);
+    color: var(--text-secondary);
+    cursor: pointer;
+
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+    transition:
+        color 0.15s ease,
+        background-color 0.15s ease,
+        border-color 0.15s ease;
+}
+
+.gutter_icon:hover {
+    color: var(--text);
+    background-color: var(--editor-sidebar-hover);
+    border-color: rgba(255, 213, 0, 0.6);
+}
+
+.gutter_icon_active {
+    color: var(--text);
+    border-color: rgba(255, 213, 0, 0.8);
+    background-color: var(--editor-sidebar-hover);
+}
+
+.gutter_count {
+    font-size: 11px;
+    font-weight: 600;
+    line-height: 1;
+}
+
+/* ---- Discussion thread popover ---- */
+
+.thread {
+    position: absolute;
+    z-index: 12;
+
+    display: flex;
+    flex-direction: column;
+    max-height: 60vh;
+
+    background-color: var(--editor-sidebar);
+    border: 1px solid var(--separator);
+    border-radius: 12px;
+    box-shadow: 0 4px 18px rgba(0, 0, 0, 0.25);
+    overflow: hidden;
+}
+
+.thread_header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 8px 12px;
+    border-bottom: 1px solid var(--separator);
+}
+
+.thread_title {
+    font-size: 13px;
+    font-weight: 600;
+    color: var(--text);
+}
+
+.thread_close {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 2px;
+    border: none;
+    border-radius: 6px;
+    background-color: transparent;
+    color: var(--text-secondary);
+    cursor: pointer;
+    transition:
+        background-color 0.15s ease,
+        color 0.15s ease;
+}
+
+.thread_close:hover {
+    background-color: var(--editor-style-bg-hover);
+    color: var(--text);
+}
+
+.thread_body {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    padding: 8px;
+    overflow-y: auto;
+}
+
+.thread_add {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 4px;
+    margin: 0 8px 8px;
+    padding: 6px;
+
+    border: 1px dashed var(--separator);
+    border-radius: 8px;
+    background-color: transparent;
+    color: var(--text-secondary);
+    font-size: 13px;
+    cursor: pointer;
+    transition:
+        background-color 0.15s ease,
+        color 0.15s ease;
+}
+
+.thread_add:hover {
+    background-color: var(--editor-style-bg-hover);
+    color: var(--text);
+}
diff --git a/components/editor/CommentGutter.tsx b/components/editor/CommentGutter.tsx
new file mode 100644
index 00000000..862e7ccf
--- /dev/null
+++ b/components/editor/CommentGutter.tsx
@@ -0,0 +1,227 @@
+"use client";
+
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Editor } from "@tiptap/react";
+import { Transaction } from "@tiptap/pm/state";
+import { MessageSquare, Plus, X } from "lucide-react";
+import { Comment } from "@src/lib/utils/types";
+import { getNodePositions } from "@src/lib/screenplay/comment-anchors";
+import { useUser } from "@src/lib/utils/hooks";
+import { useViewContext } from "@src/context/ViewContext";
+import CommentCard from "./CommentCard";
+import styles from "./CommentGutter.module.css";
+
+const ICON_SIZE = 22;
+const GUTTER_INSET = 20; // px from the page's left edge
+const POPOVER_WIDTH = 320;
+const POPOVER_GAP = 10;
+
+type IconPos = { nodeId: string; top: number; left: number; count: number };
+
+export interface CommentGutterProps {
+    editor: Editor | null;
+    comments: Comment[];
+    activeNodeId: string | null;
+    setActiveNodeId: (id: string | null) => void;
+    /** Create a new empty comment anchored to the node and keep its thread open. */
+    onAddComment: (nodeId: string) => void;
+    onUpdateComment: (id: string, data: Partial<Comment>) => void;
+    onDeleteComment: (id: string) => void;
+    onResolveComment: (id: string) => void;
+    onAddReply: (commentId: string, text: string, author: string) => void;
+}
+
+/**
+ * Renders a comment icon in the editor's left margin for every node that has an
+ * unresolved discussion. Clicking an icon opens that node's discussion thread in
+ * a popover anchored next to the icon.
+ */
+const CommentGutter = ({
+    editor,
+    comments,
+    activeNodeId,
+    setActiveNodeId,
+    onAddComment,
+    onUpdateComment,
+    onDeleteComment,
+    onResolveComment,
+    onAddReply,
+}: CommentGutterProps) => {
+    const { user } = useUser();
+    const { showComments } = useViewContext();
+    const [icons, setIcons] = useState<IconPos[]>([]);
+
+    // RAF handles to avoid layout thrashing on rapid transactions / resizes.
+    const txDebounceRef = useRef<number | null>(null);
+    const resizeThrottleRef = useRef<number | null>(null);
+
+    // Unresolved comments grouped by their anchor node, in document order is
+    // applied later via the computed icon tops.
+    const commentsByNode = useMemo(() => {
+        const map = new Map<string, Comment[]>();
+        for (const c of comments) {
+            if (c.resolved) continue;
+            const list = map.get(c.nodeId);
+            if (list) list.push(c);
+            else map.set(c.nodeId, [c]);
+        }
+        // Keep each thread chronological.
+        for (const list of map.values()) list.sort((a, b) => a.createdAt - b.createdAt);
+        return map;
+    }, [comments]);
+
+    const computePositions = useCallback(() => {
+        if (!editor || editor.isDestroyed || !editor.view?.dom || !showComments) {
+            setIcons([]);
+            return;
+        }
+
+        const editorDom = editor.view.dom;
+        const scrollContainer = editorDom.closest("[class*='container']") as HTMLElement | null;
+        if (!scrollContainer) return;
+
+        const containerRect = scrollContainer.getBoundingClientRect();
+        const editorRect = editorDom.getBoundingClientRect();
+        const left = editorRect.left - containerRect.left + GUTTER_INSET;
+
+        const nodePositions = getNodePositions(editor);
+        const next: IconPos[] = [];
+
+        for (const [nodeId, list] of commentsByNode) {
+            const pos = nodePositions.get(nodeId);
+            if (!pos) continue; // node was deleted — orphaned comment, no icon
+            try {
+                const coords = editor.view.coordsAtPos(pos.from);
+                const top = coords.top - containerRect.top + scrollContainer.scrollTop;
+                next.push({ nodeId, top, left, count: list.length });
+            } catch {
+                // Position out of range
+            }
+        }
+
+        next.sort((a, b) => a.top - b.top);
+        setIcons(next);
+    }, [editor, commentsByNode, showComments]);
+
+    // Recompute on mount and whenever the comment set changes. Deferred to the
+    // next frame so the editor DOM is laid out before we measure positions.
+    useEffect(() => {
+        const raf = requestAnimationFrame(computePositions);
+        return () => cancelAnimationFrame(raf);
+    }, [computePositions]);
+
+    // Recompute on document edits and container/window resizes.
+    useEffect(() => {
+        if (!editor || editor.isDestroyed || !showComments) return;
+
+        const handleTransaction = ({ transaction }: { transaction: Transaction }) => {
+            if (!transaction.docChanged) return;
+            if (txDebounceRef.current !== null) cancelAnimationFrame(txDebounceRef.current);
+            txDebounceRef.current = requestAnimationFrame(() => {
+                txDebounceRef.current = null;
+                computePositions();
+            });
+        };
+        editor.on("transaction", handleTransaction);
+        window.addEventListener("resize", computePositions);
+
+        const scrollContainer = editor.view?.dom.closest("[class*='container']") as HTMLElement | null;
+        let resizeObserver: ResizeObserver | undefined;
+        if (scrollContainer) {
+            resizeObserver = new ResizeObserver(() => {
+                if (resizeThrottleRef.current !== null) return;
+                resizeThrottleRef.current = requestAnimationFrame(() => {
+                    resizeThrottleRef.current = null;
+                    computePositions();
+                });
+            });
+            resizeObserver.observe(scrollContainer);
+        }
+
+        return () => {
+            editor.off("transaction", handleTransaction);
+            window.removeEventListener("resize", computePositions);
+            resizeObserver?.disconnect();
+            if (txDebounceRef.current !== null) cancelAnimationFrame(txDebounceRef.current);
+            if (resizeThrottleRef.current !== null) cancelAnimationFrame(resizeThrottleRef.current);
+        };
+    }, [editor, computePositions, showComments]);
+
+    if (!showComments || icons.length === 0) return null;
+
+    const activeIcon = activeNodeId ? icons.find((i) => i.nodeId === activeNodeId) : undefined;
+    const activeComments = activeNodeId ? commentsByNode.get(activeNodeId) ?? [] : [];
+
+    // Anchor the popover to the right of its icon, clamped to the scroll container.
+    let popoverLeft = 0;
+    if (activeIcon) {
+        const scrollContainer = editor?.view?.dom.closest("[class*='container']") as HTMLElement | null;
+        const containerWidth = scrollContainer?.clientWidth ?? 0;
+        const ideal = activeIcon.left + ICON_SIZE + POPOVER_GAP;
+        const maxLeft = Math.max(8, containerWidth - POPOVER_WIDTH - 8);
+        popoverLeft = Math.min(ideal, maxLeft);
+    }
+
+    return (
+        <>
+            {icons.map((icon) => {
+                const isActive = icon.nodeId === activeNodeId;
+                return (
+                    <button
+                        key={icon.nodeId}
+                        className={`${styles.gutter_icon} ${isActive ? styles.gutter_icon_active : ""}`}
+                        style={{ top: icon.top, left: icon.left }}
+                        onMouseDown={(e) => e.stopPropagation()}
+                        onClick={(e) => {
+                            e.stopPropagation();
+                            setActiveNodeId(isActive ? null : icon.nodeId);
+                        }}
+                        title={icon.count > 1 ? `${icon.count} comments` : "1 comment"}
+                    >
+                        <MessageSquare size={13} />
+                        {icon.count > 1 && <span className={styles.gutter_count}>{icon.count}</span>}
+                    </button>
+                );
+            })}
+
+            {activeIcon && (
+                <div
+                    className={styles.thread}
+                    style={{ top: activeIcon.top, left: popoverLeft, width: POPOVER_WIDTH }}
+                    onMouseDown={(e) => e.stopPropagation()}
+                    onClick={(e) => e.stopPropagation()}
+                >
+                    <div className={styles.thread_header}>
+                        <span className={styles.thread_title}>Discussion</span>
+                        <button
+                            className={styles.thread_close}
+                            onClick={() => setActiveNodeId(null)}
+                            title="Close"
+                        >
+                            <X size={14} />
+                        </button>
+                    </div>
+
+                    <div className={styles.thread_body}>
+                        {activeComments.map((comment) => (
+                            <CommentCard
+                                key={comment.id}
+                                comment={comment}
+                                onUpdate={(data) => onUpdateComment(comment.id, data)}
+                                onResolve={() => onResolveComment(comment.id)}
+                                onDelete={() => onDeleteComment(comment.id)}
+                                onReply={(text) => onAddReply(comment.id, text, user?.username || "Anonymous")}
+                            />
+                        ))}
+                    </div>
+
+                    <button className={styles.thread_add} onClick={() => onAddComment(activeNodeId!)}>
+                        <Plus size={14} /> Add comment
+                    </button>
+                </div>
+            )}
+        </>
+    );
+};
+
+export default CommentGutter;
diff --git a/components/editor/DocumentEditorPanel.tsx b/components/editor/DocumentEditorPanel.tsx
index 0ebdd658..29235393 100644
--- a/components/editor/DocumentEditorPanel.tsx
+++ b/components/editor/DocumentEditorPanel.tsx
@@ -17,13 +17,14 @@ import { useViewContext } from "@src/context/ViewContext";
 import { ContextMenuType } from "@components/editor/sidebar/ContextMenu";
 import { UserContext } from "@src/context/UserContext";
 import { useUser } from "@src/lib/utils/hooks";
-import CommentCards from "@components/editor/CommentCards";
+import CommentGutter from "@components/editor/CommentGutter";
 import Loading from "@components/utils/Loading";
 
-import { TextSelection } from "@tiptap/pm/state";
+import { TextSelection, Transaction } from "@tiptap/pm/state";
 import { EditorView } from "@tiptap/pm/view";
 import { DocumentEditorConfig } from "@src/lib/editor/document-editor-config";
 import { useDocumentComments } from "@src/lib/editor/use-document-comments";
+import { getNodeIdAtPos, transactionDeletesNode } from "@src/lib/screenplay/comment-anchors";
 import { useDocumentEditor } from "@src/lib/editor/use-document-editor";
 import type { SuggestionData } from "@components/editor/SuggestionMenu";
 
@@ -80,7 +81,7 @@ const DocumentEditorPanel = ({
         repository,
     } = projectCtx;
     const { settings } = useSettings();
-    const { isEndlessScroll, showComments } = useViewContext();
+    const { isEndlessScroll } = useViewContext();
     const { user } = useUser();
 
     const [isEditorReady, setIsEditorReady] = useState(false);
@@ -114,7 +115,6 @@ const DocumentEditorPanel = ({
         setSelectedStyles,
         updateSuggestions,
         updateSuggestionsData: updateSuggestionData,
-        setActiveCommentId: commentOps.setActiveCommentId,
         userKeybinds: keybinds,
         globalContext,
         setSelectedTitlePageElement,
@@ -157,6 +157,53 @@ const DocumentEditorPanel = ({
         }
     }, [editor, isYjsReady]);
 
+    // ---- Orphaned comment cleanup ----
+    // Comments anchor to a node's data-id. When that node is deleted the comment
+    // is orphaned (no gutter icon, unreachable), so prune it from the project.
+    const pruneOrphanedComments = useCallback(() => {
+        if (!editor || editor.isDestroyed || isReadOnly || !config.features.comments) return;
+
+        const liveIds = new Set<string>();
+        editor.state.doc.descendants((node) => {
+            const id = node.attrs?.["data-id"];
+            if (typeof id === "string") liveIds.add(id);
+        });
+        // Don't prune before the document has synced — an empty doc would
+        // otherwise wipe every comment.
+        if (liveIds.size === 0) return;
+
+        for (const comment of commentOps.comments) {
+            if (comment.nodeId && !liveIds.has(comment.nodeId)) {
+                commentOps.deleteComment(comment.id);
+            }
+        }
+    }, [editor, isReadOnly, config.features.comments, commentOps]);
+
+    const pruneRef = useRef(pruneOrphanedComments);
+    useEffect(() => {
+        pruneRef.current = pruneOrphanedComments;
+    }, [pruneOrphanedComments]);
+
+    useEffect(() => {
+        if (!editor || editor.isDestroyed || !config.features.comments) return;
+
+        let debounce: ReturnType<typeof setTimeout> | null = null;
+        const schedule = () => {
+            if (debounce) clearTimeout(debounce);
+            debounce = setTimeout(() => pruneRef.current(), 600);
+        };
+        // Only prune when a transaction actually removes a node — never on typing.
+        const onTransaction = ({ transaction }: { transaction: Transaction }) => {
+            if (transactionDeletesNode(transaction)) schedule();
+        };
+
+        editor.on("transaction", onTransaction);
+        return () => {
+            editor.off("transaction", onTransaction);
+            if (debounce) clearTimeout(debounce);
+        };
+    }, [editor, config.features.comments]);
+
     // ---- CSS variable application (screenplay only) ----
     useEffect(() => {
         if (!editor || editor.isDestroyed || !editor.view?.dom) return;
@@ -474,6 +521,22 @@ const DocumentEditorPanel = ({
         return () => removeEventListener("keydown", pressedKeyEvent);
     }, [isVisible, config.type, editor]);
 
+    // Create a new empty comment anchored to a node and open its thread.
+    const addCommentToNode = useCallback(
+        (nodeId: string) => {
+            commentOps.addComment({
+                nodeId,
+                text: "",
+                author: user?.username || "Anonymous",
+                createdAt: Date.now(),
+                resolved: false,
+                replies: [],
+            });
+            commentOps.setActiveNodeId(nodeId);
+        },
+        [commentOps, user],
+    );
+
     // ---- Context menu ----
     const onEditorContextMenu = useCallback(
         (e: React.MouseEvent) => {
@@ -528,18 +591,11 @@ const DocumentEditorPanel = ({
                 }
             }
 
-            const onAddComment = () => {
-                if (!editor) return;
-                const commentId = commentOps.addComment({
-                    text: "",
-                    author: user?.username || "Anonymous",
-                    createdAt: Date.now(),
-                    resolved: false,
-                    replies: [],
-                });
-                editor.chain().setTextSelection({ from, to }).setComment(commentId).run();
-                commentOps.setActiveCommentId(commentId);
-            };
+            // Comments anchor to the node under the caret, not a text range.
+            const commentNodeId = getNodeIdAtPos(editor.state, from);
+            const onAddComment = commentNodeId
+                ? () => addCommentToNode(commentNodeId)
+                : undefined;
 
             updateContextMenu({
                 type: ContextMenuType.EditorContextMenu,
@@ -547,12 +603,12 @@ const DocumentEditorPanel = ({
                 typeSpecificProps: { from, to, onAddComment, spellError, nodePos, nodeClass, outlineScene },
             });
         },
-        [editor, updateContextMenu, commentOps, user, config.features.shelving, config.documentId],
+        [editor, updateContextMenu, addCommentToNode, config.features.shelving, config.documentId],
     );
 
-    // Clear active comment on mousedown
+    // Clear the open discussion when clicking elsewhere in the editor.
     const handleContainerMouseDown = useCallback(() => {
-        commentOps.setActiveCommentId(null);
+        commentOps.setActiveNodeId(null);
     }, [commentOps]);
 
     const onScroll = (e: React.UIEvent<HTMLDivElement>) => {
@@ -579,7 +635,7 @@ const DocumentEditorPanel = ({
     return (
         <div className={`${styles.editor_panel} ${isEditorReady ? styles.visible : styles.hidden}`}>
             <div
-                className={`${styles.container} ${!showComments ? "hide-comments" : ""}`}
+                className={styles.container}
                 onScroll={onScroll}
                 onMouseDown={handleContainerMouseDown}
                 onFocus={() => setFocusedEditorType(focusType)}
@@ -612,13 +668,15 @@ const DocumentEditorPanel = ({
                     </div>
                 </div>
                 {config.features.comments && (
-                    <CommentCards
+                    <CommentGutter
                         editor={editor}
                         comments={commentOps.comments}
-                        activeCommentId={commentOps.activeCommentId}
-                        setActiveCommentId={commentOps.setActiveCommentId}
+                        activeNodeId={commentOps.activeNodeId}
+                        setActiveNodeId={commentOps.setActiveNodeId}
+                        onAddComment={addCommentToNode}
                         onUpdateComment={(id, data) => commentOps.updateComment(id, data)}
                         onDeleteComment={(id) => commentOps.deleteComment(id)}
+                        onResolveComment={(id) => commentOps.resolveComment(id)}
                         onAddReply={(commentId, text, author) =>
                             commentOps.addReply(commentId, { text, author, createdAt: Date.now() })
                         }
diff --git a/components/editor/outline/OutlineItem.module.css b/components/editor/outline/OutlineItem.module.css
index cceb06b9..6b514b69 100644
--- a/components/editor/outline/OutlineItem.module.css
+++ b/components/editor/outline/OutlineItem.module.css
@@ -1,23 +1,17 @@
 .block {
     position: relative;
     display: flex;
-    flex-direction: row;
     align-items: stretch;
-    gap: 10px;
     box-sizing: border-box;
-    padding: 10px 12px;
-    border: 1px solid var(--separator);
-    border-radius: 8px;
-    background-color: var(--main-bg);
+    /* Board-card look: a full-color strip on the left and a tinted body, driven
+       by `--card-color` (set inline from the element's color). */
+    background-color: color-mix(in srgb, var(--card-color, white) 20%, white);
     cursor: pointer;
-    transition:
-        background-color 0.12s ease,
-        border-color 0.12s ease;
-    overflow: hidden;
+    transition: background-color 0.12s ease;
 }
 
 .block:hover {
-    background-color: var(--editor-sidebar-hover);
+    background-color: color-mix(in srgb, var(--card-color, white) 20%, #ececec);
 }
 
 .block_missing {
@@ -25,43 +19,51 @@
 }
 
 /* Drop indicators */
-.block_drop_into {
-    background-color: var(--editor-style-bg-hover);
-    box-shadow: inset 0 0 0 2px var(--tertiary-hover);
+.block_drop_into::after {
+    content: "";
+    position: absolute;
+    inset: 0;
+    border: 2px solid var(--tertiary-hover);
+    pointer-events: none;
+    z-index: 1;
 }
 
 .block_drop_before::before,
 .block_drop_after::after {
     content: "";
     position: absolute;
-    left: 4px;
-    right: 4px;
+    left: 0;
+    right: 0;
     height: 2px;
     background-color: var(--tertiary-hover);
     pointer-events: none;
+    z-index: 1;
 }
 
 .block_drop_before::before {
-    top: -4px;
+    top: 0;
 }
 
 .block_drop_after::after {
-    bottom: -4px;
+    bottom: 0;
 }
 
-.color_bar {
+/* Full-color strip (board card header); stretches to full height. */
+.color_strip {
     flex-shrink: 0;
-    width: 4px;
-    border-radius: 2px;
-    align-self: stretch;
+    width: 8px;
+    background-color: var(--card-color, var(--tertiary));
 }
 
+/* Body (board card body) — transparent so the block's tint and drop highlights
+   show through. */
 .body {
     flex: 1;
     min-width: 0;
     display: flex;
     flex-direction: column;
     gap: 3px;
+    padding: 9px 12px;
 }
 
 .title_row {
@@ -74,7 +76,7 @@
 
 .type_icon {
     flex-shrink: 0;
-    color: var(--secondary-text);
+    color: #64748b;
 }
 
 .title {
@@ -82,7 +84,7 @@
     min-width: 0;
     font-size: 13px;
     font-weight: 600;
-    color: var(--primary-text);
+    color: var(--board-card-body-text);
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -99,8 +101,8 @@
     font-weight: 500;
     text-transform: uppercase;
     letter-spacing: 0.03em;
-    color: var(--secondary-text);
-    background-color: var(--editor-style-bg-hover);
+    color: #64748b;
+    background-color: rgba(0, 0, 0, 0.06);
 }
 
 .remove_btn {
@@ -112,7 +114,7 @@
     border: none;
     border-radius: 4px;
     background: none;
-    color: var(--secondary-text);
+    color: #64748b;
     cursor: pointer;
     opacity: 0;
     transition:
@@ -125,14 +127,14 @@
 }
 
 .remove_btn:hover {
-    background-color: var(--editor-style-bg-hover);
-    color: var(--primary-text);
+    background-color: rgba(0, 0, 0, 0.06);
+    color: var(--board-card-body-text);
 }
 
 .preview {
     margin: 0;
     font-size: 12px;
-    color: var(--secondary-text);
+    color: #64748b;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
diff --git a/components/editor/outline/OutlineItem.tsx b/components/editor/outline/OutlineItem.tsx
index 41255365..a811655f 100644
--- a/components/editor/outline/OutlineItem.tsx
+++ b/components/editor/outline/OutlineItem.tsx
@@ -81,7 +81,10 @@ const OutlineItem = ({
             <div style={{ paddingLeft: depth * INDENT }}>
                 <div
                     className={blockClass}
-                    style={{ opacity: draggingId === node.id ? 0.4 : 1 }}
+                    style={{
+                        opacity: draggingId === node.id ? 0.4 : 1,
+                        ...(r.color ? { "--card-color": r.color } : {}),
+                    } as React.CSSProperties}
                     onClick={() => onNavigate(node)}
                     draggable
                     onDragStart={(e) => {
@@ -96,9 +99,7 @@ const OutlineItem = ({
                     }}
                     onDragEnd={onDragEnd}
                 >
-                    {isCard && node.color && (
-                        <span className={styles.color_bar} style={{ backgroundColor: node.color }} />
-                    )}
+                    <div className={styles.color_strip} />
                     <div className={styles.body}>
                         <div className={styles.title_row}>
                             {!isCard && <Film size={14} className={styles.type_icon} />}
diff --git a/components/editor/outline/OutlineView.module.css b/components/editor/outline/OutlineView.module.css
index 33758909..679f5e2e 100644
--- a/components/editor/outline/OutlineView.module.css
+++ b/components/editor/outline/OutlineView.module.css
@@ -19,9 +19,9 @@
 .outline_list {
     display: flex;
     flex-direction: column;
-    gap: 6px;
+    gap: 0;
     width: 100%;
-    max-width: 760px;
+    max-width: 580px;
     margin: 0 auto;
     padding: 16px;
     box-sizing: border-box;
diff --git a/components/editor/sidebar/CommentSidebarItem.tsx b/components/editor/sidebar/CommentSidebarItem.tsx
index a8d3efc3..0b52d64b 100644
--- a/components/editor/sidebar/CommentSidebarItem.tsx
+++ b/components/editor/sidebar/CommentSidebarItem.tsx
@@ -3,7 +3,7 @@
 import { memo, useCallback, useContext } from "react";
 import { ProjectContext } from "@src/context/ProjectContext";
 import { Comment } from "@src/lib/utils/types";
-import { getCommentPositions } from "@src/lib/screenplay/extensions/comment-highlight-extension";
+import { getNodePositions } from "@src/lib/screenplay/comment-anchors";
 import { focusOnPosition } from "@src/lib/screenplay/editor";
 import { join } from "@src/lib/utils/misc";
 import nav_item from "./SidebarItem.module.css";
@@ -19,12 +19,12 @@ const CommentSidebarItem = memo(({ comment, isActive, onActivate }: CommentSideb
 
     const handleDoubleClick = useCallback(() => {
         if (!editor) return;
-        const positions = getCommentPositions(editor);
-        const pos = positions.get(comment.id);
+        const positions = getNodePositions(editor);
+        const pos = positions.get(comment.nodeId);
         if (pos) {
             focusOnPosition(editor, pos.from);
         }
-    }, [comment.id, editor]);
+    }, [comment.nodeId, editor]);
 
     const handleClick = useCallback(() => {
         onActivate();
diff --git a/components/editor/sidebar/CommentSidebarView.tsx b/components/editor/sidebar/CommentSidebarView.tsx
index ff6ae066..e6cf15c8 100644
--- a/components/editor/sidebar/CommentSidebarView.tsx
+++ b/components/editor/sidebar/CommentSidebarView.tsx
@@ -25,7 +25,7 @@ const CommentSidebarView = () => {
         [projectState],
     );
 
-    const { comments, activeCommentId, setActiveCommentId } = useDocumentComments(commentsMap, repository);
+    const { comments, activeNodeId, setActiveNodeId } = useDocumentComments(commentsMap, repository);
 
     const unresolvedComments = useMemo(() => comments.filter((c) => !c.resolved), [comments]);
 
@@ -41,8 +41,8 @@ const CommentSidebarView = () => {
                         <CommentSidebarItem
                             key={comment.id}
                             comment={comment}
-                            isActive={activeCommentId === comment.id}
-                            onActivate={() => setActiveCommentId(comment.id)}
+                            isActive={activeNodeId === comment.nodeId}
+                            onActivate={() => setActiveNodeId(comment.nodeId)}
                         />
                     ))
                 ) : (
diff --git a/components/editor/sidebar/ContextMenu.module.css b/components/editor/sidebar/ContextMenu.module.css
index 3911f80a..416fd195 100644
--- a/components/editor/sidebar/ContextMenu.module.css
+++ b/components/editor/sidebar/ContextMenu.module.css
@@ -1,89 +1,5 @@
-.menu {
-    display: flex;
-    flex-direction: column;
-    width: 220px;
-
-    z-index: 100;
-    position: fixed;
-    padding-block: 6px;
-    overflow-y: auto;
-    border-radius: 12px;
-    background-color: var(--context-menu-bg);
-    border: 1px solid var(--separator);
-    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
-}
-
-.menu_item {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-
-    padding-block: 6px;
-    padding-inline: 12px;
-
-    font-size: 14px;
-    cursor: pointer;
-}
-
-.menu_item:hover {
-    background-color: var(--context-menu-item-hover);
-}
-
-.menu_item_disabled {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-
-    padding-block: 6px;
-    padding-inline: 12px;
-
-    font-size: 14px;
-    cursor: default;
-    opacity: 0.4;
-}
-
-.menu_item_icon {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    width: 16px;
-    flex-shrink: 0;
-}
-
-.menu_separator {
-    height: 1px;
-    background-color: var(--separator);
-    margin: 2px 0;
-}
-
-/* Right-click color picker (document tree items) */
-.colors {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 6px;
-    padding: 10px 12px;
-}
-
-.color_swatch {
-    width: 20px;
-    height: 20px;
-    padding: 0;
-    border: 2px solid transparent;
-    border-radius: 50%;
-    cursor: pointer;
-    transition:
-        transform 0.15s ease,
-        border-color 0.15s ease;
-}
-
-.color_swatch:hover {
-    transform: scale(1.15);
-}
-
-.color_swatch_active {
-    border-color: var(--primary-text);
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3);
-}
+/* Editor-specific context-menu pieces. The shared menu surface, items,
+   separator, and color row live in components/utils/ContextMenu. */
 
 .suggestion_item {
     display: flex;
@@ -91,7 +7,8 @@
     gap: 10px;
 
     padding-block: 6px;
-    padding-inline: 12px;
+    padding-inline: 6px;
+    border-radius: 6px;
 
     font-size: 14px;
     font-weight: 600;
@@ -108,7 +25,7 @@
     align-items: center;
 
     padding-block: 6px;
-    padding-inline: 12px;
+    padding-inline: 6px;
 
     font-size: 13px;
     color: var(--secondary-text);
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index b2ffe784..429883b4 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -1,12 +1,17 @@
 "use client";
 
-import { useContext, useEffect, useState } from "react";
+import { ReactNode, useContext, useEffect, useState } from "react";
 import { UserContext } from "@src/context/UserContext";
 import { useSpellcheck } from "@src/context/SpellcheckContext";
 import { refreshSpellcheck } from "@src/lib/spellcheck/spellcheck-extension";
 import { Scene } from "@src/lib/screenplay/scenes";
 
 import context from "./ContextMenu.module.css";
+import {
+    ContextMenu as ContextMenuSurface,
+    ContextMenuItem,
+    ContextMenuSeparator,
+} from "@components/utils/ContextMenu";
 import { CharacterData, deleteCharacter } from "@src/lib/screenplay/characters";
 import { LocationData, deleteLocation } from "@src/lib/screenplay/locations";
 import { isTauri } from "@tauri-apps/api/core";
@@ -26,7 +31,6 @@ import {
     Highlighter,
     ListTree,
     Loader2,
-    LucideIcon,
     MessageSquarePlus,
     Pencil,
     Scissors,
@@ -43,11 +47,18 @@ import { MAIN_SCREENPLAY_REF } from "@src/lib/project/project-state";
 /*     Context menu     */
 /* ==================== */
 
-export type ContextMenuProps = {
-    type: ContextMenuType;
-    position: { x: number; y: number };
-    typeSpecificProps: unknown;
-};
+export type ContextMenuProps =
+    | {
+          type: ContextMenuType;
+          position: { x: number; y: number };
+          typeSpecificProps: unknown;
+      }
+    | {
+          /** Pre-rendered content for menus not driven by the editor type switch
+           *  (board cards, document tree). */
+          content: ReactNode;
+          position: { x: number; y: number };
+      };
 
 export const enum ContextMenuType {
     SceneList,
@@ -63,13 +74,6 @@ export const enum ContextMenuType {
     EditorContextMenu,
 }
 
-type ContextMenuItemProps = {
-    text: string;
-    action: () => void;
-    icon?: LucideIcon;
-    disabled?: boolean;
-};
-
 type SubMenuProps<T> = { props: T };
 
 const openWebSearch = async (text: string) => {
@@ -92,15 +96,6 @@ const readClipboardText = async (): Promise<string> => {
     return navigator.clipboard.readText();
 };
 
-export const ContextMenuItem = ({ text, action, icon: Icon, disabled }: ContextMenuItemProps) => {
-    return (
-        <div onClick={disabled ? undefined : action} className={disabled ? context.menu_item_disabled : context.menu_item}>
-            <span className={context.menu_item_icon}>{Icon && <Icon size={16} />}</span>
-            <p className="unselectable">{text}</p>
-        </div>
-    );
-};
-
 /* ========================== */
 /*     Scene context menu     */
 /* ========================== */
@@ -154,7 +149,7 @@ const SceneItemMenu = ({ props }: SubMenuProps<SceneContextProps>) => {
             />
             {!isReadOnly && (
                 <>
-                    <div className={context.menu_separator} />
+                    <ContextMenuSeparator />
                     {scene.id && (
                         <ContextMenuItem
                             text={t("sendToOutline")}
@@ -209,7 +204,7 @@ const CharacterItemMenu = ({ props }: SubMenuProps<CharacterContextProps>) => {
                         text={t("paste")}
                         action={() => pasteText(projectCtx.editor!, character.name)}
                     />
-                    <div className={context.menu_separator} />
+                    <ContextMenuSeparator />
                 </>
             )}
             <ContextMenuItem
@@ -307,7 +302,7 @@ const EditorSelectionMenu = ({ props }: SubMenuProps<EditorSelectionContextProps
             )}
             {hasSelection && (
                 <>
-                    <div className={context.menu_separator} />
+                    <ContextMenuSeparator />
                     {!isReadOnly && (
                         <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
                     )}
@@ -392,7 +387,7 @@ const SpellcheckMenu = ({ props }: SubMenuProps<SpellcheckContextProps>) => {
                     <p className="unselectable">{s}</p>
                 </div>
             ))}
-            {displaySuggestions !== null && displaySuggestions.length > 0 && <div className={context.menu_separator} />}
+            {displaySuggestions !== null && displaySuggestions.length > 0 && <ContextMenuSeparator />}
             <ContextMenuItem text={t("addToDictionary")} icon={BookPlus} action={handleAddToDictionary} />
         </>
     );
@@ -492,7 +487,8 @@ const ShelveNodeMenu = ({ props }: SubMenuProps<{ pos: number; nodeClass: string
 export type EditorContextMenuProps = {
     from: number;
     to: number;
-    onAddComment: () => void;
+    /** Present when the caret sits on a node a comment can anchor to. */
+    onAddComment?: () => void;
     spellError?: { word: string; from: number; to: number };
     nodePos?: number;
     nodeClass?: string;
@@ -670,7 +666,7 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
                     {!isReadOnly && (
                         <ContextMenuItem text={t("addToDictionary")} icon={BookPlus} action={handleAddToDictionary} />
                     )}
-                    <div className={context.menu_separator} />
+                    <ContextMenuSeparator />
                 </>
             )}
 
@@ -681,21 +677,23 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
             <ContextMenuItem text={t("copy")} action={handleCopy} disabled={!hasSelection} />
             {!isReadOnly && <ContextMenuItem text={t("paste")} action={handlePaste} />}
 
-            {/* Selection actions — only when there's a selection and no spellcheck error */}
-            {hasSelection && !spellError && (
+            {/* Comment on the node at the caret + search a selection on the web */}
+            {!spellError && ((onAddComment && !isReadOnly) || hasSelection) && (
                 <>
-                    <div className={context.menu_separator} />
-                    {!isReadOnly && (
+                    <ContextMenuSeparator />
+                    {!isReadOnly && onAddComment && (
                         <ContextMenuItem text={t("addComment")} icon={MessageSquarePlus} action={onAddComment} />
                     )}
-                    <ContextMenuItem text={t("searchOnWeb")} action={handleSearchOnWeb} />
+                    {hasSelection && (
+                        <ContextMenuItem text={t("searchOnWeb")} action={handleSearchOnWeb} />
+                    )}
                 </>
             )}
 
             {/* Node actions — shelve and optional dual dialogue */}
             {isShelvable && !isReadOnly && (
                 <>
-                    <div className={context.menu_separator} />
+                    <ContextMenuSeparator />
                     <ContextMenuItem
                         text={
                             nodeClass === ScreenplayElement.Scene
@@ -722,7 +720,7 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
             {/* Send a scene heading to the Outline */}
             {outlineScene && !isReadOnly && (
                 <>
-                    <div className={context.menu_separator} />
+                    <ContextMenuSeparator />
                     <ContextMenuItem text={t("sendToOutline")} icon={ListTree} action={handleSendToOutline} />
                 </>
             )}
@@ -730,7 +728,7 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
             {/* Production: Omit / Unomit on a locked scene heading */}
             {sceneInfo && !isReadOnly && (
                 <>
-                    <div className={context.menu_separator} />
+                    <ContextMenuSeparator />
                     {sceneInfo.isOmitted ? (
                         <ContextMenuItem
                             text={t("unomitScene")}
@@ -751,6 +749,7 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
 };
 
 const renderContextMenu = (contextMenu: ContextMenuProps) => {
+    if ("content" in contextMenu) return contextMenu.content;
     switch (contextMenu.type) {
         case ContextMenuType.SceneList:
             return <SceneListMenu />;
@@ -792,9 +791,16 @@ const ContextMenu = () => {
     useEffect(() => {
         if (!contextMenu) return;
         const prevent = (e: WheelEvent) => e.preventDefault();
+        const onKey = (e: KeyboardEvent) => {
+            if (e.key === "Escape") updateContextMenu(undefined);
+        };
         document.addEventListener("wheel", prevent, { passive: false });
-        return () => document.removeEventListener("wheel", prevent);
-    }, [contextMenu]);
+        document.addEventListener("keydown", onKey);
+        return () => {
+            document.removeEventListener("wheel", prevent);
+            document.removeEventListener("keydown", onKey);
+        };
+    }, [contextMenu, updateContextMenu]);
 
     useEffect(() => {
         updateContextMenu(undefined);
@@ -803,15 +809,9 @@ const ContextMenu = () => {
     if (!contextMenu) return null;
 
     return (
-        <div
-            className={context.menu}
-            style={{
-                top: contextMenu.position.y,
-                left: contextMenu.position.x,
-            }}
-        >
+        <ContextMenuSurface position={contextMenu.position}>
             {renderContextMenu(contextMenu)}
-        </div>
+        </ContextMenuSurface>
     );
 };
 
diff --git a/components/editor/sidebar/DocumentTreeSidebarView.tsx b/components/editor/sidebar/DocumentTreeSidebarView.tsx
index 656d6f4c..d0ed1be4 100644
--- a/components/editor/sidebar/DocumentTreeSidebarView.tsx
+++ b/components/editor/sidebar/DocumentTreeSidebarView.tsx
@@ -1,25 +1,28 @@
 "use client";
 
-import { useCallback, useContext, useEffect, useMemo, useState } from "react";
+import { useCallback, useContext, useMemo, useState } from "react";
 import { useTranslations } from "next-intl";
 import { ProjectContext } from "@src/context/ProjectContext";
+import { UserContext } from "@src/context/UserContext";
 import { useViewContext } from "@src/context/ViewContext";
 import { DocumentNode } from "@src/lib/project/project-state";
 import { DEFAULT_ITEM_COLORS } from "@src/lib/utils/colors";
 import { join } from "@src/lib/utils/misc";
 import { FilePlus, FolderPlus, FolderTree, LayoutDashboard, Pencil, Trash2 } from "lucide-react";
 import DocumentTreeItem, { DropPosition } from "./DocumentTreeItem";
-import { ContextMenuItem } from "./ContextMenu";
+import {
+    ContextMenuItem,
+    ContextMenuSeparator,
+    ContextMenuColorRow,
+} from "@components/utils/ContextMenu";
 
 import form from "./../../utils/Form.module.css";
 import sidebar_nav from "./EditorSidebarNavigation.module.css";
-import context from "./ContextMenu.module.css";
-
-type MenuState = { x: number; y: number; node: DocumentNode | null };
 
 const DocumentTreeSidebarView = () => {
     const t = useTranslations("editorSidebar");
     const { documents, repository } = useContext(ProjectContext);
+    const { updateContextMenu } = useContext(UserContext);
     const { setSideDocument, closeDocument, primaryDocId, secondaryDocId } = useViewContext();
 
     // Documents currently open in a panel — highlighted in the tree.
@@ -32,8 +35,7 @@ const DocumentTreeSidebarView = () => {
     const [draggingId, setDraggingId] = useState<string | null>(null);
     const [dropTarget, setDropTarget] = useState<{ id: string; pos: DropPosition } | null>(null);
 
-    // Right-click menu + inline edit state (lifted here so the menu can drive it).
-    const [menu, setMenu] = useState<MenuState | null>(null);
+    // Inline edit state (lifted here so the right-click menu can drive it).
     const [renamingId, setRenamingId] = useState<string | null>(null);
     const [confirmingDeleteId, setConfirmingDeleteId] = useState<string | null>(null);
 
@@ -118,35 +120,71 @@ const DocumentTreeSidebarView = () => {
         (id: string, color: string) => {
             const current = documents[id]?.color;
             repository?.setDocumentColor(id, current === color ? undefined : color);
-            setMenu(null);
         },
         [repository, documents],
     );
 
     // ---- Right-click menu ----
-    const openMenu = useCallback((node: DocumentNode | null, e: React.MouseEvent) => {
-        e.preventDefault();
-        setMenu({ x: e.clientX, y: e.clientY, node });
-    }, []);
-
-    // Close the menu on any left-click, scroll, resize, or Escape.
-    useEffect(() => {
-        if (!menu) return;
-        const close = () => setMenu(null);
-        const onKey = (e: KeyboardEvent) => {
-            if (e.key === "Escape") setMenu(null);
-        };
-        window.addEventListener("click", close);
-        window.addEventListener("resize", close);
-        window.addEventListener("scroll", close, true);
-        window.addEventListener("keydown", onKey);
-        return () => {
-            window.removeEventListener("click", close);
-            window.removeEventListener("resize", close);
-            window.removeEventListener("scroll", close, true);
-            window.removeEventListener("keydown", onKey);
-        };
-    }, [menu]);
+    // Opens the shared single context-menu host with this node's actions.
+    const openMenu = useCallback(
+        (node: DocumentNode | null, e: React.MouseEvent) => {
+            e.preventDefault();
+            const left = Math.min(e.clientX, window.innerWidth - 230);
+            const top = Math.min(e.clientY, window.innerHeight - 220);
+            // Where create actions should put new nodes: inside a right-clicked
+            // folder, otherwise at the root.
+            const parentId = node?.type === "folder" ? node.id : null;
+            const showCreate = !node || node.type === "folder";
+            const showEdit = !!node;
+            updateContextMenu({
+                position: { x: left, y: top },
+                content: (
+                    <>
+                        {showCreate && (
+                            <>
+                                <ContextMenuItem
+                                    text={t("newDocument")}
+                                    icon={FilePlus}
+                                    action={() => createInside(parentId, "editor")}
+                                />
+                                <ContextMenuItem
+                                    text={t("newFolder")}
+                                    icon={FolderPlus}
+                                    action={() => createInside(parentId, "folder")}
+                                />
+                                <ContextMenuItem
+                                    text={t("newBoard")}
+                                    icon={LayoutDashboard}
+                                    action={() => createInside(parentId, "board")}
+                                />
+                            </>
+                        )}
+                        {showCreate && showEdit && <ContextMenuSeparator />}
+                        {showEdit && node && (
+                            <>
+                                <ContextMenuColorRow
+                                    colors={DEFAULT_ITEM_COLORS}
+                                    selected={node.color}
+                                    onSelect={(color) => setColor(node.id, color)}
+                                />
+                                <ContextMenuItem
+                                    text={t("rename")}
+                                    icon={Pencil}
+                                    action={() => setRenamingId(node.id)}
+                                />
+                                <ContextMenuItem
+                                    text={t("delete")}
+                                    icon={Trash2}
+                                    action={() => setConfirmingDeleteId(node.id)}
+                                />
+                            </>
+                        )}
+                    </>
+                ),
+            });
+        },
+        [updateContextMenu, t, createInside, setColor],
+    );
 
     // ---- Drag & drop ----
     const onDragStart = useCallback((id: string) => setDraggingId(id), []);
@@ -197,74 +235,6 @@ const DocumentTreeSidebarView = () => {
         repository.moveDocument(dragId, null, appendOrder(null, dragId));
     }, [draggingId, repository, appendOrder, resetDrag]);
 
-    const renderMenu = () => {
-        if (!menu) return null;
-        const node = menu.node;
-        const left = Math.min(menu.x, window.innerWidth - 230);
-        const top = Math.min(menu.y, window.innerHeight - 220);
-        // Where create actions should put new nodes: inside a right-clicked
-        // folder, otherwise at the root.
-        const parentId = node?.type === "folder" ? node.id : null;
-        const showCreate = !node || node.type === "folder";
-        const showEdit = !!node;
-
-        return (
-            <div
-                className={context.menu}
-                style={{ top, left }}
-                onContextMenu={(e) => e.preventDefault()}
-            >
-                {showCreate && (
-                    <>
-                        <ContextMenuItem
-                            text={t("newDocument")}
-                            icon={FilePlus}
-                            action={() => createInside(parentId, "editor")}
-                        />
-                        <ContextMenuItem
-                            text={t("newFolder")}
-                            icon={FolderPlus}
-                            action={() => createInside(parentId, "folder")}
-                        />
-                        <ContextMenuItem
-                            text={t("newBoard")}
-                            icon={LayoutDashboard}
-                            action={() => createInside(parentId, "board")}
-                        />
-                    </>
-                )}
-                {showCreate && showEdit && <div className={context.menu_separator} />}
-                {showEdit && node && (
-                    <>
-                        <div className={context.colors}>
-                            {DEFAULT_ITEM_COLORS.map((color) => (
-                                <button
-                                    key={color}
-                                    className={join(
-                                        context.color_swatch,
-                                        node.color === color ? context.color_swatch_active : "",
-                                    )}
-                                    style={{ backgroundColor: color }}
-                                    onClick={() => setColor(node.id, color)}
-                                />
-                            ))}
-                        </div>
-                        <ContextMenuItem
-                            text={t("rename")}
-                            icon={Pencil}
-                            action={() => setRenamingId(node.id)}
-                        />
-                        <ContextMenuItem
-                            text={t("delete")}
-                            icon={Trash2}
-                            action={() => setConfirmingDeleteId(node.id)}
-                        />
-                    </>
-                )}
-            </div>
-        );
-    };
-
     return (
         <>
             <div className={sidebar_nav.list_header}>
@@ -340,7 +310,6 @@ const DocumentTreeSidebarView = () => {
                     </div>
                 )}
             </div>
-            {renderMenu()}
         </>
     );
 };
diff --git a/components/navbar/ProjectNavbar.tsx b/components/navbar/ProjectNavbar.tsx
index 3d9e8edb..30e519e3 100644
--- a/components/navbar/ProjectNavbar.tsx
+++ b/components/navbar/ProjectNavbar.tsx
@@ -8,7 +8,6 @@ import { redirectHome } from "@src/lib/utils/redirects";
 
 import { ProjectContext } from "@src/context/ProjectContext";
 import { UserContext } from "@src/context/UserContext";
-import { useViewContext } from "@src/context/ViewContext";
 import debounce from "debounce";
 import { editProject } from "@src/lib/utils/requests";
 import { join } from "@src/lib/utils/misc";
@@ -108,7 +107,6 @@ const ProjectNavbar = () => {
     const projectId = useProjectIdFromUrl();
 
     const t = useTranslations("navbar");
-    const viewContext = useViewContext();
 
     useEffect(() => {
         if (!projectId) {
@@ -131,8 +129,6 @@ const ProjectNavbar = () => {
     const canUploadToCloud = !membership && !!user && isPro && !!projectId && isLocalOnly === true;
 
     const isInProject = !!projectId;
-    const hasScreenplay = viewContext.visiblePanels.includes("screenplay");
-    const hasTitlePage = viewContext.visiblePanels.includes("title");
 
     const deferredTitleUpdate = useMemo(
         () =>
@@ -276,8 +272,9 @@ const ProjectNavbar = () => {
                     </div>
                 )}
             </nav>
-            {/* Center - Format dropdown */}
-            {isInProject && projectId && (hasScreenplay || hasTitlePage) && (
+            {/* Center - Format dropdown (always visible in a project, regardless
+                of which panel is open) */}
+            {isInProject && projectId && (
                 <div className={navbar.center}>
                     <div className={navbar.navbar_island}>
                         <ScreenplayFormatDropdown />
@@ -289,7 +286,7 @@ const ProjectNavbar = () => {
             {/* Right side - Collaborators + Search + Settings */}
             <div className={navbar.right_btns}>
                 {isInProject && <CollaboratorsDisplay />}
-                {hasScreenplay && <ScreenplaySearch />}
+                {isInProject && <ScreenplaySearch />}
                 <div
                     className={`${navBtn.button} ${isAnalyticsOpen ? navBtn.active : ""}`}
                     onClick={() => setIsAnalyticsOpen(true)}
diff --git a/components/navbar/ScreenplaySearch.tsx b/components/navbar/ScreenplaySearch.tsx
index b6337444..0d2fa15a 100644
--- a/components/navbar/ScreenplaySearch.tsx
+++ b/components/navbar/ScreenplaySearch.tsx
@@ -38,7 +38,9 @@ const ScreenplaySearch = () => {
     };
 
     const {
-        editor,
+        // Search is scoped to the focused panel; `editor` here is the active
+        // search target (main screenplay, or the focused draft / tree document).
+        activeSearchEditor: editor,
         searchTerm,
         setSearchTerm,
         searchFilters,
@@ -72,6 +74,12 @@ const ScreenplaySearch = () => {
         }
     }, [isOpen]);
 
+    // When the search target switches panels (focus moved), the new document's
+    // matches are a different set — reset navigation so the index stays in range.
+    useEffect(() => {
+        setCurrentSearchIndex(0);
+    }, [editor, setCurrentSearchIndex]);
+
     const handleOpen = useCallback(() => {
         setIsOpen(true);
     }, []);
diff --git a/components/project/EditorFooter.module.css b/components/project/EditorFooter.module.css
index 10d619cf..4d717ff3 100644
--- a/components/project/EditorFooter.module.css
+++ b/components/project/EditorFooter.module.css
@@ -3,7 +3,7 @@
 .bubble_right {
     position: absolute;
     bottom: 20px;
-    right: 16px;
+    right: 30px;
     z-index: 6;
     display: flex;
     align-items: center;
diff --git a/components/utils/ContextMenu.module.css b/components/utils/ContextMenu.module.css
new file mode 100644
index 00000000..80714f99
--- /dev/null
+++ b/components/utils/ContextMenu.module.css
@@ -0,0 +1,89 @@
+.menu {
+    display: flex;
+    flex-direction: column;
+    width: 220px;
+
+    z-index: 1000;
+    position: fixed;
+    padding-block: 6px;
+    /* Horizontal padding so hovered items inset from the menu's left/right edges. */
+    padding-inline: 6px;
+    overflow-y: auto;
+    border-radius: 12px;
+    background-color: var(--context-menu-bg);
+    border: 1px solid var(--separator);
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
+}
+
+.menu_item {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+
+    padding-block: 6px;
+    padding-inline: 6px;
+    border-radius: 6px;
+
+    font-size: 14px;
+    cursor: pointer;
+}
+
+.menu_item:hover {
+    background-color: var(--context-menu-item-hover);
+}
+
+.menu_item_disabled {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+
+    padding-block: 6px;
+    padding-inline: 6px;
+
+    font-size: 14px;
+    cursor: default;
+    opacity: 0.4;
+}
+
+.menu_item_icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    flex-shrink: 0;
+}
+
+.menu_separator {
+    height: 1px;
+    background-color: var(--separator);
+    margin: 2px 0;
+}
+
+/* Inline color-picker row. */
+.colors {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    padding: 10px 6px;
+}
+
+.color_swatch {
+    width: 20px;
+    height: 20px;
+    padding: 0;
+    border: 2px solid transparent;
+    border-radius: 50%;
+    cursor: pointer;
+    transition:
+        transform 0.15s ease,
+        border-color 0.15s ease;
+}
+
+.color_swatch:hover {
+    transform: scale(1.15);
+}
+
+.color_swatch_active {
+    border-color: var(--primary-text);
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3);
+}
diff --git a/components/utils/ContextMenu.tsx b/components/utils/ContextMenu.tsx
new file mode 100644
index 00000000..2cd207a0
--- /dev/null
+++ b/components/utils/ContextMenu.tsx
@@ -0,0 +1,83 @@
+"use client";
+
+import { ReactNode } from "react";
+import { LucideIcon } from "lucide-react";
+import { join } from "@src/lib/utils/misc";
+
+import styles from "./ContextMenu.module.css";
+
+export interface MenuPosition {
+    x: number;
+    y: number;
+}
+
+interface ContextMenuProps {
+    /** Viewport coordinates — the menu is fixed-positioned. */
+    position: MenuPosition;
+    /** Extra class names on the menu container. */
+    className?: string;
+    children: ReactNode;
+}
+
+/**
+ * Positioned context-menu surface. Renders a fixed panel at `position` and tags
+ * it with `data-context-menu` so canvas / outside-click handlers can detect
+ * clicks that land inside a menu without depending on hashed CSS-module names.
+ *
+ * This is purely presentational — it's mounted by the single context-menu host
+ * (see editor/sidebar/ContextMenu), which owns the open state, so only one menu
+ * is ever rendered.
+ */
+export const ContextMenu = ({ position, className, children }: ContextMenuProps) => (
+    <div
+        data-context-menu
+        className={className ? `${styles.menu} ${className}` : styles.menu}
+        style={{ top: position.y, left: position.x }}
+        // Right-clicking within a menu shouldn't open the native browser menu.
+        onContextMenu={(e) => e.preventDefault()}
+    >
+        {children}
+    </div>
+);
+
+interface ContextMenuItemProps {
+    text: string;
+    action: () => void;
+    icon?: LucideIcon;
+    disabled?: boolean;
+    /** Native tooltip — handy for explaining why a disabled item is disabled. */
+    title?: string;
+}
+
+export const ContextMenuItem = ({ text, action, icon: Icon, disabled, title }: ContextMenuItemProps) => (
+    <div
+        onClick={disabled ? undefined : action}
+        className={disabled ? styles.menu_item_disabled : styles.menu_item}
+        title={title}
+    >
+        <span className={styles.menu_item_icon}>{Icon && <Icon size={16} />}</span>
+        <p className="unselectable">{text}</p>
+    </div>
+);
+
+export const ContextMenuSeparator = () => <div className={styles.menu_separator} />;
+
+interface ContextMenuColorRowProps {
+    colors: string[];
+    /** The currently-selected color (gets a highlighted swatch). */
+    selected?: string;
+    onSelect: (color: string) => void;
+}
+
+export const ContextMenuColorRow = ({ colors, selected, onSelect }: ContextMenuColorRowProps) => (
+    <div className={styles.colors}>
+        {colors.map((color) => (
+            <button
+                key={color}
+                className={join(styles.color_swatch, selected === color ? styles.color_swatch_active : "")}
+                style={{ backgroundColor: color }}
+                onClick={() => onSelect(color)}
+            />
+        ))}
+    </div>
+);
diff --git a/src/app/projects/layout.tsx b/src/app/projects/layout.tsx
index f2813698..71fe422f 100644
--- a/src/app/projects/layout.tsx
+++ b/src/app/projects/layout.tsx
@@ -4,7 +4,7 @@ import Loading from "@components/utils/Loading";
 import DashboardModal from "@components/dashboard/DashboardModal";
 import ProjectUnavailableDialog from "@components/projects/ProjectUnavailableDialog";
 import ProjectMigrationErrorDialog from "@components/projects/ProjectMigrationErrorDialog";
-import { redirect, useSearchParams } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { ProjectProvider, useProjectReady } from "@src/context/ProjectContext";
 import { ViewProvider } from "@src/context/ViewContext";
 import { useProjectMembership, useSettings } from "@src/lib/utils/hooks";
@@ -51,12 +51,29 @@ interface ProjectLayoutInnerProps {
 }
 
 const ProjectLayoutInner = ({ children }: ProjectLayoutInnerProps) => {
+    const router = useRouter();
     const { status } = useProjectReady();
     const { membership, isLoading: isMembershipLoading, isLocalOnly: isBrowserLocalOnly } = useProjectMembership();
 
     // Desktop (Tauri) and browser local-only projects skip the cloud membership requirement.
     const isLocalAccess = isTauri() || isBrowserLocalOnly;
 
+    // Resolved to: web user with no cloud membership opening a project that
+    // isn't available locally → they have no access and must leave.
+    const isTerminalError = status.kind === "needs-update" || status.kind === "unavailable";
+    const isResolving = status.kind === "loading" || (!isLocalAccess && isMembershipLoading);
+    const mustRedirect = !isTerminalError && !isResolving && !isLocalAccess && !membership;
+
+    // Navigate from an effect, never with redirect() during render. Throwing
+    // NEXT_REDIRECT mid-render tore down the project session before the async
+    // navigation committed; React then remounted this subtree (projectId is
+    // still in the URL), re-fired /api/users + cloud-token, and threw again —
+    // an endless 401 loop in production. router.replace runs once, after the
+    // session has mounted cleanly, and stops once projectId leaves the URL.
+    useEffect(() => {
+        if (mustRedirect) router.replace("/projects");
+    }, [mustRedirect, router]);
+
     // Surface terminal error states first so the user always gets a clear message,
     // before any redirect or loading gating runs.
     if (status.kind === "needs-update") {
@@ -68,14 +85,11 @@ const ProjectLayoutInner = ({ children }: ProjectLayoutInnerProps) => {
     if (status.kind === "unavailable") {
         return <ProjectUnavailableDialog />;
     }
-    // Wait for local data and (for cloud projects) for membership to resolve.
-    if (status.kind === "loading" || (!isLocalAccess && isMembershipLoading)) {
+    // Wait for local data and (for cloud projects) for membership to resolve;
+    // also hold here while the redirect effect navigates away.
+    if (isResolving || mustRedirect) {
         return <Loading />;
     }
-    // On web, redirect if no cloud membership and not a local project.
-    if (!isLocalAccess && !membership) {
-        redirect("/projects");
-    }
 
     return (
         <ViewProvider>
diff --git a/src/context/ProjectContext.tsx b/src/context/ProjectContext.tsx
index 3d28f118..7cfc8058 100644
--- a/src/context/ProjectContext.tsx
+++ b/src/context/ProjectContext.tsx
@@ -135,6 +135,9 @@ export interface ProjectContextType {
     setCurrentSearchIndex: (index: number) => void;
     searchMatches: SearchMatch[];
     setSearchMatches: (matches: SearchMatch[]) => void;
+    /** Editor that search/replace targets: the focused screenplay-type editor
+     *  (draft or tree document), falling back to the main screenplay. */
+    activeSearchEditor: Editor | null;
 
     // Project metadata (for title page placeholders)
     projectTitle: string;
@@ -247,6 +250,7 @@ const defaultContextValue: ProjectContextType = {
     setCurrentSearchIndex: () => {},
     searchMatches: [],
     setSearchMatches: () => {},
+    activeSearchEditor: null,
     // Project metadata defaults
     projectTitle: "",
     setProjectTitle: () => {},
@@ -923,6 +927,17 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
         setFocusedEditorTypeState(type);
     }, []);
 
+    // Scope search to the focused screenplay-type editor. `focusedEditorType`
+    // flips on every editor focus change, so it gates *when* we re-resolve, while
+    // `isFocused` picks the concrete editor — disambiguating a draft from a tree
+    // document, which both report "draft". Falls back to the main screenplay.
+    const activeSearchEditor = useMemo(
+        () => [editor, draftEditor, documentEditor].find((e) => e?.isFocused) ?? editor,
+        // focusedEditorType is the intentional re-resolve trigger (not read directly).
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        [focusedEditorType, editor, draftEditor, documentEditor],
+    );
+
     const contextValue = useMemo<ProjectContextType>(
         () => ({
             projectId,
@@ -983,6 +998,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setCurrentSearchIndex,
             searchMatches,
             setSearchMatches,
+            activeSearchEditor,
             projectTitle,
             setProjectTitle,
             projectAuthor,
@@ -1064,6 +1080,7 @@ export const ProjectProvider = ({ children, projectId }: ProjectProviderProps) =
             setCurrentSearchIndex,
             searchMatches,
             setSearchMatches,
+            activeSearchEditor,
             projectTitle,
             setProjectTitle,
             projectAuthor,
diff --git a/src/lib/document-tree/document-tree-config.ts b/src/lib/document-tree/document-tree-config.ts
index 61d8dac8..8f34338e 100644
--- a/src/lib/document-tree/document-tree-config.ts
+++ b/src/lib/document-tree/document-tree-config.ts
@@ -17,7 +17,7 @@ export function createDocumentTreeConfig(docId: string): DocumentEditorConfig {
             comments: false,
             shelving: false,
             characterHighlights: false,
-            searchHighlights: false,
+            searchHighlights: true,
             sceneBookmarks: false,
             sceneLocking: false,
             nodeIdDedup: true,
diff --git a/src/lib/editor/document-editor-config.ts b/src/lib/editor/document-editor-config.ts
index 9c512b3d..40d14faf 100644
--- a/src/lib/editor/document-editor-config.ts
+++ b/src/lib/editor/document-editor-config.ts
@@ -8,7 +8,7 @@ import { TITLEPAGE_BASE_EXTENSIONS } from "@src/lib/titlepage/editor";
 export type PaginationMode = "screenplay" | "titlepage";
 
 export interface DocumentEditorFeatures {
-    /** Whether comments are enabled (CommentMark, CommentCards). */
+    /** Whether comments are enabled (node-anchored comments + margin gutter). */
     comments: boolean;
     /** Whether right-click "Shelve" actions are available (always false until shelf phase). */
     shelving: boolean;
@@ -68,7 +68,7 @@ export interface DocumentEditorConfig {
 export const SCREENPLAY_EDITOR_CONFIG: DocumentEditorConfig = {
     type: "screenplay",
     documentId: MAIN_SCREENPLAY_REF,
-    baseExtensions: BASE_EXTENSIONS,  // CommentMark added dynamically by hook when features.comments=true
+    baseExtensions: BASE_EXTENSIONS,
     getFragment: (s) => s.screenplayFragment(),
     getCommentsMap: (s) => s.comments(),
     features: {
diff --git a/src/lib/editor/use-document-comments.ts b/src/lib/editor/use-document-comments.ts
index de33ea11..540a9ae5 100644
--- a/src/lib/editor/use-document-comments.ts
+++ b/src/lib/editor/use-document-comments.ts
@@ -7,8 +7,9 @@ import type { ProjectRepository } from "@src/lib/project/project-repository";
 
 export interface DocumentCommentOps {
     comments: Comment[];
-    activeCommentId: string | null;
-    setActiveCommentId: (id: string | null) => void;
+    /** data-id of the node whose discussion is currently open, or null. */
+    activeNodeId: string | null;
+    setActiveNodeId: (id: string | null) => void;
     addComment: (partial: Omit<Comment, "id">) => string;
     updateComment: (id: string, data: Partial<Comment>) => void;
     deleteComment: (id: string) => void;
@@ -24,7 +25,7 @@ export const useDocumentComments = (
     commentsMap: Y.Map<Comment> | null | undefined,
     repository: ProjectRepository | null,
 ): DocumentCommentOps => {
-    const [activeCommentId, setActiveCommentId] = useState<string | null>(null);
+    const [activeNodeId, setActiveNodeId] = useState<string | null>(null);
 
     // Refs so CRUD callbacks do not need to be recreated on every map/repo change
     const mapRef = useRef(commentsMap);
@@ -89,8 +90,8 @@ export const useDocumentComments = (
 
     return {
         comments,
-        activeCommentId,
-        setActiveCommentId,
+        activeNodeId,
+        setActiveNodeId,
         addComment,
         updateComment,
         deleteComment,
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index 1f582e9b..d9face08 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -33,7 +33,6 @@ import {
 } from "@src/lib/screenplay/extensions/scene-locking-extension";
 import { computeAbsorbedPageTokens, SCENE_OMIT_UNDO_ORIGIN } from "@src/lib/screenplay/scene-locking";
 import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
-import { CommentMark } from "@src/lib/screenplay/extensions/comment-highlight-extension";
 import { createSpellcheckExtension, refreshSpellcheck } from "@src/lib/spellcheck/spellcheck-extension";
 import { useSpellcheck } from "@src/context/SpellcheckContext";
 import { getActiveTitlePageElement } from "@src/lib/titlepage/editor";
@@ -46,8 +45,6 @@ export interface DocumentEditorCallbacks {
     setSelectedStyles?: (style: Style) => void;
     updateSuggestions?: (suggestions: string[]) => void;
     updateSuggestionsData?: (data: SuggestionData) => void;
-    /** Per-document: wired from useDocumentComments */
-    setActiveCommentId?: (id: string | null) => void;
     userKeybinds?: Record<string, string>;
     globalContext?: { toggleFocusMode: () => void; saveProject: () => void };
     // Title-type callbacks
@@ -74,6 +71,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         searchFilters,
         currentSearchIndex,
         setSearchMatches,
+        activeSearchEditor,
         contdLabel,
         moreLabel,
         sceneLocking,
@@ -174,6 +172,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         searchFilters,
         currentSearchIndex,
         setSearchMatches,
+        activeSearchEditor,
         sceneLocking,
         sceneNumberingStyle,
         skippedSceneLetters,
@@ -193,6 +192,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     ext.searchFilters = searchFilters;
     ext.currentSearchIndex = currentSearchIndex;
     ext.setSearchMatches = setSearchMatches;
+    ext.activeSearchEditor = activeSearchEditor;
     ext.sceneLocking = sceneLocking;
     ext.sceneNumberingStyle = sceneNumberingStyle;
     ext.skippedSceneLetters = skippedSceneLetters;
@@ -283,14 +283,6 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
           })
         : null;
 
-    const commentMarkExtension = features.comments
-        ? CommentMark.configure({
-              onCommentActivated: (commentId: string | null) => {
-                  ext.callbacks.setActiveCommentId?.(commentId);
-              },
-          })
-        : null;
-
     const spellcheckExtension = features.spellcheck
         ? createSpellcheckExtension({
               getWorker: () => ext.spellWorker,
@@ -307,6 +299,7 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
               onMatchesFound: (matches: SearchMatch[]) => {
                   ext.setSearchMatches(matches);
               },
+              getActiveEditor: () => ext.activeSearchEditor,
           })
         : null;
 
@@ -317,9 +310,6 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
             extensions: [
                 ...config.baseExtensions,
 
-                // Comment mark (screenplay only, requires configured callback)
-                ...(commentMarkExtension ? [commentMarkExtension] : []),
-
                 // Collaborative editing
                 ...(projectState && isYjsReady
                     ? [
@@ -641,12 +631,14 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         }
     }, [editor, pageLocking, persistentPages, skippedSceneLetters, config.features.paginationMode]);
 
-    // Refresh search highlights
+    // Refresh search highlights. `activeSearchEditor` is a dependency so that when
+    // focus moves between panels, the newly-active editor recomputes/reports its
+    // matches and the de-activated one clears its highlights.
     useEffect(() => {
         if (editor && features.searchHighlights) {
             refreshSearchHighlights(editor);
         }
-    }, [editor, searchTerm, searchFilters, currentSearchIndex, features.searchHighlights]);
+    }, [editor, searchTerm, searchFilters, currentSearchIndex, activeSearchEditor, features.searchHighlights]);
 
     // Refresh spellcheck when worker becomes ready or language changes
     useEffect(() => {
diff --git a/src/lib/screenplay/comment-anchors.ts b/src/lib/screenplay/comment-anchors.ts
new file mode 100644
index 00000000..fa63371c
--- /dev/null
+++ b/src/lib/screenplay/comment-anchors.ts
@@ -0,0 +1,78 @@
+import { Editor } from "@tiptap/core";
+import { EditorState, Transaction } from "@tiptap/pm/state";
+
+export type NodePosition = { from: number; to: number };
+
+/**
+ * Scan the document for block nodes and return a map of node `data-id` to its
+ * position range. Comments are anchored to nodes by `data-id`, so this lets the
+ * gutter and sidebar resolve a comment's on-screen location from its `nodeId`.
+ * The first occurrence of each id wins (ids are unique in a well-formed doc).
+ */
+export const getNodePositions = (editor: Editor | null): Map<string, NodePosition> => {
+    const positions = new Map<string, NodePosition>();
+    if (!editor || editor.isDestroyed) return positions;
+
+    editor.state.doc.descendants((node, pos) => {
+        const id = node.attrs?.["data-id"] as string | undefined;
+        if (id && !positions.has(id)) {
+            positions.set(id, { from: pos + 1, to: pos + node.nodeSize - 1 });
+        }
+    });
+
+    return positions;
+};
+
+/**
+ * Whether a transaction removed at least one anchorable block node — i.e. a node
+ * with a `data-id` that was wholly deleted (not merely edited or moved). Used to
+ * gate orphaned-comment pruning so it never runs on ordinary typing/insertions.
+ */
+export const transactionDeletesNode = (tr: Transaction): boolean => {
+    if (!tr.docChanged) return false;
+
+    // Ids of block nodes wholly contained in a removed range.
+    const removed = new Set<string>();
+    tr.steps.forEach((step, i) => {
+        const oldDoc = tr.docs[i];
+        if (!oldDoc) return;
+        step.getMap().forEach((oldStart, oldEnd) => {
+            if (oldEnd <= oldStart) return; // pure insertion — nothing removed
+            oldDoc.nodesBetween(oldStart, oldEnd, (node, pos) => {
+                const id = node.attrs?.["data-id"];
+                if (typeof id === "string" && pos >= oldStart && pos + node.nodeSize <= oldEnd) {
+                    removed.add(id);
+                }
+            });
+        });
+    });
+    if (removed.size === 0) return false;
+
+    // Confirm at least one candidate is truly gone from the result (not moved).
+    const live = new Set<string>();
+    tr.doc.descendants((node) => {
+        const id = node.attrs?.["data-id"];
+        if (typeof id === "string") live.add(id);
+    });
+    for (const id of removed) {
+        if (!live.has(id)) return true;
+    }
+    return false;
+};
+
+/**
+ * Resolve the `data-id` of the nearest block ancestor at the given position.
+ * Used when creating a comment so it anchors to the node under the caret.
+ */
+export const getNodeIdAtPos = (state: EditorState, pos: number): string | null => {
+    try {
+        const $pos = state.doc.resolve(pos);
+        for (let d = $pos.depth; d >= 0; d--) {
+            const id = $pos.node(d).attrs?.["data-id"] as string | undefined;
+            if (id) return id;
+        }
+    } catch {
+        // Position out of range
+    }
+    return null;
+};
diff --git a/src/lib/screenplay/editor.ts b/src/lib/screenplay/editor.ts
index 6c2fc7e9..126524e8 100644
--- a/src/lib/screenplay/editor.ts
+++ b/src/lib/screenplay/editor.ts
@@ -9,7 +9,6 @@ import { ScreenplayNodes, ScriptioBold, ScriptioItalic, ScriptioUnderline, gener
 import { Placeholder } from "./extensions/placeholder-extension";
 import { PAGE_SIZES } from "./extensions/pagination-extension";
 import { ContdExtension } from "./extensions/contd-extension";
-import { CommentMark } from "./extensions/comment-highlight-extension";
 import { FountainExtension } from "./extensions/fountain-extension";
 
 export const applyMarkToggle = (editor: Editor, style: Style) => {
@@ -164,4 +163,4 @@ export const BASE_EXTENSIONS = [
     }),
 ];
 
-export const ScreenplaySchema = getSchema([...BASE_EXTENSIONS, CommentMark]);
+export const ScreenplaySchema = getSchema([...BASE_EXTENSIONS]);
diff --git a/src/lib/screenplay/extensions/comment-highlight-extension.ts b/src/lib/screenplay/extensions/comment-highlight-extension.ts
deleted file mode 100644
index 26afea59..00000000
--- a/src/lib/screenplay/extensions/comment-highlight-extension.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-import { Editor, Mark, mergeAttributes } from "@tiptap/core";
-import { Mark as PMMark, Node } from "@tiptap/pm/model";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-import { Decoration, DecorationSet } from "@tiptap/pm/view";
-import { timeApply } from "./apply-timing";
-
-declare module "@tiptap/core" {
-    interface Commands<ReturnType> {
-        comment: {
-            setComment: (commentId: string) => ReturnType;
-            unsetComment: (commentId: string) => ReturnType;
-        };
-    }
-}
-
-export type CommentOptions = {
-    HTMLAttributes: Record<string, unknown>;
-    onCommentActivated: (commentId: string | null) => void;
-};
-
-export type CommentStorage = {
-    activeCommentId: string | null;
-};
-
-const activeCommentPluginKey = new PluginKey("activeCommentHighlight");
-
-export const CommentMark = Mark.create<CommentOptions, CommentStorage>({
-    name: "comment",
-    keepOnSplit: false,
-
-    addOptions() {
-        return {
-            HTMLAttributes: {},
-            onCommentActivated: () => {},
-        };
-    },
-
-    addAttributes() {
-        return {
-            commentId: {
-                default: null,
-                parseHTML: (el: HTMLElement) => el.getAttribute("data-comment-id"),
-                renderHTML: (attrs) => ({
-                    "data-comment-id": attrs.commentId,
-                }),
-            },
-        };
-    },
-
-    parseHTML() {
-        return [
-            {
-                tag: "span[data-comment-id]",
-                getAttrs: (el) => {
-                    const id = (el as HTMLElement).getAttribute("data-comment-id")?.trim();
-                    return id ? null : false;
-                },
-            },
-        ];
-    },
-
-    renderHTML({ HTMLAttributes }) {
-        return [
-            "span",
-            mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
-                class: "comment-highlight",
-            }),
-            0,
-        ];
-    },
-
-    onSelectionUpdate() {
-        const { $from } = this.editor.state.selection;
-        const marks = $from.marks();
-        const commentMark = marks.find((mark) => mark.type.name === "comment");
-        const newId = commentMark?.attrs.commentId || null;
-
-        if (newId !== this.storage.activeCommentId) {
-            this.storage.activeCommentId = newId;
-            this.options.onCommentActivated(newId);
-            // Dispatch a transaction to update decorations only when active comment changes
-            this.editor.view.dispatch(this.editor.state.tr.setMeta("activeCommentChanged", newId));
-        }
-    },
-
-    addStorage() {
-        return {
-            activeCommentId: null,
-        };
-    },
-
-    addCommands() {
-        return {
-            setComment:
-                (commentId: string) =>
-                ({ commands }) => {
-                    if (!commentId) return false;
-                    return commands.setMark("comment", { commentId });
-                },
-
-            unsetComment:
-                (commentId: string) =>
-                ({ tr, dispatch }) => {
-                    if (!commentId) return false;
-
-                    const marksToRemove: { mark: PMMark; from: number; to: number }[] = [];
-
-                    tr.doc.descendants((node, pos) => {
-                        const commentMark = node.marks.find(
-                            (mark) => mark.type.name === "comment" && mark.attrs.commentId === commentId,
-                        );
-                        if (commentMark) {
-                            marksToRemove.push({
-                                mark: commentMark,
-                                from: pos,
-                                to: pos + node.nodeSize,
-                            });
-                        }
-                    });
-
-                    marksToRemove.forEach(({ mark, from, to }) => {
-                        tr.removeMark(from, to, mark);
-                    });
-
-                    if (dispatch) dispatch(tr);
-                    return true;
-                },
-        };
-    },
-
-    addProseMirrorPlugins() {
-        const extensionStorage = this.storage;
-
-        /**
-         * Compute decorations for the active comment.
-         * Only called when activeCommentId changes or document changes.
-         */
-        function computeActiveCommentDecorations(doc: Node, activeId: string | null): DecorationSet {
-            if (!activeId) return DecorationSet.empty;
-
-            const decorations: Decoration[] = [];
-
-            doc.descendants((node: Node, pos: number) => {
-                const commentMark = node.marks.find(
-                    (mark: PMMark) => mark.type.name === "comment" && mark.attrs.commentId === activeId,
-                );
-                if (commentMark) {
-                    decorations.push(
-                        Decoration.inline(pos, pos + node.nodeSize, {
-                            class: "comment-highlight-active",
-                        }),
-                    );
-                }
-            });
-
-            return DecorationSet.create(doc, decorations);
-        }
-
-        return [
-            new Plugin({
-                key: activeCommentPluginKey,
-                state: {
-                    init(_, { doc }) {
-                        return computeActiveCommentDecorations(doc, extensionStorage.activeCommentId);
-                    },
-                    apply: timeApply("comment-highlight", (tr, oldDecorations, _oldState, newState) => {
-                        // Only recompute when active comment changes
-                        const activeCommentChanged = tr.getMeta("activeCommentChanged");
-                        if (activeCommentChanged !== undefined) {
-                            return computeActiveCommentDecorations(newState.doc, extensionStorage.activeCommentId);
-                        }
-                        // For document changes, just remap positions (O(log n))
-                        // Comment marks don't change from simple text edits
-                        if (tr.docChanged) {
-                            return oldDecorations.map(tr.mapping, newState.doc);
-                        }
-                        return oldDecorations;
-                    }),
-                },
-                props: {
-                    decorations(state) {
-                        return this.getState(state);
-                    },
-                },
-            }),
-        ];
-    },
-});
-
-/**
- * Scan the document for comment marks and return their positions.
- * Returns a Map of commentId -> { from, to } with the full range of each comment.
- */
-export const getCommentPositions = (editor: Editor): Map<string, { from: number; to: number }> => {
-    if (!editor || editor.isDestroyed) return new Map();
-
-    const positions = new Map<string, { from: number; to: number }>();
-
-    editor.state.doc.descendants((node, pos) => {
-        const commentMark = node.marks.find((mark) => mark.type.name === "comment");
-        if (!commentMark) return;
-
-        const id = commentMark.attrs.commentId;
-        const existing = positions.get(id);
-        const nodeEnd = pos + node.nodeSize;
-
-        if (existing) {
-            // Extend range to include this node
-            positions.set(id, {
-                from: Math.min(existing.from, pos),
-                to: Math.max(existing.to, nodeEnd),
-            });
-        } else {
-            positions.set(id, { from: pos, to: nodeEnd });
-        }
-    });
-
-    return positions;
-};
diff --git a/src/lib/screenplay/extensions/search-highlight-extension.ts b/src/lib/screenplay/extensions/search-highlight-extension.ts
index ee6c5c03..95cd849e 100644
--- a/src/lib/screenplay/extensions/search-highlight-extension.ts
+++ b/src/lib/screenplay/extensions/search-highlight-extension.ts
@@ -18,6 +18,13 @@ type SearchHighlightConfig = {
     getEnabledFilters: () => Set<ScreenplayElement>;
     getCurrentMatchIndex: () => number;
     onMatchesFound: (matches: SearchMatch[]) => void;
+    /**
+     * Returns the editor search currently targets. Optional: when provided, this
+     * instance only highlights and reports matches while it belongs to the active
+     * editor, so search is scoped to the focused panel and several open editors
+     * don't clobber the single shared match list. Omitted → always active.
+     */
+    getActiveEditor?: () => Editor | null;
 };
 
 /**
@@ -191,7 +198,7 @@ function applyCurrentMatchClass(
 }
 
 export const createSearchHighlightExtension = (config: SearchHighlightConfig) => {
-    const { getSearchTerm, getEnabledFilters, getCurrentMatchIndex, onMatchesFound } = config;
+    const { getSearchTerm, getEnabledFilters, getCurrentMatchIndex, onMatchesFound, getActiveEditor } = config;
 
     // Track previous state to avoid unnecessary updates
     let previousMatchCount = 0;
@@ -203,11 +210,18 @@ export const createSearchHighlightExtension = (config: SearchHighlightConfig) =>
         name: "searchHighlight",
 
         addProseMirrorPlugins() {
+            // `this.editor` is the instance this extension is bound to. Search is
+            // scoped to the focused editor: only the active instance highlights
+            // and reports matches (see getActiveEditor above).
+            const ownEditor = this.editor;
+            const isActive = () => !getActiveEditor || getActiveEditor() === ownEditor;
+
             return [
                 new Plugin({
                     key: searchHighlightPluginKey,
                     state: {
                         init(_, { doc }) {
+                            if (!isActive()) return DecorationSet.empty;
                             const searchTerm = getSearchTerm();
                             const result = computeSearchDecorations(
                                 doc,
@@ -222,6 +236,18 @@ export const createSearchHighlightExtension = (config: SearchHighlightConfig) =>
                             return result.decorations;
                         },
                         apply: timeApply("search-highlight", (tr, oldDecorations, _oldState, newState) => {
+                            // Not the active search editor: render nothing and don't report
+                            // matches (the active editor owns the shared match list). Reset
+                            // bookkeeping so re-activation recomputes from scratch.
+                            if (!isActive()) {
+                                if (previousSearchTerm !== "" || previousMatchCount !== 0 || cachedMatches.length !== 0) {
+                                    previousSearchTerm = "";
+                                    previousMatchCount = 0;
+                                    cachedMatches = [];
+                                }
+                                return DecorationSet.empty;
+                            }
+
                             const searchTerm = getSearchTerm();
 
                             // Fast path: no search term and wasn't searching before
diff --git a/src/lib/shelf/shelf-editor-config.ts b/src/lib/shelf/shelf-editor-config.ts
index a4e23b99..aea2f2a3 100644
--- a/src/lib/shelf/shelf-editor-config.ts
+++ b/src/lib/shelf/shelf-editor-config.ts
@@ -11,7 +11,7 @@ export function createShelfEditorConfig(nodeId: string, versionId: string): Docu
             comments: false,
             shelving: false,
             characterHighlights: false,
-            searchHighlights: false,
+            searchHighlights: true,
             sceneBookmarks: false,
             sceneLocking: false,
             nodeIdDedup: true,
diff --git a/src/lib/utils/types.ts b/src/lib/utils/types.ts
index f313c9cb..7422f98e 100644
--- a/src/lib/utils/types.ts
+++ b/src/lib/utils/types.ts
@@ -88,6 +88,8 @@ export type CommentReply = {
 
 export type Comment = {
     id: string;
+    /** data-id of the screenplay node this comment is anchored to. */
+    nodeId: string;
     text: string;
     author: string;
     createdAt: number;
diff --git a/src/tests/benchmarks/comment-highlight.bench.ts b/src/tests/benchmarks/comment-highlight.bench.ts
deleted file mode 100644
index 49e25991..00000000
--- a/src/tests/benchmarks/comment-highlight.bench.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { JSONContent } from "@tiptap/core";
-import { BASE_EXTENSIONS, SCREENPLAY_FORMATS } from "@src/lib/screenplay/editor";
-import { ScriptioPagination } from "@src/lib/screenplay/extensions/pagination-extension";
-import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
-import { CommentMark } from "@src/lib/screenplay/extensions/comment-highlight-extension";
-import { createTestEditor } from "../helpers/editor-factory";
-import { pluginBenchSuite } from "../helpers/bench-suite";
-
-function makeEditor(content: JSONContent[]) {
-    return createTestEditor(
-        [
-            ...BASE_EXTENSIONS,
-            ScriptioPagination.configure({
-                pageGap: 20,
-                headerRight: `<p class="page-number" style="margin-top: 50px;">{page}.</p>`,
-                customHeader: {
-                    1: {
-                        headerLeft: "",
-                        headerRight: `<p class="page-number" style="margin-top: 50px;"></p>`,
-                    },
-                },
-                footerRight: "",
-                ...SCREENPLAY_FORMATS.LETTER,
-            }),
-            createNodeIdDedupExtension({ duplicatePersistentScene: () => {} }),
-            CommentMark.configure({
-                onCommentActivated: () => {},
-            }),
-        ],
-        content,
-    );
-}
-
-pluginBenchSuite("comment-highlight — apply() timing", makeEditor);
diff --git a/src/tests/project/scriptio-roundtrip.test.ts b/src/tests/project/scriptio-roundtrip.test.ts
index ff715a2c..86251522 100644
--- a/src/tests/project/scriptio-roundtrip.test.ts
+++ b/src/tests/project/scriptio-roundtrip.test.ts
@@ -46,7 +46,7 @@ function buildPopulatedProject(): ProjectState {
         repo.setPageSize("A4" as never);
         repo.setSceneLocking(true);
         repo.setSkippedSceneLetters(["I", "O", "Q"]);
-        repo.addComment({ content: "note", resolved: false } as never);
+        repo.addComment({ nodeId: "b1", text: "note", author: "Ada", createdAt: 0, resolved: false, replies: [] });
         ydoc.dictionary().set("zoetrope", true);
     });
 
diff --git a/styles/scriptio.css b/styles/scriptio.css
index 8ceaf8bd..018e189d 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -485,26 +485,6 @@
         text-decoration-skip-ink: none;
     }
 
-    /* Comment highlighting */
-    .hide-comments .comment-highlight,
-    .hide-comments .comment-highlight-active {
-        background-color: transparent !important;
-        border-bottom: none !important;
-        cursor: text !important;
-    }
-
-    .comment-highlight {
-        background-color: rgba(255, 213, 0, 0.2);
-        border-bottom: 2px solid rgba(255, 213, 0, 0.5);
-        cursor: pointer;
-        border-radius: 2px;
-    }
-
-    .comment-highlight-active {
-        background-color: rgba(255, 213, 0, 0.4);
-        border-bottom-color: rgba(255, 213, 0, 0.8);
-    }
-
     /* Scene bookmark marker (widget decoration inserted by scene-bookmark-extension) */
     .scene-bookmark-marker {
         position: absolute;

From d41592e18794c15a42b3a020d59da5bef52b5882 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Tue, 16 Jun 2026 08:38:36 +0200
Subject: [PATCH 73/76] fixed pagination for locked pages, added lock icons to
 locked pages

---
 .../extensions/pagination-extension.ts        | 202 ++++++++++++++++--
 1 file changed, 186 insertions(+), 16 deletions(-)

diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index a6fb9212..2f3a17ea 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -16,6 +16,7 @@ import {
     SceneToken,
 } from "@src/lib/screenplay/scene-locking";
 import { PAGE_COLLAPSE_META, PAGE_ONE_KEY, PersistentPageMap, SCENE_OMIT_META } from "@src/lib/screenplay/page-locking";
+import { generateNodeId } from "@src/lib/screenplay/nodes";
 import { timeApply } from "./apply-timing";
 
 // ---------------------------------------------------------------------------
@@ -157,6 +158,10 @@ export interface PageBreakInfo {
     /** Display label for the page ending before this break — used by the footer of
      *  the previous page. Undefined for the first break (footer uses page-1 label). */
     prevLabel?: string;
+    /** True when the page beginning after this break holds a frozen page-lock
+     *  token (status "locked"). Drives the subtle lock badge in the page's
+     *  top-right corner. Only ever set while page locking is active. */
+    locked?: boolean;
     /** Character offset within the anchor node where the break occurs.
      *  Set for sentence-split breaks (mid-node) — both the original split and
      *  the locked re-application of it — and read by the production panel when
@@ -229,6 +234,57 @@ function syncVars(dom: HTMLElement, o: PaginationOptions) {
 // Decoration builders
 // ---------------------------------------------------------------------------
 
+/**
+ * Lock badge shown in the top-right corner of a page-locked page.
+ *
+ * Built once and cloned on reuse — every locked page mounts an identical copy,
+ * so the SVG is parsed a single time. CSS floats it just past the page's
+ * top-right corner, in the gutter. It carries no text, so the PDF adapter's
+ * label extraction (which reads `.pagination-header-right`) and the header-area
+ * textContent are both untouched.
+ */
+let pageLockBadgeTemplate: HTMLSpanElement | null = null;
+
+function makePageLockBadge(): HTMLSpanElement {
+    if (!pageLockBadgeTemplate) {
+        const badge = document.createElement("span");
+        badge.className = "page-lock-badge";
+        badge.setAttribute("aria-hidden", "true");
+        // Lucide "lock" glyph, matching the icon set used across the app.
+        badge.innerHTML =
+            '<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 24 24"' +
+            ' fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"' +
+            ' stroke-linejoin="round"><rect width="18" height="11" x="3" y="11" rx="2" ry="2"/>' +
+            '<path d="M7 11V7a5 5 0 0 1 10 0v4"/></svg>';
+        pageLockBadgeTemplate = badge;
+    }
+    return pageLockBadgeTemplate.cloneNode(true) as HTMLSpanElement;
+}
+
+/**
+ * Standalone lock-marker widget for a whole-node locked page.
+ *
+ * Rendered as its own decoration at the page-start boundary — a sibling of the
+ * page-break widget and the page's first paragraph, belonging to neither. It is
+ * therefore NOT a descendant of the content-visibility-contained break/first-page
+ * widget (whose paint containment would clip it) and NOT tied to the paragraph.
+ * A zero-height, full-page-width block establishes the positioning context at
+ * the new page's top edge; the badge inside it floats up into the top-right
+ * gutter via CSS.
+ */
+function makePageLockMarker(): HTMLDivElement {
+    const marker = document.createElement("div");
+    marker.className = "page-lock-marker";
+    marker.contentEditable = "false";
+    marker.appendChild(makePageLockBadge());
+    return marker;
+}
+
+/** Append the lock badge to a page's header area when that page is locked. */
+function applyPageLock(headerArea: HTMLElement, locked: boolean | undefined): void {
+    if (locked) headerArea.appendChild(makePageLockBadge());
+}
+
 /**
  * A header/footer span, built once per (class, html) and cloned on reuse.
  *
@@ -312,6 +368,9 @@ function createFirstPageWidget(firstPageLabel: string, options: PaginationOption
     headerArea.className = "pagination-header-area";
     headerArea.style.height = `${options.marginTop}px`;
     fillHeader(headerArea, 1, firstPageLabel, options);
+    // Page 1's lock badge is mounted on its first paragraph (see
+    // pushPageLockBadge) — not here — because this widget carries
+    // content-visibility, whose paint containment would hide it.
 
     overlay.appendChild(headerArea);
     container.appendChild(spacer);
@@ -442,6 +501,12 @@ function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOpti
     // Header area of the new page (fixed size = marginTop)
     headerArea.style.height = `${options.marginTop}px`;
     fillHeader(headerArea, breakInfo.pagenum, thisLabel, options);
+    // Only mid-node split pages render the lock badge in the header area: their
+    // widget is exempt from content-visibility (its overlay escapes the box), so
+    // the badge actually paints. Whole-node pages would have it clipped by this
+    // widget's paint containment, so they mount it on the page's first paragraph
+    // instead (see pushPageLockBadge).
+    if (breakInfo.splitNodeType !== null) applyPageLock(headerArea, breakInfo.locked);
 
     if (isEmpty) {
         // Empty content area for the orphan-locked page. Renders a faint
@@ -568,6 +633,7 @@ function buildDecorations(
     breaks: PageBreakInfo[],
     lastPageFreespace: number,
     firstPageLabel: string,
+    firstPageLocked: boolean,
     options: PaginationOptions,
     reuse?: Map<string, Decoration>,
 ): DecorationSet {
@@ -602,11 +668,25 @@ function buildDecorations(
         if (node) decorations.push(Decoration.node(pos, pos + node.nodeSize, { class: cls }));
     };
 
+    // Mount the lock badge for a locked, whole-node page as its own standalone
+    // widget at the page-start boundary. It must live OUTSIDE the page-break /
+    // first-page widget — those carry content-visibility, whose paint containment
+    // hides anything inside them. A sibling widget in the flat list is a direct
+    // child of `.pagination` (not contained), so it paints into the gutter. Side
+    // +1 keeps it after the page-break widget at the same position, i.e. on the
+    // new page's side of the boundary. Mid-node split pages can't use this (their
+    // page has no fresh boundary node), but their break widget is
+    // content-visibility-exempt, so they keep the header-area badge instead.
+    const pushPageLockBadge = (pos: number) => {
+        pushWidget(pos, "page-lock-marker", 1, makePageLockMarker);
+    };
+
     // First page top margin / header
     pushWidget(0, `page-1-header-${firstPageLabel}-${fp}`, -1, () =>
         createFirstPageWidget(firstPageLabel, options),
     );
     markPageStart(0, "pagination-doc-start");
+    if (firstPageLocked) pushPageLockBadge(0);
 
     // Page breaks
     // The key MUST include every value that affects the widget DOM (freespace,
@@ -614,13 +694,18 @@ function buildDecorations(
     // pagenum. A matching key keeps the previously drawn DOM, so a key that
     // omits e.g. freespace causes stale spacer heights after content edits.
     for (const b of breaks) {
-        const key = `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}-${b.label ?? ""}-${b.prevLabel ?? ""}-${b.isEmpty ? "E" : ""}-${fp}`;
+        const key = `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}-${b.label ?? ""}-${b.prevLabel ?? ""}-${b.isEmpty ? "E" : ""}-${b.locked ? "L" : ""}-${fp}`;
         pushWidget(b.pos, key, -1, () => createPageBreakWidget(b, options));
         // Only whole-node breaks start a fresh node; mid-node sentence splits
         // (splitNodeType !== null) keep the straddling node, which never had a
         // margin to reset — the old `> .pagination-page-break + p` rule didn't
         // match inside-<p> widgets either.
-        if (b.splitNodeType === null) markPageStart(b.pos, "pagination-break-start");
+        if (b.splitNodeType === null) {
+            markPageStart(b.pos, "pagination-break-start");
+            // Whole-node locked page → mount its badge on the new page's first
+            // paragraph (split locked pages render it in the header area above).
+            if (b.locked) pushPageLockBadge(b.pos);
+        }
     }
 
     // Last page bottom margin / footer.
@@ -695,8 +780,7 @@ const ZERO_TOP_MARGIN_TYPES = new Set<ScreenplayElement>([
  * a constant keeps this off the layout path entirely, the same way LINE_HEIGHT
  * mirrors --line-height. Keep in sync with the margin-top rules in scriptio.css.
  */
-const nodeTopMargin = (nodeType: ScreenplayElement): number =>
-    ZERO_TOP_MARGIN_TYPES.has(nodeType) ? 0 : LINE_HEIGHT;
+const nodeTopMargin = (nodeType: ScreenplayElement): number => (ZERO_TOP_MARGIN_TYPES.has(nodeType) ? 0 : LINE_HEIGHT);
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const setupTestDiv = (editorDom: HTMLElement, _: PaginationOptions): HTMLElement => {
@@ -862,6 +946,8 @@ interface PaginationState {
     breaks: PageBreakInfo[];
     lastPageFreespace: number;
     firstPageLabel: string;
+    /** Whether page 1 carries a frozen page-lock token (drives its lock badge). */
+    firstPageLocked: boolean;
 }
 
 /**
@@ -903,6 +989,7 @@ const createPaginationPlugin = (extension: {
                 breaks: [],
                 lastPageFreespace: 0,
                 firstPageLabel: "1",
+                firstPageLocked: false,
             }),
             apply: timeApply("pagination", (tr, value: PaginationState, oldState, newState): PaginationState => {
                 // Wait for the screenplay fonts to finish loading before doing
@@ -1395,6 +1482,7 @@ const createPaginationPlugin = (extension: {
                 // pages keep their frozen labels, provisional inserts get suffix labels
                 // (e.g. "4A"), and pages past the last lock continue the integer sequence.
                 let firstPageLabel = "1";
+                let firstPageLocked = false;
                 if (pageLocks) {
                     // Omitted scenes collapse whole locked pages out of the
                     // document. Each such removed page contributes an "absorbed"
@@ -1472,8 +1560,7 @@ const createPaginationPlugin = (extension: {
                     // Reclaimed pages join the lock map for label computation so
                     // they get their absorbed number (and following provisional
                     // pages suffix off it: "18", "18A", …).
-                    const labelLocks =
-                        Object.keys(synthetic).length > 0 ? { ...pageLocks, ...synthetic } : pageLocks;
+                    const labelLocks = Object.keys(synthetic).length > 0 ? { ...pageLocks, ...synthetic } : pageLocks;
                     const pageLabels = computePageLabels(breaks, labelLocks, skippedLetters);
 
                     // Fold the unreclaimed tokens into the FOLLOWING surviving
@@ -1514,9 +1601,11 @@ const createPaginationPlugin = (extension: {
                     }
 
                     firstPageLabel = pageLabels[0].label;
+                    firstPageLocked = pageLabels[0].status === "locked";
                     for (let i = 0; i < breaks.length; i++) {
                         breaks[i].label = pageLabels[i + 1].label;
                         breaks[i].prevLabel = pageLabels[i].label;
+                        breaks[i].locked = pageLabels[i + 1].status === "locked";
                     }
                 }
 
@@ -1525,6 +1614,7 @@ const createPaginationPlugin = (extension: {
                     fullRemeasure ||
                     lastPageFreespace !== value.lastPageFreespace ||
                     firstPageLabel !== value.firstPageLabel ||
+                    firstPageLocked !== value.firstPageLocked ||
                     breaks.length !== mappedOldBreaks.length ||
                     breaks.some(
                         (b, i) =>
@@ -1533,7 +1623,8 @@ const createPaginationPlugin = (extension: {
                             b.contdName !== mappedOldBreaks[i].contdName ||
                             b.label !== mappedOldBreaks[i].label ||
                             b.prevLabel !== mappedOldBreaks[i].prevLabel ||
-                            !!b.isEmpty !== !!mappedOldBreaks[i].isEmpty,
+                            !!b.isEmpty !== !!mappedOldBreaks[i].isEmpty ||
+                            !!b.locked !== !!mappedOldBreaks[i].locked,
                     );
 
                 // Always map the previous set first: it re-anchors every existing
@@ -1554,6 +1645,7 @@ const createPaginationPlugin = (extension: {
                         breaks,
                         lastPageFreespace,
                         firstPageLabel,
+                        firstPageLocked,
                         options,
                         buildReuseMap(mapped),
                     );
@@ -1577,12 +1669,13 @@ const createPaginationPlugin = (extension: {
                                   breaks,
                                   lastPageFreespace,
                                   firstPageLabel,
+                                  firstPageLocked,
                                   options,
                                   buildReuseMap(mapped),
                               );
                 }
 
-                return { decset, breaks, lastPageFreespace, firstPageLabel };
+                return { decset, breaks, lastPageFreespace, firstPageLabel, firstPageLocked };
             }),
         },
         appendTransaction() {
@@ -1701,7 +1794,14 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
         if (!style) {
             style = document.createElement("style");
             style.id = "pagination-style";
-            style.textContent = `
+            document.head.appendChild(style);
+        }
+        // Always (re)write the rules. The <style> element is created once and
+        // then persists across editor instances and hot reloads, so guarding the
+        // assignment (the old `if (!style)`) would pin the very first CSS — a
+        // hot-swapped rule set (e.g. a newly added affordance like the page-lock
+        // badge) would never take effect until a full page reload.
+        style.textContent = `
                 .pagination {
                     position: relative;
                     width: var(--page-width) !important;
@@ -1773,9 +1873,44 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                     text-transform: uppercase;
                     box-sizing: border-box;
                 }
+
+                /* Subtle lock badge for page-locked pages. It floats just past
+                   the page's top-right corner, in the gutter. */
+                .page-lock-badge {
+                    position: absolute;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    width: 22px;
+                    height: 22px;
+                    color: var(--secondary-text);
+                    opacity: 0.5;
+                    pointer-events: none;
+                    right: 0;
+                }
+
+                /* Whole-node pages carry a standalone, zero-height marker at the
+                   page-start boundary (a sibling of the break widget / paragraph,
+                   NOT inside the content-visibility-contained widget that would
+                   clip it). The marker spans the page width and sits at the new
+                   page's top edge, so lift the badge by the top margin to reach
+                   the physical top-right corner, then nudge it into the gutter. */
+                .page-lock-marker {
+                    position: relative;
+                    height: 0;
+                }
+                .page-lock-marker > .page-lock-badge {
+                    top: 0;
+                    transform: translate(calc(100% + 8px), calc(-1 * var(--page-margin-top) + 10px));
+                }
+
+                /* Split pages render the badge in the (content-visibility-exempt)
+                   header area, whose top already is the page's physical top. */
+                .pagination-header-area .page-lock-badge {
+                    top: 10px;
+                    transform: translateX(calc(100% + 8px));
+                }
             `;
-            document.head.appendChild(style);
-        }
 
         setupTestDiv(editorDOM, this.options);
 
@@ -1898,11 +2033,7 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                 // map as an orphan so the page's frozen number is absorbed into
                 // the following page as a range (e.g. "5-6") rather than vanishing.
                 const curDataId = $from.parent.attrs?.["data-id"];
-                if (
-                    $from.parent.textContent.length === 0 &&
-                    typeof curDataId === "string" &&
-                    pageLocks[curDataId]
-                ) {
+                if ($from.parent.textContent.length === 0 && typeof curDataId === "string" && pageLocks[curDataId]) {
                     const tr = state.tr;
                     tr.delete(curStart, $from.after());
                     tr.setSelection(TextSelection.create(tr.doc, curStart - 1));
@@ -1937,6 +2068,45 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                 view.dispatch(tr);
                 return true;
             },
+            Enter: ({ editor }) => {
+                // Enter at the very start of a locked page's anchor node.
+                //
+                // We want the standard "open a line above" feel: the new empty
+                // line becomes the page's FIRST line, the page keeps its number,
+                // and any overflow flows FORWARD (an A-page that carries real
+                // content) — never a blank page pushed backward onto the previous
+                // (already full) page.
+                //
+                // The default split is inconsistent: Action keeps the page token
+                // on the new empty half (forward, correct), but keep-with-next
+                // types (Character, Parenthetical, Transition, Scene) keep it on
+                // the content half, which shoves a blank line backward and spawns
+                // a blank A-page on the previous page. Normalize every type to the
+                // forward behavior: the empty half retains the locked data-id (so
+                // it anchors the page) and the content half gets a fresh id.
+                const { state, view } = editor;
+                const { $from, empty } = state.selection;
+                if (!empty || $from.parentOffset !== 0) return false;
+                if ($from.parent.textContent.length === 0) return false; // nothing to push down
+
+                const opts = this.options as PaginationOptions;
+                if (!opts.getPageLocking?.()) return false;
+                const pageLocks = opts.getPageLocks?.();
+                if (!pageLocks) return false;
+
+                const dataId = $from.parent.attrs?.["data-id"];
+                if (typeof dataId !== "string" || !pageLocks[dataId]) return false;
+
+                // split with typesAfter re-keying the CONTENT half; the new empty
+                // first half keeps the original (locked) data-id and so stays the
+                // page anchor.
+                const attrs = $from.parent.attrs;
+                const tr = state.tr.split($from.pos, 1, [
+                    { type: $from.parent.type, attrs: { ...attrs, "data-id": generateNodeId() } },
+                ]);
+                view.dispatch(tr);
+                return true;
+            },
         };
     },
 

From ce2c0b82dddc71f8b07e35312912c8e8eac5d3a3 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Fri, 19 Jun 2026 02:29:10 +0200
Subject: [PATCH 74/76] fixed page break logic and page number rendering

---
 .../extensions/pagination-extension.ts        | 70 ++++++++++++-------
 styles/scriptio.css                           |  1 +
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index 2f3a17ea..cd3c15f6 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -1,5 +1,4 @@
 import { DOMSerializer } from "@node_modules/prosemirror-model/dist";
-import { CircularBuffer } from "@src/lib/utils/circular-buffer";
 import { ScreenplayElement } from "@src/lib/utils/enums";
 import { Editor, Extension } from "@tiptap/core";
 import { Node } from "@tiptap/pm/model";
@@ -682,9 +681,7 @@ function buildDecorations(
     };
 
     // First page top margin / header
-    pushWidget(0, `page-1-header-${firstPageLabel}-${fp}`, -1, () =>
-        createFirstPageWidget(firstPageLabel, options),
-    );
+    pushWidget(0, `page-1-header-${firstPageLabel}-${fp}`, -1, () => createFirstPageWidget(firstPageLabel, options));
     markPageStart(0, "pagination-doc-start");
     if (firstPageLocked) pushPageLockBadge(0);
 
@@ -916,8 +913,14 @@ function trySplitNode(
                 getHTMLHeight(bottomElement, editorDOM, node.type.name, options) - nodeMarginTop,
             );
 
-            // Bottom too short — not worth a split; force the whole node to the next page.
-            if (bottomHeight < LINE_HEIGHT * MIN_SPLIT_BOTTOM_LINES) return null;
+            // Bottom would be a widow (< MIN_SPLIT_BOTTOM_LINES). Don't abandon the
+            // split — try a SHORTER top prefix instead. A shorter top pushes the
+            // next sentence down too, growing the bottom past the threshold while
+            // the (smaller) top still fits the freespace. Heights are monotonic in
+            // the prefix length, so the loop keeps walking down until it finds the
+            // largest prefix that BOTH fits and leaves an adequate bottom; only if
+            // no prefix qualifies do we fall out of the loop and move the whole node.
+            if (bottomHeight < LINE_HEIGHT * MIN_SPLIT_BOTTOM_LINES) continue;
 
             // The split position in document space:
             // nodeDocPos + 1 skips the node's opening token; topText.length then walks
@@ -931,7 +934,8 @@ function trySplitNode(
         }
     }
 
-    // No prefix fits — the first sentence alone is too tall; move the whole node.
+    // No valid split: either the first sentence alone is too tall to fit, or every
+    // prefix that fits would leave a too-short widow on the next page. Move the whole node.
     return null;
 }
 
@@ -1114,14 +1118,17 @@ const createPaginationPlugin = (extension: {
                 // subsequent page is byte-identical to the previous layout.
                 let shortCircuited = false;
 
-                let lastNodes: CircularBuffer<NodeInfo> = new CircularBuffer(3);
+                // Nodes on the current page, oldest first; reset at every break, so it
+                // only ever holds one page's worth (bounded by page height). The orphan
+                // walkback scans it from the end and must see the ENTIRE trailing
+                // keep-with-next run — Scene → Character → Parenthetical is already 3
+                // long — so a fixed 3-slot window would strand the head of longer runs.
+                let lastNodes: NodeInfo[] = [];
                 for (let i = 0; i < childCount; i++) {
                     const node = newState.doc.child(i);
                     const pos = offset;
                     offset += node.nodeSize;
 
-                    if (!("height" in node.attrs)) continue;
-
                     const nodeType = node.type.name as ScreenplayElement;
                     const logic = BREAK_LOGIC[nodeType];
 
@@ -1163,7 +1170,7 @@ const createPaginationPlugin = (extension: {
                         });
                         // New page's first node margin is set by the pagePos === 0 path below.
                         pagePos = 0;
-                        lastNodes = new CircularBuffer(3);
+                        lastNodes = [];
                     }
 
                     // --- Force page break for locked page anchors ---
@@ -1226,7 +1233,7 @@ const createPaginationPlugin = (extension: {
                             // split is not a page-start node) — no top margin to strip.
                             pageStartMargin = 0;
                             pagePos = bottomHeight;
-                            lastNodes = new CircularBuffer(3);
+                            lastNodes = [];
                             lastNodes.push({
                                 pos,
                                 type: nodeType,
@@ -1252,7 +1259,7 @@ const createPaginationPlugin = (extension: {
                             });
                             // New page's first node margin is set by the pagePos === 0 path below.
                             pagePos = 0;
-                            lastNodes = new CircularBuffer(3);
+                            lastNodes = [];
                         }
                     }
 
@@ -1266,7 +1273,8 @@ const createPaginationPlugin = (extension: {
                     }
                     pagePos += height;
 
-                    // We keep the last 3 nodes for orphan resolution on page break
+                    // Record this node for orphan resolution; the walkback at the next
+                    // break scans this list backward through the trailing keep-with-next run.
                     lastNodes.push({
                         pos,
                         type: nodeType,
@@ -1322,7 +1330,7 @@ const createPaginationPlugin = (extension: {
                                 // no top margin to strip.
                                 pageStartMargin = 0;
                                 pagePos = split.bottomHeight;
-                                lastNodes = new CircularBuffer(3);
+                                lastNodes = [];
                                 lastNodes.push({
                                     pos,
                                     type: nodeType,
@@ -1335,15 +1343,23 @@ const createPaginationPlugin = (extension: {
                         }
 
                         // --- Orphan resolution ---
-                        // Walk back through the buffer: if the last fitted node has keepWithNext,
-                        // slide the break back to its position (and carry its height to the next page).
-                        // Repeat once more for the double-orphan case (e.g. Character → Parenthetical).
+                        // Walk back through this page's nodes, sliding the break before each
+                        // node that would otherwise be stranded as the page's last item: while
+                        // the would-be last node has keepWithNext, carry it (and its height) to
+                        // the next page. This handles a keep-with-next run of ANY length, e.g.
+                        // Scene → Character → Parenthetical → Dialogue, not just the two-node
+                        // case. It stops at the first node safe to end a page on, at a locked
+                        // anchor (which owns its page), or before the page's first node.
                         let breakPos = pos;
                         let carryHeight = height; // cumulative height that moves to the next page
                         let backCount = 0; // how many nodes slid back
 
-                        for (let back = 1; back <= 2; back++) {
-                            const prev = lastNodes.at(back); // at(1) = last fitted, at(2) = one before
+                        // lastNodes[length - 1] is the current (overflowing) node; index
+                        // (length - 1 - back) walks backward from it (back = 1 is the last
+                        // fitted node). The `back < length - 1` bound never reaches index 0,
+                        // so at least one node always stays — a break can never empty a page.
+                        for (let back = 1; back < lastNodes.length - 1; back++) {
+                            const prev = lastNodes[lastNodes.length - 1 - back];
                             if (!prev) break;
                             // A locked anchor owns its page and must never be displaced by
                             // walkback — otherwise the next overflow would yank it onto an
@@ -1361,9 +1377,10 @@ const createPaginationPlugin = (extension: {
                         }
 
                         // freespace = space left before the first node that moved down.
-                        // lastNodes.at(backCount) is that first node; positionTop is its accumulated
-                        // page height just before it was added — i.e. the used space above it.
-                        const firstMovingNode = lastNodes.at(backCount);
+                        // That first moving node sits backCount steps back from the current node;
+                        // positionTop is its accumulated page height just before it was added —
+                        // i.e. the used space above it.
+                        const firstMovingNode = lastNodes[lastNodes.length - 1 - backCount];
                         const freespace = contentHeight - (firstMovingNode?.positionTop ?? pagePos - height);
 
                         // If the first node moving to the next page is Dialogue or Parenthetical,
@@ -1407,12 +1424,13 @@ const createPaginationPlugin = (extension: {
                         const carryNodes: NodeInfo[] = [];
                         let carryTop = 0;
                         for (let back = backCount; back >= 0; back--) {
-                            const n = lastNodes.at(back)!;
+                            const n = lastNodes[lastNodes.length - 1 - back];
                             carryNodes.push({ ...n, positionTop: carryTop });
                             carryTop += n.height;
                         }
-                        lastNodes = new CircularBuffer(3);
-                        for (const n of carryNodes) lastNodes.push(n);
+                        // carryNodes is already oldest→newest with fresh positionTop values,
+                        // which is exactly the page-relative ordering lastNodes expects.
+                        lastNodes = carryNodes;
 
                         // Short-circuit: past the changed range and this break matches an old break
                         // (same position, freespace, and contdName) → layout is back in sync;
diff --git a/styles/scriptio.css b/styles/scriptio.css
index 018e189d..423d3812 100644
--- a/styles/scriptio.css
+++ b/styles/scriptio.css
@@ -108,6 +108,7 @@
     .page-number > * {
         color: var(--editor-text);
         font-family: var(--font-screenplay);
+        line-height: var(--line-height);
     }
 
     /* Editor styles */

From bb1d2c6a39fbbeb7519eb6c2903842bfa73ab7ed Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 22 Jun 2026 00:19:07 +0200
Subject: [PATCH 75/76] assets syncing to cloud, added manual page break,
 english spellchecker now built-in, added spellcheck toggle

---
 components/board/BoardCanvas.module.css       |    19 +
 components/board/BoardCanvas.tsx              |    63 +-
 components/dashboard/DashboardModal.tsx       |     5 +-
 components/dashboard/DashboardSidebar.tsx     |     1 +
 .../preferences/LanguageSettings.tsx          |    40 +-
 .../preferences/SpellcheckSettings.module.css |    12 +
 .../project/StorageSettings.module.css        |   175 +
 .../dashboard/project/StorageSettings.tsx     |   279 +
 components/editor/DocumentEditorPanel.tsx     |    35 +-
 components/editor/EditorPanel.module.css      |    11 +-
 components/editor/sidebar/ContextMenu.tsx     |    34 +-
 components/navbar/ProjectNavbar.module.css    |    55 +
 components/navbar/ProjectNavbar.tsx           |   105 +-
 components/project/EditorFooter.tsx           |    34 +-
 messages/de.json                              |    28 +-
 messages/en.json                              |    28 +-
 messages/es.json                              |    28 +-
 messages/fr.json                              |    28 +-
 messages/ja.json                              |    28 +-
 messages/ko.json                              |    28 +-
 messages/pl.json                              |    28 +-
 messages/zh.json                              |    28 +-
 prisma/schema.prisma                          |    21 +
 public/dictionaries/en/index.aff              |   205 +
 public/dictionaries/en/index.dic              | 49569 ++++++++++++++++
 public/dictionaries/en/license                |   347 +
 src/app/api/internal/asset-gc/route.ts        |    47 +
 .../[projectId]/assets/[hash]/route.ts        |    44 +
 .../projects/[projectId]/assets/gc/route.ts   |    54 +
 .../[projectId]/assets/missing/route.ts       |    40 +
 .../api/projects/[projectId]/assets/route.ts  |   108 +
 src/app/api/projects/[projectId]/route.ts     |     7 +
 .../api/projects/[projectId]/storage/route.ts |    37 +
 src/app/api/users/me/storage/route.ts         |    19 +
 src/context/SpellcheckContext.tsx             |    25 +-
 src/lib/adapters/fountain/fountain-adapter.ts |    17 +-
 src/lib/assets/asset-gc.ts                    |    62 +-
 src/lib/assets/asset-orphans.ts               |    20 +
 src/lib/assets/asset-refs.ts                  |    34 +
 src/lib/assets/asset-store.ts                 |   127 +-
 src/lib/assets/cloud-asset-sync.ts            |   129 +
 src/lib/assets/use-asset-gc.ts                |    10 +-
 src/lib/cloud/index.ts                        |     7 +-
 src/lib/cloud/room.ts                         |   137 +-
 src/lib/cloud/types.ts                        |     2 +
 src/lib/cloud/wrangler.toml                   |    13 +-
 .../storage-provider/local-persistence.ts     |    38 +
 src/lib/project/project-doc.ts                |     2 +-
 src/lib/project/project-state.ts              |    59 +-
 src/lib/s3.ts                                 |    61 +-
 src/lib/screenplay/editor.ts                  |     6 +-
 .../extensions/pagination-extension.ts        |   157 +-
 src/lib/spellcheck/spellcheck-dictionaries.ts |    19 +
 src/lib/utils/api-utils.ts                    |     5 +
 src/lib/utils/storage-limits.ts               |    21 +
 src/proxy.ts                                  |     1 +
 src/server/repository/project-repository.ts   |    68 +
 src/server/service/asset-gc-service.ts        |    37 +
 src/server/service/project-service.ts         |    45 +
 .../adapters/fountain-page-break.test.ts      |    78 +
 src/tests/assets/assets.test.ts               |     4 +-
 src/tests/assets/cloud-assets.test.ts         |    59 +
 src/tests/project/scriptio-roundtrip.test.ts  |     2 +-
 src/tests/repro/manual-break-delete.test.ts   |   193 +
 src/tests/repro/manual-page-break.test.ts     |   128 +
 65 files changed, 52964 insertions(+), 192 deletions(-)
 create mode 100644 components/dashboard/project/StorageSettings.module.css
 create mode 100644 components/dashboard/project/StorageSettings.tsx
 create mode 100644 public/dictionaries/en/index.aff
 create mode 100644 public/dictionaries/en/index.dic
 create mode 100644 public/dictionaries/en/license
 create mode 100644 src/app/api/internal/asset-gc/route.ts
 create mode 100644 src/app/api/projects/[projectId]/assets/[hash]/route.ts
 create mode 100644 src/app/api/projects/[projectId]/assets/gc/route.ts
 create mode 100644 src/app/api/projects/[projectId]/assets/missing/route.ts
 create mode 100644 src/app/api/projects/[projectId]/assets/route.ts
 create mode 100644 src/app/api/projects/[projectId]/storage/route.ts
 create mode 100644 src/app/api/users/me/storage/route.ts
 create mode 100644 src/lib/assets/asset-orphans.ts
 create mode 100644 src/lib/assets/asset-refs.ts
 create mode 100644 src/lib/assets/cloud-asset-sync.ts
 create mode 100644 src/lib/utils/storage-limits.ts
 create mode 100644 src/server/service/asset-gc-service.ts
 create mode 100644 src/tests/adapters/fountain-page-break.test.ts
 create mode 100644 src/tests/assets/cloud-assets.test.ts
 create mode 100644 src/tests/repro/manual-break-delete.test.ts
 create mode 100644 src/tests/repro/manual-page-break.test.ts

diff --git a/components/board/BoardCanvas.module.css b/components/board/BoardCanvas.module.css
index af8ddc56..a9bd10a2 100644
--- a/components/board/BoardCanvas.module.css
+++ b/components/board/BoardCanvas.module.css
@@ -420,6 +420,25 @@
     font-variant-numeric: tabular-nums;
 }
 
+.asset_error {
+    position: absolute;
+    top: 8px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 12;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    max-width: 80%;
+    height: 36px;
+    padding: 0 14px;
+    border-radius: 16px;
+    background-color: var(--error);
+    color: #fff;
+    font-size: 13px;
+    user-select: none;
+}
+
 .recording_stop {
     display: flex;
     align-items: center;
diff --git a/components/board/BoardCanvas.tsx b/components/board/BoardCanvas.tsx
index e9598ab1..360ad865 100644
--- a/components/board/BoardCanvas.tsx
+++ b/components/board/BoardCanvas.tsx
@@ -15,7 +15,8 @@ import { v7 as uuidv7 } from "uuid";
 import { Trash2, Plus, Minus, Copy, ListTree, Mic, Square } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { DEFAULT_ITEM_COLORS } from "@src/lib/utils/colors";
-import { importImageFile, importAudioFile } from "@src/lib/assets/asset-store";
+import { importImageFile, importAudioFile, syncAssetToCloud } from "@src/lib/assets/asset-store";
+import { CloudQuotaError } from "@src/lib/assets/cloud-asset-sync";
 import { scheduleAssetGc } from "@src/lib/assets/asset-gc";
 import { useAudioRecorder } from "./use-audio-recorder";
 
@@ -56,6 +57,9 @@ const BoardCanvas =({ isVisible, docId }: { isVisible: boolean; docId: string })
     const [isPanning, setIsPanning] = useState(false);
     const [isDraggingFile, setIsDraggingFile] = useState(false);
     const [isSnapping, setIsSnapping] = useState(true);
+    /** Transient banner shown when an asset can't be saved (e.g. cloud quota). */
+    const [assetError, setAssetError] = useState<string | null>(null);
+    const assetErrorTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
     const recorder = useAudioRecorder();
     const [prevIsVisible, setPrevIsVisible] = useState(isVisible);
     if (prevIsVisible !== isVisible) {
@@ -527,6 +531,50 @@ const BoardCanvas =({ isVisible, docId }: { isVisible: boolean; docId: string })
         if (!e.currentTarget.contains(e.relatedTarget as Node | null)) setIsDraggingFile(false);
     }, []);
 
+    // Show a transient error banner (auto-dismissed). Used when an asset can't be
+    // persisted, e.g. the owner is out of cloud storage.
+    const showAssetError = useCallback((message: string) => {
+        setAssetError(message);
+        if (assetErrorTimer.current) clearTimeout(assetErrorTimer.current);
+        assetErrorTimer.current = setTimeout(() => setAssetError(null), 4000);
+    }, []);
+
+    useEffect(() => () => {
+        if (assetErrorTimer.current) clearTimeout(assetErrorTimer.current);
+    }, []);
+
+    // Remove cards by id (used to roll back a card whose asset can't be saved).
+    const removeCards = useCallback(
+        (ids: Set<string>) => {
+            const next = cardsRef.current.filter((c) => !ids.has(c.id));
+            cardsRef.current = next; // keep the ref current so concurrent removals don't race
+            setCards(next);
+            saveCards(next);
+        },
+        [saveCards],
+    );
+
+    // Upload the new cards' assets to the cloud in the background, so the cards
+    // appear instantly (the bytes are already cached locally and render offline).
+    // If an upload is rejected for quota, roll back that card and explain why.
+    const syncCreatedAssets = useCallback(
+        (createdCards: BoardCardData[], pid: string) => {
+            for (const card of createdCards) {
+                if (!card.assetId) continue;
+                const cardId = card.id;
+                void syncAssetToCloud(pid, card.assetId).catch((err) => {
+                    if (err instanceof CloudQuotaError) {
+                        removeCards(new Set([cardId]));
+                        showAssetError(t("storageLimitReached"));
+                    } else {
+                        console.error("[BoardCanvas] cloud asset upload failed:", err);
+                    }
+                });
+            }
+        },
+        [removeCards, showAssetError, t],
+    );
+
     // Drop image files → store each in IndexedDB (deduped) and drop an image
     // card referencing its hash at the cursor.
     const handleDrop = useCallback(
@@ -589,8 +637,11 @@ const BoardCanvas =({ isVisible, docId }: { isVisible: boolean; docId: string })
             const newCards = [...cardsRef.current, ...created];
             setCards(newCards);
             saveCards(newCards);
+
+            // Upload to the cloud in the background (cards already show locally).
+            syncCreatedAssets(created, projectId);
         },
-        [isReadOnly, projectId, offset, scale, saveCards],
+        [isReadOnly, projectId, offset, scale, saveCards, syncCreatedAssets],
     );
 
     // Create a text card at the given canvas-space coords (from the canvas menu).
@@ -651,10 +702,13 @@ const BoardCanvas =({ isVisible, docId }: { isVisible: boolean; docId: string })
             const newCards = [...cardsRef.current, newCard];
             setCards(newCards);
             saveCards(newCards);
+
+            // Upload to the cloud in the background (card already shows locally).
+            syncCreatedAssets([newCard], projectId);
         } catch (err) {
             console.error("[BoardCanvas] Failed to store recording:", err);
         }
-    }, [recorder, projectId, saveCards]);
+    }, [recorder, projectId, saveCards, syncCreatedAssets]);
 
     // Right-clicking empty canvas opens a menu (create card / record audio).
     // Cards and arrows have their own menus, so bail when the click landed on one.
@@ -1206,6 +1260,9 @@ const BoardCanvas =({ isVisible, docId }: { isVisible: boolean; docId: string })
                     )}
                 </div>
 
+                {/* Transient asset error (e.g. cloud storage limit reached) */}
+                {assetError && <div className={styles.asset_error}>{assetError}</div>}
+
                 {/* Recording indicator */}
                 {recorder.isRecording && (
                     <div className={styles.recording_indicator}>
diff --git a/components/dashboard/DashboardModal.tsx b/components/dashboard/DashboardModal.tsx
index 7fd6c06f..8f2f0fc4 100644
--- a/components/dashboard/DashboardModal.tsx
+++ b/components/dashboard/DashboardModal.tsx
@@ -11,7 +11,7 @@ import CollaboratorsSettings from "./project/CollaboratorsSettings";
 
 import styles from "./DashboardModal.module.css";
 import ExportProject from "./project/ExportProject";
-import { CreditCard, FileDown, Folder, Globe, Keyboard, Lock, Palette, PanelsTopLeft, User, Users, X } from "lucide-react";
+import { CreditCard, FileDown, Folder, Globe, HardDrive, Keyboard, Lock, Palette, PanelsTopLeft, User, Users, X } from "lucide-react";
 import { useTranslations } from "next-intl";
 import KeybindsSettings from "./preferences/KeybindsSettings";
 import AppearanceSettings from "./preferences/AppearanceSettings";
@@ -20,6 +20,7 @@ import ProfileSettings from "./account/ProfileSettings";
 import SubscriptionSettings from "./account/SubscriptionSettings";
 import LayoutSettings from "./project/LayoutSettings";
 import ProductionSettings from "./project/ProductionSettings";
+import StorageSettings from "./project/StorageSettings";
 import DashboardAuth from "./account/DashboardAuth";
 import AboutSettings from "./AboutSettings";
 
@@ -36,6 +37,7 @@ const DashboardModal = () => {
             { id: "Layout",        label: t("tabs.Layout"),        icon: <PanelsTopLeft size={18} /> },
             { id: "Production",    label: t("tabs.Production"),    icon: <Lock size={18} /> },
             { id: "Export",        label: t("tabs.Export"),        icon: <FileDown size={18} /> },
+            { id: "Storage",       label: t("tabs.Storage"),       icon: <HardDrive size={18} /> },
             { id: "Collaborators", label: t("tabs.Collaborators"), icon: <Users size={18} /> },
         ],
     }), [t]);
@@ -138,6 +140,7 @@ const DashboardModal = () => {
                         {isInProject && activeTab === "Layout" && <LayoutSettings />}
                         {isInProject && activeTab === "Production" && <ProductionSettings />}
                         {isInProject && activeTab === "Export" && <ExportProject />}
+                        {isInProject && activeTab === "Storage" && <StorageSettings />}
                         {isInProject && activeTab === "Collaborators" && <CollaboratorsSettings />}
                         {/* Preferences tabs */}
                         {activeTab === "Keybinds" && <KeybindsSettings />}
diff --git a/components/dashboard/DashboardSidebar.tsx b/components/dashboard/DashboardSidebar.tsx
index 73f2b50e..163fba17 100644
--- a/components/dashboard/DashboardSidebar.tsx
+++ b/components/dashboard/DashboardSidebar.tsx
@@ -18,6 +18,7 @@ export type Category =
     | "Layout"
     | "Production"
     | "Export"
+    | "Storage"
     | "Collaborators"
     | "Profile"
     | "Subscription"
diff --git a/components/dashboard/preferences/LanguageSettings.tsx b/components/dashboard/preferences/LanguageSettings.tsx
index a0292f36..4fb1b2dd 100644
--- a/components/dashboard/preferences/LanguageSettings.tsx
+++ b/components/dashboard/preferences/LanguageSettings.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useCallback, useContext, useEffect, useMemo, useState } from "react";
-import { Check, ChevronDown, Download, Loader2, Plus, X } from "lucide-react";
+import { Check, ChevronDown, Download, Loader2, Plus, SpellCheck, X } from "lucide-react";
 import form from "./../../utils/Form.module.css";
 import sharedStyles from "../project/ProjectSettings.module.css";
 import styles from "./SpellcheckSettings.module.css";
@@ -10,7 +10,11 @@ import { useLocale } from "@src/context/LocaleContext";
 import { useSettings } from "@src/lib/utils/hooks";
 import { useSpellcheck } from "@src/context/SpellcheckContext";
 import { ProjectContext } from "@src/context/ProjectContext";
-import { DICTIONARY_CATALOG, formatDictionarySize } from "@src/lib/spellcheck/spellcheck-dictionaries";
+import {
+    BUILTIN_DICTIONARY_CODE,
+    DICTIONARY_CATALOG,
+    formatDictionarySize,
+} from "@src/lib/spellcheck/spellcheck-dictionaries";
 import Dropdown, { DropdownOption } from "@components/utils/Dropdown";
 import { useTranslations } from "next-intl";
 
@@ -72,12 +76,8 @@ const LanguageSettings = () => {
     );
 
     const spellcheckOptions: DropdownOption[] = useMemo(() => {
-        const noneOption: DropdownOption = {
-            value: "none",
-            label: t("spellcheckNone"),
-        };
-
-        const dictOptions: DropdownOption[] = DICTIONARY_CATALOG.map((dict) => {
+        return DICTIONARY_CATALOG.map((dict) => {
+            const isBuiltin = dict.code === BUILTIN_DICTIONARY_CODE;
             const installed = installedDictionaries.find((d) => d.code === dict.code);
             const isDownloading = downloadProgress?.code === dict.code;
 
@@ -87,7 +87,12 @@ const LanguageSettings = () => {
                     <div className={styles.dictOption}>
                         <span>{dict.name}</span>
                         <span className={styles.dictMeta}>
-                            {isDownloading ? (
+                            {isBuiltin ? (
+                                <>
+                                    <span className={styles.size}>{t("spellcheckBuiltin")}</span>
+                                    <Check size={14} className={styles.checkmark} />
+                                </>
+                            ) : isDownloading ? (
                                 <Loader2 size={14} className={styles.spinner} />
                             ) : installed ? (
                                 <>
@@ -100,20 +105,19 @@ const LanguageSettings = () => {
                         </span>
                     </div>
                 ),
-                triggerLabel: dict.name,
+                triggerLabel: (
+                    <span className={styles.triggerLabel}>
+                        <SpellCheck size={14} className={styles.triggerIcon} />
+                        {dict.name}
+                    </span>
+                ),
             };
         });
-
-        return [noneOption, ...dictOptions];
     }, [installedDictionaries, downloadProgress, t]);
 
     const handleSpellcheckChange = useCallback(
         (value: string) => {
-            if (value === "none") {
-                setSpellcheckLang(null);
-                return;
-            }
-            const isInstalled = installedDictionaries.some((d) => d.code === value);
+            const isInstalled = value === BUILTIN_DICTIONARY_CODE || installedDictionaries.some((d) => d.code === value);
             if (isInstalled) {
                 setSpellcheckLang(value);
             } else {
@@ -140,7 +144,7 @@ const LanguageSettings = () => {
                 <label className={form.label}>{t("spellcheckLabel")}</label>
                 <p className={sharedStyles.helpText}>{t("spellcheckHelpText")}</p>
                 <Dropdown
-                    value={spellcheckLang ?? "none"}
+                    value={spellcheckLang ?? "en"}
                     onChange={handleSpellcheckChange}
                     options={spellcheckOptions}
                     className={sharedStyles.input}
diff --git a/components/dashboard/preferences/SpellcheckSettings.module.css b/components/dashboard/preferences/SpellcheckSettings.module.css
index 9cb70893..efd09ff9 100644
--- a/components/dashboard/preferences/SpellcheckSettings.module.css
+++ b/components/dashboard/preferences/SpellcheckSettings.module.css
@@ -6,6 +6,18 @@
     gap: 8px;
 }
 
+/* Selected language shown in the collapsed dropdown trigger, with a leading icon. */
+.triggerLabel {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.triggerIcon {
+    color: var(--secondary-text);
+    flex-shrink: 0;
+}
+
 .dictMeta {
     display: flex;
     align-items: center;
diff --git a/components/dashboard/project/StorageSettings.module.css b/components/dashboard/project/StorageSettings.module.css
new file mode 100644
index 00000000..399665e7
--- /dev/null
+++ b/components/dashboard/project/StorageSettings.module.css
@@ -0,0 +1,175 @@
+.storageSummary {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.storageHeader {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    gap: 12px;
+}
+
+.storageUsed {
+    font-size: 0.85rem;
+    color: var(--secondary-text);
+    font-variant-numeric: tabular-nums;
+}
+
+.bar {
+    display: flex;
+    width: 100%;
+    height: 10px;
+    border-radius: 6px;
+    overflow: hidden;
+    background-color: var(--tertiary);
+}
+
+.barSeg {
+    height: 100%;
+    transition: width 0.3s ease;
+}
+
+.segThis {
+    background-color: #3b82f6; /* vivid blue */
+}
+
+.segOther {
+    background-color: #f59e0b; /* vivid amber */
+}
+
+.legend {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px 18px;
+    font-size: 0.8rem;
+    color: var(--secondary-text);
+}
+
+.legendItem {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+}
+
+.legendValue {
+    color: var(--primary-text);
+    font-variant-numeric: tabular-nums;
+}
+
+.dot {
+    width: 9px;
+    height: 9px;
+    border-radius: 50%;
+    flex-shrink: 0;
+}
+
+.dotThis {
+    background-color: #3b82f6; /* vivid blue */
+}
+
+.dotOther {
+    background-color: #f59e0b; /* vivid amber */
+}
+
+.dotFree {
+    background-color: var(--tertiary);
+    border: 1px solid var(--secondary-text);
+}
+
+.empty {
+    color: var(--secondary-text);
+    font-size: 0.9rem;
+    padding: 16px 0;
+}
+
+.list {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.row {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    padding: 8px 10px;
+    border-radius: 10px;
+    background-color: var(--secondary);
+}
+
+.thumb {
+    flex-shrink: 0;
+    width: 44px;
+    height: 44px;
+    border-radius: 8px;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--tertiary);
+    color: var(--secondary-text);
+}
+
+.thumbImg {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.meta {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    min-width: 0;
+    flex: 1;
+}
+
+.metaTitle {
+    font-size: 0.9rem;
+    color: var(--primary-text);
+    font-variant-numeric: tabular-nums;
+}
+
+.metaSub {
+    font-size: 0.8rem;
+    color: var(--secondary-text);
+    font-variant-numeric: tabular-nums;
+}
+
+.deleteBtn,
+.confirmBtn,
+.cancelBtn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    border: none;
+    border-radius: 8px;
+    background-color: transparent;
+    color: var(--secondary-text);
+    cursor: pointer;
+    transition: background-color 0.15s ease, color 0.15s ease;
+}
+
+.deleteBtn:hover {
+    background-color: var(--tertiary);
+    color: var(--error);
+}
+
+.confirm {
+    display: flex;
+    gap: 4px;
+}
+
+.confirmBtn {
+    background-color: var(--error);
+    color: #fff;
+}
+
+.cancelBtn:hover {
+    background-color: var(--tertiary);
+    color: var(--primary-text);
+}
diff --git a/components/dashboard/project/StorageSettings.tsx b/components/dashboard/project/StorageSettings.tsx
new file mode 100644
index 00000000..472a8791
--- /dev/null
+++ b/components/dashboard/project/StorageSettings.tsx
@@ -0,0 +1,279 @@
+"use client";
+
+import { useCallback, useContext, useEffect, useState } from "react";
+import { useTranslations } from "next-intl";
+import { Check, Image as ImageIcon, Music, Trash2, X } from "lucide-react";
+
+import { ProjectContext } from "@src/context/ProjectContext";
+import { useProjectMembership } from "@src/lib/utils/hooks";
+import { listInUseAssets, type ProjectAssetInfo } from "@src/lib/assets/asset-store";
+import { useAssetUrl } from "@src/lib/assets/use-asset-url";
+import { USER_STORAGE_QUOTA_BYTES } from "@src/lib/utils/storage-limits";
+import type { BoardArrowData, BoardCardData } from "@src/lib/project/project-doc";
+
+import sharedStyles from "./ProjectSettings.module.css";
+import form from "./../../utils/Form.module.css";
+import styles from "./StorageSettings.module.css";
+
+/** Human-readable byte size, e.g. 1.4 GB. */
+function formatBytes(bytes: number): string {
+    if (bytes < 1024) return `${bytes} B`;
+    const units = ["KB", "MB", "GB", "TB"];
+    let value = bytes / 1024;
+    let i = 0;
+    while (value >= 1024 && i < units.length - 1) {
+        value /= 1024;
+        i++;
+    }
+    return `${value < 10 ? value.toFixed(1) : Math.round(value)} ${units[i]}`;
+}
+
+/** Owner-shared storage split into this project, the owner's other projects, and free. */
+interface StorageBreakdown {
+    thisUsed: number;
+    otherUsed: number;
+    quota: number;
+}
+
+const emptyBreakdown = (): StorageBreakdown => ({
+    thisUsed: 0,
+    otherUsed: 0,
+    quota: USER_STORAGE_QUOTA_BYTES,
+});
+
+/** Last fetched breakdown (tagged with its project id), so re-opening the section
+ *  shows the previous figures immediately and the bar never shifts layout. */
+let cachedBreakdown: { projectId: string; breakdown: StorageBreakdown } | null = null;
+
+const AssetRow = ({
+    projectId,
+    asset,
+    readOnly,
+    onDelete,
+}: {
+    projectId: string;
+    asset: ProjectAssetInfo;
+    readOnly: boolean;
+    onDelete: (hash: string) => void;
+}) => {
+    const t = useTranslations("storage");
+    const isImage = asset.mime.startsWith("image/");
+    const url = useAssetUrl(projectId, isImage ? asset.hash : null);
+    const [confirming, setConfirming] = useState(false);
+
+    const dims = isImage && asset.width && asset.height ? `${asset.width}×${asset.height}` : null;
+
+    return (
+        <div className={styles.row}>
+            <div className={styles.thumb}>
+                {isImage ? (
+                    url ? (
+                        // eslint-disable-next-line @next/next/no-img-element
+                        <img src={url} alt="" className={styles.thumbImg} />
+                    ) : (
+                        <ImageIcon size={18} />
+                    )
+                ) : (
+                    <Music size={18} />
+                )}
+            </div>
+            <div className={styles.meta}>
+                <span className={styles.metaTitle}>{isImage ? t("image") : t("audio")}</span>
+                <span className={styles.metaSub}>
+                    {dims ? `${dims} · ${formatBytes(asset.size)}` : formatBytes(asset.size)}
+                </span>
+            </div>
+
+            {!readOnly &&
+                (confirming ? (
+                    <div className={styles.confirm}>
+                        <button
+                            className={styles.confirmBtn}
+                            onClick={() => onDelete(asset.hash)}
+                            aria-label={t("confirm")}
+                        >
+                            <Check size={16} />
+                        </button>
+                        <button
+                            className={styles.cancelBtn}
+                            onClick={() => setConfirming(false)}
+                            aria-label={t("cancel")}
+                        >
+                            <X size={16} />
+                        </button>
+                    </div>
+                ) : (
+                    <button
+                        className={styles.deleteBtn}
+                        onClick={() => setConfirming(true)}
+                        aria-label={t("remove")}
+                    >
+                        <Trash2 size={16} />
+                    </button>
+                ))}
+        </div>
+    );
+};
+
+const StorageBar = ({ breakdown, isLocalOnly }: { breakdown: StorageBreakdown; isLocalOnly: boolean }) => {
+    const t = useTranslations("storage");
+    const { thisUsed, otherUsed, quota } = breakdown;
+    const used = thisUsed + otherUsed;
+    const free = Math.max(0, quota - used);
+
+    const thisPct = quota > 0 ? Math.min(100, (thisUsed / quota) * 100) : 0;
+    const otherPct = quota > 0 ? Math.min(100 - thisPct, (otherUsed / quota) * 100) : 0;
+
+    return (
+        <div className={styles.storageSummary}>
+            <div className={styles.storageHeader}>
+                <span className={form.label}>{t("sharedStorage")}</span>
+                <span className={styles.storageUsed}>
+                    {formatBytes(used)} / {formatBytes(quota)}
+                </span>
+            </div>
+
+            <div className={styles.bar}>
+                <div className={`${styles.barSeg} ${styles.segThis}`} style={{ width: `${thisPct}%` }} />
+                <div className={`${styles.barSeg} ${styles.segOther}`} style={{ width: `${otherPct}%` }} />
+            </div>
+
+            <div className={styles.legend}>
+                <span className={styles.legendItem}>
+                    <span className={`${styles.dot} ${styles.dotThis}`} />
+                    {t("thisProject")}
+                    <span className={styles.legendValue}>{formatBytes(thisUsed)}</span>
+                </span>
+                <span className={styles.legendItem}>
+                    <span className={`${styles.dot} ${styles.dotOther}`} />
+                    {t("otherProjects")}
+                    <span className={styles.legendValue}>{formatBytes(otherUsed)}</span>
+                </span>
+                <span className={styles.legendItem}>
+                    <span className={`${styles.dot} ${styles.dotFree}`} />
+                    {t("free")}
+                    <span className={styles.legendValue}>{formatBytes(free)}</span>
+                </span>
+            </div>
+
+            {isLocalOnly && <p className={sharedStyles.helpText}>{t("localNote")}</p>}
+        </div>
+    );
+};
+
+const StorageSettings = () => {
+    const t = useTranslations("storage");
+    const { projectId, repository, isReadOnly } = useContext(ProjectContext);
+    const { isLocalOnly } = useProjectMembership();
+    const [assets, setAssets] = useState<ProjectAssetInfo[] | null>(null);
+    // Seed from the cache so the bar shows last-known figures immediately (and at a
+    // stable size); fetched values refresh it in place without shifting layout.
+    const [breakdown, setBreakdown] = useState<StorageBreakdown>(() =>
+        cachedBreakdown?.projectId === projectId ? cachedBreakdown.breakdown : emptyBreakdown(),
+    );
+
+    const load = useCallback(async () => {
+        if (!projectId || !repository) {
+            setAssets([]);
+            setBreakdown(emptyBreakdown());
+            return;
+        }
+
+        const list = await listInUseAssets(projectId, repository.getState());
+        list.sort((a, b) => b.size - a.size);
+        setAssets(list);
+
+        const { fetchProjectStorage, fetchMyStorage } = await import("@src/lib/assets/cloud-asset-sync");
+        let bd: StorageBreakdown;
+        if (isLocalOnly) {
+            // Not synced: this project's usage is local; "other" is the owner's
+            // current cloud usage (this project would add on top once synced).
+            const localTotal = list.reduce((sum, a) => sum + a.size, 0);
+            const my = await fetchMyStorage();
+            bd = { thisUsed: localTotal, otherUsed: my?.used ?? 0, quota: my?.quota ?? USER_STORAGE_QUOTA_BYTES };
+        } else {
+            const s = await fetchProjectStorage(projectId);
+            bd = s
+                ? { thisUsed: s.projectUsed, otherUsed: Math.max(0, s.ownerTotalUsed - s.projectUsed), quota: s.quota }
+                : emptyBreakdown();
+        }
+        cachedBreakdown = { projectId, breakdown: bd };
+        setBreakdown(bd);
+    }, [projectId, repository, isLocalOnly]);
+
+    useEffect(() => {
+        void load();
+    }, [load]);
+
+    const deleteAsset = useCallback(
+        async (hash: string) => {
+            if (!projectId || !repository) return;
+            const ydoc = repository.getState();
+
+            // Remove every board card (and dangling arrow) referencing the asset.
+            ydoc.transact(() => {
+                ydoc.documents().forEach((node) => {
+                    if (node.type !== "board") return;
+                    const map = ydoc.boardData(node.id);
+                    const rawCards = map.get("cards");
+                    if (!rawCards) return;
+                    let cards: BoardCardData[];
+                    try {
+                        cards = JSON.parse(rawCards);
+                    } catch {
+                        return;
+                    }
+                    const removed = new Set(cards.filter((c) => c.assetId === hash).map((c) => c.id));
+                    if (removed.size === 0) return;
+                    map.set("cards", JSON.stringify(cards.filter((c) => !removed.has(c.id))));
+
+                    const rawArrows = map.get("arrows");
+                    if (!rawArrows) return;
+                    try {
+                        const arrows = JSON.parse(rawArrows) as BoardArrowData[];
+                        const next = arrows.filter(
+                            (a) => !removed.has(a.fromCardId) && !removed.has(a.toCardId),
+                        );
+                        if (next.length !== arrows.length) map.set("arrows", JSON.stringify(next));
+                    } catch {
+                        // leave arrows untouched if unparseable
+                    }
+                });
+            });
+
+            // Reclaim the now-orphaned bytes (local immediately; cloud follows the
+            // snapshot-aware GC rules) and refresh.
+            const { gcProjectAssets } = await import("@src/lib/assets/asset-gc");
+            await gcProjectAssets(projectId, ydoc).catch(() => {});
+            await load();
+        },
+        [projectId, repository, load],
+    );
+
+    return (
+        <div className={sharedStyles.settingsForm}>
+            <div className={sharedStyles.formGroup}>
+                <StorageBar breakdown={breakdown} isLocalOnly={isLocalOnly} />
+                <p className={sharedStyles.helpText}>{t("description")}</p>
+            </div>
+
+            {assets === null ? null : assets.length === 0 ? (
+                <p className={styles.empty}>{t("empty")}</p>
+            ) : (
+                <div className={styles.list}>
+                    {assets.map((asset) => (
+                        <AssetRow
+                            key={asset.hash}
+                            projectId={projectId}
+                            asset={asset}
+                            readOnly={isReadOnly}
+                            onDelete={deleteAsset}
+                        />
+                    ))}
+                </div>
+            )}
+        </div>
+    );
+};
+
+export default StorageSettings;
diff --git a/components/editor/DocumentEditorPanel.tsx b/components/editor/DocumentEditorPanel.tsx
index 29235393..000c78a5 100644
--- a/components/editor/DocumentEditorPanel.tsx
+++ b/components/editor/DocumentEditorPanel.tsx
@@ -83,6 +83,10 @@ const DocumentEditorPanel = ({
     const { settings } = useSettings();
     const { isEndlessScroll } = useViewContext();
     const { user } = useUser();
+    // Localised label for the manual page-break hint rendered in the page gap.
+    // Injected as a CSS variable so the plain-DOM pagination widget can show it,
+    // mirroring how the (MORE)/(CONT'D) labels are localised.
+    const pageBreakHint = useTranslations("contextMenu")("pageBreakHint");
 
     const [isEditorReady, setIsEditorReady] = useState(false);
     const [isScrolled, setIsScrolled] = useState(false);
@@ -238,6 +242,7 @@ const DocumentEditorPanel = ({
 
         editorElement.style.setProperty("--contd-label", `"${contdLabel}"`);
         editorElement.style.setProperty("--more-label", `"${moreLabel}"`);
+        editorElement.style.setProperty("--page-break-label", `"${pageBreakHint}"`);
 
         const elementKeys = [
             "action",
@@ -308,6 +313,7 @@ const DocumentEditorPanel = ({
         sceneNumberOnRight,
         contdLabel,
         moreLabel,
+        pageBreakHint,
         elementMargins,
         elementStyles,
         sceneLocking,
@@ -591,6 +597,20 @@ const DocumentEditorPanel = ({
                 }
             }
 
+            // Manual page break: the top-level block under the caret, plus whether
+            // it already forces a page break. Paginated screenplay editors only, and
+            // never the document's first block (there is nothing to break before it).
+            let pageBreak: { pos: number; active: boolean } | undefined;
+            if (config.features.paginationMode === "screenplay") {
+                const $pos = editor.state.doc.resolve(from);
+                if ($pos.depth >= 1) {
+                    const nodeStart = $pos.before(1);
+                    if (nodeStart > 0) {
+                        pageBreak = { pos: nodeStart, active: !!$pos.node(1).attrs.pageBreak };
+                    }
+                }
+            }
+
             // Comments anchor to the node under the caret, not a text range.
             const commentNodeId = getNodeIdAtPos(editor.state, from);
             const onAddComment = commentNodeId
@@ -600,10 +620,21 @@ const DocumentEditorPanel = ({
             updateContextMenu({
                 type: ContextMenuType.EditorContextMenu,
                 position: { x: e.clientX, y: e.clientY },
-                typeSpecificProps: { from, to, onAddComment, spellError, nodePos, nodeClass, outlineScene },
+                // Pass the editor that was right-clicked: positions above are
+                // resolved against it, and ProjectContext.editor is always the
+                // MAIN screenplay editor — so secondary editors (tree document,
+                // draft, title page) must act on this instance, not that one.
+                typeSpecificProps: { editor, from, to, onAddComment, spellError, nodePos, nodeClass, outlineScene, pageBreak },
             });
         },
-        [editor, updateContextMenu, addCommentToNode, config.features.shelving, config.documentId],
+        [
+            editor,
+            updateContextMenu,
+            addCommentToNode,
+            config.features.shelving,
+            config.features.paginationMode,
+            config.documentId,
+        ],
     );
 
     // Clear the open discussion when clicking elsewhere in the editor.
diff --git a/components/editor/EditorPanel.module.css b/components/editor/EditorPanel.module.css
index 9d5221f8..ed40e210 100644
--- a/components/editor/EditorPanel.module.css
+++ b/components/editor/EditorPanel.module.css
@@ -21,6 +21,9 @@
     width: 100%;
     max-width: 1000px;
     margin: 0 auto;
+    /* Breathing room so the last page doesn't butt against the viewport edge
+     * when scrolled to the bottom. Matches the inter-page gap (20px). */
+    padding-bottom: 30%;
     contain: layout;
 }
 
@@ -56,13 +59,7 @@
     transition: opacity 0.7s ease;
     background: linear-gradient(to bottom, var(--editor-shadow) 0%, transparent 100%);
     mask-image: linear-gradient(to right, transparent 0%, black 20%, black 80%, transparent 100%);
-    -webkit-mask-image: linear-gradient(
-        to right,
-        transparent 0%,
-        black 20%,
-        black 80%,
-        transparent 100%
-    );
+    -webkit-mask-image: linear-gradient(to right, transparent 0%, black 20%, black 80%, transparent 100%);
 }
 
 /* Zero-height sticky container so the banner overlays the editor without
diff --git a/components/editor/sidebar/ContextMenu.tsx b/components/editor/sidebar/ContextMenu.tsx
index 429883b4..6341d7d3 100644
--- a/components/editor/sidebar/ContextMenu.tsx
+++ b/components/editor/sidebar/ContextMenu.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { Editor } from "@tiptap/react";
 import { ReactNode, useContext, useEffect, useState } from "react";
 import { UserContext } from "@src/context/UserContext";
 import { useSpellcheck } from "@src/context/SpellcheckContext";
@@ -34,6 +35,7 @@ import {
     MessageSquarePlus,
     Pencil,
     Scissors,
+    SeparatorHorizontal,
     Trash2,
     UserRound,
 } from "lucide-react";
@@ -485,6 +487,9 @@ const ShelveNodeMenu = ({ props }: SubMenuProps<{ pos: number; nodeClass: string
 /* ============================== */
 
 export type EditorContextMenuProps = {
+    /** The editor that was right-clicked. All actions act on this instance — not
+     *  ProjectContext.editor, which is always the main screenplay editor. */
+    editor: Editor;
     from: number;
     to: number;
     /** Present when the caret sits on a node a comment can anchor to. */
@@ -494,15 +499,20 @@ export type EditorContextMenuProps = {
     nodeClass?: string;
     /** Present when the caret sits on a scene heading that can be sent to the Outline. */
     outlineScene?: { refDocId: string; refId: string; title: string };
+    /** Present on paginated screenplay editors: the top-level block under the
+     *  caret (`pos`) and whether it already forces a manual page break. */
+    pageBreak?: { pos: number; active: boolean };
 };
 
 const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
     const t = useTranslations("contextMenu");
-    const { editor, repository, isReadOnly, persistentScenes } =
-        useContext(ProjectContext);
+    const { repository, isReadOnly, persistentScenes } = useContext(ProjectContext);
     const { worker } = useSpellcheck();
     const { updateContextMenu } = useContext(UserContext);
-    const { from, to, onAddComment, spellError, nodePos, nodeClass, outlineScene } = props;
+    // Act on the editor that was right-clicked (passed through props), NOT
+    // ProjectContext.editor — that one is always the main screenplay editor, so
+    // using it would misfire actions in the tree-document / draft / title editors.
+    const { editor, from, to, onAddComment, spellError, nodePos, nodeClass, outlineScene, pageBreak } = props;
     const hasSelection = from !== to;
 
     const handleSendToOutline = () => {
@@ -620,6 +630,12 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
         updateContextMenu(undefined);
     };
 
+    const handleTogglePageBreak = () => {
+        if (!editor || !pageBreak || isReadOnly) return;
+        editor.commands.toggleManualPageBreak(pageBreak.pos);
+        updateContextMenu(undefined);
+    };
+
     const canDualDialogue = (() => {
         if (nodeClass !== ScreenplayElement.Character || !editor || nodePos === undefined) return false;
         const doc = editor.state.doc;
@@ -717,6 +733,18 @@ const EditorContextMenu = ({ props }: SubMenuProps<EditorContextMenuProps>) => {
                 </>
             )}
 
+            {/* Manual page break — force a new page that begins at this block */}
+            {pageBreak && !isReadOnly && (
+                <>
+                    <ContextMenuSeparator />
+                    <ContextMenuItem
+                        text={pageBreak.active ? t("removePageBreak") : t("insertPageBreak")}
+                        icon={SeparatorHorizontal}
+                        action={handleTogglePageBreak}
+                    />
+                </>
+            )}
+
             {/* Send a scene heading to the Outline */}
             {outlineScene && !isReadOnly && (
                 <>
diff --git a/components/navbar/ProjectNavbar.module.css b/components/navbar/ProjectNavbar.module.css
index 2c7110e6..9dca27ba 100644
--- a/components/navbar/ProjectNavbar.module.css
+++ b/components/navbar/ProjectNavbar.module.css
@@ -146,6 +146,61 @@
     height: 20px;
 }
 
+/* Storage usage panel (hover of the cloud status indicator) */
+.status_wrapper {
+    position: relative;
+    display: flex;
+    align-items: center;
+}
+
+.storage_panel {
+    position: absolute;
+    top: 40px;
+    left: 0;
+    min-width: 220px;
+    background-color: var(--secondary);
+    color: var(--primary-text);
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
+    padding: 10px 12px;
+    border-radius: 8px;
+    font-size: 12px;
+    z-index: 100;
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+}
+
+.storage_status {
+    font-weight: 600;
+}
+
+.storage_separator {
+    height: 1px;
+    background-color: var(--tertiary);
+    margin: 1px 0;
+}
+
+.storage_row {
+    display: flex;
+    justify-content: space-between;
+    gap: 16px;
+    color: var(--secondary-text);
+}
+
+.storage_bar {
+    height: 6px;
+    border-radius: 3px;
+    background-color: var(--tertiary);
+    overflow: hidden;
+}
+
+.storage_bar_fill {
+    height: 100%;
+    background-color: var(--primary);
+    border-radius: 3px;
+    transition: width 0.3s ease;
+}
+
 .failed {
     color: var(--error);
 }
diff --git a/components/navbar/ProjectNavbar.tsx b/components/navbar/ProjectNavbar.tsx
index 30e519e3..c6bece4b 100644
--- a/components/navbar/ProjectNavbar.tsx
+++ b/components/navbar/ProjectNavbar.tsx
@@ -12,6 +12,7 @@ import debounce from "debounce";
 import { editProject } from "@src/lib/utils/requests";
 import { join } from "@src/lib/utils/misc";
 import { uploadToCloudPopup } from "@src/lib/screenplay/popup";
+import type { StorageUsage } from "@src/lib/assets/cloud-asset-sync";
 import { DashboardContext } from "@src/context/DashboardContext";
 import {
     BarChart2,
@@ -34,8 +35,73 @@ import navBtn from "@components/utils/NavbarIconButton.module.css";
 import ScreenplayFormatDropdown from "./ScreenplayFormatDropdown";
 import ScreenplaySearch from "./ScreenplaySearch";
 
+/** Human-readable byte size, e.g. 1.4 GB. */
+const formatBytes = (bytes: number): string => {
+    if (bytes < 1024) return `${bytes} B`;
+    const units = ["KB", "MB", "GB", "TB"];
+    let value = bytes / 1024;
+    let i = 0;
+    while (value >= 1024 && i < units.length - 1) {
+        value /= 1024;
+        i++;
+    }
+    return `${value < 10 ? value.toFixed(1) : Math.round(value)} ${units[i]}`;
+};
+
+/** Last fetched usage, so re-hovering shows the previous numbers immediately (the
+ *  panel unmounts on mouse-leave) instead of placeholders. Tagged with its project
+ *  id so switching projects doesn't flash the wrong project's figures. */
+let cachedStorage: { projectId: string; usage: StorageUsage } | null = null;
+
+const StorageUsageBody = ({ projectId }: { projectId: string }) => {
+    const t = useTranslations("navbar");
+    const [usage, setUsage] = useState<StorageUsage | null>(() =>
+        cachedStorage?.projectId === projectId ? cachedStorage.usage : null,
+    );
+
+    useEffect(() => {
+        let cancelled = false;
+        (async () => {
+            const { fetchProjectStorage } = await import("@src/lib/assets/cloud-asset-sync");
+            const data = await fetchProjectStorage(projectId);
+            // Keep the last known value on a failed refresh rather than wiping it.
+            if (!cancelled && data) {
+                cachedStorage = { projectId, usage: data };
+                setUsage(data);
+            }
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [projectId]);
+
+    // Render the full layout immediately (stable size); only the amounts fill in
+    // once fetched, so the panel doesn't grow after appearing.
+    const pct = usage && usage.quota > 0 ? Math.min(100, Math.round((usage.ownerTotalUsed / usage.quota) * 100)) : 0;
+
+    return (
+        <>
+            <div className={navbar.storage_row}>
+                <span>{t("storageProject")}</span>
+                <span>{usage ? formatBytes(usage.projectUsed) : "—"}</span>
+            </div>
+            <div className={navbar.storage_row}>
+                <span>{t("storageTotal")}</span>
+                <span>
+                    {usage ? `${formatBytes(usage.ownerTotalUsed)} / ${formatBytes(usage.quota)}` : "—"}
+                </span>
+            </div>
+            <div className={navbar.storage_bar}>
+                <div className={navbar.storage_bar_fill} style={{ width: `${pct}%` }} />
+            </div>
+        </>
+    );
+};
+
 const StatusIndicator = () => {
     const { connectionStatus } = useContext(ProjectContext);
+    const projectId = useProjectIdFromUrl();
+    const [hovered, setHovered] = useState(false);
     const t = useTranslations("navbar");
     const STATUS: Record<ConnectionStatus, string> = {
         connected: t("synced"),
@@ -43,19 +109,32 @@ const StatusIndicator = () => {
         connecting: t("reconnecting"),
     };
     return (
-        <>
-            <div className={navbar.tooltip} data-hint={STATUS[connectionStatus]}>
-                {connectionStatus === "connected" && (
-                    <CircleCheckBig style={{ color: "var(--success)" }} className={navbar.status_icon} />
-                )}
-                {connectionStatus === "disconnected" && (
-                    <WifiOff style={{ color: "var(--error)" }} className={navbar.status_icon} />
-                )}
-                {connectionStatus === "connecting" && (
-                    <WifiSync style={{ color: "var(--warning)" }} className={navbar.status_icon} />
-                )}
-            </div>
-        </>
+        <div
+            className={navbar.status_wrapper}
+            onMouseEnter={() => setHovered(true)}
+            onMouseLeave={() => setHovered(false)}
+        >
+            {connectionStatus === "connected" && (
+                <CircleCheckBig style={{ color: "var(--success)" }} className={navbar.status_icon} />
+            )}
+            {connectionStatus === "disconnected" && (
+                <WifiOff style={{ color: "var(--error)" }} className={navbar.status_icon} />
+            )}
+            {connectionStatus === "connecting" && (
+                <WifiSync style={{ color: "var(--warning)" }} className={navbar.status_icon} />
+            )}
+            {hovered && (
+                <div className={navbar.storage_panel}>
+                    <div className={navbar.storage_status}>{STATUS[connectionStatus]}</div>
+                    {projectId && (
+                        <>
+                            <div className={navbar.storage_separator} />
+                            <StorageUsageBody projectId={projectId} />
+                        </>
+                    )}
+                </div>
+            )}
+        </div>
     );
 };
 
diff --git a/components/project/EditorFooter.tsx b/components/project/EditorFooter.tsx
index be03ceec..2f551918 100644
--- a/components/project/EditorFooter.tsx
+++ b/components/project/EditorFooter.tsx
@@ -3,11 +3,12 @@
 import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
 import type { Editor } from "@tiptap/react";
-import { FileText, Maximize, MessageSquare, MessageSquareOff, Minimize, Scroll } from "lucide-react";
+import { FileText, Maximize, Minimize, Scroll, SpellCheck } from "lucide-react";
 
 import { ProjectContext } from "@src/context/ProjectContext";
 import { UserContext } from "@src/context/UserContext";
 import { useViewContext } from "@src/context/ViewContext";
+import { useSpellcheck } from "@src/context/SpellcheckContext";
 import { paginationKey } from "@src/lib/screenplay/extensions/pagination-extension";
 import { join } from "@src/lib/utils/misc";
 import WritingTimer from "./WritingTimer";
@@ -50,17 +51,22 @@ const EditorFooter = () => {
     const t = useTranslations("navbar");
     const { editor } = useContext(ProjectContext);
     const { isZenMode, updateIsZenMode } = useContext(UserContext);
-    const {
-        isEndlessScroll,
-        setIsEndlessScroll,
-        showComments,
-        setShowComments,
-        setLeftSidebarOpen,
-        setRightSidebarOpen,
-    } = useViewContext();
+    const { isEndlessScroll, setIsEndlessScroll, setLeftSidebarOpen, setRightSidebarOpen } = useViewContext();
+    const { spellcheckLang, setSpellcheckLang } = useSpellcheck();
 
     const pageCount = useScreenplayPageCount(editor);
 
+    // Remember the last active language so the toggle can restore it after being turned
+    // off; default to English when nothing has been selected yet.
+    const lastSpellcheckLang = useRef("en");
+    useEffect(() => {
+        if (spellcheckLang) lastSpellcheckLang.current = spellcheckLang;
+    }, [spellcheckLang]);
+
+    const toggleSpellcheck = useCallback(() => {
+        setSpellcheckLang(spellcheckLang ? null : lastSpellcheckLang.current);
+    }, [spellcheckLang, setSpellcheckLang]);
+
     // Sidebar open-state captured on entering focus mode so it can be restored on exit.
     const sidebarsBeforeFocus = useRef<{ left: boolean; right: boolean } | null>(null);
 
@@ -124,12 +130,12 @@ const EditorFooter = () => {
             </button>
             <button
                 type="button"
-                className={join(styles.action, !showComments ? styles.action_active : "")}
-                onClick={() => setShowComments((prev) => !prev)}
-                title={t("toggleComments")}
-                aria-label={t("toggleComments")}
+                className={join(styles.action, spellcheckLang ? styles.action_active : "")}
+                onClick={toggleSpellcheck}
+                title={t("toggleSpellcheck")}
+                aria-label={t("toggleSpellcheck")}
             >
-                {showComments ? <MessageSquare size={14} /> : <MessageSquareOff size={14} />}
+                <SpellCheck size={14} />
             </button>
             <button
                 type="button"
diff --git a/messages/de.json b/messages/de.json
index f391fadb..76a8ecb5 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -17,9 +17,12 @@
     "reconnecting": "Verbindung wird wiederhergestellt...",
     "localProject": "Lokales Projekt",
     "uploadToCloud": "In die Cloud hochladen",
+    "storageProject": "Dieses Projekt",
+    "storageTotal": "Gesamt belegt",
     "cachedProject": "Gecachtes Projekt",
     "endlessScroll": "Endloses Scrollen",
     "toggleComments": "Kommentare ein/aus",
+    "toggleSpellcheck": "Rechtschreibprüfung ein/aus",
     "focusMode": "Fokus-Modus",
     "splitPanel": "Panel teilen",
     "unsplitPanel": "Panel schließen",
@@ -88,6 +91,7 @@
     "spellcheckLabel": "Rechtschreibprüfung",
     "spellcheckHelpText": "Laden Sie ein Wörterbuch für die Rechtschreibprüfung im Editor herunter.",
     "spellcheckNone": "Deaktiviert",
+    "spellcheckBuiltin": "Integriert",
     "customDictLabel": "Projektwörterbuch",
     "customDictAdd": "Hinzufügen",
     "customDictEmpty": "Noch keine eigenen Wörter.",
@@ -104,6 +108,7 @@
       "Layout": "Layout",
       "Production": "Produktion",
       "Export": "Import/Export",
+      "Storage": "Speicher",
       "Collaborators": "Mitwirkende",
       "Keybinds": "Tastenkürzel",
       "Appearance": "Erscheinungsbild",
@@ -115,6 +120,21 @@
       "Subscription": "Abonnement"
     }
   },
+  "storage": {
+    "total": "Belegter Speicher",
+    "description": "Bilder und Audio, die von den Boards dieses Projekts verwendet werden.",
+    "sharedStorage": "Gemeinsamer Speicher",
+    "thisProject": "Dieses Projekt",
+    "otherProjects": "Andere Projekte",
+    "free": "Frei",
+    "localNote": "Dieses Projekt ist noch nicht synchronisiert — angezeigt, wie es auf deinen Cloud-Speicher angerechnet würde.",
+    "empty": "Noch keine Bilder oder Audio in diesem Projekt.",
+    "image": "Bild",
+    "audio": "Audio",
+    "remove": "Entfernen",
+    "confirm": "Aus Projekt entfernen",
+    "cancel": "Abbrechen"
+  },
   "dangerZone": {
     "transferOwnership": "Besitz übertragen",
     "transferDesc": "Übertragen Sie Ihren Besitzerstatus auf einen anderen Benutzer. Sie werden zum Editor.",
@@ -427,7 +447,10 @@
     "shelveDialogue": "Dialog ablegen",
     "shelveAction": "Aktion ablegen",
     "omitScene": "Szene auslassen",
-    "unomitScene": "Szene wiederherstellen"
+    "unomitScene": "Szene wiederherstellen",
+    "insertPageBreak": "Seitenumbruch einfügen",
+    "removePageBreak": "Seitenumbruch entfernen",
+    "pageBreakHint": "Seitenumbruch"
   },
   "popup": {
     "character": {
@@ -484,7 +507,8 @@
     "audioHint": "Sprachnotiz",
     "play": "Abspielen",
     "pause": "Pause",
-    "rename": "Zum Umbenennen doppelklicken"
+    "rename": "Zum Umbenennen doppelklicken",
+    "storageLimitReached": "Speicherlimit erreicht – diese Datei konnte nicht gespeichert werden"
   },
   "production": {
     "title": "Produktion",
diff --git a/messages/en.json b/messages/en.json
index 81e35559..a6f852d6 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -17,8 +17,11 @@
     "reconnecting": "Reconnecting...",
     "localProject": "Local project",
     "uploadToCloud": "Upload to cloud",
+    "storageProject": "This project",
+    "storageTotal": "Total used",
     "endlessScroll": "Endless Scroll",
     "toggleComments": "Toggle Comments",
+    "toggleSpellcheck": "Toggle Spell Check",
     "focusMode": "Focus Mode",
     "splitPanel": "Split Panel",
     "unsplitPanel": "Unsplit Panel",
@@ -87,6 +90,7 @@
     "spellcheckLabel": "Spell Check",
     "spellcheckHelpText": "Download a dictionary for in-editor spell checking.",
     "spellcheckNone": "Disabled",
+    "spellcheckBuiltin": "Built-in",
     "customDictLabel": "Project Dictionary",
     "customDictAdd": "Add",
     "customDictEmpty": "No custom words yet.",
@@ -103,6 +107,7 @@
       "Layout": "Layout",
       "Production": "Production",
       "Export": "Import/Export",
+      "Storage": "Storage",
       "Collaborators": "Collaborators",
       "Keybinds": "Keybinds",
       "Appearance": "Appearance",
@@ -114,6 +119,21 @@
       "Subscription": "Subscription"
     }
   },
+  "storage": {
+    "total": "Total used",
+    "description": "Images and audio used by this project's boards.",
+    "sharedStorage": "Shared storage",
+    "thisProject": "This project",
+    "otherProjects": "Other projects",
+    "free": "Free",
+    "localNote": "This project isn't synced yet — shown as it would count toward your cloud storage.",
+    "empty": "No images or audio in this project yet.",
+    "image": "Image",
+    "audio": "Audio",
+    "remove": "Remove",
+    "confirm": "Remove from project",
+    "cancel": "Cancel"
+  },
   "dangerZone": {
     "transferOwnership": "Transfer ownership",
     "transferDesc": "Transfer your owner role to another user. You will be given editor role.",
@@ -426,7 +446,10 @@
     "shelveDialogue": "Shelve dialogue",
     "shelveAction": "Shelve action",
     "omitScene": "Omit scene",
-    "unomitScene": "Unomit scene"
+    "unomitScene": "Unomit scene",
+    "insertPageBreak": "Insert page break",
+    "removePageBreak": "Remove page break",
+    "pageBreakHint": "Page break"
   },
   "popup": {
     "character": {
@@ -483,7 +506,8 @@
     "audioHint": "Voice note",
     "play": "Play",
     "pause": "Pause",
-    "rename": "Double-click to rename"
+    "rename": "Double-click to rename",
+    "storageLimitReached": "Storage limit reached — couldn't save this file"
   },
   "production": {
     "title": "Production",
diff --git a/messages/es.json b/messages/es.json
index 7b8224d1..88f429f6 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -17,8 +17,11 @@
     "reconnecting": "Reconectando...",
     "localProject": "Proyecto local",
     "uploadToCloud": "Subir a la nube",
+    "storageProject": "Este proyecto",
+    "storageTotal": "Total usado",
     "endlessScroll": "Desplazamiento infinito",
     "toggleComments": "Mostrar/ocultar comentarios",
+    "toggleSpellcheck": "Activar/desactivar corrector ortográfico",
     "focusMode": "Modo concentración",
     "splitPanel": "Dividir panel",
     "unsplitPanel": "Unir panel",
@@ -87,6 +90,7 @@
     "spellcheckLabel": "Corrector orthográfico",
     "spellcheckHelpText": "Descarga un diccionario para la corrección ortográfica en el editor.",
     "spellcheckNone": "Desactivado",
+    "spellcheckBuiltin": "Integrado",
     "customDictLabel": "Diccionario del proyecto",
     "customDictAdd": "Añadir",
     "customDictEmpty": "Aún no hay palabras personalizadas.",
@@ -103,6 +107,7 @@
       "Layout": "Diseño",
       "Production": "Producción",
       "Export": "Importar/Exportar",
+      "Storage": "Almacenamiento",
       "Collaborators": "Colaboradores",
       "Keybinds": "Atajos de teclado",
       "Appearance": "Apariencia",
@@ -114,6 +119,21 @@
       "Subscription": "Suscripción"
     }
   },
+  "storage": {
+    "total": "Espacio usado",
+    "description": "Imágenes y audio usados por los tableros de este proyecto.",
+    "sharedStorage": "Almacenamiento compartido",
+    "thisProject": "Este proyecto",
+    "otherProjects": "Otros proyectos",
+    "free": "Libre",
+    "localNote": "Este proyecto aún no está sincronizado — se muestra como contaría en tu almacenamiento en la nube.",
+    "empty": "Aún no hay imágenes ni audio en este proyecto.",
+    "image": "Imagen",
+    "audio": "Audio",
+    "remove": "Eliminar",
+    "confirm": "Quitar del proyecto",
+    "cancel": "Cancelar"
+  },
   "dangerZone": {
     "transferOwnership": "Transferir propiedad",
     "transferDesc": "Transfiere tu rol de propietario a otro usuario. Pasarás a tener el rol de editor.",
@@ -426,7 +446,10 @@
     "shelveDialogue": "Archivar diálogo",
     "shelveAction": "Archivar acción",
     "omitScene": "Omitir escena",
-    "unomitScene": "Restaurar escena"
+    "unomitScene": "Restaurar escena",
+    "insertPageBreak": "Insertar salto de página",
+    "removePageBreak": "Quitar salto de página",
+    "pageBreakHint": "Salto de página"
   },
   "popup": {
     "character": {
@@ -483,7 +506,8 @@
     "audioHint": "Nota de voz",
     "play": "Reproducir",
     "pause": "Pausar",
-    "rename": "Doble clic para renombrar"
+    "rename": "Doble clic para renombrar",
+    "storageLimitReached": "Límite de almacenamiento alcanzado: no se pudo guardar este archivo"
   },
   "production": {
     "title": "Producción",
diff --git a/messages/fr.json b/messages/fr.json
index fd00873d..04180b74 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -17,9 +17,12 @@
     "reconnecting": "Reconnexion...",
     "localProject": "Projet local",
     "uploadToCloud": "Téléverser dans le cloud",
+    "storageProject": "Ce projet",
+    "storageTotal": "Total utilisé",
     "cachedProject": "Projet en cache",
     "endlessScroll": "Défilement infini",
     "toggleComments": "Afficher/masquer les commentaires",
+    "toggleSpellcheck": "Activer/désactiver la correction orthographique",
     "focusMode": "Mode concentration",
     "splitPanel": "Diviser le panneau",
     "unsplitPanel": "Fermer le panneau divisé",
@@ -88,6 +91,7 @@
     "spellcheckLabel": "Correcteur orthographique",
     "spellcheckHelpText": "Téléchargez un dictionnaire pour la vérification orthographique dans l'éditeur.",
     "spellcheckNone": "Désactivé",
+    "spellcheckBuiltin": "Intégré",
     "customDictLabel": "Dictionnaire du projet",
     "customDictAdd": "Ajouter",
     "customDictEmpty": "Aucun mot personnalisé pour l'instant.",
@@ -104,6 +108,7 @@
       "Layout": "Mise en page",
       "Production": "Production",
       "Export": "Import/Export",
+      "Storage": "Stockage",
       "Collaborators": "Collaborateurs",
       "Keybinds": "Raccourcis",
       "Appearance": "Apparence",
@@ -115,6 +120,21 @@
       "Subscription": "Abonnement"
     }
   },
+  "storage": {
+    "total": "Espace utilisé",
+    "description": "Images et audio utilisés par les tableaux de ce projet.",
+    "sharedStorage": "Stockage partagé",
+    "thisProject": "Ce projet",
+    "otherProjects": "Autres projets",
+    "free": "Libre",
+    "localNote": "Ce projet n'est pas encore synchronisé — affiché tel qu'il compterait dans votre stockage cloud.",
+    "empty": "Aucune image ou audio dans ce projet pour l'instant.",
+    "image": "Image",
+    "audio": "Audio",
+    "remove": "Supprimer",
+    "confirm": "Retirer du projet",
+    "cancel": "Annuler"
+  },
   "dangerZone": {
     "transferOwnership": "Transférer la propriété",
     "transferDesc": "Transférez votre rôle de propriétaire à un autre utilisateur. Vous obtiendrez le rôle d'éditeur.",
@@ -427,7 +447,10 @@
     "shelveDialogue": "Mettre le dialogue de côté",
     "shelveAction": "Mettre l'action de côté",
     "omitScene": "Omettre la scène",
-    "unomitScene": "Restaurer la scène"
+    "unomitScene": "Restaurer la scène",
+    "insertPageBreak": "Insérer un saut de page",
+    "removePageBreak": "Supprimer le saut de page",
+    "pageBreakHint": "Saut de page"
   },
   "popup": {
     "character": {
@@ -484,7 +507,8 @@
     "audioHint": "Note vocale",
     "play": "Lire",
     "pause": "Pause",
-    "rename": "Double-cliquez pour renommer"
+    "rename": "Double-cliquez pour renommer",
+    "storageLimitReached": "Limite de stockage atteinte — impossible d'enregistrer ce fichier"
   },
   "production": {
     "title": "Production",
diff --git a/messages/ja.json b/messages/ja.json
index 0816f9da..b5ff5d19 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -17,8 +17,11 @@
     "reconnecting": "再接続中...",
     "localProject": "ローカルプロジェクト",
     "uploadToCloud": "クラウドにアップロード",
+    "storageProject": "このプロジェクト",
+    "storageTotal": "合計使用量",
     "endlessScroll": "無限スクロール",
     "toggleComments": "コメントの表示/非表示",
+    "toggleSpellcheck": "スペルチェックの切り替え",
     "focusMode": "集中モード",
     "splitPanel": "パネルを分割",
     "unsplitPanel": "パネルを閉じる",
@@ -87,6 +90,7 @@
     "spellcheckLabel": "スペルチェック",
     "spellcheckHelpText": "エディタでスペルチェックを行うための辞書をダウンロードしてください。",
     "spellcheckNone": "無効",
+    "spellcheckBuiltin": "内蔵",
     "customDictLabel": "プロジェクト辞書",
     "customDictAdd": "追加",
     "customDictEmpty": "カスタム単語はまだありません。",
@@ -103,6 +107,7 @@
       "Layout": "レイアウト",
       "Production": "プロダクション",
       "Export": "インポート/エクスポート",
+      "Storage": "ストレージ",
       "Collaborators": "共同作業者",
       "Keybinds": "ショートカットキー",
       "Appearance": "外観",
@@ -114,6 +119,21 @@
       "Subscription": "サブスクリプション"
     }
   },
+  "storage": {
+    "total": "使用容量",
+    "description": "このプロジェクトのボードで使用されている画像と音声。",
+    "sharedStorage": "共有ストレージ",
+    "thisProject": "このプロジェクト",
+    "otherProjects": "他のプロジェクト",
+    "free": "空き",
+    "localNote": "このプロジェクトはまだ同期されていません — クラウドストレージにどれだけ使用するかを表示しています。",
+    "empty": "このプロジェクトにはまだ画像や音声がありません。",
+    "image": "画像",
+    "audio": "音声",
+    "remove": "削除",
+    "confirm": "プロジェクトから削除",
+    "cancel": "キャンセル"
+  },
   "dangerZone": {
     "transferOwnership": "所有権を譲渡",
     "transferDesc": "所有者権限を他のユーザーに譲渡します。あなたは編集者権限に変更されます。",
@@ -426,7 +446,10 @@
     "shelveDialogue": "セリフを保管する",
     "shelveAction": "アクションを保管する",
     "omitScene": "シーンを省略",
-    "unomitScene": "シーンを復元"
+    "unomitScene": "シーンを復元",
+    "insertPageBreak": "改ページを挿入",
+    "removePageBreak": "改ページを削除",
+    "pageBreakHint": "改ページ"
   },
   "popup": {
     "character": {
@@ -483,7 +506,8 @@
     "audioHint": "ボイスメモ",
     "play": "再生",
     "pause": "一時停止",
-    "rename": "ダブルクリックで名前を変更"
+    "rename": "ダブルクリックで名前を変更",
+    "storageLimitReached": "ストレージの上限に達しました — このファイルを保存できませんでした"
   },
   "production": {
     "title": "プロダクション",
diff --git a/messages/ko.json b/messages/ko.json
index 921950df..4727f4f0 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -17,8 +17,11 @@
     "reconnecting": "재연결 중...",
     "localProject": "로컬 프로젝트",
     "uploadToCloud": "클라우드에 업로드",
+    "storageProject": "이 프로젝트",
+    "storageTotal": "총 사용량",
     "endlessScroll": "무한 스크롤",
     "toggleComments": "댓글 표시 전환",
+    "toggleSpellcheck": "맞춤법 검사 전환",
     "focusMode": "집중 모드",
     "splitPanel": "패널 분할",
     "unsplitPanel": "패널 통합",
@@ -87,6 +90,7 @@
     "spellcheckLabel": "맞춤법 검사",
     "spellcheckHelpText": "에디터에서 맞춤법 검사를 위해 사전을 다운로드하세요.",
     "spellcheckNone": "비활성화됨",
+    "spellcheckBuiltin": "내장",
     "customDictLabel": "프로젝트 사전",
     "customDictAdd": "추가",
     "customDictEmpty": "아직 사용자 정의 단어가 없습니다.",
@@ -103,6 +107,7 @@
       "Layout": "레이아웃",
       "Production": "프로덕션",
       "Export": "가져오기/내보내기",
+      "Storage": "저장 공간",
       "Collaborators": "공동 작업자",
       "Keybinds": "단축키",
       "Appearance": "테마",
@@ -114,6 +119,21 @@
       "Subscription": "구독"
     }
   },
+  "storage": {
+    "total": "사용 용량",
+    "description": "이 프로젝트의 보드에서 사용 중인 이미지와 오디오입니다.",
+    "sharedStorage": "공유 저장 공간",
+    "thisProject": "이 프로젝트",
+    "otherProjects": "다른 프로젝트",
+    "free": "여유 공간",
+    "localNote": "이 프로젝트는 아직 동기화되지 않았습니다 — 클라우드 저장 공간에 차지할 용량으로 표시됩니다.",
+    "empty": "이 프로젝트에는 아직 이미지나 오디오가 없습니다.",
+    "image": "이미지",
+    "audio": "오디오",
+    "remove": "삭제",
+    "confirm": "프로젝트에서 제거",
+    "cancel": "취소"
+  },
   "dangerZone": {
     "transferOwnership": "소유권 이전",
     "transferDesc": "소유자 권한을 다른 사용자에게 이전합니다. 당신은 편집자 권한으로 변경됩니다.",
@@ -426,7 +446,10 @@
     "shelveDialogue": "대사 보관하기",
     "shelveAction": "행동 보관하기",
     "omitScene": "씬 생략",
-    "unomitScene": "씬 복원"
+    "unomitScene": "씬 복원",
+    "insertPageBreak": "페이지 나누기 삽입",
+    "removePageBreak": "페이지 나누기 제거",
+    "pageBreakHint": "페이지 나누기"
   },
   "popup": {
     "character": {
@@ -483,7 +506,8 @@
     "audioHint": "음성 메모",
     "play": "재생",
     "pause": "일시정지",
-    "rename": "더블클릭하여 이름 변경"
+    "rename": "더블클릭하여 이름 변경",
+    "storageLimitReached": "저장 용량 한도 초과 — 이 파일을 저장할 수 없습니다"
   },
   "production": {
     "title": "프로덕션",
diff --git a/messages/pl.json b/messages/pl.json
index aeb20236..ad783006 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -17,8 +17,11 @@
     "reconnecting": "Łączenie...",
     "localProject": "Projekt lokalny",
     "uploadToCloud": "Wyślij do chmury",
+    "storageProject": "Ten projekt",
+    "storageTotal": "Łącznie użyte",
     "endlessScroll": "Nieskończone przewijanie",
     "toggleComments": "Pokaż/ukryj komentarze",
+    "toggleSpellcheck": "Włącz/wyłącz sprawdzanie pisowni",
     "focusMode": "Tryb skupienia",
     "splitPanel": "Podziel panel",
     "unsplitPanel": "Zamknij panel",
@@ -87,6 +90,7 @@
     "spellcheckLabel": "Korekta pisowni",
     "spellcheckHelpText": "Pobierz słownik do sprawdzania pisowni w edytorze.",
     "spellcheckNone": "Wyłączone",
+    "spellcheckBuiltin": "Wbudowany",
     "customDictLabel": "Słownik projektu",
     "customDictAdd": "Dodaj",
     "customDictEmpty": "Brak niestandardowych słów.",
@@ -103,6 +107,7 @@
       "Layout": "Układ",
       "Production": "Produkcja",
       "Export": "Import/Eksport",
+      "Storage": "Pamięć",
       "Collaborators": "Współpracownicy",
       "Keybinds": "Skróty klawiszowe",
       "Appearance": "Wygląd",
@@ -114,6 +119,21 @@
       "Subscription": "Subskrypcja"
     }
   },
+  "storage": {
+    "total": "Wykorzystane miejsce",
+    "description": "Obrazy i dźwięki używane przez tablice tego projektu.",
+    "sharedStorage": "Współdzielona pamięć",
+    "thisProject": "Ten projekt",
+    "otherProjects": "Inne projekty",
+    "free": "Wolne",
+    "localNote": "Ten projekt nie jest jeszcze zsynchronizowany — pokazano, ile zająłby z Twojej pamięci w chmurze.",
+    "empty": "W tym projekcie nie ma jeszcze obrazów ani dźwięków.",
+    "image": "Obraz",
+    "audio": "Dźwięk",
+    "remove": "Usuń",
+    "confirm": "Usuń z projektu",
+    "cancel": "Anuluj"
+  },
   "dangerZone": {
     "transferOwnership": "Przekaż własność",
     "transferDesc": "Przekaż rolę właściciela innemu użytkownikowi. Twoja rola zmieni się na edytora.",
@@ -426,7 +446,10 @@
     "shelveDialogue": "Odłóż dialog",
     "shelveAction": "Odłóż akcję",
     "omitScene": "Pomiń scenę",
-    "unomitScene": "Przywróć scenę"
+    "unomitScene": "Przywróć scenę",
+    "insertPageBreak": "Wstaw podział strony",
+    "removePageBreak": "Usuń podział strony",
+    "pageBreakHint": "Podział strony"
   },
   "popup": {
     "character": {
@@ -483,7 +506,8 @@
     "audioHint": "Notatka głosowa",
     "play": "Odtwórz",
     "pause": "Wstrzymaj",
-    "rename": "Kliknij dwukrotnie, aby zmienić nazwę"
+    "rename": "Kliknij dwukrotnie, aby zmienić nazwę",
+    "storageLimitReached": "Osiągnięto limit pamięci — nie można zapisać tego pliku"
   },
   "production": {
     "title": "Produkcja",
diff --git a/messages/zh.json b/messages/zh.json
index ea691772..c22c204a 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -17,8 +17,11 @@
     "reconnecting": "正在重新连接...",
     "localProject": "本地项目",
     "uploadToCloud": "上传到云端",
+    "storageProject": "本项目",
+    "storageTotal": "已用总量",
     "endlessScroll": "无限滚动",
     "toggleComments": "切换显示评论",
+    "toggleSpellcheck": "切换拼写检查",
     "focusMode": "聚焦模式",
     "splitPanel": "分割面板",
     "unsplitPanel": "合并面板",
@@ -87,6 +90,7 @@
     "spellcheckLabel": "拼写检查",
     "spellcheckHelpText": "下载字典以在编辑器中进行拼写检查。",
     "spellcheckNone": "已禁用",
+    "spellcheckBuiltin": "内置",
     "customDictLabel": "项目词典",
     "customDictAdd": "添加",
     "customDictEmpty": "暂无自定义词汇。",
@@ -103,6 +107,7 @@
       "Layout": "布局",
       "Production": "制作",
       "Export": "导入/导出",
+      "Storage": "存储",
       "Collaborators": "协作",
       "Keybinds": "键位",
       "Appearance": "外观",
@@ -114,6 +119,21 @@
       "Subscription": "订阅"
     }
   },
+  "storage": {
+    "total": "已用空间",
+    "description": "本项目板块使用的图片和音频。",
+    "sharedStorage": "共享存储",
+    "thisProject": "本项目",
+    "otherProjects": "其他项目",
+    "free": "可用",
+    "localNote": "此项目尚未同步——按其将占用的云存储显示。",
+    "empty": "本项目还没有图片或音频。",
+    "image": "图片",
+    "audio": "音频",
+    "remove": "删除",
+    "confirm": "从项目中移除",
+    "cancel": "取消"
+  },
   "dangerZone": {
     "transferOwnership": "转移所有权",
     "transferDesc": "将所有者权限转移给其他用户。您将降级为编辑者。",
@@ -426,7 +446,10 @@
     "shelveDialogue": "搁置对白",
     "shelveAction": "搁置动作",
     "omitScene": "省略场景",
-    "unomitScene": "恢复场景"
+    "unomitScene": "恢复场景",
+    "insertPageBreak": "插入分页符",
+    "removePageBreak": "移除分页符",
+    "pageBreakHint": "分页符"
   },
   "popup": {
     "character": {
@@ -483,7 +506,8 @@
     "audioHint": "语音备注",
     "play": "播放",
     "pause": "暂停",
-    "rename": "双击重命名"
+    "rename": "双击重命名",
+    "storageLimitReached": "存储空间已满 — 无法保存此文件"
   },
   "production": {
     "title": "制作",
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 098130fc..8819666f 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -120,6 +120,27 @@ model Project {
 
   members             ProjectMember[]
   invitations         ProjectInvitation[]
+  assets              ProjectAsset[]
+}
+
+// Tracking row for a cloud asset (board image / audio recording). The bytes live
+// in R2 at `assets/{projectId}/{hash}`; this row records the size so per-owner
+// storage usage can be summed across all projects a user owns. Content-addressed
+// per project (mirrors the local IndexedDB store), so duplicates collapse.
+model ProjectAsset {
+  id                  String      @id @default(uuid(7))
+  hash                String
+  mime                String
+  size                Int
+  width               Int         @default(0)
+  height              Int         @default(0)
+  createdAt           DateTime    @default(now())
+
+  project             Project     @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  projectId           String
+
+  @@unique([projectId, hash])
+  @@index([projectId])
 }
 
 model ProjectMember {
diff --git a/public/dictionaries/en/index.aff b/public/dictionaries/en/index.aff
new file mode 100644
index 00000000..9e7cb1e2
--- /dev/null
+++ b/public/dictionaries/en/index.aff
@@ -0,0 +1,205 @@
+SET UTF-8
+TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ'
+ICONV 1
+ICONV ’ '
+NOSUGGEST !
+
+# ordinal numbers
+COMPOUNDMIN 1
+# only in compounds: 1th, 2th, 3th
+ONLYINCOMPOUND c
+# compound rules:
+# 1. [0-9]*1[0-9]th (10th, 11th, 12th, 56714th, etc.)
+# 2. [0-9]*[02-9](1st|2nd|3rd|[4-9]th) (21st, 22nd, 123rd, 1234th, etc.)
+COMPOUNDRULE 2
+COMPOUNDRULE n*1t
+COMPOUNDRULE n*mp
+WORDCHARS 0123456789
+
+PFX A Y 1
+PFX A   0     re         .
+
+PFX I Y 1
+PFX I   0     in         .
+
+PFX U Y 1
+PFX U   0     un         .
+
+PFX C Y 1
+PFX C   0     de          .
+
+PFX E Y 1
+PFX E   0     dis         .
+
+PFX F Y 1
+PFX F   0     con         .
+
+PFX K Y 1
+PFX K   0     pro         .
+
+SFX V N 2
+SFX V   e     ive        e
+SFX V   0     ive        [^e]
+
+SFX N Y 3
+SFX N   e     ion        e
+SFX N   y     ication    y
+SFX N   0     en         [^ey]
+
+SFX X Y 3
+SFX X   e     ions       e
+SFX X   y     ications   y
+SFX X   0     ens        [^ey]
+
+SFX H N 2
+SFX H   y     ieth       y
+SFX H   0     th         [^y]
+
+SFX Y Y 1
+SFX Y   0     ly         .
+
+SFX G Y 2
+SFX G   e     ing        e
+SFX G   0     ing        [^e]
+
+SFX J Y 2
+SFX J   e     ings       e
+SFX J   0     ings       [^e]
+
+SFX D Y 4
+SFX D   0     d          e
+SFX D   y     ied        [^aeiou]y
+SFX D   0     ed         [^ey]
+SFX D   0     ed         [aeiou]y
+
+SFX T N 4
+SFX T   0     st         e
+SFX T   y     iest       [^aeiou]y
+SFX T   0     est        [aeiou]y
+SFX T   0     est        [^ey]
+
+SFX R Y 4
+SFX R   0     r          e
+SFX R   y     ier        [^aeiou]y
+SFX R   0     er         [aeiou]y
+SFX R   0     er         [^ey]
+
+SFX Z Y 4
+SFX Z   0     rs         e
+SFX Z   y     iers       [^aeiou]y
+SFX Z   0     ers        [aeiou]y
+SFX Z   0     ers        [^ey]
+
+SFX S Y 4
+SFX S   y     ies        [^aeiou]y
+SFX S   0     s          [aeiou]y
+SFX S   0     es         [sxzh]
+SFX S   0     s          [^sxzhy]
+
+SFX P Y 3
+SFX P   y     iness      [^aeiou]y
+SFX P   0     ness       [aeiou]y
+SFX P   0     ness       [^y]
+
+SFX M Y 1
+SFX M   0     's         .
+
+SFX B Y 3
+SFX B   0     able       [^aeiou]
+SFX B   0     able       ee
+SFX B   e     able       [^aeiou]e
+
+SFX L Y 1
+SFX L   0     ment       .
+
+REP 90
+REP a ei
+REP ei a
+REP a ey
+REP ey a
+REP ai ie
+REP ie ai
+REP alot a_lot
+REP are air
+REP are ear
+REP are eir
+REP air are
+REP air ere
+REP ere air
+REP ere ear
+REP ere eir
+REP ear are
+REP ear air
+REP ear ere
+REP eir are
+REP eir ere
+REP ch te
+REP te ch
+REP ch ti
+REP ti ch
+REP ch tu
+REP tu ch
+REP ch s
+REP s ch
+REP ch k
+REP k ch
+REP f ph
+REP ph f
+REP gh f
+REP f gh
+REP i igh
+REP igh i
+REP i uy
+REP uy i
+REP i ee
+REP ee i
+REP j di
+REP di j
+REP j gg
+REP gg j
+REP j ge
+REP ge j
+REP s ti
+REP ti s
+REP s ci
+REP ci s
+REP k cc
+REP cc k
+REP k qu
+REP qu k
+REP kw qu
+REP o eau
+REP eau o
+REP o ew
+REP ew o
+REP oo ew
+REP ew oo
+REP ew ui
+REP ui ew
+REP oo ui
+REP ui oo
+REP ew u
+REP u ew
+REP oo u
+REP u oo
+REP u oe
+REP oe u
+REP u ieu
+REP ieu u
+REP ue ew
+REP ew ue
+REP uff ough
+REP oo ieu
+REP ieu oo
+REP ier ear
+REP ear ier
+REP ear air
+REP air ear
+REP w qu
+REP qu w
+REP z ss
+REP ss z
+REP shun tion
+REP shun sion
+REP shun cion
+REP size cise
diff --git a/public/dictionaries/en/index.dic b/public/dictionaries/en/index.dic
new file mode 100644
index 00000000..b41fd203
--- /dev/null
+++ b/public/dictionaries/en/index.dic
@@ -0,0 +1,49569 @@
+49568
+0/nm
+0th/pt
+1/n1
+1st/p
+1th/tc
+2/nm
+2nd/p
+2th/tc
+3/nm
+3rd/p
+3th/tc
+4/nm
+4th/pt
+5/nm
+5th/pt
+6/nm
+6th/pt
+7/nm
+7th/pt
+8/nm
+8th/pt
+9/nm
+9th/pt
+A/SM
+AA/M
+AAA
+AB/M
+ABA
+ABC/SM
+ABM/SM
+ABS
+AC/M
+ACLU/M
+ACT
+ACTH/M
+AD/M
+ADC
+ADD
+ADM
+ADP/M
+AF
+AFAIK
+AFB
+AFC/M
+AFDC
+AFN
+AFT
+AI/SM
+AIDS/M
+AK
+AL
+AM/M
+AMA
+AMD/M
+ANSI/S
+ANZUS/M
+AOL/M
+AP/M
+APB
+APC
+API
+APO
+APR
+AR
+ARC
+ASAP
+ASCII/SM
+ASL/M
+ASPCA
+ATM/M
+ATP/M
+ATV
+AV
+AVI
+AWACS/M
+AWOL/M
+AWS/M
+AZ/M
+AZT/M
+Aachen/M
+Aaliyah/M
+Aaron/M
+Abbas/M
+Abbasid/M
+Abbott/M
+Abby/M
+Abdul/M
+Abe/M
+Abel/M
+Abelard/M
+Abelson/M
+Aberdeen/M
+Abernathy/M
+Abidjan/M
+Abigail/M
+Abilene/M
+Abner/M
+Aborigine/MS
+Abraham/M
+Abram/MS
+Abrams/M
+Absalom/M
+Abuja/M
+Abyssinia/M
+Abyssinian/M
+Ac/M
+Acadia/M
+Acapulco/M
+Accenture/M
+Accra/M
+Acevedo/M
+Achaean/M
+Achebe/M
+Achernar/M
+Acheson/M
+Achilles/M
+Aconcagua/M
+Acosta/M
+Acropolis
+Acrux/M
+Actaeon/M
+Acton/M
+Acts/M
+Acuff/M
+Ada/SM
+Adam/SM
+Adams/M
+Adan/M
+Adana/M
+Adar/M
+Addams/M
+Adderley/M
+Addie/M
+Addison/M
+Adela/M
+Adelaide/M
+Adele/M
+Adeline/M
+Aden/M
+Adenauer/M
+Adhara/M
+Adidas/M
+Adirondack/SM
+Adirondacks/M
+Adkins/M
+Adler/M
+Adm
+Admiralty
+Adolf/M
+Adolfo/M
+Adolph/M
+Adonis/MS
+Adrenalin/MS
+Adrian/M
+Adriana/M
+Adriatic/M
+Adrienne/M
+Advent/MS
+Adventist/MS
+Advil/M
+Aegean/M
+Aelfric/M
+Aeneas/M
+Aeneid/M
+Aeolus/M
+Aeroflot/M
+Aeschylus/M
+Aesculapius/M
+Aesop/M
+Afghan/SM
+Afghani/M
+Afghanistan/M
+Afr
+Africa/M
+African/SM
+Afrikaans/M
+Afrikaner/SM
+Afro/SM
+Afrocentric
+Afrocentrism/M
+Ag/M
+Agamemnon/M
+Agana
+Agassi/M
+Agassiz/M
+Agatha/M
+Aggie/M
+Aglaia/M
+Agnes/M
+Agnew/M
+Agni/M
+Agra/M
+Agricola/M
+Agrippa/M
+Agrippina/M
+Aguadilla/M
+Aguascalientes
+Aguilar/M
+Aguinaldo/M
+Aguirre/M
+Agustin/M
+Ahab/M
+Ahmad/M
+Ahmadabad/M
+Ahmadinejad/M
+Ahmed/M
+Ahriman/M
+Aida/M
+Aiken/M
+Aileen/M
+Aimee/M
+Ainu/M
+Airedale/MS
+Aires/M
+Aisha/M
+Ajax/M
+Akbar/M
+Akhmatova/M
+Akihito/M
+Akita/M
+Akiva/M
+Akkad/M
+Akron/M
+Al/M
+Ala/S
+Alabama/M
+Alabaman/MS
+Alabamian/SM
+Aladdin/M
+Alamo/M
+Alamogordo/M
+Alan/M
+Alana/M
+Alar/M
+Alaric/M
+Alaska/M
+Alaskan/MS
+Alba/M
+Albania/M
+Albanian/MS
+Albany/M
+Albee/M
+Alberio/M
+Albert/M
+Alberta/M
+Albertan
+Alberto/M
+Albigensian/M
+Albion/M
+Albireo/M
+Albuquerque/M
+Alcatraz/M
+Alcestis/M
+Alcibiades/M
+Alcindor/M
+Alcmena/M
+Alcoa/M
+Alcott/M
+Alcuin/M
+Alcyone/M
+Aldan/M
+Aldebaran/M
+Alden/M
+Alderamin/M
+Aldo/M
+Aldrin/M
+Alec/M
+Aleichem/M
+Alejandra/M
+Alejandro/M
+Alembert/M
+Aleppo/M
+Aleut/MS
+Aleutian/SM
+Alex/M
+Alexander/MS
+Alexandra/M
+Alexandria/M
+Alexandrian
+Alexei/M
+Alexis/M
+Alfonso/M
+Alfonzo/M
+Alford/M
+Alfred/M
+Alfreda/M
+Alfredo/M
+Algenib/M
+Alger/M
+Algeria/M
+Algerian/SM
+Algieba/M
+Algiers/M
+Algol/M
+Algonquian/SM
+Algonquin/MS
+Alhambra/M
+Alhena/M
+Ali/M
+Alice/M
+Alicia/M
+Alighieri/M
+Aline/M
+Alioth/M
+Alisa/M
+Alisha/M
+Alison/M
+Alissa/M
+Alistair/M
+Alkaid/M
+Allah/M
+Allahabad/M
+Allan/M
+Alleghenies/M
+Allegheny/SM
+Allegra/M
+Allen/M
+Allende/M
+Allentown/M
+Allhallows/M
+Allie/MS
+Allison/M
+Allstate/M
+Allyson/M
+Alma/M
+Almach/M
+Almaty/M
+Almighty/M
+Almohad/M
+Almoravid/M
+Alnilam/M
+Alnitak/M
+Alonzo/M
+Alpert/M
+Alphard/M
+Alphecca/M
+Alpheratz/M
+Alphonse/M
+Alphonso/M
+Alpine/M
+Alpo/M
+Alps/M
+Alsace/M
+Alsatian/SM
+Alsop/M
+Alston/M
+Alta/M
+Altaba/M
+Altai/M
+Altaic/M
+Altair/M
+Altamira/M
+Althea/M
+Altiplano/M
+Altman/M
+Altoids/M
+Alton/M
+Altoona/M
+Aludra/M
+Alva/M
+Alvarado/M
+Alvarez/M
+Alvaro/M
+Alvin/M
+Alyce/M
+Alyson/M
+Alyssa/M
+Alzheimer/M
+Am/MNR
+Amadeus/M
+Amado/M
+Amalia/M
+Amanda/M
+Amarillo/M
+Amaru/M
+Amaterasu/M
+Amati/M
+Amazon/SM
+Amazonian
+Amber/M
+Amelia/M
+Amen/M
+Amenhotep/M
+Amerasian/M
+America/SM
+American/MS
+Americana/M
+Americanism/MS
+Americanization/MS
+Americanize/GDS
+Amerind/SM
+Amerindian/MS
+Ames/M
+Ameslan/M
+Amgen/M
+Amharic/M
+Amherst/M
+Amie/M
+Amiga/M
+Amish/M
+Amman/M
+Amoco/M
+Amos/M
+Amparo/M
+Ampere/M
+Amritsar/M
+Amsterdam/M
+Amtrak/M
+Amundsen/M
+Amur/M
+Amway/M
+Amy/M
+Ana/M
+Anabaptist/M
+Anabel/M
+Anacin/M
+Anacreon/M
+Anaheim/M
+Analects/M
+Ananias/M
+Anasazi/M
+Anastasia/M
+Anatole/M
+Anatolia/M
+Anatolian/M
+Anaxagoras/M
+Anchorage/M
+Andalusia/M
+Andalusian/M
+Andaman/M
+Andean/M
+Andersen/M
+Anderson/M
+Andes/M
+Andorra/M
+Andorran/SM
+Andre/MS
+Andrea/M
+Andrei/M
+Andres/M
+Andretti/M
+Andrew/SM
+Andrews/M
+Andrianampoinimerina/M
+Android/M
+Andromache/M
+Andromeda/M
+Andropov/M
+Andy/M
+Angara/M
+Angel/M
+Angela/M
+Angeles/M
+Angelia/M
+Angelica/M
+Angelico/M
+Angelina/M
+Angeline/M
+Angelique/M
+Angelita/M
+Angelo/M
+Angelou/M
+Angevin/M
+Angie/M
+Angkor/M
+Angle/MS
+Angleton/M
+Anglia/M
+Anglican/SM
+Anglicanism/MS
+Anglicism/MS
+Anglicization
+Anglicize
+Anglo/M
+Anglophile/M
+Anglophobe
+Angola/M
+Angolan/MS
+Angora/SM
+Angstrom/M
+Anguilla/M
+Angus/M
+Anhui/M
+Aniakchak/M
+Anibal/M
+Anita/M
+Ankara/M
+Ann/M
+Anna/M
+Annabel/M
+Annabelle/M
+Annam/M
+Annapolis/M
+Annapurna/M
+Anne/M
+Annette/M
+Annie/M
+Anniston/M
+Annmarie/M
+Annunciation/SM
+Anouilh/M
+Anselm/M
+Anselmo/M
+Anshan/M
+Antaeus/M
+Antananarivo/M
+Antarctic/M
+Antarctica/M
+Antares/M
+Anthony/M
+Anthropocene
+Antichrist/SM
+Antietam/M
+Antifa/M
+Antigone/M
+Antigua/M
+Antillean
+Antilles/M
+Antioch/M
+Antipas/M
+Antipodes
+Antofagasta/M
+Antoine/M
+Antoinette/M
+Anton/M
+Antone/M
+Antonia/M
+Antoninus/M
+Antonio/M
+Antonius/M
+Antony/M
+Antwan/M
+Antwerp/M
+Anubis/M
+Anzac/M
+Apache/SM
+Apalachicola/M
+Apatosaurus
+Apennines/M
+Aphrodite/M
+Apia/M
+Apocalypse/M
+Apocrypha/M
+Apollinaire/M
+Apollo/SM
+Apollonian/M
+Apostle/M
+Appalachia/M
+Appalachian/SM
+Appalachians/M
+Appaloosa/SM
+Apple/M
+Appleseed/M
+Appleton/M
+Appomattox/M
+Apr/M
+April/MS
+Apuleius/M
+Aquafresh/M
+Aquarian
+Aquarius/MS
+Aquila/M
+Aquinas/M
+Aquino/M
+Aquitaine/M
+Ar/M
+Ara/M
+Arab/SM
+Arabia/M
+Arabian/MS
+Arabic/M
+Arabist/MS
+Araby/M
+Araceli/M
+Arafat/M
+Aragon
+Araguaya/M
+Aral/M
+Aramaic/M
+Aramco/M
+Arapaho/MS
+Arapahoes
+Ararat/M
+Araucanian/M
+Arawak/M
+Arawakan/M
+Arbitron/M
+Arcadia/M
+Arcadian/M
+Archean/M
+Archibald/M
+Archie/M
+Archimedes/M
+Arctic/M
+Arcturus/M
+Ardabil
+Arden/M
+Arduino/M
+Arecibo/M
+Arequipa/M
+Ares/M
+Argentina/M
+Argentine/M
+Argentinean
+Argentinian/MS
+Argo/SM
+Argonaut/MS
+Argonne/M
+Argos/M
+Argus/M
+Ariadne/M
+Arianism/M
+Ariel/M
+Aries/MS
+Ariosto/M
+Aristarchus/M
+Aristides/M
+Aristophanes/M
+Aristotelian/M
+Aristotle/M
+Arius/M
+Ariz
+Arizona/M
+Arizonan/SM
+Arizonian/MS
+Arjuna/M
+Ark/M
+Arkansan/MS
+Arkansas/M
+Arkhangelsk/M
+Arkwright/M
+Arlene/M
+Arline/M
+Arlington/M
+Armageddon/SM
+Armagnac/M
+Armand/M
+Armando/M
+Armani/M
+Armenia/M
+Armenian/SM
+Arminius/M
+Armonk/M
+Armour/M
+Armstrong/M
+Arneb/M
+Arnhem/M
+Arno/M
+Arnold/M
+Arnulfo/M
+Aron/M
+Arrhenius/M
+Arron/M
+Art/M
+Artaxerxes/M
+Artemis/M
+Arthur/M
+Arthurian/M
+Artie/M
+Arturo/M
+Aruba/M
+Aryan/MS
+As/M
+Asama/M
+Ascella/M
+Ascension/M
+Asgard/M
+Ashanti/M
+Ashcroft/M
+Ashe/M
+Asheville/M
+Ashgabat
+Ashikaga/M
+Ashkenazim/M
+Ashkhabad/M
+Ashlee/M
+Ashley/M
+Ashmolean/M
+Ashurbanipal/M
+Asia/M
+Asiago
+Asian/MS
+Asiatic/SM
+Asimov/M
+Asmara/M
+Asoka/M
+Aspell/M
+Aspen/M
+Asperger/M
+Aspidiske/M
+Asquith/M
+Assad/M
+Assam/M
+Assamese/M
+Assembly
+Assisi/M
+Assyria/M
+Assyrian/SM
+Astaire/M
+Astana/M
+Astarte/M
+Aston/M
+Astor/M
+Astoria/M
+Astrakhan/M
+AstroTurf/M
+Asturias/M
+Asuncion/M
+Aswan/M
+At/SM
+Atacama/M
+Atahualpa/M
+Atalanta/M
+Atari/M
+Atascadero/M
+Ataturk/M
+Athabasca/M
+Athabaskan/SM
+Athanasius
+Athena/M
+Athene/M
+Athenian/SM
+Athens/M
+Atkins/M
+Atkinson/M
+Atlanta/M
+Atlantes
+Atlantic/M
+Atlantis/M
+Atlas/MS
+Atman/M
+Atonement
+Atreus/M
+Atria/M
+Atropos/M
+Attic/M
+Attica/M
+Attila/M
+Attlee/M
+Attn
+Attucks/M
+Atwood/M
+Au/M
+Aubrey/M
+Auburn/M
+Auckland/M
+Auden/M
+Audi/M
+Audion/M
+Audra/M
+Audrey/M
+Audubon/M
+Aug/M
+Augean/M
+Augsburg/M
+August/MS
+Augusta/M
+Augustan/M
+Augustine/M
+Augustinian/MS
+Augustus/M
+Aurangzeb/M
+Aurelia/M
+Aurelio/M
+Aurelius/M
+Aureomycin/M
+Auriga/M
+Aurora/M
+Auschwitz/M
+Aussie/MS
+Austen/M
+Austerlitz/M
+Austin/MS
+Australasia/M
+Australasian
+Australia/M
+Australian/SM
+Australoid/M
+Australopithecus/M
+Austria/M
+Austrian/SM
+Austronesian/M
+Autumn/M
+Av/M
+Ava/M
+Avalon/M
+Ave/M
+Aventine/M
+Avernus/M
+Averroes/M
+Avery/M
+Avesta/M
+Avicenna/M
+Avignon/M
+Avila/M
+Avior/M
+Avis/M
+Avogadro/M
+Avon/M
+Avondale/M
+Axis
+Axum/M
+Ayala/M
+Ayers/M
+Aymara/M
+Ayrshire/M
+Ayurveda/M
+Ayyubid/M
+Azana/M
+Azania/M
+Azazel/M
+Azerbaijan/M
+Azerbaijani/MS
+Azores/M
+Azov/M
+Aztec/SM
+Aztecan/M
+Aztlan/M
+B/MNT
+BA/M
+BASIC/SM
+BB/M
+BBB/M
+BBC/M
+BBQ
+BBS
+BBSes
+BC/M
+BFF
+BIA
+BIOS
+BITNET
+BLT/SM
+BM/M
+BMW/M
+BO
+BP/M
+BPOE
+BR
+BS/M
+BSA
+BSD/SM
+BTU
+BTW
+BYOB
+Ba/M
+Baal/SM
+Baath/M
+Baathist/M
+Babbage/M
+Babbitt/M
+Babel/MS
+Babylon/MS
+Babylonia/M
+Babylonian/SM
+Bacall/M
+Bacardi/M
+Bacchanalia/M
+Bacchic
+Bacchus/M
+Bach/M
+Backus/M
+Bacon/M
+Bactria/M
+Baden/M
+Badlands/M
+Baedeker/MS
+Baez/M
+Baffin/M
+Baggies/M
+Baghdad/M
+Baguio/M
+Baha'i/M
+Baha'ullah/M
+Bahama/SM
+Bahamanian
+Bahamas/M
+Bahamian/MS
+Bahia/M
+Bahrain/M
+Baidu/M
+Baikal/M
+Bailey/M
+Baird/M
+Bakelite/M
+Baker/M
+Bakersfield/M
+Baku/M
+Bakunin/M
+Balanchine/M
+Balaton/M
+Balboa/M
+Balder/M
+Baldwin/SM
+Balearic/M
+Balfour/M
+Bali/M
+Balinese/M
+Balkan/MS
+Balkans/M
+Balkhash/M
+Ball/M
+Ballard/M
+Balthazar/M
+Baltic/M
+Baltimore/M
+Baluchistan/M
+Balzac/M
+Bamako/M
+Bambi/M
+Banach/M
+Bancroft/M
+Bandung/M
+Bangalore/M
+Bangkok/M
+Bangladesh/M
+Bangladeshi/SM
+Bangor/M
+Bangui/M
+Banjarmasin/M
+Banjul/M
+Banks/M
+Banneker/M
+Bannister/M
+Banting/M
+Bantu/MS
+Baotou/M
+Baptist/SM
+Baptiste/M
+Barabbas/M
+Barack/M
+Barbadian/SM
+Barbados/M
+Barbara/M
+Barbarella/M
+Barbarossa/M
+Barbary/M
+Barber/M
+Barbie/M
+Barbour/M
+Barbra/M
+Barbuda/M
+Barcelona/M
+Barceloneta/M
+Barclay/SM
+Barclays/M
+Bardeen/M
+Barents/M
+Barker/M
+Barkley/M
+Barlow/M
+Barnabas/M
+Barnaby/M
+Barnard/M
+Barnaul/M
+Barnes/M
+Barnett/M
+Barney/M
+Barnum/M
+Baroda/M
+Barquisimeto/M
+Barr/M
+Barranquilla/M
+Barrera/M
+Barrett/M
+Barrie/M
+Barron/M
+Barry/M
+Barrymore/M
+Bart/M
+Barth/MS
+Bartholdi/M
+Bartholomew/M
+Bartlett/M
+Bartok/M
+Barton/M
+Baruch/M
+Baryshnikov/M
+Basel/M
+Basho/M
+Basie/M
+Basil/M
+Basque/MS
+Basra/M
+Bass/M
+Basseterre/M
+Bastille/M
+Basutoland/M
+Bataan/M
+Bates/M
+Bathsheba/M
+Batista/M
+Batman/M
+Battle/M
+Batu/M
+Baudelaire/M
+Baudouin/M
+Baudrillard/M
+Bauer/M
+Bauhaus/M
+Baum/M
+Bavaria/M
+Bavarian/M
+Baxter/M
+Bayamon
+Bayer/M
+Bayes/M
+Bayesian/M
+Bayeux/M
+Baylor/M
+Bayonne/M
+Bayreuth/M
+Baywatch/M
+Be/MH
+Beach/M
+Beadle/M
+Bean/M
+Beard/M
+Beardmore/M
+Beardsley/M
+Bearnaise/M
+Beasley/M
+Beatlemania/M
+Beatles/M
+Beatrice/M
+Beatrix/M
+Beatriz/M
+Beatty/M
+Beau/M
+Beaufort/M
+Beaujolais/M
+Beaumarchais/M
+Beaumont/M
+Beauregard/M
+Beauvoir/M
+Bechtel/M
+Beck/MR
+Becker/M
+Becket/M
+Beckett/M
+Beckley/M
+Beckman
+Becky/M
+Becquerel/M
+Bede/M
+Bedouin/SM
+Beebe/M
+Beecher/M
+Beefaroni/M
+Beelzebub/M
+Beerbohm/M
+Beethoven/M
+Beeton/M
+Begin/M
+Behan/M
+Behring/M
+Beiderbecke/M
+Beijing/M
+Beirut/M
+Bekesy/M
+Bela/M
+Belarus/M
+Belarusian
+Belau/M
+Belem/M
+Belfast/M
+Belg
+Belgian/SM
+Belgium/M
+Belgrade/M
+Belinda/M
+Belize/M
+Bell/M
+Bella/M
+Bellamy/M
+Bellatrix/M
+Belleek/M
+Bellingham/M
+Bellini/M
+Bellow/M
+Belmont/M
+Belmopan/M
+Beloit/M
+Belorussian/MS
+Belshazzar/M
+Beltane/M
+Belushi/M
+Ben/M
+Benacerraf/M
+Benchley/M
+Bend/MR
+Bender/M
+Bendictus
+Bendix/M
+Benedict/M
+Benedictine/MS
+Benelux/M
+Benet/M
+Benetton/M
+Bengal/SM
+Bengali/M
+Benghazi/M
+Benin/M
+Beninese/M
+Benita/M
+Benito/M
+Benjamin/M
+Bennett/M
+Bennie/M
+Benny/M
+Benson/M
+Bentham/M
+Bentley/M
+Benton/M
+Benz/M
+Benzedrine/M
+Beowulf/M
+Berber/SM
+Berenice/M
+Beretta/M
+Berg/MNR
+Bergen/M
+Berger/M
+Bergerac/M
+Bergman/M
+Bergson/M
+Beria/M
+Bering/M
+Berkeley/M
+Berkshire/SM
+Berkshires/M
+Berle/M
+Berlin/SZMR
+Berliner/M
+Berlioz/M
+Berlitz/M
+Bermuda/SM
+Bermudan/SM
+Bermudian/SM
+Bern/M
+Bernadette/M
+Bernadine/M
+Bernanke/M
+Bernard/M
+Bernardo/M
+Bernays/M
+Bernbach/M
+Bernese
+Bernhardt/M
+Bernice/M
+Bernie/M
+Bernini/M
+Bernoulli/M
+Bernstein/M
+Berra/M
+Berry/M
+Bert/M
+Berta/M
+Bertelsmann/M
+Bertha/M
+Bertie/M
+Bertillon/M
+Bertram/M
+Bertrand/M
+Berwick/M
+Beryl/M
+Berzelius/M
+Bess/M
+Bessel/M
+Bessemer/M
+Bessie/M
+Best/M
+Betelgeuse/M
+Beth/M
+Bethany/M
+Bethe/M
+Bethesda/M
+Bethlehem/M
+Bethune/M
+Betsy/M
+Bette/M
+Bettie/M
+Betty/M
+Bettye/M
+Beulah/M
+Beveridge
+Beverley/M
+Beverly/M
+Beyer/M
+Bharat/M
+Bhopal/M
+Bhutan/M
+Bhutanese/M
+Bhutto/M
+Bi/M
+Bialystok/M
+Bianca/M
+Bib
+Bible/MS
+Bic/M
+Biddle/M
+Biden/M
+Bierce/M
+BigQuery/M
+Bigfoot/M
+Biggles/M
+Biko/M
+Bilbao/M
+Bilbo/M
+Bill/MJ
+Billie/M
+Billings/M
+Billy/M
+Bimini/M
+Binghamton/M
+Biogen/M
+Bioko/M
+Bird/M
+Birdseye/M
+Birkenstock/M
+Birmingham/M
+Biro/M
+Biscay/M
+Biscayne/M
+Bishkek/M
+Bishop/M
+Bismarck/M
+Bismark/M
+Bisquick/M
+Bissau/M
+BitTorrent/M
+Bizet/M
+Bjerknes/M
+Bjork/M
+Bk/M
+BlackBerry/M
+Blackbeard/M
+Blackburn/M
+Blackfeet/M
+Blackfoot/M
+Blackpool/M
+Blacksburg/M
+Blackshirt/M
+Blackstone/M
+Blackwell/M
+Blaine/M
+Blair/M
+Blake/M
+Blanca/M
+Blanchard/M
+Blanche/M
+Blankenship/M
+Blantyre/M
+Blatz/M
+Blavatsky/M
+Blenheim/M
+Blevins/M
+Bligh/M
+Bloch/M
+Blockbuster/M
+Bloemfontein/M
+Blondel/M
+Blondie/M
+Bloom/MR
+Bloomer/M
+Bloomfield/M
+Bloomingdale/M
+Bloomington/M
+Bloomsburg/M
+Bloomsbury/M
+Blu
+Blucher/M
+Bluebeard/M
+Bluetooth/M
+Blvd
+Blythe/M
+Boadicea
+Boas/M
+Bob/M
+Bobbi/M
+Bobbie/M
+Bobbitt/M
+Bobby/M
+Boccaccio/M
+Bodhidharma/M
+Bodhisattva/M
+Bodleian
+Boeing/M
+Boeotia/M
+Boeotian/M
+Boer/SM
+Boethius/M
+Bogart/M
+Bogota/M
+Bohemia/M
+Bohemian/SM
+Bohr/M
+Boise/M
+Bojangles/M
+Boleyn/M
+Bolivar/M
+Bolivia/M
+Bolivian/MS
+Bollywood/M
+Bologna/M
+Bolshevik/SM
+Bolsheviki
+Bolshevism/M
+Bolshevist/M
+Bolshoi/M
+Bolton/M
+Boltzmann/M
+Bombay/M
+Bonaparte/M
+Bonaventure/M
+Bond/M
+Bonhoeffer/M
+Boniface/M
+Bonita/M
+Bonn/MR
+Bonner/M
+Bonneville/M
+Bonnie/M
+Bono/M
+Booker/M
+Boole/M
+Boolean/M
+Boone/M
+Bootes/M
+Booth/M
+Bordeaux/M
+Borden/M
+Bordon/M
+Boreas/M
+Borg/SM
+Borges/M
+Borgia/M
+Borglum/M
+Boris/M
+Bork/M
+Borlaug/M
+Born/M
+Borneo/M
+Borobudur/M
+Borodin/M
+Boru/M
+Bosch/M
+Bose/M
+Bosnia/M
+Bosnian
+Bosporus/M
+Boston/MS
+Bostonian/M
+Boswell/M
+Botha
+Botox
+Botswana/M
+Botticelli/M
+Boulder/M
+Boulez/M
+Bourbaki/M
+Bourbon/SM
+Bournemouth/M
+Bovary/M
+Bowditch/M
+Bowell/M
+Bowen/M
+Bowers/M
+Bowery/M
+Bowie/M
+Bowman/M
+Boyd/M
+Boyer/M
+Boyle/M
+Br/MT
+Brad/MY
+Bradbury/M
+Braddock/M
+Bradenton/M
+Bradford/M
+Bradley/M
+Bradly/M
+Bradshaw/M
+Bradstreet/M
+Brady/M
+Bragg/M
+Brahe/M
+Brahma/MS
+Brahmagupta/M
+Brahman/MS
+Brahmani
+Brahmanism/SM
+Brahmaputra/M
+Brahms/M
+Braille/MS
+Brain/M
+Brampton/M
+Bran/M
+Branch/M
+Brandeis/M
+Branden/M
+Brandenburg/M
+Brandi/M
+Brandie/M
+Brando/M
+Brandon/M
+Brandt/M
+Brandy/M
+Brant/M
+Braque/M
+Brasilia/M
+Bratislava/M
+Brattain/M
+Bray/M
+Brazil/M
+Brazilian/MS
+Brazos/M
+Brazzaville/M
+Breakspear/M
+Breathalyzer
+Brecht/M
+Breckenridge/M
+Bremen/M
+Bremerton/M
+Brenda/M
+Brendan/M
+Brennan/M
+Brenner/M
+Brent/M
+Brenton/M
+Brest/M
+Bret/M
+Breton/M
+Brett/M
+Brewer/M
+Brewster/M
+Brexit
+Brezhnev/M
+Brian/M
+Briana/M
+Brianna/M
+Brice/M
+Bridalveil/M
+Bridgeport/M
+Bridger/M
+Bridges/M
+Bridget/M
+Bridgetown/M
+Bridgett/M
+Bridgette/M
+Bridgman/M
+Brie/SM
+Brigadoon/M
+Briggs/M
+Brigham/M
+Bright/M
+Brighton/M
+Brigid/M
+Brigitte/M
+Brillo/M
+Brillouin
+Brinkley/M
+Brisbane/M
+Bristol/M
+Brit/SM
+Britain/M
+Britannia/M
+Britannic/M
+Britannica/M
+Briticism/SM
+British/MRZ
+Britisher/M
+Britney/M
+Briton/MS
+Britt/MN
+Brittany/SM
+Britten/M
+Brittney/M
+Brno/M
+Broadway/SM
+Brobdingnag/M
+Brobdingnagian/M
+Brock/M
+Brokaw/M
+Bronson/M
+Bronte/M
+Brontosaurus
+Bronx/M
+Brooke/MS
+Brooklyn/M
+Brooks/M
+Bros
+Brown/MG
+Browne/M
+Brownian/M
+Brownie/S
+Browning/M
+Brownshirt/M
+Brownsville/M
+Brubeck/M
+Bruce/M
+Bruckner/M
+Bruegel
+Brummel/M
+Brunei/M
+Bruneian/MS
+Brunelleschi/M
+Brunhilde/M
+Bruno/M
+Brunswick/M
+Brussels/M
+Brut/M
+Brutus/M
+Bryan/M
+Bryant/M
+Bryce/M
+Brynner/M
+Bryon/M
+Brzezinski/M
+Btu/M
+Buber/M
+Buchanan/M
+Bucharest/M
+Buchenwald/M
+Buchwald/M
+Buck/M
+Buckingham/M
+Buckley/M
+Buckner/M
+Bud/M
+Budapest/M
+Buddha/SM
+Buddhism/SM
+Buddhist/SM
+Buddy/M
+Budweiser/M
+Buffalo/M
+Buffy/M
+Buford/M
+Bugatti/M
+Bugzilla/M
+Buick/M
+Bujumbura/M
+Bukhara/M
+Bukharin/M
+Bulawayo/M
+Bulfinch/M
+Bulganin/M
+Bulgar/M
+Bulgari/M
+Bulgaria/M
+Bulgarian/SM
+Bullock/M
+Bullwinkle/M
+Bultmann/M
+Bumppo/M
+Bunche/M
+Bundesbank/M
+Bundestag/M
+Bunin/M
+Bunker/M
+Bunsen/M
+Bunuel/M
+Bunyan/M
+Burbank/M
+Burberry/M
+Burch/M
+Burger/M
+Burgess/M
+Burgoyne/M
+Burgundian/M
+Burgundy/SM
+Burke/M
+Burks/M
+Burl/M
+Burlington/M
+Burma/M
+Burmese/M
+Burnett/M
+Burns/M
+Burnside/M
+Burr/M
+Burris/M
+Burroughs/M
+Bursa/M
+Burt/M
+Burton/M
+Burundi/M
+Burundian/MS
+Busch/M
+Bush/M
+Bushido/M
+Bushnell/M
+Butler/M
+Butterfingers/M
+Buxtehude/M
+Byblos/M
+Byers/M
+Byrd/M
+Byron/M
+Byronic/M
+Byzantine/MS
+Byzantium/M
+C/SM
+CA
+CAD/M
+CAI
+CAM
+CAP
+CARE
+CATV
+CB
+CBC/M
+CBS/M
+CCTV
+CCU
+CD/SM
+CDC
+CDT
+CEO/M
+CF
+CFC/M
+CFO
+CGI
+CIA/M
+CID
+CNN/M
+CNS/M
+CO/M
+COBOL/SM
+COD
+COL
+COLA
+COVID
+CPA/M
+CPI/M
+CPO
+CPR/M
+CPU/M
+CRT/SM
+CSS/M
+CST/M
+CT/M
+CV
+CVS/M
+CZ
+Ca/M
+Cabernet/M
+Cabot/M
+Cabral/M
+Cabrera/M
+Cabrini/M
+Cadette
+Cadillac/M
+Cadiz/M
+Caedmon/M
+Caerphilly/M
+Caesar/SM
+Cage/M
+Cagney/M
+Cahokia/M
+Caiaphas/M
+Cain/SM
+Cairo/M
+Caitlin/M
+Cajun/MS
+Cal/M
+Calais/M
+Calcutta/M
+Calder/M
+Calderon/M
+Caldwell/M
+Caleb/M
+Caledonia/M
+Calexico/M
+Calgary/M
+Calhoun/M
+Cali/M
+Caliban/M
+Calif
+California/M
+Californian/SM
+Caligula/M
+Callaghan/M
+Callahan/M
+Callao/M
+Callas/M
+Callie/M
+Calliope/M
+Callisto/M
+Caloocan/M
+Calvary/M
+Calvert/M
+Calvin/M
+Calvinism/MS
+Calvinist/MS
+Calvinistic
+Camacho/M
+Camarillo/M
+Cambodia/M
+Cambodian/SM
+Cambrian/SM
+Cambridge/M
+Camden/M
+Camel/M
+Camelopardalis/M
+Camelot/MS
+Camembert/MS
+Cameron/M
+Cameroon/SM
+Cameroonian/MS
+Camilla/M
+Camille/M
+Camoens/M
+Campanella/M
+Campbell/M
+Campinas/M
+Campos/M
+Camry/M
+Camus/M
+Can/M
+Canaan/M
+Canaanite/MS
+Canad
+Canada/M
+Canadian/SM
+Canadianism
+Canaletto/M
+Canaries/M
+Canaveral/M
+Canberra/M
+Cancer/SM
+Cancun/M
+Candace/M
+Candice/M
+Candide/M
+Candy/M
+Cannes/M
+Cannon/M
+Canon/M
+Canopus/M
+Cantabrigian/M
+Canterbury/M
+Canton/M
+Cantonese/M
+Cantor/M
+Cantrell/M
+Cantu/M
+Canute/M
+Capablanca/M
+Capek/M
+Capella/M
+Capet/M
+Capetian/M
+Capetown/M
+Caph/M
+Capistrano/M
+Capitol/SM
+Capitoline/M
+Capone/M
+Capote/M
+Capra/M
+Capri/M
+Capricorn/MS
+Capt
+Capuchin/M
+Capulet/M
+Cara/M
+Caracalla/M
+Caracas/M
+Caravaggio/M
+Carboloy/M
+Carbondale/M
+Carboniferous/M
+Carborundum/M
+Cardenas/M
+Cardiff/M
+Cardin/M
+Cardozo/M
+Carey/M
+Carib/MS
+Caribbean/MS
+Carina/M
+Carissa/M
+Carl/M
+Carla/M
+Carlene/M
+Carlin/M
+Carlo/MS
+Carlos/M
+Carlsbad/M
+Carlson/M
+Carlton/M
+Carly/M
+Carlyle/M
+Carmela/M
+Carmella/M
+Carmelo/M
+Carmen/M
+Carmichael/M
+Carmine/M
+Carnap/M
+Carnation/M
+Carnegie/M
+Carney/M
+Carnot/M
+Carol/M
+Carole/M
+Carolina/M
+Caroline/M
+Carolingian/M
+Carolinian/M
+Carolyn/M
+Carpathian/SM
+Carpathians/M
+Carpenter/M
+Carr/M
+Carranza/M
+Carrie/RM
+Carrier/M
+Carrillo/M
+Carroll/M
+Carson/M
+Carter/M
+Cartersville/M
+Cartesian/M
+Carthage/M
+Carthaginian/MS
+Cartier/M
+Cartwright/M
+Caruso/M
+Carver/M
+Cary/M
+Casablanca/M
+Casals/M
+Casandra/M
+Casanova/SM
+Cascades/M
+Case/M
+Casey/M
+Cash/M
+Casio/M
+Caspar/M
+Casper/M
+Caspian/M
+Cassandra/SM
+Cassatt/M
+Cassidy/M
+Cassie/M
+Cassiopeia/M
+Cassius/M
+Castaneda/M
+Castilian
+Castillo/M
+Castlereagh/M
+Castor/M
+Castries/M
+Castro/M
+Catalan/SM
+Catalina/M
+Catalonia/M
+Catawba/M
+Caterpillar/M
+Cathay/M
+Cather/M
+Catherine/M
+Cathleen/M
+Catholic/MS
+Catholicism/MS
+Cathryn/M
+Cathy/M
+Catiline/M
+Cato/M
+Catskill/SM
+Catskills/M
+Catt/M
+Catullus/M
+Caucasian/MS
+Caucasoid
+Caucasus/M
+Cauchy/M
+Cavendish/M
+Cavour/M
+Caxton/M
+Cayenne/M
+Cayman/M
+Cayuga/SM
+Cayuse
+Cb
+Cd/M
+Ce/M
+Ceausescu/M
+Cebu/M
+Cebuano/M
+Cecelia/M
+Cecil/M
+Cecile/M
+Cecilia/M
+Cecily/M
+Cedric/M
+Celeste/M
+Celgene/M
+Celia/M
+Celina/M
+Cellini/M
+Celsius/M
+Celt/SM
+Celtic/SM
+Cenozoic/M
+Centaurus/M
+Centigrade
+Central
+Cepheid/M
+Cepheus/M
+Cerberus/M
+Cerenkov/M
+Ceres/M
+Cerf/M
+Cervantes/M
+Cesar/M
+Cesarean/M
+Cessna/M
+Cetus/M
+Ceylon/M
+Ceylonese
+Cezanne/M
+Cf/M
+Ch'in/M
+Ch/N
+Chablis/M
+Chad/M
+Chadian/MS
+Chadwick/M
+Chagall/M
+Chaitanya/M
+Chaitin/M
+Chaldea
+Chaldean/M
+Challenger/M
+Chalmers
+Chamberlain/M
+Chambers/M
+Chambersburg/M
+Champaign/M
+Champlain/M
+Champollion/M
+Chan/M
+Chance/M
+Chancellorsville/M
+Chandigarh/M
+Chandler/M
+Chandon/M
+Chandra/M
+Chandragupta/M
+Chandrasekhar/M
+Chanel/M
+Chaney/M
+Chang/M
+Changchun/M
+Changsha/M
+Chantilly/M
+Chaplin/M
+Chaplinesque
+Chapman/M
+Chappaquiddick/M
+Chapultepec/M
+Charbray/M
+Chardonnay/M
+Charity/M
+Charlemagne/M
+Charlene/M
+Charles/M
+Charleston/MS
+Charley/M
+Charlie/M
+Charlotte/M
+Charlottesville/M
+Charlottetown/M
+Charmaine/M
+Charmin/M
+Charolais/M
+Charon/M
+Chartism/M
+Chartres/M
+Charybdis/M
+Chase/M
+Chasity/M
+Chateaubriand/M
+Chattahoochee/M
+Chattanooga/M
+Chatterley/M
+Chatterton/M
+Chaucer/M
+Chauncey/M
+Chautauqua/M
+Chavez/M
+Chayefsky/M
+Che/M
+Chechen/M
+Chechnya/M
+Cheddar/M
+Cheer/M
+Cheerios/M
+Cheetos/M
+Cheever/M
+Chekhov/M
+Chekhovian
+Chelsea/M
+Chelyabinsk/M
+Chen/M
+Cheney/M
+Chengdu/M
+Chennai/M
+Cheops/M
+Cheri/M
+Cherie/M
+Chernenko/M
+Chernobyl/M
+Chernomyrdin/M
+Cherokee/MS
+Cherry/M
+Cheryl/M
+Chesapeake/M
+Cheshire/M
+Chester/M
+Chesterfield/M
+Chesterton/M
+Chevalier/M
+Cheviot/M
+Chevrolet/M
+Chevron/M
+Chevy/M
+Cheyenne/SM
+Chi/M
+Chianti/MS
+Chiba/M
+Chibcha/M
+Chicago/M
+Chicagoan/M
+Chicana/M
+Chicano/M
+Chickasaw/MS
+Chiclets/M
+Chico/M
+Chihuahua/MS
+Chile/M
+Chilean/MS
+Chimborazo/M
+Chimera/MS
+Chimu/M
+Chin/M
+China/M
+Chinatown/M
+Chinese/M
+Chinook/MS
+Chipewyan/M
+Chippendale/M
+Chippewa/SM
+Chiquita/M
+Chirico/M
+Chisholm/M
+Chisinau/M
+Chittagong/M
+Chivas/M
+Chloe/M
+Choctaw/SM
+Chomsky/M
+Chongqing/M
+Chopin/M
+Chopra/M
+Chou/M
+Chretien/M
+Chris/M
+Christ/MS
+Christa/M
+Christchurch/M
+Christendom/MS
+Christensen/M
+Christi/M
+Christian/SM
+Christianity/SM
+Christianize
+Christie/M
+Christina/M
+Christine/M
+Christlike
+Christmas/MS
+Christmastide/MS
+Christmastime/MS
+Christoper/M
+Christopher/M
+Chromebook/MS
+Chronicles
+Chrysler/M
+Chrysostom/M
+Chrystal/M
+Chuck/M
+Chukchi/M
+Chumash/M
+Chung/M
+Church/M
+Churchill/M
+Churriguera/M
+Chuvash/M
+Ci/M
+Cicero/M
+Cid/M
+Cimabue/M
+Cincinnati/M
+Cinderella/MS
+Cindy/M
+CinemaScope/M
+Cinerama/M
+Cipro/M
+Circe/M
+Cisco/M
+Citibank/M
+Citigroup/M
+Citroen/M
+Cl/MV
+Claiborne/M
+Clair/M
+Claire/M
+Clairol/M
+Clancy/M
+Clapeyron/M
+Clapton/M
+Clara/M
+Clare/M
+Clarence/M
+Clarendon/M
+Clarice/M
+Clarissa/M
+Clark/M
+Clarke/M
+Clarksville/M
+Claude/M
+Claudette/M
+Claudia/M
+Claudine/M
+Claudio/M
+Claudius/M
+Claus/M
+Clausewitz/M
+Clausius/M
+Clay/M
+Clayton/M
+Clearasil/M
+Clem/XM
+Clemenceau/M
+Clemens/M
+Clement/MS
+Clementine/M
+Clements/M
+Clemons/M
+Clemson/M
+Cleo/M
+Cleopatra/M
+Cleveland/M
+Cliburn/M
+Cliff/M
+Clifford/M
+Clifton/M
+Cline/M
+Clint/M
+Clinton/M
+Clio/M
+Clive/M
+Clojure/M
+Clorets/M
+Clorox/M
+Closure/M
+Clotho/M
+Clouseau/M
+Clovis/M
+Clyde/M
+Clydesdale/M
+Clytemnestra/M
+Cm/M
+Cmdr
+Co/M
+Cobain/M
+Cobb/M
+Cochabamba/M
+Cochin/M
+Cochise/M
+Cochran/M
+Cockney/M
+Cocteau/M
+Cod
+Cody/M
+Coffey/M
+Cognac/M
+Cohan/M
+Cohen/M
+Coimbatore/M
+Cointreau/M
+Coke/SM
+Col/M
+Colbert/M
+Colby/M
+Cole/M
+Coleen/M
+Coleman/M
+Coleridge/M
+Colette/M
+Colfax/M
+Colgate/M
+Colin/M
+Colleen/M
+Collier/M
+Collin/SM
+Collins/M
+Colo
+Cologne/M
+Colombia/M
+Colombian/MS
+Colombo/M
+Colon/M
+Coloradan/SM
+Colorado/M
+Coloradoan
+Colosseum/M
+Colt/M
+Coltrane/M
+Columbia/M
+Columbine/M
+Columbus/M
+Com
+Comanche/MS
+Combs/M
+Comdr
+Comintern/M
+Commandment
+Commons/M
+Commonwealth
+Communion/SM
+Communism
+Communist/SM
+Como/M
+Comoran
+Comoros/M
+Compaq/M
+Compton/M
+CompuServe/M
+Comte/M
+Conakry/M
+Conan/M
+Concepcion/M
+Concetta/M
+Concord/SM
+Concorde/M
+Condillac/M
+Condorcet/M
+Conestoga/M
+Confederacy/M
+Confederate/MS
+Confucian/SM
+Confucianism/MS
+Confucius/M
+Cong/M
+Congo/M
+Congolese/M
+Congregational
+Congregationalist/MS
+Congress/MS
+Congressional
+Congreve/M
+Conley/M
+Conn/MR
+Connecticut/M
+Connellsville/M
+Connemara/M
+Conner/M
+Connery/M
+Connie/M
+Connolly/M
+Connors/M
+Conrad/M
+Conrail/M
+Conroe/M
+Conservative
+Constable/M
+Constance/M
+Constantine/M
+Constantinople/M
+Constitution
+Consuelo/M
+Continent/M
+Continental/M
+Contreras/M
+Conway/M
+Cook/M
+Cooke/M
+Cooley/M
+Coolidge/M
+Cooper/M
+Cooperstown/M
+Coors/M
+Copacabana/M
+Copeland/M
+Copenhagen/M
+Copernican/M
+Copernicus/M
+Copland/M
+Copley/M
+Copperfield/M
+Coppertone/M
+Coppola/M
+Coptic/M
+Cora/M
+Cordelia/M
+Cordilleras/M
+Cordoba/M
+Corey/M
+Corfu/M
+Corina/M
+Corine/M
+Corinne/M
+Corinth/M
+Corinthian/MS
+Corinthians/M
+Coriolanus/M
+Coriolis/M
+Cork
+Corleone/M
+Cormack/M
+Corneille/M
+Cornelia/M
+Cornelius/M
+Cornell/M
+Corning/M
+Cornish/MS
+Cornwall/M
+Cornwallis/M
+Coronado/M
+Corot/M
+Corp
+Correggio/M
+Corrine/M
+Corsica/M
+Corsican/M
+Cortes/MS
+Cortland/M
+Corvallis/M
+Corvette/M
+Corvus/M
+Cory/M
+Cosby/M
+CosmosDB/M
+Cossack/M
+Costco/M
+Costello/M
+Costner/M
+Cote/M
+Cotonou/M
+Cotopaxi/M
+Cotswold/M
+Cotton/M
+Coulomb/M
+Coulter/M
+Couperin/M
+Courbet/M
+Courtney/M
+Cousteau/M
+Coventry/SM
+Covington/M
+Coward/M
+Cowell/M
+Cowley/M
+Cowper/M
+Cox/M
+Coy/M
+Coyle/M
+Cozumel/M
+Cpl
+Cr/MT
+Crabbe/M
+Craft/M
+Craig/M
+Cranach/M
+Crane/M
+Cranmer/M
+Crater/M
+Crawford/M
+Cray/M
+Crayola/M
+Creation/M
+Creator/M
+Crecy/M
+Cree/DSM
+Creek/SM
+Creighton/M
+Creole/SM
+Creon/M
+Cressida/M
+Crest/M
+Cretaceous/M
+Cretan/SM
+Crete/M
+Crichton/M
+Crick/M
+Crimea/M
+Crimean/M
+Criollo/M
+Crisco/M
+Cristina/M
+Croat/SM
+Croatia/M
+Croatian/MS
+Croce/M
+Crockett/M
+Croesus/M
+Cromwell/M
+Cromwellian/M
+Cronin/M
+Cronkite/M
+Cronus/M
+Crookes/M
+Crosby/M
+Cross/M
+Crow/SM
+Crowley/M
+Crucifixion/MS
+Cruikshank/M
+Cruise/M
+Crusades's
+Crusoe/M
+Crux/M
+Cruz/M
+Cryptozoic/M
+Crystal/M
+Csonka/M
+Ct
+Ctesiphon/M
+Cthulhu/M
+Cu/M
+Cuba/M
+Cuban/SM
+Cuchulain/M
+Cuisinart/M
+Culbertson/M
+Cullen/M
+Cumberland/M
+Cummings/M
+Cunard/M
+Cunningham/M
+Cupid/M
+Curacao/M
+Curie/M
+Curitiba/M
+Currier/M
+Curry/RM
+Curt/M
+Curtis/M
+Custer/M
+Cuvier/M
+Cuzco/M
+Cybele/M
+Cyclades/M
+Cyclopes/M
+Cyclops/M
+Cygnus/M
+Cymbeline/M
+Cynthia/M
+Cyprian/M
+Cypriot/MS
+Cyprus/M
+Cyrano/M
+Cyril/M
+Cyrillic/M
+Cyrus/M
+Czech/M
+Czechia/M
+Czechoslovak
+Czechoslovakia/M
+Czechoslovakian/SM
+Czechs
+Czerny/M
+D/M
+DA/M
+DAR
+DAT/M
+DBMS/M
+DC/M
+DD/M
+DDS/M
+DDT/S
+DE
+DEA
+DEC/SD
+DH
+DHS
+DI
+DJ
+DMCA
+DMD/M
+DMZ
+DNA/M
+DOA
+DOB
+DOD
+DOE
+DOS/M
+DOT
+DP/SM
+DPT
+DST
+DTP
+DUI
+DVD/S
+DVR/SM
+DWI
+Dachau/M
+Dacron/SM
+Dada/M
+Dadaism/M
+Daedalus/M
+Daguerre/M
+Dagwood/M
+Dahomey/M
+Daimler/M
+Daisy/M
+Dakar/M
+Dakota/SM
+Dakotan/M
+Dalai
+Dale/M
+Daley/M
+Dali/M
+Dalian/M
+Dallas/M
+Dalmatia/M
+Dalmatian/SM
+Dalton/M
+Damascus/M
+Dame/MN
+Damian/M
+Damien/M
+Damion/M
+Damocles/M
+Damon/M
+Dan/M
+Dana/M
+Danae/M
+Danbury/M
+Dane/SM
+Danelaw/M
+Dangerfield/M
+Danial/M
+Daniel/SM
+Danielle/M
+Daniels/M
+Danish/M
+Dannie/M
+Danny/M
+Danone/M
+Dante/M
+Danton/M
+Danube/M
+Danubian/M
+Danville/M
+Daphne/M
+Darby/M
+Darcy/M
+Dardanelles/M
+Dare/M
+Daren/M
+Darfur/M
+Darin/M
+Dario/M
+Darius/M
+Darjeeling/M
+Darla/M
+Darlene/M
+Darling/M
+Darnell/M
+Darrel/M
+Darrell/M
+Darren/M
+Darrin/M
+Darrow/M
+Darryl/M
+Darth/M
+Dartmoor/M
+Dartmouth/M
+Darvon/M
+Darwin/M
+Darwinian/M
+Darwinism/SM
+Darwinist
+Daryl/M
+Datamation
+Daugherty/M
+Daumier/M
+Davao/M
+Dave/M
+Davenport/M
+David/MS
+Davidson/M
+Davies/M
+Davis/M
+Davy/SM
+Dawes/M
+Dawkins
+Dawn/M
+Dawson/M
+Day/M
+Dayan
+Dayton/M
+DeGeneres/M
+DeKalb/M
+Deadhead/M
+Dean/M
+Deana/M
+Deandre/M
+Deann/M
+Deanna/M
+Deanne/M
+Death/M
+Debbie/M
+Debby/M
+Debian/M
+Debora/M
+Deborah/M
+Debouillet/M
+Debra/M
+Debs/M
+Debussy/M
+Dec/M
+Decalogue/M
+Decatur/M
+Decca/M
+Deccan/M
+December/SM
+Decker/M
+Dedekind/M
+Dee/M
+Deena/M
+Deere/M
+Defoe/M
+Degas/M
+Deidre/M
+Deimos/M
+Deirdre/M
+Deity
+Dejesus/M
+Del/M
+Delacroix/M
+Delacruz/M
+Delaney/M
+Delano/M
+Delaware/MS
+Delawarean/SM
+Delbert/M
+Deleon/M
+Delgado/M
+Delhi/M
+Delia/M
+Delibes/M
+Delicious/M
+Delilah/M
+Delilahs
+Delius/M
+Dell/M
+Della/M
+Delmar/M
+Delmarva/M
+Delmer/M
+Delmonico/M
+Delores/M
+Deloris/M
+Delphi/M
+Delphic/M
+Delphinus/M
+Delta/M
+Deltona/M
+Dem/G
+Demavend/M
+Demerol/M
+Demeter/M
+Demetrius/M
+Deming/M
+Democrat/SM
+Democratic
+Democritus/M
+Demosthenes/M
+Dempsey/M
+Dena/M
+Denali
+Deneb/M
+Denebola/M
+Deng/M
+Denis/M
+Denise/M
+Denmark/M
+Dennis/M
+Denny/M
+Denton/M
+Denver/M
+Deon/M
+Depp/M
+Derby/M
+Derek/M
+Derick/M
+Dermot/M
+Derrick/M
+Derrida/M
+Descartes/M
+Desdemona/M
+Desiree/M
+Desmond/M
+Detroit/M
+Deuteronomy/M
+Devanagari/M
+Devi/M
+Devin/M
+Devon/M
+Devonian/M
+Dewar/M
+Dewayne/M
+Dewey/M
+Dewitt/M
+Dexedrine/M
+Dexter/M
+Dhaka/M
+Dhaulagiri/M
+Di/SM
+DiCaprio/M
+DiMaggio/M
+Diaghilev/M
+Dial/M
+Diana/M
+Diane/M
+Diann/M
+Dianna/M
+Dianne/M
+Dias
+Diaspora/MS
+Dick/XM
+Dickens/M
+Dickensian
+Dickerson/M
+Dickinson/M
+Dickson/M
+Dictaphone/SM
+Diderot/M
+Dido/M
+Didrikson/M
+Diefenbaker/M
+Diego/M
+Diem/M
+Dietrich/M
+Dijkstra/M
+Dijon/M
+Dilbert/MS
+Dillard/M
+Dillinger/M
+Dillon/M
+Dina/M
+Dinah/M
+Dino/M
+Diocletian/M
+Diogenes/M
+Dion/M
+Dionne/M
+Dionysian/M
+Dionysus/M
+Diophantine/M
+Dior/M
+Dipper/M
+Dir
+Dirac/M
+Dirichlet/M
+Dirk/M
+Dis/M
+Disney/M
+Disneyland/M
+Disraeli/M
+Divine/M
+Diwali/M
+Dix/M
+Dixie/M
+Dixiecrat/M
+Dixieland/SM
+Dixon/M
+Django/M
+Djibouti/M
+Dmitri/M
+Dnepropetrovsk/M
+Dniester/M
+Dobbin/M
+Doberman/M
+Dobro/M
+Doctor
+Doctorow/M
+Dodge/M
+Dodgson/M
+Dodoma/M
+Dodson/M
+Doe/M
+Doha/M
+Dolby/M
+Dole/M
+Dollie/M
+Dolly/M
+Dolores/M
+Domesday/M
+Domingo/M
+Dominguez/M
+Dominic/M
+Dominica/M
+Dominican/MS
+Dominick/M
+Dominion
+Dominique/M
+Domitian/M
+Don/SM
+Dona/M
+Donahue/M
+Donald/M
+Donaldson/M
+Donatello/M
+Donetsk/M
+Donizetti/M
+Donn/MR
+Donna/M
+Donne/M
+Donnell/M
+Donner/M
+Donnie/M
+Donny/M
+Donovan/M
+Dooley/M
+Doolittle/M
+Doonesbury/M
+Doppler/M
+Dora/M
+Dorcas/M
+Doreen/M
+Dorian/M
+Doric/M
+Doris/M
+Doritos/M
+Dorothea/M
+Dorothy/M
+Dorset/M
+Dorsey/M
+Dorthy/M
+Dortmund/M
+Dostoevsky/M
+Dot/M
+Dothan/M
+Dotson/M
+Douala/M
+Douay/M
+Doubleday/M
+Doug/M
+Douglas/M
+Douglass/M
+Douro/M
+Dover/M
+Dow/M
+Downs/M
+Downy/M
+Doyle/M
+Dr
+Draco/M
+Draconian/M
+Dracula/M
+Drake/M
+Dramamine/SM
+Drambuie/M
+Drano/M
+Dravidian/M
+Dreiser/M
+Dresden/M
+Drew/M
+Dreyfus/M
+Dristan/M
+Dropbox/M
+Drudge/M
+Drupal/M
+Dryden/M
+Dschubba/M
+Du
+DuPont/M
+Duane/M
+Dubai/M
+Dubcek/M
+Dubhe/M
+Dublin/M
+Dubrovnik/M
+Dubuque/M
+Duchamp/M
+Dudley/M
+Duffy/M
+Duisburg/M
+Duke/M
+Dulles/M
+Duluth/M
+Dumas/M
+Dumbledore/M
+Dumbo/M
+Dunant/M
+Dunbar/M
+Duncan/M
+Dundee
+Dunedin/M
+Dunkirk/M
+Dunlap/M
+Dunn/M
+Dunne/M
+Duracell/M
+Duran/M
+Durant/M
+Durante/M
+Durban/M
+Durer/M
+Durex/M
+Durham/MS
+Durkheim/M
+Duroc/M
+Durocher/M
+Duse/M
+Dushanbe/M
+Dusseldorf/M
+Dustbuster/M
+Dustin/M
+Dusty/M
+Dutch/M
+Dutchman/M
+Dutchmen/M
+Dutchwoman
+Duvalier/M
+Dvina/M
+Dvorak/M
+Dwayne/M
+Dwight/M
+Dy/M
+Dyer/M
+Dylan/M
+DynamoDB/M
+Dyson/M
+Dzerzhinsky/M
+Dzungaria/M
+E/SM
+EC
+ECG/M
+ECMAScript/M
+EDP/M
+EDT
+EEC/M
+EEG/M
+EEO
+EEOC
+EFL
+EFT
+EKG/M
+ELF/M
+EM
+EMT
+ENE/M
+EOE
+EPA/M
+ER
+ERA
+ESE/M
+ESL
+ESP/M
+ESPN/M
+ESR
+EST/M
+ET
+ETA
+ETD
+EU
+EULA/S
+Eakins/M
+Earhart/M
+Earl/M
+Earle/M
+Earlene/M
+Earline/M
+Earnest/M
+Earnestine/M
+Earnhardt/M
+Earp/M
+East/SZMR
+Easter/M
+Eastern/R
+Eastman/M
+Eastwood/M
+Eaton/M
+Eben/M
+Ebeneezer/M
+Ebert/M
+Ebola/M
+Ebonics/M
+Ebony/M
+Ebro/M
+Ecclesiastes/M
+Eco/M
+Ecstasy
+Ecuador/M
+Ecuadoran/SM
+Ecuadorean
+Ecuadorian/SM
+Ed/MNX
+Edam/SM
+Edda/M
+Eddie/M
+Eddington/M
+Eddy/M
+Eden/M
+Edgar/M
+Edgardo/M
+Edinburgh/M
+Edison/M
+Edith/M
+Edmond/M
+Edmonton/M
+Edmund/M
+Edna/M
+Edsel/M
+Eduardo/M
+Edward/SM
+Edwardian/M
+Edwardo/M
+Edwards/M
+Edwin/M
+Edwina/M
+Eeyore/M
+Effie/M
+Efrain/M
+Efren/M
+Eggo/M
+Egypt/M
+Egyptian/MS
+Egyptology/M
+Ehrenberg/M
+Ehrlich/M
+Eichmann/M
+Eiffel/M
+Eileen/M
+Einstein/MS
+Eire/M
+Eisenhower/M
+Eisenstein/M
+Eisner/M
+Elaine/M
+Elam/M
+Elanor/M
+Elasticsearch/M
+Elastoplast/M
+Elba/M
+Elbe/M
+Elbert/M
+Elbrus/M
+Eldersburg/M
+Eldon/M
+Eleanor/M
+Eleazar/M
+Electra/M
+Elena/M
+Elgar/M
+Eli/M
+Elias/M
+Elijah/M
+Elinor/M
+Eliot/M
+Elisa/M
+Elisabeth/M
+Elise/M
+Eliseo/M
+Elisha/M
+Eliza/M
+Elizabeth/M
+Elizabethan/SM
+Elizabethtown/M
+Elkhart/M
+Ella/M
+Ellen/M
+Ellesmere/M
+Ellie/M
+Ellington/M
+Elliot/M
+Elliott/M
+Ellis/M
+Ellison/M
+Elma/M
+Elmer/M
+Elmira/M
+Elmo/M
+Elnath/M
+Elnora/M
+Elohim/M
+Eloise/M
+Eloy/M
+Elroy/M
+Elsa/M
+Elsie/M
+Elsinore/M
+Eltanin/M
+Elton/M
+Elul/M
+Elva/M
+Elvia/M
+Elvin/M
+Elvira/M
+Elvis/M
+Elway/M
+Elwood/M
+Elyria/M
+Elysee/M
+Elysian/M
+Elysium/SM
+Emacs/M
+Emanuel/M
+Emerson/M
+Emery/M
+Emil/M
+Emile/M
+Emilia/M
+Emilio/M
+Emily/M
+Eminem/M
+Eminence
+Emma/M
+Emmanuel/M
+Emmett/M
+Emmy/M
+Emory/M
+Encarta/M
+Endymion/M
+Eng/M
+Engels/M
+England/M
+English/MRS
+Englishman/M
+Englishmen/M
+Englishwoman/M
+Englishwomen/M
+Enid/M
+Enif/M
+Eniwetok/M
+Enkidu/M
+Enoch/M
+Enos/M
+Enrico/M
+Enrique/M
+Enron/M
+Enterprise/M
+Eocene/M
+Epcot/M
+Ephesian/MS
+Ephesus/M
+Ephraim/M
+Epictetus/M
+Epicurean/M
+Epicurus/M
+Epimethius/M
+Epiphany/SM
+Episcopal
+Episcopalian/MS
+Epistle
+Epsom/M
+Epson/M
+Epstein/M
+Equuleus/M
+Er/M
+Erasmus/M
+Erato/M
+Eratosthenes/M
+Erebus/M
+Erector/M
+Erewhon/M
+Erhard/M
+Eric/M
+Erica/M
+Erich/M
+Erick/M
+Ericka/M
+Erickson/M
+Eridanus/M
+Erie/M
+Erik/M
+Erika/M
+Erin/M
+Eris/MS
+Eritrea/M
+Eritrean/SM
+Erlang/M
+Erlenmeyer/M
+Erma/M
+Erna/M
+Ernest/M
+Ernestine/M
+Ernesto/M
+Ernie/M
+Ernst/M
+Eros/MS
+Errol/M
+Erse/M
+ErvIn/M
+Erwin/M
+Esau/M
+Escher/M
+Escherichia/M
+Escondido
+Eskimo/MS
+Esmeralda/M
+Esperanto/M
+Esperanza/M
+Espinoza/M
+Esq/M
+Esquire/MS
+Essen/M
+Essene/M
+Essequibo/M
+Essex/M
+Essie/M
+Establishment
+Esteban/M
+Estela/M
+Estella/M
+Estelle/M
+Ester/M
+Esterhazy/M
+Estes/M
+Esther/M
+Estonia/M
+Estonian/SM
+Estrada/M
+Ethan/M
+Ethel/M
+Ethelred/M
+Ethernet/M
+Ethiopia/M
+Ethiopian/SM
+Etna/M
+Eton/M
+Etruria/M
+Etruscan/M
+Etta/M
+Eu/M
+Eucharist/MS
+Eucharistic
+Euclid/M
+Eugene/M
+Eugenia/M
+Eugenie/M
+Eugenio/M
+Eula/M
+Euler/M
+Eumenides/M
+Eunice/M
+Euphrates/M
+Eur
+Eurasia/M
+Eurasian/MS
+Euripides/M
+Eurodollar/SM
+Europa/M
+Europe/M
+European/MS
+Eurydice/M
+Eustachian/M
+Eustis/M
+Euterpe/M
+Eva/M
+Evan/SM
+Evangelical
+Evangelina/M
+Evangeline/M
+Evangelist/M
+Evans/M
+Evansville/M
+Eve/M
+Evelyn/M
+Evenki/M
+EverReady/M
+Everest/M
+Everett/M
+Everette/M
+Everglades/M
+Evert/M
+Evian/M
+Evita/M
+Ewing/M
+Excalibur/M
+Excedrin/M
+Excellency/SM
+Exchequer
+Exercycle/M
+Exocet/M
+Exodus/M
+Exxon/M
+Eyck/M
+Eyre/M
+Eysenck/M
+Ezekiel/M
+Ezra/M
+F/MD
+FAA
+FAQ/SM
+FBI/M
+FCC
+FD
+FDA
+FDIC/M
+FDR/M
+FHA/M
+FICA/M
+FIFO
+FL
+FM/SM
+FNMA/M
+FOFL
+FORTRAN/M
+FPO
+FSF/M
+FSLIC
+FTC
+FUD/S
+FWD
+FWIW
+FY
+FYI
+Faberge/M
+Fabian/MS
+Facebook/M
+Faeroe/M
+Fafnir/M
+Fagin/M
+Fahd/M
+Fahrenheit/M
+Fairbanks/M
+Fairfield/M
+Fairhope/M
+Faisal/M
+Faisalabad/M
+Faith/M
+Fajardo/M
+Falasha/M
+Falkland/SM
+Falklands/M
+Fallopian/M
+Falstaff/M
+Falwell/M
+Fannie/M
+Fanny/M
+Faraday/M
+Fargo/M
+Farley/M
+Farmer/M
+Farmington/M
+Farragut/M
+Farrakhan/M
+Farrell/M
+Farrow/M
+Farsi/M
+Fassbinder/M
+Fatah/M
+Fates/M
+Father/SM
+Fatima/M
+Fatimid/M
+Faulkner/M
+Faulknerian/M
+Fauntleroy/M
+Faust/M
+Faustian/M
+Faustino/M
+Faustus/M
+Fawkes/M
+Fay/M
+Faye/M
+Fayetteville/M
+Fe/M
+Feb/M
+February/SM
+Fed/SM
+FedEx/M
+Federal/MS
+Federalist/M
+Federico/M
+Feds/M
+Felecia/M
+Felice/M
+Felicia/M
+Felicity/M
+Felipe/M
+Felix/M
+Fellini/M
+Fenian/M
+Ferber/M
+Ferdinand/M
+Fergus/M
+Ferguson/M
+Ferlinghetti/M
+Fermat/M
+Fermi/M
+Fern/M
+Fernandez/M
+Fernando/M
+Ferrari/M
+Ferraro/M
+Ferrell/M
+Ferris/M
+Feynman/M
+Fez/M
+Fiat/M
+Fiberglas/M
+Fibonacci/M
+Fichte/M
+Fidel/M
+Fido/M
+Fielding/M
+Fields/M
+Figaro/M
+Figueroa/M
+Fiji/M
+Fijian/MS
+Filipino/MS
+Fillmore/M
+Filofax/M
+Finch/M
+Finland/M
+Finlay/M
+Finley/M
+Finn/SM
+Finnbogadottir/M
+Finnegan/M
+Finnish/M
+Fiona/M
+Firebase/M
+Firefox/M
+Firestone/M
+Fischer/M
+Fisher/M
+Fisk/M
+Fitch/M
+Fitchburg/M
+Fitzgerald/M
+Fitzpatrick/M
+Fitzroy/M
+Fizeau/M
+Fla
+Flagstaff/M
+Flanagan/M
+Flanders/M
+Flathead
+Flatt/M
+Flaubert/M
+Fleischer/M
+Fleming/M
+Flemish/M
+Fletcher/M
+Flint/M
+Flintstones/M
+Flo/M
+Flora/M
+Florence/M
+Florentine/M
+Flores/M
+Florida/M
+Floridan/M
+Floridian/SM
+Florine/M
+Florsheim/M
+Flory/M
+Flossie/M
+Flowers/M
+Floyd/M
+Flynn/M
+Fm/M
+Foch/M
+Fokker/M
+Foley/M
+Folgers/M
+Folsom/M
+Fomalhaut/M
+Fonda/M
+Foosball/M
+Forbes/M
+Ford/M
+Foreman/M
+Forest/MR
+Forester/M
+Formica/MS
+Formosa/M
+Formosan/M
+Forrest/M
+Forster/M
+Fortaleza/M
+Fosse/M
+Foster/M
+Fotomat/M
+Foucault/M
+Fourier/M
+Fourneyron/M
+Fourth
+Fowler/M
+Fox/MS
+Fr/MD
+Fragonard/M
+Fran/M
+France/SM
+Frances/M
+Francesca/M
+Francine/M
+Francis/M
+Francisca/M
+Franciscan/MS
+Francisco/M
+Franck/M
+Franco/M
+Francois/M
+Francoise/M
+Francophile
+Franglais/M
+Frank/SM
+Frankel/M
+Frankenstein/M
+Frankfort/M
+Frankfurt/MR
+Frankfurter/M
+Frankie/M
+Frankish
+Franklin/M
+Franks/M
+Franny/M
+Franz/M
+Fraser/M
+Frau/MN
+Fraulein
+Frazier/M
+Fred/M
+Freda/M
+Freddie/M
+Freddy/M
+Frederic/M
+Frederick/M
+Fredericksburg/M
+Fredericton/M
+Fredric/M
+Fredrick/M
+Freeman/M
+Freemason/SM
+Freemasonry/SM
+Freetown/M
+Freida/M
+Fremont/M
+French/MS
+Frenchman/M
+Frenchmen/M
+Frenchwoman/M
+Frenchwomen/M
+Freon/M
+Fresnel/M
+Fresno/M
+Freud/M
+Freudian/M
+Frey/M
+Freya/M
+Fri/M
+Friday/SM
+Frieda/M
+Friedan/M
+Friedman/M
+Friedmann/M
+Friend/SM
+Frigga/M
+Frigidaire/M
+Frisbee/M
+Frisco/M
+Frisian/MS
+Frito/M
+Fritz/M
+Frobisher/M
+Frodo/M
+Froissart/M
+Fromm/M
+Fronde/M
+Frontenac/M
+Frost/M
+Frostbelt/M
+Frunze/M
+Fry/M
+Frye/M
+Fuchs/M
+Fuentes/M
+Fugger/M
+Fuji/M
+Fujian/M
+Fujitsu/M
+Fujiwara/M
+Fujiyama/M
+Fukuoka/M
+Fukuyama/M
+Fulani/M
+Fulbright/M
+Fuller/M
+Fullerton/M
+Fulton/M
+Funafuti/M
+Fundy/M
+Furies/M
+Furman/M
+Furtwangler/M
+Fushun/M
+Fuzhou/M
+Fuzzbuster/M
+G/MNRB
+GA
+GAO
+GATT/M
+GB/M
+GCC/M
+GDP/M
+GE/M
+GED
+GHQ/M
+GHz
+GI
+GIF
+GIGO
+GM/M
+GMAT
+GMO
+GMT/M
+GNP/M
+GNU/M
+GOP/M
+GP/M
+GPA
+GPO
+GPS
+GPU
+GSA
+GTE/M
+GU
+GUI/M
+Ga/M
+Gable/M
+Gabon/M
+Gabonese/M
+Gaborone/M
+Gabriel/M
+Gabriela/M
+Gabrielle/M
+Gacrux/M
+Gadsden/M
+Gaea/M
+Gael/SM
+Gaelic/M
+Gagarin/M
+Gage/M
+Gaia/M
+Gail/M
+Gaiman/M
+Gaines/M
+Gainesville/M
+Gainsborough/M
+Galahad/SM
+Galapagos/M
+Galatea/M
+Galatia/M
+Galatians/M
+Galaxy
+Galbraith/M
+Gale/M
+Galen/M
+Galibi/M
+Galilean/SM
+Galilee/M
+Galileo/M
+Gall/M
+Gallagher/M
+Gallegos/M
+Gallic/M
+Gallicism/SM
+Gallo/M
+Galloway/M
+Gallup/M
+Galois/M
+Galsworthy/M
+Galvani/M
+Galveston/M
+Gama
+Gamay/M
+Gambia/M
+Gambian/SM
+Gamble/M
+Gamow/M
+Gandalf/M
+Gandhi/M
+Gandhian/M
+Ganesha/M
+Ganges/M
+Gangtok/M
+Gansu/M
+Gantry/M
+Ganymede/M
+Gap/M
+Garbo/M
+Garcia/M
+Gardner/M
+Gareth/M
+Garfield/M
+Garfunkel/M
+Gargantua/M
+Garibaldi/M
+Garland/M
+Garner/M
+Garrett/M
+Garrick/M
+Garrison/M
+Garry/M
+Garth/M
+Garvey/M
+Gary/M
+Garza/M
+Gascony/M
+Gasser/M
+Gastonia/M
+Gastroenterology
+Gates/M
+Gatling/M
+Gatorade/M
+Gatsby/M
+Gatun/M
+Gauguin/M
+Gaul/SM
+Gaulish
+Gauss/M
+Gaussian/M
+Gautama/M
+Gautier/M
+Gavin/M
+Gawain/M
+Gay/M
+Gayle/M
+Gaza/M
+Gaziantep/M
+Gd/M
+Gdansk/M
+Ge/M
+Geffen/M
+Gehenna/M
+Gehrig/M
+Geiger/M
+Gelbvieh/M
+Geller/M
+Gemini/MS
+Gen/M
+Gena/M
+Genaro/M
+Gene/M
+Genesis/M
+Genet/M
+Geneva/M
+Genevieve/M
+Genghis/M
+Genoa/SM
+Gentoo/M
+Gentry/M
+Geo/M
+Geoffrey/M
+George/MS
+Georgetown/M
+Georgette/M
+Georgia/M
+Georgian/MS
+Georgina/M
+Ger/M
+Gerald/M
+Geraldine/M
+Gerard/M
+Gerardo/M
+Gerber/M
+Gere/M
+Geritol/M
+German/MS
+Germanic/M
+Germany/M
+Geronimo/M
+Gerry/M
+Gershwin/M
+Gertrude/M
+Gestapo/SM
+Gethsemane/M
+Getty/M
+Gettysburg/M
+Gewurztraminer/M
+Ghana/M
+Ghanaian
+Ghats/M
+Ghazvanid/M
+Ghent/M
+Ghibelline/M
+Giacometti/M
+Giannini/M
+Giauque/M
+Gibbon/M
+Gibbs/M
+Gibraltar/MS
+Gibson/M
+Gide/M
+Gideon/M
+Gielgud/M
+Gienah/M
+Gil/M
+Gila/M
+Gilbert/M
+Gilberto/M
+Gilchrist/M
+Gilda/M
+Gilead/M
+Giles/M
+Gilgamesh/M
+Gill/M
+Gillespie/M
+Gillette/M
+Gilliam/M
+Gillian/M
+Gilligan/M
+Gilman
+Gilmore/M
+Gilroy/M
+Gina/M
+Ginger/M
+Gingrich/M
+Ginny/M
+Gino/M
+Ginsberg/M
+Ginsburg/M
+Ginsu/M
+Giorgione/M
+Giotto/M
+Giovanni/M
+Giraudoux/M
+Giselle/M
+Gish/M
+GitHub/M
+Giuliani/M
+Giuseppe/M
+Giza/M
+Gk
+Gladstone/MS
+Gladys/M
+Glaser/M
+Glasgow/M
+Glass/M
+Glastonbury/M
+Glaswegian/SM
+Glaxo/M
+Gleason/M
+Glen/M
+Glenda/M
+Glendale
+Glenlivet/M
+Glenn/M
+Glenna/M
+Gloria/M
+Gloucester/M
+Glover/M
+Gnostic/M
+Gnosticism/M
+GnuPG
+Goa/M
+Gobi/M
+God/M
+Godard/M
+Goddard/M
+Godel/M
+Godhead/M
+Godiva/M
+Godot/M
+Godspeed/SM
+Godthaab/M
+Godunov/M
+Godzilla/M
+Goebbels/M
+Goering/M
+Goethals/M
+Goethe/M
+Goff/M
+Gog/M
+Gogol/M
+Goiania/M
+Golan/M
+Golconda/M
+Golda/M
+Goldberg/M
+Golden/M
+Goldie/M
+Goldilocks/M
+Golding/M
+Goldman/M
+Goldsboro/M
+Goldsmith/M
+Goldwater/M
+Goldwyn/M
+Golgi/M
+Golgotha/M
+Goliath/M
+Gomez/M
+Gomorrah/M
+Gompers/M
+Gomulka/M
+Gondwanaland/M
+Gonzales/M
+Gonzalez/M
+Gonzalo/M
+Good/M
+Goodall/M
+Goode/M
+Goodman/M
+Goodrich/M
+Goodwill/M
+Goodwin/M
+Goodyear/M
+Google/M
+Goolagong/M
+Gopher
+Gorbachev/M
+Gordian/M
+Gordimer/M
+Gordon/M
+Gore/M
+Goren/M
+Gorey/M
+Gorgas/M
+Gorgon/M
+Gorgonzola/M
+Gorky/M
+Gospel/MS
+Goteborg/M
+Goth/M
+Gotham/M
+Gothic/MS
+Goths
+Gouda/SM
+Gould/M
+Gounod/M
+Governor
+Goya/M
+Gr/B
+Grable/M
+Gracchus/M
+Grace/M
+Graceland/M
+Gracie/M
+Graciela/M
+Grady/M
+Graffias/M
+Grafton/M
+Graham/M
+Grahame/M
+Grail/M
+Grammy/M
+Grampians/M
+Granada/M
+Grant/M
+Grass/M
+Graves/M
+Gray/M
+Grayslake/M
+Grecian/M
+Greece/M
+Greek/SM
+Greeley/M
+Green/SM
+Greene/M
+Greenland/M
+Greenlandic
+Greenpeace/M
+Greensboro/M
+Greensleeves/M
+Greenspan/M
+Greenville/M
+Greenwich/M
+Greer/M
+Greg/M
+Gregg/M
+Gregorian/M
+Gregorio/M
+Gregory/M
+Grenada/M
+Grenadian/MS
+Grenadines/M
+Grendel/M
+Grenoble/M
+Gresham/M
+Greta/M
+Gretchen/M
+Gretel/M
+Gretzky/M
+Grey/M
+Grieg/M
+Griffin/M
+Griffith/M
+Grimes/M
+Grimm/M
+Grinch/M
+Gris/M
+Gromyko/M
+Gropius/M
+Gross/M
+Grosz/M
+Grotius/M
+Grover/M
+Grozny
+Grumman/M
+Grundy/M
+Grunewald/M
+Grus/M
+Gruyere/SM
+Guadalajara/M
+Guadalcanal/M
+Guadalquivir/M
+Guadalupe/M
+Guadeloupe/M
+Guallatiri/M
+Guam/M
+Guamanian
+Guangdong/M
+Guangzhou/M
+Guantanamo/M
+Guarani/M
+Guarnieri/M
+Guatemala/M
+Guatemalan/MS
+Guayama/M
+Guayaquil/M
+Gucci/M
+Guelph/M
+Guernsey/MS
+Guerra/M
+Guerrero/M
+Guevara/M
+Guggenheim/M
+Guiana/M
+Guido
+Guillermo/M
+Guinea/M
+Guinean/MS
+Guinevere/M
+Guinness/M
+Guiyang/M
+Guizhou/M
+Guizot/M
+Gujarat/M
+Gujarati/M
+Gujranwala/M
+Gulfport/M
+Gullah/M
+Gulliver/M
+Gumbel/M
+Gunther/M
+Guofeng/M
+Gupta/M
+Gurkha/M
+Gus/M
+Gustav/M
+Gustavo/M
+Gustavus/M
+Gutenberg/M
+Guthrie/M
+Gutierrez/M
+Guy/M
+Guyana/M
+Guyanese/M
+Guzman/M
+Gwalior/M
+Gwen/M
+Gwendoline/M
+Gwendolyn/M
+Gwyn/M
+Gypsy/SM
+H/M
+HBO/M
+HBase/M
+HDD
+HDMI
+HDTV
+HF/M
+HHS
+HI
+HIV/M
+HM
+HMO/M
+HMS
+HOV
+HP/M
+HPV
+HQ/M
+HR
+HRH
+HS
+HSBC/M
+HST
+HT
+HTML/M
+HTTP
+HUD/M
+Ha/M
+Haas/M
+Habakkuk/M
+Haber/M
+Hadar/M
+Hades/M
+Hadoop/M
+Hadrian/M
+Hafiz/M
+Hagar/M
+Hagerstown/M
+Haggai/M
+Hagiographa/M
+Hague/M
+Hahn/M
+Haida/SM
+Haifa/M
+Hainan/M
+Haiphong/M
+Haiti/M
+Haitian/MS
+Hakka/M
+Hakluyt/M
+Hal/SM
+Haldane/M
+Hale/M
+Haleakala/M
+Haley/M
+Halifax/M
+Hall/M
+Halley/M
+Halliburton/M
+Hallie/M
+Hallmark/M
+Halloween/MS
+Hallstatt/M
+Halon/M
+Hals/M
+Halsey/M
+Ham/M
+Haman/M
+Hamburg/MS
+Hamhung/M
+Hamilcar/M
+Hamill/M
+Hamilton/M
+Hamiltonian/M
+Hamitic/M
+Hamlet/M
+Hamlin/M
+Hammarskjold/M
+Hammerstein/M
+Hammett/M
+Hammond/M
+Hammurabi/M
+Hampshire/M
+Hampton/M
+Hamsun/M
+Han/SM
+Hancock/M
+Handel/M
+Handy/M
+Haney/M
+Hanford/M
+Hangul/M
+Hangzhou/M
+Hank/M
+Hanna/M
+Hannah/M
+Hannibal/M
+Hanoi/M
+Hanover/M
+Hanoverian/M
+Hans/MN
+Hansel/M
+Hansen/M
+Hanson/M
+Hanuka
+Hanukkah/M
+Hanukkahs
+Hapsburg/M
+Harare/M
+Harbin/M
+Hardin/M
+Harding/M
+Hardy/M
+Hargreaves/M
+Harlan/M
+Harlem/M
+Harlequin/M
+Harley/M
+Harlingen/M
+Harlow/M
+Harmon/M
+Harold/M
+Harper/M
+Harpy/SM
+Harrell/M
+Harriet/M
+Harriett/M
+Harrington/M
+Harris/M
+Harrisburg/M
+Harrison/M
+Harrisonburg/M
+Harrods/M
+Harry/M
+Hart/M
+Harte/M
+Hartford/M
+Hartline/M
+Hartman/M
+Harvard/M
+Harvey/M
+Hasbro/M
+Hasidim/M
+Haskell/M
+Hastings/M
+Hatfield/M
+Hathaway/M
+Hatsheput/M
+Hatteras/M
+Hattie/M
+Hattiesburg/M
+Hauptmann/M
+Hausa/M
+Hausdorff/M
+Havana/MS
+Havarti/M
+Havel/M
+Havoline/M
+Haw
+Hawaii/M
+Hawaiian/SM
+Hawking/M
+Hawkins/M
+Hawks
+Hawthorne/M
+Hay/SM
+Hayden/M
+Haydn/M
+Hayek/M
+Hayes/M
+Haynes/M
+Hays/M
+Hayward/M
+Haywood/M
+Hayworth/M
+Hazel/M
+Hazleton/M
+Hazlitt/M
+He/M
+Head/M
+Hearst/M
+Heath/MR
+Heather/M
+Heaviside/M
+Heb
+Hebe/M
+Hebei/M
+Hebert/M
+Hebraic/M
+Hebraism/SM
+Hebrew/MS
+Hebrews/M
+Hebrides/M
+Hecate/M
+Hector/M
+Hecuba/M
+Heep/M
+Hefner/M
+Hegel/M
+Hegelian/M
+Hegira/M
+Heidegger/M
+Heidelberg/M
+Heidi/M
+Heifetz/M
+Heilongjiang/M
+Heimlich/M
+Heine/M
+Heineken/M
+Heinlein/M
+Heinrich/M
+Heinz/M
+Heisenberg/M
+Heisman/M
+Helen/M
+Helena/M
+Helene/M
+Helga/M
+Helicobacter
+Helicon/M
+Heliopolis/M
+Helios/M
+Hellene/SM
+Hellenic/M
+Hellenism/MS
+Hellenist
+Hellenistic/M
+Hellenization/M
+Hellenize/M
+Heller/M
+Hellespont/M
+Hellman/M
+Helmholtz/M
+Heloise/M
+Helsinki/M
+Helvetian
+Helvetius/M
+Hemet/M
+Hemingway/M
+Henan/M
+Hench/M
+Henderson/M
+Hendrick/MS
+Hendricks/M
+Hendrix/M
+Henley/M
+Hennessy/M
+Henri/M
+Henrietta/M
+Henrik/M
+Henry/M
+Hensley/M
+Henson/M
+Hepburn/M
+Hephaestus/M
+Hepplewhite/M
+Hera/M
+Heracles/M
+Heraclitus/M
+Herakles/M
+Herbart/M
+Herbert/M
+Herculaneum/M
+Herculean
+Hercules/M
+Herder/M
+Hereford/SM
+Herero/M
+Heriberto/M
+Herman/M
+Hermaphroditus/M
+Hermes/M
+Herminia/M
+Hermitage/M
+Hermite/M
+Hermosillo/M
+Hernandez/M
+Herod/M
+Herodotus/M
+Heroku/M
+Herr/MG
+Herrera/M
+Herrick/M
+Herring/M
+Herschel/M
+Hersey/M
+Hershel/M
+Hershey/M
+Hertz/M
+Hertzsprung/M
+Herzegovina/M
+Herzl/M
+Heshvan/M
+Hesiod/M
+Hesperia/M
+Hesperus/M
+Hess/M
+Hesse/M
+Hessian/M
+Hester/M
+Heston/M
+Hettie/M
+Hewitt/M
+Hewlett/M
+Heyerdahl/M
+Heywood/M
+Hezbollah/M
+Hezekiah/M
+Hf/M
+Hg/M
+Hialeah/M
+Hiawatha/M
+Hibernia/M
+Hibernian
+Hickman/M
+Hickok/M
+Hickory/M
+Hicks/M
+Hieronymus/M
+Higashiosaka
+Higgins/M
+Highlander/SM
+Highlands
+Highness/M
+Hightstown/M
+Hilario/M
+Hilary/M
+Hilbert/M
+Hilda/M
+Hildebrand/M
+Hilfiger/M
+Hill/M
+Hillary/M
+Hillel/M
+Hilton/M
+Himalaya/SM
+Himalayan
+Himalayas/M
+Himmler/M
+Hinayana/M
+Hindemith/M
+Hindenburg/M
+Hindi/M
+Hindu/SM
+Hinduism/SM
+Hindustan/M
+Hindustani/SM
+Hines/M
+Hinesville/M
+Hinton/M
+Hipparchus/M
+Hippocrates/M
+Hippocratic/M
+Hiram/M
+Hirobumi/M
+Hirohito/M
+Hiroshima/M
+Hispanic/SM
+Hispaniola/M
+Hiss/M
+Hitachi/M
+Hitchcock/M
+Hitler/MS
+Hittite/SM
+Hmong/M
+Ho/M
+Hobart/M
+Hobbes/M
+Hobbs/M
+Hockney/M
+Hodge/SM
+Hodges/M
+Hodgkin/M
+Hoff/M
+Hoffa/M
+Hoffman/M
+Hofstadter/M
+Hogan/M
+Hogarth/M
+Hogwarts/M
+Hohenlohe/M
+Hohenstaufen/M
+Hohenzollern/M
+Hohhot/M
+Hohokam/M
+Hokkaido/M
+Hokusai/M
+Holbein/M
+Holcomb/M
+Holden/M
+Holder/M
+Holiday/M
+Holiness
+Holland/ZSMR
+Hollander/M
+Hollerith/M
+Holley/M
+Hollie/M
+Hollis/M
+Holloway/M
+Holly/M
+Hollywood/M
+Holman/M
+Holmes/M
+Holocaust/M
+Holocene/M
+Holst/M
+Holstein/SM
+Holt/M
+Homer/M
+Homeric/M
+Hon
+Honda/M
+Honduran/MS
+Honduras/M
+Honecker/M
+Honeywell/M
+Hong
+Honiara/M
+Honolulu/M
+Honorable
+Honshu/M
+Hood/M
+Hooke/RM
+Hooker/M
+Hooper/M
+Hoosier/MS
+Hooters/M
+Hoover/MS
+Hope/M
+Hopewell/M
+Hopi/SM
+Hopkins/M
+Hopper/M
+Horace/M
+Horacio/M
+Horatio/M
+Hormel/M
+Hormuz/M
+Horn/M
+Hornblower/M
+Horne/M
+Horowitz/M
+Horthy/M
+Horton/M
+Horus/M
+Hosea/M
+Host/SM
+Hotpoint/M
+Hottentot/SM
+Houdini/M
+Houma/M
+House/M
+Housman/M
+Houston/M
+Houyhnhnm/M
+Hovhaness/M
+Howard/M
+Howe/M
+Howell/MS
+Howells/M
+Howrah
+Hoyle/M
+Hrothgar/M
+Hts
+Huang/M
+Hubbard/M
+Hubble/M
+Hubei/M
+Huber/M
+Hubert/M
+Huck/M
+Huddersfield
+Hudson/M
+Huerta/M
+Huey/M
+Huff/M
+Huffman/M
+Huggins/M
+Hugh/MS
+Hughes/M
+Hugo/M
+Huguenot/MS
+Hui/M
+Huitzilopotchli/M
+Hull/M
+Humberto/M
+Humboldt/M
+Hume/M
+Hummel/M
+Hummer/M
+Humphrey/SM
+Humvee/M
+Hun/SM
+Hunan/M
+Hung/M
+Hungarian/SM
+Hungary/M
+Hunspell/M
+Hunt/MR
+Hunter/M
+Huntington/M
+Huntley/M
+Huntsville/M
+Hurd/M
+Hurley/M
+Huron/M
+Hurst/M
+Hus/M
+Hussein/M
+Husserl/M
+Hussite/M
+Huston/M
+Hutchinson/M
+Hutton/M
+Hutu/M
+Huxley/M
+Huygens/M
+Hyades/M
+Hyde/M
+Hyderabad/M
+Hydra/M
+Hymen/M
+Hyperion/M
+Hyundai/M
+Hz/M
+I'd
+I'll
+I'm
+I've
+I/M
+IA
+IBM/M
+ICBM/SM
+ICC
+ICU
+ID/SM
+IDE
+IE
+IED
+IEEE
+IKEA/M
+IL
+IMF/M
+IMHO
+IMNSHO
+IMO
+IN
+ING/M
+INRI
+INS
+IOU/M
+IP
+IPA
+IPO
+IQ/M
+IRA/SM
+IRC
+IRS/M
+ISBN
+ISIS
+ISO/M
+ISP
+ISS
+IT
+IUD
+IV/SM
+IVF
+Ia
+Iaccoca/M
+Iago/M
+Ian/M
+Iapetus/M
+Ibadan/M
+Iberia/M
+Iberian/M
+Ibiza/M
+Iblis/M
+Ibo/M
+Ibsen/M
+Icahn/M
+Icarus/M
+Ice
+Iceland/MRZ
+Icelander/M
+Icelandic/M
+Ida/M
+Idaho/SM
+Idahoan/MS
+Idahoes
+Ieyasu/M
+Ignacio/M
+Ignatius/M
+Igor/M
+Iguassu/M
+Ijsselmeer/M
+Ike/M
+Ikhnaton/M
+Ila/M
+Ilene/M
+Iliad/SM
+Ill
+Illinois/M
+Illinoisan/MS
+Illuminati/M
+Ilyushin/M
+Imelda/M
+Imhotep/M
+Imodium/M
+Imogene/M
+Imus/M
+In/M
+Ina/M
+Inc
+Inca/SM
+Inchon/M
+Incorporated
+Ind
+Independence/M
+India/M
+Indian/MS
+Indiana/M
+Indianan/SM
+Indianapolis/M
+Indianian
+Indies/M
+Indio/M
+Indira/M
+Indochina/M
+Indochinese/M
+Indonesia/M
+Indonesian/SM
+Indore/M
+Indra/M
+Indus/M
+Indy/SM
+Ines/M
+Inez/M
+Inge/M
+Inglewood
+Ingram/M
+Ingres/M
+Ingrid/M
+Innocent/M
+Innsbruck
+Inonu/M
+Inquisition/M
+Inst
+Instagram/M
+Instamatic/M
+Intel/M
+Intelsat/M
+Internationale/M
+Internet/SM
+Interpol/M
+Inuit/MS
+Inuktitut/M
+Invar/M
+Io/M
+Ionesco/M
+Ionian/MS
+Ionic/SM
+Iowa/SM
+Iowan/MS
+Iphigenia/M
+Ipswich
+Iqaluit/M
+Iqbal/M
+Iquitos/M
+Ir/M
+Ira/M
+Iran/M
+Iranian/SM
+Iraq/M
+Iraqi/MS
+Ireland/M
+Irene/M
+Iris/M
+Irish/MR
+Irishman/M
+Irishmen/M
+Irishwoman/M
+Irishwomen/M
+Irkutsk/M
+Irma/M
+Iroquoian/SM
+Iroquois/M
+Irrawaddy/M
+Irtish/M
+Irvin/M
+Irvine/M
+Irving/M
+Irwin/M
+Isaac/M
+Isabel/M
+Isabela/M
+Isabella/M
+Isabelle/M
+Isaiah/M
+Iscariot/M
+Isfahan/M
+Isherwood/M
+Ishim/M
+Ishmael/M
+Ishtar/M
+Isiah/M
+Isidro/M
+Isis/M
+Islam/MS
+Islamabad/M
+Islamic/M
+Islamism/M
+Islamist/M
+Islamophobia
+Islamophobic
+Ismael/M
+Ismail/M
+Isolde/M
+Ispell/M
+Israel/SM
+Israeli/SM
+Israelite/M
+Issac/M
+Issachar/M
+Istanbul/M
+Isuzu/M
+It
+Itaipu/M
+Ital
+Italian/SM
+Italianate
+Italy/M
+Itasca/M
+Ithaca/M
+Ithacan/M
+Ito/M
+Iva/M
+Ivan/M
+Ivanhoe/M
+Ives/M
+Ivorian
+Ivory/M
+Ivy/M
+Iyar/M
+Izaak/M
+Izanagi/M
+Izanami/M
+Izhevsk/M
+Izmir/M
+Izod/M
+Izvestia/M
+J/MD
+JCS
+JD
+JFK/M
+JP
+JPEG
+JV
+Jack/M
+Jackie/M
+Jacklyn/M
+Jackson/M
+Jacksonian/M
+Jacksonville/M
+Jacky/M
+Jaclyn/M
+Jacob/SM
+Jacobean/M
+Jacobi/M
+Jacobin/M
+Jacobite/M
+Jacobs/M
+Jacobson/M
+Jacquard/M
+Jacqueline/M
+Jacquelyn/M
+Jacques/M
+Jacuzzi/M
+Jagger/M
+Jagiellon/M
+Jaguar/M
+Jahangir/M
+Jaime/M
+Jain/M
+Jainism/M
+Jaipur/M
+Jakarta/M
+Jake/M
+Jamaal/M
+Jamaica/M
+Jamaican/SM
+Jamal/M
+Jamar/M
+Jame/SM
+Jamel/M
+James/M
+Jamestown/M
+Jami/M
+Jamie/M
+Jan/M
+Jana/M
+Janacek/M
+Jane/M
+Janell/M
+Janelle/M
+Janesville/M
+Janet/M
+Janette/M
+Janice/M
+Janie/M
+Janine/M
+Janis/M
+Janissary/M
+Janjaweed/M
+Janna/M
+Jannie/M
+Jansen/M
+Jansenist/M
+January/SM
+Janus/M
+Jap/SM
+Japan/M
+Japanese/MS
+Japura/M
+Jared/M
+Jarlsberg/M
+Jarred/M
+Jarrett/M
+Jarrod/M
+Jarvis/M
+Jasmine/M
+Jason/M
+Jasper/M
+Jataka/M
+Java/SM
+JavaScript/M
+Javanese/M
+Javier/M
+Jaxartes/M
+Jay/M
+Jayapura/M
+Jayawardene/M
+Jaycee/MS
+Jaycees/M
+Jayne/M
+Jayson/M
+Jean/M
+Jeanette/M
+Jeanie/M
+Jeanine/M
+Jeanne/M
+Jeannette/M
+Jeannie/M
+Jeannine/M
+Jed/M
+Jedi/M
+Jeep/M
+Jeeves/M
+Jeff/M
+Jefferey/M
+Jefferson/M
+Jeffersonian/M
+Jeffery/M
+Jeffrey/M
+Jeffry/M
+Jehoshaphat/M
+Jehovah/M
+Jekyll/M
+Jenifer/M
+Jenkins/M
+Jenna/M
+Jenner/M
+Jennie/M
+Jennifer/M
+Jennings/M
+Jenny/M
+Jensen/M
+Jephthah/M
+Jerald/M
+Jeremiah/M
+Jeremiahs
+Jeremy/M
+Jeri/M
+Jericho/M
+Jermaine/M
+Jeroboam/M
+Jerold/M
+Jerome/M
+Jerri/M
+Jerrod/M
+Jerrold/M
+Jerry/M
+Jersey/MS
+Jerusalem/M
+Jess/M
+Jesse/M
+Jessica/M
+Jessie/M
+Jesuit/MS
+Jesus/M
+Jetway/M
+Jew/SM
+Jewel/M
+Jewell/M
+Jewess/MS
+Jewish/PM
+Jewry/M
+Jezebel/SM
+Jiangsu/M
+Jiangxi/M
+Jidda/M
+Jilin/M
+Jill/M
+Jillian/M
+Jim/M
+Jimenez/M
+Jimmie/M
+Jimmy/M
+Jinan/M
+Jinnah/M
+Jinny/M
+Jivaro/M
+Jo/M
+Joan/M
+Joann/M
+Joanna/M
+Joanne/M
+Joaquin/M
+Job/SM
+Jobs/M
+Jocasta/M
+Jocelyn/M
+Jock/M
+Jockey/M
+Jodi/M
+Jodie/M
+Jody/M
+Joe/M
+Joel/M
+Joey/M
+Jogjakarta/M
+Johann/M
+Johanna/M
+Johannes/M
+Johannesburg/M
+John/SM
+Johnathan/M
+Johnathon/M
+Johnie/M
+Johnnie/M
+Johnny/M
+Johns/M
+Johnson/M
+Johnston/M
+Johnstown/M
+Jolene/M
+Jolson/M
+Jon/M
+Jonah/M
+Jonahs
+Jonas/M
+Jonathan/M
+Jonathon/M
+Jones/M
+Jonesboro/M
+Joni/M
+Jonson/M
+Joplin/M
+Jordan/M
+Jordanian/MS
+Jorge/M
+Jose/M
+Josef/M
+Josefa/M
+Josefina/M
+Joseph/M
+Josephine/M
+Josephs
+Josephson/M
+Josephus/M
+Josh/M
+Joshua/M
+Josiah/M
+Josie/M
+Josue/M
+Joule/M
+Jove/M
+Jovian/M
+Joy/M
+Joyce/M
+Joycean/M
+Joyner/M
+Jpn
+Jr/M
+Juan/M
+Juana/M
+Juanita/M
+Juarez/M
+Jubal/M
+Judaeo
+Judah/M
+Judaic
+Judaical
+Judaism/MS
+Judas/MS
+Judd/M
+Jude/M
+Judea/M
+Judges
+Judith/M
+Judson/M
+Judy/M
+Juggernaut/M
+Jul
+Jules/M
+Julia/M
+Julian/M
+Juliana/M
+Julianne/M
+Julie/M
+Juliet/M
+Juliette/M
+Julio/M
+Julius/M
+Julliard/M
+July/SM
+Jun/M
+June/SM
+Juneau/M
+Jung/M
+Jungfrau/M
+Jungian/M
+Junior/SM
+Junker/SM
+Juno/M
+Jupiter/M
+Jurassic/M
+Jurua/M
+Justice/M
+Justin/M
+Justine/M
+Justinian/M
+Jutland/M
+Juvenal/M
+K/SMNGJ
+KB/M
+KC
+KFC/M
+KGB/M
+KIA
+KKK/M
+KO/M
+KP
+KS
+KY
+Kaaba/M
+Kabul/M
+Kafka/M
+Kafkaesque/M
+Kagoshima/M
+Kahlua/M
+Kahului/M
+Kaifeng/M
+Kailua/M
+Kaiser/MS
+Kaitlin/M
+Kalahari/M
+Kalamazoo/M
+Kalashnikov/M
+Kalb/M
+Kalevala/M
+Kalgoorlie/M
+Kali/M
+Kalmyk/M
+Kama/M
+Kamchatka/M
+Kamehameha/M
+Kampala/M
+Kampuchea/M
+Kan/SM
+Kanchenjunga/M
+Kandahar/M
+Kandinsky/M
+Kane/M
+Kaneohe/M
+Kankakee/M
+Kannada/M
+Kano/M
+Kanpur/M
+Kansan/MS
+Kansas/M
+Kant/M
+Kantian/M
+Kaohsiung/M
+Kaposi/M
+Kara/M
+Karachi/M
+Karaganda/M
+Karakorum/M
+Karamazov/M
+Kareem/M
+Karen/M
+Karenina/M
+Kari/M
+Karin/M
+Karina/M
+Karl/M
+Karla/M
+Karloff/M
+Karo/M
+Karol/M
+Karroo/M
+Karyn/M
+Kasai/M
+Kasey/M
+Kashmir/SM
+Kasparov/M
+Kate/M
+Katelyn/M
+Katharine/M
+Katherine/M
+Katheryn/M
+Kathiawar/M
+Kathie/M
+Kathleen/M
+Kathmandu/M
+Kathrine/M
+Kathryn/M
+Kathy/M
+Katie/M
+Katina/M
+Katmai/M
+Katowice/M
+Katrina/M
+Katy/M
+Kauai/M
+Kaufman/M
+Kaunas/M
+Kaunda/M
+Kawabata/M
+Kawasaki/M
+Kay/M
+Kaye/M
+Kayla/M
+Kazakh/M
+Kazakhs
+Kazakhstan/M
+Kazan/M
+Kazantzakis/M
+Kb/M
+Keaton/M
+Keats/M
+Keck/M
+Keenan/M
+Keewatin/M
+Keillor/M
+Keisha/M
+Keith/M
+Keller/M
+Kelley/M
+Kelli/M
+Kellie/M
+Kellogg/M
+Kelly/M
+Kelsey/M
+Kelvin/M
+Kemerovo/M
+Kemp/M
+Kempis/M
+Ken/M
+Kendall/M
+Kendra/M
+Kendrick/M
+Kenmore/M
+Kennan/M
+Kennedy/M
+Kenneth/M
+Kennewick/M
+Kennith/M
+Kenny/M
+Kenosha/M
+Kent/M
+Kenton/M
+Kentuckian/MS
+Kentucky/M
+Kenya/M
+Kenyan/SM
+Kenyatta/M
+Kenyon/M
+Keogh/M
+Keokuk/M
+Kepler/M
+Kerensky/M
+Keri/M
+Kermit/M
+Kern/M
+Kerouac/M
+Kerr/M
+Kerri/M
+Kerry/M
+Kettering/M
+Keven/M
+Kevin/M
+Kevlar/M
+Kevorkian/M
+Kewpie/M
+Key/M
+Keynes/M
+Keynesian/M
+Khabarovsk/M
+Khachaturian/M
+Khalid/M
+Khan/M
+Kharkov/M
+Khartoum/M
+Khayyam/M
+Khazar/M
+Khmer/M
+Khoikhoi/M
+Khoisan/M
+Khomeini/M
+Khorana/M
+Khrushchev/M
+Khufu/M
+Khulna/M
+Khwarizmi/M
+Khyber/M
+Kickapoo/M
+Kidd/M
+Kiel/M
+Kierkegaard/M
+Kieth/M
+Kiev/M
+Kigali/M
+Kikuyu/M
+Kilauea/M
+Kilimanjaro/M
+Killeen/M
+Kilroy/M
+Kim/M
+Kimberley/M
+Kimberly/M
+King/M
+Kingsport/M
+Kingston/M
+Kingstown/M
+Kinko's
+Kinney/M
+Kinsey/M
+Kinshasa/M
+Kiowa/MS
+Kip/M
+Kipling/M
+Kirby/M
+Kirchhoff/M
+Kirchner/M
+Kirghistan/M
+Kirghiz/M
+Kirghizia/M
+Kiribati/M
+Kirinyaga/M
+Kirk/M
+Kirkland/M
+Kirkpatrick/M
+Kirov/M
+Kirsten/M
+Kisangani/M
+Kishinev/M
+Kislev/M
+Kissimmee/M
+Kissinger/M
+Kit/M
+Kitakyushu/M
+Kitchener/M
+Kitty/M
+Kiwanis/M
+Klan/M
+Klansman/M
+Klaus/M
+Klee/M
+Kleenex/MS
+Klein/M
+Klimt/M
+Kline/M
+Klingon/M
+Klondike/MS
+Kmart/M
+Knapp/M
+Knesset/M
+Kngwarreye/M
+Knickerbocker/M
+Knievel/M
+Knight/M
+Knopf/M
+Knossos/M
+Knowles/M
+Knox/M
+Knoxville/M
+Knudsen/M
+Knuth/M
+Knuths
+Kobe/M
+Koch/M
+Kochab/M
+Kodachrome/M
+Kodak/M
+Kodaly/M
+Kodiak/M
+Koestler/M
+Kohinoor/M
+Kohl/M
+Koizumi/M
+Kojak/M
+Kokomo/M
+Kolyma/M
+Kommunizma/M
+Kong/M
+Kongo/M
+Konrad/M
+Koontz/M
+Koppel/M
+Korea/M
+Korean/SM
+Kornberg/M
+Kory/M
+Korzybski/M
+Kosciusko/M
+Kossuth/M
+Kosygin/M
+Kotlin/M
+Koufax/M
+Kowloon/M
+Kr/M
+Kraft/M
+Krakatoa/M
+Krakow/M
+Kramer/M
+Krasnodar/M
+Krasnoyarsk/M
+Krebs/M
+Kremlin/M
+Kremlinologist
+Kremlinology
+Kresge/M
+Kringle/M
+Kris/M
+Krishna/M
+Krishnamurti/M
+Krista/M
+Kristen/M
+Kristi/M
+Kristie/M
+Kristin/M
+Kristina/M
+Kristine/M
+Kristopher/M
+Kristy/M
+Kroc/M
+Kroger/M
+Kronecker/M
+Kropotkin/M
+Kruger/M
+Krugerrand/M
+Krupp/M
+Krystal/M
+Kshatriya/M
+Kublai/M
+Kubrick/M
+Kuhn/M
+Kuibyshev/M
+Kulthumm/M
+Kunming/M
+Kuomintang/M
+Kurd/M
+Kurdish/M
+Kurdistan/M
+Kurosawa/M
+Kurt/M
+Kurtis/M
+Kusch/M
+Kutuzov/M
+Kuwait/M
+Kuwaiti/SM
+Kuznets/M
+Kuznetsk/M
+Kwakiutl/M
+Kwan/M
+Kwangju/M
+Kwanzaa/MS
+Ky/MH
+Kyle/M
+Kyoto/M
+Kyrgyzstan/M
+Kyushu/M
+L'Amour/M
+L'Enfant
+L'Oreal/M
+L'Ouverture/M
+L/MN
+LA
+LAN/M
+LBJ/M
+LC
+LCD/M
+LCM
+LDC
+LED/M
+LG/M
+LGBT
+LIFO
+LL
+LLB/M
+LLD/M
+LNG
+LOGO
+LP/M
+LPG
+LPN/SM
+LSAT
+LSD/M
+LVN
+La/SM
+Lab
+Laban/M
+Labrador/SM
+Labradorean
+Lacey/M
+Lachesis/M
+Lactobacillus
+Lacy/M
+Ladoga/M
+Ladonna/M
+Lady/M
+Ladyship/MS
+Lafayette/M
+Lafitte/M
+Lagos/M
+Lagrange/M
+Lagrangian/M
+Lahore/M
+Laius/M
+Lajos/M
+Lakeisha/M
+Lakeland/M
+Lakewood
+Lakisha/M
+Lakota/M
+Lakshmi/M
+Lamaism/SM
+Lamar/M
+Lamarck/M
+Lamaze/M
+Lamb/M
+Lambert/M
+Lamborghini/M
+Lambrusco/M
+Lamentations
+Lamont/M
+Lana/M
+Lanai/M
+Lancashire/M
+Lancaster/M
+Lance/M
+Lancelot/M
+Land/M
+Landon/M
+Landry/M
+Landsat/M
+Landsteiner/M
+Lane/M
+Lang/M
+Langerhans/M
+Langland/M
+Langley/M
+Langmuir/M
+Lanka/M
+Lankan/M
+Lanny/M
+Lansing/M
+Lanzhou/M
+Lao/SM
+Laocoon/M
+Laos/M
+Laotian/SM
+Laplace/M
+Laplacian
+Lapland/MR
+Lapp/SM
+Lara/M
+Laramie/M
+Lardner/M
+Laredo/M
+Larousse/M
+Larry/M
+Lars/MN
+Larsen/M
+Larson/M
+Lascaux/M
+Lassa/M
+Lassen/M
+Lassie/M
+Lat/M
+Latasha/M
+Lateran/M
+Latham/M
+Latin/MRS
+Latina
+Latino/SM
+Latinx
+Latisha/M
+Latonya/M
+Latoya/M
+Latrobe/M
+Latvia/M
+Latvian/MS
+Laud/MR
+Lauder/M
+Laue/M
+Laundromat/M
+Laura/M
+Laurasia/M
+Laurel/M
+Lauren/M
+Laurence/M
+Laurent/M
+Lauri/M
+Laurie/M
+Laval/M
+Lavern/M
+Laverne/M
+Lavoisier/M
+Lavonne/M
+Lawanda/M
+Lawrence/M
+Lawson/M
+Lawton/M
+Layamon/M
+Layla/M
+Layton/M
+Lazaro/M
+Lazarus/M
+Le/SM
+Lea/M
+Leach/M
+Leadbelly/M
+Leah/M
+Leakey/M
+Lean/M
+Leander/M
+Leann/M
+Leanna/M
+Leanne/M
+Lear/M
+Learjet/M
+Leary/M
+Leavenworth/M
+Lebanese/M
+Lebanon/M
+Lebesgue/M
+Leblanc/M
+Leda/M
+Lederberg/M
+Lee/M
+Leeds/M
+Leesburg/M
+Leeuwenhoek/M
+Leeward/M
+Left
+Legendre/M
+Leger/M
+Leghorn/M
+Lego/M
+Legree/M
+Lehman/M
+Leibniz/M
+Leicester/SM
+Leiden/M
+Leif/M
+Leigh/M
+Leila/M
+Leipzig/M
+Lela/M
+Leland/M
+Lelia/M
+Lemaitre/M
+Lemuel/M
+Lemuria/M
+Len/M
+Lena/M
+Lenard/M
+Lenin/M
+Leningrad/M
+Leninism/M
+Leninist/M
+Lennon/M
+Lenny/M
+Leno/M
+Lenoir/M
+Lenora/M
+Lenore/M
+Lent/SMN
+Lenten/M
+Leo/SM
+Leola/M
+Leominster/M
+Leon/M
+Leona/M
+Leonard/M
+Leonardo/M
+Leoncavallo/M
+Leonel/M
+Leonid/M
+Leonidas/M
+Leonor/M
+Leopold/M
+Leopoldo/M
+Lepidus/M
+Lepke/M
+Lepus/M
+Lerner/M
+Leroy/M
+Les/M
+Lesa/M
+Lesley/M
+Leslie/M
+Lesotho/M
+Lesseps/M
+Lessie/M
+Lester/M
+Lestrade/M
+Leta/M
+Letha/M
+Lethe/M
+Leticia/M
+Letitia/M
+Letterman/M
+Levant/M
+Levesque/M
+Levi/SM
+Leviathan/M
+Levine/M
+Leviticus/M
+Levitt/M
+Levy/M
+Lew/M
+Lewinsky/M
+Lewis/M
+Lewiston/M
+Lewisville/M
+Lexington/M
+Lexus/M
+Lhasa/MS
+Lhotse/M
+Li/MY
+Liaoning/M
+Libby/M
+Liberace/M
+Liberal
+Liberia/M
+Liberian/SM
+Libra/MS
+LibreOffice/M
+Libreville/M
+Librium/M
+Libya/M
+Libyan/SM
+Lichtenstein/M
+Lidia/M
+Lie/M
+Lieberman/M
+Liebfraumilch/M
+Liechtenstein/ZMR
+Liechtensteiner/M
+Liege/M
+Lieut
+Lila/M
+Lilia/M
+Lilian/M
+Liliana/M
+Lilith/M
+Liliuokalani/M
+Lille/M
+Lillian/M
+Lillie/M
+Lilliput/M
+Lilliputian/MS
+Lilly/M
+Lilongwe/M
+Lily/M
+Lima/M
+Limbaugh/M
+Limbo
+Limburger/M
+Limoges/M
+Limousin/M
+Limpopo/M
+Lin/M
+Lina/M
+Lincoln/MS
+Lind/M
+Linda/M
+Lindbergh/M
+Lindsay/M
+Lindsey/M
+Lindy/M
+Linnaeus/M
+Linotype/M
+Linton/M
+Linus/M
+Linux/MS
+Linwood/M
+Lionel/M
+Lipizzaner/M
+Lippi/M
+Lippmann/M
+Lipscomb/M
+Lipton/M
+Lisa/M
+Lisbon/M
+Lissajous/M
+Lister/M
+Listerine/M
+Liston/M
+Liszt/M
+Lithuania/M
+Lithuanian/MS
+Little/M
+Litton/M
+Livermore/M
+Liverpool/M
+Liverpudlian/SM
+Livia/M
+Livingston/M
+Livingstone/M
+Livonia/M
+Livy/M
+Liz/M
+Liza/M
+Lizzie/M
+Lizzy/M
+Ljubljana/M
+Llewellyn/M
+Lloyd/M
+Ln
+Loafer/SM
+Lobachevsky/M
+Lochinvar/M
+Locke/M
+Lockean/M
+Lockheed/M
+Lockwood/M
+Lodge/M
+Lodi/M
+Lodz/M
+Loewe/M
+Loewi/M
+Loews/M
+Logan/M
+Lohengrin/M
+Loire/M
+Lois/M
+Loki/M
+Lola/M
+Lolita/M
+Lollard/M
+Lollobrigida/M
+Lombard/M
+Lombardi/M
+Lombardy/M
+Lome/M
+Lompoc/M
+Lon/M
+London/MRZ
+Londoner/M
+Long/M
+Longfellow/M
+Longmont/M
+Longstreet/M
+Longueuil
+Longview/M
+Lonnie/M
+Lopez/M
+Lora/M
+Lorain/M
+Loraine/M
+Lord/SM
+Lordship/SM
+Lorelei/M
+Loren/M
+Lorena/M
+Lorene/M
+Lorentz/M
+Lorentzian
+Lorenz/M
+Lorenzo/M
+Loretta/M
+Lori/M
+Lorie/M
+Lorna/M
+Lorraine/M
+Lorre/M
+Lorrie/M
+Los
+Lot/M
+Lothario/SM
+Lott/M
+Lottie/M
+Lou/M
+Louella/M
+Louie/M
+Louis/M
+Louisa/M
+Louise/M
+Louisiana/M
+Louisianan/MS
+Louisianian/MS
+Louisville/M
+Lourdes/M
+Louvre/M
+Love/M
+Lovecraft/M
+Lovelace/M
+Lowe/M
+Lowell/M
+Lowenbrau/M
+Lowery/M
+Lowlands
+Loyang/M
+Loyd/M
+Loyola/M
+Lr
+Lt
+Ltd
+Lu/M
+Luanda/M
+Luann/M
+Lubavitcher/M
+Lubbock/M
+Lubumbashi/M
+Lucas/M
+Luce/M
+Lucia/M
+Lucian/M
+Luciano/M
+Lucien/M
+Lucifer/M
+Lucile/M
+Lucille/M
+Lucinda/M
+Lucio/M
+Lucite/SM
+Lucius/M
+Lucknow/M
+Lucretia/M
+Lucretius/M
+Lucy/M
+Luddite/MS
+Ludhiana/M
+Ludwig/M
+Luella/M
+Lufthansa/M
+Luftwaffe/M
+Luger/M
+Lugosi/M
+Luigi/M
+Luis/M
+Luisa/M
+Luke/M
+Lula/M
+Lully/M
+Lulu/M
+Lumiere/M
+Luna/M
+Lupe/M
+Lupercalia/M
+Lupus/M
+Luria/M
+Lusaka/M
+Lusitania/M
+Luther/M
+Lutheran/SM
+Lutheranism/MS
+Luvs/M
+Luxembourg/ZMR
+Luxembourger/M
+Luxembourgian
+Luz/M
+Luzon/M
+Lvov/M
+LyX/M
+Lyallpur
+Lycra/M
+Lycurgus/M
+Lydia/M
+Lydian/SM
+Lyell/M
+Lyle/M
+Lyly/M
+Lyman/M
+Lyme/M
+Lynch/M
+Lynchburg/M
+Lynda/M
+Lyndon/M
+Lynette/M
+Lynn/M
+Lynne/M
+Lynnette/M
+Lyon/SM
+Lyons/M
+Lyra/M
+Lysenko/M
+Lysistrata/M
+Lysol/M
+M/SMGB
+MA/M
+MASH
+MB/M
+MBA/M
+MC
+MCI/M
+MD/M
+MDT
+ME
+MEGO/S
+MFA/M
+MGM/M
+MHz
+MI/M
+MIA
+MIDI/M
+MIPS
+MIRV
+MIT/M
+MM
+MN
+MO
+MOOC
+MP/M
+MPEG
+MRI/M
+MS/M
+MSG/M
+MST/M
+MSW
+MT/M
+MTV/M
+MVP/M
+MW
+Maalox/M
+Mabel/M
+Mable/M
+Mac/M
+MacArthur/M
+MacBride/M
+MacDonald/M
+MacLeish/M
+Macao/M
+Macaulay/M
+Macbeth/M
+Maccabees
+Maccabeus/M
+Mace/M
+Macedon/M
+Macedonia/M
+Macedonian/SM
+Mach/M
+Machiavelli/M
+Machiavellian/M
+Macias/M
+Macintosh/M
+Mack/M
+Mackenzie/M
+Mackinac/M
+Mackinaw/M
+Macmillan/M
+Macon/M
+Macumba/M
+Macy/M
+Madagascan/SM
+Madagascar/M
+Madam
+Madden/M
+Maddox/M
+Madeira/SM
+Madeleine/M
+Madeline/M
+Madelyn/M
+Madera/M
+Madge/M
+Madison/M
+Madonna/SM
+Madras/M
+Madrid/M
+Madurai/M
+Mae/M
+Maeterlinck/M
+Mafia/MS
+Mafioso/M
+Magdalena/M
+Magdalene/M
+Magellan/M
+Magellanic/M
+Maggie/M
+Maghreb/M
+Magi
+Maginot/M
+Magnificat
+Magnitogorsk/M
+Magog/M
+Magoo/M
+Magritte/M
+Magsaysay/M
+Magus
+Magyar/SM
+Mahabharata/M
+Maharashtra/M
+Mahavira/M
+Mahayana/M
+Mahayanist/M
+Mahdi/M
+Mahfouz/M
+Mahican/SM
+Mahler/M
+Mai/M
+Maidenform/M
+Maigret/M
+Mailer/M
+Maillol/M
+Maiman/M
+Maimonides/M
+Maine/MZR
+Mainer/M
+Maisie/M
+Maitreya/M
+Maj
+Majesty
+Major/M
+Majorca/M
+Majuro/M
+Makarios/M
+Maker/M
+Malabar/M
+Malabo/M
+Malacca/M
+Malachi/M
+Malagasy/M
+Malamud/M
+Malaprop/M
+Malawi/M
+Malawian/SM
+Malay/MS
+Malaya/M
+Malayalam/M
+Malayan/MS
+Malaysia/M
+Malaysian/MS
+Malcolm/M
+Maldive/MS
+Maldives/M
+Maldivian/MS
+Maldonado/M
+Male/M
+Mali/M
+Malian/SM
+Malibu/M
+Malinda/M
+Malinowski/M
+Mallarme/M
+Mallomars/M
+Mallory/M
+Malone/M
+Malory/M
+Malplaquet/M
+Malraux/M
+Malta/M
+Maltese/M
+Malthus/M
+Malthusian/SM
+Mameluke/M
+Mamet/M
+Mamie/M
+Mamore/M
+Man/M
+Managua/M
+Manama/M
+Manasseh/M
+Manchester/M
+Manchu/SM
+Manchuria/M
+Manchurian/M
+Mancini/M
+Mancunian/MS
+Mandalay/M
+Mandarin/M
+Mandela/M
+Mandelbrot/M
+Mandeville/M
+Mandingo/M
+Mandrell/M
+Mandy/M
+Manet/M
+Manfred/M
+Manhattan/SM
+Mani/M
+Manichean/M
+Manila/SM
+Manitoba/M
+Manitoulin/M
+Mankato/M
+Manley/M
+Mann/GM
+Mannheim/M
+Manning/M
+Mansfield/M
+Manson/M
+Manteca/M
+Mantegna/M
+Mantle/M
+Manuel/M
+Manuela/M
+Manx/M
+Mao/M
+Maoism/SM
+Maoist/SM
+Maori/MS
+Mapplethorpe/M
+Maputo/M
+Mar/SM
+Mara/M
+Maracaibo/M
+Marat/M
+Maratha/M
+Marathi/M
+Marathon/M
+Marc/M
+Marceau/M
+Marcel/M
+Marcelino/M
+Marcella/M
+Marcelo/M
+March/MS
+Marci/M
+Marcia/M
+Marciano/M
+Marcie/M
+Marco/MS
+Marconi/M
+Marcos/M
+Marcus/M
+Marcuse
+Marcy/M
+Marduk/M
+Margaret/M
+Margarita/M
+Margarito/M
+Marge/M
+Margery/M
+Margie/M
+Margo/M
+Margot
+Margret/M
+Margrethe/M
+Marguerite/M
+Mari/SM
+Maria/M
+MariaDB/M
+Marian/M
+Mariana/SM
+Marianas/M
+Marianne/M
+Mariano/M
+Maribel/M
+Maricela/M
+Marie/M
+Marietta/M
+Marilyn/M
+Marin/M
+Marina/M
+Marine/SM
+Mario/M
+Marion/M
+Maris/M
+Marisa/M
+Marisol/M
+Marissa/M
+Maritain/M
+Maritza/M
+Mariupol
+Marius/M
+Marjorie/M
+Marjory/M
+Mark/SM
+Markab/M
+Markham/M
+Markov/M
+Marks/M
+Marla/M
+Marlboro/M
+Marlborough/M
+Marlene/M
+Marley/M
+Marlin/M
+Marlon/M
+Marlowe/M
+Marmara/M
+Marne/M
+Maronite/M
+Marple/M
+Marquesas/M
+Marquette/M
+Marquez/M
+Marquis/M
+Marquita/M
+Marrakesh/M
+Marriott/M
+Mars/MS
+Marsala/M
+Marseillaise/MS
+Marseilles/M
+Marsh/M
+Marsha/M
+Marshall/M
+Marta/M
+Martel/M
+Martha/M
+Martial/M
+Martian/SM
+Martin/M
+Martina/M
+Martinez/M
+Martinique/M
+Marty/M
+Marva/M
+Marvell/M
+Marvin/M
+Marx/M
+Marxian
+Marxism/SM
+Marxist/SM
+Mary/M
+Maryann/M
+Maryanne/M
+Maryellen/M
+Maryland/MR
+Marylander/M
+Marylou/M
+Marysville/M
+Masada/M
+Masai/M
+Masaryk/M
+Mascagni/M
+Masefield/M
+Maserati/M
+Maseru/M
+Mashhad/M
+Mason/MS
+Masonic/M
+Masonite/M
+Mass/MS
+Massachusetts/M
+Massasoit/M
+Massenet/M
+Massey/M
+Master/S
+MasterCard/M
+Masters/M
+Mather/M
+Matheson/M
+Mathew/SM
+Mathews/M
+Mathewson/M
+Mathias/M
+Mathis/M
+Matilda/M
+Matisse/M
+Matlab/M
+Matt/M
+Mattel/M
+Matterhorn/M
+Matthew/SM
+Matthews/M
+Matthias/M
+Mattie/M
+Maud/M
+Maude/M
+Maugham/M
+Maui/M
+Mauldin/M
+Maupassant/M
+Maura/M
+Maureen/M
+Mauriac/M
+Maurice/M
+Mauricio/M
+Maurine/M
+Mauritania/M
+Mauritanian/SM
+Mauritian/SM
+Mauritius/M
+Mauro/M
+Maurois/M
+Mauryan/M
+Mauser/M
+Mavis/M
+Max/M
+Maximilian/M
+Maxine/M
+Maxwell/M
+May/SMR
+Maya/SM
+Mayan/MS
+Mayer/M
+Mayfair/M
+Mayflower/M
+Maynard/M
+Mayo/M
+Maypole
+Mayra/M
+Mays/M
+Maytag/M
+Mazama/M
+Mazarin/M
+Mazatlan/M
+Mazda/M
+Mazola/M
+Mazzini/M
+Mb/M
+Mbabane/M
+Mbini/M
+McAdam/M
+McAllen/M
+McBride/M
+McCain/M
+McCall/M
+McCarthy/M
+McCarthyism/M
+McCartney/M
+McCarty/M
+McClain/M
+McClellan/M
+McClure/M
+McConnell/M
+McCormick/M
+McCoy/M
+McCray/M
+McCullough/M
+McDaniel/M
+McDonald/M
+McDonnell/M
+McDowell/M
+McEnroe/M
+McFadden/M
+McFarland/M
+McGee/M
+McGovern/M
+McGowan/M
+McGuffey/M
+McGuire/M
+McHenry/M
+McIntosh/M
+McIntyre/M
+McJob
+McKay/M
+McKee/M
+McKenzie/M
+McKinley/M
+McKinney/M
+McKnight/M
+McLaughlin/M
+McLean/M
+McLeod/M
+McLuhan/M
+McMahon/M
+McMillan/M
+McNamara/M
+McNaughton/M
+McNeil/M
+McPherson/M
+McQueen/M
+McVeigh/M
+Md/M
+Me
+Mead/M
+Meade/M
+Meadows/M
+Meagan/M
+Meany/M
+Mecca/MS
+Medan/M
+Medea/M
+Medellin/M
+Medford/M
+Media/M
+Medicaid/SM
+Medicare/SM
+Medici/M
+Medina/M
+Mediterranean/MS
+Medusa/M
+Meg/M
+Megan/M
+Meghan/M
+Meier/M
+Meighen/M
+Meiji/M
+Meir/M
+Mejia/M
+Mekong/M
+Mel/M
+Melanesia/M
+Melanesian/M
+Melanie/M
+Melba/M
+Melbourne/M
+Melchior/M
+Melchizedek/M
+Melendez/M
+Melinda/M
+Melisa/M
+Melisande/M
+Melissa/M
+Mellon/M
+Melody/M
+Melpomene/M
+Melton/M
+Melva/M
+Melville/M
+Melvin/M
+Memcached/M
+Memling/M
+Memphis/M
+Menander/M
+Mencius/M
+Mencken/M
+Mendel/M
+Mendeleev/M
+Mendelian/M
+Mendelssohn/M
+Mendez/M
+Mendocino/M
+Mendoza/M
+Menelaus/M
+Menelik/M
+Menes/M
+Mengzi
+Menifee/M
+Menkalinan/M
+Menkar/M
+Menkent/M
+Mennen/M
+Mennonite/MS
+Menominee/M
+Menotti/M
+Mensa/M
+Mentholatum/M
+Menuhin/M
+Menzies/M
+Mephisto
+Mephistopheles/M
+Merak/M
+Mercado/M
+Mercator/M
+Merced/M
+Mercedes/M
+Mercer/M
+Mercia/M
+Merck/M
+Mercurochrome/M
+Mercury/SM
+Meredith/M
+Merino/M
+Merle/M
+Merlin/M
+Merlot/M
+Merovingian/M
+Merriam/M
+Merrick/M
+Merrill/M
+Merrimack/M
+Merritt/M
+Merthiolate/M
+Merton/M
+Mervin/M
+Mesa/M
+Mesabi/M
+Mesmer/M
+Mesolithic/M
+Mesopotamia/M
+Mesopotamian
+Mesozoic/M
+Messerschmidt/M
+Messiaen/M
+Messiah/M
+Messiahs
+Messianic
+Messieurs
+Metallica/M
+Metamucil/M
+Methodism/SM
+Methodist/SM
+Methuselah/M
+Metternich/M
+Meuse/M
+Mex
+Mexicali/M
+Mexican/MS
+Mexico/M
+Meyer/MS
+Meyerbeer/M
+Meyers/M
+Mfume/M
+Mg/M
+Mgr
+MiG/M
+Mia/M
+Miami/MS
+Miaplacidus/M
+Micah/M
+Micawber/M
+Mich/M
+Michael/M
+Michaelmas/MS
+Micheal/M
+Michel/M
+Michelangelo/M
+Michele/M
+Michelin/M
+Michelle/M
+Michelob/M
+Michelson/M
+Michigan/M
+Michigander/MS
+Michiganite
+Mick/M
+Mickey/M
+Mickie/M
+Micky/M
+Micmac/SM
+Micronesia/M
+Micronesian/M
+Microsoft/M
+Midas/M
+Middleton/M
+Middletown/M
+Mideast
+Mideastern
+Midland/MS
+Midway/M
+Midwest/M
+Midwestern/MR
+Miguel/M
+Mike/M
+Mikhail/M
+Mikoyan/M
+Milagros/M
+Milan/M
+Milanese
+Mildred/M
+Miles/M
+Milford/M
+Milken/M
+Mill/SMR
+Millard/M
+Millay/M
+Miller/M
+Millet/M
+Millicent/M
+Millie/M
+Millikan/M
+Mills/M
+Milne/M
+Milo/M
+Milosevic/M
+Milquetoast/M
+Miltiades/M
+Milton/M
+Miltonian
+Miltonic/M
+Miltown/M
+Milwaukee/M
+Mimi/M
+Mimosa/M
+Min/M
+Minamoto/M
+Mindanao/M
+Mindoro/M
+Mindy/M
+Minerva/M
+Ming/M
+Mingus/M
+Minn
+Minneapolis/M
+Minnelli/M
+Minnesota/M
+Minnesotan/SM
+Minnie/M
+Minoan/MS
+Minolta/M
+Minos/M
+Minot/M
+Minotaur/M
+Minsk/M
+Minsky/M
+Mintaka/M
+Minuit/M
+Minuteman/M
+Miocene/M
+Mir/M
+Mira/M
+Mirabeau/M
+Mirach/M
+Miranda/M
+Mirfak/M
+Miriam/M
+Miro/M
+Mirzam/M
+Miskito/M
+Miss
+Mississauga/M
+Mississippi/M
+Mississippian/SM
+Missoula/M
+Missouri/M
+Missourian/MS
+Missy/M
+Mistassini/M
+Mister
+Mistress
+Misty/M
+Mitch/M
+Mitchel/M
+Mitchell/M
+Mitford/M
+Mithra/M
+Mithridates/M
+Mitsubishi/M
+Mitterrand/M
+Mitty/M
+Mitzi/M
+Mixtec/M
+Mizar/M
+Mk
+Mlle
+Mme/S
+Mn/M
+Mnemosyne/M
+Mo/M
+Mobil/M
+Mobile/M
+Mobutu/M
+Modesto/M
+Modigliani/M
+Moe/M
+Moet/M
+Mogadishu/M
+Mogul/MS
+Mohacs/M
+Mohamed/M
+Mohammad/M
+Mohammedan/SM
+Mohammedanism/SM
+Mohave/SM
+Mohawk/SM
+Mohegan
+Moho/M
+Mohorovicic/M
+Moira/M
+Moises/M
+Moiseyev/M
+Mojave/SM
+Moldavia/M
+Moldavian
+Moldova/M
+Moldovan
+Moliere/M
+Molina/M
+Moll/M
+Mollie/M
+Molly/M
+Molnar/M
+Moloch/M
+Molokai/M
+Molotov/M
+Moluccas/M
+Mombasa/M
+Mon/SM
+Mona/M
+Monacan
+Monaco/M
+Mondale/M
+Monday/SM
+Mondrian/M
+Monegasque/SM
+Monera/M
+Monessen/M
+Monet/M
+MongoDB/M
+Mongol/SM
+Mongolia/M
+Mongolian/SM
+Mongolic/M
+Mongoloid
+Monica/M
+Monique/M
+Monk/M
+Monmouth/M
+Monongahela/M
+Monroe/M
+Monrovia/M
+Monsanto/M
+Monsieur/M
+Monsignor/SM
+Mont/M
+Montague/M
+Montaigne/M
+Montana/M
+Montanan/SM
+Montcalm/M
+Monte/M
+Montenegrin/M
+Montenegro/M
+Monterey/M
+Monterrey/M
+Montesquieu/M
+Montessori/M
+Monteverdi/M
+Montevideo/M
+Montezuma/M
+Montgolfier/M
+Montgomery/M
+Monticello/M
+Montoya/M
+Montpelier/M
+Montrachet/M
+Montreal/M
+Montserrat/M
+Monty/M
+Moody/M
+Moog/M
+Moon/M
+Mooney/M
+Moor/SM
+Moore/M
+Moorish/M
+Morales/M
+Moran/M
+Moravia/M
+Moravian/M
+Mordred/M
+More/M
+Moreno/M
+Morgan/SM
+Morgantown/M
+Moriarty/M
+Morin/M
+Morison/M
+Morita/M
+Morley/M
+Mormon/SM
+Mormonism/SM
+Moro/M
+Moroccan/SM
+Morocco/M
+Moroni/M
+Morpheus/M
+Morphy/M
+Morris/M
+Morrison/M
+Morristown/M
+Morrow/M
+Morse/M
+Mort/M
+Mortimer/M
+Morton/M
+Mosaic/M
+Moscow/M
+Moseley/M
+Moselle/M
+Moses/M
+Mosley/M
+Moss/M
+Mosul/M
+Motorola/M
+Motown/M
+Motrin/M
+Mott/M
+Moulton/M
+Mount/M
+Mountbatten/M
+Mountie/MS
+Moussorgsky/M
+Mouthe/M
+Mouton/M
+Mowgli/M
+Mozambican/SM
+Mozambique/M
+Mozart/M
+Mozilla/M
+Mr/SM
+Ms/S
+Msgr
+Mt
+Muawiya/M
+Mubarak/M
+Mueller/M
+Muenster/MS
+Mugabe/M
+Muhammad/M
+Muhammadan/MS
+Muhammadanism/SM
+Muir/M
+Mujib/M
+Mulder/M
+Mullen/M
+Muller/M
+Mulligan/M
+Mullikan/M
+Mullins/M
+Mulroney/M
+Multan/M
+Multics
+Mumbai/M
+Mumford/M
+Munch/M
+Munchhausen/M
+Muncie/M
+Munich/M
+Munoz/M
+Munro/M
+Munster/M
+Muppet/M
+Murasaki/M
+Murat/M
+Murchison/M
+Murcia
+Murdoch/M
+Murfreesboro/M
+Muriel/M
+Murillo/M
+Murine/M
+Murmansk/M
+Murphy/M
+Murray/M
+Murrieta/M
+Murrow/M
+Murrumbidgee/M
+Muscat/M
+Muscovite/M
+Muscovy/M
+Muse/M
+Musharraf/M
+Musial/M
+Muskegon/M
+Muskogee/M
+Muslim/MS
+Mussolini/M
+Mussorgsky/M
+Mutsuhito/M
+Muzak/M
+MySQL/M
+MySpace/M
+Myanmar/M
+Mycenae/M
+Mycenaean/M
+Myers/M
+Mylar/MS
+Myles/M
+Myra/M
+Myrdal/M
+Myrna/M
+Myron/M
+Myrtle/M
+Mysore/M
+Myst/M
+N'Djamena
+N/MD
+NAACP/M
+NAFTA/M
+NASA/M
+NASCAR/M
+NASDAQ/M
+NATO/M
+NB
+NBA/M
+NBC/M
+NBS
+NC
+NCAA/M
+NCO
+ND
+NE/M
+NEH
+NF
+NFC
+NFL/M
+NH
+NHL/M
+NIH
+NIMBY
+NJ
+NLRB
+NM
+NORAD/M
+NOW
+NP
+NPR/M
+NR
+NRA
+NRC
+NS
+NSA/M
+NSC
+NSF
+NSFW
+NT
+NV
+NVIDIA/M
+NW/M
+NWT
+NY
+NYC
+NYSE
+NZ
+Na/M
+Nabisco/M
+Nabokov/M
+Nader/M
+Nadia/M
+Nadine/M
+Nagasaki/M
+Nagoya/M
+Nagpur/M
+Nagy/M
+Nahuatl/MS
+Nahum/M
+Naipaul/M
+Nair/M
+Nairobi/M
+Naismith/M
+Nam/M
+Namath/M
+Namibia/M
+Namibian/MS
+Nampa/M
+Nan/M
+Nanak/M
+Nanchang/M
+Nancy/M
+Nanette/M
+Nanjing/M
+Nannie/M
+Nanook/M
+Nansen/M
+Nantes/M
+Nantucket/M
+Naomi/M
+Napa/M
+Naphtali/M
+Napier/M
+Naples/M
+Napoleon/MS
+Napoleonic/M
+Napster/M
+Narcissus/M
+Narmada/M
+Narnia/M
+Narraganset
+Narragansett/M
+Nash/M
+Nashua/M
+Nashville/M
+Nassau/M
+Nasser/M
+Nat/M
+Natalia/M
+Natalie/M
+Natasha/M
+Natchez/M
+Nate/MN
+Nathan/SM
+Nathaniel/M
+Nathans/M
+Nation/M
+Nationwide/M
+Nativity/M
+Naugahyde/M
+Nauru/M
+Nautilus/M
+Navajo/SM
+Navajoes
+Navarre/M
+Navarro/M
+Navratilova/M
+Navy
+Nazarene/M
+Nazareth/M
+Nazca/M
+Nazi/SM
+Nazism/MS
+Nb/M
+Nd/M
+Ndjamena/M
+Ne/M
+NeWS
+NeWSes
+Neal/M
+Neanderthal/SM
+Neapolitan/M
+Neb
+Nebr
+Nebraska/M
+Nebraskan/MS
+Nebuchadnezzar/M
+Ned/M
+Nefertiti/M
+Negev/M
+Negress/MS
+Negritude
+Negro/MS
+Negroes
+Negroid/SM
+Negros/M
+Nehemiah/M
+Nehru/M
+Neil/M
+Nelda/M
+Nell/M
+Nellie/M
+Nelly/M
+Nelsen/M
+Nelson/M
+Nembutal/M
+Nemesis/M
+Neo/M
+Neogene/M
+Neolithic
+Nepal/M
+Nepalese/M
+Nepali/MS
+Neptune/M
+Nereid/M
+Nerf/M
+Nero/M
+Neruda/M
+Nescafe/M
+Nesselrode/M
+Nestle/M
+Nestor/M
+Nestorius/M
+Netflix/M
+Netherlander/SM
+Netherlands/M
+Netscape/M
+Nettie/M
+Netzahualcoyotl/M
+Nev/M
+Neva/M
+Nevada/M
+Nevadan/SM
+Nevadian
+Nevis/M
+Nevsky/M
+Newark/M
+Newburgh/M
+Newcastle/M
+Newfoundland/MRS
+Newman/M
+Newport/M
+Newsweek/M
+Newton/M
+Newtonian/M
+Nexis/M
+Ngaliema/M
+Nguyen/M
+Ni/M
+Niagara/M
+Niamey/M
+Nibelung/M
+Nicaea/M
+Nicaragua/M
+Nicaraguan/SM
+Niccolo/M
+Nice/M
+Nicene/M
+Nichiren/M
+Nicholas/M
+Nichole/M
+Nichols/M
+Nicholson/M
+Nick/M
+Nickelodeon/M
+Nicklaus/M
+Nickolas/M
+Nicobar/M
+Nicodemus/M
+Nicola/SM
+Nicolas/M
+Nicole/M
+Nicosia/M
+Niebuhr/M
+Nielsen/M
+Nietzsche/M
+Nieves/M
+Nigel/M
+Niger/M
+Nigeria/M
+Nigerian/MS
+Nigerien/M
+Nightingale/M
+Nijinsky/M
+Nike/M
+Nikita/M
+Nikkei/M
+Nikki/M
+Nikolai/M
+Nikon/M
+Nile/M
+Nimitz/M
+Nimrod/M
+Nina/M
+Nineveh/M
+Nintendo/M
+Niobe/M
+Nippon/M
+Nipponese/M
+Nirenberg/M
+Nirvana/M
+Nisan/M
+Nisei/M
+Nissan/M
+Nita/M
+Nivea/M
+Nixon/M
+Nkrumah/M
+No/SM
+NoDoz/M
+Noah/M
+Nobel/M
+Nobelist/MS
+Noble/M
+Noe/M
+Noel/SM
+Noelle/M
+Noemi/M
+Nokia/M
+Nola/M
+Nolan/M
+Nome/M
+Nona/M
+Nootka/M
+Nora/M
+Norbert/M
+Norberto/M
+Nordic/MS
+Noreen/M
+Norfolk/M
+Noriega/M
+Norma/M
+Normal/M
+Norman/MS
+Normand/M
+Normandy/M
+Norplant/M
+Norris/M
+Norse/M
+Norseman/M
+Norsemen/M
+North/M
+Northampton/M
+Northeast/MS
+Northerner/M
+Northrop/M
+Northrup/M
+Norths
+Northwest/SM
+Norton/M
+Norw
+Norway/M
+Norwegian/SM
+Norwich/M
+Nosferatu/M
+Nostradamus/M
+Nottingham/M
+Nouakchott/M
+Noumea/M
+Nov/M
+Nova/M
+Novartis/M
+November/MS
+Novgorod/M
+Novocain/MS
+Novocaine
+Novokuznetsk/M
+Novosibirsk/M
+Noxzema/M
+Noyce/M
+Noyes/M
+Np/M
+Nubia/M
+Nubian/M
+Nukualofa/M
+Numbers/M
+Nunavut/M
+Nunez/M
+Nunki/M
+Nuremberg/M
+Nureyev/M
+NutraSweet/M
+NyQuil/M
+Nyasa/M
+Nyerere/M
+O'Brien/M
+O'Casey/M
+O'Connell/M
+O'Connor/M
+O'Donnell/M
+O'Hara/M
+O'Higgins/M
+O'Keeffe/M
+O'Neil/M
+O'Neill/M
+O'Rourke/M
+O'Toole/M
+O/SM
+OAS/M
+OB
+OCR
+OD/SM
+OE
+OED
+OH
+OHSA/M
+OJ
+OK/SMDG
+OMB/M
+ON
+OPEC/M
+OR
+OS/M
+OSHA/M
+OSes
+OT
+OTB
+OTC
+OTOH
+Oahu/M
+Oakland/M
+Oakley/M
+Oates/M
+Oaxaca/M
+Ob/M
+Obadiah/M
+Obama/M
+Obamacare
+Oberlin/M
+Oberon/M
+Ocala/M
+Ocaml/M
+Occam/M
+Occident
+Occidental/MS
+Oceania/M
+Oceanside
+Oceanus/M
+Ochoa/M
+Oct/M
+Octavia/M
+Octavian/M
+Octavio/M
+October/SM
+Odell/M
+Oder/M
+Odessa/M
+Odets/M
+Odin/M
+Odis/M
+Odom/M
+Odysseus/M
+Odyssey/M
+Oedipal/M
+Oedipus/M
+Oersted/M
+Ofelia/M
+Offenbach/M
+OfficeMax/M
+Ogbomosho/M
+Ogden/M
+Ogilvy/M
+Oglethorpe/M
+Ohio/M
+Ohioan/SM
+Oise/M
+Ojibwa/SM
+Okayama
+Okeechobee/M
+Okefenokee/M
+Okhotsk/M
+Okinawa/M
+Okinawan
+Okla
+Oklahoma/M
+Oklahoman/M
+Oktoberfest/M
+Ola/M
+Olaf/M
+Olajuwon/M
+Olav/M
+Oldenburg/M
+Oldfield/M
+Oldsmobile/M
+Olduvai/M
+Olen/M
+Olenek/M
+Olga/M
+Oligocene/M
+Olin/M
+Olive/MR
+Oliver/M
+Olivetti/M
+Olivia/M
+Olivier/M
+Ollie/M
+Olmec/M
+Olmsted/M
+Olsen/M
+Olson/M
+Olympia/SM
+Olympiad/MS
+Olympian/MS
+Olympic/SM
+Olympics/M
+Olympus/M
+Omaha/MS
+Oman/M
+Omani/MS
+Omar/M
+Omayyad/M
+Omdurman/M
+Omnipotent
+Omsk/M
+Onassis/M
+Oneal/M
+Onega/M
+Onegin/M
+Oneida/MS
+Onion/M
+Ono/M
+Onondaga/MS
+Onsager/M
+Ont
+Ontarian
+Ontario/M
+Oort/M
+Opal/M
+Opel/M
+OpenOffice/M
+Ophelia/M
+Ophiuchus/M
+Oppenheimer/M
+Opposition
+Oprah/M
+Ora/M
+Oracle/M
+Oran/M
+Orange/M
+Oranjestad/M
+Orbison/M
+Ordovician/M
+Ore/N
+Oreg
+Oregon/M
+Oregonian/SM
+Orem/M
+Oreo/M
+Orestes/M
+Orient/M
+Oriental/MS
+Orientalism
+Orin/M
+Orinoco/M
+Orion/M
+Oriya/M
+Orizaba/M
+Orkney/M
+Orlando/M
+Orleans/M
+Orlon/MS
+Orly/M
+Orpheus/M
+Orphic/M
+Orr/M
+Ortega/M
+Orthodox
+Ortiz/M
+Orval/M
+Orville/M
+Orwell/M
+Orwellian/M
+Os/M
+Osage/MS
+Osaka/M
+Osbert/M
+Osborn/M
+Osborne/M
+Oscar/MS
+Osceola/M
+Osgood/M
+Oshawa/M
+Oshkosh/M
+Osiris/M
+Oslo/M
+Osman/M
+Ostrogoth/M
+Ostwald/M
+Osvaldo/M
+Oswald/M
+Othello/M
+Otis/M
+Ottawa/SM
+Otto/M
+Ottoman/M
+Ouagadougou/M
+Ouija/MS
+Ovid/M
+Owen/SM
+Owens/M
+Owensboro/M
+Oxford/SM
+Oxnard/M
+Oxonian/M
+Oxus/M
+Oxycontin/M
+Oz/M
+Ozark/MS
+Ozarks/M
+Ozymandias/M
+Ozzie/M
+P/MN
+PA/M
+PAC/M
+PARC/S
+PASCAL
+PBS/M
+PBX
+PC/SM
+PCB
+PCMCIA
+PCP/M
+PD
+PDF
+PDQ
+PDT
+PE
+PET/M
+PFC
+PG
+PGP
+PHP/M
+PIN
+PJ's
+PLO/M
+PM/SMDG
+PMS/M
+PO
+POW/M
+PP
+PPS
+PR
+PRC/M
+PRO
+PS/M
+PST/M
+PT
+PTA/M
+PTO
+PVC/M
+PW
+PX
+Pa/M
+Paar/M
+Pablo/M
+Pablum/M
+Pabst/M
+Pace/M
+Pacheco/M
+Pacific/M
+Pacino/M
+Packard/M
+Padang
+Paderewski/M
+Padilla/M
+Paganini/M
+Page/M
+Paglia/M
+Pahlavi/M
+Paige/M
+Paine/M
+Paiute/SM
+Pakistan/M
+Pakistani/SM
+Palembang/M
+Paleocene/M
+Paleogene/M
+Paleolithic/M
+Paleozoic/M
+Palermo/M
+Palestine/M
+Palestinian/SM
+Palestrina/M
+Paley/M
+Palikir/M
+Palisades/M
+Palladio/M
+Palmdale/M
+Palmer/M
+Palmerston/M
+Palmolive/M
+Palmyra/M
+Palomar/M
+Pam/M
+Pamela/M
+Pamirs/M
+Pampers/M
+Pan/M
+Panama/SM
+Panamanian/MS
+Panasonic/M
+Pandora/M
+Pangaea/M
+Pankhurst/M
+Panmunjom/M
+Pansy/M
+Pantagruel/M
+Pantaloon/M
+Pantheon/M
+Panza/M
+Paracelsus/M
+Paraclete/M
+Paradise
+Paraguay/M
+Paraguayan/MS
+Paralympic/S
+Paramaribo/M
+Paramount/M
+Parana/M
+Parcheesi/M
+Pareto/M
+Paris/M
+Parisian/MS
+Park/SMR
+Parker/M
+Parkersburg/M
+Parkinson/M
+Parkinsonism
+Parkman/M
+Parks/M
+Parliament/M
+Parmenides
+Parmesan/MS
+Parnassus/MS
+Parnell/M
+Parr/M
+Parrish/M
+Parsifal/M
+Parsons/M
+Parthenon/M
+Parthia/M
+Pasadena/M
+Pascagoula/M
+Pascal/SM
+Pasco/M
+Pasquale/M
+Passion/SM
+Passover/MS
+Pasternak/M
+Pasteur/M
+Pat/M
+Patagonia/M
+Patagonian/M
+Pate/M
+Patel/M
+Paterson/M
+Patna/M
+Patrica/M
+Patrice/M
+Patricia/M
+Patrick/M
+Patsy/M
+Patterson/M
+Patti/M
+Patton/M
+Patty/M
+Paul/GM
+Paula/M
+Paulette/M
+Pauli/M
+Pauline/M
+Pauling/M
+Pavarotti/M
+Pavlov/M
+Pavlova/M
+Pavlovian/M
+Pawnee/SM
+PayPal/M
+Payne/M
+Pb/M
+Pd/M
+Peabody/M
+Peace/M
+Peale/M
+Pearl/M
+Pearlie/M
+Pearson/M
+Peary/M
+Pechora/M
+Peck/M
+Peckinpah/M
+Pecos/M
+Pedro/M
+Peel/M
+Peg/M
+Pegasus/MS
+Peggy/M
+Pei/M
+Peiping/M
+Peking/SM
+Pekingese/SM
+Pele/M
+Pelee/M
+Peloponnese/M
+Pembroke/M
+Pen/M
+Pena/M
+Penderecki/M
+Penelope/M
+Penn/M
+Penna
+Penney/M
+Pennington/M
+Pennsylvania/M
+Pennsylvanian/MS
+Penny/M
+Pennzoil/M
+Pensacola/M
+Pentagon/M
+Pentateuch/M
+Pentax/M
+Pentecost/SM
+Pentecostal/MS
+Pentecostalism
+Pentium/SM
+Peoria/M
+Pepin/M
+Pepsi/M
+Pepys/M
+Pequot/M
+Percheron/M
+Percival/M
+Percy/M
+Perelman/M
+Perez/M
+Periclean/M
+Pericles/M
+Perkins/M
+Perl/SM
+Perm/M
+Permalloy/M
+Permian/M
+Pernod/M
+Peron/M
+Perot/M
+Perrier/M
+Perry/RM
+Perseid/M
+Persephone/M
+Persepolis/M
+Perseus/M
+Pershing/M
+Persia/M
+Persian/SM
+Perth/M
+Peru/M
+Peruvian/MS
+Peshawar/M
+Petain/M
+Petaluma/M
+Pete/RMZ
+Peter/M
+Peters/MN
+Petersen/M
+Peterson/M
+Petra/M
+Petrarch/M
+Petty/M
+Peugeot/M
+Pfc
+Pfizer/M
+PhD/M
+Phaedra/M
+Phaethon/M
+Phanerozoic/M
+Pharaoh/M
+Pharaohs
+Pharisaic
+Pharisaical
+Pharisee/MS
+Phekda/M
+Phelps/M
+Phidias/M
+Phil/MY
+Philadelphia/M
+Philby/M
+Philemon/M
+Philip/MS
+Philippe/M
+Philippians/M
+Philippine/SM
+Philippines/M
+Philips/M
+Philistine/M
+Phillip/SM
+Phillipa/M
+Phillips/M
+Philly/M
+Phipps/M
+Phobos/M
+Phoebe/M
+Phoenicia/M
+Phoenician/SM
+Phoenix/M
+Photostat/MS
+Photostatted
+Photostatting
+Phrygia/M
+Phyllis/M
+Piaf/M
+Piaget/M
+Pianola/M
+Picasso/M
+Piccadilly/M
+Pickering/M
+Pickett/M
+Pickford/M
+Pickwick/M
+Pict/M
+Piedmont/M
+Pierce/M
+Pierre/M
+Pierrot/M
+Pike/M
+Pilate/MS
+Pilates/M
+Pilcomayo/M
+Pilgrim/SM
+Pillsbury/M
+Pinatubo/M
+Pincus/M
+Pindar/M
+Pinkerton/M
+Pinocchio/M
+Pinochet/M
+Pinter/M
+Pinyin
+Pippin/M
+Piraeus/M
+Pirandello/M
+Pisa/M
+Pisces/M
+Pisistratus/M
+Pissaro/M
+Pitcairn/M
+Pitt/SM
+Pittman/M
+Pitts/M
+Pittsburgh/M
+Pittsfield/M
+Pius/M
+Pizarro/M
+Pkwy
+Pl
+Planck/M
+Plano
+Plantagenet/M
+Plasticine/M
+Plataea/M
+Plath/M
+Plato/M
+Platonic
+Platonism/M
+Platonist/M
+Platte/M
+Plautus/M
+PlayStation/M
+Playboy/M
+Playtex/M
+Pleiades/M
+Pleistocene/M
+Plexiglas/MS
+Pliny/M
+Pliocene/SM
+Plutarch/M
+Pluto/M
+Plymouth/M
+Pm/M
+Po/M
+Pocahontas/M
+Pocatello/M
+Pocono/SM
+Poconos/M
+Podgorica/M
+Podhoretz/M
+Podunk/M
+Poe/M
+Pogo/M
+Poincare/M
+Poiret/M
+Poirot/M
+Poisson/M
+Poitier/M
+Pokemon/M
+Pol/MY
+Poland/M
+Polanski/M
+Polaris/M
+Polaroid/MS
+Pole/SM
+Polish/M
+Politburo/M
+Polk/M
+Pollard/M
+Pollock/M
+Pollux/M
+Polly/M
+Pollyanna/M
+Polo/M
+Poltava/M
+Polyhymnia/M
+Polynesia/M
+Polynesian/MS
+Polyphemus/M
+Pomerania/M
+Pomeranian/M
+Pomona/M
+Pompadour/M
+Pompeian
+Pompeii/M
+Pompey/M
+Ponce/M
+Pontchartrain/M
+Pontiac/M
+Pontianak/M
+Pooh/M
+Poole/M
+Poona/M
+Pope/M
+Popeye/M
+Popocatepetl/M
+Popper/M
+Poppins/M
+Popsicle/M
+Porfirio/M
+Porrima/M
+Porsche/M
+Port/MR
+Porter/M
+Porterville/M
+Portia/M
+Portland/M
+Porto/M
+Portsmouth/M
+Portugal/M
+Portuguese/M
+Poseidon/M
+Post/M
+PostgreSQL/M
+Potemkin/M
+Potomac/M
+Potsdam/M
+Pottawatomie/M
+Potter/M
+Potts/M
+Pottstown/M
+Poughkeepsie/M
+Pound/M
+Poussin/M
+Powell/M
+PowerPC/M
+PowerPoint/M
+Powers/M
+Powhatan/M
+Poznan/M
+Pr/M
+Prada/M
+Prado/M
+Praetorian/M
+Prague/M
+Praia/M
+Prakrit/M
+Pratchett/M
+Pratt/M
+Pravda/M
+Praxiteles/M
+Preakness/M
+Precambrian/M
+Preminger/M
+Premyslid/M
+Prensa/M
+Prentice/M
+Pres
+Presbyterian/SM
+Presbyterianism/MS
+Prescott/M
+Presley/M
+Preston/M
+Pretoria/M
+Priam/M
+Pribilof/M
+Price/M
+Priceline/M
+Priestley/M
+Prince/M
+Princeton/M
+Principe/M
+Priscilla/M
+Prius/M
+Private
+Procrustean/M
+Procrustes/M
+Procter/M
+Procyon/M
+Prof
+Prohibition
+Prokofiev/M
+Promethean/M
+Prometheus/M
+Prophets
+Proserpina/M
+Proserpine/M
+Protagoras/M
+Proterozoic/M
+Protestant/MS
+Protestantism/SM
+Proteus/M
+Proudhon/M
+Proust/M
+Provencal/MS
+Provence/M
+Proverbs
+Providence/SM
+Provo/M
+Prozac/MS
+Prudence/M
+Prudential/M
+Pruitt/M
+Prussia/M
+Prussian/MS
+Prut/M
+Pryor/M
+Psalms/M
+Psalter/MS
+Psyche/M
+Pt/M
+Ptah/M
+Ptolemaic/M
+Ptolemy/SM
+Pu/M
+Puccini/M
+Puck/M
+Puckett/M
+Puebla/M
+Pueblo/M
+Puerto
+Puget/M
+Pugh/M
+Pulaski/M
+Pulitzer/M
+Pullman/MS
+Punch/M
+Punic/M
+Punjab/M
+Punjabi/M
+Purana/M
+Purcell/M
+Purdue/M
+Purim/MS
+Purina/M
+Puritan/M
+Puritanism/MS
+Purus/M
+Pusan/M
+Pusey/M
+Pushkin/M
+Pushtu/M
+Putin/M
+Putnam/M
+Puzo/M
+Pvt
+PyTorch/M
+Pygmalion/M
+Pygmy/SM
+Pyle/M
+Pym/M
+Pynchon/M
+Pyongyang/M
+Pyotr/M
+Pyrenees/M
+Pyrex/MS
+Pyrrhic/M
+Pythagoras/M
+Pythagorean/M
+Pythias/M
+Python/M
+Q
+QA
+QB
+QC
+QED
+QM
+QWERTY
+Qaddafi/M
+Qantas/M
+Qatar/M
+Qatari/MS
+Qingdao/M
+Qinghai/M
+Qiqihar/M
+Qom/M
+Quaalude/M
+Quaker/MS
+Quakerism/SM
+Qualcomm/M
+Quaoar/M
+Quasimodo/M
+Quaternary/M
+Quayle/M
+Que
+Quebec/M
+Quebecois/M
+Quechua/M
+Queen/MS
+Queens/M
+Queensland/M
+Quentin/M
+Quetzalcoatl/M
+Quezon/M
+Quincy/M
+Quinn/M
+Quintilian/M
+Quinton/M
+Quirinal/M
+Quisling/M
+Quito/M
+Quixote/M
+Quixotism/M
+Qumran/M
+Quonset/M
+Quran
+Quranic
+R/M
+RAF/M
+RAM/SM
+RBI
+RC
+RCA/M
+RCMP
+RD
+RDA
+RDS/M
+REIT
+REM/SM
+RF
+RFC/S
+RFD
+RI
+RIF
+RIP
+RISC
+RN/M
+RNA/M
+ROFL
+ROM/M
+ROTC/M
+RP
+RR
+RSFSR
+RSI
+RSV
+RSVP
+RTFM
+RV/SM
+Ra/M
+Rabat/M
+Rabelais/M
+Rabelaisian/M
+Rabin/M
+Rachael/M
+Rachel/M
+Rachelle/M
+Rachmaninoff/M
+Racine/M
+Radcliff/M
+Radcliffe/M
+Rae/M
+Rafael/M
+Raffles/M
+Ragnarok/M
+Rainier/M
+Raleigh/M
+Ralph/M
+Rama/M
+Ramada/M
+Ramadan/MS
+Ramakrishna/M
+Ramanujan/M
+Ramayana/M
+Rambo/M
+Ramirez/M
+Ramiro/M
+Ramon/M
+Ramona/M
+Ramos/M
+Ramsay/M
+Ramses/M
+Ramsey/M
+Rand/M
+Randal/M
+Randall/M
+Randell/M
+Randi/M
+Randolph/M
+Randy/M
+Rangoon/M
+Rankin/M
+Rankine/M
+Raoul/M
+Raphael/M
+Rappaport/M
+Rapunzel/M
+Raquel/M
+Rasalgethi/M
+Rasalhague/M
+Rasmussen/M
+Rasputin/M
+Rasta
+Rastaban/M
+Rastafarian/MS
+Rastafarianism
+Rather/M
+Ratliff/M
+Raul/M
+Ravel/M
+Rawalpindi/M
+Ray/M
+RayBan/M
+Rayburn/M
+Rayleigh/M
+Raymond/M
+Raymundo/M
+Rb/M
+Rd
+Re/M
+Reading/M
+Reagan/M
+Reaganomics/M
+Realtor/M
+Reasoner/M
+Reba/M
+Rebekah/M
+Recife/M
+Reconstruction/M
+Redding/M
+Redeemer/M
+Redford/M
+Redgrave/M
+Redis/M
+Redmond/M
+Redshift/M
+Reebok/M
+Reed/M
+Reese/M
+Reeves/M
+Reformation/MS
+Refugio/M
+Reggie/M
+Regina/M
+Reginae/M
+Reginald/M
+Regor/M
+Regulus/M
+Rehnquist/M
+Reich/M
+Reichstag's
+Reid/M
+Reilly/M
+Reinaldo/M
+Reinhardt/M
+Reinhold/M
+Remarque/M
+Rembrandt/M
+Remington/M
+Remus/M
+Rena/M
+Renaissance/SM
+Renascence
+Renault/M
+Rene/M
+Renee/M
+Reno/M
+Renoir/M
+Rep
+Representative
+Republican/SM
+Republicanism
+Requiem/MS
+Resistance
+Restoration/M
+Resurrection
+Reuben/M
+Reunion/M
+Reuters/M
+Reuther/M
+Rev
+Reva/M
+Revelation/SM
+Revelations/M
+Revere/M
+Reverend/M
+Revlon/M
+Rex/M
+Reyes/M
+Reykjavik/M
+Reyna/M
+Reynaldo/M
+Reynolds/M
+Rf/M
+Rh/M
+Rhea/M
+Rhee/M
+Rheingau/M
+Rhenish/M
+Rhiannon/M
+Rhine/M
+Rhineland/M
+Rhoda/M
+Rhode/S
+Rhodes/M
+Rhodesia/M
+Rhodesian
+Rhonda/M
+Rhone/M
+Ribbentrop/M
+Ricardo/M
+Rice/M
+Rich/M
+Richard/MS
+Richards/M
+Richardson/M
+Richelieu/M
+Richie/M
+Richmond/M
+Richter/M
+Richthofen/M
+Rick/M
+Rickenbacker/M
+Rickey/M
+Rickie/M
+Rickover/M
+Ricky/M
+Rico/M
+Riddle/M
+Ride/M
+Riefenstahl/M
+Riel/M
+Riemann/M
+Riesling/MS
+Riga/M
+Rigel/M
+Riggs/M
+Right
+Rigoberto/M
+Rigoletto/M
+Riley/M
+Rilke/M
+Rimbaud/M
+Ringling/M
+Ringo/M
+Rio/SM
+Rios/M
+Ripley/M
+Risorgimento/M
+Rita/M
+Ritalin/M
+Ritz/M
+Rivas/M
+Rivera/M
+Rivers/M
+Riverside/M
+Riviera/MS
+Riyadh/M
+Rizal/M
+Rn/M
+Roach/M
+Roanoke/M
+Rob/M
+Robbie/M
+Robbin/MS
+Robbins/M
+Robby/M
+Roberson/M
+Robert/MS
+Roberta/M
+Roberto/M
+Roberts/M
+Robertson/M
+Robeson/M
+Robespierre/M
+Robin/M
+Robinson/M
+Robitussin/M
+Robles/M
+Robson/M
+Robt/M
+Robyn/M
+Rocco/M
+Rocha/M
+Rochambeau/M
+Roche/M
+Rochelle/M
+Rochester/M
+Rock/M
+Rockefeller/M
+Rockford/M
+Rockies/M
+Rockne/M
+Rockwell/M
+Rocky/SM
+Rod/M
+Roddenberry/M
+Roderick/M
+Rodger/MS
+Rodgers/M
+Rodin/M
+Rodney/M
+Rodolfo/M
+Rodrick/M
+Rodrigo/M
+Rodriguez/M
+Rodriquez/M
+Roeg/M
+Roentgen
+Rogelio/M
+Roger/MS
+Rogers/M
+Roget/M
+Rojas/M
+Roku/M
+Rolaids/M
+Roland/M
+Rolando/M
+Rolex/M
+Rolland/M
+Rollerblade/M
+Rollins/M
+Rolodex/M
+Rolvaag/M
+Rom
+Roman/MS
+Romanesque/MS
+Romania/M
+Romanian/MS
+Romano/M
+Romanov/M
+Romans/M
+Romansh/M
+Romanticism
+Romany/SM
+Rome/SM
+Romeo/M
+Romero/M
+Rommel/M
+Romney/M
+Romulus/M
+Ron/M
+Ronald/M
+Ronda/M
+Ronnie/M
+Ronny/M
+Ronstadt/M
+Rontgen
+Rooney/M
+Roosevelt/M
+Root/M
+Roquefort/SM
+Rorschach/M
+Rory/M
+Rosa/M
+Rosales/M
+Rosalie/M
+Rosalind/M
+Rosalinda/M
+Rosalyn/M
+Rosanna/M
+Rosanne/M
+Rosario/M
+Roscoe/M
+Rose/M
+Roseann/M
+Roseau/M
+Rosecrans/M
+Rosella/M
+Rosemarie/M
+Rosemary/M
+Rosenberg/M
+Rosendo/M
+Rosenzweig/M
+Rosetta/M
+Rosicrucian/M
+Rosie/M
+Roslyn/M
+Ross/M
+Rossetti/M
+Rossini/M
+Rostand/M
+Rostov/M
+Rostropovich/M
+Roswell/M
+Rotarian/M
+Roth/M
+Rothko/M
+Rothschild/M
+Rotterdam/M
+Rottweiler/M
+Rouault/M
+Rourke/M
+Rousseau/M
+Rove/RM
+Rover/M
+Rowe/M
+Rowena/M
+Rowland/M
+Rowling/M
+Roxanne/M
+Roxie/M
+Roxy/M
+Roy/M
+Royal/M
+Royce/M
+Rozelle/M
+Rte
+Ru/MH
+Rubaiyat/M
+Rubbermaid/M
+Ruben/SM
+Rubens/M
+Rubicon/MS
+Rubik/M
+Rubin/M
+Rubinstein/M
+Ruby/M
+Ruchbah/M
+Rudolf/M
+Rudolph/M
+Rudy/M
+Rudyard/M
+Rufus/M
+Ruhr/M
+Ruiz/M
+Rukeyser/M
+Rumpelstiltskin/M
+Rumsfeld/M
+Runnymede/M
+Runyon/M
+Rupert/M
+Rush/M
+Rushdie/M
+Rushmore/M
+Ruskin/M
+Russ/M
+Russel/M
+Russell/M
+Russia/M
+Russian/SM
+Russo/M
+Rustbelt/M
+Rusty/M
+Rutan/M
+Rutgers/M
+Ruth/M
+Rutherford/M
+Ruthie/M
+Rutledge/M
+Rwanda/MS
+Rwandan/SM
+Rwy
+Rx
+Ry
+Ryan/M
+Rydberg/M
+Ryder/M
+Ryukyu/M
+S/MN
+SA
+SAC
+SALT/M
+SAM/M
+SAP/M
+SARS/M
+SASE
+SAT
+SBA
+SC/M
+SCSI/M
+SD
+SDI
+SE/M
+SEATO
+SEC/M
+SF
+SGML/M
+SIDS/M
+SJ
+SJW
+SK
+SLR
+SO/S
+SOB/M
+SOP/M
+SOS/M
+SOSes
+SPCA
+SPF
+SQL
+SQLite/M
+SRO
+SS
+SSA
+SSE/M
+SSS
+SST
+SSW/M
+ST
+STD
+STOL
+SUSE/M
+SUV
+SVN/M
+SW/M
+SWAK
+SWAT
+Saab/M
+Saar/M
+Saarinen/M
+Saatchi/M
+Sabbath/M
+Sabbaths
+Sabik/M
+Sabin/M
+Sabina/M
+Sabine/M
+Sabre/M
+Sabrina/M
+Sacajawea/M
+Sacco/M
+Sachs/M
+Sacramento/M
+Sadat/M
+Saddam/M
+Sadducee/M
+Sade/M
+Sadie/M
+Sadr/M
+Safavid/M
+Safeway/M
+Sagan/M
+Saginaw/M
+Sagittarius/MS
+Sahara/M
+Saharan/M
+Sahel/M
+Saigon/M
+Saiph/M
+Sakai/M
+Sakha/M
+Sakhalin/M
+Sakharov/M
+Saki/M
+Saks/M
+Sal/MY
+Saladin/M
+Salado/M
+Salamis/M
+Salas/M
+Salazar/M
+Salem/M
+Salerno/M
+Salesforce/M
+Salinas/M
+Salinger/M
+Salisbury/M
+Salish/M
+Salk/M
+Sallie/M
+Sallust/M
+Sally/M
+Salome/M
+Salonika/M
+Salton/M
+Salvador/M
+Salvadoran/SM
+Salvadorean/MS
+Salvadorian/MS
+Salvatore/M
+Salween/M
+Salyut/M
+Sam/M
+Samantha/M
+Samar/M
+Samara/M
+Samaritan/MS
+Samarkand/M
+Sammie/M
+Sammy/M
+Samoa/M
+Samoan/SM
+Samoset/M
+Samoyed/M
+Sampson/M
+Samson/M
+Samsonite/M
+Samsung/M
+Samuel/M
+Samuelson/M
+San'a
+San/M
+Sana/M
+Sanchez/M
+Sancho/M
+Sand/ZM
+Sandburg/M
+Sanders/M
+Sandinista/M
+Sandoval/M
+Sandra/M
+Sandy/M
+Sanford/M
+Sanforized/M
+Sang/MR
+Sanger/M
+Sanhedrin/M
+Sanka/M
+Sankara/M
+Sanskrit/M
+Santa/M
+Santana/M
+Santayana/M
+Santeria/M
+Santiago/M
+Santos/M
+Sappho/M
+Sapporo/M
+Sara/M
+Saracen/MS
+Saragossa/M
+Sarah/M
+Sarajevo/M
+Saran/M
+Sarasota/M
+Saratov/M
+Sarawak/M
+Sardinia/M
+Sargasso/M
+Sargent/M
+Sargon/M
+Sarnoff/M
+Saroyan/M
+Sarto/M
+Sartre/M
+Sasha/M
+Sask
+Saskatchewan/M
+Saskatoon/M
+Sasquatch/MS
+Sassanian/M
+Sassoon/M
+Sat/M
+Satan/M
+Satanism/M
+Satanist/M
+Saturday/MS
+Saturn/M
+Saturnalia/M
+Saudi/MS
+Saul/M
+Saunders/M
+Saundra/M
+Saussure/M
+Sauternes
+Savage/M
+Savannah/M
+Savior/M
+Savonarola/M
+Savoy/M
+Savoyard/M
+Sawyer/M
+Saxon/MS
+Saxony/M
+Sayers/M
+Sb/M
+Sc/M
+Scala/M
+Scan
+Scandinavia/M
+Scandinavian/MS
+Scaramouch/M
+Scarborough/M
+Scarlatti/M
+Scheat/M
+Schedar/M
+Scheherazade/M
+Schelling/M
+Schenectady/M
+Schiaparelli/M
+Schick/M
+Schiller/M
+Schindler/M
+Schlesinger/M
+Schliemann/M
+Schlitz/M
+Schloss/M
+Schmidt/M
+Schnabel/M
+Schnauzer/M
+Schneider/M
+Schoenberg/M
+Schopenhauer/M
+Schrieffer/M
+Schrodinger/M
+Schroeder/M
+Schubert/M
+Schultz/M
+Schulz/M
+Schumann/M
+Schumpeter/M
+Schuyler/M
+Schuylkill/M
+Schwartz/M
+Schwarzenegger/M
+Schwarzkopf/M
+Schweitzer/M
+Schweppes/M
+Schwinger/M
+Schwinn/M
+Scientologist/SM
+Scientology/M
+Scipio/M
+Scopes/M
+Scorpio/SM
+Scorpius/M
+Scorsese/M
+Scot/SM
+Scotch/MS
+Scotchman/M
+Scotchmen/M
+Scotchwoman/M
+Scotchwomen/M
+Scotia/M
+Scotland/M
+Scotsman/M
+Scotsmen/M
+Scotswoman/M
+Scotswomen/M
+Scott/M
+Scottie/SM
+Scottish/M
+Scottsdale/M
+Scrabble/MS
+Scranton/M
+Scriabin/M
+Scribner/M
+Scripture/SM
+Scrooge/M
+Scruggs/M
+Scud/M
+Sculley/M
+Scylla/M
+Scythia/M
+Scythian/M
+Se/MH
+Seaborg/M
+Seagram/M
+Sean/M
+Sears/M
+Seaside/M
+Seattle/M
+Sebastian/M
+Sebring/M
+Sec
+Seconal/M
+Secretariat/M
+Secretary
+Seder/MS
+Sedna/M
+Seebeck/M
+Seeger/M
+Sega/M
+Segovia/M
+Segre/M
+Segundo/M
+Segway/S
+Seiko/M
+Seine/M
+Seinfeld/M
+Sejong/M
+Selassie/M
+Selectric/M
+Selena/M
+Seleucid/M
+Seleucus/M
+Selim/M
+Seljuk/M
+Selkirk/M
+Sellers/M
+Selma/M
+Selznick/M
+Semarang/M
+Seminole/MS
+Semiramis/M
+Semite/MS
+Semitic/SM
+Semtex/M
+Senate/MS
+Sendai/M
+Seneca/MS
+Senegal/M
+Senegalese/M
+Senghor/M
+Senior/M
+Sennacherib/M
+Sennett/M
+Sensurround/M
+Seoul/M
+Sep
+Sephardi/M
+Sepoy/M
+Sept/M
+September/MS
+Septuagint/MS
+Sequoya/M
+Serb/SM
+Serbia/M
+Serbian/MS
+Serena/M
+Serengeti/M
+Sergei/M
+Sergio/M
+Serpens/M
+Serra/M
+Serrano/M
+Set/M
+Seth/M
+Seton/M
+Seurat/M
+Seuss/M
+Sevastopol/M
+Severn/M
+Severus/M
+Seville/M
+Sevres/M
+Seward/M
+Sextans/M
+Sexton/M
+Seychelles/M
+Seyfert/M
+Seymour/M
+Sgt
+Shaanxi/M
+Shackleton/M
+Shaffer/M
+Shah/M
+Shaka/M
+Shaker
+Shakespeare/M
+Shakespearean/M
+Shana/M
+Shandong/M
+Shane/M
+Shanghai/M
+Shankara/M
+Shanna/M
+Shannon/M
+Shantung/M
+Shanxi/M
+Shapiro/M
+SharePoint/M
+Shari'a/M
+Shari/M
+Sharif/M
+Sharlene/M
+Sharon/M
+Sharp/M
+Sharpe/M
+Sharron/M
+Shasta/M
+Shaula/M
+Shaun/M
+Shauna/M
+Shavian/M
+Shavuot/M
+Shaw/M
+Shawn/M
+Shawna/M
+Shawnee/SM
+Shcharansky/M
+Shea/M
+Sheba/M
+Shebeli/M
+Sheboygan/M
+Sheena/M
+Sheetrock/M
+Sheffield/M
+Sheila/M
+Shelby/M
+Sheldon/M
+Shelia/M
+Shell/M
+Shelley/M
+Shelly/M
+Shelton/M
+Shenandoah/M
+Shenyang/M
+Sheol/M
+Shepard/M
+Shepherd/M
+Sheppard/M
+Sheratan/M
+Sheraton/M
+Sheree/M
+Sheri/M
+Sheridan/M
+Sherlock/M
+Sherman/M
+Sherpa/M
+Sherri/M
+Sherrie/M
+Sherry/M
+Sherwood/M
+Sheryl/M
+Shetland/SM
+Shetlands/M
+Shevardnadze/M
+Shevat/M
+Shi'ite/M
+Shields/M
+Shiite/MS
+Shijiazhuang/M
+Shikoku/M
+Shillong/M
+Shiloh/M
+Shinto/MS
+Shintoism/MS
+Shintoist/MS
+Shiraz/M
+Shirley/M
+Shiva/M
+Shockley/M
+Short/M
+Shorthorn/M
+Shoshone/SM
+Shostakovitch/M
+Shrek/M
+Shreveport/M
+Shriner/M
+Shropshire/M
+Shula/M
+Shylock/M
+Shylockian/M
+Si/M
+Siam/M
+Siamese/M
+Sibelius/M
+Siberia/M
+Siberian/MS
+Sibyl/M
+Sichuan/M
+Sicilian/SM
+Sicily/M
+Sid/M
+Siddhartha/M
+Sidney/M
+Siegfried/M
+Siemens/M
+Sierpinski/M
+Sierras
+Sigismund/M
+Sigmund/M
+Sigurd/M
+Sihanouk/M
+Sikh/M
+Sikhism
+Sikhs
+Sikkim/M
+Sikkimese/M
+Sikorsky/M
+Silas/M
+Silesia/M
+Silurian/SM
+Silva/M
+Silvia/M
+Simenon/M
+Simmental/M
+Simmons/M
+Simon/M
+Simone/M
+Simpson/SM
+Simpsons/M
+Simpsonville/M
+Sims/M
+Sinai/M
+Sinatra/M
+Sinbad/M
+Sinclair/M
+Sindbad/M
+Sindhi/M
+Singapore/M
+Singaporean/SM
+Singer/M
+Singh/M
+Singleton/M
+Sinhalese/M
+Sinkiang/M
+Sioux/M
+Sir/SM
+Sirius/M
+Sistine/M
+Sisyphean/M
+Sisyphus/M
+Siva/M
+Sivan/M
+Sjaelland/M
+Skinner/M
+Skippy/M
+Skopje/M
+Skye/M
+Skylab/M
+Skype/M
+Slackware/M
+Slashdot/M
+Slater/M
+Slav/SM
+Slavic/M
+Slavonic/M
+Slidell/M
+Slinky/M
+Sloan/M
+Sloane/M
+Slocum/M
+Slovak/SM
+Slovakia/M
+Slovakian
+Slovene/SM
+Slovenia/M
+Slovenian/MS
+Slurpee/M
+Sm/M
+Small/M
+Smetana/M
+Smirnoff/M
+Smith/M
+Smithson/M
+Smithsonian/M
+Smokey/M
+Smolensk/M
+Smollett/M
+Smuts/M
+Smyrna
+Sn/M
+Snake/M
+Snapple/M
+Snead/M
+Snell/M
+Snickers/M
+Snider/M
+Snoopy/M
+Snow/M
+Snowbelt/M
+Snyder/M
+Soave/M
+Soc
+Socastee/M
+Socorro/M
+Socrates/M
+Socratic/M
+Soddy/M
+Sodom/M
+Sofia/M
+Soho/M
+Sol/M
+Solis/M
+Solomon/M
+Solon/M
+Solzhenitsyn/M
+Somali/SM
+Somalia/M
+Somalian/MS
+Somme/M
+Somoza/M
+Son/M
+Sondheim/M
+Sondra/M
+Songhai/M
+Songhua/M
+Sonia/M
+Sonja/M
+Sonny/M
+Sonora/M
+Sontag/M
+Sony/M
+Sonya/M
+Sophia/M
+Sophie/M
+Sophoclean/M
+Sophocles/M
+Sopwith/M
+Sorbonne/M
+Sosa/M
+Soto/M
+Souphanouvong/M
+Sourceforge/M
+Sousa/M
+South/M
+Southampton/M
+Southeast/MS
+Southerner/SM
+Southey/M
+Souths
+Southwest/MS
+Soviet/M
+Soweto/M
+Soyinka/M
+Soyuz/M
+Sp
+Spaatz/M
+Spackle/M
+Spahn/M
+Spain/M
+Spam/M
+Span
+Spanglish
+Spaniard/SM
+Spanish/M
+Sparks/M
+Sparta/M
+Spartacus/M
+Spartan/MS
+Spartanburg/M
+Spears/M
+Speer/M
+Spence/RM
+Spencer/M
+Spencerian/M
+Spengler/M
+Spenglerian/M
+Spenser/M
+Spenserian/M
+Sperry/M
+Sphinx/M
+Spica/M
+Spielberg/M
+Spillane/M
+Spinoza/M
+Spinx/M
+Spiro/M
+Spirograph/M
+Spitsbergen/M
+Spitz/M
+Spock/M
+Spokane/M
+Springdale/M
+Springfield/M
+Springsteen/M
+Sprint/M
+Sprite/M
+Sputnik/M
+Sq
+Squanto/M
+Squibb/M
+Sr/M
+Srinagar/M
+Srivijaya/M
+St
+Sta
+Stacey/M
+Staci/M
+Stacie/M
+Stacy/M
+Stael/M
+Stafford/M
+StairMaster/M
+Stalin/M
+Stalingrad/M
+Stalinist/M
+Stallone/M
+Stamford/M
+Stan/M
+Standish/M
+Stanford/M
+Stanislavsky/M
+Stanley/M
+Stanton/M
+Staples/M
+Starbucks/M
+Stark/M
+Starkey/M
+Starr/M
+Staten/M
+States
+Staubach/M
+Staunton/M
+Ste
+Steadicam/M
+Steele/M
+Stefan/M
+Stefanie/M
+Stein/MR
+Steinbeck/M
+Steinem/M
+Steiner/M
+Steinmetz/M
+Steinway/M
+Stella/M
+Stendhal/M
+Stengel/M
+Stephan/M
+Stephanie/M
+Stephen/MS
+Stephens/M
+Stephenson/M
+Sterling/M
+Stern/M
+Sterne/M
+Sterno/M
+Stetson/M
+Steuben/M
+Steubenville/M
+Steve/M
+Steven/MS
+Stevens/M
+Stevenson/M
+Stevie/M
+Stewart/M
+Stieglitz/M
+Stilton/SM
+Stimson/M
+Stine/M
+Stirling/M
+Stockhausen/M
+Stockholm/M
+Stockton/M
+Stoic/SM
+Stoicism/MS
+Stokes/M
+Stolichnaya/M
+Stolypin/M
+Stone/M
+Stonehenge/M
+Stoppard/M
+Stout/M
+Stowe/M
+Strabo/M
+Stradivari
+Stradivarius/M
+Strasbourg/M
+Strauss/M
+Stravinsky/M
+Streisand/M
+Strickland/M
+Strindberg/M
+Stromboli/M
+Strong/M
+Stu/M
+Stuart/MS
+Studebaker/M
+Stuttgart/M
+Stuyvesant/M
+Stygian/M
+Styrofoam/SM
+Styron/M
+Styx/M
+Suarez/M
+Subaru/M
+Sucre/M
+Sucrets/M
+Sudan/M
+Sudanese/M
+Sudetenland/M
+Sudoku/M
+Sudra/M
+Sue/M
+Suetonius/M
+Suez/M
+Suffolk/M
+Sufi/M
+Sufism/M
+Suharto/M
+Sui/M
+Sukarno/M
+Sukkot
+Sulawesi/M
+Suleiman/M
+Sulla/M
+Sullivan/M
+Sumatra/M
+Sumatran/SM
+Sumeria/M
+Sumerian/SM
+Summer/MS
+Summers/M
+Sumner/M
+Sumter/M
+Sun/SM
+Sunbeam/M
+Sunbelt/M
+Sundanese/M
+Sundas/M
+Sunday/MS
+Sung/M
+Sunkist/M
+Sunni/SM
+Sunnite/MS
+Sunnyvale/M
+Superbowl/M
+Superfund/M
+Superglue/M
+Superior/M
+Superman/M
+Supt
+Surabaya/M
+Surat/M
+Suriname/M
+Surinamese
+Surya/M
+Susan/M
+Susana/M
+Susanna/M
+Susanne/M
+Susie/M
+Susquehanna/M
+Sussex/M
+Sutherland/M
+Sutton/M
+Suva/M
+Suwanee/M
+Suzanne/M
+Suzette/M
+Suzhou/M
+Suzuki/M
+Suzy/M
+Svalbard/M
+Sven/M
+Svengali/M
+Sverdlovsk
+Swahili/SM
+Swammerdam/M
+Swanee/M
+Swansea/M
+Swanson/M
+Swazi/SM
+Swaziland/M
+Swed/N
+Swede/SM
+Sweden/M
+Swedenborg/M
+Swedish/M
+Sweeney/M
+Sweet/M
+Swift/M
+Swinburne/M
+Swiss/MS
+Swissair/M
+Switz
+Switzerland/M
+Sybil/M
+Sydney/M
+Sykes/M
+Sylvester/M
+Sylvia/M
+Sylvie/M
+Synge/M
+Syracuse/M
+Syria/M
+Syriac/M
+Syrian/MS
+Szilard/M
+Szymborska/M
+T'ang/M
+T/MDG
+TA
+TARP
+TB/M
+TBA
+TD
+TDD
+TEFL
+TELNET/S
+TELNETTed
+TELNETTing
+TESL
+TESOL
+TGIF
+THC
+TKO/M
+TLC/M
+TM
+TN
+TNT/M
+TOEFL
+TQM
+TV/SM
+TVA
+TWA/M
+TWX
+TX
+Ta/M
+Tabasco/SM
+Tabatha/M
+Tabernacle/MS
+Tabitha/M
+Tabriz/MS
+Tacitus/M
+Tacoma/M
+Tad/M
+Tadzhik/M
+Taegu/M
+Taejon/M
+Taft/M
+Tagalog/SM
+Tagore/M
+Tagus/M
+Tahiti/M
+Tahitian/MS
+Tahoe/M
+Taichung/M
+Tainan
+Taine/M
+Taipei/M
+Taiping/M
+Taiwan/M
+Taiwanese/M
+Taiyuan/M
+Tajikistan/M
+Taklamakan/M
+Talbot/M
+Taliban/M
+Taliesin/M
+Tallahassee/M
+Tallchief/M
+Talley/M
+Talleyrand/M
+Tallinn/M
+Talmud/MS
+Talmudic
+Talmudist
+Tamara/M
+Tameka/M
+Tamera/M
+Tamerlane/M
+Tami/M
+Tamika/M
+Tamil/MS
+Tammany/M
+Tammi/M
+Tammie/M
+Tammuz/M
+Tammy/M
+Tampa/M
+Tampax/M
+Tamra/M
+Tamworth/M
+Tancred/M
+Taney/M
+Tanganyika/M
+Tangier/MS
+Tangshan/M
+Tania/M
+Tanisha/M
+Tanner/M
+Tannhauser/M
+Tantalus/M
+Tanya/M
+Tanzania/M
+Tanzanian/SM
+Tao/M
+Taoism/MS
+Taoist/MS
+Tara/M
+Tarantino/M
+Tarawa/M
+Tarazed/M
+Tarbell/M
+Target/M
+Tarim/M
+Tarkenton/M
+Tarkington/M
+Tartary/M
+Tartuffe/M
+Tarzan/M
+Tasha/M
+Tashkent/M
+Tasman/M
+Tasmania/M
+Tasmanian/M
+Tass/M
+Tatar/MS
+Tate/M
+Tatum/M
+Taurus/MS
+Tavares/M
+Tawney/M
+Taylor/M
+Tb/M
+Tbilisi/M
+Tc/M
+Tchaikovsky/M
+Te/M
+TeX
+TeXes
+Teasdale/M
+Technicolor/M
+Tecumseh/M
+Ted/M
+Teddy/M
+Teflon/MS
+Tegucigalpa/M
+Tehran
+TelePrompTer
+TelePrompter/M
+Telemachus/M
+Telemann/M
+Teletype
+Tell/MR
+Teller/M
+Telugu/M
+Temecula/M
+Tempe
+Templar/M
+Temple/M
+Tenn/M
+Tennessean/SM
+Tennessee/M
+Tennyson/M
+Tennysonian
+Tenochtitlan/M
+TensorFlow/M
+Teotihuacan/M
+Terence/M
+Teresa/M
+Tereshkova/M
+Teri/M
+Terkel/M
+Terpsichore/M
+Terr/M
+Terra/M
+Terran/M
+Terrance/M
+Terrell/M
+Terrence/M
+Terri/M
+Terrie/M
+Terry/M
+Tertiary/M
+Tesla/M
+Tess/M
+Tessa/M
+Tessie/M
+Tet/M
+Tethys/M
+Tetons/M
+Teuton/MS
+Teutonic/M
+Tevet/M
+Tex/M
+Texaco/M
+Texan/MS
+Texarkana/M
+Texas/M
+Th/M
+Thackeray/M
+Thad/M
+Thaddeus/M
+Thai/SM
+Thailand/M
+Thales/M
+Thalia/M
+Thames/M
+Thanh/M
+Thanksgiving/MS
+Thant/M
+Thar/M
+Tharp/M
+Thatcher/M
+Thea/M
+Thebes/M
+Theiler/M
+Thelma/M
+Themistocles/M
+Theocritus/M
+Theodora/M
+Theodore/M
+Theodoric/M
+Theodosius/M
+Theosophy/M
+Theravada/M
+Theresa/M
+Therese/M
+Thermopylae/M
+Thermos
+Theron/M
+Theseus/M
+Thespian/M
+Thespis/M
+Thessalonian/SM
+Thessaloniki/M
+Thessaly/M
+Thieu/M
+Thimbu/M
+Thimphu
+Thomas/M
+Thomism/M
+Thomistic/M
+Thompson/M
+Thomson/M
+Thor/M
+Thorazine/M
+Thoreau/M
+Thornton/M
+Thoroughbred/M
+Thorpe/M
+Thoth/M
+Thrace/M
+Thracian/M
+Thu
+Thucydides/M
+Thule/M
+Thunderbird/M
+Thur/S
+Thurber/M
+Thurman/M
+Thurmond/M
+Thursday/SM
+Thutmose/M
+Ti/M
+Tia/M
+Tianjin/M
+Tiber/M
+Tiberius/M
+Tibet/M
+Tibetan/MS
+Ticketmaster/M
+Ticonderoga/M
+Tide/M
+Tienanmen/M
+Tiffany/M
+Tigris/M
+Tijuana/M
+Tillich/M
+Tillman/M
+Tilsit/M
+Tim/M
+Timbuktu/M
+Timex/M
+Timmy/M
+Timon/M
+Timor/M
+Timothy/M
+Timur/M
+Timurid/M
+Tina/M
+Ting/M
+Tinkerbell/M
+Tinkertoy/M
+Tinseltown/M
+Tintoretto/M
+Tippecanoe/M
+Tipperary/M
+Tirane
+Tiresias/M
+Tirol/M
+Tirolean
+Tisha/M
+Tishri/M
+Titan/SM
+Titania/M
+Titanic/M
+Titian/M
+Titicaca/M
+Tito/M
+Titus/M
+Titusville/M
+Tl/M
+Tlaloc/M
+Tlingit/M
+Tm/M
+Tobago/M
+Tobit/M
+Toby/M
+Tocantins/M
+Tocqueville/M
+Tod/M
+Todd/M
+Togo/M
+Togolese/M
+Tojo/M
+Tokay/M
+Tokugawa/M
+Tokyo/M
+Tokyoite
+Toledo/MS
+Tolkien/M
+Tolstoy/M
+Toltec/M
+Tolyatti/M
+Tom/M
+Tomas/M
+Tombaugh/M
+Tomlin/M
+Tommie/M
+Tommy/M
+Tompkins/M
+Tomsk/M
+Tonga/M
+Tongan/MS
+Toni/M
+Tonia/M
+Tonto/M
+Tony/M
+Tonya/M
+Topeka/M
+Topsy/M
+Torah/M
+Torahs
+Toronto/M
+Torquemada/M
+Torrance/M
+Torrens/M
+Torres/M
+Torricelli/M
+Tortola/M
+Tortuga/M
+Torvalds/M
+Tory/SM
+Tosca/M
+Toscanini/M
+Toshiba/M
+Toto/M
+Toulouse/M
+Townes/M
+Townsend/M
+Toynbee/M
+Toyoda/M
+Toyota/M
+Tracey/M
+Traci/M
+Tracie/M
+Tracy/M
+Trafalgar/M
+Trailways/M
+Trajan/M
+Tran/M
+Transcaucasia/M
+Transvaal/M
+Transylvania/M
+Transylvanian/M
+Trappist/SM
+Travis/M
+Travolta/M
+Treasury/SM
+Treblinka/M
+Trekkie/M
+Trent/M
+Trenton/M
+Trevelyan/M
+Trevino/M
+Trevor/M
+Trey/M
+Triangulum/M
+Triassic/M
+Tricia/M
+Trident/M
+Trieste/M
+Trimurti/M
+Trina/M
+Trinidad/M
+Trinidadian/MS
+Trinity/SM
+Tripitaka/M
+Tripoli/M
+Trippe/M
+Trisha/M
+Tristan/M
+Triton/M
+Trobriand/M
+Troilus/M
+Trojan/MS
+Trollope/M
+Trondheim/M
+Tropicana/M
+Trotsky/M
+Troy/M
+Troyes
+Truckee/M
+Trudeau/M
+Trudy/M
+Truffaut/M
+Trujillo/M
+Truman/M
+Trumbull/M
+Trump/M
+Truth/M
+Tsimshian/M
+Tsiolkovsky/M
+Tsitsihar/M
+Tsongkhapa/M
+Tswana/M
+Tu/M
+Tuamotu/M
+Tuareg/M
+Tubman/M
+Tucker/M
+Tucson/M
+Tucuman/M
+Tudor/SM
+Tue/S
+Tues/M
+Tuesday/MS
+Tulane/M
+Tull/M
+Tulsa/M
+Tulsidas/M
+Tums/M
+Tungus/M
+Tunguska/M
+Tunis/M
+Tunisia/M
+Tunisian/MS
+Tunney/M
+Tupi/M
+Tupperware/M
+Tupungato/M
+Turgenev/M
+Turin/M
+Turing/M
+Turk/SM
+Turkestan/M
+Turkey/M
+Turkic/MS
+Turkish/M
+Turkmenistan/M
+Turlock/M
+Turner/M
+Turpin/M
+Tuscaloosa/M
+Tuscan/M
+Tuscany/M
+Tuscarora/MS
+Tuscon/M
+Tuskegee/M
+Tussaud/M
+Tut/M
+Tutankhamen/M
+Tutsi/M
+Tutu/M
+Tuvalu/M
+Tuvaluan
+Twain/M
+Tweed/M
+Tweedledee/M
+Tweedledum/M
+Twila/M
+Twinkies/M
+Twitter/M
+Twizzlers/M
+Twp
+Ty/M
+Tycho/M
+Tylenol/M
+Tyler/M
+Tyndale/M
+Tyndall/M
+Tyre/M
+Tyree/M
+Tyrolean
+Tyrone/M
+Tyson/M
+U/M
+UAR
+UAW
+UBS/M
+UCLA/M
+UFO/SM
+UHF/M
+UK/M
+UL
+UN/M
+UNESCO/M
+UNICEF/M
+UNIX/M
+UPC
+UPI/M
+UPS/M
+URL/S
+US/M
+USA/M
+USAF
+USB
+USCG
+USDA/M
+USIA
+USMC
+USN
+USO
+USP
+USPS
+USS
+USSR/M
+UT/M
+UTC
+UV/M
+Ubangi/M
+Ubuntu/M
+Ucayali/M
+Uccello/M
+Udall/M
+Ufa/M
+Uganda/M
+Ugandan/MS
+Uighur/M
+Ujungpandang/M
+Ukraine/M
+Ukrainian/SM
+Ulster/M
+Ultrasuede/M
+Ulyanovsk/M
+Ulysses/M
+Umbriel/M
+Underwood/M
+Ungava/M
+Unicode/M
+Unilever/M
+Union/SM
+Unionist
+Uniontown/M
+Uniroyal/M
+Unitarian/MS
+Unitarianism/MS
+Unitas/M
+Unix/S
+Unukalhai/M
+Upanishads/M
+Updike/M
+Upjohn/M
+Upton/M
+Ur/M
+Ural/SM
+Urals/M
+Urania/M
+Uranus/M
+Urban/M
+Urdu/M
+Urey/M
+Uriah/M
+Uriel/M
+Uris/M
+Urquhart/M
+Ursa/M
+Ursula/M
+Ursuline/M
+Uruguay/M
+Uruguayan/MS
+Urumqi/M
+Usenet/MS
+Ustinov/M
+Ut
+Utah/M
+Utahan/MS
+Ute/SM
+Utica/M
+Utopia/SM
+Utopian/SM
+Utrecht/M
+Utrillo/M
+Uzbek/M
+Uzbekistan/M
+Uzi/SM
+V/M
+VA
+VAT/M
+VAX
+VAXes
+VBA/M
+VCR/M
+VD/M
+VDT
+VDU
+VF
+VFW/M
+VG
+VGA
+VHF/M
+VHS
+VI/M
+VIP/SM
+VISTA
+VJ
+VLF/M
+VOA
+VP
+VT
+VTOL
+Va/M
+Vacaville/M
+Vader/M
+Vaduz/M
+Val/M
+Valarie/M
+Valdez/M
+Valdosta/M
+Valencia/SM
+Valenti/M
+Valentin/M
+Valentine/M
+Valentino/M
+Valenzuela/M
+Valeria/M
+Valerian/M
+Valerie/M
+Valery/M
+Valhalla/M
+Valium/MS
+Valkyrie/SM
+Vallejo/M
+Valletta/M
+Valois/M
+Valparaiso/M
+Valvoline/M
+Van/M
+Vance/M
+Vancouver/M
+Vandal/MS
+Vanderbilt/M
+Vandyke/M
+Vanessa/M
+Vang/M
+Vanuatu/M
+Vanzetti/M
+Varanasi/M
+Varese/M
+Vargas/M
+Vaseline/SM
+Vasquez/M
+Vassar/M
+Vatican/M
+Vauban/M
+Vaughan/M
+Vaughn/M
+Vazquez/M
+Veblen/M
+Veda/SM
+Vedanta/M
+Vega/SM
+Vegas/M
+Vegemite/M
+Vela/M
+Velasquez/M
+Velazquez/M
+Velcro/MS
+Velez/M
+Velma/M
+Velveeta/M
+Venetian/SM
+Venezuela/M
+Venezuelan/SM
+Venice/M
+Venn/M
+Ventolin/M
+Venus/MS
+Venusian/M
+Vera/M
+Veracruz/M
+Verde/M
+Verdi/M
+Verdun/M
+Verizon/M
+Verlaine/M
+Vermeer/M
+Vermont/ZMR
+Vermonter/M
+Vern/M
+Verna/M
+Verne/M
+Vernon/M
+Verona/M
+Veronese/M
+Veronica/M
+Versailles/M
+Vesalius/M
+Vespasian/M
+Vespucci/M
+Vesta/M
+Vesuvius/M
+Viacom/M
+Viagra/M
+Vic/M
+Vicente/M
+Vichy/M
+Vicki/M
+Vickie/M
+Vicksburg/M
+Vicky/M
+Victor/M
+Victoria/M
+Victorian/MS
+Victorianism
+Victorville/M
+Victrola/M
+Vidal/M
+Vienna/M
+Viennese/M
+Vientiane/M
+Vietcong/M
+Vietminh/M
+Vietnam/M
+Vietnamese/M
+Vijayanagar/M
+Vijayawada/M
+Viking/MS
+Vila/M
+Villa/SM
+Villarreal/M
+Villas/M
+Villon/M
+Vilma/M
+Vilnius/M
+Vilyui/M
+Vince/M
+Vincent/M
+Vindemiatrix/M
+Vineland/M
+Vinson/M
+Viola/M
+Violet/M
+Virgie/M
+Virgil/M
+Virginia/M
+Virginian/SM
+Virgo/SM
+Visa/M
+Visalia/M
+Visayans/M
+Vishnu/M
+Visigoth/M
+Visigoths
+Vistula/M
+Vitim/M
+Vito/M
+Vitus/M
+Vivaldi/M
+Vivekananda/M
+Vivian/M
+Vivienne/M
+Vlad/M
+Vladimir/M
+Vladivostok/M
+Vlaminck/M
+Vlasic/M
+VoIP
+Vogue/M
+Volcker/M
+Voldemort/M
+Volga/M
+Volgograd/M
+Volkswagen/M
+Volstead/M
+Volta/M
+Voltaire/M
+Volvo/M
+Vonda/M
+Vonnegut/M
+Voronezh/M
+Vorster/M
+Voyager/M
+Vt
+Vuitton/M
+Vulcan/M
+Vulg
+Vulgate/SM
+W/MDT
+WA
+WAC
+WASP/M
+WATS/M
+WC
+WHO/M
+WI
+WMD
+WNW/M
+WP
+WSW/M
+WTO
+WV
+WW
+WWI
+WWII
+WWW/M
+WY
+WYSIWYG
+Wabash/M
+Wac
+Waco/M
+Wade/M
+Wagner/M
+Wagnerian/M
+Wahhabi/M
+Waikiki/M
+Waite/M
+Wake/M
+Waksman/M
+Wald/MN
+Waldemar/M
+Walden/M
+Waldensian/M
+Waldheim/M
+Waldo/M
+Waldorf/M
+Wales/M
+Walesa/M
+Walgreen/SM
+Walgreens/M
+Walker/M
+Walkman/M
+Wall/SMR
+Wallace/M
+Wallenstein/M
+Waller/M
+Wallis/M
+Walloon/M
+Walls/M
+Walmart/M
+Walpole/M
+Walpurgisnacht/M
+Walsh/M
+Walt/MRZ
+Walter/M
+Walters/M
+Walton/M
+Wanamaker/M
+Wanda/M
+Wang/M
+Wankel/M
+Ward/M
+Ware/MG
+Warhol/M
+Waring/M
+Warner/M
+Warren/M
+Warsaw/M
+Warwick/M
+Wasatch/M
+Wash/M
+Washington/M
+Washingtonian/MS
+Wassermann/M
+Waterbury/M
+Waterford/M
+Watergate/M
+Waterloo/MS
+Waters/M
+Watertown/M
+Watkins/M
+Watson/M
+Watsonville/M
+Watt/SM
+Watteau/M
+Watts/M
+Watusi/M
+Waugh/M
+Wausau/M
+Wave
+Wayne/M
+Waynesboro/M
+Weaver/M
+Web/MR
+Webb/M
+Weber/M
+Webern/M
+Webster/MS
+Wed/M
+Weddell/M
+Wedgwood/M
+Wednesday/MS
+Weeks/M
+Wehrmacht/M
+Wei/M
+Weierstrass/M
+Weill/M
+Weinberg/M
+Weirton/M
+Weiss/M
+Weissmuller/M
+Weizmann/M
+Weldon/M
+Welland/M
+Weller/M
+Welles/M
+Wellington/SM
+Wells/M
+Welsh/M
+Welshman/M
+Welshmen/M
+Welshwoman
+Wenatchee/M
+Wendell/M
+Wendi/M
+Wendy/M
+Wesak/M
+Wesley/M
+Wesleyan/M
+Wessex/M
+Wesson/M
+West/SM
+Western/MRS
+Westinghouse/M
+Westminster/M
+Weston/M
+Westphalia/M
+Weyden/M
+Wezen/M
+Wharton/M
+Wheaties/M
+Wheatstone/M
+Wheeler/M
+Wheeling/M
+Whig/SM
+Whipple/M
+Whirlpool/M
+Whistler/M
+Whitaker/M
+White/SM
+Whitefield/M
+Whitehall/M
+Whitehead/M
+Whitehorse/M
+Whiteley/M
+Whitfield/M
+Whitley/M
+Whitman/M
+Whitney/M
+Whitsunday/MS
+Whittier/M
+WiFi
+Wicca/M
+Wichita/M
+Wiemar/M
+Wiesel/M
+Wiesenthal/M
+Wiggins/M
+Wigner/M
+Wii/M
+Wikileaks
+Wikipedia/M
+Wilberforce/M
+Wilbert/M
+Wilbur/M
+Wilburn/M
+Wilcox/M
+Wilda/M
+Wilde/MR
+Wilder/M
+Wiles/M
+Wiley/M
+Wilford/M
+Wilfred/M
+Wilfredo/M
+Wilhelm/M
+Wilhelmina/M
+Wilkerson/M
+Wilkes/M
+Wilkins/M
+Wilkinson/M
+Will/M
+Willa/M
+Willamette/M
+Willard/M
+Willemstad/M
+William/SM
+Williams/M
+Williamsburg/M
+Williamson/M
+Williamsport/M
+Willie/M
+Willis/M
+Willy/M
+Wilma/M
+Wilmer/M
+Wilmington/M
+Wilson/M
+Wilsonian/M
+Wilton/M
+Wimbledon/M
+Wimsey/M
+Winchell/M
+Winchester/MS
+Windbreaker/M
+Windex/M
+Windhoek/M
+Windows/M
+Windsor/SM
+Windward/M
+Winesap/M
+Winfred/M
+Winfrey/M
+Winifred/M
+Winkle/M
+Winnebago/M
+Winnie/M
+Winnipeg/M
+Winston/M
+Winters/M
+Winthrop/M
+Wis
+Wisc
+Wisconsin/M
+Wisconsinite/MS
+Wise/M
+Witt/M
+Wittgenstein/M
+Witwatersrand/M
+Wm/M
+Wobegon/M
+Wodehouse/M
+Wolf/M
+Wolfe/M
+Wolff/M
+Wolfgang/M
+Wollongong/M
+Wollstonecraft/M
+Wolsey/M
+Wolverhampton
+Wonder/M
+Wonderbra/M
+Wong/M
+Wood/SM
+Woodard/M
+Woodhull/M
+Woodland/M
+Woodrow/M
+Woods/M
+Woodstock/M
+Woodward/M
+Woolf/M
+Woolite/M
+Woolongong/M
+Woolworth/M
+Wooster/M
+Wooten/M
+Worcester/SM
+Worcestershire/M
+WordPress/M
+Wordsworth/M
+Workman/M
+Worms/M
+Wotan/M
+Wovoka/M
+Wozniak/M
+Wozzeck/M
+Wrangell/M
+Wren/M
+Wright/M
+Wrigley/M
+Wroclaw/M
+Wu/M
+Wuhan/M
+Wurlitzer/M
+Wyatt/M
+Wycherley/M
+Wycliffe/M
+Wyeth/M
+Wylie/M
+Wynn/M
+Wyo
+Wyoming/M
+Wyomingite/SM
+X/M
+XEmacs/M
+XL/M
+XML
+XS
+XXL
+Xamarin/M
+Xanadu/M
+Xanthippe/M
+Xavier/M
+Xe/SM
+Xenakis/M
+Xenia/M
+Xenophon/M
+Xerox/MS
+Xerxes/M
+Xhosa/M
+Xi'an/M
+Xian/SM
+Xiaoping/M
+Ximenes/M
+Xingu/M
+Xinjiang/M
+Xiongnu/M
+Xizang/M
+Xmas/MS
+Xochipilli/M
+Xuzhou/M
+Y/M
+YMCA/M
+YMHA
+YMMV
+YT
+YWCA/M
+YWHA
+Yacc/M
+Yahoo/M
+Yahtzee/M
+Yahweh/M
+Yakima/M
+Yakut/M
+Yakutsk/M
+Yale/M
+Yalow/M
+Yalta/M
+Yalu/M
+Yamagata/M
+Yamaha/M
+Yamoussoukro/M
+Yang/M
+Yangon/M
+Yangtze/M
+Yank/SM
+Yankee/SM
+Yaobang/M
+Yaounde/M
+Yaqui/M
+Yaren
+Yaroslavl/M
+Yataro/M
+Yates/M
+Yauco/M
+Yb/M
+Yeager/M
+Yeats/M
+Yekaterinburg/M
+Yellowknife/M
+Yellowstone/M
+Yeltsin/M
+Yemen/M
+Yemeni/SM
+Yemenite
+Yenisei/M
+Yerevan/M
+Yerkes/M
+Yesenia/M
+Yevtushenko/M
+Yggdrasil/M
+Yiddish/M
+Ymir/M
+Yoda/M
+Yoknapatawpha/M
+Yoko/M
+Yokohama/M
+Yolanda/M
+Yong/M
+Yonkers/M
+York/M
+Yorkie/M
+Yorkshire/MS
+Yorktown/M
+Yoruba/M
+Yosemite/M
+Yossarian/M
+YouTube/M
+Young/M
+Youngstown/M
+Ypres/M
+Ypsilanti/M
+Yuan/M
+Yucatan/M
+Yugo/M
+Yugoslav/MS
+Yugoslavia/M
+Yugoslavian/SM
+Yukon/M
+Yule/SM
+Yuletide/MS
+Yuma/SM
+Yunnan/M
+Yuri/M
+Yves/M
+Yvette/M
+Yvonne/M
+Z/SMNXT
+Zachariah/M
+Zachary/M
+Zachery/M
+Zagreb/M
+Zaire/M
+Zairian
+Zambezi/M
+Zambia/M
+Zambian/SM
+Zamboni/M
+Zamenhof/M
+Zamora/M
+Zane/M
+Zanuck/M
+Zanzibar/M
+Zapata/M
+Zaporozhye/M
+Zapotec/M
+Zappa/M
+Zara/M
+Zarathustra/M
+Zealand/M
+Zebedee/M
+Zechariah/M
+Zedekiah/M
+Zedong/M
+Zeffirelli/M
+Zeke/M
+Zelig/M
+Zelma/M
+Zen/M
+Zenger/M
+Zeno/M
+Zephaniah/M
+Zephyrhills/M
+Zephyrus/M
+Zest/M
+Zeus/M
+Zhdanov
+Zhejiang/M
+Zhengzhou/M
+Zhivago/M
+Zhukov/M
+Zibo/M
+Ziegfeld/M
+Ziegler/M
+Ziggy/M
+Zika
+Zimbabwe/M
+Zimbabwean/SM
+Zimmerman/M
+Zinfandel/M
+Zion/SM
+Zionism/SM
+Zionist/SM
+Ziploc/M
+Zn/M
+Zoe/M
+Zola/M
+Zollverein/M
+Zoloft/M
+Zomba/M
+Zorn/M
+Zoroaster/M
+Zoroastrian/MS
+Zoroastrianism/SM
+Zorro/M
+Zosma/M
+Zr/M
+Zsigmondy/M
+Zubenelgenubi/M
+Zubeneschamali/M
+Zukor/M
+Zulu/SM
+Zululand
+Zuni/M
+Zurich/M
+Zwingli/M
+Zworykin/M
+Zyrtec/M
+Zyuganov/M
+Zzz
+a/S
+aah
+aardvark/SM
+ab/SDY
+aback
+abacus/MS
+abaft
+abalone/SM
+abandon/LSDG
+abandonment/M
+abase/LGDS
+abasement/M
+abash/GLDS
+abashed/UY
+abashment/M
+abate/LGDS
+abated/U
+abatement/M
+abattoir/MS
+abbe/SM
+abbess/MS
+abbey/MS
+abbot/MS
+abbr
+abbrev/S
+abbreviate/DSGNX
+abbreviation/M
+abdicate/GNDSX
+abdication/M
+abdomen/SM
+abdominal
+abduct/DSG
+abductee/MS
+abduction/SM
+abductor/MS
+abeam
+aberrant
+aberration/MS
+aberrational
+abet/S
+abetted
+abetting
+abettor/SM
+abeyance/M
+abhor/S
+abhorred
+abhorrence/M
+abhorrent/Y
+abhorring
+abidance/M
+abide/GS
+abiding/Y
+ability/IEMS
+abject/YP
+abjection/M
+abjectness/M
+abjuration/SM
+abjuratory
+abjure/ZGDRS
+abjurer/M
+ablate/XGNVDS
+ablation/M
+ablative/MS
+ablaze
+able/UT
+abler
+abloom
+ablution/SM
+abnegate/GNDS
+abnegation/M
+abnormal/Y
+abnormality/SM
+aboard
+abode/MS
+abolish/GDS
+abolition/M
+abolitionism/M
+abolitionist/SM
+abominable
+abominably
+abominate/DSGNX
+abomination/M
+aboriginal/MS
+aborigine/SM
+aborning
+abort/GVDS
+abortion/MS
+abortionist/MS
+abortive/Y
+abound/DSG
+about
+above/M
+aboveboard
+abracadabra/M
+abrade/GDS
+abrasion/MS
+abrasive/MYPS
+abrasiveness/M
+abreast
+abridge/DSG
+abridgment/MS
+abroad
+abrogate/XGNDS
+abrogation/M
+abrogator/MS
+abrupt/TPRY
+abruptness/M
+abs/M
+abscess/MDSG
+abscissa/SM
+abscission/M
+abscond/ZGSDR
+absconder/M
+abseil/MDSG
+absence/SM
+absent/DYSG
+absentee/MS
+absenteeism/M
+absentminded/YP
+absentmindedness/M
+absinthe/M
+absolute/PMYTNS
+absoluteness/M
+absolution/M
+absolutism/M
+absolutist/MS
+absolve/DSG
+absorb/AGDS
+absorbance
+absorbency/M
+absorbent/SM
+absorbing/Y
+absorption/M
+absorptive
+abstain/DRZGS
+abstainer/M
+abstemious/PY
+abstemiousness/M
+abstention/MS
+abstinence/M
+abstinent
+abstract/GSPMDY
+abstracted/YP
+abstractedness/M
+abstraction/SM
+abstractness/MS
+abstruse/YP
+abstruseness/M
+absurd/TPRY
+absurdist/MS
+absurdity/SM
+absurdness/M
+abundance/SM
+abundant/Y
+abuse's
+abuse/EGVDS
+abuser/MS
+abusive/YP
+abusiveness/M
+abut/SL
+abutment/MS
+abutted
+abutting
+abuzz
+abysmal/Y
+abyss/MS
+abyssal
+ac
+acacia/MS
+academe/M
+academia/M
+academic/SM
+academical/Y
+academician/MS
+academy/SM
+acanthus/MS
+accede/GDS
+accelerate/GNXDS
+acceleration/M
+accelerator/SM
+accent/MDSG
+accented/U
+accentual
+accentuate/GNDS
+accentuation/M
+accept/DSBG
+acceptability/M
+acceptableness/M
+acceptably/U
+acceptance/SM
+acceptation/MS
+accepted/U
+access/MDSG
+accessibility/IM
+accessible/I
+accessibly/I
+accession/MDGS
+accessorize/DSG
+accessory/SM
+accident/MS
+accidental/SMY
+acclaim/MDGS
+acclamation/M
+acclimate/DSGN
+acclimation/M
+acclimatization/M
+acclimatize/DSG
+acclivity/SM
+accolade/SM
+accommodate/XGNDS
+accommodating/Y
+accommodation/M
+accompanied/U
+accompaniment/MS
+accompanist/SM
+accompany/DSG
+accomplice/SM
+accomplish/DSLG
+accomplished/U
+accomplishment/MS
+accord/GMDS
+accordance/M
+accordant
+according/Y
+accordion/MS
+accordionist/MS
+accost/GMDS
+account/MDSBG
+accountability/M
+accountable/U
+accountancy/M
+accountant/MS
+accounted/U
+accounting/M
+accouter/SGD
+accouterments/M
+accredit/SGD
+accreditation/M
+accredited/U
+accretion/MS
+accrual/MS
+accrue/GDS
+acct
+acculturate/DSGN
+acculturation/M
+accumulate/XGNVDS
+accumulation/M
+accumulator/MS
+accuracy/IM
+accurate/IY
+accurateness/M
+accursed/P
+accursedness/M
+accusation/MS
+accusative/MS
+accusatory
+accuse/ZGDRS
+accuser/M
+accusing/Y
+accustom/DSG
+accustomed/U
+ace/DSMG
+acerbate/DSG
+acerbic
+acerbically
+acerbity/M
+acetaminophen/M
+acetate/MS
+acetic
+acetone/M
+acetonic
+acetyl
+acetylene/M
+ache/DSMG
+achene/MS
+achievable/U
+achieve/BLZGDRS
+achievement/SM
+achiever/M
+aching/Y
+achoo/M
+achromatic
+achy/TR
+acid/SMY
+acidic
+acidify/GDS
+acidity/M
+acidosis/M
+acidulous
+acknowledge/DSG
+acknowledged/U
+acknowledgment/SM
+acme/SM
+acne/M
+acolyte/MS
+aconite/MS
+acorn/MS
+acoustic/S
+acoustical/Y
+acoustics/M
+acquaint/AGSD
+acquaintance/SM
+acquaintanceship/M
+acquainted/U
+acquiesce/DSG
+acquiescence/M
+acquiescent/Y
+acquire/ZGBDRSL
+acquirement/M
+acquisition/MS
+acquisitive/YP
+acquisitiveness/M
+acquit/S
+acquittal/MS
+acquitted
+acquitting
+acre/SM
+acreage/MS
+acrid/PTRY
+acridity/M
+acridness/M
+acrimonious/YP
+acrimoniousness/M
+acrimony/M
+acrobat/MS
+acrobatic/S
+acrobatically
+acrobatics/M
+acronym/MS
+acrophobia/M
+acropolis/MS
+across
+acrostic/SM
+acrylamide
+acrylic/MS
+act's
+act/ASDGV
+acting/M
+actinium/M
+action/ASM
+actionable
+activate/ICANGSD
+activation/ICAM
+activator/MS
+active's
+active/IKY
+activeness/M
+actives
+activism/M
+activist/MS
+activities
+activity/IM
+actor/AMS
+actress/MS
+actual/Y
+actuality/SM
+actualization/M
+actualize/GDS
+actuarial
+actuary/SM
+actuate/GNDS
+actuation/M
+actuator/SM
+acuity/M
+acumen/M
+acupressure/M
+acupuncture/M
+acupuncturist/SM
+acute/PMYTRS
+acuteness/M
+acyclovir/M
+acyl
+ad/SM
+adage/MS
+adagio/MS
+adamant/MY
+adapt/BZGVDRS
+adaptability/M
+adaptation/MS
+adapter/M
+adaption/S
+add/SDRBZG
+addend/MS
+addenda
+addendum/M
+adder/M
+addict/GVMDS
+addiction/SM
+addition/SM
+additional/Y
+additive/SM
+addle/GDS
+address's
+address/AGDS
+addressable
+addressed/U
+addressee/SM
+adduce/GDS
+adenine/M
+adenocarcinoma
+adenoid/SM
+adenoidal
+adept/MYPS
+adeptness/M
+adequacy/IM
+adequate/IY
+adequateness/M
+adhere/GDS
+adherence/M
+adherent/SM
+adhesion/M
+adhesive/PSM
+adhesiveness/M
+adiabatic
+adieu/MS
+adios
+adipose
+adj
+adjacency/M
+adjacent/Y
+adjectival/Y
+adjective/MS
+adjoin/GDS
+adjourn/DGLS
+adjournment/SM
+adjudge/GDS
+adjudicate/GNVXDS
+adjudication/M
+adjudicator/SM
+adjudicatory
+adjunct/MS
+adjuration/MS
+adjure/GDS
+adjust/AGDSL
+adjustable
+adjuster/SM
+adjustment/AMS
+adjutant/SM
+adman/M
+admen
+admin/S
+administer/DGS
+administrate/XDSGNV
+administration/M
+administrative/Y
+administrator/MS
+admirably
+admiral/MS
+admiralty/M
+admiration/M
+admire/BZGDRS
+admirer/M
+admiring/Y
+admissibility/IM
+admissible/I
+admissibly
+admission/AM
+admissions
+admit/AS
+admittance/M
+admitted/Y
+admitting/A
+admix/GDS
+admixture/SM
+admonish/LDSG
+admonishment/MS
+admonition/MS
+admonitory
+ado/M
+adobe/MS
+adolescence/SM
+adolescent/SM
+adopt/AGVDS
+adoptable
+adopter/MS
+adoption/SM
+adorableness/M
+adorably
+adoration/M
+adore/BZGDRS
+adorer/M
+adoring/Y
+adorn/LGDS
+adorned/U
+adornment/MS
+adrenal/MS
+adrenalin's
+adrenaline/M
+adrenergic
+adrift
+adroit/PY
+adroitness/M
+adsorb/SDG
+adsorbent/MS
+adsorption/SM
+adulate/DSGN
+adulation/M
+adulator/MS
+adulatory
+adult/MS
+adulterant/MS
+adulterate/GNDS
+adulterated/U
+adulteration/M
+adulterer/SM
+adulteress/MS
+adulterous
+adultery/SM
+adulthood/M
+adumbrate/GNDS
+adumbration/M
+adv
+advance/LDSMG
+advancement/SM
+advantage/EDSMG
+advantageous/EY
+advent/SM
+adventitious/Y
+adventure/DRSMZG
+adventurer/M
+adventuresome
+adventuress/MS
+adventurism
+adventurist/S
+adventurous/YP
+adventurousness/M
+adverb/SM
+adverbial/SMY
+adversarial
+adversary/SM
+adverse/PRYT
+adverseness/M
+adversity/SM
+advert/SMDG
+advertise/LZGDRS
+advertised/U
+advertisement/MS
+advertiser/M
+advertising/M
+advertorial/SM
+advice/M
+advisability/IM
+advisable/I
+advisably
+advise/LDRSZGB
+advised/UY
+advisement/M
+adviser/M
+advisor/SM
+advisory/SM
+advocacy/M
+advocate/MGDS
+advt
+adware
+adze/SM
+aegis/M
+aerate/DSGN
+aeration/M
+aerator/SM
+aerial/SMY
+aerialist/MS
+aerie/MS
+aerobatic/S
+aerobatics/M
+aerobic/S
+aerobically
+aerobics/M
+aerodrome/MS
+aerodynamic/S
+aerodynamically
+aerodynamics/M
+aerogram/S
+aeronautic/S
+aeronautical
+aeronautics/M
+aerosol/MS
+aerospace/M
+aery
+aesthete/MS
+aesthetic/S
+aesthetically
+aestheticism/M
+aesthetics/M
+afar
+affability/M
+affable
+affably
+affair/MS
+affect's
+affect/EGDS
+affectation/SM
+affected/UY
+affecting/Y
+affection/EM
+affectionate/Y
+affections
+afferent
+affiance/GDS
+affidavit/SM
+affiliate's
+affiliate/EGNDS
+affiliated/U
+affiliation/EM
+affiliations
+affine
+affinity/SM
+affirm/AGDS
+affirmation/AMS
+affirmative/MYS
+affix/GMDS
+afflatus/M
+afflict/GDS
+affliction/SM
+affluence/M
+affluent/Y
+afford/GDSB
+affordability
+affordably
+afforest/EGSD
+afforestation/M
+affray/MS
+affront/GMDS
+afghan/MS
+aficionado/MS
+afield
+afire
+aflame
+afloat
+aflutter
+afoot
+aforementioned
+aforesaid
+aforethought
+afoul
+afraid/U
+afresh
+aft/RZ
+afterbirth/M
+afterbirths
+afterburner/MS
+aftercare/M
+aftereffect/MS
+afterglow/SM
+afterimage/MS
+afterlife/M
+afterlives
+aftermarket/MS
+aftermath/M
+aftermaths
+afternoon/MS
+aftershave/SM
+aftershock/SM
+aftertaste/SM
+afterthought/SM
+afterward/S
+afterword/MS
+again
+against
+agape/M
+agar/M
+agate/MS
+agave/M
+age/DSMGJ
+ageism/M
+ageist/SM
+ageless/YP
+agelessness/M
+agency/SM
+agenda/SM
+agenesis
+agent/AMS
+ageratum/M
+agglomerate/DSMGNX
+agglomeration/M
+agglutinate/DSXGN
+agglutination/M
+aggrandize/GLDS
+aggrandizement/M
+aggravate/GNXDS
+aggravating/Y
+aggravation/M
+aggregate/MGNDSX
+aggregation/M
+aggregator/SM
+aggression/M
+aggressive/PY
+aggressiveness/M
+aggressor/SM
+aggrieve/DSG
+aggro
+aghast
+agile/Y
+agility/M
+aging/M
+agitate/XGNDS
+agitation/M
+agitator/MS
+agitprop/M
+agleam
+aglitter
+aglow
+agnostic/MS
+agnosticism/M
+ago
+agog
+agonist/S
+agonize/GDS
+agonizing/Y
+agony/SM
+agoraphobia/M
+agoraphobic/MS
+agrarian/MS
+agrarianism/M
+agree/EBLDS
+agreeableness/EM
+agreeably/E
+agreeing/E
+agreement/ESM
+agribusiness/MS
+agricultural/Y
+agriculturalist/MS
+agriculture/M
+agriculturist/MS
+agronomic
+agronomist/MS
+agronomy/M
+aground
+ague/M
+ah
+aha
+ahchoo
+ahead
+ahem
+ahoy
+aid/SMDG
+aide/SM
+aided/U
+aigrette/MS
+ail/SDLG
+aileron/SM
+ailment/SM
+aim/SMDG
+aimless/YP
+aimlessness/M
+ain't
+air/SMDJG
+airbag/MS
+airbase/SM
+airbed/S
+airborne
+airbrush/MDSG
+airbus/MS
+aircraft/M
+aircraftman
+aircraftmen
+aircrew/S
+airdrome/S
+airdrop/SM
+airdropped
+airdropping
+airfare/SM
+airfield/SM
+airflow/M
+airfoil/SM
+airfreight/M
+airguns
+airhead/SM
+airily
+airiness/M
+airing/M
+airless/P
+airlessness/M
+airletters
+airlift/SGMD
+airline/RSMZ
+airliner/M
+airlock/SM
+airmail/GSMD
+airman/M
+airmen
+airplane/MS
+airplay/M
+airport/SM
+airship/SM
+airshow/S
+airsick/P
+airsickness/M
+airspace/M
+airspeed
+airstrike/MS
+airstrip/SM
+airtight
+airtime/M
+airwaves/M
+airway/MS
+airwoman
+airwomen
+airworthiness/M
+airworthy/P
+airy/PTR
+aisle/MS
+aitch/MS
+ajar
+aka
+akimbo
+akin
+alabaster/M
+alack
+alacrity/M
+alarm/GMDS
+alarming/Y
+alarmist/SM
+alas
+alb/SM
+albacore/SM
+albatross/MS
+albeit
+albinism/M
+albino/MS
+album/MNS
+albumen/M
+albumin/M
+albuminous
+alchemist/SM
+alchemy/M
+alcohol/SM
+alcoholic/MS
+alcoholically
+alcoholism/M
+alcove/MS
+alder/MS
+alderman/M
+aldermen
+alderwoman/M
+alderwomen
+ale/SMV
+aleatory
+alehouse/SM
+alembic/SM
+alert/GMDYPS
+alertness/M
+alewife/M
+alewives
+alfalfa/M
+alfresco
+alga/M
+algae
+algal
+algebra/SM
+algebraic
+algebraically
+algorithm/SM
+algorithmic
+alias/GMDS
+alibi/GMDS
+alien/BGMDS
+alienable/IU
+alienate/DSGN
+alienation/M
+alienist/SM
+alight/GDS
+align/ALGDS
+aligned/U
+aligner/MS
+alignment/AMS
+alike/U
+aliment/MDSG
+alimentary
+alimony/M
+aliveness/M
+aliyah/M
+aliyahs
+alkali/M
+alkalies
+alkaline
+alkalinity/M
+alkalize/DSG
+alkaloid/SM
+alkyd/MS
+all/M
+allay/GDS
+allegation/MS
+allege/GDS
+alleged/Y
+allegiance/MS
+allegoric
+allegorical/Y
+allegorist/MS
+allegory/SM
+allegretto/MS
+allegro/MS
+allele/MS
+alleluia/SM
+allergen/SM
+allergenic
+allergic
+allergically
+allergist/SM
+allergy/SM
+alleviate/DSGN
+alleviation/M
+alley/MS
+alleyway/SM
+alliance/SM
+alligator/MS
+alliterate/DSXGNV
+alliteration/M
+alliterative/Y
+allocate/ADSGN
+allocation/AM
+allocations
+allot/LS
+allotment/SM
+allotted
+allotting
+allover
+allow/EGDS
+allowable/U
+allowably
+allowance/SM
+alloy/GMDS
+alloyed/U
+allspice/M
+allude/GDS
+allure/MGLDS
+allurement/MS
+alluring/Y
+allusion/SM
+allusive/PY
+allusiveness/M
+alluvial/M
+alluvium/SM
+ally/GDSM
+almanac/SM
+almighty
+almond/MS
+almoner/SM
+almost
+alms/M
+almshouse/MS
+aloe/SM
+aloft
+aloha/MS
+alone
+along
+alongshore
+alongside
+aloof/PY
+aloofness/M
+aloud
+alp/SM
+alpaca/MS
+alpha/MS
+alphabet/SM
+alphabetic
+alphabetical/Y
+alphabetization/SM
+alphabetize/ZGDRS
+alphabetizer/M
+alphanumeric
+alphanumerical/Y
+alpine/S
+already
+alright
+also
+alt/S
+altar/MS
+altarpiece/SM
+alter/GDBS
+alterable/U
+alteration/MS
+altercation/SM
+altered/U
+alternate/DSMYGNVX
+alternation/M
+alternative/MYS
+alternator/SM
+although
+altimeter/MS
+altitude/MS
+alto/SM
+altogether
+altruism/M
+altruist/SM
+altruistic
+altruistically
+alum/SM
+alumina/M
+aluminum/M
+alumna/M
+alumnae
+alumni
+alumnus/M
+alveolar/S
+always
+am/N
+amalgam/SM
+amalgamate/XGNDS
+amalgamation/M
+amanuenses
+amanuensis/M
+amaranth/M
+amaranths
+amaretto/M
+amaryllis/MS
+amass/GDS
+amateur/SM
+amateurish/YP
+amateurishness/M
+amateurism/M
+amatory
+amaze/LMGDS
+amazement/M
+amazing/Y
+amazon/MS
+amazonian
+ambassador/SM
+ambassadorial
+ambassadorship/MS
+ambassadress/MS
+amber/M
+ambergris/M
+ambiance/MS
+ambidexterity/M
+ambidextrous/Y
+ambient
+ambiguity/SM
+ambiguous/UY
+ambit
+ambition/MS
+ambitious/YP
+ambitiousness/M
+ambivalence/M
+ambivalent/Y
+amble/MZGDRS
+ambler/M
+ambrosia/M
+ambrosial
+ambulance/MS
+ambulanceman
+ambulancemen
+ambulancewoman
+ambulancewomen
+ambulant
+ambulate/DSXGN
+ambulation/M
+ambulatory/SM
+ambuscade/MGDS
+ambush/GMDS
+ameliorate/GNVDS
+amelioration/M
+amen/B
+amenability/M
+amenably
+amend/BLGDS
+amendment/SM
+amenity/SM
+amerce/GLDS
+amercement/SM
+americium/M
+amethyst/SM
+amiability/M
+amiable
+amiably
+amicability/M
+amicable
+amicably
+amid
+amide/MS
+amidship/S
+amigo/MS
+amine/S
+amino
+amiss
+amitriptyline
+amity/M
+ammeter/SM
+ammo/M
+ammonia/M
+ammonium
+ammunition/M
+amnesia/M
+amnesiac/MS
+amnesic/SM
+amnesty/GDSM
+amniocenteses
+amniocentesis/M
+amnion/MS
+amniotic
+amoeba/MS
+amoebae
+amoebic
+amok
+among
+amontillado/SM
+amoral/Y
+amorality/M
+amorous/YP
+amorousness/M
+amorphous/PY
+amorphousness/M
+amortization/SM
+amortize/DSGB
+amount/GMDS
+amour/MS
+amoxicillin
+amp/SMY
+amperage/M
+ampere/MS
+ampersand/MS
+amphetamine/SM
+amphibian/MS
+amphibious/Y
+amphitheater/SM
+amphora/M
+amphorae
+ampicillin
+ample/TR
+amplification/M
+amplifier/M
+amplify/NDRSXZG
+amplitude/SM
+ampule/MS
+amputate/GNDSX
+amputation/M
+amputee/MS
+amt
+amulet/MS
+amuse/LGDS
+amusement/MS
+amusing/Y
+amygdala
+amylase/M
+amyloid
+an/CS
+anabolism/M
+anachronism/SM
+anachronistic
+anachronistically
+anaconda/SM
+anaerobe/SM
+anaerobic
+anaerobically
+anagram/MS
+anal/Y
+analgesia/M
+analgesic/SM
+analog/MS
+analogical/Y
+analogize/GDS
+analogous/YP
+analogousness/M
+analogue/SM
+analogy/SM
+analysand/MS
+analyses/A
+analysis/AM
+analyst/SM
+analytic/S
+analytical/Y
+analyzable
+analyze/ADSG
+analyzer/SM
+anapest/SM
+anapestic/MS
+anarchic
+anarchically
+anarchism/M
+anarchist/MS
+anarchistic
+anarchy/M
+anathema/SM
+anathematize/DSG
+anatomic
+anatomical/Y
+anatomist/SM
+anatomize/DSG
+anatomy/SM
+ancestor/SM
+ancestral/Y
+ancestress/MS
+ancestry/SM
+anchor/MDGS
+anchorage/MS
+anchorite/MS
+anchorman/M
+anchormen
+anchorpeople
+anchorperson/SM
+anchorwoman/M
+anchorwomen
+anchovy/SM
+ancient/SPMRYT
+ancientness/M
+ancillary/SM
+and
+andante/SM
+andiron/SM
+androgen/M
+androgenic
+androgynous
+androgyny/M
+android/SM
+anecdotal/Y
+anecdote/MS
+anemia/M
+anemic
+anemically
+anemometer/SM
+anemone/SM
+anent
+anesthesia/M
+anesthesiologist/SM
+anesthesiology/M
+anesthetic/SM
+anesthetist/MS
+anesthetization/M
+anesthetize/GDS
+aneurysm/SM
+anew
+angel/MS
+angelfish/MS
+angelic
+angelica/M
+angelical/Y
+anger/GMDS
+angina/M
+angioplasty/SM
+angiosperm/SM
+angle/MZGDRS
+angler/M
+angleworm/MS
+anglicism/S
+anglicize/GDS
+angling/M
+anglophile/S
+anglophone/S
+angora/MS
+angostura
+angrily
+angry/TR
+angst/M
+angstrom/MS
+anguish/GMDS
+angular
+angularity/SM
+angulation
+anhydrous
+aniline/M
+anilingus
+animadversion/MS
+animadvert/GSD
+animal/MS
+animalcule/SM
+animate/ADSGN
+animated/Y
+animation/AM
+animations
+animator/MS
+anime/M
+animism/M
+animist/SM
+animistic
+animosity/SM
+animus/M
+anion/MS
+anionic
+anise/M
+aniseed/M
+anisette/M
+ankh/M
+ankhs
+ankle/MS
+anklebone/MS
+anklet/MS
+annalist/SM
+annals/M
+anneal/GDS
+annelid/MS
+annex/GMDS
+annexation/MS
+annihilate/DSGN
+annihilation/M
+annihilator/SM
+anniversary/SM
+annotate/DSXGNV
+annotation/M
+annotator/MS
+announce/DRSLZG
+announced/U
+announcement/MS
+announcer/M
+annoy/GDS
+annoyance/MS
+annoying/Y
+annual/MYS
+annualized
+annuitant/SM
+annuity/SM
+annul/LS
+annular
+annulled
+annulling
+annulment/SM
+annulus
+annunciation/SM
+anode/MS
+anodize/GDS
+anodyne/MS
+anoint/GDLS
+anointment/M
+anomalous/Y
+anomaly/SM
+anon/S
+anonymity/M
+anonymous/Y
+anopheles/M
+anorak/MS
+anorectic/SM
+anorexia/M
+anorexic/MS
+another
+answer/BMDGS
+answerable/U
+answered/U
+answerphone/S
+ant/SMD
+antacid/SM
+antagonism/SM
+antagonist/SM
+antagonistic
+antagonistically
+antagonize/DSG
+antarctic
+ante/SM
+anteater/MS
+antebellum
+antecedence/M
+antecedent/SM
+antechamber/SM
+antedate/GDS
+antediluvian
+anteing
+antelope/MS
+antenatal
+antenna/SM
+antennae
+anterior
+anteroom/MS
+anthem/MS
+anther/MS
+anthill/SM
+anthologist/SM
+anthologize/DSG
+anthology/SM
+anthracite/M
+anthrax/M
+anthropocentric
+anthropoid/MS
+anthropological/Y
+anthropologist/SM
+anthropology/M
+anthropomorphic
+anthropomorphically
+anthropomorphism/M
+anthropomorphize
+anthropomorphous
+anti/SM
+antiabortion
+antiabortionist/MS
+antiaircraft
+antibacterial/MS
+antibiotic/MS
+antibody/SM
+antic/MS
+anticancer
+anticipate/GNXDS
+anticipated/U
+anticipation/M
+anticipatory
+anticked
+anticking
+anticlerical
+anticlimactic
+anticlimactically
+anticlimax/MS
+anticline/SM
+anticlockwise
+anticoagulant/MS
+anticommunism/M
+anticommunist/SM
+anticyclone/SM
+anticyclonic
+antidemocratic
+antidepressant/MS
+antidote/MS
+antifascist/MS
+antiferromagnetic
+antifreeze/M
+antigen/SM
+antigenic
+antigenicity/M
+antihero/M
+antiheroes
+antihistamine/SM
+antiknock/M
+antilabor
+antilogarithm/SM
+antimacassar/MS
+antimalarial
+antimatter/M
+antimicrobial
+antimissile
+antimony/M
+antineutrino/SM
+antineutron/MS
+antinuclear
+antioxidant/MS
+antiparticle/SM
+antipasti
+antipasto/MS
+antipathetic
+antipathy/SM
+antipersonnel
+antiperspirant/SM
+antiphon/SM
+antiphonal/MYS
+antipodal/S
+antipodean/MS
+antipodes/M
+antipollution
+antipoverty
+antiproton/MS
+antiquarian/SM
+antiquarianism/M
+antiquary/SM
+antiquate/GDS
+antique/DSMG
+antiquity/SM
+antirrhinum/S
+antiscience
+antisemitic
+antisemitism/M
+antisepsis/M
+antiseptic/SM
+antiseptically
+antiserum/MS
+antislavery
+antisocial/Y
+antispasmodic/MS
+antisubmarine
+antitank
+antitheses
+antithesis/M
+antithetic
+antithetical/Y
+antitoxin/MS
+antitrust
+antivenin/MS
+antivenom
+antiviral/MS
+antivirus
+antivivisectionist/MS
+antiwar
+antler/MDS
+antonym/SM
+antonymous
+antrum
+antsy/TR
+anus/MS
+anvil/MS
+anxiety/SM
+anxious/YP
+anxiousness/M
+any
+anybody/SM
+anyhow
+anymore
+anyone/M
+anyplace
+anything/SM
+anytime
+anyway/S
+anywhere
+anywise
+aorta/MS
+aortic
+apace
+apart
+apartheid/M
+apartment/MS
+apathetic
+apathetically
+apathy/M
+apatite/M
+ape/DSMG
+apelike
+aperitif/MS
+aperture/SM
+apex/MS
+aphasia/M
+aphasic/MS
+aphelia
+aphelion/SM
+aphid/MS
+aphorism/MS
+aphoristic
+aphoristically
+aphrodisiac/SM
+apiarist/SM
+apiary/SM
+apical/Y
+apiece
+apish/Y
+aplenty
+aplomb/M
+apocalypse/SM
+apocalyptic
+apocrypha/M
+apocryphal/Y
+apogee/MS
+apolitical/Y
+apologetic/U
+apologetically
+apologia/SM
+apologist/MS
+apologize/GDS
+apology/SM
+apoplectic
+apoplexy/SM
+apoptosis
+apoptotic
+apostasy/SM
+apostate/SM
+apostatize/GDS
+apostle/MS
+apostleship/M
+apostolic
+apostrophe/MS
+apothecary/SM
+apothegm/SM
+apotheoses
+apotheosis/M
+app/SM
+appall/GDS
+appalling/Y
+appaloosa/MS
+apparatchik/S
+apparatus/MS
+apparel/MDGS
+apparent/Y
+apparition/SM
+appeal/GMDS
+appealing/UY
+appear/AESDG
+appearance/EAMS
+appease/LZGDRS
+appeasement/SM
+appeaser/M
+appellant/SM
+appellate/XN
+appellation/M
+append/GDS
+appendage/SM
+appendectomy/SM
+appendices
+appendicitis/M
+appendix/MS
+appertain/GDS
+appetite/SM
+appetizer/MS
+appetizing/Y
+applaud/ZGDRS
+applauder/M
+applause/M
+apple/MS
+applejack/M
+applesauce/M
+applet/MS
+appliance/SM
+applicability/M
+applicable/I
+applicably
+applicant/SM
+application/AM
+applicator/SM
+applier/MS
+applique/DSM
+appliqueing
+apply/ANXGDS
+appoint/AELSVGD
+appointee/SM
+appointment's/A
+appointment/ESM
+apportion/AGDLS
+apportionment/AM
+appose/GDS
+apposite/YNVP
+appositeness/M
+apposition/M
+appositive/SM
+appraisal/AMS
+appraise/ADSG
+appraiser/MS
+appreciable/I
+appreciably/I
+appreciate/DSXGNV
+appreciated/U
+appreciation/M
+appreciative/Y
+appreciator/MS
+appreciatory
+apprehend/GDS
+apprehension/MS
+apprehensive/YP
+apprehensiveness/M
+apprentice/DSMG
+apprenticeship/MS
+apprise/GDS
+apprize/GDS
+approach/GBMDS
+approachable/UI
+approbation/EM
+approbations
+appropriate/PYGNXDS
+appropriated/U
+appropriateness/IM
+appropriation/M
+appropriator/SM
+approval/EM
+approvals
+approve/EGDS
+approved/U
+approving/EY
+approx
+approximate/DSXYGN
+approximation/M
+appurtenance/SM
+appurtenant
+apricot/MS
+apron/MS
+apropos
+apse/SM
+apt/IYPT
+apter
+aptitude/SM
+aptness/IM
+aqua/SM
+aquaculture/M
+aqualung/MS
+aquamarine/SM
+aquanaut/MS
+aquaplane/MGDS
+aquarium/MS
+aquatic/SM
+aquatically
+aquatics/M
+aquatint/S
+aquavit/M
+aqueduct/MS
+aqueous
+aquifer/SM
+aquiline
+arabesque/MS
+arability/M
+arachnid/MS
+arachnophobia
+arbiter/SM
+arbitrage/MZGDRS
+arbitrager/M
+arbitrageur/SM
+arbitrament/SM
+arbitrarily
+arbitrariness/M
+arbitrary/P
+arbitrate/GNDS
+arbitration/M
+arbitrator/MS
+arbor/MS
+arboreal
+arboretum/SM
+arborvitae/SM
+arbutus/MS
+arc/SMDG
+arcade/MS
+arcane
+arch/PZTGVMDRSY
+archaeological/Y
+archaeologist/SM
+archaeology/M
+archaic
+archaically
+archaism/MS
+archaist/MS
+archangel/MS
+archbishop/SM
+archbishopric/SM
+archdeacon/SM
+archdiocesan
+archdiocese/MS
+archduchess/MS
+archduke/MS
+archenemy/SM
+archer/M
+archery/M
+archetypal
+archetype/MS
+archfiend/MS
+archiepiscopal
+archipelago/MS
+architect/SM
+architectonic/S
+architectonics/M
+architectural/Y
+architecture/MS
+architrave/SM
+archival
+archive/DSMG
+archivist/MS
+archness/M
+archway/SM
+arctic/MS
+ardent/Y
+ardor/MS
+arduous/YP
+arduousness/M
+are/SMB
+area/SM
+areal
+aren't
+arena/MS
+argent/M
+arginine
+argon/M
+argosy/SM
+argot/MS
+arguable/IU
+arguably/U
+argue/ZGDRS
+arguer/M
+argument/MS
+argumentation/M
+argumentative/PY
+argumentativeness/M
+argyle/MS
+aria/SM
+arid/Y
+aridity/M
+aright
+arise/GS
+arisen
+aristocracy/SM
+aristocrat/SM
+aristocratic
+aristocratically
+arithmetic/M
+arithmetical/Y
+arithmetician/MS
+ark/SM
+arm's
+arm/EAGDS
+armada/MS
+armadillo/SM
+armament/AEM
+armaments
+armature/MS
+armband/MS
+armchair/MS
+armed/U
+armful/MS
+armhole/SM
+armistice/SM
+armlet/MS
+armload/S
+armor/ZGMDRS
+armored/U
+armorer/M
+armorial
+armory/SM
+armpit/MS
+armrest/SM
+army/SM
+aroma/MS
+aromatherapist/MS
+aromatherapy/M
+aromatic/MS
+aromatically
+arose
+around
+arousal/M
+arouse/GDS
+arpeggio/MS
+arr
+arraign/DGSL
+arraignment/SM
+arrange/AESDLG
+arrangement's/E
+arrangement/ASM
+arranger/SM
+arrant
+arras/MS
+array/EGMDS
+arrears/M
+arrest/AGMDS
+arrhythmia/M
+arrhythmic
+arrhythmical
+arrival/MS
+arrive/GDS
+arrogance/M
+arrogant/Y
+arrogate/GNDS
+arrogation/M
+arrow/MS
+arrowhead/MS
+arrowroot/M
+arroyo/MS
+arsed
+arsenal/MS
+arsenic/M
+arsing
+arson/M
+arsonist/SM
+art/SM
+arterial
+arteriole/MS
+arteriosclerosis/M
+artery/SM
+artful/PY
+artfulness/M
+arthritic/MS
+arthritis/M
+arthropod/MS
+arthroscope/SM
+arthroscopic
+arthroscopy
+artichoke/SM
+article/MDS
+articulacy/I
+articular
+articulate/YGNPDSX
+articulateness/IM
+articulation/M
+artifact/SM
+artifice/RSMZ
+artificer/M
+artificial/Y
+artificiality/M
+artillery/M
+artilleryman/M
+artillerymen
+artiness/M
+artisan/MS
+artist/MS
+artiste/MS
+artistic/I
+artistically
+artistry/M
+artless/PY
+artlessness/M
+artsy/TR
+artwork/MS
+arty/PTR
+arugula
+arum/SM
+asap
+asbestos/M
+ascend/AGDS
+ascendance/M
+ascendancy/M
+ascendant/SM
+ascension/MS
+ascent/MS
+ascertain/GDSBL
+ascertainment/M
+ascetic/MS
+ascetically
+asceticism/M
+ascot/MS
+ascribe/GBDS
+ascription/M
+aseptic
+aseptically
+asexual/Y
+asexuality/M
+ash/MDNSG
+ashamed/UY
+ashcan/MS
+ashlar/MS
+ashore
+ashram/MS
+ashtray/SM
+ashy/TR
+aside/MS
+asinine/Y
+asininity/SM
+ask/SDG
+askance
+asked/U
+askew
+aslant
+asleep
+asocial
+asp/SMNX
+asparagus/M
+aspartame/M
+aspect/MS
+aspen/M
+asperity/SM
+aspersion/MS
+asphalt/MDGS
+asphodel/SM
+asphyxia/M
+asphyxiate/DSXGN
+asphyxiation/M
+aspic/MS
+aspidistra/MS
+aspirant/MS
+aspirate/MGNDSX
+aspiration/M
+aspirator/SM
+aspire/GDS
+aspirin/MS
+ass/MS
+assail/GBDS
+assailable/U
+assailant/SM
+assassin/SM
+assassinate/GNXDS
+assassination/M
+assault/MDRGS
+assay/ZGMDRS
+assayer/M
+assemblage/SM
+assemble/AEGSD
+assembler/MS
+assemblies
+assembly/AM
+assemblyman/M
+assemblymen
+assemblywoman/M
+assemblywomen
+assent/GMDS
+assert/AGVDS
+assertion/AM
+assertions
+assertive/YP
+assertiveness/M
+assess/ALGDS
+assessment/ASM
+assessor/MS
+asset/MS
+asseverate/DSGN
+asseveration/M
+asshole/MS!
+assiduity/M
+assiduous/PY
+assiduousness/M
+assign's
+assign/ALGDS
+assignable
+assignation/MS
+assigned/U
+assignee/M
+assigner/MS
+assignment/AMS
+assignor/MS
+assimilate/DSGN
+assimilated/U
+assimilation/M
+assist/GVMDS
+assistance/M
+assistant/SM
+assisted/U
+assize/MS
+assn
+assoc
+associate's
+associate/EDSGNV
+association/EM
+associations
+associativity
+assonance/M
+assonant/MS
+assort/GLDS
+assortative
+assortment/MS
+asst
+assuage/GDS
+assume/BGDS
+assumption/SM
+assumptive
+assurance/ASM
+assure/AGDS
+assured/MYS
+astatine/M
+aster/EMS
+asterisk/GMDS
+astern
+asteroid/MS
+asthma/M
+asthmatic/SM
+asthmatically
+astigmatic
+astigmatism/SM
+astir
+astonish/DSLG
+astonishing/Y
+astonishment/M
+astound/GDS
+astounding/Y
+astraddle
+astrakhan/M
+astral
+astray
+astride
+astringency/M
+astringent/SMY
+astrolabe/SM
+astrologer/SM
+astrological/Y
+astrologist/MS
+astrology/M
+astronaut/MS
+astronautic/S
+astronautical
+astronautics/M
+astronomer/SM
+astronomic
+astronomical/Y
+astronomy/M
+astrophysical
+astrophysicist/MS
+astrophysics/M
+astute/PYTR
+astuteness/M
+asunder
+asylum/SM
+asymmetric
+asymmetrical/Y
+asymmetry/SM
+asymptomatic
+asymptotic
+asymptotically
+asynchronous/Y
+at
+atavism/M
+atavist/SM
+atavistic
+ataxia/M
+ataxic/MS
+ate
+atelier/SM
+atheism/M
+atheist/MS
+atheistic
+atherosclerosis/M
+atherosclerotic
+athirst
+athlete/MS
+athletic/S
+athletically
+athleticism
+athletics/M
+athwart
+atilt
+atishoo
+atlas/MS
+atmosphere/MS
+atmospheric/S
+atmospherically
+atmospherics/M
+atoll/MS
+atom/SM
+atomic
+atomically
+atomize/ZGDRS
+atomizer/M
+atonal/Y
+atonality/M
+atone/LGDS
+atonement/M
+atop
+atria
+atrial
+atrioventricular
+atrium/M
+atrocious/PY
+atrociousness/M
+atrocity/SM
+atrophy/DSMG
+atropine/M
+attach/ALGDS
+attache/BM
+attached/U
+attachment/AM
+attachments
+attack/ZGMDRS
+attacker/M
+attain/AGDS
+attainability/M
+attainable/U
+attainder/M
+attainment/SM
+attar/M
+attempt's
+attempt/ASDG
+attend/SDRZG
+attendance/SM
+attendant/SM
+attended/U
+attendee/SM
+attention/IM
+attentions
+attentive/IPY
+attentiveness/IM
+attenuate/DSGN
+attenuation/M
+attest/SDG
+attestation/SM
+attested/U
+attic/SM
+attire/DSMG
+attitude/SM
+attitudinal
+attitudinize/GDS
+attn
+attorney/MS
+attract/SGVDB
+attractant/MS
+attraction/MS
+attractive/UY
+attractiveness/M
+attribute/DSMGNVBX
+attributed/U
+attribution/M
+attributive/MYS
+attrition/M
+attune/DSG
+atty
+atwitter
+atypical/Y
+aubergine/S
+auburn/M
+auction/MDGS
+auctioneer/SM
+audacious/YP
+audaciousness/M
+audacity/M
+audibility/IM
+audible/MS
+audibly/I
+audience/MS
+audio/MS
+audiological
+audiologist/SM
+audiology/M
+audiometer/SM
+audiophile/SM
+audiotape/SM
+audiovisual/S
+audiovisuals/M
+audit/GMDS
+audition/SMDG
+auditor/MS
+auditorium/SM
+auditory
+auger/MS
+aught/MS
+augment/DRZGS
+augmentation/MS
+augmentative
+augmenter/M
+augur/GMDS
+augury/SM
+august/PTRY
+augustness/M
+auk/SM
+aunt/SM
+auntie/SM
+aura/MS
+aural/Y
+aureole/SM
+aureus
+auricle/SM
+auricular
+aurora/SM
+auscultate/GNDSX
+auscultation/M
+auspice/SM
+auspicious/IY
+auspiciousness/M
+austere/RYT
+austerity/SM
+austral
+authentic/IU
+authentically
+authenticate/XGNDS
+authenticated/U
+authentication/M
+authenticity/M
+author/SMDG
+authoress/MS
+authorial
+authoritarian/MS
+authoritarianism/M
+authoritative/YP
+authoritativeness/M
+authority/SM
+authorization/MS
+authorize/AGDS
+authorized/U
+authorship/M
+autism/M
+autistic
+auto/MS
+autobahn/SM
+autobiographer/SM
+autobiographic
+autobiographical/Y
+autobiography/SM
+autoclave/MS
+autocracy/SM
+autocrat/SM
+autocratic
+autocratically
+autocross
+autodidact/SM
+autograph/MDG
+autographs
+autoimmune
+autoimmunity/M
+automaker/SM
+automate/GNDS
+automatic/SM
+automatically
+automation/M
+automatism/M
+automatize/GDS
+automaton/SM
+automobile/DSMG
+automotive
+autonomic
+autonomous/Y
+autonomy/M
+autopilot/SM
+autopsy/GDSM
+autosuggestion
+autoworker/MS
+autumn/SM
+autumnal
+aux
+auxiliary/SM
+auxin/M
+av/RZ
+avail/BGMDS
+availability/UM
+available/U
+avalanche/SM
+avarice/M
+avaricious/Y
+avast
+avatar/MS
+avaunt
+avdp
+ave
+avenge/ZGDRS
+avenger/M
+avenue/MS
+average/MYGDS
+averred
+averring
+averse/XN
+aversion/M
+avert/GDS
+avg
+avian
+aviary/SM
+aviation/M
+aviator/MS
+aviatrices
+aviatrix/MS
+avid/Y
+avidity/M
+avionic/S
+avionics/M
+avitaminosis/M
+avocado/SM
+avocation/MS
+avocational
+avoid/SDGB
+avoidable/U
+avoidably/U
+avoidance/M
+avoidant
+avoirdupois/M
+avouch/DSG
+avow/EDGS
+avowal/ESM
+avowed/Y
+avuncular/Y
+aw
+await/GDS
+awake/GS
+awaken/AGDS
+awakening/SM
+award/GMDS
+awardee/S
+aware/UP
+awareness/UM
+awash
+away
+awe/DSMG
+aweigh
+awesome/YP
+awesomeness/M
+awestruck
+awful/YP
+awfuller
+awfullest
+awfulness/M
+awhile
+awkward/RYPT
+awkwardness/M
+awl/SM
+awn/GJSM
+awning/M
+awoke
+awoken
+awry
+ax/MDSG
+axial/Y
+axiom/SM
+axiomatic
+axiomatically
+axis/M
+axle/MS
+axletree/SM
+axolotl/SM
+axon/MS
+ayah/M
+ayahs
+ayatollah/M
+ayatollahs
+aye/SM
+azalea/SM
+azimuth/M
+azimuths
+azure/SM
+b/KDT
+baa/SMDG
+babble/MZGDRS
+babbler/M
+babe/SM
+babel/MS
+baboon/MS
+babushka/SM
+baby/TGDRSM
+babyhood/M
+babyish
+babysat
+babysit/S
+babysitter/MS
+babysitting/M
+baccalaureate/SM
+baccarat/M
+bacchanal/MS
+bacchanalia/M
+bacchanalian/MS
+baccy
+bachelor/SM
+bachelorhood/M
+bacillary
+bacilli
+bacillus/M
+back/SJZGMDR
+backache/MS
+backbench/S
+backbit
+backbite/ZGRS
+backbiter/M
+backbitten
+backboard/SM
+backbone/MS
+backbreaking
+backchat
+backcloth
+backcloths
+backcomb/DSG
+backdate/GDS
+backdoor
+backdrop/MS
+backer/M
+backfield/SM
+backfire/MGDS
+backgammon/M
+background/MRZS
+backgrounder/M
+backhand/MDRSZG
+backhanded/Y
+backhander/M
+backhoe/MS
+backing/M
+backlash/MS
+backless
+backlog/MS
+backlogged
+backlogging
+backpack/ZGMDRS
+backpacker/M
+backpacking/M
+backpedal/SDG
+backrest/SM
+backroom/S
+backscratching/M
+backseat/SM
+backside/SM
+backslapper/SM
+backslapping/M
+backslash/MS
+backslid
+backslide/RSZG
+backslider/M
+backspace/DSMG
+backspin/M
+backstabber/MS
+backstabbing
+backstage/M
+backstair/S
+backstop/SM
+backstopped
+backstopping
+backstory/S
+backstreet/S
+backstretch/MS
+backstroke/MGDS
+backtalk/M
+backtrack/SDG
+backup/MS
+backward/PSY
+backwardness/M
+backwash/M
+backwater/SM
+backwoods/M
+backwoodsman/M
+backwoodsmen
+backyard/SM
+bacon/M
+bacteria/M
+bacterial
+bactericidal
+bactericide/SM
+bacteriologic
+bacteriological
+bacteriologist/SM
+bacteriology/M
+bacterium/M
+bad/MYP
+badder
+baddest
+baddie/MS
+bade
+badge/MZRS
+badger/GMD
+badinage/M
+badlands/M
+badman/M
+badmen
+badminton/M
+badmouth/GD
+badmouths
+badness/M
+baffle/MZGDRSL
+bafflement/M
+baffler/M
+bag/SM
+bagatelle/SM
+bagel/MS
+bagful/MS
+baggage/M
+bagged
+baggie/M
+baggily
+bagginess/M
+bagging
+baggy/PTRS
+bagpipe/MZRS
+bagpiper/M
+baguette/MS
+bah
+baht/SM
+bail/SBGMD
+bailey/S
+bailiff/S
+bailiwick/MS
+bailout/SM
+bailsman/M
+bailsmen
+bairn/MS
+bait/SGMD
+baize/M
+bake/DRSMZG
+baked/U
+baker/M
+bakery/SM
+bakeshop/MS
+baklava/M
+baksheesh/M
+balaclava/MS
+balalaika/MS
+balance's
+balance/UDSG
+balboa/SM
+balcony/SM
+bald/STGPDRY
+balderdash/M
+baldfaced
+baldness/M
+baldric/SM
+baldy/S
+bale/DRSMZG
+baleen/M
+baleful/PY
+balefulness/M
+baler/M
+balk/SGMD
+balky/RT
+ball/SGMD
+ballad/SM
+balladeer/MS
+balladry/M
+ballast/GSMD
+ballcock/MS
+ballerina/SM
+ballet/SM
+balletic
+ballgame/MS
+ballgirl/S
+ballgown/S
+ballistic/S
+ballistics/M
+balloon/SGMD
+balloonist/MS
+ballot/SMDG
+ballpark/MS
+ballplayer/MS
+ballpoint/MS
+ballroom/MS
+balls/DSG
+ballsy/RT
+bally
+ballyhoo/SMDG
+balm/SM
+balminess/M
+balmy/RTP
+baloney/M
+balsa/MS
+balsam/SM
+balsamic
+baluster/SM
+balustrade/MS
+bamboo/SM
+bamboozle/DSG
+ban/SM
+banal/Y
+banality/SM
+banana/SM
+band's
+band/ESGD
+bandage/DSMG
+bandanna/MS
+bandbox/MS
+bandeau/M
+bandeaux
+bandit/SM
+banditry/M
+bandleader/S
+bandmaster/SM
+bandoleer/SM
+bandsman/M
+bandsmen
+bandstand/SM
+bandwagon/SM
+bandwidth
+bandwidths
+bandy/DRSTG
+bane/SM
+baneful
+bang/SGMDR
+bangle/SM
+bani
+banish/GLDS
+banishment/M
+banister/SM
+banjo/MS
+banjoist/SM
+bank/SZGBMDR
+bankbook/SM
+bankcard/SM
+banker/M
+banking/M
+banknote/SM
+bankroll/SGMD
+bankrupt/SGMD
+bankruptcy/SM
+banned
+banner/SM
+banning
+bannock/MS
+banns/M
+banquet/ZGMDRS
+banqueter/M
+banquette/SM
+banshee/MS
+bantam/SM
+bantamweight/SM
+banter/GSMD
+bantering/Y
+banyan/SM
+banzai/SM
+baobab/SM
+bap/S
+baptism/MS
+baptismal
+baptist/S
+baptistery/SM
+baptize/ZGDRS
+baptized/U
+baptizer/M
+bar's
+bar/ECUTS
+barb/SZGMDR
+barbacoa
+barbarian/SM
+barbarianism/MS
+barbaric
+barbarically
+barbarism/SM
+barbarity/SM
+barbarize/DSG
+barbarous/Y
+barbecue/DSMG
+barbel/SM
+barbell/MS
+barber/GMD
+barberry/SM
+barbershop/MS
+barbie/S
+barbiturate/SM
+barbwire/M
+barcarole/SM
+bard/SM
+bardic
+bare/DRSPYG
+bareback/D
+barefaced/Y
+barefoot/D
+barehanded
+bareheaded
+barelegged
+bareness/M
+barf/SGMDY
+barfly/SM
+bargain/MDRZGS
+bargainer/M
+barge/MGDS
+bargeman/M
+bargemen
+barhop/S
+barhopped
+barhopping
+barista/MS
+baritone/MS
+barium/M
+bark's
+bark/CSGD
+barkeep/ZMRS
+barkeeper/M
+barker/SM
+barley/M
+barmaid/MS
+barman/M
+barmen
+barmy/RT
+barn/SM
+barnacle/MDS
+barney/S
+barnstorm/SDRZG
+barnstormer/M
+barnyard/SM
+barometer/MS
+barometric
+barometrically
+baron/MS
+baronage/MS
+baroness/MS
+baronet/MS
+baronetcy/SM
+baronial
+barony/SM
+baroque/M
+barrack/MDGS
+barracuda/SM
+barrage/MGDS
+barre/MGJDS
+barred/UEC
+barrel/GSMD
+barren/TPSMR
+barrenness/M
+barrette/SM
+barricade/MGDS
+barrier/MS
+barring/ECU
+barrio/SM
+barrister/MS
+barroom/MS
+barrow/SM
+bartender/SM
+barter/ZGSMDR
+barterer/M
+baryon/SM
+basal/Y
+basalt/M
+basaltic
+base's
+base/CDSLTG
+baseball/SM
+baseboard/MS
+baseless
+baseline/MS
+basely
+baseman/M
+basemen
+basement/CMS
+baseness/M
+baser
+bash/GMDS
+bashful/PY
+bashfulness/M
+bashing/M
+basic/MS
+basically
+basil/M
+basilica/MS
+basilisk/MS
+basin/MS
+basinful/MS
+basis/M
+bask/SGD
+basket/SM
+basketball/MS
+basketry/M
+basketwork/M
+basque/S
+bass/MS
+basset/SM
+bassinet/MS
+bassist/MS
+basso/MS
+bassoon/MS
+bassoonist/SM
+basswood/MS
+bast/M
+bastard/MS
+bastardization/MS
+bastardize/GDS
+bastardy/M
+baste/ZGNXDRS
+baster/M
+bastion/M
+bat/SM
+batch/MDSG
+bate/KACGSD
+bath/ZGMDRS
+bathe/M
+bather/M
+bathetic
+bathhouse/MS
+bathing/M
+bathmat/MS
+bathos/M
+bathrobe/SM
+bathroom/SM
+baths
+bathtub/MS
+bathwater
+bathyscaphe/SM
+bathysphere/MS
+batik/MS
+batiste/M
+batman/M
+batmen
+baton/MS
+batsman/M
+batsmen
+battalion/SM
+batted
+batten/GSMD
+batter/JZGSMDR
+batterer/M
+battery/SM
+batting/M
+battle/LDRSMZG
+battleaxe/MS
+battledore/SM
+battledress
+battlefield/MS
+battlefront/MS
+battleground/MS
+battlement/SM
+battler/M
+battleship/SM
+batty/RT
+bauble/SM
+baud/SM
+bauxite/M
+bawd/SM
+bawdily
+bawdiness/M
+bawdy/PRT
+bawl/SGMD
+bay/SMDG
+bayberry/SM
+bayonet/SMDG
+bayou/MS
+bazaar/SM
+bazillion/S
+bazooka/SM
+bbl
+bdrm
+be
+beach/MDSG
+beachcomber/SM
+beachfront
+beachhead/MS
+beachwear/M
+beacon/SM
+bead/SGMD
+beading/M
+beadle/SM
+beady/RT
+beagle/SM
+beak/SZMDR
+beaker/M
+beam/SGMD
+bean/SGMD
+beanbag/MS
+beanfeast/S
+beanie/SM
+beanpole/MS
+beansprout/S
+beanstalk/MS
+bear/SZGBJMR
+bearable/U
+bearably/U
+beard/MDGS
+beardless
+bearer/M
+bearing/M
+bearish/PY
+bearishness/M
+bearlike
+bearskin/MS
+beast/MS
+beastliness/M
+beastly/TPRM
+beat/SZGBMNRJ
+beatable/U
+beaten/U
+beater/M
+beatific
+beatifically
+beatification/M
+beatify/GXNDS
+beating/M
+beatitude/SM
+beatnik/MS
+beau/SM
+beaut/MS
+beauteous/Y
+beautician/SM
+beautification/M
+beautifier/M
+beautiful/Y
+beautify/NDRSZG
+beauty/SM
+beaver/SGMD
+bebop/MS
+becalm/GSD
+became
+because
+beck/SM
+beckon/SGD
+becloud/GDS
+become/S
+becoming/UY
+becquerel/S
+bed/SM
+bedaub/GSD
+bedazzle/GDSL
+bedazzlement/M
+bedbug/SM
+bedchamber/S
+bedclothes/M
+bedded
+bedder
+bedding/M
+bedeck/GSD
+bedevil/LGDS
+bedevilment/M
+bedfellow/SM
+bedhead/S
+bedim/S
+bedimmed
+bedimming
+bedizen/GDS
+bedlam/SM
+bedpan/SM
+bedpost/SM
+bedraggle/GDS
+bedridden
+bedrock/SM
+bedroll/SM
+bedroom/SM
+bedside/SM
+bedsit/S
+bedsitter/S
+bedsore/SM
+bedspread/SM
+bedstead/SM
+bedtime/SM
+bee/RSMZGJ
+beebread/M
+beech/MS
+beechnut/MS
+beef/SGMD
+beefburger/SM
+beefcake/MS
+beefiness/M
+beefsteak/MS
+beefy/RPT
+beehive/MS
+beekeeper/MS
+beekeeping/M
+beeline/MS
+been
+beep/SZGMDR
+beeper/M
+beer/M
+beery/TR
+beeswax/M
+beet/SM
+beetle/MGDS
+beetroot/S
+beeves
+befall/SGN
+befell
+befit/S
+befitted
+befitting/Y
+befog/S
+befogged
+befogging
+before
+beforehand
+befoul/DGS
+befriend/SGD
+befuddle/GLDS
+befuddlement/M
+beg/S
+began
+begat
+beget/S
+begetter/S
+begetting
+beggar/MDYGS
+beggary/M
+begged
+begging
+begin/S
+beginner/SM
+beginning/MS
+begone
+begonia/SM
+begot
+begotten
+begrime/DSG
+begrudge/DSG
+begrudging/Y
+beguile/DRSZGL
+beguilement/M
+beguiler/M
+beguiling/Y
+beguine/SM
+begum/MS
+begun
+behalf/M
+behalves
+behave/GDS
+behavior/SM
+behavioral/Y
+behaviorism/M
+behaviorist/MS
+behead/DGS
+beheld
+behemoth/M
+behemoths
+behest/MS
+behind/MS
+behindhand
+behold/NRZGS
+beholder/M
+behoove/DSG
+beige/M
+being/M
+bejewel/SDG
+belabor/SDG
+belated/Y
+belay/GDS
+belch/GMDS
+beleaguer/GSD
+belfry/SM
+belie/DS
+belief/EUM
+beliefs
+believable/U
+believably/U
+believe/EDRSZG
+believer/EUMS
+believing/U
+belittle/LDSG
+belittlement/M
+bell/SGMD
+belladonna/M
+bellboy/SM
+belle/MS
+belled/A
+belletrist/MS
+belletristic
+bellhop/SM
+bellicose
+bellicosity/M
+belligerence/M
+belligerency/M
+belligerent/MYS
+belling/A
+bellman/M
+bellmen
+bellow/MDGS
+bellwether/MS
+belly/GDSM
+bellyache/MGDS
+bellybutton/SM
+bellyful/MS
+belong/JDGS
+belonging/M
+beloved/SM
+below
+belt/SGMD
+beltway/SM
+beluga/MS
+belying
+bemire/GDS
+bemoan/DGS
+bemuse/LGDS
+bemused/Y
+bemusement/M
+bench/GMDS
+benchmark/MS
+bend/BSZGMR
+bender/M
+bendy/TR
+beneath
+benedictine
+benediction/SM
+benedictory
+benefaction/SM
+benefactor/MS
+benefactress/MS
+benefice/SM
+beneficence/M
+beneficent/Y
+beneficial/Y
+beneficiary/SM
+benefit/SMDG
+benevolence/SM
+benevolent/Y
+benighted/Y
+benign/Y
+benignant
+benignity/M
+bent/SM
+bentonite
+bentwood/M
+benumb/DSG
+benzene/M
+benzine/M
+benzyl
+bequeath/DG
+bequeaths
+bequest/MS
+berate/GDS
+bereave/DSLG
+bereavement/MS
+bereft
+beret/MS
+berg/SM
+beriberi/M
+berk/S
+berkelium/M
+berm/SM
+berry/GDSM
+berrylike
+berserk
+berth/GMD
+berths
+beryl/MS
+beryllium/M
+beseech/ZGRS
+beseecher/M
+beseeching/Y
+beseem/DSG
+beset/S
+besetting
+beside/S
+besiege/ZGDRS
+besieger/M
+besmear/DSG
+besmirch/GDS
+besom/MS
+besot/S
+besotted
+besotting
+besought
+bespangle/DSG
+bespatter/GSD
+bespeak/SG
+bespectacled
+bespoke
+bespoken
+best/SGMD
+bestial/Y
+bestiality/M
+bestiary/SM
+bestir/S
+bestirred
+bestirring
+bestow/DGS
+bestowal/SM
+bestrew/SDG
+bestrewn
+bestridden
+bestride/SG
+bestrode
+bestseller/MS
+bestselling
+bet/SM
+beta/SM
+betake/GS
+betaken
+betcha
+betel/M
+bethink/SG
+bethought
+betide/GDS
+betimes
+betoken/GDS
+betook
+betray/DRZGS
+betrayal/SM
+betrayer/M
+betroth/DG
+betrothal/SM
+betrothed/M
+betroths
+better/MDGLS
+betterment/M
+betting
+bettor/MS
+between
+betwixt
+bevel/GMDS
+beverage/SM
+bevvy/S
+bevy/SM
+bewail/DGS
+beware/GDS
+bewhiskered
+bewigged
+bewilder/LSGD
+bewildering/Y
+bewilderment/M
+bewitch/GLDS
+bewitching/Y
+bewitchment/M
+bey/SM
+beyond
+bezel/MS
+bf
+bhaji
+bi/SMRZ
+biannual/Y
+bias/GMDS
+biased/U
+biathlon/SM
+bib/SM
+bible/MS
+biblical
+bibliographer/MS
+bibliographic
+bibliographical/Y
+bibliography/SM
+bibliophile/SM
+bibulous
+bicameral
+bicameralism/M
+bicarb/MS
+bicarbonate/MS
+bicentenary/SM
+bicentennial/SM
+bicep/MS
+biceps/M
+bicker/MDRZGS
+bickerer/M
+biconcave
+biconvex
+bicuspid/MS
+bicycle/DRSMZG
+bicycler/M
+bicyclist/SM
+bid/SMG
+biddable
+bidden/U
+bidder/MS
+bidding/M
+biddy/SM
+bide/S
+bidet/MS
+bidirectional/Y
+biennial/MYS
+biennium/MS
+bier/M
+biff/SGD
+bifocal/S
+bifocals/M
+bifurcate/XDSGN
+bifurcation/M
+big/P
+bigamist/SM
+bigamous
+bigamy/M
+bigger
+biggest
+biggie/MS
+biggish
+bighead/SM
+bighearted/P
+bigheartedness/M
+bighorn/SM
+bight/MS
+bigmouth/M
+bigmouths
+bigness/M
+bigot/MDS
+bigotry/SM
+bigwig/MS
+bijou/M
+bijoux
+bike/DRSMZG
+biker/M
+bikini/MS
+bilabial/MS
+bilateral/Y
+bilberry/S
+bile/M
+bilge/MS
+bilingual/SMY
+bilingualism/M
+bilious/P
+biliousness/M
+bilirubin
+bilk/SZGDR
+bilker/M
+bill/SBJGMD
+billboard/MS
+billet/GMDS
+billfold/SM
+billhook/S
+billiard/S
+billiards/M
+billing/M
+billingsgate/M
+billion/MHS
+billionaire/SM
+billionth/M
+billionths
+billow/GMDS
+billowy
+billy/SM
+billycan/S
+bimbo/MS
+bimetallic/SM
+bimetallism/M
+bimodal
+bimonthly/SM
+bin/SM
+binary/SM
+binaural
+bind's
+bind/AUGS
+binder/MS
+bindery/SM
+binding/MS
+bindweed/M
+binge/MDS
+bingo/M
+binman
+binmen
+binnacle/SM
+binned
+binning
+binocular/MS
+binomial/SM
+bio/SM
+biochemical/SMY
+biochemist/MS
+biochemistry/M
+biodegradability/M
+biodegrade/DSGB
+biodiversity/M
+bioethics/M
+biofeedback/M
+biofilm/MS
+biog
+biographer/SM
+biographic
+biographical/Y
+biography/SM
+biol
+biologic
+biological/Y
+biologist/MS
+biology/M
+biomarker/MS
+biomass/M
+biomedical
+bionic/S
+bionically
+bionics/M
+biophysical
+biophysicist/MS
+biophysics/M
+biopic/MS
+biopsy/GDSM
+bioreactor/S
+biorhythm/MS
+biosensor/S
+biosphere/SM
+biosynthesis
+biotech
+biotechnological
+biotechnology/M
+biotin/M
+bipartisan
+bipartisanship/M
+bipartite
+biped/MS
+bipedal
+biplane/MS
+bipolar
+bipolarity/M
+biracial
+birch/GMDS
+bird/SZGMDR
+birdbath/M
+birdbaths
+birdbrain/SMD
+birdcage/S
+birder/M
+birdhouse/MS
+birdie/MDS
+birdieing
+birdlike
+birdlime/M
+birdseed/M
+birdsong
+birdwatcher/SM
+birdying
+biretta/SM
+birth/ZGMDR
+birthday/MS
+birther/M
+birthmark/MS
+birthplace/MS
+birthrate/MS
+birthright/MS
+births/A
+birthstone/SM
+biscuit/SM
+bisect/DGS
+bisection/MS
+bisector/SM
+bisexual/MYS
+bisexuality/M
+bishop/MS
+bishopric/SM
+bismuth/M
+bison/M
+bisque/M
+bistro/MS
+bit/CSMG
+bitch/GMDS
+bitchily
+bitchiness/M
+bitchy/PRT
+bitcoin/SM
+bite/RSMZ
+biter/M
+biting/Y
+bitmap/S
+bitten
+bitter/PMRYTS
+bittern/SM
+bitterness/M
+bitters/M
+bittersweet/MS
+bitty/TR
+bitumen/M
+bituminous
+bivalent
+bivalve/SM
+bivouac/MS
+bivouacked
+bivouacking
+biweekly/SM
+biyearly
+biz/M
+bizarre/Y
+bk
+bl/DG
+blab/SM
+blabbed
+blabber/DGS
+blabbermouth/M
+blabbermouths
+blabbing
+black/PXTGMDNRYS
+blackamoor/MS
+blackball/SGMD
+blackberry/GSM
+blackbird/SM
+blackboard/MS
+blackcurrant/S
+blacken/DG
+blackface
+blackguard/SM
+blackhead/MS
+blacking/M
+blackish
+blackjack/MDGS
+blackleg/S
+blacklist/MDSG
+blackmail/MDRSZG
+blackmailer/M
+blackness/M
+blackout/SM
+blacksmith/M
+blacksmiths
+blacksnake/SM
+blackthorn/SM
+blacktop/SM
+blacktopped
+blacktopping
+bladder/MS
+blade/MDS
+blag/S
+blagged
+blagging
+blah/M
+blahs/M
+blame/BMGDRS
+blameless/YP
+blamelessness/M
+blameworthiness/M
+blameworthy/P
+blammo
+blanch/GDS
+blancmange/MS
+bland/PTRY
+blandish/DSLG
+blandishment/SM
+blandness/M
+blank/TGPMDRYS
+blanket/GMDS
+blankness/M
+blare/MGDS
+blarney/SMDG
+blase
+blaspheme/ZGDRS
+blasphemer/M
+blasphemous/Y
+blasphemy/SM
+blast/ZGMDRS
+blaster/M
+blastoff/MS
+blat/S
+blatancy/SM
+blatant/Y
+blather/SMDG
+blaze/MZGDRS
+blazer/M
+blazon/MDGS
+bldg
+bleach/MDRSZG
+bleached/U
+bleacher/M
+bleak/TPRY
+bleakness/M
+blear
+blearily
+bleariness/M
+bleary/PRT
+bleat/GMDS
+bleed/ZGRS
+bleeder/M
+bleeding/M
+bleep/ZGMDRS
+bleeper/M
+blemish/GMDS
+blemished/U
+blench/DSG
+blend/ZGMDRS
+blender/M
+bless/GDSJ
+blessed/YP
+blessedness/M
+blessing/M
+bletch
+blew
+blight/ZGMDRS
+blimey
+blimp/MS
+blimpish
+blind/PZTGMDRYS
+blinder/M
+blindfold/SMDG
+blinding/Y
+blindness/M
+blindside/DSG
+blini/MS
+blink/ZGMDRS
+blinker/MDG
+blintz/MS
+blintze/M
+blip/SM
+bliss/M
+blissful/YP
+blissfulness/M
+blister/GMDS
+blistering/Y
+blistery
+blithe/PYTR
+blitheness/M
+blither/G
+blithesome
+blitz/GMDS
+blitzkrieg/MS
+blivet/S
+blizzard/SM
+bloat/ZGDRS
+bloatware
+blob/SM
+blobbed
+blobbing
+bloc/SM
+block's
+block/UGDS
+blockade/MZGDRS
+blockader/M
+blockage/MS
+blockbuster/SM
+blockbusting/M
+blockchain/MS
+blocker/MS
+blockhead/SM
+blockhouse/MS
+blog/SM
+blogged
+blogger/MS
+blogging
+bloke/MS
+blokish
+blond/PTMRS
+blonde/MS
+blondish
+blondness/M
+blood/GMDS
+bloodbath/M
+bloodbaths
+bloodcurdling
+bloodhound/SM
+bloodily
+bloodiness/M
+bloodless/YP
+bloodlessness/M
+bloodletting/M
+bloodline/SM
+bloodmobile/MS
+bloodshed/M
+bloodshot
+bloodstain/SMD
+bloodstock/M
+bloodstream/SM
+bloodsucker/SM
+bloodsucking
+bloodthirstily
+bloodthirstiness/M
+bloodthirsty/RPT
+bloody/PTGDRS
+bloom/ZGMDRS
+bloomer/M
+bloop/ZGMDRS
+blooper/M
+blossom/GMDS
+blossomy
+blot/SM
+blotch/GMDS
+blotchy/TR
+blotted
+blotter/MS
+blotting
+blotto
+blouse/MGDS
+blow/SZGMR
+blower/M
+blowfly/SM
+blowgun/MS
+blowhard/MS
+blowhole/S
+blowjob/SM
+blowlamp/S
+blown
+blowout/SM
+blowpipe/SM
+blowtorch/MS
+blowup/MS
+blowy/TR
+blowzy/RT
+blubber/GSMD
+blubbery
+bludgeon/MDGS
+blue/DRSPMTG
+bluebell/MS
+blueberry/SM
+bluebird/MS
+bluebonnet/SM
+bluebottle/SM
+bluefish/MS
+bluegill/MS
+bluegrass/M
+blueish
+bluejacket/SM
+bluejeans/M
+blueness/M
+bluenose/MS
+bluepoint/MS
+blueprint/MDGS
+bluestocking/SM
+bluesy/RT
+bluet/MS
+bluff/ZTGPMDRYS
+bluffer/M
+bluffness/M
+bluing/M
+bluish
+blunder/MDRZGS
+blunderbuss/MS
+blunderer/M
+blunt/PTGDRYS
+bluntness/M
+blur/SM
+blurb/MS
+blurred
+blurriness/M
+blurring
+blurry/TRP
+blurt/GDS
+blush/ZGMDRS
+blusher/M
+bluster/MDRSZG
+blusterer/M
+blusterous
+blustery
+blvd
+boa/SM
+boar/SM
+board/ZGMDRS
+boarder/M
+boarding/M
+boardinghouse/MS
+boardroom/MS
+boardwalk/MS
+boast/ZGMDRS
+boaster/M
+boastful/PY
+boastfulness/M
+boat/SZGMDR
+boater/M
+boathouse/MS
+boating/M
+boatload/S
+boatman/M
+boatmen
+boatswain/SM
+boatyard/S
+bob/SM
+bobbed
+bobbin/MS
+bobbing
+bobble/MGDS
+bobby/SM
+bobbysoxer/SM
+bobcat/MS
+bobolink/SM
+bobsled/SM
+bobsledded
+bobsledder/MS
+bobsledding
+bobsleigh/M
+bobsleighs
+bobtail/SM
+bobwhite/MS
+boccie/M
+bock/M
+bod/SMDG
+bodacious
+bode/S
+bodega/MS
+bodge/GDS
+bodice/MS
+bodily
+bodkin/MS
+body/DSM
+bodybuilder/SM
+bodybuilding/M
+bodyguard/MS
+bodysuit/SM
+bodywork/M
+boffin/S
+boffo
+bog/SM
+boga
+bogey/GMDS
+bogeyman/M
+bogeymen
+bogged
+bogging
+boggle/GDS
+boggy/TR
+bogie/MS
+bogon
+bogosity
+bogus
+bogyman/M
+bogymen
+bohemian/SM
+bohemianism/M
+boil/SJZGMDR
+boiler/M
+boilermaker/SM
+boilerplate/M
+boink/GDS
+boisterous/YP
+boisterousness/M
+bola/SM
+bold/PTRY
+boldface/DM
+boldness/M
+bole/SM
+bolero/MS
+bolivar/MS
+bolivares
+boll/SM
+bollard/S
+bollix/GMDS
+bollocking/S
+bollocks
+bologna/M
+bolshie
+bolster/GMDS
+bolt's
+bolt/USGD
+bolthole/S
+bolus/MS
+bomb/SJZGMDR
+bombard/GDLS
+bombardier/MS
+bombardment/SM
+bombast/M
+bombastic
+bombastically
+bomber/M
+bombproof
+bombshell/SM
+bombsite/S
+bonanza/MS
+bonbon/MS
+bonce/S
+bond/SGMD
+bondage/M
+bondholder/MS
+bonding/M
+bondman/M
+bondmen
+bondsman/M
+bondsmen
+bondwoman/M
+bondwomen
+bone/DRSMZG
+bonehead/SMD
+boneless
+boner/M
+boneshaker/S
+boneyard
+bonfire/MS
+bong/SGMD
+bongo/MS
+bonhomie/M
+boniness/M
+bonito/MS
+bonk/SZGD
+bonnet/MS
+bonny/TR
+bonobo/MS
+bonsai/M
+bonus/MS
+bony/PTR
+boo/SMDHG
+boob/SGMD
+booby/SM
+boodle/MS
+booger/S
+boogeyman/M
+boogeymen
+boogie/MDS
+boogieing
+boogieman/M
+boohoo/GMDS
+book/SBJGMD
+bookbinder/SM
+bookbindery/SM
+bookbinding/M
+bookcase/MS
+bookend/MS
+bookie/MS
+booking/M
+bookish
+bookkeeper/MS
+bookkeeping/M
+booklet/MS
+bookmaker/SM
+bookmaking/M
+bookmark/SMDG
+bookmobile/SM
+bookplate/MS
+bookseller/MS
+bookshelf/M
+bookshelves
+bookshop/SM
+bookstall/S
+bookstore/MS
+bookworm/SM
+boolean
+boom/SZGMDR
+boombox/MS
+boomerang/MDGS
+boon/SM
+boondocks/M
+boondoggle/MZGDRS
+boondoggler/M
+boonies/M
+boor/SM
+boorish/PY
+boorishness/MS
+boost/ZGMDRS
+booster/M
+boot's
+boot/ASGD
+bootblack/SM
+bootee/MS
+booth/M
+booths
+bootlace/S
+bootleg/MS
+bootlegged
+bootlegger/MS
+bootlegging/M
+bootless
+bootstrap/MS
+bootstrapped
+bootstrapping
+booty/SM
+booze/MZGDRS
+boozer/M
+boozy/TR
+bop/SM
+bopped
+bopping
+borax/M
+bordello/MS
+border/GMDS
+borderland/MS
+borderline/MS
+bore/DRSMZG
+boredom/M
+borehole/S
+borer/M
+boring/Y
+born/IAU
+borne
+boron/M
+borough/M
+boroughs
+borrow/SDRZGJ
+borrower/M
+borrowing/M
+borscht/M
+borstal/S
+borzoi/SM
+bosh/M
+bosom's
+bosom/US
+bosomy
+boss/DSGM
+bossily
+bossiness/M
+bossism/M
+bossy/RTP
+bot/S
+botanic
+botanical/Y
+botanist/SM
+botany/M
+botch/DRSZGM
+botcher/M
+both
+bother/SMDG
+botheration
+bothered/U
+bothersome
+botnet/SM
+bottle/DRSMZG
+bottleneck/MS
+bottler/M
+bottom/SMDG
+bottomless
+botulinum
+botulism/M
+boudoir/SM
+bouffant/SM
+bougainvillea/MS
+bough/M
+boughs
+bought
+bouillabaisse/SM
+bouillon/MS
+boulder/SM
+boules
+boulevard/SM
+bounce/DRSMZG
+bouncer/M
+bouncily
+bounciness/M
+bouncy/RTP
+bound/ASMGD
+boundary/SM
+bounden
+bounder/SM
+boundless/PY
+boundlessness/M
+bounteous/YP
+bounteousness/M
+bountiful/YP
+bountifulness/M
+bounty/SM
+bouquet/SM
+bourbon/SM
+bourgeois/M
+bourgeoisie/M
+boustrophedon
+bout/MS
+boutique/SM
+boutonniere/MS
+bouzouki/MS
+bovine/SM
+bovver
+bow/ZGSMDR
+bowdlerization/MS
+bowdlerize/DSG
+bowed/U
+bowel/SM
+bower/M
+bowl/MDRZGS
+bowleg/SM
+bowlegged
+bowler/M
+bowlful/SM
+bowline/SM
+bowling/M
+bowman/M
+bowmen
+bowsprit/SM
+bowstring/SM
+bowwow/SM
+box/ZGMDNRS
+boxcar/SM
+boxer/M
+boxing/M
+boxlike
+boxroom/S
+boxwood/M
+boxy/RT
+boy/SM
+boycott/SGMD
+boyfriend/MS
+boyhood/SM
+boyish/YP
+boyishness/M
+boysenberry/SM
+bozo/MS
+bpm
+bps
+bra/SM
+brace/MZGDRS
+bracelet/MS
+bracer/M
+bracero/MS
+bracken/M
+bracket/GMDS
+brackish/P
+brackishness/M
+bract/MS
+brad/SM
+bradawl/S
+bradycardia
+brae/SM
+brag/SM
+braggadocio/SM
+braggart/SM
+bragged
+bragger/MS
+bragging
+braid/GMDS
+braiding/M
+braille/M
+brain/GMDS
+brainchild/M
+brainchildren/M
+braininess/M
+brainless/Y
+brainpower
+brainstorm/SMDG
+brainstorming/M
+brainteaser/SM
+brainwash/DSG
+brainwashing/M
+brainwave/S
+brainy/PTR
+braise/GDS
+brake/MGDS
+brakeman/M
+brakemen
+bramble/MS
+brambly
+bran/M
+branch/GMDS
+branchlike
+brand/ZGMDRS
+branded/U
+brander/M
+brandish/DSG
+brandy/GDSM
+brash/PTRY
+brashness/M
+brass/MS
+brasserie/MS
+brassiere/MS
+brassily
+brassiness/M
+brassy/PTR
+brat/SM
+bratty/RT
+bratwurst/SM
+bravado/M
+brave/GPMYDTRS
+braveness/M
+bravery/M
+bravo/SM
+bravura/SM
+brawl/SDRZGM
+brawler/M
+brawn/M
+brawniness/M
+brawny/RTP
+bray/DGSM
+braze/DRSZG
+brazen/SDYGP
+brazenness/M
+brazer/M
+brazier/SM
+breach/GMDS
+bread/GMDHS
+breadbasket/SM
+breadboard/SM
+breadbox/MS
+breadcrumb/MS
+breadfruit/SM
+breadline/MS
+breadth/M
+breadths
+breadwinner/SM
+break/BMZGRS
+breakable/MS
+breakage/MS
+breakaway/MS
+breakdown/MS
+breaker/M
+breakfast/MDGS
+breakfront/MS
+breakneck
+breakout/MS
+breakpoints
+breakthrough/M
+breakthroughs
+breakup/SM
+breakwater/SM
+bream/MS
+breast/SMDG
+breastbone/MS
+breastfed
+breastfeed/GS
+breastplate/SM
+breaststroke/SM
+breastwork/MS
+breath/MDRSZGB
+breathalyze/ZGDRS
+breathe
+breather/M
+breathing/M
+breathless/PY
+breathlessness/M
+breaths
+breathtaking/Y
+breathy/RT
+bred/I
+breech/MS
+breed/SRZGM
+breeder/M
+breeding/IM
+breeze/DSMG
+breezeway/SM
+breezily
+breeziness/M
+breezy/RTP
+brethren
+breve/SM
+brevet/SM
+brevetted
+brevetting
+breviary/SM
+brevity/M
+brew/MDRZGS
+brewer/M
+brewery/SM
+brewpub/SM
+bribe/DRSMZG
+briber/M
+bribery/M
+brick/SMDG
+brickbat/SM
+brickie/S
+bricklayer/MS
+bricklaying/M
+brickwork/M
+brickyard/S
+bridal/SM
+bride/SM
+bridegroom/SM
+bridesmaid/MS
+bridge/DSMG
+bridgeable/U
+bridgehead/SM
+bridgework/M
+bridle/DSMG
+bridled/U
+bridleway/S
+brie/MZR
+brief's
+brief/CSDTGJ
+briefcase/SM
+briefer
+briefing/CM
+briefly
+briefness/M
+brier/M
+brig/MS
+brigade/SM
+brigadier/MS
+brigand/SM
+brigandage/M
+brigantine/MS
+bright/SPNRYXT
+brighten/DRZG
+brightener/M
+brightness/M
+brights/M
+brill
+brilliance/M
+brilliancy/M
+brilliant/MYS
+brilliantine/M
+brim/MS
+brimful
+brimless
+brimmed
+brimming
+brimstone/M
+brindle/DM
+brine/M
+bring/SRZG
+bringer/M
+brininess/M
+brink/SM
+brinkmanship/M
+briny/RTP
+brioche/SM
+briquette/MS
+brisk/SDRYTGP
+brisket/SM
+briskness/M
+bristle/DSMG
+bristly/TR
+britches/M
+brittle/PRMT
+brittleness/M
+bro/SMH
+broach/MDSG
+broad/SMNRYXTP
+broadband/M
+broadcast/AMGS
+broadcaster/MS
+broadcasting/M
+broadcloth/M
+broaden/DG
+broadloom/M
+broadminded
+broadness/M
+broadsheet/SM
+broadside/MGDS
+broadsword/SM
+brocade/DSMG
+broccoli/M
+brochette/SM
+brochure/MS
+brogan/SM
+brogue/SM
+broil/SMDRZG
+broiler/M
+broke
+broken/YP
+brokenhearted/Y
+brokenness/M
+broker/SMDG
+brokerage/MS
+brolly/S
+bromide/SM
+bromidic
+bromine/M
+bronc/SM
+bronchi
+bronchial
+bronchitic
+bronchitis/M
+bronchus/M
+bronco/SM
+broncobuster/SM
+brontosaur/MS
+brontosaurus/MS
+bronze/DSMG
+brooch/MS
+brood/SMDRZG
+brooder/M
+broodily
+brooding/MY
+broodmare/MS
+broody/RMPT
+brook/SMDG
+brooklet/SM
+broom/SM
+broomstick/MS
+broth/MRZ
+brothel/MS
+brother/MY
+brotherhood/MS
+brotherliness/M
+broths
+brougham/SM
+brought
+brouhaha/SM
+brow/MS
+browbeat/SNG
+brown/SMDRPTG
+brownfield
+brownie/MS
+brownish
+brownness/M
+brownout/SM
+brownstone/MS
+browse/DRSMZG
+browser/M
+brr
+bruin/SM
+bruise/DRSMZG
+bruiser/M
+bruising/M
+bruit/SDG
+brunch/MDSG
+brunet/SM
+brunette/MS
+brunt/M
+brush/MDSG
+brushoff/SM
+brushstroke/S
+brushwood/M
+brushwork/M
+brusque/RPYT
+brusqueness/M
+brutal/Y
+brutality/SM
+brutalization/M
+brutalize/GDS
+brute/SM
+brutish/PY
+brutishness/M
+bu
+bub/SM
+bubble/DSMG
+bubblegum/M
+bubbly/RMT
+bubo/M
+buboes
+buccaneer/SGMD
+buck/MDGS
+buckaroo/SM
+buckboard/MS
+bucket/SGMD
+bucketful/MS
+buckeye/MS
+buckle's
+buckle/UDSG
+buckler/MS
+buckram/M
+bucksaw/MS
+buckshot/M
+buckskin/MS
+buckteeth
+bucktooth/MD
+buckwheat/M
+buckyball/SM
+bucolic/MS
+bucolically
+bud/SM
+budded
+budding/S
+buddy/SM
+budge/DSG
+budgerigar/MS
+budget/SGMD
+budgetary
+budgie/SM
+buff/AMDGS
+buffalo/MDG
+buffaloes
+buffer/SMDG
+buffet/SMDGJ
+buffoon/SM
+buffoonery/M
+buffoonish
+bug's
+bug/CS
+bugaboo/SM
+bugbear/SM
+bugged/C
+bugger/SMDG
+buggery
+bugging/C
+buggy/RSMT
+bugle/DRSMZG
+bugler/M
+build/SMRZGJ
+builder/M
+building/M
+buildup/SM
+built/AI
+builtin
+bulb/MS
+bulbous
+bulge/DSMG
+bulgy/RT
+bulimarexia/M
+bulimia/M
+bulimic/SM
+bulk/MDGS
+bulkhead/MS
+bulkiness/M
+bulky/RTP
+bull/MDGS
+bulldog/SM
+bulldogged
+bulldogging
+bulldoze/ZGDRS
+bulldozer/M
+bullet/SMD
+bulletin/MDGS
+bulletproof/SDG
+bullfight/SMRZG
+bullfighter/M
+bullfighting/M
+bullfinch/MS
+bullfrog/MS
+bullhead/MDS
+bullheaded/PY
+bullheadedness/M
+bullhorn/MS
+bullion/M
+bullish/YP
+bullishness/M
+bullock/SM
+bullpen/SM
+bullring/MS
+bullseye
+bullshit/MS!
+bullshitted/!
+bullshitter/SM!
+bullshitting/!
+bullwhip/S
+bully/DSMG
+bulrush/MS
+bulwark/MS
+bum/SM
+bumbag/S
+bumble/DRSZG
+bumblebee/SM
+bumbler/M
+bumf
+bummed
+bummer/SM
+bummest
+bumming
+bump/MDRZGS
+bumper/M
+bumph
+bumpiness/M
+bumpkin/MS
+bumptious/PY
+bumptiousness/M
+bumpy/PRT
+bun/SM
+bunch/MDSG
+bunchy/RT
+bunco/SMDG
+bundle/DSMG
+bung/MDGS
+bungalow/MS
+bungee/SM
+bunghole/MS
+bungle/DRSMZG
+bungler/M
+bunion/SM
+bunk's
+bunk/CDGS
+bunker/SM
+bunkhouse/SM
+bunkum/M
+bunny/SM
+bunt/MDGSJ
+bunting/M
+buoy/MDGS
+buoyancy/M
+buoyant/Y
+bur/SMY
+burble/DSMG
+burbs/M
+burden's
+burden/USGD
+burdensome
+burdock/M
+bureau/SM
+bureaucracy/SM
+bureaucrat/MS
+bureaucratic
+bureaucratically
+bureaucratization/M
+bureaucratize/GDS
+burg/MRZS
+burgeon/DSG
+burger/M
+burgh/MRZ
+burgher/M
+burghs
+burglar/MS
+burglarize/GDS
+burglarproof
+burglary/SM
+burgle/DSG
+burgomaster/SM
+burgundy/SM
+burial/ASM
+burka/SM
+burl/MDS
+burlap/M
+burlesque/MGDS
+burliness/M
+burly/RPT
+burn/MDRZGSB
+burnable/SM
+burner/M
+burnish/ZGMDRS
+burnisher/M
+burnoose/MS
+burnout/MS
+burnt
+burp/MDGS
+burr/MDGS
+burrito/MS
+burro/SM
+burrow/SMDRZG
+burrower/M
+bursa/M
+bursae
+bursar/SM
+bursary/SM
+bursitis/M
+burst/SMG
+bury/ADSG
+bus/AMS
+busboy/SM
+busby/SM
+bused
+busgirl/MS
+bush/MDSGJ
+bushel/SGMD
+bushiness/M
+bushing/M
+bushman/M
+bushmaster/SM
+bushmen
+bushwhack/DRSZG
+bushwhacker/M
+bushy/RPT
+busily
+business/MS
+businesslike
+businessman/M
+businessmen
+businessperson/SM
+businesswoman/M
+businesswomen
+busing/M
+busk/DRZGS
+buskin/SM
+busload/S
+buss/MDSG
+bust/MDRZGS
+buster/M
+bustle/DSMG
+busty/RZT
+busy/DRSTGP
+busybody/SM
+busyness/M
+busywork/M
+but/ACS
+butane/M
+butch/MRSZ
+butcher/MDG
+butchery/SM
+butler/SM
+butt/MDRZGS
+butte/SM
+butted/A
+butter/MDG
+butterball/MS
+buttercream
+buttercup/SM
+butterfat/M
+butterfingered
+butterfingers/M
+butterfly/GDSM
+buttermilk/M
+butternut/SM
+butterscotch/M
+buttery/TRSM
+butting/A
+buttock/SM
+button's
+button/USDG
+buttonhole/DSMG
+buttonwood/MS
+buttress/MDSG
+butty/S
+buxom
+buy/ZGSMR
+buyback/SM
+buyer/M
+buyout/SM
+buzz/MDRSZG
+buzzard/MS
+buzzer/M
+buzzkill/SM
+buzzword/SM
+bx
+bxs
+by/M
+bye/SM
+bygone/SM
+bylaw/SM
+byline/SM
+bypass/GMDS
+bypath/M
+bypaths
+byplay/M
+byproduct/MS
+byre/S
+byroad/SM
+bystander/MS
+byte/MS
+byway/SM
+byword/SM
+byzantine
+c/IES
+ca
+cab/SMRZ
+cabal/MS
+cabala's
+caballero/MS
+cabana/SM
+cabaret/SM
+cabbage/MS
+cabbed
+cabbing
+cabby/SM
+cabdriver/SM
+cabin/MS
+cabinet/SM
+cabinetmaker/MS
+cabinetmaking/M
+cabinetry/M
+cabinetwork/M
+cable/MGDS
+cablecast/GMS
+cablegram/MS
+cabochon/SM
+caboodle/M
+caboose/SM
+cabriolet/SM
+cabstand/SM
+cacao/MS
+cache/MGDS
+cachepot/SM
+cachet/MS
+cackle/MZGDRS
+cackler/M
+cacophonous
+cacophony/SM
+cacti
+cactus/M
+cad/SM
+cadaver/SM
+cadaverous
+caddie/MDS
+caddish/YP
+caddishness/M
+caddying
+cadence/DSM
+cadenza/SM
+cadet/MS
+cadge/ZGDRS
+cadger/M
+cadmium/M
+cadre/MS
+caducei
+caduceus/M
+caesura/SM
+cafe/SM
+cafeteria/MS
+cafetiere/S
+caff/CS
+caffeinated
+caffeine/M
+caftan/MS
+cage/DSMG
+cagey
+cagier
+cagiest
+cagily
+caginess/M
+cagoule/S
+cahoot/MS
+caiman/MS
+cairn/MS
+caisson/SM
+caitiff/SM
+cajole/ZGLDRS
+cajolement/M
+cajoler/M
+cajolery/M
+cake/DSMG
+cakewalk/SM
+cal
+calabash/MS
+calaboose/SM
+calamari/SM
+calamine/M
+calamitous/Y
+calamity/SM
+calcareous
+calciferous
+calcification/M
+calcify/GNDS
+calcimine/DSMG
+calcine/DSG
+calcite/M
+calcium/M
+calculable/I
+calculate/AGNVDSX
+calculated/Y
+calculating/Y
+calculation/AM
+calculator/SM
+calculi
+calculus/M
+caldera/SM
+calendar/MDGS
+calf/M
+calfskin/M
+caliber/SM
+calibrate/GNDSX
+calibration/M
+calibrator/SM
+calico/M
+calicoes
+californium/M
+caliper/SGMD
+caliph/M
+caliphate/MS
+caliphs
+calisthenic/S
+calisthenics/M
+calk/SGMD
+call/ASGMD
+calla/MS
+callable
+callback/MS
+called/U
+caller/MS
+calligrapher/SM
+calligraphic
+calligraphist/MS
+calligraphy/M
+calling/SM
+calliope/MS
+callosity/SM
+callous/PGDSY
+callousness/M
+callow/RPT
+callowness/M
+callus/MDSG
+calm/PSTGMDRY
+calmness/M
+caloric
+calorie/MS
+calorific
+calumet/MS
+calumniate/GNDS
+calumniation/M
+calumniator/MS
+calumnious
+calumny/SM
+calve/GDS
+calypso/MS
+calyx/MS
+cam/SM
+camaraderie/M
+camber/MDSG
+cambial
+cambium/SM
+cambric/M
+camcorder/SM
+came
+camel/MS
+camelhair
+camellia/MS
+cameo/MS
+camera/MS
+cameraman/M
+cameramen
+camerapeople
+cameraperson
+camerawoman/M
+camerawomen
+camerawork
+camiknickers
+camisole/SM
+camouflage/MZGDRS
+camouflager/M
+camp's
+camp/CSGD
+campaign/SMDRZG
+campaigner/M
+campanile/SM
+campanologist/MS
+campanology/M
+camper/MS
+campfire/SM
+campground/SM
+camphor/M
+camping/M
+campsite/SM
+campus/MS
+campy/TR
+camshaft/SM
+can't
+can/SMDRZG
+canal/MS
+canalization/M
+canalize/GDS
+canape/MS
+canard/MS
+canary/SM
+canasta/M
+cancan/MS
+cancel/DRSZG
+canceler/M
+cancellation/SM
+cancelous
+cancer/MS
+cancerous
+candelabra/SM
+candelabrum/M
+candid/YP
+candida
+candidacy/SM
+candidate/MS
+candidature/SM
+candidness/M
+candle/MZGDRS
+candlelight/M
+candlelit
+candlepower/M
+candler/M
+candlestick/MS
+candlewick/SM
+candor/M
+candy/GDSM
+candyfloss
+cane/SM
+canebrake/MS
+caner/M
+canine/MS
+canister/SM
+canker/GMDS
+cankerous
+cannabis/MS
+canned
+cannelloni/M
+cannery/SM
+cannibal/SM
+cannibalism/M
+cannibalistic
+cannibalization/M
+cannibalize/GDS
+cannily/U
+canniness/M
+canning
+cannon/GMDS
+cannonade/MGDS
+cannonball/SM
+cannot
+canny/UTR
+canoe/MDS
+canoeing
+canoeist/SM
+canola/M
+canon/MS
+canonical/Y
+canonization/SM
+canonize/DSG
+canoodle/DSG
+canopy/GDSM
+canst
+cant's
+cant/CZRDGS
+cantabile
+cantaloupe/SM
+cantankerous/PY
+cantankerousness/M
+cantata/MS
+canteen/MS
+canter/CM
+cantered
+cantering
+canticle/MS
+cantilever/MDGS
+canto/MS
+canton/MLS
+cantonal
+cantonment/MS
+cantor/MS
+canvas/MGDS
+canvasback/SM
+canvass/MDRSZG
+canvasser/M
+canyon/MGS
+cap/SMDRBZ
+capabilities
+capability/IM
+capable/I
+capably/I
+capacious/PY
+capaciousness/M
+capacitance/M
+capacities
+capacitor/SM
+capacity/IM
+caparison/MDGS
+cape/SM
+caper/GMD
+capeskin/M
+capillarity/M
+capillary/SM
+capital/MSY
+capitalism/M
+capitalist/SM
+capitalistic
+capitalistically
+capitalization/M
+capitalize/ADSG
+capitation/CSM
+capitol/SM
+capitulate/ADSXGN
+capitulation/AM
+caplet/MS
+capo/SM
+capon/MS
+capped/UA
+capping/UA
+cappuccino/SM
+caprice/SM
+capricious/PY
+capriciousness/M
+capsicum/SM
+capsize/DSG
+capstan/SM
+capstone/MS
+capsular
+capsule/DSMG
+capsulize/DSG
+capt
+captain/SMDG
+captaincy/SM
+caption/SMDG
+captious/YP
+captiousness/M
+captivate/DSGN
+captivation/M
+captivator/SM
+captive/SM
+captivity/SM
+captor/MS
+capture/ADSMG
+car/SMDRZG
+carafe/MS
+caramel/SM
+caramelize/DSG
+carapace/SM
+carat/MS
+caravan/SM
+caravansary/SM
+caravel/SM
+caraway/SM
+carbide/SM
+carbine/SM
+carbohydrate/SM
+carbolic
+carbon/MS
+carbonaceous
+carbonate/MGNDS
+carbonation/M
+carboniferous
+carbonize/GDS
+carborundum/M
+carboy/MS
+carbs
+carbuncle/SM
+carbuncular
+carburetor/SM
+carcass/MS
+carcinogen/SM
+carcinogenic/MS
+carcinogenicity/M
+carcinoma/MS
+card/ESGMD
+cardamom/SM
+cardamon/S
+cardboard/M
+carder/MS
+cardholder/S
+cardiac
+cardie/S
+cardigan/SM
+cardinal/SMY
+cardio
+cardiogram/SM
+cardiograph/M
+cardiographs
+cardiologist/MS
+cardiology/M
+cardiomyopathy
+cardiopulmonary
+cardiovascular
+cardsharp/MRZS
+cardsharper/M
+care/SM
+careen/DGS
+career/MDGS
+careerism
+careerist/SM
+carefree
+careful/YP
+carefuller
+carefullest
+carefulness/M
+caregiver/SM
+careless/PY
+carelessness/M
+carer/M
+caress/MDSG
+caret/MS
+caretaker/MS
+careworn
+carfare/M
+cargo/M
+cargoes
+carhop/MS
+caribou/SM
+caricature/MGDS
+caricaturist/SM
+caries/M
+carillon/SM
+caring/M
+carious
+carjack/JSDRZG
+carjacker/M
+carjacking/M
+carload/SM
+carmaker/S
+carmine/SM
+carnage/M
+carnal/Y
+carnality/M
+carnation/IMS
+carnelian/MS
+carnival/MS
+carnivora
+carnivore/SM
+carnivorous/PY
+carnivorousness/M
+carny/SM
+carob/MS
+carol/ZGMDRS
+caroler/M
+carom/GMDS
+carotene/M
+carotid/SM
+carousal/SM
+carouse/DRSMZG
+carousel/SM
+carouser/M
+carp/SZGMDR
+carpal/MS
+carpel/MS
+carpenter/MDGS
+carpentry/M
+carper/M
+carpet/MDGS
+carpetbag/MS
+carpetbagged
+carpetbagger/MS
+carpetbagging
+carpeting/M
+carpi
+carpool/SMDG
+carport/SM
+carpus/M
+carrel/MS
+carriage/SM
+carriageway/S
+carrier/M
+carrion/M
+carrot/MS
+carroty
+carry/ZGDRSM
+carryall/SM
+carrycot/S
+carryout
+carryover/MS
+carsick/P
+carsickness/M
+cart/SZGMDR
+cartage/M
+cartel/MS
+carter/M
+carthorse/SM
+cartilage/SM
+cartilaginous
+cartload/SM
+cartographer/SM
+cartographic
+cartography/M
+carton/MS
+cartoon/SMDG
+cartoonist/MS
+cartridge/MS
+cartwheel/GMDS
+carve/JZGDRS
+carver/M
+carvery/S
+carving/M
+caryatid/MS
+casaba/MS
+cascade/DSMG
+cascara/SM
+case/LDSJMG
+casebook/S
+cased/U
+caseharden/DGS
+casein/M
+caseload/MS
+casement/MS
+casework/ZMR
+caseworker/M
+cash/GMDS
+cashback/M
+cashbook/MS
+cashew/MS
+cashier/GSMD
+cashless
+cashmere/M
+casing/M
+casino/MS
+cask/SM
+casket/MS
+cassava/SM
+casserole/DSMG
+cassette/MS
+cassia/MS
+cassock/SM
+cassowary/SM
+cast/ASGM
+castanet/MS
+castaway/MS
+caste/JMZRS
+castellated
+caster/M
+castigate/DSGN
+castigation/M
+castigator/SM
+casting/AM
+castle/MGDS
+castoff/SM
+castor/MS
+castrate/GNXDS
+castration/M
+casual/PMYS
+casualness/M
+casualty/SM
+casuist/SM
+casuistic
+casuistry/M
+cat/SM
+cataclysm/MS
+cataclysmal
+cataclysmic
+catacomb/SM
+catafalque/MS
+catalepsy/M
+cataleptic/MS
+catalog/ZGSMDR
+cataloger/M
+catalpa/SM
+catalyses
+catalysis/M
+catalyst/MS
+catalytic/M
+catalyze/GDS
+catamaran/SM
+catapult/GMDS
+cataract/MS
+catarrh/M
+catastrophe/MS
+catastrophic
+catastrophically
+catatonia/M
+catatonic/SM
+catbird/SM
+catboat/SM
+catcall/GSMD
+catch/ZGJLMRS
+catchall/MS
+catcher/M
+catchment/MS
+catchpenny
+catchphrase/SM
+catchword/MS
+catchy/RT
+catechism/SM
+catechist/SM
+catechize/DSG
+categorical/Y
+categorization/MS
+categorize/GDS
+category/SM
+cater/ZGJDRS
+catercorner
+caterer/M
+caterpillar/MS
+caterwaul/SMDG
+catfish/MS
+catgut/M
+catharses
+catharsis/M
+cathartic/SM
+cathedral/SM
+catheter/SM
+catheterize/DSG
+cathode/SM
+cathodic
+catholic
+catholicity/M
+cation/MS
+catkin/MS
+catlike
+catnap/MS
+catnapped
+catnapping
+catnip/M
+catsuit/S
+cattail/SM
+catted
+cattery/S
+cattily
+cattiness/M
+catting
+cattle/M
+cattleman/M
+cattlemen
+catty/TPR
+catwalk/SM
+caucus/MDSG
+caudal/Y
+caught/U
+cauldron/MS
+cauliflower/SM
+caulk/ZGMDRS
+caulker/M
+causal/Y
+causality/SM
+causation/M
+causative
+cause/MZGDRS
+causeless
+causer/M
+causerie/SM
+causeway/SM
+caustic/SM
+caustically
+causticity/M
+cauterization/M
+cauterize/GDS
+caution/SMDG
+cautionary
+cautious/IY
+cautiousness/M
+cavalcade/MS
+cavalier/SMY
+cavalry/SM
+cavalryman/M
+cavalrymen
+cave/DRSMZG
+caveat/MS
+caveman/M
+cavemen
+cavern/MS
+cavernous/Y
+caviar/M
+cavil/ZGJMDRS
+caviler/M
+caving/M
+cavitation
+cavity/FSM
+cavort/DGS
+caw/SMDG
+cay/CSM
+cayenne/M
+cayuse/MS
+cc
+cease/CMGDS
+ceasefire/MS
+ceaseless/YP
+ceaselessness/M
+ceca
+cecal
+cecum/M
+cedar/MS
+cede/FAGSD
+ceder/MS
+cedilla/SM
+ceilidh
+ceilidhs
+ceiling/MS
+celandine/M
+celeb/S
+celebrant/SM
+celebrate/DSGNX
+celebration/M
+celebrator/SM
+celebratory
+celebrity/SM
+celeriac
+celerity/M
+celery/M
+celesta/MS
+celestial/Y
+celibacy/M
+celibate/MS
+cell/SMD
+cellar/MS
+cellist/SM
+cellmate/SM
+cello/MS
+cellophane/M
+cellphone/MS
+cellular/SM
+cellulite/M
+cellulitis
+celluloid/M
+cellulose/M
+cement/MDRZGS
+cementer/M
+cementum/M
+cemetery/SM
+cenobite/MS
+cenobitic
+cenotaph/M
+cenotaphs
+censer/MS
+censor/MDGS
+censored/U
+censorial
+censorious/PY
+censoriousness/M
+censorship/M
+censure/BDRSMZG
+censurer/M
+census/MDSG
+cent/SZMR
+centaur/SM
+centavo/SM
+centenarian/MS
+centenary/SM
+centennial/MYS
+center/MDG
+centerboard/SM
+centerfold/MS
+centerpiece/MS
+centigrade
+centigram/SM
+centiliter/MS
+centime/SM
+centimeter/MS
+centipede/SM
+central/SMY
+centralism
+centralist
+centrality/M
+centralization/CM
+centralize/CGDS
+centralizer/MS
+centrifugal/Y
+centrifuge/DSMG
+centripetal/Y
+centrism/M
+centrist/MS
+centurion/SM
+century/SM
+cephalic
+ceramic/SM
+ceramicist/SM
+ceramics/M
+ceramist/MS
+cereal/MS
+cerebellar
+cerebellum/SM
+cerebra
+cerebral
+cerebrate/GNDS
+cerebration/M
+cerebrovascular
+cerebrum/MS
+cerement/MS
+ceremonial/SMY
+ceremonious/UY
+ceremoniousness/M
+ceremony/SM
+cerise/M
+cerium/M
+cermet/M
+cert/S
+certain/UY
+certainty/USM
+certifiable
+certifiably
+certificate/MGNXDS
+certification/M
+certify/DSG
+certitude/IM
+certitudes
+cerulean/M
+cervical
+cervices
+cervix/M
+cesarean/MS
+cesium/M
+cessation/MS
+cession/KAFSM
+cesspit/S
+cesspool/MS
+cetacean/MS
+ceteris
+cf
+cg
+ch/IFVT
+chad/S
+chafe/GDS
+chaff/GMDS
+chaffinch/MS
+chagrin/GSMD
+chain's
+chain/UGDS
+chainsaw/MDGS
+chair/GMDS
+chairlift/MS
+chairman/M
+chairmanship/SM
+chairmen
+chairperson/SM
+chairwoman/M
+chairwomen
+chaise/MS
+chalcedony/M
+chalet/MS
+chalice/SM
+chalk/GMDS
+chalkboard/SM
+chalkiness/M
+chalky/PRT
+challenge/DRSMZG
+challenged/U
+challenger/M
+challis/M
+chamber/SMD
+chamberlain/MS
+chambermaid/MS
+chambray/M
+chameleon/SM
+chamois/M
+chamomile/MS
+champ/ZGMDS
+champagne/MS
+champion/GMDS
+championship/MS
+chance/MGDS
+chancel/SM
+chancellery/SM
+chancellor/MS
+chancellorship/M
+chancery/SM
+chanciness/M
+chancre/SM
+chancy/PRT
+chandelier/SM
+chandler/MS
+change/MZGDRS
+changeability/M
+changeable/P
+changeableness/M
+changeably
+changed/U
+changeless/Y
+changeling/SM
+changeover/SM
+changer/M
+changing/U
+channel/GSMD
+channelization/M
+channelize/DSG
+chanson/SM
+chant/ZGMDRS
+chanter/M
+chanteuse/MS
+chantey/SM
+chanticleer/MS
+chaos/M
+chaotic
+chaotically
+chap/SM
+chaparral/SM
+chapati/S
+chapatti/S
+chapbook/MS
+chapeau/SM
+chapel/MS
+chaperon/MDGS
+chaperonage/M
+chaperoned/U
+chaplain/MS
+chaplaincy/SM
+chaplet/SM
+chapped
+chapping
+chappy/S
+chapter/SM
+char/SM
+charabanc/MS
+character/MS
+characterful
+characteristic/SM
+characteristically/U
+characterization/MS
+characterize/DSG
+characterless
+charade/SM
+charbroil/GDS
+charcoal/MS
+chard/M
+chardonnay/SM
+charge/AESDGM
+chargeable/A
+charged/U
+charger/SM
+charily
+chariness/M
+chariot/SM
+charioteer/MS
+charisma/M
+charismatic/MS
+charitable/P
+charitableness/M
+charitably/U
+charity/SM
+charlady/S
+charlatan/SM
+charlatanism/M
+charlatanry/M
+charlie/S
+charm/ZGMDRS
+charmer/M
+charming/Y
+charmless
+charred
+charring
+chart/GMDS
+charted/U
+charter's
+charter/ASGD
+charterer/MS
+chartreuse/M
+charwoman/M
+charwomen
+chary/TRP
+chase/MZGDRS
+chaser/M
+chasm/MS
+chassis/M
+chaste/PYTR
+chasten/DGS
+chasteness/M
+chastise/DRSZGL
+chastisement/SM
+chastiser/M
+chastity/M
+chasuble/SM
+chat/SM
+chateau/SM
+chateaux
+chatelaine/SM
+chatline/S
+chatroom/M
+chatted
+chattel/MS
+chatter/MDRZGS
+chatterbox/MS
+chatterer/M
+chattily
+chattiness/M
+chatting
+chatty/TPR
+chauffeur/GMDS
+chauvinism/M
+chauvinist/SM
+chauvinistic
+chauvinistically
+cheap/PXTNRY
+cheapen/DG
+cheapness/M
+cheapo
+cheapskate/MS
+cheat/ZGMDRS
+cheater/M
+check/AGMDS
+checkbook/SM
+checkbox
+checked/U
+checker/MDGS
+checkerboard/SM
+checkers/M
+checklist/MS
+checkmate/MGDS
+checkoff/SM
+checkout/SM
+checkpoint/SM
+checkroom/MS
+checksum
+checkup/MS
+cheddar/M
+cheek/GMDS
+cheekbone/SM
+cheekily
+cheekiness/M
+cheeky/TPR
+cheep/GMDS
+cheer/ZGMDRS
+cheerer/M
+cheerful/YP
+cheerfuller
+cheerfullest
+cheerfulness/M
+cheerily
+cheeriness/M
+cheerio/MS
+cheerleader/SM
+cheerless/PY
+cheerlessness/M
+cheery/TPR
+cheese/MGDS
+cheeseboard/S
+cheeseburger/SM
+cheesecake/SM
+cheesecloth/M
+cheeseparing/M
+cheesiness/M
+cheesy/TPR
+cheetah/M
+cheetahs
+chef/SM
+chem
+chemical/SMY
+chemise/MS
+chemist/MS
+chemistry/M
+chemo/M
+chemotherapeutic
+chemotherapy/M
+chemurgy/M
+chenille/M
+cherish/DSG
+cheroot/MS
+cherry/SM
+chert/M
+cherub/MS
+cherubic
+cherubim
+chervil/M
+chess/M
+chessboard/MS
+chessman/M
+chessmen
+chest/MDS
+chesterfield/SM
+chestful/SM
+chestnut/SM
+chesty/TR
+chevalier/SM
+cheviot/M
+chevron/MS
+chew/SZGMDR
+chewer/M
+chewiness/M
+chewy/PTR
+chg
+chge
+chi/SM
+chiaroscuro/M
+chic/PTMR
+chicane/MS
+chicanery/SM
+chichi/MS
+chick/XMNS
+chickadee/SM
+chicken/MDG
+chickenfeed/M
+chickenhearted
+chickenpox/M
+chickenshit/S!
+chickpea/SM
+chickweed/M
+chicle/M
+chicness/M
+chicory/SM
+chide/GDS
+chiding/Y
+chief/TMRYS
+chiefdom/M
+chieftain/MS
+chieftainship/SM
+chiffon/M
+chiffonier/MS
+chigger/MS
+chignon/MS
+chihuahua/SM
+chilblain/SM
+child/M
+childbearing/M
+childbirth/M
+childbirths
+childcare/M
+childhood/SM
+childish/YP
+childishness/M
+childless/P
+childlessness/M
+childlike
+childminder/S
+childminding
+childproof/GSD
+children/M
+chili/M
+chilies
+chill/JPZTGMDRS
+chiller/M
+chilliness/M
+chilling/Y
+chillness/M
+chilly/TPR
+chime/MZGDRS
+chimer/M
+chimera/MS
+chimeric
+chimerical
+chimney/MS
+chimp/MS
+chimpanzee/SM
+chin/SM
+china/M
+chinaware/M
+chinchilla/MS
+chine/MS
+chink/GMDS
+chinless
+chinned
+chinning
+chino/MS
+chinstrap/MS
+chintz/M
+chintzy/RT
+chinwag/S
+chip/SM
+chipboard
+chipmunk/SM
+chipolata/S
+chipped
+chipper/MS
+chippie
+chipping/S
+chippy/S
+chirography/M
+chiropodist/MS
+chiropody/M
+chiropractic/SM
+chiropractor/SM
+chirp/GMDS
+chirpily
+chirpy/PTR
+chirrup/GMDS
+chisel/ZGMDRS
+chiseler/M
+chit/SM
+chitchat/SM
+chitchatted
+chitchatting
+chitin/M
+chitinous
+chitosan
+chitterlings/M
+chivalrous/PY
+chivalrousness/M
+chivalry/M
+chive/MS
+chivy/GDS
+chlamydia/MS
+chlamydiae
+chloral/M
+chlordane/M
+chloride/MS
+chlorinate/GNDS
+chlorination/M
+chlorine/M
+chlorofluorocarbon/SM
+chloroform/SGMD
+chlorophyll/M
+chloroplast/MS
+chm
+choc/S
+chock/GMDS
+chockablock
+chocoholic/SM
+chocolate/MS
+chocolaty
+choice/MTRS
+choir/MS
+choirboy/MS
+choirmaster/SM
+choke/MZGDRS
+chokecherry/SM
+choker/M
+cholecystectomy
+cholecystitis
+choler/M
+cholera/M
+choleric
+cholesterol/M
+chomp/ZGMDRS
+choose/ZGRS
+chooser/M
+choosiness/M
+choosy/TPR
+chop/SM
+chophouse/SM
+chopped
+chopper/MDGS
+choppily
+choppiness/M
+chopping
+choppy/TPR
+chopstick/SM
+choral/MYS
+chorale/MS
+chord/MS
+chordal
+chordate/SM
+chore/MS
+chorea/M
+choreograph/DRZG
+choreographer/M
+choreographic
+choreographically
+choreographs
+choreography/M
+chorister/SM
+choroid/MS
+chortle/MZGDRS
+chortler/M
+chorus/GMDS
+chose
+chosen
+chow/SGMD
+chowder/MS
+chrism/M
+christen/ASGD
+christening/MS
+christian/U
+christology
+chromatic
+chromatically
+chromatin/M
+chromatography
+chrome/MGDS
+chromium/M
+chromosomal
+chromosome/MS
+chronic
+chronically
+chronicle/DRSMZG
+chronicler/M
+chronograph/M
+chronographs
+chronological/Y
+chronologist/MS
+chronology/SM
+chronometer/SM
+chrysalis/MS
+chrysanthemum/MS
+chub/SM
+chubbiness/M
+chubby/TPR
+chuck/GMDS
+chuckhole/SM
+chuckle/MGDS
+chuffed
+chug/SM
+chugged
+chugging
+chukka/MS
+chum/SM
+chummed
+chummily
+chumminess/M
+chumming
+chummy/PTR
+chump/MS
+chunder/GDS
+chunk/GMDS
+chunkiness/M
+chunky/PTR
+chunter/DGS
+church/MS
+churchgoer/SM
+churchgoing/M
+churchman/M
+churchmen
+churchwarden/MS
+churchwoman
+churchwomen
+churchyard/SM
+churl/MS
+churlish/PY
+churlishness/M
+churn/ZGMDRS
+churner/M
+chute/MS
+chutney/MS
+chutzpah/M
+chyme/M
+chyron/MS
+ciabatta/SM
+ciao/S
+cicada/MS
+cicatrices
+cicatrix/M
+cicerone/SM
+ciceroni
+cider's
+cider/S
+cigar/MS
+cigarette/MS
+cigarillo/MS
+cilantro/M
+cilia
+cilium/M
+cinch/GMDS
+cinchona/SM
+cincture/SM
+cinder/GMDS
+cine
+cinema/MS
+cinematic
+cinematographer/MS
+cinematographic
+cinematography/M
+cinnabar/M
+cinnamon/M
+cipher's
+cipher/CGDS
+cir
+circa
+circadian
+circle/MGDS
+circlet/MS
+circuit/MDGS
+circuital
+circuitous/YP
+circuitousness/M
+circuitry/M
+circuity/M
+circular/SMY
+circularity/M
+circularize/DSG
+circulate/ADSG
+circulation/SM
+circulatory
+circumcise/XDSGN
+circumcised/U
+circumcision/M
+circumference/MS
+circumferential
+circumflex/MS
+circumlocution/MS
+circumlocutory
+circumnavigate/XGNDS
+circumnavigation/M
+circumpolar
+circumscribe/GDS
+circumscription/MS
+circumspect/Y
+circumspection/M
+circumstance/MGDS
+circumstantial/Y
+circumvent/DSG
+circumvention/M
+circus/MS
+cirque/MS
+cirrhosis/M
+cirrhotic/SM
+cirri
+cirrus/M
+cis
+cisgender
+cistern/MS
+cit
+citadel/MS
+citation/AMS
+cite's
+cite/IAGSD
+citified
+citizen/MS
+citizenry/M
+citizenship/M
+citric
+citron/MS
+citronella/M
+citrus/MS
+city/SM
+citywide
+civet/MS
+civic/S
+civically
+civics/M
+civil/UY
+civilian/MS
+civility/ISM
+civilization/MS
+civilize/GDS
+civilized/U
+civvies/M
+ck
+cl
+clack/GMDS
+clad/U
+cladding/M
+clade
+claim's
+claim/CKEAGDS
+claimable/A
+claimant/MS
+claimed/U
+claimer/ECSM
+clairvoyance/M
+clairvoyant/MS
+clam/SM
+clambake/MS
+clamber/ZGMDRS
+clamberer/M
+clammed
+clammily
+clamminess/M
+clamming
+clammy/PTR
+clamor/GMDS
+clamorous
+clamp/GMDS
+clampdown/MS
+clan/SM
+clandestine/Y
+clang/ZGMDRS
+clangor/M
+clangorous/Y
+clank/GMDS
+clannish/P
+clannishness/M
+clansman/M
+clansmen
+clanswoman
+clanswomen
+clap/SM
+clapboard/MDGS
+clapped
+clapper/MS
+clapperboard/S
+clapping/M
+claptrap/M
+claque/MS
+claret/MS
+clarification/M
+clarify/XDSNG
+clarinet/SM
+clarinetist/SM
+clarion/MDGS
+clarity/M
+clash/GMDS
+clasp's
+clasp/UGDS
+class/GMDS
+classic/MS
+classical/MY
+classicism/M
+classicist/MS
+classifiable
+classification/CAM
+classifications
+classified's
+classified/U
+classifieds
+classifier/MS
+classify/ACSDGN
+classiness/M
+classism
+classless/P
+classmate/MS
+classroom/MS
+classwork/M
+classy/TRP
+clatter/GMDS
+clausal
+clause/MS
+claustrophobia/M
+claustrophobic
+clavichord/SM
+clavicle/MS
+clavier/MS
+claw's
+claw/CSGD
+clay/M
+clayey
+clayier
+clayiest
+clean/BJPZTGDRYS
+cleaner/M
+cleaning/M
+cleanliness/UM
+cleanly/UTPR
+cleanness/UM
+cleanse/ZGDRS
+cleanser/M
+cleanup/MS
+clear/JPTGMDRYS
+clearance/SM
+clearheaded
+clearing/M
+clearinghouse/SM
+clearness/M
+clearway/S
+cleat/MS
+cleavage/MS
+cleave/ZGDRS
+cleaver/M
+clef/SM
+cleft/MS
+clematis/MS
+clemency/IM
+clement/Y
+clementine/S
+clench/GMDS
+clerestory/SM
+clergy/SM
+clergyman/M
+clergymen
+clergywoman/M
+clergywomen
+cleric/MS
+clerical/Y
+clericalism/M
+clerk/GMDS
+clerkship/M
+clever/PTRY
+cleverness/M
+clevis/MS
+clew/SGMD
+cliche/MDS
+click/BZGMDRS
+clickbait
+clicker/M
+client/MS
+clientele/MS
+cliff/MS
+cliffhanger/SM
+cliffhanging
+clifftop/S
+clii
+climacteric/M
+climactic
+climate/SM
+climatic
+climatically
+climatologist/SM
+climatology/M
+climax/MDSG
+climb/SMDRZGB
+climber/M
+climbing/M
+clime/SM
+clinch/MDRSZG
+clincher/M
+cling/SMRZG
+clinger/M
+clingfilm
+clingy/RT
+clinic/SM
+clinical/Y
+clinician/SM
+clink/SMDRZG
+clinker/M
+cliometric/S
+cliometrician/MS
+cliometrics/M
+clip/SM
+clipboard/MS
+clipped
+clipper/SM
+clipping/SM
+clique/SM
+cliquey
+cliquish/YP
+cliquishness/M
+clit/SM
+clitoral
+clitorides
+clitoris/MS
+clix
+cloaca/M
+cloacae
+cloak's
+cloak/USDG
+cloakroom/MS
+clobber/SMDG
+cloche/SM
+clock/SMDG
+clockwise
+clockwork/SM
+clod/MS
+cloddish
+clodhopper/MS
+clog's
+clog/US
+clogged/U
+clogging/U
+cloisonne/M
+cloister/SMDG
+cloistral
+clomp/SDG
+clonal
+clone/DSMG
+clonidine
+clonk/SMDG
+clop/MS
+clopped
+clopping
+close/DRSMYTGJP
+closefisted
+closemouthed
+closeness/M
+closeout/MS
+closet/SMDG
+closeup/SM
+closing/M
+closure/ESM
+clot/MS
+cloth/M
+clothe/UDSG
+clotheshorse/MS
+clothesline/SM
+clothespin/SM
+clothier/MS
+clothing/M
+cloths
+clotted
+clotting
+cloture/SM
+cloud/SMDG
+cloudburst/SM
+clouded/U
+cloudiness/M
+cloudless
+cloudy/RPT
+clout/SMDG
+clove/RSMZ
+cloven
+clover/M
+cloverleaf/SM
+cloverleaves
+clown/SMDG
+clownish/YP
+clownishness/M
+cloy/DGS
+cloying/Y
+club/MS
+clubbable
+clubbed
+clubber/S
+clubbing
+clubfeet
+clubfoot/MD
+clubhouse/SM
+clubland
+cluck/SMDG
+clue/MGDS
+clueless
+clump/SMDG
+clumpy/TR
+clumsily
+clumsiness/M
+clumsy/TRP
+clung
+clunk/SMDRZG
+clunker/M
+clunky/TR
+cluster/MDSG
+clutch/GMDS
+clutter's
+clutter/UDSG
+clvi
+clvii
+clxi
+clxii
+clxiv
+clxix
+clxvi
+clxvii
+cm
+cnidarian/MS
+co/ESD
+coach/MDSG
+coachload/S
+coachman/M
+coachmen
+coachwork
+coadjutor/MS
+coagulant/MS
+coagulate/GNDS
+coagulation/M
+coagulator/MS
+coal/MDGS
+coalesce/GDS
+coalescence/M
+coalescent
+coalface/MS
+coalfield/S
+coalition/MS
+coalitionist/MS
+coalmine/S
+coarse/RYTP
+coarsen/SDG
+coarseness/M
+coast/SMDRZG
+coastal
+coaster/M
+coastguard/S
+coastline/MS
+coat/MDGJS
+coating/M
+coatroom/S
+coattail/SM
+coauthor/MDGS
+coax/DRSZG
+coaxer/M
+coaxial
+coaxing/Y
+cob/SM
+cobalt/M
+cobber/S
+cobble/DRSMZG
+cobbler/M
+cobblestone/SM
+cobnut/S
+cobra/SM
+cobweb/SM
+cobwebbed
+cobwebby/RT
+coca/M
+cocaine/M
+cocci/S
+coccus/M
+coccyges
+coccyx/M
+cochineal/M
+cochlea/SM
+cochleae
+cochlear
+cock/MDGS
+cockade/SM
+cockamamie
+cockatiel/MS
+cockatoo/SM
+cockatrice/SM
+cockchafer/S
+cockcrow/SM
+cockerel/SM
+cockeyed
+cockfight/MGS
+cockfighting/M
+cockily
+cockiness/M
+cockle/SM
+cockleshell/SM
+cockney/SM
+cockpit/SM
+cockroach/MS
+cockscomb/SM
+cocksucker/MS!
+cocksure
+cocktail/MS
+cocky/RTP
+coco/MS
+cocoa/SM
+coconut/SM
+cocoon/SMDG
+cod/SM
+coda/MS
+codded
+codding
+coddle/DSG
+code's
+code/CZGDRS
+codeine/M
+codependency/M
+codependent/SM
+coder/CM
+codex/M
+codfish/MS
+codger/SM
+codices
+codicil/SM
+codification/M
+codifier/M
+codify/XDRSNZG
+codon/S
+codpiece/MS
+codswallop
+coed/MS
+coeducation/M
+coeducational
+coefficient/MS
+coelenterate/MS
+coenzyme
+coequal/MYS
+coerce/DRSZGNV
+coercer/M
+coercion/M
+coeval/SMY
+coexist/DSG
+coexistence/M
+coexistent
+coextensive
+coffee/SM
+coffeecake/SM
+coffeehouse/MS
+coffeemaker/SM
+coffeepot/MS
+coffer/SM
+cofferdam/MS
+coffin/SMDG
+cog/SM
+cogency/M
+cogent/Y
+cogitate/DSXGNV
+cogitation/M
+cogitator/MS
+cognac/SM
+cognate/MS
+cognition/AM
+cognitional
+cognitive/Y
+cognizable
+cognizance/AM
+cognizant
+cognomen/SM
+cognoscente/M
+cognoscenti
+cogwheel/SM
+cohabit/SGD
+cohabitant/MS
+cohabitation/M
+coheir/SM
+cohere/DSG
+coherence/IM
+coherency/M
+coherent/IY
+cohesion/M
+cohesive/YP
+cohesiveness/M
+coho/MS
+cohort/SM
+coif/MS
+coiffed
+coiffing
+coiffure/DSMG
+coil's/A
+coil/UADGS
+coin/MDRZGS
+coinage/SM
+coincide/DSG
+coincidence/MS
+coincident
+coincidental/Y
+coiner/M
+coinsurance/M
+coir
+coital
+coitus/M
+coke/MGDS
+col/S
+cola/MS
+colander/SM
+cold/MRYTPS
+coldblooded
+coldness/M
+coleslaw/M
+coleus/MS
+coley/S
+colic/M
+colicky
+coliseum/MS
+colitis/M
+coll
+collaborate/DSXGNV
+collaboration/M
+collaborationist
+collaborative/Y
+collaborator/MS
+collage/SM
+collagen
+collapse/MGDS
+collapsible
+collar/SMDG
+collarbone/SM
+collard/SM
+collarless
+collate/DSXGN
+collateral/MY
+collateralize
+collation/M
+collator/MS
+colleague/MS
+collect's
+collect/ASGVD
+collected/U
+collectedly
+collectible/SM
+collection/AMS
+collective/MYS
+collectivism/M
+collectivist/SM
+collectivization/M
+collectivize/DSG
+collector/MS
+colleen/SM
+college/SM
+collegiality/M
+collegian/MS
+collegiate
+collide/DRSZG
+collie/RSMZ
+collier/M
+colliery/SM
+collision/SM
+collocate/MGNDSX
+collocation/M
+colloid/SM
+colloidal
+colloq
+colloquial/Y
+colloquialism/SM
+colloquies
+colloquium/MS
+colloquy/M
+collude/DSG
+collusion/M
+collusive
+cologne/SM
+colon/SM
+colonel/SM
+colonelcy/M
+colones
+colonial/SMY
+colonialism/M
+colonialist/MS
+colonist/SM
+colonization/ACM
+colonize/CAGSD
+colonizer/MS
+colonnade/MDS
+colonoscopy/SM
+colony/SM
+colophon/SM
+color's
+color/AEGDS
+colorant/SM
+coloration/EM
+coloratura/MS
+colorblind/P
+colorblindness/M
+colored's
+colored/U
+coloreds
+colorfast/P
+colorfastness/M
+colorful/PY
+colorfulness/M
+coloring's
+colorist/S
+colorization/M
+colorize/DSG
+colorless/PY
+colorlessness/M
+colorway/S
+colossal/Y
+colossi
+colossus/M
+colostomy/SM
+colostrum/M
+colt/MS
+coltish
+columbine/SM
+column/SMD
+columnar
+columnist/SM
+com/JL
+coma/MS
+comaker/SM
+comatose
+comb/MDRZGJS
+combat/SMDGV
+combatant/SM
+combativeness/M
+combed/U
+comber/M
+combination/SM
+combine's
+combine/ADSG
+combined/U
+combiner/MS
+combings/M
+combo/SM
+combust/SGVD
+combustibility/M
+combustible/MS
+combustion/M
+come/IMZGRS
+comeback/MS
+comedian/MS
+comedic
+comedienne/MS
+comedown/MS
+comedy/SM
+comeliness/M
+comely/RPT
+comer's
+comestible/SM
+comet/SM
+comeuppance/SM
+comfit's
+comfit/ES
+comfort/ESMDG
+comfortable/P
+comfortableness/M
+comfortably/U
+comforter/MS
+comforting/Y
+comfortless
+comfy/RT
+comic/SM
+comical/Y
+comicality/M
+coming/M
+comity/M
+comm
+comma/SM
+command/SMDRLZG
+commandant/MS
+commandeer/GDS
+commander/M
+commandment/MS
+commando/SM
+commemorate/XGNVDS
+commemoration/M
+commemorator/MS
+commence/ADSLG
+commencement/AM
+commencements
+commend/ASDBG
+commendably
+commendation/AMS
+commendatory
+commensurable
+commensurate/IY
+comment/GSMD
+commentary/SM
+commentate/DSG
+commentator/SM
+commerce/M
+commercial/SMY
+commercialism/M
+commercialization/M
+commercialize/GDS
+commie/SM
+commingle/DSG
+commiserate/GNVDSX
+commiseration/M
+commissar/SM
+commissariat/SM
+commissary/SM
+commission's
+commission/ACSGD
+commissionaire/S
+commissioner/SM
+commit/AS
+commitment/MS
+committal/SM
+committed/AU
+committee/SM
+committeeman/M
+committeemen
+committeewoman/M
+committeewomen
+committer/S
+committing/A
+commode's
+commode/EIS
+commodification
+commodious/Y
+commodity/SM
+commodore/SM
+common's
+common/UPRYT
+commonality/S
+commonalty/M
+commoner/MS
+commonness/UM
+commonplace/MS
+commons
+commonsense
+commonweal/MH
+commonwealth/M
+commonwealths
+commotion/SM
+communal/Y
+commune/XDSMGN
+communicability/M
+communicable/I
+communicably
+communicant/MS
+communicate/GNVDSX
+communication/M
+communicative/U
+communicator/SM
+communion/M
+communique/SM
+communism/M
+communist/SM
+communistic
+community/SM
+commutation/MS
+commutative
+commutativity
+commutator/SM
+commute/BDRSMZG
+commuter/M
+comorbidity
+comp/MDYGS
+compact/TGSMDRYP
+compaction
+compactness/M
+compactor/SM
+companion/SBM
+companionably
+companionship/M
+companionway/MS
+company/SM
+comparability/M
+comparable/I
+comparably/I
+comparative/MYS
+compare/BDSG
+comparison/MS
+compartment/SM
+compartmental
+compartmentalization/M
+compartmentalize/DSG
+compass/GMDS
+compassion/M
+compassionate/Y
+compatibility/IM
+compatible/IMS
+compatibly/I
+compatriot/MS
+compeer/SM
+compel/S
+compelled
+compelling/Y
+compendious
+compendium/SM
+compensate/DSXGN
+compensated/U
+compensation/M
+compensatory
+compere/DSG
+compete/DSG
+competence/IM
+competences
+competencies
+competency/IM
+competent/IY
+competition/SM
+competitive/PY
+competitiveness/M
+competitor/SM
+compilation/SM
+compile/DRSZG
+compiler/M
+complacence/M
+complacency/M
+complacent/Y
+complain/DRZGS
+complainant/MS
+complainer/M
+complaint/SM
+complaisance/M
+complaisant/Y
+complected
+complement/SGMD
+complementary
+complete/PYTGNXDRS
+completed/U
+completeness/IM
+completion/M
+complex/MSY
+complexion/MDS
+complexional
+complexity/SM
+compliance/M
+compliant/Y
+complicate/GDS
+complicated/Y
+complication/M
+complicit
+complicity/M
+compliment/MDGS
+complimentary/U
+comply/NDSXG
+compo/S
+component/SM
+comport/LSGD
+comportment/M
+compose/AECGSD
+composedly
+composer/MS
+composite/MYGNXDS
+composition/CM
+compositional
+compositor/SM
+compost/SGMD
+composure/EM
+compote/SM
+compound/GMDBS
+compounded/U
+comprehend/SDG
+comprehensibility/IM
+comprehensible/I
+comprehensibly/I
+comprehension/IM
+comprehensions
+comprehensive/PMYS
+comprehensiveness/M
+compress's
+compress/CGVDS
+compressed/U
+compressible
+compression/CM
+compressor/SM
+comprise/GDS
+compromise/MGDS
+comptroller/MS
+compulsion/MS
+compulsive/YP
+compulsiveness/M
+compulsorily
+compulsory/SM
+compunction/SM
+computation/SM
+computational/Y
+compute/ADSG
+computer/MS
+computerate
+computerization/M
+computerize/GDS
+computing/M
+comrade/SMY
+comradeship/M
+con/GSM
+concatenate/XDSGN
+concatenation/M
+concave/YP
+concaveness/M
+conceal/SDRZGBL
+concealed/U
+concealer/M
+concealment/M
+conceit/SMD
+conceited/PY
+conceitedness/M
+conceivable/I
+conceivably/I
+conceive/DSGB
+concentrate/DSMGNX
+concentration/M
+concentric
+concentrically
+concept/SM
+conception/SM
+conceptional
+conceptual/Y
+conceptualization/MS
+conceptualize/DSG
+concern/UMD
+concerned/UY
+concerning
+concerns
+concert's
+concert/ESDG
+concerted/Y
+concertgoer/S
+concertina/SGMD
+concertize/DSG
+concertmaster/MS
+concerto/SM
+concessionaire/MS
+concessional
+concessionary
+conch/M
+conchie/S
+conchs
+concierge/MS
+conciliate/DSGN
+conciliation/AM
+conciliator/SM
+conciliatory
+concise/RPYTN
+conciseness/M
+concision/M
+conclave/SM
+conclude/DSG
+conclusion/MS
+conclusive/IYP
+conclusiveness/IM
+concoct/SDG
+concoction/MS
+concomitant/MYS
+concord/M
+concordance/SM
+concordant
+concordat/SM
+concourse/SM
+concrete/DSPMYGNX
+concreteness/M
+concretion/M
+concubinage/M
+concubine/MS
+concupiscence/M
+concupiscent
+concur/S
+concurred
+concurrence/SM
+concurrency
+concurring
+concuss/V
+concussion/SM
+condemn/SDRZG
+condemnation/MS
+condemnatory
+condemner/M
+condensate/MNXS
+condensation/M
+condense/DRSZG
+condenser/M
+condescending/Y
+condescension/M
+condign
+condiment/MS
+condition's
+condition/AGSD
+conditional/SMY
+conditionality
+conditioned/U
+conditioner/SM
+conditioning/M
+condo/SM
+condolence/SM
+condom/SM
+condominium/MS
+condone/DSG
+condor/SM
+conduce/DSGV
+conduct/MDGV
+conductance/M
+conductibility/M
+conductible
+conduction/M
+conductivity/M
+conductor/MS
+conductress/MS
+conduit/SM
+cone/M
+coneys
+confab/SM
+confabbed
+confabbing
+confabulate/XDSGN
+confabulation/M
+confection/SZMR
+confectioner/M
+confectionery/SM
+confederacy/SM
+confederate/M
+confer/S
+conferee/SM
+conference/MGS
+conferrable
+conferral/M
+conferred
+conferrer/MS
+conferring
+confessed/Y
+confession/SM
+confessional/SM
+confessor/MS
+confetti/M
+confidant/MS
+confidante/SM
+confide/DRSZG
+confidence/SM
+confident/Y
+confidential/Y
+confidentiality/M
+confider/M
+confiding/Y
+configuration/S
+configure/B
+confined/U
+confinement/MS
+confirm/ASDG
+confirmation/ASM
+confirmatory
+confirmed/U
+confiscate/DSGNX
+confiscation/M
+confiscator/SM
+confiscatory
+conflagration/MS
+conflate/XDSGN
+conflation/M
+conflict/SGMD
+confluence/MS
+confluent
+conform/ZB
+conformable/U
+conformal
+conformance/M
+conformism/M
+conformist/SM
+conformity/M
+confrere/MS
+confrontation/SM
+confrontational
+confuse/RZ
+confused/Y
+confusing/Y
+confutation/M
+confute/DSG
+conga/SMDG
+congeal/SLDG
+congealment/M
+conger/SM
+congeries/M
+congest/SDGV
+congestion/M
+conglomerate/DSXMGN
+conglomeration/M
+congrats/M
+congratulate/XGNDS
+congratulation/M
+congratulatory
+congregant/MS
+congregate/GNDSX
+congregation/M
+congregational
+congregationalism/M
+congregationalist/MS
+congress/MS
+congressional
+congressman/M
+congressmen
+congresspeople
+congressperson/MS
+congresswoman/M
+congresswomen
+congruence/M
+congruent/Y
+congruity/ISM
+congruous
+conic/SM
+conical/Y
+conifer/SM
+coniferous
+conjectural
+conjecture/MGDS
+conjoint
+conjugal/Y
+conjugate/DSXGN
+conjugation/M
+conjunct/VMS
+conjunctiva/SM
+conjunctive/SM
+conjunctivitis/M
+conjuration/MS
+conjure/DRSZG
+conjurer/M
+conk/MDRZ
+conman
+connect/AEDVGS
+connectable
+connected/U
+connection/EMS
+connective/MS
+connectivity/M
+connector/MS
+conned
+conning
+conniption/MS
+connivance/M
+connive/DRSZG
+conniver/M
+connoisseur/SM
+connotative
+connubial
+conquer/ASDG
+conquerable/U
+conquered/U
+conqueror/MS
+conquest/AM
+conquistador/SM
+cons/DSG
+consanguineous
+consanguinity/M
+conscienceless
+conscientious/PY
+conscientiousness/M
+conscious/UYP
+consciousness/UM
+consciousnesses
+conscription/M
+consecrate/ADSGN
+consecrated/U
+consecration/AM
+consecrations
+consecutive/Y
+consensual
+consensus/MS
+consent/SMDG
+consequence/SM
+consequent/Y
+consequential/IY
+conservancy/SM
+conservation/M
+conservationism/M
+conservationist/SM
+conservatism/M
+conservative/MYS
+conservatoire/S
+conservator/SM
+conservatory/SM
+consider/AGSD
+considerable/I
+considerably
+considerate/IPYN
+considerateness/IM
+consideration/AIM
+considerations
+considered/U
+consign/ASDG
+consignee/MS
+consignment/MS
+consist/SDG
+consistence/MS
+consistency/ISM
+consistent/IY
+consistory/SM
+consolable/I
+consolation/MS
+consolatory
+consolidate/XDSGN
+consolidated/U
+consolidation/M
+consolidator/MS
+consoling/Y
+consomme/M
+consonance/SM
+consonant/SMY
+consortia
+consortium/M
+conspectus/MS
+conspicuous/IPY
+conspicuousness/IM
+conspiracy/SM
+conspirator/MS
+conspiratorial/Y
+conspire/GD
+constable/SM
+constabulary/SM
+constancy/IM
+constant/MYS
+constellation/SM
+consternation/M
+constipate/GNDS
+constipation/M
+constituency/SM
+constituent/SM
+constitute/ADSGNV
+constitution/AM
+constitutional/MYS
+constitutionalism
+constitutionality/UM
+constitutions
+constrained/U
+constraint/SM
+constrict/GVSD
+constriction/SM
+constrictor/SM
+construable
+construct's
+construct/CADVGS
+construction/CAMS
+constructional
+constructionist's
+constructionist/CS
+constructive/YP
+constructiveness/M
+constructor/MS
+construe/GDS
+consul/KSM
+consular/K
+consulate/SM
+consulship/M
+consult/GSD
+consultancy/SM
+consultant/MS
+consultation/MS
+consultative
+consumable/SM
+consume/BDRSZG
+consumed/U
+consumer/M
+consumerism/M
+consumerist/MS
+consummate/YGNXDS
+consummated/U
+consumption/M
+consumptive/SM
+cont
+contact/ASDG
+contactable
+contactless
+contagion/MS
+contagious/PY
+contagiousness/M
+contain/SBLDRZG
+container/M
+containerization/M
+containerize/DSG
+containment/M
+contaminant/SM
+contaminate/ACDSG
+contaminated/U
+contamination/CM
+contaminator/SM
+contd
+contemn/SDG
+contemplate/DSGNV
+contemplation/M
+contemplative/SMY
+contemporaneity/M
+contemporaneous/Y
+contempt/M
+contemptible
+contemptibly
+contemptuous/YP
+contemptuousness/M
+contender/MS
+content/ESLMDG
+contented/EY
+contentedness/M
+contention/SM
+contentious/YP
+contentiousness/M
+contently
+contentment/EM
+conterminous/Y
+contestable/I
+contestant/MS
+contested/U
+contextualization
+contextualize/DSG
+contiguity/M
+contiguous/Y
+continence/IM
+continent/SM
+continental/SM
+contingency/SM
+contingent/SMY
+continua
+continual/Y
+continuance/EMS
+continuation/EMS
+continue/EGDS
+continuity/ESM
+continuous/EY
+continuum/M
+contort/GD
+contortion/MS
+contortionist/SM
+contra
+contraband/M
+contrabassoon/S
+contraception/M
+contraceptive/SM
+contract/MDG
+contractible
+contractile
+contractility
+contraction/S
+contractual/Y
+contradict/SDG
+contradiction/SM
+contradictory
+contradistinction/MS
+contraflow/S
+contrail/MS
+contraindicate/GNXDS
+contraindication/M
+contralto/SM
+contraption/SM
+contrapuntal/Y
+contrarian/SM
+contrarianism
+contrariety/M
+contrarily
+contrariness/M
+contrariwise
+contrary/PSM
+contrast/MDGS
+contravene/GDS
+contravention/SM
+contretemps/M
+contribute/XGND
+contribution/M
+contributor/MS
+contributory
+contrition/M
+contrivance/MS
+contrive/ZGDRS
+contriver/M
+control's
+control/CS
+controllable/U
+controlled/UC
+controller/MS
+controlling/C
+controversial/Y
+controversy/SM
+controvert/DSG
+controvertible/I
+contumacious/Y
+contumacy/M
+contumelious
+contumely/SM
+contuse/XDSGN
+contusion/M
+conundrum/SM
+conurbation/MS
+convalesce/DSG
+convalescence/MS
+convalescent/SM
+convection/M
+convectional
+convective
+convector/S
+convene/ADSG
+convener/MS
+convenience/IMS
+convenient/IY
+convent/SM
+conventicle/MS
+convention/SM
+conventional/UY
+conventionality/UM
+conventionalize/GDS
+conventioneer/S
+convergence/MS
+convergent
+conversant
+conversation/MS
+conversational/Y
+conversationalist/SM
+converse/Y
+convert's
+convert/AGSD
+converted/U
+converter/SM
+convertibility/M
+convertible/SM
+convex/Y
+convexity/M
+convey/SBDG
+conveyance/MGS
+conveyor/MS
+convict/GSMD
+conviction/MS
+convince/GDS
+convinced/U
+convincing/UY
+convivial/Y
+conviviality/M
+convoke/DSG
+convoluted
+convolution/MS
+convoy/SMDG
+convulse/GNVXDS
+convulsion/M
+convulsive/Y
+cony/M
+coo/GSMD
+cook's
+cook/ADGS
+cookbook/MS
+cooked/U
+cooker/SM
+cookery/SM
+cookhouse/S
+cookie/SM
+cooking/M
+cookout/SM
+cookware/SM
+cool/MDRYZTGPS
+coolant/SM
+cooler/M
+coolie/SM
+coolness/M
+coon/MS!
+coonskin/MS
+coop/MDRZGS
+cooper/MDG
+cooperage/M
+cooperate/DSGNV
+cooperation/M
+cooperative/PMYS
+cooperativeness/M
+cooperator/SM
+coordinate/DSMYGN
+coordinated/U
+coordination/M
+coordinator/MS
+coot/MS
+cootie/SM
+cop/GJSMD
+copacetic
+copay/M
+cope/MS
+copier/SM
+copilot/SM
+coping/M
+copious/PY
+copiousness/M
+copped
+copper/SM
+copperhead/SM
+copperplate/M
+coppery
+copping
+copra/M
+copse/SM
+copter/SM
+copula/SM
+copulate/GNVDS
+copulation/M
+copulative/SM
+copy's
+copy/ADSG
+copybook/SM
+copycat/MS
+copycatted
+copycatting
+copyist/MS
+copyleft
+copyright/GSMD
+copywriter/MS
+coquetry/SM
+coquette/DSMG
+coquettish/Y
+cor
+coracle/SM
+coral/SM
+corbel/SM
+cord/EASGDM
+cordage/M
+cordial/SMY
+cordiality/M
+cordillera/MS
+cordite/M
+cordless
+cordon/SMDG
+cordovan/M
+corduroy/MS
+corduroys/M
+core/MZGDRS
+coreligionist/S
+corer/M
+corespondent/MS
+corgi/SM
+coriander/M
+cork's
+cork/UDGS
+corkage
+corker/SM
+corkscrew/SMDG
+corm/MS
+cormorant/SM
+corn/MDRZGS
+cornball/MS
+cornbread/M
+corncob/MS
+corncrake/S
+cornea/SM
+corneal
+corner/GMD
+cornerstone/SM
+cornet/SM
+cornfield/S
+cornflakes/M
+cornflour
+cornflower/SM
+cornice/MS
+cornily
+corniness/M
+cornmeal/M
+cornrow/MDGS
+cornstalk/SM
+cornstarch/M
+cornucopia/MS
+corny/PRT
+corolla/MS
+corollary/SM
+corona/SM
+coronal/MS
+coronary/SM
+coronation/SM
+coronavirus/MS
+coroner/MS
+coronet/MS
+corp
+corpora
+corporal/SM
+corporate/XYN
+corporation/IM
+corporatism
+corporeal/Y
+corporeality/M
+corps/MS
+corpse/M
+corpsman/M
+corpsmen
+corpulence/M
+corpulent
+corpus/M
+corpuscle/MS
+corpuscular
+corr
+corral/SM
+corralled
+corralling
+correct/DRYTGVSBP
+corrected/U
+correction/SM
+correctional
+corrective/SM
+correctness/IM
+corrector
+correlate/XDSMGNV
+correlated/U
+correlation/M
+correlational
+correlative/MS
+correspond/SDG
+correspondence/SM
+correspondent/SM
+corresponding/Y
+corridor/SM
+corrie/S
+corroborate/GNVDSX
+corroborated/U
+corroboration/M
+corroborator/SM
+corroboratory
+corrode/GDS
+corrosion/M
+corrosive/SMY
+corrugate/GNXDS
+corrugation/M
+corrupt/DRYPSTG
+corruptibility/IM
+corruptible/I
+corruption/MS
+corruptness/M
+corsage/MS
+corsair/MS
+corset/SGMD
+cortege/MS
+cortex/M
+cortical
+cortices
+cortisol
+cortisone/M
+corundum/M
+coruscate/GNDS
+coruscation/M
+corvette/SM
+cos/M
+cosh/DSG
+cosign/ZGSDR
+cosignatory/SM
+cosigner/M
+cosine/SM
+cosmetic/SM
+cosmetically
+cosmetician/MS
+cosmetologist/MS
+cosmetology/M
+cosmic
+cosmically
+cosmogonist/SM
+cosmogony/SM
+cosmological
+cosmologist/SM
+cosmology/SM
+cosmonaut/SM
+cosmopolitan/MS
+cosmopolitanism/M
+cosmos/MS
+cosplay
+cosponsor/GSMD
+cosset/SGD
+cossetted
+cossetting
+cost/MDYGSJ
+costar/SM
+costarred
+costarring
+costliness/M
+costly/PTR
+costume/MZGDRS
+costumer/M
+costumier/S
+cot/SM
+cotangent/MS
+cote/MS
+coterie/MS
+coterminous
+cotillion/SM
+cottage/MZGRS
+cottager/M
+cottar/SM
+cotter/SM
+cotton/SGMD
+cottonmouth/M
+cottonmouths
+cottonseed/MS
+cottontail/MS
+cottonwood/SM
+cottony
+cotyledon/MS
+couch/MDSG
+couchette/S
+cougar/SM
+cough/MDG
+coughs
+could
+could've
+couldn't
+coulee/SM
+coulis
+coulomb/MS
+council/MS
+councilman/M
+councilmen
+councilor/MS
+councilperson/SM
+councilwoman/M
+councilwomen
+counsel/JMDGS
+counselor/MS
+count/EASMDG
+countable/U
+countably
+countdown/MS
+counted/U
+countenance's
+countenance/EGDS
+counter/EMS
+counteract/SGVD
+counteraction/MS
+counterargument/S
+counterattack/GMDS
+counterbalance/MGDS
+counterblast/S
+counterclaim/GSMD
+counterclockwise
+counterculture/SM
+countered
+counterespionage/M
+counterexample/S
+counterfactual
+counterfeit/ZGMDRS
+counterfeiter/M
+counterfoil/MS
+countering
+counterinsurgency/SM
+counterintelligence/M
+counterman/M
+countermand/GMDS
+countermeasure/SM
+countermelody/S
+countermen
+countermove/S
+counteroffensive/SM
+counteroffer/SM
+counterpane/SM
+counterpart/SM
+counterpetition
+counterpoint/MDGS
+counterpoise/MGDS
+counterproductive
+counterrevolution/SM
+counterrevolutionary/SM
+countersign/GSMD
+countersignature/MS
+countersink/GSM
+counterspy/SM
+counterstroke/SM
+countersunk
+countertenor/MS
+countervail/GSD
+counterweight/MS
+countess/MS
+countless
+countrified
+country/SM
+countryman/M
+countrymen
+countryside/MS
+countrywide
+countrywoman/M
+countrywomen
+county/SM
+countywide
+coup's
+coup/AS
+coupe/SM
+couple's
+couple/UCGSD
+couplet/MS
+coupling/SM
+coupon/SM
+courage/M
+courageous/YP
+courageousness/M
+courgette/S
+courier/MDSG
+course/EDGMS
+coursebook/S
+courser/MS
+coursework
+court/SMDYG
+courteous/EY
+courteousness/M
+courtesan/SM
+courtesy/ESM
+courthouse/MS
+courtier/SM
+courtliness/M
+courtly/PRT
+courtroom/MS
+courtship/MS
+courtyard/MS
+couscous/M
+cousin/SM
+couture/M
+couturier/MS
+covalent
+covariance
+covariant
+cove/MS
+coven/SM
+covenant/MDSG
+cover's
+cover/AEUGDS
+coverage/M
+coverall/MS
+covering's
+coverings
+coverlet/MS
+covert/SPMY
+covertness/M
+covet/SDG
+covetous/YP
+covetousness/M
+covey/SM
+cow/ZGSMDR
+coward/SMY
+cowardice/M
+cowardliness/M
+cowbell/MS
+cowbird/MS
+cowboy/SM
+cowcatcher/MS
+cower/DG
+cowgirl/MS
+cowhand/MS
+cowherd/MS
+cowhide/MS
+cowl/MGSJ
+cowlick/MS
+cowling/M
+cowman/M
+cowmen
+coworker/MS
+cowpat/S
+cowpoke/MS
+cowpox/M
+cowpuncher/SM
+cowrie/SM
+cowshed/S
+cowslip/SM
+cox/GDS
+coxcomb/MS
+coxswain/MS
+coy/TPRY
+coyness/M
+coyote/SM
+coypu/SM
+cozen/SDG
+cozenage/M
+cozily
+coziness/M
+cozy/RSMTP
+cpd
+cpl
+cps
+crab/MS
+crabbed
+crabber/SM
+crabbily
+crabbiness/M
+crabbing
+crabby/PRT
+crabgrass/M
+crablike
+crabwise
+crack/SMDRYZGJ
+crackdown/MS
+cracker/M
+crackerjack/MS
+crackhead/MS
+crackle/DSJMG
+crackling/M
+crackpot/MS
+crackup/SM
+cradle/DSMG
+craft/SMDG
+craftily
+craftiness/M
+craftsman/M
+craftsmanship/M
+craftsmen
+craftspeople
+craftswoman/M
+craftswomen
+crafty/RTP
+crag/MS
+cragginess/M
+craggy/RPT
+cram/S
+crammed
+crammer/S
+cramming
+cramp/SMDG
+cramping/M
+crampon/SM
+cranberry/SM
+crane/DSMG
+cranial
+cranium/SM
+crank/SMDG
+crankcase/SM
+crankily
+crankiness/M
+crankshaft/MS
+cranky/PRT
+cranny/DSM
+crap/MS
+crape/SM
+crapped
+crapper/S
+crappie/RSMT
+crapping
+crappy
+craps/M
+crapshooter/MS
+crash/MDSG
+crass/RYTP
+crassness/M
+crate/DRSMZG
+crater/MDG
+cravat/SM
+crave/DSGJ
+craven/SMYP
+cravenness/M
+craving/M
+craw/MS
+crawdad/SM
+crawl/SMDRZG
+crawler/M
+crawlspace/SM
+crawly/TRSM
+cray/S
+crayfish/MS
+crayola/S
+crayon/GSMD
+craze/DSMG
+crazily
+craziness/M
+crazy/PRSMT
+creak/SMDG
+creakily
+creakiness/M
+creaky/RPT
+cream/SMDRZG
+creamer/M
+creamery/SM
+creamily
+creaminess/M
+creamy/RPT
+crease/ICGMSD
+create/KADSGNV
+creation's/K
+creation/ASM
+creationism/SM
+creationist/SM
+creative/SMYP
+creativeness/M
+creativity/M
+creator/MS
+creature/SM
+creche/SM
+cred
+credence/M
+credential/SGMD
+credenza/SM
+credibility/IM
+credible/I
+credibly/I
+credit/EGSBMD
+creditably/E
+creditor/SM
+creditworthy/P
+credo/SM
+credulity/IM
+credulous/IY
+credulousness/M
+creed/SM
+creek/SM
+creel/SM
+creep/SMRZG
+creeper/M
+creepily
+creepiness/M
+creepy/TPR
+cremains/M
+cremate/GNDSX
+cremation/M
+crematoria
+crematorium/MS
+crematory/SM
+creme/SM
+crenelate/XGNDS
+crenelation/M
+creole/SM
+creosote/MGDS
+crepe/SM
+crept
+crepuscular
+crescendo/CSM
+crescent/MS
+cress/M
+crest/SMDG
+crestfallen
+crestless
+cretaceous
+cretin/SM
+cretinism/M
+cretinous
+cretonne/M
+crevasse/SM
+crevice/MS
+crew/MDGS
+crewel/M
+crewelwork/M
+crewman/M
+crewmen
+crib/MS
+cribbage/M
+cribbed
+cribber/MS
+cribbing
+crick/SMDG
+cricket/MRSZG
+cricketer/M
+crier/M
+crikey
+crime/SM
+criminal/MYS
+criminality/M
+criminalize/CGDS
+criminologist/MS
+criminology/M
+crimp/SMDG
+crimson/SMDG
+cringe/DSMG
+crinkle/DSMG
+crinkly/RT
+crinoline/SM
+cripes
+cripple/DRSMZG
+crippler/M
+crippleware
+crippling/Y
+crises
+crisis/M
+crisp/SMDRYTGP
+crispbread/S
+crispiness/M
+crispness/M
+crispy/PRT
+crisscross/GMDS
+criteria
+criterion/M
+critic/SM
+critical/UY
+criticality
+criticism/MS
+criticize/ZGDRS
+criticizer/M
+critique/MGDS
+critter/SM
+croak/SMDG
+croaky/RT
+crochet/SMDRZG
+crocheter/M
+crocheting/M
+crock/SMD
+crockery/M
+crocodile/SM
+crocus/MS
+croft/SRZG
+croissant/MS
+crone/SM
+crony/SM
+cronyism/M
+crook/SMDG
+crooked/PTRY
+crookedness/M
+crookneck/SM
+croon/SMDRZG
+crooner/M
+crop/MS
+cropland/SM
+cropped
+cropper/MS
+cropping
+croquet/M
+croquette/SM
+crosier/MS
+cross's
+cross/AUGTSD
+crossbar/SM
+crossbeam/MS
+crossbones/M
+crossbow/SM
+crossbowman/M
+crossbowmen
+crossbred
+crossbreed/SGM
+crosscheck/SMDG
+crosscurrent/MS
+crosscut/SM
+crosscutting
+crosser
+crossfire/MS
+crosshatch/GDS
+crossing/SM
+crossly
+crossness/M
+crossover/MS
+crosspatch/MS
+crosspiece/SM
+crossroad/MS
+crossroads/M
+crosstown
+crosswalk/MS
+crosswind/MS
+crosswise
+crossword/MS
+crotch/MS
+crotchet/SM
+crotchety
+crouch/GMDS
+croup/M
+croupier/M
+croupy/ZTR
+crouton/MS
+crow/MDGS
+crowbar/MS
+crowd/SMDG
+crowded/U
+crowdfund/SDG
+crowfeet
+crowfoot/SM
+crown/SMDG
+crowned/U
+crucial/Y
+crucible/SM
+crucifix/MS
+crucifixion/SM
+cruciform/SM
+crucify/DSG
+crud/M
+cruddy/TR
+crude/RMYTP
+crudeness/M
+crudites/M
+crudity/SM
+cruel/RYPT
+cruelness/M
+cruelty/SM
+cruet/SM
+cruft/SD
+crufty
+cruise/DRSMZG
+cruiser/M
+cruller/MS
+crumb/SMDYG
+crumble/MGDS
+crumbliness/M
+crumbly/TPR
+crumby/TR
+crumminess/M
+crummy/PTR
+crumpet/MS
+crumple/MGDS
+crunch/GMDRS
+crunchiness/M
+crunchy/TRP
+crupper/MS
+crusade/MZGDRS
+crusader/M
+cruse/SM
+crush/MDRSZG
+crusher/M
+crushing/Y
+crust/SMDG
+crustacean/SM
+crustal
+crustily
+crustiness/M
+crusty/TRP
+crutch/MS
+crux/MS
+cry/ZGJDRSM
+crybaby/SM
+cryogenic/S
+cryogenics/M
+cryonics
+cryosurgery/M
+crypt/SM
+cryptanalysis
+cryptic
+cryptically
+cryptocurrency/SM
+cryptogram/SM
+cryptographer/SM
+cryptography/M
+crystal/SM
+crystalline
+crystallization/M
+crystallize/ADSG
+crystallographic
+crystallography
+ct
+ctn
+ctr
+cu
+cub/ZGSMDR
+cubbyhole/MS
+cube/MS
+cuber/M
+cubic
+cubical
+cubicle/MS
+cubism/M
+cubist/SM
+cubit/SM
+cuboid/S
+cuckold/MDSG
+cuckoldry/M
+cuckoo/SM
+cucumber/SM
+cud/SM
+cuddle/DSMG
+cuddly/TR
+cudgel/SGMDJ
+cue/DSMG
+cuff/MDGS
+cuisine/SM
+culinary
+cull/MDGS
+culminate/XDSGN
+culmination/M
+culotte/SM
+culpability/M
+culpable/I
+culpably
+culprit/SM
+cult/MS
+cultism/M
+cultist/MS
+cultivable
+cultivar/SM
+cultivate/BDSGN
+cultivated/U
+cultivation/M
+cultivator/MS
+cultural/Y
+culture/MGDS
+cultured/U
+culvert/MS
+cum/SM
+cumber/SDG
+cumbersome/P
+cumbersomeness/M
+cumbrous
+cumin/M
+cummerbund/MS
+cumming
+cumulative/Y
+cumuli
+cumulonimbi
+cumulonimbus/M
+cumulus/M
+cuneiform/M
+cunnilingus/M
+cunning/MRYT
+cunt/MS!
+cup/SM
+cupboard/SM
+cupcake/MS
+cupful/SM
+cupid/SM
+cupidity/M
+cupola/SMD
+cuppa/S
+cupped
+cupping
+cupric
+cur/SMY
+curability/M
+curacao
+curacy/SM
+curare/M
+curate/DSMGV
+curative/MS
+curator/KMS
+curatorial
+curb/MDGS
+curbing/M
+curbside
+curbstone/SM
+curd/MS
+curdle/DSG
+cure's
+cure/KZGBDRS
+cured/U
+curer/KM
+curettage/M
+curfew/SM
+curia/M
+curiae
+curie/SM
+curio/SM
+curiosity/SM
+curious/YP
+curiousness/M
+curium/M
+curl's
+curl/UDGS
+curler/SM
+curlew/SM
+curlicue/DSMG
+curliness/M
+curling/M
+curly/RPT
+curmudgeon/MYS
+currant/MS
+currency/SM
+current's
+current/FAY
+currents
+curricula
+curricular
+curriculum/M
+curry/DSMG
+currycomb/SGMD
+curse/DSMGV
+cursed/Y
+cursive's
+cursive/EAY
+cursor/SM
+cursorily
+cursoriness/M
+cursory/P
+curt/RYTP
+curtail/GDSL
+curtailment/SM
+curtain/GMDS
+curtness/M
+curtsy/GDSM
+curvaceous/P
+curvaceousness/M
+curvature/SM
+curve/DSMG
+curvy/RT
+cushion/MDSG
+cushy/RT
+cusp/MS
+cuspid/SM
+cuspidor/SM
+cuss's
+cuss/FEGSD
+cussed/PY
+custard/MS
+custodial
+custodian/MS
+custodianship/M
+custody/M
+custom/SZMR
+customarily
+customary/U
+customer/M
+customhouse/SM
+customization/M
+customize/DSG
+cut/TSMR
+cutaneous
+cutaway/MS
+cutback/MS
+cute/YP
+cuteness/M
+cutesy/TR
+cutey/S
+cuticle/MS
+cutie/SM
+cutlass/MS
+cutler/SM
+cutlery/M
+cutlet/SM
+cutoff/SM
+cutout/SM
+cutter/SM
+cutthroat/SM
+cutting/MYS
+cuttlefish/MS
+cutup/SM
+cutworm/MS
+cw
+cwt
+cyan/M
+cyanide/M
+cyanobacteria
+cyberbully/SM
+cybercafe/S
+cybernetic/S
+cybernetics/M
+cyberpunk/SM
+cybersex
+cyberspace/MS
+cyborg/SM
+cyclamen/MS
+cycle/ADSMG
+cyclic
+cyclical/Y
+cyclist/MS
+cyclometer/MS
+cyclone/MS
+cyclonic
+cyclopedia/MS
+cyclopes
+cyclops/M
+cyclotron/MS
+cygnet/MS
+cylinder/MS
+cylindrical
+cymbal/MS
+cymbalist/MS
+cynic/SM
+cynical/Y
+cynicism/M
+cynosure/MS
+cypress/MS
+cyst/MS
+cystic
+cystitis
+cytokines
+cytologist/SM
+cytology/M
+cytoplasm/M
+cytoplasmic
+cytosine/M
+czar/MS
+czarina/SM
+czarism
+czarist/SM
+d'Arezzo/M
+d'Estaing/M
+d/NXGJ
+dB
+dab/SM
+dabbed
+dabber/MS
+dabbing
+dabble/ZGDRS
+dabbler/M
+dace/SM
+dacha/MS
+dachshund/MS
+dactyl/MS
+dactylic/MS
+dad/SM
+dadaism/M
+dadaist/MS
+daddy/SM
+dado/M
+dadoes
+daemon/MS
+daemonic
+daffiness/M
+daffodil/SM
+daffy/PTR
+daft/PTRY
+daftness/M
+dag/S
+dagger/MS
+dago/S
+dagoes
+daguerreotype/DSMG
+dahlia/MS
+dailiness/M
+daily/PSM
+daintily
+daintiness/M
+dainty/RSMTP
+daiquiri/MS
+dairy/GSM
+dairying/M
+dairymaid/MS
+dairyman/M
+dairymen
+dairywoman/M
+dairywomen
+dais/MS
+daisy/SM
+dale/SM
+dalliance/MS
+dallier/M
+dally/ZGDRS
+dalmatian/MS
+dam/SM
+damage/MGDS
+damageable
+damaged/U
+damages/M
+damask/MDGS
+dame/SM
+dammed
+damming
+dammit
+damn/SBGMD
+damnably
+damnation/M
+damned/T
+damp/SPXZTGMDNRY
+dampen/ZGDR
+dampener/M
+damper/M
+dampness/M
+damsel/MS
+damselfly/SM
+damson/MS
+dance/MZGDRS
+dancer/M
+dancing/M
+dandelion/SM
+dander/M
+dandify/GDS
+dandle/GDS
+dandruff/M
+dandy/TRSM
+dang/SZGDR
+danger/M
+dangerous/Y
+dangle/ZGDRS
+dangler/M
+danish/MS
+dank/PTRY
+dankness/M
+danseuse/MS
+dapper/TR
+dapple/MGDS
+dare/DRSMZG
+daredevil/MS
+daredevilry/M
+darer/M
+daresay
+daring/MY
+dark/PXTMNRY
+darken/ZGDR
+darkener/M
+darkie/S
+darkness/M
+darkroom/MS
+darling/MS
+darn/SZGMDR
+darned/TR
+darner/M
+dart/SZGMDR
+dartboard/MS
+darter/M
+dash/ZGMDRS
+dashboard/SM
+dasher/M
+dashiki/MS
+dashing/Y
+dastard/MYS
+dastardliness/M
+data
+database/SM
+dataset/MS
+datatype
+date/DRSMZGV
+datebook/S
+dated/U
+dateless
+dateline/MGDS
+dater/M
+dateset
+dative/MS
+datum/M
+daub/SZGMDR
+dauber/M
+daughter/SMY
+daunt/GDS
+daunting/Y
+dauntless/YP
+dauntlessness/M
+dauphin/MS
+davenport/MS
+davit/MS
+dawdle/ZGDRS
+dawdler/M
+dawn/SGMD
+day/SM
+daybed/MS
+daybreak/M
+daycare/M
+daydream/MDRZGS
+daydreamer/M
+daylight/MS
+daylights/M
+daylong
+daytime/M
+daze/DSMG
+dazed/Y
+dazzle/MZGDRS
+dazzler/M
+dazzling/Y
+db
+dbl
+dc
+dd/SDG
+dded/K
+dding/K
+deacon/MS
+deaconess/MS
+dead/XTMNRY
+deadbeat/MS
+deadbolt/SM
+deaden/GD
+deadhead/SDG
+deadline/SM
+deadliness/M
+deadlock/GSMD
+deadly/TPR
+deadpan/MS
+deadpanned
+deadpanning
+deadwood/M
+deaf/PXTNR
+deafen/GD
+deafening/Y
+deafness/M
+deal/SJZGMR
+dealer/M
+dealership/SM
+dealing/M
+dealt
+dean/M
+deanery/SM
+deanship/M
+dear/SPTMRYH
+dearest/S
+dearness/M
+dearth/M
+dearths
+deary/SM
+death/MY
+deathbed/SM
+deathblow/MS
+deathless/Y
+deathlike
+deaths
+deathtrap/MS
+deathwatch/MS
+deaves
+deb/SM
+debacle/MS
+debarkation/M
+debarment/M
+debate/BMZR
+debater/M
+debating/M
+debauch/MDSG
+debauchee/MS
+debauchery/SM
+debenture/MS
+debilitate/DSGN
+debilitation/M
+debility/SM
+debit/D
+debonair/PY
+debonairness/M
+debouch/GDS
+debridement
+debris/M
+debt/SM
+debtor/MS
+debugger/S
+debut/GMD
+debutante/SM
+decade/MS
+decadence/M
+decadency/M
+decadent/MYS
+decaf/MS
+decaffeinate/DSG
+decagon/MS
+decal/MS
+decampment/M
+decapitate/XGNDS
+decapitator/MS
+decathlete/S
+decathlon/SM
+decay/GD
+deceased/M
+decedent/MS
+deceit/MS
+deceitful/YP
+deceitfulness/M
+deceive/UGDS
+deceiver/MS
+deceiving/Y
+decelerate/GNDS
+deceleration/M
+decelerator/SM
+decency/ISM
+decennial/SM
+decent/IY
+deception/MS
+deceptive/YP
+deceptiveness/M
+decibel/MS
+decidable/U
+decide/BZGDRS
+decided/Y
+deciduous
+deciliter/MS
+decimal/SM
+decimalization
+decimate/DSGN
+decimation/M
+decimeter/MS
+decipherable/UI
+decision/IM
+decisions
+decisive/IPY
+decisiveness/IM
+deck/SGMD
+deckchair/S
+deckhand/SM
+deckle/S
+declamation/MS
+declamatory
+declaration/MS
+declarative
+declaratory
+declare/DRSZGB
+declared/U
+declarer/M
+declension/SM
+declination/M
+decline/DRSMZG
+decliner/M
+declivity/SM
+decoherence
+decolletage/SM
+decollete
+decongestant/MS
+deconstructionism
+decor/MS
+decorate/AGNVDS
+decorating/M
+decoration/AM
+decorations
+decorative/Y
+decorator/MS
+decorous/IY
+decorousness/M
+decorum/M
+decoupage/DSMG
+decoy/GMDS
+decreasing/Y
+decree/MDS
+decreeing
+decrement/GDS
+decrepit
+decrepitude/M
+decriminalization/M
+decry/GDS
+decryption
+dedicate/AGDS
+dedication/SM
+dedicator/SM
+dedicatory
+deduce/GDS
+deducible
+deduct/GVD
+deductible/SM
+deduction/SM
+deductive/Y
+deed/GD
+deejay/MS
+deem/ASGD
+deep/SPXTMNRY
+deepen/GD
+deepfake/SM
+deepness/M
+deer/M
+deerskin/M
+deerstalker/S
+def/Z
+defacement/M
+defacer/SM
+defalcate/DSXGN
+defalcation/M
+defamation/M
+defamatory
+defame/ZGDRS
+defamer/M
+defaulter/SM
+defeat/MDRZGS
+defeated/U
+defeater/M
+defeatism/M
+defeatist/MS
+defecate/GNDS
+defecation/M
+defect/MDGVS
+defection/MS
+defective/MPYS
+defectiveness/M
+defector/MS
+defendant/SM
+defended/U
+defenestration/S
+defense/DSMGV
+defenseless/YP
+defenselessness/M
+defensible/I
+defensibly/I
+defensive/MYP
+defensiveness/M
+deference/M
+deferential/Y
+deferral/MS
+deferred
+deferring
+deffer
+deffest
+defiant/Y
+defibrillation
+defibrillator/S
+deficiency/SM
+deficient
+deficit/SM
+defilement/M
+definable/IU
+define/AGDS
+defined/U
+definer/MS
+definite/IYVP
+definiteness/IM
+definition/AM
+definitions
+definitive/Y
+deflate/GNDS
+deflation/M
+deflationary
+deflect/DGVS
+deflection/MS
+deflector/SM
+defogger/SM
+defoliant/SM
+defoliate/DSGN
+defoliation/M
+defoliator/MS
+deformity/SM
+defraud/DRZGS
+defrauder/M
+defrayal/M
+defrock/DG
+defroster/MS
+deft/PTRY
+deftness/M
+defunct
+defy/GDS
+deg
+degeneracy/M
+degenerate/MV
+degrade/B
+degree/MS
+dehydrator/SM
+dehydrogenase
+deicer/MS
+deification/M
+deify/NGDS
+deign/GDS
+deist/MS
+deistic
+deity/SM
+deject/GDS
+dejected/Y
+dejection/M
+delay/ZDR
+delectable
+delectably
+delectation/M
+delegate/GD
+delete/XGNDS
+deleterious
+deletion/M
+delft/M
+delftware/M
+deli/SM
+deliberate/XYVP
+deliberateness/M
+delicacy/ISM
+delicate/IY
+delicateness/M
+delicatessen/SM
+delicious/PY
+deliciousness/M
+delighted/Y
+delightful/Y
+deliminator
+delineate/GNXDS
+delineation/M
+delinquency/SM
+delinquent/SMY
+deliquesce/DSG
+deliquescent
+delirious/YP
+deliriousness/M
+delirium/SM
+deliver/ADGS
+deliverable/S
+deliverance/M
+delivered/U
+deliverer/SM
+dell/SM
+delphinium/MS
+delta/MS
+delude/GDS
+deluge/MGDS
+delusion/MS
+delusional
+delusive/Y
+deluxe
+delve/ZGDRS
+delver/M
+demagogic
+demagogically
+demagogue/SM
+demagoguery/M
+demagogy/M
+demand/GMDS
+demanding/U
+demarcate/DSGNX
+demarcation/M
+demean/GDS
+demeanor/M
+demented/Y
+dementia/M
+demesne/MS
+demigod/MS
+demigoddess/MS
+demijohn/SM
+demimondaine/SM
+demimonde/M
+demise/MGDS
+demitasse/MS
+demo/GMD
+democracy/SM
+democrat/MS
+democratic/U
+democratically
+democratization/M
+democratize/GDS
+demode
+demographer/SM
+demographic/SM
+demographically
+demographics/M
+demography/M
+demolish/DSG
+demolition/MS
+demon/MS
+demonetization/M
+demoniac
+demoniacal/Y
+demonic
+demonically
+demonize/GDS
+demonology/SM
+demonstrability
+demonstrable/I
+demonstrably
+demonstrate/XGNVDS
+demonstration/M
+demonstrative/MYSP
+demonstrativeness/M
+demonstrator/MS
+demote/GD
+demotic
+demount
+demulcent/SM
+demur/TMRS
+demure/PY
+demureness/M
+demurral/SM
+demurred
+demurrer/SM
+demurring
+den/M
+denationalization
+denaturation
+denature/DG
+dendrite/SM
+dengue/M
+deniability
+deniable/U
+denial/MS
+denier/M
+denigrate/DSGN
+denigration/M
+denim/MS
+denitrification
+denizen/MS
+denominational
+denotative
+denouement/MS
+denounce/LDSG
+denouncement/SM
+dense/PYTR
+denseness/M
+density/SM
+dent/ISGMD
+dental/Y
+dentifrice/SM
+dentin/M
+dentist/MS
+dentistry/M
+dentition/M
+denture/IMS
+denuclearize/GDS
+denudation/M
+denude/GDS
+denunciation/SM
+deny/ZGDRS
+deodorant/SM
+deodorization/M
+deodorize/DRSZG
+deodorizer/M
+departed/M
+department/MS
+departmental/Y
+departmentalization/M
+departmentalize/GDS
+departure/SM
+dependability/M
+dependable/U
+dependably
+dependence/IM
+dependency/SM
+dependent/IMYS
+depict/GDS
+depiction/MS
+depilatory/SM
+deplete/GNDS
+depletion/M
+deplorably
+deplore/BGDS
+deploy/ALGDS
+deployment/AM
+deployments
+deponent/MS
+deportation/MS
+deportee/MS
+deportment/M
+deposit/AGMDS
+depositor/MS
+depository/SM
+deprave/GDS
+depravity/SM
+deprecate/GNDS
+deprecating/Y
+deprecation/M
+deprecatory
+depreciate/DSGN
+depreciation/M
+depredation/SM
+depressant/SM
+depressing/Y
+depression/SM
+depressive/SM
+depressor/MS
+depressurization
+deprive/GDS
+deprogramming
+depth/M
+depths
+deputation/MS
+depute/DSG
+deputize/DSG
+deputy/SM
+derailleur/SM
+derailment/SM
+derangement/M
+derby/SM
+derelict/MS
+dereliction/M
+deride/GDS
+derision/M
+derisive/PY
+derisiveness/M
+derisory
+derivation/MS
+derivative/MS
+derive/B
+dermal
+dermatitis/M
+dermatological
+dermatologist/SM
+dermatology/M
+dermis/M
+derogate/DSGN
+derogation/M
+derogatorily
+derogatory
+derrick/SM
+derriere/SM
+derringer/SM
+derv
+dervish/MS
+desalinate/GNDS
+desalination/M
+desalinization/M
+desalinize/GDS
+descant/M
+descend/FGDS
+descendant/MS
+descender
+describable/I
+describe/BZGDR
+describer/M
+description/SM
+descriptive/PY
+descriptiveness/M
+descriptor/S
+descry/GDS
+desecrate/DSGN
+desecration/M
+deselection
+desert/SDRZGM
+deserter/M
+desertification
+desertion/SM
+deserved/UY
+deserving/U
+desiccant/SM
+desiccate/DSGN
+desiccation/M
+desiccator/SM
+desiderata
+desideratum/M
+design/ASDG
+designate/DSGNX
+designation/M
+desirability/UM
+desirableness/M
+desirably/U
+desire/B
+desired/U
+desirous
+desist/SDG
+desk/SM
+deskill/G
+desktop/SM
+desolate/PDSYGN
+desolateness/M
+desolation/M
+despair/SMDG
+despairing/Y
+desperado/M
+desperadoes
+desperate/YNP
+desperateness/M
+desperation/M
+despicable
+despicably
+despise/DSG
+despite
+despoilment/M
+despondence/M
+despondency/M
+despondent/Y
+despotic
+despotically
+despotism/M
+dessert/SM
+dessertspoon/S
+dessertspoonful/S
+destination/SM
+destine/DSG
+destiny/SM
+destitute/N
+destitution/M
+destroy/SZGDR
+destroyer/M
+destruct/GVMDS
+destructibility/IM
+destructible/I
+destruction/M
+destructive/PY
+destructiveness/M
+desuetude/M
+desultorily
+desultory
+detach/BLGDS
+detachment/MS
+detain/LGDS
+detainee/MS
+detainment/M
+detect/SDGVB
+detectable/U
+detected/U
+detection/M
+detective/SM
+detector/SM
+detente/SMNX
+detention/M
+deter/SL
+detergent/SM
+deteriorate/DSGN
+deterioration/M
+determent/M
+determinable/I
+determinant/SM
+determinate
+determine/AGDS
+determined/U
+determinedly
+determiner/SM
+determinism/M
+deterministic
+deterministically
+deterred/U
+deterrence/M
+deterrent/MS
+deterring
+detestably
+detestation/M
+dethrone/DSLG
+dethronement/M
+detonate/GNDSX
+detonation/M
+detonator/SM
+detox/MDSG
+detoxification/M
+detoxify/DSGN
+detract/GD
+detriment/SM
+detrimental/Y
+detritus/M
+deuce/SM
+deuterium/M
+devastate/GNDS
+devastating/Y
+devastation/M
+devastator/MS
+develop/ASGDL
+developed/U
+developer/SM
+development/ASM
+developmental/Y
+deviance/M
+deviancy/M
+deviant/SM
+deviate/DSMGNX
+deviating/U
+deviation/M
+devil/SMDGL
+devilish/YP
+devilishness/M
+devilment/M
+devilry/SM
+deviltry/SM
+devious/YP
+deviousness/M
+devoid
+devolution/M
+devolve/DSG
+devoted/Y
+devotee/SM
+devotion/MS
+devotional/SM
+devour/SDG
+devout/PRYT
+devoutness/M
+dew/M
+dewberry/SM
+dewclaw/SM
+dewdrop/SM
+dewiness/M
+dewlap/SM
+dewy/RTP
+dexterity/M
+dexterous/YP
+dexterousness/M
+dextrose/M
+dharma
+dhoti/SM
+dhow/MS
+diabetes/M
+diabetic/SM
+diabolic
+diabolical/Y
+diacritic/MS
+diacritical
+diadem/SM
+diaereses
+diaeresis/M
+diagnose/DSG
+diagnosis/M
+diagnostic/S
+diagnostically
+diagnostician/SM
+diagnostics/M
+diagonal/SMY
+diagram/SM
+diagrammatic
+diagrammatically
+diagrammed
+diagramming
+dial/AMDGS
+dialect/SM
+dialectal
+dialectic/SM
+dialectical
+dialectics/M
+dialing/S
+dialog
+dialogue/SM
+dialyses
+dialysis/M
+dialyzes
+diam
+diamagnetic
+diamagnetism
+diamante
+diameter/SM
+diametric
+diametrical/Y
+diamond/SM
+diamondback/MS
+diapason/SM
+diaper/SMDG
+diaphanous
+diaphragm/SM
+diaphragmatic
+diarist/SM
+diarrhea/M
+diary/SM
+diaspora/SM
+diastase/M
+diastole/M
+diastolic
+diathermy/M
+diatom/SM
+diatomic
+diatonic
+diatribe/SM
+diazepam
+dibble/DSMG
+dibs/M
+dice/GDS
+dices/I
+dicey
+dichotomous
+dichotomy/SM
+dicier
+diciest
+dick/MRXZS
+dicker/DG
+dickey/SM
+dickhead/S
+dickybird/S
+dicotyledon/MS
+dicotyledonous
+dict
+dicta
+dictate/DSMGNX
+dictation/M
+dictator/SM
+dictatorial/Y
+dictatorship/SM
+diction/M
+dictionary/SM
+dictum/M
+did/AU
+didactic
+didactically
+diddle/DRSZG
+diddler/M
+diddly
+diddlysquat
+diddums
+didgeridoo/S
+didn't
+dido/M
+didoes
+didst
+die/DSM
+dielectric/MS
+diereses
+dieresis/M
+diesel/SMDG
+diet/MDRZGS
+dietary/SM
+dieter/M
+dietetic/S
+dietetics/M
+dietitian/MS
+diff/DRZGS
+differ/DG
+difference/IM
+differences
+different/IY
+differentiable
+differential/SM
+differentiate/DSGN
+differentiated/U
+differentiation/M
+difficult/Y
+difficulty/SM
+diffidence/M
+diffident/Y
+diffract/GSD
+diffraction/M
+diffuse/DSYGNVP
+diffuseness/M
+diffusion/M
+diffusivity
+dig/SM
+digerati/M
+digest/SMDGV
+digested/U
+digestibility/M
+digestible/I
+digestion/IM
+digestions
+digestive/S
+digger/SM
+digging/S
+diggings/M
+digicam/S
+digit/SM
+digital/Y
+digitalis/M
+digitization
+digitize/GDS
+dignified/U
+dignify/DSG
+dignitary/SM
+dignity/ISM
+digraph/M
+digraphs
+digress/GVDS
+digression/MS
+dike/MGDS
+diktat/S
+dilapidated
+dilapidation/M
+dilatation/M
+dilate/DSGN
+dilation/M
+dilator/SM
+dilatory
+dildo/S
+dilemma/MS
+dilettante/SM
+dilettantish
+dilettantism/M
+diligence/M
+diligent/Y
+dill/MS
+dilly/SM
+dillydally/DSG
+diluent
+dilute/DSGNX
+diluted/U
+dilution/M
+dim/PSRY
+dime/MS
+dimension/SM
+dimensional
+dimensionless
+diminish/GDS
+diminished/U
+diminuendo/SM
+diminution/SM
+diminutive/SM
+dimity/M
+dimmed/U
+dimmer/SM
+dimmest
+dimming
+dimness/M
+dimple/DSMG
+dimply
+dimwit/SM
+dimwitted
+din/ZGSMDR
+dinar/SM
+dine/S
+diner/M
+dinette/MS
+ding/MDG
+dingbat/MS
+dinghy/SM
+dingily
+dinginess/M
+dingle/SM
+dingo/M
+dingoes
+dingus/MS
+dingy/RPT
+dink/R
+dinky/RSMT
+dinned
+dinner/SMDG
+dinnertime/M
+dinnerware/M
+dinning
+dinosaur/SM
+dint/M
+diocesan/MS
+diocese/MS
+diode/SM
+diorama/SM
+dioxide/SM
+dioxin/SM
+dip/SM
+diphtheria/M
+diphthong/SM
+diploid/SM
+diploma/SM
+diplomacy/M
+diplomat/MS
+diplomata
+diplomatic/U
+diplomatically
+diplomatist/MS
+diplopia
+dipole/SM
+dipped
+dipper/SM
+dipping
+dippy/RT
+dipso/S
+dipsomania/M
+dipsomaniac/MS
+dipstick/SM
+dipterous
+diptych/M
+diptychs
+dire/YTR
+direct/ASDGVT
+directer
+direction/IM
+directional
+directionless
+directions
+directive/SM
+directly
+directness/IM
+director/MS
+directorate/SM
+directorial
+directorship/SM
+directory/SM
+direful
+dirge/SM
+dirigible/MS
+dirk/MS
+dirndl/SM
+dirt/M
+dirtball/S
+dirtily
+dirtiness/M
+dirty/DRSTGP
+dis/M
+disable/DSGL
+disablement/M
+disambiguate/N
+disappointing/Y
+disarming/Y
+disassembly
+disastrous/Y
+disbandment/M
+disbarment/M
+disbelieving/Y
+disbursal/M
+disburse/DSGL
+disbursement/MS
+disc/M
+discern/LSDG
+discernible/I
+discernibly
+discerning/Y
+discernment/M
+discharged/U
+disciple/SM
+discipleship/M
+disciplinarian/SM
+disciplinary
+discipline/DSMG
+disciplined/U
+disclose/DSG
+disclosed/U
+disco/MG
+discography/SM
+discoloration/S
+discombobulate/DSGN
+discombobulation/M
+discomfit/DG
+discomfiture/M
+discommode/DG
+disconcerting/Y
+disconnected/PY
+disconnectedness/M
+disconsolate/Y
+discordance/M
+discordant/Y
+discotheque/SM
+discourage/LGDS
+discouragement/SM
+discouraging/Y
+discover/ASDG
+discovered/U
+discoverer/MS
+discovery/ASM
+discreet/PRYT
+discreetness/M
+discrepancy/SM
+discrepant
+discrete/PYN
+discreteness/M
+discretion/IM
+discretionary
+discriminant
+discriminate/GNDS
+discriminating/U
+discrimination/M
+discriminator/MS
+discriminatory
+discursiveness/M
+discus/MS
+discussant/SM
+discussion/SM
+disdain/SMDG
+disdainful/Y
+disembowel/SDLG
+disembowelment/M
+disfigurement/SM
+disfranchisement/M
+disgorgement/M
+disgruntle/LGDS
+disgruntlement/M
+disguise/GD
+disguised/U
+disgusted/Y
+disgusting/Y
+dish/MDSG
+dishabille/M
+disharmonious
+dishcloth/M
+dishcloths
+disheartening/Y
+dishevel/DGLS
+dishevelment/M
+dishpan/SM
+dishrag/SM
+dishtowel/MS
+dishware/M
+dishwasher/MS
+dishwater/M
+dishy
+disillusion/GLD
+disillusionment/M
+disinfectant/MS
+disinfection/M
+disinterested/PY
+disinterestedness/M
+disjointed/YP
+disjointedness/M
+disjunctive
+disjuncture
+disk/MS
+diskette/MS
+dislodge/GDS
+dismal/Y
+dismantlement/M
+dismay/SMDG
+dismayed/U
+dismember/LGD
+dismemberment/M
+dismissive/Y
+disorder/Y
+disorganization/M
+disparage/DSGL
+disparagement/M
+disparaging/Y
+disparate/Y
+dispatcher/MS
+dispel/S
+dispelled
+dispelling
+dispensary/SM
+dispensation/MS
+dispense/BZGDRS
+dispenser/M
+dispersal/M
+disperse/GNDS
+dispersion/M
+dispirit/GDS
+displeasure/M
+disposable/SM
+disposal/SM
+disposed/I
+disposition/ISM
+dispossession/M
+disproof/SM
+disproportional
+disprove/B
+disputable/I
+disputably/I
+disputant/MS
+disputation/SM
+disputatious/Y
+dispute/DRSMZGB
+disputed/U
+disputer/M
+disquiet/GSMD
+disquisition/MS
+disregardful
+disrepair/M
+disrepute/MB
+disrupt/GVSD
+disruption/SM
+disruptive/Y
+dissect/SDG
+dissed
+dissemblance/M
+dissemble/ZGDRS
+dissembler/M
+disseminate/GNDS
+dissemination/M
+dissension/SM
+dissent/SMDRZG
+dissenter/M
+dissertation/SM
+disses
+dissidence/M
+dissident/MS
+dissimilar
+dissimilitude/S
+dissing
+dissipate/GNDS
+dissipation/M
+dissociate/GNVDS
+dissociation/M
+dissoluble/I
+dissolute/YNP
+dissoluteness/M
+dissolve/AGDS
+dissolved/U
+dissonance/SM
+dissonant
+dissuade/GDS
+dissuasive
+dist
+distaff/SM
+distal/Y
+distance/DSMG
+distant/Y
+distaste/SM
+distemper/M
+distention/SM
+distillate/SMNX
+distillation/M
+distillery/SM
+distinct/IYTVP
+distincter
+distinction/SM
+distinctive/YP
+distinctiveness/M
+distinctness/IM
+distinguish/GDSB
+distinguishable/I
+distinguished/U
+distort/GDR
+distortion/MS
+distract/DG
+distracted/Y
+distraction/S
+distrait
+distraught
+distress/DG
+distressful
+distressing/Y
+distribute/AGNVDS
+distributed/U
+distribution/AM
+distributional
+distributions
+distributive/Y
+distributor's
+distributor/AS
+distributorship/S
+district's
+district/AS
+disturb/ZGSDR
+disturbance/SM
+disturbed/U
+disturber/M
+disturbing/Y
+disunion/M
+disyllabic
+ditch/MDSG
+dither/SMDRZG
+ditherer/M
+ditransitive
+ditsy
+ditto/SMDG
+ditty/SM
+ditz/MS
+diuretic/MS
+diurnal/Y
+div
+diva/MS
+divalent
+divan/SM
+dive/MZTGDRS
+diver/M
+diverge/DSG
+divergence/MS
+divergent
+diverse/XYNP
+diverseness/M
+diversification/M
+diversify/GNDS
+diversion/M
+diversionary
+diversity/SM
+divert/SDG
+diverticulitis/M
+divest/SLDG
+divestiture/MS
+divestment/M
+divide/DRSMZGB
+divided/U
+dividend/MS
+divider/M
+divination/M
+divine/DRSMYZTG
+diviner/M
+diving/M
+divinity/SM
+divisibility/IM
+divisible/I
+division/MS
+divisional
+divisive/PY
+divisiveness/M
+divisor/SM
+divorce/DSLMG
+divorcee/MS
+divorcement/MS
+divot/SM
+divulge/GDS
+divvy/DSMG
+dixieland/M
+dizzily
+dizziness/M
+dizzy/DRSPTG
+djellaba/MS
+do/SJMRHZG
+doable
+dob/S
+dobbed
+dobbin/SM
+dobbing
+doberman/MS
+dobro
+doc/SM
+docent/SM
+docile/Y
+docility/M
+dock/MDRZGS
+docket/SMDG
+dockland/S
+dockside
+dockworker/MS
+dockyard/MS
+doctor/SMDG
+doctoral
+doctorate/MS
+doctrinaire/MS
+doctrinal
+doctrine/MS
+docudrama/SM
+document/GMDS
+documentary/SM
+documentation/SM
+documented/U
+dodder/SMDG
+doddery
+doddle
+dodge/DRSMZG
+dodgem/S
+dodger/M
+dodgy/RT
+dodo/MS
+doe/SM
+doer/M
+does/AU
+doeskin/MS
+doesn't
+doff/DGS
+dog/SM
+dogcart/SM
+dogcatcher/SM
+doge/MS
+dogeared
+dogfight/SM
+dogfish/MS
+dogged/PY
+doggedness/M
+doggerel/M
+dogging
+doggone/TGRS
+doggy/RSMT
+doghouse/SM
+dogie/SM
+dogleg/SM
+doglegged
+doglegging
+doglike
+dogma/SM
+dogmatic
+dogmatically
+dogmatism/M
+dogmatist/SM
+dognapper
+dogsbody/S
+dogsled/S
+dogtrot/MS
+dogtrotted
+dogtrotting
+dogwood/MS
+doily/SM
+doing/USM
+doldrums/M
+dole's
+dole/FGDS
+doleful/YP
+dolefulness/M
+doll/MDGS
+dollar/SM
+dollhouse/SM
+dollop/SGMD
+dolly/SM
+dolmen/SM
+dolomite/M
+dolor/M
+dolorous/Y
+dolphin/MS
+dolt/MS
+doltish/YP
+doltishness/M
+domain/SM
+dome/MGDS
+domestic/SM
+domestically
+domesticate/DSGN
+domesticated/U
+domestication/M
+domesticity/M
+domicile/DSMG
+domiciliary
+dominance/M
+dominant/SMY
+dominate/DSGN
+domination/M
+dominatrices
+dominatrix/M
+domineer/SGD
+domineering/Y
+dominion/SM
+domino/M
+dominoes
+don't
+don/SM
+dona/MS
+donate/DSXGN
+donation/M
+done/FAU
+dong/MDGS
+dongle/SM
+donkey/SM
+donned
+donning
+donnish
+donnybrook/MS
+donor/SM
+donuts
+doodad/SM
+doodah
+doodahs
+doodle/DRSMZG
+doodlebug/SM
+doodler/M
+doohickey/SM
+doolally
+doom/MDGS
+doomsayer/MS
+doomsday/M
+doomster/S
+door's
+door/IS
+doorbell/MS
+doorjamb/S
+doorkeeper/MS
+doorknob/MS
+doorknocker/S
+doorman/M
+doormat/SM
+doormen
+doorplate/SM
+doorpost/S
+doorstep/MS
+doorstepped
+doorstepping
+doorstop/MS
+doorway/SM
+dooryard/MS
+dopa/M
+dopamine
+dope/MZGDRS
+doper/M
+dopey
+dopier
+dopiest
+dopiness/M
+doping/M
+doppelganger/S
+dork/MS
+dorky/RT
+dorm/MRZS
+dormancy/M
+dormant
+dormer/M
+dormice
+dormitory/SM
+dormouse/M
+dorsal/Y
+dory/SM
+dosage/SM
+dose/MGDS
+dosh
+dosimeter/SM
+doss/DRSZG
+dosshouse/S
+dossier/MS
+dost
+dot/ZGSMDR
+dotage/M
+dotard/SM
+dotcom/SM
+dote/S
+doter/M
+doting/Y
+dotted
+dotting
+dotty/RT
+double's
+double/ADSG
+doubleheader/MS
+doublespeak/M
+doublet/MS
+doubloon/SM
+doubly
+doubt/SMDRZG
+doubter/M
+doubtful/PY
+doubtfulness/M
+doubting/Y
+doubtless/Y
+douche/DSMG
+dough/M
+doughnut/SM
+doughty/RT
+doughy/TR
+dour/RYTP
+dourness/M
+douse/DSG
+dove/MS
+dovecot/S
+dovecote/SM
+dovetail/MDSG
+dovish
+dowager/MS
+dowdily
+dowdiness/M
+dowdy/RSPT
+dowel/SMDG
+dower/SMDG
+down/MDRZGS
+downbeat/SM
+downcast
+downdraft/MS
+downer/M
+downfall/SMN
+downfield
+downgrade/DSMG
+downhearted/PY
+downheartedness/M
+downhill/MS
+download/MDBSG
+downmarket
+downplay/DSG
+downpour/MS
+downrange
+downright
+downriver
+downscale
+downshift/SGD
+downside/MS
+downsize/GDS
+downsizing/M
+downspout/MS
+downstage
+downstairs/M
+downstate/M
+downstream
+downswing/MS
+downtempo
+downtime/M
+downtown/M
+downtrend/MS
+downtrodden
+downturn/MS
+downward/S
+downwind
+downy/RT
+dowry/SM
+dowse/DRSZG
+dowser/M
+doxology/SM
+doyen/SM
+doyenne/MS
+doz/XGDNS
+doze/M
+dozen/MH
+dozily
+dozy/RTP
+dpi
+dpt
+drab/MYSP
+drabber
+drabbest
+drabness/M
+drachma/MS
+draconian
+draft's
+draft/ASDG
+draftee/SM
+drafter/SM
+draftily
+draftiness/M
+drafting/M
+draftsman/M
+draftsmanship/M
+draftsmen
+draftswoman/M
+draftswomen
+drafty/RTP
+drag/MS
+dragged
+dragging
+draggy/TR
+dragnet/SM
+dragon/SM
+dragonfly/SM
+dragoon/SMDG
+dragster/S
+drain/SMDRZG
+drainage/M
+drainboard/SM
+drainer/M
+drainpipe/MS
+drake/SM
+dram/MS
+drama/SM
+dramatic/S
+dramatically
+dramatics/M
+dramatist/SM
+dramatization/SM
+dramatize/DSG
+drank
+drape/DRSMZG
+draper/M
+drapery/SM
+drastic
+drastically
+drat
+dratted
+draughtboard/S
+draw/MRZGSJ
+drawback/MS
+drawbridge/MS
+drawer/M
+drawing/M
+drawl/SMDG
+drawn/A
+drawstring/MS
+dray/MS
+dread/SMDG
+dreadful/PY
+dreadfulness/M
+dreadlocks/M
+dreadnought/MS
+dream/SMDRZG
+dreamboat/MS
+dreamed/U
+dreamer/M
+dreamily
+dreaminess/M
+dreamland/M
+dreamless
+dreamlike
+dreamworld/SM
+dreamy/RPT
+drear
+drearily
+dreariness/M
+dreary/RPT
+dredge/DRSMZG
+dredger/M
+dregs/M
+drench/GDS
+dress/AUGSDM
+dressage/M
+dresser/MS
+dressiness/M
+dressing/SM
+dressmaker/SM
+dressmaking/M
+dressy/TPR
+drew/A
+dribble/MZGDRS
+dribbler/M
+driblet/MS
+drier/M
+drift/SMDRZG
+drifter/M
+driftnet/S
+driftwood/M
+drill/SMDRZG
+driller/M
+drillmaster/SM
+drink/SMRBJZG
+drinkable/U
+drinker/M
+drip/MS
+dripped
+dripping/SM
+drippy/TR
+drive/RSMZGJ
+drivel/SZGMDR
+driveler/M
+driven
+driver/M
+driveshaft/SM
+driveway/MS
+drizzle/MGDS
+drizzly
+drogue/SM
+droid/S
+droll/RPT
+drollery/SM
+drollness/M
+drolly
+dromedary/SM
+drone/DSMG
+drool/SMDG
+droop/GSMD
+droopiness/M
+droopy/TPR
+drop/MS
+dropkick/MS
+droplet/SM
+dropout/SM
+dropped
+dropper/SM
+dropping/S
+droppings/M
+dropsical
+dropsy/M
+dross/M
+drought/SM
+drove/RSMZ
+drover/M
+drown/GSJD
+drowning/M
+drowse/MGDS
+drowsily
+drowsiness/M
+drowsy/RTP
+drub/S
+drubbed
+drubber/SM
+drubbing/MS
+drudge/MGDS
+drudgery/M
+drug/MS
+drugged
+druggie/SM
+drugging
+druggist/SM
+druggy
+drugstore/MS
+druid/SM
+druidism/M
+drum/MS
+drumbeat/SM
+drumlin/SM
+drummed
+drummer/SM
+drumming
+drumstick/SM
+drunk/STMNR
+drunkard/MS
+drunken/PY
+drunkenness/M
+drupe/SM
+druthers/M
+dry/ZTGDRSMY
+dryad/SM
+dryer/SM
+dryness/M
+drys
+drywall/M
+dual
+dualism/M
+duality/M
+dub/SM
+dubbed
+dubber/SM
+dubbin/M
+dubbing
+dubiety/M
+dubious/YP
+dubiousness/M
+ducal
+ducat/SM
+duchess/MS
+duchy/SM
+duck/MDGS
+duckbill/SM
+duckboards
+duckling/SM
+duckpins/M
+duckweed/M
+ducky/TRSM
+duct's/K
+duct/CKIFS
+ductile
+ductility/M
+ducting
+ductless
+dud/GSMD
+dude/MS
+dudgeon/M
+due/SM
+duel/MDRJZGS
+dueler/M
+duelist/SM
+duenna/MS
+duet/MS
+duff/MDRZGS
+duffer/M
+dug
+dugout/MS
+duh
+duke/MS
+dukedom/SM
+dulcet
+dulcimer/MS
+dull/DRPTGS
+dullard/SM
+dullness/M
+dully
+duly/U
+dumb/RYPT
+dumbbell/SM
+dumbfound/SDG
+dumbness/M
+dumbo/S
+dumbstruck
+dumbwaiter/SM
+dumdum/MS
+dummy/SM
+dump/MDRZGS
+dumpiness/M
+dumpling/SM
+dumpsite/S
+dumpster/SM
+dumpy/PTR
+dun/SM
+dunce/SM
+dunderhead/MS
+dune/MS
+dung/MDGS
+dungaree/MS
+dungeon/SM
+dunghill/MS
+dunk/MDGS
+dunned
+dunner
+dunnest
+dunning
+dunno
+duo/SM
+duodecimal
+duodena
+duodenal
+duodenum/M
+duopoly/S
+dupe/MZGDRS
+duper/M
+duple
+duplex/MS
+duplicate's
+duplicate/AGNDS
+duplication/AM
+duplicator/MS
+duplicitous
+duplicity/M
+durability/M
+durable
+durably
+durance/M
+duration/M
+duress/M
+during
+durst
+durum/M
+dusk/M
+duskiness/M
+dusky/RTP
+dust/MDRZGS
+dustbin/SM
+dustcart/S
+duster/M
+dustiness/M
+dustless
+dustman
+dustmen
+dustpan/SM
+dustsheet/S
+dusty/RTP
+dutch
+duteous/Y
+dutiable
+dutiful/YP
+dutifulness/M
+duty/SM
+duvet/SM
+dwarf/SGMD
+dwarfish
+dwarfism/M
+dweeb/SM
+dwell/SJZGR
+dweller/M
+dwelling/M
+dwelt/I
+dwindle/DSG
+dyadic
+dybbuk/SM
+dybbukim
+dye/DRSMZG
+dyeing/A
+dyer/M
+dyestuff/M
+dying/M
+dyke/MS
+dynamic/MS
+dynamical/Y
+dynamics/M
+dynamism/M
+dynamite/MZGDRS
+dynamiter/M
+dynamo/SM
+dynastic
+dynasty/SM
+dysentery/M
+dysfunction/MS
+dysfunctional
+dyslectic/SM
+dyslexia/M
+dyslexic/SM
+dyspepsia/M
+dyspeptic/MS
+dysphagia
+dysphoria
+dysphoric
+dysprosium/M
+dystonia
+dystopi
+dystopia
+dystopian
+dz
+e'en
+e'er
+e/FDST
+eBay/M
+eMusic/M
+ea
+each
+eager/PTRY
+eagerness/M
+eagle/MS
+eaglet/MS
+ear/SMDY
+earache/SM
+earbud/SM
+eardrum/SM
+earful/SM
+earl/MS
+earldom/SM
+earliness/M
+earlobe/SM
+early/RTP
+earmark/SMDG
+earmuff/SM
+earn/DRZTGJS
+earned/U
+earner/M
+earnest/SMYP
+earnestness/M
+earnings/M
+earphone/MS
+earpiece/S
+earplug/SM
+earring/SM
+earshot/M
+earsplitting
+earth's
+earth/UDYG
+earthbound
+earthen
+earthenware/M
+earthiness/M
+earthling/MS
+earthly/RT
+earthquake/SM
+earths/U
+earthshaking
+earthward/S
+earthwork/MS
+earthworm/MS
+earthy/RTP
+earwax/M
+earwig/SM
+ease/EDSM
+easel/SM
+easement/SM
+easily/U
+easiness/UM
+easing
+east/M
+eastbound
+easterly/SM
+eastern/ZR
+easterner/M
+easternmost
+eastward/S
+easy/URTP
+easygoing
+eat/ZGBSNR
+eatable/SM
+eaten/U
+eater/M
+eatery/SM
+eave/MS
+eavesdrop/S
+eavesdropped
+eavesdropper/SM
+eavesdropping
+ebb/SMDG
+ebony/SM
+ebullience/M
+ebullient/Y
+ebullition/M
+eccentric/SM
+eccentrically
+eccentricity/SM
+eccl
+ecclesial
+ecclesiastic/SM
+ecclesiastical/Y
+echelon/SM
+echidna
+echinoderm/SM
+echo's
+echo/ADG
+echoes/A
+echoic
+echolocation/M
+echos
+eclair/SM
+eclat/M
+eclectic/SM
+eclectically
+eclecticism/M
+eclipse/DSMG
+ecliptic/M
+eclogue/SM
+ecocide/M
+ecol
+ecologic
+ecological/Y
+ecologist/MS
+ecology/M
+econ
+econometric/S
+economic/S
+economical/UY
+economics/M
+economist/SM
+economize/DRSZG
+economizer/M
+economy/SM
+ecosystem/MS
+ecotourism/M
+ecotourist/MS
+ecru/M
+ecstasy/SM
+ecstatic
+ecstatically
+ecu/S
+ecumenical/Y
+ecumenicism/M
+ecumenism/M
+eczema/M
+ed/ACSM
+edamame
+eddy/DSMG
+edelweiss/M
+edema/SM
+edge/MZGJDRS
+edger/M
+edgewise
+edgily
+edginess/M
+edging/M
+edgy/RTP
+edibility/M
+edible/SMP
+edibleness/M
+edict/SM
+edification/M
+edifice/SM
+edifier/M
+edify/DRSZGN
+edifying/U
+edit's
+edit/ADGS
+editable
+edited/U
+edition/MS
+editor/SM
+editorial/SMY
+editorialize/DSG
+editorship/M
+educ
+educability/M
+educable/I
+educate/ADSGNV
+educated/U
+education/AM
+educational/Y
+educationalist/S
+educationist/S
+educations
+educator/MS
+educe/DSGB
+edutainment/M
+eek
+eel/SM
+eerie/RT
+eerily
+eeriness/M
+eff/GSD
+efface/DSLG
+effacement/M
+effect/SMDGV
+effective/IPY
+effectiveness/IM
+effectual/IY
+effectuate/DSG
+effeminacy/M
+effeminate/Y
+effendi/SM
+efferent
+effervesce/GDS
+effervescence/M
+effervescent/Y
+effete/YP
+effeteness/M
+efficacious/Y
+efficacy/IM
+efficiency/ISM
+efficient/IY
+effigy/SM
+efflorescence/M
+efflorescent
+effluence/M
+effluent/MS
+effluvia
+effluvium/M
+efflux
+effort/SM
+effortful
+effortless/YP
+effortlessness/M
+effrontery/M
+effulgence/M
+effulgent
+effuse/DSGNVX
+effusion/M
+effusive/YP
+effusiveness/M
+egad
+egalitarian/SM
+egalitarianism/M
+egg/GSMD
+eggbeater/MS
+eggcup/SM
+egghead/SM
+eggnog/M
+eggplant/MS
+eggshell/SM
+eglantine/SM
+ego/SM
+egocentric/MS
+egocentrically
+egocentricity/M
+egoism/M
+egoist/SM
+egoistic
+egoistical/Y
+egomania/M
+egomaniac/MS
+egotism/M
+egotist/SM
+egotistic
+egotistical/Y
+egregious/PY
+egregiousness/M
+egress/MS
+egret/SM
+eh
+eider/SM
+eiderdown/MS
+eigenvalue/S
+eigenvector/S
+eight/SM
+eighteen/MHS
+eighteenth/M
+eighteenths
+eighth/M
+eighths
+eightieth/M
+eightieths
+eighty/SMH
+einsteinium/M
+eisteddfod/S
+either
+ejaculate/GNXDS
+ejaculation/M
+ejaculatory
+eject/SDG
+ejection/MS
+ejector/SM
+eke/DSG
+elaborate/YGNDSPX
+elaborateness/M
+elaboration/M
+elan/M
+eland/SM
+elapse/DSG
+elastic/MS
+elastically
+elasticated
+elasticity/M
+elasticize/DSG
+elate/DSGN
+elated/Y
+elation/M
+elbow/SMDG
+elbowroom/M
+elder/SMY
+elderberry/SM
+eldercare/M
+eldest
+eldritch
+elect's
+elect/ASDGV
+electable
+election/AMS
+electioneer/DGS
+elective/MS
+elector/MS
+electoral/Y
+electorate/MS
+electric/S
+electrical/Y
+electrician/MS
+electricity/M
+electrification/M
+electrifier/M
+electrify/ZGNDRS
+electrocardiogram/MS
+electrocardiograph/M
+electrocardiographs
+electrocardiography/M
+electrocute/DSXGN
+electrocution/M
+electrode/SM
+electrodynamics
+electroencephalogram/MS
+electroencephalograph/M
+electroencephalographic
+electroencephalographs
+electroencephalography/M
+electrologist/SM
+electrolysis/M
+electrolyte/MS
+electrolytic
+electromagnet/MS
+electromagnetic
+electromagnetically
+electromagnetism/M
+electromotive
+electron/MS
+electronic/S
+electronica/M
+electronically
+electronics/M
+electroplate/DSG
+electroscope/SM
+electroscopic
+electroshock/M
+electrostatic/S
+electrostatics/M
+electrotype/MS
+electroweak
+eleemosynary
+elegance/IM
+elegant/IY
+elegiac/MS
+elegiacal
+elegy/SM
+elem
+element/MS
+elemental/Y
+elementary
+elephant/SM
+elephantiasis/M
+elephantine
+elev
+elevate/XDSGN
+elevation/M
+elevator/MS
+eleven/SMH
+elevens/S
+eleventh/M
+elevenths
+elf/M
+elfin
+elfish
+elicit/SDG
+elicitation/M
+elide/DSG
+eligibility/IM
+eligible
+eliminate/XDSGN
+elimination/M
+eliminator/S
+elision/MS
+elite/SM
+elitism/M
+elitist/MS
+elixir/SM
+elk/SM
+ell/SM
+ellipse/MS
+ellipsis/M
+ellipsoid/SM
+ellipsoidal
+elliptic
+elliptical/Y
+elm/SM
+elocution/M
+elocutionary
+elocutionist/SM
+elodea/SM
+elongate/DSGNX
+elongation/M
+elope/DSGL
+elopement/MS
+eloquence/M
+eloquent/Y
+else
+elsewhere
+elucidate/DSGNX
+elucidation/M
+elude/DSG
+elusive/YP
+elusiveness/M
+elver/SM
+elves
+elvish
+em's
+em/S
+emaciate/GNDS
+emaciation/M
+email/SMDG
+emanate/XDSGN
+emanation/M
+emancipate/DSGN
+emancipation/M
+emancipator/MS
+emasculate/GNDS
+emasculation/M
+embalm/SZGDR
+embalmer/M
+embank/SLGD
+embankment/SM
+embargo/MDG
+embargoes
+embark/AEGDS
+embarkation/EM
+embarkations
+embarrass/GLDS
+embarrassed/U
+embarrassing/Y
+embarrassment/SM
+embassy/SM
+embattled
+embed/S
+embedded
+embedding
+embellish/LGDS
+embellishment/SM
+ember/SM
+embezzle/ZGLDRS
+embezzlement/M
+embezzler/M
+embitter/GLDS
+embitterment/M
+emblazon/GDLS
+emblazonment/M
+emblem/SM
+emblematic
+emblematically
+embodiment/EM
+embody/AEGSD
+embolden/DGS
+embolism/MS
+embolization
+emboss/DRSZG
+embosser/M
+embouchure/M
+embower/SGD
+embrace/DSMG
+embraceable
+embrasure/MS
+embrocation/MS
+embroider/SDRZG
+embroiderer/M
+embroidery/SM
+embroil/DGLS
+embroilment/M
+embryo/SM
+embryological
+embryologist/MS
+embryology/M
+embryonic
+emcee/DSM
+emceeing
+emend/SDG
+emendation/MS
+emerald/MS
+emerge/ADSG
+emergence/AM
+emergency/SM
+emergent
+emerita
+emeritus
+emery/M
+emetic/SM
+emf/S
+emigrant/SM
+emigrate/DSXGN
+emigration/M
+emigre/SM
+eminence/MS
+eminent/Y
+emir/MS
+emirate/MS
+emissary/SM
+emission/SM
+emit/S
+emitted
+emitter/MS
+emitting
+emo/SM
+emoji/SM
+emollient/MS
+emolument/MS
+emote/XDSGNV
+emoticon/SM
+emotion/M
+emotional/UY
+emotionalism/M
+emotionalize/GDS
+emotionless
+emotive/Y
+empathetic
+empathically
+empathize/DSG
+empathy/M
+emperor/MS
+emphases
+emphasis/M
+emphasize/AGDS
+emphatic/U
+emphatically
+emphysema/M
+empire/SM
+empiric
+empirical/Y
+empiricism/M
+empiricist/SM
+emplacement/SM
+employ's
+employ/ADGLS
+employable/U
+employee/SM
+employer/SM
+employment/UAM
+employments
+emporium/SM
+empower/SDGL
+empowerment/M
+empress/MS
+emptily
+emptiness/M
+empty/TGPDRSM
+empyrean/M
+emu/SM
+emulate/DSGNVX
+emulation/M
+emulator/SM
+emulsification/M
+emulsifier/M
+emulsify/NDRSZG
+emulsion/MS
+en/SM
+enable/DRSZG
+enabler/M
+enact/ASLDG
+enactment/ASM
+enamel/JSZGMDR
+enameler/M
+enamelware/M
+enamor/SGD
+enc
+encamp/LSGD
+encampment/MS
+encapsulate/XGNDS
+encapsulation/M
+encase/LDSG
+encasement/M
+encephalitic
+encephalitis/M
+enchain/DGS
+enchant/ELDGS
+enchanter/MS
+enchanting/Y
+enchantment/EM
+enchantments
+enchantress/MS
+enchilada/SM
+encipher/SGD
+encircle/DSGL
+encirclement/M
+encl
+enclave/MS
+enclose/GDS
+enclosed/U
+enclosure/SM
+encode/DRSZG
+encoder/M
+encomium/MS
+encompass/GDS
+encore/DSMG
+encounter/GSMD
+encourage/DSLG
+encouragement/SM
+encouraging/Y
+encroach/GLDS
+encroachment/SM
+encrust/DGS
+encrustation/SM
+encrypt/DGS
+encryption
+encumber/EGSD
+encumbered/U
+encumbrance/MS
+ency
+encyclical/SM
+encyclopedia/MS
+encyclopedic
+encyst/LSGD
+encystment/M
+end/GVSJMD
+endanger/SGDL
+endangerment/M
+endear/SGLD
+endearing/Y
+endearment/SM
+endeavor/GSMD
+endemic/MS
+endemically
+endgame/S
+ending/M
+endive/SM
+endless/PY
+endlessness/M
+endmost
+endocarditis
+endocrine/MS
+endocrinologist/MS
+endocrinology/M
+endogenous/Y
+endometrial
+endometriosis
+endometrium
+endorphin/MS
+endorse/LZGDRS
+endorsement/MS
+endorser/M
+endoscope/MS
+endoscopic
+endoscopy/M
+endothelial
+endothermic
+endotracheal
+endow/SDLG
+endowment/MS
+endpoint/SM
+endue/DSG
+endurable/U
+endurance/M
+endure/DSBG
+endways
+enema/SM
+enemy/SM
+energetic
+energetically
+energize/ZGDRS
+energizer/M
+energy/SM
+enervate/GNDS
+enervation/M
+enfeeble/GDSL
+enfeeblement/M
+enfilade/DSMG
+enfold/SGD
+enforce/LZGDRS
+enforceable/U
+enforced/U
+enforcement/M
+enforcer/M
+enfranchise/EGDSL
+enfranchisement/EM
+engage/EADSG
+engagement/EMS
+engagingly
+engender/SGD
+engine/SM
+engineer/MDGS
+engineering/M
+engorge/LGDS
+engorgement/M
+engram/SM
+engrave/ZGJDRS
+engraver/M
+engraving/M
+engross/GLDS
+engrossment/M
+engulf/SLGD
+engulfment/M
+enhance/LZGDRS
+enhancement/SM
+enigma/SM
+enigmatic
+enigmatically
+enjambment/SM
+enjoin/SGD
+enjoy/GBLSD
+enjoyably
+enjoyment/SM
+enlarge/LZGDRS
+enlargeable
+enlargement/MS
+enlarger/M
+enlighten/SGLD
+enlightened/U
+enlightenment/M
+enlist/ADGSL
+enlistee/SM
+enlistment/AM
+enlistments
+enliven/SLDG
+enlivenment/M
+enmesh/DSGL
+enmeshment/M
+enmity/SM
+ennoble/DSGL
+ennoblement/M
+ennui/M
+enormity/SM
+enormous/PY
+enormousness/M
+enough/M
+enplane/DSG
+enqueue/DS
+enquirer/S
+enquiringly
+enrage/GDS
+enrapture/DSG
+enrich/DSLG
+enrichment/M
+enroll/DLSG
+enrollment/MS
+ensconce/DSG
+ensemble/SM
+enshrine/GLDS
+enshrinement/M
+enshroud/DGS
+ensign/MS
+ensilage/M
+enslave/DSGL
+enslavement/M
+ensnare/DSLG
+ensnarement/M
+ensue/DSG
+ensure/ZGDRS
+ensurer/M
+entail/DSGL
+entailment/M
+entangle/EDSLG
+entanglement/EM
+entanglements
+entente/SM
+enter/ASGD
+enteral
+enteric
+enteritis/M
+enterprise/MGS
+enterprising/Y
+entertain/ZGDRSL
+entertainer/M
+entertaining/MY
+entertainment/MS
+enthrall/GDSL
+enthrallment/M
+enthrone/GDSL
+enthronement/SM
+enthuse/DSG
+enthusiasm/MS
+enthusiast/MS
+enthusiastic/U
+enthusiastically
+entice/GDSL
+enticement/MS
+enticing/Y
+entire/Y
+entirety/M
+entitle/DSGL
+entitlement/SM
+entity/SM
+entomb/DSGL
+entombment/M
+entomological
+entomologist/MS
+entomology/M
+entourage/SM
+entr'acte
+entrails/M
+entrained
+entrance/LDSMG
+entrancement/M
+entrancing/Y
+entrant/SM
+entrap/LS
+entrapment/M
+entrapped
+entrapping
+entreat/GSD
+entreating/Y
+entreaty/SM
+entree/MS
+entrench/DSGL
+entrenchment/MS
+entrepreneur/SM
+entrepreneurial
+entrepreneurship
+entropy/M
+entrust/SGD
+entry/ASM
+entryphone/S
+entryway/MS
+entwine/DSG
+enumerable
+enumerate/DSGNX
+enumeration/M
+enumerator/SM
+enunciate/DSGN
+enunciation/M
+enuresis/M
+envelop/SLDRZG
+envelope/SM
+enveloper/M
+envelopment/M
+envenom/SDG
+enviable/U
+enviably
+envious/PY
+enviousness/M
+environment/MS
+environmental/Y
+environmentalism/M
+environmentalist/SM
+environs/M
+envisage/GDS
+envision/DGS
+envoy/SM
+envy/DSMG
+envying/Y
+enzymatic
+enzyme/SM
+eolian
+eon/SM
+eosinophil/S
+eosinophilic
+epaulet/SM
+epee/MS
+ephedrine/M
+ephemera/M
+ephemeral/Y
+epic/MS
+epicenter/MS
+epicure/SM
+epicurean/MS
+epidemic/SM
+epidemically
+epidemiological
+epidemiologist/SM
+epidemiology/M
+epidermal
+epidermic
+epidermis/MS
+epidural/S
+epiglottis/MS
+epigram/SM
+epigrammatic
+epigraph/M
+epigraphs
+epigraphy/M
+epilepsy/M
+epileptic/SM
+epilogue/MS
+epinephrine/M
+epiphany/SM
+episcopacy/M
+episcopal
+episcopate/M
+episode/SM
+episodic
+episodically
+epistemic
+epistemological
+epistemology
+epistle/SM
+epistolary
+epitaph/M
+epitaphs
+epithelial
+epithelium/M
+epithet/SM
+epitome/SM
+epitomize/GDS
+epoch/M
+epochal
+epochs
+eponymous
+epoxy/DSMG
+epsilon/SM
+equability/M
+equable
+equably
+equal/SMDYG
+equality/IM
+equalization/M
+equalize/ZGDRS
+equalizer/M
+equanimity/M
+equate/DSGNBX
+equation/M
+equator/SM
+equatorial
+equerry/SM
+equestrian/SM
+equestrianism/M
+equestrienne/SM
+equidistant/Y
+equilateral/SM
+equilibrium/EM
+equine/SM
+equinoctial
+equinox/MS
+equip/AS
+equipage/MS
+equipment/M
+equipoise/M
+equipped/UA
+equipping/A
+equitable/I
+equitably/I
+equitation/M
+equity/ISM
+equiv
+equivalence/MS
+equivalency/SM
+equivalent/MYS
+equivocal/UY
+equivocalness/M
+equivocate/GNXDS
+equivocation/M
+equivocator/SM
+er/C
+era/SM
+eradicable/I
+eradicate/DSGN
+eradication/M
+eradicator/MS
+erase/DRSBZG
+eraser/M
+erasure/SM
+erbium/M
+ere
+erect/PSGDY
+erectile
+erection/SM
+erectness/M
+erector/MS
+erelong
+eremite/MS
+erg/SM
+ergo
+ergonomic/S
+ergonomically
+ergonomics/M
+ergosterol/M
+ergot/M
+ermine/SM
+erode/DSG
+erodible
+erogenous
+erosion/M
+erosive
+erotic/S
+erotica/M
+erotically
+eroticism/M
+err/GSD
+errand/SM
+errant/I
+errata/SM
+erratic
+erratically
+erratum/M
+erroneous/Y
+error/SM
+ersatz/MS
+erst
+erstwhile
+eruct/SDG
+eructation/SM
+erudite/YN
+erudition/M
+erupt/SDGV
+eruption/MS
+erysipelas/M
+erythrocyte/SM
+erythromycin
+escalate/CDSGN
+escalation/CM
+escalations
+escalator/MS
+escallop/SGMD
+escalope/S
+escapade/MS
+escape/LMGDS
+escapee/MS
+escapement/SM
+escapism/M
+escapist/MS
+escapologist/S
+escapology
+escargot/MS
+escarole/MS
+escarpment/MS
+eschatological
+eschatology
+eschew/SDG
+escort/SMDG
+escritoire/MS
+escrow/SM
+escudo/SM
+escutcheon/SM
+esophageal
+esophagi
+esophagus/M
+esoteric
+esoterically
+esp
+espadrille/MS
+espalier/MDSG
+especial/Y
+espionage/M
+esplanade/MS
+espousal/M
+espouse/GDS
+espresso/MS
+esprit/M
+espy/DSG
+esquire/SM
+essay/SMDRZG
+essayer/M
+essayist/SM
+essence/SM
+essential/IMS
+essentially
+establish/AESDGL
+establishment/AEM
+establishments
+estate/SM
+esteem/ESMDG
+ester/SM
+estimable/I
+estimate/MGNDSX
+estimation/M
+estimator/SM
+estoppel
+estradiol
+estrange/LDSG
+estrangement/MS
+estrogen/MS
+estrous
+estrus/MS
+estuary/SM
+eta/SM
+etc
+etch/DRSZGJ
+etcher/M
+etching/M
+eternal/YP
+eternalness/M
+eternity/SM
+ethane/M
+ethanol/M
+ether/M
+ethereal/Y
+ethic/SM
+ethical/UY
+ethics/M
+ethmoid
+ethnic/SM
+ethnically
+ethnicity/M
+ethnocentric
+ethnocentrism/M
+ethnographer/S
+ethnographic
+ethnographically
+ethnography
+ethnological/Y
+ethnologist/SM
+ethnology/M
+ethological
+ethologist/MS
+ethology/M
+ethos/M
+ethyl/M
+ethylene/M
+etiolated
+etiologic
+etiological
+etiology/SM
+etiquette/M
+etude/SM
+etymological/Y
+etymologist/SM
+etymology/SM
+eucalypti
+eucalyptus/MS
+euchre/DSMG
+euclidean
+eugenic/S
+eugenically
+eugenicist/MS
+eugenics/M
+eukaryote/SM
+eukaryotic
+eulogist/MS
+eulogistic
+eulogize/ZGDRS
+eulogizer/M
+eulogy/SM
+eunuch/M
+eunuchs
+euphemism/SM
+euphemistic
+euphemistically
+euphonious/Y
+euphony/M
+euphoria/M
+euphoric
+euphorically
+eureka
+euro/MS
+europium/M
+eutectic
+euthanasia/M
+euthanize/DSG
+euthenics/M
+eutrophication
+evacuate/XDSGN
+evacuation/M
+evacuee/MS
+evade/DRSZG
+evader/M
+evaluate/AGNVDSX
+evaluation/AM
+evaluator/S
+evanescence/M
+evanescent
+evangelic
+evangelical/SMY
+evangelicalism/M
+evangelism/M
+evangelist/MS
+evangelistic
+evangelize/GDS
+evaporate/GNDS
+evaporation/M
+evaporator/SM
+evasion/SM
+evasive/YP
+evasiveness/M
+eve/ASM
+even/MDRYTGSJP
+evenhanded/Y
+evening/M
+evenness/UM
+evensong/M
+event/SM
+eventful/UY
+eventfulness/M
+eventide/M
+eventual/Y
+eventuality/SM
+eventuate/GDS
+ever
+everglade/SM
+evergreen/SM
+everlasting/MYS
+evermore
+every
+everybody/M
+everyday
+everyone/M
+everyplace
+everything/M
+everywhere
+evict/SDG
+eviction/MS
+evidence/MGDS
+evident/Y
+evil/MRYTSP
+evildoer/SM
+evildoing/M
+eviller
+evillest
+evilness/M
+evince/DSG
+eviscerate/DSGN
+evisceration/M
+evocation/MS
+evocative/Y
+evoke/DSG
+evolution/M
+evolutionary
+evolutionist/SM
+evolve/DSG
+ewe/RSMZ
+ewer/M
+ex/MS
+exabyte/MS
+exacerbate/GNDS
+exacerbation/M
+exact/SPDRYTG
+exacting/Y
+exaction/M
+exactitude/M
+exactness/IM
+exaggerate/XDSGN
+exaggerated/Y
+exaggeration/M
+exaggerator/MS
+exajoule/S
+exalt/SDG
+exaltation/M
+exam/MS
+examination/AMS
+examine/AGDS
+examiner/MS
+example/MGDS
+exampled/U
+exasperate/DSGN
+exasperated/Y
+exasperating/Y
+exasperation/M
+excavate/GNDSX
+excavation/M
+excavator/SM
+exceed/GSD
+exceeding/Y
+excel/S
+excelled
+excellence/M
+excellency/SM
+excellent/Y
+excelling
+excelsior/M
+except/GSD
+exception/BSM
+exceptionable/U
+exceptional/UY
+exceptionalism
+excerpt/MDGS
+excess/VMS
+excessive/Y
+exchange/DSMG
+exchangeable
+exchequer/SM
+excise/XDSMGN
+excision/M
+excitability/M
+excitably
+excitation/M
+excite/BDRSLZG
+excited/Y
+excitement/SM
+exciter/M
+exciting/Y
+exciton
+excl
+exclaim/DGS
+exclamation/SM
+exclamatory
+exclude/GDS
+exclusion/MS
+exclusionary
+exclusive/PMYS
+exclusiveness/M
+exclusivity/M
+excommunicate/GNDSX
+excommunication/M
+excoriate/DSGNX
+excoriation/M
+excrement/M
+excremental
+excrescence/MS
+excrescent
+excreta/M
+excrete/XGNDS
+excretion/M
+excretory
+excruciating/Y
+exculpate/DSGN
+exculpation/M
+exculpatory
+excursion/MS
+excursionist/MS
+excursive/YP
+excursiveness/M
+excusable/I
+excusably/I
+excuse/DSBMG
+excused/U
+exec/MS
+execrable
+execrably
+execrate/DSGN
+execration/M
+execute/BXGNVDS
+execution/ZMR
+executioner/M
+executive/SM
+executor/MS
+executrices
+executrix/M
+exegeses
+exegesis/M
+exegetic
+exegetical
+exemplar/SM
+exemplary
+exemplification/M
+exemplify/GDSXN
+exempt/SGD
+exemption/SM
+exercise/DRSMZG
+exerciser/M
+exert/SDG
+exertion/MS
+exeunt
+exfoliate/GNDS
+exhalation/MS
+exhale/DSG
+exhaust/GVMDS
+exhaustible/I
+exhaustion/M
+exhaustive/YP
+exhaustiveness/M
+exhibit/GMDS
+exhibition/MS
+exhibitionism/M
+exhibitionist/MS
+exhibitor/SM
+exhilarate/DSGN
+exhilaration/M
+exhort/SDG
+exhortation/MS
+exhumation/MS
+exhume/DSG
+exigence/MS
+exigency/SM
+exigent
+exiguity/M
+exiguous
+exile/DSMG
+exilic
+exist/SDG
+existence/MS
+existent
+existential/Y
+existentialism/M
+existentialist/MS
+exit/MDGS
+exobiology/M
+exodus/MS
+exogenous
+exon/MS
+exonerate/GNDS
+exoneration/M
+exoplanet/MS
+exorbitance/M
+exorbitant/Y
+exorcise/DSG
+exorcism/SM
+exorcist/SM
+exoskeleton/SM
+exosphere/SM
+exothermic
+exotic/SM
+exotica
+exotically
+exoticism/M
+exp
+expand/BGSD
+expanse/XMNVS
+expansible
+expansion/M
+expansionary
+expansionism/M
+expansionist/MS
+expansive/YP
+expansiveness/M
+expat/S
+expatiate/GNDS
+expatiation/M
+expatriate/DSMGN
+expatriation/M
+expect/GSD
+expectancy/M
+expectant/Y
+expectation/SM
+expectorant/SM
+expectorate/DSGN
+expectoration/M
+expedience/IM
+expediences
+expediencies
+expediency/IM
+expedient/SMY
+expedite/DRSZGNX
+expediter/M
+expedition/M
+expeditionary
+expeditious/PY
+expeditiousness/M
+expel/S
+expelled
+expelling
+expend/GSBD
+expendable/SM
+expenditure/SM
+expense/MS
+expensive/IYP
+expensiveness/IM
+experience/IMD
+experiences
+experiencing
+experiential
+experiment/MDRSZG
+experimental/Y
+experimentation/M
+experimenter/M
+expert/SPMY
+expertise/M
+expertness/M
+expiate/GNDS
+expiation/M
+expiatory
+expiration/M
+expire/DSG
+expired/U
+expiry/M
+explain/ADGS
+explainable
+explained/U
+explanation/MS
+explanatory
+expletive/MS
+explicable/I
+explicate/XGNDS
+explication/M
+explicit/PY
+explicitness/M
+explode/GDS
+exploit/ZGBMDRS
+exploitation/M
+exploitative
+exploited/U
+exploiter/M
+exploration/MS
+exploratory
+explore/ZGDRS
+explored/U
+explorer/M
+explosion/SM
+explosive/SPMY
+explosiveness/M
+expo/MS
+exponent/MS
+exponential/Y
+exponentiation
+export/BSZGMDR
+exportation/M
+exporter/M
+expose/DSMG
+exposed/U
+exposition/SM
+expositor/SM
+expository
+expostulate/GNXDS
+expostulation/M
+exposure/MS
+expound/ZGDRS
+expounder/M
+express/GVMDSY
+expressed/U
+expressible/I
+expression/SM
+expressionism/M
+expressionist/SM
+expressionistic
+expressionless/Y
+expressive/PY
+expressiveness/M
+expressway/SM
+expropriate/GNXDS
+expropriation/M
+expropriator/SM
+expulsion/MS
+expunge/GDS
+expurgate/DSGNX
+expurgated/U
+expurgation/M
+exquisite/YP
+exquisiteness/M
+ext
+extant
+extemporaneous/PY
+extemporaneousness/M
+extempore
+extemporization/M
+extemporize/GDS
+extend/SZGDRB
+extender/M
+extensibility
+extensible
+extension/SM
+extensional
+extensive/YP
+extensiveness/M
+extent/SM
+extenuate/DSGN
+extenuation/M
+exterior/MS
+exterminate/DSXGN
+extermination/M
+exterminator/MS
+external/MYS
+externalization/SM
+externalize/DSG
+extinct/GDS
+extinction/MS
+extinguish/ZGBDRS
+extinguishable/I
+extinguisher/M
+extirpate/GNDS
+extirpation/M
+extol/S
+extolled
+extolling
+extort/SGD
+extortion/MRZ
+extortionate/Y
+extortioner/M
+extortionist/MS
+extra/SM
+extracellular
+extract/MDGVS
+extraction/SM
+extractor/MS
+extracurricular
+extradite/GNBXDS
+extradition/M
+extrajudicial
+extralegal
+extramarital
+extramural
+extraneous/Y
+extraordinaire
+extraordinarily
+extraordinary
+extrapolate/XGNDS
+extrapolation/M
+extrasensory
+extraterrestrial/MS
+extraterritorial
+extraterritoriality/M
+extravagance/MS
+extravagant/Y
+extravaganza/MS
+extravehicular
+extreme/PMYTRS
+extremeness/M
+extremism/M
+extremist/MS
+extremity/SM
+extricable/I
+extricate/GNDS
+extrication/M
+extrinsic
+extrinsically
+extroversion/M
+extrovert/SMD
+extrude/GDS
+extrusion/SM
+extrusive
+exuberance/M
+exuberant/Y
+exudation/M
+exude/DSG
+exult/SDG
+exultant/Y
+exultation/M
+exurb/SM
+exurban
+exurbanite/SM
+exurbia/M
+eye/DSM
+eyeball/GMDS
+eyebrow/SM
+eyedropper/SM
+eyeful/SM
+eyeglass/MS
+eyeing
+eyelash/MS
+eyeless
+eyelet/SM
+eyelid/SM
+eyeliner/MS
+eyeopener/MS
+eyeopening
+eyepiece/MS
+eyesight/M
+eyesore/MS
+eyestrain/M
+eyeteeth
+eyetooth/M
+eyewash/M
+eyewitness/MS
+f/CIAVTR
+fMRI
+fa/M
+fab
+fable/DSM
+fabric/SM
+fabricate/DSGNX
+fabrication/M
+fabricator/SM
+fabulous/Y
+facade/SM
+face's
+face/ACSDG
+facecloth/M
+facecloths
+faceless
+facepalm/SDG
+facet/SMDG
+facetious/YP
+facetiousness/M
+facial/SMY
+facile/Y
+facilitate/GNDS
+facilitation/M
+facilitator/MS
+facility/SM
+facing/SM
+facsimile/DSM
+facsimileing
+fact/MS
+faction/SM
+factional
+factionalism/M
+factious
+factitious
+factoid/SM
+factor's
+factor/ASDG
+factorial/MS
+factorization
+factorize/GDS
+factory/SM
+factotum/SM
+factual/Y
+faculty/SM
+fad/GSMD
+faddish/P
+faddist/MS
+faddy/P
+fade/MS
+fading/U
+faerie/SM
+faff/DGS
+fag/SM
+fagged
+fagging
+faggot/SM
+fagot/SMG
+faience/M
+fail/DGJS
+failing/M
+faille/M
+failure/SM
+fain/RT
+faint/SMDRYTGP
+fainthearted
+faintness/M
+fair/MRYTGJPS
+fairground/MS
+fairing/M
+fairness/UM
+fairway/SM
+fairy/SM
+fairyland/SM
+faith/M
+faithful's
+faithful/UPY
+faithfulness/UM
+faithfuls
+faithless/PY
+faithlessness/M
+faiths
+fajita/SM
+fajitas/M
+fake/MZGDRS
+faker/M
+fakir/SM
+falcon/SMRZ
+falconer/M
+falconry/M
+fall/MNGS
+fallacious/Y
+fallacy/SM
+fallback
+fallibility/IM
+fallible/P
+fallibleness/M
+fallibly/I
+falloff/SM
+fallout/M
+fallow/SMDG
+false/PRYT
+falsehood/SM
+falseness/M
+falsetto/SM
+falsie/SM
+falsifiable
+falsification/M
+falsifier/M
+falsify/DRSZGNX
+falsity/SM
+falter/GSJMD
+faltering/Y
+fame's
+fame/D
+familial
+familiar/MYS
+familiarity/UM
+familiarization/M
+familiarize/GDS
+family/SM
+famine/SM
+famish/DSG
+famous/IY
+fan/SM
+fanatic/SM
+fanatical/Y
+fanaticism/M
+fanboy/SM
+fanciable
+fancier/M
+fanciful/YP
+fancifulness/M
+fancily
+fanciness/M
+fancy/DRSMZTGP
+fancywork/M
+fandango/MS
+fandom
+fanfare/SM
+fang/MDS
+fanlight/SM
+fanned
+fanning
+fanny/SM
+fantail/MS
+fantasia/SM
+fantasist/S
+fantasize/GDS
+fantastic
+fantastical/Y
+fantasy/DSMG
+fanzine/MS
+far
+farad/SM
+faradize/DG
+faraway
+farce/SM
+farcical/Y
+fare/MGDS
+farewell/SM
+farina/M
+farinaceous
+farm/MDRZGSJ
+farmer/M
+farmhand/SM
+farmhouse/SM
+farming/M
+farmland/MS
+farmstead/MS
+farmyard/MS
+faro/M
+farrago/M
+farragoes
+farrier/MS
+farrow/SMDG
+farseeing
+farsighted/P
+farsightedness/M
+fart/MDGS
+farther
+farthermost
+farthest
+farthing/SM
+fascia/SM
+fascicle/SM
+fascinate/GNDSX
+fascinating/Y
+fascination/M
+fascism/M
+fascist/MS
+fascistic
+fashion/ZGBMDRS
+fashionable/U
+fashionably/U
+fashioner/M
+fashionista/MS
+fast/MDRTGSP
+fastback/SM
+fastball/SM
+fasten/UAGDS
+fastener/SM
+fastening/MS
+fastidious/PY
+fastidiousness/M
+fastness/MS
+fat/GSPMD
+fatal/Y
+fatalism/M
+fatalist/SM
+fatalistic
+fatalistically
+fatality/SM
+fatback/M
+fate/MS
+fateful/YP
+fatefulness/M
+fathead/MDS
+father/SGMDY
+fatherhood/M
+fatherland/MS
+fatherless
+fathom/SMDGB
+fathomable/U
+fathomless
+fatigue/MDSG
+fatigues/M
+fatness/M
+fatso/S
+fatten/SDG
+fatter
+fattest
+fattiness/M
+fatty/RSMTP
+fatuity/M
+fatuous/YP
+fatuousness/M
+fatwa/SM
+faucet/SM
+fault/CSMDG
+faultfinder/SM
+faultfinding/M
+faultily
+faultiness/M
+faultless/PY
+faultlessness/M
+faulty/PRT
+faun/MS
+fauna/SM
+fauvism/M
+fauvist/SM
+faux
+fave/S
+favor/ESMDG
+favorable/U
+favorably/U
+favorite/SM
+favoritism/M
+fawn/MDRZGS
+fawner/M
+fax/GMDS
+fay/TSMR
+faze/GDS
+fazed/U
+fealty/M
+fear/MDGS
+fearful/YP
+fearfulness/M
+fearless/PY
+fearlessness/M
+fearsome
+feasibility/M
+feasible/IU
+feasibly
+feast/SMDRZG
+feaster/M
+feat/MS
+feather/SGMD
+featherbedding/M
+featherbrained
+featherless
+featherweight/MS
+feathery/TR
+feature/DSMG
+featureless
+febrile
+fecal
+feces/M
+feckless/PY
+fecund
+fecundate/GNDS
+fecundation/M
+fecundity/M
+fed/SM
+federal/SMY
+federalism/M
+federalist/MS
+federalization/M
+federalize/GDS
+federate/FXDSGN
+federation/FM
+fedora/SM
+fee/SM
+feeble/RTP
+feebleness/M
+feebly
+feed/MRZGSJ
+feedback/M
+feedbag/SM
+feeder/M
+feeding/M
+feedlot/SM
+feel/MRZGSJ
+feeler/M
+feelgood
+feeling/MY
+feet
+feign/SDG
+feigned/U
+feint/SMDG
+feisty/TR
+feldspar/M
+felicitate/GNXDS
+felicitation/M
+felicitous/Y
+felicity/ISM
+feline/SM
+fell/MDRZTGS
+fella/S
+fellatio/M
+fellow/SM
+fellowman/M
+fellowmen
+fellowship/MS
+felon/SM
+felonious
+felony/SM
+felt/MDGS
+fem
+female/PSM
+femaleness/M
+feminine/SMY
+femininity/M
+feminism/M
+feminist/SM
+feminize/DSG
+femoral
+femur/SM
+fen/SM
+fence/DRSMZG
+fencer/M
+fencing/M
+fend/CDRZGS
+fender/CM
+fenestration/M
+fennel/M
+fentanyl/M
+feral
+ferment/FCMS
+fermentation/M
+fermented
+fermenting
+fermium/M
+fern/MS
+ferny/RT
+ferocious/PY
+ferociousness/M
+ferocity/M
+ferret/GSMD
+ferric
+ferromagnetic
+ferromagnetism
+ferrous
+ferrule/MS
+ferry/DSMG
+ferryboat/SM
+ferryman/M
+ferrymen
+fertile/I
+fertility/IM
+fertilization/M
+fertilize/DRSZG
+fertilized/U
+fertilizer/M
+ferule/SM
+fervency/M
+fervent/Y
+fervid/Y
+fervor/M
+fess/FKGSD
+fest/MRZVS
+festal
+fester/GMD
+festival/SM
+festive/YP
+festiveness/M
+festivity/SM
+festoon/GMDS
+feta/M
+fetal
+fetch/DRSZG
+fetcher/M
+fetching/Y
+fete/MGDS
+fetid/P
+fetidness/M
+fetish/MS
+fetishism/M
+fetishist/SM
+fetishistic
+fetlock/MS
+fetter's
+fetter/USGD
+fettle/M
+fettuccine/M
+fetus/MS
+feud/MDGS
+feudal
+feudalism/M
+feudalistic
+fever/SMD
+feverish/YP
+feverishness/M
+few/TPMR
+fewness/M
+fey
+fez/M
+fezzes
+ff
+fiance/CM
+fiancee/MS
+fiances
+fiasco/M
+fiascoes
+fiat/MS
+fib/ZSMR
+fibbed
+fibber/SM
+fibbing
+fiber/M
+fiberboard/M
+fiberfill/M
+fiberglass/M
+fibril/SM
+fibrillate/GNDS
+fibrillation/M
+fibrin/M
+fibroid
+fibrosis/M
+fibrous
+fibula/M
+fibulae
+fibular
+fiche/SM
+fichu/SM
+fickle/RPT
+fickleness/M
+fiction/MS
+fictional/Y
+fictionalization/SM
+fictionalize/DSG
+fictitious/Y
+fictive
+ficus/M
+fiddle/DRSMZG
+fiddler/M
+fiddlesticks
+fiddly/TR
+fidelity/IM
+fidget/SGMD
+fidgety
+fiduciary/SM
+fie
+fief/MS
+fiefdom/MS
+field/ISMRZ
+fielded
+fielder/IM
+fielding
+fieldsman
+fieldsmen
+fieldwork/MRZ
+fieldworker/M
+fiend/SM
+fiendish/Y
+fierce/PRYT
+fierceness/M
+fieriness/M
+fiery/RPT
+fiesta/SM
+fife/MZRS
+fifer/M
+fifteen/MHS
+fifteenth/M
+fifteenths
+fifth/MY
+fifths
+fiftieth/M
+fiftieths
+fifty/SMH
+fig/SLM
+fight/SMRZG
+fightback
+fighter/IMS
+fighting/IM
+figment/MS
+figuration/FM
+figurative/Y
+figure's
+figure/FEGSD
+figurehead/SM
+figurine/MS
+filament/MS
+filamentous
+filbert/MS
+filch/DSG
+file's/KC
+file/CAKGDS
+filename/S
+filer/CSM
+filet
+filial
+filibuster/MDRSZG
+filibusterer/M
+filigree/DSM
+filigreeing
+filing's
+filings
+fill's
+fill/AIDGS
+filled/U
+filler/MS
+fillet/MDGS
+filling/SM
+fillip/MDGS
+filly/SM
+film/MDGS
+filminess/M
+filmmaker/SM
+filmstrip/MS
+filmy/TPR
+filo
+filter/MDRBSZG
+filtered/U
+filterer/M
+filth/M
+filthily
+filthiness/M
+filthy/RPT
+filtrate's
+filtrate/IGNDS
+filtration/IM
+fin/SMR
+finagle/DRSZG
+finagler/M
+final/SMY
+finale/MS
+finalist/SM
+finality/M
+finalization/M
+finalize/DSG
+finance's
+finance/ADSG
+financial/Y
+financier/MS
+financing/M
+finch/MS
+find/JMRZGS
+finder/M
+finding/M
+findings/M
+fine's/F
+fine/CAFTGDS
+finely
+fineness/M
+finery/AM
+finespun
+finesse/DSMG
+finger/MDGSJ
+fingerboard/SM
+fingering/M
+fingerling/SM
+fingermark/S
+fingernail/SM
+fingerprint/SGMD
+fingertip/MS
+finial/MS
+finical
+finickiness/M
+finicky/RPT
+finis/MS
+finish's
+finish/ADSG
+finished/U
+finisher/MS
+finite/IY
+fink/MDGS
+finned
+finny
+fir/ZGSJMDRH
+fire/MS
+firearm/SM
+fireball/MS
+firebomb/MDSJG
+firebox/MS
+firebrand/SM
+firebreak/SM
+firebrick/SM
+firebug/SM
+firecracker/SM
+firedamp/M
+firefight/MRSZG
+firefighter/M
+firefighting/M
+firefly/SM
+fireguard/S
+firehouse/SM
+firelight/ZMR
+fireman/M
+firemen
+fireplace/SM
+fireplug/MS
+firepower/M
+fireproof/DSG
+firer/M
+firescreen/S
+fireside/MS
+firestorm/MS
+firetrap/MS
+firetruck/MS
+firewall/MS
+firewater/M
+firewood/M
+firework/SM
+firm/MDRYPTGS
+firmament/SM
+firmness/M
+firmware/M
+first/SMY
+firstborn/SM
+firsthand
+firth/M
+firths
+fiscal/MYS
+fish/MDRSZG
+fishbowl/SM
+fishcake/SM
+fisher/M
+fisherman/M
+fishermen
+fishery/SM
+fishhook/SM
+fishily
+fishiness/M
+fishing/M
+fishmonger/MS
+fishnet/SM
+fishpond/MS
+fishtail/DGS
+fishwife/M
+fishwives
+fishy/TRP
+fissile
+fission/BM
+fissure/SM
+fist/MS
+fistfight/MS
+fistful/SM
+fisticuffs/M
+fistula/SM
+fistulous/M
+fit/KAMS
+fitful/YP
+fitfulness/M
+fitly
+fitment/S
+fitness/UM
+fitted/UA
+fitter/MS
+fittest
+fitting/SMY
+five/MZRS
+fix/ZGBJMDRS
+fixate/GNVDSX
+fixation/M
+fixative/MS
+fixed/Y
+fixer/M
+fixings/M
+fixity/M
+fixture/MS
+fizz/MDSG
+fizzle/DSMG
+fizzy/RT
+fjord/SM
+fl/JDG
+flab/M
+flabbergast/SGD
+flabbily
+flabbiness/M
+flabby/RPT
+flaccid/Y
+flaccidity/M
+flack/SM
+flag/MS
+flagella
+flagellant/S
+flagellate/GNDS
+flagellation/M
+flagellum/M
+flagged
+flagging/U
+flagman/M
+flagmen
+flagon/MS
+flagpole/SM
+flagrance/M
+flagrancy/M
+flagrant/Y
+flagship/SM
+flagstaff/MS
+flagstone/MS
+flail/SGMD
+flair/SM
+flak/M
+flake/DSMG
+flakiness/M
+flaky/TRP
+flamage
+flambe/MS
+flambeed
+flambeing
+flamboyance/M
+flamboyancy/M
+flamboyant/Y
+flame/DRSJMZG
+flamenco/MS
+flameproof/DGS
+flamethrower/SM
+flamingo/MS
+flammability/IM
+flammable/SM
+flan/MS
+flange/MS
+flank/SZGMDR
+flanker/M
+flannel/SGMD
+flannelette/M
+flap/MS
+flapjack/MS
+flapped
+flapper/SM
+flapping
+flare/DSMG
+flareup/SM
+flash/ZTGMDRS
+flashback/SM
+flashbulb/SM
+flashcard/SM
+flashcube/SM
+flasher/M
+flashgun/SM
+flashily
+flashiness/M
+flashing/M
+flashlight/MS
+flashy/RTP
+flask/SM
+flat/MYPS
+flatbed/SM
+flatboat/SM
+flatbread
+flatcar/SM
+flatfeet
+flatfish/MS
+flatfoot/SMD
+flatiron/SM
+flatland/M
+flatlet/S
+flatmate/S
+flatness/M
+flatted
+flatten/SDG
+flatter/SDRZG
+flatterer/M
+flattering/Y
+flattery/M
+flattest
+flatting
+flattish
+flattop/SM
+flatulence/M
+flatulent
+flatus/M
+flatware/M
+flatworm/SM
+flaunt/MDSG
+flaunting/Y
+flavor/MDSGJ
+flavored/U
+flavorful
+flavoring/M
+flavorless
+flavorsome
+flaw/MDGS
+flawless/PY
+flawlessness/M
+flax/MN
+flay/DGS
+flea/MS
+fleabag/SM
+fleabite/S
+fleapit/S
+fleck/SGMD
+fledged/U
+fledgling/MS
+flee/S
+fleece/MZGDRS
+fleecer/M
+fleeciness/M
+fleecy/RTP
+fleeing
+fleet/STGMDRYP
+fleetingly/M
+fleetingness/M
+fleetness/M
+flesh/GMDSY
+fleshly/TR
+fleshpot/MS
+fleshy/RT
+flew
+flex/AMS
+flexed
+flexibility/IM
+flexible/I
+flexibly/I
+flexing
+flexion
+flextime/M
+flibbertigibbet/SM
+flick/SZGMDR
+flicker/GMD
+flier/M
+flight/MS
+flightiness/M
+flightless
+flighty/PTR
+flimflam/SM
+flimflammed
+flimflamming
+flimsily
+flimsiness/M
+flimsy/TRP
+flinch/GMDS
+fling/GM
+flint/SM
+flintlock/SM
+flinty/TR
+flip/MS
+flippancy/M
+flippant/Y
+flipped
+flipper/MS
+flippest
+flipping
+flippy/S
+flirt/SGMD
+flirtation/MS
+flirtatious/YP
+flirtatiousness/M
+flirty
+flit/MS
+flitted
+flitting
+float/SMDRZG
+floater/M
+flock/SMDG
+flocking/M
+floe/MS
+flog/S
+flogged
+flogger/SM
+flogging/MS
+flood/SMDRG
+floodgate/MS
+floodlight/MDSG
+floodlit
+floodplain/MS
+floodwater/MS
+floor/SMDG
+floorboard/MS
+flooring/M
+floorwalker/SM
+floozy/SM
+flop/MS
+flophouse/MS
+flopped
+floppily
+floppiness/M
+flopping
+floppy/PRSMT
+flora/SM
+floral
+florescence/IM
+florescent/I
+floret/SM
+florid/PY
+floridness/M
+florin/SM
+florist/SM
+floss/MDSG
+flossy/RT
+flotation/SM
+flotilla/MS
+flotsam/M
+flounce/DSMG
+flouncy
+flounder/MDSG
+flour/SMDG
+flourish/GMDS
+floury
+flout/SMDRZG
+flouter/M
+flow/MDGS
+flowchart/SM
+flower's
+flower/CSDG
+flowerbed/MS
+floweriness/M
+flowering/S
+flowerless
+flowerpot/MS
+flowery/PTR
+flown
+flt
+flu/M
+flub/MS
+flubbed
+flubbing
+fluctuate/GNDSX
+fluctuation/M
+flue/MS
+fluency/M
+fluent/Y
+fluff/SMDG
+fluffiness/M
+fluffy/RPT
+fluid/SMY
+fluidity/M
+fluke/SM
+fluky/RT
+flume/SM
+flummox/DSG
+flung
+flunk/SMDG
+flunky/SM
+fluoresce/DSG
+fluorescence/M
+fluorescent
+fluoridate/GNDS
+fluoridation/M
+fluoride/SM
+fluorine/M
+fluorite/M
+fluorocarbon/MS
+fluoroscope/SM
+fluoroscopic
+fluoxetine
+flurry/GDSM
+flush/MDRSTG
+fluster/MDSG
+flute/DSMG
+fluting/M
+flutist/MS
+flutter/MDSG
+fluttery
+fluvial
+flux/IMS
+fluxed
+fluxing
+fly/ZTGBDRSM
+flyaway
+flyblown
+flyby/M
+flybys
+flycatcher/MS
+flying/M
+flyleaf/M
+flyleaves
+flyover/MS
+flypaper/SM
+flypast/S
+flysheet/S
+flyspeck/GMDS
+flyswatter/MS
+flytrap/S
+flyway/SM
+flyweight/SM
+flywheel/MS
+foal/MDGS
+foam/MDGS
+foaminess/M
+foamy/RTP
+fob/SM
+fobbed
+fobbing
+focal/Y
+focus's
+focus/ADSG
+focused/U
+fodder/SM
+foe/SM
+fog's
+fog/CS
+fogbound
+fogged/C
+foggily
+fogginess/M
+fogging/C
+foggy/RTP
+foghorn/MS
+fogy/SM
+fogyish
+foible/SM
+foil/MDGS
+foist/SDG
+fol
+fold's
+fold/AUSGD
+foldaway
+folder/SM
+foldout/MS
+foliage/M
+folic
+folio/SM
+folk/MS
+folklore/M
+folkloric
+folklorist/MS
+folksiness/M
+folksinger/SM
+folksinging/M
+folksy/PTR
+folktale/MS
+folkway/MS
+foll
+follicle/MS
+follow/SDRZGJ
+follower/M
+following/M
+followup/S
+folly/SM
+foment/SGD
+fomentation/M
+fond/RYTP
+fondant/MS
+fondle/DSG
+fondness/M
+fondue/SM
+font/MS
+fontanel/MS
+foo
+foobar
+food/MS
+foodie/SM
+foodstuff/SM
+fool/MDGS
+foolery/SM
+foolhardily
+foolhardiness/M
+foolhardy/TPR
+foolish/YP
+foolishness/M
+foolproof
+foolscap/M
+foot/MDRZGSJ
+footage/M
+football/MRZGS
+footballer/M
+footbridge/SM
+footfall/MS
+foothill/MS
+foothold/MS
+footie
+footing/M
+footless
+footlights/M
+footling/MS
+footlocker/SM
+footloose
+footman/M
+footmen
+footnote/MGDS
+footpath/M
+footpaths
+footplate/S
+footprint/SM
+footrace/MS
+footrest/MS
+footsie/SM
+footslogging
+footsore
+footstep/MS
+footstool/SM
+footwear/M
+footwork/M
+footy
+fop/SM
+foppery/M
+foppish/P
+foppishness/M
+for/H
+fora
+forage/DRSMZG
+forager/M
+foray/SMDG
+forbade
+forbear/SMG
+forbearance/M
+forbid/S
+forbidden
+forbidding/YS
+forbore
+forborne
+force/DSMG
+forced/U
+forceful/PY
+forcefulness/M
+forceps/M
+forcible
+forcibly
+ford/MDGSB
+fore/MS
+forearm/GSMD
+forebear/MS
+forebode/GJDS
+foreboding/M
+forecast/MRZGS
+forecaster/M
+forecastle/MS
+foreclose/DSG
+foreclosure/MS
+forecourt/SM
+foredoom/DGS
+forefather/MS
+forefeet
+forefinger/SM
+forefoot/M
+forefront/SM
+forego/G
+foregoes
+foregone
+foreground/GMDS
+forehand/MS
+forehead/MS
+foreign/ZRP
+foreigner/M
+foreignness/M
+foreknew
+foreknow/GS
+foreknowledge/M
+foreknown
+foreleg/SM
+forelimb/MS
+forelock/MS
+foreman/M
+foremast/MS
+foremen
+foremost
+forename/MDS
+forenoon/MS
+forensic/MS
+forensically
+forensics/M
+foreordain/GSD
+forepart/MS
+foreperson/SM
+foreplay/M
+forequarter/MS
+forerunner/MS
+foresail/MS
+foresaw
+foresee/RSBZ
+foreseeable/U
+foreseeing
+foreseen/U
+foreseer/M
+foreshadow/GDS
+foreshore/S
+foreshorten/DSG
+foresight/MD
+foresightedness/M
+foreskin/MS
+forest's
+forest/ACGDS
+forestall/SGD
+forestation/ACM
+forester/MS
+forestland/M
+forestry/M
+foretaste/DSMG
+foretell/GS
+forethought/M
+foretold
+forever/M
+forevermore
+forewarn/DSG
+forewent
+forewoman/M
+forewomen
+foreword/MS
+forfeit/GSMD
+forfeiture/SM
+forgather/SDG
+forgave
+forge/DRSMZGVJ
+forger/M
+forgery/SM
+forget/S
+forgetful/YP
+forgetfulness/M
+forgettable/U
+forgetting
+forging/M
+forgivable/U
+forgive/BRSZGP
+forgiven
+forgiveness/M
+forgiver/M
+forgiving/U
+forgo/RZG
+forgoer/M
+forgoes
+forgone
+forgot
+forgotten/U
+fork/MDGS
+forkful/SM
+forklift/MS
+forlorn/Y
+form's
+form/CAIFDGS
+formal/SMY
+formaldehyde/M
+formalin
+formalism/M
+formalist/MS
+formalities
+formality/IM
+formalization/M
+formalize/GDS
+format/SMV
+formation/CFASM
+formatted/A
+formatting/M
+formed/U
+former/FIAM
+formerly
+formfitting
+formic
+formidable
+formidably
+formless/PY
+formlessness/M
+formula/MS
+formulae
+formulaic
+formulate/ADSGNX
+formulated/U
+formulation/AM
+formulator/SM
+fornicate/GNDS
+fornication/M
+fornicator/MS
+forsake/GS
+forsaken
+forsook
+forsooth
+forswear/SG
+forswore
+forsworn
+forsythia/SM
+fort/MS
+forte/SM
+forthcoming/M
+forthright/YP
+forthrightness/M
+forthwith
+fortieth/M
+fortieths
+fortification/M
+fortified/U
+fortifier/M
+fortify/DRSNZGX
+fortissimo
+fortitude/M
+fortnight/MYS
+fortress/MS
+fortuitous/YP
+fortuitousness/M
+fortuity/M
+fortunate/UY
+fortune/MS
+fortuneteller/SM
+fortunetelling/M
+forty/SMH
+forum/SM
+forward/MDRYZTGSP
+forwarder/M
+forwardness/M
+forwent
+fossa
+fossil/SM
+fossilization/M
+fossilize/GDS
+foster/GSD
+fought
+foul/MDRYTGSP
+foulard/M
+foulmouthed
+foulness/M
+found/FSDG
+foundation/SM
+foundational
+founded/U
+founder/GMDS
+foundling/SM
+foundry/SM
+fount/SM
+fountain/SM
+fountainhead/MS
+four/MHS
+fourfold
+fourposter/SM
+fourscore/M
+foursome/SM
+foursquare
+fourteen/SMH
+fourteenth/M
+fourteenths
+fourth/MY
+fourths
+fowl/MDGS
+fox/GMDS
+foxfire/M
+foxglove/SM
+foxhole/MS
+foxhound/SM
+foxhunt/GS
+foxily
+foxiness/M
+foxtrot/MS
+foxtrotted
+foxtrotting
+foxy/RTP
+foyer/SM
+fps
+fr
+fracas/MS
+frack/SDG
+fractal/SM
+fraction/ISM
+fractional/Y
+fractious/YP
+fractiousness/M
+fracture/MGDS
+frag/S
+fragile/RT
+fragility/M
+fragment/GMDS
+fragmentary/M
+fragmentation/M
+fragrance/MS
+fragrant/Y
+frail/RYTP
+frailness/M
+frailty/SM
+frame/DRSMZG
+framed/U
+framer/M
+framework/SM
+franc/SM
+franchise's
+franchise/EDSG
+franchisee/SM
+franchiser/SM
+francium/M
+francophone
+frangibility/M
+frangible
+frank/SMDRYTGP
+frankfurter/MS
+frankincense/M
+frankness/M
+frantic
+frantically
+frappe/SM
+frat/MS
+fraternal/Y
+fraternity/FSM
+fraternization/M
+fraternize/ZGDRS
+fraternizer/M
+fratricidal
+fratricide/MS
+fraud's
+fraud/S
+fraudster/S
+fraudulence/M
+fraudulent/Y
+fraught
+fray's
+fray/CDGS
+frazzle/MGDS
+freak/SMDG
+freakish/YP
+freakishness/M
+freaky/RT
+freckle/DSMG
+freckly
+free/YTDRS
+freebase/MGDS
+freebie/SM
+freebooter/SM
+freeborn
+freedman/M
+freedmen
+freedom/SM
+freehand
+freehold/ZMRS
+freeholder/M
+freeing
+freelance/DRSMZG
+freelancer/M
+freeload/SDRZG
+freeloader/M
+freeman/M
+freemasonry
+freemen
+freephone
+freesia/S
+freestanding
+freestone/SM
+freestyle/SM
+freethinker/SM
+freethinking/M
+freeware/M
+freeway/MS
+freewheel/DGS
+freewill
+freezable
+freeze's
+freeze/UAGS
+freezer/MS
+freezing's
+freight/MDRZGS
+freighter/M
+french
+frenemy/S
+frenetic
+frenetically
+frenzied/Y
+frenzy/DSM
+freq
+frequencies
+frequency/IM
+frequent/DRYSZTG
+frequented/U
+frequenter/M
+fresco/M
+frescoes
+fresh/PNRYXZT
+freshen/ZGDR
+freshener/M
+freshet/MS
+freshman/M
+freshmen
+freshness/M
+freshwater/M
+fret/MS
+fretful/YP
+fretfulness/M
+fretsaw/MS
+fretted
+fretting
+fretwork/M
+friable
+friar/SM
+friary/SM
+fricassee/DSM
+fricasseeing
+fricative/SM
+friction/SM
+frictional
+fridge/SM
+friedcake/MS
+friend's
+friend/UGSDY
+friendless
+friendlies
+friendliness/UM
+friendly's
+friendly/UPTR
+friendship/MS
+frieze/SM
+frig/S
+frigate/MS
+frigged
+frigging
+fright/SXGMDN
+frighten/DG
+frightening/Y
+frightful/PY
+frightfulness/M
+frigid/YP
+frigidity/M
+frigidness/M
+frill/SMD
+frilly/TR
+fringe's
+fringe/IDSG
+frippery/SM
+frisk/SDG
+friskily
+friskiness/M
+frisky/TRP
+frisson/S
+fritter/MDSG
+fritz/M
+frivolity/SM
+frivolous/PY
+frivolousness/M
+frizz/MDSYG
+frizzle/MGDS
+frizzy/TR
+fro
+frock's
+frock/CUS
+frog/MS
+frogging/S
+frogman/M
+frogmarch/GDS
+frogmen
+frogspawn
+frolic/SM
+frolicked
+frolicker/SM
+frolicking
+frolicsome
+from
+frond/SM
+front's
+front/FSDG
+frontage/MS
+frontal/Y
+frontbench/ZRS
+frontier/MS
+frontiersman/M
+frontiersmen
+frontierswoman
+frontierswomen
+frontispiece/MS
+frontward/S
+frosh/M
+frost's
+frost/CSDG
+frostbit
+frostbite/MGS
+frostbitten
+frostily
+frostiness/M
+frosting/SM
+frosty/TPR
+froth/MDG
+frothiness/M
+froths
+frothy/TPR
+froufrou/M
+frown/SMDG
+frowzily
+frowziness/M
+frowzy/TPR
+froze/AU
+frozen/UA
+fructify/DSG
+fructose/M
+frugal/Y
+frugality/M
+fruit/SMDG
+fruitcake/MS
+fruiterer/S
+fruitful/YP
+fruitfulness/M
+fruitiness/M
+fruition/M
+fruitless/PY
+fruitlessness/M
+fruity/TPR
+frump/SM
+frumpish
+frumpy/TR
+frustrate/GNXDS
+frustrating/Y
+frustration/M
+frustum/MS
+fry/GDSM
+fryer/SM
+ft
+ftp/ZGS
+fuchsia/MS
+fuck/SMGDRZ!
+fucker/M!
+fuckhead/S!
+fuddle/DSMG
+fudge/DSMG
+fuehrer/MS
+fuel's
+fuel/ADGS
+fug
+fugal
+fuggy
+fugitive/MS
+fugue/SM
+fuhrer/SM
+fulcrum/MS
+fulfill/LDGS
+fulfilled/U
+fulfilling/U
+fulfillment/M
+full/MDRZTGSP
+fullback/MS
+fuller/M
+fullness/M
+fully
+fulminate/DSXGN
+fulmination/M
+fulsome/PY
+fulsomeness/M
+fum/S
+fumble/DRSMZG
+fumbler/M
+fumbling/Y
+fume/MGDS
+fumigant/MS
+fumigate/GNDS
+fumigation/M
+fumigator/SM
+fumy/RT
+fun/M
+function/MDGS
+functional/Y
+functionalism
+functionalist/S
+functionality/S
+functionary/SM
+functor
+fund/AMDGS
+fundamental/SMY
+fundamentalism/M
+fundamentalist/SM
+funded/U
+funding/M
+fundraiser/MS
+fundraising
+funeral/MS
+funerary
+funereal/Y
+funfair/S
+fungal
+fungi
+fungible/MS
+fungicidal
+fungicide/MS
+fungoid
+fungous
+fungus/M
+funicular/SM
+funk/MDGS
+funkiness/M
+funky/PRT
+funnel/MDGS
+funner
+funnest
+funnily
+funniness/M
+funny/TPRSM
+funnyman/M
+funnymen
+fur/SM
+furbelow/M
+furbish/ADSG
+furious/Y
+furl's
+furl/UDGS
+furlong/SM
+furlough/GMD
+furloughs
+furn
+furnace/SM
+furnish/ADSG
+furnished/U
+furnishings/M
+furniture/M
+furor/SM
+furosemide
+furred
+furrier/M
+furriness/M
+furring/M
+furrow/MDSG
+furry/ZTRP
+further/SGD
+furtherance/M
+furthermore
+furthermost
+furthest
+furtive/YP
+furtiveness/M
+fury/SM
+furze/M
+fuse's/A
+fuse/CAIFGDS
+fusee/SM
+fuselage/SM
+fusibility/M
+fusible
+fusilier/SM
+fusillade/MS
+fusion/IFKSM
+fuss/MDSG
+fussbudget/MS
+fussily
+fussiness/M
+fusspot/SM
+fussy/TRP
+fustian/M
+fustiness/M
+fusty/TRP
+fut
+futile/Y
+futility/M
+futon/SM
+future/MS
+futurism/M
+futurist/MS
+futuristic
+futurity/SM
+futurologist/MS
+futurology/M
+futz/DSG
+fuzz/MDSG
+fuzzball/S
+fuzzily
+fuzziness/M
+fuzzy/PTR
+fwd
+fwy
+g/SNXVB
+gab/SM
+gabardine/SM
+gabbed
+gabbiness/M
+gabbing
+gabble/DSMG
+gabby/RTP
+gaberdine/SM
+gabfest/MS
+gable/DSM
+gad/S
+gadabout/SM
+gadded
+gadder/SM
+gadding
+gadfly/SM
+gadget/SM
+gadgetry/M
+gadolinium/M
+gaff/MDRZGS
+gaffe/SM
+gaffer/M
+gag/SM
+gaga
+gagged
+gagging
+gaggle/SM
+gaiety/M
+gaily
+gain's
+gain/ADGS
+gainer/SM
+gainful/Y
+gainsaid
+gainsay/ZGRS
+gainsayer/M
+gait/MRZS
+gaiter/M
+gal/SM
+gala/MS
+galactic
+galaxy/SM
+gale's
+gale/AS
+galena/M
+gall/MDGS
+gallant/SMY
+gallantry/M
+gallbladder/MS
+galleon/SM
+galleria/MS
+gallery/SM
+galley/SM
+gallimaufry/SM
+gallium/M
+gallivant/GSD
+gallon/SM
+gallop/SMDG
+gallows/M
+gallstone/MS
+galoot/SM
+galore
+galosh/MS
+galumph/DG
+galumphs
+galvanic
+galvanism/M
+galvanization/M
+galvanize/DSG
+galvanometer/MS
+gambit/SM
+gamble/DRSMZG
+gambler/M
+gambling/M
+gambol/SMDG
+game/MYTGDRSP
+gamecock/MS
+gamekeeper/MS
+gameness/M
+gamesmanship/M
+gamester/MS
+gamete/SM
+gametic
+gamin/SM
+gamine/SM
+gaminess/M
+gaming/M
+gamma/SM
+gammon/M
+gammy
+gamut/SM
+gamy/RTP
+gander/SM
+gang/MDGS
+gangbusters/M
+gangland/M
+ganglia
+gangling
+ganglion/M
+ganglionic
+gangplank/SM
+gangrene/DSMG
+gangrenous
+gangsta/S
+gangster/SM
+gangway/MS
+ganja
+gannet/SM
+gantlet/MS
+gantry/SM
+gap/GSMD
+gape/MS
+gar/SLM
+garage/DSMG
+garb/MDGS
+garbage/M
+garbageman
+garbanzo/SM
+garble/DSG
+garcon/SM
+garden/SZGMDR
+gardener/M
+gardenia/MS
+gardening/M
+garfish/MS
+gargantuan
+gargle/DSMG
+gargoyle/SM
+garish/PY
+garishness/M
+garland/MDGS
+garlic/M
+garlicky
+garment/MS
+garner/SGD
+garnet/SM
+garnish/GLMDS
+garnishee/DSM
+garnisheeing
+garnishment/SM
+garret/SM
+garrison/MDSG
+garrote/MZGDRS
+garroter/M
+garrulity/M
+garrulous/PY
+garrulousness/M
+garter/SM
+gas's
+gas/CS
+gasbag/SM
+gaseous
+gash/MDSG
+gasholder/S
+gasket/SM
+gaslight/MS
+gasman
+gasmen
+gasohol/M
+gasoline/M
+gasometer/S
+gasp/MDGS
+gassed/C
+gasses
+gassing/C
+gassy/RT
+gastric
+gastritis/M
+gastroenteritis/M
+gastrointestinal
+gastronome/S
+gastronomic
+gastronomical/Y
+gastronomy/M
+gastropod/SM
+gasworks/M
+gate/MGDS
+gateau
+gateaux
+gatecrash/DRSZG
+gatecrasher/M
+gatehouse/SM
+gatekeeper/MS
+gatepost/MS
+gateway/MS
+gather/SJZGMDR
+gatherer/M
+gathering/M
+gator/SM
+gauche/RPYT
+gaucheness/M
+gaucherie/M
+gaucho/SM
+gaudily
+gaudiness/M
+gaudy/RPT
+gauge/DSMG
+gaunt/RPT
+gauntlet/MS
+gauntness/M
+gauze/M
+gauziness/M
+gauzy/RPT
+gave
+gavel/SM
+gavotte/MS
+gawd
+gawk/DGS
+gawkily
+gawkiness/M
+gawky/RPT
+gawp/DGS
+gay/TSPMR
+gayness/M
+gaze/MZGDRS
+gazebo/SM
+gazelle/MS
+gazer/M
+gazette/MGDS
+gazetteer/MS
+gazillion/S
+gazpacho/M
+gazump/DGS
+gear/MDGS
+gearbox/MS
+gearing/M
+gearshift/MS
+gearwheel/SM
+gecko/SM
+geddit
+gee/DS
+geeing
+geek/MS
+geeky/RT
+geese
+geezer/MS
+geisha/M
+gel/SM
+gelatin/M
+gelatinous
+gelcap/M
+geld/DJGS
+gelding/M
+gelid
+gelignite/M
+gelled
+gelling
+gem/SM
+gemological
+gemologist/MS
+gemology/M
+gemstone/MS
+gendarme/MS
+gender/MDS
+gene/MS
+genealogical/Y
+genealogist/MS
+genealogy/SM
+genera
+general/SMY
+generalissimo/MS
+generalist/MS
+generality/SM
+generalization/MS
+generalize/GDS
+generalship/M
+generate/CAVNGSD
+generation/ACM
+generational
+generations
+generator/SM
+generic/SM
+generically
+generosity/SM
+generous/PY
+generousness/M
+genes/S
+genesis/M
+genetic/S
+genetically
+geneticist/MS
+genetics/M
+genial/FY
+geniality/FM
+geniculate
+genie/SM
+genii
+genital/FY
+genitalia/M
+genitals/M
+genitive/MS
+genitourinary
+genius/MS
+genned
+genning
+genocidal
+genocide/MS
+genome/MS
+genomics
+genre/SM
+gent/AMS
+genteel/YP
+genteelness/M
+gentian/SM
+gentile/SM
+gentility/M
+gentle/TGDRSP
+gentlefolk/MS
+gentlefolks/M
+gentleman/MY
+gentlemanly/U
+gentlemen
+gentleness/M
+gentlewoman/M
+gentlewomen
+gently
+gentrification/M
+gentrify/DSGN
+gentry/SM
+genuflect/DGS
+genuflection/MS
+genuine/PY
+genuineness/M
+genus/M
+geocache/DSG
+geocentric
+geocentrically
+geochemistry/M
+geode/SM
+geodesic/SM
+geodesy/M
+geodetic
+geoengineering
+geog
+geographer/SM
+geographic
+geographical/Y
+geography/SM
+geologic
+geological/Y
+geologist/MS
+geology/SM
+geom
+geomagnetic
+geomagnetism/M
+geometer
+geometric
+geometrical/Y
+geometry/SM
+geophysical
+geophysicist/SM
+geophysics/M
+geopolitical
+geopolitics/M
+geostationary
+geosynchronous
+geosyncline/MS
+geothermal
+geothermic
+geranium/MS
+gerbil/MS
+geriatric/S
+geriatrician/S
+geriatrics/M
+germ/MS
+germane
+germanium/M
+germicidal
+germicide/MS
+germinal/M
+germinate/GNDS
+germination/M
+gerontological
+gerontologist/MS
+gerontology/M
+gerrymander/GMDS
+gerrymandering/M
+gerund/MS
+gestalt/S
+gestapo/MS
+gestate/GNDS
+gestation/M
+gestational
+gesticulate/DSGNX
+gesticulation/M
+gestural
+gesture/MGDS
+gesundheit
+get/S
+getaway/SM
+getting
+getup/M
+gewgaw/SM
+geyser/SM
+ghastliness/M
+ghastly/TPR
+ghat/MS
+ghee
+gherkin/MS
+ghetto/SM
+ghettoize/GDS
+ghost/SMDYG
+ghostliness/M
+ghostly/RTP
+ghostwrite/ZGRS
+ghostwriter/M
+ghostwritten
+ghostwrote
+ghoul/SM
+ghoulish/YP
+ghoulishness/M
+giant/SM
+giantess/MS
+gibber/GDS
+gibberish/M
+gibbet/GMDS
+gibbon/MS
+gibbous
+gibe/MGDS
+giblet/SM
+giddily
+giddiness/M
+giddy/RTP
+gift/MDGS
+gig/SM
+gigabit/SM
+gigabyte/MS
+gigagram/S
+gigahertz/M
+gigajoule/S
+gigameter/S
+gigantic
+gigantically
+gigapascal/S
+gigapixel/MS
+gigawatt/SM
+gigged
+gigging
+giggle/DRSMZG
+giggler/M
+giggly/RT
+gigolo/SM
+gild/MDRZGS
+gilder/M
+gilding/M
+gill/MS
+gillie/S
+gillion/S
+gilt/MS
+gimbals/M
+gimcrack/SM
+gimcrackery/M
+gimlet/GSMD
+gimme/SM
+gimmick/MS
+gimmickry/M
+gimmicky
+gimp/MDGS
+gimpy
+gin/SM
+ginger/GSMDY
+gingerbread/M
+gingersnap/SM
+gingery
+gingham/M
+gingivitis/M
+ginkgo/M
+ginkgoes
+ginned
+ginning
+ginormous
+ginseng/M
+giraffe/MS
+gird/DRZGS
+girder/M
+girdle/DSMG
+girl/MS
+girlfriend/MS
+girlhood/SM
+girlish/YP
+girlishness/M
+girly
+giro/S
+girt/MDGS
+girth/M
+girths
+gist/M
+git/S
+gite/S
+give/ZGJRS
+giveaway/MS
+giveback/MS
+given/SM
+giver/M
+gizmo/SM
+gizzard/MS
+glace/S
+glaceed
+glaceing
+glacial/Y
+glaciate/XGNDS
+glaciation/M
+glacier/MS
+glad/MYSP
+gladden/GDS
+gladder
+gladdest
+glade/SM
+gladiator/SM
+gladiatorial
+gladiola/SM
+gladioli
+gladiolus/M
+gladness/M
+gladsome
+glam
+glamorization/M
+glamorize/DSG
+glamorous/Y
+glamour/GMDS
+glance/DSMG
+gland/SM
+glandes
+glandular
+glans/M
+glare/DSMG
+glaring/Y
+glasnost/M
+glass/MDSG
+glassblower/MS
+glassblowing/M
+glassful/SM
+glasshouse/S
+glassily
+glassiness/M
+glassware/M
+glassy/RTP
+glaucoma/M
+glaze/DSMG
+glazier/SM
+glazing/M
+gleam/SMDGJ
+glean/SDRZGJ
+gleaner/M
+gleanings/M
+glee/M
+gleeful/YP
+gleefulness/M
+glen/MS
+glenohumeral
+glenoid
+glib/YP
+glibber
+glibbest
+glibness/M
+glide/DRSMZG
+glider/M
+gliding/M
+glimmer/MDGJS
+glimmering/M
+glimpse/MGDS
+glint/SMDG
+glissandi
+glissando/M
+glisten/MDSG
+glister/DSG
+glitch/GMDS
+glitter/MDSG
+glitterati
+glittery
+glitz/M
+glitzy/TR
+gloaming/SM
+gloat/SMDG
+gloating/Y
+glob/MDGS
+global/Y
+globalism/M
+globalist/MS
+globalization/M
+globalize/GDS
+globe/SM
+globetrotter/MS
+globetrotting
+globular
+globule/MS
+globulin/M
+glockenspiel/SM
+gloom/M
+gloomily
+gloominess/M
+gloomy/TRP
+glop/M
+gloppy
+glorification/M
+glorify/GDSN
+glorious/IY
+glory/DSMG
+gloss/MDSG
+glossary/SM
+glossily
+glossiness/M
+glossolalia/M
+glossy/PTRSM
+glottal
+glottis/MS
+glove/DSMG
+glow/MDRZGS
+glower/GMD
+glowing/Y
+glowworm/MS
+glucagon
+glucose/M
+glue/MGDS
+glued/U
+gluey
+gluier
+gluiest
+glum/YP
+glummer
+glummest
+glumness/M
+gluon/S
+glut/MNS
+gluten/M
+glutenous
+glutinous/Y
+glutted
+glutting
+glutton/MS
+gluttonous/Y
+gluttony/M
+glycerin/M
+glycerol/M
+glycogen/M
+glycol
+glyph
+gm
+gnarl/SMDG
+gnarly/TR
+gnash/MDSG
+gnat/MS
+gnaw/DGS
+gneiss/M
+gnocchi
+gnome/SM
+gnomic
+gnomish
+gnu/SM
+go/JMRHZG
+goad/MDGS
+goal/MS
+goalie/SM
+goalkeeper/MS
+goalkeeping/M
+goalless
+goalmouth
+goalmouths
+goalpost/MS
+goalscorer/S
+goaltender/MS
+goat/MS
+goatee/SM
+goatherd/MS
+goatskin/MS
+gob/SM
+gobbed
+gobbet/SM
+gobbing
+gobble/DRSMZG
+gobbledygook/M
+gobbler/M
+goblet/SM
+goblin/SM
+gobsmacked
+gobstopper/S
+god/SM
+godawful
+godchild/M
+godchildren/M
+goddammit
+goddamn/D
+goddaughter/MS
+goddess/MS
+godfather/SM
+godforsaken
+godhead/M
+godhood/M
+godless/PY
+godlessness/M
+godlike
+godliness/UM
+godly/URTP
+godmother/SM
+godparent/SM
+godsend/SM
+godson/SM
+godspeed
+goer/M
+goes
+gofer/SM
+goggle/DSMG
+goggles/M
+going/M
+goiter/SM
+gold/MNS
+goldbrick/ZGSMDR
+goldbricker/M
+golden/TR
+goldenrod/M
+goldfield/S
+goldfinch/MS
+goldfish/MS
+goldmine/SM
+goldsmith/M
+goldsmiths
+golf/MDRZGS
+golfer/M
+golliwog/S
+golly/SM
+gonad/SM
+gonadal
+gondola/MS
+gondolier/SM
+gone/ZR
+goner/M
+gong/MDGS
+gonk/S
+gonna
+gonorrhea/M
+gonorrheal
+gonzo
+goo/M
+goober/SM
+good/MYSP
+goodbye/MS
+goodhearted
+goodish
+goodly/TR
+goodness/M
+goodnight
+goods/M
+goodwill/M
+goody/SM
+gooey
+goof/MDGS
+goofball/SM
+goofiness/M
+goofy/RPT
+google/DSMG
+googly/S
+gooier
+gooiest
+gook/MS
+goon/MS
+goop/M
+goose/DSMG
+gooseberry/SM
+goosebumps/M
+goosestep/S
+goosestepped
+goosestepping
+gopher/SM
+gore/MGDS
+gorge's
+gorge/EDSG
+gorgeous/YP
+gorgeousness/M
+gorgon/SM
+gorilla/MS
+gorily
+goriness/M
+gormandize/DRSZG
+gormandizer/M
+gormless
+gorp/MS
+gorse/M
+gory/RTP
+gosh
+goshawk/MS
+gosling/SM
+gospel/MS
+gossamer/M
+gossip/MDRZGS
+gossiper/M
+gossipy
+got
+gotcha/S
+goths
+gotta
+gotten
+gouache/S
+gouge/DRSMZG
+gouger/M
+goulash/MS
+gourd/SM
+gourde/MS
+gourmand/SM
+gourmet/SM
+gout/M
+gouty/TR
+gov
+govern/DGSBL
+governable/U
+governance/M
+governed/U
+governess/MS
+government/MS
+governmental
+governor/SM
+governorship/M
+govt
+gown/MDGS
+gr
+grab/MS
+grabbed
+grabber/MS
+grabbing
+grabby/TR
+grace/EDSMG
+graceful/EPY
+gracefulness/EM
+graceless/PY
+gracelessness/M
+gracious/UY
+graciousness/M
+grackle/MS
+grad/MRZSB
+gradate/XGNDS
+gradation/CM
+grade's
+grade/CADSG
+graded/U
+grader/M
+gradient/MS
+gradual/PY
+gradualism/M
+gradualness/M
+graduate/XMGNDS
+graduation/M
+graffiti
+graffito/M
+graft/SMDRZG
+grafter/M
+graham/S
+grail
+grain/ISMD
+graininess/M
+grainy/PTR
+gram/KMS
+grammar/MS
+grammarian/SM
+grammatical/UY
+gramophone/MS
+grampus/MS
+gran/S
+granary/SM
+grand/SMRYPT
+grandam/MS
+grandaunt/MS
+grandchild/M
+grandchildren/M
+granddad/SM
+granddaddy/SM
+granddaughter/SM
+grandee/MS
+grandeur/M
+grandfather/GMDYS
+grandiloquence/M
+grandiloquent
+grandiose/Y
+grandiosity/M
+grandma/MS
+grandmother/MYS
+grandnephew/MS
+grandness/M
+grandniece/MS
+grandpa/MS
+grandparent/MS
+grandson/MS
+grandstand/SGMD
+granduncle/SM
+grange/SM
+granite/M
+granitic
+granny/SM
+granola/M
+grant/SMDRZG
+grantee/MS
+granter/M
+grantsmanship/M
+granular
+granularity/M
+granulate/GNDS
+granulation/M
+granule/MS
+grape/SM
+grapefruit/MS
+grapeshot/M
+grapevine/SM
+graph/MDG
+graphic/MS
+graphical/Y
+graphite/M
+graphologist/MS
+graphology/M
+graphs
+grapnel/MS
+grapple/MGDS
+grasp/SMDBG
+grass/MDSG
+grasshopper/MS
+grassland/MS
+grassroots
+grassy/TR
+grate/DRSMZGJ
+grateful/UYP
+gratefulness/UM
+grater/M
+gratification/M
+gratify/GNXDS
+gratifying/Y
+gratin/S
+grating/MY
+gratis
+gratitude/IM
+gratuitous/YP
+gratuitousness/M
+gratuity/SM
+gravamen/MS
+grave/DRSMYTGP
+gravedigger/SM
+gravel/SGMDY
+graven
+graveness/M
+graveside/MS
+gravestone/SM
+graveyard/MS
+gravid
+gravimeter/MS
+gravitas
+gravitate/GNDS
+gravitation/M
+gravitational
+gravity/M
+gravy/SM
+gray/MDRTGSP
+graybeard/SM
+grayish
+grayness/M
+graze/DRSMZG
+grazer/M
+grease/DRSMZG
+greasepaint/M
+greasily
+greasiness/M
+greasy/PTR
+great/SMRYPT
+greatcoat/SM
+greathearted
+greatness/M
+grebe/SM
+greed/M
+greedily
+greediness/M
+greedy/PTR
+green/GPSMDRYT
+greenback/MS
+greenbelt/MS
+greenery/M
+greenfield
+greenfly/S
+greengage/MS
+greengrocer/SM
+greenhorn/SM
+greenhouse/SM
+greenish
+greenmail/M
+greenness/M
+greenroom/SM
+greenstone
+greensward/M
+greenwood/M
+greet/ZGJSDR
+greeter/M
+greeting/M
+gregarious/PY
+gregariousness/M
+gremlin/SM
+grenade/SM
+grenadier/MS
+grenadine/M
+grep/S
+grepped
+grepping
+grew/A
+greyhound/SM
+gribble/S
+grid/MS
+griddle/SM
+griddlecake/SM
+gridiron/SM
+gridlock/SMD
+grief/SM
+grievance/MS
+grieve/ZGDRS
+griever/M
+grievous/PY
+grievousness/M
+griffin/SM
+griffon/SM
+grill/SGMDJ
+grille/MS
+grim/DYPG
+grimace/DSMG
+grime/SM
+griminess/M
+grimmer
+grimmest
+grimness/M
+grimy/TRP
+grin/MS
+grind/SZGMRJ
+grinder/M
+grindstone/MS
+gringo/MS
+grinned
+grinning
+grip/MDRSZG
+gripe/SM
+griper/M
+grippe/MZGDR
+gripper/M
+grisliness/M
+grisly/RTP
+grist/MY
+gristle/M
+gristmill/MS
+grit/MS
+grits/M
+gritted
+gritter/SM
+grittiness/M
+gritting
+gritty/RTP
+grizzle/DSG
+grizzly/TRSM
+groan/SGMD
+groat/SM
+grocer/MS
+grocery/SM
+grog/M
+groggily
+grogginess/M
+groggy/PRT
+groin/SM
+grok/S
+grokked
+grokking
+grommet/SM
+groom/SZGMDR
+groomer/M
+grooming/M
+groomsman/M
+groomsmen
+groove/MGDS
+groovy/RT
+grope/DRSMZG
+groper/M
+grosbeak/MS
+grosgrain/M
+gross/PTGMDRSY
+grossness/M
+grotesque/SPMY
+grotesqueness/M
+grotto/M
+grottoes
+grotty/TR
+grouch/GMDS
+grouchily
+grouchiness/M
+grouchy/RTP
+ground/ZGMDRJS
+groundbreaking/MS
+groundcloth
+groundcloths
+grounder/M
+groundhog/MS
+grounding/M
+groundless/Y
+groundnut/MS
+groundsheet/S
+groundskeeper/S
+groundsman
+groundsmen
+groundswell/SM
+groundwater/M
+groundwork/M
+group/JSZGMDR
+grouper/M
+groupie/MS
+grouping/M
+groupware/M
+grouse/MZGDRS
+grouser/M
+grout/SGMD
+grove/SM
+grovel/ZGDRS
+groveler/M
+grovelled
+grovelling
+grow/AHSG
+grower/MS
+growing/I
+growl/SZGMDR
+growler/M
+grown/AI
+grownup/MS
+growth/AM
+growths
+grub/MS
+grubbed
+grubber/MS
+grubbily
+grubbiness/M
+grubbing
+grubby/TRP
+grubstake/M
+grudge/MGDS
+grudging/Y
+grue/S
+gruel/GJM
+grueling/Y
+gruesome/RYTP
+gruesomeness/M
+gruff/TPRY
+gruffness/M
+grumble/DRSMZGJ
+grumbler/M
+grump/SM
+grumpily
+grumpiness/M
+grumpy/PRT
+grunge/MS
+grungy/RT
+grunion/SM
+grunt/SGMD
+gt
+guacamole/M
+guanine/M
+guano/M
+guarani/MS
+guarantee/MDS
+guaranteeing
+guarantor/MS
+guaranty/GDSM
+guard/SZGMDR
+guarded/Y
+guarder/M
+guardhouse/SM
+guardian/SM
+guardianship/M
+guardrail/SM
+guardroom/SM
+guardsman/M
+guardsmen
+guava/SM
+gubernatorial
+guerrilla/SM
+guess/ZGBMDRS
+guesser/M
+guesstimate/DSMG
+guesswork/M
+guest/SGMD
+guestbook/SM
+guesthouse/S
+guestroom/S
+guff/M
+guffaw/MDGS
+guidance/M
+guide/DRSMZG
+guidebook/SM
+guided/U
+guideline/SM
+guidepost/SM
+guider/M
+guild/SZMR
+guilder/M
+guildhall/MS
+guile/M
+guileful
+guileless/YP
+guilelessness/M
+guillemot/S
+guillotine/DSMG
+guilt/M
+guiltily
+guiltiness/M
+guiltless
+guilty/PRT
+guinea/MS
+guise/ESM
+guitar/MS
+guitarist/SM
+gulag/SM
+gulch/MS
+gulden/MS
+gulf/MS
+gull/MDSG
+gullet/MS
+gullibility/M
+gullible
+gully/SM
+gulp/MDRSZG
+gulper/M
+gum/SM
+gumball/S
+gumbo/SM
+gumboil/SM
+gumboot/S
+gumdrop/SM
+gummed
+gumming
+gummy/TR
+gumption/M
+gumshoe/MDS
+gumshoeing
+gun/SM
+gunboat/SM
+gunfight/MRZS
+gunfighter/M
+gunfire/M
+gunge
+gungy
+gunk/M
+gunky
+gunman/M
+gunmen
+gunmetal/M
+gunned
+gunnel/MS
+gunner/MS
+gunnery/M
+gunning
+gunny/M
+gunnysack/MS
+gunpoint/M
+gunpowder/M
+gunrunner/MS
+gunrunning/M
+gunship/MS
+gunshot/MS
+gunslinger/SM
+gunsmith/M
+gunsmiths
+gunwale/MS
+guppy/SM
+gurgle/MGDS
+gurney/MS
+guru/MS
+gush/MDRSZG
+gusher/M
+gushing/Y
+gushy/TR
+gusset/MSDG
+gussy/DSG
+gust/EMDSG
+gustatory
+gustily
+gusto/M
+gusty/RT
+gut/SM
+gutless/P
+gutlessness/M
+gutsy/RT
+gutted
+gutter/SMDG
+guttersnipe/MS
+gutting
+guttural/MS
+gutty/RT
+guv/S
+guvnor/S
+guy/SGMD
+guzzle/DRSZG
+guzzler/M
+gym/SM
+gymkhana/MS
+gymnasium/MS
+gymnast/MS
+gymnastic/S
+gymnastically
+gymnastics/M
+gymnosperm/SM
+gymslip/S
+gynecologic
+gynecological
+gynecologist/SM
+gynecology/M
+gyp/SM
+gypped
+gypper/SM
+gypping
+gypster/SM
+gypsum/M
+gypsy/SM
+gyrate/DSGNX
+gyration/M
+gyrator/SM
+gyrfalcon/MS
+gyro/MS
+gyroscope/MS
+gyroscopic
+gyve/MGDS
+h'm
+h/NRSXZGVJ
+ha/SH
+haberdasher/SM
+haberdashery/SM
+habiliment/SM
+habit's
+habit/ISB
+habitability/M
+habitat/SM
+habitation/MS
+habitual/YP
+habitualness/M
+habituate/GNDS
+habituation/M
+habitue/SM
+hacienda/SM
+hack/MDRZGS
+hacker/M
+hacking/M
+hackish
+hackle/MS
+hackney/SMDG
+hacksaw/SM
+hacktivist/MS
+hackwork/M
+had
+haddock/SM
+hadith
+hadn't
+hadst
+hafnium/M
+haft/MS
+hag/SM
+haggard/YP
+haggardness/M
+haggis/MS
+haggish
+haggle/MZGDRS
+haggler/M
+hagiographer/SM
+hagiography/SM
+hahnium/M
+haiku/M
+hail/MDGS
+hailstone/MS
+hailstorm/MS
+hair/MDS
+hairball/MS
+hairband/S
+hairbreadth/M
+hairbreadths
+hairbrush/MS
+haircloth/M
+haircut/SM
+hairdo/MS
+hairdresser/SM
+hairdressing/M
+hairdryer/MS
+hairgrip/S
+hairiness/M
+hairless
+hairlike
+hairline/SM
+hairnet/SM
+hairpiece/MS
+hairpin/SM
+hairsbreadth/M
+hairsbreadths
+hairsplitter/SM
+hairsplitting/M
+hairspray/S
+hairspring/MS
+hairstyle/MS
+hairstylist/SM
+hairy/TRP
+haj
+hajj/M
+hajjes
+hajji/SM
+hake/MS
+halal/M
+halberd/SM
+halcyon
+hale/ITGDRS
+half/M
+halfback/SM
+halfhearted/PY
+halfheartedness/M
+halfpence
+halfpenny/SM
+halftime/MS
+halftone/MS
+halfway
+halfwit/SM
+halibut/SM
+halite/M
+halitosis/M
+hall/MS
+hallelujah/M
+hallelujahs
+hallmark/GMDS
+halloo/MSG
+hallow/DSG
+hallowed/U
+hallucinate/GNXDS
+hallucination/M
+hallucinatory
+hallucinogen/SM
+hallucinogenic/SM
+hallway/SM
+halo/MDGS
+halogen/SM
+halon
+halt/MDRZGS
+halter/GMD
+halterneck/S
+halting/Y
+halve/DSG
+halyard/MS
+ham/SM
+hamburg/SZMR
+hamburger/M
+hamlet/MS
+hammed
+hammer/MDRSJZG
+hammerer/M
+hammerhead/SM
+hammerlock/SM
+hammertoe/MS
+hamming
+hammock/SM
+hammy/TR
+hamper/GMDS
+hampered/U
+hamster/MS
+hamstring/GSM
+hamstrung
+hand's
+hand/UDGS
+handbag/SM
+handball/MS
+handbarrow/SM
+handbill/MS
+handbook/MS
+handbrake/S
+handcar/SM
+handcart/MS
+handclasp/MS
+handcraft/SMDG
+handcuff/MDGS
+handed/P
+handful/SM
+handgun/SM
+handheld/MS
+handhold/MS
+handicap/MS
+handicapped
+handicapper/MS
+handicapping
+handicraft/MS
+handily
+handiness/M
+handiwork/M
+handkerchief/MS
+handle/MZGDRS
+handlebar/MS
+handler/M
+handmade
+handmaid/XMNS
+handmaiden/M
+handout/SM
+handover/S
+handpick/GDS
+handrail/MS
+handsaw/SM
+handset/SM
+handshake/JMGS
+handsome/PYTR
+handsomeness/M
+handspring/MS
+handstand/SM
+handwork/M
+handwoven
+handwriting/M
+handwritten
+handy/UTR
+handyman/M
+handymen
+hang/MDRJZGS
+hangar/MS
+hangdog
+hanger/M
+hanging/M
+hangman/M
+hangmen
+hangnail/MS
+hangout/SM
+hangover/MS
+hangup/MS
+hank/MRZS
+hanker/GJD
+hankering/M
+hankie/MS
+hansom/MS
+hap/MY
+haphazard/YP
+haphazardness/M
+hapless/YP
+haplessness/M
+haploid/MS
+happen/SDGJ
+happening/M
+happenstance/SM
+happily/U
+happiness/UM
+happy/URTP
+haptic
+harangue/MGDS
+harass/LZGDRS
+harasser/M
+harassment/M
+harbinger/SM
+harbor/GMDS
+harbormaster/S
+hard/NRYXTP
+hardback/MS
+hardball/M
+hardboard/M
+hardbound
+hardcore
+hardcover/SM
+harden/ZGDR
+hardened/U
+hardener/M
+hardhat/MS
+hardheaded/PY
+hardheadedness/M
+hardhearted/PY
+hardheartedness/M
+hardihood/M
+hardily
+hardiness/M
+hardliner/MS
+hardness/M
+hardscrabble
+hardship/SM
+hardstand/SM
+hardtack/M
+hardtop/SM
+hardware/M
+hardwired
+hardwood/SM
+hardworking
+hardy/PTR
+hare/MGDS
+harebell/MS
+harebrained
+harelip/SM
+harelipped
+harem/SM
+haricot/S
+hark/DGS
+harlequin/SM
+harlot/SM
+harlotry/M
+harm/MDGS
+harmed/U
+harmful/YP
+harmfulness/M
+harmless/PY
+harmlessness/M
+harmonic/SM
+harmonica/MS
+harmonically
+harmonies
+harmonious/PY
+harmoniousness/M
+harmonium/MS
+harmonization/M
+harmonize/ZGDRS
+harmonizer/M
+harmony/EM
+harness's
+harness/UDSG
+harp/MDGS
+harpist/SM
+harpoon/ZGSMDR
+harpooner/M
+harpsichord/MS
+harpsichordist/SM
+harpy/SM
+harridan/MS
+harrier/M
+harrow/SMDG
+harrumph/GD
+harrumphs
+harry/DRSZG
+harsh/RYTP
+harshness/M
+hart/MS
+harvest/SMDRZG
+harvested/U
+harvester/M
+hash/AMDSG
+hashish/M
+hashtag/SM
+hasn't
+hasp/MS
+hassle/DSMG
+hassock/SM
+hast/DNXG
+haste/SM
+hasten/DG
+hastily
+hastiness/M
+hasty/RTP
+hat/ZGSMDR
+hatband/S
+hatbox/MS
+hatch/MDSG
+hatchback/MS
+hatcheck/SM
+hatched/U
+hatchery/SM
+hatchet/SM
+hatching/M
+hatchway/SM
+hate/MS
+hateful/PY
+hatefulness/M
+hatemonger/MS
+hater/M
+hatpin/S
+hatred/SM
+hatstand/S
+hatted
+hatter/SM
+hatting
+hauberk/SM
+haughtily
+haughtiness/M
+haughty/PRT
+haul/MDRZGS
+haulage/M
+hauler/M
+haulier/S
+haunch/MS
+haunt/SMDRZG
+haunter/M
+haunting/Y
+hauteur/M
+have/MGS
+haven't
+haven/SM
+haversack/SM
+havoc/M
+haw/GSMD
+hawk/MDRZGS
+hawker/M
+hawkish/P
+hawkishness/M
+hawser/SM
+hawthorn/MS
+hay/GSMD
+haycock/SM
+hayloft/SM
+haymaker/S
+haymaking
+haymow/SM
+hayrick/MS
+hayride/MS
+hayseed/MS
+haystack/SM
+haywire
+hazard/SMDG
+hazardous/Y
+haze/MZGJDRS
+hazel/SM
+hazelnut/MS
+hazer/M
+hazily
+haziness/M
+hazing/M
+hazmat
+hazy/RTP
+hdqrs
+he'd
+he'll
+he/M
+head/MDRZGJS
+headache/MS
+headband/MS
+headbanger/S
+headbanging
+headboard/SM
+headbutt/DSG
+headcase/S
+headcheese
+headcount/S
+headdress/MS
+header/M
+headfirst
+headgear/M
+headhunt/DRSZG
+headhunter/M
+headhunting/M
+headily
+headiness/M
+heading/M
+headlamp/MS
+headland/MS
+headless
+headlight/MS
+headline/MZGDRS
+headliner/M
+headlock/MS
+headlong
+headman/M
+headmaster/SM
+headmen
+headmistress/MS
+headphone/MS
+headpiece/MS
+headpin/SM
+headquarter/SDG
+headquarters/M
+headrest/MS
+headroom/M
+headscarf
+headscarves
+headset/SM
+headship/SM
+headshrinker/SM
+headsman/M
+headsmen
+headstall/SM
+headstand/SM
+headstone/SM
+headstrong
+headteacher/S
+headwaiter/SM
+headwaters/M
+headway/M
+headwind/SM
+headword/SM
+heady/RTP
+heal/DRHZGS
+healed/U
+healer/M
+health/M
+healthcare
+healthful/PY
+healthfulness/M
+healthily/U
+healthiness/UM
+healthy/UTRP
+heap/MDGS
+hear/AHGJS
+heard/AU
+hearer/SM
+hearing/AM
+hearken/SGD
+hearsay/M
+hearse's
+hearse/AS
+heart/SM
+heartache/MS
+heartbeat/MS
+heartbreak/SMG
+heartbroken
+heartburn/M
+hearten/ESGD
+heartfelt
+hearth/M
+hearthrug/S
+hearths
+hearthstone/SM
+heartily
+heartiness/M
+heartland/MS
+heartless/PY
+heartlessness/M
+heartrending/Y
+heartsick/P
+heartsickness/M
+heartstrings/M
+heartthrob/MS
+heartwarming
+heartwood/M
+hearty/RSMPT
+heat's
+heat/ADGS
+heated/U
+heatedly
+heater/SM
+heath/MNRX
+heathen/M
+heathendom/M
+heathenish
+heathenism/M
+heather/M
+heaths
+heating/M
+heatproof
+heatstroke/M
+heatwave/S
+heave/DRSMZG
+heaven/SMY
+heavenly/TR
+heavens/M
+heavenward/S
+heaver/M
+heavily
+heaviness/M
+heavy/RSMTP
+heavyhearted
+heavyset
+heavyweight/MS
+heck/M
+heckle/DRSMZG
+heckler/M
+heckling/M
+hectare/SM
+hectic
+hectically
+hectogram/SM
+hectometer/MS
+hector/SMDG
+hedge/DRSMZG
+hedgehog/MS
+hedgehop/S
+hedgehopped
+hedgehopping
+hedger/M
+hedgerow/SM
+hedonism/M
+hedonist/MS
+hedonistic
+heed/MDGS
+heeded/U
+heedful/Y
+heedless/PY
+heedlessness/M
+heehaw/SMDG
+heel/MDGS
+heelless
+heft/MDGS
+heftily
+heftiness/M
+hefty/PRT
+hegemonic
+hegemony/M
+hegira/SM
+heifer/SM
+height/XSMN
+heighten/DG
+heinous/YP
+heinousness/M
+heir/MS
+heiress/MS
+heirloom/SM
+heist/SMDG
+held
+helical
+helices
+helicopter/SGMD
+heliocentric
+heliotrope/SM
+helipad/S
+heliport/MS
+helium/M
+helix/M
+hell/M
+hellbent
+hellcat/MS
+hellebore/M
+hellfire
+hellhole/MS
+hellion/MS
+hellish/YP
+hellishness/M
+hello/SM
+helluva
+helm/MS
+helmet/SMD
+helmsman/M
+helmsmen
+helot/SM
+help/MDRZGSJ
+helper/M
+helpful/UY
+helpfulness/M
+helping/M
+helpless/PY
+helplessness/M
+helpline/SM
+helpmate/SM
+helve/SM
+hem/SM
+hematite/M
+hematologic
+hematological
+hematologist/MS
+hematology/M
+heme/M
+hemiplegia
+hemisphere/SM
+hemispheric
+hemispherical
+hemline/SM
+hemlock/SM
+hemmed
+hemmer/SM
+hemming
+hemoglobin/M
+hemophilia/M
+hemophiliac/MS
+hemorrhage/MGDS
+hemorrhagic
+hemorrhoid/MS
+hemostat/MS
+hemp/MN
+hemstitch/MDSG
+hen/M
+hence
+henceforth
+henceforward
+henchman/M
+henchmen
+henna/SMDG
+henpeck/GSD
+hep
+heparin/M
+hepatic
+hepatitis/M
+hepatocyte/S
+hepper
+heppest
+heptagon/MS
+heptagonal
+heptathlon/SM
+herald/SMDG
+heralded/U
+heraldic
+heraldry/M
+herb/MS
+herbaceous
+herbage/M
+herbal/S
+herbalist/MS
+herbicidal
+herbicide/MS
+herbivore/SM
+herbivorous
+herculean
+herd/MDRZGS
+herder/M
+herdsman/M
+herdsmen
+here/M
+hereabout/S
+hereafter/SM
+hereby
+hereditary
+heredity/M
+herein
+hereinafter
+hereof
+hereon
+heresy/SM
+heretic/SM
+heretical
+hereto
+heretofore
+hereunder
+hereunto
+hereupon
+herewith
+heritable/I
+heritage/MS
+hermaphrodite/SM
+hermaphroditic
+hermetic
+hermetical/Y
+hermit/SM
+hermitage/MS
+hermitian
+hernia/SM
+hernial
+herniate/GNDS
+herniation/M
+hero/M
+heroes
+heroic/S
+heroically
+heroics/M
+heroin/SM
+heroine/SM
+heroism/M
+heron/SM
+herpes/M
+herpetologist/SM
+herpetology/M
+herring/MS
+herringbone/M
+herself
+hertz/M
+hesitance/M
+hesitancy/M
+hesitant/Y
+hesitate/DSGNX
+hesitating/UY
+hesitation/M
+hessian
+hetero/SM
+heterodox
+heterodoxy/M
+heterogeneity/M
+heterogeneous/Y
+heterosexual/MYS
+heterosexuality/M
+heuristic/MS
+heuristically
+heuristics/M
+hew/ZGSDR
+hewer/M
+hex/GMDS
+hexadecimal/S
+hexagon/MS
+hexagonal
+hexagram/SM
+hexameter/SM
+hey
+heyday/SM
+hf
+hgt
+hgwy
+hi/SD
+hiatus/MS
+hibachi/MS
+hibernate/GNDS
+hibernation/M
+hibernator/MS
+hibiscus/MS
+hiccough/DG
+hiccoughs
+hiccup/GSMD
+hick/MS
+hickey/SM
+hickory/SM
+hid
+hidden
+hide/MZGJDRS
+hideaway/SM
+hidebound
+hideous/YP
+hideousness/M
+hideout/MS
+hider/M
+hiding/M
+hie/S
+hieing
+hierarchic
+hierarchical/Y
+hierarchy/SM
+hieroglyph/M
+hieroglyphic/MS
+hieroglyphs
+high/MRYZTP
+highball/SM
+highborn
+highboy/MS
+highbrow/SM
+highchair/MS
+highfalutin
+highhanded/PY
+highhandedness/M
+highland/MRZS
+highlander/M
+highlight/SMDRZG
+highlighter/M
+highness/M
+highroad/MS
+highs
+hightail/DSG
+highway/MS
+highwayman/M
+highwaymen
+hijab/SM
+hijack/SJZGMDR
+hijacker/M
+hijacking/M
+hike/MZGDRS
+hiker/M
+hiking/M
+hilarious/PY
+hilariousness/M
+hilarity/M
+hill/MS
+hillbilly/SM
+hilliness/M
+hillock/MS
+hillside/SM
+hilltop/MS
+hilly/PRT
+hilt/MS
+him/S
+himself
+hind/MRZS
+hinder/GD
+hindered/U
+hindmost
+hindquarter/MS
+hindrance/SM
+hindsight/M
+hinge's
+hinge/UDSG
+hint/MDRZGS
+hinter/M
+hinterland/SM
+hip/SPM
+hipbath
+hipbaths
+hipbone/MS
+hiphuggers
+hipness/M
+hipped
+hipper
+hippest
+hippie/SM
+hipping
+hippo/SM
+hippocampus
+hippodrome/SM
+hippopotamus/MS
+hippy
+hipster/MS
+hiragana
+hire's
+hire/AGDS
+hireling/MS
+hirsute/P
+hirsuteness/M
+hiss/MDSG
+hist
+histamine/MS
+histogram/MS
+histologist/SM
+histology/M
+histopathology
+historian/MS
+historic
+historical/Y
+historicity/M
+historiographer/MS
+historiography/M
+history/SM
+histrionic/S
+histrionically
+histrionics/M
+hit/SM
+hitch's
+hitch/UDSG
+hitcher/MS
+hitchhike/DRSMZG
+hitchhiker/M
+hither
+hitherto
+hitter/SM
+hitting
+hive/MGDS
+hivemind/SM
+hiya
+hmm
+ho/SMDRYZ
+hoagie/MS
+hoard/SZGMDRJ
+hoarder/M
+hoarding/M
+hoarfrost/M
+hoariness/M
+hoarse/YTRP
+hoarseness/M
+hoary/TRP
+hoax/MDRSZG
+hoaxer/M
+hob/SM
+hobbit/S
+hobble/MZGDRS
+hobbler/M
+hobby/SM
+hobbyhorse/MS
+hobbyist/SM
+hobgoblin/MS
+hobnail/SGMD
+hobnob/S
+hobnobbed
+hobnobbing
+hobo/MS
+hoc
+hock/MDSG
+hockey/M
+hockshop/MS
+hod/SM
+hodgepodge/SM
+hoe/SM
+hoecake/SM
+hoedown/SM
+hoeing
+hoer/M
+hog/SM
+hogan/SM
+hogback/SM
+hogged
+hogging
+hoggish/Y
+hogshead/SM
+hogtie/DS
+hogtying
+hogwash/M
+hoick/SGD
+hoist/SGMD
+hoke/GDS
+hokey
+hokier
+hokiest
+hokum/M
+hold/MRJSZG
+holdall/S
+holder/M
+holding/M
+holdout/SM
+holdover/SM
+holdup/MS
+hole/MGDS
+holey
+holiday/SMDG
+holidaymaker/S
+holiness/UM
+holism
+holistic
+holistically
+holler/MDGS
+hollow/MDRYPSTG
+hollowness/M
+holly/SM
+hollyhock/MS
+holmium/M
+holocaust/SM
+hologram/MS
+holograph/M
+holographic
+holographs
+holography/M
+hols
+holster/SMDG
+holy/URPT
+homage/MS
+hombre/MS
+homburg/SM
+home/MYZGDRS
+homebody/SM
+homeboy/SM
+homecoming/SM
+homegrown
+homeland/MS
+homeless/MP
+homelessness/M
+homelike
+homeliness/M
+homely/PRT
+homemade
+homemaker/SM
+homemaking/M
+homeopath/M
+homeopathic
+homeopaths
+homeopathy/M
+homeostasis/M
+homeostatic
+homeowner/MS
+homepage/MS
+homer/GMD
+homeroom/MS
+homeschooling/M
+homesick/P
+homesickness/M
+homespun/M
+homestead/SMDRZG
+homesteader/M
+homestretch/MS
+hometown/MS
+homeward/S
+homework/MRZG
+homewrecker/SM
+homey/SMP
+homeyness/M
+homicidal
+homicide/MS
+homier
+homiest
+homiletic
+homily/SM
+hominid/SM
+hominoid/S
+hominy/M
+homo/MS
+homoerotic
+homogeneity/M
+homogeneous/Y
+homogenization/M
+homogenize/DSG
+homograph/M
+homographs
+homologous
+homology
+homonym/SM
+homophobia/M
+homophobic
+homophone/MS
+homosexual/SM
+homosexuality/M
+hon/SZTGMDR
+honcho/MS
+hone/MS
+honer/M
+honest/EYT
+honester
+honesty/EM
+honey/SGMD
+honeybee/SM
+honeycomb/MDSG
+honeydew/SM
+honeylocust/M
+honeymoon/ZGMDRS
+honeymooner/M
+honeypot/S
+honeysuckle/SM
+honk/MDRSZG
+honker/M
+honky/SM
+honor/ESGMDB
+honorableness/M
+honorably/E
+honorarily
+honorarium/MS
+honorary
+honoree/SM
+honorer/SM
+honorific/MS
+hooch/M
+hood/MDSG
+hoodie/MS
+hoodlum/SM
+hoodoo/MDSG
+hoodwink/DGS
+hooey/M
+hoof/MDRSZG
+hook's
+hook/UDSG
+hookah/M
+hookahs
+hooker/MS
+hookup/MS
+hookworm/MS
+hooky/M
+hooligan/MS
+hooliganism/M
+hoop/MDSG
+hoopla/M
+hooray
+hoosegow/SM
+hoot/MDRSZG
+hootenanny/SM
+hooter/M
+hoover/DSG
+hooves
+hop/SGMD
+hope/MS
+hopeful/PSMY
+hopefulness/M
+hopeless/YP
+hopelessness/M
+hopped
+hopper/MS
+hopping
+hopscotch/MDSG
+hora/MS
+horde/DSMG
+horehound/SM
+horizon/SM
+horizontal/SMY
+hormonal
+hormone/SM
+horn/MDS
+hornbeam
+hornblende/M
+hornet/MS
+hornless
+hornlike
+hornpipe/MS
+horny/TR
+horologic
+horological
+horologist/MS
+horology/M
+horoscope/SM
+horrendous/Y
+horrible/P
+horribleness/M
+horribly
+horrid/Y
+horrific
+horrifically
+horrify/DSG
+horrifying/Y
+horror/MS
+horse's
+horse/UDSG
+horseback/M
+horsebox/S
+horseflesh/M
+horsefly/SM
+horsehair/M
+horsehide/M
+horselaugh/M
+horselaughs
+horseless
+horseman/M
+horsemanship/M
+horsemen
+horseplay/M
+horsepower/M
+horseradish/MS
+horseshit/!
+horseshoe/DSM
+horseshoeing
+horsetail/SM
+horsetrading
+horsewhip/SM
+horsewhipped
+horsewhipping
+horsewoman/M
+horsewomen
+horsey
+horsier
+horsiest
+hortatory
+horticultural
+horticulturalist/S
+horticulture/M
+horticulturist/MS
+hosanna/SM
+hose/MGDS
+hosepipe/S
+hosier/MS
+hosiery/M
+hosp
+hospholipase
+hospice/MS
+hospitable/I
+hospitably/I
+hospital/SM
+hospitality/M
+hospitalization/SM
+hospitalize/DSG
+host/MDSG
+hostage/MS
+hostel/ZGMDRS
+hosteler/M
+hostelry/SM
+hostess/MDSG
+hostile/MYS
+hostilities/M
+hostility/SM
+hostler/MS
+hot/SYP
+hotbed/MS
+hotblooded
+hotbox/MS
+hotcake/SM
+hotel/SM
+hotelier/MS
+hotfoot/MDGS
+hothead/DSM
+hotheaded/YP
+hotheadedness/M
+hothouse/SM
+hotkey/S
+hotlink/S
+hotness/M
+hotplate/SM
+hotpot/S
+hots/M
+hotshot/MS
+hotted
+hotter
+hottest
+hottie/S
+hotting
+hound/SGMD
+hour/MYS
+hourglass/MS
+houri/SM
+house's
+house/ADSG
+houseboat/SM
+housebound
+houseboy/SM
+housebreak/RSZG
+housebreaker/M
+housebreaking/M
+housebroke
+housebroken
+houseclean/DSG
+housecleaning/M
+housecoat/SM
+housefly/SM
+houseful/SM
+household/SMRZ
+householder/M
+househusband/SM
+housekeeper/MS
+housekeeping/M
+houselights/M
+housemaid/SM
+houseman/M
+housemaster/S
+housemate/S
+housemen
+housemistress/S
+housemother/SM
+houseparent/SM
+houseplant/MS
+houseproud
+houseroom
+housetop/SM
+housewares/M
+housewarming/SM
+housewife/MY
+housewives
+housework/M
+housing/MS
+hove
+hovel/SM
+hover/SGD
+hoverboard/MS
+hovercraft/MS
+how'd
+how're
+how/SM
+howbeit
+howdah/M
+howdahs
+howdy
+however
+howitzer/SM
+howl/MDRSZG
+howler/M
+howsoever
+hoyden/MS
+hoydenish
+hp
+hr/S
+ht
+huarache/SM
+hub/SM
+hubbub/SM
+hubby/SM
+hubcap/SM
+hubris/M
+huckleberry/SM
+huckster/SGMD
+hucksterism/M
+huddle/DSMG
+hue/DSM
+huff/MDSG
+huffily
+huffiness/M
+huffy/PRT
+hug/STMR
+huge/YP
+hugeness/M
+hugged
+hugging
+huh
+hula/MS
+hulk/MSG
+hull/MDRSZG
+hullabaloo/SM
+huller/M
+hum/SM
+human/SMRYTP
+humane/PY
+humaneness/M
+humanism/M
+humanist/SM
+humanistic
+humanitarian/MS
+humanitarianism/M
+humanities/M
+humanity/ISM
+humanization/CM
+humanize/CDSG
+humanizer/SM
+humankind/M
+humanness/M
+humanoid/SM
+humble/DRSZTGJP
+humbleness/M
+humbler/M
+humbly
+humbug/SM
+humbugged
+humbugging
+humdinger/MS
+humdrum/M
+humeral
+humeri
+humerus/M
+humid/Y
+humidification/M
+humidifier/CM
+humidify/CZGDRS
+humidity/M
+humidor/SM
+humiliate/DSGNX
+humiliating/Y
+humiliation/M
+humility/M
+hummed
+hummer/SM
+humming
+hummingbird/SM
+hummock/SM
+hummocky
+hummus/M
+humongous
+humor/SMDG
+humoresque
+humorist/MS
+humorless/YP
+humorlessness/M
+humorous/PY
+humorousness/M
+hump/MDSG
+humpback/MDS
+humph/DG
+humphs
+humus/M
+hunch/MDSG
+hunchback/SMD
+hundred/SMH
+hundredfold
+hundredth/M
+hundredths
+hundredweight/SM
+hung
+hunger/SMDG
+hungover
+hungrily
+hungriness/M
+hungry/PRT
+hunk/MRSZ
+hunker/DG
+hunky/RT
+hunt/MDRSZG
+hunter/M
+hunting/M
+huntress/MS
+huntsman/M
+huntsmen
+hurdle/DRSMZG
+hurdler/M
+hurdling/M
+hurl/MDRSZG
+hurler/M
+hurling/M
+hurrah/GMD
+hurrahs
+hurricane/MS
+hurried/UY
+hurry/DSMG
+hurt/MSG
+hurtful/YP
+hurtfulness/M
+hurtle/DSG
+husband/GMDS
+husbandman/M
+husbandmen
+husbandry/M
+hush/MDSG
+husk/MDRSZG
+husker/M
+huskily
+huskiness/M
+husky/PRSMT
+hussar/SM
+hussy/SM
+hustings/M
+hustle/DRSMZG
+hustler/M
+hut/SM
+hutch/MS
+huzzah/MDG
+huzzahs
+hwy
+hyacinth/M
+hyacinths
+hybrid/SM
+hybridism/M
+hybridization/M
+hybridize/DSG
+hydra/SM
+hydrangea/SM
+hydrant/MS
+hydrate's
+hydrate/CGNDS
+hydration/CM
+hydraulic/S
+hydraulically
+hydraulics/M
+hydro/M
+hydrocarbon/MS
+hydrocephalus/M
+hydrochloride
+hydrocortisone
+hydrodynamic/S
+hydrodynamics/M
+hydroelectric
+hydroelectrically
+hydroelectricity/M
+hydrofoil/MS
+hydrogen/M
+hydrogenate/CGDS
+hydrogenation/M
+hydrogenous
+hydrologist/MS
+hydrology/M
+hydrolyses
+hydrolysis/M
+hydrolyze/DSG
+hydrometer/SM
+hydrometry/M
+hydrophilic
+hydrophobia/M
+hydrophobic
+hydrophone/SM
+hydroplane/GDSM
+hydroponic/S
+hydroponically
+hydroponics/M
+hydrosphere/M
+hydrotherapy/M
+hydrothermal
+hydrous
+hydroxide/SM
+hyena/SM
+hygiene/M
+hygienic/U
+hygienically
+hygienist/MS
+hygrometer/SM
+hying
+hymen/SM
+hymeneal
+hymn/MDSG
+hymnal/MS
+hymnbook/SM
+hype/MGDRS
+hyperactive
+hyperactivity/M
+hyperbola/SM
+hyperbole/M
+hyperbolic
+hypercritical/Y
+hypercube
+hyperglycemia/M
+hyperinflation
+hyperlink/GSMD
+hypermarket/S
+hypermedia/M
+hyperparathyroidism
+hyperplane
+hypersensitive/P
+hypersensitiveness/M
+hypersensitivity/SM
+hyperspace/S
+hypertension/M
+hypertensive/SM
+hypertext/M
+hyperthyroid/M
+hyperthyroidism/M
+hypertrophy/DSMG
+hyperventilate/GNDS
+hyperventilation/M
+hypervisor/MS
+hyphen/MDSG
+hyphenate/XDSMGN
+hyphenation/M
+hypnoses
+hypnosis/M
+hypnotherapist/S
+hypnotherapy/M
+hypnotic/SM
+hypnotically
+hypnotism/M
+hypnotist/MS
+hypnotize/GDS
+hypo/MS
+hypoallergenic
+hypochondria/M
+hypochondriac/SM
+hypocrisy/SM
+hypocrite/MS
+hypocritical/Y
+hypodermic/MS
+hypoglycemia/M
+hypoglycemic/SM
+hypotenuse/MS
+hypothalami
+hypothalamus/M
+hypothermia/M
+hypotheses
+hypothesis/M
+hypothesize/DSG
+hypothetical/Y
+hypothyroid/M
+hypothyroidism/M
+hyssop/M
+hysterectomy/SM
+hysteresis
+hysteria/M
+hysteric/SM
+hysterical/Y
+hysterics/M
+i/US
+iOS/M
+iPad/M
+iPhone/M
+iPod/M
+iTunes/M
+iamb/MS
+iambi
+iambic/SM
+iambus/MS
+ibex/MS
+ibid
+ibidem
+ibis/MS
+ibuprofen/M
+ice's
+ice/CDSG
+iceberg/SM
+iceboat/SM
+icebound
+icebox/MS
+icebreaker/SM
+icecap/SM
+iceman/M
+icemen
+ichthyologist/MS
+ichthyology/M
+icicle/SM
+icily
+iciness/M
+icing/SM
+icky/RT
+icon/MS
+iconic
+iconoclasm/M
+iconoclast/SM
+iconoclastic
+iconography/M
+ictus/M
+icy/TPR
+id/SMY
+idea/MS
+ideal/SMY
+idealism/M
+idealist/SM
+idealistic
+idealistically
+idealization/MS
+idealize/DSG
+idem
+idempotent
+identical/Y
+identifiable/U
+identification/M
+identified/U
+identify/ZGNDRSX
+identikit/S
+identity/SM
+ideogram/SM
+ideograph/M
+ideographs
+ideological/Y
+ideologist/SM
+ideologue/MS
+ideology/SM
+ides/M
+idiocy/SM
+idiom/SM
+idiomatic/U
+idiomatically
+idiopathic
+idiosyncrasy/SM
+idiosyncratic
+idiosyncratically
+idiot/SM
+idiotic
+idiotically
+idle/MZTGDRSP
+idleness/M
+idler/M
+idol/MS
+idolater/SM
+idolatress/MS
+idolatrous
+idolatry/M
+idolization/M
+idolize/GDS
+idyll/SM
+idyllic
+idyllically
+if/SM
+iffiness/M
+iffy/RTP
+igloo/SM
+igneous
+ignitable
+ignite/AGDS
+ignition/MS
+ignoble
+ignobly
+ignominious/Y
+ignominy/SM
+ignoramus/MS
+ignorance/M
+ignorant/Y
+ignore/GDS
+iguana/MS
+ii
+iii
+ilea
+ileitis/M
+ileum/M
+ilia
+ilium/M
+ilk/SM
+ill/SMP
+illegal/MYS
+illegality/SM
+illegibility/M
+illegible
+illegibly
+illegitimacy/M
+illegitimate/Y
+illiberal/Y
+illiberality/M
+illicit/YP
+illicitness/M
+illimitable
+illiteracy/M
+illiterate/MYS
+illness/MS
+illogical/Y
+illogicality/M
+illuminate/GNXDS
+illuminating/Y
+illumination/M
+illumine/DSBG
+illus/V
+illusion/EMS
+illusionist/SM
+illusory
+illustrate/GNVXDS
+illustration/M
+illustrative/Y
+illustrator/SM
+illustrious/PY
+illustriousness/M
+image/DSMG
+imagery/M
+imaginable/U
+imaginably/U
+imaginal
+imaginary
+imagination/MS
+imaginative/UY
+imagine/DSBJG
+imago/M
+imagoes
+imam/MS
+imbalance/DSM
+imbecile/MS
+imbecilic
+imbecility/SM
+imbibe/ZGDRS
+imbiber/M
+imbrication/M
+imbroglio/SM
+imbue/DSG
+imitable/I
+imitate/DSGNVX
+imitation/M
+imitative/PY
+imitativeness/M
+imitator/SM
+immaculate/PY
+immaculateness/M
+immanence/M
+immanency/M
+immanent/Y
+immaterial/YP
+immateriality/M
+immaterialness/M
+immature/Y
+immaturity/M
+immeasurable
+immeasurably
+immediacies/M
+immediacy/SM
+immediate/PY
+immediateness/M
+immemorial/Y
+immense/Y
+immensity/SM
+immerse/XDSGNV
+immersible
+immersion/M
+immigrant/SM
+immigrate/DSGN
+immigration/M
+imminence/M
+imminent/Y
+immobile
+immobility/M
+immobilization/M
+immobilize/ZGDRS
+immoderate/Y
+immodest/Y
+immodesty/M
+immolate/DSGN
+immolation/M
+immoral/Y
+immorality/SM
+immortal/MYS
+immortality/M
+immortalize/DSG
+immovability/M
+immovable
+immovably
+immune
+immunity/M
+immunization/SM
+immunize/GDS
+immunodeficiency/M
+immunodeficient
+immunoglobulin/S
+immunologic
+immunological
+immunologist/MS
+immunology/M
+immure/DSG
+immutability/M
+immutable
+immutably
+imp/SMR
+impact/SMDG
+impair/SDGL
+impaired/U
+impairment/MS
+impala/SM
+impale/DSGL
+impalement/M
+impalpable
+impalpably
+impanel/SDG
+impart/SDG
+impartial/Y
+impartiality/M
+impassably
+impasse/BSMV
+impassibility/M
+impassible
+impassibly
+impassioned
+impassive/YP
+impassiveness/M
+impassivity/M
+impasto/M
+impatience/MS
+impatiens/M
+impatient/Y
+impeach/ZGBLDRS
+impeachable/U
+impeacher/M
+impeachment/SM
+impeccability/M
+impeccable
+impeccably
+impecunious/PY
+impecuniousness/M
+impedance/M
+impede/DSG
+impeded/U
+impediment/SM
+impedimenta/M
+impel/S
+impelled
+impeller/MS
+impelling
+impend/SDG
+impenetrability/M
+impenetrable
+impenetrably
+impenitence/M
+impenitent/Y
+imperative/SMY
+imperceptibility/M
+imperceptible
+imperceptibly
+imperceptive
+imperf
+imperfect/SMYP
+imperfection/MS
+imperfectness/M
+imperial/MYS
+imperialism/M
+imperialist/SM
+imperialistic
+imperialistically
+imperil/GSLD
+imperilment/M
+imperious/PY
+imperiousness/M
+imperishable
+imperishably
+impermanence/M
+impermanent/Y
+impermeability/M
+impermeable
+impermeably
+impermissible
+impersonal/Y
+impersonate/GNXDS
+impersonation/M
+impersonator/SM
+impertinence/MS
+impertinent/Y
+imperturbability/M
+imperturbable
+imperturbably
+impervious/Y
+impetigo/M
+impetuosity/M
+impetuous/YP
+impetuousness/M
+impetus/MS
+impiety/SM
+impinge/LDSG
+impingement/M
+impious/PY
+impiousness/M
+impish/YP
+impishness/M
+implacability/M
+implacable
+implacably
+implant/BSGMD
+implantation/M
+implausibility/SM
+implausible
+implausibly
+implement/GBMDRS
+implementable/U
+implementation/SM
+implemented/U
+implicate/DSG
+implication/M
+implicit/PY
+implicitness/M
+implode/DSG
+implore/DSG
+imploring/Y
+implosion/MS
+implosive
+imply/XDSGN
+impolite/YP
+impoliteness/MS
+impolitic
+imponderable/MS
+import/ZGBSMDR
+importance/M
+important/Y
+importation/MS
+importer/M
+importunate/Y
+importune/GDS
+importunity/M
+impose/ADSG
+imposer/MS
+imposing/U
+imposingly
+imposition/MS
+impossibility/SM
+impossible/S
+impossibly
+impost/SM
+impostor/SM
+imposture/MS
+impotence/M
+impotency/M
+impotent/Y
+impound/DGS
+impoverish/DSLG
+impoverishment/M
+impracticability
+impracticable
+impracticably
+impractical/Y
+impracticality/M
+imprecate/DSXGN
+imprecation/M
+imprecise/PYN
+impreciseness/M
+imprecision/M
+impregnability/M
+impregnable
+impregnably
+impregnate/GNDS
+impregnation/M
+impresario/SM
+impress/MDSGV
+impressed/U
+impressibility/M
+impressible
+impression/BSM
+impressionability/M
+impressionism/M
+impressionist/SM
+impressionistic
+impressive/PY
+impressiveness/M
+imprimatur/SM
+imprint/MDRZGS
+imprinter/M
+imprison/SDLG
+imprisonment/SM
+improbability/SM
+improbable
+improbably
+impromptu/SM
+improper/Y
+impropriety/SM
+improve/GBDSL
+improved/U
+improvement/MS
+improvidence/M
+improvident/Y
+improvisation/SM
+improvisational
+improvise/ZGDRS
+improviser/M
+imprudence/M
+imprudent/Y
+impudence/M
+impudent/Y
+impugn/ZGSDR
+impugner/M
+impulse/MGNVDS
+impulsion/M
+impulsive/PY
+impulsiveness/M
+impulsivity
+impunity/M
+impure/RYT
+impurity/SM
+imputation/SM
+impute/BDSG
+in/ASM
+inaccuracy/S
+inaction/M
+inadequacy/S
+inadvertence/M
+inadvertent/Y
+inalienability/M
+inalienably
+inamorata/SM
+inane/RYT
+inanimate/PY
+inanimateness/M
+inanity/SM
+inappropriate/Y
+inarticulate/Y
+inasmuch
+inaudible
+inaugural/SM
+inaugurate/XGNDS
+inauguration/M
+inboard/MS
+inbound
+inbox/MS
+inbreed/S
+inc/TGD
+incalculably
+incandescence/M
+incandescent/Y
+incantation/SM
+incapacitate/GNDS
+incarcerate/XDSGN
+incarceration/M
+incarnadine/DSG
+incarnate/AXGNDS
+incarnation/AM
+incendiary/SM
+incense/MGDS
+incentive's
+incentive/ES
+inception/SM
+incessant/Y
+incest/M
+incestuous/PY
+incestuousness/M
+inch/MDSG
+inchoate
+inchworm/SM
+incidence/SM
+incident/SM
+incidental/MYS
+incinerate/DSGN
+incineration/M
+incinerator/MS
+incipience/M
+incipient/Y
+incise/XGNVDS
+incision/M
+incisive/PY
+incisiveness/M
+incisor/MS
+incitement/MS
+inciter/MS
+incl
+inclement
+inclination/EM
+inclinations
+incline's
+incline/EGDS
+include/GDS
+inclusion/MS
+inclusive/YP
+inclusiveness/M
+incognito/MS
+incombustible
+incommode/GD
+incommodious
+incommunicado
+incompatibility/S
+incompetent/MS
+incomplete/Y
+inconceivability/M
+incongruous/PY
+incongruousness/M
+inconsolably
+inconstant/Y
+incontestability/M
+incontestably
+incontinent
+incontrovertibly
+inconvenience/GD
+incorporate/ADSGN
+incorporated/U
+incorporation/AM
+incorporeal
+incorrect/Y
+incorrigibility/M
+incorrigible
+incorrigibly
+incorruptibly
+increasing/Y
+increment/SMDG
+incremental/Y
+incrementalism
+incrementalist/SM
+incriminate/GNDS
+incrimination/M
+incriminatory
+incrustation/SM
+incubate/GNDS
+incubation/M
+incubator/SM
+incubus/MS
+inculcate/DSGN
+inculcation/M
+inculpate/DSG
+incumbency/SM
+incumbent/SM
+incunabula
+incunabulum/M
+incur/SB
+incurable/MS
+incurably
+incurious
+incurred
+incurring
+incursion/MS
+ind
+indebted/P
+indebtedness/M
+indeed
+indefatigable
+indefatigably
+indefeasible
+indefeasibly
+indefinably
+indelible
+indelibly
+indemnification/M
+indemnify/GDSXN
+indemnity/SM
+indentation/MS
+indention/M
+indenture/DG
+indescribably
+indestructibly
+indeterminably
+indeterminacy/M
+indeterminate/Y
+index/ZGMDRS
+indexation/SM
+indexer/M
+indicate/XDSGNV
+indication/M
+indicative/SMY
+indicator/MS
+indict/GDSBL
+indictment/SM
+indie/S
+indigence/M
+indigenous
+indigent/SMY
+indignant/Y
+indignation/M
+indigo/M
+indirect/Y
+indiscipline
+indiscreet/Y
+indiscretion/S
+indiscriminate/Y
+indispensability/M
+indispensable/MS
+indispensably
+indissolubility
+indissolubly
+indistinguishably
+indite/GDS
+indium/M
+individual/MYS
+individualism/M
+individualist/MS
+individualistic
+individualistically
+individuality/M
+individualization/M
+individualize/GDS
+individuate/DSGN
+individuation/M
+indivisibly
+indoctrinate/GNDS
+indoctrination/M
+indolence/M
+indolent/Y
+indomitable
+indomitably
+indubitable
+indubitably
+induce/DRSZGL
+inducement/SM
+inducer/M
+induct/DGV
+inductance/M
+inductee/SM
+induction/MS
+inductive/Y
+indulge/DSG
+indulgence/SM
+indulgent/Y
+industrial/Y
+industrialism/M
+industrialist/SM
+industrialization/M
+industrialize/DSG
+industrious/YP
+industriousness/M
+industry/SM
+indwell/SG
+inebriate/MGNDS
+inebriation/M
+inedible
+ineffability/M
+ineffable
+ineffably
+inelastic
+ineligible/MS
+ineligibly
+ineluctable
+ineluctably
+inept/YP
+ineptitude/M
+ineptness/M
+inequality/S
+inert/YP
+inertia/M
+inertial
+inertness/M
+inescapable
+inescapably
+inestimably
+inevitability/M
+inevitable/M
+inevitably
+inexact/Y
+inexhaustibly
+inexorability
+inexorable
+inexorably
+inexpedient
+inexpert/Y
+inexpiable
+inexplicably
+inexpressibly
+inexpressive
+inextricably
+inf/ZT
+infallible
+infamy/SM
+infancy/M
+infant/MS
+infanticide/MS
+infantile
+infantry/SM
+infantryman/M
+infantrymen
+infarct/MS
+infarction/M
+infatuate/DSXGN
+infatuation/M
+infect/AESDG
+infected/U
+infection/ASM
+infectious/PY
+infectiousness/M
+infelicitous
+inference/SM
+inferential
+inferior/MS
+inferiority/M
+infernal/Y
+inferno/MS
+inferred
+inferring
+infest/GDS
+infestation/MS
+infidel/MS
+infidelity/S
+infiltrator/SM
+infinite/MV
+infinitesimal/SMY
+infinitival
+infinitive/MS
+infinitude/M
+infinity/SM
+infirm
+infirmary/SM
+infirmity/SM
+infix
+inflame/DSG
+inflammable
+inflammation/SM
+inflammatory
+inflatable/SM
+inflate/ADSG
+inflation/EM
+inflationary
+inflect/SDG
+inflection/MS
+inflectional
+inflict/SDGV
+infliction/M
+inflow/SM
+influence/MGDS
+influenced/U
+influential/Y
+influenza/M
+info/M
+infomercial/SM
+inform/Z
+informal/Y
+informant/SM
+informatics
+information/EM
+informational
+informative/PY
+informativeness/M
+informed/U
+infotainment/M
+infra
+infrared/M
+infrasonic
+infrastructural
+infrastructure/SM
+infrequence/M
+infrequent/Y
+infringement/MS
+infuriate/GDS
+infuriating/Y
+infuser/SM
+ingenious/PY
+ingeniousness/M
+ingenue/SM
+ingenuity/M
+ingenuous/EY
+ingenuousness/M
+ingest/SDG
+ingestion/M
+inglenook/SM
+ingot/SM
+ingrain/G
+ingrate/SM
+ingratiate/GNDS
+ingratiating/Y
+ingratiation/M
+ingredient/MS
+ingress/MS
+inguinal
+inhabit/DG
+inhabitable/U
+inhabitant/SM
+inhabited/U
+inhalant/SM
+inhalation/MS
+inhalator/MS
+inhaler/SM
+inharmonious
+inhere/DSG
+inherent/Y
+inherit/EGSD
+inheritance/EM
+inheritances
+inheritor/SM
+inhibit/GSD
+inhibition/SM
+inhibitor/SM
+inhibitory
+inhuman/Y
+inhumane/Y
+inimical/Y
+inimitably
+iniquitous/Y
+iniquity/SM
+initial/SGMDY
+initialism
+initialization
+initialize/DSG
+initialized/AU
+initiate/XMGNVDS
+initiated/U
+initiation/M
+initiative/SM
+initiator/MS
+initiatory
+initio
+inject/SDG
+injection/SM
+injector/SM
+injunctive
+injure/DRSZG
+injured/U
+injurer/M
+injurious
+ink/MD
+inkblot/SM
+inkiness/M
+inkling/SM
+inkstand/SM
+inkwell/MS
+inky/RTP
+inland/M
+inline
+inmate/SM
+inmost
+inn/SGMRJ
+innards/M
+innate/PY
+innateness/M
+innermost
+innersole/SM
+innerspring
+innervate/GNDS
+innervation/M
+inning/M
+innit
+innkeeper/MS
+innocence/M
+innocent/MYS
+innocuous/PY
+innocuousness/M
+innovate/XDSGNV
+innovation/M
+innovator/MS
+innovatory
+innuendo/SM
+innumerably
+innumerate
+inoculate/AGDS
+inoculation/MS
+inoperative
+inordinate/Y
+inorganic
+inositol
+inquire/ZGDR
+inquirer/M
+inquiring/Y
+inquiry/SM
+inquisition/MS
+inquisitional
+inquisitive/YP
+inquisitiveness/M
+inquisitor/SM
+inquisitorial
+inrush/MS
+insane/T
+insatiability/M
+insatiably
+inscribe/ZGDR
+inscriber/M
+inscription/MS
+inscrutability/M
+inscrutable/P
+inscrutableness/M
+inscrutably
+inseam/SM
+insecticidal
+insecticide/MS
+insectivore/MS
+insectivorous
+insecure/Y
+inseminate/DSGN
+insemination/M
+insensate
+insensible
+insensitive/Y
+inseparable/MS
+insert's
+insert/AGSD
+insertion/AM
+insertions
+insetting
+inshore
+inside/RSMZ
+insider/M
+insidious/YP
+insidiousness/M
+insight/MS
+insightful
+insignia/M
+insinuate/GNVDSX
+insinuation/M
+insinuator/SM
+insipid/PY
+insipidity/M
+insist/SGD
+insistence/M
+insistent/Y
+insisting/Y
+insofar
+insole/SM
+insolence/M
+insolent/Y
+insoluble
+insolubly
+insolvency/S
+insomnia/M
+insomniac/SM
+insomuch
+insouciance/M
+insouciant
+inspect/AGDS
+inspection/SM
+inspector/MS
+inspectorate/MS
+inspiration/MS
+inspirational
+inspiratory
+inspired/U
+inspiring/U
+inst
+instability/S
+install/UBZRSDG
+installation/MS
+installer/UM
+installment/SM
+instance/GD
+instant/MRYS
+instantaneous/Y
+instantiate/DSG
+instar
+instate/AGDS
+instead
+instigate/DSGN
+instigation/M
+instigator/MS
+instillation/M
+instinct/VMS
+instinctive/Y
+instinctual
+institute/XMZGNDRS
+instituter/M
+institution/M
+institutional/Y
+institutionalization/M
+institutionalize/DSG
+instr
+instruct/SDGV
+instructed/U
+instruction/MS
+instructional
+instructive/Y
+instructor/MS
+instrument/MDSG
+instrumental/MYS
+instrumentalist/SM
+instrumentality/M
+instrumentation/M
+insubordinate
+insufferable
+insufferably
+insula
+insular
+insularity/M
+insulate/GNDS
+insulation/M
+insulator/MS
+insulin/M
+insult/SMDG
+insulting/Y
+insuperable
+insuperably
+insurance/SM
+insure/DRSZGB
+insured/SM
+insurer/M
+insurgence/SM
+insurgency/SM
+insurgent/MS
+insurmountably
+insurrection/SM
+insurrectionist/SM
+int
+intact
+intaglio/MS
+integer/MS
+integral/SMY
+integrate/AEVNGSD
+integration/EAM
+integrator
+integrity/M
+integument/SM
+intel/M
+intellect/MS
+intellectual/MYS
+intellectualism/M
+intellectualize/GDS
+intelligence/M
+intelligent/Y
+intelligentsia/M
+intelligibility/M
+intelligible/U
+intelligibly/U
+intended/SM
+intense/YTVR
+intensification/M
+intensifier/M
+intensify/DRSZGN
+intensity/S
+intensive/MYPS
+intensiveness/M
+intent/SMYP
+intention/MS
+intentional/UY
+intentness/M
+inter/ESL
+interact/SGVD
+interaction/SM
+interactive/Y
+interactivity
+interbred
+interbreed/GS
+intercede/GDS
+intercept/GMDS
+interception/MS
+interceptor/SM
+intercession/SM
+intercessor/MS
+intercessory
+interchange/DSMG
+interchangeability
+interchangeable
+interchangeably
+intercity
+intercollegiate
+intercom/SM
+intercommunicate/DSGN
+intercommunication/M
+interconnect/GDS
+interconnection/SM
+intercontinental
+intercourse/M
+intercultural
+interdenominational
+interdepartmental
+interdependence/M
+interdependent/Y
+interdict/GMDS
+interdiction/M
+interdisciplinary
+interest/ESMD
+interested/U
+interesting/Y
+interface/MGDS
+interfaith
+interfere/GDS
+interference/M
+interferon/M
+interfile/GDS
+intergalactic
+intergovernmental
+interim/M
+interior/SM
+interj
+interject/GDS
+interjection/SM
+interlace/GDS
+interlard/DGS
+interleave/DSG
+interleukin/M
+interline/GDSJ
+interlinear
+interlining/M
+interlink/DSG
+interlock/GMDS
+interlocutor/SM
+interlocutory
+interlope/ZGDRS
+interloper/M
+interlude/MGDS
+intermarriage/SM
+intermarry/GDS
+intermediary/SM
+intermediate/MYS
+interment/EM
+interments
+intermezzi
+intermezzo/MS
+interminably
+intermingle/DSG
+intermission/SM
+intermittence
+intermittency
+intermittent/Y
+intermix/GDS
+intern/GDL
+internal/SY
+internalization/M
+internalize/GDS
+international/SMY
+internationalism/M
+internationalist/SM
+internationalization
+internationalize/DSG
+internecine
+internee/SM
+internet
+internist/MS
+internment/M
+internship/MS
+interoffice
+interoperability
+interoperable
+interoperate/S
+interpenetrate/DSGN
+interpersonal
+interplanetary
+interplay/M
+interpolate/XDSGN
+interpolation/M
+interpose/GDS
+interposition/M
+interpret/AGVDS
+interpretation/AMS
+interpretative
+interpreted/U
+interpreter/MS
+interracial
+interred/E
+interregnum/SM
+interrelate/XDSGN
+interrelation/M
+interrelationship/MS
+interring/E
+interrogate/DSGNVX
+interrogation/M
+interrogative/MYS
+interrogator/SM
+interrogatory/SM
+interrupt/ZGMDRS
+interrupter/M
+interruption/MS
+interscholastic
+intersect/GDS
+intersection/SM
+intersectional
+intersectionality
+intersession/SM
+intersex
+intersperse/GNDS
+interspersion/M
+interstate/MS
+interstellar
+interstice/MS
+interstitial
+intertwine/GDS
+interurban
+interval/SM
+intervene/GDS
+intervention/SM
+interventionism/M
+interventionist/SM
+interview/ZGMDRS
+interviewee/MS
+interviewer/M
+intervocalic
+interwar
+interweave/GS
+interwove
+interwoven
+intestacy/M
+intestate
+intestinal
+intestine/MS
+intifada
+intimacy/SM
+intimate/MYGNDSX
+intimation/M
+intimidate/GNDS
+intimidating/Y
+intimidation/M
+intonation/SM
+intoxicant/SM
+intoxicate/DSGN
+intoxication/M
+intracranial
+intramural
+intramuscular
+intranet/MS
+intransigence/M
+intransigent/MYS
+intrastate
+intrauterine
+intravenous/MSY
+intrepid/Y
+intrepidity/M
+intricacy/SM
+intricate/Y
+intrigue/DRSMZG
+intriguer/M
+intriguing/Y
+intrinsic
+intrinsically
+intro/SM
+introduce/AGDS
+introduction/AM
+introductions
+introductory
+introit/SM
+introspect/GVDS
+introspection/M
+introspective/Y
+introversion/M
+introvert/MDS
+intrude/DRSZG
+intruder/M
+intrusion/SM
+intrusive/YP
+intrusiveness/M
+intuit/SDGV
+intuition/S
+intuitive/PY
+intuitiveness/M
+inundate/XDSGN
+inundation/M
+inure/DSG
+invade/DRSZG
+invader/M
+invalid/GMDYS
+invalidism/M
+invaluable
+invaluably
+invariant
+invasion/MS
+invasive
+invective/M
+inveigh/GD
+inveighs
+inveigle/ZGDRS
+inveigler/M
+invent/ASGVD
+invention/AMS
+inventive/PY
+inventiveness/M
+inventor/MS
+inventory/DSMG
+inverse/SMY
+invert/SMDRZG
+inverter/M
+invest/ASDGL
+investigate/GNVDSX
+investigation/M
+investigator/SM
+investigatory
+investiture/MS
+investment/AEM
+investor/SM
+inveteracy/M
+inveterate
+invidious/YP
+invidiousness/M
+invigilate/GNDS
+invigilator/S
+invigorate/ADSG
+invigorating/Y
+invigoration/M
+invincibility/M
+invincibly
+inviolability/M
+inviolably
+inviolate
+invitation/SM
+invitational/SM
+invite/DSMG
+invited/U
+invitee/SM
+inviting/Y
+invoke/DSG
+involuntariness/M
+involuntary/P
+involution/M
+involve/LDSG
+involved/U
+involvement/SM
+inward/SY
+ioctl
+iodide/SM
+iodine/M
+iodize/DSG
+ion/USM
+ionic
+ionization/UM
+ionize/UDSG
+ionizer/MS
+ionosphere/MS
+ionospheric
+iota/MS
+ipecac/SM
+irascibility/M
+irascible
+irascibly
+irate/YP
+irateness/M
+ire/M
+ireful
+irenic
+irides
+iridescence/M
+iridescent/Y
+iridium/M
+iris/MS
+irk/SGD
+irksome/YP
+irksomeness/M
+iron/MDSG
+ironclad/MS
+ironic
+ironical/Y
+ironing/M
+ironmonger/S
+ironmongery
+ironstone/M
+ironware/M
+ironwood/MS
+ironwork/M
+irony/SM
+irradiate/DSGN
+irradiation/M
+irrational/SMY
+irrationality/M
+irreclaimable
+irreconcilability/M
+irreconcilable
+irreconcilably
+irrecoverable
+irrecoverably
+irredeemable
+irredeemably
+irreducible
+irreducibly
+irrefutable
+irrefutably
+irregular/MYS
+irregularity/SM
+irrelevance/MS
+irrelevancy/MS
+irrelevant/Y
+irreligion
+irreligious
+irremediable
+irremediably
+irremovable
+irreparable
+irreparably
+irreplaceable
+irrepressible
+irrepressibly
+irreproachable
+irreproachably
+irresistible
+irresistibly
+irresolute/PYN
+irresoluteness/M
+irresolution/M
+irrespective
+irresponsibility/M
+irresponsible
+irresponsibly
+irretrievable
+irretrievably
+irreverence/M
+irreverent/Y
+irreversible
+irreversibly
+irrevocable
+irrevocably
+irrigable
+irrigate/DSGN
+irrigation/M
+irritability/M
+irritable
+irritably
+irritant/SM
+irritate/DSXGN
+irritating/Y
+irritation/M
+irrupt/DGVS
+irruption/SM
+ischemia
+ischemic
+isinglass/M
+isl
+island/SZMR
+islander/M
+isle/MS
+islet/SM
+ism/CM
+isms
+isn't
+isobar/MS
+isobaric
+isolate/DSMGN
+isolation/M
+isolationism/M
+isolationist/SM
+isomer/MS
+isomeric
+isomerism/M
+isometric/S
+isometrically
+isometrics/M
+isomorphic
+isomorphism
+isosceles
+isotherm/SM
+isotope/SM
+isotopic
+isotropic
+issuance/M
+issue/ADSMG
+issuer/MS
+isthmian
+isthmus/MS
+it'd
+it'll
+it/USM
+ital
+italic/SM
+italicization/M
+italicize/GDS
+italics/M
+itch/MDSG
+itchiness/M
+itchy/RPT
+item/MS
+itemization/M
+itemize/GDS
+iterate/AXGNVDS
+iteration/AM
+iterator/S
+itinerant/SM
+itinerary/SM
+itself
+iv/U
+ivory/SM
+ivy/DSM
+ix
+j/F
+jab/SM
+jabbed
+jabber/SMDRZG
+jabberer/M
+jabbing
+jabot/SM
+jacaranda/MS
+jack/MDGS
+jackal/SM
+jackass/MS
+jackboot/SMD
+jackdaw/MS
+jacket/SMD
+jackhammer/MS
+jackknife/MGDS
+jackknives
+jackpot/MS
+jackrabbit/MS
+jackstraw/MS
+jacquard/M
+jade/MGDS
+jaded/PY
+jadedness/M
+jadeite/M
+jag/SM
+jagged/TPRY
+jaggedness/M
+jaggies
+jaguar/SM
+jail/MDRZGS
+jailbird/SM
+jailbreak/SM
+jailer/M
+jailhouse/S
+jalapeno/MS
+jalopy/SM
+jalousie/MS
+jam/SM
+jamb/MS
+jambalaya/M
+jamboree/MS
+jammed
+jamming
+jammy/RT
+jangle/DRSMZG
+jangler/M
+janitor/SM
+janitorial
+japan/SM
+japanned
+japanning
+jape/MGDS
+jar/SM
+jardiniere/SM
+jarful/MS
+jargon/M
+jarred
+jarring/Y
+jasmine/SM
+jasper/M
+jato/MS
+jaundice/DSMG
+jaunt/SGMD
+jauntily
+jauntiness/M
+jaunty/RPT
+java/M
+javelin/SM
+jaw/SGMD
+jawbone/DSMG
+jawbreaker/MS
+jawline/S
+jay/SM
+jaybird/SM
+jaywalk/DRSZG
+jaywalker/M
+jaywalking/M
+jazz/MDSG
+jazzy/TR
+jct
+jealous/Y
+jealousy/SM
+jean/MS
+jeans/M
+jeep/MS
+jeer/MDSG
+jeering/MY
+jeez
+jejuna
+jejune
+jejunum/M
+jell/DSG
+jello/S
+jelly/GDSM
+jellybean/MS
+jellyfish/MS
+jellylike
+jellyroll/SM
+jemmy/GDS
+jennet/MS
+jenny/SM
+jeopardize/GDS
+jeopardy/M
+jeremiad/MS
+jerk/MDSG
+jerkily
+jerkin/MS
+jerkiness/M
+jerkwater
+jerky/TRMP
+jeroboam/S
+jerrybuilt
+jerrycan/S
+jersey/MS
+jest/MDRSZG
+jester/M
+jesting/Y
+jet/SM
+jetliner/SM
+jetport/MS
+jetsam/M
+jetted
+jetting
+jettison/MDSG
+jetty/SM
+jewel/SZGMDR
+jeweler/M
+jewelry/SM
+jg
+jib/SGMD
+jibbed
+jibbing
+jibe/MS
+jiff/MS
+jiffy/SM
+jig's
+jig/AS
+jigged/A
+jigger's
+jigger/ASDG
+jigging/A
+jiggle/DSMG
+jiggly
+jigsaw/SMDG
+jihad/SM
+jihadist/SM
+jilt/MDSG
+jimmy/DSMG
+jimsonweed/M
+jingle/DSMG
+jingly
+jingoism/M
+jingoist/SM
+jingoistic
+jink/DSG
+jinn
+jinni/M
+jinrikisha/SM
+jinx/MDSG
+jitney/SM
+jitterbug/MS
+jitterbugged
+jitterbugger/M
+jitterbugging
+jitters/M
+jittery/RT
+jive/MGDS
+job/SM
+jobbed
+jobber/SM
+jobbing
+jobholder/MS
+jobless/P
+joblessness/M
+jobshare/S
+jobsworth
+jobsworths
+jock/MS
+jockey/SGMD
+jockstrap/MS
+jocose/PY
+jocoseness/M
+jocosity/M
+jocular/Y
+jocularity/M
+jocund/Y
+jocundity/M
+jodhpurs/M
+joey/S
+jog/SM
+jogged
+jogger/SM
+jogging/M
+joggle/DSMG
+john/MS
+johnny/SM
+johnnycake/MS
+join's
+join/AFDSG
+joiner/FMS
+joinery/M
+joint's
+joint/EGSD
+jointly/F
+joist/SM
+jojoba
+joke/MZGDRS
+joker/M
+jokey
+jokier
+jokiest
+joking/Y
+jollification/SM
+jollily
+jolliness/M
+jollity/M
+jolly/TGPDRSM
+jolt/MDRSZG
+jolter/M
+jonquil/SM
+josh/MDRSZG
+josher/M
+jostle/MGDS
+jot/SM
+jotted
+jotter/MS
+jotting/MS
+joule/SM
+jounce/MGDS
+jouncy
+journal/MS
+journalese/M
+journalism/M
+journalist/SM
+journalistic
+journey/ZGMDRS
+journeyer/M
+journeyman/M
+journeymen
+journo/S
+joust/SZGMDR
+jouster/M
+jousting/M
+jovial/Y
+joviality/M
+jowl/MS
+jowly/TR
+joy/SGMD
+joyful/YP
+joyfuller
+joyfullest
+joyfulness/M
+joyless/PY
+joylessness/M
+joyous/YP
+joyousness/M
+joyridden
+joyride/RSMZG
+joyrider/M
+joyriding/M
+joyrode
+joystick/SM
+jr
+jubilant/Y
+jubilation/M
+jubilee/SM
+judder/GDS
+judge's
+judge/ADSG
+judgeship/M
+judgment/SM
+judgmental/Y
+judicatory/SM
+judicature/M
+judicial/Y
+judiciary/SM
+judicious/IYP
+judiciousness/IM
+judo/M
+jug/SM
+jugful/MS
+jugged
+juggernaut/SM
+jugging
+juggle/MZGDRS
+juggler/M
+jugglery/M
+jugular/SM
+juice/DRSMZG
+juicer/M
+juicily
+juiciness/M
+juicy/PTR
+jujitsu/M
+jujube/MS
+jukebox/MS
+julep/SM
+julienne
+jumble/MGDS
+jumbo/SM
+jump/MDRSZG
+jumper/M
+jumpily
+jumpiness/M
+jumpsuit/MS
+jumpy/TRP
+jun
+junco/SM
+junction/FISM
+juncture/FMS
+jungle/MS
+junior/MS
+juniper/SM
+junk/MDRSZG
+junker/M
+junket/MDSG
+junketeer/MS
+junkie/MTRS
+junkyard/MS
+junta/SM
+juridic
+juridical/Y
+jurisdiction/SM
+jurisdictional
+jurisprudence/M
+jurist/MS
+juristic
+juror/SM
+jury/ISM
+juryman/M
+jurymen
+jurywoman/M
+jurywomen
+just/RYPT
+justice/IMS
+justifiable/U
+justifiably/U
+justification/M
+justified/U
+justify/XGDSN
+justness/M
+jut/SM
+jute/M
+jutted
+jutting
+juvenile/SM
+juxtapose/DSG
+juxtaposition/SM
+k/IFGS
+kHz
+kW
+kWh
+kabbalah
+kaboom
+kabuki/M
+kaddish/MS
+kaffeeklatch/MS
+kaffeeklatsch/MS
+kahuna/S
+kaiser/MS
+kale/M
+kaleidoscope/MS
+kaleidoscopic
+kaleidoscopically
+kamikaze/MS
+kana
+kangaroo/MS
+kanji
+kaolin/M
+kapok/M
+kappa/SM
+kaput
+karakul/M
+karaoke/MS
+karat/SM
+karate/M
+karma/M
+karmic
+kart/MS
+katakana
+katydid/SM
+kayak/SMDG
+kayaking/M
+kayo/MDSG
+kazoo/SM
+kc
+kebab/SM
+kedgeree
+keel/MDSG
+keelhaul/DGS
+keen/MDRYSTGP
+keenness/M
+keep/MRSZG
+keeper/M
+keeping/M
+keepsake/MS
+keg/SM
+kelp/M
+kelvin/SM
+ken/SM
+kenned
+kennel/SGMD
+kenning
+keno/M
+kepi/MS
+kept
+keratin/M
+keratitis
+kerbside
+kerchief/SM
+kerfuffle/S
+kernel/SM
+kerosene/M
+kestrel/MS
+ketch/MS
+ketchup/M
+keto
+ketogenic
+ketone/S
+kettle/SM
+kettledrum/SM
+key/SGMD
+keybinding/S
+keyboard/ZGSMDR
+keyboarder/M
+keyboardist/SM
+keyhole/MS
+keynote/MZGDRS
+keynoter/M
+keypad/SM
+keypunch/ZGMDRS
+keypuncher/M
+keystone/MS
+keystroke/SM
+keyword/MS
+kg
+khaki/SM
+khan/MS
+kibble/DSMG
+kibbutz/MS
+kibbutzim
+kibitz/ZGDRS
+kibitzer/M
+kibosh/M
+kick/MDRSZG
+kickback/SM
+kickball/M
+kickboxing
+kicker/M
+kickoff/MS
+kickstand/MS
+kicky/RT
+kid/SM
+kidded
+kidder/SM
+kiddie/SM
+kidding
+kiddish
+kiddo/SM
+kidnap/S
+kidnapped
+kidnapper/MS
+kidnapping/MS
+kidney/SM
+kidskin/M
+kielbasa/MS
+kielbasi
+kike/S
+kill/JMDRSZG
+killdeer/SM
+killer/M
+killing/M
+killjoy/SM
+kiln/MDSG
+kilo/MS
+kilobyte/SM
+kilocoulomb/S
+kilocycle/SM
+kilogram/SM
+kilohertz/M
+kilojoule/S
+kiloliter/MS
+kilometer/MS
+kilonewton/S
+kilopascal/S
+kiloton/SM
+kilovolt/S
+kilowatt/SM
+kilt/MDRS
+kilter/M
+kimono/MS
+kin/M
+kinase
+kind's
+kind/UPRYT
+kinda
+kindergarten/MS
+kindergartner/SM
+kindhearted/PY
+kindheartedness/M
+kindle/AGDS
+kindliness/M
+kindling/M
+kindly/URT
+kindness/UM
+kindnesses
+kindred/M
+kinds
+kine/S
+kinematic/S
+kinematics/M
+kinetic/S
+kinetically
+kinetics/M
+kinfolk/SM
+kinfolks/M
+king/MYS
+kingdom/SM
+kingfisher/SM
+kingly/RT
+kingmaker/S
+kingpin/SM
+kingship/M
+kink/MDSG
+kinkily
+kinkiness/M
+kinky/TPR
+kinsfolk/M
+kinship/M
+kinsman/M
+kinsmen
+kinswoman/M
+kinswomen
+kiosk/SM
+kip/SM
+kipped
+kipper/MDGS
+kipping
+kirsch/MS
+kismet/M
+kiss/MDRSBZG
+kisser/M
+kissoff/SM
+kissogram/S
+kit/SGMD
+kitchen/SM
+kitchenette/MS
+kitchenware/M
+kite/MS
+kith/M
+kitsch/M
+kitschy
+kitted
+kitten/MS
+kittenish
+kitting
+kitty/SM
+kiwi/MS
+kiwifruit/MS
+kl
+klaxon/S
+kleptocracy
+kleptomania/M
+kleptomaniac/SM
+kludge/GDS
+kluge/DS
+klutz/MS
+klutziness/M
+klutzy/TRP
+km
+kn
+knack/SZMR
+knacker/GD
+knapsack/MS
+knave/SM
+knavery/M
+knavish/Y
+knead/SZGDR
+kneader/M
+knee/MDS
+kneecap/SM
+kneecapped
+kneecapping
+kneeing
+kneel/SG
+knell/SGMD
+knelt
+knew
+knicker/S
+knickerbockers/M
+knickers/M
+knickknack/MS
+knife/DSMG
+knight/MDYSG
+knighthood/MS
+knightliness/M
+knish/MS
+knit/MS
+knitted
+knitter/SM
+knitting/M
+knitwear/M
+knives
+knob/MS
+knobbly
+knobby/TR
+knock/SZGMDR
+knockabout
+knockdown/SM
+knocker/M
+knockoff/SM
+knockout/SM
+knockwurst/SM
+knoll/SM
+knot/MS
+knothole/SM
+knotted
+knotting
+knotty/TR
+know/SB
+knowing/UYS
+knowledge/M
+knowledgeable
+knowledgeably
+known
+knuckle/DSMG
+knuckleduster/S
+knucklehead/MS
+knurl/SGMD
+koala/SM
+koan/S
+kohl
+kohlrabi/M
+kohlrabies
+kola/MS
+kook/MS
+kookaburra/SM
+kookiness/M
+kooky/TPR
+kopeck/MS
+korma
+kosher/DSG
+kowtow/GMDS
+kph
+kraal/SM
+kraut/SM!
+krill/M
+krona/M
+krone/RM
+kronor
+kronur
+krypton/M
+kt
+kuchen/SM
+kudos/M
+kudzu/SM
+kumquat/MS
+kvetch/ZGMDRS
+kvetcher/M
+kw
+l/SDXTGJ
+la/M
+lab/SM
+label's
+label/ASDG
+labeled/U
+labia
+labial/SM
+labile
+labium/M
+labor/SMDRZG
+laboratory/SM
+laborer/M
+laborious/PY
+laboriousness/M
+laborsaving
+laburnum/MS
+labyrinth/M
+labyrinthine
+labyrinths
+lac/M
+lace's
+lace/UGDS
+lacerate/DSGNX
+laceration/M
+lacewing/SM
+lacework/M
+lachrymal
+lachrymose
+lack/MDSG
+lackadaisical/Y
+lackey/SM
+lackluster
+laconic
+laconically
+lacquer/GMDS
+lacrosse/M
+lactate/GNDS
+lactation/M
+lacteal
+lactic
+lactose/M
+lacuna/M
+lacunae
+lacy/RT
+lad/SGMDNJ
+ladder/GSMD
+laddie/SM
+laddish/P
+lade/S
+laden/U
+lading/M
+ladle/DSMG
+lady/SM
+ladybird/SM
+ladybug/MS
+ladyfinger/MS
+ladylike/U
+ladylove/MS
+ladyship/MS
+laetrile/M
+lag/SZMR
+lager/M
+laggard/MYS
+lagged
+lagging/M
+lagniappe/SM
+lagoon/SM
+laid/IA
+lain
+lair/MS
+laird/SM
+laity/M
+lake/MS
+lakefront/S
+lakeside
+lam/SM
+lama/MS
+lamasery/SM
+lamb/MDSG
+lambada/MS
+lambaste/GDS
+lambda/SM
+lambency/M
+lambent/Y
+lambkin/SM
+lambskin/SM
+lambswool
+lame/MYZTGDRSP
+lamebrain/MDS
+lameness/M
+lament/BSMDG
+lamentably
+lamentation/MS
+lamina/M
+laminae
+laminar
+laminate/MGNDS
+lamination/M
+lammed
+lamming
+lamp/MS
+lampblack/M
+lamplight/MRZ
+lamplighter/M
+lampoon/SGMD
+lamppost/SM
+lamprey/MS
+lampshade/SM
+lanai/SM
+lance/DRSMZG
+lancer/M
+lancet/SM
+land/MDRSGJ
+landau/SM
+landfall/MS
+landfill/MS
+landholder/SM
+landholding/MS
+landing/M
+landlady/SM
+landless/M
+landline/MS
+landlocked
+landlord/MS
+landlubber/MS
+landmark/MS
+landmass/MS
+landmine/S
+landowner/MS
+landownership
+landowning/SM
+landscape/MZGDRS
+landscaper/M
+landslid
+landslide/MGS
+landslip/S
+landsman/M
+landsmen
+landward/S
+lane/MS
+language/MS
+languid/PY
+languidness/M
+languish/DSG
+languor/SM
+languorous/Y
+lank/RYTP
+lankiness/M
+lankness/M
+lanky/RTP
+lanolin/M
+lantern/MS
+lanthanum/M
+lanyard/MS
+lap/SM
+laparoscopic
+laparoscopy
+laparotomy
+lapboard/SM
+lapdog/SM
+lapel/SM
+lapidary/SM
+lapin/SM
+lapped
+lappet/SM
+lapping
+lapse/AKGMSD
+laptop/SM
+lapwing/MS
+larboard/SM
+larcenist/SM
+larcenous
+larceny/SM
+larch/MS
+lard/MDRSZG
+larder/M
+lardy/RT
+large/RSPMYT
+largehearted
+largeness/M
+largess/M
+largish
+largo/SM
+lariat/SM
+lark/MDSG
+larkspur/SM
+larva/M
+larvae
+larval
+laryngeal
+larynges
+laryngitis/M
+larynx/M
+lasagna/MS
+lascivious/YP
+lasciviousness/M
+lase/ZGDRS
+laser/M
+lash/MDSGJ
+lashing/M
+lass/MS
+lassie/SM
+lassitude/M
+lasso/SMDG
+last/MDYSG
+lasting/Y
+lat/S
+latch's
+latch/UDSG
+latchkey/SM
+late/YTRP
+latecomer/MS
+latency/M
+lateness/M
+latent
+lateral/MDYSG
+latest/M
+latex/M
+lath/MDRSZG
+lathe/M
+lather/GMD
+lathery
+laths
+latices
+latish
+latitude/MS
+latitudinal
+latitudinarian/MS
+latrine/MS
+latte/RSM
+latter/MY
+lattice/MDS
+latticework/SM
+laud/MDSGB
+laudably
+laudanum/M
+laudatory
+laugh/BMDG
+laughably
+laughing/MY
+laughingstock/SM
+laughs
+laughter/M
+launch/AGMDS
+launcher/SM
+launchpad/SM
+launder/DRZGS
+launderer/M
+launderette/SM
+laundress/MS
+laundromat/MS
+laundry/SM
+laundryman/M
+laundrymen
+laundrywoman/M
+laundrywomen
+laureate/MS
+laureateship/M
+laurel/SM
+lav/SGD
+lava/M
+lavage/M
+lavaliere/SM
+lavatorial
+lavatory/SM
+lave/S
+lavender/SM
+lavish/PTGDRSY
+lavishness/M
+law/SM
+lawbreaker/SM
+lawbreaking/M
+lawful/UPY
+lawfulness/UM
+lawgiver/MS
+lawless/PY
+lawlessness/M
+lawmaker/MS
+lawmaking/M
+lawman/M
+lawmen
+lawn/MS
+lawnmower/SM
+lawrencium/M
+lawsuit/MS
+lawyer/SM
+lax/TRYP
+laxative/MS
+laxity/M
+laxness/M
+lay/AICSGM
+layabout/S
+layaway/M
+layer/CSM
+layered
+layering/M
+layette/MS
+layman/M
+laymen
+layoff/SM
+layout/SM
+layover/MS
+laypeople
+layperson/MS
+layup/SM
+laywoman/M
+laywomen
+laze/MGDS
+lazily
+laziness/M
+lazy/DRSTGP
+lazybones/M
+lb/S
+lbw
+lea/SM
+leach/DSG
+lead/MDNRSZG
+leader/M
+leaderless
+leadership/SM
+leading/M
+leaf/MDSG
+leafage/M
+leafless
+leaflet/GMDS
+leafstalk/MS
+leafy/RT
+league/DSMG
+leak/MDSG
+leakage/MS
+leakiness/M
+leaky/PRT
+lean/MDRSTGJP
+leaning/M
+leanness/M
+leap/MDRSZG
+leaper/M
+leapfrog/MS
+leapfrogged
+leapfrogging
+leapt
+learn/AUGDS
+learnability
+learnable
+learnedly
+learner/MS
+learning's
+lease/ADSMG
+leaseback/SM
+leasehold/MRSZ
+leaseholder/M
+leaser/SM
+leash's
+leash/UDSG
+least/M
+leastwise
+leather/MS
+leatherette/M
+leatherneck/MS
+leathery
+leave/DRSMZGJ
+leaven/SGMD
+leavened/U
+leavening/M
+leaver/M
+leavings/M
+lech/MDRSZG
+lecher/M
+lecherous/PY
+lecherousness/M
+lechery/M
+lecithin/M
+lectern/MS
+lecture/MZGDRS
+lecturer/M
+lectureship/SM
+ledge/RSMZ
+ledger/M
+lee/RSMZ
+leech/MDSG
+leek/MS
+leer/MDG
+leeriness/M
+leery/RPT
+leeward/SM
+leeway/M
+left/MRST
+leftism/M
+leftist/SM
+leftmost
+leftover/SM
+leftward/S
+lefty/SM
+leg/SM
+legacy/SM
+legal/SMY
+legalese/M
+legalism/MS
+legalistic
+legalistically
+legality/SM
+legalization/M
+legalize/GDS
+legate/CXMNS
+legatee/MS
+legation's/AC
+legato/SM
+legend/SM
+legendarily
+legendary
+legerdemain/M
+legged
+legginess/M
+legging/MS
+leggy/RPT
+leghorn/MS
+legibility/M
+legible
+legibly
+legion/SM
+legionary/SM
+legionnaire/SM
+legislate/DSGNV
+legislation/M
+legislative/Y
+legislator/MS
+legislature/SM
+legit
+legitimacy/M
+legitimate/DSYG
+legitimatize/GDS
+legitimization/M
+legitimize/DSG
+legless
+legman/M
+legmen
+legroom/SM
+legume/MS
+leguminous
+legwarmer/S
+legwork/M
+lei/SM
+leisure/DMY
+leisureliness/M
+leisurewear/M
+leitmotif/MS
+leitmotiv/MS
+lemma/S
+lemme/JG
+lemming/M
+lemon/SM
+lemonade/SM
+lemongrass
+lemony
+lemur/SM
+lend/RSZG
+lender/M
+length/MNX
+lengthen/GD
+lengthily
+lengthiness/M
+lengths
+lengthwise
+lengthy/PRT
+lenience/M
+leniency/M
+lenient/Y
+lenitive
+lens/MS
+lent
+lentil/MS
+lento
+leonine
+leopard/SM
+leopardess/MS
+leotard/SM
+leper/SM
+leprechaun/MS
+leprosy/M
+leprous
+lepta
+lepton/MS
+lesbian/SM
+lesbianism/M
+lesion/MS
+less/MNRX
+lessee/MS
+lessen/GD
+lesson/MS
+lessor/MS
+let/ISM
+letdown/SM
+lethal/Y
+lethargic
+lethargically
+lethargy/M
+letter/ZGMDRS
+letterbomb/S
+letterbox/S
+lettered/U
+letterer/M
+letterhead/MS
+lettering/M
+letterpress/M
+letting/S
+lettuce/MS
+letup/SM
+leucine
+leucotomy/S
+leukemia/M
+leukemic/SM
+leukocyte/MS
+levee/SM
+level/PSZGMDRY
+leveler/M
+levelheaded/P
+levelheadedness/M
+levelness/M
+lever/SGMD
+leverage's
+leverage/CDSG
+leviathan/MS
+levier/M
+levitate/DSGN
+levitation/M
+levity/M
+levy/DRSMZG
+lewd/RYPT
+lewdness/M
+lexer/S
+lexical
+lexicographer/MS
+lexicographic
+lexicographical
+lexicography/M
+lexicon/SM
+lexis
+lg
+liabilities
+liability/AM
+liable/A
+liaise/GDS
+liaison/MS
+liar/MS
+lib/M
+libation/SM
+libber/MS
+libel/SZGMDR
+libeler/M
+libelous
+liberal/MYPS
+liberalism/M
+liberality/M
+liberalization/SM
+liberalize/GDS
+liberalness/M
+liberate/CDSGN
+liberation/CM
+liberator/MS
+libertarian/SM
+libertine/MS
+liberty/SM
+libidinal
+libidinous
+libido/MS
+librarian/MS
+librarianship
+library/SM
+librettist/MS
+libretto/SM
+lice
+license/MGDS
+licensed/U
+licensee/MS
+licentiate/SM
+licentious/YP
+licentiousness/M
+lichen/MS
+licit/Y
+lick/MDJSG
+licking/M
+licorice/SM
+lid/SM
+lidded
+lidless
+lido/MS
+lie/DSM
+lied/MR
+lief/RT
+liege/SM
+lien/MS
+lieu/M
+lieutenancy/M
+lieutenant/MS
+life/MZR
+lifebelt/S
+lifeblood/M
+lifeboat/MS
+lifebuoy/MS
+lifeforms
+lifeguard/SM
+lifeless/YP
+lifelessness/M
+lifelike
+lifeline/MS
+lifelong
+lifer/M
+lifesaver/SM
+lifesaving/M
+lifespan/S
+lifestyle/SM
+lifetime/MS
+lifework/MS
+lift/MDRSZG
+lifter/M
+liftoff/SM
+ligament/MS
+ligate/GNDS
+ligation/M
+ligature/MGDS
+light's/C
+light/CASTGD
+lighted/U
+lighten/SDRZG
+lightener/M
+lighter/SM
+lightface/MD
+lightheaded
+lighthearted/YP
+lightheartedness/M
+lighthouse/MS
+lighting's
+lightly
+lightness/M
+lightning/MDS
+lightproof
+lightship/MS
+lightweight/SM
+ligneous
+lignin
+lignite/M
+lii
+likability/M
+likable/P
+likableness/M
+like/EMGDST
+likelihood/UM
+likelihoods
+likeliness/UM
+likely/UPRT
+liken/SGD
+likeness/UM
+likenesses
+liker
+likewise
+liking/M
+lilac/SM
+lilliputian
+lilo/S
+lilt/MDSG
+lily/SM
+limb/MS
+limber/UDSG
+limberness/M
+limbless
+limbo/SM
+lime/MGDS
+limeade/SM
+limelight/M
+limerick/SM
+limescale
+limestone/M
+limey/S
+limit's
+limit/CSZGDR
+limitation/CM
+limitations
+limited/U
+limiter's
+limiting/S
+limitless/P
+limitlessness/M
+limn/DSG
+limo/MS
+limousine/MS
+limp/MDRYSPTG
+limpet/MS
+limpid/YP
+limpidity/M
+limpidness/M
+limpness/M
+limy/RT
+linage/M
+linchpin/SM
+linden/MS
+line/MZGDRSJ
+lineage/MS
+lineal/Y
+lineament/SM
+linear/Y
+linearity/M
+linebacker/MS
+lined/U
+linefeed
+lineman/M
+linemen
+linen/SM
+linens/M
+liner/M
+linesman/M
+linesmen
+lineup/MS
+ling/M
+linger/ZGJDRS
+lingerer/M
+lingerie/M
+lingering/Y
+lingo/M
+lingoes
+lingual
+linguine/M
+linguist/SM
+linguistic/S
+linguistically
+linguistics/M
+liniment/SM
+lining/M
+link/MDRSG
+linkage/MS
+linkman
+linkmen
+linkup/MS
+linnet/MS
+lino
+linoleum/M
+linseed/M
+lint's
+lint/CDG
+lintel/MS
+lints
+linty/TR
+lion/MS
+lioness/MS
+lionhearted
+lionization/M
+lionize/GDS
+lip/SM
+lipid/SM
+liposuction/M
+lipped
+lippy
+lipread/GRS
+lipreader/M
+lipreading/M
+lipstick/MDSG
+liq
+liquefaction/M
+liquefy/DSG
+liqueur/SM
+liquid/MS
+liquidate/XGNDS
+liquidation/M
+liquidator/MS
+liquidity/M
+liquidize/ZGDRS
+liquidizer/M
+liquor/MDGS
+lira/M
+lire
+lisle/M
+lisp/MDRSZG
+lisper/M
+lissome
+list/MDNSJXG
+listed/U
+listen/BMDRZG
+listener/M
+listeria
+listing/M
+listless/YP
+listlessness/M
+lit/ZR
+litany/SM
+litchi/MS
+lite
+liter/M
+literacy/M
+literal/SMYP
+literalness/M
+literariness/M
+literary/P
+literate/SMY
+literati/M
+literature/M
+lithe/RPYT
+litheness/M
+lithesome
+lithium/M
+lithograph/MDRZG
+lithographer/M
+lithographic
+lithographically
+lithographs
+lithography/M
+lithosphere/SM
+litigant/SM
+litigate/DSGN
+litigation/M
+litigator/MS
+litigious/P
+litigiousness/M
+litmus/M
+litotes/M
+litter/MDRSZG
+litterateur/MS
+litterbug/MS
+litterer/M
+little/MTRP
+littleness/M
+littoral/SM
+liturgical/Y
+liturgist/SM
+liturgy/SM
+livability/M
+livable/U
+live/ATGDSB
+livelihood/SM
+liveliness/M
+livelong/S
+lively/PRT
+liven/SGD
+liver's
+liver/S
+liveried
+liverish
+liverwort/MS
+liverwurst/M
+livery/CSM
+liveryman/CM
+liverymen/C
+livestock/M
+liveware
+livid/Y
+living/MS
+lix/K
+lizard/MS
+ll
+llama/SM
+llano/SM
+lo
+load's
+load/AUGSD
+loadable
+loader/MS
+loading's
+loaf/MDRSZG
+loafer/M
+loam/M
+loamy/TR
+loan/MDRSZG
+loaner/M
+loansharking/M
+loanword/MS
+loath/JZGDRS
+loathe
+loather/M
+loathing/M
+loathsome/PY
+loathsomeness/M
+loaves
+lob/SMD
+lobar
+lobbed
+lobber/MS
+lobbing
+lobby/GDSM
+lobbyist/MS
+lobe/MS
+lobotomize/DSG
+lobotomy/SM
+lobster/MS
+local/SMY
+locale/MS
+locality/SM
+localization/M
+localize/DSG
+locate/EAGNDS
+location's/A
+location/ESM
+locator/MS
+locavore/SM
+loci
+lock/MDRSBZG
+locker/M
+locket/MS
+lockjaw/M
+lockout/MS
+locksmith/M
+locksmiths
+lockstep/M
+lockup/MS
+loco/S
+locomotion/M
+locomotive/MS
+locoweed/SM
+locum/S
+locus/M
+locust/SM
+locution/MS
+lode/MS
+lodestar/MS
+lodestone/MS
+lodge/DRSJMZG
+lodger/M
+lodging/M
+lodgings/M
+loft/MDSG
+loftily
+loftiness/M
+lofty/PRT
+log/SM
+loganberry/SM
+logarithm/SM
+logarithmic
+logbook/SM
+loge/MS
+logged
+logger/SM
+loggerhead/SM
+loggia/SM
+logging/M
+logic/M
+logical/Y
+logicality/M
+logician/MS
+login/SM
+logistic/S
+logistical/Y
+logistics/M
+logjam/SM
+logo/MS
+logoff/SM
+logon/SM
+logotype/SM
+logout/SM
+logrolling/M
+logy/RT
+loin/MS
+loincloth/M
+loincloths
+loiter/ZGSDR
+loiterer/M
+loitering/M
+lolcat/SM
+loll/DSG
+lollipop/SM
+lollop/GSD
+lolly/S
+lollygag/S
+lollygagged
+lollygagging
+lone/YZR
+loneliness/M
+lonely/PTR
+loner/M
+lonesome/YP
+lonesomeness/M
+long's
+long/KDSTG
+longboat/MS
+longbow/MS
+longer
+longevity/M
+longhair/MS
+longhand/M
+longhorn/MS
+longhouse/S
+longing/MYS
+longish
+longitude/MS
+longitudinal/Y
+longshoreman/M
+longshoremen
+longsighted
+longstanding
+longtime
+longueur/SM
+longways
+loo
+loofah/M
+loofahs
+look/MDRSZG
+lookalike/MS
+looker/M
+lookout/MS
+lookup
+loom/MDSG
+loon/MS
+loonie/M
+loony/RSMT
+loop/MDSG
+loophole/MS
+loopy/RT
+loos/NRX
+loose/UDSTG
+loosely
+loosen/UGSD
+looseness/M
+loot/MDRSZG
+looter/M
+looting/M
+lop/S
+lope/MGDS
+lopped
+lopping
+lopsided/YP
+lopsidedness/M
+loquacious/PY
+loquaciousness/M
+loquacity/M
+lord/MDYSG
+lordliness/M
+lordly/TPR
+lordship/SM
+lore/M
+lorgnette/SM
+loris/MS
+lorn
+lorry/SM
+lose/ZGRSJ
+loser/M
+losing/M
+loss/MS
+lossless
+lost
+lot/SM
+lotion/SM
+lottery/SM
+lotto/M
+lotus/MS
+louche
+loud/RYTP
+loudhailer/SM
+loudmouth/MD
+loudmouths
+loudness/M
+loudspeaker/MS
+lough
+loughs
+lounge/MZGDRS
+lounger/M
+lour/DSG
+louse's
+louse/CDSG
+lousily
+lousiness/M
+lousy/TPR
+lout/MS
+loutish/PY
+louver/MDS
+lovableness/M
+lovably
+love/MYZGDRSB
+lovebird/SM
+lovechild/M
+loved/U
+loveless
+loveliness/M
+lovelorn
+lovely/RSMTP
+lovemaking/M
+lover/M
+lovesick
+lovey/S
+loving/Y
+low/SZTGMDRYP
+lowborn
+lowboy/MS
+lowbrow/SM
+lowdown/M
+lower/GD
+lowercase/M
+lowermost
+lowish
+lowland/SZMR
+lowlander/M
+lowlife/SM
+lowliness/M
+lowly/TPR
+lowness/M
+lox/M
+loyal/ETY
+loyaler
+loyalism/M
+loyalist/SM
+loyalties
+loyalty/EM
+lozenge/SM
+ltd
+luau/MS
+lubber/MYS
+lube/MGDS
+lubricant/SM
+lubricate/DSGN
+lubrication/M
+lubricator/MS
+lubricious/Y
+lubricity/M
+lucid/PY
+lucidity/M
+lucidness/M
+luck/MDSG
+luckily/U
+luckiness/UM
+luckless
+lucky/UPTR
+lucrative/YP
+lucrativeness/M
+lucre/M
+lucubrate/GNDS
+lucubration/M
+ludicrous/YP
+ludicrousness/M
+ludo
+luff/DSG
+lug/SM
+luge/S
+luggage/M
+lugged
+lugger/MS
+lugging
+lughole/S
+lugsail/SM
+lugubrious/YP
+lugubriousness/M
+lukewarm/YP
+lukewarmness/M
+lull/MDSG
+lullaby/SM
+lulu/S
+lumbago/M
+lumbar
+lumber/MDRZGS
+lumberer/M
+lumbering/M
+lumberjack/SM
+lumberman/M
+lumbermen
+lumberyard/SM
+lumen
+luminary/SM
+luminescence/M
+luminescent
+luminosity/M
+luminous/Y
+lummox/MS
+lump/MDNSG
+lumpectomy/S
+lumpenproletariat
+lumpiness/M
+lumpish
+lumpy/TRP
+lunacy/SM
+lunar
+lunatic/SM
+lunch/GMDS
+lunchbox/S
+luncheon/SM
+luncheonette/SM
+lunchroom/MS
+lunchtime/MS
+lung/MDSG
+lunge/SM
+lungfish/MS
+lungful/S
+lunkhead/MS
+lupine/MS
+lupus/M
+lurch/GMDS
+lure/MGDS
+lurgy
+lurid/PY
+luridness/M
+lurk/DRSZG
+luscious/PY
+lusciousness/M
+lush/MRSYPT
+lushness/M
+lust/MDRSG
+luster/M
+lusterless
+lustful/Y
+lustily
+lustiness/M
+lustrous/Y
+lusty/PTR
+lutanist/SM
+lute/MS
+lutenist/SM
+lutetium/M
+lux
+luxuriance/M
+luxuriant/Y
+luxuriate/DSGN
+luxuriation/M
+luxurious/PY
+luxuriousness/M
+luxury/SM
+lvi
+lvii
+lxi
+lxii
+lxiv
+lxix
+lxvi
+lxvii
+lyceum/MS
+lychgate/S
+lye/MG
+lying/M
+lymph/M
+lymphatic/SM
+lymphocyte/SM
+lymphoid
+lymphoma/SM
+lynch/JZGDRS
+lyncher/M
+lynching/M
+lynx/MS
+lyre/MS
+lyrebird/MS
+lyric/SM
+lyrical/Y
+lyricism/M
+lyricist/SM
+lysosomal
+lysosomes
+m/KAS
+ma'am
+ma/SMH
+mac/SGMD
+macabre
+macadam/M
+macadamia/SM
+macadamize/GDS
+macaque/MS
+macaroni/MS
+macaroon/MS
+macaw/SM
+mace/MS
+macerate/DSGN
+maceration/M
+mach/M
+machete/SM
+machinate/GNDSX
+machination/M
+machine/DSMGB
+machinery/M
+machinist/MS
+machismo/M
+macho/M
+mackerel/SM
+mackinaw/SM
+mackintosh/MS
+macrame/M
+macro/SM
+macrobiotic/S
+macrobiotics/M
+macrocosm/SM
+macroeconomic/S
+macroeconomics/M
+macrology/S
+macron/MS
+macrophages
+macroscopic
+mad/SMYP
+madam/SM
+madame/M
+madcap/MS
+madden/DGS
+maddening/Y
+madder/MS
+maddest
+madding
+made/AU
+mademoiselle/MS
+madhouse/SM
+madman/M
+madmen
+madness/M
+madras/MS
+madrasa/SM
+madrasah/M
+madrasahs
+madrassa/SM
+madrigal/SM
+madwoman/M
+madwomen
+maelstrom/SM
+maestro/SM
+mafia/SM
+mafiosi
+mafioso/M
+mag/SM
+magazine/SM
+mage/MS
+magenta/M
+maggot/MS
+maggoty
+magi/M
+magic/SM
+magical/Y
+magician/SM
+magicked
+magicking
+magisterial/Y
+magistracy/M
+magistrate/SM
+magma/M
+magnanimity/M
+magnanimous/Y
+magnate/SM
+magnesia/M
+magnesium/M
+magnet/MS
+magnetic
+magnetically
+magnetism/M
+magnetite/M
+magnetizable
+magnetization/CM
+magnetize/CGDS
+magneto/SM
+magnetometer/SM
+magnetosphere
+magnification/M
+magnificence/M
+magnificent/Y
+magnifier/M
+magnify/ZGXDRSN
+magniloquence/M
+magniloquent
+magnitude/SM
+magnolia/MS
+magnon
+magnum/MS
+magpie/MS
+magus/M
+maharajah/M
+maharajahs
+maharani/SM
+maharishi/SM
+mahatma/SM
+mahogany/SM
+mahout/MS
+maid/MNSX
+maiden/MY
+maidenhair/M
+maidenhead/SM
+maidenhood/M
+maidservant/SM
+mail/JMDRSZG
+mailbag/SM
+mailbomb/GSD
+mailbox/MS
+mailer/M
+mailing/M
+maillot/SM
+mailman/M
+mailmen
+mailshot/S
+maim/DSG
+main/MYS
+mainframe/SM
+mainland/MS
+mainline/MGDS
+mainmast/MS
+mainsail/MS
+mainspring/MS
+mainstay/MS
+mainstream/SMDG
+maintain/ZGBDRS
+maintainability
+maintainable/U
+maintained/U
+maintenance/M
+maintop/SM
+maisonette/MS
+maize/SM
+majestic
+majestically
+majesty/SM
+majolica/M
+major/SGMDY
+majordomo/MS
+majorette/MS
+majoritarian/SM
+majoritarianism
+majority/SM
+make's/A
+make/UAGS
+makeover/MS
+maker/SM
+makeshift/SM
+makeup/MS
+makeweight/S
+making/MS
+makings/M
+malachite/M
+maladjusted
+maladjustment/M
+maladministration
+maladroit/PY
+maladroitness/M
+malady/SM
+malaise/M
+malamute/MS
+malapropism/SM
+malaria/M
+malarial
+malarkey/M
+malathion/M
+malcontent/MS
+male/MPS
+malediction/SM
+malefaction/M
+malefactor/SM
+malefic
+maleficence/M
+maleficent
+maleness/M
+malevolence/M
+malevolent/Y
+malfeasance/M
+malformation/SM
+malformed
+malfunction/MDSG
+malice/M
+malicious/PY
+maliciousness/M
+malign/DSG
+malignancy/SM
+malignant/Y
+malignity/M
+malinger/ZGSDR
+malingerer/M
+mall/MS
+mallard/SM
+malleability/M
+malleable
+mallet/MS
+mallow/MS
+malnourished
+malnutrition/M
+malocclusion/M
+malodorous
+malpractice/SM
+malt/MDSG
+malted/MS
+maltose/M
+maltreat/GLDS
+maltreatment/M
+malty/TR
+malware/M
+mam/S
+mama/MS
+mamba/SM
+mambo/SGMD
+mamma/M
+mammal/MS
+mammalian/MS
+mammary
+mammogram/MS
+mammography/M
+mammon/M
+mammoth/M
+mammoths
+mammy/SM
+man's/F
+man/USY
+manacle/DSMG
+manage/ZGDRSL
+manageability/M
+manageable/U
+management/MS
+manager/M
+manageress/S
+managerial
+manana/MS
+manatee/SM
+mandala/SM
+mandamus/MS
+mandarin/MS
+mandate/DSMG
+mandatory
+mandible/MS
+mandibular
+mandolin/MS
+mandrake/MS
+mandrel/SM
+mandrill/MS
+mane/MDS
+manege/M
+maneuver/MDGSBJ
+maneuverability/M
+manful/Y
+manga/M
+manganese/M
+mange/DRMZ
+manger/M
+mangetout/S
+manginess/M
+mangle/MZGDRS
+mango/M
+mangoes
+mangrove/MS
+mangy/TRP
+manhandle/GDS
+manhole/SM
+manhood/M
+manhunt/SM
+mania/SM
+maniac/MS
+maniacal/Y
+manic/SM
+manically
+manicure/MGDS
+manicurist/MS
+manifest/MDYSG
+manifestation/SM
+manifesto/SM
+manifold/GMDS
+manikin/SM
+manila/M
+manioc/MS
+manipulable
+manipulate/XGNVDS
+manipulation/M
+manipulative/Y
+manipulator/MS
+mankind/M
+manky
+manlike
+manliness/M
+manly/UTR
+manna/M
+manned/U
+mannequin/SM
+manner/MDYS
+mannerism/SM
+mannerly/U
+manning/U
+mannish/YP
+mannishness/M
+manometer/SM
+manor/SM
+manorial
+manpower/M
+manque
+mansard/MS
+manse/SXMN
+manservant/M
+mansion/M
+manslaughter/M
+manta/SM
+mantel/MS
+mantelpiece/SM
+mantelshelf
+mantelshelves
+mantes
+mantilla/SM
+mantis/MS
+mantissa/SM
+mantle's
+mantle/EGDS
+mantra/MS
+manual/MYS
+manufacture/DRSMZG
+manufacturer/M
+manufacturing/M
+manumission/SM
+manumit/S
+manumitted
+manumitting
+manure/MGDS
+manuscript/MS
+many/M
+map's
+map/AS
+maple/SM
+mapmaker/SM
+mapped/A
+mapper/MS
+mapping/S
+mar/S
+marabou/MS
+marabout/SM
+maraca/MS
+maraschino/MS
+marathon/SMRZ
+marathoner/M
+maraud/ZGDRS
+marauder/M
+marble/MGDS
+marbleize/GDS
+marbling/M
+march/ZGMDRS
+marcher/M
+marchioness/MS
+mare/MS
+margarine/M
+margarita/MS
+marge
+margin/MS
+marginal/YS
+marginalia/M
+marginalization/M
+marginalize/GDS
+maria/M
+mariachi/MS
+marigold/MS
+marijuana/M
+marimba/SM
+marina/MS
+marinade/DSMG
+marinara/M
+marinate/DSGN
+marination/M
+marine/MZRS
+mariner/M
+marionette/MS
+marital/Y
+maritime
+marjoram/M
+mark/AMDSG
+markdown/SM
+marked/U
+markedly
+marker/MS
+market/MDRZGBS
+marketability/M
+marketable/U
+marketeer/SM
+marketer/M
+marketing/M
+marketplace/SM
+marking/SM
+markka/M
+markkaa
+marksman/M
+marksmanship/M
+marksmen
+markup/MS
+marl/M
+marlin/MS
+marlinespike/SM
+marmalade/M
+marmoreal
+marmoset/SM
+marmot/MS
+maroon/MDGS
+marque/MS
+marquee/SM
+marquess/MS
+marquetry/M
+marquis/MS
+marquise/M
+marquisette/M
+marred/U
+marriage/ASM
+marriageability/M
+marriageable
+married/SM
+marring
+marrow/MS
+marry/AGDS
+marsh/MS
+marshal/SMDG
+marshland/SM
+marshmallow/SM
+marshy/RT
+marsupial/MS
+mart/MNSX
+marten/M
+martensite
+martial/Y
+martian/S
+martin/MS
+martinet/MS
+martingale/MS
+martini/SM
+martyr/MDGS
+martyrdom/M
+marvel/MDGS
+marvelous/Y
+marzipan/M
+masc
+mascara/GMDS
+mascot/MS
+masculine/SM
+masculinity/M
+maser/SM
+mash/MDRSZG
+masher/M
+mashup/MS
+mask's
+mask/UDSG
+masker/MS
+masochism/M
+masochist/SM
+masochistic
+masochistically
+mason/SM
+masonic
+masonry/M
+masque/MS
+masquerade/DRSMZG
+masquerader/M
+mass/MDSGV
+massacre/MGDS
+massage/DSMG
+masseur/SM
+masseuse/MS
+massif/MS
+massive/PY
+massiveness/M
+mast/MDS
+mastectomy/SM
+master's
+master/ADGS
+masterclass/S
+masterful/Y
+masterly
+mastermind/SGMD
+masterpiece/MS
+masterstroke/SM
+masterwork/MS
+mastery/M
+masthead/MS
+mastic/M
+masticate/GNDS
+mastication/M
+mastiff/SM
+mastitis
+mastodon/SM
+mastoid/SM
+masturbate/GNDS
+masturbation/M
+masturbatory
+mat/SZGMDR
+matador/SM
+match/AMS
+matchbook/SM
+matchbox/MS
+matched/U
+matching
+matchless
+matchlock/SM
+matchmaker/MS
+matchmaking/M
+matchstick/MS
+matchwood/M
+mate/MS
+material/SMY
+materialism/M
+materialist/SM
+materialistic
+materialistically
+materialization/M
+materialize/DSG
+materiel/M
+maternal/Y
+maternity/M
+matey/S
+mathematical/Y
+mathematician/SM
+mathematics/M
+matinee/SM
+mating/M
+matins/M
+matriarch/M
+matriarchal
+matriarchs
+matriarchy/SM
+matrices
+matricidal
+matricide/MS
+matriculate/DSGN
+matriculation/M
+matrimonial
+matrimony/M
+matrix/M
+matron/MYS
+matte/DRSMZG
+matter/MDG
+matting/M
+mattock/SM
+mattress/MS
+maturate/GNDS
+maturation/M
+mature/YTGDRS
+maturity/SM
+matzo/SMH
+matzoh/M
+matzohs
+matzot
+maudlin
+maul/MDRSZG
+mauler/M
+maunder/SDG
+mausoleum/SM
+mauve/M
+maven/SM
+maverick/SM
+maw/SM
+mawkish/PY
+mawkishness/M
+max/GMDS
+maxi/MS
+maxilla/M
+maxillae
+maxillary
+maxim/SM
+maxima
+maximal/Y
+maximization/M
+maximize/GDS
+maximum/SM
+may/M
+maybe/SM
+mayday/MS
+mayflower/MS
+mayfly/SM
+mayhem/M
+mayn't
+mayo/M
+mayonnaise/M
+mayor/SM
+mayoral
+mayoralty/M
+mayoress/MS
+maypole/SM
+mayst
+maze/MS
+mazurka/MS
+mdse
+me/DSH
+mead/M
+meadow/MS
+meadowlark/MS
+meager/PY
+meagerness/M
+meal/MS
+mealiness/M
+mealtime/SM
+mealy/TPR
+mealybug/SM
+mealymouthed
+mean/MRYJPSTG
+meander/SMDJG
+meanderings/M
+meanie/M
+meaning/M
+meaningful/PY
+meaningfulness/M
+meaningless/YP
+meaninglessness/M
+meanness/M
+meant/U
+meantime/M
+meanwhile/M
+meany/SM
+meas
+measles/M
+measly/RT
+measurable
+measurably
+measure's
+measure/ADSG
+measured/U
+measureless
+measurement/MS
+meat/MS
+meatball/MS
+meathead/MS
+meatiness/M
+meatless
+meatloaf/M
+meatloaves
+meatpacking/M
+meaty/TPR
+mecca/SM
+mechanic/MS
+mechanical/Y
+mechanics/M
+mechanism/SM
+mechanistic
+mechanistically
+mechanization/M
+mechanize/DSG
+medal/SM
+medalist/MS
+medallion/SM
+meddle/ZGDRS
+meddler/M
+meddlesome
+media/SM
+medial/AY
+median/MS
+mediate/ADSGN
+mediated/U
+mediation/AM
+mediator/MS
+medic/SM
+medicaid/M
+medical/SMY
+medicament/M
+medicare/M
+medicate/GNXDS
+medication/M
+medicinal/Y
+medicine/MS
+medico/MS
+medieval
+medievalist/MS
+mediocre
+mediocrity/SM
+meditate/DSGNVX
+meditation/M
+meditative/Y
+medium/MS
+medley/MS
+medulla/SM
+medusa
+medusae
+meed/M
+meek/RYPT
+meekness/M
+meerschaum/SM
+meet/MJSG
+meeting/M
+meetinghouse/SM
+meetup/MS
+meg/S
+mega
+megabit/SM
+megabucks/M
+megabyte/MS
+megachurch/MS
+megacycle/SM
+megadeath/M
+megadeaths
+megagram/S
+megahertz/M
+megajoule/S
+megalith/M
+megalithic
+megaliths
+megalomania/M
+megalomaniac/SM
+megalopolis/MS
+megameter/S
+megapascal/S
+megaphone/DSMG
+megapixel/SM
+megastar/S
+megaton/SM
+megawatt/MS
+meh
+meiosis/M
+meiotic
+melamine/M
+melancholia/M
+melancholic/S
+melancholy/M
+melange/MS
+melanin/M
+melanoma/SM
+meld/MDSG
+melee/SM
+meliorate/GNVDS
+melioration/M
+mellifluous/PY
+mellifluousness/M
+mellow/PTGDRYS
+mellowness/M
+melodic
+melodically
+melodious/YP
+melodiousness/M
+melodrama/MS
+melodramatic/S
+melodramatically
+melodramatics/M
+melody/SM
+melon/SM
+melt's
+melt/ADSG
+meltdown/SM
+member's
+member/EAS
+membership/SM
+membrane/SM
+membranous
+meme/MS
+memento/MS
+memo/MS
+memoir/MS
+memorabilia/M
+memorability/M
+memorable/U
+memorably
+memorandum/MS
+memorial/SM
+memorialize/DSG
+memorization/M
+memorize/DSG
+memory/SM
+memsahib/S
+men/M
+menace/MGDS
+menacing/Y
+menage/MS
+menagerie/MS
+mend/MDRSZG
+mendacious/Y
+mendacity/M
+mendelevium/M
+mender/M
+mendicancy/M
+mendicant/SM
+mending/M
+menfolk/MS
+menfolks/M
+menhaden/M
+menial/MYS
+meningeal
+meninges
+meningitis/M
+meninx/M
+menisci
+meniscus/M
+menopausal
+menopause/M
+menorah/M
+menorahs
+mensch/MS
+menservants
+menses/M
+menstrual
+menstruate/GNDS
+menstruation/M
+mensurable
+mensuration/M
+menswear/M
+mental/Y
+mentalist/SM
+mentality/SM
+menthol/M
+mentholated
+mention/GSMD
+mentioned/U
+mentor/MDSG
+mentorship
+menu/MS
+meow/MDSG
+mercantile
+mercantilism/M
+mercenary/SM
+mercer/MS
+mercerize/GDS
+merchandise/MZGDRS
+merchandiser/M
+merchandising/M
+merchant/MBS
+merchantman/M
+merchantmen
+merciful/UY
+merciless/PY
+mercilessness/M
+mercurial/Y
+mercuric
+mercury/M
+mercy/SM
+mere/MYTS
+meretricious/YP
+meretriciousness/M
+merganser/MS
+merge/DRSZG
+merger/M
+meridian/MS
+meringue/MS
+merino/MS
+merit/CSM
+merited/U
+meriting
+meritless
+meritocracy/SM
+meritocratic
+meritorious/PY
+meritoriousness/M
+mermaid/SM
+merman/M
+mermen
+merrily
+merriment/M
+merriness/M
+merry/TRP
+merrymaker/MS
+merrymaking/M
+mesa/MS
+mescal/MS
+mescalin
+mescaline/M
+mesdames
+mesdemoiselles
+mesh/MDSG
+mesmeric
+mesmerism/M
+mesmerize/ZGDRS
+mesmerizer/M
+mesomorph/M
+mesomorphs
+meson/SM
+mesosphere/SM
+mesquite/SM
+mess/MDSG
+message/MGDS
+messeigneurs
+messenger/SM
+messiah/M
+messiahs
+messianic
+messieurs
+messily
+messiness/M
+messmate/SM
+messy/PTR
+mestizo/MS
+met
+meta
+metabolic
+metabolically
+metabolism/SM
+metabolite/SM
+metabolize/DSG
+metacarpal/SM
+metacarpi
+metacarpus/M
+metadata
+metal/SMD
+metalanguage/MS
+metallic
+metallurgic
+metallurgical
+metallurgist/MS
+metallurgy/M
+metalwork/MRZG
+metalworker/M
+metalworking/M
+metamorphic
+metamorphism/M
+metamorphose/GDS
+metamorphosis/M
+metaphor/MS
+metaphoric
+metaphorical/Y
+metaphysical/Y
+metaphysics/M
+metastases
+metastasis/M
+metastasize/DSG
+metastatic
+metatarsal/MS
+metatarsi
+metatarsus/M
+metatheses
+metathesis/M
+mete/MZGDRS
+metempsychoses
+metempsychosis/M
+meteor/MS
+meteoric
+meteorically
+meteorite/SM
+meteoroid/SM
+meteorologic
+meteorological
+meteorologist/SM
+meteorology/M
+meter/GMD
+metformin
+methadone/M
+methamphetamine/M
+methane/M
+methanol/M
+methinks
+method/MS
+methodical/YP
+methodicalness/M
+methodological/Y
+methodology/SM
+methotrexate
+methought
+meths
+methyl/M
+meticulous/YP
+meticulousness/M
+metier/MS
+metric/S
+metrical/Y
+metricate/GNDS
+metrication/M
+metricize/GDS
+metro/SM
+metronome/MS
+metropolis/MS
+metropolitan
+mettle/M
+mettlesome
+mew/SGMD
+mewl/DSG
+mews/M
+mezzanine/MS
+mezzo/SM
+mfg
+mfr/S
+mg
+mgr
+mi/MNX
+miasma/MS
+mic/S
+mica/M
+mice
+mick/S
+mickey/MS
+micro/SM
+microaggression/SM
+microbe/MS
+microbial
+microbiological
+microbiologist/MS
+microbiology/M
+microbrewery/SM
+microchip/MS
+microcircuit/SM
+microcode
+microcomputer/MS
+microcosm/MS
+microcosmic
+microdot/SM
+microeconomics/M
+microelectronic/S
+microelectronics/M
+microfiber/MS
+microfiche/M
+microfilm/GMDS
+microfinance
+microfloppies
+microgroove/SM
+microlight/MS
+microloan/MS
+micromanage/ZGDRSL
+micromanagement/M
+micromanager/M
+micrometeorite/SM
+micrometer/MS
+micron/MS
+microorganism/MS
+microphone/SM
+microplastics
+microprocessor/MS
+microscope/SM
+microscopic
+microscopical/Y
+microscopy/M
+microsecond/MS
+microsurgery/M
+microwave/DSMGB
+microwaveable
+mid
+midair/M
+midday/M
+midden/MS
+middle/MGS
+middlebrow/SM
+middleman/M
+middlemen
+middlemost
+middleweight/MS
+middy/SM
+midfield/RZ
+midge/SM
+midget/MS
+midi/MS
+midland/MS
+midlife/M
+midmost
+midnight/M
+midpoint/MS
+midrib/MS
+midriff/MS
+midsection/MS
+midshipman/M
+midshipmen
+midships
+midsize
+midst/M
+midstream/M
+midsummer/M
+midterm/MS
+midtown/M
+midway/MS
+midweek/MS
+midwife/MGDS
+midwifery/SM
+midwinter/M
+midwives
+midyear/MS
+mien/M
+miff/DSG
+might've
+might/M
+mightily
+mightiness/M
+mightn't
+mighty/TRP
+mignonette/SM
+migraine/MS
+migrant/MS
+migrate/AGDS
+migration/SM
+migratory
+mikado/MS
+mike/MGDS
+mil/SZMR
+milady/SM
+milch
+mild/MRYTP
+mildew/SMDG
+mildness/M
+mile/MS
+mileage/SM
+milepost/MS
+miler/M
+milestone/MS
+milf/MS
+milieu/SM
+militancy/M
+militant/MYS
+militarily
+militarism/M
+militarist/SM
+militaristic
+militarization/CM
+militarize/CDSG
+military/M
+militate/GDS
+militia/SM
+militiaman/M
+militiamen
+milk/MDRSZG
+milker/M
+milkiness/M
+milkmaid/MS
+milkman/M
+milkmen
+milkshake/SM
+milksop/MS
+milkweed/SM
+milky/RTP
+mill/MDRSZGJ
+millage/M
+millennia
+millennial/M
+millennium/MS
+miller/M
+millet/M
+milliard/MS
+millibar/MS
+milligram/MS
+milliliter/MS
+millimeter/MS
+milliner/MS
+millinery/M
+milling/M
+million/HSM
+millionaire/SM
+millionairess/S
+millionth/M
+millionths
+millipede/SM
+millisecond/SM
+millpond/SM
+millrace/SM
+millstone/SM
+millstream/MS
+millwright/SM
+milometer/S
+milquetoast/SM
+milt/MDSG
+mime/MGDS
+mimeograph/GMD
+mimeographs
+mimetic
+mimic/SM
+mimicked
+mimicker/SM
+mimicking
+mimicry/SM
+mimosa/SM
+min
+minaret/MS
+minatory
+mince/DRSMZG
+mincemeat/M
+mincer/M
+mind's
+mind/ADRSZG
+mindbogglingly
+minded/P
+mindful/YP
+mindfulness/M
+mindless/YP
+mindlessness/M
+mindset/MS
+mine/MZGNDRSX
+minefield/SM
+miner/M
+mineral/MS
+mineralogical
+mineralogist/MS
+mineralogy/M
+minestrone/M
+minesweeper/SM
+mingle/DSG
+mingy
+mini/MS
+miniature/MS
+miniaturist/MS
+miniaturization/M
+miniaturize/GDS
+minibar/S
+minibike/SM
+minibus/MS
+minicab/S
+minicam/MS
+minicomputer/SM
+minifloppies
+minim/SM
+minima
+minimal/Y
+minimalism/M
+minimalist/MS
+minimization/M
+minimize/DSG
+minimum/MS
+mining/M
+minion/M
+miniseries/M
+miniskirt/MS
+minister/SGMD
+ministerial
+ministrant/MS
+ministration/MS
+ministry/SM
+minivan/MS
+mink/MS
+minnesinger/MS
+minnow/SM
+minor/SMDG
+minority/SM
+minoxidil/M
+minster/MS
+minstrel/SM
+minstrelsy/M
+mint/MDRSZG
+mintage/M
+minter/M
+minty/RT
+minuend/MS
+minuet/SM
+minus/MS
+minuscule/MS
+minute/PDRSMYTG
+minuteman/M
+minutemen
+minuteness/M
+minutia/M
+minutiae
+minx/MS
+miracle/MS
+miraculous/Y
+mirage/SM
+mire/MGDS
+mirror/GSMD
+mirth/M
+mirthful/PY
+mirthfulness/M
+mirthless/Y
+miry/RT
+misaddress/DSG
+misadventure/MS
+misaligned
+misalignment/M
+misalliance/MS
+misanthrope/SM
+misanthropic
+misanthropically
+misanthropist/MS
+misanthropy/M
+misapplication/M
+misapply/DSGNX
+misapprehend/GSD
+misapprehension/MS
+misappropriate/XDSGN
+misappropriation/M
+misbegotten
+misbehave/GDS
+misbehavior/M
+misc
+miscalculate/DSXGN
+miscalculation/M
+miscall/DSG
+miscarriage/MS
+miscarry/GDS
+miscast/SG
+miscegenation/M
+miscellaneous/Y
+miscellany/SM
+mischance/SM
+mischief/M
+mischievous/YP
+mischievousness/M
+miscibility/M
+miscible
+misclassified
+miscommunication/S
+misconceive/GDS
+misconception/SM
+misconduct/MDGS
+misconstruction/MS
+misconstrue/GDS
+miscount/MDSG
+miscreant/SM
+miscue/DSMG
+misdeal/GMS
+misdealt
+misdeed/MS
+misdemeanor/MS
+misdiagnose/GDS
+misdiagnosis/M
+misdid
+misdirect/SDG
+misdirection/M
+misdo/JG
+misdoes
+misdoing/M
+misdone
+miser/SBMY
+miserableness/M
+miserably
+miserliness/M
+misery/SM
+misfeasance/M
+misfeature/S
+misfile/GDS
+misfire/MGDS
+misfit/SM
+misfitted
+misfitting
+misfortune/SM
+misgiving/MS
+misgovern/SDGL
+misgovernment/M
+misguidance/M
+misguide/DSG
+misguided/Y
+mishandle/DSG
+mishap/SM
+mishear/GS
+misheard
+mishit/S
+mishitting
+mishmash/MS
+misidentify/GDS
+misinform/DGS
+misinformation/M
+misinterpret/SGD
+misinterpretation/SM
+misjudge/DSG
+misjudgment/SM
+mislabel/GSD
+mislaid
+mislay/GS
+mislead/GS
+misleading/Y
+misled
+mismanage/LGDS
+mismanagement/M
+mismatch/GMDS
+misname/GDS
+misnomer/MS
+misogamist/MS
+misogamy/M
+misogynist/SM
+misogynistic
+misogynous
+misogyny/M
+misplace/GLDS
+misplacement/M
+misplay/GMDS
+misprint/GMDS
+misprision/M
+mispronounce/DSG
+mispronunciation/SM
+misquotation/MS
+misquote/MGDS
+misread/GJS
+misreading/M
+misremember/GDS
+misreport/MDGS
+misrepresent/GDS
+misrepresentation/MS
+misrule/MGDS
+miss's
+miss/EDSGV
+missal/ESM
+missed/U
+misshape/GDS
+misshapen
+missile/MS
+missilery/M
+mission/AMS
+missionary/SM
+missioner/SM
+missive/MS
+misspeak/GS
+misspell/GDJS
+misspelling/M
+misspend/GS
+misspent
+misspoke
+misspoken
+misstate/GDSL
+misstatement/SM
+misstep/MS
+missus/MS
+mist's
+mist/CDRSZG
+mistakable/U
+mistake/BMGS
+mistaken/Y
+mister's
+mistily
+mistime/GDS
+mistiness/M
+mistletoe/M
+mistook
+mistral/MS
+mistranslated
+mistreat/LDGS
+mistreatment/M
+mistress/MS
+mistrial/MS
+mistrust/MDSG
+mistrustful/Y
+misty/PRT
+mistype/GS
+misunderstand/SGJ
+misunderstanding/M
+misunderstood
+misuse/DSMG
+mite/MZRS
+miter/MDG
+mitigate/DSGN
+mitigated/U
+mitigation/M
+mitochondria
+mitochondrial
+mitochondrion
+mitoses
+mitosis/M
+mitotic
+mitral
+mitt/MNSX
+mitten/M
+mitzvah
+mix/ZGMDRSB
+mixed/U
+mixer/M
+mixture/SM
+mizzen/MS
+mizzenmast/SM
+mkay
+mks
+ml
+mm
+mnemonic/MS
+mnemonically
+mo/CKHS
+moan/MDRSZG
+moaner/M
+moat/MDS
+mob's
+mob/CS
+mobbed/C
+mobbing/C
+mobile/MS
+mobility/M
+mobilization/CM
+mobilizations
+mobilize/CDSG
+mobilizer/SM
+mobster/SM
+moccasin/SM
+mocha/SM
+mock/DRSZG
+mocker/M
+mockery/SM
+mocking/Y
+mockingbird/SM
+mod/STM
+modal/SM
+modality/S
+modded
+modding
+mode/MS
+model/ZGSJMDR
+modeler/M
+modeling/M
+modem/SM
+moderate/MYGNPDS
+moderateness/M
+moderation/M
+moderator/SM
+modern/MYPS
+modernism/M
+modernist/SM
+modernistic
+modernity/M
+modernization/M
+modernize/DRSZG
+modernizer/M
+modernness/M
+modest/Y
+modesty/M
+modicum/SM
+modifiable
+modification/M
+modified/U
+modifier/M
+modify/DRSXZGN
+modish/YP
+modishness/M
+modular
+modularization
+modulate/CGNDS
+modulation/CM
+modulations
+modulator/MS
+module/MS
+modulo
+modulus
+moggy
+mogul/SM
+mohair/M
+moi
+moiety/SM
+moil/MDSG
+moire/SM
+moist/XTPNRY
+moisten/DRZG
+moistener/M
+moistness/M
+moisture/M
+moisturize/ZGDRS
+moisturizer/M
+molar/SM
+molasses/M
+mold/MDRJSZG
+moldboard/SM
+molder/GMD
+moldiness/M
+molding/M
+moldy/TPR
+mole/MS
+molecular
+molecularity/M
+molecule/SM
+molehill/SM
+moleskin/M
+molest/DRZGS
+molestation/M
+molested/U
+molester/M
+moll/MS
+mollification/M
+mollify/DSNG
+molluscan
+mollusk/SM
+molly/SM
+mollycoddle/DSMG
+molt/MDNRSZG
+molter/M
+molybdenum/M
+mom/SM
+moment/MS
+momenta
+momentarily
+momentariness/M
+momentary/P
+momentous/PY
+momentousness/M
+momentum/M
+mommy/SM
+monad
+monarch/M
+monarchic
+monarchical
+monarchism/M
+monarchist/MS
+monarchistic
+monarchs
+monarchy/SM
+monastery/SM
+monastic/MS
+monastical/Y
+monasticism/M
+monaural
+monetarily
+monetarism/M
+monetarist/MS
+monetary
+monetization/C
+monetize/CGDS
+money/SMD
+moneybag/MS
+moneybox/S
+moneylender/SM
+moneymaker/SM
+moneymaking/M
+monger/MDGS
+mongol/S
+mongolism/M
+mongoloid/MS
+mongoose/MS
+mongrel/SM
+monies
+moniker/SM
+monism/M
+monist/MS
+monition/SM
+monitor/SMDG
+monitory
+monk/MS
+monkey/MDGS
+monkeyshine/SM
+monkish
+monkshood/SM
+mono/M
+monochromatic
+monochrome/MS
+monocle/DSM
+monoclonal
+monocotyledon/SM
+monocotyledonous
+monocular
+monodic
+monodist/SM
+monody/SM
+monogamist/MS
+monogamous/Y
+monogamy/M
+monogram/SM
+monogrammed
+monogramming
+monograph/M
+monographs
+monolingual/MS
+monolith/M
+monolithic
+monoliths
+monologist/SM
+monologue/SM
+monomania/M
+monomaniac/MS
+monomaniacal
+monomer/SM
+mononucleosis/M
+monophonic
+monoplane/SM
+monopolist/SM
+monopolistic
+monopolization/M
+monopolize/DRSZG
+monopolizer/M
+monopoly/SM
+monorail/MS
+monosyllabic
+monosyllable/MS
+monotheism/M
+monotheist/SM
+monotheistic
+monotone/MS
+monotonic
+monotonically
+monotonous/PY
+monotonousness/M
+monotony/M
+monounsaturated
+monoxide/MS
+monseigneur/M
+monsieur/M
+monsignor/SM
+monsoon/SM
+monsoonal
+monster/SM
+monstrance/ASM
+monstrosity/SM
+monstrous/Y
+montage/SM
+month/MY
+monthly/SM
+months
+monument/MS
+monumental/Y
+moo/SGMD
+mooch/ZGMDRS
+moocher/M
+mood/MS
+moodily
+moodiness/M
+moody/TPR
+moon/MDSG
+moonbeam/MS
+moonless
+moonlight/SMDRZG
+moonlighter/M
+moonlighting/M
+moonlit
+moonscape/SM
+moonshine/MZRS
+moonshiner/M
+moonshot/MS
+moonstone/MS
+moonstruck
+moonwalk/MS
+moor/MDJSG
+moorhen/S
+mooring/M
+moorland/MS
+moose/M
+moot/DSG
+mop/SZGMDR
+mope/MS
+moped/SM
+moper/M
+mopey
+mopier
+mopiest
+mopish
+mopped
+moppet/MS
+mopping
+moraine/SM
+moral/SMY
+morale/M
+moralism
+moralist/MS
+moralistic
+moralistically
+moralities
+morality/UM
+moralization/CM
+moralize/CGDS
+moralizer/MS
+morass/MS
+moratorium/SM
+moray/SM
+morbid/YP
+morbidity/M
+morbidness/M
+mordancy/M
+mordant/SMY
+more/MS
+moreish
+morel/SM
+moreover
+mores/M
+morgue/MS
+moribund
+morn/MJSG
+morning/M
+morocco/M
+moron/SM
+moronic
+moronically
+morose/YP
+moroseness/M
+morph/GD
+morpheme/MS
+morphemic
+morphia/M
+morphine/M
+morphing/M
+morphological
+morphology/M
+morphs
+morrow/MS
+morsel/MS
+mortal/MYS
+mortality/M
+mortar/MDSG
+mortarboard/SM
+mortgage's
+mortgage/AGDS
+mortgagee/MS
+mortgagor/MS
+mortician/MS
+mortification/M
+mortify/NGDS
+mortise/DSMG
+mortuary/SM
+mosaic/MS
+mosey/SGD
+mosh/DSG
+mosque/MS
+mosquito/M
+mosquitoes
+moss/MS
+mossback/SM
+mossy/TR
+most/MY
+mot/SM
+mote's
+mote/KCXSVN
+motel/SM
+motet/SM
+moth/M
+mothball/GMDS
+mother/MDYSG
+motherboard/SM
+motherfucker/MS!
+motherfucking/!
+motherhood/M
+motherland/MS
+motherless
+motherliness/M
+moths
+motif/SM
+motile/S
+motility/M
+motion/KCM
+motioned
+motioning
+motionless/YP
+motionlessness/M
+motivate/CDSG
+motivated/U
+motivation/SM
+motivational
+motivator/SM
+motive/MS
+motiveless
+motley/MS
+motlier
+motliest
+motocross/MS
+motor/SGMD
+motorbike/MGDS
+motorboat/MS
+motorcade/MS
+motorcar/SM
+motorcycle/DSMG
+motorcyclist/MS
+motorist/SM
+motorization/M
+motorize/DSG
+motorman/M
+motormen
+motormouth/M
+motormouths
+motorway/SM
+mottle/GDS
+motto/M
+mottoes
+moue/MS
+mound/SGMD
+mount/EASGMD
+mountable
+mountain/SM
+mountaineer/SMDG
+mountaineering/M
+mountainous
+mountainside/SM
+mountaintop/SM
+mountebank/MS
+mounted/U
+mounter/MS
+mounting/SM
+mourn/SZGDR
+mourned/U
+mourner/M
+mournful/YP
+mournfulness/M
+mourning/M
+mouse/DRSMZG
+mouser/M
+mousetrap/SM
+mousetrapped
+mousetrapping
+mousiness/M
+moussaka/S
+mousse/MGDS
+mousy/PTR
+mouth/GMD
+mouthfeel
+mouthful/MS
+mouthiness/M
+mouthpiece/MS
+mouths
+mouthwash/MS
+mouthwatering
+mouthy/PTR
+mouton/M
+movable/SM
+move/AMZGDRSB
+moved/U
+movement/SM
+mover/AM
+movie/SM
+moviegoer/SM
+moving/Y
+mow/SZGMDR
+mower/M
+moxie/M
+mozzarella/M
+mp
+mpg
+mph
+mt
+mtg
+mtge
+mu/SM
+much/M
+mucilage/M
+mucilaginous
+muck/MDSG
+muckrake/DRSZG
+muckraker/M
+mucky/TR
+mucous
+mucus/M
+mud/M
+muddily
+muddiness/M
+muddle/MGDS
+muddleheaded
+muddy/PTGDRS
+mudflap/S
+mudflat/MS
+mudguard/SM
+mudpack/S
+mudroom/MS
+mudslide/MS
+mudslinger/SM
+mudslinging/M
+muenster/M
+muesli
+muezzin/MS
+muff/MDSG
+muffin/MS
+muffle/ZGDRS
+muffler/M
+mufti/SM
+mug/SM
+mugful/MS
+mugged
+mugger/MS
+mugginess/M
+mugging/MS
+muggins
+muggle/MS
+muggy/PTR
+mugshot/MS
+mugwump/MS
+mujaheddin
+mukluk/MS
+mulatto/M
+mulattoes
+mulberry/SM
+mulch/GMDS
+mulct/SGMD
+mule/MS
+muleskinner/MS
+muleteer/MS
+mulish/PY
+mulishness/M
+mull/DSG
+mullah/M
+mullahs
+mullein/M
+mullet/MS
+mulligan/SM
+mulligatawny/M
+mullion/SMD
+multi
+multicellular
+multichannel
+multicolored
+multicultural
+multiculturalism/M
+multidimensional
+multidisciplinary
+multifaceted
+multifamily
+multifarious/PY
+multifariousness/M
+multiform
+multigrain
+multilateral/Y
+multilayered
+multilevel
+multilingual
+multilingualism/M
+multimedia/M
+multimillionaire/SM
+multinational/SM
+multipart
+multiparty
+multiplayer/M
+multiple/MS
+multiplex/ZGMDRS
+multiplexer/M
+multiplicand/MS
+multiplication/M
+multiplicative
+multiplicity/SM
+multiplier/M
+multiply/NZGDRSX
+multiprocessing
+multiprocessor/SM
+multipurpose
+multiracial
+multistage
+multistory
+multitask/GS
+multitasking/M
+multitude/SM
+multitudinous
+multivariate
+multiverse/SM
+multivitamin/MS
+multiyear
+mum
+mumble/MZGDRS
+mumbler/M
+mumbletypeg/M
+mummer/MS
+mummery/M
+mummification/M
+mummify/GNDS
+mummy/SM
+mumps/M
+mun
+munch/GDS
+munchie/S
+munchies/M
+munchkin/SM
+mundane/SY
+mung/DSG
+municipal/SMY
+municipality/SM
+munificence/M
+munificent/Y
+munition/MDGS
+mural/SM
+muralist/SM
+murder/ZGMDRS
+murderer/M
+murderess/MS
+murderous/Y
+murk/MS
+murkily
+murkiness/M
+murky/PTR
+murmur/ZGJMDRS
+murmurer/M
+murmuring/M
+murmurous
+murrain/M
+muscat/MS
+muscatel/SM
+muscle/MGDS
+musclebound
+muscleman
+musclemen
+muscly
+muscular/Y
+muscularity/M
+musculature/M
+musculoskeletal
+muse/MGDSJ
+musette/MS
+museum/MS
+mush/MDRSZG
+mushiness/M
+mushroom/GSMD
+mushy/PTR
+music/SM
+musical/MYS
+musicale/MS
+musicality/M
+musician/SMY
+musicianship/M
+musicological
+musicologist/MS
+musicology/M
+musing/MY
+musk/M
+muskeg/MS
+muskellunge/MS
+musket/MS
+musketeer/MS
+musketry/M
+muskie/M
+muskiness/M
+muskmelon/SM
+muskox/MN
+muskrat/MS
+musky/PTRS
+muslin/M
+muss/MDSG
+mussel/MS
+mussy/TR
+must've
+must/MRSZ
+mustache/MDS
+mustachio/SMD
+mustang/MS
+mustard/M
+muster/GMD
+mustily
+mustiness/M
+mustn't
+musty/PTR
+mutability/M
+mutably
+mutagen/MS
+mutagenic
+mutant/MS
+mutate/XGNVDS
+mutation/M
+mutational
+mute/MYTGDRSPB
+muteness/M
+mutilate/DSGNX
+mutilation/M
+mutilator/SM
+mutineer/SM
+mutinous/Y
+mutiny/GDSM
+mutt/MS
+mutter/ZGJMDRS
+mutterer/M
+muttering/M
+mutton/M
+muttonchops/M
+muttony
+mutual/Y
+mutuality/M
+muumuu/MS
+muzak
+muzzily
+muzzle/DSMG
+muzzy/P
+my
+mycologist/SM
+mycology/M
+myelitis/M
+myna/MS
+myocardial
+myocardium
+myopia/M
+myopic
+myopically
+myriad/SM
+myrmidon/MS
+myrrh/M
+myrtle/SM
+mys
+myself
+mysterious/PY
+mysteriousness/M
+mystery/SM
+mystic/SM
+mystical/Y
+mysticism/M
+mystification/CM
+mystify/CDSGN
+mystique/M
+myth/M
+mythic
+mythical
+mythological
+mythologist/SM
+mythologize/DSG
+mythology/SM
+myths
+myxomatosis
+n/IKTH
+naan/S
+nab/S
+nabbed
+nabbing
+nabob/SM
+nacelle/SM
+nacho/SM
+nacre/M
+nacreous
+nadir/SM
+nae
+naff/RT
+nag/SM
+nagged
+nagger/MS
+nagging
+nagware
+nah
+naiad/SM
+naif/MS
+nail/MDSG
+nailbrush/MS
+naive/RYT
+naivete/M
+naivety/M
+naked/PY
+nakedness/M
+name's
+name/AGDS
+nameable/U
+named/U
+nameless/Y
+namely
+nameplate/MS
+namesake/SM
+nanny/SM
+nanobot/S
+nanometer/S
+nanosecond/SM
+nanotechnology/SM
+nanotube
+nap/SM
+napalm/MDSG
+nape/MS
+naphtha/M
+naphthalene/M
+napkin/MS
+napless
+napoleon/SM
+napped
+napper/MS
+napping
+nappy/TRSM
+narc/MS
+narcissism/M
+narcissist/MS
+narcissistic
+narcissus/M
+narcolepsy/M
+narcoleptic
+narcoses
+narcosis/M
+narcotic/SM
+narcotization/M
+narcotize/GDS
+nark
+narky
+narrate/GNVDSX
+narration/M
+narrative/SM
+narrator/SM
+narrow/PTGMDRYS
+narrowness/M
+narwhal/MS
+nary
+nasal/SMY
+nasality/M
+nasalization/M
+nasalize/DSG
+nascence/AM
+nascent/A
+nastily
+nastiness/M
+nasturtium/SM
+nasty/PTR
+natal
+natch
+nation/MS
+national/MYS
+nationalism/M
+nationalist/SM
+nationalistic
+nationalistically
+nationality/SM
+nationalization/MS
+nationalize/CDSG
+nationhood/M
+nationwide
+native/MS
+nativity/SM
+natl
+natter/GMDS
+nattily
+nattiness/M
+natty/PTR
+natural's
+natural/UPY
+naturalism/M
+naturalist/SM
+naturalistic
+naturalization/M
+naturalize/DSG
+naturalness/UM
+naturals
+nature's
+nature/CS
+naturism
+naturist/S
+naught/MS
+naughtily
+naughtiness/M
+naughty/PTR
+nausea/M
+nauseam
+nauseate/GDS
+nauseating/Y
+nauseous/PY
+nauseousness/M
+nautical/Y
+nautilus/MS
+naval
+nave/MS
+navel/SM
+navigability/M
+navigable
+navigate/DSGN
+navigation/M
+navigational
+navigator/MS
+navvy/S
+navy/SM
+nay/SM
+naysayer/MS
+ne'er
+neanderthal/MS
+neap/MS
+near/DRYSPTG
+nearby
+nearness/M
+nearshore
+nearside
+nearsighted/YP
+nearsightedness/M
+neat/NRYPXT
+neaten/GD
+neath
+neatness/M
+nebula/M
+nebulae
+nebular
+nebulous/PY
+nebulousness/M
+necessarily/U
+necessary/SM
+necessitate/DSG
+necessitous
+necessity/SM
+neck/MDSG
+neckband/S
+neckerchief/MS
+necking/M
+necklace/MGDSJ
+neckline/MS
+necktie/MS
+necrology/M
+necromancer/SM
+necromancy/M
+necrophilia
+necrophiliac/S
+necropolis/MS
+necroses
+necrosis/M
+necrotic
+nectar/M
+nectarine/MS
+nee
+need/MDSG
+needed/U
+needful/Y
+neediness/M
+needle/MGDS
+needlepoint/M
+needless/YP
+needlessness/M
+needlewoman/M
+needlewomen
+needlework/M
+needn't
+needy/PTR
+nefarious/YP
+nefariousness/M
+neg
+negate/DSGNVX
+negation/M
+negative/MYGPDS
+negativeness/M
+negativism/M
+negativity/M
+neglect/SGMD
+neglectful/YP
+neglectfulness/M
+negligee/MS
+negligence/M
+negligent/Y
+negligible
+negligibly
+negotiability/M
+negotiable/A
+negotiate/ADSGN
+negotiation/AM
+negotiations
+negotiator/MS
+negritude/M
+negro
+negroid
+neigh/MDG
+neighbor/SMDYG
+neighborhood/SM
+neighborliness/M
+neighs
+neither
+nelson/SM
+nematode/SM
+nemeses
+nemesis/M
+neoclassic
+neoclassical
+neoclassicism/M
+neocolonialism/M
+neocolonialist/MS
+neocon/SM
+neoconservative/SM
+neocortex
+neodymium/M
+neolithic
+neologism/SM
+neon/M
+neonatal
+neonate/MS
+neophilia
+neophyte/MS
+neoplasm/MS
+neoplastic
+neoprene/M
+nepenthe/M
+nephew/SM
+nephrite/M
+nephritic
+nephritis/M
+nephropathy
+nepotism/M
+nepotist/SM
+nepotistic
+neptunium/M
+nerd/MS
+nerdy/RT
+nerve's
+nerve/UDSG
+nerveless/YP
+nervelessness/M
+nerviness/M
+nervous/YP
+nervousness/M
+nervy/TPR
+nest/MDSG
+nestle/GJDS
+nestling/M
+net/SM
+netball
+netbook/MS
+nether
+nethermost
+netherworld/M
+netiquette/S
+netted
+netter/S
+netting/M
+nettle/MGDS
+nettlesome
+network/SGMD
+networking/M
+neural/Y
+neuralgia/M
+neuralgic
+neurasthenia/M
+neurasthenic/MS
+neuritic/MS
+neuritis/M
+neurological/Y
+neurologist/SM
+neurology/M
+neuron/MS
+neuronal
+neuroscience
+neuroses
+neurosis/M
+neurosurgeon/MS
+neurosurgery/M
+neurosurgical
+neurotic/MS
+neurotically
+neuroticism
+neurotransmitter/SM
+neut
+neuter/MDGS
+neutral/SMY
+neutralism/M
+neutralist/SM
+neutrality/M
+neutralization/M
+neutralize/DRSZG
+neutralizer/M
+neutrino/SM
+neutron/SM
+never
+nevermore
+nevertheless
+nevi
+nevus/M
+new/STMRYP
+newbie/MS
+newborn/SM
+newcomer/SM
+newel/SM
+newfangled
+newfound
+newline/S
+newlywed/SM
+newness/M
+news/M
+newsagent/S
+newsboy/SM
+newscast/SMRZ
+newscaster/M
+newsdealer/SM
+newsflash/S
+newsgirl/SM
+newsgroup/MS
+newshound/S
+newsletter/MS
+newsman/M
+newsmen
+newspaper/MS
+newspaperman/M
+newspapermen
+newspaperwoman/M
+newspaperwomen
+newspeak
+newsprint/M
+newsreader/S
+newsreel/MS
+newsroom/MS
+newsstand/SM
+newsweekly/SM
+newswoman/M
+newswomen
+newsworthiness/M
+newsworthy/P
+newsy/TR
+newt/MS
+newton/MS
+next/M
+nexus/MS
+niacin/M
+nib/SM
+nibble/MZGDRS
+nibbler/M
+nice/PYTR
+niceness/M
+nicety/SM
+niche/SM
+nick/MDRSZG
+nickel/MS
+nickelodeon/SM
+nicker/MDG
+nickle/S
+nickname/DSMG
+nicotine/M
+niece/SM
+nifedipine
+niff
+niffy
+nifty/TR
+nigga/MS!
+niggard/SMY
+niggardliness/M
+niggaz/!
+nigger/SM!
+niggle/MZGDRS
+niggler/M
+nigh/RT
+night/SMY
+nightcap/SM
+nightclothes/M
+nightclub/SM
+nightclubbed
+nightclubbing
+nightdress/MS
+nightfall/M
+nightgown/SM
+nighthawk/SM
+nightie/SM
+nightingale/SM
+nightlife/M
+nightlight/S
+nightlong
+nightmare/SM
+nightmarish
+nightshade/SM
+nightshirt/SM
+nightspot/MS
+nightstand/SM
+nightstick/SM
+nighttime/M
+nightwatchman
+nightwatchmen
+nightwear/M
+nihilism/M
+nihilist/MS
+nihilistic
+nil/M
+nimbi
+nimble/TPR
+nimbleness/M
+nimbly
+nimbus/M
+nimby
+nimrod/MS
+nincompoop/SM
+nine/MS
+ninepin/MS
+ninepins/M
+nineteen/SMH
+nineteenth/M
+nineteenths
+ninetieth/M
+ninetieths
+ninety/HSM
+ninja/SM
+ninny/SM
+ninth/M
+ninths
+niobium/M
+nip/SM
+nipped
+nipper/MS
+nippiness/M
+nipping
+nipple/MS
+nippy/TPR
+nirvana/M
+nisei/M
+nit/SMR
+niter/M
+nitpick/SZGDR
+nitpicker/M
+nitpicking/M
+nitrate/DSMGN
+nitration/M
+nitric
+nitrification/M
+nitrite/SM
+nitro
+nitrocellulose/M
+nitrogen/M
+nitrogenous
+nitroglycerin/M
+nitwit/MS
+nix/GMDS
+no/SM
+nob/SY
+nobble/GDS
+nobelium/M
+nobility/M
+noble/RSPMT
+nobleman/M
+noblemen
+nobleness/M
+noblewoman/M
+noblewomen
+nobody/SM
+nocturnal/Y
+nocturne/MS
+nod/SM
+nodal
+nodded
+nodding
+noddle/MS
+noddy
+node/MS
+nodular
+nodule/MS
+noel/MS
+noes
+noggin/MS
+nohow
+noise/DSMG
+noiseless/PY
+noiselessness/M
+noisemaker/MS
+noisily
+noisiness/M
+noisome
+noisy/PTR
+nomad/SM
+nomadic
+nomenclature/MS
+nominal/Y
+nominate/ACGNVDS
+nomination's/A
+nomination/CSM
+nominative/SM
+nominator/CSM
+nominee/MS
+non
+nonabrasive
+nonabsorbent/SM
+nonacademic
+nonacceptance/M
+nonacid
+nonactive/MS
+nonaddictive
+nonadhesive
+nonadjacent
+nonadjustable
+nonadministrative
+nonage/MS
+nonagenarian/MS
+nonaggression/M
+nonalcoholic
+nonaligned
+nonalignment/M
+nonallergic
+nonappearance/MS
+nonassignable
+nonathletic
+nonattendance/M
+nonautomotive
+nonavailability/M
+nonbasic
+nonbeliever/MS
+nonbelligerent/MS
+nonbinding
+nonbreakable
+nonburnable
+noncaloric
+noncancerous
+nonce/M
+nonchalance/M
+nonchalant/Y
+nonchargeable
+nonclerical/MS
+nonclinical
+noncollectable
+noncom/MS
+noncombat
+noncombatant/MS
+noncombustible
+noncommercial/MS
+noncommittal/Y
+noncommunicable
+noncompeting
+noncompetitive
+noncompliance/M
+noncomplying
+noncomprehending
+nonconducting
+nonconductor/MS
+nonconforming
+nonconformism
+nonconformist/MS
+nonconformity/M
+nonconsecutive
+nonconstructive
+noncontagious
+noncontinuous
+noncontributing
+noncontributory
+noncontroversial
+nonconvertible
+noncooperation/M
+noncorroding
+noncorrosive
+noncredit
+noncriminal/SM
+noncritical
+noncrystalline
+noncumulative
+noncustodial
+nondairy
+nondeductible/M
+nondelivery/SM
+nondemocratic
+nondenominational
+nondepartmental
+nondepreciating
+nondescript
+nondestructive
+nondetachable
+nondeterminism
+nondeterministic
+nondisciplinary
+nondisclosure/M
+nondiscrimination/M
+nondiscriminatory
+nondramatic
+nondrinker/MS
+nondrying
+none
+noneducational
+noneffective
+nonelastic
+nonelectric
+nonelectrical
+nonempty
+nonenforceable
+nonentity/SM
+nonequivalent/MS
+nonessential
+nonesuch/MS
+nonetheless
+nonevent/MS
+nonexchangeable
+nonexclusive
+nonexempt/M
+nonexistence/M
+nonexistent
+nonexplosive/MS
+nonfactual
+nonfading
+nonfat
+nonfatal
+nonfattening
+nonferrous
+nonfiction/M
+nonfictional
+nonflammable
+nonflowering
+nonfluctuating
+nonflying
+nonfood/M
+nonfreezing
+nonfunctional
+nongovernmental
+nongranular
+nonhazardous
+nonhereditary
+nonhuman
+nonidentical
+noninclusive
+nonindependent
+nonindustrial
+noninfectious
+noninflammatory
+noninflationary
+noninflected
+nonintellectual/MS
+noninterchangeable
+noninterference/M
+nonintervention/M
+nonintoxicating
+noninvasive
+nonirritating
+nonissue
+nonjudgmental
+nonjudicial
+nonlegal
+nonlethal
+nonlinear
+nonliterary
+nonliving/M
+nonmagnetic
+nonmalignant
+nonmember/MS
+nonmetal/SM
+nonmetallic
+nonmigratory
+nonmilitant
+nonmilitary
+nonnarcotic/SM
+nonnative/MS
+nonnegotiable
+nonnuclear
+nonnumerical
+nonobjective
+nonobligatory
+nonobservance/M
+nonobservant
+nonoccupational
+nonoccurence
+nonofficial
+nonoperational
+nonoperative
+nonparallel/MS
+nonpareil/MS
+nonparticipant/MS
+nonparticipating
+nonpartisan/SM
+nonpaying
+nonpayment/SM
+nonperformance/M
+nonperforming
+nonperishable
+nonperson/MS
+nonphysical/Y
+nonplus/S
+nonplussed
+nonplussing
+nonpoisonous
+nonpolitical
+nonpolluting
+nonporous
+nonpracticing
+nonprejudicial
+nonprescription
+nonproductive
+nonprofessional/SM
+nonprofit/SMB
+nonproliferation/M
+nonpublic
+nonpunishable
+nonracial
+nonradioactive
+nonrandom
+nonreactive
+nonreciprocal/SM
+nonreciprocating
+nonrecognition/M
+nonrecoverable
+nonrecurring
+nonredeemable
+nonrefillable
+nonrefundable
+nonreligious
+nonrenewable
+nonrepresentational
+nonresident/MS
+nonresidential
+nonresidual/M
+nonresistance/M
+nonresistant
+nonrestrictive
+nonreturnable/MS
+nonrhythmic
+nonrigid
+nonsalaried
+nonscheduled
+nonscientific
+nonscoring
+nonseasonal
+nonsectarian
+nonsecular
+nonsegregated
+nonsense/M
+nonsensical/Y
+nonsensitive
+nonsexist
+nonsexual
+nonskid
+nonslip
+nonsmoker/SM
+nonsmoking
+nonsocial
+nonspeaking
+nonspecialist/MS
+nonspecializing
+nonspecific
+nonspiritual/SM
+nonstaining
+nonstandard
+nonstarter/MS
+nonstick
+nonstop
+nonstrategic
+nonstriking
+nonstructural
+nonsuccessive
+nonsupport/GM
+nonsurgical
+nonsustaining
+nonsympathizer/M
+nontarnishable
+nontaxable
+nontechnical
+nontenured
+nontheatrical
+nonthinking
+nonthreatening
+nontoxic
+nontraditional
+nontransferable
+nontransparent
+nontrivial
+nontropical
+nonuniform
+nonunion
+nonuser/MS
+nonvenomous
+nonverbal
+nonviable
+nonviolence/M
+nonviolent/Y
+nonvirulent
+nonvocal
+nonvocational
+nonvolatile
+nonvoter/MS
+nonvoting
+nonwhite/MS
+nonworking
+nonyielding
+nonzero
+noodle/MGDS
+nook/MS
+nookie
+nooky
+noon/M
+noonday/M
+noontide/M
+noontime/M
+noose/SM
+nope
+nor
+nor'easter
+norm/MS
+normal/MY
+normalcy/M
+normality/M
+normalization/M
+normalize/DSG
+normative
+north/ZMR
+northbound
+northeast/MRZ
+northeaster/MY
+northeastern
+northeastward/S
+norther/MY
+northerly/SM
+northern/ZR
+northerner/M
+northernmost
+northward/S
+northwest/ZMR
+northwester/MY
+northwestern
+northwestward/S
+nose/MGDS
+nosebag/S
+nosebleed/MS
+nosecone/SM
+nosedive/DSMG
+nosegay/SM
+nosh/MDRSZG
+nosher/M
+nosily
+nosiness/M
+nostalgia/M
+nostalgic
+nostalgically
+nostril/MS
+nostrum/MS
+nosy/RPT
+not/B
+notability/SM
+notable/SM
+notably
+notarial
+notarization/M
+notarize/GDS
+notary/SM
+notate/GDS
+notation/FCSM
+notch/GMDS
+note's
+note/FCSDG
+notebook/MS
+notelet/S
+notepad/S
+notepaper/M
+noteworthiness/M
+noteworthy/P
+nothing/PSM
+nothingness/M
+notice/MGDS
+noticeable/U
+noticeably
+noticeboard/S
+noticed/U
+notifiable
+notification/M
+notifier/M
+notify/NDRSXZG
+notion/MS
+notional/Y
+notoriety/M
+notorious/Y
+notwithstanding
+notwork/S
+nougat/MS
+noun/KMS
+nourish/DSLG
+nourishment/M
+nous
+nova/MS
+novae
+novel/SM
+novelette/SM
+novelist/SM
+novelization/MS
+novelize/DSG
+novella/MS
+novelty/SM
+novena/MS
+novene
+novice/MS
+novitiate/MS
+now/M
+nowadays/M
+noway/S
+nowhere/M
+nowise
+nowt
+noxious
+nozzle/MS
+nu/SM
+nuance/MDS
+nub/SM
+nubbin/MS
+nubby/TR
+nubile
+nuclear/K
+nucleate/DSGN
+nucleation/M
+nuclei
+nucleic
+nucleoli
+nucleolus/M
+nucleon/SM
+nucleoside
+nucleotide
+nucleus/M
+nude/MTRS
+nudge/GDSM
+nudism/M
+nudist/SM
+nudity/M
+nugatory
+nugget/SM
+nuisance/MS
+nuke/MGDS
+null/S
+nullification/M
+nullify/NDSG
+nullity/M
+numb/ZTGPDRYS
+number's
+number/ASDG
+numbered/U
+numberless
+numbness/M
+numerable/I
+numeracy/IM
+numeral/SM
+numerate/XGNDS
+numeration/M
+numerator/MS
+numeric
+numerical/Y
+numerologist/MS
+numerology/M
+numerous/Y
+numinous
+numismatic/S
+numismatics/M
+numismatist/SM
+numskull/MS
+nun/SM
+nuncio/SM
+nunnery/SM
+nuptial/MS
+nurse/MZGDRS
+nurselings
+nursemaid/MS
+nurser/M
+nursery/SM
+nurseryman/M
+nurserymen
+nursing/M
+nursling/SM
+nurture/DRSMZG
+nurturer/M
+nut/SM
+nutcase/S
+nutcracker/MS
+nuthatch/MS
+nuthouse/S
+nutmeat/SM
+nutmeg/SM
+nutpick/SM
+nutria/SM
+nutrient/MS
+nutriment/MS
+nutrition/M
+nutritional/Y
+nutritionist/SM
+nutritious/YP
+nutritiousness/M
+nutritive
+nutshell/MS
+nutted
+nutter/S
+nuttiness/M
+nutting
+nutty/RTP
+nuzzle/DRSMZG
+nuzzler/M
+nybble/S
+nylon/MS
+nylons/M
+nymph/M
+nymphet/MS
+nympho/S
+nymphomania/M
+nymphomaniac/SM
+nymphs
+o
+o'clock
+o'er
+oaf/SM
+oafish/PY
+oafishness/M
+oak/SMN
+oakum/M
+oar/SGMD
+oarlock/SM
+oarsman/M
+oarsmen
+oarswoman/M
+oarswomen
+oases
+oasis/M
+oat/SMN
+oatcake/SM
+oath/M
+oaths
+oatmeal/M
+oats/M
+ob/S
+obbligato/MS
+obduracy/M
+obdurate/PY
+obdurateness/M
+obedience/EM
+obedient/EY
+obeisance/SM
+obeisant
+obelisk/MS
+obese
+obesity/M
+obey/EDSG
+obfuscate/GNXDS
+obfuscation/M
+obi/SM
+obit/MS
+obituary/SM
+obj
+object/SGVMD
+objectify/NGDS
+objection/SMB
+objectionable/U
+objectionably
+objective/SMYP
+objectiveness/M
+objectivity/M
+objector/MS
+objurgate/XGNDS
+objurgation/M
+oblate/NX
+oblation/M
+obligate/DSXGN
+obligation/M
+obligatorily
+obligatory
+oblige/EGDS
+obliging/Y
+oblique/SMYP
+obliqueness/M
+obliquity/M
+obliterate/DSGN
+obliteration/M
+oblivion/M
+oblivious/YP
+obliviousness/M
+oblong/MS
+obloquy/M
+obnoxious/YP
+obnoxiousness/M
+oboe/MS
+oboist/MS
+obscene/RYT
+obscenity/SM
+obscurantism/M
+obscurantist/SM
+obscure/DRSYTG
+obscurity/SM
+obsequies
+obsequious/PY
+obsequiousness/M
+obsequy/M
+observably
+observance/MS
+observant/Y
+observation/SM
+observational
+observatory/SM
+observe/DRSBZG
+observed/U
+observer/M
+obsess/DSGV
+obsession/SM
+obsessional/Y
+obsessive/PSMY
+obsessiveness/M
+obsidian/M
+obsolesce/DSG
+obsolescence/M
+obsolescent
+obsolete/GDS
+obstacle/MS
+obstetric/S
+obstetrical
+obstetrician/SM
+obstetrics/M
+obstinacy/M
+obstinate/Y
+obstreperous/YP
+obstreperousness/M
+obstruct/DGVS
+obstructed/U
+obstruction/SM
+obstructionism/M
+obstructionist/MS
+obstructive/YP
+obstructiveness/M
+obtain/DBLGS
+obtainable/U
+obtainment/M
+obtrude/DSG
+obtrusion/M
+obtrusive/UPY
+obtrusiveness/UM
+obtuse/YTRP
+obtuseness/M
+obverse/SM
+obviate/DSGN
+obviation/M
+obvious/PY
+obviousness/M
+ocarina/MS
+occasion/GMDS
+occasional/Y
+occidental/SM
+occlude/GDS
+occlusion/SM
+occlusive
+occult/M
+occultism/M
+occultist/SM
+occupancy/M
+occupant/SM
+occupation/AM
+occupational/Y
+occupations
+occupied/U
+occupier/SM
+occupy/ADSG
+occur/AS
+occurred/A
+occurrence/SM
+occurring/A
+ocean/SM
+oceanfront/SM
+oceangoing
+oceanic/M
+oceanographer/SM
+oceanographic
+oceanography/M
+oceanology/M
+ocelot/MS
+och/R
+ocher/M
+ocker/S
+octagon/MS
+octagonal
+octal
+octane/MS
+octave/MS
+octavo/MS
+octet/SM
+octogenarian/SM
+octopus/MS
+ocular/MS
+oculist/SM
+oculomotor
+odalisque/SM
+odd/STRYLP
+oddball/SM
+oddity/SM
+oddment/SM
+oddness/M
+odds/M
+ode/SM
+odious/YP
+odiousness/M
+odium/M
+odometer/MS
+odor/MDS
+odoriferous
+odorless
+odorous
+odyssey/MS
+oedipal
+oenology/M
+oenophile/SM
+oeuvre/MS
+of
+off/SZGDRJ
+offal/M
+offbeat/MS
+offend/ZGDRS
+offender/M
+offense/MS
+offensive's
+offensive/IPY
+offensiveness/IM
+offensives
+offer/JGMD
+offering/M
+offertory/SM
+offhand
+offhanded/PY
+offhandedness/M
+office/MZRS
+officeholder/SM
+officer/M
+official/MYS
+officialdom/M
+officialese
+officialism/M
+officiant/SM
+officiate/DSG
+officiator/MS
+officious/PY
+officiousness/M
+offing/M
+offish
+offline
+offload/SDG
+offprint/SM
+offset/MS
+offsetting
+offshoot/MS
+offshore/G
+offside
+offsite
+offspring/M
+offstage/S
+offtrack
+oft
+often/TR
+oftentimes
+ofttimes
+ogle/MZGDRS
+ogler/M
+ogre/MS
+ogreish
+ogress/MS
+oh/M
+ohm/SM
+ohmmeter/MS
+oho
+ohs
+oi
+oik/S
+oil/SGMD
+oilcan/S
+oilcloth/M
+oilcloths
+oilfield/S
+oiliness/M
+oilman
+oilmen
+oilskin/MS
+oilskins/M
+oily/RPT
+oink/MDSG
+ointment/SM
+okapi/SM
+okay/MSG
+okra/MS
+old/TMNRP
+oldie/SM
+oldish
+oldness/M
+oldster/MS
+ole/SMV
+oleaginous
+oleander/MS
+oleo/M
+oleomargarine/M
+olfactory/SM
+oligarch/M
+oligarchic
+oligarchical
+oligarchs
+oligarchy/SM
+oligonucleotide/S
+oligopoly/SM
+olive/SM
+om/SMNX
+ombudsman/M
+ombudsmen
+omega/SM
+omelet/MS
+omen/M
+omicron/MS
+ominous/YP
+ominousness/M
+omission/MS
+omit/S
+omitted
+omitting
+omnibus/MS
+omnipotence/M
+omnipotent
+omnipresence/M
+omnipresent
+omniscience/M
+omniscient
+omnivore/MS
+omnivorous/PY
+omnivorousness/M
+on/Y
+onboard
+once/M
+oncogene/SM
+oncologist/SM
+oncology/M
+oncoming
+one/SXMNP
+oneness/M
+onerous/PY
+onerousness/M
+oneself
+onetime
+ongoing
+onion/M
+onionskin/M
+online
+onlooker/SM
+onlooking
+onomatopoeia/M
+onomatopoeic
+onomatopoetic
+onrush/MSG
+onscreen
+onset/MS
+onshore
+onside
+onsite
+onslaught/MS
+onstage
+onto
+ontogeny/M
+ontological
+ontology/M
+onus/MS
+onward
+onyx/MS
+oodles/M
+ooh/GD
+oohs
+oomph
+oops
+ooze/MGDS
+oozy/TR
+op/SMDG
+opacity/M
+opal/MS
+opalescence/M
+opalescent
+opaque/PYTGDRS
+opaqueness/M
+opcode/S
+ope/S
+open/ZTGJPMDRYS
+opencast
+opened/U
+opener/M
+openhanded/P
+openhandedness/M
+openhearted
+opening/M
+openness/M
+openwork/M
+opera/MS
+operable/I
+operand/S
+operate/DSGNVX
+operatic
+operatically
+operation/M
+operational/Y
+operative/SM
+operator/SM
+operetta/SM
+ophthalmic
+ophthalmologist/SM
+ophthalmology/M
+opiate/SM
+opine/GNXDS
+opinion/M
+opinionated
+opioid/SM
+opium/M
+opossum/MS
+opp
+opponent/SM
+opportune/IY
+opportunism/M
+opportunist/SM
+opportunistic
+opportunistically
+opportunity/SM
+oppose/DSG
+opposed/U
+opposite/SMYNX
+opposition/M
+oppress/DSGV
+oppression/M
+oppressive/YP
+oppressiveness/M
+oppressor/MS
+opprobrious/Y
+opprobrium/M
+opt/SGD
+optic/MS
+optical/Y
+optician/SM
+optics/M
+optima
+optimal/Y
+optimism/SM
+optimist/SM
+optimistic
+optimistically
+optimization/MS
+optimize/DRSG
+optimum/SM
+option/SMDG
+optional/Y
+optometrist/MS
+optometry/M
+opulence/M
+opulent/Y
+opus/MS
+or
+oracle/SM
+oracular
+oral/MYS
+orality
+orange/SMP
+orangeade/MS
+orangery/SM
+orangutan/SM
+orate/GNXDS
+oration/M
+orator/SM
+oratorical/Y
+oratorio/MS
+oratory/SM
+orb/SM
+orbicular
+orbit/MDRZGS
+orbital/SM
+orbiter/M
+orc/SM
+orchard/SM
+orchestra/MS
+orchestral
+orchestrate/DSXGN
+orchestration/M
+orchid/SM
+ordain/SDLG
+ordainment/M
+ordeal/SM
+order/EAMDGS
+ordered/U
+orderings
+orderliness/EM
+orderly/PSM
+ordinal/SM
+ordinance/SM
+ordinarily
+ordinariness/M
+ordinary/SMP
+ordinate/MNSX
+ordination/M
+ordnance/M
+ordure/M
+ore/SM
+oregano/M
+org
+organ/MS
+organdy/M
+organelle/MS
+organic/SM
+organically/I
+organism/MS
+organismic
+organist/MS
+organization/ASM
+organizational/Y
+organize/AESDG
+organized/U
+organizer/MS
+organza/M
+orgasm/SM
+orgasmic
+orgiastic
+orgy/SM
+oriel/MS
+orient's
+orient/AEDGS
+oriental/MS
+orientalist/S
+orientate/EDSGN
+orientation/AEM
+orientations
+orienteering
+orifice/MS
+orig
+origami/M
+origin/SM
+original/MYS
+originality/M
+originate/DSGN
+origination/M
+originator/SM
+oriole/SM
+orison/SM
+ormolu/M
+ornament/SGMD
+ornamental
+ornamentation/M
+ornate/YP
+ornateness/M
+orneriness/M
+ornery/PRT
+ornithological
+ornithologist/MS
+ornithology/M
+orotund
+orotundity/SM
+orphan/SMDG
+orphanage/MS
+orris/MS
+orthodontia/M
+orthodontic/S
+orthodontics/M
+orthodontist/SM
+orthodox/U
+orthodoxy/SM
+orthogonal
+orthogonality
+orthographic
+orthographically
+orthography/SM
+orthopedic/S
+orthopedics/M
+orthopedist/MS
+orzo/M
+oscillate/GNDSX
+oscillation/M
+oscillator/SM
+oscillatory
+oscilloscope/MS
+osculate/DSXGN
+osculation/M
+osier/MS
+osmium/M
+osmosis/M
+osmotic
+osprey/SM
+ossicles
+ossification/M
+ossify/NGDS
+ostensible
+ostensibly
+ostentation/M
+ostentatious/Y
+osteoarthritis/M
+osteopath/M
+osteopathic
+osteopaths
+osteopathy/M
+osteoporosis/M
+ostler/S
+ostracism/M
+ostracize/GDS
+ostrich/MS
+other/MSP
+otherwise
+otherworldly
+otiose
+otter/MS
+ottoman/MS
+oubliette/MS
+ouch
+ought
+oughtn't
+ounce/MS
+our/S
+ourselves
+oust/ZGDRS
+ouster/M
+out/SJGMDR
+outage/SM
+outargue/GDS
+outback/MS
+outbalance/DSG
+outbid/S
+outbidding
+outboard/MS
+outboast/DSG
+outbound
+outbox/MS
+outbreak/MS
+outbuilding/MS
+outburst/SM
+outcast/MS
+outclass/DSG
+outcome/MS
+outcrop/MS
+outcropped
+outcropping/SM
+outcry/SM
+outdated
+outdid
+outdistance/GDS
+outdo/G
+outdoes
+outdone
+outdoor/S
+outdoors/M
+outdoorsy
+outdraw/GS
+outdrawn
+outdrew
+outercourse
+outermost
+outerwear/M
+outface/GDS
+outfall/S
+outfield/SMRZ
+outfielder/M
+outfight/SG
+outfit/SM
+outfitted
+outfitter/MS
+outfitting
+outflank/GSD
+outflow/MS
+outfought
+outfox/GDS
+outgo/MJG
+outgoes
+outgrew
+outgrow/HGS
+outgrown
+outgrowth/M
+outgrowths
+outguess/GDS
+outgun/S
+outgunned
+outgunning
+outhit/S
+outhitting
+outhouse/SM
+outing/M
+outlaid
+outlandish/PY
+outlandishness/M
+outlast/DSG
+outlaw/SGMD
+outlay/SGM
+outlet/SM
+outlier/S
+outline/MGDS
+outlive/GDS
+outlook/MS
+outlying
+outmaneuver/GDS
+outmatch/GDS
+outmoded
+outnumber/DSG
+outpace/GDS
+outpatient/MS
+outperform/GSD
+outplace/L
+outplacement/M
+outplay/GDS
+outpoint/DGS
+outpost/MS
+outpouring/MS
+outproduce/DSG
+output/SM
+outputted
+outputting
+outrace/GDS
+outrage/MGDS
+outrageous/Y
+outran
+outrank/GDS
+outre
+outreach/MDSG
+outrider/MS
+outrigger/SM
+outright
+outrun/S
+outrunning
+outscore/GDS
+outsell/GS
+outset/SM
+outshine/GS
+outshone
+outshout/GDS
+outside/MZRS
+outsider/M
+outsize/MS
+outskirt/MS
+outsmart/GDS
+outsold
+outsource/DSG
+outsourcing/M
+outspend/SG
+outspent
+outspoken/YP
+outspokenness/M
+outspread/GS
+outstanding/Y
+outstation/MS
+outstay/DGS
+outstretch/DSG
+outstrip/S
+outstripped
+outstripping
+outta
+outtake/MS
+outvote/GDS
+outward/YS
+outwear/GS
+outweigh/GD
+outweighs
+outwit/S
+outwith
+outwitted
+outwitting
+outwore
+outwork/MDRSZG
+outworn
+ouzo/MS
+ova
+oval/MS
+ovarian
+ovary/SM
+ovate/NX
+ovation/M
+oven/MS
+ovenbird/SM
+ovenproof
+ovenware
+over/MYS
+overabundance/M
+overabundant
+overachieve/ZGDRS
+overachiever/M
+overact/GVSD
+overage/SM
+overaggressive
+overall/SM
+overalls/M
+overambitious
+overanxious
+overarching
+overarm/GSD
+overate
+overattentive
+overawe/DSG
+overbalance/MGDS
+overbear/GS
+overbearing/Y
+overbid/SM
+overbidding
+overbite/MS
+overblown
+overboard
+overbold
+overbook/DGS
+overbore
+overborne
+overbought
+overbuild/SG
+overbuilt
+overburden/GSD
+overbuy/GS
+overcame
+overcapacity/M
+overcapitalize/DSG
+overcareful
+overcast/MGS
+overcautious
+overcharge/DSMG
+overclock/GD
+overcloud/SGD
+overcoat/MS
+overcome/GS
+overcompensate/DSGN
+overcompensation/M
+overconfidence/M
+overconfident
+overconscientious
+overcook/DGS
+overcritical
+overcrowd/SDG
+overcrowding/M
+overdecorate/DSG
+overdependent
+overdevelop/SDG
+overdid
+overdo/G
+overdoes
+overdone
+overdose/MGDS
+overdraft/SM
+overdraw/GS
+overdrawn
+overdress/GMDS
+overdrew
+overdrive/SM
+overdub/SM
+overdubbed
+overdubbing
+overdue
+overeager
+overeat/GSN
+overemotional
+overemphasis/M
+overemphasize/GDS
+overenthusiastic
+overestimate/MGNDS
+overestimation/M
+overexcite/DSG
+overexercise/GDS
+overexert/SDG
+overexertion/M
+overexpose/GDS
+overexposure/M
+overextend/DGS
+overfed
+overfeed/GS
+overfill/DGS
+overflew
+overflight/MS
+overflow/MDSG
+overflown
+overfly/GS
+overfond
+overfull
+overgeneralize/DSG
+overgenerous
+overgraze/DSG
+overgrew
+overground
+overgrow/HSG
+overgrown
+overgrowth/M
+overhand/MDS
+overhang/MSG
+overhasty
+overhaul/MDSG
+overhead/MS
+overhear/SG
+overheard
+overheat/DSG
+overhung
+overindulge/GDS
+overindulgence/M
+overindulgent
+overinflated
+overjoy/GSD
+overkill/M
+overladen
+overlaid
+overlain
+overland
+overlap/SM
+overlapped
+overlapping
+overlarge
+overlay/GSM
+overleaf
+overlie
+overload/GMDS
+overlong
+overlook/GMDS
+overlord/MS
+overly/SG
+overmanned
+overmanning
+overmaster/SDG
+overmodest
+overmuch/S
+overnice
+overnight/MS
+overoptimism/M
+overoptimistic
+overpaid
+overparticular
+overpass/MS
+overpay/GS
+overplay/GDS
+overpopulate/GNDS
+overpopulation/M
+overpower/SDG
+overpowering/Y
+overpraise/DSG
+overprecise
+overprice/DSG
+overprint/SMDG
+overproduce/GDS
+overproduction/M
+overprotect/SDGV
+overqualified
+overran
+overrate/GDS
+overreach/GDS
+overreact/SDG
+overreaction/SM
+overrefined
+overridden
+override/MGS
+overripe/M
+overrode
+overrule/GDS
+overrun/SM
+overrunning
+oversampling
+oversaw
+oversea/S
+oversee/RSZ
+overseeing
+overseen
+overseer/M
+oversell/GS
+oversensitive/P
+oversensitiveness/M
+oversexed
+overshadow/DSG
+overshare/DSG
+overshoe/MS
+overshoot/GS
+overshot
+oversight/SM
+oversimple
+oversimplification/M
+oversimplify/DSNGX
+oversize
+oversleep/GS
+overslept
+oversold
+overspecialization/M
+overspecialize/GDS
+overspend/SG
+overspent
+overspread/GS
+overstaffed
+overstate/DSLG
+overstatement/MS
+overstay/DSG
+overstep/S
+overstepped
+overstepping
+overstimulate/DSG
+overstock/GSD
+overstretch/GDS
+overstrict
+overstrung
+overstuffed
+oversubscribe/DSG
+oversubtle
+oversupply/GDS
+oversuspicious
+overt/Y
+overtake/GS
+overtaken
+overtax/GDS
+overthink/SG
+overthought
+overthrew
+overthrow/SMG
+overthrown
+overtime/MS
+overtire/GDS
+overtone/MS
+overtook
+overture/MS
+overturn/DSG
+overuse/DSMG
+overvaluation/S
+overvalue/DSG
+overview/MS
+overweening/Y
+overweight/M
+overwhelm/SGD
+overwhelming/Y
+overwinter/SDG
+overwork/GMDS
+overwrite/GS
+overwritten
+overwrote
+overwrought
+overzealous
+oviduct/SM
+oviparous
+ovoid/MS
+ovular
+ovulate/DSGN
+ovulation/M
+ovule/MS
+ovum/M
+ow
+owe/DSG
+owl/SM
+owlet/MS
+owlish/Y
+own/ESGD
+owner/MS
+ownership/M
+ox/MN
+oxalate
+oxblood/M
+oxbow/MS
+oxcart/SM
+oxford/SM
+oxidant/MS
+oxidase
+oxidation/M
+oxidative
+oxide/MS
+oxidization/M
+oxidize/ZGDRS
+oxidizer/M
+oxtail/S
+oxyacetylene/M
+oxygen/M
+oxygenate/DSGN
+oxygenation/M
+oxymora
+oxymoron/M
+oyster/SM
+oz
+ozone/M
+p/NRXTGJ
+pH
+pa/SMH
+pablum/M
+pabulum/M
+pace/MZGDRS
+pacemaker/SM
+pacer/M
+pacesetter/SM
+pacey
+pachyderm/MS
+pachysandra/MS
+pacific
+pacifically
+pacification/M
+pacifier/M
+pacifism/M
+pacifist/SM
+pacifistic
+pacify/ZGDRSN
+pack's
+pack/AUGSD
+package's
+package/AGDS
+packager/SM
+packaging/M
+packer/MS
+packet/MS
+packing's
+packinghouse/SM
+packsaddle/MS
+pact/MS
+pacy/RT
+pad/SM
+padded
+padding/M
+paddle/MZGDRS
+paddler/M
+paddock/MDGS
+paddy/SM
+padlock/MDSG
+padre/SM
+paean/SM
+paella/MS
+pagan/SM
+paganism/M
+page/MZGDRS
+pageant/MS
+pageantry/M
+pageboy/SM
+pager/M
+paginate/DSGN
+pagination/M
+pagoda/MS
+pah
+paid/AU
+pail/MS
+pailful/SM
+pain/MDSG
+painful/PY
+painfuller
+painfullest
+painfulness/M
+painkiller/MS
+painkilling
+painless/PY
+painlessness/M
+painstaking/MY
+paint/SZGJMDR
+paintball
+paintbox/MS
+paintbrush/MS
+painted/U
+painter/MY
+painting/M
+paintwork
+pair/AMDSG
+paired/U
+pairing/S
+pairwise
+paisley/SM
+pajama/S
+pajamas/M
+pal/SMY
+palace/MS
+paladin/SM
+palanquin/SM
+palatable/U
+palatal/SM
+palatalization/M
+palatalize/GDS
+palate/MBS
+palatial/Y
+palatinate/MS
+palatine/MS
+palaver/GSMD
+palazzi
+palazzo
+pale/MYTGPDRSJ
+paleface/MS
+paleness/M
+paleo
+paleographer/MS
+paleography/M
+paleolithic
+paleontologist/SM
+paleontology/M
+palette/SM
+palfrey/SM
+palimony/M
+palimpsest/MS
+palindrome/MS
+palindromic
+paling/M
+palisade/SM
+palish
+pall/MDSG
+palladium/M
+pallbearer/MS
+pallet/MS
+palliate/DSGNV
+palliation/M
+palliative/SM
+pallid/YP
+pallidness/M
+pallor/M
+palm/MDSG
+palmate
+palmetto/SM
+palmist/SM
+palmistry/M
+palmtop/SM
+palmy/TR
+palomino/MS
+palpable
+palpably
+palpate/DSGN
+palpation/M
+palpitate/XGNDS
+palpitation/M
+palsy/GDSM
+paltriness/M
+paltry/RPT
+pampas/M
+pamper/DSG
+pamphlet/MS
+pamphleteer/MS
+pan/SM
+panacea/SM
+panache/M
+panama/MS
+panatella/S
+pancake/DSMG
+panchromatic
+pancreas/MS
+pancreatic
+pancreatitis
+panda/SM
+pandemic/SM
+pandemonium/M
+pander/MDRZGS
+panderer/M
+pane/KM
+panegyric/SM
+panel/SGJMD
+paneling/M
+panelist/MS
+panes
+pang/MS
+panhandle/DRSMZG
+panhandler/M
+panic/SM
+panicked
+panicking
+panicky
+panned
+pannier/SM
+panning
+panoply/SM
+panorama/SM
+panoramic
+panpipes/M
+pansy/SM
+pant/MDSG
+pantaloons/M
+pantechnicon/S
+pantheism/M
+pantheist/SM
+pantheistic
+pantheon/SM
+panther/MS
+pantie/MS
+panto/S
+pantomime/MGDS
+pantomimic
+pantomimist/SM
+pantry/SM
+pantsuit/SM
+pantyhose/M
+pantyliner/M
+pantywaist/SM
+pap/SM
+papa/MS
+papacy/SM
+papal
+paparazzi/M
+paparazzo
+papaya/MS
+paper/SZGMDR
+paperback/SM
+paperbark/S
+paperboard/M
+paperboy/SM
+paperclip/S
+paperer/M
+papergirl/SM
+paperhanger/SM
+paperhanging/M
+paperless
+paperweight/MS
+paperwork/M
+papery
+papilla/M
+papillae
+papillary
+papist/MS
+papoose/MS
+pappy/SM
+paprika/M
+papyri
+papyrus/M
+par/SZGMDRBJ
+para/MS
+parable/MS
+parabola/SM
+parabolic
+paracetamol/S
+parachute/DSMG
+parachutist/MS
+parade/MZGDRS
+parader/M
+paradigm/SM
+paradigmatic
+paradisaical
+paradise/SM
+paradox/MS
+paradoxical/Y
+paraffin/M
+paragliding
+paragon/MS
+paragraph/GMD
+paragraphs
+parakeet/SM
+paralegal/MS
+parallax/MS
+parallel/SGMD
+paralleled/U
+parallelism/MS
+parallelization
+parallelized
+parallelogram/SM
+paralyses
+paralysis/M
+paralytic/SM
+paralyze/DSG
+paralyzing/Y
+paramagnetic
+paramecia
+paramecium/M
+paramedic/MS
+paramedical/MS
+parameter/MS
+parameterize/D
+parametric
+paramilitary/SM
+paramount
+paramountcy
+paramour/SM
+paranoia/M
+paranoiac/MS
+paranoid/SM
+paranormal
+parapet/MS
+paraphernalia/M
+paraphrase/DSMG
+paraplegia/M
+paraplegic/SM
+paraprofessional/MS
+parapsychologist/MS
+parapsychology/M
+paraquat/M
+parasailing
+parascending
+parasite/SM
+parasitic
+parasitical/Y
+parasitism/M
+parasol/MS
+parasympathetic/S
+parathion/M
+parathyroid/MS
+paratroop/RZS
+paratrooper/M
+paratroops/M
+paratyphoid/M
+parboil/DSG
+parcel/GMDS
+parch/LGDS
+parchment/SM
+pardner/S
+pardon/ZGMDRBS
+pardonable/U
+pardonably/U
+pardoner/M
+pare/S
+paregoric/M
+parent/GMDS
+parentage/M
+parental
+parentheses
+parenthesis/M
+parenthesize/DSG
+parenthetic
+parenthetical/Y
+parenthood/M
+parenting/M
+parer/M
+pares/S
+paresis/M
+parfait/MS
+pariah/M
+pariahs
+paribus
+parietal
+parimutuel/MS
+paring/M
+parish/MS
+parishioner/MS
+parity/ESM
+park/MDSG
+parka/SM
+parking/M
+parkland
+parkour
+parkway/MS
+parky
+parlance/M
+parlay/GMDS
+parley/GMDS
+parliament/SM
+parliamentarian/SM
+parliamentary
+parlor/MS
+parlous
+parmigiana
+parochial/Y
+parochialism/M
+parodist/SM
+parody/GDSM
+parole/MGDS
+parolee/MS
+parotid
+paroxysm/SM
+paroxysmal
+parquet/MDSG
+parquetry/M
+parred
+parricidal
+parricide/MS
+parring
+parrot/GMDS
+parry/GDSM
+parse/DRSG
+parsec/MS
+parsimonious/Y
+parsimony/M
+parsley/M
+parsnip/MS
+parson/MS
+parsonage/MS
+part's
+part/CDSG
+partake/ZGRS
+partaken
+partaker/M
+parterre/SM
+parthenogenesis/M
+partial/MYS
+partiality/M
+participant/SM
+participate/DSGN
+participation/M
+participator/MS
+participatory
+participial/M
+participle/MS
+particle/SM
+particleboard/M
+particular/SMY
+particularity/SM
+particularization/M
+particularize/DSG
+particulate/SM
+parting/MS
+partisan/SM
+partisanship/M
+partition/GMDS
+partitive/MS
+partly
+partner/MDSG
+partnership/MS
+partook
+partridge/SM
+parturition/M
+partway
+party/GDSM
+parvenu/MS
+pascal/MS
+paschal
+pasha/SM
+pass/M
+passably
+passage/MS
+passageway/MS
+passbook/MS
+passe/DRSBXZGNV
+passel/MS
+passenger/SM
+passer/M
+passerby/M
+passersby
+passim
+passing/MY
+passion/EM
+passionate/EY
+passionflower/SM
+passionless
+passive/PMYS
+passiveness/M
+passivity/M
+passivization
+passivize/DSG
+passkey/MS
+passphrase/S
+passport/MS
+password/MS
+past/AMS
+pasta/SM
+paste/DSMG
+pasteboard/M
+pastel/MS
+pastern/MS
+pasteurization/M
+pasteurize/ZGDRS
+pasteurized/U
+pasteurizer/M
+pastiche/MS
+pastie
+pastille/MS
+pastime/MS
+pastiness/M
+pastor/MS
+pastoral/MS
+pastorate/MS
+pastrami/M
+pastry/SM
+pasturage/M
+pasture/DSMG
+pastureland/M
+pasty/PTRSM
+pat/SM
+patch/EGMDS
+patchily
+patchiness/M
+patchouli
+patchwork/SM
+patchy/TPR
+pate/MS
+patella/MS
+patellae
+patent/GMDYS
+paterfamilias/MS
+paternal/Y
+paternalism/M
+paternalist/S
+paternalistic
+paternity/M
+paternoster/MS
+path/M
+pathetic
+pathetically
+pathfinder/SM
+pathless
+pathogen/SM
+pathogenic
+pathological/Y
+pathologist/SM
+pathology/M
+pathos/M
+paths
+pathway/MS
+patience/M
+patient/IMST
+patienter
+patiently
+patina/MS
+patine
+patio/SM
+patisserie/S
+patois/M
+patresfamilias
+patriarch/M
+patriarchal
+patriarchate/MS
+patriarchs
+patriarchy/SM
+patrician/SM
+patricidal
+patricide/SM
+patrimonial
+patrimony/SM
+patriot/SM
+patriotic/U
+patriotically
+patriotism/M
+patrol/MS
+patrolled
+patrolling
+patrolman/M
+patrolmen
+patrolwoman/M
+patrolwomen
+patron/MS
+patronage/MS
+patroness/MS
+patronize/ZGDRS
+patronizer/M
+patronizing/Y
+patronymic/SM
+patronymically
+patroon/SM
+patsy/SM
+patted
+patter/MDGS
+pattern/SMDG
+patting
+patty/SM
+paucity/M
+paunch/MS
+paunchy/RT
+pauper/MS
+pauperism/M
+pauperize/DSG
+pause/DSMG
+pave/AGDS
+paved/U
+pavement/MS
+pavilion/SM
+paving/MS
+pavlova/S
+paw/SGMD
+pawl/MS
+pawn/MDSG
+pawnbroker/MS
+pawnbroking/M
+pawnshop/MS
+pawpaw/MS
+pay's
+pay/ASGBL
+payback/SM
+paycheck/MS
+payday/MS
+payed
+payee/SM
+payer/SM
+payload/SM
+paymaster/SM
+payment/ASM
+payoff/MS
+payola/M
+payout/MS
+payphone/S
+payroll/SM
+payslip/SM
+paywall/SM
+payware
+pct
+pd
+pea/SM
+peace/SM
+peaceable
+peaceably
+peaceful/PY
+peacefulness/M
+peacekeeper/SM
+peacekeeping/M
+peacemaker/MS
+peacemaking/M
+peacetime/M
+peach/MS
+peachy/TR
+peacock/MS
+peafowl/MS
+peahen/MS
+peak/MDSG
+peaky
+peal/AMDSG
+peanut/MS
+pear/MYS
+pearl/SGMD
+pearly/RT
+peasant/SM
+peasantry/M
+peashooter/SM
+peat/M
+peaty/TR
+pebble/MGDS
+pebbly
+pecan/SM
+peccadillo/M
+peccadilloes
+peccary/SM
+peck/MDRSZG
+peckish
+pecs
+pectic
+pectin/M
+pectoral/MS
+pectoralis
+peculate/GNDS
+peculation/M
+peculator/SM
+peculiar/Y
+peculiarity/SM
+pecuniary
+pedagogic
+pedagogical/Y
+pedagogue/SM
+pedagogy/M
+pedal/SGMD
+pedalo/S
+pedant/MS
+pedantic
+pedantically
+pedantry/M
+peddle/ZGDRS
+peddler/M
+pederast/MS
+pederasty/M
+pedestal/MS
+pedestrian/SM
+pedestrianization
+pedestrianize/GDS
+pediatric/S
+pediatrician/MS
+pediatrics/M
+pedicab/SM
+pedicure/MGDS
+pedicurist/MS
+pedigree/MDS
+pediment/MS
+pedometer/MS
+pedophile/S
+pedophilia
+peduncle/MS
+pee/DRSMZ
+peeing
+peek/MDSG
+peekaboo/M
+peel/MDRSJZG
+peeled/U
+peeler/M
+peeling/M
+peen/MS
+peep/MDRSZG
+peepbo
+peeper/M
+peephole/MS
+peepshow/MS
+peer/MDG
+peerage/SM
+peeress/MS
+peerless
+peeve/DSMG
+peevish/PY
+peevishness/M
+peewee/MS
+peewit/S
+peg/SM
+pegboard/MS
+pegged
+pegging
+peignoir/SM
+pejoration/M
+pejorative/SMY
+peke/MS
+pekineses
+pekingese/SM
+pekoe/M
+pelagic
+pelf/M
+pelican/MS
+pellagra/M
+pellet/GMDS
+pellucid
+pelmet/S
+pelt/MDSG
+pelvic
+pelvis/MS
+pemmican/M
+pen/M
+penal
+penalization/M
+penalize/DSG
+penalty/SM
+penance/MS
+pence
+penchant/SM
+pencil/GMDJS
+pend/CDSG
+pendant/MS
+pendent/MS
+pendulous
+pendulum/MS
+penetrability/M
+penetrable
+penetrate/DSGNVX
+penetrating/Y
+penetration/M
+penfriend/S
+penguin/MS
+penicillin/M
+penile
+peninsula/SM
+peninsular
+penis/MS
+penitence/M
+penitent/SMY
+penitential
+penitentiary/SM
+penknife/M
+penknives
+penlight/SM
+penman/M
+penmanship/M
+penmen
+pennant/MS
+penned
+penniless
+penning
+pennon/MS
+penny/SM
+pennyweight/MS
+pennyworth
+penologist/MS
+penology/M
+pension/BZGMDRS
+pensioner/M
+pensive/PY
+pensiveness/M
+pent
+pentacle/MS
+pentagon/MS
+pentagonal
+pentagram/SM
+pentameter/SM
+pentathlete/MS
+pentathlon/MS
+penthouse/SM
+penuche/M
+penultimate/SM
+penumbra/MS
+penumbrae
+penurious/PY
+penuriousness/M
+penury/M
+peon/MS
+peonage/M
+peony/SM
+people/MGDS
+pep/SM
+pepped
+pepper/GMDS
+peppercorn/SM
+peppermint/SM
+pepperoni/MS
+peppery
+peppiness/M
+pepping
+peppy/TPR
+pepsin/M
+peptic/MS
+peptide/S
+peradventure/M
+perambulate/XGNDS
+perambulation/M
+perambulator/MS
+percale/MS
+perceive/BGDS
+perceived/U
+percent/MS
+percentage/SM
+percentile/SM
+perceptible
+perceptibly
+perception/SM
+perceptional
+perceptive/PY
+perceptiveness/M
+perceptual/Y
+perch/GMDS
+perchance
+percipience/M
+percipient
+percolate/GNDS
+percolation/M
+percolator/SM
+percussion/AM
+percussionist/MS
+percussive
+perdition/M
+perdurable
+peregrinate/DSXGN
+peregrination/M
+peregrine/MS
+peremptorily
+peremptory
+perennial/SMY
+perestroika/M
+perfect/PTGMDRYS
+perfecta/MS
+perfectibility/M
+perfectible
+perfection/SM
+perfectionism/M
+perfectionist/SM
+perfectness/M
+perfidious/Y
+perfidy/SM
+perforate/GNXDS
+perforation/M
+perforce
+perform/SDRZG
+performance/SM
+performative
+performed/U
+performer/M
+perfume/DRSMZG
+perfumer/M
+perfumery/SM
+perfunctorily
+perfunctory
+perfusion
+pergola/SM
+perhaps
+pericardia
+pericardial
+pericarditis
+pericardium/M
+perigee/SM
+perihelia
+perihelion/M
+peril/SGMD
+perilous/Y
+perimeter/SM
+perinatal
+perinea
+perineum/M
+period/MS
+periodic
+periodical/SMY
+periodicity/M
+periodontal
+periodontics/M
+periodontist/SM
+peripatetic/MS
+peripheral/MYS
+periphery/SM
+periphrases
+periphrasis/M
+periphrastic
+periscope/SM
+perish/BDRSZG
+perishable/MS
+peristalses
+peristalsis/M
+peristaltic
+peristyle/SM
+peritoneal
+peritoneum/MS
+peritonitis/M
+periwig/SM
+periwinkle/SM
+perjure/DRSZG
+perjurer/M
+perjury/SM
+perk/MDSG
+perkily
+perkiness/M
+perky/TPR
+perm/MDSG
+permafrost/M
+permanence/M
+permanency/M
+permanent/SMY
+permeability/M
+permeable
+permeate/GNDS
+permeation/M
+permissible
+permissibly
+permission/MS
+permissive/PY
+permissiveness/M
+permit/MS
+permitted
+permitting
+permittivity
+permutation/SM
+permute/DSG
+pernicious/YP
+perniciousness/M
+peroration/MS
+peroxide/MGDS
+perpendicular/SMY
+perpendicularity/M
+perpetrate/DSGN
+perpetration/M
+perpetrator/MS
+perpetual/SMY
+perpetuate/DSGN
+perpetuation/M
+perpetuity/M
+perplex/GDS
+perplexed/Y
+perplexing/Y
+perplexity/SM
+perquisite/SM
+persecute/GNXDS
+persecution/M
+persecutor/SM
+perseverance/M
+persevere/DSG
+persiflage/M
+persimmon/SM
+persist/SGD
+persistence/M
+persistent/Y
+persnickety
+person/UMS
+persona/SM
+personable
+personae
+personage/MS
+personal/MYS
+personality/SM
+personalize/CDSG
+personalty/M
+personification/M
+personify/GDSNX
+personnel/M
+perspective/MS
+perspex
+perspicacious/Y
+perspicacity/M
+perspicuity/M
+perspicuous
+perspiration/M
+perspire/GDS
+persuade/BZGDRS
+persuaded/U
+persuader/M
+persuasion/SM
+persuasive/PY
+persuasiveness/M
+pert/RYPT
+pertain/GSD
+pertinacious/Y
+pertinacity/M
+pertinence/M
+pertinent/Y
+pertness/M
+perturb/DGS
+perturbation/SM
+perturbed/U
+pertussis/M
+peruke/MS
+perusal/MS
+peruse/GDS
+perv/S
+pervade/DSG
+pervasive/PY
+pervasiveness/M
+perverse/PXYN
+perverseness/M
+perversion/M
+perversity/M
+pervert/SGMD
+peseta/MS
+peskily
+peskiness/M
+pesky/TPR
+peso/MS
+pessary/S
+pessimal
+pessimism/M
+pessimist/SM
+pessimistic
+pessimistically
+pest/MRSZ
+pester/GD
+pesticide/MS
+pestiferous
+pestilence/SM
+pestilent
+pestilential
+pestle/MGDS
+pesto/M
+pet/SZMR
+petabyte/MS
+petajoule/S
+petal/SMD
+petard/MS
+petawatt/S
+petcock/SM
+peter/GMD
+petiole/SM
+petite/MS
+petition/ZGMDRS
+petitionary
+petitioner/M
+petrel/MS
+petrifaction/M
+petrify/DSG
+petrochemical/SM
+petrodollar/MS
+petrol/M
+petrolatum/M
+petroleum/M
+petrologist/SM
+petrology/M
+petted
+petticoat/MS
+pettifog/S
+pettifogged
+pettifogger/SM
+pettifoggery/M
+pettifogging
+pettily
+pettiness/M
+petting/M
+pettish/Y
+petty/PTR
+petulance/M
+petulant/Y
+petunia/MS
+pew/SM
+pewee/SM
+pewit/SM
+pewter/MS
+peyote/M
+pf
+pfennig/MS
+pg
+phaeton/MS
+phage/S
+phagocyte/SM
+phalanger/SM
+phalanges
+phalanx/MS
+phalli
+phallic
+phallocentric
+phallocentrism
+phallus/M
+phantasm/MS
+phantasmagoria/MS
+phantasmagorical
+phantasmal
+phantom/SM
+pharaoh/M
+pharaohs
+pharisaic
+pharisee/SM
+pharmaceutic/MS
+pharmaceutical/SM
+pharmaceutics/M
+pharmacist/MS
+pharmacologic
+pharmacological
+pharmacologist/SM
+pharmacology/M
+pharmacopoeia/MS
+pharmacotherapy
+pharmacy/SM
+pharyngeal
+pharynges
+pharyngitis/M
+pharynx/M
+phase/DSMG
+phaseout/SM
+phat
+pheasant/MS
+phenacetin/M
+phenobarbital/M
+phenol/M
+phenom/MS
+phenomena
+phenomenal/Y
+phenomenological
+phenomenology
+phenomenon/MS
+phenotype
+phenytoin
+pheromone/MS
+phew
+phi/SM
+phial/SM
+philander/ZGDRS
+philanderer/M
+philandering/M
+philanthropic
+philanthropically
+philanthropist/MS
+philanthropy/SM
+philatelic
+philatelist/MS
+philately/M
+philharmonic/SM
+philippic/MS
+philistine/MS
+philistinism/M
+philodendron/SM
+philological
+philologist/MS
+philology/M
+philosopher/MS
+philosophic
+philosophical/Y
+philosophize/DRSZG
+philosophizer/M
+philosophy/SM
+philter/MS
+phish/ZGDR
+phisher/M
+phlebitis/M
+phlegm/M
+phlegmatic
+phlegmatically
+phloem/M
+phlox/M
+phobia/MS
+phobic/MS
+phoebe/MS
+phoenix/MS
+phone/DSMG
+phonecard/S
+phoneme/MS
+phonemic
+phonemically
+phonetic/S
+phonetically
+phonetician/SM
+phonetics/M
+phoneyed
+phoneying
+phonic/S
+phonically
+phonics/M
+phoniness/M
+phonograph/M
+phonographic
+phonographs
+phonological/Y
+phonologist/MS
+phonology/M
+phonon
+phony/PTGDRSM
+phooey
+phosphate/MS
+phosphodiesterase
+phosphor/MS
+phosphorescence/M
+phosphorescent/Y
+phosphoric
+phosphorous
+phosphorus/M
+phosphorylation
+photo/SGMD
+photocell/MS
+photocopier/M
+photocopy/DRSMZG
+photoelectric
+photoelectrically
+photoengrave/DRSJZG
+photoengraver/M
+photoengraving/M
+photofinishing/M
+photogenic
+photogenically
+photograph/MDRZG
+photographer/M
+photographic
+photographically
+photographs/A
+photography/M
+photojournalism/M
+photojournalist/SM
+photometer/MS
+photon/MS
+photosensitive
+photostat/SM
+photostatic
+photostatted
+photostatting
+photosynthesis/M
+photosynthesize/GDS
+photosynthetic
+phototropic
+phototropism
+phototypesetter
+phototypesetting
+photovoltaic
+phrasal
+phrase's
+phrase/AGDS
+phrasebook/S
+phraseology/M
+phrasing/MS
+phreaking
+phrenologist/SM
+phrenology/M
+phyla
+phylactery/SM
+phylogeny/M
+phylum/M
+phys
+physic/SM
+physical/MYS
+physicality
+physician/SM
+physicist/SM
+physicked
+physicking
+physics/M
+physio/S
+physiognomy/SM
+physiography/M
+physiologic
+physiological/Y
+physiologist/MS
+physiology/M
+physiotherapist/MS
+physiotherapy/M
+physique/MS
+phytoplankton
+pi/SMDRHZG
+pianissimo/SM
+pianist/MS
+piano/SM
+pianoforte/SM
+pianola/S
+piaster/MS
+piazza/MS
+pibroch/M
+pibrochs
+pic/SM
+pica/M
+picador/MS
+picante
+picaresque
+picayune
+piccalilli/M
+piccolo/MS
+pick/MDRSJZG
+pickax/GMDS
+picker/M
+pickerel/MS
+picket/ZGMDRS
+pickings/M
+pickle/MGDS
+pickpocket/SM
+pickup/MS
+picky/PTR
+picnic/MS
+picnicked
+picnicker/SM
+picnicking
+picot/SM
+pictogram/S
+pictograph/M
+pictographs
+pictorial/MYS
+picture/MGDS
+picturesque/PY
+picturesqueness/M
+piddle/MGDS
+piddly
+pidgin/MS
+pie/SM
+piebald/MS
+piece/DSMG
+piecemeal
+piecework/MRZ
+pieceworker/M
+piecrust/SM
+pieing
+pier/M
+pierce/JGDS
+piercing/MY
+piety/M
+piezoelectric
+piffle/MG
+pig/SML
+pigeon/MS
+pigeonhole/DSMG
+pigged
+piggery/S
+pigging
+piggish/PY
+piggishness/M
+piggy/TRSM
+piggyback/MDSG
+pigheaded/PY
+pigheadedness/M
+piglet/MS
+pigment/MDS
+pigmentation/M
+pigpen/MS
+pigskin/MS
+pigsty/SM
+pigswill
+pigtail/MS
+pike/MZGDRS
+piker/M
+pikestaff/SM
+pilaf/SM
+pilaster/MS
+pilchard/MS
+pile/MGDSJ
+pileup/MS
+pilfer/ZGDRS
+pilferage/M
+pilferer/M
+pilgrim/MS
+pilgrimage/MS
+piling/M
+pill/MDSG
+pillage/MZGDRS
+pillager/M
+pillar/MDS
+pillbox/MS
+pillion/MS
+pillock/S
+pillory/GDSM
+pillow/GMDS
+pillowcase/MS
+pillowslip/MS
+pilot/DGSM
+pilothouse/SM
+pimento/MS
+pimiento/MS
+pimp/GMDYS
+pimpernel/MS
+pimple/DSM
+pimply/RT
+pin/SM
+pinafore/MS
+pinata/MS
+pinball/M
+pincer/MS
+pinch/GMDS
+pincushion/MS
+pine's
+pine/AGDS
+pineapple/MS
+pinewood/S
+piney
+pinfeather/SM
+ping/GMD
+pinhead/SM
+pinhole/SM
+pinier
+piniest
+pinion/SMDG
+pink/TGPMDRS
+pinkeye/M
+pinkie/SM
+pinkish
+pinkness/M
+pinko/MS
+pinnacle/SM
+pinnate
+pinned/U
+pinning/U
+pinny/S
+pinochle/M
+pinon/MS
+pinpoint/SGMD
+pinprick/MS
+pinsetter/SM
+pinstripe/DSM
+pint/MS
+pinto/MS
+pinup/MS
+pinwheel/GSMD
+pinyin/M
+pinyon/SM
+pioneer/SGMD
+pious/YP
+piousness/M
+pip/SZGMDR
+pipe/MS
+pipeline/SM
+piper/M
+pipette/SM
+pipework
+piping/M
+pipit/MS
+pipped
+pippin/SM
+pipping
+pipsqueak/SM
+piquancy/M
+piquant/Y
+pique/MGDS
+piracy/M
+piranha/SM
+pirate/DSMG
+piratical/Y
+pirogi/M
+piroshki/M
+pirouette/DSMG
+piscatorial
+pismire/SM
+piss/ZGMDRS
+pissoir/S
+pistachio/SM
+piste/S
+pistil/SM
+pistillate
+pistol/SM
+piston/SM
+pit/SM
+pita/MS
+pitapat/SM
+pitch/MDRSZG
+pitchblende/M
+pitcher/M
+pitchfork/MDSG
+pitchman/M
+pitchmen
+piteous/YP
+piteousness/M
+pitfall/SM
+pith/M
+pithead/S
+pithily
+pithiness/M
+pithy/RTP
+pitiable
+pitiably
+pitiful/Y
+pitiless/PY
+pitilessness/M
+piton/MS
+pitta/S
+pittance/MS
+pitted
+pitting
+pituitary/SM
+pity/GDSM
+pitying/Y
+pivot/MDGS
+pivotal
+pix/M
+pixel/MS
+pixie/MS
+pizza/MS
+pizzazz/M
+pizzeria/SM
+pizzicati
+pizzicato/M
+pj's
+pk
+pkg
+pkt
+pkwy
+pl
+placard/SMDG
+placate/DSGN
+placation/M
+placatory
+place's
+place/AESDLG
+placebo/SM
+placed/U
+placeholder/MS
+placekick/MDRZGS
+placekicker/M
+placement/EASM
+placenta/SM
+placental/S
+placer/SM
+placid/Y
+placidity/M
+placings
+placket/SM
+plagiarism/SM
+plagiarist/SM
+plagiarize/DRSZG
+plagiarizer/M
+plagiary/M
+plague/DSMG
+plaice
+plaid/MS
+plain/MRYTSP
+plainchant
+plainclothes
+plainclothesman/M
+plainclothesmen
+plainness/M
+plainsman/M
+plainsmen
+plainsong/M
+plainspoken
+plaint/SMV
+plaintiff/SM
+plaintive/Y
+plait/MDGS
+plan/ZMRS
+planar
+plane's
+plane/CGDS
+planeload/MS
+planer/M
+planet/SM
+planetarium/SM
+planetary
+plangency/M
+plangent
+plank/MDGS
+planking/M
+plankton/M
+planned/U
+planner/SM
+planning/S
+plant/MDRZGSJ
+plantain/SM
+plantar
+plantation/MS
+planter/M
+planting/M
+plantlike
+plaque/SM
+plash/MDSG
+plasma/M
+plasmon
+plaster/SZGMDR
+plasterboard/M
+plasterer/M
+plastic/SM
+plasticity/M
+plasticize/DSG
+plastique
+plat/XGMDNS
+plate/MS
+plateau/SMDG
+plateful/SM
+platelet/SM
+platen/M
+platform/SGMD
+plating/M
+platinum/M
+platitude/SM
+platitudinous
+platonic
+platoon/SGMD
+platted
+platter/SM
+platting
+platy/M
+platypus/MS
+platys
+plaudit/SM
+plausibility/M
+plausible
+plausibly
+play/AEGMDS
+playable/EU
+playact/SGD
+playacting/M
+playback/MS
+playbill/MS
+playbook/MS
+playboy/SM
+player/SM
+playfellow/SM
+playful/PY
+playfulness/M
+playgirl/MS
+playgoer/MS
+playground/SM
+playgroup/S
+playhouse/MS
+playlist/MS
+playmate/MS
+playoff/SM
+playpen/SM
+playroom/SM
+playschool/S
+plaything/SM
+playtime/M
+playwright/SM
+plaza/MS
+plea/MS
+plead/DRZGSJ
+pleader/M
+pleading/MY
+pleasant/UTYP
+pleasanter
+pleasantness/UM
+pleasantry/SM
+please/EDSG
+pleasing/YS
+pleasurably
+pleasure/MGDSB
+pleasureful
+pleat/MDGS
+pleb/S
+plebby
+plebe/MS
+plebeian/MS
+plebiscite/MS
+plectra
+plectrum/MS
+pledge/DSMG
+plenary/SM
+plenipotentiary/SM
+plenitude/SM
+plenteous
+plentiful/Y
+plenty/M
+plenum/S
+pleonasm/MS
+plethora/M
+pleura/M
+pleurae
+pleurisy/M
+plexus/MS
+pliability/M
+pliable
+pliancy/M
+pliant/Y
+pliers/M
+plight/SMDG
+plimsoll/S
+plinth/M
+plinths
+plod/S
+plodded
+plodder/MS
+plodding/S
+plonk/DRSZG
+plop/MS
+plopped
+plopping
+plosive/S
+plot/MS
+plotted
+plotter/SM
+plotting
+plover/SM
+plow/GMDS
+plowman/M
+plowmen
+plowshare/MS
+ploy's
+ploy/S
+pluck/MDSG
+pluckily
+pluckiness/M
+plucky/RPT
+plug's
+plug/US
+plugged/U
+plugging/U
+plughole/S
+plugin/SM
+plum/GMDS
+plumage/M
+plumb/MDRSZGJ
+plumbed/U
+plumber/M
+plumbing/M
+plume/MS
+plummet/SGMD
+plummy
+plump/MDRYSTGP
+plumpness/M
+plumy/RT
+plunder/SZGMDR
+plunderer/M
+plunge/DRSMZG
+plunger/M
+plunk/MDSG
+pluperfect/SM
+plural/SM
+pluralism/M
+pluralist/MS
+pluralistic
+plurality/SM
+pluralization/M
+pluralize/GDS
+plus/MS
+plush/MRYTP
+plushness/M
+plushy/RT
+plutocracy/SM
+plutocrat/SM
+plutocratic
+plutonium/M
+pluvial
+ply/AGDSM
+plywood/M
+pm
+pneumatic
+pneumatically
+pneumococcal
+pneumococci
+pneumococcus
+pneumonia/M
+poach/DRSZG
+poacher/M
+poaching/M
+pock/GMDS
+pocket/SMDG
+pocketbook/SM
+pocketful/SM
+pocketknife/M
+pocketknives
+pockmark/MDGS
+pod/SM
+podcast/SMG
+podded
+podding
+podiatrist/SM
+podiatry/M
+podium/SM
+poem/MS
+poesy/M
+poet/MS
+poetaster/MS
+poetess/MS
+poetic/S
+poetical/Y
+poetry/M
+pogrom/SM
+poi/M
+poignancy/M
+poignant/Y
+poinciana/SM
+poinsettia/SM
+point/MDRSZG
+pointblank
+pointed/Y
+pointer/M
+pointillism/M
+pointillist/SM
+pointless/PY
+pointlessness/M
+pointy/TR
+poise/MGDS
+poison/SJZGMDR
+poisoner/M
+poisoning/M
+poisonous/Y
+poke/MZGDRS
+poker/M
+pokey/MS
+poky/TR
+pol/SGMD
+polar
+polarity/SM
+polarization/CM
+polarize/CDSG
+pole/MS
+poleaxe/GDS
+polecat/MS
+polemic/MS
+polemical/Y
+polemicist/SM
+polemics/M
+polestar/SM
+police/DSMG
+policeman/M
+policemen
+policewoman/M
+policewomen
+policy/SM
+policyholder/MS
+policymaker/S
+polio/MS
+poliomyelitis/M
+polish/ZGMDRS
+polished/U
+polisher/M
+politburo/MS
+polite/RYTP
+politeness/M
+politesse/M
+politic/S
+political/Y
+politician/SM
+politicization/M
+politicize/CDSG
+politicking/M
+politico/SM
+politics/M
+polity/SM
+polka/MDSG
+poll/GMDNS
+pollack/MS
+pollard/S
+pollen/M
+pollinate/GNDS
+pollination/M
+pollinator/SM
+polling/M
+polliwog/SM
+pollster/SM
+pollutant/MS
+pollute/ZGNDRS
+polluted/U
+polluter/M
+pollution/M
+polo/M
+polonaise/SM
+polonium/M
+poltergeist/MS
+poltroon/SM
+poly
+polyacrylamide
+polyamory/S
+polyandrous
+polyandry/M
+polyclinic/SM
+polyester/MS
+polyethylene/M
+polygamist/MS
+polygamous
+polygamy/M
+polyglot/SM
+polygon/SM
+polygonal
+polygraph/GMD
+polygraphs
+polyhedral
+polyhedron/SM
+polymath/M
+polymaths
+polymer/SM
+polymeric
+polymerization/M
+polymerize/GDS
+polymorphic
+polymorphous
+polynomial/MS
+polyp/MS
+polyphonic
+polyphony/M
+polypropylene/M
+polys
+polysemous
+polystyrene/M
+polysyllabic
+polysyllable/MS
+polytechnic/MS
+polytheism/M
+polytheist/SM
+polytheistic
+polythene
+polyunsaturate/DS
+polyurethane/MS
+polyvinyl
+pom/S
+pomade/DSMG
+pomander/SM
+pomegranate/MS
+pommel/SGMD
+pommy/S
+pomp/M
+pompadour/SMD
+pompano/MS
+pompom/SM
+pomposity/M
+pompous/YP
+pompousness/M
+ponce/GDS
+poncho/SM
+poncy
+pond/MS
+ponder/SZGDR
+ponderer/M
+ponderous/YP
+ponderousness/M
+pone/MS
+pong/GDS
+pongee/M
+poniard/MS
+pontiff/SM
+pontifical/Y
+pontificate/DSMG
+pontoon/SM
+pony/GDSM
+ponytail/MS
+poo/SGD
+pooch/MDSG
+poodle/SM
+poof/MS
+poofter/S
+pooh/GMD
+poohs
+pool/GMDS
+poolroom/MS
+poolside/S
+poop/GMDS
+poor/TRYP
+poorboy/M
+poorhouse/SM
+poorness/M
+pop/SM
+popcorn/M
+pope/MS
+popgun/SM
+popinjay/MS
+poplar/SM
+poplin/M
+popover/SM
+poppa/MS
+poppadom/S
+popped
+popper/SM
+poppet/S
+popping
+poppy/SM
+poppycock/M
+populace/MS
+popular/Y
+popularity/UM
+popularization/M
+popularize/DSG
+populate/ACGDS
+populated/U
+population/CM
+populations
+populism/M
+populist/MS
+populous/P
+populousness/M
+popup/MS
+porcelain/SM
+porch/MS
+porcine
+porcupine/SM
+pore/MGDS
+porgy/SM
+pork/ZMR
+porker/M
+porky/RSMT
+porn/M
+porno/M
+pornographer/MS
+pornographic
+pornographically
+pornography/M
+porosity/M
+porous/P
+porousness/M
+porphyritic
+porphyry/M
+porpoise/MGDS
+porridge/M
+porringer/SM
+port's/A
+port/CAEGDS
+portability/M
+portable/MS
+portage/DSMG
+portal/SM
+portcullis/MS
+portend/SGD
+portent/SM
+portentous/YP
+porter/ASM
+porterhouse/SM
+portfolio/MS
+porthole/MS
+portico/M
+porticoes
+portiere/MS
+portion/KSGMD
+portliness/M
+portly/RPT
+portmanteau/MS
+portrait/MS
+portraitist/SM
+portraiture/M
+portray/SGD
+portrayal/MS
+portulaca/M
+pose's/A
+pose/CAKEGDS
+poser/EKSM
+poseur/SM
+posh/TR
+posit/DSGV
+position/CKEMS
+positional/KE
+positioned/K
+positioning/AK
+positive/MYPS
+positiveness/M
+positivism
+positivist/S
+positron/MS
+poss
+posse/MS
+possess/AEVGSD
+possession/ASM
+possessive/SMYP
+possessiveness/M
+possessor/SM
+possibility/SM
+possible/SM
+possibly
+possum/SM
+post/ZGMDRSJ
+postage/M
+postal
+postbag/S
+postbox/S
+postcard/SM
+postcode/S
+postcolonial
+postconsonantal
+postdate/DSG
+postdoc/MS
+postdoctoral
+poster/M
+posterior/SM
+posterity/M
+postgraduate/SM
+posthaste
+posthumous/Y
+posthypnotic
+postie/S
+postilion/SM
+postindustrial
+posting/M
+postlude/SM
+postman/M
+postmark/SMDG
+postmaster/MS
+postmen
+postmenopausal
+postmeridian
+postmistress/MS
+postmodern
+postmodernism/M
+postmodernist/MS
+postmortem/SM
+postnasal
+postnatal
+postoperative
+postpaid
+postpartum
+postpone/DSGL
+postponement/SM
+postprandial
+postscript/SM
+postseason/SM
+postsynaptic
+postulate/XDSMGN
+postulation/M
+postural
+posture/MGJDS
+posturing/M
+postwar
+postwoman
+postwomen
+posy/SM
+pot/CSM
+potability/M
+potable/SM
+potash/M
+potassium/M
+potato/M
+potatoes
+potbelly/DSM
+potboiler/SM
+potency/M
+potent/Y
+potentate/MS
+potential/MYS
+potentiality/SM
+potentiate/GDS
+potful/SM
+pothead/SM
+pother/SMDG
+potherb/SM
+potholder/MS
+pothole/DRSMZG
+pothook/SM
+potion/SM
+potluck/MS
+potpie/SM
+potpourri/SM
+potsherd/SM
+potshot/MS
+pottage/M
+potted
+potter/GSMD
+pottery/SM
+potting
+potty/PRSMT
+pouch/MDSG
+pouf/S
+pouffe/S
+poulterer/MS
+poultice/DSMG
+poultry/M
+pounce/DSMG
+pound's
+pound/KDSG
+poundage/M
+pounding/SM
+pour/GDSJ
+pout/ZGMDRS
+pouter/M
+poverty/M
+pow
+powder/GSMD
+powdery
+power/MDSG
+powerboat/MS
+powerful/Y
+powerhouse/SM
+powerless/PY
+powerlessness/M
+powwow/SGMD
+pox/MS
+pp
+ppm
+ppr
+pr
+practicability/M
+practicably
+practical/SMY
+practicality/SM
+practice/DSMGB
+practiced/U
+practicum/SM
+practitioner/SM
+praetor/SM
+praetorian
+pragmatic/MS
+pragmatical/Y
+pragmatism/M
+pragmatist/MS
+prairie/SM
+praise/EDSMG
+praiseworthiness/M
+praiseworthy/P
+praline/SM
+pram/MS
+prance/DRSMZG
+prancer/M
+prancing/Y
+prang/DSG
+prank/MS
+prankster/SM
+praseodymium/M
+prat/S
+prate/MZGDRS
+prater/M
+pratfall/SM
+prattle/DRSMZG
+prattler/M
+prawn/MDSG
+pray/ZGDRS
+prayer/M
+prayerful/Y
+preach/DRSZGL
+preacher/M
+preachment/M
+preachy/RT
+preadolescence/SM
+preadolescent
+preamble/MGDS
+prearrange/LGDS
+prearrangement/M
+preassigned
+precancel/SMDG
+precancerous
+precarious/PY
+precariousness/M
+precast
+precaution/MS
+precautionary
+precede/DSG
+precedence/M
+precedent/SM
+precept/SM
+preceptor/SM
+precinct/MS
+preciosity/M
+precious/YP
+preciousness/M
+precipice/SM
+precipitant/MS
+precipitate/XMYGNDS
+precipitation/M
+precipitous/Y
+precis/M
+precise/DRSYTGNP
+preciseness/M
+precision/M
+preclude/GDS
+preclusion/M
+precocious/YP
+precociousness/M
+precocity/M
+precognition/M
+precognitive
+precolonial
+preconceive/GDS
+preconception/SM
+precondition/MDGS
+precook/GSD
+precursor/SM
+precursory
+predate/DSG
+predator/MS
+predatory
+predawn
+predecease/GDS
+predecessor/SM
+predefined
+predesignate/GDS
+predestination/M
+predestine/DSG
+predetermination/M
+predetermine/ZGDRS
+predeterminer/M
+predicable
+predicament/MS
+predicate/MGNVDS
+predication/M
+predicative/Y
+predict/BGVSD
+predictability/UM
+predictable/U
+predictably/U
+prediction/SM
+predictor/MS
+predigest/GDS
+predilection/SM
+predispose/GDS
+predisposition/MS
+prednisone
+predominance/M
+predominant/Y
+predominate/YGDS
+preemie/SM
+preeminence/M
+preeminent/Y
+preempt/GVSD
+preemption/M
+preemptive/Y
+preen/DSG
+preexist/DGS
+preexistence/M
+pref
+prefab/SM
+prefabbed
+prefabbing
+prefabricate/DSGN
+prefabrication/M
+preface/DSMG
+prefatory
+prefect/SM
+prefecture/MS
+prefer/SBL
+preferably
+preference/MS
+preferential/Y
+preferment/M
+preferred
+preferring
+prefigure/GDS
+prefix/MDSG
+preform/GSD
+prefrontal
+pregame/SM
+pregnancy/SM
+pregnant
+preheat/GSD
+prehensile
+prehistorian/S
+prehistoric
+prehistorical/Y
+prehistory/M
+prehuman
+preinstalled
+prejudge/GDS
+prejudgment/SM
+prejudice/MGDS
+prejudiced/U
+prejudicial
+prekindergarten/SM
+prelacy/M
+prelate/SM
+prelim/SM
+preliminary/SM
+preliterate
+prelude/MS
+premarital
+premature/Y
+premed/SM
+premedical
+premeditate/DSGN
+premeditated/U
+premeditation/M
+premenstrual
+premier/SGMD
+premiere/MS
+premiership/MS
+premise/DSMG
+premium/SM
+premix/GDS
+premolar/SM
+premonition/MS
+premonitory
+prenatal/Y
+prenup/SM
+prenuptial
+preoccupation/SM
+preoccupy/DSG
+preoperative
+preordain/GDS
+preowned
+prep/MS
+prepackage/DSG
+prepacked
+prepaid
+preparation/SM
+preparatory
+prepare/GDS
+prepared/UP
+preparedness/UM
+prepay/GSL
+prepayment/MS
+prepend
+preponderance/SM
+preponderant/Y
+preponderate/GDS
+preposition/SM
+prepositional/Y
+prepossess/GDS
+prepossessing/U
+prepossession/SM
+preposterous/Y
+prepped
+prepping
+preppy/TRSM
+prepubescence/M
+prepubescent/SM
+prepuce/MS
+prequel/MS
+prerecord/GSD
+preregister/SGD
+preregistration/M
+prerequisite/MS
+prerogative/SM
+pres
+presage/MGDS
+presbyopia/M
+presbyter/SM
+presbytery/SM
+preschool/SZMR
+preschooler/M
+prescience/M
+prescient/Y
+prescribe/DSG
+prescript/SVM
+prescription/SM
+prescriptive/Y
+preseason/SM
+presence/SM
+present/LMDRYZGSB
+presentably
+presentation/ASM
+presenter/M
+presentiment/SM
+presentment/SM
+preservation/M
+preservationist/SM
+preservative/SM
+preserve/BDRSMZG
+preserver/M
+preset/S
+presetting
+preshrank
+preshrink/GS
+preshrunk
+preside/GDS
+presidency/SM
+president/MS
+presidential
+presidium/M
+presort/DGS
+press's
+press/ACGSD
+pressed/U
+presser/MS
+pressie/S
+pressing/SMY
+pressman/M
+pressmen
+pressure/DSMG
+pressurization/M
+pressurize/CGDS
+pressurizer/SM
+prestidigitation/M
+prestige/M
+prestigious
+presto/SM
+presumably
+presume/GDSB
+presumption/SM
+presumptive
+presumptuous/YP
+presumptuousness/M
+presuppose/DSG
+presupposition/MS
+pretax
+preteen/MS
+pretend/DRZGS
+pretender/M
+pretense/SXMN
+pretension/M
+pretentious/UY
+pretentiousness/M
+preterit/SM
+preterm
+preternatural/Y
+pretest/DGS
+pretext/MS
+pretrial/S
+prettify/GDS
+prettily
+prettiness/M
+pretty/TGDRSMP
+pretzel/MS
+prevail/DGS
+prevalence/M
+prevalent
+prevaricate/DSGNX
+prevarication/M
+prevaricator/SM
+prevent/DBSGV
+preventable/U
+preventative/MS
+prevention/M
+preventive/SM
+preview/MDRSZG
+previous/Y
+prevision/MS
+prewar
+prey/GMDS
+prezzie/S
+priapic
+price's
+price/AGDS
+priceless
+pricey
+pricier
+priciest
+prick/MDRYSZG
+pricker/M
+prickle/MGDS
+prickliness/M
+prickly/PRT
+pride/MGDS
+prideful/Y
+prier/M
+priest/SMY
+priestess/MS
+priesthood/SM
+priestliness/M
+priestly/RTP
+prig/MS
+priggish/P
+priggishness/M
+prim/ZGDRYP
+primacy/M
+primal
+primarily
+primary/SM
+primate/MS
+prime/MS
+primer/M
+primeval
+priming/M
+primitive/SPMY
+primitiveness/M
+primmer
+primmest
+primness/M
+primogenitor/SM
+primogeniture/M
+primordial/Y
+primp/DSG
+primrose/SM
+primula/S
+prince/SMY
+princedom/SM
+princeliness/M
+princely/PRT
+princess/MS
+principal/SMY
+principality/SM
+principle/DSM
+principled/U
+print/AMDSG
+printable/U
+printer/MS
+printing/SM
+printmaking
+printout/SM
+prion/S
+prior/MS
+prioress/MS
+prioritization
+prioritize/DSG
+priority/SM
+priory/SM
+prism/MS
+prismatic
+prison/SZMR
+prisoner/M
+prissily
+prissiness/M
+prissy/PTR
+pristine
+prithee
+privacy/M
+private/XMYTNRS
+privateer/SM
+privation/CSM
+privatization/SM
+privatize/DSG
+privet/SM
+privilege/DSMG
+privileged/U
+privily
+privy/RSMT
+prize/MGDS
+prized/A
+prizefight/ZGSMR
+prizefighter/M
+prizefighting/M
+prizewinner/MS
+prizewinning
+pro/SM
+probabilistic
+probability/SM
+probable/SM
+probably
+probate/MN
+probation/ZMR
+probational
+probationary
+probationer/M
+probe/MGDSBJ
+probity/M
+problem/MS
+problematic/U
+problematical/Y
+probosces
+proboscis/MS
+procaine/M
+procedural
+procedure/SM
+proceed/GJDS
+proceeding/M
+proceeds/M
+process's
+process/AGDS
+processable
+processed/U
+procession/GD
+processional/MS
+processor/SM
+proclamation/MS
+proclivity/SM
+procrastinate/DSGN
+procrastination/M
+procrastinator/MS
+procreate/V
+proctor/GMDS
+procurement/M
+prod/MS
+prodigal/MYS
+prodigality/M
+prodigious/Y
+prodigy/SM
+produce's
+produce/AZGDRS
+producer/AM
+producible/A
+production/ASM
+productive/UY
+productiveness/M
+productivity/M
+prof/MS
+profanation/MS
+profane/PYGDS
+profaneness/M
+profanity/SM
+professed/Y
+profession/SM
+professional/MYS
+professionalism/M
+professionalization
+professionalize/DSG
+professor/SM
+professorial/Y
+professorship/SM
+proffer/GMDS
+proficiency/M
+proficient/MYS
+profit/BGD
+profitability/M
+profitable/U
+profitably/U
+profiteer/MDGS
+profiteering/M
+profiterole/SM
+profitless
+profligacy/M
+profligate/SMY
+proforma
+profound/RYTP
+profoundness/M
+profundity/SM
+profuse/PY
+profuseness/M
+progenitor/SM
+progeny/M
+progesterone/M
+progestin/S
+prognathous
+prognoses
+prognosis/M
+prognostic/MS
+prognosticate/XGNDS
+prognostication/M
+prognosticator/MS
+program/CAS
+programmable/MS
+programmatic
+programmed/AC
+programmer/MS
+programming/SM
+progress/MDSGV
+progression/MS
+progressive/PMYS
+progressiveness/M
+prohibit/DGVS
+prohibition/SM
+prohibitionist/MS
+prohibitive/Y
+prohibitory
+project/GMDS
+projectile/SM
+projection/SM
+projectionist/SM
+projector/MS
+prokaryote/MS
+prokaryotic
+prole/S
+proletarian/MS
+proletariat/M
+proliferate/DSGN
+proliferation/M
+prolific
+prolifically
+prolix/Y
+prolixity/M
+prologue/SM
+prolongation/SM
+prom/M
+promenade/MGDS
+promethium/M
+prominence/M
+prominent/Y
+promiscuity/M
+promiscuous/Y
+promise/DSMG
+promising/Y
+promissory
+promo/M
+promontory/SM
+promote/DRZG
+promoter/M
+promotional
+prompt/JPSMDRYZTG
+prompted/U
+prompter/M
+prompting/M
+promptitude/M
+promptness/M
+promulgate/GNDS
+promulgation/M
+promulgator/MS
+prone/P
+proneness/M
+prong/MDS
+pronghorn/MS
+pronominal/M
+pronounce/DSLG
+pronounceable/U
+pronouncement/SM
+pronto
+pronunciation/MS
+proof/ADGSM
+proofread/SRZG
+proofreader/M
+prop/MS
+propaganda/M
+propagandist/MS
+propagandize/GDS
+propagate/DSGN
+propagation/M
+propagator/SM
+propel/S
+propellant/MS
+propelled
+propeller/SM
+propelling
+propensity/SM
+proper/MRYT
+property/DSM
+prophecy/SM
+prophesier/M
+prophesy/DRSMZG
+prophet/SM
+prophetess/MS
+prophetic
+prophetical/Y
+prophylactic/SM
+prophylaxes
+prophylaxis/M
+propinquity/M
+propitiate/DSGN
+propitiation/M
+propitiatory
+propitious/Y
+proponent/SM
+proportion/ESM
+proportional/YS
+proportionality
+proportionate/EY
+proposal/MS
+propped
+propping
+propranolol
+proprietary/SM
+proprieties/M
+proprietor/SM
+proprietorial/Y
+proprietorship/M
+proprietress/MS
+propriety/SM
+propulsion/M
+propulsive
+prorate/DSG
+prorogation/M
+prorogue/GD
+prosaic
+prosaically
+proscenium/SM
+prosciutto/M
+proscribe/DG
+proscription/MS
+prose/M
+prosecute/DSXGN
+prosecution/M
+prosecutor/MS
+proselyte/DSMG
+proselytism/M
+proselytize/DRSZG
+proselytizer/M
+prosocial
+prosody/SM
+prospect/MDGVS
+prospective/Y
+prospector/SM
+prospectus/MS
+prosper/GSD
+prosperity/M
+prosperous/Y
+prostate/MS
+prostheses
+prosthesis/M
+prosthetic
+prostitute/MGNDS
+prostitution/M
+prostrate/GNXDS
+prostration/M
+prosy/RT
+protactinium/M
+protagonist/SM
+protean
+protect/GVSD
+protected/U
+protection/SM
+protectionism/M
+protectionist/MS
+protective/PY
+protectiveness/M
+protector/MS
+protectorate/MS
+protege/SM
+protegee/S
+protein/SM
+protestant/S
+protestation/MS
+protocol/MS
+proton/SM
+protoplasm/M
+protoplasmic
+prototype/MGS
+prototypical
+protozoa
+protozoan/MS
+protozoic
+protract/GD
+protrude/GDS
+protrusile
+protrusion/MS
+protuberance/MS
+protuberant
+proud/RYT
+prov/NB
+provability/M
+provably
+prove/EAGDS
+proved/U
+proven/U
+provenance/SM
+provender/M
+provenience/M
+proverbial/Y
+provide/DRSZG
+provided/U
+providence/M
+provident/Y
+providential/Y
+provider/M
+province/MS
+provincial/SMY
+provincialism/M
+provisional/Y
+proviso/SM
+provocateur/S
+provocative/PY
+provocativeness/M
+provoke/DRSZG
+provoked/U
+provoker/M
+provoking/Y
+provolone/M
+provost/SM
+prow/MS
+prowess/M
+prowl/MDRSZG
+prowler/M
+proximal
+proximate
+proximity/M
+proxy/SM
+prude/MS
+prudence/M
+prudent/Y
+prudential/Y
+prudery/M
+prudish/YP
+prudishness/M
+prune/MZGDRS
+pruner/M
+prurience/M
+prurient/Y
+pry/ZTGDRSM
+psalm/MS
+psalmist/SM
+psaltery/SM
+psephologist/S
+psephology
+pseud/S
+pseudo/S
+pseudonym/SM
+pseudonymous
+pseudoscience/MS
+pseudy
+pshaw/MS
+psi/SM
+psittacosis/M
+psoriasis/M
+psst
+psych/MDSG
+psyche/M
+psychedelia
+psychedelic/SM
+psychedelically
+psychiatric
+psychiatrist/SM
+psychiatry/M
+psychic/MS
+psychical/Y
+psycho/SM
+psychoactive
+psychoanalyses
+psychoanalysis/M
+psychoanalyst/SM
+psychoanalytic
+psychoanalytical/Y
+psychoanalyze/DSG
+psychobabble/M
+psychodrama/MS
+psychogenic
+psychokinesis
+psychokinetic
+psychological/Y
+psychologist/MS
+psychology/SM
+psychometric
+psychoneuroses
+psychoneurosis/M
+psychopath/M
+psychopathic
+psychopathology
+psychopaths
+psychopathy/M
+psychopharmacology
+psychophysiology
+psychos/S
+psychosis/M
+psychosomatic
+psychotherapist/MS
+psychotherapy/SM
+psychotic/SM
+psychotically
+psychotropic/MS
+psychs
+pt/C
+ptarmigan/MS
+pterodactyl/MS
+ptomaine/SM
+pub/SM
+pubertal
+puberty/M
+pubes/M
+pubescence/M
+pubescent
+pubic
+pubis/M
+public/AM
+publican/AMS
+publication/ASM
+publicist/MS
+publicity/M
+publicize/GDS
+publicly
+publish/AGDS
+publishable
+published/U
+publisher/MS
+publishing/M
+puce/M
+puck/ZMRS
+pucker/MDG
+puckish/YP
+puckishness/M
+pud/S
+pudding/SM
+puddle/DSMG
+puddling/M
+pudenda
+pudendum/M
+pudginess/M
+pudgy/PRT
+pueblo/SM
+puerile
+puerility/M
+puerperal
+puff/ZGMDRS
+puffball/SM
+puffer/M
+puffin/SM
+puffiness/M
+puffy/PRT
+pug/SM
+pugilism/M
+pugilist/SM
+pugilistic
+pugnacious/YP
+pugnaciousness/M
+pugnacity/M
+puke/MGDS
+pukka
+pulchritude/M
+pulchritudinous
+pule/GDS
+pull/ZGMDRS
+pullback/MS
+puller/M
+pullet/SM
+pulley/SM
+pullout/MS
+pullover/SM
+pulmonary
+pulp/GMDS
+pulpiness/M
+pulpit/SM
+pulpwood/M
+pulpy/RPT
+pulsar/SM
+pulsate/XGNDS
+pulsation/M
+pulse/AMGDS
+pulverization/M
+pulverize/DSG
+puma/MS
+pumice/SM
+pummel/SGD
+pump/ZGMDRS
+pumper/M
+pumpernickel/M
+pumpkin/MS
+pun/SM
+punch/MDRSZG
+punchbag/S
+puncheon/MS
+puncher/M
+punchline/S
+punchy/TR
+punctilio/M
+punctilious/PY
+punctiliousness/M
+punctual/Y
+punctuality/M
+punctuate/GNDS
+punctuation/M
+puncture/DSMG
+pundit/SM
+punditry/M
+pungency/M
+pungent/Y
+puniness/M
+punish/BLGDS
+punished/U
+punishing/Y
+punishment/MS
+punitive/Y
+punk/TMRS
+punned
+punnet/S
+punning
+punster/SM
+punt/ZGMDRS
+punter/M
+puny/TRP
+pup/SM
+pupa/M
+pupae
+pupal
+pupate/DSG
+pupil/MS
+pupped
+puppet/MS
+puppeteer/SM
+puppetry/M
+pupping
+puppy/SM
+purblind
+purchase/DRSMZGB
+purchaser/M
+purdah/M
+pure/PYTR
+purebred/SM
+puree/MDS
+pureeing
+pureness/M
+purgative/SM
+purgatorial
+purgatory/SM
+purge/MZGDRS
+purger/M
+purification/M
+purifier/M
+purify/NDRSZG
+purine/MS
+purism/M
+purist/MS
+puristic
+puritan/SM
+puritanical/Y
+puritanism/M
+purity/M
+purl/GMDS
+purlieu/SM
+purloin/SGD
+purple/MTRS
+purplish
+purport/SMDG
+purported/Y
+purpose/DSMYG
+purposed/A
+purposeful/YP
+purposefulness/M
+purposeless/PY
+purr/GMDS
+purse/MZGDRS
+purser/M
+pursuance/M
+pursuant
+pursue/ZGDRS
+pursuer/M
+pursuit/SM
+purulence/M
+purulent
+purvey/DSG
+purveyance/M
+purveyor/SM
+purview/M
+pus/M
+push/ZGMDRS
+pushbike/S
+pushcart/SM
+pushchair/S
+pusher/M
+pushily
+pushiness/M
+pushover/MS
+pushpin/S
+pushy/TRP
+pusillanimity/M
+pusillanimous/Y
+puss/MS
+pussy/TRSM
+pussycat/MS
+pussyfoot/DSG
+pustular
+pustule/SM
+put/ISM
+putative
+putout/MS
+putrefaction/M
+putrefactive
+putrefy/GDS
+putrescence/M
+putrescent
+putrid
+putsch/MS
+putt/ZGMDRS
+putted/I
+puttee/MS
+putter/MDRZG
+putterer/M
+putting/I
+putty/GDSM
+putz/S
+puzzle/MZGDRSL
+puzzlement/M
+puzzler/M
+pvt
+pwn/SGD
+pyelonephritis
+pygmy/SM
+pylon/SM
+pylori
+pyloric
+pylorus/M
+pyorrhea/M
+pyramid/GSMD
+pyramidal
+pyre/MS
+pyrimidine/MS
+pyrite/SM
+pyrites/M
+pyromania/M
+pyromaniac/SM
+pyrotechnic/S
+pyrotechnical
+pyrotechnics/M
+pyruvate
+python/SM
+pyx/MS
+pzazz
+q
+qr
+qt/S
+qty
+qua
+quack/GMDS
+quackery/M
+quad/MS
+quadrangle/SM
+quadrangular
+quadrant/MS
+quadraphonic
+quadratic/MS
+quadrature
+quadrennial
+quadrennium/MS
+quadriceps/MS
+quadrilateral/SM
+quadrille/XMNS
+quadrillion/M
+quadriplegia/M
+quadriplegic/SM
+quadrivium/M
+quadruped/MS
+quadrupedal
+quadruple/MGDS
+quadruplet/MS
+quadruplicate/MGNDS
+quadruplication/M
+quaff/GMDS
+quagmire/SM
+quahog/MS
+quail/GMDS
+quaint/PRYT
+quaintness/M
+quake/MGDS
+quaky
+qualification/EM
+qualified/U
+qualifier/SM
+qualify/EGXNDS
+qualitative/Y
+quality/SM
+qualm/MS
+qualmish
+quandary/SM
+quango/S
+quanta
+quantifiable
+quantification/M
+quantifier/M
+quantify/NDRSZG
+quantitation
+quantitative/Y
+quantity/SM
+quantization
+quantize
+quantum/M
+quarantine/MGDS
+quark/MS
+quarrel/SZGMDR
+quarreler/M
+quarrelsome/P
+quarrelsomeness/M
+quarry/DSMG
+quart/MS
+quarter/SGMDY
+quarterback/GMDS
+quarterdeck/MS
+quarterfinal/SM
+quarterly/SM
+quartermaster/MS
+quarterstaff/M
+quarterstaves
+quartet/SM
+quarto/MS
+quartz/M
+quasar/MS
+quash/GDS
+quasi
+quatrain/MS
+quaver/MDSG
+quavery
+quay/MS
+quayside/S
+queasily
+queasiness/M
+queasy/TPR
+queen/GMDYS
+queenly/RT
+queer/PTGMDRYS
+queerness/M
+quell/GDS
+quench/ZGDRSB
+quenchable/U
+quencher/M
+quenchless
+querulous/YP
+querulousness/M
+query/DSMG
+ques
+quesadilla/MS
+quest/IFAMS
+quested
+questing
+question/SMDRZGBJ
+questionable/U
+questionably/U
+questioned/U
+questioner/M
+questioning/MY
+questionnaire/SM
+queue's
+queue/CDS
+queuing
+quibble/DRSMZG
+quibbler/M
+quiche/SM
+quick/MNRYXTP
+quicken/DG
+quickfire
+quickie/SM
+quicklime/M
+quickness/M
+quicksand/MS
+quicksilver/M
+quickstep/MS
+quid/MS
+quiescence/M
+quiescent/Y
+quiet/SMDNRYXTGP
+quieten/DG
+quietism
+quietness/M
+quietude/IEM
+quietus/MS
+quiff/S
+quill/SM
+quilt/SMDRZG
+quilter/M
+quilting/M
+quin/S
+quince/SM
+quine/S
+quinidine
+quinine/M
+quinoa
+quinsy/M
+quint/SM
+quintessence/SM
+quintessential/Y
+quintet/SM
+quintuple/MGDS
+quintuplet/MS
+quip/MS
+quipped
+quipping
+quipster/SM
+quire's
+quire/IAS
+quirk/SMDG
+quirkiness/M
+quirky/RTP
+quirt/SM
+quisling/SM
+quit/S
+quitclaim/MS
+quite
+quittance/M
+quitter/SM
+quitting
+quiver/SMDG
+quivery
+quixotic
+quixotically
+quiz/M
+quizzed
+quizzer/SM
+quizzes
+quizzical/Y
+quizzing
+quo/H
+quoin/SM
+quoit/SMDG
+quondam
+quorate/I
+quorum/SM
+quot/B
+quota/SM
+quotability/M
+quotation/SM
+quote's
+quote/UDSG
+quotidian
+quotient/SM
+qwerty
+r/S
+rabbet/GMDS
+rabbi/SM
+rabbinate/M
+rabbinic
+rabbinical
+rabbit/GMDS
+rabble/MS
+rabid/PY
+rabidness/M
+rabies/M
+raccoon/MS
+race/MZGDRS
+racecourse/SM
+racegoer/S
+racehorse/MS
+raceme/MS
+racer/M
+racetrack/MS
+raceway/MS
+racial/Y
+racialism/M
+racialist/MS
+racily
+raciness/M
+racing/M
+racism/M
+racist/SM
+rack/GMDS
+racket/SMDG
+racketeer/SMDG
+racketeering/M
+raconteur/SM
+racquetball/SM
+racy/PRT
+rad/SM
+radar/SM
+radarscope/SM
+raddled
+radial/SMY
+radian/S
+radiance/M
+radiant/Y
+radiate/DSGNX
+radiation/M
+radiator/SM
+radical/SMY
+radicalism/M
+radicalization/M
+radicalize/DSG
+radicchio/M
+radii
+radio/MDGS
+radioactive/Y
+radioactivity/M
+radiocarbon/M
+radiogram/MS
+radiographer/SM
+radiography/M
+radioisotope/MS
+radiologist/SM
+radiology/M
+radioman/M
+radiomen
+radiometer/MS
+radiometric
+radiometry/M
+radiophone/SM
+radioscopy/M
+radiosonde/SM
+radiosurgery
+radiotelegraph/M
+radiotelegraphs
+radiotelegraphy/M
+radiotelephone/MS
+radiotherapist/MS
+radiotherapy/M
+radish/MS
+radium/M
+radius/M
+radon/M
+raffia/M
+raffish/YP
+raffishness/M
+raffle/DSMG
+raft/ZGMDRS
+rafter/M
+rafting/M
+rag/SGMD
+raga/MS
+ragamuffin/MS
+ragbag/M
+rage/MS
+ragga
+ragged/RYTP
+raggedness/M
+raggedy/RT
+ragging
+raging/Y
+raglan/SM
+ragout/SM
+ragtag/S
+ragtime/M
+ragweed/M
+ragwort
+rah
+raid/ZGMDRS
+raider/M
+rail's
+rail/CGDS
+railcard/S
+railing/SM
+raillery/SM
+railroad/SZGMDR
+railroader/M
+railroading/M
+railway/SM
+railwayman
+railwaymen
+raiment/M
+rain/GMDS
+rainbow/SM
+raincoat/SM
+raindrop/SM
+rainfall/SM
+rainmaker/SM
+rainmaking/M
+rainproof
+rainstorm/MS
+rainwater/M
+rainy/RT
+raise/MZGDRS
+raiser/M
+raisin/SM
+rajah/M
+rajahs
+rake/MGDS
+rakish/YP
+rakishness/M
+rally/DSMG
+ram/SM
+ramble/DRSMZGJ
+rambler/M
+rambunctious/PY
+rambunctiousness/M
+ramekin/SM
+ramie/M
+ramification/M
+ramify/DSXNG
+ramjet/SM
+rammed
+ramming
+ramp/GMS
+rampage/DSMG
+rampancy/M
+rampant/Y
+rampart/SM
+ramrod/SM
+ramrodded
+ramrodding
+ramshackle
+ran/A
+ranch/MDRSZG
+rancher/M
+ranching/M
+rancid/P
+rancidity/M
+rancidness/M
+rancor/M
+rancorous/Y
+rand/M
+randiness/M
+random/PSY
+randomization/M
+randomize/DSG
+randomness/MS
+randy/RTP
+ranee/MS
+rang/ZR
+range's
+range/CGDS
+rangefinder/S
+ranger/M
+ranginess/M
+rangy/RTP
+rank/TGJPMDRYS
+ranking/M
+rankle/DSG
+rankness/M
+ransack/SGD
+ransom/SZGMDR
+ransomer/M
+ransomware
+rant/ZGMDJRS
+ranter/M
+rap/SZGMDR
+rapacious/PY
+rapaciousness/M
+rapacity/M
+rape/MS
+raper/M
+rapeseed/M
+rapid/PMRYTS
+rapidity/M
+rapidness/M
+rapier/SM
+rapine/M
+rapist/SM
+rapped
+rappel/SM
+rappelled
+rappelling
+rapper/SM
+rapping
+rapport/MS
+rapporteur/S
+rapprochement/SM
+rapscallion/MS
+rapt/YP
+raptness/M
+raptor/S
+rapture/MS
+rapturous/Y
+rare/YTGPDRS
+rarebit/MS
+rarefaction/M
+rarefy/GDS
+rareness/M
+rarity/SM
+rascal/SMY
+rash/ZTMRSYP
+rasher/M
+rashness/M
+rasp/GMDS
+raspberry/SM
+raspy/RT
+raster
+rat/SM
+ratatouille/M
+ratbag/S
+ratchet/GMDS
+rate/JXMZGNDRS
+rated/U
+ratepayer/S
+rater/M
+rather
+rathskeller/SM
+ratification/M
+ratifier/M
+ratify/NDRSZG
+rating/M
+ratio/MS
+ratiocinate/GNDS
+ratiocination/M
+ration/MDG
+rational/SMY
+rationale/MS
+rationalism/M
+rationalist/SM
+rationalistic
+rationality/M
+rationalization/MS
+rationalize/DSG
+ratlike
+ratline/SM
+rattan/SM
+ratted
+ratter/SM
+ratting
+rattle/DRSMZGJ
+rattlebrain/SMD
+rattler/M
+rattlesnake/SM
+rattletrap/SM
+rattly
+rattrap/SM
+ratty/RT
+raucous/YP
+raucousness/M
+raunchily
+raunchiness/M
+raunchy/TRP
+ravage/DRSMZG
+ravager/M
+ravages/M
+rave/JMZGDRS
+ravel's
+ravel/UDSG
+raveling/S
+raven/MDSG
+ravenous/Y
+ravine/SM
+raving/M
+ravioli/SM
+ravish/DRSZGL
+ravisher/M
+ravishing/Y
+ravishment/M
+raw/PTMR
+rawboned
+rawhide/M
+rawness/M
+ray/SM
+rayon/M
+raze/GDS
+razor/MS
+razorback/MS
+razz/GMDS
+razzmatazz/M
+rcpt
+rd
+re/DSMYTGVJ
+reach/MDSGB
+reachable/U
+reacquire/DSG
+react/V
+reactance
+reactant/SM
+reactionary/SM
+reactivity
+read/ZGMRBJS
+readability/SM
+reader/M
+readership/SM
+readily
+readiness/M
+reading/M
+readmitted
+readout/SM
+ready/DRSTGP
+reafforestation
+real/TMRYPS
+realism/M
+realist/SM
+realistic/U
+realistically/U
+realities
+reality/UM
+realization/MS
+realize/DSBG
+realized/U
+realm/MS
+realness/M
+realpolitik/M
+realty/M
+ream/ZGMDRS
+reamer/M
+reap/ZGDRS
+reaper/M
+rear/GMDS
+rearguard/MS
+rearmost
+rearward/S
+reason/SMDRZGB
+reasonable/UP
+reasonableness/UM
+reasonably/U
+reasoner/M
+reasoning/M
+reassuring/Y
+rebate/M
+rebel/MS
+rebellion/MS
+rebellious/YP
+rebelliousness/M
+rebid/S
+rebidding
+rebirth/M
+reboil/SDG
+rebuild/SG
+rebuke/DSMG
+rebuking/Y
+rebuttal/MS
+rec'd
+rec/M
+recalcitrance/M
+recalcitrant
+recant/SDG
+recantation/SM
+recap/MS
+recapitalization
+recce/S
+recd
+receipt/SMDG
+receivables/M
+receive/DRSZGB
+receiver/M
+receivership/M
+recent/RYTP
+recentness/M
+receptacle/SM
+reception/MS
+receptionist/SM
+receptive/PY
+receptiveness/M
+receptivity/M
+receptor/SM
+recess/MDSGV
+recessional/SM
+recessionary
+recessive/SM
+recherche
+recidivism/M
+recidivist/SM
+recipe/SM
+recipient/SM
+reciprocal/SMY
+reciprocate/GNDS
+reciprocation/M
+reciprocity/M
+recital/SM
+recitalist/MS
+recitative/MS
+reciter/SM
+reckless/YP
+recklessness/M
+reckon/SJDG
+reckoning/M
+reclamation/M
+recline/DRSZG
+recliner/M
+recluse/SMV
+recognizable/U
+recognizably/U
+recognize/DRSGB
+recognized/U
+recombination
+recompense/DSMG
+recompilation
+recompile/GD
+recon/S
+reconcile/GDSB
+reconciliation/S
+recondite
+reconfiguration
+reconfigure/D
+reconnaissance/MS
+reconnoiter/DGS
+reconstruct/V
+reconstructed/U
+recorded/U
+recorder/MS
+recording/MS
+recoup/DG
+recourse/M
+recoverable/U
+recovery/SM
+recreant/MS
+recreational
+recriminate/DSGNX
+recrimination/M
+recriminatory
+recrudesce/GDS
+recrudescence/M
+recrudescent
+recruit/LSMDRZG
+recruiter/M
+recruitment/M
+rectal/Y
+rectangle/MS
+rectangular
+rectifiable
+rectification/M
+rectifier/M
+rectify/XNDRSZG
+rectilinear
+rectitude/M
+recto/MS
+rector/SM
+rectory/SM
+rectum/SM
+recumbent
+recuperate/GNVDS
+recuperation/M
+recur/S
+recurred
+recurrence/SM
+recurring
+recursion/S
+recuse/DSG
+recyclable/SM
+recycling/M
+red/PSM
+redact/SDG
+redaction/M
+redactor/SM
+redbird/SM
+redbreast/MS
+redbrick
+redcap/SM
+redcoat/SM
+redcurrant/S
+redden/SDG
+redder
+reddest
+reddish
+redeem/RZB
+redeemer/M
+redemption/M
+redemptive
+redhead/SMD
+redirection
+redistrict/GD
+redivide/GDS
+redlining/M
+redneck/SM
+redness/M
+redo/G
+redolence/M
+redolent
+redoubt/SBM
+redoubtably
+redound/SDG
+redraw/SG
+redskin/SM
+reduce/DRSZG
+reducer/M
+reducible
+reductase/M
+reduction/SM
+reductionist
+reductive
+redundancy/SM
+redundant/Y
+redwood/SM
+redye/DS
+reediness/M
+reedy/RTP
+reef/ZGMDRS
+reefer/M
+reek/GMDS
+reel's
+reel/UGDS
+reeve/G
+reexport/SDG
+ref/SZM
+refashion/DGS
+refection/M
+refectory/SM
+refer/B
+referee/DSM
+refereeing
+reference/MGDS
+referendum/MS
+referent/SM
+referential
+referral/SM
+referred
+referrer/SM
+referring
+reffed
+reffing
+refill/BM
+refined/U
+refinement/SM
+refiner/SM
+refinery/S
+refitting
+reflate/XDSGN
+reflationary
+reflect/GVSD
+reflection/MS
+reflective/Y
+reflectivity
+reflector/MS
+reflexive/SMY
+reflexivity
+reflexology
+reforge/DSG
+reform/MZ
+reformat/V
+reformatory/SM
+reformatting
+reformed/U
+reformist/S
+refortify/GDS
+refract/SGVD
+refraction/M
+refractory/SM
+refrain/SGMD
+refresh/ZGLDRS
+refresher/M
+refreshing/Y
+refreshment/SM
+refreshments/M
+refrigerant/SM
+refrigerate/DSGN
+refrigeration/M
+refrigerator/MS
+refuge/SM
+refugee/SM
+refulgence/M
+refulgent
+refund/B
+refurbishment/MS
+refusal/MS
+refutation/MS
+refute/BDRSZG
+refuter/M
+reg
+regal/DYG
+regalement/M
+regalia/M
+regard/ESMDG
+regardless
+regards/M
+regather/DGS
+regatta/SM
+regency/SM
+regeneracy/M
+regenerate/V
+regex/M
+regexp/S
+reggae/M
+regicidal
+regicide/MS
+regime/SM
+regimen/SM
+regiment/MDGS
+regimental
+regimentation/M
+region/SM
+regional/Y
+regionalism/MS
+register/GMDS
+registered/U
+registrant/MS
+registrar/MS
+registration/SM
+registry/SM
+regnant
+regress/MDSGV
+regression/MS
+regret/SM
+regretful/Y
+regrettable
+regrettably
+regretted
+regretting
+regrind/GS
+reground
+regroup/DGS
+regular/MYS
+regularity/SM
+regularization/M
+regularize/DSG
+regulate/CDSGNV
+regulated/U
+regulation/CM
+regulations
+regulator/MS
+regulatory
+regurgitate/DSGN
+regurgitation/M
+rehab/MS
+rehabbed
+rehabbing
+rehabilitate/GNVDS
+rehabilitation/M
+rehang/SDG
+rehears/GD
+rehearsal/MS
+rehearsed/U
+rehi
+rehung
+reify/NDSG
+reign/MDSG
+reimburse/BDSGL
+reimbursement/MS
+rein/GD
+reindeer/M
+reinforce/LGDS
+reinforcement/SM
+reinitialize
+reinstall/DG
+reinstatement/M
+reinsurance
+reiterate/V
+reject/GSMD
+rejection/SM
+rejoice/JGDS
+rejoicing/M
+rejoinder/SM
+rejuvenate/DSGN
+rejuvenation/M
+rel
+relate/DRSBXZGNV
+relatedness/M
+relater/M
+relation/M
+relational
+relationship/MS
+relative/MYS
+relativism/M
+relativist/S
+relativistic
+relativity/M
+relax/DRSZG
+relaxant/MS
+relaxation/SM
+relaxer/M
+relay/D
+release/B
+released/U
+relegate/GNDS
+relent/SGD
+relentless/PY
+relentlessness/M
+relevance/M
+relevancy/M
+relevant/Y
+reliability/UM
+reliable/U
+reliably/U
+reliance/M
+reliant
+relic/MS
+relief/SM
+relieve/ZGDRS
+reliever/M
+religion/SM
+religiosity
+religious/MYP
+religiousness/M
+reline/DSG
+relinquish/LDSG
+relinquishment/M
+reliquary/SM
+relish/GMDS
+relist/SGD
+relocate/B
+reluctance/M
+reluctant/Y
+rely/GDS
+rem/M
+remain/SGD
+remainder/GMDS
+remand/SGD
+remapping
+remark/B
+remarkableness/M
+remarkably
+remarked/U
+remediable
+remedy/GDSM
+remember/DG
+remembered/U
+remembrance/MS
+reminder/M
+reminisce/GDS
+reminiscence/MS
+reminiscent/Y
+remiss/PY
+remissness/M
+remit/S
+remittance/SM
+remitted
+remitting/U
+remix/DSG
+remnant/MS
+remodel/GDS
+remold/SGD
+remonstrant/SM
+remonstrate/DSG
+remorse/M
+remorseful/Y
+remorseless/PY
+remorselessness/M
+remote/RSMYTP
+remoteness/M
+removal/SM
+remunerate/GNVXDS
+remuneration/M
+renaissance/MS
+renal
+renascence/S
+rend/GS
+render/SGMDJ
+rendering/M
+rendezvous/GMDS
+rendition/MS
+renegade/DSMG
+renege/DRSZG
+reneger/M
+renew/DSBG
+renewal/MS
+rennet/M
+rennin/M
+renounce/LDSG
+renouncement/M
+renovate/DSXGN
+renovation/M
+renovator/MS
+renown/MD
+rent/ZGMDRS
+rental/SM
+renter/M
+renunciation/SM
+reopen/SDG
+reorg/MDSG
+rep/SM
+repaint/GDS
+repair/BZR
+repairer/M
+repairman/M
+repairmen
+reparable
+reparation/MS
+reparations/M
+repartee/M
+repatriate/XDSMGN
+repatriation/M
+repeat/SMDRZGB
+repeatability
+repeatable/U
+repeatably
+repeated/Y
+repeater/M
+repeating/M
+repel/S
+repelled
+repellent/SM
+repelling
+repent/SDG
+repentance/M
+repentant/Y
+repercussion/S
+repertoire/MS
+repertory/SM
+repetition/MS
+repetitious/YP
+repetitiousness/M
+repetitive/YP
+repetitiveness/M
+rephotograph/DG
+replaceable
+replant/GSD
+replenish/LGDS
+replenishment/M
+replete/PDSGN
+repleteness/M
+repletion/M
+replica/SM
+replicate/DSGNX
+replication/M
+replicator/S
+reportage/M
+reported/Y
+reportorial
+reposeful
+reposition
+repository/SM
+reprehend/DGS
+reprehensibility/M
+reprehensible
+reprehensibly
+reprehension/M
+represent/GDS
+representational
+representative/MS
+represented/U
+repression/MS
+repressive/PY
+reprieve/DSMG
+reprimand/GSMD
+reprisal/SM
+reprise/SMG
+reproach/GMDSB
+reproachful/Y
+reprobate/MS
+reproductive
+reprogramming
+reproving/Y
+reptile/SM
+reptilian/MS
+republic/S
+republicanism/M
+repudiate/XGNDS
+repudiation/M
+repudiator/MS
+repugnance/M
+repugnant
+repulsion/M
+repulsive/YP
+repulsiveness/M
+repurchase/GDS
+reputability/M
+reputably/E
+reputation/MS
+repute/DSMGB
+reputed/Y
+request/GDR
+requiem/SM
+require/LDG
+requirement/MS
+requisite/XMNS
+requisition/GMD
+requital/M
+requite/DRSZG
+requited/U
+requiter/M
+reread/SG
+rerecord/GDS
+rerunning
+resample/GDS
+resat
+rescind/SDG
+rescission/M
+rescue/DRSMZG
+rescuer/M
+reseal/B
+resemble/DSG
+resend
+resent/LSDG
+resentful/YP
+resentfulness/M
+resentment/MS
+reserpine/M
+reservation/MS
+reserved/UY
+reservedness/M
+reservist/SM
+reservoir/SM
+resetting
+reshipping
+residence/SM
+residency/SM
+resident/MS
+residential
+residua
+residual/MS
+residue/SM
+residuum/M
+resignation/SM
+resigned/Y
+resilience/M
+resiliency/M
+resilient/Y
+resinous
+resist/SMDRZG
+resistance/SM
+resistant/U
+resistible
+resistivity
+resistless
+resistor/MS
+resit/S
+resitting
+resold
+resole/DSG
+resolute/PY
+resoluteness/M
+resolve/RBM
+resolved/U
+resonance/SM
+resonant/Y
+resonate/GDS
+resonator/SM
+resorption/M
+resound/SGD
+resounding/Y
+resourceful/YP
+resourcefulness/M
+resp
+respect/ESGVMD
+respectability/M
+respectable
+respectably
+respectful/EY
+respectfulness/M
+respective/Y
+respell/SGD
+respiration/M
+respirator/SM
+respiratory
+respire/DG
+resplendence/M
+resplendent/Y
+respond/SGD
+respondent/SM
+response/MS
+responsibility/SM
+responsible
+responsibly
+responsive/UYP
+responsiveness/UM
+rest/GVMDS
+restate/GDS
+restaurant/SM
+restaurateur/MS
+restful/YP
+restfuller
+restfullest
+restfulness/M
+restitution/M
+restive/YP
+restiveness/M
+restless/PY
+restlessness/M
+restoration/SM
+restorative/SM
+restorer/SM
+restrained/U
+restraint/MS
+restrict/SDGV
+restricted/U
+restriction/MS
+restrictive/YP
+restrictiveness/M
+restring/SG
+restroom/SM
+restructuring/SM
+result/GSMD
+resultant/SM
+resume/DSMG
+resumption/MS
+resupply/DSG
+resurgence/MS
+resurgent
+resurrect/GSD
+resurrection/MS
+resuscitate/GNDS
+resuscitation/M
+resuscitator/SM
+retailer/MS
+retain/SDRZG
+retainer/M
+retake/G
+retaliate/DSGNVX
+retaliation/M
+retaliatory
+retard/SMDRZG
+retardant/SM
+retardation/M
+retarder/M
+retch/DSG
+reteach/GS
+retention/M
+retentive/YP
+retentiveness/M
+rethink/SGM
+rethought
+reticence/M
+reticent/Y
+reticulated
+reticulation/MS
+reticulum
+retina/SM
+retinal
+retinoblastoma
+retinue/SM
+retiree/SM
+retirement/MS
+retort/GMD
+retrace/GDS
+retract/DBG
+retractile
+retraction/S
+retrain/DGS
+retread/D
+retrenchment/MS
+retribution/MS
+retributive
+retrieval/SM
+retrieve/DRSMZGB
+retriever/M
+retro/MS
+retroactive/Y
+retrofire/GDS
+retrofit/SM
+retrofitted
+retrofitting
+retrograde/DSG
+retrogress/GVDS
+retrogression/M
+retrorocket/MS
+retrospect/MDSGV
+retrospection/M
+retrospective/MYS
+retrovirus/MS
+retsina/M
+returnable/SM
+returnee/SM
+rev/ZVM
+revamping/M
+reveal/GJSD
+revealed/U
+revealing/Y
+reveille/M
+revel/JMDRSZG
+revelation/SM
+revelatory
+reveler/M
+revelry/SM
+revenge/MGDS
+revenuer/SM
+reverb
+reverberate/DSGNX
+reverberation/M
+revere/DSG
+reverence/DSMG
+reverend/SM
+reverent/Y
+reverential/Y
+reverie/MS
+revers/M
+reversal/SM
+reverse/Y
+reversibility
+reversible
+reversibly
+revert/GSD
+revertible
+revetment/SM
+revile/DRSLZG
+revilement/M
+reviler/M
+reviser/MS
+revision/SM
+revisionism/M
+revisionist/SM
+revival/MS
+revivalism/M
+revivalist/SM
+revive/DSG
+revivification/M
+revocable
+revoke/DSG
+revolt/GD
+revolting/Y
+revolution/SM
+revolutionary/SM
+revolutionist/SM
+revolutionize/DSG
+revolve/BZGDRS
+revolver/M
+revue/MS
+revulsion/M
+revved
+revving
+rewarded/U
+rewarding/U
+rewarm/GSD
+rewash/GDS
+reweave/GS
+rewedding
+rewind/MB
+rewound
+rewrite/MGS
+rhapsodic
+rhapsodical
+rhapsodize/GDS
+rhapsody/SM
+rhea/MS
+rhenium/M
+rheostat/SM
+rhesus/MS
+rhetoric/M
+rhetorical/Y
+rhetorician/SM
+rheum/M
+rheumatic/MS
+rheumatically
+rheumatism/M
+rheumatoid
+rheumy
+rhinestone/SM
+rhinitis/M
+rhino/MS
+rhinoceros/MS
+rhinoplasty
+rhinovirus/MS
+rhizome/MS
+rho/SM
+rhodium/M
+rhododendron/SM
+rhomboid/SM
+rhomboidal
+rhombus/MS
+rhubarb/MS
+rhyme/MZGDRS
+rhymer/M
+rhymester/MS
+rhythm/SM
+rhythmic
+rhythmical/Y
+rial/MS
+rib/SM
+ribald
+ribaldry/M
+ribbed
+ribber/SM
+ribbing
+ribbon/SM
+riboflavin/M
+rice/MZGDRS
+ricer/M
+rich/TMRSYP
+richness/M
+rick/GMDS
+rickets/M
+rickety/RT
+rickrack/M
+rickshaw/MS
+ricochet/GMDS
+ricotta/M
+rid/S
+riddance/M
+ridden
+ridding
+riddle/DSMG
+ride/MZGRS
+rider/M
+riderless
+ridership/M
+ridge/MGDS
+ridgepole/SM
+ridgy
+ridicule/MGDS
+ridiculous/YP
+ridiculousness/M
+riding/M
+rife/TR
+riff/GMDS
+riffle/DSMG
+riffraff/M
+rifle/MZGDRS
+rifleman/M
+riflemen
+rifler/M
+rifling/M
+rift/GMDS
+rig/SM
+rigatoni/M
+rigged
+rigger/SM
+rigging/M
+right/MDRYSPTG
+righteous/UP
+righteously
+righteousness/UM
+rightful/PY
+rightfulness/M
+rightism/M
+rightist/SM
+rightmost
+rightness/M
+righto
+rightsize/DSG
+rightward/S
+rigid/YP
+rigidity/M
+rigidness/M
+rigmarole/MS
+rigor/MS
+rigorous/YP
+rigorousness/M
+rile/GDS
+rill/MS
+rim/SGMD
+rime/MS
+rimless
+rimmed
+rimming
+rind/MS
+ring/ZGMDRJ
+ringer/M
+ringgit/MS
+ringleader/MS
+ringlet/MS
+ringlike
+ringmaster/MS
+ringside/M
+ringtone/SM
+ringworm/M
+rink/MS
+rinse/MGDS
+riot/ZGMDRS
+rioter/M
+rioting/M
+riotous/PY
+rip/SXTMNR
+riparian
+ripcord/MS
+ripe/YP
+ripen/DG
+ripened/U
+ripeness/M
+ripoff/SM
+riposte/MGDS
+ripped
+ripper/SM
+ripping
+ripple/DSMG
+ripply
+ripsaw/SM
+riptide/MS
+rise/JMZGRS
+risen
+riser/M
+risibility/M
+risible
+rising/M
+risk/GMDS
+riskily
+riskiness/M
+risky/RPT
+risotto/MS
+risque
+rissole/S
+rite/MS
+ritual/SMY
+ritualism/M
+ritualistic
+ritualistically
+ritualized
+ritzy/RT
+riv/ZNR
+rival/MDSG
+rivaled/U
+rivalry/SM
+rive/CGDS
+river/M
+riverbank/SM
+riverbed/MS
+riverboat/SM
+riverfront
+riverside/MS
+rivet/MDRSZG
+riveter/M
+riviera/S
+rivulet/MS
+riyal/MS
+rm
+roach/GMDS
+road/IMS
+roadbed/SM
+roadblock/MDSG
+roadhouse/SM
+roadie/MS
+roadkill/M
+roadrunner/SM
+roadshow/SM
+roadside/SM
+roadster/SM
+roadway/SM
+roadwork/SM
+roadworthy
+roam/ZGDRS
+roamer/M
+roaming/M
+roan/MS
+roar/ZGMDRS
+roarer/M
+roaring/M
+roast/ZGMDRSJ
+roaster/M
+roasting/M
+rob/S
+robbed
+robber/MS
+robbery/SM
+robbing
+robe's
+robe/EGDS
+robin/MS
+robocall/SGMD
+robot/MS
+robotic/S
+robotics/M
+robotize/GDS
+robust/RYPT
+robustness/M
+rock/ZGMDRS
+rockabilly/M
+rockbound
+rocker/M
+rockery/S
+rocket/MDSG
+rocketry/M
+rockfall/SM
+rockiness/M
+rocky/TRP
+rococo/M
+rod/SM
+rode
+rodent/MS
+rodeo/MS
+roe/SM
+roebuck/SM
+roentgen/MS
+roger/GDS
+rogue's
+rogue/KS
+roguery/M
+roguish/YP
+roguishness/M
+roil/GDS
+roister/ZGDRS
+roisterer/M
+role/MS
+roll/MDRZGJS
+rollback/SM
+roller/M
+rollerblading
+rollerskating/M
+rollick/SDG
+rollicking/M
+rollmop/S
+rollover/SM
+romaine/MS
+roman/M
+romance/MZGDRS
+romancer/M
+romantic/MS
+romantically
+romanticism/M
+romanticist/SM
+romanticize/DSG
+romeo/MS
+romp/MDRZGS
+romper/M
+rondo/SM
+rood/MS
+roof/MDRZGS
+roofer/M
+roofing/M
+roofless
+rooftop/SM
+rook/MDGS
+rookery/SM
+rookie/SM
+room/MDRZGS
+roomer/M
+roomette/SM
+roomful/SM
+roominess/M
+roommate/SM
+roomy/RTP
+roost/SMDRZG
+rooster/M
+root/MDRZGS
+rooter/M
+rootkit/SM
+rootless/P
+rootlet/SM
+rope/MZGDRS
+roper/M
+ropy/RT
+rosary/SM
+rose/MS
+roseate
+rosebud/SM
+rosebush/MS
+rosemary/M
+rosette/SM
+rosewater/M
+rosewood/MS
+rosily
+rosin/SMDG
+rosiness/M
+roster/SM
+rostrum/MS
+rosy/RTP
+rot/SM
+rota/S
+rotary/SM
+rotate/DSGNX
+rotation/M
+rotational
+rotatory
+rote/M
+rotgut/M
+rotisserie/SM
+rotogravure/MS
+rotor/SM
+rototiller/MS
+rotted
+rotten/TPRY
+rottenness/M
+rotter/S
+rotting
+rottweiler/S
+rotund/P
+rotunda/MS
+rotundity/M
+rotundness/M
+roue/MS
+rouge/DSMG
+rough/MDNRYXTGP
+roughage/M
+roughcast
+roughen/GD
+roughhouse/MGDS
+roughneck/GMDS
+roughness/M
+roughs
+roughshod
+roulette/M
+round/PSMDRYZTG
+roundabout/SM
+roundel/S
+roundelay/MS
+roundhouse/SM
+roundish
+roundness/M
+roundup/MS
+roundworm/SM
+rouse/DSG
+roust/SDG
+roustabout/SM
+rout/MRZS
+route's
+route/ADSG
+routeing
+router/M
+routine/MYS
+routinize/GDS
+roux
+rove/ZGDRS
+rover/M
+row/SZGMDR
+rowan/S
+rowboat/MS
+rowdily
+rowdiness/M
+rowdy/PRSMT
+rowdyism/M
+rowel/SMDG
+rower/M
+rowing/M
+rowlock/S
+royal/SMY
+royalist/SM
+royalties/M
+royalty/SM
+rpm
+rps
+rt
+rte
+rub/SM
+rubato/SM
+rubbed
+rubber/SM
+rubberize/GDS
+rubberneck/MDRSZG
+rubbernecker/M
+rubbery
+rubbing/S
+rubbish/MDSG
+rubbishy
+rubble/M
+rubdown/SM
+rube/MS
+rubella/M
+rubicund
+rubidium/M
+ruble/SM
+rubric/SM
+ruby/RSMT
+ruched
+ruck/DGS
+rucksack/MS
+ruckus/MS
+ructions
+rudder/SM
+rudderless
+ruddiness/M
+ruddy/RTP
+rude/YTRP
+rudeness/M
+rudiment/SM
+rudimentary
+rue/DSMG
+rueful/PY
+ruefulness/M
+ruff/MDYGS
+ruffian/MYS
+ruffle/DSMG
+ruffled/U
+rug/SM
+rugby/M
+rugged/PTRY
+ruggedness/M
+rugger
+rugrat/SM
+ruin/MDGS
+ruination/M
+ruinous/Y
+rule/MZGJDRS
+ruler/M
+ruling/M
+rum/SM
+rumba/SMDG
+rumble/DSJMG
+rumbling/M
+rumbustious
+ruminant/MS
+ruminate/XGNVDS
+rumination/M
+ruminative/Y
+rummage/DSMG
+rummer
+rummest
+rummy/M
+rumor/SMDG
+rumormonger/SM
+rump/MYS
+rumple/DSMG
+rumpus/MS
+run/ASM
+runabout/MS
+runaround/SM
+runaway/MS
+rundown/SM
+rune/MS
+rung/MS
+runic
+runlet/SM
+runnel/SM
+runner/SM
+running/M
+runny/RT
+runoff/SM
+runt/MS
+runtime
+runty/RT
+runway/SM
+rupee/SM
+rupiah/M
+rupiahs
+rupture/MGDS
+rural
+ruse/MS
+rush/MDRSZG
+rusher/M
+rushy
+rusk/MS
+russet/SM
+rust/MDGS
+rustic/SM
+rustically
+rusticate/GDS
+rustication/M
+rusticity/M
+rustiness/M
+rustle/DRSJMZG
+rustler/M
+rustproof/SDG
+rusty/RPNT
+rut/SM
+rutabaga/SM
+ruthenium/M
+rutherfordium/M
+ruthless/YP
+ruthlessness/M
+rutted
+rutting
+rutty/RT
+rye/M
+s/NYXB
+sabbath/M
+sabbaths
+sabbatical/SM
+saber/MS
+sable/MS
+sabot/MS
+sabotage/DSMG
+saboteur/SM
+sabra/MS
+sac/SM
+saccharin/M
+saccharine
+sacerdotal
+sachem/SM
+sachet/SM
+sack/ZGMDRJS
+sackcloth/M
+sacker/M
+sackful/MS
+sacking/M
+sacra
+sacrament/MS
+sacramental
+sacred/YP
+sacredness/M
+sacrifice/DSMG
+sacrificial/Y
+sacrilege/MS
+sacrilegious/Y
+sacristan/MS
+sacristy/SM
+sacroiliac/MS
+sacrosanct/P
+sacrosanctness/M
+sacrum/M
+sad/PY
+sadden/SDG
+sadder
+saddest
+saddle's
+saddle/UDSG
+saddlebag/MS
+saddler/S
+saddlery
+sades
+sadhu/S
+sadism/M
+sadist/SM
+sadistic
+sadistically
+sadness/M
+sadomasochism/M
+sadomasochist/MS
+sadomasochistic
+safari/SGMD
+safe/MYTPRS
+safeguard/SMDG
+safekeeping/M
+safeness/M
+safety/SM
+safflower/MS
+saffron/MS
+sag/SM
+saga/MS
+sagacious/Y
+sagacity/M
+sage/MYTRS
+sagebrush/M
+sagged
+sagging
+saggy/RT
+sago/M
+saguaro/MS
+sahib/MS
+said/U
+sail/GMDSJ
+sailboard/MRZGS
+sailboarder/M
+sailboarding/M
+sailboat/MS
+sailcloth/M
+sailfish/MS
+sailing/M
+sailor/SM
+sailplane/MS
+saint/MDYS
+sainthood/M
+saintlike
+saintliness/M
+saintly/PRT
+saith
+sake/M
+salaam/SMDG
+salable/U
+salacious/PY
+salaciousness/M
+salacity/M
+salad/MS
+salamander/SM
+salami/SM
+salary/DSM
+sale/ABMS
+saleroom/S
+salesclerk/SM
+salesgirl/SM
+saleslady/SM
+salesman/M
+salesmanship/M
+salesmen
+salespeople/M
+salesperson/MS
+salesroom/S
+saleswoman/M
+saleswomen
+salience/M
+salient/SMY
+saline/SM
+salinity/M
+saliva/M
+salivary
+salivate/GNDS
+salivation/M
+sallow/RTP
+sallowness/M
+sally/DSMG
+salmon/SM
+salmonella/M
+salmonellae
+salon/MS
+saloon/SM
+salsa/MS
+salt's
+salt/CTGDS
+saltbox/MS
+saltcellar/SM
+salted/U
+salter
+saltine/SM
+saltiness/M
+saltpeter/M
+saltshaker/SM
+saltwater/M
+salty/RTP
+salubrious/I
+salutary
+salutation/MS
+salutatorian/MS
+salutatory
+salute/DSMG
+salvage/DSMG
+salvageable
+salvation/M
+salve/MZGDRS
+salver/M
+salvo/MS
+samarium/M
+samba/MDSG
+same/SP
+sameness/M
+samey
+samizdat/S
+samosa/S
+samovar/SM
+sampan/SM
+sample/DRSMZGJ
+sampler/M
+sampling/M
+samurai/SM
+sanatorium/SM
+sanctification/M
+sanctify/GDSN
+sanctimonious/YP
+sanctimoniousness/M
+sanctimony/M
+sanction/GSMD
+sanctioned/U
+sanctity/M
+sanctuary/SM
+sanctum/SM
+sand/ZGMDRS
+sandal/SM
+sandalwood/M
+sandbag/SM
+sandbagged
+sandbagger/SM
+sandbagging
+sandbank/MS
+sandbar/SM
+sandblast/ZGMDRS
+sandblaster/M
+sandbox/MS
+sandcastle/MS
+sander/M
+sandhog/SM
+sandiness/M
+sandlot/SM
+sandlotter/MS
+sandman/M
+sandmen
+sandpaper/GMDS
+sandpiper/MS
+sandpit/S
+sandstone/M
+sandstorm/SM
+sandwich/MDSG
+sandy/RTP
+sane/IYTR
+saneness/M
+sang/S
+sangfroid/M
+sangria/M
+sanguinary
+sanguine/Y
+sanitarian/SM
+sanitarium/SM
+sanitary/IU
+sanitation/M
+sanitize/ZGDRS
+sanity/IM
+sank
+sans
+sanserif
+sap/SM
+sapience/M
+sapiens
+sapient
+sapless
+sapling/MS
+sapped
+sapper/S
+sapphire/SM
+sappiness/M
+sapping
+sappy/PRT
+saprophyte/SM
+saprophytic
+sapsucker/SM
+sapwood/M
+saran/M
+sarcasm/MS
+sarcastic
+sarcastically
+sarcoma/MS
+sarcophagi
+sarcophagus/M
+sardine/MS
+sardonic
+sardonically
+sarge/MS
+sari/MS
+sarky
+sarnie/S
+sarong/SM
+sarsaparilla/MS
+sartorial/Y
+sash/MS
+sashay/SGMD
+sass/GMDS
+sassafras/MS
+sassy/RT
+sat
+satanic
+satanical/Y
+satanism/M
+satanist/MS
+satay
+satchel/MS
+sate/GDS
+sateen/M
+satellite/DSMG
+satiable/I
+satiate/GNDS
+satiation/M
+satiety/M
+satin/M
+satinwood/SM
+satiny
+satire/SM
+satiric
+satirical/Y
+satirist/SM
+satirize/DSG
+satisfaction/EM
+satisfactions
+satisfactorily/U
+satisfactory/U
+satisfied/U
+satisfy/EDSG
+satisfying/U
+satisfyingly
+satori/M
+satrap/SM
+satsuma/S
+saturate/DSGN
+saturated/U
+saturation/M
+saturnine
+satyr/MS
+satyriasis/M
+satyric
+sauce/MZGDRS
+saucepan/SM
+saucer/M
+saucily
+sauciness/M
+saucy/RPT
+sauerkraut/M
+sauna/MDSG
+saunter/MDGS
+saurian
+sauropod/SM
+sausage/MS
+saute/MS
+sauteed
+sauteing
+savage/DRSMYTGP
+savageness/M
+savagery/SM
+savanna/MS
+savant/SM
+save/BJMZGDRS
+saved/U
+saver/M
+saving/M
+savings/M
+savior/SM
+savor/MDSG
+savoriness/M
+savory/PTRSM
+savoy/MS
+savvy/DRSMTG
+saw/SGMD
+sawbones/M
+sawbuck/MS
+sawdust/M
+sawfly/SM
+sawhorse/SM
+sawmill/MS
+sawyer/SM
+sax/MS
+saxifrage/SM
+saxophone/MS
+saxophonist/SM
+say's
+say/USG
+saying/SM
+scab/MS
+scabbard/MS
+scabbed
+scabbiness/M
+scabbing
+scabby/PTR
+scabies/M
+scabrous
+scad/MS
+scaffold/SMG
+scaffolding/M
+scag/S
+scagged
+scalability
+scalar/S
+scalawag/MS
+scald/MDSG
+scale's
+scale/CGDS
+scaleless
+scalene
+scaliness/M
+scallion/MS
+scallop/GSMD
+scalp/MDRSZG
+scalpel/SM
+scalper/M
+scaly/RTP
+scam/MS
+scammed
+scammer/S
+scamming
+scamp/MRSZ
+scamper/GMD
+scampi/M
+scan/MS
+scandal/SM
+scandalize/DSG
+scandalmonger/SM
+scandalous/Y
+scandium/M
+scanned
+scanner/SM
+scanning
+scansion/M
+scant/CDSTG
+scanter
+scantily
+scantiness/M
+scantly
+scantness/M
+scanty/RSPT
+scapegoat/SGMD
+scapegrace/MS
+scapula/M
+scapulae
+scapular/SM
+scar/GMDS
+scarab/SM
+scarce/RYTP
+scarceness/M
+scarcity/SM
+scare/MS
+scarecrow/MS
+scaremonger/SMG
+scarf/MDSG
+scarification/M
+scarify/NDSG
+scarily
+scariness/M
+scarlatina/M
+scarlet/M
+scarp/MDRSZG
+scarper/DG
+scarred
+scarring
+scarves
+scary/RTP
+scat/MS
+scathing/Y
+scatological
+scatology/M
+scatted
+scatter/GJSMD
+scatterbrain/SMD
+scattering/M
+scattershot
+scatting
+scatty
+scavenge/ZGDRS
+scavenger/M
+scenario/MS
+scenarist/MS
+scene/MS
+scenery/M
+scenic
+scenically
+scent/CMS
+scented/U
+scenting
+scentless
+scepter/MS
+sch
+schadenfreude
+schedule's
+schedule/ADSG
+scheduled/U
+scheduler/S
+schema
+schemata
+schematic/SM
+schematically
+schematize/GDS
+scheme/DRSMZG
+schemer/M
+scherzo/MS
+schilling/MS
+schism/SM
+schismatic/SM
+schist/M
+schistosomiasis
+schizo/SM
+schizoid/MS
+schizophrenia/M
+schizophrenic/SM
+schlemiel/SM
+schlep/SM
+schlepped
+schlepping
+schlock/M
+schmaltz/M
+schmaltzy/TR
+schmo/M
+schmoes
+schmooze/DRSZG
+schmuck/MS
+schnapps/M
+schnauzer/SM
+schnitzel/SM
+schnook/MS
+schnoz/MS
+schnozzle/SM
+scholar/MYS
+scholarship/MS
+scholastic
+scholastically
+scholasticism
+school/SGMD
+schoolbag/MS
+schoolbook/SM
+schoolboy/MS
+schoolchild/M
+schoolchildren/M
+schooldays
+schooled/U
+schoolfellow/SM
+schoolgirl/SM
+schoolhouse/SM
+schooling/M
+schoolkid/S
+schoolmarm/SM
+schoolmarmish
+schoolmaster/MS
+schoolmate/SM
+schoolmistress/MS
+schoolroom/SM
+schoolteacher/MS
+schoolwork/M
+schoolyard/SM
+schooner/SM
+schuss/GMDS
+schussboomer/MS
+schwa/MS
+sci
+sciatic
+sciatica/M
+science/FMS
+scientific/U
+scientifically/U
+scientist/SM
+scimitar/SM
+scintilla/MS
+scintillate/DSGN
+scintillation/M
+scion/MS
+scissor/GDS
+scleroses
+sclerosis/M
+sclerotic
+scoff/MDRSZG
+scoffer/M
+scofflaw/MS
+scold/MDSGJ
+scolding/M
+scoliosis/M
+sconce/SM
+scone/MS
+scoop/MDSG
+scoopful/MS
+scoot/DRSZG
+scooter/M
+scope/MGDS
+scorbutic
+scorch/MDRSZG
+scorcher/M
+score/MZGDRS
+scoreboard/SM
+scorecard/MS
+scorekeeper/MS
+scoreless
+scoreline/S
+scorer/M
+scorn/MDRSZG
+scorner/M
+scornful/Y
+scorpion/MS
+scotch/MDSG
+scotchs
+scoundrel/MS
+scour/DRSZG
+scourer/M
+scourge/DSMG
+scout/MDRSZG
+scouting/M
+scoutmaster/MS
+scow/MS
+scowl/MDSG
+scrabble/MZGDRS
+scrabbler/M
+scrag/MS
+scraggly/RT
+scraggy/TR
+scram/S
+scramble's
+scramble/UGDS
+scrambler/MS
+scrammed
+scramming
+scrap/MDRSZGJ
+scrapbook/SM
+scrape/SM
+scraper/M
+scrapheap/SM
+scrapie
+scrapped
+scrapper/MS
+scrapping
+scrappy/TR
+scrapyard/SM
+scratch/GMDS
+scratchcard/S
+scratched/U
+scratchily
+scratchiness/M
+scratchpad/S
+scratchy/PRT
+scrawl/SMDG
+scrawly
+scrawniness/M
+scrawny/PTR
+scream/SMDRZG
+screamer/M
+screaming/Y
+scree/MDS
+screech/GMDS
+screechy/TR
+screed/S
+screen/SJMDG
+screening/M
+screenplay/SM
+screensaver/SM
+screenshot/S
+screenwriter/SM
+screenwriting/M
+screw's
+screw/UDSG
+screwball/MS
+screwdriver/MS
+screwiness/M
+screwworm/SM
+screwy/PRT
+scribal
+scribble/MZGDRS
+scribbler/M
+scribe's
+scribe/CKIS
+scrim/MS
+scrimmage/MGDS
+scrimp/SDG
+scrimshaw/MDGS
+scrip/MS
+script/FSMDG
+scripted/U
+scriptural
+scripture/MS
+scriptwriter/SM
+scrivener/SM
+scrod/M
+scrofula/M
+scrofulous
+scrog/S
+scroll/GSMD
+scrooge/MS
+scrota
+scrotal
+scrotum/M
+scrounge/DRSZG
+scrounger/M
+scroungy/TR
+scrub/MS
+scrubbed
+scrubber/SM
+scrubbing
+scrubby/RT
+scruff/SM
+scruffily
+scruffiness/M
+scruffy/RPT
+scrum/S
+scrumhalf
+scrumhalves
+scrummage/S
+scrummed
+scrumming
+scrump/SGD
+scrumptious/Y
+scrumpy
+scrunch/MDSG
+scrunchy/SM
+scruple/MGDS
+scrupulosity/M
+scrupulous/UPY
+scrupulousness/UM
+scrutineer/S
+scrutinize/GDS
+scrutiny/M
+scuba/MDSG
+scud/MS
+scudded
+scudding
+scuff/MDSG
+scuffle/MGDS
+scull/MDRSZG
+sculler/M
+scullery/SM
+scullion/SM
+sculpt/SGD
+sculptor/SM
+sculptress/MS
+sculptural
+sculpture/DSMG
+scum/MS
+scumbag/MS
+scummed
+scumming
+scummy/TR
+scupper/MDGS
+scurf/M
+scurfy
+scurrility/M
+scurrilous/PY
+scurrilousness/M
+scurry/GDSM
+scurvily
+scurvy/TRM
+scutcheon/SM
+scuttle/MGDS
+scuttlebutt/M
+scuzzy/TR
+scythe/DSMG
+sea/SM
+seabed/SM
+seabird/MS
+seaboard/SM
+seaborne
+seacoast/SM
+seafarer/SM
+seafaring/M
+seafloor/SM
+seafood/M
+seafront/SM
+seagoing
+seagull/MS
+seahorse/MS
+seal's
+seal/AUSDG
+sealant/MS
+sealer/SM
+sealskin/M
+seam/GMDNS
+seaman/M
+seamanship/M
+seamless/Y
+seamount/MS
+seamstress/MS
+seamy/RT
+seance/SM
+seaplane/SM
+seaport/MS
+sear/GMDS
+search/AZGMDRS
+searchable/U
+searcher/AM
+searching/Y
+searchlight/MS
+searing/Y
+seascape/SM
+seashell/SM
+seashore/SM
+seasick/P
+seasickness/M
+seaside/MS
+season/SGMDBJ
+seasonable/U
+seasonably/U
+seasonal/Y
+seasonality
+seasoned/U
+seasoning/M
+seat's
+seat/UGDS
+seating/M
+seatmate/SM
+seawall/MS
+seaward/MS
+seawater/M
+seaway/SM
+seaweed/MS
+seaworthiness/M
+seaworthy/P
+sebaceous
+seborrhea/M
+sebum
+sec'y
+sec/SM
+secant/SM
+secateurs
+secede/DSG
+secession/M
+secessionist/MS
+seclude/GDS
+seclusion/M
+seclusive
+second/SLZGMDRY
+secondarily
+secondary/SM
+seconder/M
+secondhand
+secondment/S
+secrecy/M
+secret/SGVMDY
+secretarial
+secretariat/MS
+secretary/SM
+secretaryship/M
+secrete/XNS
+secretion/M
+secretive/PY
+secretiveness/M
+secretory
+sect/IMS
+sectarian/MS
+sectarianism/M
+sectary/SM
+section/AESM
+sectional/MS
+sectionalism/M
+sectioned
+sectioning
+sector/ESM
+secular
+secularism/M
+secularist/SM
+secularization/M
+secularize/DSG
+secure/DRSYTG
+secured/U
+security/ISM
+secy
+sedan/MS
+sedate/DRSYTGNVP
+sedateness/M
+sedation/M
+sedative/SM
+sedentary
+sedge/M
+sedgy
+sediment/MS
+sedimentary
+sedimentation/M
+sedition/M
+seditious
+seduce/DRSZG
+seducer/M
+seduction/SM
+seductive/YP
+seductiveness/M
+seductress/MS
+sedulous/Y
+see/RSMZ
+seed's
+seed/AGDS
+seedbed/MS
+seedcase/MS
+seeded/U
+seeder/SM
+seediness/M
+seedless
+seedling/MS
+seedpod/MS
+seedy/RPT
+seeing/S
+seek/ZGRS
+seeker/M
+seem/GDS
+seeming/Y
+seemliness/UM
+seemly/URTP
+seen/U
+seep/GDS
+seepage/M
+seer/M
+seersucker/M
+seesaw/SMDG
+seethe/DSG
+segfault/S
+segment/GSMD
+segmentation/M
+segmented/U
+segregate/CDSGN
+segregated/U
+segregation/CM
+segregationist/MS
+segue/MGDS
+segueing
+seigneur/SM
+seignior/SM
+seine/MZGDRS
+seiner/M
+seismic
+seismically
+seismograph/ZMR
+seismographer/M
+seismographic
+seismographs
+seismography/M
+seismologic
+seismological
+seismologist/MS
+seismology/M
+seize/GDS
+seizure/MS
+seldom
+select/CSGVD
+selection/SM
+selective/Y
+selectivity/M
+selectman/M
+selectmen
+selectness/M
+selector/MS
+selenium/M
+selenographer/MS
+selenography/M
+self/M
+selfie/SM
+selfish/UYP
+selfishness/UM
+selfless/PY
+selflessness/M
+selfsame
+sell's
+sell/AZGRS
+seller's
+selloff/MS
+sellotape/DSG
+sellout/MS
+seltzer/MS
+selvage/MS
+selves
+semantic/S
+semantically
+semanticist/MS
+semantics/M
+semaphore/DSMG
+semblance/ASM
+semen/M
+semester/SM
+semi/MS
+semiannual/Y
+semiarid
+semiautomatic/MS
+semibreve/S
+semicircle/SM
+semicircular
+semicolon/MS
+semiconducting
+semiconductor/MS
+semiconscious
+semidarkness/M
+semidetached
+semifinal/SM
+semifinalist/MS
+semigloss/S
+semimonthly/SM
+seminal
+seminar/MS
+seminarian/SM
+seminary/SM
+semiofficial
+semiotic/S
+semiotics/M
+semipermeable
+semiprecious
+semiprivate
+semipro/S
+semiprofessional/SM
+semiquaver/S
+semiretired
+semiskilled
+semisolid
+semisweet
+semitone/SM
+semitrailer/MS
+semitransparent
+semitropical
+semivowel/SM
+semiweekly/SM
+semiyearly
+semolina/M
+sempstress/MS
+senate/SM
+senator/MS
+senatorial
+send/ZGRS
+sender/M
+sendoff/MS
+senescence/M
+senescent
+senile
+senility/M
+senior/SM
+seniority/M
+senna/M
+senor/MS
+senora/SM
+senorita/SM
+sensation/MS
+sensational/Y
+sensationalism/M
+sensationalist/MS
+sensationalize/GDS
+sense/MGDS
+senseless/PY
+senselessness/M
+sensibilities
+sensibility/IM
+sensible/P
+sensibleness/M
+sensibly/I
+sensitive/SMYP
+sensitiveness/M
+sensitivities
+sensitivity/IM
+sensitization/CM
+sensitize/CDSG
+sensor/SM
+sensory
+sensual/Y
+sensualist/SM
+sensuality/M
+sensuous/YP
+sensuousness/M
+sent/FAU
+sentence/MGDS
+sententious/Y
+sentience/IM
+sentient/I
+sentiment/SM
+sentimental/Y
+sentimentalism/M
+sentimentalist/MS
+sentimentality/M
+sentimentalization/M
+sentimentalize/GDS
+sentinel/MS
+sentry/SM
+sepal/MS
+separability/IM
+separable
+separably/I
+separate/XMYGNVDSP
+separateness/M
+separation/M
+separatism/M
+separatist/MS
+separator/MS
+sepia/M
+sepsis/M
+septa
+septal
+septet/SM
+septic
+septicemia/M
+septicemic
+septuagenarian/MS
+septum/M
+sepulcher/GMDS
+sepulchral
+seq
+sequel/SM
+sequence/MZGDRS
+sequencing/M
+sequential/FY
+sequester/SDG
+sequestrate/XGNDS
+sequestration/M
+sequin/SMD
+sequinned
+sequitur
+sequoia/MS
+seraglio/MS
+serape/SM
+seraph/M
+seraphic
+seraphs
+sere/TR
+serenade/MGDS
+serendipitous
+serendipity/M
+serene/RPYT
+sereneness/M
+serenity/M
+serf/MS
+serfdom/M
+serge/M
+sergeant/MS
+serial/SMY
+serialization/SM
+serialize/GDSB
+series/M
+serif/MS
+serigraph/M
+serigraphs
+serine
+serious/PY
+seriousness/M
+sermon/SM
+sermonize/GDS
+serology/M
+serotonin
+serous
+serpent/MS
+serpentine/M
+serrate/XND
+serration/M
+serried
+serum/MS
+servant/MS
+serve's/AF
+serve/FACGDS
+server/SM
+servery/S
+service/EMS
+serviceability/M
+serviceable
+serviced
+serviceman/M
+servicemen
+servicewoman/M
+servicewomen
+servicing
+serviette/MS
+servile
+servility/M
+serving's
+servings
+servitor/MS
+servitude/M
+servo/MS
+servomechanism/SM
+servomotor/MS
+sesame/SM
+sesquicentennial/MS
+session/MS
+set/AISM
+setback/MS
+setscrew/SM
+setsquare/S
+sett/BJZGRS
+settee/MS
+setter/M
+setting/M
+settle's
+settle/AUGDS
+settlement/AM
+settlements
+settler/SM
+setup/MS
+seven/MHS
+seventeen/SMH
+seventeenth/M
+seventeenths
+seventh/M
+sevenths
+seventieth/M
+seventieths
+seventy/SMH
+sever/ETGDS
+several/MY
+severance/SM
+severe/YPR
+severeness/M
+severity/M
+sew/ASGD
+sewage/M
+sewer/MS
+sewerage/M
+sewing/M
+sewn/A
+sex/GMDS
+sexagenarian/SM
+sexily
+sexiness/M
+sexism/M
+sexist/MS
+sexless
+sexologist/SM
+sexology/M
+sexpot/MS
+sextant/SM
+sextet/MS
+sexting
+sexton/MS
+sextuplet/SM
+sexual/Y
+sexuality/M
+sexy/PTR
+sf
+sh
+shabbily
+shabbiness/M
+shabby/PTR
+shack/MDSG
+shackle's
+shackle/UGDS
+shad/GMDSJ
+shade/MS
+shadily
+shadiness/M
+shading/M
+shadow/SGMD
+shadowbox/GDS
+shadowy/RT
+shady/RPT
+shaft/MDSG
+shag/MS
+shagged
+shagginess/M
+shagging
+shaggy/TPR
+shah/M
+shahs
+shake/MZGRS
+shakedown/SM
+shaken/U
+shakeout/MS
+shaker/M
+shakeup/MS
+shakily
+shakiness/M
+shaky/RPT
+shale/M
+shall
+shallot/MS
+shallow/TPMRYS
+shallowness/M
+shalom
+shalt
+sham/GMDS
+shaman/SM
+shamanic
+shamanism
+shamanistic
+shamble/MGDS
+shambles/M
+shambolic
+shame/MS
+shamefaced/Y
+shameful/PY
+shamefulness/M
+shameless/YP
+shamelessness/M
+shammed
+shamming
+shampoo/ZGMDRS
+shampooer/M
+shamrock/MS
+shan't
+shandy/S
+shanghai/DSG
+shank/MS
+shantung/M
+shanty/SM
+shantytown/SM
+shape's
+shape/AGDS
+shaped/U
+shapeless/YP
+shapelessness/M
+shapeliness/M
+shapely/PTR
+shard/MS
+share/MZGDRS
+shareable
+sharecrop/S
+sharecropped
+sharecropper/MS
+sharecropping
+shareholder/SM
+shareholding/S
+sharer/M
+shareware/M
+sharia/M
+shariah
+shark/MDSG
+sharkskin/M
+sharp/MDNRYSPXZTG
+sharpen/ADGS
+sharpener/MS
+sharper/M
+sharpie/MS
+sharpish
+sharpness/M
+sharpshooter/SM
+sharpshooting/M
+shatter/GMDS
+shatterproof
+shave/MZGDRSJ
+shaven/U
+shaver/M
+shaving/M
+shawl/MS
+shay/MS
+she'd
+she'll
+she/DSM
+sheaf/M
+shear/MDRSZG
+shearer/M
+sheath/JM
+sheathe/UGDS
+sheathing/M
+sheaths
+sheave/DSMG
+shebang/MS
+shebeen/S
+shed/MS
+shedding
+sheen/M
+sheeny/TR
+sheep/M
+sheepdog/MS
+sheepfold/SM
+sheepherder/MS
+sheepish/YP
+sheepishness/M
+sheepskin/MS
+sheer/MDRSPTG
+sheerness/M
+sheet/MSG
+sheeting/M
+sheetlike
+sheikdom/MS
+sheikh/M
+sheikhs
+sheila/S
+shekel/SM
+shelf/M
+shell/MDRSG
+shellac/MS
+shellacked
+shellacking/MS
+shellfire/M
+shellfish/MS
+shelter/GMDS
+shelve/GDS
+shelving/M
+shenanigan/SM
+shepherd/SMDG
+shepherdess/MS
+sherbet/SM
+sheriff/SM
+sherry/SM
+shew/GDS
+shewn
+shh
+shiatsu/M
+shibboleth/M
+shibboleths
+shield/MDGS
+shift/GMDS
+shiftily
+shiftiness/M
+shiftless/PY
+shiftlessness/M
+shifty/RPT
+shiitake/SM
+shill/GMDSJ
+shillelagh/M
+shillelaghs
+shilling/M
+shim/MS
+shimmed
+shimmer/SMDG
+shimmery
+shimming
+shimmy/DSMG
+shin/ZGMDRS
+shinbone/SM
+shindig/SM
+shine/MS
+shiner/M
+shingle/DSMG
+shinguard/M
+shininess/M
+shinned
+shinning
+shinny/DSG
+shinsplints/M
+shiny/TRP
+ship's
+ship/ALS
+shipboard/MS
+shipbuilder/SM
+shipbuilding/M
+shipload/SM
+shipmate/SM
+shipment/AM
+shipments
+shipowner/MS
+shipped/A
+shipper/SM
+shipping/M
+shipshape
+shipwreck/GMDS
+shipwright/MS
+shipyard/SM
+shire/MS
+shirk/ZGDRS
+shirker/M
+shirr/GMDSJ
+shirring/M
+shirt/GMDS
+shirtfront/SM
+shirting/M
+shirtless
+shirtsleeve/SM
+shirttail/SM
+shirtwaist/MS
+shirty
+shit/SM!
+shitfaced/!
+shithead/S!
+shitload/!
+shitted/!
+shitting/!
+shitty/RT!
+shiv/ZMRS
+shiver/MDG
+shivery
+shoal/GMDS
+shoat/MS
+shock/ZGMDRS
+shocker/M
+shocking/Y
+shockproof
+shod/U
+shoddily
+shoddiness/M
+shoddy/PRMT
+shoe/MS
+shoehorn/GMDS
+shoeing
+shoelace/MS
+shoemaker/SM
+shoeshine/SM
+shoestring/SM
+shoetree/MS
+shogun/MS
+shogunate/M
+shone
+shoo/GDS
+shook
+shoot/ZGMRSJ
+shooter/M
+shooting/M
+shootout/MS
+shop/MS
+shopaholic/MS
+shopfitter/S
+shopfitting
+shopfront/S
+shopkeeper/MS
+shoplift/DRZGS
+shoplifter/M
+shoplifting/M
+shoppe/MZGDRS
+shopper/M
+shopping/M
+shoptalk/M
+shopworn
+shore/MGDS
+shorebird/SM
+shoreline/MS
+shoring/M
+short/XTGMDNRYSP
+shortage/MS
+shortbread/M
+shortcake/MS
+shortchange/DSG
+shortcoming/MS
+shortcrust
+shortcut/MS
+shorten/JGD
+shortening/M
+shortfall/MS
+shorthand/MD
+shorthorn/MS
+shortish
+shortlist/DGS
+shortness/M
+shortsighted/PY
+shortsightedness/M
+shortstop/MS
+shortwave/MS
+shorty/SM
+shot/MS
+shotgun/SM
+shotgunned
+shotgunning
+should
+should've
+shoulder/MDGS
+shouldn't
+shout/ZGMDRS
+shouter/M
+shove/MGDS
+shovel/MDSG
+shovelful/SM
+show/JZGMDRS
+showbiz/M
+showboat/MDGS
+showcase/MGDS
+showdown/MS
+shower/MDG
+showerproof
+showery
+showgirl/MS
+showground/S
+showily
+showiness/M
+showing/M
+showjumping
+showman/M
+showmanship/M
+showmen
+shown
+showoff/SM
+showpiece/SM
+showplace/SM
+showroom/MS
+showstopper/MS
+showstopping
+showtime
+showy/TRP
+shpt
+shrank
+shrapnel/M
+shred/MS
+shredded
+shredder/MS
+shredding
+shrew/MS
+shrewd/RYPT
+shrewdness/M
+shrewish
+shriek/MDSG
+shrift/M
+shrike/MS
+shrill/DRSPTG
+shrillness/M
+shrilly
+shrimp/MDRSZG
+shrine/MS
+shrink/MSBG
+shrinkage/M
+shrive/GDS
+shrivel/SGD
+shriven
+shroud/GMDS
+shrub/MS
+shrubbery/SM
+shrubby/RT
+shrug/MS
+shrugged
+shrugging
+shrunk/N
+shtick/MS
+shuck/GMDS
+shucks/S
+shudder/MDSG
+shuffle/AMGDS
+shuffleboard/SM
+shuffler/SM
+shun/S
+shunned
+shunning
+shunt/MSDG
+shush/DSG
+shut/S
+shutdown/SM
+shuteye/M
+shutoff/SM
+shutout/SM
+shutter/SMDG
+shutterbug/MS
+shutting
+shuttle/DSMG
+shuttlecock/GMDS
+shy/TGDRSMY
+shyer
+shyest
+shyness/M
+shyster/SM
+sibilant/SM
+sibling/SM
+sibyl/MS
+sibylline
+sic/S
+sicced
+siccing
+sick/PXTGDNRYS
+sickbay/S
+sickbed/SM
+sicken/DG
+sickening/Y
+sickie/MS
+sickish
+sickle/MS
+sickly/RT
+sickness/MS
+sicko/MS
+sickout/SM
+sickroom/MS
+side's
+side/AGDS
+sidearm/SM
+sidebar/SM
+sideboard/SM
+sideburns/M
+sidecar/SM
+sidekick/SM
+sidelight/MS
+sideline/DSMG
+sidelong
+sideman/M
+sidemen
+sidepiece/MS
+sidereal
+sidesaddle/MS
+sideshow/MS
+sidesplitting
+sidestep/MS
+sidestepped
+sidestepping
+sidestroke/DSMG
+sideswipe/DSMG
+sidetrack/SMDG
+sidewalk/MS
+sidewall/MS
+sideways
+sidewinder/SM
+siding/MS
+sidle/MGDS
+siege/MS
+sienna/M
+sierra/MS
+siesta/MS
+sieve/MGDS
+sift/ZGDRS
+sifted/U
+sifter/M
+sigh/GMD
+sighs
+sight/GMDYSJ
+sighting/M
+sightless
+sightly/UTR
+sightread
+sightseeing/M
+sightseer/MS
+sigma/MS
+sign's/C
+sign/AFCGDS
+signage/M
+signal/MDRYSZG
+signaler/M
+signalization/M
+signalize/GDS
+signalman/M
+signalmen
+signatory/SM
+signature/MS
+signboard/MS
+signed/U
+signer/CMS
+signet/MS
+significance/IM
+significant/IY
+signification/M
+signify/XDSNG
+signing's/C
+signings
+signor/FMS
+signora/SM
+signore
+signori
+signorina/MS
+signorine
+signpost/GSMD
+silage/M
+silence/DRSMZG
+silencer/M
+silent/MRYST
+silhouette/DSMG
+silica/M
+silicate/MS
+siliceous
+silicon/SM
+silicone/M
+silicosis/M
+silk/MNS
+silkily
+silkiness/M
+silkscreen/SM
+silkworm/MS
+silky/TRP
+sill/MS
+silliness/M
+silly/TRSMP
+silo/MS
+silt/GMDS
+silty/TR
+silver/GMDS
+silverfish/MS
+silversmith/M
+silversmiths
+silverware/M
+silvery
+sim/SM
+simian/MS
+similar/Y
+similarity/ESM
+simile/MS
+similitude/EM
+simmer/GMDS
+simonize/DSG
+simony/M
+simpatico
+simper/GMDS
+simpering/Y
+simple/TRP
+simpleminded
+simpleness/M
+simpleton/SM
+simplex
+simplicity/M
+simplification/M
+simplify/DSXNG
+simplistic
+simplistically
+simply
+simulacra
+simulacrum/S
+simulate/EDSGN
+simulation/EM
+simulations
+simulator/EMS
+simulcast/GMDS
+simultaneity/M
+simultaneous/Y
+sin/ASM
+since
+sincere/IYT
+sincerer
+sincerity/IM
+sine/MS
+sinecure/MS
+sinew/MS
+sinewy
+sinful/PY
+sinfulness/M
+sing/BZGMDRYS
+singalong/S
+singe/MS
+singeing
+singer/M
+singing/M
+single/PMGDS
+singleness/M
+singles/M
+singlet/S
+singleton/SM
+singletree/SM
+singsong/SMDG
+singular/SMY
+singularity/SM
+sinister
+sink/BZGMRS
+sinkable/U
+sinker/M
+sinkhole/SM
+sinless
+sinned
+sinner/MS
+sinning
+sinology
+sinuosity/M
+sinuous/Y
+sinus/MS
+sinusitis/M
+sinusoidal
+sip/SM
+siphon/GMDS
+sipped
+sipper/SM
+sipping
+sir/SXMN
+sire/CMGDS
+siren/M
+sirloin/SM
+sirocco/SM
+sirrah
+sirree/M
+sis/MS
+sisal/M
+sissified
+sissy/RSMT
+sister/ASM
+sisterhood/MS
+sisterliness/M
+sisterly/P
+sit/S
+sitar/SM
+sitarist/MS
+sitcom/SM
+site/MGDS
+sitemap/SM
+sitter/SM
+sitting/SM
+situ
+situate/DSXGN
+situation/M
+situational
+six/MSH
+sixfold
+sixpence/MS
+sixshooter/M
+sixteen/SMH
+sixteenth/M
+sixteenths
+sixth/M
+sixths
+sixtieth/M
+sixtieths
+sixty/SMH
+sizable
+size's
+size/AGDS
+sizer
+sizing/M
+sizzle/DRSMZG
+ska/M
+skate/MZGDRS
+skateboard/MDRSZG
+skateboarder/M
+skateboarding/M
+skater/M
+skating/M
+skedaddle/MGDS
+skeet/ZMR
+skein/MS
+skeletal
+skeleton/SM
+skeptic/SM
+skeptical/Y
+skepticism/M
+sketch/MDRSZG
+sketchbook/S
+sketcher/M
+sketchily
+sketchiness/M
+sketchpad/S
+sketchy/RTP
+skew/MDRZGS
+skewbald/S
+skewer/MDG
+ski/SZGMDR
+skibob/S
+skid/MS
+skidded
+skidding
+skidpan/S
+skier/M
+skiff/SM
+skiffle
+skiing/M
+skill's
+skill/CSD
+skilled/U
+skillet/SM
+skillful/UY
+skillfulness/M
+skim/MS
+skimmed
+skimmer/SM
+skimming
+skimp/SDG
+skimpily
+skimpiness/M
+skimpy/RTP
+skin/MS
+skincare/M
+skinflint/MS
+skinful
+skinhead/MS
+skinless
+skinned
+skinniness/M
+skinning
+skinny/RMTP
+skint
+skintight
+skip/MS
+skipped
+skipper/SMDG
+skipping
+skirmish/ZGMDRS
+skirt/SMDG
+skit/MS
+skitter/GSD
+skittish/YP
+skittishness/M
+skittle/S
+skive/DRSZG
+skivvy/DSMG
+skoal/SM
+skua/S
+skulduggery/M
+skulk/SDRZG
+skulker/M
+skull/SM
+skullcap/MS
+skunk/SMDG
+sky/GSM
+skycap/SM
+skydive/DRSZG
+skydiver/M
+skydiving/M
+skyjack/JZGSDR
+skyjacker/M
+skyjacking/M
+skylark/SGMD
+skylight/MS
+skyline/SM
+skyrocket/GSMD
+skyscraper/SM
+skyward/S
+skywriter/SM
+skywriting/M
+slab/MS
+slabbed
+slabbing
+slack/PXZTGMDNRYS
+slacken/DG
+slacker/M
+slackness/M
+slacks/M
+slag/MS
+slagged
+slagging
+slagheap/S
+slain
+slake/GDS
+slalom/MSDG
+slam/MS
+slammed
+slammer/SM
+slamming
+slander/MZGDRS
+slanderer/M
+slanderous
+slang/M
+slangy/RT
+slant/MSDG
+slanting/Y
+slantwise
+slap/MS
+slapdash
+slaphappy
+slapped
+slapper/S
+slapping
+slapstick/M
+slash/MDRSZG
+slasher/M
+slat/MDGS
+slate/SM
+slather/SDG
+slatted
+slattern/SMY
+slaughter/MDRZGS
+slaughterer/M
+slaughterhouse/MS
+slave/DRSMZG
+slaveholder/MS
+slaver/MDG
+slavery/M
+slavish/PY
+slavishness/M
+slaw/M
+slay/DRZGJS
+slayer/M
+slaying/M
+sleaze/SM
+sleazebag/S
+sleazeball/S
+sleazily
+sleaziness/M
+sleazy/PRT
+sled/MS
+sledded
+sledder/SM
+sledding
+sledge/DSMG
+sledgehammer/GSMD
+sleek/SDRYTGP
+sleekness/M
+sleep/SMRZG
+sleeper/M
+sleepily
+sleepiness/M
+sleepless/PY
+sleeplessness/M
+sleepover/SM
+sleepwalk/ZGSDR
+sleepwalker/M
+sleepwalking/M
+sleepwear/M
+sleepy/RPT
+sleepyhead/MS
+sleet/SMDG
+sleety
+sleeve/DSM
+sleeveless
+sleigh/MDG
+sleighs
+sleight/SM
+slender/PRT
+slenderize/DSG
+slenderness/M
+slept
+sleuth/MG
+sleuths
+slew/MDGS
+slice/DRSMZG
+slicer/M
+slick/SMDRYZTGP
+slicker/M
+slickness/M
+slid
+slide/RSMZG
+slider/M
+slideshow/MS
+slight/SMDRYTGP
+slightness/M
+slim/PS
+slime/M
+sliminess/M
+slimline
+slimmed
+slimmer/S
+slimmest
+slimming/M
+slimness/M
+slimy/RTP
+sling/SMG
+slingback/S
+slingshot/SM
+slink/SG
+slinky/RT
+slip/MS
+slipcase/MS
+slipcover/MS
+slipknot/MS
+slippage/MS
+slipped
+slipper/SM
+slipperiness/M
+slippery/PRT
+slipping
+slippy
+slipshod
+slipstream/SM
+slipway/SM
+slit/MS
+slither/SGMD
+slithery
+slitter
+slitting
+sliver/GSMD
+slob/MS
+slobbed
+slobber/MDSG
+slobbery
+slobbing
+sloe/MS
+slog/MS
+slogan/SM
+sloganeering
+slogged
+slogging
+sloop/SM
+slop/MDGS
+slope/SM
+slopped
+sloppily
+sloppiness/M
+slopping
+sloppy/PTR
+slops/M
+slosh/DSG
+slot/MS
+sloth/M
+slothful/YP
+slothfulness/M
+sloths
+slotted
+slotting
+slouch/ZGMDRS
+sloucher/M
+slouchy/TR
+slough/GMD
+sloughs
+sloven/SMY
+slovenliness/M
+slovenly/PTR
+slow/DRYTGSP
+slowcoach/S
+slowdown/SM
+slowness/M
+slowpoke/SM
+sludge/M
+sludgy/RT
+slue/MGDS
+slug/MS
+sluggard/MS
+slugged
+slugger/SM
+slugging
+sluggish/PY
+sluggishness/M
+sluice/DSMG
+slum/MS
+slumber/GSMD
+slumberous
+slumdog/SM
+slumlord/MS
+slummed
+slummer
+slumming
+slummy/RT
+slump/SMDG
+slung
+slunk
+slur/MS
+slurp/SMDG
+slurred
+slurring
+slurry/M
+slush/M
+slushiness/M
+slushy/RPT
+slut/MS
+sluttish
+slutty/RT
+sly/TRY
+slyness/M
+smack/SMDRZG
+smacker/M
+small/SMRTP
+smallholder/S
+smallholding/S
+smallish
+smallness/M
+smallpox/M
+smarmy/RT
+smart/SMDNRYXTGP
+smarten/DG
+smartness/M
+smartphone/SM
+smarts/M
+smartwatch/MS
+smarty/SM
+smartypants/M
+smash/MDRSZG
+smasher/M
+smashup/SM
+smattering/MS
+smear/SMDG
+smeary/RT
+smell/SMDG
+smelliness/M
+smelly/RPT
+smelt/SMDRZG
+smelter/M
+smidgen/MS
+smilax/M
+smile/DSMG
+smiley/SM
+smiling/Y
+smirch/GMDS
+smirk/SMDG
+smite/SG
+smith/M
+smithereens/M
+smiths
+smithy/SM
+smitten
+smock/SMDG
+smocking/M
+smog/MS
+smoggy/RT
+smoke/DRSMZG
+smokehouse/MS
+smokeless
+smoker/M
+smokescreen/SM
+smokestack/SM
+smokey
+smokiness/M
+smoking/M
+smoky/RTP
+smolder/SGMD
+smooch/MDSG
+smoochy
+smooth/PDRYTG
+smoothie/MS
+smoothness/M
+smooths
+smorgasbord/SM
+smote
+smother/GSMD
+smudge/DSMG
+smudgy/TR
+smug/YP
+smugger
+smuggest
+smuggle/ZGDRS
+smuggler/M
+smuggling/M
+smugness/M
+smurf/S
+smut/MS
+smuttiness/M
+smutty/TRP
+snack/SMDG
+snaffle/DSMG
+snafu/SM
+snag/MS
+snagged
+snagging
+snail/SMDG
+snake/DSMG
+snakebite/MS
+snakelike
+snakeskin
+snaky/RT
+snap's
+snap/US
+snapdragon/SM
+snapped/U
+snapper/MS
+snappily
+snappiness/M
+snapping/U
+snappish/YP
+snappishness/M
+snappy/TRP
+snapshot/SM
+snare/DSMG
+snarf/SDG
+snark/S
+snarky/TR
+snarl's
+snarl/USDG
+snarling/Y
+snarly/TR
+snatch/ZGMDRS
+snatcher/M
+snazzily
+snazzy/TR
+sneak/SMDRZG
+sneaker/M
+sneakily
+sneakiness/M
+sneaking/Y
+sneaky/TRP
+sneer/SJMDG
+sneering/Y
+sneeze/DSMG
+snick/SDRZG
+snicker/MDG
+snide/RYT
+sniff/SMDRZG
+sniffer/M
+sniffle/DSMG
+sniffy/RT
+snifter/SM
+snip/MDRZGS
+snipe/SM
+sniper/M
+snipped
+snippet/SM
+snipping
+snippy/RT
+snips/M
+snit/MS
+snitch/MDSG
+snivel/SMDRZG
+sniveler/M
+snob/MS
+snobbery/M
+snobbish/PY
+snobbishness/M
+snobby/RT
+snog/S
+snogged
+snogging
+snood/SM
+snooker/MDSG
+snoop/SMDRZG
+snooper/M
+snoopy/TR
+snoot/SM
+snootily
+snootiness/M
+snooty/PTR
+snooze/DSMG
+snore/DRSMZG
+snorer/M
+snorkel/ZGMDRS
+snorkeler/M
+snorkeling/M
+snort/SMDRZG
+snorter/M
+snot/MS
+snottily
+snottiness/M
+snotty/TPR
+snout/SM
+snow/MDGS
+snowball/GSMD
+snowbank/SM
+snowbird/SM
+snowblower/MS
+snowboard/ZGMDRS
+snowboarder/M
+snowboarding/M
+snowbound
+snowdrift/SM
+snowdrop/SM
+snowfall/SM
+snowfield/SM
+snowflake/SM
+snowiness/M
+snowline
+snowman/M
+snowmen
+snowmobile/DSMG
+snowplow/SGMD
+snowshed
+snowshoe/SM
+snowshoeing
+snowstorm/SM
+snowsuit/SM
+snowy/PRT
+snub/MS
+snubbed
+snubbing
+snuff/SMDRYZG
+snuffbox/MS
+snuffer/M
+snuffle/MGDS
+snug/MYSP
+snugged
+snugger
+snuggest
+snugging
+snuggle/MGDS
+snugness/M
+so
+soak/MDGSJ
+soaking/M
+soap/MDGS
+soapbox/MS
+soapiness/M
+soapstone/M
+soapsuds/M
+soapy/RPT
+soar/MDGS
+sob/SM
+sobbed
+sobbing/Y
+sober/SDRYPTG
+soberness/M
+sobriety/IM
+sobriquet/SM
+soc
+soccer/M
+sociability/M
+sociable/SM
+sociably
+social/SMY
+socialism/M
+socialist/SM
+socialistic
+socialite/SM
+socialization/M
+socialize/DSG
+societal
+society/SM
+socioeconomic
+socioeconomically
+sociological/Y
+sociologist/SM
+sociology/M
+sociopath/M
+sociopaths
+sociopolitical
+sock/MDGS
+socket/SM
+sockeye/SM
+sod/SM
+soda/MS
+sodded
+sodden/Y
+sodding
+sodium/M
+sodomite/MS
+sodomize/GDS
+sodomy/M
+soever
+sofa/MS
+soft/NRYXTP
+softback
+softball/MS
+softbound
+softcover
+soften/DRZG
+softener/M
+softhearted
+softness/M
+software/M
+softwood/SM
+softy/SM
+soggily
+sogginess/M
+soggy/RTP
+soigne
+soignee
+soil/MDGS
+soiled/U
+soiree/SM
+sojourn/ZGMDRS
+sojourner/M
+sol/SM
+solace/DSMG
+solar
+solaria
+solarium/M
+sold
+solder/ZGSMDR
+solderer/M
+soldier/MDYSG
+soldiery/M
+sole/FSDGM
+solecism/SM
+solely
+solemn/PTRY
+solemness/M
+solemnify/DSG
+solemnity/SM
+solemnization/M
+solemnize/DSG
+solemnness/M
+solenoid/MS
+solicit/GDS
+solicitation/SM
+solicited/U
+solicitor/SM
+solicitous/PY
+solicitousness/M
+solicitude/M
+solid/PSMRYT
+solidarity/M
+solidi
+solidification/M
+solidify/DSNG
+solidity/M
+solidness/M
+solidus/M
+soliloquies
+soliloquize/DSG
+soliloquy/M
+solipsism/M
+solipsistic
+solitaire/MS
+solitariness/M
+solitary/SMP
+solitude/M
+solo/MDGS
+soloist/MS
+solstice/MS
+solubility/IM
+soluble/MS
+solute's
+solute/AXN
+solutes
+solution's/AE
+solvable/IU
+solve/EADSG
+solved/U
+solvency/IM
+solvent/IMS
+solver/SM
+somatic
+somatosensory
+somber/PY
+somberness/M
+sombrero/MS
+some
+somebody/SM
+someday
+somehow
+someone/MS
+someplace
+somersault/MDGS
+somerset/SM
+somersetted
+somersetting
+something/SM
+sometime/S
+someway/S
+somewhat/S
+somewhere
+somnambulism/M
+somnambulist/SM
+somnolence/M
+somnolent
+son/SM
+sonar/SM
+sonata/SM
+sonatina/SM
+song/MS
+songbird/SM
+songbook/SM
+songfest/SM
+songster/MS
+songstress/MS
+songwriter/SM
+songwriting
+sonic
+sonnet/SM
+sonny/SM
+sonogram/SM
+sonority/M
+sonorous/YP
+sonorousness/M
+sonsofbitches
+soon/RT
+soot/M
+sooth/MDRSZG
+soothe
+soother/M
+soothing/Y
+soothsayer/MS
+soothsaying/M
+sooty/RT
+sop/SM
+soph
+sophism/M
+sophist/MS
+sophistic
+sophistical
+sophisticate/DSMGN
+sophisticated/U
+sophistication/M
+sophistry/SM
+sophomore/MS
+sophomoric
+soporific/MS
+soporifically
+sopped
+sopping
+soppy/RT
+soprano/MS
+sorbet/SM
+sorcerer/MS
+sorceress/MS
+sorcery/M
+sordid/PY
+sordidness/M
+sore/MYTRSP
+sorehead/MS
+soreness/M
+sorghum/M
+sorority/SM
+sorrel/SM
+sorrily
+sorriness/M
+sorrow/SMDG
+sorrowful/YP
+sorrowfulness/M
+sorry/RTP
+sort/FASGDM
+sorta
+sorted/U
+sorter/SM
+sortie/DSM
+sortieing
+sot/SM
+sottish
+sou'wester
+sou/SMH
+souffle/SM
+sough/MDG
+soughs
+sought/U
+souk/S
+soul/MS
+soulful/YP
+soulfulness/M
+soulless/YP
+soulmate/SM
+sound/JPSMDRYZTG
+soundalike/S
+soundbar/S
+soundbite/S
+soundboard/MS
+soundcheck/S
+sounder/M
+sounding/M
+soundless/Y
+soundness/UM
+soundproof/GDS
+soundproofing/M
+soundscape/S
+soundtrack/SM
+soup/MDGS
+soupcon/MS
+soupy/RT
+sour/MDRYTGSP
+source/ADSMG
+sourdough/M
+sourdoughs
+sourish
+sourness/M
+sourpuss/MS
+sousaphone/MS
+souse/DSMG
+south/M
+southbound
+southeast/ZMR
+southeaster/MY
+southeastern
+southeastward/S
+southerly/SM
+southern/SZMR
+southerner/M
+southernmost
+southpaw/SM
+southward/MS
+southwest/ZMR
+southwester/MY
+southwestern
+southwestward/S
+souvenir/SM
+sovereign/SM
+sovereignty/M
+soviet/SM
+sow's
+sow/ASGD
+sower/SM
+sown/A
+soy/M
+soybean/MS
+sozzled
+spa/SM
+space/DRSMZG
+spacecraft/MS
+spaceflight/MS
+spaceman/M
+spacemen
+spaceport/SM
+spacer/M
+spaceship/SM
+spacesuit/SM
+spacetime
+spacewalk/SGMD
+spacewoman/M
+spacewomen
+spacey
+spacial
+spacier
+spaciest
+spaciness/M
+spacing/M
+spacious/YP
+spaciousness/M
+spade/DSMG
+spadeful/MS
+spadework/M
+spadices
+spadix/M
+spaghetti/M
+spake
+spam/MS
+spammed
+spammer/SM
+spamming
+span/MS
+spandex/M
+spangle/DSMG
+spangly
+spaniel/SM
+spank/SMDGJ
+spanking/M
+spanned
+spanner/SM
+spanning
+spar/MS
+spare/DRSMYTGP
+spareness/M
+spareribs/M
+sparing/UY
+spark/SMDYG
+sparkle/DRSMZG
+sparkler/M
+sparky/RT
+sparred
+sparring
+sparrow/SM
+sparrowhawk/S
+sparse/RYTP
+sparseness/M
+sparsity/M
+spartan
+spasm/SM
+spasmodic
+spasmodically
+spastic/SM
+spat/MS
+spate/SM
+spathe/SM
+spatial/Y
+spatted
+spatter/SGMD
+spatting
+spatula/SM
+spavin/MD
+spawn/SMDG
+spay/DGS
+speak/SRZGJ
+speakeasy/SM
+speaker/M
+speakerphone/S
+spear/SMDG
+spearfish/GMDS
+speargun
+spearhead/GMDS
+spearmint/M
+spec/MS
+special/SMY
+specialism/S
+specialist/MS
+specialization/MS
+specialize/GDS
+specialty/SM
+specie/SM
+species/M
+specif
+specifiable
+specific/MS
+specifically
+specification/M
+specificity/M
+specified/U
+specify/XNZDRSG
+specimen/SM
+specious/YP
+speciousness/M
+speck/SMDG
+speckle/MGDS
+specs/M
+spectacle/SM
+spectacles/M
+spectacular/MYS
+spectate/DSG
+spectator/SM
+specter/AMS
+spectra
+spectral
+spectrometer/MS
+spectroscope/MS
+spectroscopic
+spectroscopy/M
+spectrum/M
+speculate/DSXGNV
+speculation/M
+speculative/Y
+speculator/MS
+sped
+speech/MS
+speechify/DSG
+speechless/YP
+speechlessness/M
+speechwriter/S
+speed/SMRZG
+speedboat/SM
+speeder/M
+speedily
+speediness/M
+speeding/M
+speedometer/MS
+speedster/SM
+speedup/MS
+speedway/SM
+speedwell/M
+speedy/TPR
+speleological
+speleologist/MS
+speleology/M
+spell/JSMDRZG
+spellbind/ZGRS
+spellbinder/M
+spellbound
+spellcheck/MDRZGS
+spellchecker/M
+spelldown/SM
+speller/M
+spelling/M
+spelunker/MS
+spelunking/M
+spend/BSRZG
+spender/M
+spending/M
+spendthrift/MS
+spent/U
+sperm/SM
+spermatozoa
+spermatozoon/M
+spermicidal
+spermicide/MS
+spew/MDRZGS
+spewer/M
+sphagnum/MS
+sphere/SM
+spherical/Y
+spheroid/SM
+spheroidal
+sphincter/MS
+sphinx/MS
+spic/S
+spice/DSMG
+spicily
+spiciness/M
+spicule/MS
+spicy/PRT
+spider/SM
+spiderweb/MS
+spidery
+spiel/SMDG
+spiff/SDG
+spiffy/TR
+spigot/SM
+spike/DSMG
+spikiness/M
+spiky/RPT
+spill/SMDG
+spillage/MS
+spillover/SM
+spillway/MS
+spin/MS
+spinach/M
+spinal/SMY
+spindle/MGDS
+spindly/TR
+spine/SM
+spineless/YP
+spinet/SM
+spinless
+spinnaker/SM
+spinner/MS
+spinneret/SM
+spinney/S
+spinning/M
+spinster/SM
+spinsterhood/M
+spinsterish
+spiny/RT
+spiracle/SM
+spiral/SGMDY
+spire's
+spire/IFAS
+spirea/SM
+spirit's
+spirit/ISGD
+spirited/Y
+spiritless
+spiritual/MYS
+spiritualism/M
+spiritualist/MS
+spiritualistic
+spirituality/M
+spirituous
+spirochete/SM
+spiry
+spit/MDGS
+spitball/SM
+spite/ASM
+spiteful/PY
+spitefuller
+spitefullest
+spitefulness/M
+spitfire/SM
+spitted
+spitting
+spittle/M
+spittoon/MS
+spiv/S
+splanchnic
+splash/GMDS
+splashdown/MS
+splashily
+splashiness/M
+splashy/RTP
+splat/SM
+splatted
+splatter/GSMD
+splatting
+splay/SMDG
+splayfeet
+splayfoot/MD
+spleen/SM
+splendid/RYT
+splendor/MS
+splendorous
+splenectomy
+splenetic
+splice/DRSMZG
+splicer/M
+spliff/S
+spline/S
+splint/SZGMDR
+splinter/MDG
+splintery
+split/SM
+splitting/MS
+splodge/S
+splosh/DSG
+splotch/MDSG
+splotchy/TR
+splurge/DSMG
+splutter/GMDS
+spoil's
+spoil/CSDRZG
+spoilage/M
+spoiled/U
+spoiler/CM
+spoilsport/MS
+spoke/SM
+spoken/U
+spokesman/M
+spokesmen
+spokespeople
+spokesperson/MS
+spokeswoman/M
+spokeswomen
+spoliation/CM
+sponge/DRSMZG
+sponger/M
+sponginess/M
+spongy/RPT
+sponsor/MDGS
+sponsorship/M
+spontaneity/M
+spontaneous/Y
+spoof/SMDG
+spook/SMDG
+spookiness/M
+spooky/RPT
+spool/SMDG
+spoon/SMDG
+spoonbill/MS
+spoonerism/MS
+spoonful/SM
+spoor/SMDG
+sporadic
+sporadically
+spore/DSMG
+sporran/S
+sport/SMDGV
+sportiness/M
+sporting/Y
+sportive/Y
+sportscast/MRZGS
+sportscaster/M
+sportsman/M
+sportsmanlike/U
+sportsmanship/M
+sportsmen
+sportspeople
+sportsperson
+sportswear/M
+sportswoman/M
+sportswomen
+sportswriter/SM
+sporty/TPR
+spot/CMS
+spotless/PY
+spotlessness/M
+spotlight/GSMD
+spotlit
+spotted
+spotter/MS
+spottily
+spottiness/M
+spotting
+spotty/TPR
+spousal/MS
+spouse/SM
+spout/SMDG
+sprain/GSMD
+sprang
+sprat/SM
+sprawl/GSMD
+spray's
+spray/ASDG
+sprayer/MS
+spread/ZGBSMR
+spreadeagled
+spreader/M
+spreadsheet/MS
+spree/DSM
+spreeing
+sprig/SM
+sprigged
+sprightliness/M
+sprightly/RTP
+spring/GSM
+springboard/MS
+springbok/MS
+springily
+springiness/M
+springlike
+springtime/M
+springy/RPT
+sprinkle/DRSJMZG
+sprinkler/M
+sprinkling/M
+sprint/ZGSMDR
+sprinter/M
+sprite/SM
+spritz/ZGMDRS
+spritzer/M
+sprocket/MS
+sprog/S
+sprout/GSMD
+spruce/DRSPMYTG
+spruceness/M
+sprung
+spry/RYT
+spryness/M
+spud/MS
+spume/DSMG
+spumoni/M
+spumy
+spun
+spunk/SM
+spunky/TR
+spur/MS
+spurge/M
+spurious/PY
+spuriousness/M
+spurn/SDG
+spurred
+spurring
+spurt/SMDG
+sputa
+sputnik/MS
+sputter/MDGS
+sputum/M
+spy/GDSM
+spyglass/MS
+spymaster/S
+spyware/M
+sq
+sqq
+squab/SM
+squabble/MZGDRS
+squabbler/M
+squad/SM
+squadron/MS
+squalid/PTRY
+squalidness/M
+squall/SGMD
+squally
+squalor/M
+squamous
+squander/GDS
+square/PDRSMYTG
+squareness/M
+squarish
+squash/GMDS
+squashy/TR
+squat/SMP
+squatness/M
+squatted
+squatter/MS
+squattest
+squatting
+squaw/SM
+squawk/SZGMDR
+squawker/M
+squeak/SZGMDR
+squeaker/M
+squeakily
+squeakiness/M
+squeaky/TRP
+squeal/SZGMDR
+squealer/M
+squeamish/PY
+squeamishness/M
+squeegee/MDS
+squeegeeing
+squeeze/BMZGDRS
+squeezebox/S
+squeezer/M
+squelch/GMDS
+squelchy
+squib/SM
+squid/SM
+squidgy
+squiffy
+squiggle/DSMG
+squiggly
+squint/STGMDR
+squire/DSMG
+squirm/SGMD
+squirmy/RT
+squirrel/SGMD
+squirt/SGMD
+squish/GMDS
+squishy/RT
+sriracha
+ssh
+st
+stab/MYS
+stabbed
+stabber/MS
+stabbing/MS
+stability/IM
+stabilization/CM
+stabilize/CDSG
+stabilizer/MS
+stable/DRSMTG
+stableman/M
+stablemate/S
+stablemen
+stably/U
+staccato/MS
+stack/SMDG
+stadium/MS
+staff's
+staff/ASDG
+staffer/MS
+staffing/M
+stag/MDGSJ
+stage/SM
+stagecoach/MS
+stagecraft/M
+stagehand/MS
+stagestruck
+stagflation/M
+stagger/MDGS
+staggering/Y
+staging/M
+stagnancy/M
+stagnant/Y
+stagnate/DSGN
+stagnation/M
+stagy/RT
+staid/PRYT
+staidness/M
+stain/SMDG
+stained/U
+stainless/M
+stair/SM
+staircase/MS
+stairway/MS
+stairwell/SM
+stake/DSMG
+stakeholder/MS
+stakeout/SM
+stalactite/MS
+stalagmite/MS
+stale/DRSTGP
+stalemate/DSMG
+staleness/M
+stalk/SMDRJZG
+stalker/M
+stalking/M
+stall's
+stall/SDG
+stallholder/S
+stallion/MS
+stalwart/MYS
+stamen/SM
+stamina/M
+stammer/ZGMDRS
+stammerer/M
+stammering/Y
+stamp/SMDRZG
+stampede/MGDS
+stamper/M
+stance/ISM
+stanch/TGDRS
+stanchion/SM
+stand/SMRJZG
+standalone
+standard/MS
+standardization/M
+standardize/DSG
+standby/M
+standbys
+standee/MS
+stander/M
+standing/M
+standoff/MS
+standoffish
+standout/MS
+standpipe/SM
+standpoint/MS
+standstill/MS
+stank
+stanza/SM
+staph/M
+staphylococcal
+staphylococci
+staphylococcus/M
+staple/DRSMZG
+stapler/M
+star/MDRZGS
+starboard/M
+starburst/S
+starch/GMDS
+starchily
+starchiness/M
+starchy/PTR
+stardom/M
+stardust/M
+stare/SM
+starer/M
+starfish/MS
+starfruit
+stargaze/DRSZG
+stargazer/M
+stark/RYPZT
+starkness/M
+starless
+starlet/MS
+starlight/M
+starling/SM
+starlit
+starred
+starring
+starry/TR
+starstruck
+start/ASMDG
+starter/MS
+startle/GDS
+startling/Y
+startup/MS
+starvation/M
+starve/DSJG
+starveling/MS
+stash/MDSG
+stasis
+stat/MS
+state/DRSMYGNLX
+statecraft/M
+stated/U
+statehood/M
+statehouse/MS
+stateless/P
+statelessness/M
+stateliness/M
+stately/PRT
+statement/AMS
+statemented
+statementing
+stateroom/MS
+stateside
+statesman/M
+statesmanlike
+statesmanship/M
+statesmen
+stateswoman/M
+stateswomen
+statewide
+static/SM
+statically
+station/MDRZG
+stationary
+stationer/M
+stationery/M
+stationmaster/S
+statistic/MS
+statistical/Y
+statistician/SM
+statuary/M
+statue/SM
+statuesque
+statuette/MS
+stature/MS
+status/MS
+statute/MS
+statutorily
+statutory
+staunch/PDRSYTG
+staunchness/M
+stave/DSMG
+stay/MDRZGS
+std
+stdio
+stead/SM
+steadfast/YP
+steadfastness/M
+steadily/U
+steadiness/UM
+steady/TGPDRSM
+steak/SM
+steakhouse/SM
+steal/SMHG
+stealth/M
+stealthily
+stealthiness/M
+stealthy/TPR
+steam/SMDRZG
+steamboat/MS
+steamer/M
+steamfitter/SM
+steamfitting/M
+steaminess/M
+steampunk
+steamroll/ZGDRS
+steamroller/MDG
+steamship/MS
+steamy/TPR
+steed/SM
+steel/SMDG
+steeliness/M
+steelmaker/S
+steelworker/SM
+steelworks/M
+steely/PTR
+steelyard/SM
+steep/SMDNRYPXTG
+steepen/GD
+steeple/MS
+steeplechase/MS
+steeplejack/SM
+steepness/M
+steer/SMDBG
+steerage/M
+steering/M
+steersman/M
+steersmen
+stegosauri
+stegosaurus/MS
+stein/SM
+stellar
+stem/MS
+stemless
+stemmed
+stemming
+stemware/M
+stench/MS
+stencil/GMDS
+steno/SM
+stenographer/SM
+stenographic
+stenography/M
+stenosis
+stent/SM
+stentorian
+step/IMS
+stepbrother/SM
+stepchild/M
+stepchildren/M
+stepdad/MS
+stepdaughter/SM
+stepfather/SM
+stepladder/MS
+stepmom/MS
+stepmother/SM
+stepparent/SM
+steppe/DRSMZG
+stepper/M
+steppingstone/SM
+stepsister/MS
+stepson/MS
+stereo/SM
+stereophonic
+stereoscope/MS
+stereoscopic
+stereotype/DSMG
+stereotypical
+sterile
+sterility/M
+sterilization/SM
+sterilize/DRSZG
+sterilizer/M
+sterling/M
+stern/SMRYPT
+sternness/M
+sternum/MS
+steroid/MS
+steroidal
+stertorous
+stet/S
+stethoscope/MS
+stetson/MS
+stetted
+stetting
+stevedore/SM
+stew/MDGS
+steward/GMDS
+stewardess/MS
+stewardship/M
+stick/SMRZG
+sticker/M
+stickily
+stickiness/M
+stickleback/SM
+stickler/MS
+stickpin/MS
+stickup/MS
+sticky/PTRSM
+stiff/SMDNRYPXTG
+stiffen/ZGDR
+stiffener/M
+stiffening/M
+stiffness/M
+stifle/DSJG
+stifling/Y
+stigma/SM
+stigmata
+stigmatic
+stigmatization/M
+stigmatize/GDS
+stile/SM
+stiletto/SM
+still's
+still/ITGSD
+stillbirth/M
+stillbirths
+stillborn
+stiller
+stillness/M
+stilt/SMD
+stilted/Y
+stimulant/SM
+stimulate/DSGNV
+stimulation/M
+stimuli
+stimulus/M
+sting/ZGSMR
+stinger/M
+stingily
+stinginess/M
+stingray/SM
+stingy/RTP
+stink/ZGSMR
+stinkbug/SM
+stinker/M
+stinky/RT
+stint/GSMD
+stipend/SM
+stipendiary/S
+stipple/DSMG
+stippling/M
+stipulate/XDSGN
+stipulation/M
+stir/MS
+stirred
+stirrer/SM
+stirring/SY
+stirrup/SM
+stitch's
+stitch/ADSG
+stitchery/M
+stitching/M
+stoat/SM
+stochastic
+stock's
+stock/AGSD
+stockade/DSMG
+stockbreeder/MS
+stockbroker/SM
+stockbroking/M
+stockholder/SM
+stockily
+stockiness/M
+stockinette/M
+stocking/SM
+stockist/S
+stockpile/MGDS
+stockpot/SM
+stockroom/MS
+stocktaking/M
+stocky/RTP
+stockyard/MS
+stodge
+stodgily
+stodginess/M
+stodgy/RTP
+stogie/MS
+stoic/SM
+stoical/Y
+stoicism/M
+stoke/DRSZG
+stoker/M
+stole/SM
+stolen
+stolid/RYTP
+stolidity/M
+stolidness/M
+stolon/MS
+stomach/MDRZG
+stomachache/SM
+stomacher/M
+stomachs
+stomp/GSMD
+stone/DRSMZG
+stonemason/MS
+stoner/M
+stonewall/GSD
+stoneware/M
+stonewashed
+stonework/M
+stonily
+stoniness/M
+stonkered
+stonking
+stony/TRP
+stood
+stooge/MS
+stool/SM
+stoop/GSMD
+stop's
+stop/US
+stopcock/SM
+stopgap/SM
+stoplight/MS
+stopover/MS
+stoppable/U
+stoppage/MS
+stopped/U
+stopper/GSMD
+stopping/U
+stopple/DSMG
+stopwatch/MS
+storage/M
+store's
+store/ADSG
+storefront/MS
+storehouse/MS
+storekeeper/SM
+storeroom/SM
+stork/SM
+storm/GSMD
+stormily
+storminess/M
+stormy/RPT
+story/DSM
+storyboard/MS
+storybook/SM
+storyteller/MS
+storytelling/M
+stoup/SM
+stout/TSMRYP
+stouthearted
+stoutness/M
+stove/SM
+stovepipe/SM
+stow/DGS
+stowage/M
+stowaway/MS
+straddle/DRSMZG
+straddler/M
+strafe/MGDS
+straggle/DRSZG
+straggler/M
+straggly/TR
+straight/SPXTMNRY
+straightaway/SM
+straightedge/SM
+straighten/ZGDR
+straightener/M
+straightforward/YPS
+straightforwardness/M
+straightness/M
+straightway
+strain's
+strain/FADSG
+strainer/ASM
+strait/MNSX
+straiten/GD
+straitjacket/SGMD
+straitlaced
+strand/MDSG
+strange/PRYZT
+strangeness/M
+stranger/M
+strangle/ZGDRS
+stranglehold/SM
+strangler/M
+strangulate/GNDS
+strangulation/M
+strap's
+strap/US
+strapless/MS
+strapped/U
+strapping/M
+strata
+stratagem/SM
+strategic/S
+strategical/Y
+strategics/M
+strategist/SM
+strategy/SM
+strati
+stratification/M
+stratify/DSGN
+stratosphere/SM
+stratospheric
+stratum/M
+stratus/M
+straw/GSMD
+strawberry/SM
+stray/GSMD
+streak/MDRSZG
+streaker/M
+streaky/TR
+stream/MDRSZG
+streamer/M
+streamline/DSG
+street/MS
+streetcar/MS
+streetlamp/S
+streetlight/SM
+streetwalker/SM
+streetwise
+strength/M
+strengthen/AGDS
+strengthener/MS
+strengths
+strenuous/PY
+strenuousness/M
+strep/M
+streptococcal
+streptococci
+streptococcus/M
+streptomycin/M
+stress/MDSG
+stressed/U
+stressful
+stressors
+stretch/BZGMDRS
+stretcher/MDG
+stretchmarks
+stretchy/TR
+strew/GSDH
+strewn
+stria/M
+striae
+striated
+striation/MS
+stricken
+strict/RYPT
+strictness/M
+stricture/SM
+stridden
+stride/MGS
+stridency/M
+strident/Y
+strife/M
+strike/MZGRSJ
+strikebound
+strikebreaker/SM
+strikebreaking
+strikeout/MS
+striker/M
+striking/Y
+string/MDRSZG
+stringency/M
+stringent/Y
+stringer/M
+stringiness/M
+stringy/PTR
+strip/GSMD
+stripe/MS
+stripey
+stripling/MS
+stripped
+stripper/MS
+stripping
+striptease/MZGDRS
+stripteaser/M
+stripy
+strive/GS
+striven
+strobe/MS
+stroboscope/MS
+stroboscopic
+strode
+stroke/MGDS
+stroll/MDRSZG
+stroller/M
+strong/RYT
+strongbox/MS
+stronghold/MS
+strongman/M
+strongmen
+strongroom/S
+strontium/M
+strop/SM
+strophe/SM
+strophic
+stropped
+stroppily
+stropping
+stroppy/TRP
+strove
+struck
+structural/Y
+structuralism
+structuralist/S
+structure's
+structure/AGDS
+structured/U
+strudel/SM
+struggle/MGDS
+strum/SM
+strummed
+strumming
+strumpet/MS
+strung/UA
+strut/SM
+strutted
+strutting
+strychnine/M
+stub/MS
+stubbed
+stubbing
+stubble/M
+stubbly
+stubborn/RYPT
+stubbornness/M
+stubby/RT
+stucco/MDG
+stuccoes
+stuck/U
+stud/MYS
+studbook/MS
+studded
+studding/M
+student/SM
+studentship/S
+studied/U
+studiedly
+studio/MS
+studious/PY
+studiousness/M
+studly/RT
+study's
+study/AGDS
+stuff/GSMDJ
+stuffily
+stuffiness/M
+stuffing/M
+stuffy/RPT
+stultification/M
+stultify/DSNG
+stumble/DRSMZG
+stumbler/M
+stump/GSMD
+stumpy/TR
+stun/S
+stung
+stunk
+stunned
+stunner/S
+stunning/Y
+stunt/GSMD
+stuntman
+stuntmen
+stupefaction/M
+stupefy/DSG
+stupendous/Y
+stupid/TMRYS
+stupidity/SM
+stupor/MS
+sturdily
+sturdiness/M
+sturdy/TRP
+sturgeon/SM
+stutter/MDRSZG
+stutterer/M
+sty/SM
+style's
+style/ADSG
+styli
+stylish/PY
+stylishness/M
+stylist/SM
+stylistic/S
+stylistically
+stylize/DSG
+stylus/MS
+stymie/MDS
+stymieing
+styptic/SM
+suasion/EM
+suave/RYTP
+suaveness/M
+suavity/M
+sub/SM
+subaltern/MS
+subaqua
+subarctic
+subarea/MS
+subatomic
+subbasement/SM
+subbed
+subbing
+subbranch/MS
+subcategory/SM
+subclass
+subcommittee/SM
+subcompact/SM
+subconscious/PMY
+subconsciousness/M
+subcontinent/SM
+subcontinental
+subcontract/MDSG
+subcontractor/MS
+subculture/MS
+subcutaneous/Y
+subdivide/GDS
+subdivision/SM
+subdomain/MS
+subdominant
+subdue/DSG
+subeditor/S
+subfamily/SM
+subfreezing
+subgroup/MS
+subhead/GJMS
+subheading/M
+subhuman/MS
+subj
+subject/GVMDS
+subjection/M
+subjective/Y
+subjectivity/M
+subjoin/GDS
+subjugate/GNDS
+subjugation/M
+subjunctive/SM
+sublease/MGDS
+sublet/SM
+subletting
+sublieutenant/S
+sublimate/GNDS
+sublimation/M
+sublime/YTGDRS
+subliminal/Y
+sublimity/M
+sublingual
+submarginal
+submarine/MZRS
+submariner/M
+submerge/GDS
+submergence/M
+submerse/GNDS
+submersible/MS
+submersion/M
+submicroscopic
+submission/MS
+submissive/PY
+submissiveness/M
+submit/AS
+submitted/A
+submitter
+submitting/A
+subnormal
+suborbital
+suborder/MS
+subordinate/DSMGN
+subordination/IM
+suborn/SGD
+subornation/M
+subpar
+subparagraph
+subpart
+subplot/MS
+subpoena/GMDS
+subprime
+subprofessional/SM
+subprogram/S
+subroutine/SM
+subscribe/UASDG
+subscriber/MS
+subscript/MS
+subscription/MS
+subsection/MS
+subsequent/Y
+subservience/M
+subservient/Y
+subset/SM
+subside/GDS
+subsidence/M
+subsidiarity
+subsidiary/SM
+subsidization/M
+subsidize/ZGDRS
+subsidizer/M
+subsidy/SM
+subsist/SDG
+subsistence/M
+subsoil/M
+subsonic
+subspace
+subspecies/M
+substance/SM
+substandard
+substantial/IY
+substantiate/GNDSX
+substantiated/U
+substantiation/FM
+substantive/SMY
+substation/MS
+substituent
+substitute/XMGNDS
+substitution/M
+substrata
+substrate/MS
+substratum/M
+substructure/SM
+subsume/DSG
+subsumption
+subsurface/M
+subsystem/SM
+subteen/SM
+subtenancy/M
+subtenant/SM
+subtend/SDG
+subterfuge/SM
+subterranean
+subtext/SM
+subtitle/DSMG
+subtle/TR
+subtlety/SM
+subtly
+subtopic/SM
+subtotal/SGMD
+subtract/GSD
+subtraction/SM
+subtrahend/SM
+subtropic/S
+subtropical
+subtropics/M
+suburb/MS
+suburban/SM
+suburbanite/SM
+suburbia/M
+subvention/SM
+subversion/M
+subversive/SPMY
+subversiveness/M
+subvert/SDG
+subway/MS
+subzero
+succeed/GDS
+success/VMS
+successful/UY
+succession/SM
+successive/Y
+successor/SM
+succinct/RYTP
+succinctness/M
+succor/SGMD
+succotash/M
+succubi
+succubus
+succulence/M
+succulency/M
+succulent/SM
+succumb/GDS
+such
+suchlike
+suck/MDRZGS
+sucker/GMD
+suckle/DSJG
+suckling/M
+sucrose/M
+suction/SMDG
+sudden/PY
+suddenness/M
+suds/M
+sudsy/TR
+sue/DSG
+suede/M
+suet/M
+suety
+suffer/DRZGSJ
+sufferance/M
+sufferer/M
+suffering/M
+suffice/DSG
+sufficiency/IM
+sufficient/IY
+suffix/MDSG
+suffixation/M
+suffocate/GNDS
+suffocation/M
+suffragan/MS
+suffrage/M
+suffragette/SM
+suffragist/MS
+suffuse/DSGN
+suffusion/M
+sugar/GSMD
+sugarcane/M
+sugarcoat/GDS
+sugarless
+sugarplum/MS
+sugary/RT
+suggest/GVSDR
+suggestibility/M
+suggestible
+suggestion/SM
+suggestive/YP
+suggestiveness/M
+suicidal
+suicide/SM
+suit/BMDGS
+suitability/UM
+suitableness/M
+suitably/U
+suitcase/SM
+suite/SM
+suited/U
+suiting/M
+suitor/MS
+sukiyaki/M
+sulfa/M
+sulfate/SM
+sulfide/SM
+sulfonamides
+sulfur/MDSG
+sulfuric
+sulfurous
+sulk/MDGS
+sulkily
+sulkiness/M
+sulky/TRSMP
+sullen/RYPT
+sullenness/M
+sullied/U
+sully/GDS
+sultan/MS
+sultana/SM
+sultanate/MS
+sultrily
+sultriness/M
+sultry/RPT
+sum/SM
+sumac/M
+summarily
+summarize/GDS
+summary/SM
+summat
+summation/FMS
+summed
+summer/MDSG
+summerhouse/SM
+summertime/M
+summery
+summing
+summit/MS
+summitry/M
+summon/DRSZG
+summoner/M
+summons/GMDS
+sumo/M
+sump/MS
+sumptuous/PY
+sumptuousness/M
+sun/SM
+sunbath/ZGMDRS
+sunbathe
+sunbather/M
+sunbathing/M
+sunbaths
+sunbeam/SM
+sunbed/S
+sunbelt/SM
+sunblock/MS
+sunbonnet/SM
+sunburn/SGMD
+sunburst/MS
+sundae/MS
+sundeck/S
+sunder/DSG
+sundial/SM
+sundown/SM
+sundress/S
+sundries/M
+sundry/S
+sunfish/MS
+sunflower/MS
+sung/U
+sunglasses/M
+sunhat/S
+sunk/N
+sunlamp/SM
+sunless
+sunlight/M
+sunlit
+sunned
+sunniness/M
+sunning
+sunny/TRP
+sunrise/SM
+sunroof/SM
+sunscreen/MS
+sunset/MS
+sunshade/MS
+sunshine/M
+sunshiny
+sunspot/SM
+sunstroke/M
+suntan/MS
+suntanned
+suntanning
+suntrap/S
+sunup/M
+sup/SZMR
+super/M
+superabundance/MS
+superabundant
+superannuate/GNDS
+superannuation/M
+superb/RYT
+supercargo/M
+supercargoes
+supercharge/ZGDRS
+supercharger/M
+supercilious/PY
+superciliousness/M
+supercity/SM
+supercomputer/MS
+superconducting
+superconductive
+superconductivity/M
+superconductor/SM
+supercritical
+superego/MS
+supererogation/M
+supererogatory
+superficial/Y
+superficiality/M
+superfine
+superfluity/M
+superfluous/YP
+superfluousness/M
+superglue
+supergrass/S
+superhero/MS
+superheroes
+superhighway/SM
+superhuman
+superimpose/GDS
+superimposition/M
+superintend/DSG
+superintendence/M
+superintendency/M
+superintendent/SM
+superior/MS
+superiority/M
+superlative/SMY
+superman/M
+supermarket/SM
+supermassive
+supermen
+supermodel/SM
+supermom/MS
+supernal
+supernatural/SY
+supernova/MS
+supernovae
+supernumerary/SM
+superpose/GDS
+superposition/M
+superpower/SM
+supersaturate/GNDS
+supersaturation/M
+superscribe/GDS
+superscript/MS
+superscription/M
+supersede/GDS
+supersize/GDS
+supersonic
+superspreader/SM
+superstar/MS
+superstardom
+superstate/S
+superstition/MS
+superstitious/Y
+superstore/MS
+superstructure/MS
+supertanker/MS
+superuser/S
+supervene/GDS
+supervention/M
+supervise/XGNDS
+supervised/U
+supervision/M
+supervisor/MS
+supervisory
+superwoman/M
+superwomen
+supine/Y
+supp/DRZG
+supper/M
+suppertime
+suppl
+supplant/SDG
+supple/TLPR
+supplement/MDGS
+supplemental
+supplementary
+supplementation/M
+suppleness/M
+suppliant/SM
+supplicant/MS
+supplicate/GDS
+supplication/M
+supplier/M
+supply/ZGDRSMXN
+support/MDRSBZGV
+supportable/UI
+supported/U
+supporter/M
+suppose/GDS
+supposed/Y
+supposition/MS
+suppository/SM
+suppress/GVDS
+suppressant/MS
+suppressible
+suppression/M
+suppressor/SM
+suppurate/DSGN
+suppuration/M
+supra
+supranational
+supremacist/MS
+supremacy/M
+supreme/Y
+supremo/S
+supt
+surcease/DSMG
+surcharge/DSMG
+surcingle/SM
+sure/PYTR
+surefire
+surefooted
+sureness/M
+surety/SM
+surf/MDRZGS
+surface's
+surface/AGDS
+surfboard/MDSG
+surfeit/MDSG
+surfer/M
+surfing/M
+surge/DSMG
+surgeon/MS
+surgery/SM
+surgical/Y
+surliness/M
+surly/PTR
+surmise/MGDS
+surmount/DGSB
+surmountable/I
+surname/MS
+surpass/GDS
+surpassed/U
+surplice/MS
+surplus/MS
+surplussed
+surplussing
+surprise/DSMGJ
+surprising/UY
+surreal
+surrealism/M
+surrealist/SM
+surrealistic
+surrealistically
+surrender/MDSG
+surreptitious/PY
+surreptitiousness/M
+surrey/MS
+surrogacy/M
+surrogate/SM
+surround/GSDJ
+surrounding/M
+surroundings/M
+surtax/MDSG
+surtitle/S
+surveillance/M
+survey's
+survey/ADGS
+surveying/M
+surveyor/SM
+survival/SM
+survivalist/SM
+survive/DSGB
+survivor/SM
+susceptibility/SM
+susceptible/I
+sushi/M
+suspect/SMDG
+suspected/U
+suspend/SDRZG
+suspender/M
+suspense/XMN
+suspenseful
+suspension/M
+suspicion/SM
+suspicious/Y
+suss/DSG
+sustain/SDBG
+sustainability
+sustainable/U
+sustainably
+sustenance/M
+sutler/MS
+suttee
+suture/MGDS
+suzerain/MS
+suzerainty/M
+svelte/TR
+swab/MS
+swabbed
+swabbing
+swaddle/DSG
+swag/MS
+swagged
+swagger/SMDRG
+swagging
+swain/SM
+swallow/GSMD
+swallowtail/MS
+swam
+swami/SM
+swamp/GSMD
+swampland/M
+swampy/RT
+swan/MS
+swank/TGSMDR
+swankily
+swankiness/M
+swanky/RPT
+swanned
+swanning
+swansong/S
+swap/MS
+swapped
+swapping
+sward/SM
+swarm/GSMD
+swarthy/TR
+swash/GMDS
+swashbuckler/SM
+swashbuckling/M
+swastika/SM
+swat/MS
+swatch/MS
+swath/GMDS
+swathe/M
+swaths
+swatted
+swatter/SMDG
+swatting
+sway/MDGS
+swayback/MD
+swayed/U
+swear/ZGSR
+swearer/M
+swearword/MS
+sweat/ZGSMDR
+sweatband/MS
+sweater/M
+sweatpants/M
+sweats/M
+sweatshirt/SM
+sweatshop/MS
+sweatsuit/S
+sweaty/RT
+swede/SM
+sweep/ZGSMRJ
+sweeper/M
+sweeping/MY
+sweepings/M
+sweepstakes/M
+sweet/XTSMNRYP
+sweetbread/SM
+sweetbrier/SM
+sweetcorn
+sweetened/U
+sweetener/MS
+sweetening/M
+sweetheart/SM
+sweetie/SM
+sweetish
+sweetmeat/MS
+sweetness/M
+swell/TGSMDRJ
+swellhead/MDS
+swelling/M
+swelter/SGMD
+swept
+sweptback
+swerve/MGDS
+swerving/U
+swift/PTSMRY
+swiftness/M
+swig/MS
+swigged
+swigging
+swill/GSMD
+swim/MS
+swimmer/SM
+swimming/MY
+swimsuit/SM
+swimwear
+swindle/DRSMZG
+swindler/M
+swine/SM
+swineherd/SM
+swing/ZGSMR
+swingeing
+swinger/M
+swinish
+swipe/DSMG
+swirl/GSMD
+swirly
+swish/TGMDRS
+switch/MDRSZGB
+switchback/MS
+switchblade/SM
+switchboard/SM
+switcher/M
+switchover
+swivel/MDGS
+swiz
+swizz
+swizzle/DSG
+swollen
+swoon/SGMD
+swoop/SGMD
+swoosh/MDSG
+sword/SM
+swordfish/MS
+swordplay/M
+swordsman/M
+swordsmanship/M
+swordsmen
+swore
+sworn
+swot/S
+swotted
+swotting
+swum
+swung
+sybarite/SM
+sybaritic
+sycamore/MS
+sycophancy/M
+sycophant/SM
+sycophantic
+syllabic
+syllabicate/GNDS
+syllabication/M
+syllabification/M
+syllabify/DSNG
+syllable/MS
+syllabub/S
+syllabus/MS
+syllogism/MS
+syllogistic
+sylph/M
+sylphic
+sylphlike
+sylphs
+sylvan
+symbioses
+symbiosis/M
+symbiotic
+symbiotically
+symbol/MS
+symbolic
+symbolical/Y
+symbolism/M
+symbolization/M
+symbolize/DSG
+symbology
+symmetric
+symmetrical/Y
+symmetry/SM
+sympathetic/U
+sympathetically/U
+sympathies/M
+sympathize/ZGDRS
+sympathizer/M
+sympathy/SM
+symphonic
+symphony/SM
+symposium/MS
+symptom/MS
+symptomatic
+symptomatically
+syn/H
+synagogal
+synagogue/SM
+synapse/MS
+synaptic
+sync/MDSG
+synchronicity
+synchronization/SM
+synchronize/GDS
+synchronous/Y
+synchrony
+syncopate/DSGN
+syncopation/M
+syncope/M
+syndicalism
+syndicalist/S
+syndicate/DSMGN
+syndication/M
+syndrome/SM
+synergism/M
+synergistic
+synergy/SM
+synfuel/MS
+synod/SM
+synonym/SM
+synonymous
+synonymy/M
+synopses
+synopsis/M
+synoptic
+synovial
+syntactic
+syntactical/Y
+syntax/M
+syntheses
+synthesis/M
+synthesize/ZGDRS
+synthesizer/M
+synthetic/SM
+synthetically
+synths
+syphilis/M
+syphilitic/SM
+syringe/DSMG
+syrup/SM
+syrupy
+sysadmin/S
+sysop/S
+system/SM
+systematic/U
+systematical/Y
+systematization/M
+systematize/GDS
+systemic/MS
+systemically
+systole/SM
+systolic
+t/SDNXGBJ
+ta
+tab/SM
+tabbed
+tabbing
+tabbouleh/M
+tabby/SM
+tabernacle/SM
+tabla/MS
+table/MGDS
+tableau/M
+tableaux
+tablecloth/M
+tablecloths
+tableland/SM
+tablespoon/SM
+tablespoonful/SM
+tablet/SM
+tabletop/MS
+tableware/M
+tabloid/SM
+taboo/MDSG
+tabor/MS
+tabular
+tabulate/DSGNX
+tabulation/M
+tabulator/SM
+tachograph
+tachographs
+tachometer/SM
+tachycardia/M
+tachyon
+tacit/PY
+tacitness/M
+taciturn/Y
+taciturnity/M
+tack/ZGMDRS
+tacker/M
+tackiness/M
+tackle/DRSMZG
+tackler/M
+tacky/RTP
+taco/MS
+tact/FM
+tactful/YP
+tactfulness/M
+tactic/SM
+tactical/Y
+tactician/MS
+tactile
+tactility/M
+tactless/PY
+tactlessness/M
+tad/SM
+tadpole/MS
+taffeta/M
+taffrail/SM
+taffy/SM
+tag/SM
+tagged
+tagger/SM
+tagging
+tagliatelle
+tagline/MS
+taiga/MS
+tail/ACSDMG
+tailback/MS
+tailboard/S
+tailbone/S
+tailcoat/MS
+tailgate/MZGDRS
+tailgater/M
+tailless
+taillight/MS
+tailor/SGMD
+tailoring/M
+tailpiece/S
+tailpipe/SM
+tailspin/SM
+tailwind/SM
+taint/MDSG
+tainted/U
+take/AIMS
+takeaway/S
+taken/A
+takeoff/MS
+takeout/MS
+takeover/SM
+taker/MS
+taking/SM
+takings/M
+talc/M
+talcum/M
+tale/MS
+talebearer/MS
+talent/SMD
+talented/U
+tali
+talisman/MS
+talk/ZGMDRS
+talkative/PY
+talkativeness/M
+talker/M
+talkie/RSMT
+talky
+tall/TRP
+tallboy/MS
+tallier/M
+tallish
+tallness/M
+tallow/M
+tallowy
+tally/DRSMZG
+tallyho/MDGS
+talon/MS
+talus/MS
+tam/SM
+tamale/SM
+tamarack/MS
+tamarind/MS
+tambourine/MS
+tame/BYZTGDRSP
+tamed/U
+tameness/M
+tamer/M
+tamoxifen
+tamp/ZGDRS
+tamper/ZGDR
+tamperer/M
+tampon/SM
+tan/SM
+tanager/MS
+tanbark/M
+tandem/SM
+tandoori/M
+tang/MS
+tangelo/MS
+tangent/MS
+tangential/Y
+tangerine/MS
+tangibility/IM
+tangible/IMS
+tangibleness/M
+tangibly/I
+tangle's
+tangle/UDSG
+tango/MDSG
+tangy/RT
+tank/ZGMDRS
+tankard/MS
+tanker/M
+tankful/MS
+tanned/U
+tanner/SM
+tannery/SM
+tannest
+tannin/M
+tanning/M
+tansy/M
+tantalization/M
+tantalize/ZGDRS
+tantalizer/M
+tantalizing/Y
+tantalum/M
+tantamount
+tantra/M
+tantrum/SM
+tap/SZGMDR
+tapas
+tape/MS
+tapeline/MS
+taper/MDG
+tapestry/SM
+tapeworm/MS
+tapioca/M
+tapir/MS
+tapped/U
+tapper/MS
+tappet/MS
+tapping
+taproom/SM
+taproot/SM
+tar/SGMD
+taramasalata
+tarantella/MS
+tarantula/SM
+tarball/S
+tardily
+tardiness/M
+tardy/TPR
+tare/MS
+target/MDGS
+tariff/MS
+tarmac/MS
+tarmacadam
+tarmacked
+tarmacking
+tarn/MS
+tarnish/GMDS
+tarnished/U
+taro/MS
+tarot/MS
+tarp/MS
+tarpaulin/MS
+tarpon/MS
+tarragon/SM
+tarred
+tarring
+tarry/TGDRS
+tarsal/MS
+tarsi
+tarsus/M
+tart/PTGMDRYS
+tartan/MS
+tartar/MS
+tartaric
+tartness/M
+tarty/T
+taser/GMDS
+task/GMDS
+taskbar
+taskmaster/MS
+taskmistress/MS
+tassel/MDSG
+taste/JMZGDRS
+tasted/U
+tasteful/EPY
+tastefulness/EM
+tasteless/PY
+tastelessness/M
+taster/M
+tastily
+tastiness/M
+tasting/M
+tasty/TRP
+tat/SZR
+tatami/MS
+tater/M
+tatted
+tatter/MDSG
+tatterdemalion/MS
+tattie
+tatting/M
+tattle/MZGDRS
+tattler/M
+tattletale/MS
+tattoo/MDRSZG
+tattooer/M
+tattooist/SM
+tatty/TRS
+tau/SM
+taught/UA
+taunt/ZGMDRS
+taunter/M
+taunting/Y
+taupe/M
+taut/PXTNRY
+tauten/DG
+tautness/M
+tautological/Y
+tautologous
+tautology/SM
+tavern/MS
+tawdrily
+tawdriness/M
+tawdry/RTP
+tawny/TRM
+tax/BZGMDRS
+taxa
+taxation/M
+taxer/M
+taxi/GMDS
+taxicab/SM
+taxidermist/SM
+taxidermy/M
+taximeter/MS
+taxiway/S
+taxman
+taxmen
+taxon
+taxonomic
+taxonomist/MS
+taxonomy/SM
+taxpayer/MS
+taxpaying
+tb/S
+tbsp
+tea/SM
+teabag/S
+teacake/SM
+teach/ZGRSBJ
+teachable/U
+teacher/M
+teaching/M
+teacup/MS
+teacupful/MS
+teak/MS
+teakettle/SM
+teal/MS
+tealight/MS
+team/GMDS
+teammate/MS
+teamster/MS
+teamwork/M
+teapot/MS
+tear/GMDS
+tearaway/S
+teardrop/SM
+tearful/Y
+teargas/MS
+teargassed
+teargassing
+tearjerker/MS
+tearoom/SM
+teary/TR
+tease/MZGDRS
+teasel/MS
+teaser/M
+teasing/Y
+teaspoon/SM
+teaspoonful/SM
+teat/MS
+teatime/S
+tech/M
+techie/S
+technetium/M
+technical/Y
+technicality/SM
+technician/SM
+technicolor
+technique/SM
+techno
+technobabble
+technocracy/SM
+technocrat/MS
+technocratic
+technological/Y
+technologist/MS
+technology/SM
+technophobe/S
+techs
+tectonic/S
+tectonics/M
+ted/S
+teddy/S
+tedious/PY
+tediousness/M
+tedium/M
+tee/DSMH
+teeing
+teem/GDS
+teen/MS
+teenage/RZ
+teenager/M
+teeny/TR
+teenybopper/MS
+teeter/MDSG
+teethe/GDS
+teething/M
+teetotal/RZ
+teetotaler/M
+teetotalism/M
+tektite/SM
+tel
+telecast/SZGMR
+telecaster/M
+telecommunication/MS
+telecommunications/M
+telecommute/ZGDRS
+telecommuter/M
+telecommuting/M
+teleconference/MGDS
+teleconferencing/M
+telegenic
+telegram/MS
+telegraph/MDRZG
+telegrapher/M
+telegraphese
+telegraphic
+telegraphically
+telegraphist/SM
+telegraphs
+telegraphy/M
+telekinesis/M
+telekinetic
+telemarketer/SM
+telemarketing/M
+telemeter/SM
+telemetry/SM
+teleological
+teleology
+telepathic
+telepathically
+telepathy/M
+telephone/DRSMZG
+telephoner/M
+telephonic
+telephonist/S
+telephony/M
+telephoto/SM
+telephotography/M
+teleplay/MS
+teleport
+teleportation
+teleprinter/MS
+teleprocessing/M
+teleprompter/SM
+telesales
+telescope/DSMG
+telescopic
+telescopically
+teletext/MS
+telethon/MS
+teletype/S
+teletypewriter/MS
+televangelism/M
+televangelist/MS
+televise/XGNDS
+television/M
+teleworker/S
+teleworking
+telex/MDSG
+tell/AGS
+teller/SM
+telling/Y
+telltale/SM
+tellurium/M
+telly/SM
+telnet
+temblor/MS
+temerity/M
+temp/MDRZTGS
+temper/MDG
+tempera/LSM
+temperament/MS
+temperamental/Y
+temperance/IM
+temperate/IY
+temperateness/M
+temperature/SM
+tempest/SM
+tempestuous/YP
+tempestuousness/M
+template's
+template/S
+temple/SM
+tempo/SM
+temporal/Y
+temporarily
+temporariness/M
+temporary/FSM
+temporize/ZGDRS
+temporizer/M
+tempt/SDRZG
+temptation/MS
+tempter/M
+tempting/Y
+temptress/MS
+tempura/M
+ten/BMH
+tenability/M
+tenable/U
+tenably
+tenacious/YP
+tenaciousness/M
+tenacity/M
+tenancy/SM
+tenant/SMDG
+tenanted/U
+tenantry/M
+tench
+tend/IEFDGS
+tended/U
+tendency/SM
+tendentious/YP
+tendentiousness/M
+tender/SMDRYTGP
+tenderfoot/MS
+tenderhearted/P
+tenderheartedness/M
+tenderize/ZGDRS
+tenderizer/M
+tenderloin/SM
+tenderness/M
+tendinitis/M
+tendon/SM
+tendril/SM
+tenement/SM
+tenet/SM
+tenfold
+tenner/S
+tennis/M
+tenon/SMDG
+tenor/SM
+tenpin/SM
+tenpins/M
+tense/DRSMYTGNXP
+tenseness/M
+tensile
+tension/ESM
+tensity/IM
+tensor/S
+tent/DGSM
+tentacle/DSM
+tentative/PY
+tentativeness/M
+tenterhook/MS
+tenth/MY
+tenths
+tenuity/M
+tenuous/PY
+tenuousness/M
+tenure/DSMG
+tepee/SM
+tepid/YP
+tepidity/M
+tepidness/M
+tequila/SM
+terabit/SM
+terabyte/MS
+terahertz/M
+terajoule/S
+terapixel/MS
+terawatt/S
+terbium/M
+tercentenary/SM
+tercentennial/SM
+teriyaki
+term/MDYGS
+termagant/MS
+terminable/IC
+terminal/MYS
+terminate/DSGNX
+termination/CSM
+terminator/S
+termini
+terminological/Y
+terminology/SM
+terminus/M
+termite/SM
+tern/IMS
+ternary/SM
+terr
+terrace/DSMG
+terracotta/M
+terrain/SM
+terrapin/MS
+terrarium/SM
+terrazzo/MS
+terrestrial/SMY
+terrible/P
+terribleness/M
+terribly
+terrier/M
+terrific
+terrifically
+terrify/GDS
+terrifying/Y
+terrine/S
+territorial/MS
+territoriality
+territory/SM
+terror/SM
+terrorism/M
+terrorist/SM
+terrorize/DSG
+terry/RMZ
+terrycloth/M
+terse/RYTP
+terseness/M
+tertiary
+tessellate/DSXGN
+tessellation/M
+test's/AFK
+test/AKFCDGS
+testable/CF
+testament/MS
+testamentary
+testate/S
+testator/MS
+testatrices
+testatrix/M
+tested/U
+tester/KSM
+testes
+testicle/MS
+testicular
+testifier/M
+testify/ZGDRS
+testily
+testimonial/MS
+testimony/SM
+testiness/M
+testings
+testis/M
+testosterone/M
+testy/PRT
+tetanus/M
+tetchily
+tetchy/PRT
+tether/SMDG
+tetra/SM
+tetracycline/M
+tetrahedral
+tetrahedron/MS
+tetrameter/SM
+text/FMS
+textbook/SM
+texted
+textile/MS
+texting
+textual/FY
+textural
+texture/MGDS
+thalami
+thalamus/M
+thalidomide/M
+thallium/M
+than
+thane/SM
+thank/SDG
+thankful/YP
+thankfulness/M
+thankless/PY
+thanklessness/M
+thanksgiving/SM
+that'd
+that'll
+that/M
+thatch/MDRSZG
+thatcher/M
+thatching/M
+thaw/MDGS
+the/JG
+theater/SM
+theatergoer/SM
+theatrical/YS
+theatricality/M
+theatricals/M
+theatrics/M
+thee/S
+theft/SM
+their/S
+theism/M
+theist/SM
+theistic
+them
+thematic
+thematically
+theme/DSM
+themselves
+then/M
+thence
+thenceforth
+thenceforward
+theocracy/SM
+theocratic
+theodolite/S
+theologian/SM
+theological/Y
+theology/SM
+theorem/MS
+theoretic
+theoretical/Y
+theoretician/SM
+theorist/SM
+theorize/DSG
+theory/SM
+theosophic
+theosophical
+theosophist/SM
+theosophy/M
+therapeutic/S
+therapeutically
+therapeutics/M
+therapist/SM
+therapy/SM
+there/M
+thereabout/S
+thereafter
+thereat
+thereby
+therefor
+therefore
+therefrom
+therein
+theremin/SM
+thereof
+thereon
+thereto
+theretofore
+thereunder
+thereunto
+thereupon
+therewith
+therm/SM
+thermal/MYS
+thermionic
+thermodynamic/S
+thermodynamics/M
+thermometer/MS
+thermometric
+thermonuclear
+thermoplastic/SM
+thermos/MS
+thermostat/MS
+thermostatic
+thermostatically
+thesauri
+thesaurus/MS
+these/S
+thesis/M
+thespian/SM
+theta/SM
+thew/MS
+they
+they'd
+they'll
+they're
+they've
+thiamine/M
+thick/PMNRYXT
+thicken/DRJZG
+thickener/M
+thickening/M
+thicket/MS
+thickheaded/M
+thickness/MS
+thicko/S
+thickset
+thief/M
+thieve/DSG
+thievery/M
+thieving/M
+thievish
+thigh/M
+thighbone/MS
+thighs
+thimble/MS
+thimbleful/SM
+thin/YSP
+thine
+thing/M
+thingamabob/SM
+thingamajig/SM
+thingumabob/S
+thingummy/S
+thingy/S
+think/SRBZG
+thinkable/U
+thinker/M
+thinking's
+thinned
+thinner/MS
+thinness/M
+thinnest
+thinning
+third/SMY
+thirst/SGMD
+thirstily
+thirstiness/M
+thirsty/TPR
+thirteen/SMH
+thirteenth/M
+thirteenths
+thirtieth/M
+thirtieths
+thirty/HSM
+this
+thistle/MS
+thistledown/M
+thither
+tho
+thole/SM
+thong/SM
+thoracic
+thorax/MS
+thorium/M
+thorn/SM
+thorniness/M
+thorny/PRT
+thorough/RYPT
+thoroughbred/MS
+thoroughfare/MS
+thoroughgoing
+thoroughness/M
+those
+thou/MS
+though
+thought/SM
+thoughtful/YP
+thoughtfulness/M
+thoughtless/PY
+thoughtlessness/M
+thousand/MHS
+thousandfold
+thousandth/M
+thousandths
+thrall/SMDG
+thralldom/M
+thrash/JMDRSZG
+thrasher/M
+thrashing/M
+thread/SMDRZG
+threadbare
+threader/M
+threadlike
+thready/TR
+threat/SMNX
+threaten/DG
+threatening/Y
+three/SM
+threefold
+threepence/M
+threescore/MS
+threesome/SM
+threnody/SM
+thresh/MDRSZG
+thresher/M
+threshold/SM
+threw
+thrice
+thrift/SM
+thriftily
+thriftiness/M
+thriftless
+thrifty/PTR
+thrill/SMDRZG
+thriller/M
+thrilling/Y
+thrive/DSG
+throat/SM
+throatily
+throatiness/M
+throaty/RTP
+throb/SM
+throbbed
+throbbing
+throe/SM
+thrombi
+thrombolytic
+thromboses
+thrombosis/M
+thrombotic
+thrombus/M
+throne's
+throne/S
+throng/GSMD
+throttle/DRSMZG
+throttler/M
+through
+throughout
+throughput/M
+throw/SMRZG
+throwaway/SM
+throwback/SM
+thrower/M
+thrown
+thru
+thrum/SM
+thrummed
+thrumming
+thrush/MS
+thrust/GSM
+thruway/MS
+thud/MS
+thudded
+thudding
+thug/MS
+thuggery/M
+thuggish
+thulium/M
+thumb/SMDG
+thumbnail/SM
+thumbprint/SM
+thumbscrew/SM
+thumbtack/SM
+thump/SMDG
+thumping/M
+thunder/ZGMDRS
+thunderbolt/SM
+thunderclap/SM
+thundercloud/MS
+thunderer/M
+thunderhead/SM
+thunderous/Y
+thundershower/SM
+thunderstorm/SM
+thunderstruck
+thundery
+thunk/S
+thus
+thwack/ZGSMDR
+thwacker/M
+thwart/GSMD
+thy
+thyme/M
+thymine/M
+thymus/MS
+thyroid/MS
+thyroidal
+thyself
+ti/MRZ
+tiara/SM
+tibia/M
+tibiae
+tibial
+tic/SM
+tick/MDRZGS
+ticker/M
+ticket/GSMD
+ticking/M
+tickle/DRSMZG
+tickler/M
+ticklish/YP
+ticklishness/M
+ticktacktoe/M
+ticktock/MS
+tidal/Y
+tidbit/SM
+tiddler/S
+tiddly
+tiddlywink/S
+tiddlywinks/M
+tide/MGJDS
+tideland/SM
+tidemark/S
+tidewater/MS
+tideway/MS
+tidily/U
+tidiness/UM
+tidings/M
+tidy/DRSMTGP
+tie's
+tie/AUSD
+tieback/MS
+tiebreak/RSZ
+tiebreaker/M
+tiepin/S
+tier/MD
+tiff/MDGS
+tiger/SM
+tigerish
+tight/SNRYPXT
+tighten/ZGDR
+tightener/M
+tightfisted
+tightness/M
+tightrope/MS
+tights/M
+tightwad/MS
+tigress/MS
+til
+tilapia
+tilde/SM
+tile/MZGDRS
+tiler/M
+tiling/M
+till's
+till/EDRZGS
+tillable
+tillage/M
+tiller/EM
+tilt/MDGS
+timber/SMDG
+timberland/M
+timberline/MS
+timbre/SM
+timbrel/SM
+time/MYZGJDRS
+timekeeper/MS
+timekeeping/M
+timeless/PY
+timelessness/M
+timeline/MS
+timeliness/UM
+timely/UPRT
+timeout/SM
+timepiece/MS
+timer/M
+timescale/S
+timeserver/SM
+timeserving/M
+timeshare/S
+timestamp/SMD
+timetable/DSMG
+timeworn
+timezone
+timid/RYTP
+timidity/M
+timidness/M
+timing/M
+timorous/PY
+timorousness/M
+timothy/M
+timpani/M
+timpanist/SM
+tin/SM
+tincture/MGDS
+tinder/M
+tinderbox/MS
+tine/MS
+tinfoil/M
+ting/MDYG
+tinge/SM
+tingeing
+tingle/DSMGJ
+tingling/M
+tininess/M
+tinker/ZGSMDR
+tinkerer/M
+tinkle/DSMG
+tinned
+tinniness/M
+tinning
+tinnitus/M
+tinny/PRT
+tinplate/M
+tinpot
+tinsel/GSMD
+tinsmith/M
+tinsmiths
+tint/MDGS
+tintinnabulation/MS
+tintype/MS
+tinware/M
+tiny/RTP
+tip/SM
+tipped
+tipper/SM
+tippet/SM
+tippex/GDS
+tipping
+tipple/DRSMZG
+tippler/M
+tipsily
+tipsiness/M
+tipster/MS
+tipsy/RPT
+tiptoe/DSM
+tiptoeing
+tiptop/SM
+tirade/SM
+tiramisu/MS
+tire's
+tire/AGDS
+tired/PRYT
+tiredness/M
+tireless/YP
+tirelessness/M
+tiresome/PY
+tiresomeness/M
+tissue/SM
+tit/SM
+titan/SM
+titanic
+titanium/M
+titch/S
+titchy
+tithe/DRSMZG
+tither/M
+titian/M
+titillate/DSGN
+titillating/Y
+titillation/M
+titivate/DSGN
+titivation/M
+title/DSMG
+titled/U
+titleholder/MS
+titlist/MS
+titmice
+titmouse/M
+titter/SGMD
+tittle/SM
+titty/S
+titular
+tizz
+tizzy/SM
+tn
+tnpk
+to/IU
+toad/MS
+toadstool/MS
+toady/DSMG
+toadyism/M
+toast/SMDRZG
+toaster/M
+toastmaster/SM
+toastmistress/MS
+toasty/TRS
+tobacco/MS
+tobacconist/SM
+toboggan/ZGSMDR
+tobogganer/M
+tobogganing/M
+toccata/S
+tocopherol
+tocsin/SM
+today/M
+toddle/DRSMZG
+toddler/M
+toddy/SM
+toe/DSM
+toecap/SM
+toehold/MS
+toeing
+toenail/MS
+toerag/S
+toff/S
+toffee/SM
+tofu/M
+tog/SM
+toga/MDS
+together/P
+togetherness/M
+togged
+togging
+toggle/DSMG
+togs/M
+toil/MDRZGS
+toiler/M
+toilet/MDGS
+toiletry/SM
+toilette/M
+toilsome
+toke/MGDS
+token/SM
+tokenism/M
+told/AU
+tole/M
+tolerable/I
+tolerably/I
+tolerance/IM
+tolerances
+tolerant/IY
+tolerate/GNDS
+toleration/M
+toll/MDGS
+tollbooth/M
+tollbooths
+tollgate/SM
+tollway/SM
+toluene/M
+tom/SM
+tomahawk/SGMD
+tomato/M
+tomatoes
+tomb/MDGS
+tombola/S
+tomboy/MS
+tomboyish
+tombstone/MS
+tomcat/MS
+tome/MS
+tomfoolery/SM
+tomographic
+tomography/M
+tomorrow/MS
+tomtit/MS
+ton/SM
+tonal/Y
+tonality/SM
+tone's
+tone/IZGDRS
+tonearm/SM
+toneless/Y
+toner/IM
+tong/MDGS
+tongue/MGDS
+tongueless
+tonic/SM
+tonight/M
+tonnage/SM
+tonne/SM
+tonsil/MS
+tonsillectomy/SM
+tonsillitis/M
+tonsorial
+tonsure/DSMG
+tony/RT
+too
+took/A
+tool's
+tool/ADGS
+toolbar/SM
+toolbox/MS
+toolkit
+toolmaker/MS
+toot/MDRZGS
+tooter/M
+tooth/MD
+toothache/MS
+toothbrush/MS
+toothily
+toothless
+toothpaste/SM
+toothpick/SM
+toothsome
+toothy/RT
+tootle/GDS
+tootsie/S
+top/SM
+topaz/MS
+topcoat/SM
+topdressing/SM
+topee/S
+topflight
+topi
+topiary/M
+topic/SM
+topical/Y
+topicality/M
+topknot/SM
+topless
+topmast/SM
+topmost
+topnotch
+topographer/SM
+topographic
+topographical/Y
+topography/SM
+topological/Y
+topology
+topped
+topper/MS
+topping/SM
+topple/GDS
+topsail/SM
+topside/SM
+topsoil/M
+topspin/M
+toque/SM
+tor/SM
+torch/GMDS
+torchbearer/MS
+torchlight/M
+tore
+toreador/MS
+torment/SMDG
+tormenting/Y
+tormentor/MS
+torn
+tornado/M
+tornadoes
+torpedo/GMD
+torpedoes
+torpid/Y
+torpidity/M
+torpor/M
+torque/MGDS
+torrent/SM
+torrential
+torrid/YP
+torridity/M
+torridness/M
+torsion/M
+torsional
+torso/SM
+tort's
+tort/FEAS
+torte/SM
+tortellini/M
+tortilla/MS
+tortoise/MS
+tortoiseshell/SM
+tortoni/M
+tortuous/PY
+tortuousness/M
+torture/DRSMZG
+torturer/M
+torturous
+torus
+tosh
+toss/MDRSZG
+tossup/MS
+tot/SGMD
+total/GSMDY
+totalitarian/SM
+totalitarianism/M
+totality/SM
+totalizator/SM
+tote/MS
+totem/SM
+totemic
+totted
+totter/ZGMDRS
+totterer/M
+totting
+toucan/MS
+touch/AGMDS
+touchdown/SM
+touche/BJ
+touched/U
+touchily
+touchiness/M
+touching/Y
+touchline/S
+touchpaper/S
+touchscreen/MS
+touchstone/MS
+touchy/RPT
+tough/XTGMDNRYP
+toughen/ZGDR
+toughener/M
+toughie/SM
+toughness/M
+toughs
+toupee/MS
+tour/CFSGDM
+tourism/M
+tourist/MS
+touristic
+touristy
+tourmaline/M
+tournament/SM
+tourney/MS
+tourniquet/MS
+tousle/GDS
+tout/MDGS
+tow/SZGMDR
+toward/S
+towboat/MS
+towel/JGSMD
+towelette/SM
+toweling/M
+tower/GMD
+towhead/MDS
+towhee/MS
+towline/MS
+town/MS
+townee/S
+townhouse/MS
+townie/MS
+townsfolk/M
+township/MS
+townsman/M
+townsmen
+townspeople/M
+townswoman/M
+townswomen
+towpath/M
+towpaths
+towrope/SM
+toxemia/M
+toxic
+toxicity/SM
+toxicological
+toxicologist/SM
+toxicology/M
+toxin/SM
+toy/SGMD
+toyboy/S
+tr
+trabecula
+trabecular
+trabecule
+trace/JDRSMZG
+traceability
+traceable/U
+tracer/M
+tracery/SM
+trachea/M
+tracheae
+tracheal
+tracheotomy/SM
+tracing/M
+track/ZGSMDR
+trackball/SM
+tracker/M
+trackless
+tracksuit/S
+tract's
+tract/CEKFAS
+tractability/IM
+tractable/I
+tractably/I
+traction/EFACKM
+tractor/FCKMS
+trad
+trade/JDRSMZG
+trademark/SGMD
+trader/M
+tradesman/M
+tradesmen
+tradespeople/M
+tradeswoman/M
+tradeswomen
+trading/M
+tradition/MS
+traditional/Y
+traditionalism/M
+traditionalist/SM
+traduce/DRSZG
+traducer/M
+traffic/SM
+trafficked
+trafficker/SM
+trafficking/M
+tragedian/SM
+tragedienne/MS
+tragedy/SM
+tragic
+tragically
+tragicomedy/SM
+tragicomic
+trail/ZGSMDR
+trailblazer/MS
+trailblazing/M
+trailer/M
+train/ZGSMDRB
+trained/U
+trainee/SM
+trainer/M
+training/M
+trainload/MS
+trainman/M
+trainmen
+trainspotter/S
+trainspotting
+traipse/DSMG
+trait/SM
+traitor/SM
+traitorous/Y
+trajectory/SM
+tram/MS
+tramcar/S
+tramlines
+trammed
+trammel/SGMD
+trammeled/U
+tramming
+tramp/ZGSMDR
+tramper/M
+trample/DRSMZG
+trampler/M
+trampoline/MGDS
+tramway/S
+trance/MS
+tranche/S
+tranquil/RYT
+tranquility/M
+tranquilize/ZGDRS
+tranquilizer/M
+trans/I
+transact/DGS
+transaction/SM
+transactional
+transactor/MS
+transatlantic
+transceiver/SM
+transcend/GSD
+transcendence/M
+transcendent
+transcendental/Y
+transcendentalism/M
+transcendentalist/SM
+transcontinental
+transcribe/ZGDRS
+transcriber/M
+transcript/MS
+transcription/SM
+transducer/MS
+transduction
+transect/DSG
+transept/MS
+transfer/MBS
+transferal/MS
+transference/M
+transferred
+transferring
+transfiguration/M
+transfigure/GDS
+transfinite
+transfix/DSG
+transform/BSZGMDR
+transformation/SM
+transformational
+transformer/M
+transfuse/DSXGN
+transfusion/M
+transgender/S
+transgenic
+transgress/GDS
+transgression/SM
+transgressor/SM
+transience/M
+transiency/M
+transient/SMY
+transistor/SM
+transistorize/DSG
+transit/SGMD
+transition/GSMD
+transitional/Y
+transitive/ISMY
+transitiveness/M
+transitivity/M
+transitory
+transl
+translatable/U
+translate/DSGNBX
+translated/U
+translation/M
+translator/SM
+transliterate/DSGNX
+transliteration/M
+translocation
+translucence/M
+translucency/M
+translucent/Y
+transmigrate/GNDS
+transmigration/M
+transmissible
+transmission/MS
+transmit/S
+transmittable
+transmittal/M
+transmittance/M
+transmitted
+transmitter/SM
+transmitting
+transmogrification/M
+transmogrify/DSNG
+transmutation/SM
+transmute/BDSG
+transnational/MS
+transoceanic
+transom/SM
+transpacific
+transparency/SM
+transparent/Y
+transphobia/M
+transphobic
+transpiration/M
+transpire/DSG
+transplant/MDGS
+transplantation/M
+transpolar
+transponder/SM
+transport/BSZGMDR
+transportation/M
+transporter/M
+transpose/DSG
+transposition/MS
+transsexual/SM
+transsexualism/M
+transship/SL
+transshipment/M
+transshipped
+transshipping
+transubstantiation/M
+transversal
+transverse/MYS
+transvestism/M
+transvestite/MS
+trap/MS
+trapdoor/MS
+trapeze/SM
+trapezium/SM
+trapezoid/SM
+trapezoidal
+trappable
+trapped
+trapper/SM
+trapping/S
+trappings/M
+trapshooting/M
+trash/GMDS
+trashcan/MS
+trashiness/M
+trashy/RPT
+trauma/MS
+traumatic
+traumatically
+traumatize/GDS
+travail/SGMD
+travel/MDRSZGJ
+traveled/U
+traveler/M
+traveling/M
+travelogue/MS
+traversal/SM
+traverse/DSMG
+travesty/GDSM
+trawl/ZGSMDR
+trawler/M
+tray/MS
+treacherous/PY
+treacherousness/M
+treachery/SM
+treacle/M
+treacly
+tread/AGSM
+treadle/DSMG
+treadmill/MS
+treas
+treason/BM
+treasonous
+treasure/DRSMZG
+treasurer/M
+treasury/SM
+treat/AGSMD
+treatable
+treated/U
+treatise/SM
+treatment/MS
+treaty/SM
+treble/MGDS
+tree/MDS
+treeing
+treeless
+treelike
+treeline
+treetop/SM
+trefoil/SM
+trek/MS
+trekked
+trekker/SM
+trekking
+trellis/GMDS
+trematode/MS
+tremble/DSMG
+tremendous/Y
+tremolo/SM
+tremor/MS
+tremulous/PY
+tremulousness/M
+trench's
+trench/ADSG
+trenchancy/M
+trenchant/Y
+trencher/MS
+trencherman/M
+trenchermen
+trend/GSMD
+trendily
+trendiness/M
+trendsetter/S
+trendsetting
+trendy/RSMPT
+trepidation/M
+trespass/MDRSZG
+trespasser/M
+tress/EMS
+trestle/MS
+trews
+trey/MS
+triad/SM
+triage/MD
+trial/ASM
+trialed
+trialing
+triangle/SM
+triangular/Y
+triangulate/GNDS
+triangulation/M
+triathlete/S
+triathlon/SM
+tribal
+tribalism/M
+tribe/SM
+tribesman/M
+tribesmen
+tribeswoman/M
+tribeswomen
+tribulation/SM
+tribunal/SM
+tribune/MS
+tributary/SM
+tribute's
+tribute/FS
+trice/M
+tricentennial/MS
+triceps/MS
+triceratops/M
+trichina/M
+trichinae
+trichinosis/M
+trick/GSMD
+trickery/M
+trickily
+trickiness/M
+trickle/MGDS
+trickster/SM
+tricky/TRP
+tricolor/SM
+tricycle/SM
+trident/MS
+tried/U
+triennial/MYS
+trier/SM
+trifecta/SM
+trifle/MZGDRS
+trifler/M
+trifocals/M
+trig/M
+trigger/MDSG
+triglyceride/MS
+trigonometric
+trigonometrical
+trigonometry/M
+trike/SM
+trilateral/S
+trilby/SM
+trill/GSMD
+trillion/SMH
+trillionth/M
+trillionths
+trillium/M
+trilobite/SM
+trilogy/SM
+trim/PMYS
+trimaran/MS
+trimester/SM
+trimmed/U
+trimmer/SM
+trimmest
+trimming/SM
+trimmings/M
+trimness/M
+trimonthly
+trinitrotoluene/M
+trinity/SM
+trinket/SM
+trio/MS
+trip/MYS
+tripartite
+tripe/M
+triple/MGDS
+triplet/SM
+triplex/MS
+triplicate/MGDS
+tripod/MS
+tripodal
+tripos
+tripped
+tripper/SM
+tripping
+triptych/M
+triptychs
+tripwire/S
+trireme/SM
+trisect/SDG
+trisection/M
+trite/FPYT
+triteness/FM
+triter
+tritium/M
+triumph/GMD
+triumphal
+triumphalism
+triumphalist
+triumphant/Y
+triumphs
+triumvir/MS
+triumvirate/SM
+trivalent
+trivet/MS
+trivia/M
+trivial/Y
+triviality/SM
+trivialization/M
+trivialize/GDS
+trivium/M
+trochaic
+trochee/SM
+trod/AU
+trodden/A
+troglodyte/SM
+troika/MS
+troll/SGMD
+trolley/SM
+trolleybus/MS
+trollop/SM
+trombone/MS
+trombonist/MS
+tromp/SGD
+tron/S
+troop/SZGMDR
+trooper/M
+troopship/MS
+trope/SM
+trophy/SM
+tropic/MS
+tropical/Y
+tropics/M
+tropism/SM
+troposphere/SM
+trot/MS
+troth/M
+trotted
+trotter/SM
+trotting
+troubadour/MS
+trouble/DSMG
+troubled/U
+troublemaker/MS
+troubleshoot/DRZGS
+troubleshooter/M
+troubleshooting/M
+troubleshot
+troublesome/Y
+trough/M
+troughs
+trounce/DRSZG
+trouncer/M
+troupe/MZGDRS
+trouper/M
+trouser/SM
+trousers/M
+trousseau/M
+trousseaux
+trout/SM
+trove/SM
+trow/DSG
+trowel/MDSG
+troy/S
+truancy/M
+truant/GMDS
+truce/SM
+truck/SZGMDR
+trucker/M
+trucking/M
+truckle/MGDS
+truckload/SM
+truculence/M
+truculent/Y
+trudge/MGDS
+true/MTGDRS
+truelove/SM
+truffle/MS
+trug/S
+truism/MS
+truly/U
+trump/SGMD
+trumpery/M
+trumpet/ZGMDRS
+trumpeter/M
+truncate/GNDS
+truncation/M
+truncheon/SM
+trundle/MZGDRS
+trundler/M
+trunk/SGM
+truss/GMDS
+trust/ESGMD
+trustee/MS
+trusteeship/SM
+trustful/EY
+trustfulness/M
+trusting/Y
+trustworthiness/M
+trustworthy/TPR
+trusty/TRSM
+truth/ZMR
+truther/M
+truthful/UYP
+truthfulness/UM
+truthiness
+truths/U
+try's
+try/AGDS
+trying/Y
+tryout/SM
+tryptophan
+tryst/SMDG
+tsarists
+tsetse/MS
+tsp
+tsunami/SM
+ttys
+tub/SZGMDR
+tuba/MS
+tubal
+tubby/TR
+tube/MS
+tubeless/M
+tuber/M
+tubercle/SM
+tubercular
+tuberculin/M
+tuberculosis/M
+tuberculous
+tuberose/M
+tuberous
+tubful/MS
+tubing/M
+tubular
+tubule/MS
+tuck/MDRSZG
+tucker/MDG
+tuft/MDRSZG
+tufter/M
+tug/SM
+tugboat/MS
+tugged
+tugging
+tuition/IM
+tularemia/M
+tulip/SM
+tulle/M
+tum/S
+tumble/DRSMZG
+tumbledown
+tumbler/M
+tumbleweed/SM
+tumbling/M
+tumbrel/SM
+tumescence/M
+tumescent
+tumid
+tumidity/M
+tummy/SM
+tumor/SM
+tumorous
+tumult/SM
+tumultuous/Y
+tun/SZGMDR
+tuna/MS
+tundra/SM
+tune/MS
+tuneful/YP
+tunefulness/M
+tuneless/Y
+tuner/M
+tuneup/SM
+tungsten/M
+tunic/SM
+tunnel/JSMDRZG
+tunneler/M
+tunny/SM
+tuple/S
+tuppence
+tuppenny
+tuque/SM
+turban/SMD
+turbid
+turbidity/M
+turbine/SM
+turbo/SM
+turbocharge/ZGDRS
+turbocharger/M
+turbofan/SM
+turbojet/SM
+turboprop/SM
+turbot/SM
+turbulence/M
+turbulent/Y
+turd/MS
+turducken/SM
+tureen/SM
+turf/MDSG
+turfy
+turgid/Y
+turgidity/M
+turkey/SM
+turmeric/SM
+turmoil/MS
+turn/AMDRSZG
+turnabout/SM
+turnaround/SM
+turnbuckle/SM
+turncoat/SM
+turner/AM
+turning/MS
+turnip/SM
+turnkey/MS
+turnoff/MS
+turnout/MS
+turnover/MS
+turnpike/MS
+turnstile/SM
+turntable/SM
+turpentine/M
+turpitude/M
+turps
+turquoise/SM
+turret/SMD
+turtle/SM
+turtledove/SM
+turtleneck/SMD
+tush/MS
+tusk/MDS
+tussle/DSMG
+tussock/MS
+tussocky
+tut/SM
+tutelage/M
+tutelary
+tutor/SMDG
+tutored/U
+tutorial/SM
+tutorship/M
+tutted
+tutti/SM
+tutting
+tutu/MS
+tux/MS
+tuxedo/SM
+twaddle/MZGDRS
+twaddler/M
+twain/M
+twang/SMDG
+twangy/RT
+twas
+twat/S
+tweak/SMDG
+twee
+tweed/SM
+tweeds/M
+tweedy/RT
+tween
+tweet's
+tweet/ASDG
+tweeter/SM
+tweezers/M
+twelfth/M
+twelfths
+twelve/SM
+twelvemonth/M
+twelvemonths
+twentieth/M
+twentieths
+twenty/SMH
+twerk/SDG
+twerp/SM
+twice
+twiddle/MGDS
+twiddly
+twig/MS
+twigged
+twigging
+twiggy/TR
+twilight/M
+twilit
+twill/MD
+twin/MDRSZG
+twine/SM
+twiner/M
+twinge/DSMG
+twink/SY
+twinkle/MGJDS
+twinkling/M
+twinned
+twinning
+twinset/S
+twirl/SMDRZG
+twirler/M
+twirly
+twist's
+twist/USDG
+twister/MS
+twisty/TR
+twit/MS
+twitch/GMDS
+twitchy/RT
+twitted
+twitter/MDSG
+twittery
+twitting
+twixt
+two/SM
+twofer/SM
+twofold
+twopence/SM
+twopenny
+twosome/SM
+twp
+tycoon/SM
+tying/AU
+tyke/MS
+tympani/M
+tympanic
+tympanist/MS
+tympanum/SM
+type's
+type/AGDS
+typecast/GS
+typeface/MS
+typescript/MS
+typeset/S
+typesetter/MS
+typesetting/M
+typewrite/RSZG
+typewriter/M
+typewriting/M
+typewritten
+typewrote
+typhoid/M
+typhoon/MS
+typhus/M
+typical/UY
+typicality/M
+typification/M
+typify/NGDS
+typing/M
+typist/SM
+typo/MS
+typographer/SM
+typographic
+typographical/Y
+typography/M
+typology/SM
+tyrannic
+tyrannical/Y
+tyrannicidal
+tyrannicide/S
+tyrannize/GDS
+tyrannosaur/MS
+tyrannosaurus/MS
+tyrannous
+tyranny/SM
+tyrant/SM
+tyro/MS
+tzatziki
+u/S
+ubiquitous/Y
+ubiquity/M
+udder/SM
+ufologist/SM
+ufology/M
+ugh
+ugliness/M
+ugly/RTP
+uh
+uhf
+ukase/SM
+ukulele/SM
+ulcer/SM
+ulcerate/XDSGN
+ulceration/M
+ulcerous
+ulna/M
+ulnae
+ulnar
+ulster/MS
+ult
+ulterior
+ultimate/MY
+ultimatum/MS
+ultimo
+ultra/SM
+ultraconservative/SM
+ultrahigh
+ultralight/SM
+ultramarine/M
+ultramodern
+ultrasensitive
+ultrashort
+ultrasonic
+ultrasonically
+ultrasound/MS
+ultraviolet/M
+ululate/DSGNX
+ululation/M
+um
+umbel/SM
+umber/M
+umbilical
+umbilici
+umbilicus/M
+umbra/SM
+umbrage/M
+umbrella/SM
+umiak/SM
+umlaut/MS
+ump/SGMD
+umpire/MGDS
+umpteen/H
+unabridged/MS
+unacceptability
+unacceptable
+unaccommodating
+unaccountably
+unadventurous
+unaesthetic
+unalterably
+unambitious
+unanimity/M
+unanimous/Y
+unapparent
+unappetizing
+unappreciative
+unary
+unassertive
+unassimilable
+unassuming/Y
+unavailing/Y
+unaware/S
+unbeknownst
+unbend/SG
+unbent
+unbid
+unblinking/Y
+unblushing/Y
+unbosom/DG
+unbound/D
+unbox/GDS
+unbreakable
+unbroken
+uncanny/T
+uncap/S
+uncaring
+uncatalogued
+unceasing/Y
+unchangeable
+uncharacteristic
+uncharitable
+unchaste/RT
+uncial/M
+uncle/SM
+unclean/DRPT
+uncleanly/T
+unclear/DRT
+uncomfortable
+uncommon/T
+uncompelling
+uncomplaining/Y
+uncomplicated
+uncomprehending/Y
+uncompromising/Y
+unconditional/Y
+uncongenial
+unconscionable
+unconscionably
+unconscious/M
+unconstitutional/Y
+uncontrollably
+uncontroversial
+uncool
+uncooperative
+uncouth/Y
+uncrushable
+unction/SM
+unctuous/YP
+unctuousness/M
+uncut
+undaunted/Y
+undecided/SM
+undemonstrative/Y
+undeniably
+under
+underachieve/LZGDRS
+underachiever/M
+underact/SDG
+underage
+underappreciated
+underarm/SM
+underbelly/SM
+underbid/S
+underbidding
+underbrush/M
+undercarriage/MS
+undercharge/MGDS
+underclass/MS
+underclassman/M
+underclassmen
+underclothes/M
+underclothing/M
+undercoat/GJSMD
+undercoating/M
+undercover
+undercurrent/SM
+undercut/SM
+undercutting
+underdeveloped
+underdevelopment/M
+underdog/SM
+underdone
+underemployed
+underemployment/M
+underestimate/DSMGNX
+underestimation/M
+underexpose/GDS
+underexposure/MS
+underfed
+underfeed/GS
+underfloor
+underflow
+underfoot
+underfunded
+underfur/M
+undergarment/SM
+undergo/G
+undergoes
+undergone
+undergrad/S
+undergraduate/SM
+underground/MS
+undergrowth/M
+underhand
+underhanded/PY
+underhandedness/M
+underinflated
+underlain
+underlay/SM
+underlie/S
+underline/MGDS
+underling/MS
+underlip/SM
+underlying
+undermanned
+undermentioned
+undermine/GDS
+undermost
+underneath/M
+underneaths
+undernourished
+undernourishment/M
+underpaid
+underpants/M
+underpart/MS
+underpass/MS
+underpay/GSL
+underpayment/SM
+underpin/S
+underpinned
+underpinning/MS
+underplay/DGS
+underpopulated
+underprivileged
+underproduction/M
+underrate/GDS
+underrepresented
+underscore/DSMG
+undersea/S
+undersecretary/SM
+undersell/GS
+undersexed
+undershirt/SM
+undershoot/SG
+undershorts/M
+undershot
+underside/MS
+undersign/DGS
+undersigned/M
+undersized
+underskirt/SM
+undersold
+understaffed
+understand/SGBJ
+understandably
+understanding/MY
+understate/DSLG
+understatement/SM
+understood
+understudy/GDSM
+undertake/ZGJRS
+undertaken
+undertaker/M
+undertaking/M
+underthings/M
+undertone/MS
+undertook
+undertow/SM
+underused
+underutilized
+undervaluation/M
+undervalue/DSG
+underwater
+underway
+underwear/M
+underweight/M
+underwent
+underwhelm/DGS
+underwire/DS
+underworld/MS
+underwrite/ZGRS
+underwriter/M
+underwritten
+underwrote
+undesirable/MS
+undies/M
+undo
+undoubted/Y
+undramatic
+undue
+undulant
+undulate/DSXGN
+undulation/M
+undying
+unearthliness/M
+unease/M
+uneasy/T
+uneatable
+uneconomic
+unemployed/M
+unending
+unenterprising
+unequal/DY
+unerring/Y
+unessential
+uneven/Y
+unexceptionably
+unexcited
+unexciting
+unexpected/YP
+unexpectedness/M
+unfailing/Y
+unfair/PTRY
+unfaltering
+unfamiliar
+unfathomably
+unfed
+unfeeling/Y
+unfeminine
+unfit/S
+unfitting
+unfix/GDS
+unflagging/Y
+unflappability/M
+unflappable
+unflappably
+unflattering
+unflinching/Y
+unforgettably
+unforgivably
+unfortunate/MS
+unfriendly/T
+unfrock/DG
+unfruitful
+unfunny
+ungainliness/M
+ungainly/RPT
+ungenerous
+ungentle
+ungodly/T
+ungraceful/Y
+ungrudging
+unguarded
+unguent/SM
+ungulate/MS
+unhandy/T
+unhappy/T
+unhealthful
+unhealthy/T
+unhistorical
+unholy/T
+unhurt
+unicameral
+unicellular
+unicorn/SM
+unicycle/SM
+unidirectional
+unification/AM
+uniform/SMDYG
+uniformity/M
+unify/AGDSN
+unilateral/Y
+unilateralism
+unimportant
+unimpressive
+uninformative
+uninhibited/Y
+uninsured
+unintelligent
+unintended
+uninteresting
+uninterrupted/Y
+uninterruptible
+uninviting
+union/ASM
+unionism/M
+unionist/MS
+unique/YTRP
+uniqueness/M
+unisex/M
+unison/M
+unitary
+unite/AEGSD
+unitedly
+unities
+unitize/DSG
+unity/EM
+univalent
+univalve/SM
+universal/MYS
+universalism
+universalist
+universality/M
+universalize/DSG
+universe/SM
+university/SM
+univocal
+unjust/Y
+unkempt
+unkind/T
+unkindly/T
+unknowable/M
+unknown/SM
+unleaded/M
+unless
+unlike/PB
+unlikely/T
+unlit
+unlock/DSG
+unlovable
+unlovely/TR
+unloving
+unlucky/T
+unmanly/T
+unmarried
+unmeaning
+unmentionable/MS
+unmentionables/M
+unmet
+unmindful
+unmissable
+unmistakably
+unmoral
+unmovable
+unmusical
+unnecessary
+unnerving/Y
+unobservant
+unoffensive
+unofficial/Y
+unoriginal
+unpeople
+unperceptive
+unpersuasive
+unpick/GDS
+unpin/S
+unpleasing
+unpolitical
+unpopular
+unpractical
+unprecedented/Y
+unprofessional/Y
+unpromising
+unpropitious
+unquestioning/Y
+unquiet/TR
+unread/B
+unready
+unreal
+unreasoning
+unregenerate
+unrelated
+unrelenting/Y
+unrelieved/Y
+unremarkable
+unremitting/Y
+unrepentant
+unreported
+unrepresentative
+unrest/M
+unrevealing
+unripe/TR
+unroll/GDS
+unromantic
+unruliness/M
+unruly/RTP
+unsafe/YTR
+unsaleable
+unsavory
+unscathed
+unseeing/Y
+unseemly/T
+unseen/M
+unsentimental
+unset
+unshakable
+unshakably
+unshapely
+unshockable
+unshorn
+unsightliness/M
+unsightly/PT
+unsmiling
+unsociable
+unsocial
+unsold
+unsound/PRYT
+unspeakable
+unspeakably
+unspecific
+unspectacular
+unsporting
+unstable
+unsteady/TRP
+unstinting/Y
+unstrapping
+unsubstantial
+unsubtle
+unsuitable
+unsure
+unsuspecting/Y
+unsymmetrical
+untactful
+unthinkably
+unthinking/Y
+untidy/PTR
+until
+untimely/T
+untiring/Y
+untouchable/MS
+untoward
+untrue/RT
+untrustworthy
+untruth/M
+unutterable
+unutterably
+unwarrantable
+unwary/T
+unwavering
+unwed
+unwelcome/G
+unwell
+unwieldiness/M
+unwieldy/TRP
+unwise/RYT
+unworried
+unworthy/T
+unwound
+unwrapping
+unyielding
+up/S
+upbeat/MS
+upbraid/SGD
+upbringing/MS
+upchuck/SGD
+upcoming
+upcountry/M
+update/MGDRS
+updraft/MS
+upend/SGD
+upfront
+upgrade/MGDS
+upheaval/MS
+upheld
+uphill/MS
+uphold/ZGRS
+upholder/M
+upholster/ASGD
+upholsterer/MS
+upholstery/M
+upkeep/M
+upland/MS
+uplift/JSMDG
+upload/SDG
+upmarket
+upmost
+upon
+upped
+upper/SM
+uppercase/M
+upperclassman/M
+upperclassmen
+upperclasswoman
+upperclasswomen
+uppercut/MS
+uppercutting
+uppermost
+upping
+uppish
+uppity
+upraise/DSG
+uprear/GSD
+upright/MYPS
+uprightness/M
+uprising/SM
+upriver
+uproar/SM
+uproarious/Y
+uproot/GSD
+upscale
+upset/SM
+upsetting
+upshot/SM
+upside/SM
+upsilon/MS
+upstage/GDS
+upstairs
+upstanding
+upstart/MDSG
+upstate/M
+upstream
+upstroke/SM
+upsurge/MGDS
+upswing/MS
+uptake/SM
+uptempo
+upthrust/GSM
+uptick/SM
+uptight
+uptown/M
+uptrend
+upturn/GSMD
+upward/SY
+upwind
+uracil/M
+uranium/M
+urban
+urbane/RYT
+urbanity/M
+urbanization/M
+urbanize/DSG
+urbanologist/MS
+urbanology/M
+urchin/SM
+urea/M
+uremia/M
+uremic
+ureter/SM
+urethane/M
+urethra/M
+urethrae
+urethral
+urge/MGDS
+urgency/M
+urgent/Y
+uric
+urinal/SM
+urinalyses
+urinalysis/M
+urinary
+urinate/GNDS
+urination/M
+urine/M
+urn/SM
+urogenital
+urological
+urologist/MS
+urology/M
+ursine
+urticaria/M
+usability/M
+usable/UA
+usage/SM
+use/AEDSMG
+used/U
+useful/PY
+usefulness/M
+useless/YP
+uselessness/M
+user/MS
+username/MS
+usher/SMDG
+usherette/SM
+usu
+usual's
+usual/UY
+usurer/SM
+usurious
+usurp/SDRZG
+usurpation/M
+usurper/M
+usury/M
+utensil/SM
+uteri
+uterine
+uterus/M
+utilitarian/MS
+utilitarianism/M
+utility/SM
+utilization/M
+utilize/GBDS
+utmost/M
+utopia/SM
+utter/SDYG
+utterance/SM
+uttermost/M
+uveitis
+uvula/SM
+uvular/MS
+uxorious
+v/AS
+vac/S
+vacancy/SM
+vacant/Y
+vacate/DSG
+vacation/ZGMDRS
+vacationer/M
+vacationist/SM
+vaccinate/GNDSX
+vaccination/M
+vaccine/SM
+vacillate/XGNDS
+vacillation/M
+vacuity/M
+vacuole/MS
+vacuous/YP
+vacuousness/M
+vacuum/GSMD
+vagabond/SMDG
+vagabondage/M
+vagarious
+vagary/SM
+vagina/SM
+vaginae
+vaginal/Y
+vaginitis
+vagrancy/M
+vagrant/MS
+vague/RYTP
+vagueness/M
+vagus
+vain/RYT
+vainglorious/Y
+vainglory/M
+val
+valance/MS
+vale/MS
+valediction/MS
+valedictorian/SM
+valedictory/SM
+valence/MS
+valency/SM
+valentine/SM
+valet/SMDG
+valetudinarian/MS
+valetudinarianism/M
+valiance/M
+valiant/Y
+valid/Y
+validate/IGNDS
+validation/IM
+validations
+validity/IM
+validness/M
+valise/SM
+valley/SM
+valor/M
+valorous/Y
+valuable/MS
+valuate/DSG
+valuation/CAMS
+value's
+value/CAGSD
+valueless
+valuer/SM
+valve/DSMG
+valveless
+valvular
+vamoose/DSG
+vamp/AMDGS
+vampire/SM
+van/SM
+vanadium/M
+vandal/SM
+vandalism/M
+vandalize/DSG
+vane/MS
+vanguard/MS
+vanilla/SM
+vanish/JDSG
+vanity/SM
+vanned
+vanning
+vanquish/ZGDRS
+vanquisher/M
+vantage/SM
+vape/GDS
+vapid/YP
+vapidity/M
+vapidness/M
+vapor/SM
+vaporization/M
+vaporize/DRSZG
+vaporizer/M
+vaporous
+vaporware
+vapory
+vaquero/MS
+var/S
+variability/IM
+variable/ISM
+variably/I
+variance/SM
+variant/MS
+variate/NX
+variation/M
+varicolored
+varicose
+varied/U
+variegate/DSGN
+variegation/M
+varietal/SM
+variety/SM
+various/Y
+varlet/SM
+varmint/MS
+varnish/GMDS
+varnished/U
+varsity/SM
+vary/DSG
+varying/U
+vascular
+vase/MS
+vasectomy/SM
+vasoconstriction
+vasomotor
+vassal/SM
+vassalage/M
+vast/MRYTSP
+vastness/M
+vat/SM
+vatted
+vatting
+vaudeville/M
+vaudevillian/MS
+vault/SMDRZG
+vaulter/M
+vaulting/M
+vaunt/SMDG
+vb
+veal/M
+vector/SGMD
+veejay/SM
+veep/MS
+veer/MDGS
+veg/M
+vegan/SM
+veganism
+vegeburger/S
+veges
+vegetable/SM
+vegetarian/SM
+vegetarianism/M
+vegetate/GNVDS
+vegetation/M
+vegged
+vegges
+veggie/SM
+veggieburger/S
+vegging
+vehemence/M
+vehemency/M
+vehement/Y
+vehicle/MS
+vehicular
+veil's
+veil/UDGS
+vein/MDGS
+vela
+velar/SM
+veld/MS
+vellum/M
+velocipede/MS
+velocity/SM
+velodrome/S
+velour/MS
+velum/M
+velvet/M
+velveteen/M
+velvety
+venal/Y
+venality/M
+venation/M
+vend/DGS
+vendetta/SM
+vendible
+vendor/MS
+veneer/MDGS
+venerability/M
+venerable
+venerate/DSGN
+veneration/M
+venereal
+vengeance/M
+vengeful/AY
+venial
+venireman/M
+veniremen
+venison/M
+venom/M
+venomous/Y
+venous
+vent's
+vent/DGS
+ventilate/GNDS
+ventilation/M
+ventilator/SM
+ventilatory
+ventral
+ventricle/SM
+ventricular
+ventriloquism/M
+ventriloquist/SM
+ventriloquy/M
+venture/DSMG
+venturesome/PY
+venturesomeness/M
+venturous/PY
+venturousness/M
+venue/ASM
+veracious/Y
+veracity/M
+veranda/SM
+verapamil
+verb/KMS
+verbal/MYS
+verbalization/M
+verbalize/GDS
+verbatim
+verbena/SM
+verbiage/MS
+verbose/Y
+verbosity/M
+verboten
+verdant/Y
+verdict/SM
+verdigris/GMDS
+verdure/M
+verge's
+verge/FDSG
+verger/MS
+verifiable/U
+verification/M
+verified/U
+verify/DSNG
+verily
+verisimilitude/M
+veritable
+veritably
+verity/SM
+vermicelli/M
+vermiculite/M
+vermiform
+vermilion/M
+vermin/M
+verminous
+vermouth/M
+vernacular/MS
+vernal
+vernier/SM
+veronica/M
+verruca/SM
+verrucae
+versa
+versatile
+versatility/M
+verse/AFNGMSDX
+versed/U
+versification/M
+versifier/M
+versify/ZGNDRS
+version/AFIMS
+versioned
+versioning
+verso/SM
+versus
+vert/A
+vertebra/M
+vertebrae
+vertebral
+vertebrate/IMS
+vertex/MS
+vertical/MYS
+vertices
+vertiginous
+vertigo/M
+verve/M
+very/RT
+vesicle/SM
+vesicular
+vesiculate
+vesper/MS
+vessel/MS
+vest's
+vest/ILDGS
+vestal/MS
+vestibule/MS
+vestige/SM
+vestigial/Y
+vesting/M
+vestment/IMS
+vestry/SM
+vestryman/M
+vestrymen
+vet/SM
+vetch/MS
+veteran/SM
+veterinarian/MS
+veterinary/SM
+veto/MDG
+vetoes
+vetted
+vetting
+vex/GDS
+vexation/SM
+vexatious/Y
+vhf
+vi
+via
+viability/M
+viable
+viably
+viaduct/SM
+vial/MS
+viand/SM
+vibe/MS
+vibes/M
+vibraharp/SM
+vibrancy/M
+vibrant/Y
+vibraphone/MS
+vibraphonist/MS
+vibrate/GNDSX
+vibration/M
+vibrato/MS
+vibrator/SM
+vibratory
+viburnum/SM
+vicar/SM
+vicarage/SM
+vicarious/YP
+vicariousness/M
+vice/CMS
+viced
+vicegerent/SM
+vicennial
+viceregal
+viceroy/MS
+vichyssoise/M
+vicing
+vicinity/M
+vicious/YP
+viciousness/M
+vicissitude/SM
+victim/MS
+victimization/M
+victimize/GDS
+victimless
+victor/MS
+victorious/Y
+victory/SM
+victual/SMDG
+vicuna/MS
+videlicet
+video/GSMD
+videocassette/SM
+videoconferencing
+videodisc/MS
+videophone/MS
+videotape/DSMG
+videotex
+vie/DS
+view/AMDRSZG
+viewable
+viewer/AM
+viewership/M
+viewfinder/SM
+viewing/SM
+viewpoint/MS
+vigesimal
+vigil/SM
+vigilance/M
+vigilant/Y
+vigilante/SM
+vigilantism/M
+vigilantist/M
+vignette/DSMG
+vignettist/MS
+vigor/M
+vigorous/Y
+vii
+viii
+viking/MS
+vile/YTPR
+vileness/M
+vilification/M
+vilify/DSNG
+villa/SM
+village/RSMZ
+villager/M
+villain/SM
+villainous
+villainy/SM
+villein/SM
+villeinage/M
+villi
+villus/M
+vim/M
+vinaigrette/M
+vincible/I
+vindicate/XDSGN
+vindication/M
+vindicator/MS
+vindictive/PY
+vindictiveness/M
+vine/MS
+vinegar/M
+vinegary
+vineyard/MS
+vino/M
+vinous
+vintage/MS
+vintner/MS
+vinyl/SM
+viol/MBS
+viola/SM
+violable/I
+violate/GNDSX
+violation/M
+violator/SM
+violence/M
+violent/Y
+violet/MS
+violin/MS
+violincello/S
+violinist/SM
+violist/MS
+violoncellist/SM
+violoncello/MS
+viper/SM
+viperous
+virago/M
+viragoes
+viral
+vireo/SM
+virgin/MS
+virginal/SM
+virginity/M
+virgule/MS
+virile
+virility/M
+virologist/SM
+virology/M
+virtual/Y
+virtualization
+virtue/SM
+virtuosity/M
+virtuoso/M
+virtuous/YP
+virtuousness/M
+virulence/M
+virulent/Y
+virus/MS
+visa/MDSG
+visage/MS
+viscera
+visceral/Y
+viscid
+viscose/M
+viscosity/M
+viscount/SM
+viscountcy/SM
+viscountess/MS
+viscous
+viscus/M
+vise/ACMGDS
+visibility/IM
+visible/I
+visibly/I
+vision/KGDSM
+visionary/SM
+visit's
+visit/ASGD
+visitant/MS
+visitation/MS
+visitor/MS
+visor/SM
+vista/SM
+visual/SMY
+visualization/SM
+visualize/DRSZG
+visualizer/M
+vita/M
+vitae
+vital/SY
+vitality/M
+vitalization/AM
+vitalize/CAGSD
+vitals/M
+vitamin/MS
+vitiate/GNDS
+vitiation/M
+viticulture/M
+viticulturist/MS
+vitreous
+vitrifaction/M
+vitrification/M
+vitrify/GNDS
+vitrine/SM
+vitriol/M
+vitriolic
+vitriolically
+vittles/M
+vituperate/GNVDS
+vituperation/M
+viva/MS
+vivace
+vivacious/PY
+vivaciousness/M
+vivacity/M
+vivaria
+vivarium/SM
+vivid/RYTP
+vividness/M
+vivify/ADSG
+viviparous
+vivisect/DGS
+vivisection/M
+vivisectional
+vivisectionist/SM
+vixen/SM
+vixenish/Y
+viz
+vizier/SM
+vlf
+vocab
+vocable/MS
+vocabulary/SM
+vocal/SMY
+vocalic
+vocalist/SM
+vocalization/MS
+vocalize/DSG
+vocation/FIKASM
+vocational/Y
+vocative/MS
+vociferate/DSGN
+vociferation/M
+vociferous/YP
+vociferousness/M
+vodka/SM
+vogue/SM
+voguish
+voice/IDSMG
+voiced/U
+voiceless/PY
+voicelessness/M
+voicemail/SM
+void/MDSGB
+voila
+voile/M
+vol/S
+volatile
+volatility/M
+volatilize/DSG
+volcanic
+volcanism
+volcano/M
+volcanoes
+vole/MS
+volition/M
+volitional
+volley/GSMD
+volleyball/MS
+volt/AMS
+voltage/MS
+voltaic
+voltmeter/SM
+volubility/M
+voluble
+volubly
+volume/SM
+volumetric
+voluminous/YP
+voluminousness/M
+voluntarily/I
+voluntarism/M
+voluntary/SM
+volunteer/SGMD
+volunteerism/M
+voluptuary/SM
+voluptuous/PY
+voluptuousness/M
+volute/SM
+vomit/SMDG
+voodoo/GSMD
+voodooism/M
+voracious/PY
+voraciousness/M
+voracity/M
+vortex/MS
+votary/SM
+vote's
+vote/CGVDS
+voter/SM
+vouch/DRSZG
+voucher/M
+vouchsafe/DSG
+vow/SGMD
+vowel/SM
+voyage/MZGDRS
+voyager/M
+voyageur/SM
+voyeur/MS
+voyeurism/M
+voyeuristic
+vulcanization/M
+vulcanize/GDS
+vulgar/RYT
+vulgarian/MS
+vulgarism/MS
+vulgarity/SM
+vulgarization/M
+vulgarize/ZGDRS
+vulgarizer/M
+vulnerabilities
+vulnerability/IM
+vulnerable/I
+vulnerably/I
+vulpine
+vulture/SM
+vulturous
+vulva/M
+vulvae
+vuvuzela/MS
+vying
+w/DNXTGVJ
+wabbit/S
+wack/MRTS
+wackiness/M
+wacko/SM
+wacky/RPT
+wad/SZGMDR
+wadded
+wadding/M
+waddle/DSMG
+wade/MS
+wader/M
+waders/M
+wadge/S
+wadi/MS
+wafer/SM
+waffle/MZGDRS
+waffler/M
+waft/MDGS
+wag/SZGMDR
+wage/MS
+waged/U
+wager/ZGMDR
+wagerer/M
+wagged
+waggery/SM
+wagging
+waggish/YP
+waggishness/M
+waggle/MGDS
+wagon/ZSMR
+wagoner/M
+wagtail/SM
+waif/MS
+wail/MDRZGS
+wailer/M
+wailing/M
+wain/MS
+wainscot/SJMDG
+wainscoting/M
+wainwright/MS
+waist/SM
+waistband/MS
+waistcoat/MS
+waistline/MS
+wait/MDRZGS
+waiter/M
+waiting/M
+waitperson/MS
+waitress/MS
+waitstaff/M
+waive/DRSZG
+waiver/M
+wake/MGJDS
+wakeful/PY
+wakefulness/M
+waken/GSD
+waldo/S
+waldoes
+wale/MGDS
+walk/MDRZGS
+walkabout/S
+walkaway/MS
+walker/M
+walkies
+walking/M
+walkout/SM
+walkover/MS
+walkway/SM
+wall/MDGS
+wallaby/SM
+wallah
+wallahs
+wallboard/M
+wallet/MS
+walleye/DSM
+wallflower/MS
+wallop/MDSJG
+walloping/M
+wallow/MDSG
+wallpaper/SMDG
+wally/S
+walnut/MS
+walrus/MS
+waltz/ZGMDRS
+waltzer/M
+wampum/M
+wan/GPDY
+wand/MS
+wander/DRSJZG
+wanderer/M
+wanderings/M
+wanderlust/SM
+wane/MS
+wangle/MZGDRS
+wangler/M
+wank/DRZGS
+wanna
+wannabe/SM
+wannabee/S
+wanner
+wanness/M
+wannest
+want/MDGS
+wanted/U
+wanton/MDYSPG
+wantonness/M
+wapiti/MS
+war/SM
+warble/MZGDRS
+warbler/M
+warbonnet/SM
+ward/AMDGS
+warden/MS
+warder/MS
+wardress/S
+wardrobe/SM
+wardroom/SM
+ware/MS
+warehouse/DSMG
+warez
+warfare/M
+warfarin
+warhead/MS
+warhorse/SM
+warily/U
+wariness/UM
+warlike
+warlock/MS
+warlord/MS
+warm/PDRYHZTGS
+warmblooded
+warmer/M
+warmhearted/P
+warmheartedness/M
+warmish
+warmness/M
+warmonger/SMG
+warmongering/M
+warmth/M
+warn/JDGS
+warning/M
+warp/MDGS
+warpaint
+warpath/M
+warpaths
+warplane/MS
+warrant/GMDS
+warranted/U
+warranty/DSMG
+warred
+warren/MS
+warring
+warrior/SM
+warship/SM
+wart/MS
+warthog/SM
+wartime/M
+warty/TR
+wary/UPRT
+was
+wasabi
+wash/BJMDRSZG
+washable/SM
+washbasin/SM
+washboard/SM
+washbowl/SM
+washcloth/M
+washcloths
+washed/U
+washer/M
+washerwoman/M
+washerwomen
+washing/M
+washout/MS
+washrag/MS
+washroom/MS
+washstand/SM
+washtub/MS
+washy/TR
+wasn't
+wasp/MS
+waspish/YP
+waspishness/M
+wassail/SMDG
+wast
+wastage/M
+waste/DRSMZG
+wastebasket/MS
+wasteful/PY
+wastefulness/M
+wasteland/SM
+wastepaper/M
+waster/M
+wastewater
+wastrel/SM
+watch/BZGMDRS
+watchable/U
+watchband/MS
+watchdog/SM
+watcher/M
+watchful/YP
+watchfulness/M
+watchmaker/MS
+watchmaking/M
+watchman/M
+watchmen
+watchstrap/S
+watchtower/SM
+watchword/MS
+water/GSMD
+waterbed/MS
+waterbird/SM
+waterboard/MDJSG
+waterboarding/M
+waterborne
+watercolor/MS
+watercourse/SM
+watercraft/M
+watercress/M
+waterfall/SM
+waterfowl/SM
+waterfront/MS
+waterhole/SM
+wateriness/M
+waterlily/SM
+waterline/MS
+waterlogged
+watermark/MDGS
+watermelon/SM
+watermill/MS
+waterproof/SMDG
+waterproofing/M
+waters/M
+watershed/MS
+waterside/MS
+waterspout/SM
+watertight
+waterway/MS
+waterwheel/SM
+waterworks/M
+watery/PTR
+watt/MS
+wattage/M
+wattle/MGDS
+wave/MZGDRS
+waveband/S
+waveform
+wavefront
+wavelength/M
+wavelengths
+wavelet/SM
+wavelike
+waver/ZGMDR
+waverer/M
+wavering/Y
+waviness/M
+wavy/PRT
+wax/GMDNS
+waxiness/M
+waxwing/SM
+waxwork/SM
+waxy/RPT
+way/SM
+waybill/SM
+wayfarer/MS
+wayfaring/SM
+waylaid
+waylay/RSZG
+waylayer/M
+wayside/SM
+wayward/PY
+waywardness/M
+wazoo/S
+we
+we'd
+we'll
+we're
+we've
+weak/PNRYXT
+weaken/DRZG
+weakener/M
+weakfish/MS
+weakish
+weakling/SM
+weakness/MS
+weal/MHS
+wealth/M
+wealthiness/M
+wealthy/TRP
+wean/DGS
+weapon/MS
+weaponize/GDS
+weaponless
+weaponry/M
+wear/MRBJSZG
+wearable/U
+wearer/M
+wearied/U
+wearily
+weariness/M
+wearisome/Y
+weary/TGDRSP
+weasel/MDYSG
+weather/SMDG
+weatherboard/SG
+weathercock/MS
+weathering/M
+weatherization/M
+weatherize/DSG
+weatherman/M
+weathermen
+weatherperson/MS
+weatherproof/GSD
+weatherstrip/S
+weatherstripped
+weatherstripping/M
+weave/DRSMZG
+weaver/M
+weaving/M
+web/SM
+webbed
+webbing/M
+webcam/MS
+webcast/SMG
+webfeet
+webfoot/M
+webinar/SM
+webisode/MS
+weblog/MS
+webmaster/SM
+webmistress/MS
+website/SM
+wed/AS
+wedded/A
+wedder
+wedding/SM
+wedge/DSMG
+wedgie/MS
+wedlock/M
+wee/RSMT
+weed/MDRSZG
+weeder/M
+weedkiller/S
+weedless
+weedy/TR
+weeing
+week/MYS
+weekday/SM
+weekend/SZGMDR
+weekly/SM
+weeknight/SM
+ween/DSG
+weenie/MTRS
+weensy/RT
+weeny
+weep/MRJSZG
+weeper/M
+weepie
+weepy/TRSM
+weevil/MS
+weft/MS
+weigh's
+weigh/AGD
+weighbridge/S
+weighs/A
+weight/MDSJG
+weighted/U
+weightily
+weightiness/M
+weightless/YP
+weightlessness/M
+weightlifter/MS
+weightlifting/M
+weighty/PTR
+weir/MS
+weird/PTRY
+weirdie/MS
+weirdness/M
+weirdo/MS
+welcome/MGDS
+weld/MDRBSZG
+welder/M
+welfare/M
+welkin/M
+well/MDPSG
+wellhead/SM
+wellie
+wellington/MS
+wellness/M
+wellspring/MS
+welly/S
+welsh/ZGDRS
+welsher/M
+welt/MDRSZG
+welter/GMD
+welterweight/SM
+wen/M
+wench/MS
+wend/DSG
+went
+wept
+were
+weren't
+werewolf/M
+werewolves
+west/M
+westbound
+westerly/SM
+western/SZMR
+westerner/M
+westernization/M
+westernize/GDS
+westernmost
+westward/S
+wet/SMYP
+wetback/SM
+wetland/SM
+wetness/M
+wetter/SM
+wettest
+wetting
+wetware/S
+whack/SJZGMDR
+whacker/M
+whale/DRSMZG
+whaleboat/MS
+whalebone/M
+whaler/M
+whaling/M
+wham/MS
+whammed
+whamming
+whammy/SM
+wharf/M
+wharves
+what/MS
+whatchamacallit/MS
+whatever
+whatnot/M
+whatshername
+whatshisname
+whatsit/S
+whatsoever
+wheal/SM
+wheat/MN
+wheatgerm
+wheatmeal
+whee
+wheedle/DRSZG
+wheedler/M
+wheel/SMDRG
+wheelbarrow/SM
+wheelbase/SM
+wheelchair/SM
+wheelhouse/MS
+wheelie/SM
+wheelwright/MS
+wheeze/DSMG
+wheezily
+wheeziness/M
+wheezy/PRT
+whelk/SMD
+whelm/SDG
+whelp/SMDG
+when/MS
+whence
+whenever
+whensoever
+where/SM
+whereabouts/M
+whereas
+whereat
+whereby
+wherefore/MS
+wherein
+whereof
+whereon
+wheresoever
+whereto
+whereupon
+wherever
+wherewith
+wherewithal/M
+wherry/SM
+whet/S
+whether
+whetstone/SM
+whetted
+whetting
+whew
+whey/M
+which
+whichever
+whiff/SMDG
+whiffletree/MS
+while/DSMG
+whilom
+whilst
+whim/MS
+whimper/MDGS
+whimsical/Y
+whimsicality/M
+whimsy/SM
+whine/DRSMZG
+whiner/M
+whinge/DRSZG
+whingeing
+whinny/GDSM
+whiny/RT
+whip/MS
+whipcord/M
+whiplash/MS
+whipped
+whipper/MS
+whippersnapper/MS
+whippet/MS
+whipping/SM
+whippletree/SM
+whippoorwill/MS
+whipsaw/MDGS
+whir/MS
+whirl/SMDG
+whirligig/MS
+whirlpool/MS
+whirlwind/MS
+whirlybird/SM
+whirred
+whirring
+whisk/SMDRZG
+whisker/MD
+whiskery
+whiskey/MS
+whiskys
+whisper/MDRSZG
+whisperer/M
+whist/M
+whistle/MZGDRS
+whistler/M
+whit/MDNRSXTGJ
+white/SPM
+whitebait
+whiteboard/S
+whitecap/SM
+whitefish/MS
+whitehead/MS
+whitelist/GDS
+whiten/ZGDRJ
+whitener/M
+whiteness/M
+whitening/M
+whiteout/SM
+whitetail/MS
+whitewall/SM
+whitewash/MDSG
+whitewater/M
+whitey/SM
+whither
+whiting/M
+whitish
+whittle/ZGDRS
+whittler/M
+whiz/M
+whizkid/M
+whizzbang/MS
+whizzed
+whizzes
+whizzing
+who'd
+who'll
+who're
+who've
+who/M
+whoa
+whodunit/MS
+whoever
+whole/SMP
+wholefood/S
+wholegrain
+wholehearted/YP
+wholeheartedness/M
+wholemeal
+wholeness/M
+wholesale/MZGDRS
+wholesaler/M
+wholesome/UP
+wholesomely
+wholesomeness/UM
+wholewheat
+wholly
+whom
+whomever
+whomsoever
+whoop/SMDRZG
+whoopee/S
+whooper/M
+whoosh/MDSG
+whop/S
+whopped
+whopper/SM
+whopping
+whore/SMG
+whorehouse/MS
+whoreish
+whorish
+whorl/SMD
+whose
+whoso
+whosoever
+whup/S
+whupped
+whupping
+why'd
+why/M
+whys
+wick/MDRSZ
+wicked/TPRY
+wickedness/M
+wicker/M
+wickerwork/M
+wicket/SM
+wide/YTRP
+widemouthed
+widen/SDRZG
+widener/M
+wideness/M
+widescreen/MS
+widespread
+widget/S
+widow/SMDRZG
+widower/M
+widowhood/M
+width/M
+widths
+wield/SDRZG
+wielder/M
+wiener/SM
+wienie/SM
+wife/MY
+wifeless
+wig/SM
+wigeon/M
+wigged
+wigging
+wiggle/DRSMZG
+wiggler/M
+wiggly/TR
+wight/SM
+wiglet/SM
+wigwag/SM
+wigwagged
+wigwagging
+wigwam/SM
+wiki/MS
+wild/MRYSTP
+wildcard/MS
+wildcat/MS
+wildcatted
+wildcatter/MS
+wildcatting
+wildebeest/MS
+wilderness/MS
+wildfire/MS
+wildflower/SM
+wildfowl/M
+wildlife/M
+wildness/M
+wilds/M
+wile/MGDS
+wiliness/M
+will/MDS
+willful/PY
+willfulness/M
+willies/M
+willing/UPY
+willingness/UM
+williwaw/MS
+willow/SM
+willowy
+willpower/M
+willy/S
+wilt/MDSG
+wily/RTP
+wimp/MDSG
+wimpish
+wimple/DSMG
+wimpy/RT
+win/SGMD
+wince/DSMG
+winch/MDSG
+wind's
+wind/UASG
+windbag/SM
+windblown
+windbreak/SZMR
+windbreaker/M
+windburn/MD
+windcheater/S
+windchill/M
+winded
+winder/SM
+windfall/MS
+windflower/MS
+windily
+windiness/M
+winding's
+windjammer/SM
+windlass/MS
+windless
+windmill/MDGS
+window/SMDG
+windowless
+windowpane/SM
+windowsill/SM
+windpipe/MS
+windproof
+windrow/SM
+windscreen/SM
+windshield/SM
+windsock/MS
+windstorm/MS
+windsurf/ZGDRS
+windsurfer/M
+windsurfing/M
+windswept
+windup/SM
+windward/M
+windy/RTP
+wine/MS
+wineglass/MS
+winegrower/MS
+winemaker/MS
+winery/SM
+wing/MDRZG
+wingding/MS
+wingless
+winglike
+wingnut/SM
+wingspan/MS
+wingspread/SM
+wingtip/SM
+wink/MDRSZG
+winker/M
+winkle/DSMG
+winnable/U
+winner/SM
+winning/MYS
+winnow/ZGSDR
+winnower/M
+wino/MS
+winsome/YTRP
+winsomeness/M
+winter/GSMD
+wintergreen/M
+winterize/GDS
+wintertime/M
+wintry/TR
+winy/RT
+wipe/MZGDRS
+wiper/M
+wire's
+wire/AGDS
+wired/S
+wirehair/MS
+wireless/MS
+wiretap/MS
+wiretapped
+wiretapper/SM
+wiretapping/M
+wiriness/M
+wiring/M
+wiry/RTP
+wisdom/M
+wise/MYTGDRS
+wiseacre/SM
+wisecrack/MDSG
+wiseguy/S
+wish/MDRSZG
+wishbone/SM
+wisher/M
+wishful/Y
+wishlist's
+wisp/MS
+wispy/RT
+wist
+wisteria/SM
+wistful/YP
+wistfulness/M
+wit/SM
+witch/MDSG
+witchcraft/M
+witchery/M
+with
+withal
+withdraw/SG
+withdrawal/MS
+withdrawn
+withdrew
+withe/DRSMZG
+wither/JGD
+withering/Y
+withers/M
+withheld
+withhold/SG
+withholding/M
+within/M
+without
+withstand/GS
+withstood
+witless/PY
+witlessness/M
+witness/MDSG
+wits/M
+witted
+witter/SGD
+witticism/SM
+wittily
+wittiness/M
+witting/UY
+witty/RPT
+wive/GDS
+wiz
+wizard/SMY
+wizardry/M
+wizened
+wk/Y
+woad/M
+wobble/MGDS
+wobbliness/M
+wobbly/RTP
+wodge/S
+woe/SM
+woebegone
+woeful/YP
+woefuller
+woefullest
+woefulness/M
+wog/S
+wok/SMN
+woke
+wold/MS
+wolf/MDSG
+wolfhound/SM
+wolfish
+wolfram/M
+wolverine/SM
+wolves
+woman/M
+womanhood/M
+womanish
+womanize/DRSZG
+womanizer/M
+womankind/M
+womanlike/M
+womanliness/M
+womanly/RPT
+womb/MS
+wombat/MS
+womble/S
+women/M
+womenfolk/SM
+womenfolks/M
+won't
+won/M
+wonder/MDGLS
+wonderful/YP
+wonderfulness/M
+wondering/Y
+wonderland/MS
+wonderment/M
+wondrous/Y
+wonk/MS
+wonky/TR
+wont/MD
+wonted/U
+woo/SZGDR
+wood/MDNSG
+woodbine/M
+woodblock/MS
+woodcarver/MS
+woodcarving/SM
+woodchuck/MS
+woodcock/SM
+woodcraft/M
+woodcut/SM
+woodcutter/SM
+woodcutting/M
+wooden/RYTP
+woodenness/M
+woodiness/M
+woodland/SM
+woodlice
+woodlot/SM
+woodlouse
+woodman/M
+woodmen
+woodpecker/MS
+woodpile/SM
+woods/M
+woodshed/SM
+woodsiness/M
+woodsman/M
+woodsmen
+woodsy/RTP
+woodwind/MS
+woodwork/MRZG
+woodworker/M
+woodworking/M
+woodworm/S
+woody/TPRSM
+wooer/M
+woof/MDRSZG
+woofer/M
+wool/MNX
+woolen/M
+woolgathering/M
+wooliness
+woolliness/M
+woolly/RSMPT
+woozily
+wooziness/M
+woozy/TRP
+wop/S!
+word's
+word/ADSG
+wordage/M
+wordbook/SM
+wordily
+wordiness/M
+wording/SM
+wordless/Y
+wordplay/M
+wordsmith
+wordsmiths
+wordy/TPR
+wore
+work's
+work/ADJSG
+workable/U
+workaday
+workaholic/SM
+workaround/S
+workbasket/S
+workbench/MS
+workbook/MS
+workday/SM
+worker/MS
+workfare/M
+workflow/MS
+workforce/M
+workhorse/SM
+workhouse/SM
+working's
+workingman/M
+workingmen
+workings/M
+workingwoman/M
+workingwomen
+workload/MS
+workman/M
+workmanlike
+workmanship/M
+workmate/S
+workmen
+workout/SM
+workplace/MS
+workroom/MS
+works/M
+worksheet/MS
+workshop/MS
+workshy
+worksite/S
+workspace
+workstation/MS
+worktable/MS
+worktop/S
+workup/MS
+workweek/SM
+world/SM
+worldlier
+worldliness/UM
+worldly/UTP
+worldview/SM
+worldwide
+worm/MDSG
+wormhole/MS
+wormwood/M
+wormy/TR
+worn/U
+worried/Y
+worrier/M
+worriment/M
+worrisome
+worry/ZGDRSMJ
+worrying/Y
+worrywart/SM
+worse/M
+worsen/DSG
+worship/ZGSMDR
+worshiper/M
+worshipful
+worst/SGMD
+worsted/M
+wort/M
+worth/M
+worthies
+worthily/U
+worthiness/UM
+worthless/PY
+worthlessness/M
+worthwhile
+worthy's
+worthy/UPRT
+wot
+wotcha
+would've
+would/S
+wouldn't
+wouldst
+wound/SGMDR
+wove/A
+woven/AU
+wow/SGMD
+wpm
+wrack/GSMD
+wraith/M
+wraiths
+wrangle/DRSMZGJ
+wrangler/M
+wrap's
+wrap/US
+wraparound/SM
+wrapped/U
+wrapper/SM
+wrapping/MS
+wrasse/MS
+wrath/M
+wrathful/Y
+wreak/SGD
+wreath/MDSG
+wreathe
+wreaths
+wreck/SZGMDR
+wreckage/M
+wrecker/M
+wren/MS
+wrench/MDSG
+wrest/SGMD
+wrestle/MZGDRS
+wrestler/M
+wrestling/M
+wretch/MS
+wretched/TPRY
+wretchedness/M
+wriggle/MZGDRS
+wriggler/M
+wriggly
+wright/MS
+wring/SZGMR
+wringer/M
+wrinkle/MGDS
+wrinkled/U
+wrinkly/TRSM
+wrist/SM
+wristband/MS
+wristwatch/MS
+writ/MRBJSZG
+write/S
+writer/M
+writhe/MGDS
+writing/M
+written/AU
+wrong/STGMPDRY
+wrongdoer/SM
+wrongdoing/SM
+wrongful/PY
+wrongfulness/M
+wrongheaded/YP
+wrongheadedness/M
+wrongness/M
+wrote/A
+wroth
+wrought
+wrung
+wry/Y
+wryer
+wryest
+wryness/M
+wt
+wunderkind/S
+wurst/SM
+wuss/MS
+wussy/RSMT
+x
+xci
+xcii
+xciv
+xcix
+xcvi
+xcvii
+xenon/M
+xenophobe/MS
+xenophobia/M
+xenophobic
+xerographic
+xerography/M
+xerox/MDSG
+xi/SM
+xii
+xiii
+xiv
+xix
+xor
+xref/S
+xterm/M
+xv
+xvi
+xvii
+xviii
+xx
+xxi
+xxii
+xxiii
+xxiv
+xxix
+xxv
+xxvi
+xxvii
+xxviii
+xxx
+xxxi
+xxxii
+xxxiii
+xxxiv
+xxxix
+xxxv
+xxxvi
+xxxvii
+xxxviii
+xylem/M
+xylene
+xylophone/SM
+xylophonist/MS
+y'all
+y/F
+ya
+yacht/SMDG
+yachting/M
+yachtsman/M
+yachtsmen
+yachtswoman/M
+yachtswomen
+yahoo/SM
+yak/SM
+yakked
+yakking
+yam/SM
+yammer/SZGMDR
+yammerer/M
+yang/M
+yank/MDSG
+yap/SM
+yapped
+yapping
+yard/MS
+yardage/MS
+yardarm/MS
+yardman/M
+yardmaster/MS
+yardmen
+yardstick/MS
+yarmulke/SM
+yarn/MS
+yarrow/M
+yashmak/S
+yaw/SGMD
+yawl/MS
+yawn/MDRSZG
+yawner/M
+yaws/M
+yd
+ye/RST
+yea/SM
+yeah/M
+yeahs
+year/MYS
+yearbook/MS
+yearling/MS
+yearlong
+yearly/SM
+yearn/GSJD
+yearning/M
+yeast/SM
+yeasty/RT
+yegg/MS
+yell/MDSG
+yellow/MDRTGPS
+yellowhammer/S
+yellowish
+yellowness/M
+yellowy
+yelp/MDSG
+yen/SM
+yeoman/M
+yeomanry/M
+yeomen
+yep/SM
+yes/MS
+yeshiva/SM
+yessed
+yessing
+yesterday/MS
+yesteryear/M
+yet
+yeti/MS
+yew/SM
+yid/S
+yield/JSGMD
+yikes
+yin/M
+yip/SM
+yipe
+yipped
+yippee
+yipping
+yo
+yob/S
+yobbo/S
+yodel/SMDRZG
+yodeler/M
+yoga/M
+yogi/MS
+yogic
+yogurt/SM
+yoke's
+yoke/UGDS
+yokel/SM
+yolk/MDS
+yon
+yonder
+yonks
+yore/M
+you'd
+you'll
+you're
+you've
+you/SMH
+young/TMR
+youngish
+youngster/MS
+your/S
+yourself
+yourselves
+youth/M
+youthful/YP
+youthfulness/M
+youths
+yow
+yowl/MDSG
+yr/S
+ytterbium/M
+yttrium/M
+yuan/M
+yucca/SM
+yuck
+yucky/TR
+yuk/SM
+yukked
+yukking
+yukky
+yule/M
+yuletide/M
+yum
+yummy/TR
+yup/SM
+yuppie/MS
+yuppify/GDS
+yurt/MS
+z/DNXTGJ
+zaniness/M
+zany/RSMPT
+zap/SM
+zapped
+zapper/MS
+zapping
+zappy
+zeal/M
+zealot/MS
+zealotry/M
+zealous/YP
+zealousness/M
+zebra/SM
+zebu/MS
+zed/SM
+zeitgeist/SM
+zenith/M
+zeniths
+zenned
+zeolite/S
+zephyr/MS
+zeppelin/MS
+zero/MDHSG
+zeroes
+zest/MS
+zestful/YP
+zestfulness/M
+zesty/RT
+zeta/MS
+zigzag/SM
+zigzagged
+zigzagging
+zilch/M
+zillion/MS
+zinc/MS
+zincked
+zincking
+zine/S
+zinfandel/M
+zing/MDRZG
+zinger/M
+zingy/RT
+zinnia/MS
+zip's
+zip/US
+zipped/U
+zipper/MDGS
+zipping/U
+zippy/TR
+zircon/MS
+zirconium/M
+zit/SM
+zither/MS
+zloty/SM
+zlotys
+zodiac/MS
+zodiacal
+zombie/MS
+zonal/Y
+zone's
+zone/AGDS
+zoning/M
+zonked
+zoo/SM
+zookeeper/SM
+zoological/Y
+zoologist/SM
+zoology/M
+zoom/MDSG
+zoophyte/SM
+zoophytic
+zooplankton
+zorch
+zoster
+zounds
+zucchini/MS
+zwieback/M
+zydeco/M
+zygote/SM
+zygotic
+zymurgy/M
diff --git a/public/dictionaries/en/license b/public/dictionaries/en/license
new file mode 100644
index 00000000..6b5b4908
--- /dev/null
+++ b/public/dictionaries/en/license
@@ -0,0 +1,347 @@
+en_US Hunspell Dictionary
+Version 2020.12.07
+Mon Dec 7 20:14:35 2020 -0500 [5ef55f9]
+http://wordlist.sourceforge.net
+
+README file for English Hunspell dictionaries derived from SCOWL.
+
+These dictionaries are created using the speller/make-hunspell-dict
+script in SCOWL.
+
+The following dictionaries are available:
+
+  en_US (American)
+  en_CA (Canadian)
+  en_GB-ise (British with "ise" spelling)
+  en_GB-ize (British with "ize" spelling)
+  en_AU (Australian)
+
+  en_US-large
+  en_CA-large
+  en_GB-large (with both "ise" and "ize" spelling)
+  en_AU-large
+
+The normal (non-large) dictionaries correspond to SCOWL size 60 and,
+to encourage consistent spelling, generally only include one spelling
+variant for a word.  The large dictionaries correspond to SCOWL size
+70 and may include multiple spelling for a word when both variants are
+considered almost equal.  The larger dictionaries however (1) have not
+been as carefully checked for errors as the normal dictionaries and
+thus may contain misspelled or invalid words; and (2) contain
+uncommon, yet valid, words that might cause problems as they are
+likely to be misspellings of more common words (for example, "ort" and
+"calender").
+
+To get an idea of the difference in size, here are 25 random words
+only found in the large dictionary for American English:
+
+  Bermejo Freyr's Guenevere Hatshepsut Nottinghamshire arrestment
+  crassitudes crural dogwatches errorless fetial flaxseeds godroon
+  incretion jalapeño's kelpie kishkes neuroglias pietisms pullulation
+  stemwinder stenoses syce thalassic zees
+
+The en_US, en_CA and en_AU are the official dictionaries for Hunspell.
+The en_GB and large dictionaries are made available on an experimental
+basis.  If you find them useful please send me a quick email at
+kevina@gnu.org.
+
+If none of these dictionaries suite you (for example, maybe you want
+the normal dictionary that also includes common variants) additional
+dictionaries can be generated at http://app.aspell.net/create or by
+modifying speller/make-hunspell-dict in SCOWL.  Please do let me know
+if you end up publishing a customized dictionary.
+
+If a word is not found in the dictionary or a word is there you think
+shouldn't be, you can lookup the word up at http://app.aspell.net/lookup
+to help determine why that is.
+
+General comments on these list can be sent directly to me at
+kevina@gnu.org or to the wordlist-devel mailing lists
+(https://lists.sourceforge.net/lists/listinfo/wordlist-devel).  If you
+have specific issues with any of these dictionaries please file a bug
+report at https://github.com/kevina/wordlist/issues.
+
+IMPORTANT CHANGES INTRODUCED In 2016.11.20:
+
+New Australian dictionaries thanks to the work of Benjamin Titze
+(btitze@protonmail.ch).
+
+IMPORTANT CHANGES INTRODUCED IN 2016.04.24:
+
+The dictionaries are now in UTF-8 format instead of ISO-8859-1.  This
+was required to handle smart quotes correctly.
+
+IMPORTANT CHANGES INTRODUCED IN 2016.01.19:
+
+"SET UTF8" was changes to "SET UTF-8" in the affix file as some
+versions of Hunspell do not recognize "UTF8".
+
+ADDITIONAL NOTES:
+
+The NOSUGGEST flag was added to certain taboo words.  While I made an
+honest attempt to flag the strongest taboo words with the NOSUGGEST
+flag, I MAKE NO GUARANTEE THAT I FLAGGED EVERY POSSIBLE TABOO WORD.
+The list was originally derived from Németh László, however I removed
+some words which, while being considered taboo by some dictionaries,
+are not really considered swear words in today's society.
+
+COPYRIGHT, SOURCES, and CREDITS:
+
+The English dictionaries come directly from SCOWL
+and is thus under the same copyright of SCOWL.  The affix file is
+a heavily modified version of the original english.aff file which was
+released as part of Geoff Kuenning's Ispell and as such is covered by
+his BSD license.  Part of SCOWL is also based on Ispell thus the
+Ispell copyright is included with the SCOWL copyright.
+
+The collective work is Copyright 2000-2018 by Kevin Atkinson as well
+as any of the copyrights mentioned below:
+
+  Copyright 2000-2018 by Kevin Atkinson
+
+  Permission to use, copy, modify, distribute and sell these word
+  lists, the associated scripts, the output created from the scripts,
+  and its documentation for any purpose is hereby granted without fee,
+  provided that the above copyright notice appears in all copies and
+  that both that copyright notice and this permission notice appear in
+  supporting documentation. Kevin Atkinson makes no representations
+  about the suitability of this array for any purpose. It is provided
+  "as is" without express or implied warranty.
+
+Alan Beale <biljir@pobox.com> also deserves special credit as he has,
+in addition to providing the 12Dicts package and being a major
+contributor to the ENABLE word list, given me an incredible amount of
+feedback and created a number of special lists (those found in the
+Supplement) in order to help improve the overall quality of SCOWL.
+
+The 10 level includes the 1000 most common English words (according to
+the Moby (TM) Words II [MWords] package), a subset of the 1000 most
+common words on the Internet (again, according to Moby Words II), and
+frequently class 16 from Brian Kelk's "UK English Wordlist
+with Frequency Classification".
+
+The MWords package was explicitly placed in the public domain:
+
+    The Moby lexicon project is complete and has
+    been place into the public domain. Use, sell,
+    rework, excerpt and use in any way on any platform.
+
+    Placing this material on internal or public servers is
+    also encouraged. The compiler is not aware of any
+    export restrictions so freely distribute world-wide.
+
+    You can verify the public domain status by contacting
+
+    Grady Ward
+    3449 Martha Ct.
+    Arcata, CA  95521-4884
+
+    grady@netcom.com
+    grady@northcoast.com
+
+The "UK English Wordlist With Frequency Classification" is also in the
+Public Domain:
+
+  Date: Sat, 08 Jul 2000 20:27:21 +0100
+  From: Brian Kelk <Brian.Kelk@cl.cam.ac.uk>
+
+  > I was wondering what the copyright status of your "UK English
+  > Wordlist With Frequency Classification" word list as it seems to
+  > be lacking any copyright notice.
+
+  There were many many sources in total, but any text marked
+  "copyright" was avoided. Locally-written documentation was one
+  source. An earlier version of the list resided in a filespace called
+  PUBLIC on the University mainframe, because it was considered public
+  domain.
+
+  Date: Tue, 11 Jul 2000 19:31:34 +0100
+
+  > So are you saying your word list is also in the public domain?
+
+  That is the intention.
+
+The 20 level includes frequency classes 7-15 from Brian's word list.
+
+The 35 level includes frequency classes 2-6 and words appearing in at
+least 11 of 12 dictionaries as indicated in the 12Dicts package.  All
+words from the 12Dicts package have had likely inflections added via
+my inflection database.
+
+The 12Dicts package and Supplement is in the Public Domain.
+
+The WordNet database, which was used in the creation of the
+Inflections database, is under the following copyright:
+
+  This software and database is being provided to you, the LICENSEE,
+  by Princeton University under the following license.  By obtaining,
+  using and/or copying this software and database, you agree that you
+  have read, understood, and will comply with these terms and
+  conditions.:
+
+  Permission to use, copy, modify and distribute this software and
+  database and its documentation for any purpose and without fee or
+  royalty is hereby granted, provided that you agree to comply with
+  the following copyright notice and statements, including the
+  disclaimer, and that the same appear on ALL copies of the software,
+  database and documentation, including modifications that you make
+  for internal use or for distribution.
+
+  WordNet 1.6 Copyright 1997 by Princeton University.  All rights
+  reserved.
+
+  THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON
+  UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+  IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON
+  UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT-
+  ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+  LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY
+  THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+  The name of Princeton University or Princeton may not be used in
+  advertising or publicity pertaining to distribution of the software
+  and/or database.  Title to copyright in this software, database and
+  any associated documentation shall at all times remain with
+  Princeton University and LICENSEE agrees to preserve same.
+
+The 40 level includes words from Alan's 3esl list found in version 4.0
+of his 12dicts package.  Like his other stuff the 3esl list is also in the
+public domain.
+
+The 50 level includes Brian's frequency class 1, words appearing
+in at least 5 of 12 of the dictionaries as indicated in the 12Dicts
+package, and uppercase words in at least 4 of the previous 12
+dictionaries.  A decent number of proper names is also included: The
+top 1000 male, female, and Last names from the 1990 Census report; a
+list of names sent to me by Alan Beale; and a few names that I added
+myself.  Finally a small list of abbreviations not commonly found in
+other word lists is included.
+
+The name files form the Census report is a government document which I
+don't think can be copyrighted.
+
+The file special-jargon.50 uses common.lst and word.lst from the
+"Unofficial Jargon File Word Lists" which is derived from "The Jargon
+File".  All of which is in the Public Domain.  This file also contain
+a few extra UNIX terms which are found in the file "unix-terms" in the
+special/ directory.
+
+The 55 level includes words from Alan's 2of4brif list found in version
+4.0 of his 12dicts package.  Like his other stuff the 2of4brif is also
+in the public domain.
+
+The 60 level includes all words appearing in at least 2 of the 12
+dictionaries as indicated by the 12Dicts package.
+
+The 70 level includes Brian's frequency class 0 and the 74,550 common
+dictionary words from the MWords package.  The common dictionary words,
+like those from the 12Dicts package, have had all likely inflections
+added.  The 70 level also included the 5desk list from version 4.0 of
+the 12Dics package which is in the public domain.
+
+The 80 level includes the ENABLE word list, all the lists in the
+ENABLE supplement package (except for ABLE), the "UK Advanced Cryptics
+Dictionary" (UKACD), the list of signature words from the YAWL package,
+and the 10,196 places list from the MWords package.
+
+The ENABLE package, mainted by M\Cooper <thegrendel@theriver.com>,
+is in the Public Domain:
+
+  The ENABLE master word list, WORD.LST, is herewith formally released
+  into the Public Domain. Anyone is free to use it or distribute it in
+  any manner they see fit. No fee or registration is required for its
+  use nor are "contributions" solicited (if you feel you absolutely
+  must contribute something for your own peace of mind, the authors of
+  the ENABLE list ask that you make a donation on their behalf to your
+  favorite charity). This word list is our gift to the Scrabble
+  community, as an alternate to "official" word lists. Game designers
+  may feel free to incorporate the WORD.LST into their games. Please
+  mention the source and credit us as originators of the list. Note
+  that if you, as a game designer, use the WORD.LST in your product,
+  you may still copyright and protect your product, but you may *not*
+  legally copyright or in any way restrict redistribution of the
+  WORD.LST portion of your product. This *may* under law restrict your
+  rights to restrict your users' rights, but that is only fair.
+
+UKACD, by J Ross Beresford <ross@bryson.demon.co.uk>, is under the
+following copyright:
+
+  Copyright (c) J Ross Beresford 1993-1999. All Rights Reserved.
+
+  The following restriction is placed on the use of this publication:
+  if The UK Advanced Cryptics Dictionary is used in a software package
+  or redistributed in any form, the copyright notice must be
+  prominently displayed and the text of this document must be included
+  verbatim.
+
+  There are no other restrictions: I would like to see the list
+  distributed as widely as possible.
+
+The 95 level includes the 354,984 single words, 256,772 compound
+words, 4,946 female names and the 3,897 male names, and 21,986 names
+from the MWords package, ABLE.LST from the ENABLE Supplement, and some
+additional words found in my part-of-speech database that were not
+found anywhere else.
+
+Accent information was taken from UKACD.
+
+The VarCon package was used to create the American, British, Canadian,
+and Australian word list.  It is under the following copyright:
+
+  Copyright 2000-2016 by Kevin Atkinson
+
+  Permission to use, copy, modify, distribute and sell this array, the
+  associated software, and its documentation for any purpose is hereby
+  granted without fee, provided that the above copyright notice appears
+  in all copies and that both that copyright notice and this permission
+  notice appear in supporting documentation. Kevin Atkinson makes no
+  representations about the suitability of this array for any
+  purpose. It is provided "as is" without express or implied warranty.
+
+  Copyright 2016 by Benjamin Titze
+
+  Permission to use, copy, modify, distribute and sell this array, the
+  associated software, and its documentation for any purpose is hereby
+  granted without fee, provided that the above copyright notice appears
+  in all copies and that both that copyright notice and this permission
+  notice appear in supporting documentation. Benjamin Titze makes no
+  representations about the suitability of this array for any
+  purpose. It is provided "as is" without express or implied warranty.
+
+  Since the original words lists come from the Ispell distribution:
+
+  Copyright 1993, Geoff Kuenning, Granada Hills, CA
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. All modifications to the source code must be clearly marked as
+     such.  Binary redistributions based on modified source code
+     must be clearly marked as modified versions in the documentation
+     and/or other materials provided with the distribution.
+  (clause 4 removed with permission from Geoff Kuenning)
+  5. The name of Geoff Kuenning may not be used to endorse or promote
+     products derived from this software without specific prior
+     written permission.
+
+  THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+
+Build Date: Mon Dec  7 20:19:27 EST 2020
+Wordlist Command: mk-list --accents=strip en_US 60
diff --git a/src/app/api/internal/asset-gc/route.ts b/src/app/api/internal/asset-gc/route.ts
new file mode 100644
index 00000000..d8de7e72
--- /dev/null
+++ b/src/app/api/internal/asset-gc/route.ts
@@ -0,0 +1,47 @@
+import { NextRequest } from "next/server";
+
+import { apiHandler } from "@src/lib/utils/api-handler";
+import { Success, UnauthorizedError, validate } from "@src/lib/utils/api-utils";
+import { reconcileProjectAssets } from "@src/server/service/asset-gc-service";
+
+import { jwtVerify } from "jose";
+import z from "zod";
+
+const BodySchema = z.object({
+    projectId: z.string(),
+    referenced: z.array(z.string()),
+    complete: z.boolean(),
+});
+
+/**
+ * POST `/api/internal/asset-gc`
+ *
+ * Worker→app callback fired after the DurableObject prunes snapshots, so orphaned
+ * R2 assets are reclaimed without waiting for a project reopen. Authenticated by a
+ * short-lived Worker-signed JWT (`type: "asset-gc"`), not a user session — it's in
+ * the proxy's public allowlist and verifies the token itself.
+ */
+async function internalAssetGc(req: NextRequest) {
+    const authHeader = req.headers.get("authorization");
+    const token = authHeader?.startsWith("Bearer ") ? authHeader.slice(7) : null;
+    if (!token) throw new UnauthorizedError();
+
+    let type: unknown;
+    let tokenProjectId: unknown;
+    try {
+        const { payload } = await jwtVerify(token, new TextEncoder().encode(process.env.JWT_SECRET!));
+        type = payload.type;
+        tokenProjectId = payload.projectId;
+    } catch {
+        throw new UnauthorizedError();
+    }
+    if (type !== "asset-gc") throw new UnauthorizedError();
+
+    const { projectId, referenced, complete } = validate(BodySchema, await req.json());
+    if (tokenProjectId !== projectId) throw new UnauthorizedError();
+
+    const deleted = await reconcileProjectAssets(projectId, referenced, complete);
+    return Success({ deleted });
+}
+
+export const POST = apiHandler(internalAssetGc);
diff --git a/src/app/api/projects/[projectId]/assets/[hash]/route.ts b/src/app/api/projects/[projectId]/assets/[hash]/route.ts
new file mode 100644
index 00000000..3c44db3b
--- /dev/null
+++ b/src/app/api/projects/[projectId]/assets/[hash]/route.ts
@@ -0,0 +1,44 @@
+import { NextRequest, NextResponse } from "next/server";
+
+import * as S3 from "@src/lib/s3";
+import * as ProjectService from "@src/server/service/project-service";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { NotFoundError, ProjectNotFoundError, validate } from "@src/lib/utils/api-utils";
+
+import z from "zod";
+
+const QuerySchema = z.object({
+    projectId: z.string(),
+    hash: z.string().regex(/^[0-9a-f]{64}$/i, "Invalid asset hash"),
+});
+
+/**
+ * GET `/projects/[projectId]/assets/[hash]`
+ *
+ * Streams a board asset's bytes through the (same-origin) API — the client caches
+ * them in IndexedDB. Proxying keeps the bucket private and avoids R2 CORS setup.
+ * Any project member (VIEWER+) may read.
+ */
+async function getAsset(req: NextRequest, { routeParams, user }: AuthApiContext) {
+    const { projectId, hash } = validate(QuerySchema, routeParams);
+
+    const membership = await ProjectService.getMembership(projectId, user.id);
+    if (!membership) throw new ProjectNotFoundError();
+
+    const asset = await ProjectService.getAsset(projectId, hash);
+    if (!asset) throw new NotFoundError("Asset not found");
+
+    const bytes = await S3.getObjectBytes(`assets/${projectId}/${hash}`);
+    if (!bytes) throw new NotFoundError("Asset not found");
+
+    return new NextResponse(bytes as BodyInit, {
+        headers: {
+            "Content-Type": asset.mime,
+            "Content-Length": String(asset.size),
+            // Content-addressed: bytes for a hash never change.
+            "Cache-Control": "private, max-age=31536000, immutable",
+        },
+    });
+}
+
+export const GET = apiHandler(getAsset);
diff --git a/src/app/api/projects/[projectId]/assets/gc/route.ts b/src/app/api/projects/[projectId]/assets/gc/route.ts
new file mode 100644
index 00000000..c8f225af
--- /dev/null
+++ b/src/app/api/projects/[projectId]/assets/gc/route.ts
@@ -0,0 +1,54 @@
+import { NextRequest } from "next/server";
+import { ProjectRole } from "../../../../../../generated/client/client";
+
+import * as ProjectService from "@src/server/service/project-service";
+import * as Roles from "@src/lib/utils/roles";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { ForbiddenError, getCollabHttpUrl, ProjectNotFoundError, Success, validate } from "@src/lib/utils/api-utils";
+import { reconcileProjectAssets } from "@src/server/service/asset-gc-service";
+
+import { SignJWT } from "jose";
+import z from "zod";
+
+const QuerySchema = z.object({
+    projectId: z.string(),
+});
+
+/** Ask the collaboration Worker for the asset hashes referenced by the live doc
+ *  and every retained snapshot (served from its index — cheap). */
+async function fetchReferencedHashes(projectId: string): Promise<{ hashes: string[]; complete: boolean }> {
+    const secret = new TextEncoder().encode(process.env.JWT_SECRET!);
+    const token = await new SignJWT({ type: "admin-action", projectId })
+        .setProtectedHeader({ alg: "HS256" })
+        .setExpirationTime("1m")
+        .sign(secret);
+
+    const res = await fetch(getCollabHttpUrl(`/${projectId}/asset-refs`), {
+        method: "GET",
+        headers: { Authorization: `Bearer ${token}` },
+    });
+    if (!res.ok) throw new Error(`Worker error computing asset refs: ${await res.text()}`);
+    return (await res.json()) as { hashes: string[]; complete: boolean };
+}
+
+/**
+ * POST `/projects/[projectId]/assets/gc`
+ *
+ * User-triggered reconcile (runs once on project open). Pulls the authoritative
+ * referenced set from the Worker and deletes orphaned cloud assets. The Worker
+ * also drives this autonomously after retention prunes snapshots. Requires EDITOR+.
+ */
+async function gcAssets(req: NextRequest, { routeParams, user }: AuthApiContext) {
+    const { projectId } = validate(QuerySchema, routeParams);
+
+    const membership = await ProjectService.getMembership(projectId, user.id);
+    if (!membership) throw new ProjectNotFoundError();
+    if (!Roles.hasRoleOrGreater(membership.role, ProjectRole.EDITOR)) throw new ForbiddenError();
+
+    const { hashes, complete } = await fetchReferencedHashes(projectId);
+    const deleted = await reconcileProjectAssets(projectId, hashes, complete);
+
+    return Success({ deleted, skipped: !complete });
+}
+
+export const POST = apiHandler(gcAssets);
diff --git a/src/app/api/projects/[projectId]/assets/missing/route.ts b/src/app/api/projects/[projectId]/assets/missing/route.ts
new file mode 100644
index 00000000..b0c8b9ad
--- /dev/null
+++ b/src/app/api/projects/[projectId]/assets/missing/route.ts
@@ -0,0 +1,40 @@
+import { NextRequest } from "next/server";
+import { ProjectRole } from "../../../../../../generated/client/client";
+
+import * as ProjectService from "@src/server/service/project-service";
+import * as Roles from "@src/lib/utils/roles";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { ForbiddenError, ProjectNotFoundError, Success, validate } from "@src/lib/utils/api-utils";
+
+import z from "zod";
+
+const QuerySchema = z.object({
+    projectId: z.string(),
+});
+
+const BodySchema = z.object({
+    hashes: z.array(z.string().regex(/^[0-9a-f]{64}$/i)).max(100000),
+});
+
+/**
+ * POST `/projects/[projectId]/assets/missing`
+ *
+ * Given candidate hashes (assets the client has locally), returns those the cloud
+ * isn't tracking yet — i.e. that still need uploading (e.g. added while offline).
+ * Requires EDITOR+.
+ */
+async function missingAssets(req: NextRequest, { routeParams, user }: AuthApiContext) {
+    const { projectId } = validate(QuerySchema, routeParams);
+
+    const membership = await ProjectService.getMembership(projectId, user.id);
+    if (!membership) throw new ProjectNotFoundError();
+    if (!Roles.hasRoleOrGreater(membership.role, ProjectRole.EDITOR)) throw new ForbiddenError();
+
+    const { hashes } = validate(BodySchema, await req.json());
+    const existing = new Set(await ProjectService.getExistingAssetHashes(projectId, hashes));
+    const missing = hashes.filter((hash) => !existing.has(hash));
+
+    return Success({ missing });
+}
+
+export const POST = apiHandler(missingAssets);
diff --git a/src/app/api/projects/[projectId]/assets/route.ts b/src/app/api/projects/[projectId]/assets/route.ts
new file mode 100644
index 00000000..f8a53288
--- /dev/null
+++ b/src/app/api/projects/[projectId]/assets/route.ts
@@ -0,0 +1,108 @@
+import { NextRequest } from "next/server";
+import { ProjectRole } from "../../../../../generated/client/client";
+
+import * as S3 from "@src/lib/s3";
+import * as ProjectService from "@src/server/service/project-service";
+import * as Roles from "@src/lib/utils/roles";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import {
+    BodyFieldError,
+    ForbiddenError,
+    InternalServerError,
+    ProjectNotFoundError,
+    StorageQuotaExceededError,
+    Success,
+    SuccessCreated,
+    validate,
+} from "@src/lib/utils/api-utils";
+import { requirePro } from "@src/lib/utils/pro-utils";
+import { sha256Hex } from "@src/lib/assets/asset-hash";
+import { MAX_ASSET_SIZE_BYTES, USER_STORAGE_QUOTA_BYTES } from "@src/lib/utils/storage-limits";
+
+import z from "zod";
+
+const ParamsSchema = z.object({
+    projectId: z.string(),
+});
+
+const QuerySchema = z.object({
+    projectId: z.string(),
+    hash: z.string().regex(/^[0-9a-f]{64}$/i, "Invalid asset hash"),
+    mime: z.string().min(1).max(128),
+    w: z.coerce.number().int().min(0).default(0),
+    h: z.coerce.number().int().min(0).default(0),
+});
+
+/**
+ * GET `/projects/[projectId]/assets`
+ *
+ * Lists the project's tracked assets (hash, mime, size, dimensions) for the
+ * Storage dashboard. Any project member (VIEWER+) may read.
+ */
+async function listAssets(req: NextRequest, { routeParams, user }: AuthApiContext) {
+    const { projectId } = validate(ParamsSchema, routeParams);
+
+    const membership = await ProjectService.getMembership(projectId, user.id);
+    if (!membership) throw new ProjectNotFoundError();
+
+    const assets = await ProjectService.getProjectAssets(projectId);
+    return Success({ assets });
+}
+
+/**
+ * POST `/projects/[projectId]/assets?hash=&mime=&w=&h=`
+ *
+ * Uploads a board asset (image / audio) to R2 at `assets/{projectId}/{hash}` and
+ * records a tracking row. Body is the raw bytes. Idempotent: an already-stored
+ * hash returns `{ deduped: true }` without re-charging the owner's quota.
+ */
+async function uploadAsset(req: NextRequest, { routeParams, searchParams, user }: AuthApiContext) {
+    const { projectId, hash, mime, w, h } = validate(QuerySchema, { ...routeParams, ...searchParams });
+
+    const membership = await ProjectService.getMembership(projectId, user.id);
+    if (!membership) throw new ProjectNotFoundError();
+    if (!Roles.hasRoleOrGreater(membership.role, ProjectRole.EDITOR)) throw new ForbiddenError();
+
+    const ownerId = await ProjectService.getProjectOwnerId(projectId);
+    if (!ownerId) throw new InternalServerError();
+    await requirePro(ownerId);
+
+    const bytes = new Uint8Array(await req.arrayBuffer());
+    if (bytes.byteLength === 0) throw new BodyFieldError("Empty asset body");
+    if (bytes.byteLength > MAX_ASSET_SIZE_BYTES) throw new BodyFieldError("Asset exceeds maximum size");
+
+    // Integrity: the bytes must match the claimed content-addressed hash.
+    const actualHash = await sha256Hex(bytes.buffer as ArrayBuffer);
+    if (actualHash !== hash.toLowerCase()) throw new BodyFieldError("Asset hash mismatch");
+
+    // Dedup: identical bytes already tracked for this project — no upload, no recharge.
+    const existing = await ProjectService.getAsset(projectId, hash);
+    if (existing) return SuccessCreated({ deduped: true });
+
+    // Quota: owner-centric, summed across every project they own.
+    const used = await ProjectService.getOwnerStorageUsed(ownerId);
+    if (used + bytes.byteLength > USER_STORAGE_QUOTA_BYTES) throw new StorageQuotaExceededError();
+
+    const ok = await S3.putObject(`assets/${projectId}/${hash}`, bytes, mime);
+    if (!ok) throw new InternalServerError();
+
+    try {
+        await ProjectService.createAsset({
+            projectId,
+            hash,
+            mime,
+            size: bytes.byteLength,
+            width: w,
+            height: h,
+        });
+    } catch {
+        // A concurrent upload of the same hash won the unique constraint — the
+        // object is in R2 (same key, same bytes) and tracked. Treat as deduped.
+        return SuccessCreated({ deduped: true });
+    }
+
+    return SuccessCreated({ deduped: false });
+}
+
+export const GET = apiHandler(listAssets);
+export const POST = apiHandler(uploadAsset);
diff --git a/src/app/api/projects/[projectId]/route.ts b/src/app/api/projects/[projectId]/route.ts
index e88c9ac3..b161cf49 100644
--- a/src/app/api/projects/[projectId]/route.ts
+++ b/src/app/api/projects/[projectId]/route.ts
@@ -106,6 +106,13 @@ async function deleteProject(req: NextRequest, { routeParams, user }: AuthApiCon
         throw new ForbiddenError();
     }
 
+    // Reclaim the project's R2 assets before the cascade drops their tracking
+    // rows (afterwards we'd no longer know which objects to delete).
+    const assets = await ProjectService.listAssetHashes(projectId);
+    if (assets.length > 0) {
+        await S3.destroyMany(assets.map((a) => `assets/${projectId}/${a.hash}`));
+    }
+
     const deleted = await ProjectService.destroy(projectId);
     if (!deleted) {
         throw new InternalServerError();
diff --git a/src/app/api/projects/[projectId]/storage/route.ts b/src/app/api/projects/[projectId]/storage/route.ts
new file mode 100644
index 00000000..861264f2
--- /dev/null
+++ b/src/app/api/projects/[projectId]/storage/route.ts
@@ -0,0 +1,37 @@
+import { NextRequest } from "next/server";
+
+import * as ProjectService from "@src/server/service/project-service";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { InternalServerError, ProjectNotFoundError, Success, validate } from "@src/lib/utils/api-utils";
+import { USER_STORAGE_QUOTA_BYTES } from "@src/lib/utils/storage-limits";
+
+import z from "zod";
+
+const QuerySchema = z.object({
+    projectId: z.string(),
+});
+
+/**
+ * GET `/projects/[projectId]/storage`
+ *
+ * Storage usage for the navbar panel: this project's bytes, the owner's total
+ * across all of their projects, and the quota. Any member (VIEWER+) may read.
+ */
+async function getStorage(req: NextRequest, { routeParams, user }: AuthApiContext) {
+    const { projectId } = validate(QuerySchema, routeParams);
+
+    const membership = await ProjectService.getMembership(projectId, user.id);
+    if (!membership) throw new ProjectNotFoundError();
+
+    const ownerId = await ProjectService.getProjectOwnerId(projectId);
+    if (!ownerId) throw new InternalServerError();
+
+    const [projectUsed, ownerTotalUsed] = await Promise.all([
+        ProjectService.getProjectStorageUsed(projectId),
+        ProjectService.getOwnerStorageUsed(ownerId),
+    ]);
+
+    return Success({ projectUsed, ownerTotalUsed, quota: USER_STORAGE_QUOTA_BYTES });
+}
+
+export const GET = apiHandler(getStorage);
diff --git a/src/app/api/users/me/storage/route.ts b/src/app/api/users/me/storage/route.ts
new file mode 100644
index 00000000..7cf427ba
--- /dev/null
+++ b/src/app/api/users/me/storage/route.ts
@@ -0,0 +1,19 @@
+import { NextRequest } from "next/server";
+
+import * as ProjectService from "@src/server/service/project-service";
+import { apiHandler, AuthApiContext } from "@src/lib/utils/api-handler";
+import { Success } from "@src/lib/utils/api-utils";
+import { USER_STORAGE_QUOTA_BYTES } from "@src/lib/utils/storage-limits";
+
+/**
+ * GET `/users/me/storage`
+ *
+ * The authenticated user's total cloud-asset usage across the projects they own,
+ * plus the quota. Used for the promote-to-cloud pre-check.
+ */
+async function getMyStorage(_req: NextRequest, { user }: AuthApiContext) {
+    const used = await ProjectService.getOwnerStorageUsed(user.id);
+    return Success({ used, quota: USER_STORAGE_QUOTA_BYTES });
+}
+
+export const GET = apiHandler(getMyStorage);
diff --git a/src/context/SpellcheckContext.tsx b/src/context/SpellcheckContext.tsx
index 505237a3..7dce8997 100644
--- a/src/context/SpellcheckContext.tsx
+++ b/src/context/SpellcheckContext.tsx
@@ -3,6 +3,7 @@
 import { createContext, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import type { InstalledDictionary, SpellWorkerResponse } from "@src/lib/spellcheck/spellcheck-types";
 import type { StorageProvider } from "@src/lib/persistence/storage-provider/storage-provider";
+import { BUILTIN_DICTIONARY_CODE, loadBuiltinDictionary } from "@src/lib/spellcheck/spellcheck-dictionaries";
 
 const LANG_KEY = "scriptio-spellcheck-lang";
 
@@ -31,7 +32,11 @@ const SpellcheckContext = createContext<SpellcheckContextValue>({
 export function SpellcheckProvider({ children }: { children: ReactNode }) {
     const [spellcheckLang, setSpellcheckLangState] = useState<string | null>(() => {
         if (typeof window === "undefined") return null;
-        return window.localStorage.getItem(LANG_KEY);
+        const stored = window.localStorage.getItem(LANG_KEY);
+        // No stored preference → spell check defaults to English. An empty string is the
+        // explicit "disabled" marker, so it is not re-defaulted on the next load.
+        if (stored === null) return "en";
+        return stored === "" ? null : stored;
     });
 
     const [installedDictionaries, setInstalledDictionaries] = useState<InstalledDictionary[]>([]);
@@ -74,14 +79,18 @@ export function SpellcheckProvider({ children }: { children: ReactNode }) {
 
     // Initialize or swap the worker when the spellcheck language changes
     useEffect(() => {
-        if (typeof window === "undefined" || !spellcheckLang || !storeRef.current) return;
+        if (typeof window === "undefined" || !spellcheckLang) return;
 
+        // The built-in dictionary ships with the app, so it doesn't wait on the store.
+        const isBuiltin = spellcheckLang === BUILTIN_DICTIONARY_CODE;
         const store = storeRef.current;
+        if (!isBuiltin && !store) return;
+
         let cancelled = false;
 
         const initWorker = async () => {
-            // Check if dictionary is installed
-            const dictData = await store.loadDictionary(spellcheckLang);
+            // Load the dictionary bytes: bundled asset for the built-in, IndexedDB otherwise.
+            const dictData = isBuiltin ? await loadBuiltinDictionary() : await store!.loadDictionary(spellcheckLang);
             if (!dictData || cancelled) return;
 
             // Terminate old worker
@@ -148,11 +157,9 @@ export function SpellcheckProvider({ children }: { children: ReactNode }) {
 
     const setSpellcheckLang = useCallback((code: string | null) => {
         setSpellcheckLangState(code);
-        if (code) {
-            window.localStorage.setItem(LANG_KEY, code);
-        } else {
-            window.localStorage.removeItem(LANG_KEY);
-        }
+        // Persist disabled as an empty string (not a removed key) so it survives reloads
+        // instead of falling back to the English default.
+        window.localStorage.setItem(LANG_KEY, code ?? "");
     }, []);
 
     const installDictionary = useCallback(
diff --git a/src/lib/adapters/fountain/fountain-adapter.ts b/src/lib/adapters/fountain/fountain-adapter.ts
index d05a259d..b60f4f8e 100644
--- a/src/lib/adapters/fountain/fountain-adapter.ts
+++ b/src/lib/adapters/fountain/fountain-adapter.ts
@@ -114,6 +114,14 @@ export class FountainAdapter extends ProjectAdapter {
                 continue;
             }
 
+            // Manual page break: emit a standalone `===` line before this block,
+            // surrounded by blank lines so the parser reads it as a page break and
+            // re-attaches it to this block on import. Placed after the skip checks
+            // so the break stays anchored to a block that is actually exported.
+            if (nodes[i].attrs?.pageBreak) {
+                fountain += "\n===\n\n";
+            }
+
             // Handle styled text fragments
             let fullText: string = "";
             for (let j = 0; j < content.length; j++) {
@@ -173,7 +181,14 @@ export class FountainAdapter extends ProjectAdapter {
         const decoder = new TextDecoder("utf-8");
         const text = decoder.decode(rawContent);
         const output = fountain.parse(text, true);
-        const html = output["html"]["script"];
+        // A Fountain page break (a line of `===`) parses to an <hr /> in the
+        // script HTML. Our schema has no horizontal-rule node; a page break is
+        // instead a `pageBreak` attribute on the block that STARTS the new page.
+        // Fold each <hr /> into the following block as data-page-break, which
+        // PageBreakAttribute.parseHTML turns into the attribute. A trailing
+        // <hr /> with no following block (page break at end of file) simply has
+        // no match and is dropped — a break with no content is meaningless.
+        const html = output["html"]["script"].replace(/<hr\s*\/>\s*<p\b/g, '<p data-page-break="true"');
         const json = generateJSON(html, BASE_EXTENSIONS) as JSONContent;
 
         const project: Partial<ProjectData> = {
diff --git a/src/lib/assets/asset-gc.ts b/src/lib/assets/asset-gc.ts
index 5a679a08..2e611d61 100644
--- a/src/lib/assets/asset-gc.ts
+++ b/src/lib/assets/asset-gc.ts
@@ -1,45 +1,28 @@
 /**
  * Asset garbage collection (reconcile-from-doc / mark-sweep).
  *
- * Image bytes live in IndexedDB, decoupled from Yjs; the board cards only carry
- * the `assetId` (SHA-256). The set of assetIds referenced across every board in
- * the document is therefore the source of truth for what is still in use. GC
- * computes that set and deletes any stored blob not in it — robust against
+ * Image/audio bytes live in IndexedDB, decoupled from Yjs; the board cards only
+ * carry the `assetId` (SHA-256). The set of assetIds referenced across every
+ * board is the source of truth for what is still in use. Local GC computes that
+ * set from the live doc and deletes any stored blob not in it — robust against
  * collaboration and crashes, with no persisted reference counter to drift.
+ *
+ * Cloud GC ({@link gcCloudProjectAssets}) is separate and server-authoritative:
+ * the Worker reconciles against the live doc *and every retained snapshot* (so a
+ * restorable version never loses its assets), and it's run sparingly — on project
+ * open, not on every edit — because it scans snapshots.
  */
 
-import type { BoardCardData } from "../project/project-doc";
 import type { ProjectState } from "../project/project-state";
 import { getStorageProvider } from "../persistence/storage-provider/storage-provider";
+import { collectReferencedHashes, SkipGcError } from "./asset-refs";
 
-/** Every asset hash referenced by an image or audio card across all board documents. */
-export function collectReferencedHashes(ydoc: ProjectState): Set<string> {
-    const referenced = new Set<string>();
-    ydoc.documents().forEach((node) => {
-        if (node.type !== "board") return;
-        const raw = ydoc.boardData(node.id).get("cards");
-        if (!raw) return;
-        try {
-            const cards = JSON.parse(raw) as BoardCardData[];
-            for (const card of cards) {
-                if ((card.type === "image" || card.type === "audio") && card.assetId)
-                    referenced.add(card.assetId);
-            }
-        } catch {
-            // A malformed cards blob shouldn't make us delete live assets — skip.
-            // (Conservative: treat as "references unknown", handled below.)
-            throw new SkipGcError();
-        }
-    });
-    return referenced;
-}
-
-/** Internal sentinel: a parse failure means we can't safely reconcile this run. */
-class SkipGcError extends Error {}
+export { collectReferencedHashes };
 
 /**
- * Delete every stored asset of `projectId` whose hash is not referenced by any
- * board card in `ydoc`. No-ops safely if a board's cards blob can't be parsed.
+ * Delete every locally-stored asset of `projectId` whose hash is not referenced
+ * by any board card in `ydoc`. No-ops safely if a board's cards blob can't be
+ * parsed. Local only — cloud assets are reconciled by {@link gcCloudProjectAssets}.
  */
 export async function gcProjectAssets(projectId: string, ydoc: ProjectState): Promise<void> {
     let referenced: Set<string>;
@@ -56,14 +39,27 @@ export async function gcProjectAssets(projectId: string, ydoc: ProjectState): Pr
     await Promise.all(orphans.map((hash) => provider.deleteAsset(projectId, hash)));
 }
 
+/**
+ * Reclaim a cloud project's orphaned R2 assets. Delegates to the server, which
+ * computes the referenced set authoritatively from the live doc + all snapshots.
+ * No-op for local-only projects. Best-effort: never throws into callers.
+ */
+export async function gcCloudProjectAssets(projectId: string): Promise<void> {
+    const { isCloudSyncedProject } = await import("../persistence/storage-provider/local-persistence");
+    if (!(await isCloudSyncedProject(projectId))) return;
+    const { gcCloudAssets } = await import("./cloud-asset-sync");
+    await gcCloudAssets(projectId).catch((e) => console.warn("[assets] cloud GC failed:", e));
+}
+
 // ── Debounced scheduler ──────────────────────────────────────────────────────
 
 const GC_DEBOUNCE_MS = 1500;
 const pending = new Map<string, ReturnType<typeof setTimeout>>();
 
 /**
- * Schedule a debounced project-wide reconcile (per projectId). Rapid edits — a
- * burst of card deletions, say — coalesce into a single sweep.
+ * Schedule a debounced local reconcile (per projectId). Rapid edits — a burst of
+ * card deletions, say — coalesce into a single sweep. Cloud GC is intentionally
+ * not run here (it's run on project open via {@link gcCloudProjectAssets}).
  */
 export function scheduleAssetGc(projectId: string, ydoc: ProjectState): void {
     const existing = pending.get(projectId);
diff --git a/src/lib/assets/asset-orphans.ts b/src/lib/assets/asset-orphans.ts
new file mode 100644
index 00000000..c54eb79d
--- /dev/null
+++ b/src/lib/assets/asset-orphans.ts
@@ -0,0 +1,20 @@
+/**
+ * Pure helper for cloud asset GC: which stored hashes are collectable.
+ *
+ * Mirrors the local mark-sweep but adds a grace window — an orphan younger than
+ * the window is spared, so an asset a collaborator just added isn't reaped by a
+ * client whose referencing card hasn't synced yet. Kept dependency-free so it's
+ * unit-testable and shared by the GC route.
+ */
+export function computeAssetOrphans(
+    stored: { hash: string; createdAt: Date }[],
+    referenced: Set<string>,
+    now: number,
+    graceMs: number,
+): string[] {
+    const cutoff = now - graceMs;
+    const ref = new Set([...referenced].map((h) => h.toLowerCase()));
+    return stored
+        .filter((a) => !ref.has(a.hash.toLowerCase()) && a.createdAt.getTime() < cutoff)
+        .map((a) => a.hash);
+}
diff --git a/src/lib/assets/asset-refs.ts b/src/lib/assets/asset-refs.ts
new file mode 100644
index 00000000..844e94c2
--- /dev/null
+++ b/src/lib/assets/asset-refs.ts
@@ -0,0 +1,34 @@
+/**
+ * Collect the asset hashes a project document references.
+ *
+ * Worker-safe: depends only on the pure `ProjectState`/`BoardCardData` types
+ * (no IndexedDB, React, or ProseMirror), so the Cloudflare DurableObject can run
+ * it over the live doc and over historical snapshots when deciding what's safe to
+ * garbage-collect.
+ */
+
+import type { BoardCardData, ProjectState } from "../project/project-doc";
+
+/** Sentinel: a board's cards blob couldn't be parsed, so we can't safely reconcile. */
+export class SkipGcError extends Error {}
+
+/** Every asset hash referenced by an image or audio card across all board documents. */
+export function collectReferencedHashes(ydoc: ProjectState): Set<string> {
+    const referenced = new Set<string>();
+    ydoc.documents().forEach((node) => {
+        if (node.type !== "board") return;
+        const raw = ydoc.boardData(node.id).get("cards");
+        if (!raw) return;
+        try {
+            const cards = JSON.parse(raw) as BoardCardData[];
+            for (const card of cards) {
+                if ((card.type === "image" || card.type === "audio") && card.assetId)
+                    referenced.add(card.assetId);
+            }
+        } catch {
+            // A malformed cards blob shouldn't make us delete live assets — skip.
+            throw new SkipGcError();
+        }
+    });
+    return referenced;
+}
diff --git a/src/lib/assets/asset-store.ts b/src/lib/assets/asset-store.ts
index 3be5829b..8f65834e 100644
--- a/src/lib/assets/asset-store.ts
+++ b/src/lib/assets/asset-store.ts
@@ -1,14 +1,74 @@
 /**
- * Local asset store façade.
+ * Asset store façade.
  *
- * The single chokepoint for reading/writing board image bytes, decoupled from
- * the Yjs document. Assets are stored in IndexedDB content-addressed by SHA-256
- * (so duplicates collapse) and scoped per project. A future cloud variant will
- * extend this seam to also upload to / fetch from R2.
+ * The single chokepoint for reading/writing board image/audio bytes, decoupled
+ * from the Yjs document. Assets are stored in IndexedDB content-addressed by
+ * SHA-256 (so duplicates collapse) and scoped per project. For cloud-synced
+ * projects this seam also mirrors the bytes to R2 (upload on import, fetch on a
+ * local cache miss) via {@link ./cloud-asset-sync}.
  */
 
+import type { ProjectState } from "../project/project-state";
 import { getStorageProvider } from "../persistence/storage-provider/storage-provider";
 import { sha256Hex } from "./asset-hash";
+import { collectReferencedHashes } from "./asset-refs";
+import type { ProjectAssetInfo } from "./cloud-asset-sync";
+
+export type { ProjectAssetInfo };
+
+/** Whether a project syncs to the cloud (cached and not local-only). An uncached
+ *  project is treated as local, so this never fires a request for one. */
+async function isCloudSynced(projectId: string): Promise<boolean> {
+    const { isCloudSyncedProject } = await import("../persistence/storage-provider/local-persistence");
+    return isCloudSyncedProject(projectId);
+}
+
+/**
+ * Upload a locally-stored asset to R2 for a cloud-synced project. Kept separate
+ * from import so the board can show the card instantly and upload in the
+ * background (the bytes are already cached locally, so it renders offline). A
+ * quota error propagates so the caller can roll back the card. No-op for
+ * local-only projects or if the asset isn't stored locally.
+ */
+export async function syncAssetToCloud(projectId: string, hash: string): Promise<void> {
+    if (!(await isCloudSynced(projectId))) return;
+    const provider = await getStorageProvider();
+    const asset = await provider.getAsset(projectId, hash);
+    if (!asset) return;
+    const { uploadAssetToCloud } = await import("./cloud-asset-sync");
+    await uploadAssetToCloud(projectId, asset);
+}
+
+/**
+ * Re-upload any document-referenced local assets the cloud is missing — e.g.
+ * assets added while offline. Best-effort; intended to run on project open.
+ * Only considers assets still referenced by the doc (so it never re-uploads
+ * local orphans) and present locally, then asks the server which are missing.
+ */
+export async function pushPendingAssets(projectId: string, ydoc: ProjectState): Promise<void> {
+    if (!(await isCloudSynced(projectId))) return;
+
+    let referenced: Set<string>;
+    try {
+        referenced = collectReferencedHashes(ydoc);
+    } catch {
+        return; // malformed cards — skip this pass
+    }
+    if (referenced.size === 0) return;
+
+    const provider = await getStorageProvider();
+    const local = new Set(await provider.listAssetHashes(projectId));
+    const candidates = [...referenced].filter((hash) => local.has(hash));
+    if (candidates.length === 0) return;
+
+    const { fetchMissingAssetHashes } = await import("./cloud-asset-sync");
+    const missing = await fetchMissingAssetHashes(projectId, candidates);
+    for (const hash of missing) {
+        await syncAssetToCloud(projectId, hash).catch((e) =>
+            console.warn("[assets] pending upload failed:", e),
+        );
+    }
+}
 
 export interface AssetMeta {
     /** SHA-256 hex — the assetId referenced by board cards. */
@@ -45,8 +105,10 @@ async function decodeImageSize(file: Blob): Promise<{ width: number; height: num
 }
 
 /**
- * Store an image file for a project and return its metadata. Idempotent: if an
- * asset with the same bytes already exists it is returned unchanged (dedup).
+ * Store an image file locally for a project and return its metadata. Idempotent:
+ * if an asset with the same bytes already exists it is returned unchanged (dedup).
+ * Local-only and instant — cloud upload is done separately (see
+ * {@link syncAssetToCloud}) so the card can appear immediately and render offline.
  */
 export async function importImageFile(projectId: string, file: File): Promise<AssetMeta> {
     const buffer = await file.arrayBuffer();
@@ -121,12 +183,57 @@ export async function importAudioFile(
 }
 
 /**
- * Resolve an asset to an object URL for rendering, or null if it isn't stored
- * locally. Callers own the URL and must `URL.revokeObjectURL` it when done.
+ * List the assets a project's document currently references (images/audio in
+ * board cards), with metadata for the Storage dashboard. Uses the local store
+ * for sizes/dimensions and, for a cloud-synced project, fills in any referenced
+ * asset not cached locally from the server. Works for local-only projects too.
+ */
+export async function listInUseAssets(projectId: string, ydoc: ProjectState): Promise<ProjectAssetInfo[]> {
+    let referenced: Set<string>;
+    try {
+        referenced = collectReferencedHashes(ydoc);
+    } catch {
+        return [];
+    }
+    if (referenced.size === 0) return [];
+
+    const provider = await getStorageProvider();
+    const out = new Map<string, ProjectAssetInfo>();
+    for (const hash of referenced) {
+        const a = await provider.getAsset(projectId, hash);
+        if (a) out.set(hash, { hash, mime: a.mime, size: a.size, width: a.width, height: a.height });
+    }
+
+    // Cloud project: fill in referenced assets not cached on this device.
+    if (out.size < referenced.size && (await isCloudSynced(projectId))) {
+        const { fetchProjectAssetInfos } = await import("./cloud-asset-sync");
+        for (const info of await fetchProjectAssetInfos(projectId)) {
+            if (referenced.has(info.hash) && !out.has(info.hash)) out.set(info.hash, info);
+        }
+    }
+
+    return [...out.values()];
+}
+
+/**
+ * Resolve an asset to an object URL for rendering. Reads the local IndexedDB
+ * cache first; on a miss for a cloud-synced project it fetches the bytes from R2
+ * and caches them locally before returning. Null if unavailable. Callers own the
+ * URL and must `URL.revokeObjectURL` it when done.
  */
 export async function loadAssetObjectUrl(projectId: string, hash: string): Promise<string | null> {
     const provider = await getStorageProvider();
-    const asset = await provider.getAsset(projectId, hash);
+    let asset = await provider.getAsset(projectId, hash);
+
+    if (!asset && (await isCloudSynced(projectId))) {
+        const { fetchAssetFromCloud } = await import("./cloud-asset-sync");
+        const fetched = await fetchAssetFromCloud(projectId, hash);
+        if (fetched) {
+            await provider.putAsset(fetched); // cache for next time / offline
+            asset = fetched;
+        }
+    }
+
     if (!asset) return null;
     return URL.createObjectURL(new Blob([asset.data], { type: asset.mime }));
 }
diff --git a/src/lib/assets/cloud-asset-sync.ts b/src/lib/assets/cloud-asset-sync.ts
new file mode 100644
index 00000000..970ac16d
--- /dev/null
+++ b/src/lib/assets/cloud-asset-sync.ts
@@ -0,0 +1,129 @@
+/**
+ * Cloud (R2) side of the asset store.
+ *
+ * Mirrors the local IndexedDB asset store to R2 at `assets/{projectId}/{hash}`,
+ * tracked per project in Postgres so duplicates collapse and orphans are swept
+ * the same way they are locally. Used only for cloud-synced projects; local-only
+ * projects never touch the network.
+ */
+
+import { apiFetch } from "@src/lib/api-client";
+import type { ApiResponse } from "@src/lib/utils/api-utils";
+import type { StoredAsset } from "../persistence/storage-provider/storage-provider";
+
+/** Thrown when an upload would push the owner over their storage quota (HTTP 507). */
+export class CloudQuotaError extends Error {
+    constructor(message = "Storage limit reached") {
+        super(message);
+        this.name = "CloudQuotaError";
+    }
+}
+
+export interface StorageUsage {
+    projectUsed: number;
+    ownerTotalUsed: number;
+    quota: number;
+}
+
+/** Metadata for one tracked asset (no bytes), for the Storage dashboard. */
+export interface ProjectAssetInfo {
+    hash: string;
+    mime: string;
+    size: number;
+    width: number;
+    height: number;
+}
+
+/**
+ * Upload an asset's bytes to R2 (idempotent server-side; an already-stored hash
+ * is a cheap no-op). Throws {@link CloudQuotaError} when the owner is out of room.
+ */
+export async function uploadAssetToCloud(projectId: string, asset: StoredAsset): Promise<void> {
+    const params = new URLSearchParams({
+        hash: asset.hash,
+        mime: asset.mime,
+        w: String(asset.width),
+        h: String(asset.height),
+    });
+
+    const res = await apiFetch(`/api/projects/${projectId}/assets?${params.toString()}`, {
+        method: "POST",
+        headers: { "Content-Type": "application/octet-stream" },
+        body: asset.data,
+    });
+
+    if (res.status === 507) throw new CloudQuotaError();
+    if (!res.ok) throw new Error(`Asset upload failed (${res.status})`);
+}
+
+/**
+ * Fetch an asset's bytes from the API, returning a StoredAsset ready to cache
+ * locally. Null if the asset isn't tracked or the request fails. Intrinsic
+ * dimensions aren't needed once a card exists (they only size a card on first
+ * drop), so the cached copy carries 0.
+ */
+export async function fetchAssetFromCloud(projectId: string, hash: string): Promise<StoredAsset | null> {
+    const res = await apiFetch(`/api/projects/${projectId}/assets/${hash}`, { method: "GET" });
+    if (!res.ok) return null;
+
+    const data = await res.arrayBuffer();
+    const mime = res.headers.get("Content-Type") || "application/octet-stream";
+
+    return {
+        key: `${projectId}/${hash}`,
+        projectId,
+        hash,
+        mime,
+        size: data.byteLength,
+        width: 0,
+        height: 0,
+        data,
+        createdAt: Date.now(),
+    };
+}
+
+/**
+ * Trigger a server-authoritative cloud GC. The server computes the referenced
+ * set from the live doc + every retained snapshot (so restorable versions keep
+ * their assets) and deletes the rest.
+ */
+export async function gcCloudAssets(projectId: string): Promise<void> {
+    const res = await apiFetch(`/api/projects/${projectId}/assets/gc`, { method: "POST" });
+    if (!res.ok) throw new Error(`Cloud asset GC failed (${res.status})`);
+}
+
+/** Of `hashes`, which the cloud doesn't yet have tracked for this project (so they
+ *  need (re)uploading — e.g. assets added while offline). Empty on failure. */
+export async function fetchMissingAssetHashes(projectId: string, hashes: string[]): Promise<string[]> {
+    const res = await apiFetch(`/api/projects/${projectId}/assets/missing`, {
+        method: "POST",
+        body: JSON.stringify({ hashes }),
+    });
+    if (!res.ok) return [];
+    const { data } = (await res.json()) as ApiResponse<{ missing: string[] }>;
+    return data?.missing ?? [];
+}
+
+/** All tracked assets for a project (cloud), for the Storage dashboard. Empty on failure. */
+export async function fetchProjectAssetInfos(projectId: string): Promise<ProjectAssetInfo[]> {
+    const res = await apiFetch(`/api/projects/${projectId}/assets`, { method: "GET" });
+    if (!res.ok) return [];
+    const { data } = (await res.json()) as ApiResponse<{ assets: ProjectAssetInfo[] }>;
+    return data?.assets ?? [];
+}
+
+/** Per-project + owner-global storage usage, for the navbar panel. */
+export async function fetchProjectStorage(projectId: string): Promise<StorageUsage | null> {
+    const res = await apiFetch(`/api/projects/${projectId}/storage`, { method: "GET" });
+    if (!res.ok) return null;
+    const { data } = (await res.json()) as ApiResponse<StorageUsage>;
+    return data ?? null;
+}
+
+/** The current user's owner-global usage + quota (for the promote-to-cloud pre-check). */
+export async function fetchMyStorage(): Promise<{ used: number; quota: number } | null> {
+    const res = await apiFetch(`/api/users/me/storage`, { method: "GET" });
+    if (!res.ok) return null;
+    const { data } = (await res.json()) as ApiResponse<{ used: number; quota: number }>;
+    return data ?? null;
+}
diff --git a/src/lib/assets/use-asset-gc.ts b/src/lib/assets/use-asset-gc.ts
index 024253fa..39b2da36 100644
--- a/src/lib/assets/use-asset-gc.ts
+++ b/src/lib/assets/use-asset-gc.ts
@@ -11,7 +11,8 @@
 
 import { useEffect } from "react";
 import type { ProjectRepository } from "../project/project-repository";
-import { gcProjectAssets, scheduleAssetGc } from "./asset-gc";
+import { gcCloudProjectAssets, gcProjectAssets, scheduleAssetGc } from "./asset-gc";
+import { pushPendingAssets } from "./asset-store";
 
 export function useAssetGc(
     projectId: string | null,
@@ -26,6 +27,13 @@ export function useAssetGc(
             console.warn("[assets] initial GC failed:", e),
         );
 
+        // Cloud reconcile runs once per open (it scans snapshots server-side, so
+        // it's intentionally not tied to per-edit sweeps).
+        void gcCloudProjectAssets(projectId);
+
+        // Re-upload anything added offline that the cloud is still missing.
+        void pushPendingAssets(projectId, ydoc);
+
         return repository.observeDocuments(() => scheduleAssetGc(projectId, ydoc));
     }, [projectId, repository, isReady]);
 }
diff --git a/src/lib/cloud/index.ts b/src/lib/cloud/index.ts
index c934e69e..cf6091da 100644
--- a/src/lib/cloud/index.ts
+++ b/src/lib/cloud/index.ts
@@ -65,8 +65,11 @@ const worker = {
             return stub.fetch(doRequest);
         }
 
-        // GET /saves also needs auth
-        if (request.method === "GET" && url.pathname.includes("/saves")) {
+        // GET /saves and GET /asset-refs also need auth (admin-action token)
+        if (
+            request.method === "GET" &&
+            (url.pathname.includes("/saves") || url.pathname.endsWith("/asset-refs"))
+        ) {
             const authHeader = request.headers.get("Authorization");
             const token = authHeader?.startsWith("Bearer ") ? authHeader.split(" ")[1] : null;
 
diff --git a/src/lib/cloud/room.ts b/src/lib/cloud/room.ts
index ac9156e7..cbb7991d 100644
--- a/src/lib/cloud/room.ts
+++ b/src/lib/cloud/room.ts
@@ -1,4 +1,5 @@
 import { DurableObject } from "cloudflare:workers";
+import { SignJWT } from "jose";
 import * as Y from "yjs";
 import * as encoding from "lib0/encoding";
 import * as syncProtocol from "y-protocols/sync";
@@ -18,6 +19,7 @@ import {
 } from "./types";
 import { handleProtocolMessage } from "./protocol";
 import { ProjectState } from "../project/project-doc";
+import { collectReferencedHashes } from "../assets/asset-refs";
 import { migrateProjectDocCore, readProjectDocVersion } from "../project/migrations/project-migration-runner";
 import { CURRENT_PROJECT_VERSION } from "../project/migrations/project-migrations";
 
@@ -117,6 +119,11 @@ export class ProjectRoom extends DurableObject {
                 key TEXT PRIMARY KEY,
                 value TEXT
             );
+            CREATE TABLE IF NOT EXISTS snapshot_assets (
+                snapshot_key TEXT,
+                hash TEXT
+            );
+            CREATE INDEX IF NOT EXISTS idx_snapshot_assets_key ON snapshot_assets(snapshot_key);
         `);
 
         // Restore project state from SQLite. Attach the update handler AFTER
@@ -294,9 +301,10 @@ export class ProjectRoom extends DurableObject {
                 await (this.env as Env).SNAPSHOTS.put(key, state, {
                     customMetadata: { type: "auto" },
                 });
+                this.indexSnapshotAssets(key);
                 console.log(JSON.stringify({ event: "snapshot_saved", key }));
 
-                // Run retention cleanup
+                // Run retention cleanup (prunes old snapshots + reclaims their assets)
                 await this.cleanupAutoSaves();
             } catch (e) {
                 console.error(JSON.stringify({ event: "snapshot_failed", error: String(e) }));
@@ -370,7 +378,11 @@ export class ProjectRoom extends DurableObject {
         // Batch delete (R2 supports up to 1000 keys per delete)
         if (toDelete.length > 0) {
             await (this.env as Env).SNAPSHOTS.delete(toDelete);
+            this.unindexSnapshots(toDelete);
             console.log(JSON.stringify({ event: "retention_cleanup", deletedCount: toDelete.length }));
+            // Pruning snapshots may have orphaned assets — reclaim them now,
+            // rather than waiting for the next project open.
+            await this.triggerAssetGc();
         }
     }
 
@@ -487,6 +499,11 @@ export class ProjectRoom extends DurableObject {
             return this.handleListSaves();
         }
 
+        // GET /asset-refs — asset hashes referenced by the live doc + every snapshot
+        if (request.method === "GET" && url.pathname === "/asset-refs") {
+            return this.handleAssetRefs();
+        }
+
         // POST /saves/manual — create manual save
         if (request.method === "POST" && url.pathname === "/saves/manual") {
             const { name } = (await request.json()) as { name?: string };
@@ -715,6 +732,119 @@ export class ProjectRoom extends DurableObject {
         return new Response("Not Found", { status: 404 });
     }
 
+    // ---- Asset GC support ----
+
+    /** Marker hash recorded when a snapshot's board cards couldn't be parsed, so
+     *  reference computation reports `complete: false` and the caller skips GC. */
+    private static readonly UNPARSED = "__unparsed__";
+
+    /**
+     * Record the asset hashes a snapshot references, into the `snapshot_assets`
+     * index. Called right after a snapshot is written to R2 — the doc is in
+     * memory, so this is cheap (no decode). On a parse failure we store a marker
+     * so GC stays conservative.
+     */
+    private indexSnapshotAssets(snapshotKey: string): void {
+        let hashes: Set<string>;
+        try {
+            hashes = collectReferencedHashes(this.doc);
+        } catch {
+            this.ctx.storage.sql.exec(
+                "INSERT INTO snapshot_assets (snapshot_key, hash) VALUES (?, ?)",
+                snapshotKey,
+                ProjectRoom.UNPARSED,
+            );
+            return;
+        }
+        for (const hash of hashes) {
+            this.ctx.storage.sql.exec(
+                "INSERT INTO snapshot_assets (snapshot_key, hash) VALUES (?, ?)",
+                snapshotKey,
+                hash,
+            );
+        }
+    }
+
+    /** Drop a snapshot's rows from the index (after it's deleted/expired). */
+    private unindexSnapshots(snapshotKeys: string[]): void {
+        for (const key of snapshotKeys) {
+            this.ctx.storage.sql.exec("DELETE FROM snapshot_assets WHERE snapshot_key = ?", key);
+        }
+    }
+
+    /** Re-key a snapshot's rows (rename re-puts under a new key). */
+    private rekeySnapshot(oldKey: string, newKey: string): void {
+        this.ctx.storage.sql.exec(
+            "UPDATE snapshot_assets SET snapshot_key = ? WHERE snapshot_key = ?",
+            newKey,
+            oldKey,
+        );
+    }
+
+    /**
+     * The asset hashes referenced by the live doc plus every retained snapshot
+     * (the latter read cheaply from the `snapshot_assets` index — no snapshot
+     * decode). `complete` is false if the live doc or any indexed snapshot
+     * couldn't be parsed, so the caller skips deletion.
+     */
+    private computeReferencedHashes(): { hashes: string[]; complete: boolean } {
+        const referenced = new Set<string>();
+        let complete = true;
+
+        try {
+            for (const hash of collectReferencedHashes(this.doc)) referenced.add(hash);
+        } catch {
+            complete = false;
+        }
+
+        const cursor = this.ctx.storage.sql.exec("SELECT DISTINCT hash FROM snapshot_assets");
+        for (const row of cursor) {
+            const hash = row.hash as string;
+            if (hash === ProjectRoom.UNPARSED) {
+                complete = false;
+                continue;
+            }
+            referenced.add(hash);
+        }
+
+        return { hashes: [...referenced], complete };
+    }
+
+    /**
+     * Tell the Next.js app to reclaim now-orphaned R2 assets. Called after a
+     * snapshot is deleted/expired (the moment an asset can become unreferenced
+     * without any user action). Best-effort — failures are retried on the next
+     * retention pass or the next project open.
+     */
+    private async triggerAssetGc(): Promise<void> {
+        const env = this.env as Env;
+        if (!this.projectId || !env.API_URL) return;
+        try {
+            const { hashes, complete } = this.computeReferencedHashes();
+            const token = await new SignJWT({ type: "asset-gc", projectId: this.projectId })
+                .setProtectedHeader({ alg: "HS256" })
+                .setExpirationTime("1m")
+                .sign(new TextEncoder().encode(env.JWT_SECRET));
+
+            await fetch(`${env.API_URL}/api/internal/asset-gc`, {
+                method: "POST",
+                headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+                body: JSON.stringify({ projectId: this.projectId, referenced: hashes, complete }),
+            });
+        } catch (e) {
+            console.error(JSON.stringify({ event: "asset_gc_trigger_failed", error: String(e) }));
+        }
+    }
+
+    /**
+     * Asset hashes referenced by the live doc + every retained snapshot, served
+     * from the index (cheap). The Next.js asset GC route deletes only assets in
+     * none of these, so restoring an older save never loses its images/audio.
+     */
+    private handleAssetRefs(): Response {
+        return Response.json(this.computeReferencedHashes(), { status: 200 });
+    }
+
     // ---- Save/Restore handlers ----
 
     private async handleListSaves(): Promise<Response> {
@@ -779,6 +909,7 @@ export class ProjectRoom extends DurableObject {
         await (this.env as Env).SNAPSHOTS.put(key, state, {
             customMetadata: { type: "manual", name },
         });
+        this.indexSnapshotAssets(key);
 
         console.log(JSON.stringify({ event: "manual_save_created", name }));
 
@@ -868,6 +999,7 @@ export class ProjectRoom extends DurableObject {
             customMetadata: { type: "manual", name },
         });
         await (this.env as Env).SNAPSHOTS.delete(key);
+        this.rekeySnapshot(key, newKey); // refs unchanged — just follow the key
 
         console.log(JSON.stringify({ event: "save_renamed", key, name }));
         return new Response("Renamed", { status: 200 });
@@ -880,7 +1012,10 @@ export class ProjectRoom extends DurableObject {
         }
 
         await (this.env as Env).SNAPSHOTS.delete(key);
+        this.unindexSnapshots([key]);
         console.log(JSON.stringify({ event: "save_deleted", key }));
+        // Deleting a save may have orphaned assets — reclaim them now.
+        await this.triggerAssetGc();
         return new Response("Deleted", { status: 200 });
     }
 
diff --git a/src/lib/cloud/types.ts b/src/lib/cloud/types.ts
index d85d6cd9..6a0feb6a 100644
--- a/src/lib/cloud/types.ts
+++ b/src/lib/cloud/types.ts
@@ -4,6 +4,8 @@ export interface Env {
     PROJECT_ROOM: DurableObjectNamespace;
     JWT_SECRET: string;
     SNAPSHOTS: R2Bucket;
+    /** Base URL of the Next.js app, for the asset-GC callback (e.g. https://scriptio.app). */
+    API_URL: string;
 }
 
 // Configuration
diff --git a/src/lib/cloud/wrangler.toml b/src/lib/cloud/wrangler.toml
index 400c38d3..01ae3ead 100644
--- a/src/lib/cloud/wrangler.toml
+++ b/src/lib/cloud/wrangler.toml
@@ -24,6 +24,10 @@ class_name = "ProjectRoom"
 binding = "SNAPSHOTS"
 bucket_name = "scriptio-snapshots-local"
 
+[vars]
+# Base URL of the Next.js app for the asset-GC callback (local dev).
+API_URL = "http://127.0.0.1:3000"
+
 # --- Production ---
 [env.production]
 name = "scriptio-cloud"
@@ -31,6 +35,9 @@ routes = [
   { pattern = "cloud.scriptio.app", custom_domain = true }
 ]
 
+[env.production.vars]
+API_URL = "https://scriptio.app"
+
 [[env.production.durable_objects.bindings]]
 name = "PROJECT_ROOM"
 class_name = "ProjectRoom"
@@ -52,4 +59,8 @@ class_name = "ProjectRoom"
 
 [[env.staging.r2_buckets]]
 binding = "SNAPSHOTS"
-bucket_name = "scriptio-snapshots-staging"
\ No newline at end of file
+bucket_name = "scriptio-snapshots-staging"
+
+[env.staging.vars]
+# Verify this matches the staging app domain.
+API_URL = "https://staging.scriptio.app"
\ No newline at end of file
diff --git a/src/lib/persistence/storage-provider/local-persistence.ts b/src/lib/persistence/storage-provider/local-persistence.ts
index 5f088766..dd33d2b1 100644
--- a/src/lib/persistence/storage-provider/local-persistence.ts
+++ b/src/lib/persistence/storage-provider/local-persistence.ts
@@ -73,6 +73,14 @@ export async function isLocalOnlyProject(id: string): Promise<boolean> {
     return (await getStorageProvider()).get(id).then((p) => p?.isLocalOnly ?? false);
 }
 
+/** True only when a project is cached AND synced to the cloud (i.e. not
+ *  local-only). An unknown/uncached project is treated as not cloud-synced, so
+ *  asset code never fires network requests for it. */
+export async function isCloudSyncedProject(id: string): Promise<boolean> {
+    const project = await (await getStorageProvider()).get(id);
+    return project ? !project.isLocalOnly : false;
+}
+
 export async function cachedProjectExists(id: string): Promise<boolean> {
     return (await getStorageProvider()).exists(id);
 }
@@ -150,6 +158,23 @@ export async function promoteLocalProjectToCloud(projectId: string): Promise<voi
     if (!local) throw new Error("Project not found in local cache");
     if (!local.isLocalOnly) return;
 
+    // Gather the project's local assets and pre-check the owner's quota before we
+    // create anything in the cloud, so we can fail cleanly if there's no room.
+    const provider = await getStorageProvider();
+    const hashes = await provider.listAssetHashes(projectId);
+    const assets = (await Promise.all(hashes.map((h) => provider.getAsset(projectId, h)))).filter(
+        (a): a is NonNullable<typeof a> => a !== null,
+    );
+
+    if (assets.length > 0) {
+        const { fetchMyStorage } = await import("@src/lib/assets/cloud-asset-sync");
+        const storage = await fetchMyStorage();
+        const totalSize = assets.reduce((sum, a) => sum + a.size, 0);
+        if (storage && storage.used + totalSize > storage.quota) {
+            throw new Error("Uploading this project would exceed your storage limit.");
+        }
+    }
+
     const { uploadProjectToCloud } = await import("@src/lib/utils/requests");
     const res = await uploadProjectToCloud(projectId, {
         title: local.title,
@@ -161,6 +186,19 @@ export async function promoteLocalProjectToCloud(projectId: string): Promise<voi
         throw new Error(json.message ?? `Upload failed (${res.status})`);
     }
     await markCachedProjectAsSynced(projectId);
+
+    // Push existing board assets to R2 now that the cloud project exists. A quota
+    // error aborts (pre-check should make this rare); other per-asset failures are
+    // logged so promotion still completes.
+    const { uploadAssetToCloud, CloudQuotaError } = await import("@src/lib/assets/cloud-asset-sync");
+    for (const asset of assets) {
+        try {
+            await uploadAssetToCloud(projectId, asset);
+        } catch (e) {
+            if (e instanceof CloudQuotaError) throw e;
+            console.warn("[assets] failed to upload asset on cloud promotion:", e);
+        }
+    }
 }
 
 /**
diff --git a/src/lib/project/project-doc.ts b/src/lib/project/project-doc.ts
index 19411c2b..3d7ef0ee 100644
--- a/src/lib/project/project-doc.ts
+++ b/src/lib/project/project-doc.ts
@@ -271,7 +271,7 @@ export type ProjectData = {
     /** Content of every `editor` document node's fragment, keyed by node id. */
     documentContent?: Record<string, JSONContent[]>;
     /** Board data (cards + arrows) for every `board` node, keyed by node id. */
-    boards?: Record<string, BoardData>;
+    boardContent?: Record<string, BoardData>;
     /** Content of every shelf version, keyed by `${nodeId}::${versionId}`. */
     shelfContent?: Record<string, JSONContent[]>;
 };
diff --git a/src/lib/project/project-state.ts b/src/lib/project/project-state.ts
index 120c06ef..365b8674 100644
--- a/src/lib/project/project-state.ts
+++ b/src/lib/project/project-state.ts
@@ -117,7 +117,6 @@ async function getYProtocols() {
     return yProtocolsModule;
 }
 
-
 // -------------------------------- //
 //   PROSEMIRROR HELPERS (browser)  //
 // -------------------------------- //
@@ -160,7 +159,7 @@ const documentContentOf = (ydoc: ProjectState): Record<string, JSONContent[]> =>
 };
 
 /** Board data (cards + arrows) for every `board` node, keyed by node id. */
-const boardsOf = (ydoc: ProjectState): Record<string, BoardData> => {
+const boardContentOf = (ydoc: ProjectState): Record<string, BoardData> => {
     const result: Record<string, BoardData> = {};
     ydoc.documents().forEach((node) => {
         if (node.type === "board") result[node.id] = ydoc.boardData(node.id).toJSON();
@@ -200,7 +199,7 @@ export const projectDataOf = (ydoc: ProjectState): ProjectData => ({
     shelf: ydoc.shelf().toJSON(),
     dictionary: ydoc.dictionary().toJSON(),
     documentContent: documentContentOf(ydoc),
-    boards: boardsOf(ydoc),
+    boardContent: boardContentOf(ydoc),
     shelfContent: shelfContentOf(ydoc),
 });
 
@@ -251,15 +250,11 @@ export const applyProjectData = (ydoc: ProjectState, data: Partial<ProjectData>)
         if (data.documentContent) {
             for (const [id, content] of Object.entries(data.documentContent)) {
                 if (content.length === 0) continue;
-                prosemirrorJSONToYXmlFragment(
-                    ScreenplaySchema,
-                    { type: "doc", content },
-                    ydoc.documentFragment(id),
-                );
+                prosemirrorJSONToYXmlFragment(ScreenplaySchema, { type: "doc", content }, ydoc.documentFragment(id));
             }
         }
-        if (data.boards) {
-            for (const [id, board] of Object.entries(data.boards)) {
+        if (data.boardContent) {
+            for (const [id, board] of Object.entries(data.boardContent)) {
                 const map = ydoc.boardData(id);
                 for (const [key, value] of Object.entries(board)) {
                     map.set(key as keyof BoardData, value as BoardData[keyof BoardData]);
@@ -407,9 +402,7 @@ const initCloudProvider = async (entry: SessionEntry): Promise<void> => {
         const { isTauri } = await import("@tauri-apps/api/core");
         const isDesktop = isTauri();
 
-        const { isLocalOnlyProject } = await import(
-            "../persistence/storage-provider/local-persistence"
-        );
+        const { isLocalOnlyProject } = await import("../persistence/storage-provider/local-persistence");
         if (await isLocalOnlyProject(entry.projectId)) {
             if (!isLive(entry)) return;
             entry.connectionStatus = "disconnected";
@@ -435,16 +428,11 @@ const initCloudProvider = async (entry: SessionEntry): Promise<void> => {
         if (!isLive(entry)) return;
 
         const cloudWsUrl = (process.env.NEXT_PUBLIC_CLOUD_URL || "").replace(/^http/, "ws");
-        const cloudProvider = new ThrottledWebsocketProvider(
-            cloudWsUrl,
-            entry.projectId,
-            entry.state,
-            {
-                params: { token, clientId: entry.state.clientID.toString() },
-                userInfo: entry.currentUserInfo,
-                disableBc: isDesktop,
-            },
-        );
+        const cloudProvider = new ThrottledWebsocketProvider(cloudWsUrl, entry.projectId, entry.state, {
+            params: { token, clientId: entry.state.clientID.toString() },
+            userInfo: entry.currentUserInfo,
+            disableBc: isDesktop,
+        });
         entry.cloudProvider = cloudProvider;
         notifySubscribers(entry);
 
@@ -475,9 +463,7 @@ const initCloudProvider = async (entry: SessionEntry): Promise<void> => {
             entry.connectionStatus = "connecting";
             notifySubscribers(entry);
             try {
-                const { token: refreshed, status: refreshStatus } = await getCloudToken(
-                    entry.projectId,
-                );
+                const { token: refreshed, status: refreshStatus } = await getCloudToken(entry.projectId);
                 if (!isLive(entry)) return;
                 if (refreshStatus === 403) {
                     cloudProvider.shouldConnect = false;
@@ -524,9 +510,7 @@ const initCloudProvider = async (entry: SessionEntry): Promise<void> => {
                 if (entry.localProvider?.clearData) {
                     await entry.localProvider.clearData();
                 } else {
-                    const { clearYjsData } = await import(
-                        "../persistence/storage-provider/local-persistence"
-                    );
+                    const { clearYjsData } = await import("../persistence/storage-provider/local-persistence");
                     await clearYjsData(entry.projectId);
                 }
             } catch (e) {
@@ -602,11 +586,7 @@ const releaseSession = (projectId: string): void => {
         if (entry.cloudProvider) {
             try {
                 const { removeAwarenessStates } = await getYProtocols();
-                removeAwarenessStates(
-                    entry.cloudProvider.awareness,
-                    [entry.state.clientID],
-                    "session release",
-                );
+                removeAwarenessStates(entry.cloudProvider.awareness, [entry.state.clientID], "session release");
             } catch {}
             entry.cloudProvider.destroy();
         }
@@ -632,10 +612,7 @@ const computeStatus = (entry: SessionEntry | null): ProjectStatus => {
     if (entry.isStaleClient) {
         return { kind: "needs-update", outcome: { kind: "stale-client" } };
     }
-    if (
-        entry.migrationOutcome?.kind === "future-version" ||
-        entry.migrationOutcome?.kind === "failed"
-    ) {
+    if (entry.migrationOutcome?.kind === "future-version" || entry.migrationOutcome?.kind === "failed") {
         return { kind: "needs-update", outcome: entry.migrationOutcome };
     }
     if (entry.isProjectUnavailable) return { kind: "unavailable" };
@@ -683,11 +660,7 @@ export const useProjectYjs = ({
         const handleUnload = async () => {
             if (entry.cloudProvider) {
                 const { removeAwarenessStates } = await getYProtocols();
-                removeAwarenessStates(
-                    entry.cloudProvider.awareness,
-                    [entry.state.clientID],
-                    "window unload",
-                );
+                removeAwarenessStates(entry.cloudProvider.awareness, [entry.state.clientID], "window unload");
             }
         };
         window.addEventListener("beforeunload", handleUnload);
diff --git a/src/lib/s3.ts b/src/lib/s3.ts
index b1d2794b..17b8746e 100644
--- a/src/lib/s3.ts
+++ b/src/lib/s3.ts
@@ -1,4 +1,10 @@
-import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import {
+    DeleteObjectCommand,
+    DeleteObjectsCommand,
+    GetObjectCommand,
+    PutObjectCommand,
+    S3Client,
+} from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { env } from "process";
 
@@ -59,3 +65,56 @@ export const destroy = async (name: string): Promise<boolean> => {
         return false;
     }
 };
+
+/** Read an object's raw bytes (null if missing). Used to proxy private assets
+ *  through the same-origin API, avoiding R2 CORS configuration. */
+export const getObjectBytes = async (key: string): Promise<Uint8Array | null> => {
+    try {
+        const res = await client.send(new GetObjectCommand({ Bucket: env.S3_BUCKET, Key: key }));
+        if (!res.Body) return null;
+        return await res.Body.transformToByteArray();
+    } catch (e) {
+        console.error("An error occurred while reading object from S3: ", e);
+        return null;
+    }
+};
+
+/** Upload raw bytes under `key` (generic binary, e.g. board image/audio assets). */
+export const putObject = async (
+    key: string,
+    body: Uint8Array | Buffer,
+    contentType: string,
+): Promise<boolean> => {
+    const params = {
+        Bucket: env.S3_BUCKET,
+        Key: key,
+        Body: body,
+        ContentType: contentType,
+    };
+
+    try {
+        await client.send(new PutObjectCommand(params));
+        return true;
+    } catch (e) {
+        console.error("An error occurred while uploading object to S3: ", e);
+        return false;
+    }
+};
+
+/** Delete many objects at once (best-effort). No-op on an empty list. */
+export const destroyMany = async (keys: string[]): Promise<boolean> => {
+    if (keys.length === 0) return true;
+
+    const params = {
+        Bucket: env.S3_BUCKET,
+        Delete: { Objects: keys.map((Key) => ({ Key })) },
+    };
+
+    try {
+        await client.send(new DeleteObjectsCommand(params));
+        return true;
+    } catch (e) {
+        console.error("An error occurred while destroying objects from S3: ", e);
+        return false;
+    }
+};
diff --git a/src/lib/screenplay/editor.ts b/src/lib/screenplay/editor.ts
index 126524e8..e67f6c34 100644
--- a/src/lib/screenplay/editor.ts
+++ b/src/lib/screenplay/editor.ts
@@ -7,7 +7,7 @@ import Text from "@tiptap/extension-text";
 
 import { ScreenplayNodes, ScriptioBold, ScriptioItalic, ScriptioUnderline, generateNodeId } from "@src/lib/screenplay/nodes";
 import { Placeholder } from "./extensions/placeholder-extension";
-import { PAGE_SIZES } from "./extensions/pagination-extension";
+import { PAGE_SIZES, PageBreakAttribute } from "./extensions/pagination-extension";
 import { ContdExtension } from "./extensions/contd-extension";
 import { FountainExtension } from "./extensions/fountain-extension";
 
@@ -147,6 +147,10 @@ export const BASE_EXTENSIONS = [
     // Individual screenplay element nodes
     ...ScreenplayNodes,
 
+    // Manual page-break attribute (schema-level; logic lives in ScriptioPagination).
+    // In BASE_EXTENSIONS so it survives full-project serialization via ScreenplaySchema.
+    PageBreakAttribute,
+
     // Mark extensions
     ScriptioBold,
     ScriptioItalic,
diff --git a/src/lib/screenplay/extensions/pagination-extension.ts b/src/lib/screenplay/extensions/pagination-extension.ts
index cd3c15f6..ccab4d4f 100644
--- a/src/lib/screenplay/extensions/pagination-extension.ts
+++ b/src/lib/screenplay/extensions/pagination-extension.ts
@@ -166,6 +166,10 @@ export interface PageBreakInfo {
      *  the locked re-application of it — and read by the production panel when
      *  freezing page locks so the split can be reproduced on later recomputes. */
     splitOffset?: number;
+    /** True when this break was forced by a node's manual `pageBreak` attribute
+     *  (inserted from the editor context menu) rather than by natural overflow.
+     *  Drives the "page break" hint rendered in the page gap. */
+    manual?: boolean;
 }
 
 declare module "@tiptap/core" {
@@ -181,6 +185,9 @@ declare module "@tiptap/core" {
             updatePageBreakBackground: (color: string) => ReturnType;
             updateStartNewPageTypes: (types: Set<string>) => ReturnType;
             refreshPagination: () => ReturnType;
+            /** Toggle the manual page-break flag on the top-level node at `pos`.
+             *  When set, pagination forces a new page that begins with that node. */
+            toggleManualPageBreak: (pos: number) => ReturnType;
         };
     }
 }
@@ -497,6 +504,18 @@ function createPageBreakWidget(breakInfo: PageBreakInfo, options: PaginationOpti
     // Visual gap between pages (fixed size = pageGap)
     divider.style.height = `${options.pageGap}px`;
 
+    // Manual page break: hint the user that this boundary was forced from the
+    // context menu (vs a natural overflow break). A dashed line spans the gap
+    // with a centred "page break" pill; the label text comes from the
+    // --page-break-label CSS variable (set per-locale by the editor panel),
+    // matching how the (MORE)/(CONT'D) labels are localised.
+    if (breakInfo.manual) {
+        container.classList.add("pagination-manual-break");
+        const marker = document.createElement("div");
+        marker.className = "pagination-manual-break-label";
+        divider.appendChild(marker);
+    }
+
     // Header area of the new page (fixed size = marginTop)
     headerArea.style.height = `${options.marginTop}px`;
     fillHeader(headerArea, breakInfo.pagenum, thisLabel, options);
@@ -691,7 +710,7 @@ function buildDecorations(
     // pagenum. A matching key keeps the previously drawn DOM, so a key that
     // omits e.g. freespace causes stale spacer heights after content edits.
     for (const b of breaks) {
-        const key = `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}-${b.label ?? ""}-${b.prevLabel ?? ""}-${b.isEmpty ? "E" : ""}-${b.locked ? "L" : ""}-${fp}`;
+        const key = `pb-${b.pagenum}-${b.freespace}-${b.contdName}-${b.splitNodeType}-${b.label ?? ""}-${b.prevLabel ?? ""}-${b.isEmpty ? "E" : ""}-${b.locked ? "L" : ""}-${b.manual ? "M" : ""}-${fp}`;
         pushWidget(b.pos, key, -1, () => createPageBreakWidget(b, options));
         // Only whole-node breaks start a fresh node; mid-node sentence splits
         // (splitNodeType !== null) keep the straddling node, which never had a
@@ -1154,10 +1173,14 @@ const createPaginationPlugin = (extension: {
 
                     const dataId: string | undefined = node.attrs["data-id"];
 
-                    // --- Force page break for "start new page" elements ---
-                    // If this node type is configured to start a new page and we're
-                    // not already at the top of a page, insert a break before it.
-                    if (options.startNewPageTypes.has(nodeType) && pagePos > 0) {
+                    // --- Force page break for "start new page" elements and manual breaks ---
+                    // A node starts a new page when its type is configured to (startNewPage)
+                    // or when the user attached a manual page break to it from the context
+                    // menu. Reading node.attrs.pageBreak is a single property access — the
+                    // loop already reads node.attrs["data-id"] — so this is hot-path free;
+                    // the break itself is only built for the handful of nodes that carry it.
+                    const manualBreak = node.attrs.pageBreak === true;
+                    if (pagePos > 0 && (manualBreak || options.startNewPageTypes.has(nodeType))) {
                         const freespace = contentHeight - pagePos;
                         breaks.push({
                             pos,
@@ -1167,6 +1190,7 @@ const createPaginationPlugin = (extension: {
                             contdName: "",
                             splitNodeType: null,
                             anchorId: dataId,
+                            manual: manualBreak,
                         });
                         // New page's first node margin is set by the pagePos === 0 path below.
                         pagePos = 0;
@@ -1763,12 +1787,20 @@ const createPaginationPlugin = (extension: {
             // further edits — otherwise every keystroke after a collapse would
             // be rejected.
             const before = new Set<string>();
+            // Anchors whose node carried a MANUAL page break are exempt from the
+            // spill guard. A manual break is user-controlled, so deleting its
+            // (now empty) node must always be allowed — even when production page
+            // locking froze that node as an anchor. Without this, forward-Delete
+            // and selection-delete of a manual-break line are silently rejected.
+            const manualBreakBefore = new Set<string>();
             tr.before.forEach((node) => {
                 const dataId = node.attrs?.["data-id"];
-                if (typeof dataId === "string") before.add(dataId);
+                if (typeof dataId !== "string") return;
+                before.add(dataId);
+                if (node.attrs?.["pageBreak"]) manualBreakBefore.add(dataId);
             });
             for (const anchor of lockedAnchors) {
-                if (before.has(anchor) && !after.has(anchor)) return false;
+                if (before.has(anchor) && !after.has(anchor) && !manualBreakBefore.has(anchor)) return false;
             }
             return true;
         },
@@ -1780,9 +1812,54 @@ const createPaginationPlugin = (extension: {
     });
 
 // ---------------------------------------------------------------------------
-// Extension
+// Extensions
 // ---------------------------------------------------------------------------
 
+/**
+ * Declares the `pageBreak` block attribute that drives manual page breaks.
+ *
+ * Kept SEPARATE from ScriptioPagination on purpose: this extension is part of
+ * BASE_EXTENSIONS, so the attribute lives in ScreenplaySchema and survives the
+ * full-project `.scriptio` (de)serialization paths (screenplayOf /
+ * applyProjectData), which build nodes from BASE_EXTENSIONS alone — without the
+ * pagination plugin. The pagination *logic*, the toggle command, and the visual
+ * hint stay in ScriptioPagination; only the schema-level attribute lives here.
+ *
+ * Only meaningful on top-level blocks (the pagination loop walks doc children),
+ * so it is limited to those types — off text/marks and the inner dual-dialogue
+ * column. Default null so y-prosemirror persists nothing for the vast majority
+ * of nodes that never carry a break (createTypeFromElementNode skips null
+ * attrs): zero storage and zero hot-path cost.
+ */
+export const PageBreakAttribute = Extension.create({
+    name: "pageBreakAttribute",
+
+    addGlobalAttributes() {
+        return [
+            {
+                types: [
+                    ScreenplayElement.Scene,
+                    ScreenplayElement.Action,
+                    ScreenplayElement.Character,
+                    ScreenplayElement.Dialogue,
+                    ScreenplayElement.Parenthetical,
+                    ScreenplayElement.Transition,
+                    ScreenplayElement.Section,
+                    ScreenplayElement.Note,
+                    ScreenplayElement.DualDialogue,
+                ],
+                attributes: {
+                    pageBreak: {
+                        default: null,
+                        parseHTML: (element) => (element.getAttribute("data-page-break") === "true" ? true : null),
+                        renderHTML: (attributes) => (attributes.pageBreak ? { "data-page-break": "true" } : {}),
+                    },
+                },
+            },
+        ];
+    },
+});
+
 export const ScriptioPagination = Extension.create<PaginationOptions>({
     name: "Pagination",
 
@@ -1928,6 +2005,41 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                     top: 10px;
                     transform: translateX(calc(100% + 8px));
                 }
+
+                /* Manual (context-menu) page break hint: a dashed line across the
+                   inter-page gap with a centred "page break" pill. Scoped to manual
+                   breaks so natural breaks keep their plain divider. The label text
+                   is supplied per-locale via --page-break-label (set by the editor
+                   panel), mirroring how (MORE)/(CONT'D) are localised. */
+                .pagination-manual-break .pagination-divider {
+                    position: relative;
+                }
+                .pagination-manual-break-label {
+                    position: absolute;
+                    left: 0;
+                    right: 0;
+                    top: 50%;
+                    transform: translateY(-50%);
+                    border-top: 1px dashed var(--secondary-text);
+                    opacity: 0.55;
+                    pointer-events: none;
+                }
+                .pagination-manual-break-label::after {
+                    content: var(--page-break-label, "Page break");
+                    position: absolute;
+                    left: 50%;
+                    top: 50%;
+                    transform: translate(-50%, -50%);
+                    background: var(--main-bg);
+                    color: var(--secondary-text);
+                    padding: 1px 10px;
+                    border-radius: 999px;
+                    font-size: 0.68rem;
+                    font-weight: 600;
+                    letter-spacing: 0.06em;
+                    text-transform: uppercase;
+                    white-space: nowrap;
+                }
             `;
 
         setupTestDiv(editorDOM, this.options);
@@ -2042,6 +2154,14 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                 const curStart = $from.before();
                 if (curStart === 0) return false;
 
+                // Manual page breaks are user-controlled and exempt from the lock
+                // safeguard: an empty node carrying one must delete like any other
+                // line. Defer to the default joinBackward (the filterTransaction
+                // exemption lets it through) instead of the orphan-preserving
+                // collapse below — otherwise the node goes but its frozen number
+                // lingers as a ghost page.
+                if ($from.parent.attrs?.["pageBreak"]) return false;
+
                 // Collapse case: the current block is itself a locked page anchor
                 // and is now empty (the page's last element was just deleted).
                 // Default joinBackward would remove the anchor's data-id and the
@@ -2063,6 +2183,11 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                 const prev = state.doc.resolve(curStart).nodeBefore;
                 if (!prev || prev.textContent.length !== 0) return false;
 
+                // An empty PREVIOUS node with a manual break is likewise exempt:
+                // backspacing into it should remove the break line, so defer to
+                // the default (allowed by the filterTransaction exemption).
+                if (prev.attrs?.["pageBreak"]) return false;
+
                 const prevDataId = prev.attrs?.["data-id"];
                 if (typeof prevDataId !== "string" || !pageLocks[prevDataId]) return false;
 
@@ -2217,6 +2342,22 @@ export const ScriptioPagination = Extension.create<PaginationOptions>({
                     tr.setMeta("forcePaginationUpdate", true);
                     return true;
                 },
+            toggleManualPageBreak:
+                (pos) =>
+                ({ state, tr, dispatch }) => {
+                    // `pos` is the start position of a top-level block (the value
+                    // the context menu resolves via $pos.before(1)). Flip its
+                    // pageBreak flag; the pagination plugin picks the change up
+                    // through the normal doc-changed path and re-breaks the page.
+                    const node = state.doc.nodeAt(pos);
+                    if (!node || !node.isBlock) return false;
+                    if (dispatch) {
+                        const next = node.attrs.pageBreak ? null : true;
+                        tr.setNodeMarkup(pos, undefined, { ...node.attrs, pageBreak: next });
+                        dispatch(tr);
+                    }
+                    return true;
+                },
         };
     },
 });
diff --git a/src/lib/spellcheck/spellcheck-dictionaries.ts b/src/lib/spellcheck/spellcheck-dictionaries.ts
index 71148c82..dbb2d1d8 100644
--- a/src/lib/spellcheck/spellcheck-dictionaries.ts
+++ b/src/lib/spellcheck/spellcheck-dictionaries.ts
@@ -25,6 +25,25 @@ export const DICTIONARY_CATALOG: DictionaryInfo[] = [
 
 const BASE_URL = "https://raw.githubusercontent.com/wooorm/dictionaries/main/dictionaries";
 
+/**
+ * Dictionary shipped with the app under `public/dictionaries/{code}`. It is loaded
+ * locally — no CDN download — so spell check works on first launch and fully offline.
+ */
+export const BUILTIN_DICTIONARY_CODE = "en";
+
+/**
+ * Load the bundled dictionary from the app's static assets. Resolves against the page
+ * origin, which is the served Next app on web and the static export inside Tauri.
+ */
+export async function loadBuiltinDictionary(): Promise<{ aff: Uint8Array; dic: Uint8Array }> {
+    const dir = `/dictionaries/${BUILTIN_DICTIONARY_CODE}`;
+    const [aff, dic] = await Promise.all([
+        fetch(`${dir}/index.aff`).then((r) => r.arrayBuffer()),
+        fetch(`${dir}/index.dic`).then((r) => r.arrayBuffer()),
+    ]);
+    return { aff: new Uint8Array(aff), dic: new Uint8Array(dic) };
+}
+
 /**
  * Fetch a URL as Uint8Array with optional progress tracking.
  * Uses ReadableStream when available for byte-level progress.
diff --git a/src/lib/utils/api-utils.ts b/src/lib/utils/api-utils.ts
index 8fede38c..51f9ff51 100644
--- a/src/lib/utils/api-utils.ts
+++ b/src/lib/utils/api-utils.ts
@@ -63,6 +63,11 @@ export class InternalServerError extends AppError {
         super(500, message);
     }
 }
+export class StorageQuotaExceededError extends AppError {
+    constructor(message = "Storage limit reached") {
+        super(507, message);
+    }
+}
 
 export const SuccessNoContent = () => {
     return new NextResponse(null, { status: 204 });
diff --git a/src/lib/utils/storage-limits.ts b/src/lib/utils/storage-limits.ts
new file mode 100644
index 00000000..1ac5e89d
--- /dev/null
+++ b/src/lib/utils/storage-limits.ts
@@ -0,0 +1,21 @@
+/**
+ * Cloud asset storage limits.
+ *
+ * Quota is owner-centric: every asset in a project counts against the project
+ * OWNER's single pool, summed across all projects they own (see the
+ * `ProjectAsset` model and the asset upload route). These are plain constants —
+ * tune here.
+ */
+
+/** Total cloud-storage budget per owner, shared across all of their projects. */
+export const USER_STORAGE_QUOTA_BYTES = 5 * 1024 ** 3; // 5 GB
+
+/** Hard cap on a single uploaded asset, to bound individual requests. */
+export const MAX_ASSET_SIZE_BYTES = 50 * 1024 ** 2; // 50 MB
+
+/**
+ * Grace window before a cloud orphan is eligible for GC. Protects an asset a
+ * collaborator just added whose referencing card hasn't yet synced to the client
+ * that runs the sweep.
+ */
+export const CLOUD_ASSET_GC_GRACE_MS = 5 * 60 * 1000; // 5 minutes
diff --git a/src/proxy.ts b/src/proxy.ts
index 0014140e..c87d9a03 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -12,6 +12,7 @@ const PUBLIC_API_PREFIXES = [
     "/api/projects/accept-invite", // Accessible to unauthenticated users via invite link
     "/api/contact", // Public contact form
     "/api/metrics", // Prometheus scrape (gated by bearer token in route handler)
+    "/api/internal/", // Worker→app callbacks (gated by a Worker-signed JWT in the route)
 ];
 
 function isPublicApiRoute(pathname: string): boolean {
diff --git a/src/server/repository/project-repository.ts b/src/server/repository/project-repository.ts
index 74802ff0..8ab9bb66 100644
--- a/src/server/repository/project-repository.ts
+++ b/src/server/repository/project-repository.ts
@@ -273,6 +273,74 @@ export class ProjectRepository {
         });
     }
 
+    // ── Cloud assets (board images / audio) ────────────────────────────────
+
+    /** The user id of the project's OWNER (the quota holder), or null. */
+    async fetchProjectOwnerId(projectId: string): Promise<string | null> {
+        const owner = await prisma.projectMember.findFirst({
+            where: { projectId, role: ProjectRole.OWNER },
+            select: { userId: true },
+        });
+        return owner?.userId ?? null;
+    }
+
+    /** Total bytes stored across every project owned by `ownerId`. */
+    async sumOwnerAssetSize(ownerId: string): Promise<number> {
+        const agg = await prisma.projectAsset.aggregate({
+            _sum: { size: true },
+            where: { project: { members: { some: { userId: ownerId, role: ProjectRole.OWNER } } } },
+        });
+        return agg._sum.size ?? 0;
+    }
+
+    /** Total bytes stored for a single project. */
+    async sumProjectAssetSize(projectId: string): Promise<number> {
+        const agg = await prisma.projectAsset.aggregate({
+            _sum: { size: true },
+            where: { projectId },
+        });
+        return agg._sum.size ?? 0;
+    }
+
+    fetchAsset(projectId: string, hash: string) {
+        return prisma.projectAsset.findUnique({
+            where: { projectId_hash: { projectId, hash } },
+        });
+    }
+
+    createAsset(asset: { projectId: string; hash: string; mime: string; size: number; width: number; height: number }) {
+        return prisma.projectAsset.create({ data: asset });
+    }
+
+    listAssetHashes(projectId: string) {
+        return prisma.projectAsset.findMany({
+            where: { projectId },
+            select: { hash: true, createdAt: true },
+        });
+    }
+
+    listAssets(projectId: string) {
+        return prisma.projectAsset.findMany({
+            where: { projectId },
+            select: { hash: true, mime: true, size: true, width: true, height: true },
+        });
+    }
+
+    async existingAssetHashes(projectId: string, hashes: string[]): Promise<string[]> {
+        if (hashes.length === 0) return [];
+        const rows = await prisma.projectAsset.findMany({
+            where: { projectId, hash: { in: hashes } },
+            select: { hash: true },
+        });
+        return rows.map((r) => r.hash);
+    }
+
+    deleteAssets(projectId: string, hashes: string[]) {
+        return prisma.projectAsset.deleteMany({
+            where: { projectId, hash: { in: hashes } },
+        });
+    }
+
     async searchProjects(term: string, limit: number, cursor?: number) {
         if (term) {
             const isUuid = /^[0-9a-f-]{36,}$/i.test(term);
diff --git a/src/server/service/asset-gc-service.ts b/src/server/service/asset-gc-service.ts
new file mode 100644
index 00000000..29eecef5
--- /dev/null
+++ b/src/server/service/asset-gc-service.ts
@@ -0,0 +1,37 @@
+/**
+ * Server-side cloud asset reconcile.
+ *
+ * Given the set of asset hashes still referenced (by the live doc + every
+ * retained snapshot, computed by the Worker), delete the R2 objects and tracking
+ * rows for everything else — grace-window protected so a just-uploaded asset
+ * whose card hasn't synced yet isn't reaped. Shared by the user-triggered GC
+ * route and the Worker's post-retention callback.
+ */
+
+import * as S3 from "@src/lib/s3";
+import * as ProjectService from "@src/server/service/project-service";
+import { computeAssetOrphans } from "@src/lib/assets/asset-orphans";
+import { CLOUD_ASSET_GC_GRACE_MS } from "@src/lib/utils/storage-limits";
+
+/**
+ * Delete cloud assets not in `referenced`. No-op when `complete` is false (the
+ * reference set couldn't be fully computed — never risk deleting a needed asset).
+ * Returns the number of assets reclaimed.
+ */
+export async function reconcileProjectAssets(
+    projectId: string,
+    referenced: string[],
+    complete: boolean,
+): Promise<number> {
+    if (!complete) return 0;
+
+    const stored = await ProjectService.listAssetHashes(projectId);
+    const orphans = computeAssetOrphans(stored, new Set(referenced), Date.now(), CLOUD_ASSET_GC_GRACE_MS);
+
+    if (orphans.length > 0) {
+        await S3.destroyMany(orphans.map((hash) => `assets/${projectId}/${hash}`));
+        await ProjectService.deleteAssets(projectId, orphans);
+    }
+
+    return orphans.length;
+}
diff --git a/src/server/service/project-service.ts b/src/server/service/project-service.ts
index 1d743c22..aab0fe96 100644
--- a/src/server/service/project-service.ts
+++ b/src/server/service/project-service.ts
@@ -79,3 +79,48 @@ export async function getProjectById(projectId: string) {
 export async function getInvitesWithMeta(projectId: string) {
     return repository.fetchInvitesWithMeta(projectId);
 }
+
+// ── Cloud assets ───────────────────────────────────────────────────────────
+
+export async function getProjectOwnerId(projectId: string) {
+    return repository.fetchProjectOwnerId(projectId);
+}
+
+export async function getOwnerStorageUsed(ownerId: string) {
+    return repository.sumOwnerAssetSize(ownerId);
+}
+
+export async function getProjectStorageUsed(projectId: string) {
+    return repository.sumProjectAssetSize(projectId);
+}
+
+export async function getAsset(projectId: string, hash: string) {
+    return repository.fetchAsset(projectId, hash);
+}
+
+export async function createAsset(asset: {
+    projectId: string;
+    hash: string;
+    mime: string;
+    size: number;
+    width: number;
+    height: number;
+}) {
+    return repository.createAsset(asset);
+}
+
+export async function listAssetHashes(projectId: string) {
+    return repository.listAssetHashes(projectId);
+}
+
+export async function getExistingAssetHashes(projectId: string, hashes: string[]) {
+    return repository.existingAssetHashes(projectId, hashes);
+}
+
+export async function getProjectAssets(projectId: string) {
+    return repository.listAssets(projectId);
+}
+
+export async function deleteAssets(projectId: string, hashes: string[]) {
+    return repository.deleteAssets(projectId, hashes);
+}
diff --git a/src/tests/adapters/fountain-page-break.test.ts b/src/tests/adapters/fountain-page-break.test.ts
new file mode 100644
index 00000000..b65b9a56
--- /dev/null
+++ b/src/tests/adapters/fountain-page-break.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from "vitest";
+import { prosemirrorJSONToYXmlFragment } from "y-prosemirror";
+import type { JSONContent } from "@tiptap/react";
+
+import { ProjectState } from "@src/lib/project/project-state";
+import { ScreenplaySchema } from "@src/lib/screenplay/editor";
+import { FountainAdapter } from "@src/lib/adapters/fountain/fountain-adapter";
+
+const toBuffer = (s: string) => new TextEncoder().encode(s).buffer as ArrayBuffer;
+
+const action = (id: string, text: string, pageBreak?: true) => ({
+    type: "action",
+    attrs: { "data-id": id, class: "action", ...(pageBreak ? { pageBreak: true } : {}) },
+    content: [{ type: "text", text }],
+});
+
+const opts = { title: "T", projectAuthor: "A", includeNotes: true } as never;
+
+describe("Fountain page breaks", () => {
+    it("import: a === line sets pageBreak on the following block", () => {
+        const fountain = ["!First action.", "", "===", "", "!After the break."].join("\n");
+        const { screenplay } = new FountainAdapter().convertFrom(toBuffer(fountain));
+        const nodes = screenplay as JSONContent[];
+
+        expect(nodes).toHaveLength(2);
+        expect(nodes[0].attrs?.pageBreak).toBeFalsy();
+        expect(nodes[1].attrs?.pageBreak).toBe(true);
+    });
+
+    it("import: a trailing === with no following block is dropped (no crash)", () => {
+        const fountain = ["!Only action.", "", "==="].join("\n");
+        const { screenplay } = new FountainAdapter().convertFrom(toBuffer(fountain));
+        const nodes = screenplay as JSONContent[];
+        expect(nodes).toHaveLength(1);
+        expect(nodes[0].attrs?.pageBreak).toBeFalsy();
+    });
+
+    it("export: a pageBreak block emits a standalone === line", async () => {
+        const ydoc = new ProjectState();
+        prosemirrorJSONToYXmlFragment(
+            ScreenplaySchema,
+            { type: "doc", content: [action("a1", "Before"), action("a2", "After", true)] },
+            ydoc.screenplayFragment(),
+        );
+
+        const blob = await new FountainAdapter().convertTo(ydoc, opts);
+        const text = await blob.text();
+        // A line that is exactly === (the Fountain page-break token).
+        expect(text.split(/\r?\n/).some((l) => /^={3,}$/.test(l.trim()))).toBe(true);
+        ydoc.destroy();
+    });
+
+    it("round-trips the pageBreak attribute through export then import", async () => {
+        const ydoc = new ProjectState();
+        prosemirrorJSONToYXmlFragment(
+            ScreenplaySchema,
+            {
+                type: "doc",
+                content: [action("a1", "Before"), action("a2", "After", true), action("a3", "Tail")],
+            },
+            ydoc.screenplayFragment(),
+        );
+
+        const adapter = new FountainAdapter();
+        const blob = await adapter.convertTo(ydoc, opts);
+        const buffer = await blob.arrayBuffer();
+        const { screenplay } = adapter.convertFrom(buffer);
+        const nodes = screenplay as JSONContent[];
+
+        const flat = (n: JSONContent) => (n.content ?? []).map((c) => c.text ?? "").join("");
+        const broken = nodes.find((n) => n.attrs?.pageBreak === true);
+        expect(broken).toBeDefined();
+        expect(flat(broken!)).toBe("After");
+        // The other blocks carry no break.
+        expect(nodes.filter((n) => n.attrs?.pageBreak === true)).toHaveLength(1);
+        ydoc.destroy();
+    });
+});
diff --git a/src/tests/assets/assets.test.ts b/src/tests/assets/assets.test.ts
index 71519a4e..68e376e2 100644
--- a/src/tests/assets/assets.test.ts
+++ b/src/tests/assets/assets.test.ts
@@ -211,7 +211,7 @@ describe("scriptio asset bundling", () => {
 
         // The document still parses out of the zip and carries the board card.
         const parsed = adapter.convertFrom(buffer);
-        expect(parsed.boards?.[board]?.cards).toContain(hash);
+        expect(parsed.boardContent?.[board]?.cards).toContain(hash);
 
         // Assets restore into a *different* project id (the import target).
         const dest = pid();
@@ -256,7 +256,7 @@ describe("scriptio asset bundling", () => {
         const buffer = await blob.arrayBuffer();
 
         const parsed = adapter.convertFrom(buffer);
-        expect(parsed.boards?.[board]?.cards).toContain(hash);
+        expect(parsed.boardContent?.[board]?.cards).toContain(hash);
 
         // Audio cards keep their assets referenced (GC must not drop them).
         expect(collectReferencedHashes(ydoc).has(hash)).toBe(true);
diff --git a/src/tests/assets/cloud-assets.test.ts b/src/tests/assets/cloud-assets.test.ts
new file mode 100644
index 00000000..a303ae60
--- /dev/null
+++ b/src/tests/assets/cloud-assets.test.ts
@@ -0,0 +1,59 @@
+import { describe, it, expect } from "vitest";
+
+import { computeAssetOrphans } from "@src/lib/assets/asset-orphans";
+import {
+    createCachedProjectWithId,
+    isCloudSyncedProject,
+    deleteCachedProject,
+} from "@src/lib/persistence/storage-provider/local-persistence";
+
+const pid = () => `ctest-${Math.random().toString(36).slice(2)}`;
+
+describe("computeAssetOrphans (cloud GC mark-sweep with grace)", () => {
+    const now = 1_000_000;
+    const grace = 1000;
+    const old = new Date(now - grace - 1);
+    const fresh = new Date(now - grace + 1);
+
+    it("keeps referenced assets, even old ones", () => {
+        const stored = [{ hash: "a", createdAt: old }];
+        expect(computeAssetOrphans(stored, new Set(["a"]), now, grace)).toEqual([]);
+    });
+
+    it("collects unreferenced assets older than the grace window", () => {
+        const stored = [
+            { hash: "a", createdAt: old },
+            { hash: "b", createdAt: old },
+        ];
+        expect(computeAssetOrphans(stored, new Set(["a"]), now, grace)).toEqual(["b"]);
+    });
+
+    it("spares unreferenced assets still within the grace window", () => {
+        const stored = [{ hash: "b", createdAt: fresh }];
+        expect(computeAssetOrphans(stored, new Set(), now, grace)).toEqual([]);
+    });
+
+    it("matches hashes case-insensitively", () => {
+        const stored = [{ hash: "AbC", createdAt: old }];
+        expect(computeAssetOrphans(stored, new Set(["abc"]), now, grace)).toEqual([]);
+    });
+});
+
+describe("isCloudSyncedProject (gates all cloud asset requests)", () => {
+    it("is false for an uncached project, so no request ever fires for one", async () => {
+        expect(await isCloudSyncedProject(pid())).toBe(false);
+    });
+
+    it("is false for a local-only project and true for a synced one", async () => {
+        const local = pid();
+        const synced = pid();
+        await createCachedProjectWithId(local, "local", undefined, false);
+        await createCachedProjectWithId(synced, "synced", undefined, true);
+
+        expect(await isCloudSyncedProject(local)).toBe(false);
+        expect(await isCloudSyncedProject(synced)).toBe(true);
+
+        await deleteCachedProject(local);
+        await deleteCachedProject(synced);
+    });
+});
diff --git a/src/tests/project/scriptio-roundtrip.test.ts b/src/tests/project/scriptio-roundtrip.test.ts
index 86251522..5a34f44e 100644
--- a/src/tests/project/scriptio-roundtrip.test.ts
+++ b/src/tests/project/scriptio-roundtrip.test.ts
@@ -108,7 +108,7 @@ function snapshot(data: ReturnType<typeof projectDataOf>) {
         shelf: data.shelf,
         dictionary: data.dictionary,
         documentContent: data.documentContent,
-        boards: data.boards,
+        boardContent: data.boardContent,
         shelfContent: data.shelfContent,
     };
 }
diff --git a/src/tests/repro/manual-break-delete.test.ts b/src/tests/repro/manual-break-delete.test.ts
new file mode 100644
index 00000000..a2f6da4a
--- /dev/null
+++ b/src/tests/repro/manual-break-delete.test.ts
@@ -0,0 +1,193 @@
+import { describe, it, expect } from "vitest";
+import { Editor } from "@tiptap/core";
+
+import { BASE_EXTENSIONS } from "@src/lib/screenplay/editor";
+import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
+import {
+    ScriptioPagination,
+    getPageAnchorInfo,
+    paginationKey,
+} from "@src/lib/screenplay/extensions/pagination-extension";
+import { PersistentPageMap } from "@src/lib/screenplay/page-locking";
+import { computeSceneLabels } from "@src/lib/screenplay/scene-locking";
+
+const LINE = 16;
+
+function injectStyle() {
+    const id = "repro-style";
+    if (document.getElementById(id)) return;
+    const s = document.createElement("style");
+    s.id = id;
+    s.textContent = `
+        .ProseMirror > p, #pagination-test-div > p {
+            display: block; width: 100%; line-height: ${LINE}px !important;
+            margin-top: ${LINE}px; margin-bottom: 0; min-height: ${LINE}px;
+            font-size: 12px; box-sizing: border-box; white-space: pre-wrap; padding: 0;
+        }
+    `;
+    document.head.appendChild(s);
+}
+
+type LockState = { locking: boolean; locks: PersistentPageMap };
+
+async function makeEditor(n: number) {
+    injectStyle();
+    const el = document.createElement("div");
+    document.body.appendChild(el);
+    const lockState: LockState = { locking: false, locks: {} };
+
+    const content: object[] = [];
+    for (let i = 0; i < n; i++) {
+        content.push({
+            type: "action",
+            attrs: { "data-id": `n${i}`, class: "action" },
+            content: [{ type: "text", text: `L${i}` }],
+        });
+    }
+
+    const editor = new Editor({
+        element: el,
+        injectCSS: false,
+        autofocus: false,
+        content: { type: "doc", content },
+        extensions: [
+            ...BASE_EXTENSIONS,
+            createNodeIdDedupExtension({ duplicatePersistentScene: () => {} }),
+            ScriptioPagination.configure({
+                pageHeight: 400,
+                pageWidth: 600,
+                marginTop: 0,
+                marginBottom: 0,
+                marginLeft: 0,
+                marginRight: 0,
+                pageGap: 10,
+                getPageLocking: () => lockState.locking,
+                getPageLocks: () => lockState.locks,
+                getSkippedLetters: () => [],
+            }),
+        ],
+    });
+    await new Promise((r) => setTimeout(r, 80));
+    (editor.storage as unknown as Record<string, { fontsReady: boolean }>).Pagination.fontsReady = true;
+    return { editor, lockState };
+}
+
+function nodeStart(editor: Editor, index: number): number {
+    let pos = -1;
+    let i = 0;
+    editor.state.doc.forEach((_n, p) => {
+        if (i === index) pos = p;
+        i++;
+    });
+    return pos;
+}
+
+function ids(editor: Editor): string[] {
+    const out: string[] = [];
+    editor.state.doc.forEach((n) => out.push(n.attrs["data-id"]));
+    return out;
+}
+
+function key(editor: Editor, name: string, code: number) {
+    editor.view.dom.dispatchEvent(
+        new KeyboardEvent("keydown", { key: name, code: name, keyCode: code, which: code, bubbles: true, cancelable: true }),
+    );
+}
+const backspace = (e: Editor) => key(e, "Backspace", 8);
+const del = (e: Editor) => key(e, "Delete", 46);
+
+function emptyNode(editor: Editor, index: number) {
+    const pos = nodeStart(editor, index);
+    const node = editor.state.doc.nodeAt(pos)!;
+    editor.view.dispatch(editor.state.tr.delete(pos + 1, pos + 1 + node.content.size));
+}
+
+function lockAllPages(editor: Editor, lockState: LockState) {
+    const infos = getPageAnchorInfo(editor);
+    const anchors = infos.map((a) => a.anchorId);
+    const labels = computeSceneLabels(anchors, {}, "suffix", []);
+    const locks: PersistentPageMap = {};
+    labels.forEach((l, idx) => {
+        locks[anchors[idx]] = { token: l.token, splitOffset: infos[idx]?.splitOffset };
+    });
+    lockState.locks = locks;
+    lockState.locking = true;
+    const tr = editor.state.tr;
+    tr.setMeta("forcePaginationUpdate", true);
+    tr.setMeta("addToHistory", false);
+    editor.view.dispatch(tr);
+}
+
+// An empty node carrying a manual page break must be deletable — the production
+// page-lock safeguard (which protects locked anchors from spilling) must not
+// trap it, because a manual break is user-controlled.
+describe("delete empty node with a manual page break", () => {
+    it("backspace deletes it when page locking is off", async () => {
+        const { editor } = await makeEditor(5);
+        editor.commands.toggleManualPageBreak(nodeStart(editor, 2));
+        emptyNode(editor, 2);
+
+        editor.commands.focus();
+        editor.commands.setTextSelection(nodeStart(editor, 2) + 1);
+        backspace(editor);
+
+        expect(ids(editor)).not.toContain("n2");
+    });
+
+    it("backspace deletes it cleanly when every page is locked (no ghost page)", async () => {
+        const { editor, lockState } = await makeEditor(5);
+        editor.commands.toggleManualPageBreak(nodeStart(editor, 2));
+        lockAllPages(editor, lockState);
+        emptyNode(editor, 2);
+
+        editor.commands.focus();
+        editor.commands.setTextSelection(nodeStart(editor, 2) + 1);
+        backspace(editor);
+
+        const st = paginationKey.getState(editor.state) as { breaks: { isEmpty?: boolean }[] };
+        expect(ids(editor)).not.toContain("n2");
+        // No synthetic ghost/empty page left behind for the removed manual break.
+        expect(st.breaks.some((b) => b.isEmpty)).toBe(false);
+    });
+
+    it("forward Delete removes it from the previous node when locked", async () => {
+        const { editor, lockState } = await makeEditor(5);
+        editor.commands.toggleManualPageBreak(nodeStart(editor, 2));
+        lockAllPages(editor, lockState);
+        emptyNode(editor, 2);
+
+        const t1 = nodeStart(editor, 1);
+        const n1 = editor.state.doc.nodeAt(t1)!;
+        editor.commands.focus();
+        editor.commands.setTextSelection(t1 + 1 + n1.content.size);
+        del(editor);
+
+        expect(ids(editor)).not.toContain("n2");
+    });
+
+    it("does not weaken the guard for a genuinely locked (non-break) page", async () => {
+        // A locked anchor WITHOUT a manual break must still be protected: forward
+        // Delete into it from the previous node is rejected (no spill).
+        const { editor, lockState } = await makeEditor(8);
+        // Force overflow so a natural break creates a second locked page.
+        lockAllPages(editor, lockState);
+        const st = paginationKey.getState(editor.state) as { breaks: { pos: number; anchorId?: string }[] };
+        if (st.breaks.length === 0) return; // layout produced no break; nothing to assert
+        const anchorId = st.breaks[0].anchorId!;
+        const before = ids(editor);
+        // Find the node just before the locked anchor and forward-Delete into it.
+        let prevPos = -1;
+        editor.state.doc.forEach((n, p) => {
+            if (n.attrs["data-id"] === anchorId) prevPos = p; // anchor pos; prev is before it
+        });
+        const $anchor = editor.state.doc.resolve(prevPos);
+        const prev = $anchor.nodeBefore;
+        if (!prev) return;
+        editor.commands.focus();
+        editor.commands.setTextSelection(prevPos - 1); // end of prev node
+        del(editor);
+        // The locked anchor is still present (guard held).
+        expect(ids(editor)).toContain(anchorId);
+        expect(ids(editor).length).toBe(before.length);
+    });
+});
diff --git a/src/tests/repro/manual-page-break.test.ts b/src/tests/repro/manual-page-break.test.ts
new file mode 100644
index 00000000..e421fbdd
--- /dev/null
+++ b/src/tests/repro/manual-page-break.test.ts
@@ -0,0 +1,128 @@
+import { describe, it, expect } from "vitest";
+import { Editor } from "@tiptap/core";
+
+import { BASE_EXTENSIONS } from "@src/lib/screenplay/editor";
+import { createNodeIdDedupExtension } from "@src/lib/screenplay/extensions/node-id-dedup-extension";
+import { ScriptioPagination, paginationKey } from "@src/lib/screenplay/extensions/pagination-extension";
+
+const LINE = 16;
+
+function injectStyle() {
+    const id = "repro-style";
+    if (document.getElementById(id)) return;
+    const s = document.createElement("style");
+    s.id = id;
+    s.textContent = `
+        .ProseMirror > p, #pagination-test-div > p {
+            display: block; width: 100%; line-height: ${LINE}px !important;
+            margin-top: ${LINE}px; margin-bottom: 0; min-height: ${LINE}px;
+            font-size: 12px; box-sizing: border-box; white-space: pre-wrap; padding: 0;
+        }
+        .ProseMirror > .pagination-page-break + p,
+        .ProseMirror > .pagination-first-page + p { margin-top: 0 !important; }
+    `;
+    document.head.appendChild(s);
+}
+
+/** A handful of short Action lines — well under one page, so no NATURAL break
+ *  ever occurs. Any break in these tests is therefore a manual one. */
+async function makeEditor(n: number) {
+    injectStyle();
+    const el = document.createElement("div");
+    document.body.appendChild(el);
+
+    const content: object[] = [];
+    for (let i = 0; i < n; i++) {
+        content.push({
+            type: "action",
+            attrs: { "data-id": `n${i}`, class: "action" },
+            content: [{ type: "text", text: `L${i}` }],
+        });
+    }
+
+    const editor = new Editor({
+        element: el,
+        injectCSS: false,
+        autofocus: false,
+        content: { type: "doc", content },
+        extensions: [
+            ...BASE_EXTENSIONS,
+            createNodeIdDedupExtension({ duplicatePersistentScene: () => {} }),
+            ScriptioPagination.configure({
+                pageHeight: 400,
+                pageWidth: 600,
+                marginTop: 0,
+                marginBottom: 0,
+                marginLeft: 0,
+                marginRight: 0,
+                pageGap: 10,
+            }),
+        ],
+    });
+    await new Promise((r) => setTimeout(r, 80));
+    (editor.storage as unknown as Record<string, { fontsReady: boolean }>).Pagination.fontsReady = true;
+    return editor;
+}
+
+type Break = { pos: number; manual?: boolean; anchorId?: string };
+
+function breaksOf(editor: Editor): Break[] {
+    const st = paginationKey.getState(editor.state) as { breaks: Break[] } | undefined;
+    return st?.breaks ?? [];
+}
+
+/** Document position immediately before the i-th top-level node. */
+function nodeStart(editor: Editor, index: number): number {
+    let pos = -1;
+    let i = 0;
+    editor.state.doc.forEach((_node, p) => {
+        if (i === index) pos = p;
+        i++;
+    });
+    return pos;
+}
+
+describe("manual page break", () => {
+    it("forces a break that begins at the flagged node", async () => {
+        const editor = await makeEditor(5);
+        expect(breaksOf(editor)).toHaveLength(0); // fits on one page, no natural break
+
+        const target = nodeStart(editor, 2);
+        editor.commands.toggleManualPageBreak(target);
+
+        const breaks = breaksOf(editor);
+        expect(breaks).toHaveLength(1);
+        expect(breaks[0].pos).toBe(target);
+        expect(breaks[0].manual).toBe(true);
+        expect(breaks[0].anchorId).toBe("n2");
+        // The widget carries the manual hint marker.
+        expect((editor.view.dom as HTMLElement).querySelector(".pagination-manual-break")).not.toBeNull();
+    });
+
+    it("toggles back off, removing the break", async () => {
+        const editor = await makeEditor(5);
+        const target = nodeStart(editor, 2);
+
+        editor.commands.toggleManualPageBreak(target);
+        expect(breaksOf(editor)).toHaveLength(1);
+
+        editor.commands.toggleManualPageBreak(target);
+        expect(breaksOf(editor)).toHaveLength(0);
+        expect((editor.view.dom as HTMLElement).querySelector(".pagination-manual-break")).toBeNull();
+    });
+
+    it("is a no-op on the first node (nothing to break before)", async () => {
+        const editor = await makeEditor(5);
+        editor.commands.toggleManualPageBreak(nodeStart(editor, 0));
+        // Attribute is set, but pagination adds no break since the node already
+        // starts page 1.
+        expect(breaksOf(editor)).toHaveLength(0);
+    });
+
+    it("persists the flag as a node attribute", async () => {
+        const editor = await makeEditor(5);
+        const target = nodeStart(editor, 3);
+        editor.commands.toggleManualPageBreak(target);
+        expect(editor.state.doc.nodeAt(target)?.attrs.pageBreak).toBe(true);
+    });
+});

From 9fa85ae0cd31da58227976e92f323b59e353b610 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Mon, 22 Jun 2026 02:33:00 +0200
Subject: [PATCH 76/76] added fadein and writersolo importers, fixed page
 number rendering, fixed pdf export for spellchecked words

---
 .../dashboard/project/ExportProject.tsx       |   4 +-
 components/editor/TitlePagePanel.tsx          |  47 +--
 components/popup/Popup.module.css             |  20 ++
 components/popup/PopupImportFile.tsx          |  45 ++-
 messages/de.json                              |   1 +
 messages/en.json                              |   1 +
 messages/es.json                              |   1 +
 messages/fr.json                              |   1 +
 messages/ja.json                              |   1 +
 messages/ko.json                              |   1 +
 messages/pl.json                              |   1 +
 messages/zh.json                              |   1 +
 src/lib/adapters/fadein/fadein-adapter.ts     | 161 ++++++++++
 src/lib/adapters/pdf/pdf-adapter.ts           |  25 +-
 src/lib/adapters/registry.ts                  |   4 +
 .../adapters/writersolo/writersolo-adapter.ts | 302 ++++++++++++++++++
 src/lib/editor/use-document-editor.ts         |  82 ++---
 src/lib/import/import-project.ts              |   2 +-
 src/lib/screenplay/popup.ts                   |   2 +-
 src/lib/titlepage/titlepage-content.ts        |  23 ++
 src/tests/adapters/fadein-import.test.ts      | 108 +++++++
 src/tests/adapters/writersolo-import.test.ts  | 176 ++++++++++
 22 files changed, 938 insertions(+), 71 deletions(-)
 create mode 100644 src/lib/adapters/fadein/fadein-adapter.ts
 create mode 100644 src/lib/adapters/writersolo/writersolo-adapter.ts
 create mode 100644 src/lib/titlepage/titlepage-content.ts
 create mode 100644 src/tests/adapters/fadein-import.test.ts
 create mode 100644 src/tests/adapters/writersolo-import.test.ts

diff --git a/components/dashboard/project/ExportProject.tsx b/components/dashboard/project/ExportProject.tsx
index affeb671..e3c9b801 100644
--- a/components/dashboard/project/ExportProject.tsx
+++ b/components/dashboard/project/ExportProject.tsx
@@ -16,7 +16,7 @@ import { BaseExportOptions } from "@src/lib/adapters/screenplay-adapter";
 import Dropdown, { DropdownOption } from "@components/utils/Dropdown";
 import { PDFExportOptions } from "@src/lib/adapters/pdf/pdf-adapter";
 import { ScriptioExportOptions } from "@src/lib/adapters/scriptio/scriptio-adapter";
-import { importFileIntoProject } from "@src/lib/import/import-project";
+import { importFileIntoProject, getSupportedImportExtensions } from "@src/lib/import/import-project";
 
 export enum ExportFormat {
     PDF = "pdf",
@@ -156,7 +156,7 @@ const ExportProject = () => {
                     type="file"
                     ref={fileInputRef}
                     onChange={handleFileImport}
-                    accept=".fountain,.txt,.fdx,.scriptio"
+                    accept={getSupportedImportExtensions()}
                     style={{ display: "none" }}
                 />
 
diff --git a/components/editor/TitlePagePanel.tsx b/components/editor/TitlePagePanel.tsx
index 3fb878bc..15308b61 100644
--- a/components/editor/TitlePagePanel.tsx
+++ b/components/editor/TitlePagePanel.tsx
@@ -40,30 +40,37 @@ const TitlePagePanel = ({ isVisible }: { isVisible?: boolean }) => {
         const state = repository.getState();
         const meta = state.metadata();
 
-        if (!meta.get("titlepageInitialized")) {
-            titleEditor.commands.setContent(DEFAULT_TITLEPAGE_CONTENT);
-
-            const { state: editorState, view } = titleEditor;
-            const tr = editorState.tr;
-            let modified = false;
-
-            tr.doc.descendants((node, pos) => {
-                if (node.type.name === TitlePageElement.Title) {
-                    const markType = editorState.schema.marks.underline;
-                    if (markType) {
-                        tr.addMark(pos, pos + node.nodeSize, markType.create({ class: "underline" }));
-                        modified = true;
-                    }
-                    return false;
-                }
-            });
+        // Seed the default template only into a genuinely empty title page. Guard
+        // on the Yjs fragment being empty — not on the metadata flag alone — so a
+        // fresh editor mount, a not-yet-synced flag, or an imported title page
+        // never gets overwritten or has the template appended more than once.
+        if (meta.get("titlepageInitialized") || state.titlepageFragment().length > 0) {
+            if (!meta.get("titlepageInitialized")) meta.set("titlepageInitialized", true);
+            return;
+        }
+
+        titleEditor.commands.setContent(DEFAULT_TITLEPAGE_CONTENT);
 
-            if (modified && view) {
-                view.dispatch(tr);
+        const { state: editorState, view } = titleEditor;
+        const tr = editorState.tr;
+        let modified = false;
+
+        tr.doc.descendants((node, pos) => {
+            if (node.type.name === TitlePageElement.Title) {
+                const markType = editorState.schema.marks.underline;
+                if (markType) {
+                    tr.addMark(pos, pos + node.nodeSize, markType.create({ class: "underline" }));
+                    modified = true;
+                }
+                return false;
             }
+        });
 
-            meta.set("titlepageInitialized", true);
+        if (modified && view) {
+            view.dispatch(tr);
         }
+
+        meta.set("titlepageInitialized", true);
     }, [titleEditor, isYjsReady, repository]);
 
     // Sync project metadata into the module-level ref and editor storage for node view rendering
diff --git a/components/popup/Popup.module.css b/components/popup/Popup.module.css
index 96ac22b3..3fffd44c 100644
--- a/components/popup/Popup.module.css
+++ b/components/popup/Popup.module.css
@@ -141,3 +141,23 @@
     width: 100% !important;
     margin-top: 10px;
 }
+
+.loading {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+}
+
+.spinner {
+    animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(360deg);
+    }
+}
diff --git a/components/popup/PopupImportFile.tsx b/components/popup/PopupImportFile.tsx
index 2eb1c11c..821c33e7 100644
--- a/components/popup/PopupImportFile.tsx
+++ b/components/popup/PopupImportFile.tsx
@@ -2,10 +2,10 @@
 
 import popup from "./Popup.module.css";
 
-import { X } from "lucide-react";
+import { Loader2, X } from "lucide-react";
 import { useDraggable } from "@src/lib/utils/hooks";
 import { PopupData, PopupImportFileData, closePopup } from "@src/lib/screenplay/popup";
-import { useContext } from "react";
+import { useContext, useState } from "react";
 import { UserContext } from "@src/context/UserContext";
 import { useTranslations } from "next-intl";
 
@@ -13,10 +13,30 @@ const PopupImportFile = ({ data: { confirmImport } }: PopupData<PopupImportFileD
     const userCtx = useContext(UserContext);
     const { position, handleMouseDown, isDragging } = useDraggable();
     const t = useTranslations("popup.import");
+    const [isImporting, setIsImporting] = useState(false);
 
-    const onConfirmImport = () => {
-        confirmImport();
-        closePopup(userCtx);
+    const onConfirmImport = async () => {
+        if (isImporting) return;
+        setIsImporting(true);
+        // Parsing the file and writing it into the editor/Yjs document is heavy
+        // and runs on the main thread. Yield for a couple of frames first so the
+        // button's loading state actually paints before that work blocks the UI,
+        // rather than the popup vanishing and the app appearing to freeze.
+        await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
+        try {
+            await confirmImport();
+        } catch (error) {
+            console.error("Import failed:", error);
+        } finally {
+            setIsImporting(false);
+            closePopup(userCtx);
+        }
+    };
+
+    // Block dismissal while an import is in flight so the document isn't left
+    // half-written by a popup that closed mid-import.
+    const dismiss = () => {
+        if (!isImporting) closePopup(userCtx);
     };
 
     return (
@@ -28,7 +48,7 @@ const PopupImportFile = ({ data: { confirmImport } }: PopupData<PopupImportFileD
                     style={{ cursor: isDragging ? "grabbing" : "grab" }}
                 >
                     <h2 className={popup.title}>{t("title")}</h2>
-                    <X className={popup.close_btn} onClick={() => closePopup(userCtx)} />
+                    <X className={popup.close_btn} onClick={dismiss} />
                 </div>
                 <div className={popup.info}>
                     <p>
@@ -38,10 +58,17 @@ const PopupImportFile = ({ data: { confirmImport } }: PopupData<PopupImportFileD
                     </p>
                 </div>
                 <div className={popup.buttons}>
-                    <button className={popup.import_confirm} onClick={onConfirmImport}>
-                        {t("yesImport")}
+                    <button className={popup.import_confirm} onClick={onConfirmImport} disabled={isImporting}>
+                        {isImporting ? (
+                            <span className={popup.loading}>
+                                <Loader2 className={popup.spinner} size={16} />
+                                {t("importing")}
+                            </span>
+                        ) : (
+                            t("yesImport")
+                        )}
                     </button>
-                    <button className={popup.cancel} onClick={() => closePopup(userCtx)}>
+                    <button className={popup.cancel} onClick={dismiss} disabled={isImporting}>
                         {t("no")}
                     </button>
                 </div>
diff --git a/messages/de.json b/messages/de.json
index 76a8ecb5..874b0af4 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -474,6 +474,7 @@
       "warning": "Sind Sie sicher, dass Sie Ihr aktuelles Projekt <b>überschreiben</b> möchten?",
       "info": "Sie können Ihr Projekt exportieren, bevor Sie ein neues importieren.",
       "yesImport": "Ja, importieren",
+      "importing": "Importieren…",
       "no": "Nein"
     },
     "scene": {
diff --git a/messages/en.json b/messages/en.json
index a6f852d6..568ad64a 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -473,6 +473,7 @@
       "warning": "Are you sure you want to <b>overwrite</b> your current project?",
       "info": "You can export your project before importing a new one.",
       "yesImport": "Yes, import",
+      "importing": "Importing…",
       "no": "No"
     },
     "scene": {
diff --git a/messages/es.json b/messages/es.json
index 88f429f6..884a16fc 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -473,6 +473,7 @@
       "warning": "¿Estás seguro de que quieres <b>sobrescribir</b> tu proyecto actual?",
       "info": "Puedes exportar tu proyecto antes de importar uno nuevo.",
       "yesImport": "Sí, importar",
+      "importing": "Importando…",
       "no": "No"
     },
     "scene": {
diff --git a/messages/fr.json b/messages/fr.json
index 04180b74..5931bdcc 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -474,6 +474,7 @@
       "warning": "Êtes-vous sûr de vouloir <b>écraser</b> votre projet actuel ?",
       "info": "Vous pouvez exporter votre projet avant d'en importer un nouveau.",
       "yesImport": "Oui, importer",
+      "importing": "Importation…",
       "no": "Non"
     },
     "scene": {
diff --git a/messages/ja.json b/messages/ja.json
index b5ff5d19..9909e179 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -473,6 +473,7 @@
       "warning": "現在のプロジェクトを <b>上書き</b> しますか？",
       "info": "必要に応じて事前にエクスポートを行ってください。",
       "yesImport": "はい、インポートする",
+      "importing": "インポート中…",
       "no": "いいえ"
     },
     "scene": {
diff --git a/messages/ko.json b/messages/ko.json
index 4727f4f0..5fdc277d 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -473,6 +473,7 @@
       "warning": "현재 프로젝트를 <b>덮어쓰시겠습니까</b>?",
       "info": "새 프로젝트를 가져오기 전에 현재 프로젝트를 내보낼 수 있습니다.",
       "yesImport": "예, 가져오기",
+      "importing": "가져오는 중…",
       "no": "아니요"
     },
     "scene": {
diff --git a/messages/pl.json b/messages/pl.json
index ad783006..17a8eb79 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -473,6 +473,7 @@
       "warning": "Czy na pewno chcesz <b>nadpisać</b> aktualny projekt?",
       "info": "Możesz wyeksportować swój projekt przed zaimportowaniem nowego.",
       "yesImport": "Tak, importuj",
+      "importing": "Importowanie…",
       "no": "Nie"
     },
     "scene": {
diff --git a/messages/zh.json b/messages/zh.json
index c22c204a..7af09df0 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -473,6 +473,7 @@
       "warning": "确认 <b>覆盖</b> 当前项目？",
       "info": "您可以先导出当前项目备份。",
       "yesImport": "确认导入",
+      "importing": "正在导入…",
       "no": "取消"
     },
     "scene": {
diff --git a/src/lib/adapters/fadein/fadein-adapter.ts b/src/lib/adapters/fadein/fadein-adapter.ts
new file mode 100644
index 00000000..aca22cbc
--- /dev/null
+++ b/src/lib/adapters/fadein/fadein-adapter.ts
@@ -0,0 +1,161 @@
+import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
+import { XMLParser } from "@node_modules/fast-xml-parser/src/fxp";
+import { ProjectData } from "@src/lib/project/project-state";
+import { titlePageLine } from "@src/lib/titlepage/titlepage-content";
+import type { JSONContent } from "@tiptap/core";
+import * as fflate from "fflate";
+
+// ─── FadeIn / Open Screenplay Format (OSF) ───────────────────────────────────────
+//
+// A `.fadein` file is a ZIP archive whose single entry, `document.xml`, is an
+// Open Screenplay Format document:
+//
+//   <document type="Open Screenplay Format document" version="40">
+//     <paragraphs>
+//       <para>
+//         <style basestyle="Dialogue"/>
+//         <text>No Dad, they don't.  </text>
+//         <text underline="1">I</text>
+//         <text> do not like the story.</text>
+//       </para>
+//       ...
+//     </paragraphs>
+//     <titlepage> ...same <para> structure... </titlepage>
+//   </document>
+//
+// A paragraph's type is the `basestyle` attribute on its child <style>; inline
+// formatting lives on each <text> run (bold/italic/underline). A manual page
+// break is `pagebreakbefore="1"` on the <style>. This is structurally the FDX
+// format wrapped in a ZIP, so the conversion mirrors the Final Draft adapter.
+
+const DOCUMENT_ENTRY = "document.xml";
+
+// Parser options chosen for OSF specifically:
+//  · trimValues:false        — FadeIn splits sentences across runs and relies on
+//                              significant leading/trailing whitespace (e.g. the
+//                              double space after a sentence); trimming corrupts
+//                              dialogue spacing.
+//  · parseTagValue / parseAttributeValue:false — keep numeric-looking text such
+//                              as "(1973)" and attributes like bold="1" as strings.
+const parser = new XMLParser({
+    ignoreAttributes: false,
+    attributeNamePrefix: "@_",
+    textNodeName: "#text",
+    trimValues: false,
+    parseTagValue: false,
+    parseAttributeValue: false,
+});
+
+// OSF basestyle → Scriptio node type. Unknown styles fall back to "action".
+const OSF_ELEMENT_TABLE: Record<string, string> = {
+    "Scene Heading": "scene",
+    Action: "action",
+    Character: "character",
+    Parenthetical: "parenthetical",
+    Dialogue: "dialogue",
+    Transition: "transition",
+    "Normal Text": "action",
+};
+
+// <text> formatting attribute → Scriptio mark type.
+const OSF_MARK_TABLE: { attr: string; type: string }[] = [
+    { attr: "@_bold", type: "bold" },
+    { attr: "@_italic", type: "italic" },
+    { attr: "@_underline", type: "underline" },
+];
+
+interface OSFTextRun {
+    "#text"?: string;
+    "@_bold"?: string;
+    "@_italic"?: string;
+    "@_underline"?: string;
+}
+
+interface OSFStyle {
+    "@_basestyle"?: string;
+    "@_pagebreakbefore"?: string;
+}
+
+interface OSFParagraph {
+    style?: OSFStyle;
+    text?: OSFTextRun | string | (OSFTextRun | string)[];
+}
+
+/** Coerce a possibly-single XML child into an array (fast-xml-parser collapses singletons). */
+function asArray<T>(value: T | T[] | undefined): T[] {
+    if (value === undefined) return [];
+    return Array.isArray(value) ? value : [value];
+}
+
+/** Build the marks array for a single <text> run from its formatting attributes. */
+function marksOf(run: OSFTextRun): { type: string }[] | undefined {
+    const marks: { type: string }[] = [];
+    for (const { attr, type } of OSF_MARK_TABLE) {
+        if (run[attr as keyof OSFTextRun]) marks.push({ type });
+    }
+    return marks.length > 0 ? marks : undefined;
+}
+
+/** Build the inline text runs of an OSF <para>. */
+function runsOf(para: OSFParagraph): JSONContent[] {
+    const content: JSONContent[] = [];
+    for (const run of asArray(para.text)) {
+        const text = typeof run === "string" ? run : run["#text"] ?? "";
+        if (!text) continue;
+
+        const node: JSONContent = { type: "text", text };
+        const marks = typeof run === "string" ? undefined : marksOf(run);
+        if (marks) node.marks = marks;
+        content.push(node);
+    }
+    return content;
+}
+
+/** Convert OSF <paragraphs> into Scriptio screenplay block nodes. */
+function paragraphsToScreenplay(paras: OSFParagraph[]): JSONContent[] {
+    return paras.map((para) => {
+        const basestyle = para.style?.["@_basestyle"];
+        const type = (basestyle && OSF_ELEMENT_TABLE[basestyle]) || "action";
+
+        const attrs: Record<string, unknown> = { class: type };
+        if (para.style?.["@_pagebreakbefore"]) attrs.pageBreak = true;
+
+        return { type, attrs, content: runsOf(para) };
+    });
+}
+
+/** Convert OSF <titlepage> paragraphs into title-page (`tp-text`) nodes. */
+function paragraphsToTitlePage(paras: OSFParagraph[]): JSONContent[] {
+    return paras.map((para) => titlePageLine(runsOf(para)));
+}
+
+export class FadeInAdapter extends ProjectAdapter<BaseExportOptions> {
+    label = "FadeIn";
+    extension = "fadein";
+
+    convertTo(): Promise<Blob> {
+        return Promise.reject(new Error("Export to FadeIn is not supported"));
+    }
+
+    convertFrom(rawContent: ArrayBuffer): Partial<ProjectData> {
+        const unzipped = fflate.unzipSync(new Uint8Array(rawContent), {
+            filter: (f) => f.name === DOCUMENT_ENTRY,
+        });
+
+        const documentBytes = unzipped[DOCUMENT_ENTRY];
+        if (!documentBytes) {
+            throw new Error("Invalid FadeIn file: missing document.xml");
+        }
+
+        const parsed = parser.parse(fflate.strFromU8(documentBytes));
+        const document = parsed?.document;
+        if (!document) {
+            throw new Error("Invalid FadeIn file: not an Open Screenplay Format document");
+        }
+
+        const screenplay = paragraphsToScreenplay(asArray(document.paragraphs?.para));
+        const titlepage = paragraphsToTitlePage(asArray(document.titlepage?.para));
+
+        return { screenplay, titlepage };
+    }
+}
diff --git a/src/lib/adapters/pdf/pdf-adapter.ts b/src/lib/adapters/pdf/pdf-adapter.ts
index 2e91f293..5a16221a 100644
--- a/src/lib/adapters/pdf/pdf-adapter.ts
+++ b/src/lib/adapters/pdf/pdf-adapter.ts
@@ -47,15 +47,38 @@ const fontFamilyFor = (sf: ScriptFont): string => sf ?? "CourierPrime";
  *
  * Using `getComputedStyle` captures both TipTap inline marks (`<span class="bold">`)
  * and paragraph-level styling (e.g. `.scene { font-weight: bold }`).
+ *
+ * `bold`/`italic` are inherited CSS properties, so the direct parent's computed
+ * value already reflects every ancestor. `text-decoration-line` is NOT inherited,
+ * so underline is resolved by walking the ancestor chain up to the paragraph and
+ * skipping `.spellcheck-error` decoration spans — their wavy red underline is an
+ * editor-only affordance that must never bleed into exports, while a real
+ * underline on a wrapping mark or on the paragraph itself (e.g. `.section`) is
+ * still honoured.
  */
 const getMarksFromComputedStyle = (textNode: Text): { bold: boolean; italic: boolean; underline: boolean } => {
     const el = textNode.parentElement;
     if (!el) return { bold: false, italic: false, underline: false };
     const cs = getComputedStyle(el);
+
+    let underline = false;
+    let node: HTMLElement | null = el;
+    while (node) {
+        if (!node.classList.contains("spellcheck-error")) {
+            const style = node === el ? cs : getComputedStyle(node);
+            if (style.textDecorationLine.includes("underline")) {
+                underline = true;
+                break;
+            }
+        }
+        if (node.tagName === "P") break; // reached the paragraph block
+        node = node.parentElement;
+    }
+
     return {
         bold: cs.fontWeight === "bold" || parseInt(cs.fontWeight) >= 700,
         italic: cs.fontStyle === "italic",
-        underline: cs.textDecorationLine.includes("underline"),
+        underline,
     };
 };
 
diff --git a/src/lib/adapters/registry.ts b/src/lib/adapters/registry.ts
index 0c4a910f..0b38fdf6 100644
--- a/src/lib/adapters/registry.ts
+++ b/src/lib/adapters/registry.ts
@@ -1,8 +1,10 @@
+import { FadeInAdapter } from "./fadein/fadein-adapter";
 import { FinalDraftAdapter } from "./fdx/finaldraft-adapter";
 import { FountainAdapter } from "./fountain/fountain-adapter";
 import { PDFAdapter } from "./pdf/pdf-adapter";
 import { ProjectAdapter } from "./screenplay-adapter";
 import { ScriptioAdapter } from "./scriptio/scriptio-adapter";
+import { WriterSoloAdapter } from "./writersolo/writersolo-adapter";
 
 const adapterMap = new Map<string, ProjectAdapter>();
 const registeredAdapters: ProjectAdapter[] = [
@@ -10,6 +12,8 @@ const registeredAdapters: ProjectAdapter[] = [
     new FinalDraftAdapter(),
     new PDFAdapter(),
     new ScriptioAdapter(),
+    new FadeInAdapter(),
+    new WriterSoloAdapter(),
 ];
 
 registeredAdapters.forEach((adapter) => {
diff --git a/src/lib/adapters/writersolo/writersolo-adapter.ts b/src/lib/adapters/writersolo/writersolo-adapter.ts
new file mode 100644
index 00000000..22fd8c52
--- /dev/null
+++ b/src/lib/adapters/writersolo/writersolo-adapter.ts
@@ -0,0 +1,302 @@
+import { BaseExportOptions, ProjectAdapter } from "../screenplay-adapter";
+import { ProjectData } from "@src/lib/project/project-state";
+import { titlePageLine, toTitlePageAlign } from "@src/lib/titlepage/titlepage-content";
+import type { JSONContent } from "@tiptap/core";
+import * as fflate from "fflate";
+
+// ─── WriterSolo / WriterDuet (.wdz) ──────────────────────────────────────────────
+//
+// A `.wdz` file is a ZIP archive whose single entry, `script.json`, is a
+// Firebase-style operation log (not a static document). The screenplay is
+// reconstructed by replaying that log:
+//
+//   { "b": {                          // branches
+//       "-":         { "h": { ... } },  // the main writing branch
+//       "titlePage": { "h": { ... } },  // the title page branch
+//       ...
+//   } }
+//
+// Each branch's `h` is an ordered map of operations keyed by Firebase push IDs:
+//
+//   { "a": "s", "l": "",   "v": "<json>" }   snapshot: replace the whole subtree
+//   { "a": "u", "l": "data", "v": "<json>" } update: shallow-merge children (each
+//                                            key under `v` is one line, replacing
+//                                            that line but keeping the others)
+//   {            "l": "data/<id>/type", "v": "\"Action\"" }  leaf set
+//
+// Replaying yields a `data` map of line-id → line. Sorting the ids lexicographically
+// gives reading order (WriterDuet ids are fractional-index strings). Each line has:
+//   · type           — WriterDuet line type (Slugline, Action, EditDialogName, …)
+//   · content / `.c` — text as OT change-sets { changeId: [base, ops, timestamp] }.
+//                      `content` is the text as first written, `.c` the later edits;
+//                      a line may carry either or both, so both are composed (oldest
+//                      first). Each op is ["i"|"d", [client, context, pos, payload]]
+//                      where payload is the inserted text ("i") or deleted length ("d").
+//   · pb             — 1 for a manual page break before the line.
+// Inline formatting is carried inline by paired control characters in the text:
+//   \x01…\x02 bold, \x03…\x04 italic, \x05…\x06 underline.
+
+const DOCUMENT_ENTRY = "script.json";
+const MAIN_BRANCH = "-";
+const TITLE_BRANCH = "titlePage";
+
+// WriterDuet line type → Scriptio node type. Unknown types fall back to "action".
+const LINE_TYPE_TABLE: Record<string, string> = {
+    Slugline: "scene",
+    Action: "action",
+    Character: "character",
+    EditDialogName: "character",
+    Dialogue: "dialogue",
+    EditDialogContent: "dialogue",
+    Parenthetical: "parenthetical",
+    EditDialogParen: "parenthetical",
+    Transition: "transition",
+    Note: "note",
+    Text: "action",
+    Shot: "action",
+    Image: "action",
+    Act: "section",
+    EndAct: "section",
+    Outline: "section",
+    Sequence: "section",
+};
+
+type MarkType = "bold" | "italic" | "underline";
+
+// Control characters that open / close an inline style run.
+const MARK_OPENERS: Record<number, MarkType> = { 1: "bold", 3: "italic", 5: "underline" };
+const MARK_CLOSERS: Record<number, MarkType> = { 2: "bold", 4: "italic", 6: "underline" };
+const MARK_ORDER: MarkType[] = ["bold", "italic", "underline"];
+
+function isObject(value: unknown): value is Record<string, unknown> {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// ── Operation-log replay ─────────────────────────────────────────────────────────
+
+/** Return (creating if needed) the nested object at `segs` under `root`. */
+function getPath(root: Record<string, unknown>, segs: string[]): Record<string, unknown> {
+    let cur = root;
+    for (const seg of segs) {
+        const child = cur[seg];
+        if (isObject(child)) {
+            cur = child;
+        } else {
+            const fresh: Record<string, unknown> = {};
+            cur[seg] = fresh;
+            cur = fresh;
+        }
+    }
+    return cur;
+}
+
+/** Set (or delete, when `value` is null) the leaf at `segs` under `root`. */
+function setPath(root: Record<string, unknown>, segs: string[], value: unknown): void {
+    const parent = getPath(root, segs.slice(0, -1));
+    const last = segs[segs.length - 1];
+    if (value === null) delete parent[last];
+    else parent[last] = value;
+}
+
+/** Replay a branch's operation log into its resolved state object. */
+function replayBranch(branch: unknown): Record<string, unknown> {
+    const state: Record<string, unknown> = {};
+    if (!isObject(branch) || !isObject(branch.h)) return state;
+
+    for (const key of Object.keys(branch.h)) {
+        const op = branch.h[key];
+        if (!isObject(op)) continue;
+
+        let value: unknown;
+        try {
+            value = typeof op.v === "string" ? JSON.parse(op.v) : op.v;
+        } catch {
+            value = op.v;
+        }
+
+        const path = typeof op.l === "string" ? op.l.replace(/\/+$/, "") : "";
+        const segs = path ? path.split("/") : [];
+
+        if (op.a === "s") {
+            // Snapshot: replace the subtree (the root, for the initial snapshot).
+            if (segs.length === 0) {
+                for (const k of Object.keys(state)) delete state[k];
+                if (isObject(value)) Object.assign(state, value);
+            } else {
+                setPath(state, segs, value);
+            }
+        } else if (op.a === "u") {
+            // Update: shallow-merge each child of `value` into the path (Firebase
+            // `update()` semantics — replace listed children, keep the rest).
+            const target = getPath(state, segs);
+            if (isObject(value)) {
+                for (const childKey of Object.keys(value)) {
+                    const childVal = value[childKey];
+                    if (childVal === null) delete target[childKey];
+                    else target[childKey] = childVal;
+                }
+            }
+        } else if (segs.length) {
+            // Plain leaf set.
+            setPath(state, segs, value);
+        }
+    }
+
+    return state;
+}
+
+// ── Line → screenplay node ─────────────────────────────────────────────────────────
+
+/** Compose a line's OT change-sets into its final plain text (with style markers). */
+function lineText(line: Record<string, unknown>): string {
+    // Text lives in OT change-sets under `content` and/or `.c`. A line edited
+    // since creation carries both: `content` holds the text as first written,
+    // `.c` the later edits (and a line created granularly, like the very first
+    // one, may have only `.c`). Compose every change-set in timestamp order.
+    const changes: unknown[][] = [];
+    for (const field of [line.content, line[".c"]]) {
+        if (!isObject(field)) continue;
+        for (const change of Object.values(field)) {
+            if (Array.isArray(change)) changes.push(change);
+        }
+    }
+    // Each change-set is [base, ops, timestamp]; apply oldest first.
+    changes.sort((a, b) => (Number(a[2]) || 0) - (Number(b[2]) || 0));
+
+    let text = "";
+    for (const change of changes) {
+        const ops = change[1];
+        if (!Array.isArray(ops)) continue;
+
+        for (const op of ops) {
+            // op is ["i"|"d", [client, context, pos, payload]] — payload is the
+            // inserted string for "i", or the deleted length for "d".
+            if (!Array.isArray(op) || !Array.isArray(op[1])) continue;
+            const args = op[1];
+            const pos = Number(args[2]) || 0;
+            if (op[0] === "i") {
+                const inserted = typeof args[3] === "string" ? args[3] : "";
+                text = text.slice(0, pos) + inserted + text.slice(pos);
+            } else if (op[0] === "d") {
+                const len = Number(args[3]) || 0;
+                text = text.slice(0, pos) + text.slice(pos + len);
+            }
+        }
+    }
+    return text;
+}
+
+/** Split style-marker-delimited text into TipTap text nodes carrying marks. */
+function parseRuns(text: string): JSONContent[] {
+    const runs: JSONContent[] = [];
+    const active: Record<MarkType, boolean> = { bold: false, italic: false, underline: false };
+    let buffer = "";
+
+    const flush = () => {
+        if (!buffer) return;
+        const marks = MARK_ORDER.filter((m) => active[m]).map((type) => ({ type }));
+        const node: JSONContent = { type: "text", text: buffer };
+        if (marks.length > 0) node.marks = marks;
+        runs.push(node);
+        buffer = "";
+    };
+
+    for (const ch of text) {
+        const code = ch.codePointAt(0) ?? 0;
+        if (code in MARK_OPENERS) {
+            flush();
+            active[MARK_OPENERS[code]] = true;
+        } else if (code in MARK_CLOSERS) {
+            flush();
+            active[MARK_CLOSERS[code]] = false;
+        } else {
+            buffer += ch;
+        }
+    }
+    flush();
+    return runs;
+}
+
+/** A screenplay block node for the main document. */
+function screenplayLineToNode(line: Record<string, unknown>): JSONContent {
+    const rawType = typeof line.type === "string" ? line.type : "";
+    const type = LINE_TYPE_TABLE[rawType] ?? "action";
+
+    const attrs: Record<string, unknown> = { class: type };
+    if (line.pb) attrs.pageBreak = true;
+
+    return { type, attrs, content: parseRuns(lineText(line)) };
+}
+
+/** A title-page block node (`tp-text`), carrying the WriterDuet line's alignment. */
+function titlePageLineToNode(line: Record<string, unknown>): JSONContent {
+    return titlePageLine(parseRuns(lineText(line)), toTitlePageAlign(line.al));
+}
+
+/** Replay a branch and convert its lines (in reading order) with `toNode`. */
+function branchToNodes(branch: unknown, toNode: (line: Record<string, unknown>) => JSONContent): JSONContent[] {
+    const data = replayBranch(branch).data;
+    if (!isObject(data)) return [];
+
+    const nodes: JSONContent[] = [];
+    for (const id of Object.keys(data).sort()) {
+        const line = data[id];
+        if (!isObject(line)) continue;
+        if (line.removed || line.deleted) continue;
+        // Skip metadata-only ghost entries (formatting holders without a line type).
+        if (typeof line.type !== "string") continue;
+        nodes.push(toNode(line));
+    }
+    return nodes;
+}
+
+/** Pick the screenplay branch: the conventional `-`, else the first live, non-title one. */
+function selectScreenplayBranch(branches: Record<string, unknown>): unknown {
+    if (branches[MAIN_BRANCH] !== undefined) return branches[MAIN_BRANCH];
+
+    for (const [key, branch] of Object.entries(branches)) {
+        if (key === TITLE_BRANCH || !isObject(branch)) continue;
+        const details = branch.details;
+        if (isObject(details) && details.is_live && details.branchType !== "empty" && !details.removed) {
+            return branch;
+        }
+    }
+    return undefined;
+}
+
+export class WriterSoloAdapter extends ProjectAdapter<BaseExportOptions> {
+    label = "WriterSolo";
+    extension = "wdz";
+
+    convertTo(): Promise<Blob> {
+        return Promise.reject(new Error("Export to WriterSolo is not supported"));
+    }
+
+    convertFrom(rawContent: ArrayBuffer): Partial<ProjectData> {
+        const unzipped = fflate.unzipSync(new Uint8Array(rawContent), {
+            filter: (f) => f.name === DOCUMENT_ENTRY,
+        });
+
+        const bytes = unzipped[DOCUMENT_ENTRY];
+        if (!bytes) {
+            throw new Error("Invalid WriterSolo file: missing script.json");
+        }
+
+        let parsed: unknown;
+        try {
+            parsed = JSON.parse(fflate.strFromU8(bytes));
+        } catch {
+            throw new Error("Invalid WriterSolo file: script.json is not valid JSON");
+        }
+
+        const branches = isObject(parsed) ? parsed.b : undefined;
+        if (!isObject(branches)) {
+            throw new Error("Invalid WriterSolo file: no script branches found");
+        }
+
+        const screenplay = branchToNodes(selectScreenplayBranch(branches), screenplayLineToNode);
+        const titlepage = branchToNodes(branches[TITLE_BRANCH], titlePageLineToNode);
+
+        return { screenplay, titlepage };
+    }
+}
diff --git a/src/lib/editor/use-document-editor.ts b/src/lib/editor/use-document-editor.ts
index d9face08..0768399f 100644
--- a/src/lib/editor/use-document-editor.ts
+++ b/src/lib/editor/use-document-editor.ts
@@ -103,10 +103,13 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         name: "User_" + Math.floor(Math.random() * 1000),
         color: getRandomColor(),
     }));
-    const userInfo = useMemo(() => ({
-        name: user?.username || fallbackUserInfo.name,
-        color: user?.color || fallbackUserInfo.color,
-    }), [user?.username, user?.color, fallbackUserInfo]);
+    const userInfo = useMemo(
+        () => ({
+            name: user?.username || fallbackUserInfo.name,
+            color: user?.color || fallbackUserInfo.color,
+        }),
+        [user?.username, user?.color, fallbackUserInfo],
+    );
 
     // Keep all refs in sync
     useEffect(() => {
@@ -160,27 +163,30 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
     // ---- Mutable container for extension getter functions ----
     // useMemo with [] creates a stable object reference; we mutate its properties each render
     // so that extension getter closures always return the latest values without .current accesses.
-    const ext = useMemo(() => ({
-        highlightedCharacters,
-        characters,
-        scenes,
-        repository,
-        callbacks,
-        spellWorker,
-        isSpellWorkerReady,
-        searchTerm,
-        searchFilters,
-        currentSearchIndex,
-        setSearchMatches,
-        activeSearchEditor,
-        sceneLocking,
-        sceneNumberingStyle,
-        skippedSceneLetters,
-        persistentScenes,
-        pageLocking,
-        persistentPages,
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }), []);
+    const ext = useMemo(
+        () => ({
+            highlightedCharacters,
+            characters,
+            scenes,
+            repository,
+            callbacks,
+            spellWorker,
+            isSpellWorkerReady,
+            searchTerm,
+            searchFilters,
+            currentSearchIndex,
+            setSearchMatches,
+            activeSearchEditor,
+            sceneLocking,
+            sceneNumberingStyle,
+            skippedSceneLetters,
+            persistentScenes,
+            pageLocking,
+            persistentPages,
+            // eslint-disable-next-line react-hooks/exhaustive-deps
+        }),
+        [],
+    );
     ext.highlightedCharacters = highlightedCharacters;
     ext.characters = characters;
     ext.scenes = scenes;
@@ -231,15 +237,18 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
         cb(data);
     }, []);
 
-    const onKeybindAction = useCallback((id: KeybindId, editorInstance: Editor) => {
-        const gc = callbacks.globalContext;
-        if (!gc) return;
-        executeKeybindAction(id, {
-            editor: editorInstance,
-            toggleFocusMode: gc.toggleFocusMode,
-            saveProject: gc.saveProject,
-        });
-    }, [callbacks.globalContext]);
+    const onKeybindAction = useCallback(
+        (id: KeybindId, editorInstance: Editor) => {
+            const gc = callbacks.globalContext;
+            if (!gc) return;
+            executeKeybindAction(id, {
+                editor: editorInstance,
+                toggleFocusMode: gc.toggleFocusMode,
+                saveProject: gc.saveProject,
+            });
+        },
+        [callbacks.globalContext],
+    );
 
     // ---- Dynamic extensions (created once, read from ext container) ----
     const characterHighlightExtension = features.characterHighlights
@@ -350,11 +359,11 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
                     config.features.paginationMode === "screenplay"
                         ? {
                               pageGap: 20,
-                              headerRight: `<p class="page-number" style="margin-top: 50px;">{page}.</p>`,
+                              headerRight: `<p class="page-number">{page}.</p>`,
                               customHeader: {
                                   1: {
                                       headerLeft: "",
-                                      headerRight: `<p class="page-number" style="margin-top: 50px;"></p>`,
+                                      headerRight: `<p class="page-number"></p>`,
                                   },
                               },
                               footerRight: "",
@@ -394,7 +403,6 @@ export const useDocumentEditor = (config: DocumentEditorConfig, callbacks: Docum
                 ...(spellcheckExtension ? [spellcheckExtension] : []),
             ],
 
-
             onSelectionUpdate({ editor, transaction }) {
                 const cb = callbacksRef.current;
 
diff --git a/src/lib/import/import-project.ts b/src/lib/import/import-project.ts
index 16efc25a..62ab5792 100644
--- a/src/lib/import/import-project.ts
+++ b/src/lib/import/import-project.ts
@@ -188,5 +188,5 @@ export async function importFileAsProject(
  * Get supported import file extensions.
  */
 export function getSupportedImportExtensions(): string {
-    return ".fountain,.txt,.fdx,.scriptio";
+    return ".fountain,.txt,.fdx,.scriptio,.fadein,.wdz";
 }
diff --git a/src/lib/screenplay/popup.ts b/src/lib/screenplay/popup.ts
index 82bdb1ed..90e1ad48 100644
--- a/src/lib/screenplay/popup.ts
+++ b/src/lib/screenplay/popup.ts
@@ -6,7 +6,7 @@ import { Scene } from "./scenes";
 //      SPECIFIC POPUP DATA       //
 // ------------------------------ //
 export type PopupImportFileData = {
-    confirmImport: () => void;
+    confirmImport: () => void | Promise<void>;
 };
 
 export type PopupCharacterData = {
diff --git a/src/lib/titlepage/titlepage-content.ts b/src/lib/titlepage/titlepage-content.ts
new file mode 100644
index 00000000..2f33e085
--- /dev/null
+++ b/src/lib/titlepage/titlepage-content.ts
@@ -0,0 +1,23 @@
+import type { JSONContent } from "@tiptap/core";
+
+// Helpers for building imported title-page content. The title page editor uses
+// its own schema (see `TitlePageSchema`): every line is a single `tp-text` block
+// whose `textAlign` drives alignment, with inline text + marks inside. Importers
+// must emit this shape — screenplay nodes (`action`, `scene`, …) are not valid in
+// the title-page fragment and get dropped (or rejected by `prosemirrorJSONToYXmlFragment`).
+
+/** The single block node type of the title page schema. */
+export const TITLEPAGE_NODE = "tp-text";
+
+export type TitlePageAlign = "left" | "center" | "right";
+
+/** Normalize an arbitrary alignment value to a supported title page alignment. */
+export const toTitlePageAlign = (value: unknown): TitlePageAlign =>
+    value === "center" || value === "right" ? value : "left";
+
+/** Build one title page line (a `tp-text` block) from inline content and alignment. */
+export const titlePageLine = (content: JSONContent[], align: TitlePageAlign = "left"): JSONContent => ({
+    type: TITLEPAGE_NODE,
+    attrs: { textAlign: align },
+    content,
+});
diff --git a/src/tests/adapters/fadein-import.test.ts b/src/tests/adapters/fadein-import.test.ts
new file mode 100644
index 00000000..ee3f8697
--- /dev/null
+++ b/src/tests/adapters/fadein-import.test.ts
@@ -0,0 +1,108 @@
+import { describe, expect, it } from "vitest";
+import type { JSONContent } from "@tiptap/react";
+import * as fflate from "fflate";
+
+import { FadeInAdapter } from "@src/lib/adapters/fadein/fadein-adapter";
+
+/** Wrap an OSF document.xml string into a `.fadein` ZIP buffer. */
+const toFadeIn = (xml: string): ArrayBuffer => {
+    const zip = fflate.zipSync({ "document.xml": fflate.strToU8(xml) });
+    return zip.buffer.slice(zip.byteOffset, zip.byteOffset + zip.byteLength) as ArrayBuffer;
+};
+
+const DOC = `<?xml version="1.0" encoding="UTF-8"?>
+<document type="Open Screenplay Format document" version="40">
+  <paragraphs>
+    <para>
+      <style basestyle="Scene Heading"/>
+      <text>INT. WILL'S BEDROOM - NIGHT (1973)</text>
+    </para>
+    <para>
+      <style basestyle="Character"/>
+      <text>EDWARD (V.O.)</text>
+    </para>
+    <para>
+      <style basestyle="Dialogue"/>
+      <text>No Dad, they don't.  </text>
+      <text underline="1">I</text>
+      <text> do not like the story.</text>
+    </para>
+    <para>
+      <style basestyle="Action" pagebreakbefore="1"/>
+      <text bold="1">FADE IN:</text>
+    </para>
+    <para>
+      <style basestyle="Transition"/>
+      <text>CUT TO:</text>
+    </para>
+  </paragraphs>
+  <titlepage>
+    <para>
+      <style basestyle="Normal Text"/>
+      <text>BIG FISH</text>
+    </para>
+    <para>
+      <style basestyle="Normal Text"/>
+      <text></text>
+    </para>
+  </titlepage>
+</document>`;
+
+describe("FadeIn adapter import", () => {
+    const { screenplay, titlepage } = new FadeInAdapter().convertFrom(toFadeIn(DOC));
+    const nodes = screenplay as JSONContent[];
+
+    it("maps OSF basestyles to Scriptio node types", () => {
+        expect(nodes.map((n) => n.type)).toEqual([
+            "scene",
+            "character",
+            "dialogue",
+            "action",
+            "transition",
+        ]);
+        // attrs.class mirrors the node type.
+        expect(nodes.every((n) => n.attrs?.class === n.type)).toBe(true);
+    });
+
+    it("splits a multi-run paragraph into text nodes, preserving marks and spacing", () => {
+        const dialogue = nodes[2];
+        expect(dialogue.content).toHaveLength(3);
+        // Inter-run whitespace (the double space after the sentence) is preserved.
+        expect(dialogue.content?.map((c) => c.text)).toEqual([
+            "No Dad, they don't.  ",
+            "I",
+            " do not like the story.",
+        ]);
+        // Only the middle run is underlined.
+        expect(dialogue.content?.[0].marks).toBeUndefined();
+        expect(dialogue.content?.[1].marks).toEqual([{ type: "underline" }]);
+        expect(dialogue.content?.[2].marks).toBeUndefined();
+    });
+
+    it("carries bold formatting through as a mark", () => {
+        expect(nodes[3].content?.[0]).toMatchObject({
+            text: "FADE IN:",
+            marks: [{ type: "bold" }],
+        });
+    });
+
+    it("turns pagebreakbefore into the pageBreak attribute", () => {
+        expect(nodes[3].attrs?.pageBreak).toBe(true);
+        expect(nodes[0].attrs?.pageBreak).toBeFalsy();
+    });
+
+    it("imports the title page as tp-text lines, keeping blank lines as empty nodes", () => {
+        const tp = titlepage as JSONContent[];
+        expect(tp).toHaveLength(2);
+        // Title page lines must use the title-page schema node, not screenplay nodes.
+        expect(tp.every((n) => n.type === "tp-text")).toBe(true);
+        expect(tp[0].content?.[0].text).toBe("BIG FISH");
+        expect(tp[1].content).toEqual([]);
+    });
+
+    it("throws a clear error when document.xml is missing", () => {
+        const empty = fflate.zipSync({ "other.txt": fflate.strToU8("x") });
+        const buffer = empty.buffer.slice(empty.byteOffset, empty.byteOffset + empty.byteLength) as ArrayBuffer;
+        expect(() => new FadeInAdapter().convertFrom(buffer)).toThrow(/document\.xml/);
+    });
+});
diff --git a/src/tests/adapters/writersolo-import.test.ts b/src/tests/adapters/writersolo-import.test.ts
new file mode 100644
index 00000000..ac6f04cd
--- /dev/null
+++ b/src/tests/adapters/writersolo-import.test.ts
@@ -0,0 +1,176 @@
+import { describe, expect, it } from "vitest";
+import type { JSONContent } from "@tiptap/react";
+import { prosemirrorJSONToYXmlFragment } from "y-prosemirror";
+import * as fflate from "fflate";
+
+import { WriterSoloAdapter } from "@src/lib/adapters/writersolo/writersolo-adapter";
+import { ProjectState, titlepageOf } from "@src/lib/project/project-state";
+import { TitlePageSchema } from "@src/lib/titlepage/editor";
+
+// WriterDuet wraps styled runs in paired control characters.
+const wrap = (open: number, close: number, s: string) =>
+    String.fromCharCode(open) + s + String.fromCharCode(close);
+const bold = (s: string) => wrap(1, 2, s);
+const underline = (s: string) => wrap(5, 6, s);
+
+/** A line as stored after replay: text is a single OT insert change-set. */
+const line = (type: string, text: string, extra: Record<string, unknown> = {}) => ({
+    type,
+    content: { c1: [0, [["i", [1, "", 0, text]]], 1] },
+    ...extra,
+});
+
+/** Wrap a WriterSolo document object into a `.wdz` ZIP buffer. */
+const toWdz = (doc: unknown): ArrayBuffer => {
+    const zip = fflate.zipSync({ "script.json": fflate.strToU8(JSON.stringify(doc)) });
+    return zip.buffer.slice(zip.byteOffset, zip.byteOffset + zip.byteLength) as ArrayBuffer;
+};
+
+// Body lines keyed so a lexicographic sort yields reading order.
+const bodyLines = {
+    a0: line("Slugline", "INT. HOUSE - DAY"),
+    a1: line("Action", `${bold("FADE IN:")} then normal.`),
+    a2: line("EditDialogName", "JANE"),
+    a3: line("EditDialogParen", "(softly)"),
+    a4: line("EditDialogContent", `Hello ${underline("world")}.`),
+    a5: line("Transition", "CUT TO:"),
+};
+
+const DOC = {
+    b: {
+        "-": {
+            h: {
+                // snapshot, batch update (a:"u"), then a granular leaf set.
+                "-": { a: "s", l: "", v: JSON.stringify({ data: {} }) },
+                op1: { a: "u", l: "data", v: JSON.stringify(bodyLines) },
+                op2: { l: "data/a5/pb", v: "1" }, // page break before the transition
+            },
+        },
+        titlePage: {
+            h: {
+                "-": { a: "s", l: "", v: JSON.stringify({ data: {} }) },
+                t1: {
+                    a: "u",
+                    l: "data",
+                    v: JSON.stringify({
+                        z0: line("Title", "BIG FISH", { al: "center" }),
+                        z1: line("Text", ""),
+                    }),
+                },
+            },
+        },
+    },
+};
+
+describe("WriterSolo adapter import", () => {
+    const { screenplay, titlepage } = new WriterSoloAdapter().convertFrom(toWdz(DOC));
+    const nodes = screenplay as JSONContent[];
+
+    it("replays the oplog and maps line types in reading order", () => {
+        expect(nodes.map((n) => n.type)).toEqual([
+            "scene",
+            "action",
+            "character",
+            "parenthetical",
+            "dialogue",
+            "transition",
+        ]);
+        expect(nodes.every((n) => n.attrs?.class === n.type)).toBe(true);
+    });
+
+    it("decodes inline bold control characters into a mark, splitting runs", () => {
+        expect(nodes[1].content).toEqual([
+            { type: "text", text: "FADE IN:", marks: [{ type: "bold" }] },
+            { type: "text", text: " then normal." },
+        ]);
+    });
+
+    it("decodes inline underline control characters mid-run", () => {
+        expect(nodes[4].content).toEqual([
+            { type: "text", text: "Hello " },
+            { type: "text", text: "world", marks: [{ type: "underline" }] },
+            { type: "text", text: "." },
+        ]);
+    });
+
+    it("applies a granular leaf-set op (pb) as a page break", () => {
+        expect(nodes[5].attrs?.pageBreak).toBe(true);
+        expect(nodes[0].attrs?.pageBreak).toBeFalsy();
+    });
+
+    it("imports the title page as tp-text lines, with alignment and blank lines", () => {
+        const tp = titlepage as JSONContent[];
+        expect(tp).toHaveLength(2);
+        // Title page lines must be the title-page schema node, not screenplay nodes.
+        expect(tp.every((n) => n.type === "tp-text")).toBe(true);
+        expect(tp[0].attrs?.textAlign).toBe("center");
+        expect(tp[0].content?.[0].text).toBe("BIG FISH");
+        expect(tp[1].content).toEqual([]);
+    });
+
+    it("title page survives the title-page Yjs fragment round-trip (the import path)", () => {
+        // applyProjectData writes the title page through TitlePageSchema; screenplay
+        // nodes would be rejected here. This proves the emitted nodes are valid.
+        const ydoc = new ProjectState();
+        prosemirrorJSONToYXmlFragment(
+            TitlePageSchema,
+            { type: "doc", content: titlepage as JSONContent[] },
+            ydoc.titlepageFragment(),
+        );
+        const back = titlepageOf(ydoc);
+        expect(back).toHaveLength(2);
+        expect(back[0].content?.[0].text).toBe("BIG FISH");
+        ydoc.destroy();
+    });
+
+    it("throws a clear error when script.json is missing", () => {
+        const zip = fflate.zipSync({ "other.txt": fflate.strToU8("x") });
+        const buffer = zip.buffer.slice(zip.byteOffset, zip.byteOffset + zip.byteLength) as ArrayBuffer;
+        expect(() => new WriterSoloAdapter().convertFrom(buffer)).toThrow(/script\.json/);
+    });
+});
+
+describe("WriterSolo text reconstruction (content + .c)", () => {
+    // A line whose text lives only in `.c` (created granularly, like the first
+    // line of a real document) and a line that was edited after creation: its
+    // original `content` ("Untitled") composes with `.c` delete/insert ops into
+    // "Big Fish" — mirroring the real title-page Title line.
+    const editLines = {
+        a0: {
+            type: "Action",
+            ".c": { e0: [1, [["i", [1, "", 0, "Opening narration."]]], 100] },
+        },
+        a1: {
+            type: "Slugline",
+            content: { o1: [0, [["i", [0, "", 0, "Untitled"]]], 10] },
+            ".c": {
+                e1: [9, [["d", [9, "ctx", 0, 3]]], 20], // "Untitled" → "itled"
+                e2: [9, [["i", [9, "ctx", 0, "B"]]], 21], // → "Bitled"
+                e3: [9, [["d", [9, "ctx", 2, 4]]], 22], // → "Bi"
+                e4: [9, [["i", [9, "ctx", 2, "g Fish"]]], 23], // → "Big Fish"
+            },
+        },
+    };
+
+    const doc = {
+        b: {
+            "-": {
+                h: {
+                    "-": { a: "s", l: "", v: JSON.stringify({ data: {} }) },
+                    op1: { a: "u", l: "data", v: JSON.stringify(editLines) },
+                },
+            },
+        },
+    };
+
+    const { screenplay } = new WriterSoloAdapter().convertFrom(toWdz(doc));
+    const nodes = screenplay as JSONContent[];
+
+    it("reconstructs text stored only in .c", () => {
+        expect(nodes[0].content?.[0].text).toBe("Opening narration.");
+    });
+
+    it("composes content with .c edits (insert/delete) into the final text", () => {
+        expect(nodes[1].content?.[0].text).toBe("Big Fish");
+    });
+});