From 8a5fca70666be2a9c937b6e55aa4ed0d0d14e277 Mon Sep 17 00:00:00 2001
From: Gautam25Raj <ashragautam25@gmail.com>
Date: Wed, 27 May 2026 00:44:24 +0530
Subject: [PATCH 1/2] feat: update session caching and improve document counts
 handling

---
 apps/server/src/middleware/auth.ts            |  4 +-
 apps/server/src/utils/authCache.ts            |  6 +-
 .../(dashboard)/components/OverviewHome.tsx   |  4 +-
 .../documents/useDocumentsWorkspace.ts        |  2 +-
 .../(dashboard)/documents/workspace.tsx       | 10 ++-
 apps/studio/app/(main)/(dashboard)/error.tsx  |  6 +-
 packages/ui/src/components/ui/Modal.tsx       | 84 ++++++++++++++++++-
 7 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/apps/server/src/middleware/auth.ts b/apps/server/src/middleware/auth.ts
index 6792481..547d901 100644
--- a/apps/server/src/middleware/auth.ts
+++ b/apps/server/src/middleware/auth.ts
@@ -1,6 +1,7 @@
 import { NextFunction, Request, Response } from "express";
 
 import { ApiError } from "#utils/errors";
+import { config } from "#config";
 
 import { convertNodeHeadersToWebHeaders, getSessionFromRequestHeaders } from "#auth/index";
 
@@ -63,8 +64,7 @@ export async function getSessionUserFromRequest(req: Request): Promise<Authentic
       name: user.name ?? null,
     };
 
-    // 5. Cache result in Redis for 15 minutes (short TTL for security)
-    await cacheSet(cacheKey, authUser, 900);
+    await cacheSet(cacheKey, authUser, config.auth.sessionCacheMaxAgeSeconds);
 
     req.authUser = authUser;
     return authUser;
