Merge branch 'main' into feat/prefetch-intent-navigation-links

# Conflicts: # apps/remix/app/components/general/app-header.tsx # apps/remix/app/components/general/app-nav-desktop.tsx # apps/remix/app/components/general/app-nav-mobile.tsx # apps/remix/app/components/general/folder/folder-card.tsx # apps/remix/app/components/general/folder/folder-grid.tsx # apps/remix/app/components/general/menu-switcher.tsx # apps/remix/app/components/general/org-menu-switcher.tsx # apps/remix/app/components/general/settings-nav-mobile.tsx # apps/remix/app/components/tables/admin-claims-table.tsx # apps/remix/app/components/tables/admin-dashboard-users-table.tsx # apps/remix/app/components/tables/admin-organisations-table.tsx # apps/remix/app/components/tables/documents-table-action-button.tsx # apps/remix/app/components/tables/organisation-email-domains-table.tsx # apps/remix/app/components/tables/templates-table-action-dropdown.tsx # apps/remix/app/components/tables/user-billing-organisations-table.tsx # apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx # apps/remix/app/routes/_authenticated+/admin+/email-domains._index.tsx # apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx # apps/remix/app/routes/_authenticated+/dashboard.tsx # apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx # apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx # packages/email/template-components/template-document-reminder.tsx # packages/ui/primitives/tooltip.tsx
chore: restore translation files from main
2026-07-01 00:30:53 +10:00 · 2026-05-08 11:17:51 +00:00 · 2026-04-20 00:40:29 +00:00 · 2026-04-20 00:20:51 +00:00 · 2026-03-16 10:02:32 +00:00
181 changed files with 823 additions and 7184 deletions
@@ -1,138 +0,0 @@
---
-date: 2026-05-06
-title: Platform Signing Page Branding
---
-
-## What
-
-Platform-plan organisations (and their teams) can customise the **non-embed
-signing pages** (`/sign/:token`, `/d/:token`, and the sibling
-complete/expired/rejected/waiting pages) with:
-
- Six brand colour tokens (background, foreground, primary, primary-foreground,
-  border, ring) plus a border-radius length.
- A free-text custom CSS block (up to 256 KB).
-
-Settings live on `OrganisationGlobalSettings` and `TeamGlobalSettings`. Teams
-inherit from the org via the existing `brandingEnabled === null` mechanism.
-
-## Why
-
- Embed customers already have white-label CSS; Platform customers want the
-  same coverage on direct signing URLs that they iframe or link to.
- Persisting on org/team (not per envelope) means it's set-and-forget.
- Sanitising **on save** lets us inline the verbatim string at SSR — no
-  per-render parsing cost, no `<style>.innerHTML` injection on the client.
- Reusing the existing `embedSigningWhiteLabel` claim flag keeps "if you can
-  white-label an embed, you can white-label this" as one decision.
-
-## How
-
-### Storage (`packages/prisma/schema.prisma`)
-
-Two new fields on each settings model. No new tables.
-
-| Field            | Org type           | Team type          |
-| ---------------- | ------------------ | ------------------ |
-| `brandingColors` | `Json?` (nullable) | `Json?` (nullable) |
-| `brandingCss`    | `String @default("")` | `String?`       |
-
-Colours are validated against `ZCssVarsSchema`. The team's `null` means
-"inherit"; an empty colour object is collapsed to `null` server-side so a
-team toggling `brandingEnabled = true` without filling in colours doesn't
-silently override the org's defaults with nothing.
-
-### Sanitiser (`packages/lib/utils/sanitize-branding-css.ts`)
-
-PostCSS + `postcss-selector-parser`. Runs on save only.
-
- Drops selectors containing `::before`/`::after`/`::backdrop`/`::marker` or
-  the universal `*`.
- Drops integrity-breaking properties (`display`, `position`, `transform`,
-  layout-affecting dimensions, text-hiding properties).
- Drops declaration values containing `url(`, `expression(`, `@import`,
-  `javascript:`.
- Strips `!important`.
- Allows `@media` only; drops other at-rules.
- **Does not** rewrite selectors. Scoping happens at render time via native
-  CSS nesting under `.documenso-branded { ... }`.
- Final-pass tripwire: if a literal `</style` somehow survives serialization,
-  reject the entire output. PostCSS already escapes `<` to `\3c` whenever it
-  would form `</...`; the explicit check is belt-and-braces in case a future
-  serializer regresses.
- Returns `{ css, warnings[] }`. Warnings are surfaced in the UI.
-
-Border-radius is the only token interpolated raw into a `<style>` block; it
-is regex-validated (`CSS_LENGTH_REGEX`) at both the Zod schema and the
-runtime `toNativeCssVars` call. Belt-and-braces against schema drift.
-
-### Render (`apps/remix/app/components/general/recipient-branding.tsx`)
-
-Each recipient loader calls `loadRecipientBrandingByTeamId` and threads the
-payload through to `<RecipientBranding>`, which emits a single
-nonce-attributed `<style>`:
-
-```
-.documenso-branded {
-  --background: ...; ...
-  <user css>
-}
-```
-
-Native CSS nesting expands user rules under the wrapper. The body class is
-applied unconditionally to recipient routes in `root.tsx` via `useMatches()`
-so portaled Radix content (dialogs, popovers, tooltips, dropdowns) inherits
-the scope.
-
-CSP for recipient routes already supports `<style nonce>`; no policy
-changes needed.
-
-### Plan gate
-
-`organisationClaim.flags.embedSigningWhiteLabel || !IS_BILLING_ENABLED()`.
-Self-hosted instances always allow. The outer paywall for logo/URL/details
-stays on `allowCustomBranding` (Team plan and up); only the new
-colour/CSS section is Platform-only.
-
-### UI (`apps/remix/app/components/forms/branding-preferences-form.tsx`)
-
-Extends the existing branding form. Six `<ColorPicker showHex>` (rewritten
-to use the native `<input type="color">` instead of `react-colorful`, which
-was removed) in a 2-col grid, plus a free-text radius input and an
-`<Accordion>` revealing a mono `<Textarea>`. Defaults come from
-`packages/lib/constants/theme.ts` (light-mode hex mirror of `theme.css`).
-
-Warnings from the sanitiser are surfaced in an `<Alert variant="warning">`
-after save, and the `brandingCss` textarea is re-synced from the persisted
-value so the user sees exactly what was stored. Other fields are
-deliberately NOT reset on settings refetch — that would clobber in-flight
-edits.
-
-### TRPC
-
-`update-organisation-settings` and `update-team-settings` accept the new
-fields, run them through `sanitizeBrandingCss` + `normalizeBrandingColors`,
-and return any sanitiser warnings to the client. The team route treats
-`null` as "inherit"; an empty post-sanitisation string is collapsed to
-`null` (team) so an empty override doesn't mask the org's CSS.
-
-## Known accepted limitations
-
- The sanitiser does not prevent hostile-but-syntactically-valid CSS
-  (`color: transparent`, low-contrast values, etc.). The customer is
-  branding **their own** signing pages — we focus on integrity (no
-  overlay/hide/exfiltrate), not aesthetic policing.
- User rules targeting `body`/`html`/`:root` no-op once nested under the
-  wrapper class. Documented for users.
- CSS nesting baseline is Chrome 120+ / Firefox 117+ / Safari 16.5+.
-  Acceptable for the Platform-tier audience.
- No automated `theme.css` ↔ `theme.ts` sync check; fat comment in
-  `theme.ts` reminds devs to update both.
- Per-section team inherit is coarse — `brandingEnabled = null` inherits
-  everything from the org. Per-field inherit toggles are deferred.
-
-## Out of scope
-
-Live preview, embed-route sanitiser unification, email/PDF certificate
-branding, custom font upload, the full ~30 colour tokens in the picker UI,
-wiring `hidePoweredBy` through to the actual footer.
@@ -160,16 +160,8 @@ NEXT_PRIVATE_REDIS_PREFIX="documenso"
 NEXT_PUBLIC_POSTHOG_KEY=""
 # OPTIONAL: Leave blank to disable billing.
 NEXT_PUBLIC_FEATURE_BILLING_ENABLED=
-# OPTIONAL: Set to "true" to disable all signup methods (email, Google, Microsoft, OIDC, including the organisation OIDC portal).
+# OPTIONAL: Leave blank to allow users to signup through /signup page.
 NEXT_PUBLIC_DISABLE_SIGNUP=
-# OPTIONAL: Set to "true" to disable email/password signup only.
-NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP=
-# OPTIONAL: Set to "true" to block new-account creation through Google. Existing linked users can still sign in.
-NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP=
-# OPTIONAL: Set to "true" to block new-account creation through Microsoft. Existing linked users can still sign in.
-NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP=
-# OPTIONAL: Set to "true" to block new-account creation through OIDC (including the organisation portal).
-NEXT_PUBLIC_DISABLE_OIDC_SIGNUP=
 # OPTIONAL: Comma-separated list of email domains allowed to sign up (e.g., example.com,acme.org).
 NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS=
 # OPTIONAL: Set to true to use internal webapp url in browserless requests.
@@ -211,17 +203,3 @@ NEXT_PRIVATE_LOGGER_FILE_PATH=

 # [[PLAIN SUPPORT]]
 NEXT_PRIVATE_PLAIN_API_KEY=
-
-# [[DOCUMENT CONVERSION]]
-# OPTIONAL: Base URL of a Gotenberg-compatible service used to convert uploaded
-# DOCX files to PDF on the server. When unset, DOCX uploads are disabled and
-# only PDF is accepted. The dev docker compose exposes Gotenberg on port 3005.
-# NEXT_PRIVATE_DOCUMENT_CONVERSION_URL="http://localhost:3005"
-# OPTIONAL: Per-request timeout in milliseconds for the conversion service.
-# Defaults to 30000 (30s) if unset.
-# NEXT_PRIVATE_DOCUMENT_CONVERSION_TIMEOUT_MS=30000
-# OPTIONAL: HTTP Basic auth credentials for the conversion service. Set both
-# when the service is started with `--api-enable-basic-auth` (the dev compose
-# does this; the matching values there are `documenso` / `password`).
-# NEXT_PRIVATE_DOCUMENT_CONVERSION_USERNAME=documenso
-# NEXT_PRIVATE_DOCUMENT_CONVERSION_PASSWORD=password
@@ -1,4 +1,4 @@
-name: 'Setup node'
+name: 'Setup node and cache node_modules'
 inputs:
  node_version:
    required: false
@@ -16,7 +16,25 @@ runs:
      shell: bash
      run: corepack enable npm

+    - name: Cache npm
+      uses: actions/cache@v3
+      with:
+        path: ~/.npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+
+    - name: Cache node_modules
+      uses: actions/cache@v3
+      id: cache-node-modules
+      with:
+        path: |
+          node_modules
+          packages/*/node_modules
+          apps/*/node_modules
+        key: modules-${{ hashFiles('package-lock.json') }}
+
    - name: Install dependencies
+      if: steps.cache-node-modules.outputs.cache-hit != 'true'
      shell: bash
      run: |
        npm ci --no-audit
@@ -1,8 +1,19 @@
 name: Install playwright binaries
-description: 'Install playwright'
+description: 'Install playwright, cache and restore if necessary'
 runs:
  using: 'composite'
  steps:
+    - name: Cache playwright
+      id: cache-playwright
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cache/ms-playwright
+          ${{ github.workspace }}/node_modules/playwright
+        key: playwright-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: playwright-
+
    - name: Install playwright
+      if: steps.cache-playwright.outputs.cache-hit != 'true'
      run: npx playwright install --with-deps
      shell: bash
@@ -41,6 +41,14 @@ jobs:
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3

+      - name: Cache Docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
      - name: Build Docker Image
        uses: docker/build-push-action@v5
        with:
@@ -48,3 +56,13 @@ jobs:
          context: .
          file: ./docker/Dockerfile
          tags: documenso-${{ github.sha }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+      - # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
@@ -20,6 +20,7 @@ jobs:
        uses: actions/setup-node@v4
        with:
          node-version: '18'
+          cache: npm

      - name: Install Octokit
        run: npm install @octokit/rest@18
@@ -1,7 +1,7 @@
 name: 'PR Labeler'

 on:
-  - pull_request
+  - pull_request_target

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -20,6 +20,7 @@ jobs:
        uses: actions/setup-node@v4
        with:
          node-version: '18'
+          cache: npm

      - name: Install Octokit
        run: npm install @octokit/rest@18
@@ -1,7 +1,7 @@
 name: 'Validate PR Name'

 on:
-  pull_request:
+  pull_request_target:
    types:
      - opened
      - reopened
@@ -1,24 +1,24 @@
 ---
-title: Editor
+title: Authoring
 description: Embed document, template, and envelope creation directly in your application.
 ---

 import { Callout } from 'fumadocs-ui/components/callout';

-In addition to embedding signing, Documenso supports embedded editor. It allows your users to create and edit documents, templates, and envelopes without leaving your application.
+In addition to embedding signing, Documenso supports embedded authoring. It allows your users to create and edit documents, templates, and envelopes without leaving your application.

 <Callout type="warn">
-  Embedded editor is included with [Enterprise](https://documen.so/enterprise-cta) plans. It is
+  Embedded authoring is included with [Enterprise](https://documen.so/enterprise-cta) plans. It is
  also available as a paid add-on for the [Platform Plan](https://documen.so/platform-cta-pricing).
  Contact sales for access.
 </Callout>

 ## Versions

-Embedded editor is available in two versions:
+Embedded authoring is available in two versions:

- **[V1 Editor](/docs/developers/embedding/editor/v1)** — Works with V1 Documents and Templates.
- **[V2 Editor](/docs/developers/embedding/editor/v2)** — Works with Envelopes, which are the unified model for documents and templates.
+- **[V1 Authoring](/docs/developers/embedding/authoring/v1)** — Works with V1 Documents and Templates.
+- **[V2 Authoring](/docs/developers/embedding/authoring/v2)** — Works with Envelopes, which are the unified model for documents and templates.

 ### Comparison

@@ -32,7 +32,7 @@ Embedded editor is available in two versions:

 ## Presign Tokens

-Before using any editor component, obtain a presign token from your backend:
+Before using any authoring component, obtain a presign token from your backend:

 ```
 POST /api/v2/embedding/create-presign-token
@@ -50,7 +50,7 @@ See the [API documentation](https://openapi.documenso.com/reference#tag/embeddin

 ## Next Steps

- [V1 Editor](/docs/developers/embedding/editor/v1) — Create and edit documents and templates using V1 components
- [V2 Editor](/docs/developers/embedding/editor/v2) — Create and edit envelopes using V2 components
+- [V1 Authoring](/docs/developers/embedding/authoring/v1) — Create and edit documents and templates using V1 components
+- [V2 Authoring](/docs/developers/embedding/authoring/v2) — Create and edit envelopes using V2 components
 - [CSS Variables](/docs/developers/embedding/css-variables) — Customize the appearance of embedded components
 - [SDKs](/docs/developers/embedding/sdks) — Framework-specific SDK documentation
@@ -1,4 +1,4 @@
 {
-  "title": "Editor",
+  "title": "Authoring",
  "pages": ["v1", "v2"]
 }
@@ -1,21 +1,21 @@
 ---
-title: V1 Editor
+title: V1 Authoring
 description: Embed V1 document and template creation directly in your application.
 ---

 import { Callout } from 'fumadocs-ui/components/callout';

-V1 editor components allow your users to create and edit documents and templates using the V1 Documents and Templates API without leaving your application.
+V1 authoring components allow your users to create and edit documents and templates using the V1 Documents and Templates API without leaving your application.

 <Callout type="warn">
-  Embedded editor is included with [Enterprise](https://documen.so/enterprise-cta) plans. It is
+  Embedded authoring is included with [Enterprise](https://documen.so/enterprise-cta) plans. It is
  also available as a paid add-on for the [Platform Plan](https://documen.so/platform-cta-pricing).
  Contact sales for access.
 </Callout>

 ## Components

-The SDK provides four V1 editor components:
+The SDK provides four V1 authoring components:

 | Component               | Purpose                 |
 | ----------------------- | ----------------------- |
@@ -29,7 +29,7 @@ The SDK provides four V1 editor components:

 ## Presign Tokens

-All editor components require a **presign token** for authentication. See the [Editor overview](/docs/developers/embedding/editor) for details on obtaining presign tokens.
+All authoring components require a **presign token** for authentication. See the [Authoring overview](/docs/developers/embedding/authoring) for details on obtaining presign tokens.


 <Callout type="warn">
@@ -131,7 +131,7 @@ const TemplateEditor = ({ presignToken, templateId }) => {

 ## Props

-### All Editor Components
+### All Authoring Components

 | Prop               | Type      | Required | Description                                              |
 | ------------------ | --------- | -------- | -------------------------------------------------------- |
@@ -143,7 +143,7 @@ const TemplateEditor = ({ presignToken, templateId }) => {
 | `darkModeDisabled` | `boolean` | No       | Disable dark mode (Platform Plan)                        |
 | `language`         | `string`  | No       | Set the UI language. See [Supported Languages](https://github.com/documenso/documenso/tree/main/packages/lib/constants/locales.ts) |
 | `className`        | `string`  | No       | CSS class for the iframe                                 |
-| `features`         | `object`  | No       | Feature toggles for the editor experience                |
+| `features`         | `object`  | No       | Feature toggles for the authoring experience             |

 ### Update Components Only

@@ -157,7 +157,7 @@ const TemplateEditor = ({ presignToken, templateId }) => {

 ## Feature Toggles

-Customize what options are available in the editor experience:
+Customize what options are available in the authoring experience:

 ```jsx
 <EmbedCreateDocumentV1
@@ -294,7 +294,7 @@ Pass extra props to the iframe for testing experimental features:
 ## See Also

 - [Embedding Overview](/docs/developers/embedding) - Signing embed concepts and props
- [V2 Editor](/docs/developers/embedding/editor/v2) - V2 envelope editor
+- [V2 Authoring](/docs/developers/embedding/authoring/v2) - V2 envelope authoring
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
 - [Documents API](/docs/developers/api/documents) - Create documents via API
 - [Templates API](/docs/developers/api/templates) - Create templates via API
@@ -1,21 +1,21 @@
 ---
-title: V2 Editor
+title: V2 Authoring
 description: Embed envelope creation and editing directly in your application.
 ---

 import { Callout } from 'fumadocs-ui/components/callout';

-V2 editor components allow your users to create and edit envelopes without leaving your application. Envelopes are the unified model for documents and templates in the V2 API.
+V2 authoring components allow your users to create and edit envelopes without leaving your application. Envelopes are the unified model for documents and templates in the V2 API.

 <Callout type="warn">
-  Embedded editor is included with [Enterprise](https://documen.so/enterprise-cta) plans. It is
+  Embedded authoring is included with [Enterprise](https://documen.so/enterprise-cta) plans. It is
  also available as a paid add-on for the [Platform Plan](https://documen.so/platform-cta-pricing).
  Contact sales for access.
 </Callout>

 ## Components

-The SDK provides two V2 editor components:
+The SDK provides two V2 authoring components:

 | Component              | Purpose                  |
 | ---------------------- | ------------------------ |
@@ -26,7 +26,7 @@ The SDK provides two V2 editor components:

 ## Presign Tokens

-All editor components require a **presign token** for authentication. See the [Editor overview](/docs/developers/embedding/editor) for details on obtaining presign tokens.
+All authoring components require a **presign token** for authentication. See the [Authoring overview](/docs/developers/embedding/authoring) for details on obtaining presign tokens.

 <Callout type="warn">
  A presigned token is NOT an API token
@@ -100,7 +100,7 @@ const EnvelopeEditor = ({ presignToken, envelopeId }) => {

 ## Props

-### All V2 Editor Components
+### All V2 Authoring Components

 | Prop             | Type      | Required | Description                                              |
 | ---------------- | --------- | -------- | -------------------------------------------------------- |
@@ -113,7 +113,7 @@ const EnvelopeEditor = ({ presignToken, envelopeId }) => {
 | `language`       | `string`  | No       | Set the UI language. See [Supported Languages](https://github.com/documenso/documenso/tree/main/packages/lib/constants/locales.ts) |
 | `className`      | `string`  | No       | CSS class for the iframe                                 |
 | `user`           | `object`  | No       | Current user info. When provided, enables the "Add Myself" button in the recipients list. Object with optional `email` and `name` fields |
-| `features`       | `object`  | No       | Feature toggles for the editor experience                |
+| `features`       | `object`  | No       | Feature toggles for the authoring experience             |

 ### Create Component Only

@@ -132,7 +132,7 @@ const EnvelopeEditor = ({ presignToken, envelopeId }) => {

 ## Feature Toggles

-V2 editor provides rich, structured feature toggles organized into sections. Pass a partial configuration to customize the editor experience — any omitted fields will use their defaults.
+V2 authoring provides rich, structured feature toggles organized into sections. Pass a partial configuration to customize the authoring experience — any omitted fields will use their defaults.

 ```jsx
 <EmbedCreateEnvelope
@@ -160,7 +160,7 @@ V2 editor provides rich, structured feature toggles organized into sections. Pas

 ### General

-Controls the overall editor flow and UI:
+Controls the overall authoring flow and UI:

 | Property                        | Type      | Default | Description                                      |
 | ------------------------------- | --------- | ------- | ------------------------------------------------ |
@@ -188,7 +188,7 @@ Controls envelope configuration options. Set to `null` to hide envelope settings

 ### Actions

-Controls available actions during editing:
+Controls available actions during authoring:

 | Property           | Type      | Default | Description              |
 | ------------------ | --------- | ------- | ------------------------ |
@@ -221,7 +221,7 @@ Controls recipient configuration options. Set to `null` to prevent any recipient

 ### Disabling Steps

-You can also disable entire steps of the editor flow. This allows you to skip steps that are not relevant to your use case:
+You can also disable entire steps of the authoring flow. This allows you to skip steps that are not relevant to your use case:

 ```jsx
 <EmbedCreateEnvelope
@@ -338,7 +338,7 @@ const EnvelopeManager = ({ presignToken }) => {

 ## See Also

- [Editor Overview](/docs/developers/embedding/editor) - V1 vs V2 comparison and presign tokens
- [V1 Editor](/docs/developers/embedding/editor/v1) - V1 document and template editor
+- [Authoring Overview](/docs/developers/embedding/authoring) - V1 vs V2 comparison and presign tokens
+- [V1 Authoring](/docs/developers/embedding/authoring/v1) - V1 document and template authoring
 - [Embedding Overview](/docs/developers/embedding) - Signing embed concepts and props
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
@@ -6,14 +6,14 @@ description: Embed document signing experiences directly in your application usi
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';

-## Embedded Signing vs Embedded Editor
+## Embedded Signing vs Embedded Authoring

 Documenso offers two types of embedding:

 - **Embedded Signing** lets you embed the signing experience in your application. Your users sign documents without leaving your site. Available on Teams Plan and above.
- **Embedded Editor** lets you embed document and template _creation and editing_ in your application. This is an [Enterprise](/docs/policies/enterprise-edition) feature (also available as a Platform Plan add-on). See the [Editor](/docs/developers/embedding/editor) guide.
+- **Embedded Authoring** lets you embed document and template _creation and editing_ in your application. This is an [Enterprise](/docs/policies/enterprise-edition) feature (also available as a Platform Plan add-on). See the [Authoring](/docs/developers/embedding/authoring) guide.

-This page covers **embedded signing**. If you need your users to create or edit documents inside your app, see [Editor](/docs/developers/embedding/editor).
+This page covers **embedded signing**. If you need your users to create or edit documents inside your app, see [Authoring](/docs/developers/embedding/authoring).

 ---

@@ -229,9 +229,9 @@ Receives an object with:
    href="/docs/developers/embedding/css-variables"
  />
  <Card
-    title="Editor"
+    title="Authoring"
    description="Embed document and template creation."
-    href="/docs/developers/embedding/editor"
+    href="/docs/developers/embedding/authoring"
  />
 </Cards>

@@ -1,4 +1,4 @@
 {
  "title": "Embedding",
-  "pages": ["sdks", "direct-links", "css-variables", "editor"]
+  "pages": ["sdks", "direct-links", "css-variables", "authoring"]
 }
@@ -89,4 +89,4 @@ export class SigningComponent {

 - [Embedding Overview](/docs/developers/embedding) - Props reference and concepts
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
- [Editor](/docs/developers/embedding/editor) - Embed document creation
+- [Authoring](/docs/developers/embedding/authoring) - Embed document creation
@@ -93,4 +93,4 @@ See [CSS Variables](/docs/developers/embedding/css-variables) for all available

 - [Embedding Overview](/docs/developers/embedding) - Props reference and concepts
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
- [Editor](/docs/developers/embedding/editor) - Embed document creation
+- [Authoring](/docs/developers/embedding/authoring) - Embed document creation
@@ -133,4 +133,4 @@ const DocumentSigning = ({ token }: { token: string }) => {

 - [Embedding Overview](/docs/developers/embedding) - Props reference and concepts
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
- [Editor](/docs/developers/embedding/editor) - Embed document creation
+- [Authoring](/docs/developers/embedding/authoring) - Embed document creation
@@ -93,4 +93,4 @@ See [CSS Variables](/docs/developers/embedding/css-variables) for all available

 - [Embedding Overview](/docs/developers/embedding) - Props reference and concepts
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
- [Editor](/docs/developers/embedding/editor) - Embed document creation
+- [Authoring](/docs/developers/embedding/authoring) - Embed document creation
@@ -101,4 +101,4 @@ See [CSS Variables](/docs/developers/embedding/css-variables) for all available

 - [Embedding Overview](/docs/developers/embedding) - Props reference and concepts
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
- [Editor](/docs/developers/embedding/editor) - Embed document creation
+- [Authoring](/docs/developers/embedding/authoring) - Embed document creation
@@ -104,4 +104,4 @@ See [CSS Variables](/docs/developers/embedding/css-variables) for all available

 - [Embedding Overview](/docs/developers/embedding) - Props reference and concepts
 - [CSS Variables](/docs/developers/embedding/css-variables) - Customize appearance
- [Editor](/docs/developers/embedding/editor) - Embed document creation
+- [Authoring](/docs/developers/embedding/authoring) - Embed document creation
@@ -53,8 +53,8 @@ The Enterprise Edition is required when you:
    - Document Action Reauthentication (Passkeys and 2FA)
    - 21 CFR Part 11 Compliance
    - Email Domains (custom sender addresses)
-    - Embed Editor
-    - Embed Editor White Label
+    - Embed Authoring
+    - Embed Authoring White Label
    - Custom signing certificates
    - Priority feature requests

@@ -19,19 +19,16 @@ Use the limitless plans as much as you like. They are meant to offer a lot. Plea

 ### Do

- Use team or platform plans to run your workflows, even with significant volume, as long as it aligns with the plan’s intended purpose.
- Experiment and automate freely within the plan features.
- If volume grows beyond what’s sustainable on your plan, we’ll reach out to discuss an upgrade.
- Assume that extreme usage will lead to us contacting you. You can scale up—or scale back. It’s about finding the right fit.
+- Sign as many documents as you need with the individual plan for your single business or organisation
+- Use the API and automation tools to automate your signing workflows
+- Experiment with plans and integrations while testing what you want to build

 ### Don't
- Use an individual account's API to power a platform or product.
- Run a large company signing thousands of documents per day on a small team plan.
- Expect enterprise-level support on a fair support plan (i.e. business edition).
- Use a team plan to power an external platform or commercial product or platform beyond moderate testing.
- Expect a platform plan to support enterprise-level volumes indefinitely without a conversation.
- Don’t expect the platform plan to cover enterprise-scale volume or support. If you reach that point, we’ll reach out to guide you to the right fit.
- Don’t overthink this – if you’re building something valuable, we want to see you succeed. If we need to talk, we will.
+
+- Use an individual account API to power a platform or product
+- Run a large company signing thousands of documents per day on a small team plan
+- Expect enterprise-level support on a fair support plan
+- Overthink this policy — if you are a paying customer, we want you to win

 ## Rate Limits

@@ -1,5 +1,5 @@
 ---
-title: AI Recipient & Field Detection
+title: AI Recipient & Field Detection (Self-hosting)
 description: Configure Google Vertex AI so Documenso can detect recipients and fields automatically.
 ---

@@ -1,408 +0,0 @@
---
-title: Document Conversion
-description: Enable DOCX uploads on a self-hosted Documenso instance by running a Gotenberg sidecar that converts Word documents to PDF.
---
-
-import { Accordion, Accordions } from 'fumadocs-ui/components/accordion';
-import { Callout } from 'fumadocs-ui/components/callout';
-import { Step, Steps } from 'fumadocs-ui/components/steps';
-import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
-
-## Overview
-
-Documenso can accept `.docx` uploads in addition to PDFs. When a user uploads a Word document, the Documenso server sends it to a [Gotenberg](https://gotenberg.dev) service which uses LibreOffice to convert it to PDF. The converted PDF is what gets stored, signed, and downloaded. The original DOCX is discarded.
-
-This feature is **opt-in for self-hosted instances**. When the conversion service is not configured, DOCX uploads are rejected in the UI and only PDFs are accepted.
-
-| Property                | Value                                                                |
-| ----------------------- | -------------------------------------------------------------------- |
-| Conversion engine       | [Gotenberg](https://gotenberg.dev) + LibreOffice                     |
-| Input format            | `.docx` (Office Open XML Word documents)                             |
-| Output format           | PDF                                                                  |
-| Network requirement     | Documenso must reach the Gotenberg HTTP API                          |
-| Default request timeout | 30 seconds per file                                                  |
-| Failure handling        | An internal circuit breaker opens for 30 seconds after a failure |
-
-<Callout type="info">
-  Only `.docx` is accepted. Legacy `.doc`, `.odt`, `.rtf`, and other LibreOffice-supported formats
-  are rejected at the upload step even when Gotenberg is configured.
-</Callout>
-
---
-
-## Requirements
-
- A running Gotenberg 8 instance with the LibreOffice module (`gotenberg/gotenberg:8-libreoffice` or newer).
- Network reachability from the Documenso container to the Gotenberg HTTP API.
- A version of Documenso that includes the document conversion feature.
-
-## Build the Gotenberg Image
-
-The upstream `gotenberg/gotenberg:8-libreoffice` image works out of the box, but it ships only **metric-compatible font substitutes** (Carlito for Calibri, Liberation for Arial/Times/Courier). Layout widths are preserved but documents will look noticeably different from Word.
-
-For better fidelity, especially for non-Latin scripts, build a derived image that adds Microsoft Core Fonts and additional language fonts. The Documenso repository ships a reference Dockerfile at [`docker/development/Dockerfile.gotenberg`](https://github.com/documenso/documenso/blob/main/docker/development/Dockerfile.gotenberg) that you can use as a starting point:
-
-```dockerfile
-FROM gotenberg/gotenberg:8-libreoffice
-
-USER root
-
-RUN echo "deb http://deb.debian.org/debian trixie contrib non-free" \
-      > /etc/apt/sources.list.d/contrib.list \
-    && echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" \
-      | debconf-set-selections \
-    && apt-get update -qq \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends \
-        ca-certificates \
-        ttf-mscorefonts-installer \
-        fonts-symbola \
-        fonts-noto-extra \
-        fonts-hosny-amiri \
-        fonts-thai-tlwg \
-        fonts-sil-padauk \
-        fonts-sarai \
-        fonts-samyak-taml \
-        culmus \
-        libfribidi0 \
-        libharfbuzz0b \
-    && fc-cache -f \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-USER gotenberg
-```
-
-<Callout type="warn">
-  `ttf-mscorefonts-installer` accepts the Microsoft Core Fonts EULA on your behalf via debconf. By
-  installing this image you are agreeing to those licence terms. Review them before publishing the
-  image.
-</Callout>
-
-Build and publish the image to a registry you control:
-
-```bash
-docker build -t registry.example.com/documenso/gotenberg:8 \
-  -f Dockerfile.gotenberg .
-docker push registry.example.com/documenso/gotenberg:8
-```
-
-If you do not need extra fonts, skip the build step entirely and reference `gotenberg/gotenberg:8-libreoffice` directly in the next section.
-
-## Deploy the Service
-
-The Gotenberg service should run **alongside** your Documenso container, not exposed to the public internet. The conversion service has no built-in authorisation beyond HTTP Basic auth, so it should sit on a private network or behind your existing reverse proxy.
-
-<Tabs items={['Docker Compose', 'Kubernetes', 'External Instance']}>
-<Tab value="Docker Compose">
-
-Add a `gotenberg` service to the `compose.yml` you use for Documenso:
-
-```yaml
-services:
-  gotenberg:
-    image: registry.example.com/documenso/gotenberg:8
-    # Or use upstream directly:
-    # image: gotenberg/gotenberg:8-libreoffice
-    restart: unless-stopped
-    environment:
-      GOTENBERG_API_BASIC_AUTH_USERNAME: ${GOTENBERG_USERNAME}
-      GOTENBERG_API_BASIC_AUTH_PASSWORD: ${GOTENBERG_PASSWORD}
-    command:
-      - gotenberg
-      - --api-enable-basic-auth
-      - --libreoffice-deny-private-ips
-      - --api-timeout=500s
-      - --libreoffice-auto-start
-      - --libreoffice-start-timeout=300s
-      - --pdfengines-disable-routes
-      - --webhook-disable
-    healthcheck:
-      test: ['CMD', 'curl', '-fsS', 'http://localhost:3000/health']
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 20s
-
-  documenso:
-    # existing config
-    environment:
-      NEXT_PRIVATE_DOCUMENT_CONVERSION_URL: http://gotenberg:3000
-      NEXT_PRIVATE_DOCUMENT_CONVERSION_USERNAME: ${GOTENBERG_USERNAME}
-      NEXT_PRIVATE_DOCUMENT_CONVERSION_PASSWORD: ${GOTENBERG_PASSWORD}
-    depends_on:
-      gotenberg:
-        condition: service_healthy
-```
-
-Do **not** publish Gotenberg's port (`3000`) to the host. Documenso reaches it over the internal Docker network using the service name (`http://gotenberg:3000`).
-
-</Tab>
-<Tab value="Kubernetes">
-
-Create a Deployment, Service, and Secret. Example manifests:
-
-```yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: gotenberg-auth
-  namespace: documenso
-stringData:
-  username: documenso
-  password: replace-me-with-a-strong-password
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: gotenberg
-  namespace: documenso
-spec:
-  replicas: 1
-  selector:
-    matchLabels: { app: gotenberg }
-  template:
-    metadata:
-      labels: { app: gotenberg }
-    spec:
-      containers:
-        - name: gotenberg
-          image: registry.example.com/documenso/gotenberg:8
-          args:
-            - gotenberg
-            - --api-enable-basic-auth
-            - --libreoffice-deny-private-ips
-            - --api-timeout=500s
-            - --libreoffice-auto-start
-            - --libreoffice-start-timeout=300s
-            - --pdfengines-disable-routes
-            - --webhook-disable
-          env:
-            - name: GOTENBERG_API_BASIC_AUTH_USERNAME
-              valueFrom: { secretKeyRef: { name: gotenberg-auth, key: username } }
-            - name: GOTENBERG_API_BASIC_AUTH_PASSWORD
-              valueFrom: { secretKeyRef: { name: gotenberg-auth, key: password } }
-          ports:
-            - containerPort: 3000
-          readinessProbe:
-            httpGet: { path: /health, port: 3000 }
-          livenessProbe:
-            httpGet: { path: /health, port: 3000 }
-            initialDelaySeconds: 30
---
-apiVersion: v1
-kind: Service
-metadata:
-  name: gotenberg
-  namespace: documenso
-spec:
-  selector: { app: gotenberg }
-  ports:
-    - port: 3000
-      targetPort: 3000
-```
-
-Then reference the in-cluster URL from Documenso's environment:
-
-```
-NEXT_PRIVATE_DOCUMENT_CONVERSION_URL=http://gotenberg.documenso.svc.cluster.local:3000
-NEXT_PRIVATE_DOCUMENT_CONVERSION_USERNAME=documenso
-NEXT_PRIVATE_DOCUMENT_CONVERSION_PASSWORD=replace-me-with-a-strong-password
-```
-
-</Tab>
-<Tab value="External Instance">
-
-Documenso does not have to colocate with Gotenberg. You can point it at any reachable Gotenberg deployment: a managed instance, a shared internal service, or a Gotenberg-compatible API.
-
-```bash
-NEXT_PRIVATE_DOCUMENT_CONVERSION_URL=https://gotenberg.internal.example.com
-NEXT_PRIVATE_DOCUMENT_CONVERSION_USERNAME=documenso
-NEXT_PRIVATE_DOCUMENT_CONVERSION_PASSWORD=replace-me-with-a-strong-password
-```
-
-The remote instance must:
-
- Expose the LibreOffice route `/forms/libreoffice/convert`.
- Be reachable from the Documenso container with low enough latency that the 30 second per-request timeout is comfortable.
- Be on a private network or require authentication. Uploaded documents are sent to it as multipart form data and may contain sensitive content.
-
-</Tab>
-</Tabs>
-
-## Recommended Gotenberg Flags
-
-The flags in the examples above are not arbitrary. Each one matters for a production deployment.
-
-| Flag                              | Why it matters                                                                                                                                                                                                                                                       |
-| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `--api-enable-basic-auth`         | Requires HTTP Basic credentials on every API route. Without this, anyone with network access to the container can convert arbitrary documents.                                                                                                                       |
-| `--libreoffice-deny-private-ips`  | Rejects any outbound fetch LibreOffice tries to make to private, loopback, link-local, or cloud-metadata addresses while processing a document. Mitigates SSRF via malicious `.docx` files that embed `TargetMode="External"` references. Requires Gotenberg 8.32.0. |
-| `--api-timeout=500s`              | Server-side request ceiling. Documenso aborts at 30 s by default, so this is a safety net for very large documents.                                                                                                                                                  |
-| `--libreoffice-auto-start`        | Starts LibreOffice at container boot so the first request is not slow.                                                                                                                                                                                               |
-| `--libreoffice-start-timeout=300s`| Allows LibreOffice up to 5 minutes to come up under load.                                                                                                                                                                                                            |
-| `--pdfengines-disable-routes`     | Disables the PDF engines routes Documenso does not use. Shrinks the attack surface.                                                                                                                                                                                  |
-| `--webhook-disable`               | Disables webhook callbacks. Documenso uses synchronous requests only.                                                                                                                                                                                                |
-
-## Configure Documenso
-
-Set the following environment variables on the Documenso container and restart it.
-
-### Required
-
-| Variable                              | Description                                                            |
-| ------------------------------------- | ---------------------------------------------------------------------- |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_URL`| Base URL of the Gotenberg service (e.g., `http://gotenberg:3000`). Leave unset to disable the feature. |
-
-### Optional
-
-| Variable                                    | Default | Description                                                                                  |
-| ------------------------------------------- | ------- | -------------------------------------------------------------------------------------------- |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_USERNAME` |         | HTTP Basic auth username. Set when Gotenberg runs with `--api-enable-basic-auth`.            |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_PASSWORD` |         | HTTP Basic auth password. Set together with the username.                                    |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_TIMEOUT_MS`| `30000` | Per-request timeout in milliseconds. Increase for very large documents.                      |
-
-<Callout type="info">
-  When `NEXT_PRIVATE_DOCUMENT_CONVERSION_URL` is set, the public flag
-  `NEXT_PUBLIC_DOCUMENT_CONVERSION_ENABLED` is derived automatically on server start. You do not
-  need to set it yourself, and setting it manually has no effect.
-</Callout>
-
-### Example `.env` Snippet
-
-```bash
-# Document conversion (DOCX -> PDF)
-NEXT_PRIVATE_DOCUMENT_CONVERSION_URL=http://gotenberg:3000
-NEXT_PRIVATE_DOCUMENT_CONVERSION_USERNAME=documenso
-NEXT_PRIVATE_DOCUMENT_CONVERSION_PASSWORD=replace-me-with-a-strong-password
-# NEXT_PRIVATE_DOCUMENT_CONVERSION_TIMEOUT_MS=60000
-```
-
-## Verify the Setup
-
-{/* prettier-ignore */}
-<Steps>
-<Step>
-### Restart the Documenso container
-
-Restart so the new environment variables are picked up.
-
-</Step>
-<Step>
-### Confirm Gotenberg is healthy
-
-From a shell inside the Documenso container or another container on the same network:
-
-```bash
-curl -fsS http://gotenberg:3000/health
-```
-
-The endpoint is exempt from basic auth and should return `200 OK`.
-
-</Step>
-<Step>
-### Upload a test DOCX
-
-In the Documenso web UI, open **Documents** and try uploading a small `.docx` file. The upload dropzone should accept it, and after a few seconds the editor should open with the converted PDF.
-
-</Step>
-<Step>
-### Check the server logs
-
-Successful conversions log a `document_conversion_attempt` event with `result: "success"`, the duration, and the file size. Failures log the same event with `result: "error"` and an error code (`CONVERSION_SERVICE_UNAVAILABLE`, `CONVERSION_FAILED`, or `UNSUPPORTED_FILE_TYPE`).
-
-</Step>
-</Steps>
-
-## Security Considerations
-
- **Treat the conversion service as untrusted internal infrastructure.** Documents pass through Gotenberg in plain form. Run it on a private network and require HTTP Basic auth.
- **Run with `--libreoffice-deny-private-ips`.** Without this flag, a malicious `.docx` can trigger LibreOffice to fetch URLs from your internal network (SSRF).
- **Disable unused routes.** `--pdfengines-disable-routes` and `--webhook-disable` reduce attack surface. Documenso only uses the LibreOffice convert route.
- **Do not expose Gotenberg to the public internet.** Even with basic auth, this is a document-processing service with a non-trivial CPU and memory footprint; exposing it invites abuse.
- **Rotate credentials.** Rotating the basic auth secret is a config change in both Gotenberg and Documenso, followed by a restart of each.
-
-## Resource Sizing
-
-Conversion is CPU- and memory-bound on LibreOffice. As a starting point:
-
-| Workload                      | Suggested resources                  |
-| ----------------------------- | ------------------------------------ |
-| Light (a few DOCX per minute) | 1 vCPU, 1 GB RAM                     |
-| Moderate (sustained uploads)  | 2 vCPU, 2 GB RAM                     |
-| Heavy / multi-tenant          | Horizontally scale Gotenberg replicas behind a load balancer |
-
-Gotenberg is stateless. Each container handles one or more concurrent requests independently. Scale horizontally rather than vertically once a single replica is saturated.
-
-## Troubleshooting
-
-<Accordions type="multiple">
-  <Accordion title="DOCX uploads are rejected with 'Only PDF and DOCX files are allowed'">
-    The Documenso server does not see `NEXT_PRIVATE_DOCUMENT_CONVERSION_URL`. Check the value is set
-    on the running container (`docker exec documenso printenv | grep DOCUMENT_CONVERSION`) and
-    restart after changing it.
-  </Accordion>
-
-  <Accordion title="Uploads fail with 'Document conversion service is currently unavailable'">
-    Documenso could not reach Gotenberg. Verify:
-
-    - The URL in `NEXT_PRIVATE_DOCUMENT_CONVERSION_URL` is resolvable from the Documenso container
-      (use the Docker service name or in-cluster DNS, not `localhost`).
-    - Gotenberg's `/health` endpoint returns `200`.
-    - Basic auth credentials match between the two services.
-
-    After repeated failures, an internal circuit breaker opens for 30 seconds. Subsequent uploads
-    will fail fast during that window; this is intentional and self-recovers.
-
-  </Accordion>
-
-  <Accordion title="Uploads fail with 'Failed to convert document to PDF'">
-    Gotenberg was reachable but returned a non-2xx response. Check the Gotenberg container logs:
-
-    ```bash
-    docker compose logs -f gotenberg
-    ```
-
-    Common causes: corrupted `.docx` file, exotic embedded objects LibreOffice cannot render, or a
-    file that genuinely exceeded the conversion timeout. Increase
-    `NEXT_PRIVATE_DOCUMENT_CONVERSION_TIMEOUT_MS` for very large documents.
-
-  </Accordion>
-
-  <Accordion title="Converted PDFs look different from the Word document">
-    LibreOffice is not byte-identical to Microsoft Word. Layout, font metrics, and complex elements
-    (Charts, SmartArt, ActiveX controls) may differ. To improve fidelity:
-
-    - Use the custom Dockerfile in this guide to install Microsoft Core Fonts and additional
-      language fonts.
-    - Make sure any custom fonts referenced by your documents are installed in the Gotenberg image.
-    - For pixel-perfect output, ask users to export to PDF from Word before uploading.
-
-  </Accordion>
-
-  <Accordion title="Form controls in the DOCX appear blank or missing">
-    Documenso disables Gotenberg's `exportFormFields` flag during conversion. Word content controls
-    (`<w:sdt>`) become static graphics in the output PDF, which prevents Documenso's later
-    flattening step from making them invisible. This is intentional. Use Documenso fields
-    (signature, text, date, etc.) for anything that needs to be filled in by signers.
-  </Accordion>
-
-  <Accordion title="Conversion is slow on the first request">
-    LibreOffice starts lazily by default. Pass `--libreoffice-auto-start` to Gotenberg so it warms
-    up at container boot. Allow up to a minute on first start before considering the service
-    unhealthy.
-  </Accordion>
-
-  <Accordion title="The circuit breaker keeps opening">
-    Repeated failures open an in-process circuit breaker for 30 seconds. If you see this in
-    production, the underlying problem is the Gotenberg service. Check its logs, resource usage,
-    and connectivity. The breaker is per-process and resets on restart.
-  </Accordion>
-</Accordions>
-
---
-
-## See Also
-
- [Upload Documents (User Guide)](/docs/users/documents/upload) - End-user view of DOCX uploads
- [Environment Variables](/docs/self-hosting/configuration/environment) - Full configuration reference
- [Docker Compose Deployment](/docs/self-hosting/deployment/docker-compose) - Compose-based deployment patterns
- [Gotenberg Documentation](https://gotenberg.dev/docs/getting-started/introduction) - Upstream Gotenberg docs
@@ -1,6 +1,6 @@
 ---
 title: Advanced
-description: Optional configuration for OAuth providers, AI features, document conversion, and other advanced settings.
+description: Optional configuration for OAuth providers, AI features, and other advanced settings.
 ---

 <Cards>
@@ -14,9 +14,4 @@ description: Optional configuration for OAuth providers, AI features, document c
    description="Enable AI-powered recipient and field detection."
    href="/docs/self-hosting/configuration/advanced/ai-features"
  />
-  <Card
-    title="Document Conversion"
-    description="Accept DOCX uploads by running a Gotenberg sidecar that converts Word documents to PDF."
-    href="/docs/self-hosting/configuration/advanced/document-conversion"
-  />
 </Cards>
@@ -1,4 +1,4 @@
 {
  "title": "Advanced",
-  "pages": ["oauth-providers", "document-conversion", "ai-features"]
+  "pages": ["oauth-providers", "ai-features"]
 }
@@ -224,41 +224,28 @@ For detailed certificate setup, see [Signing Certificate](/docs/self-hosting/con

 ## Feature Flags

-| Variable                                     | Description                                                                         | Default |
-| -------------------------------------------- | ----------------------------------------------------------------------------------- | ------- |
-| `NEXT_PUBLIC_DISABLE_SIGNUP`                 | Master switch. Disable all signup methods application-wide                          | `false` |
-| `NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP`  | Disable email/password signup only. SSO signup is unaffected                        | `false` |
-| `NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP`          | Block new accounts via Google. Existing Google-linked users can still sign in       | `false` |
-| `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`       | Block new accounts via Microsoft. Existing linked users can still sign in           | `false` |
-| `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`            | Block new accounts via OIDC, including the organisation portal                      | `false` |
-| `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS`        | Comma-separated list of email domains allowed to sign up (e.g., `example.com,acme.org`) |         |
+| Variable                              | Description                                                                         | Default |
+| ------------------------------------- | ----------------------------------------------------------------------------------- | ------- |
+| `NEXT_PUBLIC_DISABLE_SIGNUP`          | Disable public user registration entirely                                           | `false` |
+| `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS` | Comma-separated list of email domains allowed to sign up (e.g., `example.com,acme.org`) |         |
 | `NEXT_PUBLIC_POSTHOG_KEY`             | PostHog API key for analytics and feature flags                                     |         |
 | `NEXT_PUBLIC_FEATURE_BILLING_ENABLED` | Enable billing features                                                             | `false` |

 ### Signup Restrictions

-You can control who is allowed to create accounts on your instance with the following environment variables:
+You can control who is allowed to create accounts on your instance using two environment variables:

- **`NEXT_PUBLIC_DISABLE_SIGNUP`** (master switch): Set to `true` to block all new signups across every method (email/password, Google, Microsoft, OIDC). When set, this also blocks new-account creation through the organisation OIDC authentication portal.
- **`NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP`**: Set to `true` to disable email/password signup only. SSO signup is still allowed.
- **`NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP`**, **`NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`**, **`NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`**: Set to `true` to block brand-new account creation through the matching SSO provider. Existing users with the provider already linked can still sign in, and existing users can still link the provider to their account. `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP` also blocks new-account creation through the organisation authentication portal.
+- **`NEXT_PUBLIC_DISABLE_SIGNUP`**: Set to `true` to block all new signups. Existing users can still sign in. This applies to both email/password and OAuth signups.
 - **`NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS`**: Restrict signups to specific email domains. When set, only users whose email address matches one of the listed domains can create an account. Leave empty to allow all domains.

-Sign-in for existing users is never affected, only the creation of brand-new accounts.
+Both restrictions apply to email/password registration and OAuth (Google, Microsoft, OIDC). If a user attempts to sign up via OAuth with a disallowed domain, they are redirected to the sign-in page with an error.

-Both the master switch and the domain allowlist apply to email/password registration and OAuth (Google, Microsoft, OIDC). If a user attempts to sign up via OAuth with a disallowed domain, they are redirected to the sign-in page with an error.
-
-When both the master switch and the domain allowlist are set, the master switch takes precedence. Signups are blocked regardless of the domain list.
+When both variables are set, `NEXT_PUBLIC_DISABLE_SIGNUP` takes precedence. Signups are blocked regardless of the domain list.

 ```bash
 # Allow signups only from specific domains
 NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS="example.com,acme.org"

-# Allow OIDC signup only; block email/password, Google, Microsoft
-NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP="true"
-NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP="true"
-NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP="true"
-
 # Or disable signups entirely
 NEXT_PUBLIC_DISABLE_SIGNUP="true"
 ```
@@ -279,23 +266,6 @@ AI features must also be enabled in organisation/team settings after configurati

 ---

-## Document Conversion
-
-Documenso can accept `.docx` uploads by sending them to a [Gotenberg](https://gotenberg.dev) service that converts them to PDF. When `NEXT_PRIVATE_DOCUMENT_CONVERSION_URL` is unset, DOCX uploads are rejected and only PDFs are accepted.
-
-| Variable                                      | Description                                                                                       | Default |
-| --------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------- |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_URL`        | Base URL of the Gotenberg service (e.g., `http://gotenberg:3000`). Unset disables the feature.    |         |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_USERNAME`   | HTTP Basic auth username. Required when Gotenberg runs with `--api-enable-basic-auth`.            |         |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_PASSWORD`   | HTTP Basic auth password. Set together with the username.                                         |         |
-| `NEXT_PRIVATE_DOCUMENT_CONVERSION_TIMEOUT_MS` | Per-request timeout in milliseconds. Increase for very large documents.                           | `30000` |
-
-The public flag `NEXT_PUBLIC_DOCUMENT_CONVERSION_ENABLED` is derived automatically from `NEXT_PRIVATE_DOCUMENT_CONVERSION_URL` on server start. Do not set it manually.
-
-For setup, image-build instructions, and security recommendations, see [Document Conversion](/docs/self-hosting/configuration/advanced/document-conversion).
-
---
-
 ## Background Jobs

 Documenso supports multiple background job providers for processing emails, documents, webhooks, and scheduled tasks.
@@ -359,7 +329,7 @@ Telemetry collects only: app version, installation ID, and node ID. No personal

 ## Enterprise Features

-These variables require an active [Enterprise Edition](/docs/policies/enterprise-edition) license. Obtain a license key from [license.documenso.com](https://license.documenso.com) and set it below to unlock enterprise features such as SSO, embed editor, and 21 CFR Part 11 compliance.
+These variables require an active [Enterprise Edition](/docs/policies/enterprise-edition) license. Obtain a license key from [license.documenso.com](https://license.documenso.com) and set it below to unlock enterprise features such as SSO, embed authoring, and 21 CFR Part 11 compliance.

 | Variable                             | Description                                      |
 | ------------------------------------ | ------------------------------------------------ |
@@ -401,10 +371,6 @@ NEXT_PRIVATE_SIGNING_PASSPHRASE="your-certificate-password"

 # Signup restrictions (optional)
 # NEXT_PUBLIC_DISABLE_SIGNUP="true"
-# NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP="true"
-# NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP="true"
-# NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP="true"
-# NEXT_PUBLIC_DISABLE_OIDC_SIGNUP="true"
 # NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS="example.com,acme.org"
 ```

@@ -155,13 +155,7 @@ PORT=3000
 NEXT_PRIVATE_SIGNING_PASSPHRASE=your-certificate-password

 # Signup restrictions (optional)
-# Master switch — disables every signup method
 NEXT_PUBLIC_DISABLE_SIGNUP=false
-# Per-method switches (optional). Each disables brand-new account creation through that method.
-# NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP=true
-# NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP=true
-# NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP=true
-# NEXT_PUBLIC_DISABLE_OIDC_SIGNUP=true
 # NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS=example.com,acme.org
 ```

@@ -258,10 +252,7 @@ Navigate to the signup page and create your account. Verify your email address
 <Callout type="info">
  All accounts created through signup are regular user accounts. Admin access must be granted
  directly in the database. Once your accounts are set up, consider disabling public signups by
-  setting `NEXT_PUBLIC_DISABLE_SIGNUP=true`. For finer control, use the per-method switches
-  `NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP`, `NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP`,
-  `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`, `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`, or restrict
-  signups to specific email domains with
+  setting `NEXT_PUBLIC_DISABLE_SIGNUP=true`, or restrict signups to specific email domains with
  `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS`.
 </Callout>

@@ -100,11 +100,7 @@ See [Email Configuration](/docs/self-hosting/configuration/email) for other tran
 | `NEXT_PRIVATE_SIGNING_PASSPHRASE`           | Passphrase for the signing certificate                         | -                         |
 | `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`  | Base64-encoded `.p12` certificate (alternative to file path)   | -                         |
 | `NEXT_PUBLIC_UPLOAD_TRANSPORT`              | Document storage: `database` or `s3`                           | `database`                |
-| `NEXT_PUBLIC_DISABLE_SIGNUP`                | Master switch — disable all signup methods                     | `false`                   |
-| `NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP` | Disable email/password signup only                             | `false`                   |
-| `NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP`         | Block new accounts via Google OAuth                            | `false`                   |
-| `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`      | Block new accounts via Microsoft OAuth                         | `false`                   |
-| `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`           | Block new accounts via OIDC (incl. organisation portal)        | `false`                   |
+| `NEXT_PUBLIC_DISABLE_SIGNUP`                | Disable public signups                                         | `false`                   |
 | `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS`       | Comma-separated list of allowed signup email domains           |                           |

 For the complete list, see [Environment Variables](/docs/self-hosting/configuration/environment).
@@ -153,11 +153,7 @@ NEXT_PRIVATE_SMTP_FROM_ADDRESS=noreply@yourdomain.com
 | Variable                          | Description                        | Default |
 | --------------------------------- | ---------------------------------- | ------- |
 | `PORT`                            | Application port                   | `3000`  |
-| `NEXT_PUBLIC_DISABLE_SIGNUP`          | Master switch — disable all signup methods             | `false` |
-| `NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNUP` | Disable email/password signup only                     | `false` |
-| `NEXT_PUBLIC_DISABLE_GOOGLE_SIGNUP`   | Block new accounts via Google OAuth                    | `false` |
-| `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`| Block new accounts via Microsoft OAuth                 | `false` |
-| `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`     | Block new accounts via OIDC (incl. organisation portal)| `false` |
+| `NEXT_PUBLIC_DISABLE_SIGNUP`          | Disable public signups                                 | `false` |
 | `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS` | Comma-separated list of allowed signup email domains   |         |
 | `NEXT_PRIVATE_SIGNING_PASSPHRASE`     | Passphrase for signing certificate                     | -       |
 | `DOCUMENSO_DISABLE_TELEMETRY`     | Disable anonymous telemetry        | `false` |
@@ -122,7 +122,7 @@ See the [Quick Start guide](/docs/self-hosting/getting-started/quick-start) for

 ## Enterprise Edition

-Self-hosted Documenso includes full core functionality under the AGPL-3.0 license. If you need enterprise features such as SSO, embed editor white label, or 21 CFR Part 11 compliance, you can activate them with a license key.
+Self-hosted Documenso includes full core functionality under the AGPL-3.0 license. If you need enterprise features such as SSO, embed authoring white label, or 21 CFR Part 11 compliance, you can activate them with a license key.

 See [Enterprise Edition](/docs/policies/enterprise-edition) for details and [Licenses](/docs/policies/licenses) for a comparison.

@@ -11,41 +11,16 @@ import { Step, Steps } from 'fumadocs-ui/components/steps';

 | Limitation              | Value                               |
 | ----------------------- | ----------------------------------- |
-| Supported formats       | PDF, DOCX                           |
+| Supported format        | PDF only                            |
 | Maximum file size       | 50MB (configurable for self-hosted) |
 | Encrypted PDFs          | Not supported                       |
 | Password-protected PDFs | Not supported                       |
-| Legacy `.doc` files     | Not supported (convert to DOCX)     |

 <Callout type="warn">
  Documenso does not support password-protected or encrypted PDF files. Remove encryption before
  uploading.
 </Callout>

-## Supported Formats
-
-Documenso accepts two file formats:
-
- **PDF** (`.pdf`): used as-is. **Recommended.**
- **Word** (`.docx`): converted to PDF on the server during upload. The converted PDF is what recipients sign.
-
-Other formats (`.doc`, `.odt`, `.rtf`, images) are not supported. Convert them to PDF or DOCX before uploading.
-
-<Callout type="warn">
-  **Upload a PDF whenever you can.** DOCX files are converted to PDF using LibreOffice, which is not
-  byte-identical to Microsoft Word. Spacing, line breaks, fonts, and complex elements (tables,
-  charts, headers, footers) can shift in the converted PDF. For the final document to look exactly
-  the way you designed it, export to PDF from Word, Google Docs, or Pages and upload the PDF
-  directly.
-</Callout>
-
-<Callout type="info">
-  DOCX support requires the document conversion service. It is enabled on
-  [documenso.com](https://app.documenso.com). Self-hosted instances must
-  [configure it](/docs/self-hosting/configuration/advanced/document-conversion) before DOCX uploads
-  are accepted.
-</Callout>
-
 ## Upload Methods

 ![Documents dashboard](/document-signing/documenso-documents-dashboard.webp)
@@ -63,15 +38,15 @@ You can upload documents in two ways:

  </Step>
  <Step>
-    ### Drag and drop your file
+    ### Drag and drop your PDF

-    Drag a PDF or DOCX file from your computer and drop it anywhere on the page.
+    Drag a PDF file from your computer and drop it anywhere on the page.

  </Step>
  <Step>
    ### Wait for the upload to complete

-    The document will process and the editor will open when ready. DOCX files take a few extra seconds while they are converted to PDF.
+    The document will process and the editor will open when ready.

  </Step>
 </Steps>
@@ -95,7 +70,7 @@ You can upload documents in two ways:
  <Step>
    ### Select your file

-    Choose a PDF or DOCX file from your computer.
+    Choose a PDF file from your computer.

  </Step>
  <Step>
@@ -106,32 +81,16 @@ You can upload documents in two ways:
  </Step>
 </Steps>

-## DOCX Conversion
-
-We always recommend uploading a PDF rather than a DOCX. If you have the original document open in Word, Google Docs, or Pages, export to PDF from there and upload the PDF. The result is guaranteed to match what you see on screen.
-
-If you do upload a `.docx` file, Documenso converts it to PDF before adding it to the envelope. The original `.docx` is discarded. Only the converted PDF is stored, signed, and downloaded.
-
-Things to keep in mind when uploading DOCX:
-
- **The converted PDF will not be pixel-identical to your Word document.** Conversion uses LibreOffice, which renders most documents faithfully but differs from Microsoft Word in subtle ways. Spacing, font metrics, line breaks, and complex layout features can shift.
- **Always review the converted PDF before adding fields or sending.** Open the document in the editor and scroll through every page to confirm it looks the way you expect.
- **Form controls are flattened.** Word content controls (drop-downs, date pickers, checkboxes) become static text or graphics. Use Documenso fields for anything that needs to be filled in.
- **Fonts not installed on the server fall back to substitutes.** On documenso.com, common fonts (Calibri, Arial, Times New Roman, etc.) are installed. On self-hosted instances, font fidelity depends on the operator's setup.
- **Tracked changes and comments are preserved as they appear in Word.** Accept or reject changes and remove comments before uploading if you do not want them in the final document.
-
-If the converted PDF does not match what you expect, export the document to PDF from Word, Google Docs, or another tool and upload the PDF directly.
-
 ## Uploading Multiple Documents

-You can upload multiple files at once to create a single envelope containing multiple documents. The number of files you can upload per envelope depends on your plan.
+You can upload multiple PDF files at once to create a single envelope containing multiple documents. The number of files you can upload per envelope depends on your plan.

 To upload multiple files:

- Select multiple PDF or DOCX files when using the file picker, or
- Drag and drop multiple files at once
+- Select multiple PDF files when using the file picker, or
+- Drag and drop multiple PDF files at once

-You can mix PDF and DOCX files in the same upload. All files become part of the same envelope and share the same recipients and signing workflow.
+All files in the same upload become part of the same envelope and share the same recipients and signing workflow.

 <Callout type="info">
  If you need separate signing workflows for each document, upload them individually.
@@ -155,37 +114,15 @@ The document remains in `Draft` status until you send it. You can close the edit
  <Accordion title="File is larger than 50MB">
    Reduce the file size before uploading:

-    - Compress images within the document
+    - Compress images within the PDF
    - Remove unnecessary pages
-    - Use a PDF compression tool (for PDFs) or save with images downsampled (for DOCX)
+    - Use a PDF compression tool

  </Accordion>

-<Accordion title="Only PDF and DOCX files are allowed">
-  Documenso accepts PDF and DOCX. For other formats (`.doc`, `.odt`, `.rtf`, etc.), export to PDF
-  from your editor (Word, Google Docs, Pages) and upload the PDF.
-
-If you are self-hosted and DOCX is rejected, the [document conversion
-service](/docs/self-hosting/configuration/advanced/document-conversion) is not configured on your
-instance.
-
-</Accordion>
-
-<Accordion title="DOCX upload fails with a conversion error">
-  The document conversion service was reachable but could not convert the file. Common causes:
-
- The `.docx` file is corrupted. Open it in Word, save a new copy, and try again.
- The file uses very unusual fonts or embedded objects that LibreOffice cannot render.
- The file is unusually large or complex and exceeded the conversion timeout.
-
-If the problem persists, export the document to PDF from Word and upload the PDF directly.
-
-</Accordion>
-
-<Accordion title="DOCX upload fails with 'conversion service unavailable'">
-  The document conversion service is down or temporarily unreachable. Try again in a minute. If you
-  self-host, check the [document conversion
-  service](/docs/self-hosting/configuration/advanced/document-conversion) logs.
+<Accordion title="Only PDF files are allowed">
+  Convert your document to PDF before uploading. Most applications (Word, Google Docs, etc.) can
+  export to PDF format.
 </Accordion>

 <Accordion title="You cannot upload encrypted PDFs">
@@ -134,13 +134,6 @@ Leave empty to allow any domain authenticated by your identity provider.
  team.
 </Callout>

-### Allow Personal Organisations
-
-Controls whether users signing in via SSO for the first time also receive their own personal organisation in addition to joining your organisation.
-
- **Enabled**: New SSO users get a personal organisation where they can create and manage their own documents independently.
- **Disabled**: New SSO users only join your organisation and do not receive a personal organisation.
-
 ## User Provisioning

 When a user signs in through your SSO portal for the first time:
@@ -296,27 +296,12 @@ const config = {
      },
      {
        source: '/developers/embedding/authoring',
-        destination: '/docs/developers/embedding/editor',
-        permanent: true,
-      },
-      {
-        source: '/developers/embedding/authoring/:path*',
-        destination: '/docs/developers/embedding/editor/:path*',
+        destination: '/docs/developers/embedding/authoring',
        permanent: true,
      },
      {
        source: '/developers/embedded-authoring',
-        destination: '/docs/developers/embedding/editor',
-        permanent: true,
-      },
-      {
-        source: '/docs/developers/embedding/authoring',
-        destination: '/docs/developers/embedding/editor',
-        permanent: true,
-      },
-      {
-        source: '/docs/developers/embedding/authoring/:path*',
-        destination: '/docs/developers/embedding/editor/:path*',
+        destination: '/docs/developers/embedding/authoring',
        permanent: true,
      },

@@ -1,188 +0,0 @@
-import { AppError } from '@documenso/lib/errors/app-error';
-import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-export type AdminOrganisationDeleteDialogProps = {
-  organisationId: string;
-  organisationName: string;
-  trigger?: React.ReactNode;
-};
-
-export const AdminOrganisationDeleteDialog = ({
-  organisationId,
-  organisationName,
-  trigger,
-}: AdminOrganisationDeleteDialogProps) => {
-  const [open, setOpen] = useState(false);
-
-  const { t } = useLingui();
-  const { toast } = useToast();
-
-  const deleteMessage = t`delete ${organisationName}`;
-
-  const ZAdminDeleteOrganisationFormSchema = z.object({
-    organisationName: z.literal(deleteMessage, {
-      errorMap: () => ({ message: t`You must enter '${deleteMessage}' to proceed` }),
-    }),
-    sendEmailToOwner: z.boolean(),
-  });
-
-  type TAdminDeleteOrganisationFormSchema = z.infer<typeof ZAdminDeleteOrganisationFormSchema>;
-
-  const form = useForm<TAdminDeleteOrganisationFormSchema>({
-    resolver: zodResolver(ZAdminDeleteOrganisationFormSchema),
-    defaultValues: {
-      organisationName: '',
-      sendEmailToOwner: true,
-    },
-  });
-
-  const { mutateAsync: deleteOrganisation } = trpc.admin.organisation.delete.useMutation();
-
-  const onFormSubmit = async (values: TAdminDeleteOrganisationFormSchema) => {
-    try {
-      await deleteOrganisation({
-        organisationId,
-        organisationName,
-        sendEmailToOwner: values.sendEmailToOwner,
-      });
-
-      toast({
-        title: t`Deletion scheduled`,
-        description: t`The organisation will be deleted in the background. Documents will be orphaned, not deleted.`,
-        duration: 7500,
-      });
-
-      setOpen(false);
-    } catch (err) {
-      const error = AppError.parseError(err);
-      console.error(error);
-
-      toast({
-        title: t`An error occurred`,
-        description: t`We encountered an error while attempting to delete this organisation. Please try again later.`,
-        variant: 'destructive',
-        duration: 10000,
-      });
-    }
-  };
-
-  useEffect(() => {
-    if (!open) {
-      form.reset();
-    }
-  }, [open, form]);
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}>
-      <DialogTrigger asChild>
-        {trigger ?? (
-          <Button variant="destructive">
-            <Trans>Delete</Trans>
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent position="center">
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Delete organisation</Trans>
-          </DialogTitle>
-
-          <DialogDescription>
-            <Trans>
-              You are about to delete <span className="font-semibold">{organisationName}</span>. This action is not
-              reversible. All teams will be removed and all documents will be orphaned to the deleted-account service
-              account.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Alert variant="destructive">
-          <AlertDescription>
-            <Trans>
-              The deletion will run in the background, and can take up to a few minutes to complete. Do not re-run this
-              deletion.
-            </Trans>
-          </AlertDescription>
-        </Alert>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onFormSubmit)}>
-            <fieldset className="flex h-full flex-col space-y-4" disabled={form.formState.isSubmitting}>
-              <FormField
-                control={form.control}
-                name="organisationName"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>
-                      <Trans>
-                        Confirm by typing <span className="text-destructive">{deleteMessage}</span>
-                      </Trans>
-                    </FormLabel>
-                    <FormControl>
-                      <Input className="bg-background" {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name="sendEmailToOwner"
-                render={({ field }) => (
-                  <FormItem className="flex flex-row items-start space-x-3 space-y-0">
-                    <FormControl>
-                      <Checkbox
-                        id="admin-delete-organisation-send-email"
-                        checked={field.value}
-                        onCheckedChange={field.onChange}
-                      />
-                    </FormControl>
-
-                    <label
-                      htmlFor="admin-delete-organisation-send-email"
-                      className="font-normal text-muted-foreground text-sm leading-snug"
-                    >
-                      <Trans>Email the organisation owner to notify them of the deletion.</Trans>
-                    </label>
-                  </FormItem>
-                )}
-              />
-
-              <DialogFooter>
-                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-                  <Trans>Cancel</Trans>
-                </Button>
-
-                <Button type="submit" variant="destructive" loading={form.formState.isSubmitting}>
-                  <Trans>Delete</Trans>
-                </Button>
-              </DialogFooter>
-            </fieldset>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};
@@ -14,10 +14,10 @@ export const DateRangeFilter = ({ currentRange }: DateRangeFilterProps) => {
  const [isPending, startTransition] = useTransition();
  const updateSearchParams = useUpdateSearchParams();

-  const handleRangeChange = (value: DateRange) => {
+  const handleRangeChange = (value: string) => {
    startTransition(() => {
      updateSearchParams({
-        dateRange: value,
+        dateRange: value as DateRange,
        page: 1,
      });
    });
@@ -1,11 +1,7 @@
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { DEFAULT_BRAND_COLORS, DEFAULT_BRAND_RADIUS } from '@documenso/lib/constants/theme';
-import { ZCssVarsSchema } from '@documenso/lib/types/css-vars';
 import { cn } from '@documenso/ui/lib/utils';
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@documenso/ui/primitives/accordion';
 import { Button } from '@documenso/ui/primitives/button';
-import { ColorPicker } from '@documenso/ui/primitives/color-picker';
 import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';
@@ -19,7 +15,6 @@ import { useForm } from 'react-hook-form';
 import { z } from 'zod';

 import { useOptionalCurrentTeam } from '~/providers/team';
-import { useCspNonce } from '~/utils/nonce';

 const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
 const ACCEPTED_FILE_TYPES = ['image/jpeg', 'image/png', 'image/webp'];
@@ -33,20 +28,17 @@ const ZBrandingPreferencesFormSchema = z.object({
    .nullish(),
  brandingUrl: z.string().url().optional().or(z.literal('')),
  brandingCompanyDetails: z.string().max(500).optional(),
-  brandingColors: ZCssVarsSchema.default({}),
-  brandingCss: z.string().max(10_000).default(''),
 });

 export type TBrandingPreferencesFormSchema = z.infer<typeof ZBrandingPreferencesFormSchema>;

 type SettingsSubset = Pick<
  TeamGlobalSettings,
-  'brandingEnabled' | 'brandingLogo' | 'brandingUrl' | 'brandingCompanyDetails' | 'brandingColors' | 'brandingCss'
+  'brandingEnabled' | 'brandingLogo' | 'brandingUrl' | 'brandingCompanyDetails'
 >;

 export type BrandingPreferencesFormProps = {
  canInherit?: boolean;
-  hasAdvancedBranding: boolean;
  settings: SettingsSubset;
  onFormSubmit: (data: TBrandingPreferencesFormSchema) => Promise<void>;
  context: 'Team' | 'Organisation';
@@ -54,13 +46,11 @@ export type BrandingPreferencesFormProps = {

 export function BrandingPreferencesForm({
  canInherit = false,
-  hasAdvancedBranding,
  settings,
  onFormSubmit,
  context,
 }: BrandingPreferencesFormProps) {
  const { t } = useLingui();
-  const nonce = useCspNonce();

  const team = useOptionalCurrentTeam();
  const organisation = useCurrentOrganisation();
@@ -68,17 +58,12 @@ export function BrandingPreferencesForm({
  const [previewUrl, setPreviewUrl] = useState<string>('');
  const [hasLoadedPreview, setHasLoadedPreview] = useState(false);

-  const parsedColors = ZCssVarsSchema.safeParse(settings.brandingColors);
-  const initialColors = parsedColors.success ? parsedColors.data : {};
-
  const form = useForm<TBrandingPreferencesFormSchema>({
-    values: {
+    defaultValues: {
      brandingEnabled: settings.brandingEnabled ?? null,
      brandingUrl: settings.brandingUrl ?? '',
      brandingLogo: undefined,
      brandingCompanyDetails: settings.brandingCompanyDetails ?? '',
-      brandingColors: initialColors,
-      brandingCss: settings.brandingCss ?? '',
    },
    resolver: zodResolver(ZBrandingPreferencesFormSchema),
  });
@@ -319,225 +304,6 @@ export function BrandingPreferencesForm({
            />
          </div>

-          {hasAdvancedBranding && (
-            <div className="relative flex w-full flex-col gap-y-6">
-              {!isBrandingEnabled && <div className="absolute inset-0 z-[9998] bg-background/60" />}
-
-              <div>
-                <FormLabel>
-                  <Trans>Brand Colours</Trans>
-                </FormLabel>
-
-                <FormDescription className="mt-1 mb-4">
-                  <Trans>Customise the colours used on your signing pages.</Trans>
-                </FormDescription>
-
-                <div className="grid grid-cols-2 gap-4">
-                  <FormField
-                    control={form.control}
-                    name="brandingColors.background"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Background</Trans>
-                        </FormLabel>
-                        <FormDescription>
-                          <Trans>Base background colour.</Trans>
-                        </FormDescription>
-                        <FormControl>
-                          <ColorPicker
-                            nonce={nonce}
-                            value={field.value ?? ''}
-                            defaultValue={DEFAULT_BRAND_COLORS.background}
-                            onChange={(color) => field.onChange(color)}
-                          />
-                        </FormControl>
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name="brandingColors.foreground"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Foreground</Trans>
-                        </FormLabel>
-                        <FormDescription>
-                          <Trans>Base text colour.</Trans>
-                        </FormDescription>
-                        <FormControl>
-                          <ColorPicker
-                            nonce={nonce}
-                            value={field.value ?? ''}
-                            defaultValue={DEFAULT_BRAND_COLORS.foreground}
-                            onChange={(color) => field.onChange(color)}
-                          />
-                        </FormControl>
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name="brandingColors.primary"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Primary</Trans>
-                        </FormLabel>
-                        <FormDescription>
-                          <Trans>Primary action colour.</Trans>
-                        </FormDescription>
-                        <FormControl>
-                          <ColorPicker
-                            nonce={nonce}
-                            value={field.value ?? ''}
-                            defaultValue={DEFAULT_BRAND_COLORS.primary}
-                            onChange={(color) => field.onChange(color)}
-                          />
-                        </FormControl>
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name="brandingColors.primaryForeground"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Primary Foreground</Trans>
-                        </FormLabel>
-                        <FormDescription>
-                          <Trans>Text colour on primary buttons.</Trans>
-                        </FormDescription>
-                        <FormControl>
-                          <ColorPicker
-                            nonce={nonce}
-                            value={field.value ?? ''}
-                            defaultValue={DEFAULT_BRAND_COLORS.primaryForeground}
-                            onChange={(color) => field.onChange(color)}
-                          />
-                        </FormControl>
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name="brandingColors.border"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Border</Trans>
-                        </FormLabel>
-                        <FormDescription>
-                          <Trans>Default border colour.</Trans>
-                        </FormDescription>
-                        <FormControl>
-                          <ColorPicker
-                            nonce={nonce}
-                            value={field.value ?? ''}
-                            defaultValue={DEFAULT_BRAND_COLORS.border}
-                            onChange={(color) => field.onChange(color)}
-                          />
-                        </FormControl>
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name="brandingColors.ring"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Ring</Trans>
-                        </FormLabel>
-                        <FormDescription>
-                          <Trans>Focus ring colour.</Trans>
-                        </FormDescription>
-                        <FormControl>
-                          <ColorPicker
-                            nonce={nonce}
-                            value={field.value ?? ''}
-                            defaultValue={DEFAULT_BRAND_COLORS.ring}
-                            onChange={(color) => field.onChange(color)}
-                          />
-                        </FormControl>
-                      </FormItem>
-                    )}
-                  />
-                </div>
-
-                <div className="mt-4">
-                  <FormField
-                    control={form.control}
-                    name="brandingColors.radius"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Border Radius</Trans>
-                        </FormLabel>
-                        <FormControl>
-                          <Input
-                            type="text"
-                            placeholder={DEFAULT_BRAND_RADIUS}
-                            value={field.value ?? ''}
-                            onChange={(e) => field.onChange(e.target.value)}
-                          />
-                        </FormControl>
-                        <FormDescription>
-                          <Trans>Border radius size in REM units (e.g. 0.5rem).</Trans>
-                        </FormDescription>
-                      </FormItem>
-                    )}
-                  />
-                </div>
-              </div>
-
-              <Accordion type="single" collapsible>
-                <AccordionItem value="custom-css" className="border-none">
-                  <AccordionTrigger className="rounded border px-3 py-2 text-left text-foreground hover:bg-muted/40 hover:no-underline">
-                    <Trans>Advanced — Custom CSS</Trans>
-                  </AccordionTrigger>
-
-                  <AccordionContent className="-mx-1 px-1 pt-4 text-muted-foreground text-sm leading-relaxed">
-                    <FormField
-                      control={form.control}
-                      name="brandingCss"
-                      render={({ field }) => (
-                        <FormItem className="flex-1">
-                          <FormControl>
-                            <Textarea
-                              placeholder={`/* Write CSS targeting your signing pages. Selectors are scoped automatically. */
-.my-button {
-  background: red;
-}`}
-                              className="min-h-[200px] font-mono text-xs"
-                              {...field}
-                              value={field.value ?? ''}
-                            />
-                          </FormControl>
-
-                          <FormDescription>
-                            <Trans>
-                              Custom CSS is sanitised on save. Layout-breaking properties, remote URLs, and
-                              pseudo-elements are stripped automatically. Any rules dropped during sanitisation will be
-                              shown after you save.
-                            </Trans>
-                          </FormDescription>
-                        </FormItem>
-                      )}
-                    />
-                  </AccordionContent>
-                </AccordionItem>
-              </Accordion>
-            </div>
-          )}
-
          <div className="flex flex-row justify-end space-x-4">
            <Button type="submit" loading={form.formState.isSubmitting}>
              <Trans>Update</Trans>
@@ -58,20 +58,18 @@ export type TSignUpFormSchema = z.infer<typeof ZSignUpFormSchema>;
 export type SignUpFormProps = {
  className?: string;
  initialEmail?: string;
-  isEmailPasswordSignupEnabled?: boolean;
-  isGoogleSignupEnabled?: boolean;
-  isMicrosoftSignupEnabled?: boolean;
-  isOidcSignupEnabled?: boolean;
+  isGoogleSSOEnabled?: boolean;
+  isMicrosoftSSOEnabled?: boolean;
+  isOIDCSSOEnabled?: boolean;
  returnTo?: string;
 };

 export const SignUpForm = ({
  className,
  initialEmail,
-  isEmailPasswordSignupEnabled = true,
-  isGoogleSignupEnabled,
-  isMicrosoftSignupEnabled,
-  isOidcSignupEnabled,
+  isGoogleSSOEnabled,
+  isMicrosoftSSOEnabled,
+  isOIDCSSOEnabled,
  returnTo,
 }: SignUpFormProps) => {
  const { _ } = useLingui();
@@ -88,7 +86,7 @@ export const SignUpForm = ({

  const [captchaToken, setCaptchaToken] = useState<string | null>(null);

-  const hasSocialAuthEnabled = isGoogleSignupEnabled || isMicrosoftSignupEnabled || isOidcSignupEnabled;
+  const hasSocialAuthEnabled = isGoogleSSOEnabled || isMicrosoftSSOEnabled || isOIDCSSOEnabled;

  const form = useForm<TSignUpFormSchema>({
    values: {
@@ -147,7 +145,7 @@ export const SignUpForm = ({
  const onSignUpWithGoogleClick = async () => {
    try {
      await authClient.google.signIn();
-    } catch {
+    } catch (err) {
      toast({
        title: _(msg`An unknown error occurred`),
        description: _(msg`We encountered an unknown error while attempting to sign you Up. Please try again later.`),
@@ -159,7 +157,7 @@ export const SignUpForm = ({
  const onSignUpWithMicrosoftClick = async () => {
    try {
      await authClient.microsoft.signIn();
-    } catch {
+    } catch (err) {
      toast({
        title: _(msg`An unknown error occurred`),
        description: _(msg`We encountered an unknown error while attempting to sign you Up. Please try again later.`),
@@ -171,7 +169,7 @@ export const SignUpForm = ({
  const onSignUpWithOIDCClick = async () => {
    try {
      await authClient.oidc.signIn();
-    } catch {
+    } catch (err) {
      toast({
        title: _(msg`An unknown error occurred`),
        description: _(msg`We encountered an unknown error while attempting to sign you Up. Please try again later.`),
@@ -237,80 +235,72 @@ export const SignUpForm = ({
        <Form {...form}>
          <form className="flex w-full flex-1 flex-col gap-y-4" onSubmit={form.handleSubmit(onFormSubmit)}>
            <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
-              {isEmailPasswordSignupEnabled && (
-                <>
-                  <FormField
-                    control={form.control}
-                    name="name"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Full Name</Trans>
-                        </FormLabel>
-                        <FormControl>
-                          <Input type="text" {...field} />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Full Name</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input type="text" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />

-                  <FormField
-                    control={form.control}
-                    name="email"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Email Address</Trans>
-                        </FormLabel>
-                        <FormControl>
-                          <Input type="email" {...field} />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
+              <FormField
+                control={form.control}
+                name="email"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Email Address</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input type="email" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />

-                  <FormField
-                    control={form.control}
-                    name="password"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Password</Trans>
-                        </FormLabel>
+              <FormField
+                control={form.control}
+                name="password"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Password</Trans>
+                    </FormLabel>

-                        <FormControl>
-                          <PasswordInput {...field} />
-                        </FormControl>
+                    <FormControl>
+                      <PasswordInput {...field} />
+                    </FormControl>

-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />

-                  <FormField
-                    control={form.control}
-                    name="signature"
-                    render={({ field: { onChange, value } }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Sign Here</Trans>
-                        </FormLabel>
-                        <FormControl>
-                          <SignaturePadDialog
-                            disabled={isSubmitting}
-                            value={value}
-                            onChange={(v) => onChange(v ?? '')}
-                          />
-                        </FormControl>
+              <FormField
+                control={form.control}
+                name="signature"
+                render={({ field: { onChange, value } }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Sign Here</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <SignaturePadDialog disabled={isSubmitting} value={value} onChange={(v) => onChange(v ?? '')} />
+                    </FormControl>

-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-                </>
-              )}
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />

              {turnstileSiteKey && (
                <Turnstile
@@ -335,7 +325,7 @@ export const SignUpForm = ({
                </div>
              )}

-              {isGoogleSignupEnabled && (
+              {isGoogleSSOEnabled && (
                <Button
                  type="button"
                  size="lg"
@@ -349,7 +339,7 @@ export const SignUpForm = ({
                </Button>
              )}

-              {isMicrosoftSignupEnabled && (
+              {isMicrosoftSSOEnabled && (
                <Button
                  type="button"
                  size="lg"
@@ -363,7 +353,7 @@ export const SignUpForm = ({
                </Button>
              )}

-              {isOidcSignupEnabled && (
+              {isOIDCSSOEnabled && (
                <Button
                  type="button"
                  size="lg"
@@ -387,11 +377,9 @@ export const SignUpForm = ({
              </p>
            </fieldset>

-            {isEmailPasswordSignupEnabled && (
-              <Button loading={form.formState.isSubmitting} type="submit" size="lg" className="mt-6 w-full">
-                <Trans>Create account</Trans>
-              </Button>
-            )}
+            <Button loading={form.formState.isSubmitting} type="submit" size="lg" className="mt-6 w-full">
+              <Trans>Create account</Trans>
+            </Button>
          </form>
        </Form>
        <p className="mt-6 text-muted-foreground text-xs">
@@ -58,6 +58,7 @@ export const Header = ({ className, ...props }: HeaderProps) => {
    >
      <div className="mx-auto flex w-full max-w-screen-xl items-center justify-between gap-x-4 px-4 md:justify-normal md:px-8">
        <Link
+          prefetch="intent"
          to={getRootHref(params)}
          className="hidden rounded-md ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 md:inline"
        >
@@ -67,7 +68,7 @@ export const Header = ({ className, ...props }: HeaderProps) => {
        <AppNavDesktop setIsCommandMenuOpen={setIsCommandMenuOpen} />

        <Button asChild variant="outline" className="relative hidden h-10 w-10 rounded-lg md:flex">
-          <Link to="/inbox" className="relative block h-10 w-10">
+          <Link prefetch="intent" to="/inbox" className="relative block h-10 w-10">
            <InboxIcon className="h-5 w-5 flex-shrink-0 text-muted-foreground transition-colors hover:text-foreground" />

            {unreadCountData && unreadCountData.count > 0 && (
@@ -70,6 +70,7 @@ export const AppNavDesktop = ({ className, setIsCommandMenuOpen, ...props }: App
            >
              {menuNavigationLinks.map(({ href, label }) => (
                <Link
+                  prefetch="intent"
                  key={href}
                  to={href}
                  className={cn(
@@ -80,13 +80,14 @@ export const AppNavMobile = ({ isMenuOpen, onMenuOpenChange }: AppNavMobileProps
  return (
    <Sheet open={isMenuOpen} onOpenChange={onMenuOpenChange}>
      <SheetContent className="flex w-full max-w-[350px] flex-col">
-        <Link to="/" onClick={handleMenuItemClick}>
+        <Link prefetch="intent" to="/" onClick={handleMenuItemClick}>
          <img src={LogoImage} alt="Documenso Logo" className="dark:invert" width={170} height={25} />
        </Link>

        <div className="mt-8 flex w-full flex-col items-start gap-y-4">
          {menuNavigationLinks.map(({ href, text }) => (
            <Link
+              prefetch="intent"
              key={href}
              className="flex items-center gap-2 font-semibold text-2xl text-foreground hover:text-foreground/80"
              to={href}
@@ -63,7 +63,7 @@ export const DocumentPageViewButton = ({ envelope }: DocumentPageViewButtonProps
    ))
    .with({ isComplete: false }, () => (
      <Button className="w-full" asChild>
-        <Link to={formatPath}>
+        <Link prefetch="intent" to={formatPath}>
          <Trans>Edit</Trans>
        </Link>
      </Button>
@@ -82,7 +82,7 @@ export const DocumentPageViewDropdown = ({ envelope }: DocumentPageViewDropdownP

        {(isOwner || isCurrentTeamDocument) && !isComplete && (
          <DropdownMenuItem asChild>
-            <Link to={`${documentsPath}/${envelope.id}/edit`}>
+            <Link prefetch="intent" to={`${documentsPath}/${envelope.id}/edit`}>
              <Edit className="mr-2 h-4 w-4" />
              <Trans>Edit</Trans>
            </Link>
@@ -113,7 +113,7 @@ export const DocumentPageViewDropdown = ({ envelope }: DocumentPageViewDropdownP
        />

        <DropdownMenuItem asChild>
-          <Link to={`${documentsPath}/${envelope.id}/logs`}>
+          <Link prefetch="intent" to={`${documentsPath}/${envelope.id}/logs`}>
            <ScrollTextIcon className="mr-2 h-4 w-4" />
            <Trans>Audit Logs</Trans>
          </Link>
@@ -140,15 +140,6 @@ export const DocumentUploadButtonLegacy = ({ className, type }: DocumentUploadBu
          'ENVELOPE_ITEM_LIMIT_EXCEEDED',
          () => msg`You have reached the limit of the number of files per envelope.`,
        )
-        .with('UNSUPPORTED_FILE_TYPE', () => msg`This file type isn't supported. Please upload a PDF or Word document.`)
-        .with(
-          'CONVERSION_SERVICE_UNAVAILABLE',
-          () => msg`Document conversion is temporarily unavailable. Please try again shortly or upload a PDF.`,
-        )
-        .with(
-          'CONVERSION_FAILED',
-          () => msg`We couldn't convert this file. Please check it's a valid Word document or upload a PDF instead.`,
-        )
        .otherwise(() => msg`An error occurred while uploading your document.`);

      toast({
@@ -74,7 +74,7 @@ export default function EnvelopeEditorHeader() {
          {editorConfig.embedded?.customBrandingLogo ? (
            <img src={`/api/branding/logo/team/${envelope.teamId}`} alt="Logo" className="h-6 w-auto" />
          ) : (
-            <Link to="/">
+            <Link prefetch="intent" to="/">
              <BrandingLogo className="h-6 w-auto" />
            </Link>
          )}
@@ -504,7 +504,7 @@ export const EnvelopeEditor = () => {
                })}
                asChild
              >
-                <Link to={relativePath.basePath}>
+                <Link prefetch="intent" to={relativePath.basePath}>
                  <ArrowLeftIcon className="h-4 w-4 flex-shrink-0" />

                  {!minimizeLeftSidebar && (
@@ -3,7 +3,6 @@ import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT, IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { getAllowedUploadMimeTypes } from '@documenso/lib/constants/document-conversion';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';
@@ -116,15 +115,6 @@ export const EnvelopeDropZoneWrapper = ({ children, type, className }: EnvelopeD
          () => t`You have reached your document limit for this month. Please upgrade your plan.`,
        )
        .with('ENVELOPE_ITEM_LIMIT_EXCEEDED', () => t`You have reached the limit of the number of files per envelope.`)
-        .with('UNSUPPORTED_FILE_TYPE', () => t`This file type isn't supported. Please upload a PDF or Word document.`)
-        .with(
-          'CONVERSION_SERVICE_UNAVAILABLE',
-          () => t`Document conversion is temporarily unavailable. Please try again shortly or upload a PDF.`,
-        )
-        .with(
-          'CONVERSION_FAILED',
-          () => t`We couldn't convert this file. Please check it's a valid Word document or upload a PDF instead.`,
-        )
        .otherwise(() => t`An error occurred during upload.`);

      toast({
@@ -168,7 +158,9 @@ export const EnvelopeDropZoneWrapper = ({ children, type, className }: EnvelopeD
    });
  };
  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    accept: getAllowedUploadMimeTypes(),
+    accept: {
+      'application/pdf': ['.pdf'],
+    },
    multiple: true,
    maxSize: megabytesToBytes(APP_DOCUMENT_UPLOAD_SIZE_LIMIT),
    maxFiles: maximumEnvelopeItemCount,
@@ -191,7 +183,7 @@ export const EnvelopeDropZoneWrapper = ({ children, type, className }: EnvelopeD
            </h2>

            <p className="mt-4 text-md text-muted-foreground">
-              <Trans>Drag and drop your document here</Trans>
+              <Trans>Drag and drop your PDF file here</Trans>
            </p>

            {isUploadDisabled && IS_BILLING_ENABLED() && (
@@ -119,15 +119,6 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
          () => t`You have reached your document limit for this month. Please upgrade your plan.`,
        )
        .with('ENVELOPE_ITEM_LIMIT_EXCEEDED', () => t`You have reached the limit of the number of files per envelope.`)
-        .with('UNSUPPORTED_FILE_TYPE', () => t`This file type isn't supported. Please upload a PDF or Word document.`)
-        .with(
-          'CONVERSION_SERVICE_UNAVAILABLE',
-          () => t`Document conversion is temporarily unavailable. Please try again shortly or upload a PDF.`,
-        )
-        .with(
-          'CONVERSION_FAILED',
-          () => t`We couldn't convert this file. Please check it's a valid Word document or upload a PDF instead.`,
-        )
        .otherwise(() => t`An error occurred while uploading your document.`);

      toast({
@@ -54,7 +54,7 @@ export const FolderCard = ({ folder, onMove, onSettings, onDelete }: FolderCardP
  };

  return (
-    <Link to={formatPath()} data-folder-id={folder.id} data-folder-name={folder.name}>
+    <Link prefetch="intent" to={formatPath()} data-folder-id={folder.id} data-folder-name={folder.name}>
      <Card className="h-full border border-border transition-all hover:bg-muted/50">
        <CardContent className="p-4">
          <div className="flex min-w-0 items-center gap-3">
@@ -70,7 +70,7 @@ export const FolderGrid = ({ type, parentId }: FolderGridProps) => {
          className="flex flex-1 items-center font-medium text-muted-foreground text-sm hover:text-muted-foreground/80"
          data-testid="folder-grid-breadcrumbs"
        >
-          <Link to={formatRootPath()} className="flex items-center">
+          <Link prefetch="intent" to={formatRootPath()} className="flex items-center">
            <HomeIcon className="mr-2 h-4 w-4" />
            <Trans>Home</Trans>
          </Link>
@@ -85,7 +85,7 @@ export const FolderGrid = ({ type, parentId }: FolderGridProps) => {
            foldersData?.breadcrumbs.map((folder) => (
              <div key={folder.id} className="flex items-center">
                <span className="px-3">/</span>
-                <Link to={formatBreadCrumbPath(folder.id)} className="flex items-center">
+                <Link prefetch="intent" to={formatBreadCrumbPath(folder.id)} className="flex items-center">
                  <FolderIcon className="mr-2 h-4 w-4" />
                  <span>{folder.name}</span>
                </Link>
@@ -188,6 +188,7 @@ export const FolderGrid = ({ type, parentId }: FolderGridProps) => {
            {unpinnedFolders.length > 12 && (
              <div className="mt-2 flex items-center justify-center">
                <Link
+                  prefetch="intent"
                  className="font-medium text-muted-foreground text-sm hover:text-foreground"
                  to={formatViewAllFoldersPath()}
                >
@@ -59,7 +59,11 @@ export const MenuSwitcher = () => {

      <DropdownMenuContent className={cn('z-[60] ml-6 w-full min-w-[12rem] md:ml-0')} align="end" forceMount>
        <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-          <Link to="/settings/organisations?action=add-organisation" className="flex items-center justify-between">
+          <Link
+            prefetch="intent"
+            to="/settings/organisations?action=add-organisation"
+            className="flex items-center justify-between"
+          >
            <Trans>Create Organisation</Trans>
            <Plus className="ml-2 h-4 w-4" />
          </Link>
@@ -68,20 +72,20 @@ export const MenuSwitcher = () => {

        {isUserAdmin && (
          <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-            <Link to="/admin">
+            <Link prefetch="intent" to="/admin">
              <Trans>Admin panel</Trans>
            </Link>
          </DropdownMenuItem>
        )}

        <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-          <Link to="/inbox">
+          <Link prefetch="intent" to="/inbox">
            <Trans>Personal Inbox</Trans>
          </Link>
        </DropdownMenuItem>

        <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-          <Link to="/settings/profile">
+          <Link prefetch="intent" to="/settings/profile">
            <Trans>User settings</Trans>
          </Link>
        </DropdownMenuItem>
@@ -147,7 +147,7 @@ export const OrgMenuSwitcher = () => {
                    )}
                    asChild
                  >
-                    <Link to={`/o/${org.url}`} className="flex items-center space-x-2 pr-8">
+                    <Link prefetch="intent" to={`/o/${org.url}`} className="flex items-center space-x-2 pr-8">
                      <span
                        className={cn('min-w-0 flex-1 truncate', {
                          'font-semibold': org.id === selectedOrg?.id,
@@ -161,6 +161,7 @@ export const OrgMenuSwitcher = () => {
                  {canExecuteOrganisationAction('MANAGE_ORGANISATION', org.currentOrganisationRole) && (
                    <div className="absolute top-0 right-0 bottom-0 flex items-center justify-center">
                      <Link
+                        prefetch="intent"
                        to={`/o/${org.url}/settings`}
                        className="mr-2 rounded-sm border p-1 text-muted-foreground transition-opacity duration-200 group-hover:opacity-100 md:opacity-0"
                      >
@@ -172,7 +173,7 @@ export const OrgMenuSwitcher = () => {
              ))}

              <Button variant="ghost" className="w-full justify-start" asChild>
-                <Link to="/settings/organisations?action=add-organisation">
+                <Link prefetch="intent" to="/settings/organisations?action=add-organisation">
                  <Plus className="mr-2 h-4 w-4" />
                  <Trans>Create Organisation</Trans>
                </Link>
@@ -200,7 +201,7 @@ export const OrgMenuSwitcher = () => {
                        )}
                        asChild
                      >
-                        <Link to={`/t/${team.url}`} className="flex items-center space-x-2 pr-8">
+                        <Link prefetch="intent" to={`/t/${team.url}`} className="flex items-center space-x-2 pr-8">
                          <span
                            className={cn('min-w-0 flex-1 truncate', {
                              'font-semibold': team.id === currentTeam?.id,
@@ -214,6 +215,7 @@ export const OrgMenuSwitcher = () => {
                      {canExecuteTeamAction('MANAGE_TEAM', team.currentTeamRole) && (
                        <div className="absolute top-0 right-0 bottom-0 flex items-center justify-center">
                          <Link
+                            prefetch="intent"
                            to={`/t/${team.url}/settings`}
                            className="mr-2 rounded-sm border p-1 text-muted-foreground opacity-0 transition-opacity duration-200 group-hover:opacity-100"
                          >
@@ -231,7 +233,7 @@ export const OrgMenuSwitcher = () => {

                {displayedOrg && (
                  <Button variant="ghost" className="w-full justify-start" asChild>
-                    <Link to={`/o/${displayedOrg.url}/settings/teams?action=add-team`}>
+                    <Link prefetch="intent" to={`/o/${displayedOrg.url}/settings/teams?action=add-team`}>
                      <Plus className="mr-2 h-4 w-4" />
                      <Trans>Create Team</Trans>
                    </Link>
@@ -252,7 +254,7 @@ export const OrgMenuSwitcher = () => {
            <div className="flex-1 overflow-y-auto p-1.5">
              {isUserAdmin && (
                <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-                  <Link to="/admin">
+                  <Link prefetch="intent" to="/admin">
                    <Trans>Admin panel</Trans>
                  </Link>
                </DropdownMenuItem>
@@ -261,7 +263,7 @@ export const OrgMenuSwitcher = () => {
              {currentOrganisation &&
                canExecuteOrganisationAction('MANAGE_ORGANISATION', currentOrganisation.currentOrganisationRole) && (
                  <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-                    <Link to={`/o/${currentOrganisation.url}/settings`}>
+                    <Link prefetch="intent" to={`/o/${currentOrganisation.url}/settings`}>
                      <Trans>Organisation settings</Trans>
                    </Link>
                  </DropdownMenuItem>
@@ -269,20 +271,20 @@ export const OrgMenuSwitcher = () => {

              {currentTeam && canExecuteTeamAction('MANAGE_TEAM', currentTeam.currentTeamRole) && (
                <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-                  <Link to={`/t/${currentTeam.url}/settings`}>
+                  <Link prefetch="intent" to={`/t/${currentTeam.url}/settings`}>
                    <Trans>Team settings</Trans>
                  </Link>
                </DropdownMenuItem>
              )}

              <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-                <Link to="/inbox">
+                <Link prefetch="intent" to="/inbox">
                  <Trans>Personal Inbox</Trans>
                </Link>
              </DropdownMenuItem>

              <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
-                <Link to="/settings/profile">
+                <Link prefetch="intent" to="/settings/profile">
                  <Trans>Account</Trans>
                </Link>
              </DropdownMenuItem>
@@ -297,6 +299,7 @@ export const OrgMenuSwitcher = () => {
              {currentOrganisation && (
                <DropdownMenuItem className="px-4 py-2 text-muted-foreground" asChild>
                  <Link
+                    prefetch="intent"
                    to={{
                      pathname: `/o/${currentOrganisation.url}/support`,
                      search: currentTeam ? `?team=${currentTeam.id}` : '',
@@ -1,90 +0,0 @@
-import type { TCssVarsSchema } from '@documenso/lib/types/css-vars';
-import { useEffect } from 'react';
-
-import { toNativeCssVarsString } from '~/utils/css-vars';
-
-export type RecipientBrandingPayload = {
-  allowCustomBranding: boolean;
-  colors?: TCssVarsSchema | null;
-  css?: string | null;
-};
-
-export type RecipientBrandingProps = {
-  branding: RecipientBrandingPayload | null | undefined;
-  cspNonce: string | undefined;
-};
-
-/**
- * Renders a `<style nonce>` block for a recipient route, scoped to the
- * `.documenso-branded` wrapper rendered in `_recipient+/_layout.tsx`.
- *
- * Both the CSS variables (from `branding.colors`) and the user's custom CSS
- * (from `branding.css`) are emitted inside a single nested rule so the user
- * doesn't need to scope their own selectors — native CSS nesting handles it:
- *
- *   .documenso-branded {
- *     --background: ...;
- *     .my-class { color: red; }
- *   }
- *
- * Equivalent to `.documenso-branded .my-class { color: red; }` after expansion.
- *
- * The user's CSS is sanitised at write time (`sanitizeBrandingCss`) and stored
- * in the DB as-is — no per-render parsing.
- *
- * Why both SSR `<style>` and a `useEffect` injection?
- *
- * The rendered `<style>` covers the initial server render so the first paint
- * already has the branding applied — without it, the page would flash the
- * default theme before hydration.
- *
- * The `useEffect` covers in-app client-side navigations. When the user
- * navigates between recipient routes via the router, the server render
- * doesn't run again, so React reconciles the existing DOM. If the loader
- * data changes (e.g. a different recipient with different branding), the
- * SSR'd `<style>` from the previous page may persist or be reused, leading
- * to stale or inconsistent branding. Appending a fresh `<style>` to
- * `document.head` and removing it on cleanup guarantees the active branding
- * matches the current route on both initial load and subsequent navigations.
- */
-export const RecipientBranding = ({ branding, cspNonce }: RecipientBrandingProps) => {
-  const varsString = toNativeCssVarsString(branding?.colors ?? {});
-
-  const userCss = branding?.css ?? '';
-
-  const hasVars = varsString.trim().length > 0;
-  const hasUserCss = userCss.trim().length > 0;
-
-  const innerBody = `${hasVars ? `${varsString}\n` : ''}${hasUserCss ? userCss : ''}`.trim();
-  const css = `.documenso-branded { ${innerBody} }`;
-
-  useEffect(() => {
-    if (!branding?.allowCustomBranding) {
-      return;
-    }
-
-    if (!hasVars && !hasUserCss) {
-      return;
-    }
-
-    const style = document.createElement('style');
-    style.setAttribute('nonce', cspNonce ?? '');
-    style.textContent = css;
-
-    document.head.appendChild(style);
-
-    return () => {
-      document.head.removeChild(style);
-    };
-  }, [branding, cspNonce, css, hasUserCss, hasVars]);
-
-  if (!branding?.allowCustomBranding) {
-    return null;
-  }
-
-  if (!hasVars && !hasUserCss) {
-    return null;
-  }
-
-  return <style nonce={cspNonce}>{css}</style>;
-};
@@ -23,7 +23,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr

  return (
    <div className={cn('flex flex-col gap-y-2', className)} {...props}>
-      <Link to="/settings/profile">
+      <Link prefetch="intent" to="/settings/profile">
        <Button
          variant="ghost"
          className={cn('w-full justify-start', pathname?.startsWith('/settings/profile') && 'bg-secondary')}
@@ -35,14 +35,14 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr

      {isPersonalLayoutMode && (
        <>
-          <Link to="/settings/document">
+          <Link prefetch="intent" to="/settings/document">
            <Button variant="ghost" className={cn('w-full justify-start')}>
              <Settings2Icon className="mr-2 h-5 w-5" />
              <Trans>Preferences</Trans>
            </Button>
          </Link>

-          <Link className="w-full pl-8" to="/settings/document">
+          <Link prefetch="intent" className="w-full pl-8" to="/settings/document">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/document') && 'bg-secondary')}
@@ -51,7 +51,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
            </Button>
          </Link>

-          <Link className="w-full pl-8" to="/settings/branding">
+          <Link prefetch="intent" className="w-full pl-8" to="/settings/branding">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/branding') && 'bg-secondary')}
@@ -60,7 +60,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
            </Button>
          </Link>

-          <Link className="w-full pl-8" to="/settings/email">
+          <Link prefetch="intent" className="w-full pl-8" to="/settings/email">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/email') && 'bg-secondary')}
@@ -69,7 +69,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
            </Button>
          </Link>

-          <Link to="/settings/public-profile">
+          <Link prefetch="intent" to="/settings/public-profile">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/public-profile') && 'bg-secondary')}
@@ -79,7 +79,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
            </Button>
          </Link>

-          <Link to="/settings/tokens">
+          <Link prefetch="intent" to="/settings/tokens">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/tokens') && 'bg-secondary')}
@@ -89,7 +89,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
            </Button>
          </Link>

-          <Link to="/settings/webhooks">
+          <Link prefetch="intent" to="/settings/webhooks">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/webhooks') && 'bg-secondary')}
@@ -101,7 +101,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
        </>
      )}

-      <Link to="/settings/organisations">
+      <Link prefetch="intent" to="/settings/organisations">
        <Button
          variant="ghost"
          className={cn('w-full justify-start', pathname?.startsWith('/settings/organisations') && 'bg-secondary')}
@@ -112,7 +112,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
      </Link>

      {IS_BILLING_ENABLED() && hasManageableBillingOrgs && (
-        <Link to={isPersonalLayoutMode ? '/settings/billing-personal' : `/settings/billing`}>
+        <Link prefetch="intent" to={isPersonalLayoutMode ? '/settings/billing-personal' : `/settings/billing`}>
          <Button
            variant="ghost"
            className={cn('w-full justify-start', pathname?.startsWith('/settings/billing') && 'bg-secondary')}
@@ -123,7 +123,7 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
        </Link>
      )}

-      <Link to="/settings/security">
+      <Link prefetch="intent" to="/settings/security">
        <Button
          variant="ghost"
          className={cn('w-full justify-start', pathname?.startsWith('/settings/security') && 'bg-secondary')}
@@ -34,7 +34,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp

  return (
    <div className={cn('flex flex-wrap items-center justify-start gap-x-2 gap-y-4', className)} {...props}>
-      <Link to="/settings/profile">
+      <Link prefetch="intent" to="/settings/profile">
        <Button
          variant="ghost"
          className={cn('w-full justify-start', pathname?.startsWith('/settings/profile') && 'bg-secondary')}
@@ -46,7 +46,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp

      {isPersonalLayoutMode && (
        <>
-          <Link to="/settings/document">
+          <Link prefetch="intent" to="/settings/document">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/document') && 'bg-secondary')}
@@ -56,7 +56,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
            </Button>
          </Link>

-          <Link to="/settings/branding">
+          <Link prefetch="intent" to="/settings/branding">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/branding') && 'bg-secondary')}
@@ -66,7 +66,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
            </Button>
          </Link>

-          <Link to="/settings/email">
+          <Link prefetch="intent" to="/settings/email">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/email') && 'bg-secondary')}
@@ -76,7 +76,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
            </Button>
          </Link>

-          <Link to="/settings/public-profile">
+          <Link prefetch="intent" to="/settings/public-profile">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/public-profile') && 'bg-secondary')}
@@ -86,7 +86,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
            </Button>
          </Link>

-          <Link to="/settings/tokens">
+          <Link prefetch="intent" to="/settings/tokens">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/tokens') && 'bg-secondary')}
@@ -96,7 +96,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
            </Button>
          </Link>

-          <Link to="/settings/webhooks">
+          <Link prefetch="intent" to="/settings/webhooks">
            <Button
              variant="ghost"
              className={cn('w-full justify-start', pathname?.startsWith('/settings/webhooks') && 'bg-secondary')}
@@ -108,7 +108,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
        </>
      )}

-      <Link to="/settings/organisations">
+      <Link prefetch="intent" to="/settings/organisations">
        <Button
          variant="ghost"
          className={cn('w-full justify-start', pathname?.startsWith('/settings/organisations') && 'bg-secondary')}
@@ -119,7 +119,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
      </Link>

      {IS_BILLING_ENABLED() && hasManageableBillingOrgs && (
-        <Link to={isPersonalLayoutMode ? '/settings/billing-personal' : `/settings/billing`}>
+        <Link prefetch="intent" to={isPersonalLayoutMode ? '/settings/billing-personal' : `/settings/billing`}>
          <Button
            variant="ghost"
            className={cn('w-full justify-start', pathname?.startsWith('/settings/billing') && 'bg-secondary')}
@@ -130,7 +130,7 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
        </Link>
      )}

-      <Link to="/settings/security">
+      <Link prefetch="intent" to="/settings/security">
        <Button
          variant="ghost"
          className={cn('w-full justify-start', pathname?.startsWith('/settings/security') && 'bg-secondary')}
@@ -6,7 +6,7 @@ import { Link } from 'react-router';
 export default function DocumentEditSkeleton() {
  return (
    <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">
-      <Link to="/" className="flex grow-0 items-center text-documenso-700 hover:opacity-80">
+      <Link prefetch="intent" to="/" className="flex grow-0 items-center text-documenso-700 hover:opacity-80">
        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
        <Trans>Documents</Trans>
      </Link>
@@ -71,7 +71,11 @@ export const AdminClaimsTable = ({ licenseFlags }: AdminClaimsTableProps) => {
      {
        header: t`Name`,
        accessorKey: 'name',
-        cell: ({ row }) => <Link to={`/admin/organisations?query=claim:${row.original.id}`}>{row.original.name}</Link>,
+        cell: ({ row }) => (
+          <Link prefetch="intent" to={`/admin/organisations?query=claim:${row.original.id}`}>
+            {row.original.name}
+          </Link>
+        ),
      },
      {
        header: t`Allowed teams`,
@@ -71,7 +71,7 @@ export const AdminDashboardUsersTable = ({ users, totalPages, perPage, page }: A
        cell: ({ row }) => {
          return (
            <Button className="w-24" asChild>
-              <Link to={`/admin/users/${row.original.id}`}>
+              <Link prefetch="intent" to={`/admin/users/${row.original.id}`}>
                <Edit className="mr-2 -ml-1 h-4 w-4" />
                <Trans>Edit</Trans>
              </Link>
@@ -82,7 +82,11 @@ export const AdminOrganisationsTable = ({
      {
        header: t`Organisation`,
        accessorKey: 'name',
-        cell: ({ row }) => <Link to={`/admin/organisations/${row.original.id}`}>{row.original.name}</Link>,
+        cell: ({ row }) => (
+          <Link prefetch="intent" to={`/admin/organisations/${row.original.id}`}>
+            {row.original.name}
+          </Link>
+        ),
      },
      {
        header: t`Created At`,
@@ -92,7 +96,11 @@ export const AdminOrganisationsTable = ({
      {
        header: t`Owner`,
        accessorKey: 'owner',
-        cell: ({ row }) => <Link to={`/admin/users/${row.original.owner.id}`}>{row.original.owner.name}</Link>,
+        cell: ({ row }) => (
+          <Link prefetch="intent" to={`/admin/users/${row.original.owner.id}`}>
+            {row.original.owner.name}
+          </Link>
+        ),
      },
      {
        id: 'role',
@@ -152,14 +160,14 @@ export const AdminOrganisationsTable = ({
              </DropdownMenuLabel>

              <DropdownMenuItem asChild>
-                <Link to={`/admin/organisations/${row.original.id}`}>
+                <Link prefetch="intent" to={`/admin/organisations/${row.original.id}`}>
                  <SettingsIcon className="mr-2 h-4 w-4" />
                  <Trans>Manage</Trans>
                </Link>
              </DropdownMenuItem>

              <DropdownMenuItem asChild>
-                <Link to={`/admin/users/${row.original.owner.id}`}>
+                <Link prefetch="intent" to={`/admin/users/${row.original.owner.id}`}>
                  <UserIcon className="mr-2 h-4 w-4" />
                  <Trans>View owner</Trans>
                </Link>
@@ -58,7 +58,7 @@ export const DocumentsTableActionButton = ({ row }: DocumentsTableActionButtonPr
  })
    .with(isOwner ? { isDraft: true, isOwner: true } : { isDraft: true, isCurrentTeamDocument: true }, () => (
      <Button className="w-32" asChild>
-        <Link to={formatPath}>
+        <Link prefetch="intent" to={formatPath}>
          <Edit className="mr-2 -ml-1 h-4 w-4" />
          <Trans>Edit</Trans>
        </Link>
@@ -131,7 +131,7 @@ export const DocumentsTableActionDropdown = ({ row, onMoveDocument }: DocumentsT
          )}

        <DropdownMenuItem disabled={!canManageDocument || isComplete} asChild>
-          <Link to={formatPath}>
+          <Link prefetch="intent" to={formatPath}>
            <Edit className="mr-2 h-4 w-4" />
            <Trans>Edit</Trans>
          </Link>
@@ -102,7 +102,9 @@ export const OrganisationEmailDomainsDataTable = () => {
        cell: ({ row }) => (
          <div className="flex justify-end space-x-2">
            <Button asChild variant="outline">
-              <Link to={`/o/${organisation.url}/settings/email-domains/${row.original.id}`}>Manage</Link>
+              <Link prefetch="intent" to={`/o/${organisation.url}/settings/email-domains/${row.original.id}`}>
+                Manage
+              </Link>
            </Button>

            <OrganisationEmailDomainDeleteDialog
@@ -80,7 +80,7 @@ export const OrganisationGroupsDataTable = () => {
        cell: ({ row }) => (
          <div className="flex justify-end space-x-2">
            <Button asChild variant="outline">
-              <Link to={`/o/${organisation.url}/settings/groups/${row.original.id}`}>
+              <Link prefetch="intent" to={`/o/${organisation.url}/settings/groups/${row.original.id}`}>
                <Trans>Manage</Trans>
              </Link>
            </Button>
@@ -76,7 +76,7 @@ export const OrganisationTeamsTable = () => {
        cell: ({ row }) => (
          <div className="flex justify-end space-x-2">
            <Button variant="outline" asChild>
-              <Link to={`/t/${row.original.url}/settings`}>
+              <Link prefetch="intent" to={`/t/${row.original.url}/settings`}>
                <Trans>Manage</Trans>
              </Link>
            </Button>
@@ -78,7 +78,7 @@ export const TemplatesTableActionDropdown = ({
        {canMutate && (
          <>
            <DropdownMenuItem asChild>
-              <Link to={formatPath}>
+              <Link prefetch="intent" to={formatPath}>
                <Edit className="mr-2 h-4 w-4" />
                <Trans>Edit</Trans>
              </Link>
@@ -74,7 +74,7 @@ export const UserBillingOrganisationsTable = () => {
        id: 'actions',
        cell: ({ row }) => (
          <Button asChild variant="outline">
-            <Link to={`/o/${row.original.url}/settings/billing`}>
+            <Link prefetch="intent" to={`/o/${row.original.url}/settings/billing`}>
              <Trans>Manage Billing</Trans>
            </Link>
          </Button>
@@ -92,7 +92,7 @@ export const UserOrganisationsTable = () => {
          <div className="flex justify-end space-x-2">
            {canExecuteOrganisationAction('MANAGE_ORGANISATION', row.original.currentOrganisationRole) && (
              <Button variant="outline" asChild>
-                <Link to={`/o/${row.original.url}/settings`}>
+                <Link prefetch="intent" to={`/o/${row.original.url}/settings`}>
                  <Trans>Manage</Trans>
                </Link>
              </Button>
@@ -3,6 +3,7 @@ import { dynamicActivate } from '@documenso/lib/utils/i18n';
 import { i18n } from '@lingui/core';
 import { detect, fromHtmlTag } from '@lingui/detect-locale';
 import { I18nProvider } from '@lingui/react';
+import posthog from 'posthog-js';
 import { StrictMode, startTransition, useEffect } from 'react';
 import { hydrateRoot } from 'react-dom/client';
 import { HydratedRouter } from 'react-router/dom';
@@ -14,11 +15,9 @@ function PosthogInit() {

  useEffect(() => {
    if (postHogConfig) {
-      void import('posthog-js').then(({ default: posthog }) => {
-        posthog.init(postHogConfig.key, {
-          api_host: postHogConfig.host,
-          capture_exceptions: true,
-        });
+      posthog.init(postHogConfig.key, {
+        api_host: postHogConfig.host,
+        capture_exceptions: true,
      });
    }
  }, []);
@@ -17,7 +17,6 @@ import {
  Scripts,
  ScrollRestoration,
  useLoaderData,
-  useMatches,
 } from 'react-router';
 import { PreventFlashOnWrongTheme, ThemeProvider, useTheme } from 'remix-themes';

@@ -111,13 +110,6 @@ export function LayoutContent({ children }: { children: React.ReactNode }) {

  const [theme] = useTheme();

-  // Recipient routes (signing pages) put `documenso-branded` on <body> so the
-  // <style> block from `RecipientBranding` applies to BOTH the main tree and
-  // any portaled content (Radix dialogs/popovers/dropdowns mount outside the
-  // route tree, attached directly to document.body).
-  const matches = useMatches();
-  const isRecipientRoute = matches.some((m) => m.id?.startsWith('routes/_recipient+'));
-
  return (
    <html translate="no" lang={lang} data-theme={theme} className={theme ?? ''}>
      <head>
@@ -145,7 +137,7 @@ export function LayoutContent({ children }: { children: React.ReactNode }) {
        {/* Fix: https://stackoverflow.com/questions/21147149/flash-of-unstyled-content-fouc-in-firefox-only-is-ff-slow-renderer */}
        <script nonce={nonce(cspNonce)}>0</script>
      </head>
-      <body className={isRecipientRoute ? 'documenso-branded' : undefined}>
+      <body>
        {/* Global license banner currently disabled. Need to wait until after a few releases. */}
        {/* {licenseStatus === '?' && (
          <div className="bg-destructive text-destructive-foreground">
@@ -95,7 +95,7 @@ export default function Layout({ loaderData, params, matches }: Route.ComponentP
        }}
        primaryButton={
          <Button asChild>
-            <Link to="/">
+            <Link prefetch="intent" to="/">
              <Trans>Go home</Trans>
            </Link>
          </Button>
@@ -64,7 +64,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            className={cn('justify-start md:w-full', pathname?.startsWith('/admin/stats') && 'bg-secondary')}
            asChild
          >
-            <Link to="/admin/stats">
+            <Link prefetch="intent" to="/admin/stats">
              <BarChart3 className="mr-2 h-5 w-5" />
              <Trans>Stats</Trans>
            </Link>
@@ -75,7 +75,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            className={cn('justify-start md:w-full', pathname?.startsWith('/admin/organisations') && 'bg-secondary')}
            asChild
          >
-            <Link to="/admin/organisations">
+            <Link prefetch="intent" to="/admin/organisations">
              <Building2Icon className="mr-2 h-5 w-5" />
              <Trans>Organisations</Trans>
            </Link>
@@ -86,7 +86,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            className={cn('justify-start md:w-full', pathname?.startsWith('/admin/claims') && 'bg-secondary')}
            asChild
          >
-            <Link to="/admin/claims">
+            <Link prefetch="intent" to="/admin/claims">
              <Wallet2 className="mr-2 h-5 w-5" />
              <Trans>Claims</Trans>
            </Link>
@@ -97,7 +97,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            className={cn('justify-start md:w-full', pathname?.startsWith('/admin/users') && 'bg-secondary')}
            asChild
          >
-            <Link to="/admin/users">
+            <Link prefetch="intent" to="/admin/users">
              <Users className="mr-2 h-5 w-5" />
              <Trans>Users</Trans>
            </Link>
@@ -108,7 +108,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            className={cn('justify-start md:w-full', pathname?.startsWith('/admin/documents') && 'bg-secondary')}
            asChild
          >
-            <Link to="/admin/documents">
+            <Link prefetch="intent" to="/admin/documents">
              <FileStack className="mr-2 h-5 w-5" />
              <Trans>Documents</Trans>
            </Link>
@@ -122,7 +122,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            )}
            asChild
          >
-            <Link to="/admin/unsealed-documents">
+            <Link prefetch="intent" to="/admin/unsealed-documents">
              <AlertTriangleIcon className="mr-2 h-5 w-5" />
              <Trans>Unsealed Documents</Trans>
            </Link>
@@ -133,7 +133,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            className={cn('justify-start md:w-full', pathname?.startsWith('/admin/email-domains') && 'bg-secondary')}
            asChild
          >
-            <Link to="/admin/email-domains">
+            <Link prefetch="intent" to="/admin/email-domains">
              <MailIcon className="mr-2 h-5 w-5" />
              <Trans>Email Domains</Trans>
            </Link>
@@ -147,7 +147,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            )}
            asChild
          >
-            <Link to="/admin/organisation-insights">
+            <Link prefetch="intent" to="/admin/organisation-insights">
              <Trophy className="mr-2 h-5 w-5" />
              <Trans>Organisation Insights</Trans>
            </Link>
@@ -158,7 +158,7 @@ export default function AdminLayout({ loaderData }: Route.ComponentProps) {
            className={cn('justify-start md:w-full', pathname?.startsWith('/admin/site-settings') && 'bg-secondary')}
            asChild
          >
-            <Link to="/admin/site-settings">
+            <Link prefetch="intent" to="/admin/site-settings">
              <Settings className="mr-2 h-5 w-5" />
              <Trans>Site Settings</Trans>
            </Link>
@@ -154,7 +154,7 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
        </TooltipProvider>

        <Button variant="outline" asChild>
-          <Link to={`/admin/users/${envelope.userId}`}>
+          <Link prefetch="intent" to={`/admin/users/${envelope.userId}`}>
            <Trans>Go to owner</Trans>
          </Link>
        </Button>
@@ -61,6 +61,7 @@ export default function AdminDocumentsPage() {
        cell: ({ row }) => {
          return (
            <Link
+              prefetch="intent"
              to={`/admin/documents/${row.original.envelopeId}`}
              className="block max-w-[5rem] truncate font-medium hover:underline md:max-w-[10rem]"
            >
@@ -85,7 +86,7 @@ export default function AdminDocumentsPage() {
          return (
            <Tooltip delayDuration={200}>
              <TooltipTrigger>
-                <Link to={`/admin/users/${row.original.user.id}`}>
+                <Link prefetch="intent" to={`/admin/users/${row.original.user.id}`}>
                  <Avatar className="h-12 w-12 border-2 border-white border-solid dark:border-border">
                    <AvatarFallback className="text-muted-foreground text-xs">{avatarFallbackText}</AvatarFallback>
                  </Avatar>
@@ -58,6 +58,7 @@ export default function AdminEmailDomainsPage() {
        accessorKey: 'domain',
        cell: ({ row }) => (
          <Link
+            prefetch="intent"
            to={`/admin/email-domains/${row.original.id}`}
            className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[15rem]"
          >
@@ -69,7 +70,11 @@ export default function AdminEmailDomainsPage() {
        header: _(msg`Organisation`),
        accessorKey: 'organisation',
        cell: ({ row }) => (
-          <Link to={`/admin/organisations/${row.original.organisation.id}`} className="hover:underline">
+          <Link
+            prefetch="intent"
+            to={`/admin/organisations/${row.original.organisation.id}`}
+            className="hover:underline"
+          >
            {row.original.organisation.name}
          </Link>
        ),
@@ -112,7 +117,7 @@ export default function AdminEmailDomainsPage() {
        header: _(msg`Actions`),
        cell: ({ row }) => (
          <Button asChild variant="outline" size="sm">
-            <Link to={`/admin/email-domains/${row.original.id}`}>
+            <Link prefetch="intent" to={`/admin/email-domains/${row.original.id}`}>
              <Trans>View</Trans>
            </Link>
          </Button>
@@ -48,7 +48,7 @@ export default function OrganisationInsights({ loaderData }: Route.ComponentProp
      <div className="flex items-center justify-between">
        <h2 className="font-semibold text-4xl">{organisationName}</h2>
        <Button variant="outline" asChild>
-          <Link to={`/admin/organisations/${organisationId}`}>
+          <Link prefetch="intent" to={`/admin/organisations/${organisationId}`}>
            <Trans>Manage organisation</Trans>
          </Link>
        </Button>
@@ -37,7 +37,6 @@ import { Link, useNavigate } from 'react-router';
 import { match } from 'ts-pattern';
 import type { z } from 'zod';

-import { AdminOrganisationDeleteDialog } from '~/components/dialogs/admin-organisation-delete-dialog';
 import { AdminOrganisationMemberDeleteDialog } from '~/components/dialogs/admin-organisation-member-delete-dialog';
 import { AdminOrganisationMemberUpdateDialog } from '~/components/dialogs/admin-organisation-member-update-dialog';
 import { DetailsCard, DetailsValue } from '~/components/general/admin-details';
@@ -65,14 +64,9 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro

  const organisationId = params.id;

-  const { data: organisation, isLoading: isLoadingOrganisation } = trpc.admin.organisation.get.useQuery(
-    {
-      organisationId,
-    },
-    {
-      retry: false,
-    },
-  );
+  const { data: organisation, isLoading: isLoadingOrganisation } = trpc.admin.organisation.get.useQuery({
+    organisationId,
+  });

  const { mutateAsync: createStripeCustomer, isPending: isCreatingStripeCustomer } =
    trpc.admin.stripe.createCustomer.useMutation({
@@ -138,7 +132,7 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
        header: t`Member`,
        cell: ({ row }) => (
          <div className="space-y-1">
-            <Link className="font-medium hover:underline" to={`/admin/users/${row.original.user.id}`}>
+            <Link prefetch="intent" className="font-medium hover:underline" to={`/admin/users/${row.original.user.id}`}>
              {row.original.user.name ?? row.original.user.email}
            </Link>
            {row.original.user.name && (
@@ -242,7 +236,7 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/admin/organisations`}>
+            <Link prefetch="intent" to={`/admin/organisations`}>
              <Trans>Go back</Trans>
            </Link>
          </Button>
@@ -256,7 +250,7 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
    <div>
      <SettingsHeader title={t`Manage organisation`} subtitle={t`Manage the ${organisation.name} organisation`}>
        <Button variant="outline" asChild>
-          <Link to={`/admin/organisation-insights/${organisationId}`}>
+          <Link prefetch="intent" to={`/admin/organisation-insights/${organisationId}`}>
            <Trans>View insights</Trans>
          </Link>
        </Button>
@@ -404,31 +398,6 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
          </div>
        </div>
      </div>
-
-      <SettingsHeader
-        title={t`Danger Zone`}
-        subtitle={t`Irreversible actions for this organisation`}
-        className="mt-16"
-      />
-
-      <Alert className="my-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center" variant="destructive">
-        <div className="mb-4 sm:mb-0">
-          <AlertTitle>
-            <Trans>Delete organisation</Trans>
-          </AlertTitle>
-
-          <AlertDescription className="mr-2">
-            <Trans>
-              Permanently delete this organisation. Documents will be orphaned (not deleted) so they remain accessible
-              via the deleted-account service account.
-            </Trans>
-          </AlertDescription>
-        </div>
-
-        <div>
-          <AdminOrganisationDeleteDialog organisationId={organisation.id} organisationName={organisation.name} />
-        </div>
-      </Alert>
    </div>
  );
 }
@@ -27,7 +27,7 @@ import { useRevalidator } from 'react-router';
 import type { z } from 'zod';

 import { SettingsHeader } from '~/components/general/settings-header';
-import { useCspNonce } from '~/utils/nonce';
+
 import type { Route } from './+types/site-settings';

 const ZBannerFormSchema = ZSiteSettingsBannerSchema;
@@ -45,8 +45,6 @@ export async function loader() {
 export default function AdminBannerPage({ loaderData }: Route.ComponentProps) {
  const { banner } = loaderData;

-  const nonce = useCspNonce();
-
  const { toast } = useToast();
  const { _ } = useLingui();
  const { revalidate } = useRevalidator();
@@ -144,7 +142,7 @@ export default function AdminBannerPage({ loaderData }: Route.ComponentProps) {

                        <FormControl>
                          <div>
-                            <ColorPicker {...field} nonce={nonce} />
+                            <ColorPicker {...field} />
                          </div>
                        </FormControl>

@@ -164,7 +162,7 @@ export default function AdminBannerPage({ loaderData }: Route.ComponentProps) {

                        <FormControl>
                          <div>
-                            <ColorPicker {...field} nonce={nonce} />
+                            <ColorPicker {...field} />
                          </div>
                        </FormControl>

@@ -57,7 +57,7 @@ export default function UserPage({ params }: { params: { id: number } }) {
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/admin/users`}>
+            <Link prefetch="intent" to={`/admin/users`}>
              <Trans>Go back</Trans>
            </Link>
          </Button>
@@ -74,7 +74,7 @@ export default function DashboardPage() {
            </div>

            <Button asChild className="mt-4" variant="outline">
-              <Link to="/settings/organisations?action=add-organisation">
+              <Link prefetch="intent" to="/settings/organisations?action=add-organisation">
                <Trans>Create organisation</Trans>
              </Link>
            </Button>
@@ -102,7 +102,7 @@ export default function DashboardPage() {
            <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
              {organisations.map((org) => (
                <div key={org.id} className="group relative">
-                  <Link to={`/o/${org.url}`}>
+                  <Link prefetch="intent" to={`/o/${org.url}`}>
                    <Card className="h-full border pr-6 transition-all hover:bg-muted/50">
                      <CardContent className="p-4">
                        <div className="flex items-center gap-3">
@@ -143,7 +143,7 @@ export default function DashboardPage() {

                  {canExecuteOrganisationAction('MANAGE_ORGANISATION', org.currentOrganisationRole) && (
                    <div className="absolute top-4 right-4 text-muted-foreground opacity-0 transition-opacity duration-200 group-hover:opacity-100">
-                      <Link to={`/o/${org.url}/settings`}>
+                      <Link prefetch="intent" to={`/o/${org.url}/settings`}>
                        <SettingsIcon className="h-4 w-4" />
                      </Link>
                    </div>
@@ -176,7 +176,7 @@ export default function DashboardPage() {
              <div className="flex gap-4">
                {teams.map((team) => (
                  <div key={team.id} className="group relative">
-                    <Link to={`/t/${team.url}`}>
+                    <Link prefetch="intent" to={`/t/${team.url}`}>
                      <Card className="w-[350px] shrink-0 border transition-all hover:bg-muted/50">
                        <CardContent className="p-4">
                          <div className="flex items-center gap-3">
@@ -212,7 +212,7 @@ export default function DashboardPage() {

                    {canExecuteTeamAction('MANAGE_TEAM', team.currentTeamRole) && (
                      <div className="absolute top-4 right-4 text-muted-foreground opacity-0 transition-opacity duration-200 group-hover:opacity-100">
-                        <Link to={`/t/${team.url}/settings`}>
+                        <Link prefetch="intent" to={`/t/${team.url}/settings`}>
                          <SettingsIcon className="h-4 w-4" />
                        </Link>
                      </div>
@@ -115,7 +115,7 @@ export default function OrganisationSettingsTeamsPage() {
        </div>

        <Button asChild>
-          <Link to={`/o/${organisation.url}/settings`}>
+          <Link prefetch="intent" to={`/o/${organisation.url}/settings`}>
            <Trans>Manage Organisation</Trans>
          </Link>
        </Button>
@@ -123,7 +123,7 @@ export default function OrganisationSettingsTeamsPage() {

      <div className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
        {organisation.teams.map((team) => (
-          <Link to={`/t/${team.url}`} key={team.id}>
+          <Link prefetch="intent" to={`/t/${team.url}`} key={team.id}>
            <Card className="h-full border border-border transition-all hover:bg-muted/50">
              <CardContent className="p-4">
                <div className="flex items-center gap-3">
@@ -178,19 +178,19 @@ const TeamDropdownMenu = ({ team }: { team: TGetOrganisationSessionResponse[0]['
      </DropdownMenuTrigger>
      <DropdownMenuContent align="end" onClick={(e) => e.stopPropagation()}>
        <DropdownMenuItem asChild>
-          <Link to={`/t/${team.url}`}>
+          <Link prefetch="intent" to={`/t/${team.url}`}>
            <ArrowRight className="mr-2 h-4 w-4" />
            <Trans>Go to team</Trans>
          </Link>
        </DropdownMenuItem>
        <DropdownMenuItem asChild>
-          <Link to={`/t/${team.url}/settings`}>
+          <Link prefetch="intent" to={`/t/${team.url}/settings`}>
            <SettingsIcon className="mr-2 h-4 w-4" />
            <Trans>Settings</Trans>
          </Link>
        </DropdownMenuItem>
        <DropdownMenuItem asChild>
-          <Link to={`/t/${team.url}/settings/members`}>
+          <Link prefetch="intent" to={`/t/${team.url}/settings/members`}>
            <UsersIcon className="mr-2 h-4 w-4" />
            <Trans>Members</Trans>
          </Link>
@@ -122,7 +122,7 @@ export default function SettingsLayout() {
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/o/${organisation.url}`}>
+            <Link prefetch="intent" to={`/o/${organisation.url}`}>
              <Trans>Go Back</Trans>
            </Link>
          </Button>
@@ -3,15 +3,13 @@ import { useSession } from '@documenso/lib/client-only/providers/session';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { putFile } from '@documenso/lib/universal/upload/put-file';
 import { canExecuteOrganisationAction, isPersonalLayout } from '@documenso/lib/utils/organisations';
-import type { SanitizeBrandingCssWarning } from '@documenso/lib/utils/sanitize-branding-css';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
-import { msg, plural } from '@lingui/core/macro';
+import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { Loader } from 'lucide-react';
-import { useState } from 'react';
 import { Link } from 'react-router';

 import {
@@ -37,13 +35,7 @@ export default function OrganisationSettingsBrandingPage() {

  const isPersonalLayoutMode = isPersonalLayout(organisations);

-  const [cssWarnings, setCssWarnings] = useState<SanitizeBrandingCssWarning[]>([]);
-
-  const {
-    data: organisationWithSettings,
-    isLoading: isLoadingOrganisation,
-    refetch: refetchOrganisation,
-  } = trpc.organisation.get.useQuery({
+  const { data: organisationWithSettings, isLoading: isLoadingOrganisation } = trpc.organisation.get.useQuery({
    organisationReference: organisation.url,
  });

@@ -51,7 +43,7 @@ export default function OrganisationSettingsBrandingPage() {

  const onBrandingPreferencesFormSubmit = async (data: TBrandingPreferencesFormSchema) => {
    try {
-      const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails, brandingColors, brandingCss } = data;
+      const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails } = data;

      let uploadedBrandingLogo: string | undefined;

@@ -64,40 +56,20 @@ export default function OrganisationSettingsBrandingPage() {
        uploadedBrandingLogo = '';
      }

-      const result = await updateOrganisationSettings({
+      await updateOrganisationSettings({
        organisationId: organisation.id,
        data: {
          brandingEnabled: brandingEnabled ?? undefined,
          brandingLogo: uploadedBrandingLogo,
          brandingUrl,
          brandingCompanyDetails,
-          brandingColors,
-          brandingCss,
        },
      });

-      // Refetch so the form re-syncs with the sanitised CSS that was
-      // actually persisted (sanitiser may have dropped rules).
-      await refetchOrganisation();
-
-      const warnings = result?.cssWarnings ?? [];
-      setCssWarnings(warnings);
-
-      if (warnings.length > 0) {
-        toast({
-          title: t`Branding preferences updated with warnings`,
-          description: plural(warnings.length, {
-            one: '# CSS rule was dropped during sanitisation.',
-            other: '# CSS rules were dropped during sanitisation.',
-          }),
-          duration: 8000,
-        });
-      } else {
-        toast({
-          title: t`Branding preferences updated`,
-          description: t`Your branding preferences have been updated`,
-        });
-      }
+      toast({
+        title: t`Branding preferences updated`,
+        description: t`Your branding preferences have been updated`,
+      });
    } catch (err) {
      toast({
        title: t`Something went wrong`,
@@ -131,36 +103,9 @@ export default function OrganisationSettingsBrandingPage() {
        <section>
          <BrandingPreferencesForm
            context="Organisation"
-            hasAdvancedBranding={
-              organisationWithSettings.organisationClaim.flags.embedSigningWhiteLabel === true || !IS_BILLING_ENABLED()
-            }
            settings={organisationWithSettings.organisationGlobalSettings}
            onFormSubmit={onBrandingPreferencesFormSubmit}
          />
-
-          {cssWarnings.length > 0 && (
-            <Alert variant="warning" className="mt-6">
-              <AlertTitle>
-                <Trans>CSS rules were dropped during sanitisation</Trans>
-              </AlertTitle>
-
-              <AlertDescription>
-                <ul className="list-disc pl-5">
-                  {cssWarnings.map((warning, index) => (
-                    <li key={index}>
-                      {warning.detail}
-                      {warning.line !== undefined && (
-                        <span className="text-muted-foreground">
-                          {' '}
-                          <Trans>(line {warning.line})</Trans>
-                        </span>
-                      )}
-                    </li>
-                  ))}
-                </ul>
-              </AlertDescription>
-            </Alert>
-          )}
        </section>
      ) : (
        <Alert className="mt-8 flex flex-col justify-between p-6 sm:flex-row sm:items-center" variant="neutral">
@@ -118,7 +118,7 @@ export default function OrganisationEmailDomainSettingsPage({ params }: Route.Co
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/o/${organisation.url}/settings/email-domains`}>
+            <Link prefetch="intent" to={`/o/${organisation.url}/settings/email-domains`}>
              <Trans>Go back</Trans>
            </Link>
          </Button>
@@ -83,7 +83,7 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/o/${organisation.url}/settings/groups`}>
+            <Link prefetch="intent" to={`/o/${organisation.url}/settings/groups`}>
              <Trans>Go back</Trans>
            </Link>
          </Button>
@@ -126,7 +126,7 @@ export default function SettingsSecurity({ loaderData }: Route.ComponentProps) {
        </div>

        <Button asChild variant="outline" className="bg-background">
-          <Link to="/settings/security/passkeys">
+          <Link prefetch="intent" to="/settings/security/passkeys">
            <Trans>Manage passkeys</Trans>
          </Link>
        </Button>
@@ -144,7 +144,7 @@ export default function SettingsSecurity({ loaderData }: Route.ComponentProps) {
        </div>

        <Button asChild variant="outline" className="bg-background">
-          <Link to="/settings/security/activity">
+          <Link prefetch="intent" to="/settings/security/activity">
            <Trans>View activity</Trans>
          </Link>
        </Button>
@@ -162,7 +162,7 @@ export default function SettingsSecurity({ loaderData }: Route.ComponentProps) {
        </div>

        <Button asChild variant="outline" className="bg-background">
-          <Link to="/settings/security/sessions">
+          <Link prefetch="intent" to="/settings/security/sessions">
            <Trans>Manage sessions</Trans>
          </Link>
        </Button>
@@ -180,7 +180,7 @@ export default function SettingsSecurity({ loaderData }: Route.ComponentProps) {
        </div>

        <Button asChild variant="outline" className="bg-background">
-          <Link to="/settings/security/linked-accounts">
+          <Link prefetch="intent" to="/settings/security/linked-accounts">
            <Trans>Manage linked accounts</Trans>
          </Link>
        </Button>
@@ -57,7 +57,7 @@ export default function Layout() {
        }}
        primaryButton={
          <Button asChild>
-            <Link to="/settings/teams">
+            <Link prefetch="intent" to="/settings/teams">
              <Trans>View teams</Trans>
            </Link>
          </Button>
@@ -93,7 +93,7 @@ export default function DocumentPage({ params }: Route.ComponentProps) {
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/t/${team.url}/documents`}>
+            <Link prefetch="intent" to={`/t/${team.url}/documents`}>
              <Trans>Go back</Trans>
            </Link>
          </Button>
@@ -112,7 +112,7 @@ export default function DocumentPage({ params }: Route.ComponentProps) {
        <DocumentRecipientLinkCopyDialog recipients={envelope.recipients} />
      )}

-      <Link to={documentRootPath} className="flex items-center text-documenso-700 hover:opacity-80">
+      <Link prefetch="intent" to={documentRootPath} className="flex items-center text-documenso-700 hover:opacity-80">
        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
        <Trans>Documents</Trans>
      </Link>
@@ -83,7 +83,7 @@ export function ErrorBoundary({ error, params }: Route.ErrorBoundaryProps) {
      secondaryButton={null}
      primaryButton={
        <Button asChild className="w-32">
-          <Link to={`/t/${params.teamUrl}/documents`}>
+          <Link prefetch="intent" to={`/t/${params.teamUrl}/documents`}>
            <ChevronLeftIcon className="mr-2 h-4 w-4" />
            <Trans>Go Back</Trans>
          </Link>
@@ -86,7 +86,7 @@ export default function EnvelopeEditorPage({ params }: Route.ComponentProps) {
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/t/${team.url}/documents`}>
+            <Link prefetch="intent" to={`/t/${team.url}/documents`}>
              <Trans>Go home</Trans>
            </Link>
          </Button>
@@ -107,7 +107,7 @@ export default function TeamsSettingsLayout() {
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/t/${team.url}`}>
+            <Link prefetch="intent" to={`/t/${team.url}`}>
              <Trans>Go Back</Trans>
            </Link>
          </Button>
@@ -1,14 +1,9 @@
-import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { putFile } from '@documenso/lib/universal/upload/put-file';
-import type { SanitizeBrandingCssWarning } from '@documenso/lib/utils/sanitize-branding-css';
 import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { useToast } from '@documenso/ui/primitives/use-toast';
-import { plural } from '@lingui/core/macro';
-import { Trans, useLingui } from '@lingui/react/macro';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react/macro';
 import { Loader } from 'lucide-react';
-import { useState } from 'react';

 import {
  BrandingPreferencesForm,
@@ -16,32 +11,27 @@ import {
 } from '~/components/forms/branding-preferences-form';
 import { SettingsHeader } from '~/components/general/settings-header';
 import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags(msg`Branding Preferences`);
+}

 export default function TeamsSettingsPage() {
  const team = useCurrentTeam();
-  const organisation = useCurrentOrganisation();

  const { t } = useLingui();
  const { toast } = useToast();

-  const [cssWarnings, setCssWarnings] = useState<SanitizeBrandingCssWarning[]>([]);
-
-  const {
-    data: teamWithSettings,
-    isLoading: isLoadingTeam,
-    refetch: refetchTeam,
-  } = trpc.team.get.useQuery({
+  const { data: teamWithSettings, isLoading: isLoadingTeam } = trpc.team.get.useQuery({
    teamReference: team.id,
  });

  const { mutateAsync: updateTeamSettings } = trpc.team.settings.update.useMutation();

-  const canCustomBranding =
-    organisation.organisationClaim.flags.embedSigningWhiteLabel === true || !IS_BILLING_ENABLED();
-
  const onBrandingPreferencesFormSubmit = async (data: TBrandingPreferencesFormSchema) => {
    try {
-      const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails, brandingColors, brandingCss } = data;
+      const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails } = data;

      let uploadedBrandingLogo: string | undefined;

@@ -54,40 +44,20 @@ export default function TeamsSettingsPage() {
        uploadedBrandingLogo = '';
      }

-      const result = await updateTeamSettings({
+      await updateTeamSettings({
        teamId: team.id,
        data: {
          brandingEnabled,
          brandingLogo: uploadedBrandingLogo,
          brandingUrl: brandingUrl || null,
          brandingCompanyDetails: brandingCompanyDetails || null,
-          brandingColors,
-          brandingCss,
        },
      });

-      // Refetch so the form re-syncs with the sanitised CSS that was
-      // actually persisted (sanitiser may have dropped rules).
-      await refetchTeam();
-
-      const warnings = result?.cssWarnings ?? [];
-      setCssWarnings(warnings);
-
-      if (warnings.length > 0) {
-        toast({
-          title: t`Branding preferences updated with warnings`,
-          description: plural(warnings.length, {
-            one: '# CSS rule was dropped during sanitisation.',
-            other: '# CSS rules were dropped during sanitisation.',
-          }),
-          duration: 8000,
-        });
-      } else {
-        toast({
-          title: t`Branding preferences updated`,
-          description: t`Your branding preferences have been updated`,
-        });
-      }
+      toast({
+        title: t`Branding preferences updated`,
+        description: t`Your branding preferences have been updated`,
+      });
    } catch (err) {
      toast({
        title: t`Something went wrong`,
@@ -115,35 +85,10 @@ export default function TeamsSettingsPage() {
      <section>
        <BrandingPreferencesForm
          canInherit={true}
-          hasAdvancedBranding={canCustomBranding}
          context="Team"
          settings={teamWithSettings.teamSettings}
          onFormSubmit={onBrandingPreferencesFormSubmit}
        />
-
-        {cssWarnings.length > 0 && (
-          <Alert variant="warning" className="mt-6">
-            <AlertTitle>
-              <Trans>CSS rules were dropped during sanitisation</Trans>
-            </AlertTitle>
-
-            <AlertDescription>
-              <ul className="list-disc pl-5">
-                {cssWarnings.map((warning, index) => (
-                  <li key={index}>
-                    {warning.detail}
-                    {warning.line !== undefined && (
-                      <span className="text-muted-foreground">
-                        {' '}
-                        <Trans>(line {warning.line})</Trans>
-                      </span>
-                    )}
-                  </li>
-                ))}
-              </ul>
-            </AlertDescription>
-          </Alert>
-        )}
      </section>
    </div>
  );
@@ -203,7 +203,7 @@ export default function WebhookPage({ params }: Route.ComponentProps) {
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/t/${team.url}/settings/webhooks`}>
+            <Link prefetch="intent" to={`/t/${team.url}/settings/webhooks`}>
              <Trans>Go back</Trans>
            </Link>
          </Button>
@@ -48,7 +48,7 @@ export default function WebhookPage() {
      {
        header: t`Webhook`,
        cell: ({ row }) => (
-          <Link to={`/t/${team.url}/settings/webhooks/${row.original.id}`}>
+          <Link prefetch="intent" to={`/t/${team.url}/settings/webhooks/${row.original.id}`}>
            <p className="text-muted-foreground text-xs">{row.original.id}</p>
            <p className="max-w-sm truncate font-semibold text-foreground text-xs" title={row.original.webhookUrl}>
              {row.original.webhookUrl}
@@ -159,7 +159,7 @@ const WebhookTableActionDropdown = ({ webhook }: { webhook: Webhook }) => {
        </DropdownMenuLabel>

        <DropdownMenuItem asChild>
-          <Link to={`/t/${team.url}/settings/webhooks/${webhook.id}`}>
+          <Link prefetch="intent" to={`/t/${team.url}/settings/webhooks/${webhook.id}`}>
            <ScrollTextIcon className="mr-2 h-4 w-4" />
            <Trans>Logs</Trans>
          </Link>
@@ -77,7 +77,7 @@ export default function TemplatePage({ params }: Route.ComponentProps) {
        }}
        primaryButton={
          <Button asChild>
-            <Link to={`/t/${team.url}/templates`}>
+            <Link prefetch="intent" to={`/t/${team.url}/templates`}>
              <Trans>Go back</Trans>
            </Link>
          </Button>
@@ -118,7 +118,7 @@ export default function TemplatePage({ params }: Route.ComponentProps) {
  return (
    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
      <div className="flex flex-row justify-between">
-        <Link to={templateRootPath} className="flex items-center text-documenso-700 hover:opacity-80">
+        <Link prefetch="intent" to={templateRootPath} className="flex items-center text-documenso-700 hover:opacity-80">
          <ChevronLeft className="mr-2 inline-block h-5 w-5" />
          <Trans>Templates</Trans>
        </Link>
@@ -139,7 +139,7 @@ export default function TemplatePage({ params }: Route.ComponentProps) {
              />

              <Button asChild size="sm">
-                <Link to={`${templateRootPath}/${envelope.id}/edit`}>
+                <Link prefetch="intent" to={`${templateRootPath}/${envelope.id}/edit`}>
                  <LucideEdit className="mr-1.5 h-3.5 w-3.5" />
                  <Trans>Edit Template</Trans>
                </Link>
@@ -101,7 +101,7 @@ export function ErrorBoundary({ error, params }: Route.ErrorBoundaryProps) {
      secondaryButton={null}
      primaryButton={
        <Button asChild className="w-32">
-          <Link to={`/t/${params.teamUrl}/templates`}>
+          <Link prefetch="intent" to={`/t/${params.teamUrl}/templates`}>
            <ChevronLeftIcon className="mr-2 h-4 w-4" />
            <Trans>Go Back</Trans>
          </Link>
@@ -1,21 +1,14 @@
 import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
-import { i18n } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
 import { ChevronLeft } from 'lucide-react';
 import { isRouteErrorResponse, Link, Outlet } from 'react-router';
+
 import { Header as AuthenticatedHeader } from '~/components/general/app-header';
 import { GenericErrorLayout } from '~/components/general/generic-error-layout';
-import type { Route } from './+types/_layout';

-export function meta() {
-  return [
-    { title: i18n._(msg`Sign Document - Documenso`) },
-    { name: 'robots', content: 'noindex, nofollow, noarchive, nosnippet, noimageindex' },
-  ];
-}
+import type { Route } from './+types/_layout';

 /**
 * A layout to handle scenarios where the user is a recipient of a given resource
@@ -2,7 +2,6 @@ import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session
 import { EnvelopeRenderProvider } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { loadRecipientBrandingByTeamId } from '@documenso/lib/server-only/branding/load-recipient-branding';
 import { getEnvelopeForDirectTemplateSigning } from '@documenso/lib/server-only/envelope/get-envelope-for-direct-template-signing';
 import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
@@ -21,8 +20,6 @@ import { DocumentSigningAuthProvider } from '~/components/general/document-signi
 import { DocumentSigningPageViewV2 } from '~/components/general/document-signing/document-signing-page-view-v2';
 import { DocumentSigningProvider } from '~/components/general/document-signing/document-signing-provider';
 import { EnvelopeSigningProvider } from '~/components/general/document-signing/envelope-signing-provider';
-import { RecipientBranding } from '~/components/general/recipient-branding';
-import { useCspNonce } from '~/utils/nonce';
 import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';

 import type { Route } from './+types/_index';
@@ -128,7 +125,6 @@ export async function loader(loaderArgs: Route.LoaderArgs) {
    },
    select: {
      internalVersion: true,
-      teamId: true,
    },
  });

@@ -136,17 +132,12 @@ export async function loader(loaderArgs: Route.LoaderArgs) {
    throw new Response('Not Found', { status: 404 });
  }

-  const branding = await loadRecipientBrandingByTeamId({
-    teamId: directEnvelope.teamId,
-  });
-
  if (directEnvelope.internalVersion === 2) {
    const payloadV2 = await handleV2Loader(loaderArgs);

    return superLoaderJson({
      version: 2,
      payload: payloadV2,
-      branding,
    } as const);
  }

@@ -155,20 +146,17 @@ export async function loader(loaderArgs: Route.LoaderArgs) {
  return superLoaderJson({
    version: 1,
    payload: payloadV1,
-    branding,
  } as const);
 }

 export default function DirectTemplatePage() {
  const data = useSuperLoaderData<typeof loader>();
-  const cspNonce = useCspNonce();

-  return (
-    <>
-      <RecipientBranding branding={data.branding} cspNonce={cspNonce} />
-      {data.version === 2 ? <DirectSigningPageV2 data={data.payload} /> : <DirectSigningPageV1 data={data.payload} />}
-    </>
-  );
+  if (data.version === 2) {
+    return <DirectSigningPageV2 data={data.payload} />;
+  }
+
+  return <DirectSigningPageV1 data={data.payload} />;
 }

 const DirectSigningPageV1 = ({ data }: { data: Awaited<ReturnType<typeof handleV1Loader>> }) => {
@@ -3,7 +3,6 @@ import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session
 import { EnvelopeRenderProvider } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { loadRecipientBrandingByTeamId } from '@documenso/lib/server-only/branding/load-recipient-branding';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { viewedDocument } from '@documenso/lib/server-only/document/viewed-document';
 import { getEnvelopeForRecipientSigning } from '@documenso/lib/server-only/envelope/get-envelope-for-recipient-signing';
@@ -36,8 +35,6 @@ import { DocumentSigningPageViewV1 } from '~/components/general/document-signing
 import { DocumentSigningPageViewV2 } from '~/components/general/document-signing/document-signing-page-view-v2';
 import { DocumentSigningProvider } from '~/components/general/document-signing/document-signing-provider';
 import { EnvelopeSigningProvider } from '~/components/general/document-signing/envelope-signing-provider';
-import { RecipientBranding } from '~/components/general/recipient-branding';
-import { useCspNonce } from '~/utils/nonce';
 import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';

 import type { Route } from './+types/_index';
@@ -275,7 +272,6 @@ export async function loader(loaderArgs: Route.LoaderArgs) {
      envelope: {
        select: {
          internalVersion: true,
-          teamId: true,
        },
      },
    },
@@ -285,17 +281,12 @@ export async function loader(loaderArgs: Route.LoaderArgs) {
    throw new Response('Not Found', { status: 404 });
  }

-  const branding = await loadRecipientBrandingByTeamId({
-    teamId: foundRecipient.envelope.teamId,
-  });
-
  if (foundRecipient.envelope.internalVersion === 2) {
    const payloadV2 = await handleV2Loader(loaderArgs);

    return superLoaderJson({
      version: 2,
      payload: payloadV2,
-      branding,
    } as const);
  }

@@ -304,20 +295,17 @@ export async function loader(loaderArgs: Route.LoaderArgs) {
  return superLoaderJson({
    version: 1,
    payload: payloadV1,
-    branding,
  } as const);
 }

 export default function SigningPage() {
  const data = useSuperLoaderData<typeof loader>();
-  const cspNonce = useCspNonce();

-  return (
-    <>
-      <RecipientBranding branding={data.branding} cspNonce={cspNonce} />
-      {data.version === 2 ? <SigningPageV2 data={data.payload} /> : <SigningPageV1 data={data.payload} />}
-    </>
-  );
+  if (data.version === 2) {
+    return <SigningPageV2 data={data.payload} />;
+  }
+
+  return <SigningPageV1 data={data.payload} />;
 }

 const SigningPageV1 = ({ data }: { data: Awaited<ReturnType<typeof handleV1Loader>> }) => {
@@ -1,8 +1,6 @@
 import signingCelebration from '@documenso/assets/images/signing-celebration.png';
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
 import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
-import { isSignupEnabledForProvider } from '@documenso/lib/constants/auth';
-import { loadRecipientBrandingByTeamId } from '@documenso/lib/server-only/branding/load-recipient-branding';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { isRecipientAuthorized } from '@documenso/lib/server-only/document/is-recipient-authorized';
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
@@ -10,6 +8,7 @@ import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-re
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
 import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
+import { env } from '@documenso/lib/utils/env';
 import { trpc } from '@documenso/trpc/react';
 import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
 import { SigningCard3D } from '@documenso/ui/components/signing-card';
@@ -26,8 +25,6 @@ import { match } from 'ts-pattern';
 import { EnvelopeDownloadDialog } from '~/components/dialogs/envelope-download-dialog';
 import { ClaimAccount } from '~/components/general/claim-account';
 import { DocumentSigningAuthPageView } from '~/components/general/document-signing/document-signing-auth-page';
-import { RecipientBranding } from '~/components/general/recipient-branding';
-import { useCspNonce } from '~/utils/nonce';

 import type { Route } from './+types/complete';

@@ -49,8 +46,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
    throw new Response('Not Found', { status: 404 });
  }

-  const branding = await loadRecipientBrandingByTeamId({ teamId: document.teamId });
-
  const [fields, recipient] = await Promise.all([
    getFieldsForToken({ token }),
    getRecipientByToken({ token }).catch(() => null),
@@ -71,7 +66,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
    return {
      isDocumentAccessValid: false,
      recipientEmail: recipient.email,
-      branding,
    } as const;
  }

@@ -83,7 +77,7 @@ export async function loader({ params, request }: Route.LoaderArgs) {
  const recipientName =
    recipient.name || fields.find((field) => field.type === FieldType.NAME)?.customText || recipient.email;

-  const canSignUp = !isExistingUser && isSignupEnabledForProvider('email');
+  const canSignUp = !isExistingUser && env('NEXT_PUBLIC_DISABLE_SIGNUP') !== 'true';

  const canRedirectToFolder = user && document.userId === user.id && document.folderId && document.team?.url;

@@ -98,7 +92,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
    document,
    recipient,
    returnToHomePath,
-    branding,
  };
 }

@@ -107,7 +100,6 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp

  const { sessionData } = useOptionalSession();
  const user = sessionData?.user;
-  const cspNonce = useCspNonce();

  const {
    isDocumentAccessValid,
@@ -118,7 +110,6 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp
    recipient,
    recipientEmail,
    returnToHomePath,
-    branding,
  } = loaderData;

  // Poll signing status every few seconds
@@ -140,163 +131,154 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp
  const signingStatus = signingStatusData?.status ?? 'PENDING';

  if (!isDocumentAccessValid) {
-    return (
-      <>
-        <RecipientBranding branding={branding} cspNonce={cspNonce} />
-        <DocumentSigningAuthPageView email={recipientEmail} />
-      </>
-    );
+    return <DocumentSigningAuthPageView email={recipientEmail} />;
  }

  return (
-    <>
-      <RecipientBranding branding={branding} cspNonce={cspNonce} />
+    <div
+      className={cn('-mx-4 flex flex-col items-center overflow-hidden px-4 pt-16 md:-mx-8 md:px-8 lg:pt-20 xl:pt-28', {
+        'pt-0 lg:pt-0 xl:pt-0': canSignUp,
+      })}
+    >
      <div
-        className={cn(
-          '-mx-4 flex flex-col items-center overflow-hidden px-4 pt-16 md:-mx-8 md:px-8 lg:pt-20 xl:pt-28',
-          { 'pt-0 lg:pt-0 xl:pt-0': canSignUp },
-        )}
+        className={cn('relative mt-6 flex w-full flex-col items-center justify-center', {
+          'mt-0 flex-col divide-y overflow-hidden pt-6 md:pt-16 lg:flex-row lg:divide-x lg:divide-y-0 lg:pt-20 xl:pt-24':
+            canSignUp,
+        })}
      >
        <div
-          className={cn('relative mt-6 flex w-full flex-col items-center justify-center', {
-            'mt-0 flex-col divide-y overflow-hidden pt-6 md:pt-16 lg:flex-row lg:divide-x lg:divide-y-0 lg:pt-20 xl:pt-24':
-              canSignUp,
+          className={cn('flex flex-col items-center', {
+            'mb-8 p-4 md:mb-0 md:p-12': canSignUp,
          })}
        >
-          <div
-            className={cn('flex flex-col items-center', {
-              'mb-8 p-4 md:mb-0 md:p-12': canSignUp,
-            })}
-          >
-            <Badge variant="neutral" size="default" className="mb-6 rounded-xl border bg-transparent">
-              <span className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]">
-                {document.title}
-              </span>
-            </Badge>
+          <Badge variant="neutral" size="default" className="mb-6 rounded-xl border bg-transparent">
+            <span className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]">
+              {document.title}
+            </span>
+          </Badge>

-            {/* Card with recipient */}
-            <SigningCard3D
-              name={recipientName}
-              signature={signatures.at(0)}
-              signingCelebrationImage={signingCelebration}
+          {/* Card with recipient */}
+          <SigningCard3D
+            name={recipientName}
+            signature={signatures.at(0)}
+            signingCelebrationImage={signingCelebration}
+          />
+
+          <h2 className="mt-6 max-w-[35ch] text-center font-semibold text-2xl leading-normal md:text-3xl lg:text-4xl">
+            {recipient.role === RecipientRole.SIGNER && <Trans>Document Signed</Trans>}
+            {recipient.role === RecipientRole.VIEWER && <Trans>Document Viewed</Trans>}
+            {recipient.role === RecipientRole.APPROVER && <Trans>Document Approved</Trans>}
+          </h2>
+
+          {match({ status: signingStatus, deletedAt: document.deletedAt })
+            .with({ status: 'COMPLETED' }, () => (
+              <div className="mt-4 flex items-center text-center text-documenso-700">
+                <CheckCircle2 className="mr-2 h-5 w-5" />
+                <span className="text-sm">
+                  <Trans>Everyone has signed</Trans>
+                </span>
+              </div>
+            ))
+            .with({ status: 'PROCESSING' }, () => (
+              <div className="mt-4 flex items-center text-center text-orange-600">
+                <Loader2 className="mr-2 h-5 w-5 animate-spin" />
+                <span className="text-sm">
+                  <Trans>Processing document</Trans>
+                </span>
+              </div>
+            ))
+            .with({ deletedAt: null }, () => (
+              <div className="mt-4 flex items-center text-center text-blue-600">
+                <Clock8 className="mr-2 h-5 w-5" />
+                <span className="text-sm">
+                  <Trans>Waiting for others to sign</Trans>
+                </span>
+              </div>
+            ))
+            .otherwise(() => (
+              <div className="flex items-center text-center text-red-600">
+                <Clock8 className="mr-2 h-5 w-5" />
+                <span className="text-sm">
+                  <Trans>Document no longer available to sign</Trans>
+                </span>
+              </div>
+            ))}
+
+          {match({ status: signingStatus, deletedAt: document.deletedAt })
+            .with({ status: 'COMPLETED' }, () => (
+              <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
+                <Trans>Everyone has signed! You will receive an email copy of the signed document.</Trans>
+              </p>
+            ))
+            .with({ status: 'PROCESSING' }, () => (
+              <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
+                <Trans>
+                  All recipients have signed. The document is being processed and you will receive an email copy
+                  shortly.
+                </Trans>
+              </p>
+            ))
+            .with({ deletedAt: null }, () => (
+              <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
+                <Trans>You will receive an email copy of the signed document once everyone has signed.</Trans>
+              </p>
+            ))
+            .otherwise(() => (
+              <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
+                <Trans>
+                  This document has been cancelled by the owner and is no longer available for others to sign.
+                </Trans>
+              </p>
+            ))}
+
+          <div className="mt-8 flex w-full max-w-xs flex-col items-stretch gap-4 md:w-auto md:max-w-none md:flex-row md:items-center">
+            <DocumentShareButton
+              documentId={document.id}
+              token={recipient.token}
+              className="w-full max-w-none md:flex-1"
            />

-            <h2 className="mt-6 max-w-[35ch] text-center font-semibold text-2xl leading-normal md:text-3xl lg:text-4xl">
-              {recipient.role === RecipientRole.SIGNER && <Trans>Document Signed</Trans>}
-              {recipient.role === RecipientRole.VIEWER && <Trans>Document Viewed</Trans>}
-              {recipient.role === RecipientRole.APPROVER && <Trans>Document Approved</Trans>}
-            </h2>
-
-            {match({ status: signingStatus, deletedAt: document.deletedAt })
-              .with({ status: 'COMPLETED' }, () => (
-                <div className="mt-4 flex items-center text-center text-documenso-700">
-                  <CheckCircle2 className="mr-2 h-5 w-5" />
-                  <span className="text-sm">
-                    <Trans>Everyone has signed</Trans>
-                  </span>
-                </div>
-              ))
-              .with({ status: 'PROCESSING' }, () => (
-                <div className="mt-4 flex items-center text-center text-orange-600">
-                  <Loader2 className="mr-2 h-5 w-5 animate-spin" />
-                  <span className="text-sm">
-                    <Trans>Processing document</Trans>
-                  </span>
-                </div>
-              ))
-              .with({ deletedAt: null }, () => (
-                <div className="mt-4 flex items-center text-center text-blue-600">
-                  <Clock8 className="mr-2 h-5 w-5" />
-                  <span className="text-sm">
-                    <Trans>Waiting for others to sign</Trans>
-                  </span>
-                </div>
-              ))
-              .otherwise(() => (
-                <div className="flex items-center text-center text-red-600">
-                  <Clock8 className="mr-2 h-5 w-5" />
-                  <span className="text-sm">
-                    <Trans>Document no longer available to sign</Trans>
-                  </span>
-                </div>
-              ))}
-
-            {match({ status: signingStatus, deletedAt: document.deletedAt })
-              .with({ status: 'COMPLETED' }, () => (
-                <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
-                  <Trans>Everyone has signed! You will receive an email copy of the signed document.</Trans>
-                </p>
-              ))
-              .with({ status: 'PROCESSING' }, () => (
-                <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
-                  <Trans>
-                    All recipients have signed. The document is being processed and you will receive an email copy
-                    shortly.
-                  </Trans>
-                </p>
-              ))
-              .with({ deletedAt: null }, () => (
-                <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
-                  <Trans>You will receive an email copy of the signed document once everyone has signed.</Trans>
-                </p>
-              ))
-              .otherwise(() => (
-                <p className="mt-2.5 max-w-[60ch] text-center font-medium text-muted-foreground/60 text-sm md:text-base">
-                  <Trans>
-                    This document has been cancelled by the owner and is no longer available for others to sign.
-                  </Trans>
-                </p>
-              ))}
-
-            <div className="mt-8 flex w-full max-w-xs flex-col items-stretch gap-4 md:w-auto md:max-w-none md:flex-row md:items-center">
-              <DocumentShareButton
-                documentId={document.id}
-                token={recipient.token}
-                className="w-full max-w-none md:flex-1"
+            {isDocumentCompleted(document) && (
+              <EnvelopeDownloadDialog
+                envelopeId={document.envelopeId}
+                envelopeStatus={document.status}
+                envelopeItems={document.envelopeItems}
+                token={recipient?.token}
+                trigger={
+                  <Button type="button" variant="outline" className="flex-1 md:flex-initial">
+                    <DownloadIcon className="mr-2 h-5 w-5" />
+                    <Trans>Download</Trans>
+                  </Button>
+                }
              />
+            )}

-              {isDocumentCompleted(document) && (
-                <EnvelopeDownloadDialog
-                  envelopeId={document.envelopeId}
-                  envelopeStatus={document.status}
-                  envelopeItems={document.envelopeItems}
-                  token={recipient?.token}
-                  trigger={
-                    <Button type="button" variant="outline" className="flex-1 md:flex-initial">
-                      <DownloadIcon className="mr-2 h-5 w-5" />
-                      <Trans>Download</Trans>
-                    </Button>
-                  }
-                />
-              )}
-
-              {user && (
-                <Button asChild>
-                  <Link to={returnToHomePath}>
-                    <Trans>Go Back Home</Trans>
-                  </Link>
-                </Button>
-              )}
-            </div>
-          </div>
-
-          <div className="flex flex-col items-center">
-            {canSignUp && (
-              <div className="flex max-w-xl flex-col items-center justify-center p-4 md:p-12">
-                <h2 className="mt-8 text-center font-semibold text-xl md:mt-0">
-                  <Trans>Need to sign documents?</Trans>
-                </h2>
-
-                <p className="mt-4 max-w-[55ch] text-center text-muted-foreground/60 leading-normal">
-                  <Trans>Create your account and start using state-of-the-art document signing.</Trans>
-                </p>
-
-                <ClaimAccount defaultName={recipientName} defaultEmail={recipient.email} />
-              </div>
+            {user && (
+              <Button asChild>
+                <Link to={returnToHomePath}>
+                  <Trans>Go Back Home</Trans>
+                </Link>
+              </Button>
            )}
          </div>
        </div>
+
+        <div className="flex flex-col items-center">
+          {canSignUp && (
+            <div className="flex max-w-xl flex-col items-center justify-center p-4 md:p-12">
+              <h2 className="mt-8 text-center font-semibold text-xl md:mt-0">
+                <Trans>Need to sign documents?</Trans>
+              </h2>
+
+              <p className="mt-4 max-w-[55ch] text-center text-muted-foreground/60 leading-normal">
+                <Trans>Create your account and start using state-of-the-art document signing.</Trans>
+              </p>
+
+              <ClaimAccount defaultName={recipientName} defaultEmail={recipient.email} />
+            </div>
+          )}
+        </div>
      </div>
-    </>
+    </div>
  );
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ephraimduncan	5a0f438ee6	Merge branch 'main' into feat/prefetch-intent-navigation-links # Conflicts: # apps/remix/app/components/general/app-header.tsx # apps/remix/app/components/general/app-nav-desktop.tsx # apps/remix/app/components/general/app-nav-mobile.tsx # apps/remix/app/components/general/folder/folder-card.tsx # apps/remix/app/components/general/folder/folder-grid.tsx # apps/remix/app/components/general/menu-switcher.tsx # apps/remix/app/components/general/org-menu-switcher.tsx # apps/remix/app/components/general/settings-nav-mobile.tsx # apps/remix/app/components/tables/admin-claims-table.tsx # apps/remix/app/components/tables/admin-dashboard-users-table.tsx # apps/remix/app/components/tables/admin-organisations-table.tsx # apps/remix/app/components/tables/documents-table-action-button.tsx # apps/remix/app/components/tables/organisation-email-domains-table.tsx # apps/remix/app/components/tables/templates-table-action-dropdown.tsx # apps/remix/app/components/tables/user-billing-organisations-table.tsx # apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx # apps/remix/app/routes/_authenticated+/admin+/email-domains._index.tsx # apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx # apps/remix/app/routes/_authenticated+/dashboard.tsx # apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx # apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx # packages/email/template-components/template-document-reminder.tsx # packages/ui/primitives/tooltip.tsx	2026-05-08 11:17:51 +00:00
ephraimduncan	e0cdddc59c	chore: restore translation files from main These .po files were accidentally reverted during the merge commit. Restoring them to match main since translations are autogenerated.	2026-04-20 00:40:29 +00:00
ephraimduncan	862b2a78ea	Merge branch 'main' into feat/prefetch-intent-navigation-links	2026-04-20 00:20:51 +00:00
ephraimduncan	807ad95354	perf: add prefetch="intent" to navigation Link components Enables React Router's intent-based prefetching on Link components across the app, preloading route data and modules on hover/focus for faster perceived navigation.	2026-03-16 10:02:32 +00:00