diff --git a/apps/server/src/utils/authCache.ts b/apps/server/src/utils/authCache.ts
index c0fb694..66003d7 100644
--- a/apps/server/src/utils/authCache.ts
+++ b/apps/server/src/utils/authCache.ts
@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
-import { cacheDel } from "./redis";
+
+import { cacheDel } from "./redis.js";
 
 export function extractStableAuthCookieFingerprint(cookieHeader: string): string | null {
   const authCookies = cookieHeader
@@ -27,13 +28,16 @@ export function extractStableAuthCookieFingerprint(cookieHeader: string): string
 
 export function getSessionCacheKey(cookieHeader: string): string | null {
   const fingerprint = extractStableAuthCookieFingerprint(cookieHeader);
+
   if (!fingerprint) return null;
+
   const cookieHash = createHash("md5").update(fingerprint).digest("hex");
   return `auth:session:${cookieHash}`;
 }
 
 export async function invalidateSessionCache(cookieHeader: string): Promise<void> {
   const cacheKey = getSessionCacheKey(cookieHeader);
+
   if (cacheKey) {
     await cacheDel(cacheKey);
   }
diff --git a/apps/studio/app/(main)/(dashboard)/components/OverviewHome.tsx b/apps/studio/app/(main)/(dashboard)/components/OverviewHome.tsx
index 403f8e0..dcc2212 100644
--- a/apps/studio/app/(main)/(dashboard)/components/OverviewHome.tsx
+++ b/apps/studio/app/(main)/(dashboard)/components/OverviewHome.tsx
@@ -38,9 +38,11 @@ const OverviewHome = () => {
     () => DOCUMENT_LIBRARY_SERVER_SNAPSHOT,
   );
 
-  const totalCount = snapshot.counts.RESUME + snapshot.counts.COVER_LETTER;
+  const totalCount = Object.values(snapshot.counts).reduce((sum, count) => sum + count, 0);
+
   const resumeCount = snapshot.counts.RESUME;
   const coverLetterCount = snapshot.counts.COVER_LETTER;
+
   const recentDocs = snapshot.docs.slice(0, 6);
 
   return (
diff --git a/apps/studio/app/(main)/(dashboard)/documents/useDocumentsWorkspace.ts b/apps/studio/app/(main)/(dashboard)/documents/useDocumentsWorkspace.ts
index 4801bbc..524dd76 100644
--- a/apps/studio/app/(main)/(dashboard)/documents/useDocumentsWorkspace.ts
+++ b/apps/studio/app/(main)/(dashboard)/documents/useDocumentsWorkspace.ts
@@ -49,7 +49,7 @@ export function useDocumentsWorkspace() {
   );
 
   const { docs, counts } = snapshot;
-  const totalCount = counts.RESUME + counts.COVER_LETTER;
+  const totalCount = Object.values(counts).reduce((sum, count) => sum + count, 0);
 
   const bump = useCallback(() => setRefreshKey((key) => key + 1), []);
 
diff --git a/apps/studio/app/(main)/(dashboard)/documents/workspace.tsx b/apps/studio/app/(main)/(dashboard)/documents/workspace.tsx
index 52b8c3c..517e29b 100644
--- a/apps/studio/app/(main)/(dashboard)/documents/workspace.tsx
+++ b/apps/studio/app/(main)/(dashboard)/documents/workspace.tsx
@@ -9,6 +9,9 @@ import SyncDetailsModal from "@/components/modals/SyncDetailsModal";
 import ShareDocumentModal from "@/components/modals/ShareDocumentModal";
 import RenameDocumentModal from "@/components/modals/RenameDocumentModal";
 
+import { DOCUMENT_TYPES } from "@/features/documents/core/document-types";
+import { getDocumentDefinition } from "@/features/documents/core/registry";
+
 import { DocumentListRow } from "./components/DocumentListRow";
 import { IconToggle } from "./components/DocumentWorkspaceControls";
 import { DocumentPreviewCard } from "./components/DocumentPreviewCard";
@@ -87,8 +90,11 @@ export default function DocumentsWorkspace() {
               className="h-10 w-auto min-w-36 rounded-xl px-3 shadow-none"
             >
               <option value="ALL">All documents ({totalCount})</option>
-              <option value="RESUME">Resume ({counts.RESUME})</option>
-              <option value="COVER_LETTER">Cover letter ({counts.COVER_LETTER})</option>
+              {DOCUMENT_TYPES.map((type) => (
+                <option key={type} value={type}>
+                  {getDocumentDefinition(type).label} ({counts[type]})
+                </option>
+              ))}
             </Select>
 
             <label className="sr-only" htmlFor="document-sort">
diff --git a/apps/studio/app/(main)/(dashboard)/error.tsx b/apps/studio/app/(main)/(dashboard)/error.tsx
index 1a6e1e4..0cc58d6 100644
--- a/apps/studio/app/(main)/(dashboard)/error.tsx
+++ b/apps/studio/app/(main)/(dashboard)/error.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { useRouter } from "next/navigation";
+
 import { Button } from "@veriworkly/ui";
 
 const DashboardSegmentError = ({
@@ -8,6 +10,8 @@ const DashboardSegmentError = ({
   error: Error & { digest?: string };
   reset: () => void;
 }) => {
+  const router = useRouter();
+
   return (
     <section className="border-border bg-card relative flex h-full items-center justify-center overflow-hidden rounded-3xl border px-6 py-10 sm:px-10">
       <div className="bg-accent/10 absolute -top-20 -right-12 h-48 w-48 rounded-full blur-2xl" />
@@ -31,7 +35,7 @@ const DashboardSegmentError = ({
             Try again
           </Button>
 
-          <Button variant="secondary" onClick={() => (window.location.href = "/")}>
+          <Button variant="secondary" onClick={() => router.push("/")}>
             Go to Dashboard
           </Button>
         </div>
diff --git a/packages/ui/src/components/ui/Modal.tsx b/packages/ui/src/components/ui/Modal.tsx
index 7dec468..3a6d64b 100644
--- a/packages/ui/src/components/ui/Modal.tsx
+++ b/packages/ui/src/components/ui/Modal.tsx
@@ -10,10 +10,30 @@ interface ModalProps {
   children: React.ReactNode;
 }
 
+type ModalContentProps = React.HTMLAttributes<HTMLDivElement> & {
+  titleId?: string;
+  descriptionId?: string;
+};
+
+const FOCUSABLE_SELECTOR = [
+  "a[href]",
+  "button:not([disabled])",
+  "textarea:not([disabled])",
+  "input:not([disabled])",
+  "select:not([disabled])",
+  "[tabindex]:not([tabindex='-1'])",
+].join(",");
+
 function ModalRoot({ open, onClose, children }: ModalProps) {
+  const restoreFocusRef = React.useRef<HTMLElement | null>(null);
+
   React.useEffect(() => {
     if (!open) return;
 
+    restoreFocusRef.current =
+      document.activeElement instanceof HTMLElement ? document.activeElement : null;
+    const previousOverflow = document.body.style.overflow;
+
     const handleKey = (e: KeyboardEvent) => {
       if (e.key === "Escape") onClose();
     };
@@ -23,7 +43,9 @@ function ModalRoot({ open, onClose, children }: ModalProps) {
 
     return () => {
       document.removeEventListener("keydown", handleKey);
-      document.body.style.overflow = "";
+      document.body.style.overflow = previousOverflow;
+      restoreFocusRef.current?.focus({ preventScroll: true });
+      restoreFocusRef.current = null;
     };
   }, [open, onClose]);
 
@@ -39,11 +61,69 @@ function ModalRoot({ open, onClose, children }: ModalProps) {
   );
 }
 
-function ModalContent({ children, className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
+function ModalContent({
+  children,
+  className,
+  titleId,
+  descriptionId,
+  onKeyDown,
+  ...props
+}: ModalContentProps) {
+  const contentRef = React.useRef<HTMLDivElement>(null);
+
+  React.useEffect(() => {
+    const content = contentRef.current;
+    if (!content) return;
+
+    window.requestAnimationFrame(() => {
+      if (!content.contains(document.activeElement)) {
+        content.focus({ preventScroll: true });
+      }
+    });
+  }, []);
+
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+    onKeyDown?.(event);
+    if (event.defaultPrevented || event.key !== "Tab") return;
+
+    const content = contentRef.current;
+    if (!content) return;
+
+    const focusable = Array.from(content.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR)).filter(
+      (element) =>
+        !element.hasAttribute("disabled") &&
+        element.tabIndex !== -1 &&
+        element.offsetParent !== null,
+    );
+
+    if (focusable.length === 0) {
+      event.preventDefault();
+      content.focus({ preventScroll: true });
+      return;
+    }
+
+    const first = focusable[0];
+    const last = focusable[focusable.length - 1];
+    const active = document.activeElement;
+
+    if (event.shiftKey && active === first) {
+      event.preventDefault();
+      last.focus();
+    } else if (!event.shiftKey && active === last) {
+      event.preventDefault();
+      first.focus();
+    }
+  };
+
   return (
     <div
       role="dialog"
+      tabIndex={-1}
+      ref={contentRef}
       aria-modal="true"
+      aria-labelledby={titleId}
+      onKeyDown={handleKeyDown}
+      aria-describedby={descriptionId}
       onClick={(e) => e.stopPropagation()}
       className={cn(
         "border-border bg-card w-full rounded-t-3xl border p-6 shadow-2xl",

From 8276c838b296077b0e8f277370e39bd381528545 Mon Sep 17 00:00:00 2001
From: Gautam25Raj <ashragautam25@gmail.com>
Date: Wed, 27 May 2026 09:25:57 +0530
Subject: [PATCH 2/2] Refactor resume sections to use GenericCustomSection
 component

- Replaced individual section implementations (Awards, Certifications, Interests, Languages, Publications, References, Volunteer) with a new GenericCustomSection component to reduce code duplication and improve maintainability.
- Updated state management and event handling to align with the new structure.
- Adjusted imports and removed unnecessary state management hooks from individual sections.
- Modified ToolbarSecondaryActions to use the updated useResumeStore hook for saving functionality.
- Enhanced type definitions in the template registry for better type safety.
---
 apps/blog-platform/package.json               |   2 +-
 apps/docs-platform/package.json               |   2 +-
 apps/server/package.json                      |   2 +-
 .../server/src/controllers/shareController.ts |  38 ++++++
 apps/server/src/routes/shares.ts              |   1 +
 apps/server/src/services/shareService.ts      |  18 +++
 apps/server/tests/auth/session-cache.test.ts  |  61 +++++++++
 apps/site/package.json                        |   2 +-
 .../documents/components/DocumentListRow.tsx  |   7 +-
 .../components/DocumentPreviewCard.tsx        |  10 +-
 .../documents/components/document-display.ts  |  15 ++-
 .../app/(main)/editor/EditorEntryRedirect.tsx |  52 ++++++++
 .../app/(main)/editor/[type]/[id]/page.tsx    |  31 ++++-
 .../editor/[type]/[id]/preview/error.tsx      |   6 +-
 .../editor/[type]/[id]/preview/page.tsx       |   9 +-
 apps/studio/app/(main)/editor/page.tsx        |  21 +--
 .../components/dashboard/NewDocumentModal.tsx |  18 +--
 .../components/dashboard/StudioShell.tsx      |  15 +--
 .../dashboard/WorkspaceSearchModal.tsx        |  31 +++--
 .../components/modals/RenameDocumentModal.tsx |  18 +--
 .../components/modals/ShareDocumentModal.tsx  |  23 ++--
 apps/studio/features/documents/core/icons.ts  |  13 ++
 apps/studio/features/documents/core/routes.ts |  14 +-
 .../documents/services/document-library.ts    |  15 ++-
 .../services/document-workspace-service.ts    |  73 +++++++----
 .../documents/services/share-service.ts       |  30 ++++-
 .../resume/editor/EditorContentPanel.tsx      |   4 +-
 .../resume/editor/EditorSettingsPanel.tsx     |  33 +++--
 .../resume/editor/ResumeEditorModals.tsx      |   8 +-
 .../features/resume/editor/ResumeToolbar.tsx  |   6 +-
 .../content/sections/AchievementsSection.tsx  |  98 ++------------
 .../editor/content/sections/AwardsSection.tsx |  97 ++------------
 .../sections/CertificationsSection.tsx        | 121 +++---------------
 .../content/sections/GenericCustomSection.tsx | 109 ++++++++++++++++
 .../content/sections/InterestsSection.tsx     |  93 ++------------
 .../content/sections/LanguagesSection.tsx     |  95 ++------------
 .../content/sections/PublicationsSection.tsx  | 111 +++-------------
 .../content/sections/ReferencesSection.tsx    | 118 +++--------------
 .../content/sections/VolunteerSection.tsx     | 116 +++--------------
 .../toolbar/ToolbarSecondaryActions.tsx       |   4 +-
 apps/studio/package.json                      |   2 +-
 apps/studio/templates/index.ts                |  15 ++-
 .../document-routes.contract.test.ts          |  24 ++++
 ...ocument-workspace-service.contract.test.ts |  49 +++++++
 .../contracts/share-links.contract.test.ts    |  30 +++++
 .../template-render.contract.test.tsx         |   8 +-
 package-lock.json                             |  14 +-
 package.json                                  |   2 +-
 48 files changed, 776 insertions(+), 908 deletions(-)
 create mode 100644 apps/server/tests/auth/session-cache.test.ts
 create mode 100644 apps/studio/app/(main)/editor/EditorEntryRedirect.tsx
 create mode 100644 apps/studio/features/documents/core/icons.ts
 create mode 100644 apps/studio/features/resume/editor/content/sections/GenericCustomSection.tsx
 create mode 100644 apps/studio/tests/contracts/document-routes.contract.test.ts

diff --git a/apps/blog-platform/package.json b/apps/blog-platform/package.json
index 8c74363..686f5ac 100644
--- a/apps/blog-platform/package.json
+++ b/apps/blog-platform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@veriworkly/blog-platform",
-  "version": "3.8.0-beta.1",
+  "version": "3.8.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/apps/docs-platform/package.json b/apps/docs-platform/package.json
index a623e46..36569b9 100644
--- a/apps/docs-platform/package.json
+++ b/apps/docs-platform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@veriworkly/docs-platform",
-  "version": "3.8.0-beta.1",
+  "version": "3.8.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/apps/server/package.json b/apps/server/package.json
index de7cd16..504d7c6 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@veriworkly/server",
-  "version": "3.8.0-beta.1",
+  "version": "3.8.0",
   "description": "VeriWorkly Resume Backend API",
   "main": "dist/index.js",
   "type": "module",
diff --git a/apps/server/src/controllers/shareController.ts b/apps/server/src/controllers/shareController.ts
index db528b9..4ad1bc6 100644
--- a/apps/server/src/controllers/shareController.ts
+++ b/apps/server/src/controllers/shareController.ts
@@ -30,6 +30,18 @@ const shareLinkPasswordSchema = z.object({
   password: z.string().min(1),
 });
 
+const sharedDocumentIdsQuerySchema = z.object({
+  ids: z
+    .string()
+    .optional()
+    .transform((value) =>
+      (value ?? "")
+        .split(",")
+        .map((item) => item.trim())
+        .filter(Boolean),
+    ),
+});
+
 const publicReadableParamsSchema = z.object({
   username: z.string().transform((value) => normalizeUsername(value)),
   slug: z.string().transform((value) => normalizeSlug(value)),
@@ -80,6 +92,7 @@ export class ShareController {
       );
 
       await cacheDelByPrefix(`share:list:${user.id}:${documentId}:`);
+      await cacheDelByPrefix(`share:shared-document-ids:${user.id}:`);
 
       if (previousSlug)
         await cacheDel(`share:public-readable:${shareLink.username}:${previousSlug}`);
@@ -143,6 +156,30 @@ export class ShareController {
     }
   }
 
+  static async listSharedDocumentIds(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user = requireAuthUser(req);
+      const { ids } = sharedDocumentIdsQuerySchema.parse(req.query);
+      const cacheKey = `share:shared-document-ids:${user.id}:${ids.sort().join(",")}`;
+
+      const cached = await cacheGet<unknown>(cacheKey);
+
+      if (cached) {
+        return res.json(createSuccessResponse(cached, "Shared document ids fetched from cache"));
+      }
+
+      const documentIds = await ShareService.listSharedDocumentIds(user.id, ids);
+      const response = { documentIds };
+
+      await cacheSet(cacheKey, response, 300);
+
+      res.json(createSuccessResponse(response, "Shared document ids fetched successfully"));
+    } catch (error) {
+      if (error instanceof z.ZodError) return next(handleValidationError(error));
+      next(error);
+    }
+  }
+
   /**
    * Revoke an existing share link.
    *
@@ -161,6 +198,7 @@ export class ShareController {
 
       // Invalidate caches
       await cacheDelByPrefix(`share:list:${user.id}:${documentId}:`);
+      await cacheDelByPrefix(`share:shared-document-ids:${user.id}:`);
       await cacheDel(`share:public-readable:${revoked.username}:${revoked.slug}`);
 
       res.json(createSuccessResponse(null, "Share link revoked successfully"));
diff --git a/apps/server/src/routes/shares.ts b/apps/server/src/routes/shares.ts
index 4a8c5e1..ca307f8 100644
--- a/apps/server/src/routes/shares.ts
+++ b/apps/server/src/routes/shares.ts
@@ -12,6 +12,7 @@ router.post("/public/:username/:slug/verify", ShareController.verifyPublicReadab
 router.use(authMiddleware);
 
 router.post("/", ShareController.create);
+router.get("/documents/shared-ids", ShareController.listSharedDocumentIds);
 router.get("/documents/:documentId", ShareController.list);
 router.delete("/documents/:documentId/links/:shareLinkId", ShareController.revoke);
 
diff --git a/apps/server/src/services/shareService.ts b/apps/server/src/services/shareService.ts
index 8989f86..0d23fd2 100644
--- a/apps/server/src/services/shareService.ts
+++ b/apps/server/src/services/shareService.ts
@@ -131,6 +131,24 @@ export class ShareService {
     return this.listShareLinksPaginated(userId, documentId);
   }
 
+  static async listSharedDocumentIds(userId: string, documentIds: string[]) {
+    const uniqueDocumentIds = [...new Set(documentIds.filter(Boolean))];
+
+    if (uniqueDocumentIds.length === 0) return [];
+
+    const links = await prisma.shareLink.findMany({
+      where: {
+        userId,
+        documentId: { in: uniqueDocumentIds },
+        document: { deletedAt: null },
+        OR: [{ expiresAt: null }, { expiresAt: { gt: new Date() } }],
+      },
+      select: { documentId: true },
+    });
+
+    return [...new Set(links.map((link) => link.documentId))];
+  }
+
   static async listShareLinksPaginated(
     userId: string,
     documentId: string,
diff --git a/apps/server/tests/auth/session-cache.test.ts b/apps/server/tests/auth/session-cache.test.ts
new file mode 100644
index 0000000..4ce7f9f
--- /dev/null
+++ b/apps/server/tests/auth/session-cache.test.ts
@@ -0,0 +1,61 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const cacheGetMock = vi.fn();
+const cacheSetMock = vi.fn();
+const getSessionMock = vi.fn();
+
+vi.mock("../../src/config", () => ({
+  config: {
+    auth: {
+      sessionCacheMaxAgeSeconds: 123,
+    },
+  },
+}));
+
+vi.mock("../../src/utils/redis", () => ({
+  cacheGet: cacheGetMock,
+  cacheSet: cacheSetMock,
+}));
+
+vi.mock("../../src/auth/index", () => ({
+  convertNodeHeadersToWebHeaders: (headers: unknown) => headers,
+  getSessionFromRequestHeaders: getSessionMock,
+}));
+
+describe("session auth cache", () => {
+  beforeEach(() => {
+    cacheGetMock.mockReset();
+    cacheSetMock.mockReset();
+    getSessionMock.mockReset();
+  });
+
+  it("uses configured session cache TTL", async () => {
+    cacheGetMock.mockResolvedValue(null);
+    getSessionMock.mockResolvedValue({
+      user: {
+        id: "user-1",
+        email: "user@example.com",
+        name: "User",
+      },
+    });
+
+    const { getSessionUserFromRequest } = await import("../../src/middleware/auth");
+
+    const user = await getSessionUserFromRequest({
+      headers: {
+        cookie: "veriworkly-auth.session_token=token-1",
+      },
+    } as never);
+
+    expect(user?.id).toBe("user-1");
+    expect(cacheSetMock).toHaveBeenCalledWith(
+      expect.stringMatching(/^auth:session:/),
+      {
+        id: "user-1",
+        email: "user@example.com",
+        name: "User",
+      },
+      123,
+    );
+  });
+});
diff --git a/apps/site/package.json b/apps/site/package.json
index 9b6be85..12e00d0 100644
--- a/apps/site/package.json
+++ b/apps/site/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@veriworkly/site",
-  "version": "3.8.0-beta.1",
+  "version": "3.8.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/apps/studio/app/(main)/(dashboard)/documents/components/DocumentListRow.tsx b/apps/studio/app/(main)/(dashboard)/documents/components/DocumentListRow.tsx
index 6894202..bb42211 100644
--- a/apps/studio/app/(main)/(dashboard)/documents/components/DocumentListRow.tsx
+++ b/apps/studio/app/(main)/(dashboard)/documents/components/DocumentListRow.tsx
@@ -7,12 +7,12 @@ import { Badge, Button } from "@veriworkly/ui";
 import type { SyncTelemetry } from "@/features/documents/services/document-sync";
 import type { DocumentLibraryItem } from "@/features/documents/services/document-library";
 
-import { getDocumentDefinition } from "@/features/documents/core/registry";
 import { getDocumentEditorPath } from "@/features/documents/core/routes";
+import { getDocumentDefinition } from "@/features/documents/core/registry";
 import { formatRelative } from "@/features/documents/services/document-library";
 
 import { DocumentActionsMenu } from "./DocumentActionsMenu";
-import { docIconMap, getSyncLabel, getActivityLabel } from "./document-display";
+import { getSyncLabel, getActivityLabel, LibraryDocumentIcon } from "./document-display";
 
 interface DocumentListRowProps {
   doc: DocumentLibraryItem;
@@ -35,13 +35,12 @@ export function DocumentListRow({
   onSyncNowAction,
   onSyncDetailsAction,
 }: DocumentListRowProps) {
-  const Icon = docIconMap[doc.type];
   const editorPath = getDocumentEditorPath(doc.type, doc.id);
 
   return (
     <article className="grid gap-3 p-4 sm:grid-cols-[auto_minmax(0,1fr)_auto] sm:items-center sm:p-5">
       <div className="border-border bg-background flex h-12 w-10 shrink-0 items-center justify-center rounded-lg border sm:h-14 sm:w-11">
-        <Icon className="text-accent h-5 w-5" />
+        <LibraryDocumentIcon className="text-accent h-5 w-5" type={doc.type} />
       </div>
 
       <div className="min-w-0 flex-1">
diff --git a/apps/studio/app/(main)/(dashboard)/documents/components/DocumentPreviewCard.tsx b/apps/studio/app/(main)/(dashboard)/documents/components/DocumentPreviewCard.tsx
index f0629fb..6ae2e63 100644
--- a/apps/studio/app/(main)/(dashboard)/documents/components/DocumentPreviewCard.tsx
+++ b/apps/studio/app/(main)/(dashboard)/documents/components/DocumentPreviewCard.tsx
@@ -8,12 +8,12 @@ import { Badge } from "@veriworkly/ui";
 import type { SyncTelemetry } from "@/features/documents/services/document-sync";
 import type { DocumentLibraryItem } from "@/features/documents/services/document-library";
 
-import { getDocumentDefinition } from "@/features/documents/core/registry";
 import { getDocumentEditorPath } from "@/features/documents/core/routes";
+import { getDocumentDefinition } from "@/features/documents/core/registry";
 import { formatRelative } from "@/features/documents/services/document-library";
 
 import { DocumentActionsMenu } from "./DocumentActionsMenu";
-import { docIconMap, getSyncLabel, getActivityLabel } from "./document-display";
+import { getSyncLabel, getActivityLabel, LibraryDocumentIcon } from "./document-display";
 
 interface DocumentPreviewCardProps {
   doc: DocumentLibraryItem;
@@ -80,9 +80,9 @@ export function DocumentPreviewCard({
       </div>
 
       <Link
+        href={editorPath}
         aria-label={`Open ${doc.title}`}
         className="absolute inset-0 z-20 cursor-pointer"
-        href={editorPath}
       />
 
       <div className="absolute top-2 right-2 z-30 opacity-0 transition-opacity duration-200 group-hover:opacity-100">
@@ -116,14 +116,12 @@ function DocumentThumbnailPreview({ doc }: { doc: DocumentLibraryItem }) {
     );
   }
 
-  const Icon = docIconMap[doc.type];
-
   return (
     <div className="absolute inset-0 p-4">
       <div className="border-border bg-card h-full rounded-xl border p-4 shadow-sm">
         <div className="flex items-center gap-3">
           <div className="bg-accent/10 text-accent flex h-9 w-9 items-center justify-center rounded-lg">
-            <Icon className="h-5 w-5" />
+            <LibraryDocumentIcon className="h-5 w-5" type={doc.type} />
           </div>
 
           <div className="grid flex-1 gap-2">
diff --git a/apps/studio/app/(main)/(dashboard)/documents/components/document-display.ts b/apps/studio/app/(main)/(dashboard)/documents/components/document-display.ts
index 7155404..ce5c37f 100644
--- a/apps/studio/app/(main)/(dashboard)/documents/components/document-display.ts
+++ b/apps/studio/app/(main)/(dashboard)/documents/components/document-display.ts
@@ -1,3 +1,4 @@
+import { createElement } from "react";
 import { FileText, Mail } from "lucide-react";
 
 import type { SyncTelemetry } from "@/features/documents/services/document-sync";
@@ -5,10 +6,16 @@ import type { DocumentLibraryItem } from "@/features/documents/services/document
 
 import { formatRelative } from "@/features/documents/services/document-library";
 
-export const docIconMap = {
-  RESUME: FileText,
-  COVER_LETTER: Mail,
-} satisfies Record<DocumentLibraryItem["type"], typeof FileText>;
+interface LibraryDocumentIconProps {
+  className?: string;
+  type: DocumentLibraryItem["type"];
+}
+
+export function LibraryDocumentIcon({ className, type }: LibraryDocumentIconProps) {
+  if (type === "COVER_LETTER") return createElement(Mail, { "aria-hidden": true, className });
+
+  return createElement(FileText, { "aria-hidden": true, className });
+}
 
 export function getSyncLabel(sync: DocumentLibraryItem["sync"]) {
   if (!sync.enabled) return "Local only";
diff --git a/apps/studio/app/(main)/editor/EditorEntryRedirect.tsx b/apps/studio/app/(main)/editor/EditorEntryRedirect.tsx
new file mode 100644
index 0000000..632e10f
--- /dev/null
+++ b/apps/studio/app/(main)/editor/EditorEntryRedirect.tsx
@@ -0,0 +1,52 @@
+"use client";
+
+import { useEffect, useRef } from "react";
+import { useRouter } from "next/navigation";
+
+import type { BaseDocument } from "@/features/documents/core/types";
+import type { DocumentType } from "@/features/documents/core/document-types";
+
+import {
+  saveDocument,
+  createDocument,
+} from "@/features/documents/services/document-workspace-service";
+import { getDocumentEditorPath } from "@/features/documents/core/routes";
+
+interface EditorEntryRedirectProps {
+  type: DocumentType;
+  templateId?: string;
+}
+
+function applyTemplate(document: BaseDocument, templateId: string | undefined): BaseDocument {
+  if (!templateId || document.templateId === templateId) return document;
+
+  const content =
+    typeof document.content === "object" && document.content !== null
+      ? { ...document.content, templateId }
+      : document.content;
+
+  return {
+    ...document,
+    templateId,
+    content,
+    updatedAt: new Date().toISOString(),
+  };
+}
+
+export function EditorEntryRedirect({ type, templateId }: EditorEntryRedirectProps) {
+  const router = useRouter();
+  const createdRef = useRef(false);
+
+  useEffect(() => {
+    if (createdRef.current) return;
+    createdRef.current = true;
+
+    const document = applyTemplate(createDocument(type), templateId);
+
+    if (document.templateId === templateId) saveDocument(document, { flush: true });
+
+    router.replace(getDocumentEditorPath(type, document.id));
+  }, [router, templateId, type]);
+
+  return null;
+}
diff --git a/apps/studio/app/(main)/editor/[type]/[id]/page.tsx b/apps/studio/app/(main)/editor/[type]/[id]/page.tsx
index f9a91ef..7de765c 100644
--- a/apps/studio/app/(main)/editor/[type]/[id]/page.tsx
+++ b/apps/studio/app/(main)/editor/[type]/[id]/page.tsx
@@ -3,7 +3,9 @@ import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 
 import { getDocumentDefinition } from "@/features/documents/core/registry";
-import { isDocumentType } from "@/features/documents/core/document-types";
+import { parseDocumentRouteSegment } from "@/features/documents/core/routes";
+
+import { EditorEntryRedirect } from "../../EditorEntryRedirect";
 
 interface Params {
   type: string;
@@ -19,14 +21,31 @@ export async function generateMetadata({ params }: { params: Promise<Params> }):
   };
 }
 
-export default async function EditorByTypePage({ params }: { params: Promise<Params> }) {
+export default async function EditorByTypePage({
+  params,
+  searchParams,
+}: {
+  params: Promise<Params>;
+  searchParams: Promise<{ template?: string }>;
+}) {
   const { type, id } = await params;
-  const normalizedType = type.toUpperCase();
+  const { template } = await searchParams;
+
+  const documentType = parseDocumentRouteSegment(type);
+
+  if (!documentType) notFound();
 
-  if (!isDocumentType(normalizedType)) {
-    notFound();
+  if (id === "new") {
+    const definition = getDocumentDefinition(documentType);
+    const resolvedTemplate =
+      definition.templates.find((item) => item.id === template) ??
+      definition.templates.find((item) => item.id === definition.defaultTemplateId) ??
+      definition.templates[0];
+
+    return <EditorEntryRedirect type={documentType} templateId={resolvedTemplate?.id} />;
   }
 
-  const Editor = getDocumentDefinition(normalizedType).Editor;
+  const Editor = getDocumentDefinition(documentType).Editor;
+
   return <Editor documentId={id} />;
 }
diff --git a/apps/studio/app/(main)/editor/[type]/[id]/preview/error.tsx b/apps/studio/app/(main)/editor/[type]/[id]/preview/error.tsx
index 625f387..86cad08 100644
--- a/apps/studio/app/(main)/editor/[type]/[id]/preview/error.tsx
+++ b/apps/studio/app/(main)/editor/[type]/[id]/preview/error.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { useRouter } from "next/navigation";
+
 import { Button } from "@veriworkly/ui";
 
 export default function EditorPreviewError({
@@ -8,6 +10,8 @@ export default function EditorPreviewError({
   error: Error & { digest?: string };
   reset: () => void;
 }) {
+  const router = useRouter();
+
   return (
     <div className="space-y-6 px-4 py-6 sm:px-6 lg:px-8">
       <div className="border-border bg-card rounded-2xl border p-4">
@@ -25,7 +29,7 @@ export default function EditorPreviewError({
 
         <div className="mt-5 flex flex-wrap items-center gap-3">
           <Button onClick={() => reset()}>Try again</Button>
-          <Button variant="secondary" onClick={() => (window.location.href = "/documents")}>
+          <Button variant="secondary" onClick={() => router.push(`/`)}>
             Dashboard
           </Button>
         </div>
diff --git a/apps/studio/app/(main)/editor/[type]/[id]/preview/page.tsx b/apps/studio/app/(main)/editor/[type]/[id]/preview/page.tsx
index 01ed9a9..1bca5cf 100644
--- a/apps/studio/app/(main)/editor/[type]/[id]/preview/page.tsx
+++ b/apps/studio/app/(main)/editor/[type]/[id]/preview/page.tsx
@@ -1,8 +1,9 @@
 import type { Metadata } from "next";
+
 import { notFound } from "next/navigation";
 
 import { PreviewClient } from "./PreviewClient";
-import { isDocumentType } from "@/features/documents/core/document-types";
+import { parseDocumentRouteSegment } from "@/features/documents/core/routes";
 
 function isValidRouteId(id: string) {
   return id.length > 0 && /^[a-z0-9_-]+$/i.test(id);
@@ -31,8 +32,8 @@ export default async function EditorPreviewPage({
 
   if (!isValidRouteId(id)) notFound();
 
-  const normalizedType = type.toUpperCase();
-  if (!isDocumentType(normalizedType)) notFound();
+  const documentType = parseDocumentRouteSegment(type);
+  if (!documentType) notFound();
 
-  return <PreviewClient documentId={id} type={normalizedType} />;
+  return <PreviewClient documentId={id} type={documentType} />;
 }
diff --git a/apps/studio/app/(main)/editor/page.tsx b/apps/studio/app/(main)/editor/page.tsx
index 27200ba..42c9359 100644
--- a/apps/studio/app/(main)/editor/page.tsx
+++ b/apps/studio/app/(main)/editor/page.tsx
@@ -1,7 +1,10 @@
 import { redirect } from "next/navigation";
 
-import { getTemplateById, templateRegistry } from "@/templates";
-import { getDocumentEditorPath } from "@/features/documents/core/routes";
+import { DOCUMENT_TYPES } from "@/features/documents/core/document-types";
+import { getDocumentDefinition } from "@/features/documents/core/registry";
+import { parseDocumentRouteSegment } from "@/features/documents/core/routes";
+
+import { EditorEntryRedirect } from "./EditorEntryRedirect";
 
 interface EditorEntryPageProps {
   searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
@@ -11,14 +14,16 @@ export default async function EditorEntryPage({ searchParams }: EditorEntryPageP
   const params = await searchParams;
 
   const templateParam = typeof params.template === "string" ? params.template : undefined;
-  const typeParam = typeof params.type === "string" ? params.type.toLowerCase() : "resume";
+  const typeParam = typeof params.type === "string" ? params.type : DOCUMENT_TYPES[0];
+  const type = parseDocumentRouteSegment(typeParam);
 
-  if (typeParam !== "resume") {
-    redirect("/");
-  }
+  if (!type) redirect("/documents");
 
+  const definition = getDocumentDefinition(type);
   const resolvedTemplate =
-    (templateParam ? getTemplateById(templateParam) : null) ?? templateRegistry[0];
+    definition.templates.find((template) => template.id === templateParam) ??
+    definition.templates.find((template) => template.id === definition.defaultTemplateId) ??
+    definition.templates[0];
 
-  redirect(`${getDocumentEditorPath("RESUME", "new")}?template=${resolvedTemplate.id}`);
+  return <EditorEntryRedirect type={type} templateId={resolvedTemplate?.id} />;
 }
diff --git a/apps/studio/components/dashboard/NewDocumentModal.tsx b/apps/studio/components/dashboard/NewDocumentModal.tsx
index af91f6d..bf75fdf 100644
--- a/apps/studio/components/dashboard/NewDocumentModal.tsx
+++ b/apps/studio/components/dashboard/NewDocumentModal.tsx
@@ -1,17 +1,13 @@
 "use client";
 
-import { FileText, Mail, Plus, X } from "lucide-react";
+import { Plus, X } from "lucide-react";
 
 import { Button, Modal } from "@veriworkly/ui";
 
+import { getDocumentIcon } from "@/features/documents/core/icons";
 import { getDocumentDefinition } from "@/features/documents/core/registry";
 import { DOCUMENT_TYPES, type DocumentType } from "@/features/documents/core/document-types";
 
-const iconMap = {
-  RESUME: FileText,
-  COVER_LETTER: Mail,
-} satisfies Record<DocumentType, typeof FileText>;
-
 export function NewDocumentButton({
   collapsed,
   compact,
@@ -48,7 +44,11 @@ export function NewDocumentModal({
 
   return (
     <Modal open={open} onClose={onClose}>
-      <Modal.Content className="w-full max-w-2xl overflow-hidden rounded-2xl p-0">
+      <Modal.Content
+        titleId="new-document-title"
+        descriptionId="new-document-description"
+        className="w-full max-w-2xl overflow-hidden rounded-2xl p-0"
+      >
         <div className="border-border/70 flex items-start justify-between gap-4 border-b p-5 sm:p-6">
           <div>
             <p className="text-accent text-xs font-bold tracking-[0.2em] uppercase">Create</p>
@@ -57,7 +57,7 @@ export function NewDocumentModal({
               New document
             </h2>
 
-            <p className="text-muted mt-1 text-sm">
+            <p id="new-document-description" className="text-muted mt-1 text-sm">
               Choose document type. Template comes next in editor.
             </p>
           </div>
@@ -74,7 +74,7 @@ export function NewDocumentModal({
 
         <Modal.Body className="grid max-h-[70vh] gap-3 p-4 sm:grid-cols-2 sm:p-5">
           {DOCUMENT_TYPES.map((type) => {
-            const Icon = iconMap[type];
+            const Icon = getDocumentIcon(type);
             const definition = getDocumentDefinition(type);
 
             return (
diff --git a/apps/studio/components/dashboard/StudioShell.tsx b/apps/studio/components/dashboard/StudioShell.tsx
index 501be83..103b8fe 100644
--- a/apps/studio/components/dashboard/StudioShell.tsx
+++ b/apps/studio/components/dashboard/StudioShell.tsx
@@ -8,6 +8,8 @@ import { useEffect, useState } from "react";
 import { usePathname, useRouter } from "next/navigation";
 import { ChevronsLeft, ChevronsRight, Menu as MenuIcon, Search, X } from "lucide-react";
 
+import type { DocumentType } from "@/features/documents/core/document-types";
+
 import {
   mainNav,
   NavGroup,
@@ -17,14 +19,12 @@ import {
 } from "@/components/dashboard/StudioNavigation";
 import { ThemeToggle } from "@/components/dashboard/ThemeToggle";
 import { AccountMenu } from "@/components/dashboard/AccountMenu";
-import { NewDocumentButton, NewDocumentModal } from "@/components/dashboard/NewDocumentModal";
 import { WorkspaceSearchModal } from "@/components/dashboard/WorkspaceSearchModal";
+import { NewDocumentButton, NewDocumentModal } from "@/components/dashboard/NewDocumentModal";
 
-import { createResume } from "@/features/resume/services/resume-service";
-import { signOutCurrentUser } from "@/features/auth/services/current-user";
 import { getDocumentEditorPath } from "@/features/documents/core/routes";
+import { signOutCurrentUser } from "@/features/auth/services/current-user";
 import { createDocument } from "@/features/documents/services/document-workspace-service";
-import type { DocumentType } from "@/features/documents/core/document-types";
 
 import { cn } from "@/lib/utils";
 
@@ -52,13 +52,6 @@ const StudioShell = ({ children, mainClassName }: StudioShellProps) => {
   const displayName = user?.name || user?.email?.split("@")[0] || "Local builder";
 
   const createNewDocument = (type: DocumentType) => {
-    if (type === "RESUME") {
-      const resume = createResume();
-      router.push(getDocumentEditorPath("RESUME", resume.id));
-
-      return;
-    }
-
     const document = createDocument(type);
     router.push(getDocumentEditorPath(type, document.id));
   };
diff --git a/apps/studio/components/dashboard/WorkspaceSearchModal.tsx b/apps/studio/components/dashboard/WorkspaceSearchModal.tsx
index 72b0dd1..753b83a 100644
--- a/apps/studio/components/dashboard/WorkspaceSearchModal.tsx
+++ b/apps/studio/components/dashboard/WorkspaceSearchModal.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { FileText, Search, X } from "lucide-react";
+import { FileText, Mail, Search, X } from "lucide-react";
 import { useEffect, useId, useMemo, useState } from "react";
 
 import type { DocumentType } from "@/features/documents/core/document-types";
+import type { DocumentLibraryItem } from "@/features/documents/services/document-library";
 
-import { getDocumentDefinition } from "@/features/documents/core/registry";
-import { listDocuments } from "@/features/documents/services/document-workspace-service";
+import { getDocumentLibrarySnapshot } from "@/features/documents/services/document-library";
 
 type SearchResult = {
   id: string;
@@ -25,9 +25,10 @@ export function WorkspaceSearchModal({
   onClose: () => void;
   onOpenDocument: (doc: SearchResult) => void;
 }) {
-  const [query, setQuery] = useState("");
   const inputId = useId();
 
+  const [query, setQuery] = useState("");
+
   useEffect(() => {
     if (!open) return;
 
@@ -42,17 +43,15 @@ export function WorkspaceSearchModal({
   const results = useMemo(() => {
     if (!open) return [];
 
-    const documents: SearchResult[] = listDocuments().map((document) => {
-      const definition = getDocumentDefinition(document.type);
-
-      return {
+    const documents: SearchResult[] = getDocumentLibrarySnapshot().docs.map(
+      (document: DocumentLibraryItem) => ({
         id: document.id,
         type: document.type,
         title: document.title,
-        subtitle: definition.label,
+        subtitle: [document.templateName, document.description].filter(Boolean).join(" - "),
         updatedAt: document.updatedAt,
-      };
-    });
+      }),
+    );
 
     const needle = query.trim().toLowerCase();
 
@@ -124,7 +123,7 @@ export function WorkspaceSearchModal({
                 }}
               >
                 <span className="bg-accent/10 text-accent flex h-10 w-10 shrink-0 items-center justify-center rounded-lg">
-                  <FileText className="h-4 w-4" />
+                  <SearchResultIcon className="h-4 w-4" type={doc.type} />
                 </span>
 
                 <span className="min-w-0 flex-1">
@@ -144,3 +143,11 @@ export function WorkspaceSearchModal({
     </div>
   );
 }
+
+function SearchResultIcon({ className, type }: { className?: string; type: DocumentType }) {
+  if (type === "COVER_LETTER") {
+    return <Mail aria-hidden="true" className={className} />;
+  }
+
+  return <FileText aria-hidden="true" className={className} />;
+}
diff --git a/apps/studio/components/modals/RenameDocumentModal.tsx b/apps/studio/components/modals/RenameDocumentModal.tsx
index 52e96eb..9c08dfc 100644
--- a/apps/studio/components/modals/RenameDocumentModal.tsx
+++ b/apps/studio/components/modals/RenameDocumentModal.tsx
@@ -8,11 +8,12 @@ import type { DocumentLibraryItem } from "@/features/documents/services/document
 
 import { Modal, Input, Button, Checkbox } from "@veriworkly/ui";
 
-import { DocumentApi } from "@/features/documents/services/document-api";
 import {
-  loadDocumentById,
   saveDocument,
+  loadDocumentById,
 } from "@/features/documents/services/document-workspace-service";
+import { DocumentApi } from "@/features/documents/services/document-api";
+import { getDocumentDefinition } from "@/features/documents/core/registry";
 
 interface RenameDocumentModalProps {
   open: boolean;
@@ -36,23 +37,16 @@ export default function RenameDocumentModal({
     if (!title.trim() || loading) return;
 
     setLoading(true);
+
     try {
       const fullDoc = loadDocumentById(doc.type, doc.id);
 
-      if (!fullDoc) {
-        throw new Error("Local document not found");
-      }
+      if (!fullDoc) throw new Error("Local document not found");
 
       const nextTitle = title.trim();
-      const nextContent =
-        doc.type === "RESUME"
-          ? { ...(fullDoc.content as object), title: nextTitle }
-          : fullDoc.content;
-
       const updatedDoc = {
         ...fullDoc,
         title: nextTitle,
-        content: nextContent,
         updatedAt: new Date().toISOString(),
       };
 
@@ -98,7 +92,7 @@ export default function RenameDocumentModal({
               </Modal.Title>
 
               <p className="text-muted-foreground text-[10px] font-medium tracking-widest uppercase">
-                {doc.type === "RESUME" ? "Resume" : "Cover Letter"}
+                {getDocumentDefinition(doc.type).label}
               </p>
             </div>
           </div>
diff --git a/apps/studio/components/modals/ShareDocumentModal.tsx b/apps/studio/components/modals/ShareDocumentModal.tsx
index 5e21a23..62e487b 100644
--- a/apps/studio/components/modals/ShareDocumentModal.tsx
+++ b/apps/studio/components/modals/ShareDocumentModal.tsx
@@ -7,8 +7,8 @@ import {
   Globe,
   Link2,
   Trash2,
-  Calendar,
   Loader2,
+  Calendar,
   AlertTriangle,
 } from "lucide-react";
 import { toast } from "sonner";
@@ -18,6 +18,7 @@ import { cn } from "@/lib/utils";
 
 import { Badge, Modal, Input, Button, Checkbox } from "@veriworkly/ui";
 
+import type { DocumentType } from "@/features/documents/core/document-types";
 import type { DocumentLibraryItem } from "@/features/documents/services/document-library";
 
 import {
@@ -26,6 +27,7 @@ import {
   revokeShareLink,
   listAllShareLinks,
 } from "@/features/documents/services/share-service";
+import { getDocumentDefinition } from "@/features/documents/core/registry";
 
 import { trackUsageEvent } from "@/features/analytics/services/usage-metrics";
 import { loadDocumentById } from "@/features/documents/services/document-workspace-service";
@@ -33,6 +35,7 @@ import { loadDocumentById } from "@/features/documents/services/document-workspa
 interface ShareDocumentModalProps {
   documentId: string | null;
   documentTitle?: string;
+  documentType?: DocumentType;
   document?: DocumentLibraryItem | null;
   onClose: () => void;
 }
@@ -144,15 +147,17 @@ const ActiveLinkRow = ({
 function getShareSnapshot(
   document: DocumentLibraryItem | null | undefined,
   documentId: string | null,
+  documentType: DocumentType | undefined,
 ) {
-  const type = document?.type ?? "RESUME";
+  const type = document?.type ?? documentType;
   const id = document?.id ?? documentId;
-  return id ? loadDocumentById(type, id) : null;
+  return id && type ? loadDocumentById(type, id) : null;
 }
 
 const ShareDocumentModal = ({
   documentId: fallbackDocumentId,
   documentTitle: fallbackDocumentTitle,
+  documentType: fallbackDocumentType,
   document,
   onClose,
 }: ShareDocumentModalProps) => {
@@ -167,8 +172,10 @@ const ShareDocumentModal = ({
 
   const [shareLinks, setShareLinks] = useState<ShareLinkItem[]>([]);
   const [revokingLinkId, setRevokingLinkId] = useState<string | null>(null);
+
   const documentId = document?.id ?? fallbackDocumentId;
-  const documentLabel = document?.type === "COVER_LETTER" ? "Cover Letter" : "Resume";
+  const documentType = document?.type ?? fallbackDocumentType;
+  const documentLabel = documentType ? getDocumentDefinition(documentType).label : "Document";
   const documentTitle = document?.title ?? fallbackDocumentTitle ?? "Untitled Document";
 
   const hasActiveLink = shareLinks.length > 0;
@@ -190,6 +197,7 @@ const ShareDocumentModal = ({
 
       if (links.length > 0) {
         const link = links[0];
+
         if (link.expiresAt) {
           setExpiry(new Date(link.expiresAt).toISOString().split("T")[0]);
           setNoExpiry(false);
@@ -201,6 +209,7 @@ const ShareDocumentModal = ({
         setExpiry("");
         setNoExpiry(false);
       }
+
       setRemovePassword(false);
       setUpdateSlug(false);
 
@@ -215,15 +224,13 @@ const ShareDocumentModal = ({
   }, []);
 
   useEffect(() => {
-    if (documentId) {
-      void Promise.resolve().then(() => refreshShareLinks(documentId));
-    }
+    if (documentId) void Promise.resolve().then(() => refreshShareLinks(documentId));
   }, [documentId, refreshShareLinks]);
 
   const handleCreate = async () => {
     if (!documentId || busy) return;
 
-    const snapshot = getShareSnapshot(document, fallbackDocumentId);
+    const snapshot = getShareSnapshot(document, fallbackDocumentId, documentType);
 
     if (!snapshot) {
       toast.error("Document not found. Refresh and try again.");
diff --git a/apps/studio/features/documents/core/icons.ts b/apps/studio/features/documents/core/icons.ts
new file mode 100644
index 0000000..6297e91
--- /dev/null
+++ b/apps/studio/features/documents/core/icons.ts
@@ -0,0 +1,13 @@
+import * as LucideIcons from "lucide-react";
+import { FileText, type LucideIcon } from "lucide-react";
+
+import type { DocumentType } from "./document-types";
+
+import { getDocumentDefinition } from "./registry";
+
+export function getDocumentIcon(type: DocumentType): LucideIcon {
+  const iconName = getDocumentDefinition(type).icon;
+  const icon = (LucideIcons as unknown as Record<string, LucideIcon | undefined>)[iconName];
+
+  return icon ?? FileText;
+}
diff --git a/apps/studio/features/documents/core/routes.ts b/apps/studio/features/documents/core/routes.ts
index 39a3a88..3a661df 100644
--- a/apps/studio/features/documents/core/routes.ts
+++ b/apps/studio/features/documents/core/routes.ts
@@ -1,7 +1,17 @@
-import type { DocumentType } from "./document-types";
+import { isDocumentType, type DocumentType } from "./document-types";
+
+export function getDocumentRouteSegment(type: DocumentType) {
+  return type.toLowerCase().replaceAll("_", "-");
+}
+
+export function parseDocumentRouteSegment(value: string): DocumentType | null {
+  const normalized = value.replaceAll("-", "_").toUpperCase();
+
+  return isDocumentType(normalized) ? normalized : null;
+}
 
 export function getDocumentEditorPath(type: DocumentType, id: string) {
-  return `/editor/${type.toLowerCase()}/${id}`;
+  return `/editor/${getDocumentRouteSegment(type)}/${id}`;
 }
 
 export function getDocumentPreviewPath(type: DocumentType, id: string) {
diff --git a/apps/studio/features/documents/services/document-library.ts b/apps/studio/features/documents/services/document-library.ts
index 829bf78..7d34f4d 100644
--- a/apps/studio/features/documents/services/document-library.ts
+++ b/apps/studio/features/documents/services/document-library.ts
@@ -12,6 +12,7 @@ import {
   listDocuments,
   loadDocumentById,
 } from "@/features/documents/services/document-workspace-service";
+import { DOCUMENT_TYPES } from "@/features/documents/core/document-types";
 
 import { getDocumentDefinition } from "@/features/documents/core/registry";
 
@@ -35,10 +36,10 @@ export type DocumentLibrarySnapshot = {
   key: string;
 };
 
-const EMPTY_COUNTS: Record<DocumentType, number> = {
-  RESUME: 0,
-  COVER_LETTER: 0,
-};
+const EMPTY_COUNTS = Object.fromEntries(DOCUMENT_TYPES.map((type) => [type, 0])) as Record<
+  DocumentType,
+  number
+>;
 
 export const DOCUMENT_LIBRARY_SERVER_SNAPSHOT: DocumentLibrarySnapshot = {
   docs: [],
@@ -75,8 +76,9 @@ export function getDocumentLibrarySnapshot(
   const storage = window.localStorage;
 
   const storageKey = [
-    storage.getItem("veriworkly:docs:v2:resume") ?? "",
-    storage.getItem("veriworkly:docs:v2:cover_letter") ?? "",
+    ...DOCUMENT_TYPES.map(
+      (type) => storage.getItem(`veriworkly:docs:v2:${type.toLowerCase()}`) ?? "",
+    ),
     storage.getItem("veriworkly:docs:v2:active") ?? "",
     refreshKey.toString(),
   ].join("::");
@@ -149,6 +151,7 @@ export function mapDocumentToLibraryItem(document: BaseDocument): DocumentLibrar
 
 export function formatRelative(value: string) {
   const date = new Date(value);
+
   if (Number.isNaN(date.getTime())) return "recently";
 
   const diffMs = Date.now() - date.getTime();
diff --git a/apps/studio/features/documents/services/document-workspace-service.ts b/apps/studio/features/documents/services/document-workspace-service.ts
index a368ff8..fc3f6c8 100644
--- a/apps/studio/features/documents/services/document-workspace-service.ts
+++ b/apps/studio/features/documents/services/document-workspace-service.ts
@@ -4,9 +4,12 @@ import type { DocumentType } from "@/features/documents/core/document-types";
 import type { BaseDocument, DocumentMeta } from "@/features/documents/core/types";
 import type { SaveDocumentOptions, SaveDocumentResult } from "./local-storage-service";
 
+import { LocalStorageService } from "./local-storage-service";
+
+import { DOCUMENT_TYPES } from "@/features/documents/core/document-types";
 import { getDocumentDefinition } from "@/features/documents/core/registry";
 import { DOCUMENT_STORAGE_UPDATED_EVENT } from "@/features/documents/services/document-sync";
-import { safeSetLocalStorageItem } from "@/features/documents/services/storage/safe-local-storage";
+import { loadWorkspaceSettingsFromLocalStorage } from "@/features/documents/services/workspace-settings";
 
 const VERSION = "v2";
 const ACTIVE_KEY = `veriworkly:docs:${VERSION}:active`;
@@ -24,25 +27,41 @@ function buildId(type: DocumentType): string {
   return `${type.toLowerCase()}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
 }
 
-function loadCollection(type: DocumentType): Record<string, BaseDocument> {
-  if (typeof window === "undefined") return {};
+function parseCollection(type: DocumentType, input: unknown) {
+  const collection =
+    typeof input === "object" && input !== null
+      ? (input as { version?: unknown; items?: unknown })
+      : {};
 
-  const raw = localStorage.getItem(collectionKey(type));
+  const rawItems =
+    typeof collection.items === "object" && collection.items !== null ? collection.items : {};
 
-  if (!raw) return {};
+  const parseItem = getDocumentDefinition(type).parse;
+  const entries = Object.entries(rawItems).map(([id, value]) => [id, parseItem(value)]);
 
-  try {
-    const parsed = JSON.parse(raw) as { items?: Record<string, unknown> };
+  return {
+    version: typeof collection.version === "number" ? collection.version : 2,
+    items: Object.fromEntries(
+      entries.filter((entry): entry is [string, BaseDocument] => Boolean(entry[1])),
+    ),
+  };
+}
 
-    const parseItem = getDocumentDefinition(type).parse;
-    const entries = Object.entries(parsed.items ?? {}).map(([id, value]) => [id, parseItem(value)]);
+function createStorage(type: DocumentType) {
+  return new LocalStorageService<BaseDocument>({
+    collectionKey: collectionKey(type),
+    activeIdKey: ACTIVE_KEY,
+    activeIdScope: type,
+    updatedEventName: DOCUMENT_STORAGE_UPDATED_EVENT,
+    parseItem: getDocumentDefinition(type).parse,
+    parseCollection: (input) => parseCollection(type, input),
+  });
+}
 
-    return Object.fromEntries(
-      entries.filter((entry): entry is [string, BaseDocument] => Boolean(entry[1])),
-    );
-  } catch {
-    return {};
-  }
+function loadCollection(type: DocumentType): Record<string, BaseDocument> {
+  if (typeof window === "undefined") return {};
+
+  return createStorage(type).loadCollection().items;
 }
 
 function saveCollection(
@@ -51,16 +70,11 @@ function saveCollection(
 ): SaveDocumentResult {
   if (typeof window === "undefined") return { ok: true, queued: false };
 
-  const result = safeSetLocalStorageItem(
-    localStorage,
-    collectionKey(type),
-    JSON.stringify({ version: 2, items }),
-  );
+  const result = createStorage(type).saveCollection({ version: 2, items });
 
   if (!result.ok) return { ok: false, reason: result.reason };
 
   window.dispatchEvent(new Event("storage"));
-  window.dispatchEvent(new Event(DOCUMENT_STORAGE_UPDATED_EVENT));
 
   return { ok: true, queued: false };
 }
@@ -70,16 +84,18 @@ function clearPendingSave(type: DocumentType, id: string) {
 
   const key = pendingSaveKey(type, id);
   const pending = pendingSaves.get(key);
+
   if (!pending) return;
 
   if (pending.timer !== null) {
     window.clearTimeout(pending.timer);
   }
+
   pendingSaves.delete(key);
 }
 
 export function listDocuments(type?: DocumentType): DocumentMeta[] {
-  const selectedTypes: DocumentType[] = type ? [type] : ["RESUME", "COVER_LETTER"];
+  const selectedTypes: DocumentType[] = type ? [type] : [...DOCUMENT_TYPES];
 
   return selectedTypes
     .flatMap((t) => Object.values(loadCollection(t)))
@@ -142,7 +158,16 @@ export function saveDocument(
 
 export function createDocument(type: DocumentType) {
   const id = buildId(type);
-  const doc = getDocumentDefinition(type).createDefault(id);
+  const defaultDoc = getDocumentDefinition(type).createDefault(id);
+  const workspaceSettings = loadWorkspaceSettingsFromLocalStorage();
+  const doc: BaseDocument = {
+    ...defaultDoc,
+    sync: {
+      ...defaultDoc.sync,
+      enabled: workspaceSettings.autoSyncEnabled,
+      status: workspaceSettings.autoSyncEnabled ? "pending" : "local-only",
+    },
+  };
 
   saveDocument(doc);
   setActiveDocument(type, id);
@@ -162,7 +187,7 @@ export function deleteDocument(type: DocumentType, id: string) {
 export function setActiveDocument(type: DocumentType, id: string) {
   if (typeof window === "undefined") return;
 
-  localStorage.setItem(ACTIVE_KEY, `${type}:${id}`);
+  createStorage(type).setActiveId(id);
 }
 
 export function listFullDocuments(type: DocumentType): BaseDocument[] {
diff --git a/apps/studio/features/documents/services/share-service.ts b/apps/studio/features/documents/services/share-service.ts
index 0e4658f..471d75d 100644
--- a/apps/studio/features/documents/services/share-service.ts
+++ b/apps/studio/features/documents/services/share-service.ts
@@ -54,6 +54,10 @@ export type ShareLinksPage = {
   };
 };
 
+export type SharedDocumentIdsResult = {
+  documentIds: string[];
+};
+
 export type ShareLinkPayload<T = unknown> = {
   passwordRequired: boolean;
   documentTitle: string;
@@ -108,9 +112,7 @@ export async function listShareLinks(
     },
   );
 
-  if (!response.ok) {
-    await throwApiError(response, "Failed to load share links");
-  }
+  if (!response.ok) await throwApiError(response, "Failed to load share links");
 
   const payload = (await response.json()) as { data: ShareLinksPage };
 
@@ -133,6 +135,24 @@ export async function listAllShareLinks(documentId: string): Promise<ShareLinkIt
   }
 }
 
+export async function listSharedDocumentIds(documentIds: string[]): Promise<string[]> {
+  if (documentIds.length === 0) return [];
+
+  const params = new URLSearchParams({ ids: [...new Set(documentIds)].join(",") });
+  const response = await fetch(backendApiUrl(`/shares/documents/shared-ids?${params}`), {
+    method: "GET",
+    credentials: "include",
+  });
+
+  if (!response.ok) {
+    await throwApiError(response, "Failed to load shared document ids");
+  }
+
+  const payload = (await response.json()) as { data: SharedDocumentIdsResult };
+
+  return payload.data.documentIds;
+}
+
 export async function revokeShareLink(documentId: string, shareLinkId: string) {
   const response = await fetch(
     backendApiUrl(`/shares/documents/${documentId}/links/${shareLinkId}`),
@@ -142,9 +162,7 @@ export async function revokeShareLink(documentId: string, shareLinkId: string) {
     },
   );
 
-  if (!response.ok) {
-    await throwApiError(response, "Failed to revoke share link");
-  }
+  if (!response.ok) await throwApiError(response, "Failed to revoke share link");
 }
 
 export async function fetchShareLink<T = unknown>(token: string) {
diff --git a/apps/studio/features/resume/editor/EditorContentPanel.tsx b/apps/studio/features/resume/editor/EditorContentPanel.tsx
index 7584de3..93e97f2 100644
--- a/apps/studio/features/resume/editor/EditorContentPanel.tsx
+++ b/apps/studio/features/resume/editor/EditorContentPanel.tsx
@@ -25,7 +25,7 @@ import AchievementsSection from "./content/sections/AchievementsSection";
 import PublicationsSection from "./content/sections/PublicationsSection";
 import CertificationsSection from "./content/sections/CertificationsSection";
 
-const EditorContentPanel = () => {
+const EditorContentPanel = memo(function EditorContentPanel() {
   const sections = useResumeStore((state) => state.resume.sections);
   const reorderSections = useResumeStore((state) => state.reorderSections);
 
@@ -92,7 +92,7 @@ const EditorContentPanel = () => {
       </div>
     </div>
   );
-};
+});
 
 interface EditorSectionItemProps {
   id: ResumeSectionId;
diff --git a/apps/studio/features/resume/editor/EditorSettingsPanel.tsx b/apps/studio/features/resume/editor/EditorSettingsPanel.tsx
index df5d99d..1fd0172 100644
--- a/apps/studio/features/resume/editor/EditorSettingsPanel.tsx
+++ b/apps/studio/features/resume/editor/EditorSettingsPanel.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { memo, useState } from "react";
 
 import type { FontFamilyId } from "@/features/documents/constants/fonts";
 
@@ -10,12 +10,17 @@ import AdvancedThemeSettings from "./settings/AdvancedThemeSettings";
 import SectionVisibilitySettings from "./settings/SectionVisibilitySettings";
 import { SettingsColor, SettingsRange, SettingsSelect } from "./settings/SettingControls";
 
-import { useResume } from "@/features/resume/hooks/use-resume";
 import { fontOptions } from "@/features/documents/constants/fonts";
+import { useResumeStore } from "@/features/resume/store/resume-store";
 import { defaultResume } from "@/features/resume/constants/default-resume";
 
-const EditorSettingsPanel = () => {
-  const { resume, setSectionVisibility, setTemplateId, updateCustomization } = useResume();
+const EditorSettingsPanel = memo(function EditorSettingsPanel() {
+  const sections = useResumeStore((state) => state.resume.sections);
+  const templateId = useResumeStore((state) => state.resume.templateId);
+  const customization = useResumeStore((state) => state.resume.customization);
+  const setSectionVisibility = useResumeStore((state) => state.setSectionVisibility);
+  const setTemplateId = useResumeStore((state) => state.setTemplateId);
+  const updateCustomization = useResumeStore((state) => state.updateCustomization);
 
   const [advancedOpen, setAdvancedOpen] = useState(false);
 
@@ -31,7 +36,7 @@ const EditorSettingsPanel = () => {
 
       <SettingsSelect
         label="Template"
-        value={resume.templateId}
+        value={templateId}
         onChange={(event) => setTemplateId(event.target.value)}
       >
         {templateSummaries.map((template) => (
@@ -48,7 +53,7 @@ const EditorSettingsPanel = () => {
             fontFamily: event.target.value as FontFamilyId,
           })
         }
-        value={resume.customization.fontFamily}
+        value={customization.fontFamily}
       >
         {fontOptions.map((font) => (
           <option key={font.value} value={font.value}>
@@ -60,30 +65,30 @@ const EditorSettingsPanel = () => {
       <SettingsRange
         min={0}
         max={44}
-        label={`Section gap (${resume.customization.sectionSpacing}px)`}
+        label={`Section gap (${customization.sectionSpacing}px)`}
         onChange={(event) =>
           updateCustomization({
             sectionSpacing: Number(event.target.value),
           })
         }
-        value={resume.customization.sectionSpacing}
+        value={customization.sectionSpacing}
       />
 
       <SettingsRange
         max={52}
         min={16}
-        label={`Page margin (${resume.customization.pagePadding}px)`}
+        label={`Page margin (${customization.pagePadding}px)`}
         onChange={(event) =>
           updateCustomization({
             pagePadding: Number(event.target.value),
           })
         }
-        value={resume.customization.pagePadding}
+        value={customization.pagePadding}
       />
 
       <SettingsColor
         label="Accent color"
-        value={resume.customization.accentColor}
+        value={customization.accentColor}
         onChange={(event) =>
           updateCustomization({
             accentColor: event.target.value,
@@ -93,15 +98,15 @@ const EditorSettingsPanel = () => {
 
       <AdvancedThemeSettings
         advancedOpen={advancedOpen}
-        customization={resume.customization}
+        customization={customization}
         onUpdateCustomization={updateCustomization}
         onResetThemeDefaults={() => updateCustomization({ ...defaultResume.customization })}
         onToggleOpen={() => setAdvancedOpen((isOpen) => !isOpen)}
       />
 
-      <SectionVisibilitySettings sections={resume.sections} onToggle={setSectionVisibility} />
+      <SectionVisibilitySettings sections={sections} onToggle={setSectionVisibility} />
     </div>
   );
-};
+});
 
 export default EditorSettingsPanel;
diff --git a/apps/studio/features/resume/editor/ResumeEditorModals.tsx b/apps/studio/features/resume/editor/ResumeEditorModals.tsx
index 2293501..d9c84c7 100644
--- a/apps/studio/features/resume/editor/ResumeEditorModals.tsx
+++ b/apps/studio/features/resume/editor/ResumeEditorModals.tsx
@@ -4,9 +4,9 @@ import { toast } from "sonner";
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 
-import { useResume } from "@/features/resume/hooks/use-resume";
-import { getDocumentEditorPath } from "@/features/documents/core/routes";
+import { useResumeStore } from "@/features/resume/store/resume-store";
 import { DocumentApi } from "@/features/documents/services/document-api";
+import { getDocumentEditorPath } from "@/features/documents/core/routes";
 import { trackUsageEvent } from "@/features/analytics/services/usage-metrics";
 import { deleteResume, createResume } from "@/features/resume/services/resume-service";
 
@@ -27,7 +27,8 @@ const EditorModals = ({
   onDeleteModalClose,
 }: EditorModalsProps) => {
   const router = useRouter();
-  const { resume, setResume } = useResume();
+  const resume = useResumeStore((state) => state.resume);
+  const setResume = useResumeStore((state) => state.setResume);
   const [isDeleting, setIsDeleting] = useState(false);
 
   async function onDeleteResume() {
@@ -65,6 +66,7 @@ const EditorModals = ({
       {shareModalOpen && (
         <ShareDocumentModal
           documentId={resume.id}
+          documentType="RESUME"
           documentTitle={resume.basics.fullName || "Untitled Resume"}
           onClose={onShareModalClose}
         />
diff --git a/apps/studio/features/resume/editor/ResumeToolbar.tsx b/apps/studio/features/resume/editor/ResumeToolbar.tsx
index 944820a..52dc382 100644
--- a/apps/studio/features/resume/editor/ResumeToolbar.tsx
+++ b/apps/studio/features/resume/editor/ResumeToolbar.tsx
@@ -13,7 +13,7 @@ import ToolbarDownloadMenu from "@/features/documents/editor/toolbar/ToolbarDown
 import { useToolbarDownloads } from "@/features/resume/editor/toolbar/useToolbarDownloads";
 import ToolbarSecondaryActions from "@/features/resume/editor/toolbar/ToolbarSecondaryActions";
 
-import { useResume } from "@/features/resume/hooks/use-resume";
+import { useResumeStore } from "@/features/resume/store/resume-store";
 import { getDocumentEditorPath } from "@/features/documents/core/routes";
 import { saveResume, importResumeFromFile } from "@/features/resume/services/resume-service";
 
@@ -29,7 +29,9 @@ const ResumeToolbar = ({ resumeId, resumePreviewId, onOpenShare, onOpenDelete }:
 
   const fileInputRef = useRef<HTMLInputElement>(null);
 
-  const { resetResume, resume, setResume } = useResume();
+  const resume = useResumeStore((state) => state.resume);
+  const resetResume = useResumeStore((state) => state.resetResume);
+  const setResume = useResumeStore((state) => state.setResume);
 
   const [message, setMessage] = useState("Autosave ready");
 
diff --git a/apps/studio/features/resume/editor/content/sections/AchievementsSection.tsx b/apps/studio/features/resume/editor/content/sections/AchievementsSection.tsx
index 060baa6..d2e33c3 100644
--- a/apps/studio/features/resume/editor/content/sections/AchievementsSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/AchievementsSection.tsx
@@ -1,96 +1,28 @@
 "use client";
 
-import { useState } from "react";
-
 import type { BaseSectionProps } from "./section-types";
 
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
 
-import DraggableSection from "./DraggableSection";
 import { Field, TextArea } from "../EditorFormPrimitives";
+import GenericCustomSection from "./GenericCustomSection";
 
-import { useResumeStore } from "@/features/resume/store/resume-store";
-
-const AchievementsSection = ({
-  isOpen,
-  onDragEnd,
-  onDragOver,
-  onDragStart,
-  onDrop,
-  onToggle,
-}: BaseSectionProps) => {
-  const achievementsSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "achievements"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [achievementIndex, setAchievementIndex] = useState(0);
-
-  if (!achievementsSection) {
-    return null;
-  }
-
-  const safeAchievementIndex = Math.min(
-    achievementIndex,
-    Math.max(0, achievementsSection.items.length - 1),
-  );
-
-  const activeAchievement = achievementsSection.items[safeAchievementIndex];
-
+const AchievementsSection = (props: BaseSectionProps) => {
   return (
-    <DraggableSection
-      isOpen={isOpen}
-      onDrop={onDrop}
-      id="achievements"
+    <GenericCustomSection
+      {...props}
+      kind="achievements"
       label="Achievements"
-      onToggle={onToggle}
-      onDragEnd={onDragEnd}
-      onDragOver={onDragOver}
-      onDragStart={onDragStart}
+      addLabel="Add achievement"
+      fallbackItemLabel="Achievement"
+      emptyMessage="No achievements yet. Click Add achievement."
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {achievementsSection.items.length ? (
-          <select
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setAchievementIndex(Number(event.target.value))}
-            value={safeAchievementIndex}
-          >
-            {achievementsSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Achievement ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button onClick={() => addCustomSectionItem("achievements")} size="sm" variant="secondary">
-          Add achievement
-        </Button>
-
-        <Button
-          disabled={achievementsSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("achievements", safeAchievementIndex)}
-          size="sm"
-          variant="ghost"
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activeAchievement ? (
+      {({ item: activeAchievement, update }) => (
         <>
           <div className="grid gap-4 md:grid-cols-2">
             <Field label="Title">
               <Input
-                onChange={(event) =>
-                  updateCustomSectionItem("achievements", safeAchievementIndex, {
-                    name: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ name: event.target.value })}
                 value={activeAchievement.name}
               />
             </Field>
@@ -99,20 +31,14 @@ const AchievementsSection = ({
           <div className="mt-4">
             <Field label="Description">
               <TextArea
-                onChange={(event) =>
-                  updateCustomSectionItem("achievements", safeAchievementIndex, {
-                    description: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ description: event.target.value })}
                 value={activeAchievement.description}
               />
             </Field>
           </div>
         </>
-      ) : (
-        <p className="text-muted text-sm">No achievements yet. Click Add achievement.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/content/sections/AwardsSection.tsx b/apps/studio/features/resume/editor/content/sections/AwardsSection.tsx
index 6ae5207..82358a6 100644
--- a/apps/studio/features/resume/editor/content/sections/AwardsSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/AwardsSection.tsx
@@ -1,16 +1,11 @@
 "use client";
 
-import { useState } from "react";
-
 import type { BaseSectionProps } from "./section-types";
 
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
-
-import { useResumeStore } from "@/features/resume/store/resume-store";
 
-import DraggableSection from "./DraggableSection";
 import { Field, TextArea } from "../EditorFormPrimitives";
+import GenericCustomSection from "./GenericCustomSection";
 
 const AwardsSection = ({
   isOpen,
@@ -20,28 +15,13 @@ const AwardsSection = ({
   onDrop,
   onToggle,
 }: BaseSectionProps) => {
-  const awardsSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "awards"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [awardIndex, setAwardIndex] = useState(0);
-
-  if (!awardsSection) {
-    return null;
-  }
-
-  const safeAwardIndex = Math.min(awardIndex, Math.max(0, awardsSection.items.length - 1));
-
-  const activeAward = awardsSection.items[safeAwardIndex];
-
   return (
-    <DraggableSection
-      id="awards"
+    <GenericCustomSection
+      kind="awards"
       label="Awards"
+      addLabel="Add award"
+      emptyMessage="No awards yet. Click Add award."
+      fallbackItemLabel="Award"
       isOpen={isOpen}
       onDrop={onDrop}
       onToggle={onToggle}
@@ -49,56 +29,19 @@ const AwardsSection = ({
       onDragOver={onDragOver}
       onDragStart={onDragStart}
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {awardsSection.items.length ? (
-          <select
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setAwardIndex(Number(event.target.value))}
-            value={safeAwardIndex}
-          >
-            {awardsSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Award ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button onClick={() => addCustomSectionItem("awards")} size="sm" variant="secondary">
-          Add award
-        </Button>
-
-        <Button
-          disabled={awardsSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("awards", safeAwardIndex)}
-          size="sm"
-          variant="ghost"
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activeAward ? (
+      {({ item: activeAward, update }) => (
         <>
           <div className="grid gap-4 md:grid-cols-2">
             <Field label="Award name">
               <Input
-                onChange={(event) =>
-                  updateCustomSectionItem("awards", safeAwardIndex, {
-                    name: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ name: event.target.value })}
                 value={activeAward.name}
               />
             </Field>
 
             <Field label="Issuer">
               <Input
-                onChange={(event) =>
-                  updateCustomSectionItem("awards", safeAwardIndex, {
-                    issuer: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ issuer: event.target.value })}
                 value={activeAward.issuer}
               />
             </Field>
@@ -106,11 +49,7 @@ const AwardsSection = ({
             <Field label="Date (YYYY-MM)">
               <Input
                 type="month"
-                onChange={(event) =>
-                  updateCustomSectionItem("awards", safeAwardIndex, {
-                    date: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ date: event.target.value })}
                 value={activeAward.date}
               />
             </Field>
@@ -119,11 +58,7 @@ const AwardsSection = ({
               <Input
                 placeholder="https://..."
                 type="url"
-                onChange={(event) =>
-                  updateCustomSectionItem("awards", safeAwardIndex, {
-                    link: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ link: event.target.value })}
                 value={activeAward.link}
               />
             </Field>
@@ -132,20 +67,14 @@ const AwardsSection = ({
           <div className="mt-4">
             <Field label="Description">
               <TextArea
-                onChange={(event) =>
-                  updateCustomSectionItem("awards", safeAwardIndex, {
-                    description: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ description: event.target.value })}
                 value={activeAward.description}
               />
             </Field>
           </div>
         </>
-      ) : (
-        <p className="text-muted text-sm">No awards yet. Click Add award.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/content/sections/CertificationsSection.tsx b/apps/studio/features/resume/editor/content/sections/CertificationsSection.tsx
index e100de4..8e31549 100644
--- a/apps/studio/features/resume/editor/content/sections/CertificationsSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/CertificationsSection.tsx
@@ -1,109 +1,34 @@
 "use client";
 
-import { useState } from "react";
+import type { BaseSectionProps } from "./section-types";
 
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
-
-import { useResumeStore } from "@/features/resume/store/resume-store";
 
 import { Field } from "../EditorFormPrimitives";
-import DraggableSection from "./DraggableSection";
-import type { BaseSectionProps } from "./section-types";
-
-const CertificationsSection = ({
-  isOpen,
-  onDragEnd,
-  onDragOver,
-  onDragStart,
-  onDrop,
-  onToggle,
-}: BaseSectionProps) => {
-  const certificationsSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "certifications"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [certificationIndex, setCertificationIndex] = useState(0);
-
-  if (!certificationsSection) {
-    return null;
-  }
-
-  const safeCertificationIndex = Math.min(
-    certificationIndex,
-    Math.max(0, certificationsSection.items.length - 1),
-  );
-
-  const activeCertification = certificationsSection.items[safeCertificationIndex];
+import GenericCustomSection from "./GenericCustomSection";
 
+const CertificationsSection = (props: BaseSectionProps) => {
   return (
-    <DraggableSection
-      isOpen={isOpen}
-      onDrop={onDrop}
-      id="certifications"
+    <GenericCustomSection
+      {...props}
+      kind="certifications"
       label="Certifications"
-      onToggle={onToggle}
-      onDragEnd={onDragEnd}
-      onDragOver={onDragOver}
-      onDragStart={onDragStart}
+      addLabel="Add certification"
+      fallbackItemLabel="Certification"
+      emptyMessage="No certifications yet. Click Add certification."
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {certificationsSection.items.length ? (
-          <select
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setCertificationIndex(Number(event.target.value))}
-            value={safeCertificationIndex}
-          >
-            {certificationsSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Certification ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button
-          onClick={() => addCustomSectionItem("certifications")}
-          size="sm"
-          variant="secondary"
-        >
-          Add certification
-        </Button>
-
-        <Button
-          size="sm"
-          variant="ghost"
-          disabled={certificationsSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("certifications", safeCertificationIndex)}
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activeCertification ? (
+      {({ item: activeCertification, update }) => (
         <div className="grid gap-4 md:grid-cols-2">
           <Field label="Certificate name">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("certifications", safeCertificationIndex, {
-                  name: event.target.value,
-                })
-              }
+              onChange={(event) => update({ name: event.target.value })}
               value={activeCertification.name}
             />
           </Field>
 
           <Field label="Issuer">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("certifications", safeCertificationIndex, {
-                  issuer: event.target.value,
-                })
-              }
+              onChange={(event) => update({ issuer: event.target.value })}
               value={activeCertification.issuer}
             />
           </Field>
@@ -111,22 +36,14 @@ const CertificationsSection = ({
           <Field label="Issue date (YYYY-MM)">
             <Input
               type="month"
-              onChange={(event) =>
-                updateCustomSectionItem("certifications", safeCertificationIndex, {
-                  date: event.target.value,
-                })
-              }
+              onChange={(event) => update({ date: event.target.value })}
               value={activeCertification.date}
             />
           </Field>
 
           <Field label="Credential ID">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("certifications", safeCertificationIndex, {
-                  referenceId: event.target.value,
-                })
-              }
+              onChange={(event) => update({ referenceId: event.target.value })}
               value={activeCertification.referenceId}
             />
           </Field>
@@ -135,19 +52,13 @@ const CertificationsSection = ({
             <Input
               placeholder="https://..."
               type="url"
-              onChange={(event) =>
-                updateCustomSectionItem("certifications", safeCertificationIndex, {
-                  link: event.target.value,
-                })
-              }
+              onChange={(event) => update({ link: event.target.value })}
               value={activeCertification.link}
             />
           </Field>
         </div>
-      ) : (
-        <p className="text-muted text-sm">No certifications yet. Click Add certification.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/content/sections/GenericCustomSection.tsx b/apps/studio/features/resume/editor/content/sections/GenericCustomSection.tsx
new file mode 100644
index 0000000..770c396
--- /dev/null
+++ b/apps/studio/features/resume/editor/content/sections/GenericCustomSection.tsx
@@ -0,0 +1,109 @@
+"use client";
+
+import type { ReactNode } from "react";
+
+import { useState } from "react";
+
+import type { BaseSectionProps } from "./section-types";
+import type { ResumeAdditionalItem, ResumeAdditionalSectionKind } from "@/types/resume";
+
+import { Button } from "@veriworkly/ui";
+
+import { useResumeStore } from "@/features/resume/store/resume-store";
+
+import DraggableSection from "./DraggableSection";
+
+interface GenericCustomSectionProps extends BaseSectionProps {
+  kind: ResumeAdditionalSectionKind;
+  label: string;
+  addLabel: string;
+  fallbackItemLabel: string;
+  emptyMessage: string;
+  children: (props: {
+    item: ResumeAdditionalItem;
+    index: number;
+    update: (values: Partial<ResumeAdditionalItem>) => void;
+  }) => ReactNode;
+}
+
+export default function GenericCustomSection({
+  kind,
+  label,
+  addLabel,
+  emptyMessage,
+  fallbackItemLabel,
+  isOpen,
+  onDragEnd,
+  onDragOver,
+  onDragStart,
+  onDrop,
+  onToggle,
+  children,
+}: GenericCustomSectionProps) {
+  const section =
+    useResumeStore((state) =>
+      state.resume.customSections.find((customSection) => customSection.kind === kind),
+    ) ?? null;
+  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
+  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
+  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
+
+  const [selectedIndex, setSelectedIndex] = useState(0);
+
+  if (!section) return null;
+
+  const safeIndex = Math.min(selectedIndex, Math.max(0, section.items.length - 1));
+  const activeItem = section.items[safeIndex];
+
+  return (
+    <DraggableSection
+      id={kind}
+      label={label}
+      isOpen={isOpen}
+      onDrop={onDrop}
+      onToggle={onToggle}
+      onDragEnd={onDragEnd}
+      onDragOver={onDragOver}
+      onDragStart={onDragStart}
+    >
+      <div className="mb-3 flex flex-wrap gap-2">
+        {section.items.length ? (
+          <select
+            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
+            onChange={(event) => setSelectedIndex(Number(event.target.value))}
+            value={safeIndex}
+          >
+            {section.items.map((item, index) => (
+              <option key={item.id} value={index}>
+                {item.name || `${fallbackItemLabel} ${index + 1}`}
+              </option>
+            ))}
+          </select>
+        ) : null}
+
+        <Button onClick={() => addCustomSectionItem(kind)} size="sm" variant="secondary">
+          {addLabel}
+        </Button>
+
+        <Button
+          disabled={section.items.length === 0}
+          onClick={() => removeCustomSectionItem(kind, safeIndex)}
+          size="sm"
+          variant="ghost"
+        >
+          Remove
+        </Button>
+      </div>
+
+      {activeItem ? (
+        children({
+          item: activeItem,
+          index: safeIndex,
+          update: (values) => updateCustomSectionItem(kind, safeIndex, values),
+        })
+      ) : (
+        <p className="text-muted text-sm">{emptyMessage}</p>
+      )}
+    </DraggableSection>
+  );
+}
diff --git a/apps/studio/features/resume/editor/content/sections/InterestsSection.tsx b/apps/studio/features/resume/editor/content/sections/InterestsSection.tsx
index e40bbdb..18138c9 100644
--- a/apps/studio/features/resume/editor/content/sections/InterestsSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/InterestsSection.tsx
@@ -1,92 +1,27 @@
 "use client";
 
-import { useState } from "react";
-
 import type { BaseSectionProps } from "./section-types";
 
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
 
 import { Field } from "../EditorFormPrimitives";
-import DraggableSection from "./DraggableSection";
-
-import { useResumeStore } from "@/features/resume/store/resume-store";
-
-const InterestsSection = ({
-  isOpen,
-  onDragEnd,
-  onDragOver,
-  onDragStart,
-  onDrop,
-  onToggle,
-}: BaseSectionProps) => {
-  const interestsSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "interests"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [interestIndex, setInterestIndex] = useState(0);
-
-  if (!interestsSection) {
-    return null;
-  }
-
-  const safeInterestIndex = Math.min(interestIndex, Math.max(0, interestsSection.items.length - 1));
-
-  const activeInterest = interestsSection.items[safeInterestIndex];
+import GenericCustomSection from "./GenericCustomSection";
 
+const InterestsSection = (props: BaseSectionProps) => {
   return (
-    <DraggableSection
-      id="interests"
+    <GenericCustomSection
+      {...props}
+      kind="interests"
       label="Interests"
-      isOpen={isOpen}
-      onDrop={onDrop}
-      onToggle={onToggle}
-      onDragEnd={onDragEnd}
-      onDragOver={onDragOver}
-      onDragStart={onDragStart}
+      addLabel="Add interest"
+      fallbackItemLabel="Interest"
+      emptyMessage="No interests yet. Click Add interest."
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {interestsSection.items.length ? (
-          <select
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setInterestIndex(Number(event.target.value))}
-            value={safeInterestIndex}
-          >
-            {interestsSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Interest ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button onClick={() => addCustomSectionItem("interests")} size="sm" variant="secondary">
-          Add interest
-        </Button>
-
-        <Button
-          disabled={interestsSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("interests", safeInterestIndex)}
-          size="sm"
-          variant="ghost"
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activeInterest ? (
+      {({ item: activeInterest, update }) => (
         <div className="grid gap-4 md:grid-cols-2">
           <Field label="Interest">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("interests", safeInterestIndex, {
-                  name: event.target.value,
-                })
-              }
+              onChange={(event) => update({ name: event.target.value })}
               value={activeInterest.name}
             />
           </Field>
@@ -94,21 +29,19 @@ const InterestsSection = ({
           <Field label="Keywords (comma separated)">
             <Input
               onChange={(event) =>
-                updateCustomSectionItem("interests", safeInterestIndex, {
+                update({
                   details: event.target.value
                     .split(",")
                     .map((part) => part.trim())
                     .filter(Boolean),
                 })
               }
-              value={activeInterest.details.join(", ")}
+              value={activeInterest.details?.join(", ") ?? ""}
             />
           </Field>
         </div>
-      ) : (
-        <p className="text-muted text-sm">No interests yet. Click Add interest.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/content/sections/LanguagesSection.tsx b/apps/studio/features/resume/editor/content/sections/LanguagesSection.tsx
index 62a4118..080a190 100644
--- a/apps/studio/features/resume/editor/content/sections/LanguagesSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/LanguagesSection.tsx
@@ -1,93 +1,28 @@
 "use client";
 
-import { useState } from "react";
-
 import type { BaseSectionProps } from "./section-types";
 
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
-
-import { useResumeStore } from "@/features/resume/store/resume-store";
 
 import { Field } from "../EditorFormPrimitives";
-import DraggableSection from "./DraggableSection";
 import { proficiencyOptions } from "../editor-options";
+import GenericCustomSection from "./GenericCustomSection";
 
-const LanguagesSection = ({
-  isOpen,
-  onDragEnd,
-  onDragOver,
-  onDragStart,
-  onDrop,
-  onToggle,
-}: BaseSectionProps) => {
-  const languagesSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "languages"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [languageIndex, setLanguageIndex] = useState(0);
-
-  if (!languagesSection) {
-    return null;
-  }
-
-  const safeLanguageIndex = Math.min(languageIndex, Math.max(0, languagesSection.items.length - 1));
-
-  const activeLanguage = languagesSection.items[safeLanguageIndex];
-
+const LanguagesSection = (props: BaseSectionProps) => {
   return (
-    <DraggableSection
-      id="languages"
-      isOpen={isOpen}
-      onDrop={onDrop}
+    <GenericCustomSection
+      {...props}
+      kind="languages"
       label="Languages"
-      onToggle={onToggle}
-      onDragEnd={onDragEnd}
-      onDragOver={onDragOver}
-      onDragStart={onDragStart}
+      addLabel="Add language"
+      fallbackItemLabel="Language"
+      emptyMessage="No languages yet. Click Add language."
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {languagesSection.items.length ? (
-          <select
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setLanguageIndex(Number(event.target.value))}
-            value={safeLanguageIndex}
-          >
-            {languagesSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Language ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button size="sm" variant="secondary" onClick={() => addCustomSectionItem("languages")}>
-          Add language
-        </Button>
-
-        <Button
-          size="sm"
-          variant="ghost"
-          disabled={languagesSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("languages", safeLanguageIndex)}
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activeLanguage ? (
+      {({ item: activeLanguage, update }) => (
         <div className="grid gap-4 md:grid-cols-2">
           <Field label="Language">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("languages", safeLanguageIndex, {
-                  name: event.target.value,
-                })
-              }
+              onChange={(event) => update({ name: event.target.value })}
               value={activeLanguage.name}
             />
           </Field>
@@ -96,11 +31,7 @@ const LanguagesSection = ({
             <select
               value={activeLanguage.referenceId}
               className="border-border bg-background h-11 w-full rounded-2xl border px-4 text-sm"
-              onChange={(event) =>
-                updateCustomSectionItem("languages", safeLanguageIndex, {
-                  referenceId: event.target.value,
-                })
-              }
+              onChange={(event) => update({ referenceId: event.target.value })}
             >
               {proficiencyOptions.map((option) => (
                 <option key={option} value={option}>
@@ -110,10 +41,8 @@ const LanguagesSection = ({
             </select>
           </Field>
         </div>
-      ) : (
-        <p className="text-muted text-sm">No languages yet. Click Add language.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/content/sections/PublicationsSection.tsx b/apps/studio/features/resume/editor/content/sections/PublicationsSection.tsx
index 7a44deb..c3c1871 100644
--- a/apps/studio/features/resume/editor/content/sections/PublicationsSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/PublicationsSection.tsx
@@ -1,105 +1,34 @@
 "use client";
 
-import { useState } from "react";
-
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
-
-import { useResumeStore } from "@/features/resume/store/resume-store";
 
-import { Field } from "../EditorFormPrimitives";
-import DraggableSection from "./DraggableSection";
 import type { BaseSectionProps } from "./section-types";
 
-const PublicationsSection = ({
-  isOpen,
-  onDragEnd,
-  onDragOver,
-  onDragStart,
-  onDrop,
-  onToggle,
-}: BaseSectionProps) => {
-  const publicationsSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "publications"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [publicationIndex, setPublicationIndex] = useState(0);
-
-  if (!publicationsSection) {
-    return null;
-  }
-
-  const safePublicationIndex = Math.min(
-    publicationIndex,
-    Math.max(0, publicationsSection.items.length - 1),
-  );
-
-  const activePublication = publicationsSection.items[safePublicationIndex];
+import { Field } from "../EditorFormPrimitives";
+import GenericCustomSection from "./GenericCustomSection";
 
+const PublicationsSection = (props: BaseSectionProps) => {
   return (
-    <DraggableSection
-      isOpen={isOpen}
-      onDrop={onDrop}
-      id="publications"
-      onToggle={onToggle}
+    <GenericCustomSection
+      {...props}
+      kind="publications"
       label="Publications"
-      onDragEnd={onDragEnd}
-      onDragOver={onDragOver}
-      onDragStart={onDragStart}
+      addLabel="Add publication"
+      fallbackItemLabel="Publication"
+      emptyMessage="No publications yet. Click Add publication."
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {publicationsSection.items.length ? (
-          <select
-            value={safePublicationIndex}
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setPublicationIndex(Number(event.target.value))}
-          >
-            {publicationsSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Publication ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button size="sm" variant="secondary" onClick={() => addCustomSectionItem("publications")}>
-          Add publication
-        </Button>
-
-        <Button
-          size="sm"
-          variant="ghost"
-          disabled={publicationsSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("publications", safePublicationIndex)}
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activePublication ? (
+      {({ item: activePublication, update }) => (
         <div className="grid gap-4 md:grid-cols-2">
           <Field label="Publication title">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("publications", safePublicationIndex, {
-                  name: event.target.value,
-                })
-              }
+              onChange={(event) => update({ name: event.target.value })}
               value={activePublication.name}
             />
           </Field>
 
           <Field label="Publisher / Journal">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("publications", safePublicationIndex, {
-                  issuer: event.target.value,
-                })
-              }
+              onChange={(event) => update({ issuer: event.target.value })}
               value={activePublication.issuer}
             />
           </Field>
@@ -107,11 +36,7 @@ const PublicationsSection = ({
           <Field label="Date (YYYY-MM)">
             <Input
               type="month"
-              onChange={(event) =>
-                updateCustomSectionItem("publications", safePublicationIndex, {
-                  date: event.target.value,
-                })
-              }
+              onChange={(event) => update({ date: event.target.value })}
               value={activePublication.date}
             />
           </Field>
@@ -120,19 +45,13 @@ const PublicationsSection = ({
             <Input
               placeholder="https://..."
               type="url"
-              onChange={(event) =>
-                updateCustomSectionItem("publications", safePublicationIndex, {
-                  link: event.target.value,
-                })
-              }
+              onChange={(event) => update({ link: event.target.value })}
               value={activePublication.link}
             />
           </Field>
         </div>
-      ) : (
-        <p className="text-muted text-sm">No publications yet. Click Add publication.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/content/sections/ReferencesSection.tsx b/apps/studio/features/resume/editor/content/sections/ReferencesSection.tsx
index 3e72134..510b2e6 100644
--- a/apps/studio/features/resume/editor/content/sections/ReferencesSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/ReferencesSection.tsx
@@ -1,128 +1,48 @@
 "use client";
 
-import { useState } from "react";
-
 import type { BaseSectionProps } from "./section-types";
 
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
 
 import { Field } from "../EditorFormPrimitives";
-import DraggableSection from "./DraggableSection";
-
-import { useResumeStore } from "@/features/resume/store/resume-store";
-
-const ReferencesSection = ({
-  isOpen,
-  onDragEnd,
-  onDragOver,
-  onDragStart,
-  onDrop,
-  onToggle,
-}: BaseSectionProps) => {
-  const referencesSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "references"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [referenceIndex, setReferenceIndex] = useState(0);
-
-  if (!referencesSection) {
-    return null;
-  }
-
-  const safeReferenceIndex = Math.min(
-    referenceIndex,
-    Math.max(0, referencesSection.items.length - 1),
-  );
-
-  const activeReference = referencesSection.items[safeReferenceIndex];
+import GenericCustomSection from "./GenericCustomSection";
 
+const ReferencesSection = (props: BaseSectionProps) => {
   return (
-    <DraggableSection
-      id="references"
+    <GenericCustomSection
+      {...props}
+      kind="references"
       label="References"
-      isOpen={isOpen}
-      onDrop={onDrop}
-      onToggle={onToggle}
-      onDragEnd={onDragEnd}
-      onDragOver={onDragOver}
-      onDragStart={onDragStart}
+      addLabel="Add reference"
+      fallbackItemLabel="Reference"
+      emptyMessage="No references yet. Click Add reference."
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {referencesSection.items.length ? (
-          <select
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setReferenceIndex(Number(event.target.value))}
-            value={safeReferenceIndex}
-          >
-            {referencesSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Reference ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button onClick={() => addCustomSectionItem("references")} size="sm" variant="secondary">
-          Add reference
-        </Button>
-
-        <Button
-          disabled={referencesSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("references", safeReferenceIndex)}
-          size="sm"
-          variant="ghost"
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activeReference ? (
+      {({ item: activeReference, update }) => (
         <div className="grid gap-4 md:grid-cols-2">
           <Field label="Name">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("references", safeReferenceIndex, {
-                  name: event.target.value,
-                })
-              }
+              onChange={(event) => update({ name: event.target.value })}
               value={activeReference.name}
             />
           </Field>
 
           <Field label="Title">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("references", safeReferenceIndex, {
-                  issuer: event.target.value,
-                })
-              }
+              onChange={(event) => update({ issuer: event.target.value })}
               value={activeReference.issuer}
             />
           </Field>
 
           <Field label="Organization">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("references", safeReferenceIndex, {
-                  description: event.target.value,
-                })
-              }
+              onChange={(event) => update({ description: event.target.value })}
               value={activeReference.description}
             />
           </Field>
 
           <Field label="Relationship">
             <Input
-              onChange={(event) =>
-                updateCustomSectionItem("references", safeReferenceIndex, {
-                  referenceId: event.target.value,
-                })
-              }
+              onChange={(event) => update({ referenceId: event.target.value })}
               value={activeReference.referenceId}
             />
           </Field>
@@ -130,11 +50,7 @@ const ReferencesSection = ({
           <Field label="Email (optional)">
             <Input
               type="email"
-              onChange={(event) =>
-                updateCustomSectionItem("references", safeReferenceIndex, {
-                  link: event.target.value,
-                })
-              }
+              onChange={(event) => update({ link: event.target.value })}
               value={activeReference.link}
             />
           </Field>
@@ -144,7 +60,7 @@ const ReferencesSection = ({
               inputMode="numeric"
               maxLength={10}
               onChange={(event) =>
-                updateCustomSectionItem("references", safeReferenceIndex, {
+                update({
                   date: event.target.value.replace(/\D/g, "").slice(0, 10),
                 })
               }
@@ -154,10 +70,8 @@ const ReferencesSection = ({
             />
           </Field>
         </div>
-      ) : (
-        <p className="text-muted text-sm">No references yet. Click Add reference.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/content/sections/VolunteerSection.tsx b/apps/studio/features/resume/editor/content/sections/VolunteerSection.tsx
index 4ea4262..8ac9df9 100644
--- a/apps/studio/features/resume/editor/content/sections/VolunteerSection.tsx
+++ b/apps/studio/features/resume/editor/content/sections/VolunteerSection.tsx
@@ -1,107 +1,35 @@
 "use client";
 
-import { useState } from "react";
-
 import type { BaseSectionProps } from "./section-types";
 
 import { Input } from "@veriworkly/ui";
-import { Button } from "@veriworkly/ui";
 
-import DraggableSection from "./DraggableSection";
 import { Field, TextArea } from "../EditorFormPrimitives";
+import GenericCustomSection from "./GenericCustomSection";
 
-import { useResumeStore } from "@/features/resume/store/resume-store";
-
-const VolunteerSection = ({
-  isOpen,
-  onDragEnd,
-  onDragOver,
-  onDragStart,
-  onDrop,
-  onToggle,
-}: BaseSectionProps) => {
-  const volunteerSection =
-    useResumeStore((state) =>
-      state.resume.customSections.find((section) => section.kind === "volunteer"),
-    ) ?? null;
-  const addCustomSectionItem = useResumeStore((state) => state.addCustomSectionItem);
-  const removeCustomSectionItem = useResumeStore((state) => state.removeCustomSectionItem);
-  const updateCustomSectionItem = useResumeStore((state) => state.updateCustomSectionItem);
-
-  const [volunteerIndex, setVolunteerIndex] = useState(0);
-
-  if (!volunteerSection) {
-    return null;
-  }
-
-  const safeVolunteerIndex = Math.min(
-    volunteerIndex,
-    Math.max(0, volunteerSection.items.length - 1),
-  );
-
-  const activeVolunteer = volunteerSection.items[safeVolunteerIndex];
-
+const VolunteerSection = (props: BaseSectionProps) => {
   return (
-    <DraggableSection
-      id="volunteer"
+    <GenericCustomSection
+      {...props}
+      kind="volunteer"
       label="Volunteer"
-      isOpen={isOpen}
-      onDrop={onDrop}
-      onToggle={onToggle}
-      onDragEnd={onDragEnd}
-      onDragOver={onDragOver}
-      onDragStart={onDragStart}
+      addLabel="Add volunteer entry"
+      fallbackItemLabel="Volunteer"
+      emptyMessage="No volunteer entries yet. Click Add volunteer entry."
     >
-      <div className="mb-3 flex flex-wrap gap-2">
-        {volunteerSection.items.length ? (
-          <select
-            className="border-border bg-background h-10 rounded-xl border px-3 text-sm"
-            onChange={(event) => setVolunteerIndex(Number(event.target.value))}
-            value={safeVolunteerIndex}
-          >
-            {volunteerSection.items.map((item, index) => (
-              <option key={item.id} value={index}>
-                {item.name || `Volunteer ${index + 1}`}
-              </option>
-            ))}
-          </select>
-        ) : null}
-
-        <Button onClick={() => addCustomSectionItem("volunteer")} size="sm" variant="secondary">
-          Add volunteer entry
-        </Button>
-
-        <Button
-          disabled={volunteerSection.items.length === 0}
-          onClick={() => removeCustomSectionItem("volunteer", safeVolunteerIndex)}
-          size="sm"
-          variant="ghost"
-        >
-          Remove
-        </Button>
-      </div>
-
-      {activeVolunteer ? (
+      {({ item: activeVolunteer, update }) => (
         <>
           <div className="grid gap-4 md:grid-cols-2">
             <Field label="Organization">
               <Input
-                onChange={(event) =>
-                  updateCustomSectionItem("volunteer", safeVolunteerIndex, {
-                    name: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ name: event.target.value })}
                 value={activeVolunteer.name}
               />
             </Field>
 
             <Field label="Role">
               <Input
-                onChange={(event) =>
-                  updateCustomSectionItem("volunteer", safeVolunteerIndex, {
-                    issuer: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ issuer: event.target.value })}
                 value={activeVolunteer.issuer}
               />
             </Field>
@@ -109,22 +37,14 @@ const VolunteerSection = ({
             <Field label="Date (YYYY-MM)">
               <Input
                 type="month"
-                onChange={(event) =>
-                  updateCustomSectionItem("volunteer", safeVolunteerIndex, {
-                    date: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ date: event.target.value })}
                 value={activeVolunteer.date}
               />
             </Field>
 
             <Field label="Location">
               <Input
-                onChange={(event) =>
-                  updateCustomSectionItem("volunteer", safeVolunteerIndex, {
-                    referenceId: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ referenceId: event.target.value })}
                 value={activeVolunteer.referenceId}
               />
             </Field>
@@ -133,20 +53,14 @@ const VolunteerSection = ({
           <div className="mt-4">
             <Field label="Summary">
               <TextArea
-                onChange={(event) =>
-                  updateCustomSectionItem("volunteer", safeVolunteerIndex, {
-                    description: event.target.value,
-                  })
-                }
+                onChange={(event) => update({ description: event.target.value })}
                 value={activeVolunteer.description}
               />
             </Field>
           </div>
         </>
-      ) : (
-        <p className="text-muted text-sm">No volunteer entries yet. Click Add volunteer entry.</p>
       )}
-    </DraggableSection>
+    </GenericCustomSection>
   );
 };
 
diff --git a/apps/studio/features/resume/editor/toolbar/ToolbarSecondaryActions.tsx b/apps/studio/features/resume/editor/toolbar/ToolbarSecondaryActions.tsx
index 88e2031..b7c3568 100644
--- a/apps/studio/features/resume/editor/toolbar/ToolbarSecondaryActions.tsx
+++ b/apps/studio/features/resume/editor/toolbar/ToolbarSecondaryActions.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
 
 import { Button } from "@veriworkly/ui";
 
-import { useResume } from "@/features/resume/hooks/use-resume";
+import { useResumeStore } from "@/features/resume/store/resume-store";
 import { getDocumentPreviewPath } from "@/features/documents/core/routes";
 
 interface ToolbarSecondaryActionsProps {
@@ -20,7 +20,7 @@ const ToolbarSecondaryActions = ({
 }: ToolbarSecondaryActionsProps) => {
   const router = useRouter();
 
-  const { saveToStorage } = useResume();
+  const saveToStorage = useResumeStore((state) => state.saveToStorage);
 
   return (
     <>
diff --git a/apps/studio/package.json b/apps/studio/package.json
index 9f28807..3835f3b 100644
--- a/apps/studio/package.json
+++ b/apps/studio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@veriworkly/studio",
-  "version": "3.8.0-beta.1",
+  "version": "3.8.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/apps/studio/templates/index.ts b/apps/studio/templates/index.ts
index 0ce54e6..e2aa687 100644
--- a/apps/studio/templates/index.ts
+++ b/apps/studio/templates/index.ts
@@ -1,14 +1,15 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import React from "react";
 
+import type { ComponentType } from "react";
 import type { TemplateMeta } from "@/features/documents/core/types";
+import type { TemplateComponent, TemplateRenderProps } from "@/types/template";
 
 import { precisionAtsMeta } from "./resume/precision-ats/meta";
 import { executiveClarityMeta } from "./resume/executive-clarity/meta";
 
 /** A renderable template record used by the web editor. */
 export interface TemplateDefinition extends TemplateMeta {
-  renderWeb: (props: any) => React.ReactNode;
+  renderWeb: (props: TemplateRenderProps) => React.ReactNode;
 }
 
 // ---------------------------------------------------------------------------
@@ -24,11 +25,11 @@ import { CleanProfessionalWeb } from "./resume/executive-clarity/web";
 export const templateRegistry: TemplateDefinition[] = [
   {
     ...executiveClarityMeta,
-    renderWeb: (props: any) => React.createElement(CleanProfessionalWeb, props),
+    renderWeb: (props) => React.createElement(CleanProfessionalWeb, props),
   },
   {
     ...precisionAtsMeta,
-    renderWeb: (props: any) => React.createElement(CompactAtsWeb, props),
+    renderWeb: (props) => React.createElement(CompactAtsWeb, props),
   },
 ];
 
@@ -36,11 +37,13 @@ export const templateRegistry: TemplateDefinition[] = [
 // Lookup helpers
 // ---------------------------------------------------------------------------
 
-export const loadTemplateComponentById = (id: string | undefined): React.ComponentType<any> => {
+export const loadTemplateComponentById = (id: string | undefined): TemplateComponent => {
   const match = templateRegistry.find((t) => t.id === id);
   const template = match ?? templateRegistry[0];
 
-  return (props: any) => template.renderWeb(props);
+  const LoadedTemplate: ComponentType<TemplateRenderProps> = (props) => template.renderWeb(props);
+
+  return LoadedTemplate;
 };
 
 export const getTemplateById = (id: string | undefined): TemplateDefinition | undefined =>
diff --git a/apps/studio/tests/contracts/document-routes.contract.test.ts b/apps/studio/tests/contracts/document-routes.contract.test.ts
new file mode 100644
index 0000000..a94ed38
--- /dev/null
+++ b/apps/studio/tests/contracts/document-routes.contract.test.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  getDocumentEditorPath,
+  getDocumentRouteSegment,
+  parseDocumentRouteSegment,
+} from "@/features/documents/core/routes";
+
+describe("document routes", () => {
+  it("uses stable route segments for document types with underscores", () => {
+    expect(getDocumentRouteSegment("COVER_LETTER")).toBe("cover-letter");
+    expect(getDocumentEditorPath("COVER_LETTER", "doc-1")).toBe("/editor/cover-letter/doc-1");
+  });
+
+  it("parses hyphen and underscore route segments", () => {
+    expect(parseDocumentRouteSegment("cover-letter")).toBe("COVER_LETTER");
+    expect(parseDocumentRouteSegment("cover_letter")).toBe("COVER_LETTER");
+    expect(parseDocumentRouteSegment("resume")).toBe("RESUME");
+  });
+
+  it("rejects unknown route segments", () => {
+    expect(parseDocumentRouteSegment("unknown-document")).toBeNull();
+  });
+});
diff --git a/apps/studio/tests/contracts/document-workspace-service.contract.test.ts b/apps/studio/tests/contracts/document-workspace-service.contract.test.ts
index cc81c42..2c73b22 100644
--- a/apps/studio/tests/contracts/document-workspace-service.contract.test.ts
+++ b/apps/studio/tests/contracts/document-workspace-service.contract.test.ts
@@ -4,7 +4,9 @@ import type { BaseDocument } from "@/features/documents/core/types";
 import { defaultResume } from "@/features/resume/constants/default-resume";
 import {
   saveDocument,
+  createDocument,
   deleteDocument,
+  setActiveDocument,
   loadDocumentById,
 } from "@/features/documents/services/document-workspace-service";
 
@@ -95,4 +97,51 @@ describe("document workspace service", () => {
     expect(loadDocumentById("RESUME", first.id)).toBeNull();
     expect(loadDocumentById("RESUME", second.id)?.title).toBe(second.title);
   });
+
+  it("returns a failed save result instead of throwing when local storage quota is exceeded", () => {
+    const document = createResumeDocument("resume-quota");
+    const quotaError = new DOMException("Storage quota exceeded", "QuotaExceededError");
+
+    vi.mocked(localStorage.setItem).mockImplementation(() => {
+      throw quotaError;
+    });
+
+    expect(saveDocument(document)).toEqual({ ok: false, reason: "quota-exceeded" });
+  });
+
+  it("does not throw when setting the active document fails under quota pressure", () => {
+    const quotaError = new DOMException("Storage quota exceeded", "QuotaExceededError");
+
+    vi.mocked(localStorage.setItem).mockImplementation(() => {
+      throw quotaError;
+    });
+
+    expect(() => setActiveDocument("RESUME", "resume-quota")).not.toThrow();
+  });
+
+  it("creates generic documents with sync enabled when workspace auto-sync is enabled", () => {
+    localStorage.setItem(
+      "veriworkly:workspace-settings",
+      JSON.stringify({ autoSyncEnabled: true }),
+    );
+
+    const document = createDocument("COVER_LETTER");
+    const saved = loadDocumentById("COVER_LETTER", document.id);
+
+    expect(saved?.sync.enabled).toBe(true);
+    expect(saved?.sync.status).toBe("pending");
+  });
+
+  it("creates generic documents as local-only when workspace auto-sync is disabled", () => {
+    localStorage.setItem(
+      "veriworkly:workspace-settings",
+      JSON.stringify({ autoSyncEnabled: false }),
+    );
+
+    const document = createDocument("COVER_LETTER");
+    const saved = loadDocumentById("COVER_LETTER", document.id);
+
+    expect(saved?.sync.enabled).toBe(false);
+    expect(saved?.sync.status).toBe("local-only");
+  });
 });
diff --git a/apps/studio/tests/contracts/share-links.contract.test.ts b/apps/studio/tests/contracts/share-links.contract.test.ts
index 27b06d2..c796d88 100644
--- a/apps/studio/tests/contracts/share-links.contract.test.ts
+++ b/apps/studio/tests/contracts/share-links.contract.test.ts
@@ -4,6 +4,7 @@ import type { ResumeData } from "@/types/resume";
 import { defaultResume } from "@/features/resume/constants/default-resume";
 import {
   createShareLink,
+  listSharedDocumentIds,
   fetchShareLinkByUsernameAndSlug,
   verifyShareLinkByUsernameAndSlug,
 } from "@/features/documents/services/share-service";
@@ -57,6 +58,35 @@ describe("share links contract", () => {
     expect(mockedBackendApiUrl).toHaveBeenCalledWith(`/shares`);
   });
 
+  it("fetches shared document ids in one request", async () => {
+    const fetchMock = vi.spyOn(globalThis, "fetch").mockResolvedValue({
+      ok: true,
+      json: async () => ({
+        data: {
+          documentIds: ["doc_1", "doc_2"],
+        },
+      }),
+    } as Response);
+
+    const result = await listSharedDocumentIds(["doc_1", "doc_1", "doc_2"]);
+
+    expect(result).toEqual(["doc_1", "doc_2"]);
+    expect(fetchMock).toHaveBeenCalledWith(
+      `http://localhost:4000/api/v1/shares/documents/shared-ids?ids=doc_1%2Cdoc_2`,
+      expect.objectContaining({
+        method: "GET",
+        credentials: "include",
+      }),
+    );
+  });
+
+  it("does not call the share status endpoint for an empty document set", async () => {
+    const fetchMock = vi.spyOn(globalThis, "fetch");
+
+    await expect(listSharedDocumentIds([])).resolves.toEqual([]);
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+
   it("fetches a public share link snapshot", async () => {
     vi.spyOn(globalThis, "fetch").mockResolvedValue({
       ok: true,
diff --git a/apps/studio/tests/contracts/template-render.contract.test.tsx b/apps/studio/tests/contracts/template-render.contract.test.tsx
index a73a2a0..19bf37f 100644
--- a/apps/studio/tests/contracts/template-render.contract.test.tsx
+++ b/apps/studio/tests/contracts/template-render.contract.test.tsx
@@ -35,13 +35,9 @@ describe("template render contract", () => {
     for (const template of templateRegistry) {
       const TemplateComponent = loadTemplateComponentById(template.id);
 
-      expect(() =>
-        renderToStaticMarkup(<TemplateComponent {...({} as Record<string, unknown>)} />),
-      ).not.toThrow();
+      expect(() => renderToStaticMarkup(<TemplateComponent {...({} as any)} />)).not.toThrow();
 
-      expect(() =>
-        renderToStaticMarkup(<TemplateComponent resume={null as unknown as object} />),
-      ).not.toThrow();
+      expect(() => renderToStaticMarkup(<TemplateComponent resume={null as any} />)).not.toThrow();
     }
   });
 
diff --git a/package-lock.json b/package-lock.json
index f5787f2..d117bbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "veriworkly",
-  "version": "3.8.0-beta.1",
+  "version": "3.8.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "veriworkly",
-      "version": "3.8.0-beta.1",
+      "version": "3.8.0",
       "workspaces": [
         "apps/site",
         "apps/studio",
@@ -26,7 +26,7 @@
     },
     "apps/blog-platform": {
       "name": "@veriworkly/blog-platform",
-      "version": "3.8.0-beta.1",
+      "version": "3.8.0",
       "dependencies": {
         "@veriworkly/ui": "*",
         "fumadocs-core": "^16.8.3",
@@ -61,7 +61,7 @@
     },
     "apps/docs-platform": {
       "name": "@veriworkly/docs-platform",
-      "version": "3.8.0-beta.1",
+      "version": "3.8.0",
       "dependencies": {
         "@veriworkly/ui": "*",
         "fumadocs-core": "^16.8.3",
@@ -87,7 +87,7 @@
     },
     "apps/server": {
       "name": "@veriworkly/server",
-      "version": "3.8.0-beta.1",
+      "version": "3.8.0",
       "dependencies": {
         "@better-auth/prisma-adapter": "^1.6.11",
         "@opentelemetry/api": "^1.9.1",
@@ -160,7 +160,7 @@
     },
     "apps/site": {
       "name": "@veriworkly/site",
-      "version": "3.8.0-beta.1",
+      "version": "3.8.0",
       "dependencies": {
         "@veriworkly/ui": "*",
         "clsx": "^2.1.1",
@@ -196,7 +196,7 @@
     },
     "apps/studio": {
       "name": "@veriworkly/studio",
-      "version": "3.8.0-beta.1",
+      "version": "3.8.0",
       "dependencies": {
         "@react-pdf/renderer": "^4.5.1",
         "@veriworkly/ui": "*",
diff --git a/package.json b/package.json
index 346f666..f46b866 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "veriworkly",
-  "version": "3.8.0-beta.1",
+  "version": "3.8.0",
   "private": true,
   "repository": {
     "type": "git",