chore: Compressed inefficient images automatically

2026-06-13 11:25:03 +03:00 · 2025-09-01 09:13:04 +00:00
1645 changed files with 41435 additions and 112831 deletions
@@ -1,3 +1,4 @@
+__mocks__
 .git
 .vscode
 .github
@@ -7,19 +8,10 @@
 .eslint*
 .oxlintrc*
 .log
-*.md
 Makefile
 Procfile
 app.json
 crowdin.yml
-lint-staged.config.mjs
 build
 docker-compose.yml
 node_modules
-.yarn
-**/*.test.ts
-**/*.test.tsx
-**/*.test.js
-**/*.test.jsx
-**/__tests__
-**/__mocks__
@@ -61,11 +61,6 @@ DATABASE_CONNECTION_POOL_MAX=
 # DOCS: https://docs.getoutline.com/s/hosting/doc/redis-LGM4BFXYp4
 REDIS_URL=redis://redis:6379

-# To enable horizontal scaling of the collaboration service you must provide a Redis URL, it may
-# be the same as above, or a different server.
-# DOCS: https://docs.getoutline.com/s/hosting/doc/horizontal-scaling-hkfU5Stao7
-REDIS_COLLABORATION_URL=
-

 # ––––––––––––––––––––––––––––––––––––––
 # –––––––––––  FILE STORAGE  –––––––––––
@@ -119,18 +114,14 @@ SSL_CERT=
 # false if you can be sure that SSL is terminated at an external loadbalancer.
 FORCE_HTTPS=true

-# When behind a reverse proxy, the header to use for the client IP.
-# The default value is "X-Forwarded-For", common values are "X-Real-IP"
-# and "X-Client-IP".
-# PROXY_IP_HEADER=
-

 # ––––––––––––––––––––––––––––––––––––––
 # ––––––––––  AUTHENTICATION  ––––––––––
 # ––––––––––––––––––––––––––––––––––––––

-# Third party signin credentials, at least ONE OF these is required for a 
-# working installation or you'll have no sign-in options.
+# Third party signin credentials, at least ONE OF EITHER Google, Slack,
+# Discord, or Microsoft is required for a working installation or you'll
+# have no sign-in options.

 # Slack sign-in provider
 # DOCS: https://docs.getoutline.com/s/hosting/doc/slack-sgMujR8J9J
@@ -207,7 +198,7 @@ RATE_LIMITER_DURATION_WINDOW=60
 # –––––––––––  INTEGRATIONS  –––––––––––
 # ––––––––––––––––––––––––––––––––––––––

-# GitHub integration allows previewing issue and pull request links
+# The GitHub integration allows previewing issue and pull request links
 # DOCS: https://docs.getoutline.com/s/hosting/doc/github-GchT3NNxI9
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
@@ -216,12 +207,7 @@ GITHUB_APP_NAME=
 GITHUB_APP_ID=
 GITHUB_APP_PRIVATE_KEY=

-# The GitLab integration allows previewing issue and merge request links
-# DOCS: 
-GITLAB_CLIENT_ID=
-GITLAB_CLIENT_SECRET=
-
-# Linear integration allows previewing issue links as rich mentions
+# The Linear integration allows previewing issue links as rich mentions
 LINEAR_CLIENT_ID=
 LINEAR_CLIENT_SECRET=

@@ -232,10 +218,6 @@ SLACK_VERIFICATION_TOKEN=your_token
 SLACK_APP_ID=A0XXXXXXX
 SLACK_MESSAGE_ACTIONS=true

-# Figma integration allows previewing design files as rich mentions
-FIGMA_CLIENT_ID=
-FIGMA_CLIENT_SECRET=
-
 # For Dropbox integration, follow these instructions to get the key https://www.dropbox.com/developers/embedder#setup
 # and do not forget to whitelist your domain name in the app settings
 DROPBOX_APP_KEY=
@@ -12,15 +12,11 @@ GOOGLE_CLIENT_SECRET=123

 SLACK_CLIENT_ID=123
 SLACK_CLIENT_SECRET=123
-SLACK_VERIFICATION_TOKEN=test-token-123

 GITHUB_CLIENT_ID=123;
 GITHUB_CLIENT_SECRET=123;
 GITHUB_APP_NAME=outline-test;

-GITLAB_CLIENT_ID=123
-GITLAB_CLIENT_SECRET=123
-
 OIDC_CLIENT_ID=client-id
 OIDC_CLIENT_SECRET=client-secret
 OIDC_AUTH_URI=http://localhost/authorize
@@ -33,11 +29,3 @@ RATE_LIMITER_ENABLED=false

 FILE_STORAGE=local
 FILE_STORAGE_LOCAL_ROOT_DIR=/tmp
-
-URL=http://localhost:3000
-COLLABORATION_URL=
-REDIS_URL=redis://localhost:6379
-UTILS_SECRET=test-utils-secret
-
-DEBUG=
-LOG_LEVEL=error
@@ -13,7 +13,7 @@ jobs:

    steps:
      - name: Close unsigned PRs
-        uses: actions/github-script@v8
+        uses: actions/github-script@v6
        with:
          script: |
            const now = new Date();
@@ -40,7 +40,7 @@ jobs:
       github.event.pull_request.head.repo.full_name == github.repository)
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v2
      - name: Compress Images
        id: calibre
        uses: calibreapp/image-actions@main
@@ -48,7 +48,6 @@ jobs:
          githubToken: ${{ secrets.GITHUB_TOKEN }}
          # For non-Pull Requests, run in compressOnly mode and we'll PR after.
          compressOnly: ${{ github.event_name != 'pull_request' }}
-          minPctChange: "10"
      - name: Create Pull Request
        # If it's not a Pull Request then commit any changes as a new PR.
        if: |
@@ -18,61 +18,44 @@ env:
  SMTP_USERNAME: localhost

 jobs:
-  setup:
+  build:
    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.x, 22.x]
+
    steps:
-      - uses: actions/checkout@v5
-      - name: Enable Corepack
-        run: corepack enable
-      - name: Use Node.js 22.x
-        uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
        with:
-          node-version: 22.x
+          node-version: ${{ matrix.node-version }}
          cache: "yarn"
-      - name: Cache node_modules
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn install --immutable
+        run: yarn install --frozen-lockfile --prefer-offline

  lint:
-    needs: setup
+    needs: build
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
-      - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: 22.x
          cache: "yarn"
-      - name: Restore node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
+      - run: yarn install --frozen-lockfile --prefer-offline
      - run: yarn lint --quiet

  types:
-    needs: setup
+    needs: build
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
-      - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: 22.x
          cache: "yarn"
-      - name: Restore node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
+      - run: yarn install --frozen-lockfile --prefer-offline
      - run: yarn tsc

  changes:
@@ -82,7 +65,7 @@ jobs:
      server: ${{ steps.filter.outputs.server }}
      app: ${{ steps.filter.outputs.app }}
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@v2
        id: filter
        with:
@@ -102,29 +85,23 @@ jobs:
              - 'yarn.lock'

  test:
-    needs: [setup, changes]
+    needs: [build, changes]
    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.config == 'true' }}
    runs-on: ubuntu-latest
    strategy:
      matrix:
        test-group: [app, shared]
    steps:
-      - uses: actions/checkout@v5
-      - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: 22.x
          cache: "yarn"
-      - name: Restore node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
+      - run: yarn install --frozen-lockfile --prefer-offline
      - run: yarn test:${{ matrix.test-group }}

  test-server:
-    needs: [setup, changes]
+    needs: [build, changes]
    if: ${{ needs.changes.outputs.server == 'true' || needs.changes.outputs.config == 'true' }}
    runs-on: ubuntu-latest
    services:
@@ -147,41 +124,29 @@ jobs:
        shard: [1, 2, 3, 4]

    steps:
-      - uses: actions/checkout@v5
-      - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: 22.x
          cache: "yarn"
-      - name: Restore node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
+      - run: yarn install --frozen-lockfile --prefer-offline
      - run: yarn sequelize db:migrate
      - name: Run server tests
        run: |
-          TESTFILES=$(find . -name "*.test.ts" -path "*/server/*" | sort | awk "NR % 4 == (${{ matrix.shard }} - 1)")
+          TESTFILES=$(find . -name "*.test.ts" -path "*/server/*" | sort | split -n -d -l $(($(find . -name "*.test.ts" -path "*/server/*" | wc -l)/${{ matrix.shard }})) - | sed -n "${{ matrix.shard }}p")
          yarn test --maxWorkers=2 $TESTFILES

  bundle-size:
-    needs: [setup, types, changes]
-    if: ${{ (needs.changes.outputs.app == 'true' || needs.changes.outputs.config == 'true') && github.repository == 'outline/outline' }}
+    needs: [build, types, changes]
+    if: ${{ needs.changes.outputs.app == 'true' && github.repository == 'outline/outline' }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
-      - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: 22.x
          cache: "yarn"
-      - name: Restore node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
+      - run: yarn install --frozen-lockfile --prefer-offline
      - name: Set environment to production
        run: echo "NODE_ENV=production" >> $GITHUB_ENV
      - run: yarn vite:build
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v2

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubicloud-standard-8-arm
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
@@ -93,7 +93,7 @@ jobs:
    runs-on: ubicloud-standard-8
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
@@ -0,0 +1,30 @@
+name: Lint
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  run-linters:
+    if: startsWith(github.actor, 'codegen-sh')
+    name: Run linters
+    runs-on: ubuntu-latest
+
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the
+      # added or changed files to the repository.
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: "yarn"
+      - run: yarn install --frozen-lockfile --prefer-offline
+      - run: yarn lint --fix
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "Applied automatic fixes"
@@ -12,7 +12,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v5
        with:
          stale-pr-message: "This PR is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 5 days"
          stale-issue-message: "This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 5 days"
@@ -14,11 +14,3 @@ data/*
 *.pem
 *.key
 *.cert
-
-# Yarn Berry
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-.yarn/releases
-!.yarn/sdks
@@ -1,19 +1,16 @@
 {
  "workerIdleMemoryLimit": "0.75",
  "maxWorkers": "50%",
-  "transformIgnorePatterns": ["node_modules/(?!(franc|trigram-utils)/)"],
  "projects": [
    {
      "displayName": "server",
      "roots": ["<rootDir>/server", "<rootDir>/plugins"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1"
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
      },
-      "setupFiles": [
-        "<rootDir>/__mocks__/console.js",
-        "<rootDir>/server/test/setupMocks.js"
-      ],
+      "setupFiles": ["<rootDir>/__mocks__/console.js"],
      "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
      "globalTeardown": "<rootDir>/server/test/globalTeardown.js",
      "testEnvironment": "node"
@@ -24,7 +21,9 @@
      "moduleNameMapper": {
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js"
+        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
+        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
      },
      "modulePaths": ["<rootDir>/app"],
      "setupFiles": ["<rootDir>/__mocks__/window.js"],
@@ -39,7 +38,8 @@
      "roots": ["<rootDir>/shared"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1"
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
      },
      "setupFiles": ["<rootDir>/__mocks__/console.js"],
      "setupFilesAfterEnv": ["<rootDir>/shared/test/setup.ts"],
@@ -51,7 +51,9 @@
      "moduleNameMapper": {
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js"
+        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
+        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
      },
      "setupFiles": ["<rootDir>/__mocks__/window.js"],
      "testEnvironment": "jsdom",
@@ -86,7 +86,6 @@
        "@typescript-eslint/no-require-imports": "off",
        "import/no-named-as-default": "off",
        "import/no-named-as-default-member": "off",
-        "typescript/consistent-type-imports": "error",
        "no-unused-vars": [
          "error",
          {
@@ -95,8 +94,7 @@
            "args": "after-used",
            "ignoreRestSiblings": true
          }
-        ],
-        "react/rules-of-hooks": "error"
+        ]
      },
      "plugins": ["eslint", "oxc", "react", "typescript", "import"]
    }
@@ -5,7 +5,7 @@ require("@dotenvx/dotenvx").config({
 var path = require('path');

 module.exports = {
-  'config': path.resolve('server/config', 'database.js'),
+  'config': path.resolve('server/config', 'database.json'),
  'migrations-path': path.resolve('server', 'migrations'),
  'models-path': path.resolve('server', 'models'),
 }
@@ -1,6 +0,0 @@
-nodeLinker: node-modules
-
-npmMinimalAgeGate: 86400
-
-npmPreapprovedPackages:
-  - outline-icons
@@ -1,195 +0,0 @@
-Outline is a fast, collaborative knowledge base built for teams. It's built with React and TypeScript in both frontend and backend, uses a real-time collaboration engine, and is designed for excellent performance and user experience. The backend is a Koa server with an RPC API and uses PostgreSQL and Redis. The application can be self-hosted or used as a cloud service.
-
-There is a web client which is fully responsive and works on mobile devices.
-
-**Monorepo Structure:**
-
- **`app/`** - React web application with MobX state management
- **`server/`** - Koa API server with Sequelize ORM and background workers
- **`shared/`** - Shared TypeScript types, utilities, and editor components
- **`plugins/`** - Plugin system for extending functionality
- **`public/`** - Static assets served directly
- **Various config files** - TypeScript, Vite, Jest, Prettier, Oxlint configurations
-
-Refer to /docs/ARCHITECTURE.md for detailed architecture documentation.
-
-## Instructions
-
-You're an expert in the following areas:
-
- TypeScript
- React and React Router
- MobX and MobX-React
- Node.js and Koa
- Sequelize ORM
- PostgreSQL
- Redis
- HTML, CSS and Styled Components
- Prosemirror (rich text editor)
- WebSockets and real-time collaboration
-
-## General Guidelines
-
- Critical – Do not create new markdown (.md) files.
- Use early returns for readability.
- Emphasize type safety and static analysis.
- Follow consistent Prettier formatting.
- Do not replace smart quotes ("") or ('') with simple quotes ("").
- Do not add translation strings manually; they will be extracted automatically from the codebase.
-
-## Dependencies and Upgrading
-
- Use yarn for all dependency management.
- After updating dependency versions, install to update lockfiles:
-
-```bash
-yarn install
-```
-
-## TypeScript Usage
-
- Use strict mode.
- Avoid "unknown" unless absolutely necessary.
- Never use "any".
- Prefer type definitions; avoid type assertions (as, !).
- Always use curly braces for if statements.
- Avoid # for private properties.
- Prefer interface over type for object shapes.
-
-## Classes & Code Organization
-
-### Class Member Order
-
-1. Public static variables
-2. Public static methods
-3. Public variables
-4. Public methods
-5. Protected variables & methods
-6. Private variables & methods
-
-### Exports
-
- Exported members must appear at the top of the file.
- Always use named exports for new components & classes.
- Document ALL public/exported functions with JSDoc.
-
-## React Usage
-
- Use functional components with hooks.
- Event handlers should be prefixed with "handle", like "handleClick" for onClick.
- Avoid unnecessary re-renders by using React.memo, useMemo, and useCallback appropriately.
- Use descriptive prop types with TypeScript interfaces.
- Do not import React unless it is used directly.
- Use styled-components for component styling.
- Ensure high accessibility (a11y) standards using ARIA roles and semantic HTML.
-
-## MobX State Management
-
- Use MobX stores for global state management.
- Keep stores in `app/stores/`.
- Use `observable`, `action`, and `computed` decorators appropriately.
- Prefer computed values over manual calculations in render.
- Keep business logic in stores, not components.
-
-## Database & ORM
-
- Use Sequelize models in `server/models/`.
- Generate migrations with Sequelize CLI:
-
-```bash
-yarn sequelize migration:create --name=add-field-to-table
-```
-
- Run migrations with `yarn db:migrate`.
- Use transactions for multi-table operations.
- Add appropriate indexes for query performance.
- Always handle database errors gracefully.
-
-## API Design
-
- RESTful endpoints under `/api/`.
- Authentication endpoints under `/auth/`.
- Use consistent error responses.
- Validate request data using the validation middleware and schemas
- Use presenters to format API responses.
- Keep API routes thin, use model methods for business logic, or commands if logic spans multiple models.
-
-## Authentication & Authorization
-
- JWT tokens for authentication.
- Policies in `server/policies/` for authorization.
- Use cancan-style ability checks.
- Use authenticated middleware for protected routes.
- Always verify user permissions before data access.
-
-## Real-time Collaboration
-
- WebSocket connections for real-time updates.
- Use Y.js for collaborative editing.
- Handle connection state changes gracefully.
-
-## Documentation
-
- All public/exported functions & classes must have JSDoc.
- Include:
-  - Description
-  - @param and @return (start lowercase, end with period)
-  - @throws if applicable
- Add a newline between the description and the @ block.
- Use correct punctuation.
-
-## Testing
-
- Run tests with Jest:
-
-```bash
-# Run a specific test file (preferred)
-yarn test path/to/test.spec.ts
-
-# Run every test (avoid)
-yarn test
-
-# Run test suites (avoid)
-yarn test:app      # All frontend tests
-yarn test:server   # All backend tests
-yarn test:shared   # All shared code tests
-```
-
- Write unit tests for utilities and business logic in a collocated .test.ts file.
- Do not create new test directories
- Mock external dependencies appropriately in **mocks** folder.
- Aim for high code coverage but focus on critical paths.
-
-## Code Quality
-
- Use Oxlint for linting: `yarn lint`
- Format code with Prettier: `yarn format`
- Check types with TypeScript: `yarn tsc`
- Pre-commit hooks run automatically via Husky.
- Fix linting issues before committing.
-
-## Error Handling
-
- Use custom error classes in `server/errors.ts`.
- Always catch and handle errors appropriately.
- Log errors with appropriate context.
- Return user-friendly error messages.
- Never expose sensitive information in errors.
-
-## Performance
-
- Use React.memo for expensive components.
- Implement pagination for large lists.
- Use database indexes effectively.
- Cache expensive computations.
- Monitor performance with appropriate tools.
- Lazy load routes and components where appropriate.
-
-## Security
-
- Sanitize all user input.
- Use CSRF protection.
- Use rateLimiter middleware for sensitive endpoints.
- Follow OWASP guidelines.
- Never store sensitive data in plain text.
- Use environment variables for secrets.
@@ -1 +0,0 @@
-AGENTS.md
@@ -6,7 +6,7 @@ ARG APP_PATH
 WORKDIR $APP_PATH

 # ---
-FROM node:22.21.0-slim AS runner
+FROM node:22-slim AS runner

 LABEL org.opencontainers.image.source="https://github.com/outline/outline"

@@ -14,28 +14,29 @@ ARG APP_PATH
 WORKDIR $APP_PATH
 ENV NODE_ENV=production

-# Create a non-root user compatible with Debian and BusyBox based images
-RUN addgroup --gid 1001 nodejs && \
-    adduser --uid 1001 --ingroup nodejs nodejs && \
-    mkdir -p /var/lib/outline && \
-    chown -R nodejs:nodejs /var/lib/outline && \
-    chown -R nodejs:nodejs $APP_PATH
+COPY --from=base $APP_PATH/build ./build
+COPY --from=base $APP_PATH/server ./server
+COPY --from=base $APP_PATH/public ./public
+COPY --from=base $APP_PATH/.sequelizerc ./.sequelizerc
+COPY --from=base $APP_PATH/node_modules ./node_modules
+COPY --from=base $APP_PATH/package.json ./package.json

-COPY --from=base --chown=nodejs:nodejs $APP_PATH/build ./build
-COPY --from=base --chown=nodejs:nodejs $APP_PATH/server ./server
-COPY --from=base --chown=nodejs:nodejs $APP_PATH/public ./public
-COPY --from=base --chown=nodejs:nodejs $APP_PATH/.sequelizerc ./.sequelizerc
-COPY --from=base --chown=nodejs:nodejs $APP_PATH/node_modules ./node_modules
-COPY --from=base --chown=nodejs:nodejs $APP_PATH/package.json ./package.json
 # Install wget to healthcheck the server
 RUN  apt-get update \
-    && apt-get install -y wget \
-    && rm -rf /var/lib/apt/lists/*
+  && apt-get install -y wget \
+  && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user compatible with Debian and BusyBox based images
+RUN addgroup --gid 1001 nodejs && \
+  adduser --uid 1001 --ingroup nodejs nodejs && \
+  chown -R nodejs:nodejs $APP_PATH/build && \
+  mkdir -p /var/lib/outline && \
+  chown -R nodejs:nodejs /var/lib/outline

 ENV FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data
 RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-    chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-    chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
+  chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
+  chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"

 VOLUME /var/lib/outline/data

@@ -44,4 +45,4 @@ USER nodejs
 HEALTHCHECK --interval=1m CMD wget -qO- "http://localhost:${PORT:-3000}/_health" | grep -q "OK" || exit 1

 EXPOSE 3000
-CMD ["node", "build/server/index.js"]
+CMD ["yarn", "start"]
@@ -1,23 +1,24 @@
 ARG APP_PATH=/opt/outline
-FROM node:22.21.0 AS deps
+FROM node:20 AS deps

 ARG APP_PATH
 WORKDIR $APP_PATH
-COPY ./package.json ./yarn.lock ./.yarnrc.yml ./
+COPY ./package.json ./yarn.lock ./
 COPY ./patches ./patches

 RUN apt-get update && apt-get install -y cmake
 ENV NODE_OPTIONS="--max-old-space-size=24000"

-RUN corepack enable
-RUN yarn install --immutable --network-timeout 1000000 && \
+RUN yarn install --no-optional --frozen-lockfile --network-timeout 1000000 && \
  yarn cache clean

 COPY . .
 ARG CDN_URL
 RUN yarn build

-RUN yarn workspaces focus --production && \
+RUN rm -rf node_modules
+
+RUN yarn install --production=true --frozen-lockfile --network-timeout 1000000 && \
  yarn cache clean

 ENV PORT=3000
@@ -3,8 +3,8 @@ Business Source License 1.1
 Parameters

 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 1.6.1
-                      The Licensed Work is (c) 2026 General Outline, Inc.
+Licensed Work:        Outline 0.87.1
+                      The Licensed Work is (c) 2025 General Outline, Inc.
 Additional Use Grant: You may make use of the Licensed Work, provided that
                      you may not use the Licensed Work for a Document
                      Service.
@@ -15,7 +15,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that
                      Licensed Work by creating teams and documents
                      controlled by such third parties.

-Change Date:          2030-03-18
+Change Date:          2029-08-31

 Change License:       Apache License, Version 2.0

@@ -1,7 +1,7 @@
 up:
 	docker compose up -d redis postgres
 	yarn install-local-ssl
-	yarn install --immutable
+	yarn install --pure-lockfile
 	yarn dev:watch

 build:
@@ -1,9 +1,5 @@
 <p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./public/logos/outline-logo-dark.png" height="29">
-    <source media="(prefers-color-scheme: light)" srcset="./public/logos/outline-logo-light.png" height="29">
-    <img src="./public/logos/outline-logo-light.png" height="29" alt="Outline" />
-  </picture>
+  <img src="https://user-images.githubusercontent.com/31465/34380645-bd67f474-eb0b-11e7-8d03-0151c1730654.png" height="29" />
 </p>
 <p align="center">
  <i>A fast, collaborative, knowledge base for your team built using React and Node.js.<br/>Try out Outline using our hosted version at <a href="https://www.getoutline.com">www.getoutline.com</a>.</i>
@@ -11,13 +7,14 @@
  <img width="1640" alt="screenshot" src="https://user-images.githubusercontent.com/380914/110356468-26374600-7fef-11eb-9f6a-f2cc2c8c6590.png">
 </p>
 <p align="center">
+  <a href="https://circleci.com/gh/outline/outline" rel="nofollow"><img src="https://circleci.com/gh/outline/outline.svg?style=shield"></a>
  <a href="http://www.typescriptlang.org" rel="nofollow"><img src="https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg" alt="TypeScript"></a>
  <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat" alt="Prettier"></a>
  <a href="https://github.com/styled-components/styled-components"><img src="https://img.shields.io/badge/style-%F0%9F%92%85%20styled--components-orange.svg" alt="Styled Components"></a>
  <a href="https://translate.getoutline.com/project/outline" alt="Localized"><img src="https://badges.crowdin.net/outline/localized.svg"></a>
 </p>

-This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, A hosted version of the app is offered at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).
+This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, we offer a hosted version of the app at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).

 If you'd like to run your own copy of Outline or contribute to development then this is the place for you.

@@ -33,9 +30,9 @@ There is a short guide for [setting up a development environment](https://docs.g

 ## Contributing

-Outline is built and maintained by a small team – your help finding and fixing bugs is appreciated, though AI assisted PR's from new contributors are discouraged and unlikely to be merged.
+Outline is built and maintained by a small team – we'd love your help to fix bugs and add features!

-Before submitting a pull request _you must_ discuss with the core team by creating or commenting in an issue on [GitHub](https://www.github.com/outline/outline/issues) – we'd also love to hear from you in the [discussions](https://www.github.com/outline/outline/discussions). This way we can ensure that an approach is agreed on before code is written and that you have read these instructions. This will result in a much higher likelihood of your code being accepted.
+Before submitting a pull request _please_ discuss with the core team by creating or commenting in an issue on [GitHub](https://www.github.com/outline/outline/issues) – we'd also love to hear from you in the [discussions](https://www.github.com/outline/outline/discussions). This way we can ensure that an approach is agreed on before code is written. This will result in a much higher likelihood of your code being accepted.

 If you’re looking for ways to get started, here's a list of ways to help us improve Outline:

@@ -54,14 +51,13 @@ please refer to the [architecture document](docs/ARCHITECTURE.md) first for a hi

 In development Outline outputs simple logging to the console, prefixed by categories. In production it outputs JSON logs, these can be easily parsed by your preferred log ingestion pipeline.

-HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable. logging
-can be enabled for all categories by setting `DEBUG=*` or for specific categories such as `DEBUG=database` and `LOG_LEVEL=debug`, or `LOG_LEVEL=silly` for very verbose logging.
+HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable.

 ## Tests

 We aim to have sufficient test coverage for critical parts of the application and aren't aiming for 100% unit test coverage. All API endpoints and anything authentication related should be thoroughly tested.

-To add new tests, write your tests with [Jest](https://facebook.github.io/jest/) and add a file with `.test.ts` extension next to the tested code.
+To add new tests, write your tests with [Jest](https://facebook.github.io/jest/) and add a file with `.test.js` extension next to the tested code.

 ```shell
 # To run all tests
@@ -72,14 +68,14 @@ make watch
 ```

 Once the test database is created with `make test` you may individually run
-frontend and backend tests directly with jest:
+frontend and backend tests directly.

 ```shell
 # To run backend tests
 yarn test:server

-# To run a specific backend test in watch mode
-yarn test path/to/file.test.ts --watch
+# To run a specific backend test
+yarn test:server myTestFile

 # To run frontend tests
 yarn test:app
@@ -90,15 +86,14 @@ yarn test:app
 Sequelize is used to create and run migrations, for example:

 ```shell
-yarn db:create-migration --name my-migration
-yarn db:migrate
-yarn db:rollback
+yarn sequelize migration:generate --name my-migration
+yarn sequelize db:migrate
 ```

-Or, to run migrations on test database:
+Or to run migrations on test database:

 ```shell
-yarn db:migrate --env test
+yarn sequelize db:migrate --env test
 ```

 # Activity
@@ -21,23 +21,7 @@
    }
  ],
  "scripts": {
-    "postdeploy": "yarn sequelize db:migrate",
-    "pr-predeploy": "yarn sequelize db:migrate"
-  },
-  "environments": {
-    "review": {
-      "scripts": {
-        "postdeploy": "yarn sequelize db:migrate"
-      },
-      "addons": [
-        {
-          "plan": "heroku-redis:mini"
-        },
-        {
-          "plan": "heroku-postgresql:essential-0"
-        }
-      ]
-    }
+    "postdeploy": "yarn sequelize db:migrate"
  },
  "env": {
    "NODE_ENV": {
@@ -59,12 +43,8 @@
      "required": true
    },
    "URL": {
-      "description": "https://{your app name}.herokuapp.com, or the domain you are binding to. For review apps, this is auto-generated.",
-      "required": false
-    },
-    "HEROKU_APP_NAME": {
-      "description": "Automatically set by Heroku for review apps",
-      "required": false
+      "description": "https://{your app name}.herokuapp.com, or the domain you are binding to",
+      "required": true
    },
    "GOOGLE_CLIENT_ID": {
      "description": "See https://developers.google.com/identity/protocols/OAuth2 to create a new Google OAuth client. You must configure at least one of Slack or Google to control login.",
@@ -214,11 +194,6 @@
      "description": "Use a secure SMTP connection (optional)",
      "required": false
    },
-    "SMTP_DISABLE_STARTTLS": {
-      "value": "false",
-      "description": "Disable STARTTLS even if the server supports it (optional)",
-      "required": false
-    },
    "SMTP_TLS_CIPHERS": {
      "description": "Override SMTP cipher configuration (optional)",
      "required": false
@@ -5,13 +5,6 @@
    {
      "files": ["**/*.{jsx,tsx}"],
      "rules": {
-        "no-restricted-globals": [
-          "error",
-          {
-            "name": "crypto",
-            "message": "Do not use, does not work in environments without SSL."
-          }
-        ],
        "no-restricted-imports": [
          "error",
          {
@@ -20,6 +13,13 @@
                "group": ["mime-types"],
                "message": "Do not use the mime-types package in the browser."
              }
+            ],
+            "paths": [
+              {
+                "name": "reakit/Menu",
+                "importNames": ["useMenuState"],
+                "message": "Do not use useMenuState from reakit/Menu. Use useMenuState instead."
+              }
            ]
          }
        ]
@@ -1,9 +1,9 @@
 import { PlusIcon, TrashIcon } from "outline-icons";
 import stores from "~/stores";
-import type ApiKey from "~/models/ApiKey";
+import ApiKey from "~/models/ApiKey";
 import ApiKeyNew from "~/scenes/ApiKeyNew";
 import ApiKeyRevokeDialog from "~/scenes/Settings/components/ApiKeyRevokeDialog";
-import { createAction } from "..";
+import { createAction, createActionV2 } from "..";
 import { SettingsSection } from "../sections";

 export const createApiKey = createAction({
@@ -26,9 +26,9 @@ export const createApiKey = createAction({
 });

 export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
-  createAction({
-    name: ({ t, isMenu }) =>
-      isMenu
+  createActionV2({
+    name: ({ t, isContextMenu }) =>
+      isContextMenu
        ? apiKey.isExpired
          ? t("Delete")
          : `${t("Revoke")}…`
@@ -1,12 +1,8 @@
 import {
-  SortAlphabeticalReverseIcon,
-  SortAlphabeticalIcon,
  ArchiveIcon,
  CollectionIcon,
  EditIcon,
  ExportIcon,
-  ImportIcon,
-  SortManualIcon,
  NewDocumentIcon,
  PadlockIcon,
  PlusIcon,
@@ -26,11 +22,12 @@ import { CollectionNew } from "~/components/Collection/CollectionNew";
 import CollectionDeleteDialog from "~/components/CollectionDeleteDialog";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
+import SharePopover from "~/components/Sharing/Collection/SharePopover";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import {
  createAction,
-  createInternalLinkAction,
-  createActionWithChildren,
+  createActionV2,
+  createInternalLinkActionV2,
 } from "~/actions";
 import { ActiveCollectionSection, CollectionSection } from "~/actions/sections";
 import { setPersistedState } from "~/hooks/usePersistedState";
@@ -40,18 +37,12 @@ import {
  searchPath,
 } from "~/utils/routeHelpers";
 import ExportDialog from "~/components/ExportDialog";
-import { getEventFiles } from "@shared/utils/files";
-import history from "~/utils/history";
-import lazyWithRetry from "~/utils/lazyWithRetry";

 const ColorCollectionIcon = ({ collection }: { collection: Collection }) => (
  <DynamicCollectionIcon collection={collection} />
 );
-const SharePopover = lazyWithRetry(
-  () => import("~/components/Sharing/Collection/SharePopover")
-);

-export const openCollection = createActionWithChildren({
+export const openCollection = createAction({
  name: ({ t }) => t("Open collection"),
  analyticsName: "Open collection",
  section: CollectionSection,
@@ -59,17 +50,15 @@ export const openCollection = createActionWithChildren({
  icon: <CollectionIcon />,
  children: ({ stores }) => {
    const collections = stores.collections.orderedData;
-    return collections.map((collection) =>
-      createInternalLinkAction({
-        // Note: using url which includes the slug rather than id here to bust
-        // cache if the collection is renamed
-        id: collection.path,
-        name: collection.name,
-        icon: <ColorCollectionIcon collection={collection} />,
-        section: CollectionSection,
-        to: collection.path,
-      })
-    );
+    return collections.map((collection) => ({
+      // Note: using url which includes the slug rather than id here to bust
+      // cache if the collection is renamed
+      id: collection.path,
+      name: collection.name,
+      icon: <ColorCollectionIcon collection={collection} />,
+      section: CollectionSection,
+      to: collection.path,
+    }));
  },
 });

@@ -91,16 +80,17 @@ export const createCollection = createAction({
  },
 });

-export const editCollection = createAction({
-  name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
+export const editCollection = createActionV2({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Edit")}…` : t("Edit collection"),
  analyticsName: "Edit collection",
  section: ActiveCollectionSection,
  icon: <EditIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.update),
-  perform: ({ t, getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) =>
+    !!activeCollectionId &&
+    stores.policies.abilities(activeCollectionId).update,
+  perform: ({ t, activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
      return;
    }

@@ -109,29 +99,34 @@ export const editCollection = createAction({
      content: (
        <CollectionEdit
          onSubmit={stores.dialogs.closeAllModals}
-          collectionId={collection.id}
+          collectionId={activeCollectionId}
        />
      ),
    });
  },
 });

-export const editCollectionPermissions = createAction({
-  name: ({ t, isMenu }) =>
-    isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
+export const editCollectionPermissions = createActionV2({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Permissions")}…` : t("Collection permissions"),
  analyticsName: "Collection permissions",
  section: ActiveCollectionSection,
  icon: <PadlockIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.update),
-  perform: ({ t, getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) =>
+    !!activeCollectionId &&
+    stores.policies.abilities(activeCollectionId).update,
+  perform: ({ t, activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = stores.collections.get(activeCollectionId);
    if (!collection) {
      return;
    }

    stores.dialogs.openModal({
      title: t("Share this collection"),
+      style: { marginBottom: -12 },
      content: (
        <SharePopover
          collection={collection}
@@ -143,145 +138,27 @@ export const editCollectionPermissions = createAction({
  },
 });

-export const importDocument = createAction({
-  name: ({ t }) => t("Import document"),
-  analyticsName: "Import document",
-  section: ActiveCollectionSection,
-  icon: <ImportIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some(
-      (policy) => policy.abilities.createDocument
-    ),
-  perform: ({ t, getActiveModel, stores }) => {
-    const { documents } = stores;
-    const collection = getActiveModel(Collection);
-    if (!collection) {
-      return;
-    }
-    const input = document.createElement("input");
-    input.type = "file";
-    input.accept = documents.importFileTypesString;
-
-    input.onchange = async (ev) => {
-      const files = getEventFiles(ev);
-      const file = files[0];
-      const toastId = toast.loading(`${t("Uploading")}…`);
-
-      try {
-        const document = await documents.import(file, null, collection.id, {
-          publish: true,
-        });
-        history.push(document.path);
-      } catch (err) {
-        toast.error(err.message);
-      } finally {
-        toast.dismiss(toastId);
-      }
-    };
-
-    input.click();
-  },
-});
-
-export const sortCollection = createActionWithChildren({
-  name: ({ t }) => t("Sort in sidebar"),
-  section: ActiveCollectionSection,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.update),
-  icon: ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
-    const sortAlphabetical = collection?.sort.field === "title";
-    const sortDir = collection?.sort.direction;
-
-    return sortAlphabetical ? (
-      sortDir === "asc" ? (
-        <SortAlphabeticalIcon />
-      ) : (
-        <SortAlphabeticalReverseIcon />
-      )
-    ) : (
-      <SortManualIcon />
-    );
-  },
-  children: [
-    createAction({
-      name: ({ t }) => t("A-Z sort"),
-      section: ActiveCollectionSection,
-      selected: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return (
-          collection?.sort.field === "title" &&
-          collection?.sort.direction === "asc"
-        );
-      },
-      perform: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.save({
-          sort: {
-            field: "title",
-            direction: "asc",
-          },
-        });
-      },
-    }),
-    createAction({
-      name: ({ t }) => t("Z-A sort"),
-      section: ActiveCollectionSection,
-      selected: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return (
-          collection?.sort.field === "title" &&
-          collection?.sort.direction === "desc"
-        );
-      },
-      perform: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.save({
-          sort: {
-            field: "title",
-            direction: "desc",
-          },
-        });
-      },
-    }),
-    createAction({
-      name: ({ t }) => t("Manual sort"),
-      section: ActiveCollectionSection,
-      selected: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.sort.field !== "title";
-      },
-      perform: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.save({
-          sort: {
-            field: "index",
-            direction: "asc",
-          },
-        });
-      },
-    }),
-  ],
-});
-
-export const searchInCollection = createInternalLinkAction({
+export const searchInCollection = createInternalLinkActionV2({
  name: ({ t }) => t("Search in collection"),
  analyticsName: "Search collection",
  section: ActiveCollectionSection,
  icon: <SearchIcon />,
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
+
    if (!collection?.isActive) {
      return false;
    }

-    return stores.policies.abilities(collection.id).readDocument;
+    return stores.policies.abilities(activeCollectionId).readDocument;
  },
-  to: ({ getActiveModel, sidebarContext }) => {
-    const collection = getActiveModel(Collection);
-
+  to: ({ activeCollectionId, sidebarContext }) => {
    const [pathname, search] = searchPath({
-      collectionId: collection?.id,
+      collectionId: activeCollectionId,
    }).split("?");

    return {
@@ -292,124 +169,143 @@ export const searchInCollection = createInternalLinkAction({
  },
 });

-export const starCollection = createAction({
+export const starCollection = createActionV2({
  name: ({ t }) => t("Star"),
  analyticsName: "Star collection",
  section: ActiveCollectionSection,
  icon: <StarredIcon />,
  keywords: "favorite bookmark",
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
      return false;
    }
-
+    const collection = stores.collections.get(activeCollectionId);
    return (
-      !collection.isStarred && stores.policies.abilities(collection.id).star
+      !collection?.isStarred &&
+      stores.policies.abilities(activeCollectionId).star
    );
  },
-  perform: async ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  perform: async ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
      return;
    }
-    await collection.star();
+
+    const collection = stores.collections.get(activeCollectionId);
+    await collection?.star();
    setPersistedState(getHeaderExpandedKey("starred"), true);
  },
 });

-export const unstarCollection = createAction({
+export const unstarCollection = createActionV2({
  name: ({ t }) => t("Unstar"),
  analyticsName: "Unstar collection",
  section: ActiveCollectionSection,
  icon: <UnstarredIcon />,
  keywords: "unfavorite unbookmark",
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
      return false;
    }
-
+    const collection = stores.collections.get(activeCollectionId);
    return (
-      !!collection.isStarred && stores.policies.abilities(collection.id).unstar
+      !!collection?.isStarred &&
+      stores.policies.abilities(activeCollectionId).unstar
    );
  },
-  perform: async ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
+  perform: async ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
    await collection?.unstar();
  },
 });

-export const subscribeCollection = createAction({
+export const subscribeCollection = createActionV2({
  name: ({ t }) => t("Subscribe"),
  analyticsName: "Subscribe to collection",
  section: ActiveCollectionSection,
  icon: <SubscribeIcon />,
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
      return false;
    }

+    const collection = stores.collections.get(activeCollectionId);
+
    return (
-      !!collection.isActive &&
-      !collection.isSubscribed &&
-      stores.policies.abilities(collection.id).subscribe
+      !!collection?.isActive &&
+      !collection?.isSubscribed &&
+      stores.policies.abilities(activeCollectionId).subscribe
    );
  },
-  perform: async ({ getActiveModel, t }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  perform: async ({ activeCollectionId, stores, t }) => {
+    if (!activeCollectionId) {
      return;
    }

-    await collection.subscribe();
+    const collection = stores.collections.get(activeCollectionId);
+
+    await collection?.subscribe();
+
    toast.success(t("Subscribed to document notifications"));
  },
 });

-export const unsubscribeCollection = createAction({
+export const unsubscribeCollection = createActionV2({
  name: ({ t }) => t("Unsubscribe"),
  analyticsName: "Unsubscribe from collection",
  section: ActiveCollectionSection,
  icon: <UnsubscribeIcon />,
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
      return false;
    }

+    const collection = stores.collections.get(activeCollectionId);
+
    return (
-      !!collection.isActive &&
-      !!collection.isSubscribed &&
-      stores.policies.abilities(collection.id).unsubscribe
+      !!collection?.isActive &&
+      !!collection?.isSubscribed &&
+      stores.policies.abilities(activeCollectionId).unsubscribe
    );
  },
-  perform: async ({ getActiveModel, t }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  perform: async ({ activeCollectionId, currentUserId, stores, t }) => {
+    if (!activeCollectionId || !currentUserId) {
      return;
    }

-    await collection.unsubscribe();
+    const collection = stores.collections.get(activeCollectionId);
+
+    await collection?.unsubscribe();
+
    toast.success(t("Unsubscribed from document notifications"));
  },
 });

-export const archiveCollection = createAction({
+export const archiveCollection = createActionV2({
  name: ({ t }) => `${t("Archive")}…`,
  analyticsName: "Archive collection",
  section: ActiveCollectionSection,
  icon: <ArchiveIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.archive),
-  perform: async ({ getActiveModel, stores, t }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeCollectionId).archive;
+  },
+  perform: async ({ activeCollectionId, stores, t }) => {
+    const { dialogs, collections } = stores;
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = collections.get(activeCollectionId);
    if (!collection) {
      return;
    }

-    stores.dialogs.openModal({
+    dialogs.openModal({
      title: t("Archive collection"),
      content: (
        <ConfirmationDialog
@@ -429,15 +325,22 @@ export const archiveCollection = createAction({
  },
 });

-export const restoreCollection = createAction({
+export const restoreCollection = createActionV2({
  name: ({ t }) => t("Restore"),
  analyticsName: "Restore collection",
  section: CollectionSection,
  icon: <RestoreIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.restore),
-  perform: async ({ getActiveModel, t }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeCollectionId).restore;
+  },
+  perform: async ({ activeCollectionId, stores, t }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = stores.collections.get(activeCollectionId);
    if (!collection) {
      return;
    }
@@ -447,16 +350,24 @@ export const restoreCollection = createAction({
  },
 });

-export const deleteCollection = createAction({
+export const deleteCollection = createActionV2({
  name: ({ t }) => `${t("Delete")}…`,
  analyticsName: "Delete collection",
  section: ActiveCollectionSection,
  dangerous: true,
  icon: <TrashIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.delete),
-  perform: ({ getActiveModel, t, stores }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return stores.policies.abilities(activeCollectionId).delete;
+  },
+  perform: ({ activeCollectionId, t, stores }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
    if (!collection) {
      return;
    }
@@ -473,15 +384,26 @@ export const deleteCollection = createAction({
  },
 });

-export const exportCollection = createAction({
+export const exportCollection = createActionV2({
  name: ({ t }) => `${t("Export")}…`,
  analyticsName: "Export collection",
  section: ActiveCollectionSection,
  icon: <ExportIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.export),
-  perform: async ({ getActiveModel, stores, t }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ currentTeamId, activeCollectionId, stores }) => {
+    if (!currentTeamId || !activeCollectionId) {
+      return false;
+    }
+
+    return (
+      !!stores.policies.abilities(currentTeamId).createExport &&
+      !!stores.policies.abilities(activeCollectionId).export
+    );
+  },
+  perform: async ({ activeCollectionId, stores, t }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = stores.collections.get(activeCollectionId);
    if (!collection) {
      return;
    }
@@ -498,19 +420,19 @@ export const exportCollection = createAction({
  },
 });

-export const createDocument = createInternalLinkAction({
+export const createDocument = createInternalLinkActionV2({
  name: ({ t }) => t("New document"),
  analyticsName: "New document",
  section: ActiveCollectionSection,
  icon: <NewDocumentIcon />,
  keywords: "new create document",
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some(
-      (policy) => policy.abilities.createDocument
+  visible: ({ activeCollectionId, stores }) =>
+    !!(
+      !!activeCollectionId &&
+      stores.policies.abilities(activeCollectionId).createDocument
    ),
-  to: ({ getActiveModel, sidebarContext }) => {
-    const collection = getActiveModel(Collection);
-    const [pathname, search] = newDocumentPath(collection?.id).split("?");
+  to: ({ activeCollectionId, sidebarContext }) => {
+    const [pathname, search] = newDocumentPath(activeCollectionId).split("?");

    return {
      pathname,
@@ -520,19 +442,25 @@ export const createDocument = createInternalLinkAction({
  },
 });

-export const createTemplate = createInternalLinkAction({
+export const createTemplate = createInternalLinkActionV2({
  name: ({ t }) => t("New template"),
  analyticsName: "New template",
  section: ActiveCollectionSection,
  icon: <ShapesIcon />,
  keywords: "new create template",
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some(
-      (policy) => policy.abilities.createTemplate
+  visible: ({ activeCollectionId, stores }) =>
+    !!(
+      !!activeCollectionId &&
+      stores.policies.abilities(activeCollectionId).createDocument
    ),
-  to: ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
-    return newTemplatePath(collection?.id);
+  to: ({ activeCollectionId, sidebarContext }) => {
+    const [pathname, search] = newTemplatePath(activeCollectionId).split("?");
+
+    return {
+      pathname,
+      search,
+      state: { sidebarContext },
+    };
  },
 });

@@ -1,9 +1,9 @@
 import { DoneIcon, SmileyIcon, TrashIcon } from "outline-icons";
 import { toast } from "sonner";
-import type Comment from "~/models/Comment";
+import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
-import { createAction } from "..";
+import { createActionV2 } from "..";
 import { ActiveDocumentSection } from "../sections";

 export const deleteCommentFactory = ({
@@ -13,7 +13,7 @@ export const deleteCommentFactory = ({
  comment: Comment;
  onDelete: () => void;
 }) =>
-  createAction({
+  createActionV2({
    name: ({ t }) => `${t("Delete")}…`,
    analyticsName: "Delete comment",
    section: ActiveDocumentSection,
@@ -39,7 +39,7 @@ export const resolveCommentFactory = ({
  comment: Comment;
  onResolve: () => void;
 }) =>
-  createAction({
+  createActionV2({
    name: ({ t }) => t("Mark as resolved"),
    analyticsName: "Resolve thread",
    section: ActiveDocumentSection,
@@ -61,7 +61,7 @@ export const unresolveCommentFactory = ({
  comment: Comment;
  onUnresolve: () => void;
 }) =>
-  createAction({
+  createActionV2({
    name: ({ t }) => t("Mark as unresolved"),
    analyticsName: "Unresolve thread",
    section: ActiveDocumentSection,
@@ -80,7 +80,7 @@ export const viewCommentReactionsFactory = ({
 }: {
  comment: Comment;
 }) =>
-  createAction({
+  createActionV2({
    name: ({ t }) => `${t("View reactions")}`,
    analyticsName: "View comment reactions",
    section: ActiveDocumentSection,
@@ -9,7 +9,7 @@ import {
  UserIcon,
 } from "outline-icons";
 import { toast } from "sonner";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createAction } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
 import env from "~/env";
 import { client } from "~/utils/ApiClient";
@@ -17,19 +17,9 @@ import { Feature, FeatureFlags } from "~/utils/FeatureFlags";
 import Logger from "~/utils/Logger";
 import { deleteAllDatabases } from "~/utils/developer";
 import history from "~/utils/history";
-import { homePath, debugPath } from "~/utils/routeHelpers";
+import { homePath } from "~/utils/routeHelpers";

-export const goToDebug = createAction({
-  name: "Go to debug screen",
-  icon: <BeakerIcon />,
-  section: DeveloperSection,
-  visible: () => env.ENVIRONMENT === "development",
-  perform: () => {
-    history.push(debugPath());
-  },
-});
-
-export const copyId = createActionWithChildren({
+export const copyId = createAction({
  name: ({ t }) => t("Copy ID"),
  icon: <CopyIcon />,
  keywords: "uuid",
@@ -186,22 +176,7 @@ export const toggleDebugLogging = createAction({
  },
 });

-export const toggleDebugSafeArea = createAction({
-  name: () => "Toggle menu safe area debugging",
-  icon: <ToolsIcon />,
-  section: DeveloperSection,
-  visible: () => env.ENVIRONMENT === "development",
-  perform: ({ stores }) => {
-    stores.ui.toggleDebugSafeArea();
-    toast.message(
-      stores.ui.debugSafeArea
-        ? "Menu safe area debugging enabled"
-        : "Menu safe area debugging disabled"
-    );
-  },
-});
-
-export const toggleFeatureFlag = createActionWithChildren({
+export const toggleFeatureFlag = createAction({
  name: "Toggle feature flag",
  icon: <BeakerIcon />,
  section: DeveloperSection,
@@ -225,17 +200,15 @@ export const toggleFeatureFlag = createActionWithChildren({
  ),
 });

-export const developer = createActionWithChildren({
+export const developer = createAction({
  name: ({ t }) => t("Development"),
  keywords: "debug",
  icon: <ToolsIcon />,
  iconInContextMenu: false,
  section: DeveloperSection,
  children: [
-    goToDebug,
    copyId,
    toggleDebugLogging,
-    toggleDebugSafeArea,
    toggleFeatureFlag,
    createToast,
    createTestUsers,
@@ -1,21 +0,0 @@
-import { PlusIcon } from "outline-icons";
-import { createAction } from "~/actions";
-import { TeamSection } from "../sections";
-import stores from "~/stores";
-import { EmojiCreateDialog } from "~/components/EmojiCreateDialog";
-
-export const createEmoji = createAction({
-  name: ({ t }) => `${t("New emoji")}…`,
-  analyticsName: "Create emoji",
-  icon: <PlusIcon />,
-  keywords: "emoji custom upload image",
-  section: TeamSection,
-  visible: () =>
-    stores.policies.abilities(stores.auth.team?.id || "").createEmoji,
-  perform: ({ t }) => {
-    stores.dialogs.openModal({
-      title: t("Upload emoji"),
-      content: <EmojiCreateDialog onSubmit={stores.dialogs.closeAllModals} />,
-    });
-  },
-});
@@ -2,28 +2,9 @@ import { TrashIcon } from "outline-icons";
 import stores from "~/stores";
 import { createAction } from "..";
 import { SettingsSection } from "../sections";
-import type Integration from "~/models/Integration";
-import { DisconnectAnalyticsDialog } from "~/scenes/Settings/components/DisconnectAnalyticsDialog";
-import type { IntegrationType } from "@shared/types";
-import { settingsPath } from "@shared/utils/routeHelpers";
-import history from "~/utils/history";
-
-export const disconnectIntegrationFactory = (integration?: Integration) =>
-  createAction({
-    name: ({ t }) => t("Disconnect"),
-    analyticsName: "Disconnect integration",
-    section: SettingsSection,
-    icon: <TrashIcon />,
-    keywords: "disconnect",
-    visible: () => !!integration,
-    perform: async ({ event }) => {
-      event?.preventDefault();
-      event?.stopPropagation();
-
-      await integration?.delete();
-      history.push(settingsPath("integrations"));
-    },
-  });
+import Integration from "~/models/Integration";
+import { IntegrationType } from "@shared/types";
+import { DisconnectAnalyticsDialog } from "~/components/DisconnectAnalyticsDialog";

 export const disconnectAnalyticsIntegrationFactory = (
  integration?: Integration<IntegrationType.Analytics>
@@ -17,12 +17,13 @@ import {
 import { UrlHelper } from "@shared/utils/UrlHelper";
 import { isMac } from "@shared/utils/browser";
 import stores from "~/stores";
-import type SearchQuery from "~/models/SearchQuery";
+import SearchQuery from "~/models/SearchQuery";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
 import {
  createAction,
-  createExternalLinkAction,
-  createInternalLinkAction,
+  createActionV2,
+  createExternalLinkActionV2,
+  createInternalLinkActionV2,
 } from "~/actions";
 import { NavigationSection, RecentSearchesSection } from "~/actions/sections";
 import Desktop from "~/utils/Desktop";
@@ -36,7 +37,7 @@ import {
  settingsPath,
 } from "~/utils/routeHelpers";

-export const navigateToHome = createInternalLinkAction({
+export const navigateToHome = createAction({
  name: ({ t }) => t("Home"),
  analyticsName: "Navigate to home",
  section: NavigationSection,
@@ -47,7 +48,7 @@ export const navigateToHome = createInternalLinkAction({
 });

 export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
-  createInternalLinkAction({
+  createAction({
    section: RecentSearchesSection,
    name: searchQuery.query,
    analyticsName: "Navigate to recent search query",
@@ -55,7 +56,7 @@ export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
    to: searchPath({ query: searchQuery.query }),
  });

-export const navigateToDrafts = createInternalLinkAction({
+export const navigateToDrafts = createAction({
  name: ({ t }) => t("Drafts"),
  analyticsName: "Navigate to drafts",
  section: NavigationSection,
@@ -64,7 +65,7 @@ export const navigateToDrafts = createInternalLinkAction({
  visible: ({ location }) => location.pathname !== draftsPath(),
 });

-export const navigateToSearch = createInternalLinkAction({
+export const navigateToSearch = createAction({
  name: ({ t }) => t("Search"),
  analyticsName: "Navigate to search",
  section: NavigationSection,
@@ -73,7 +74,7 @@ export const navigateToSearch = createInternalLinkAction({
  visible: ({ location }) => location.pathname !== searchPath(),
 });

-export const navigateToArchive = createInternalLinkAction({
+export const navigateToArchive = createAction({
  name: ({ t }) => t("Archive"),
  analyticsName: "Navigate to archive",
  section: NavigationSection,
@@ -83,7 +84,7 @@ export const navigateToArchive = createInternalLinkAction({
  visible: ({ location }) => location.pathname !== archivePath(),
 });

-export const navigateToTrash = createInternalLinkAction({
+export const navigateToTrash = createAction({
  name: ({ t }) => t("Trash"),
  analyticsName: "Navigate to trash",
  section: NavigationSection,
@@ -92,7 +93,7 @@ export const navigateToTrash = createInternalLinkAction({
  visible: ({ location }) => location.pathname !== trashPath(),
 });

-export const navigateToSettings = createInternalLinkAction({
+export const navigateToSettings = createAction({
  name: ({ t }) => t("Settings"),
  analyticsName: "Navigate to settings",
  section: NavigationSection,
@@ -102,7 +103,7 @@ export const navigateToSettings = createInternalLinkAction({
  to: settingsPath(),
 });

-export const navigateToWorkspaceSettings = createInternalLinkAction({
+export const navigateToWorkspaceSettings = createInternalLinkActionV2({
  name: ({ t }) => t("Settings"),
  analyticsName: "Navigate to workspace settings",
  section: NavigationSection,
@@ -111,7 +112,7 @@ export const navigateToWorkspaceSettings = createInternalLinkAction({
  to: settingsPath("details"),
 });

-export const navigateToProfileSettings = createInternalLinkAction({
+export const navigateToProfileSettings = createInternalLinkActionV2({
  name: ({ t }) => t("Profile"),
  analyticsName: "Navigate to profile settings",
  section: NavigationSection,
@@ -120,7 +121,7 @@ export const navigateToProfileSettings = createInternalLinkAction({
  to: settingsPath(),
 });

-export const navigateToTemplateSettings = createInternalLinkAction({
+export const navigateToTemplateSettings = createAction({
  name: ({ t }) => t("Templates"),
  analyticsName: "Navigate to template settings",
  section: NavigationSection,
@@ -129,9 +130,9 @@ export const navigateToTemplateSettings = createInternalLinkAction({
  to: settingsPath("templates"),
 });

-export const navigateToNotificationSettings = createInternalLinkAction({
-  name: ({ t, isMenu }) =>
-    isMenu ? t("Notification settings") : t("Notifications"),
+export const navigateToNotificationSettings = createInternalLinkActionV2({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Notification settings") : t("Notifications"),
  analyticsName: "Navigate to notification settings",
  section: NavigationSection,
  iconInContextMenu: false,
@@ -139,7 +140,7 @@ export const navigateToNotificationSettings = createInternalLinkAction({
  to: settingsPath("notifications"),
 });

-export const navigateToAccountPreferences = createInternalLinkAction({
+export const navigateToAccountPreferences = createInternalLinkActionV2({
  name: ({ t }) => t("Preferences"),
  analyticsName: "Navigate to account preferences",
  section: NavigationSection,
@@ -148,7 +149,7 @@ export const navigateToAccountPreferences = createInternalLinkAction({
  to: settingsPath("preferences"),
 });

-export const openDocumentation = createExternalLinkAction({
+export const openDocumentation = createExternalLinkActionV2({
  name: ({ t }) => t("Documentation"),
  analyticsName: "Open documentation",
  section: NavigationSection,
@@ -158,7 +159,7 @@ export const openDocumentation = createExternalLinkAction({
  target: "_blank",
 });

-export const openAPIDocumentation = createExternalLinkAction({
+export const openAPIDocumentation = createExternalLinkActionV2({
  name: ({ t }) => t("API documentation"),
  analyticsName: "Open API documentation",
  section: NavigationSection,
@@ -176,7 +177,7 @@ export const toggleSidebar = createAction({
  perform: () => stores.ui.toggleCollapsedSidebar(),
 });

-export const openFeedbackUrl = createExternalLinkAction({
+export const openFeedbackUrl = createExternalLinkActionV2({
  name: ({ t }) => t("Send us feedback"),
  analyticsName: "Open feedback",
  section: NavigationSection,
@@ -186,7 +187,7 @@ export const openFeedbackUrl = createExternalLinkAction({
  target: "_blank",
 });

-export const openBugReportUrl = createExternalLinkAction({
+export const openBugReportUrl = createExternalLinkActionV2({
  name: ({ t }) => t("Report a bug"),
  analyticsName: "Open bug report",
  section: NavigationSection,
@@ -196,7 +197,7 @@ export const openBugReportUrl = createExternalLinkAction({
  target: "_blank",
 });

-export const openChangelog = createExternalLinkAction({
+export const openChangelog = createExternalLinkActionV2({
  name: ({ t }) => t("Changelog"),
  analyticsName: "Open changelog",
  section: NavigationSection,
@@ -206,7 +207,7 @@ export const openChangelog = createExternalLinkAction({
  target: "_blank",
 });

-export const openKeyboardShortcuts = createAction({
+export const openKeyboardShortcuts = createActionV2({
  name: ({ t }) => t("Keyboard shortcuts"),
  analyticsName: "Open keyboard shortcuts",
  section: NavigationSection,
@@ -221,21 +222,23 @@ export const openKeyboardShortcuts = createAction({
  },
 });

-export const downloadApp = createExternalLinkAction({
+export const downloadApp = createAction({
  name: ({ t }) =>
    t("Download {{ platform }} app", {
-      platform: isMac ? "macOS" : "Windows",
+      platform: isMac() ? "macOS" : "Windows",
    }),
  analyticsName: "Download app",
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <BrowserIcon />,
-  visible: () => !Desktop.isElectron() && isMac && isCloudHosted,
-  url: "https://desktop.getoutline.com",
-  target: "_blank",
+  visible: () => !Desktop.isElectron() && isMac() && isCloudHosted,
+  to: {
+    url: "https://desktop.getoutline.com",
+    target: "_blank",
+  },
 });

-export const logout = createAction({
+export const logout = createActionV2({
  name: ({ t }) => t("Log out"),
  analyticsName: "Log out",
  section: NavigationSection,
@@ -1,7 +1,6 @@
-import { ArchiveIcon, CheckmarkIcon, MarkAsReadIcon } from "outline-icons";
-import { createAction } from "..";
+import { ArchiveIcon, MarkAsReadIcon } from "outline-icons";
+import { createAction, createActionV2 } from "..";
 import { NotificationSection } from "../sections";
-import type Notification from "~/models/Notification";

 export const markNotificationsAsRead = createAction({
  name: ({ t }) => t("Mark notifications as read"),
@@ -13,7 +12,7 @@ export const markNotificationsAsRead = createAction({
  visible: ({ stores }) => stores.notifications.approximateUnreadCount > 0,
 });

-export const markNotificationsAsArchived = createAction({
+export const markNotificationsAsArchived = createActionV2({
  name: ({ t }) => t("Archive all notifications"),
  analyticsName: "Mark notifications as archived",
  section: NotificationSection,
@@ -23,36 +22,6 @@ export const markNotificationsAsArchived = createAction({
  visible: ({ stores }) => stores.notifications.orderedData.length > 0,
 });

-export const notificationMarkRead = (notification: Notification) =>
-  createAction({
-    name: ({ t }) => t("Mark as read"),
-    analyticsName: "Mark notification read",
-    section: NotificationSection,
-    icon: <CheckmarkIcon />,
-    perform: () => notification.toggleRead(),
-    visible: () => !notification.viewedAt,
-  });
-
-export const notificationMarkUnread = (notification: Notification) =>
-  createAction({
-    name: ({ t }) => t("Mark as unread"),
-    analyticsName: "Mark notification unread",
-    section: NotificationSection,
-    icon: <CheckmarkIcon />,
-    perform: () => notification.toggleRead(),
-    visible: () => !!notification.viewedAt,
-  });
-
-export const notificationArchive = (notification: Notification) =>
-  createAction({
-    name: ({ t }) => t("Archive"),
-    analyticsName: "Mark notification as archived",
-    section: NotificationSection,
-    icon: <ArchiveIcon />,
-    perform: () => notification.archive(),
-    visible: () => !notification.archivedAt,
-  });
-
 export const rootNotificationActions = [
  markNotificationsAsRead,
  markNotificationsAsArchived,
@@ -1,20 +1,17 @@
 import copy from "copy-to-clipboard";
-import { LinkIcon, RestoreIcon, TrashIcon, DownloadIcon } from "outline-icons";
+import { LinkIcon, RestoreIcon, TrashIcon } from "outline-icons";
 import { matchPath } from "react-router-dom";
 import { toast } from "sonner";
-import { ExportContentType } from "@shared/types";
 import stores from "~/stores";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createAction, createActionV2 } from "~/actions";
 import { RevisionSection } from "~/actions/sections";
-import env from "~/env";
 import history from "~/utils/history";
 import {
  documentHistoryPath,
  matchDocumentHistory,
-  urlify,
 } from "~/utils/routeHelpers";

-export const restoreRevision = createAction({
+export const restoreRevision = createActionV2({
  name: ({ t }) => t("Restore"),
  analyticsName: "Restore revision",
  icon: <RestoreIcon />,
@@ -76,105 +73,37 @@ export const deleteRevision = createAction({
  },
 });

-export const copyLinkToRevision = (revisionId: string) =>
-  createAction({
-    name: ({ t }) => t("Copy link"),
-    analyticsName: "Copy link to revision",
-    icon: <LinkIcon />,
-    section: RevisionSection,
-    perform: async ({ activeDocumentId, t }) => {
-      if (!activeDocumentId) {
-        return;
-      }
+export const copyLinkToRevision = createActionV2({
+  name: ({ t }) => t("Copy link"),
+  analyticsName: "Copy link to revision",
+  icon: <LinkIcon />,
+  section: RevisionSection,
+  perform: async ({ activeDocumentId, t }) => {
+    if (!activeDocumentId) {
+      return;
+    }

-      const document = stores.documents.get(activeDocumentId);
-      if (!document) {
-        return;
-      }
+    const match = matchPath<{ revisionId: string }>(location.pathname, {
+      path: matchDocumentHistory,
+    });
+    const revisionId = match?.params.revisionId;
+    const document = stores.documents.get(activeDocumentId);
+    if (!document) {
+      return;
+    }

-      const url = urlify(documentHistoryPath(document, revisionId));
+    const url = `${window.location.origin}${documentHistoryPath(
+      document,
+      revisionId
+    )}`;

-      copy(url, {
-        format: "text/plain",
-        onCopy: () => {
-          toast.message(t("Link copied"));
-        },
-      });
-    },
-  });
-
-export const downloadRevisionAsHTML = (revisionId: string) =>
-  createAction({
-    name: ({ t }) => t("HTML"),
-    analyticsName: "Download revision as HTML",
-    section: RevisionSection,
-    keywords: "html export",
-    icon: <DownloadIcon />,
-    iconInContextMenu: false,
-    visible: ({ activeDocumentId }) =>
-      !!activeDocumentId &&
-      stores.policies.abilities(activeDocumentId).download,
-    perform: async () => {
-      const revision = stores.revisions.get(revisionId);
-      await revision?.download(ExportContentType.Html);
-    },
-  });
-
-export const downloadRevisionAsPDF = (revisionId: string) =>
-  createAction({
-    name: ({ t }) => t("PDF"),
-    analyticsName: "Download revision as PDF",
-    section: RevisionSection,
-    keywords: "export",
-    icon: <DownloadIcon />,
-    iconInContextMenu: false,
-    visible: ({ activeDocumentId }) =>
-      !!(
-        activeDocumentId &&
-        stores.policies.abilities(activeDocumentId).download &&
-        env.PDF_EXPORT_ENABLED
-      ),
-    perform: ({ t }) => {
-      const id = toast.loading(`${t("Exporting")}…`);
-      const revision = stores.revisions.get(revisionId);
-      return revision
-        ?.download(ExportContentType.Pdf)
-        .finally(() => id && toast.dismiss(id));
-    },
-  });
-
-export const downloadRevisionAsMarkdown = (revisionId: string) =>
-  createAction({
-    name: ({ t }) => t("Markdown"),
-    analyticsName: "Download revision as Markdown",
-    section: RevisionSection,
-    keywords: "md markdown export",
-    icon: <DownloadIcon />,
-    iconInContextMenu: false,
-    visible: ({ activeDocumentId }) =>
-      !!activeDocumentId &&
-      stores.policies.abilities(activeDocumentId).download,
-    perform: async () => {
-      const revision = stores.revisions.get(revisionId);
-      await revision?.download(ExportContentType.Markdown);
-    },
-  });
-
-export const downloadRevision = (revisionId: string) =>
-  createActionWithChildren({
-    name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download revision")),
-    analyticsName: "Download revision",
-    section: RevisionSection,
-    icon: <DownloadIcon />,
-    keywords: "export",
-    visible: ({ activeDocumentId }) =>
-      !!activeDocumentId &&
-      stores.policies.abilities(activeDocumentId).download,
-    children: [
-      downloadRevisionAsHTML(revisionId),
-      downloadRevisionAsPDF(revisionId),
-      downloadRevisionAsMarkdown(revisionId),
-    ],
-  });
+    copy(url, {
+      format: "text/plain",
+      onCopy: () => {
+        toast.message(t("Link copied"));
+      },
+    });
+  },
+});

 export const rootRevisionActions = [];
@@ -1,9 +1,9 @@
 import { SunIcon, MoonIcon, BrowserIcon } from "outline-icons";
 import { Theme } from "~/stores/UiStore";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createActionV2, createActionV2WithChildren } from "~/actions";
 import { SettingsSection } from "~/actions/sections";

-export const changeToDarkTheme = createAction({
+export const changeToDarkTheme = createActionV2({
  name: ({ t }) => t("Dark"),
  analyticsName: "Change to dark theme",
  icon: <MoonIcon />,
@@ -14,7 +14,7 @@ export const changeToDarkTheme = createAction({
  perform: ({ stores }) => stores.ui.setTheme(Theme.Dark),
 });

-export const changeToLightTheme = createAction({
+export const changeToLightTheme = createActionV2({
  name: ({ t }) => t("Light"),
  analyticsName: "Change to light theme",
  icon: <SunIcon />,
@@ -25,22 +25,7 @@ export const changeToLightTheme = createAction({
  perform: ({ stores }) => stores.ui.setTheme(Theme.Light),
 });

-export const toggleTheme = createAction({
-  name: ({ t }) => t("Toggle theme"),
-  analyticsName: "Change theme",
-  iconInContextMenu: false,
-  icon: ({ stores }) =>
-    stores.ui.resolvedTheme === "light" ? <MoonIcon /> : <SunIcon />,
-  keywords: "theme light day",
-  section: SettingsSection,
-  shortcut: ["Meta+Shift+l"],
-  perform: ({ stores }) =>
-    stores.ui.setTheme(
-      stores.ui.resolvedTheme === "light" ? Theme.Dark : Theme.Light
-    ),
-});
-
-export const changeToSystemTheme = createAction({
+export const changeToSystemTheme = createActionV2({
  name: ({ t }) => t("System"),
  analyticsName: "Change to system theme",
  icon: <BrowserIcon />,
@@ -51,8 +36,9 @@ export const changeToSystemTheme = createAction({
  perform: ({ stores }) => stores.ui.setTheme(Theme.System),
 });

-export const changeTheme = createActionWithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Appearance") : t("Change theme")),
+export const changeTheme = createActionV2WithChildren({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Appearance") : t("Change theme"),
  analyticsName: "Change theme",
  placeholder: ({ t }) => t("Change theme to"),
  icon: ({ stores }) =>
@@ -62,4 +48,4 @@ export const changeTheme = createActionWithChildren({
  children: [changeToLightTheme, changeToDarkTheme, changeToSystemTheme],
 });

-export const rootSettingsActions = [changeTheme, toggleTheme];
+export const rootSettingsActions = [changeTheme];
@@ -1,13 +1,13 @@
 import copy from "copy-to-clipboard";
-import type Share from "~/models/Share";
-import { createAction, createInternalLinkAction } from "..";
+import Share from "~/models/Share";
+import { createActionV2, createInternalLinkActionV2 } from "..";
 import { ArrowIcon, CopyIcon, TrashIcon } from "outline-icons";
 import { ShareSection } from "../sections";
 import env from "~/env";
 import { toast } from "sonner";

 export const copyShareUrlFactory = ({ share }: { share: Share }) =>
-  createAction({
+  createActionV2({
    name: ({ t }) => t("Copy link"),
    analyticsName: "Copy share link",
    section: ShareSection,
@@ -22,7 +22,7 @@ export const copyShareUrlFactory = ({ share }: { share: Share }) =>
  });

 export const goToShareSourceFactory = ({ share }: { share: Share }) =>
-  createInternalLinkAction({
+  createInternalLinkActionV2({
    name: ({ t }) =>
      share.collectionId ? t("Go to collection") : t("Go to document"),
    analyticsName: "Go to share source",
@@ -41,7 +41,7 @@ export const revokeShareFactory = ({
  share: Share;
  can: Record<string, boolean>;
 }) =>
-  createAction({
+  createActionV2({
    name: ({ t }) => t("Revoke link"),
    analyticsName: "Revoke share",
    section: ShareSection,
@@ -1,22 +1,22 @@
 import { ArrowIcon, PlusIcon } from "outline-icons";
 import styled from "styled-components";
 import { stringToColor } from "@shared/utils/color";
-import type RootStore from "~/stores/RootStore";
+import RootStore from "~/stores/RootStore";
 import { LoginDialog } from "~/scenes/Login/components/LoginDialog";
 import TeamNew from "~/scenes/TeamNew";
 import TeamLogo from "~/components/TeamLogo";
 import {
-  createAction,
-  createActionWithChildren,
-  createExternalLinkAction,
+  createActionV2,
+  createActionV2WithChildren,
+  createExternalLinkActionV2,
 } from "~/actions";
-import type { ActionContext, ExternalLinkAction } from "~/types";
+import { ActionContext, ExternalLinkActionV2 } from "~/types";
 import Desktop from "~/utils/Desktop";
 import { TeamSection } from "../sections";

 export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
-  stores.auth.availableTeams?.map<ExternalLinkAction>((session) =>
-    createExternalLinkAction({
+  stores.auth.availableTeams?.map<ExternalLinkActionV2>((session) =>
+    createExternalLinkActionV2({
      id: `switch-${session.id}`,
      name: session.name,
      analyticsName: "Switch workspace",
@@ -41,7 +41,7 @@ export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
    })
  ) ?? [];

-export const switchTeam = createActionWithChildren({
+export const switchTeam = createActionV2WithChildren({
  name: ({ t }) => t("Switch workspace"),
  placeholder: ({ t }) => t("Select a workspace"),
  analyticsName: "Switch workspace",
@@ -52,7 +52,7 @@ export const switchTeam = createActionWithChildren({
  children: switchTeamsList,
 });

-export const createTeam = createAction({
+export const createTeam = createActionV2({
  name: ({ t }) => `${t("New workspace")}…`,
  analyticsName: "New workspace",
  keywords: "create change switch workspace organization team",
@@ -74,7 +74,7 @@ export const createTeam = createAction({
  },
 });

-export const desktopLoginTeam = createAction({
+export const desktopLoginTeam = createActionV2({
  name: ({ t }) => t("Login to workspace"),
  analyticsName: "Login to workspace",
  keywords: "change switch workspace organization team",
@@ -1,231 +0,0 @@
-import copy from "copy-to-clipboard";
-import {
-  CaseSensitiveIcon,
-  CollectionIcon,
-  CopyIcon,
-  MoveIcon,
-  NewDocumentIcon,
-  PlusIcon,
-  PrintIcon,
-  TrashIcon,
-} from "outline-icons";
-import { Trans } from "react-i18next";
-import { toast } from "sonner";
-import ConfirmationDialog from "~/components/ConfirmationDialog";
-import TemplateMove from "~/components/DocumentExplorer/TemplateMove";
-import {
-  createAction,
-  createActionWithChildren,
-  createInternalLinkAction,
-} from "~/actions";
-import history from "~/utils/history";
-import {
-  newDocumentPath,
-  newTemplatePath,
-  settingsPath,
-  urlify,
-} from "~/utils/routeHelpers";
-import { ActiveTemplateSection, TemplateSection } from "../sections";
-import Template from "~/models/Template";
-import { AvatarSize } from "~/components/Avatar";
-import TeamLogo from "~/components/TeamLogo";
-
-export const createTemplate = createInternalLinkAction({
-  name: ({ t }) => t("New template"),
-  analyticsName: "New template",
-  section: TemplateSection,
-  icon: <PlusIcon />,
-  keywords: "new create template",
-  visible: ({ currentTeamId, stores }) =>
-    !!stores.policies.abilities(currentTeamId!).createTemplate,
-  to: newTemplatePath(),
-});
-
-export const deleteTemplate = createAction({
-  name: ({ t }) => `${t("Delete")}…`,
-  analyticsName: "Delete template",
-  section: ActiveTemplateSection,
-  icon: <TrashIcon />,
-  dangerous: true,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Template).some((policy) => policy.abilities.delete),
-  perform: ({ getActiveModel, stores, t }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return;
-    }
-
-    stores.dialogs.openModal({
-      title: t("Delete {{ documentName }}", {
-        documentName: t("template"),
-      }),
-      content: (
-        <ConfirmationDialog
-          onSubmit={async () => {
-            await template.delete();
-            history.push(settingsPath("templates"));
-            toast.success(t("Template deleted"));
-          }}
-          savingText={`${t("Deleting")}…`}
-          danger
-        >
-          <Trans
-            defaults="Are you sure about that? Deleting the <em>{{ templateName }}</em> template is permanent."
-            values={{
-              templateName: template.titleWithDefault,
-            }}
-            components={{
-              em: <strong />,
-            }}
-          />
-        </ConfirmationDialog>
-      ),
-    });
-  },
-});
-
-export const moveTemplateToWorkspace = createAction({
-  name: ({ t }) => t("Move to workspace"),
-  analyticsName: "Move template to workspace",
-  section: ActiveTemplateSection,
-  icon: ({ stores }) => {
-    const { team } = stores.auth;
-    return <TeamLogo model={team} size={AvatarSize.Small} />;
-  },
-  visible: ({ getActiveModel }) => {
-    const template = getActiveModel(Template);
-    return !!template?.collectionId;
-  },
-  perform: async ({ getActiveModel, stores, t }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return;
-    }
-
-    try {
-      await template.save({ collectionId: null });
-      toast.success(t("Template moved"));
-      stores.dialogs.closeAllModals();
-    } catch (_err) {
-      toast.error(t("Couldn't move the template, try again?"));
-    }
-  },
-});
-
-export const moveTemplateToCollection = createAction({
-  name: ({ t }) => t("Move to collection"),
-  analyticsName: "Move template to collection",
-  section: ActiveTemplateSection,
-  icon: <CollectionIcon />,
-  perform: ({ getActiveModel, stores, t }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return;
-    }
-
-    stores.dialogs.openModal({
-      title: t("Move template"),
-      content: <TemplateMove template={template} />,
-    });
-  },
-});
-
-export const moveTemplate = createActionWithChildren({
-  name: ({ t }) => t("Move"),
-  analyticsName: "Move template",
-  section: ActiveTemplateSection,
-  icon: <MoveIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Template).some((policy) => policy.abilities.move),
-  children: [moveTemplateToWorkspace, moveTemplateToCollection],
-});
-
-export const createDocumentFromTemplate = createInternalLinkAction({
-  name: ({ t }) => t("New document"),
-  analyticsName: "New document from template",
-  section: ActiveTemplateSection,
-  icon: <NewDocumentIcon />,
-  keywords: "create",
-  visible: ({ currentTeamId, getActiveModel, stores }) => {
-    const template = getActiveModel(Template);
-    if (!template || !currentTeamId) {
-      return false;
-    }
-
-    if (template.collectionId) {
-      return !!stores.policies.abilities(template.collectionId).createDocument;
-    }
-    return !!stores.policies.abilities(currentTeamId).createDocument;
-  },
-  to: ({ getActiveModel, activeCollectionId, sidebarContext }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return "";
-    }
-    const collectionId = template?.collectionId ?? activeCollectionId;
-
-    const [pathname, search] = newDocumentPath(collectionId, {
-      templateId: template.id,
-    }).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
-  },
-});
-
-export const copyTemplateLink = createAction({
-  name: ({ t }) => t("Copy link"),
-  analyticsName: "Copy template link",
-  section: ActiveTemplateSection,
-  icon: <CopyIcon />,
-  iconInContextMenu: false,
-  perform: ({ getActiveModel, t }) => {
-    const template = getActiveModel(Template);
-    if (template) {
-      copy(urlify(template.path));
-      toast.success(t("Link copied to clipboard"));
-    }
-  },
-});
-
-export const copyTemplateAsPlainText = createAction({
-  name: ({ t }) => t("Copy as text"),
-  analyticsName: "Copy template as text",
-  section: ActiveTemplateSection,
-  icon: <CaseSensitiveIcon />,
-  iconInContextMenu: false,
-  perform: async ({ getActiveModel, t }) => {
-    const template = getActiveModel(Template);
-    if (template) {
-      const { ProsemirrorHelper } =
-        await import("~/models/helpers/ProsemirrorHelper");
-      copy(ProsemirrorHelper.toPlainText(template));
-      toast.success(t("Text copied to clipboard"));
-    }
-  },
-});
-
-export const copyTemplate = createActionWithChildren({
-  name: ({ t }) => t("Copy"),
-  analyticsName: "Copy template",
-  section: ActiveTemplateSection,
-  icon: <CopyIcon />,
-  keywords: "clipboard",
-  children: [copyTemplateLink, copyTemplateAsPlainText],
-});
-
-export const printTemplate = createAction({
-  name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print template")),
-  analyticsName: "Print template",
-  section: ActiveTemplateSection,
-  icon: <PrintIcon />,
-  visible: ({ getActiveModel }) => !!getActiveModel(Template) && !!window.print,
-  perform: () => {
-    setTimeout(window.print, 0);
-  },
-});
-
-export const rootTemplateActions = [moveTemplate, createDocumentFromTemplate];
@@ -1,14 +1,14 @@
 import { PlusIcon } from "outline-icons";
-import type { UserRole } from "@shared/types";
+import { UserRole } from "@shared/types";
 import { UserRoleHelper } from "@shared/utils/UserRoleHelper";
 import stores from "~/stores";
-import type User from "~/models/User";
+import User from "~/models/User";
 import Invite from "~/scenes/Invite";
 import {
  UserChangeRoleDialog,
  UserDeleteDialog,
 } from "~/components/UserDialogs";
-import { createAction } from "~/actions";
+import { createAction, createActionV2 } from "~/actions";
 import { UserSection } from "~/actions/sections";

 export const inviteUser = createAction({
@@ -22,14 +22,13 @@ export const inviteUser = createAction({
  perform: ({ t }) => {
    stores.dialogs.openModal({
      title: t("Invite to workspace"),
-      width: "500px",
      content: <Invite onSubmit={stores.dialogs.closeAllModals} />,
    });
  },
 });

 export const updateUserRoleActionFactory = (user: User, role: UserRole) =>
-  createAction({
+  createActionV2({
    name: ({ t }) =>
      UserRoleHelper.isRoleHigher(role, user!.role)
        ? `${t("Promote to {{ role }}", {
@@ -64,7 +63,7 @@ export const updateUserRoleActionFactory = (user: User, role: UserRole) =>
  });

 export const deleteUserActionFactory = (userId: string) =>
-  createAction({
+  createActionV2({
    name: ({ t }) => `${t("Delete user")}…`,
    analyticsName: "Delete user",
    keywords: "leave",
@@ -1,33 +1,187 @@
-import type { LocationDescriptor } from "history";
+import { LocationDescriptor } from "history";
+import flattenDeep from "lodash/flattenDeep";
 import { toast } from "sonner";
-import type { Optional } from "utility-types";
+import { Optional } from "utility-types";
 import { v4 as uuidv4 } from "uuid";
-import type {
-  ActionContext,
+import {
  Action,
-  ActionGroup,
-  ActionSeparator as TActionSeparator,
-  ActionVariant,
-  ActionWithChildren,
-  ExternalLinkAction,
-  InternalLinkAction,
+  ActionContext,
+  ActionV2,
+  ActionV2Group,
+  ActionV2Separator as TActionV2Separator,
+  ActionV2Variant,
+  ActionV2WithChildren,
+  ExternalLinkActionV2,
+  InternalLinkActionV2,
+  MenuExternalLink,
+  MenuInternalLink,
  MenuItem,
+  MenuItemButton,
+  MenuItemWithChildren,
 } from "~/types";
 import Analytics from "~/utils/Analytics";
 import history from "~/utils/history";
-import type { Action as KbarAction } from "kbar";
+import { Action as KbarAction } from "kbar";

 export function resolve<T>(value: any, context: ActionContext): T {
  return typeof value === "function" ? value(context) : value;
 }

-export const ActionSeparator: TActionSeparator = {
+export function createAction(definition: Optional<Action, "id">): Action {
+  return {
+    ...definition,
+    perform: definition.perform
+      ? (context) => {
+          // We must use the specific analytics name here as the action name is
+          // translated and potentially contains user strings.
+          if (definition.analyticsName) {
+            Analytics.track("perform_action", definition.analyticsName, {
+              context: context.isButton
+                ? "button"
+                : context.isCommandBar
+                  ? "commandbar"
+                  : "contextmenu",
+            });
+          }
+          return definition.perform?.(context);
+        }
+      : undefined,
+    id: definition.id ?? uuidv4(),
+  };
+}
+
+export function actionToMenuItem(
+  action: Action,
+  context: ActionContext
+): MenuItemButton | MenuExternalLink | MenuInternalLink | MenuItemWithChildren {
+  const resolvedIcon = resolve<React.ReactElement<any>>(action.icon, context);
+  const resolvedChildren = resolve<Action[]>(action.children, context);
+  const visible = action.visible ? action.visible(context) : true;
+  const title = resolve<string>(action.name, context);
+  const icon =
+    resolvedIcon && action.iconInContextMenu !== false
+      ? resolvedIcon
+      : undefined;
+
+  if (resolvedChildren) {
+    const items = resolvedChildren
+      .map((a) => actionToMenuItem(a, context))
+      .filter(Boolean)
+      .filter((a) => a.visible);
+
+    return {
+      type: "submenu",
+      title,
+      icon,
+      items,
+      visible: visible && items.length > 0,
+    };
+  }
+
+  if (action.to) {
+    return typeof action.to === "string"
+      ? {
+          type: "route",
+          title,
+          icon,
+          visible,
+          to: action.to,
+          selected: action.selected?.(context),
+        }
+      : {
+          type: "link",
+          title,
+          icon,
+          visible,
+          href: action.to,
+          selected: action.selected?.(context),
+        };
+  }
+
+  return {
+    type: "button",
+    title,
+    icon,
+    visible,
+    dangerous: action.dangerous,
+    onClick: () => performAction(action, context),
+    selected: action.selected?.(context),
+  };
+}
+
+export function actionToKBar(
+  action: Action,
+  context: ActionContext
+): KbarAction[] {
+  if (typeof action.visible === "function" && !action.visible(context)) {
+    return [];
+  }
+
+  const resolvedIcon = resolve<React.ReactElement>(action.icon, context);
+  const resolvedChildren = resolve<Action[]>(action.children, context);
+  const resolvedSection = resolve<string>(action.section, context);
+  const resolvedName = resolve<string>(action.name, context);
+  const resolvedPlaceholder = resolve<string>(action.placeholder, context);
+  const children = resolvedChildren
+    ? flattenDeep(resolvedChildren.map((a) => actionToKBar(a, context))).filter(
+        (a) => !!a
+      )
+    : [];
+
+  const sectionPriority =
+    typeof action.section !== "string" && "priority" in action.section
+      ? ((action.section.priority as number) ?? 0)
+      : 0;
+
+  return [
+    {
+      id: action.id,
+      name: resolvedName,
+      analyticsName: action.analyticsName,
+      section: resolvedSection,
+      placeholder: resolvedPlaceholder,
+      keywords: action.keywords ?? "",
+      shortcut: action.shortcut || [],
+      icon: resolvedIcon,
+      priority: (1 + (action.priority ?? 0)) * (1 + (sectionPriority ?? 0)),
+      perform:
+        action.perform || action.to
+          ? () => performAction(action, context)
+          : undefined,
+    },
+  ].concat(
+    // @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
+    children.map((child) => ({ ...child, parent: child.parent ?? action.id }))
+  );
+}
+
+export async function performAction(action: Action, context: ActionContext) {
+  const result = action.perform
+    ? action.perform(context)
+    : action.to
+      ? typeof action.to === "string"
+        ? history.push(action.to)
+        : window.open(action.to.url, action.to.target)
+      : undefined;
+
+  if (result instanceof Promise) {
+    return result.catch((err: Error) => {
+      toast.error(err.message);
+    });
+  }
+
+  return result;
+}
+
+/** Actions V2 */
+
+export const ActionV2Separator: TActionV2Separator = {
  type: "action_separator",
 };

-export function createAction(
-  definition: Optional<Omit<Action, "type" | "variant">, "id">
-): Action {
+export function createActionV2(
+  definition: Optional<Omit<ActionV2, "type" | "variant">, "id">
+): ActionV2 {
  return {
    ...definition,
    type: "action",
@@ -52,9 +206,9 @@ export function createAction(
  };
 }

-export function createInternalLinkAction(
-  definition: Optional<Omit<InternalLinkAction, "type" | "variant">, "id">
-): InternalLinkAction {
+export function createInternalLinkActionV2(
+  definition: Optional<Omit<InternalLinkActionV2, "type" | "variant">, "id">
+): InternalLinkActionV2 {
  return {
    ...definition,
    type: "action",
@@ -63,9 +217,9 @@ export function createInternalLinkAction(
  };
 }

-export function createExternalLinkAction(
-  definition: Optional<Omit<ExternalLinkAction, "type" | "variant">, "id">
-): ExternalLinkAction {
+export function createExternalLinkActionV2(
+  definition: Optional<Omit<ExternalLinkActionV2, "type" | "variant">, "id">
+): ExternalLinkActionV2 {
  return {
    ...definition,
    type: "action",
@@ -74,9 +228,9 @@ export function createExternalLinkAction(
  };
 }

-export function createActionWithChildren(
-  definition: Optional<Omit<ActionWithChildren, "type" | "variant">, "id">
-): ActionWithChildren {
+export function createActionV2WithChildren(
+  definition: Optional<Omit<ActionV2WithChildren, "type" | "variant">, "id">
+): ActionV2WithChildren {
  return {
    ...definition,
    type: "action",
@@ -85,9 +239,9 @@ export function createActionWithChildren(
  };
 }

-export function createActionGroup(
-  definition: Omit<ActionGroup, "type">
-): ActionGroup {
+export function createActionV2Group(
+  definition: Omit<ActionV2Group, "type">
+): ActionV2Group {
  return {
    ...definition,
    type: "action_group",
@@ -95,8 +249,8 @@ export function createActionGroup(
 }

 export function createRootMenuAction(
-  actions: (ActionVariant | ActionGroup | TActionSeparator)[]
-): ActionWithChildren {
+  actions: (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
+): ActionV2WithChildren {
  return {
    id: uuidv4(),
    type: "action",
@@ -107,8 +261,8 @@ export function createRootMenuAction(
  };
 }

-export function actionToMenuItem(
-  action: ActionVariant | ActionGroup | TActionSeparator,
+export function actionV2ToMenuItem(
+  action: ActionV2Variant | ActionV2Group | TActionV2Separator,
  context: ActionContext
 ): MenuItem {
  switch (action.type) {
@@ -132,7 +286,7 @@ export function actionToMenuItem(
            tooltip: resolve<React.ReactChild>(action.tooltip, context),
            selected: resolve<boolean>(action.selected, context),
            dangerous: action.dangerous,
-            onClick: () => performAction(action, context),
+            onClick: () => performActionV2(action, context),
          };

        case "internal_link": {
@@ -161,10 +315,10 @@ export function actionToMenuItem(

        case "action_with_children": {
          const children = resolve<
-            (ActionVariant | ActionGroup | TActionSeparator)[]
+            (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
          >(action.children, context);
          const subMenuItems = children.map((a) =>
-            actionToMenuItem(a, context)
+            actionV2ToMenuItem(a, context)
          );
          return {
            type: "submenu",
@@ -183,7 +337,7 @@ export function actionToMenuItem(

    case "action_group": {
      const groupItems = action.actions.map((a) =>
-        actionToMenuItem(a, context)
+        actionV2ToMenuItem(a, context)
      );
      return {
        type: "group",
@@ -198,8 +352,8 @@ export function actionToMenuItem(
  }
 }

-export function actionToKBar(
-  action: ActionVariant,
+export function actionV2ToKBar(
+  action: ActionV2Variant,
  context: ActionContext
 ): KbarAction[] {
  const visible = resolve<boolean>(action.visible, context);
@@ -231,18 +385,18 @@ export function actionToKBar(
          shortcut: action.shortcut,
          icon,
          priority,
-          perform: () => performAction(action, context),
+          perform: () => performActionV2(action, context),
        },
      ];
    }

    case "action_with_children": {
-      const resolvedChildren = resolve<ActionVariant[]>(
+      const resolvedChildren = resolve<ActionV2Variant[]>(
        action.children,
        context
      );
      const children = resolvedChildren
-        .map((a) => actionToKBar(a, context))
+        .map((a) => actionV2ToKBar(a, context))
        .flat()
        .filter(Boolean);

@@ -268,8 +422,8 @@ export function actionToKBar(
  }
 }

-export async function performAction(
-  action: Exclude<ActionVariant, ActionWithChildren>,
+export async function performActionV2(
+  action: Exclude<ActionV2Variant, ActionV2WithChildren>,
  context: ActionContext
 ) {
  const perform =
@@ -1,4 +1,4 @@
-import type { ActionContext } from "~/types";
+import { ActionContext } from "~/types";

 export const CollectionSection = ({ t }: ActionContext) => t("Collection");

@@ -24,15 +24,6 @@ export const ActiveDocumentSection = ({ t, stores }: ActionContext) => {

 ActiveDocumentSection.priority = 0.9;

-export const TemplateSection = ({ t }: ActionContext) => t("Template");
-
-export const ActiveTemplateSection = ({ t, stores }: ActionContext) => {
-  const activeTemplate = stores.templates.active;
-  return `${t("Template")} · ${activeTemplate?.titleWithDefault}`;
-};
-
-ActiveTemplateSection.priority = 0.9;
-
 export const RecentSection = ({ t }: ActionContext) => t("Recently viewed");

 RecentSection.priority = 1;
@@ -47,8 +38,6 @@ export const NotificationSection = ({ t }: ActionContext) => t("Notification");

 export const GroupSection = ({ t }: ActionContext) => t("Groups");

-export const EmojiSecion = ({ t }: ActionContext) => t("Emoji");
-
 export const UserSection = ({ t }: ActionContext) => t("People");

 UserSection.priority = 0.5;
@@ -1,11 +1,14 @@
 /* oxlint-disable react/prop-types */
 import * as React from "react";
-import type { Props as TooltipProps } from "~/components/Tooltip";
-import Tooltip from "~/components/Tooltip";
-import { performAction, resolve } from "~/actions";
+import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
+import { performAction, performActionV2, resolve } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
-import useActionContext from "~/hooks/useActionContext";
-import type { ActionVariant, ActionWithChildren } from "~/types";
+import {
+  Action,
+  ActionContext,
+  ActionV2Variant,
+  ActionV2WithChildren,
+} from "~/types";

 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Show the button in a disabled state */
@@ -13,7 +16,9 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Hide the button entirely if action is not applicable */
  hideOnActionDisabled?: boolean;
  /** Action to use on button */
-  action?: Exclude<ActionVariant, ActionWithChildren>;
+  action?: Action | Exclude<ActionV2Variant, ActionV2WithChildren>;
+  /** Context of action, must be provided with action */
+  context?: ActionContext;
  /** If tooltip props are provided the button will be wrapped in a tooltip */
  tooltip?: Omit<TooltipProps, "children">;
 };
@@ -22,34 +27,35 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
 * Button that can be used to trigger an action definition.
 */
 const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
-  function ActionButton_(
-    { action, tooltip, hideOnActionDisabled, ...rest }: Props,
+  function _ActionButton(
+    { action, context, tooltip, hideOnActionDisabled, ...rest }: Props,
    ref: React.Ref<HTMLButtonElement>
  ) {
-    const actionContext = useActionContext({
-      isButton: true,
-    });
    const isMounted = useIsMounted();
    const [executing, setExecuting] = React.useState(false);
+    const disabled = rest.disabled;

-    if (!actionContext || !action) {
+    if (action && !context) {
+      throw new Error("Context must be provided with action");
+    }
+    if (!context || !action) {
      return <button {...rest} ref={ref} />;
    }

-    const actionIsDisabled =
-      action.visible && !resolve<boolean>(action.visible, actionContext);
+    const actionContext = { ...context, isButton: true };

-    if (actionIsDisabled && hideOnActionDisabled) {
+    if (
+      action.visible &&
+      !resolve<boolean>(action.visible, actionContext) &&
+      hideOnActionDisabled
+    ) {
      return null;
    }

-    const disabled = rest.disabled || actionIsDisabled;
-
    const label =
-      rest["aria-label"] ??
-      (typeof action.name === "function"
+      typeof action.name === "function"
        ? action.name(actionContext)
-        : action.name);
+        : action.name;

    const button = (
      <button
@@ -62,7 +68,10 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
            ? (ev) => {
                ev.preventDefault();
                ev.stopPropagation();
-                const response = performAction(action, actionContext);
+                const response =
+                  "variant" in action
+                    ? performActionV2(action, actionContext)
+                    : performAction(action, actionContext);
                if (response?.finally) {
                  setExecuting(true);
                  void response.finally(
@@ -6,6 +6,7 @@ import Flex from "~/components/Flex";
 export const Action = styled(Flex)`
  justify-content: center;
  align-items: center;
+  padding: 0 0 0 12px;
  height: 32px;
  font-size: 15px;
  flex-shrink: 0;
@@ -17,6 +18,7 @@ export const Action = styled(Flex)`

 export const Separator = styled.div`
  flex-shrink: 0;
+  margin-left: 12px;
  width: 1px;
  height: 28px;
  background: ${s("divider")};
@@ -31,7 +33,6 @@ const Actions = styled(Flex)`
  background: ${s("background")};
  padding: 12px;
  backdrop-filter: blur(20px);
-  gap: 12px;

  @media print {
    display: none;
@@ -2,8 +2,7 @@
 /* global ga */
 import escape from "lodash/escape";
 import * as React from "react";
-import type { PublicEnv } from "@shared/types";
-import { IntegrationService } from "@shared/types";
+import { IntegrationService, PublicEnv } from "@shared/types";
 import env from "~/env";

 type Props = {
@@ -1,11 +1,20 @@
+import { AnimatePresence } from "framer-motion";
 import { observer } from "mobx-react";
 import * as React from "react";
-import { Switch, Route } from "react-router-dom";
+import {
+  Switch,
+  Route,
+  useLocation,
+  matchPath,
+  Redirect,
+} from "react-router-dom";
+import { TeamPreference } from "@shared/types";
 import ErrorSuspended from "~/scenes/Errors/ErrorSuspended";
 import Layout from "~/components/Layout";
 import RegisterKeyDown from "~/components/RegisterKeyDown";
-import { RightSidebarProvider } from "~/components/RightSidebarContext";
 import Sidebar from "~/components/Sidebar";
+import SidebarRight from "~/components/Sidebar/Right";
+import SettingsSidebar from "~/components/Sidebar/Settings";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import { usePostLoginPath } from "~/hooks/useLastVisitedPath";
 import usePolicy from "~/hooks/usePolicy";
@@ -16,16 +25,21 @@ import {
  searchPath,
  newDocumentPath,
  settingsPath,
+  matchDocumentHistory,
+  matchDocumentSlug as slug,
 } from "~/utils/routeHelpers";
 import { DocumentContextProvider } from "./DocumentContext";
 import Fade from "./Fade";
-import NotificationBadge from "./NotificationBadge";
 import { PortalContext } from "./Portal";
-import CommandBar from "./CommandBar";

-const SettingsSidebar = lazyWithRetry(
-  () => import("~/components/Sidebar/Settings")
+const DocumentComments = lazyWithRetry(
+  () => import("~/scenes/Document/components/Comments")
 );
+const DocumentHistory = lazyWithRetry(
+  () => import("~/scenes/Document/components/History")
+);
+
+const CommandBar = lazyWithRetry(() => import("~/components/CommandBar"));

 type Props = {
  children?: React.ReactNode;
@@ -33,7 +47,9 @@ type Props = {

 const AuthenticatedLayout: React.FC = ({ children }: Props) => {
  const { ui, auth } = useStores();
+  const location = useLocation();
  const layoutRef = React.useRef<HTMLDivElement>(null);
+  const can = usePolicy(ui.activeDocumentId);
  const canCollection = usePolicy(ui.activeCollectionId);
  const team = useCurrentTeam();
  const [spendPostLoginPath] = usePostLoginPath();
@@ -57,17 +73,15 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
    history.push(newDocumentPath(activeCollectionId));
  };

-  React.useEffect(() => {
-    const postLoginPath = spendPostLoginPath();
-    if (postLoginPath) {
-      history.replace(postLoginPath);
-    }
-  }, [spendPostLoginPath]);
-
  if (auth.isSuspended) {
    return <ErrorSuspended />;
  }

+  const postLoginPath = spendPostLoginPath();
+  if (postLoginPath) {
+    return <Redirect to={postLoginPath} />;
+  }
+
  const sidebar = (
    <Fade>
      <Switch>
@@ -77,20 +91,53 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
    </Fade>
  );

+  const showHistory =
+    !!matchPath(location.pathname, {
+      path: matchDocumentHistory,
+    }) && can.listRevisions;
+  const showComments =
+    !showHistory &&
+    can.comment &&
+    ui.activeDocumentId &&
+    ui.commentsExpanded &&
+    !!team.getPreference(TeamPreference.Commenting);
+
+  const sidebarRight = (
+    <AnimatePresence
+      initial={false}
+      key={ui.activeDocumentId ? "active" : "inactive"}
+    >
+      {(showHistory || showComments) && (
+        <Route path={`/doc/${slug}`}>
+          <SidebarRight>
+            <React.Suspense fallback={null}>
+              {showHistory && <DocumentHistory />}
+              {showComments && <DocumentComments />}
+            </React.Suspense>
+          </SidebarRight>
+        </Route>
+      )}
+    </AnimatePresence>
+  );
+
  return (
    <DocumentContextProvider>
-      <RightSidebarProvider>
-        <PortalContext.Provider value={layoutRef.current}>
-          <Layout title={team.name} sidebar={sidebar} ref={layoutRef}>
-            <RegisterKeyDown trigger="n" handler={goToNewDocument} />
-            <RegisterKeyDown trigger="t" handler={goToSearch} />
-            <RegisterKeyDown trigger="/" handler={goToSearch} />
-            {children}
+      <PortalContext.Provider value={layoutRef.current}>
+        <Layout
+          title={team.name}
+          sidebar={sidebar}
+          sidebarRight={sidebarRight}
+          ref={layoutRef}
+        >
+          <RegisterKeyDown trigger="n" handler={goToNewDocument} />
+          <RegisterKeyDown trigger="t" handler={goToSearch} />
+          <RegisterKeyDown trigger="/" handler={goToSearch} />
+          {children}
+          <React.Suspense fallback={null}>
            <CommandBar />
-            <NotificationBadge />
-          </Layout>
-        </PortalContext.Provider>
-      </RightSidebarProvider>
+          </React.Suspense>
+        </Layout>
+      </PortalContext.Provider>
    </DocumentContextProvider>
  );
 };
@@ -1,9 +1,7 @@
-import { observer } from "mobx-react";
 import * as React from "react";
 import styled from "styled-components";
 import useBoolean from "~/hooks/useBoolean";
 import Initials from "./Initials";
-import Tooltip from "../Tooltip";

 export enum AvatarSize {
  Small = 16,
@@ -24,7 +22,6 @@ export interface IAvatar {
  avatarUrl: string | null;
  color?: string;
  initial?: string;
-  name?: string;
  id?: string;
 }

@@ -45,8 +42,6 @@ type Props = {
  className?: string;
  /** Optional style */
  style?: React.CSSProperties;
-  /** Whether to show a tooltip */
-  showTooltip?: boolean;
 };

 function Avatar(props: Props) {
@@ -55,15 +50,12 @@ function Avatar(props: Props) {
    style,
    variant = AvatarVariant.Round,
    className,
-    showTooltip,
    ...rest
  } = props;
  const src = props.src || model?.avatarUrl;
  const [error, handleError] = useBoolean(false);
-  const initial =
-    model?.initial || (model?.name ? model.name[0] : "").toUpperCase();

-  const content = (
+  return (
    <Relative
      style={style}
      $variant={variant}
@@ -74,19 +66,13 @@ function Avatar(props: Props) {
        <Image onError={handleError} src={src} {...rest} />
      ) : model ? (
        <Initials color={model.color} {...rest}>
-          {initial}
+          {model.initial}
        </Initials>
      ) : (
        <Initials {...rest} />
      )}
    </Relative>
  );
-
-  return showTooltip ? (
-    <Tooltip content={props.alt || model?.name || ""}>{content}</Tooltip>
-  ) : (
-    content
-  );
 }

 Avatar.defaultProps = {
@@ -110,4 +96,4 @@ const Image = styled.img<{ size: number }>`
  height: ${(props) => props.size}px;
 `;

-export default observer(Avatar);
+export default Avatar;
@@ -3,7 +3,7 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled, { css } from "styled-components";
 import { s } from "@shared/styles";
-import type User from "~/models/User";
+import User from "~/models/User";
 import Tooltip from "~/components/Tooltip";
 import Avatar, { AvatarSize } from "./Avatar";

@@ -25,8 +25,6 @@ type Props = {
  onClick?: React.MouseEventHandler<HTMLImageElement>;
  /** Size of the avatar, defaults to AvatarSize.Large */
  size?: AvatarSize;
-  /** Optional alt text for the avatar image */
-  alt?: string;
  /** Optional inline styles to apply to the avatar wrapper */
  style?: React.CSSProperties;
 };
@@ -55,7 +53,6 @@ function AvatarWithPresence({
  isCurrentUser,
  size = AvatarSize.Large,
  style,
-  alt,
 }: Props) {
  const { t } = useTranslation();
  const status = isPresent
@@ -86,7 +83,7 @@ function AvatarWithPresence({
          $color={user.color}
          style={style}
        >
-          <Avatar model={user} onClick={onClick} size={size} alt={alt} />
+          <Avatar model={user} onClick={onClick} size={size} />
        </AvatarPresence>
      </Tooltip>
    </>
@@ -1,7 +1,7 @@
 import { GroupIcon } from "outline-icons";
 import { useTheme } from "styled-components";
 import Squircle from "@shared/components/Squircle";
-import type Group from "~/models/Group";
+import Group from "~/models/Group";
 import { AvatarSize } from "../Avatar/Avatar";

 type Props = {
@@ -26,7 +26,6 @@ export function GroupAvatar({
  return (
    <Squircle color={color ?? theme.text} size={size} className={className}>
      <GroupIcon
-        data-fixed-color
        color={backgroundColor ?? theme.background}
        size={size * 0.75}
      />
@@ -1,5 +1,4 @@
-import type { IAvatar } from "./Avatar";
-import Avatar, { AvatarSize, AvatarVariant } from "./Avatar";
+import Avatar, { IAvatar, AvatarSize, AvatarVariant } from "./Avatar";
 import AvatarWithPresence from "./AvatarWithPresence";
 import { GroupAvatar } from "./GroupAvatar";

@@ -2,8 +2,8 @@ import { transparentize } from "polished";
 import styled from "styled-components";

 const Badge = styled.span<{ yellow?: boolean; primary?: boolean }>`
-  padding: 1.5px 5.5px;
-  margin: 0 2px;
+  margin-left: 10px;
+  padding: 1px 5px 2px;
  background-color: ${({ yellow, primary, theme }) =>
    yellow ? theme.yellow : primary ? theme.accent : "transparent"};
  color: ${({ primary, yellow, theme }) =>
@@ -17,11 +17,10 @@ const Badge = styled.span<{ yellow?: boolean; primary?: boolean }>`
      primary || yellow
        ? "transparent"
        : transparentize(0.4, theme.textTertiary)};
-  border-radius: 8px;
+  border-radius: 10px;
  font-size: 12px;
  font-weight: 500;
  user-select: none;
-  white-space: nowrap;
 `;

 export default Badge;
@@ -1,4 +1,3 @@
-import * as React from "react";
 import styled from "styled-components";
 import { depths, s } from "@shared/styles";
 import env from "~/env";
@@ -45,4 +44,4 @@ const Link = styled.a`
  }
 `;

-export default React.memo(Branding);
+export default Branding;
@@ -1,5 +1,4 @@
 import { GoToIcon } from "outline-icons";
-import { observer } from "mobx-react";
 import * as React from "react";
 import { Link } from "react-router-dom";
 import styled from "styled-components";
@@ -7,17 +6,17 @@ import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import BreadcrumbMenu from "~/menus/BreadcrumbMenu";
 import { undraggableOnDesktop } from "~/styles";
-import type { InternalLinkAction, MenuInternalLink } from "~/types";
-import { actionToMenuItem } from "~/actions";
+import { InternalLinkActionV2, MenuInternalLink } from "~/types";
+import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import { useComputed } from "~/hooks/useComputed";

 type TopLevelAction =
-  | InternalLinkAction
-  | { type: "menu"; actions: InternalLinkAction[] };
+  | InternalLinkActionV2
+  | { type: "menu"; actions: InternalLinkActionV2[] };

 type Props = React.PropsWithChildren<{
-  actions: InternalLinkAction[];
+  actions: InternalLinkActionV2[];
  max?: number;
  highlightFirstItem?: boolean;
 }>;
@@ -26,7 +25,7 @@ function Breadcrumb(
  { actions, highlightFirstItem, children, max = 2 }: Props,
  ref: React.RefObject<HTMLDivElement> | null
 ) {
-  const actionContext = useActionContext({ isMenu: true });
+  const actionContext = useActionContext({ isContextMenu: true });

  const visibleActions = useComputed(
    () =>
@@ -47,7 +46,7 @@ function Breadcrumb(
    const menuActions = topLevelActions.splice(
      halfMax,
      totalVisibleActions - max
-    ) as InternalLinkAction[];
+    ) as InternalLinkActionV2[];

    topLevelActions.splice(halfMax, 0, {
      type: "menu",
@@ -61,7 +60,10 @@ function Breadcrumb(
        return <BreadcrumbMenu key="menu" actions={action.actions} />;
      }

-      const item = actionToMenuItem(action, actionContext) as MenuInternalLink;
+      const item = actionV2ToMenuItem(
+        action,
+        actionContext
+      ) as MenuInternalLink;

      return (
        <>
@@ -122,4 +124,4 @@ const Item = styled(Link)<{ $highlight: boolean; $withIcon: boolean }>`
  }
 `;

-export default observer(React.forwardRef<HTMLDivElement, Props>(Breadcrumb));
+export default React.forwardRef<HTMLDivElement, Props>(Breadcrumb);
@@ -1,13 +1,12 @@
-import type { LocationDescriptor } from "history";
+import { LocationDescriptor } from "history";
 import { DisclosureIcon } from "outline-icons";
 import { darken, lighten, transparentize } from "polished";
 import * as React from "react";
 import styled from "styled-components";
-import type { HapticInput } from "web-haptics";
-import { useWebHaptics } from "web-haptics/react";
 import { s } from "@shared/styles";
-import type { Props as ActionButtonProps } from "~/components/ActionButton";
-import ActionButton from "~/components/ActionButton";
+import ActionButton, {
+  Props as ActionButtonProps,
+} from "~/components/ActionButton";
 import { undraggableOnDesktop } from "~/styles";

 type RealProps = {
@@ -35,7 +34,6 @@ const RealButton = styled(ActionButton)<RealProps>`
  cursor: var(--pointer);
  user-select: none;
  appearance: none !important;
-  transition: background 200ms ease-out;
  ${undraggableOnDesktop()}

  &::-moz-focus-inner {
@@ -46,7 +44,6 @@ const RealButton = styled(ActionButton)<RealProps>`
  &:hover:not(:disabled),
  &[aria-expanded="true"] {
    background: ${(props) => darken(0.05, props.theme.accent)};
-    transition: background 0s;
  }

  &:disabled {
@@ -81,7 +78,6 @@ const RealButton = styled(ActionButton)<RealProps>`
      box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px, ${
        props.theme.buttonNeutralBorder
      } 0 0 0 1px inset;
-      transition: background 0s;
    }

    &:focus-visible {
@@ -107,7 +103,6 @@ const RealButton = styled(ActionButton)<RealProps>`
      &:hover:not(:disabled),
      &[aria-expanded="true"] {
        background: ${darken(0.05, props.theme.danger)};
-        transition: background 0s;
      }

      &:disabled {
@@ -154,8 +149,6 @@ export type Props<T> = ActionButtonProps & {
  fullwidth?: boolean;
  as?: T;
  to?: LocationDescriptor;
-  /** Haptic feedback to trigger on click. Pass a preset name or custom pattern. */
-  haptic?: HapticInput;
  borderOnHover?: boolean;
  hideIcon?: boolean;
  href?: string;
@@ -180,13 +173,11 @@ const Button = <T extends React.ElementType = "button">(
    hideIcon,
    fullwidth,
    danger,
-    haptic,
    ...rest
  } = props;
  const hasText = !!children || value !== undefined;
  const ic = hideIcon ? undefined : (action?.icon ?? icon);
  const hasIcon = ic !== undefined;
-  const { trigger } = useWebHaptics();

  return (
    <RealButton
@@ -197,7 +188,6 @@ const Button = <T extends React.ElementType = "button">(
      $danger={danger}
      $fullwidth={fullwidth}
      $borderOnHover={borderOnHover}
-      onClickCapture={haptic ? () => void trigger(haptic) : undefined}
      {...rest}
    >
      <Inner hasIcon={hasIcon} hasText={hasText} disclosure={disclosure}>
@@ -1,7 +1,6 @@
 import * as React from "react";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
-import { EditorStyleHelper } from "@shared/editor/styles/EditorStyleHelper";

 type Props = {
  children?: React.ReactNode;
@@ -23,9 +22,12 @@ const Container = styled.div<Props>`
 type ContentProps = { $maxWidth?: string };

 const Content = styled.div<ContentProps>`
-  max-width: ${(props: ContentProps) =>
-    props.$maxWidth ?? EditorStyleHelper.documentWidth};
+  max-width: ${(props) => props.$maxWidth ?? "46em"};
  margin: 0 auto;
+
+  ${breakpoint("desktopLarge")`
+    max-width: ${(props: ContentProps) => props.$maxWidth ?? "52em"};
+  `};
 `;

 const CenteredContent: React.FC<Props> = ({
@@ -5,7 +5,7 @@ import uniq from "lodash/uniq";
 import { observer } from "mobx-react";
 import { useState, useMemo, useEffect, useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import type Document from "~/models/Document";
+import Document from "~/models/Document";
 import { AvatarSize, AvatarWithPresence } from "~/components/Avatar";
 import DocumentViews from "~/components/DocumentViews";
 import Facepile from "~/components/Facepile";
@@ -125,14 +125,13 @@ function Collaborators(props: Props) {

      return (
        <AvatarWithPresence
-          key={collaborator.id}
          {...rest}
+          key={collaborator.id}
          user={collaborator}
          isPresent={isPresent}
          isEditing={isEditing}
          isObserving={isObserving}
          isCurrentUser={currentUserId === collaborator.id}
-          alt={t("Avatar of {{ name }}", { name: collaborator.name })}
          onClick={
            isObservable
              ? handleAvatarClick(
@@ -1,112 +0,0 @@
-import * as RadixCollapsible from "@radix-ui/react-collapsible";
-import { ExpandedIcon } from "outline-icons";
-import * as React from "react";
-import styled from "styled-components";
-import { s } from "@shared/styles";
-
-interface CollapsibleProps {
-  /** The label displayed on the trigger button. */
-  label: React.ReactNode;
-  /** The content to show/hide inside the collapsible panel. */
-  children: React.ReactNode;
-  /** Whether the collapsible is open by default. */
-  defaultOpen?: boolean;
-  /** Controlled open state. */
-  open?: boolean;
-  /** Callback fired when the open state changes. */
-  onOpenChange?: (open: boolean) => void;
-  /** Additional class name for the root element. */
-  className?: string;
-}
-
-/**
- * An accessible collapsible section built on Radix UI Collapsible.
- * Renders a trigger button with a disclosure chevron and animated content panel.
- *
- * @param props - component props.
- * @returns the collapsible component.
- */
-export function Collapsible({
-  label,
-  children,
-  defaultOpen = false,
-  open,
-  onOpenChange,
-  className,
-}: CollapsibleProps) {
-  return (
-    <RadixCollapsible.Root
-      defaultOpen={defaultOpen}
-      open={open}
-      onOpenChange={onOpenChange}
-      className={className}
-    >
-      <StyledTrigger>
-        <StyledExpandedIcon aria-hidden="true" />
-        {label}
-      </StyledTrigger>
-      <StyledContent>{children}</StyledContent>
-    </RadixCollapsible.Root>
-  );
-}
-
-const StyledExpandedIcon = styled(ExpandedIcon)`
-  flex-shrink: 0;
-  transition: transform 150ms ease-out;
-  margin-left: -4px;
-`;
-
-const StyledTrigger = styled(RadixCollapsible.Trigger)`
-  display: flex;
-  align-items: center;
-  background: none;
-  border: none;
-  padding: 0 0 8px 0;
-  cursor: var(--pointer);
-  color: ${s("textTertiary")};
-  font-size: 14pxte
-
-  &:hover {
-    color: ${s("textSecondary")};
-  }
-
-  &[data-state="closed"] {
-    ${StyledExpandedIcon} {
-      transform: rotate(-90deg);
-    }
-  }
-`;
-
-const StyledContent = styled(RadixCollapsible.Content)`
-  overflow: hidden;
-
-  &[data-state="open"] {
-    animation: slideDown 200ms ease-out;
-  }
-
-  &[data-state="closed"] {
-    animation: slideUp 200ms ease-out;
-  }
-
-  @keyframes slideDown {
-    from {
-      height: 0;
-      opacity: 0;
-    }
-    to {
-      height: var(--radix-collapsible-content-height);
-      opacity: 1;
-    }
-  }
-
-  @keyframes slideUp {
-    from {
-      height: var(--radix-collapsible-content-height);
-      opacity: 1;
-    }
-    to {
-      height: 0;
-      opacity: 0;
-    }
-  }
-`;
@@ -2,8 +2,7 @@ import { observer } from "mobx-react";
 import { useCallback } from "react";
 import { toast } from "sonner";
 import useStores from "~/hooks/useStores";
-import type { FormData } from "./CollectionForm";
-import { CollectionForm } from "./CollectionForm";
+import { CollectionForm, FormData } from "./CollectionForm";

 type Props = {
  collectionId: string;
@@ -7,15 +7,13 @@ import styled from "styled-components";
 import Icon from "@shared/components/Icon";
 import { randomElement } from "@shared/random";
 import { CollectionPermission, TeamPreference } from "@shared/types";
-import type { Option } from "~/components/InputSelect";
 import { IconLibrary } from "@shared/utils/IconLibrary";
 import { colorPalette } from "@shared/utils/collections";
 import { CollectionValidation } from "@shared/validations";
-import type Collection from "~/models/Collection";
+import Collection from "~/models/Collection";
 import Button from "~/components/Button";
-import { Collapsible } from "~/components/Collapsible";
+import Flex from "~/components/Flex";
 import Input from "~/components/Input";
-import { InputSelect } from "~/components/InputSelect";
 import { InputSelectPermission } from "~/components/InputSelectPermission";
 import { createLazyComponent } from "~/components/LazyLoad";
 import Switch from "~/components/Switch";
@@ -24,7 +22,6 @@ import useBoolean from "~/hooks/useBoolean";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useStores from "~/hooks/useStores";
 import { EmptySelectValue } from "~/types";
-import { HStack } from "../primitives/HStack";

 const IconPicker = createLazyComponent(() => import("~/components/IconPicker"));

@@ -35,7 +32,6 @@ export interface FormData {
  sharing: boolean;
  permission: CollectionPermission | undefined;
  commenting?: boolean | null;
-  templateManagement: CollectionPermission;
 }

 const useIconColor = (collection?: Collection) => {
@@ -70,30 +66,8 @@ export const CollectionForm = observer(function CollectionForm_({

  const [hasOpenedIconPicker, setHasOpenedIconPicker] = useBoolean(false);

-  const templateManagementOptions = useMemo<Option[]>(
-    () => [
-      {
-        type: "item",
-        label: t("Managers"),
-        value: CollectionPermission.Admin,
-      },
-      {
-        type: "item",
-        label: t("Members"),
-        value: CollectionPermission.ReadWrite,
-      },
-    ],
-    [t]
-  );
-
  const iconColor = useIconColor(collection);
-  const fallbackIcon = (
-    <Icon
-      value="collection"
-      initial={collection?.initial ?? "?"}
-      color={iconColor}
-    />
-  );
+  const fallbackIcon = <Icon value="collection" color={iconColor} />;

  const {
    register,
@@ -111,8 +85,6 @@ export const CollectionForm = observer(function CollectionForm_({
      sharing: collection?.sharing ?? true,
      permission: collection?.permission,
      commenting: collection?.commenting ?? true,
-      templateManagement:
-        collection?.templateManagement ?? CollectionPermission.Admin,
      color: iconColor,
    },
  });
@@ -155,34 +127,60 @@ export const CollectionForm = observer(function CollectionForm_({

  const initial = values.name.charAt(0).toUpperCase();

-  const options = (
-    <>
-      <Controller
-        control={control}
-        name="templateManagement"
-        render={({ field }) => (
-          <>
-            <InputSelect
+  return (
+    <form onSubmit={formHandleSubmit(handleSubmit)}>
+      <Text as="p">
+        <Trans>
+          Collections are used to group documents and choose permissions
+        </Trans>
+      </Text>
+      <Flex gap={8}>
+        <Input
+          type="text"
+          placeholder={t("Name")}
+          {...register("name", {
+            required: true,
+            maxLength: CollectionValidation.maxNameLength,
+          })}
+          prefix={
+            <Suspense fallback={fallbackIcon}>
+              <StyledIconPicker
+                icon={values.icon}
+                color={values.color ?? iconColor}
+                initial={initial}
+                popoverPosition="right"
+                onOpen={setHasOpenedIconPicker}
+                onChange={handleIconChange}
+              />
+            </Suspense>
+          }
+          autoComplete="off"
+          autoFocus
+          flex
+        />
+      </Flex>
+
+      {/* Following controls are available in create flow, but moved elsewhere for edit */}
+      {!collection && (
+        <Controller
+          control={control}
+          name="permission"
+          render={({ field }) => (
+            <InputSelectPermission
+              ref={field.ref}
              value={field.value}
-              onChange={(value: string) => {
-                field.onChange(value as CollectionPermission);
+              onChange={(
+                value: CollectionPermission | typeof EmptySelectValue
+              ) => {
+                field.onChange(value === EmptySelectValue ? null : value);
              }}
-              options={templateManagementOptions}
-              label={t("Manage templates")}
-            />
-            <Text
-              type="secondary"
-              size="small"
-              as="p"
-              style={{ paddingTop: 4 }}
-            >
-              {t(
-                "Choose who can create and edit templates in this collection."
+              help={t(
+                "The default access for workspace members, you can share with more users or groups later."
              )}
-            </Text>
-          </>
-        )}
-      />
+            />
+          )}
+        />
+      )}

      {team.sharing && (
        <Controller
@@ -217,71 +215,8 @@ export const CollectionForm = observer(function CollectionForm_({
          )}
        />
      )}
-    </>
-  );

-  return (
-    <form onSubmit={formHandleSubmit(handleSubmit)}>
-      <Text as="p">
-        <Trans>
-          Collections are used to group documents and choose permissions
-        </Trans>
-      </Text>
-      <HStack>
-        <Input
-          type="text"
-          label={t("Name")}
-          {...register("name", {
-            required: true,
-            maxLength: CollectionValidation.maxNameLength,
-          })}
-          prefix={
-            <Suspense fallback={fallbackIcon}>
-              <StyledIconPicker
-                icon={values.icon}
-                color={values.color ?? iconColor}
-                initial={initial}
-                popoverPosition="right"
-                onOpen={setHasOpenedIconPicker}
-                onChange={handleIconChange}
-              />
-            </Suspense>
-          }
-          autoComplete="off"
-          autoFocus
-          flex
-        />
-      </HStack>
-
-      {/* Following controls are available in create flow, but moved elsewhere for edit */}
-      {!collection && (
-        <Controller
-          control={control}
-          name="permission"
-          render={({ field }) => (
-            <InputSelectPermission
-              ref={field.ref}
-              value={field.value}
-              onChange={(
-                value: CollectionPermission | typeof EmptySelectValue
-              ) => {
-                field.onChange(value === EmptySelectValue ? null : value);
-              }}
-              help={t(
-                "The default access for workspace members, you can share with more users or groups later."
-              )}
-            />
-          )}
-        />
-      )}
-
-      {collection ? (
-        options
-      ) : (
-        <Collapsible label={t("Advanced options")}>{options}</Collapsible>
-      )}
-
-      <HStack justify="flex-end">
+      <Flex justify="flex-end">
        <Button
          type="submit"
          disabled={formState.isSubmitting || !formState.isValid}
@@ -294,7 +229,7 @@ export const CollectionForm = observer(function CollectionForm_({
              ? `${t("Creating")}…`
              : t("Create")}
        </Button>
-      </HStack>
+      </Flex>
    </form>
  );
 });
@@ -4,8 +4,7 @@ import { useCallback } from "react";
 import { toast } from "sonner";
 import useStores from "~/hooks/useStores";
 import history from "~/utils/history";
-import type { FormData } from "./CollectionForm";
-import { CollectionForm } from "./CollectionForm";
+import { CollectionForm, FormData } from "./CollectionForm";

 type Props = {
  onSubmit: () => void;
@@ -1,11 +1,11 @@
 import { ArchiveIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import type Collection from "~/models/Collection";
+import Collection from "~/models/Collection";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { archivePath, collectionPath } from "~/utils/routeHelpers";
 import Breadcrumb from "./Breadcrumb";
-import { createInternalLinkAction } from "~/actions";
+import { createInternalLinkActionV2 } from "~/actions";
 import { ActiveCollectionSection } from "~/actions/sections";

 type Props = {
@@ -17,18 +17,18 @@ export const CollectionBreadcrumb: React.FC<Props> = ({ collection }) => {

  const actions = React.useMemo(
    () => [
-      createInternalLinkAction({
+      createInternalLinkActionV2({
        name: t("Archive"),
        section: ActiveCollectionSection,
        icon: <ArchiveIcon />,
        visible: collection.isArchived,
        to: archivePath(),
      }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
        name: collection.name,
        section: ActiveCollectionSection,
        icon: <CollectionIcon collection={collection} expanded />,
-        to: collectionPath(collection),
+        to: collectionPath(collection.path),
      }),
    ],
    [collection, t]
@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
 import { useTranslation, Trans } from "react-i18next";
 import { useHistory } from "react-router-dom";
 import { toast } from "sonner";
-import type Collection from "~/models/Collection";
+import Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
@@ -1,63 +0,0 @@
-import * as React from "react";
-import styled from "styled-components";
-import NudeButton from "./NudeButton";
-import { hover, s } from "@shared/styles";
-
-type Props = React.HTMLAttributes<HTMLButtonElement> & {
-  /** The current color value in hex format. If no color is passed a radial gradient will be shown */
-  color?: string;
-  /** Whether the button is currently active/selected */
-  active?: boolean;
-  /** The size of the button in pixels */
-  size?: number;
-};
-
-export const ColorButton = React.forwardRef(
-  (
-    { color, active = false, size = 24, ...rest }: Props,
-    ref: React.Ref<HTMLButtonElement>
-  ) => (
-    <ColorButtonInternal
-      $active={active}
-      $size={size}
-      {...rest}
-      style={{ "--color": color, ...rest.style } as React.CSSProperties}
-      ref={ref}
-    >
-      <Selected />
-    </ColorButtonInternal>
-  )
-);
-
-const Selected = styled.span`
-  width: 10px;
-  height: 5px;
-  border-left: 2px solid white;
-  border-bottom: 2px solid white;
-  transform: translateY(-25%) rotate(-45deg);
-`;
-
-const ColorButtonInternal = styled(NudeButton)<{
-  $active: boolean;
-  $size: number;
-}>`
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  width: ${({ $size }) => $size}px;
-  height: ${({ $size }) => $size}px;
-  border-radius: 50%;
-  background: var(
-    --color,
-    linear-gradient(135deg, #ff5858 0%, #fbcc34 50%, #00c6ff 100%)
-  );
-
-  &: ${hover} {
-    outline: 2px solid ${s("menuBackground")} !important;
-    box-shadow: 0px 0px 3px 3px var(--color);
-  }
-
-  & ${Selected} {
-    display: ${({ $active }) => ($active ? "block" : "none")};
-  }
-`;
@@ -1,4 +1,4 @@
-import type { ActionImpl } from "kbar";
+import { ActionImpl } from "kbar";
 import { ArrowIcon, BackIcon } from "outline-icons";
 import * as React from "react";
 import styled, { css, useTheme } from "styled-components";
@@ -7,7 +7,6 @@ import { normalizeKeyDisplay } from "@shared/utils/keyboard";
 import Flex from "~/components/Flex";
 import Key from "~/components/Key";
 import Text from "~/components/Text";
-import { HStack } from "../primitives/HStack";

 type Props = {
  action: ActionImpl;
@@ -36,7 +35,7 @@ function CommandBarItem(

  return (
    <Item active={active} ref={ref}>
-      <Content>
+      <Content align="center" gap={8}>
        <Icon>
          {action.icon ? (
            // @ts-expect-error no icon on ActionImpl
@@ -101,7 +100,7 @@ const Ancestor = styled.span`
  color: ${s("textSecondary")};
 `;

-const Content = styled(HStack)`
+const Content = styled(Flex)`
  ${ellipsis()}
  flex-shrink: 1;
 `;
@@ -1,7 +1,7 @@
 import { DocumentIcon } from "outline-icons";
 import { useMemo } from "react";
 import Icon from "@shared/components/Icon";
-import { createInternalLinkAction } from "~/actions";
+import { createAction } from "~/actions";
 import { RecentSection } from "~/actions/sections";
 import useStores from "~/hooks/useStores";
 import { documentPath } from "~/utils/routeHelpers";
@@ -15,16 +15,12 @@ const useRecentDocumentActions = (count = 6) => {
        .filter((document) => document.id !== ui.activeDocumentId)
        .slice(0, count)
        .map((item) =>
-          createInternalLinkAction({
+          createAction({
            name: item.titleWithDefault,
            analyticsName: "Recently viewed document",
            section: RecentSection,
            icon: item.icon ? (
-              <Icon
-                value={item.icon}
-                initial={item.initial}
-                color={item.color ?? undefined}
-              />
+              <Icon value={item.icon} color={item.color ?? undefined} />
            ) : (
              <DocumentIcon />
            ),
@@ -1,6 +1,6 @@
 import { SettingsIcon } from "outline-icons";
 import { useMemo } from "react";
-import { createActionWithChildren, createInternalLinkAction } from "~/actions";
+import { createAction } from "~/actions";
 import { NavigationSection } from "~/actions/sections";
 import useSettingsConfig from "~/hooks/useSettingsConfig";

@@ -10,20 +10,20 @@ const useSettingsAction = () => {
    () =>
      config.map((item) => {
        const Icon = item.icon;
-        return createInternalLinkAction({
+        return {
          id: item.path,
          name: item.name,
          icon: <Icon />,
          section: NavigationSection,
          to: item.path,
-        });
+        };
      }),
    [config]
  );

  const navigateToSettings = useMemo(
    () =>
-      createActionWithChildren({
+      createAction({
        id: "settings",
        name: ({ t }) => t("Settings"),
        section: NavigationSection,
@@ -1,37 +1,34 @@
 import { NewDocumentIcon, ShapesIcon } from "outline-icons";
 import { useEffect, useMemo } from "react";
 import Icon from "@shared/components/Icon";
-import { createActionWithChildren, createInternalLinkAction } from "~/actions";
+import { createAction } from "~/actions";
 import {
  ActiveCollectionSection,
  DocumentSection,
  TeamSection,
 } from "~/actions/sections";
 import useStores from "~/hooks/useStores";
+import history from "~/utils/history";
 import { newDocumentPath } from "~/utils/routeHelpers";

 const useTemplatesAction = () => {
-  const { templates } = useStores();
+  const { documents } = useStores();

  useEffect(() => {
-    void templates.fetchAll();
-  }, [templates]);
+    void documents.fetchAllTemplates();
+  }, [documents]);

  const actions = useMemo(
    () =>
-      templates.alphabetical.map((template) =>
-        createInternalLinkAction({
+      documents.templatesAlphabetical.map((template) =>
+        createAction({
          name: template.titleWithDefault,
          analyticsName: "New document",
          section: template.isWorkspaceTemplate
            ? TeamSection
            : ActiveCollectionSection,
          icon: template.icon ? (
-            <Icon
-              value={template.icon}
-              initial={template.initial}
-              color={template.color ?? undefined}
-            />
+            <Icon value={template.icon} color={template.color ?? undefined} />
          ) : (
            <NewDocumentIcon />
          ),
@@ -50,28 +47,23 @@ const useTemplatesAction = () => {
              template.isWorkspaceTemplate
            );
          },
-          to: ({ activeCollectionId, sidebarContext }) => {
-            const [pathname, search] = newDocumentPath(
-              template.collectionId ?? activeCollectionId,
-              {
+          perform: ({ activeCollectionId, sidebarContext }) =>
+            history.push(
+              newDocumentPath(template.collectionId ?? activeCollectionId, {
                templateId: template.id,
+              }),
+              {
+                sidebarContext,
              }
-            ).split("?");
-
-            return {
-              pathname,
-              search,
-              state: { sidebarContext },
-            };
-          },
+            ),
        })
      ),
-    [templates.alphabetical]
+    [documents.templatesAlphabetical]
  );

  const newFromTemplate = useMemo(
    () =>
-      createActionWithChildren({
+      createAction({
        id: "templates",
        name: ({ t }) => t("New from template"),
        placeholder: ({ t }) => t("Choose a template"),
@@ -86,7 +78,7 @@ const useTemplatesAction = () => {
            stores.policies.abilities(currentTeamId).createDocument
          );
        },
-        children: actions,
+        children: () => actions,
      }),
    [actions]
  );
@@ -1,7 +1,7 @@
 import { observer } from "mobx-react";
 import { useTranslation, Trans } from "react-i18next";
 import { toast } from "sonner";
-import type Comment from "~/models/Comment";
+import Comment from "~/models/Comment";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
 import useStores from "~/hooks/useStores";
@@ -1,8 +1,7 @@
 import { observer } from "mobx-react";
 import { Trans, useTranslation } from "react-i18next";
 import { toast } from "sonner";
-import type { NavigationNode } from "@shared/types";
-import { CollectionPermission } from "@shared/types";
+import { CollectionPermission, NavigationNode } from "@shared/types";
 import type Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import useStores from "~/hooks/useStores";
@@ -31,7 +31,7 @@ export type RefHandle = {
 * Defines a content editable component with the same interface as a native
 * HTMLInputElement (or, as close as we can get).
 */
-const ContentEditable = React.forwardRef(function ContentEditable_(
+const ContentEditable = React.forwardRef(function _ContentEditable(
  {
    disabled,
    onChange,
@@ -128,14 +128,7 @@ const ContentEditable = React.forwardRef(function ContentEditable_(

  React.useEffect(() => {
    if (contentRef.current && value !== contentRef.current.textContent) {
-      if (document.activeElement === contentRef.current) {
-        // Don't reset content while the user is actively editing. Update
-        // lastValue so that the next input or blur event will push the
-        // current DOM text back to the model via onChange.
-        lastValue.current = value;
-      } else {
-        setInnerValue(value);
-      }
+      setInnerValue(value);
    }
  }, [value, contentRef]);

@@ -150,14 +143,13 @@ const ContentEditable = React.forwardRef(function ContentEditable_(
    },
    []
  );
-  const contentEditable = !disabled && !readOnly;

  return (
    <div className={className} dir={dir} onClick={onClick} tabIndex={-1}>
      {children}
      <Content
        ref={contentRef}
-        contentEditable={contentEditable}
+        contentEditable={!disabled && !readOnly}
        onInput={wrappedEvent(onInput)}
        onFocus={wrappedEvent(onFocus)}
        onBlur={wrappedEvent(onBlur)}
@@ -165,7 +157,7 @@ const ContentEditable = React.forwardRef(function ContentEditable_(
        onPaste={handlePaste}
        data-placeholder={placeholder}
        suppressContentEditableWarning
-        role={contentEditable ? "textbox" : undefined}
+        role="textbox"
        {...rest}
      >
        {innerValue}
@@ -0,0 +1,13 @@
+import styled from "styled-components";
+import { s } from "@shared/styles";
+
+const Header = styled.h3`
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  color: ${s("sidebarText")};
+  letter-spacing: 0.04em;
+  margin: 1em 12px 0.5em;
+`;
+
+export default Header;
@@ -0,0 +1,13 @@
+import styled from "styled-components";
+import { s } from "@shared/styles";
+
+const MenuIconWrapper = styled.span`
+  width: 24px;
+  height: 24px;
+  margin-right: 6px;
+  margin-left: -4px;
+  color: ${s("textSecondary")};
+  flex-shrink: 0;
+`;
+
+export default MenuIconWrapper;
@@ -0,0 +1,217 @@
+import { LocationDescriptor } from "history";
+import { CheckmarkIcon } from "outline-icons";
+import { ellipsis, transparentize } from "polished";
+import * as React from "react";
+import { mergeRefs } from "react-merge-refs";
+import { MenuItem as BaseMenuItem } from "reakit/Menu";
+import styled, { css } from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { s } from "@shared/styles";
+import Text from "../Text";
+import MenuIconWrapper from "./MenuIconWrapper";
+
+type Props = {
+  id?: string;
+  onClick?: (event: React.MouseEvent) => void | Promise<void>;
+  onPointerMove?: (event: React.MouseEvent) => void | Promise<void>;
+  active?: boolean;
+  selected?: boolean;
+  disabled?: boolean;
+  dangerous?: boolean;
+  to?: LocationDescriptor;
+  href?: string;
+  target?: string;
+  as?: string | React.ComponentType<any>;
+  hide?: () => void;
+  level?: number;
+  icon?: React.ReactNode;
+  children?: React.ReactNode;
+  ref?: React.LegacyRef<HTMLButtonElement> | undefined;
+};
+
+const MenuItem = (
+  {
+    onClick,
+    onPointerMove,
+    children,
+    active,
+    selected,
+    disabled,
+    as,
+    hide,
+    icon,
+    ...rest
+  }: Props,
+  ref: React.Ref<HTMLAnchorElement>
+) => {
+  const content = React.useCallback(
+    (props) => {
+      // Preventing default mousedown otherwise menu items do not work in Firefox,
+      // which triggers the hideOnClickOutside handler first via mousedown – hiding
+      // and un-rendering the menu contents.
+      const preventDefault = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+      };
+
+      const handleClick = async (ev: React.MouseEvent) => {
+        hide?.();
+
+        if (onClick) {
+          preventDefault(ev);
+          await onClick(ev);
+        }
+      };
+
+      return (
+        <MenuAnchor
+          {...props}
+          $active={active}
+          as={onClick ? "button" : as}
+          onClick={handleClick}
+          onPointerDown={preventDefault}
+          onMouseDown={preventDefault}
+          ref={mergeRefs([
+            ref,
+            props.ref as React.RefObject<HTMLAnchorElement>,
+          ])}
+        >
+          {selected !== undefined && (
+            <SelectedWrapper aria-hidden>
+              {selected ? <CheckmarkIcon /> : <Spacer />}
+            </SelectedWrapper>
+          )}
+          {icon && <MenuIconWrapper aria-hidden>{icon}</MenuIconWrapper>}
+          <Title>{children}</Title>
+        </MenuAnchor>
+      );
+    },
+    [active, as, hide, icon, onClick, ref, children, selected]
+  );
+
+  return (
+    <BaseMenuItem
+      onClick={disabled ? undefined : onClick}
+      onPointerMove={disabled ? undefined : onPointerMove}
+      disabled={disabled}
+      hide={hide}
+      {...rest}
+    >
+      {content}
+    </BaseMenuItem>
+  );
+};
+
+const Spacer = styled.svg`
+  width: 24px;
+  height: 24px;
+  flex-shrink: 0;
+`;
+
+const Title = styled.div`
+  ${ellipsis()}
+  flex-grow: 1;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+`;
+
+type MenuAnchorProps = {
+  level?: number;
+  disabled?: boolean;
+  dangerous?: boolean;
+  disclosure?: boolean;
+  $active?: boolean;
+};
+
+export const MenuAnchorCSS = css<MenuAnchorProps>`
+  display: flex;
+  margin: 0;
+  border: 0;
+  padding: 12px;
+  border-radius: 4px;
+  padding-left: ${(props) => 12 + (props.level || 0) * 10}px;
+  width: 100%;
+  min-height: 32px;
+  background: none;
+  color: ${(props) =>
+    props.disabled ? props.theme.textTertiary : props.theme.textSecondary};
+  justify-content: left;
+  align-items: center;
+  font-size: 16px;
+  cursor: default;
+  user-select: none;
+  white-space: nowrap;
+  position: relative;
+
+  svg {
+    flex-shrink: 0;
+    opacity: ${(props) => (props.disabled ? ".5" : 1)};
+  }
+
+  ${(props) => props.disabled && "pointer-events: none;"}
+
+  ${(props) =>
+    props.$active === undefined &&
+    !props.disabled &&
+    `
+  @media (hover: hover) {
+    &:hover,
+    &:focus,
+    &:focus-visible {
+      color: ${props.theme.accentText};
+      background: ${props.dangerous ? props.theme.danger : props.theme.accent};
+      outline-color: ${
+        props.dangerous ? props.theme.danger : props.theme.accent
+      };
+      box-shadow: none;
+      cursor: var(--pointer);
+
+      svg {
+        color: ${props.theme.accentText};
+        fill: ${props.theme.accentText};
+      }
+
+      ${Text} {
+        color: ${transparentize(0.5, props.theme.accentText)};
+      }
+    }
+  }
+  `}
+
+  ${(props) =>
+    props.$active &&
+    !props.disabled &&
+    `
+      color: ${props.theme.accentText};
+      background: ${props.dangerous ? props.theme.danger : props.theme.accent};
+      box-shadow: none;
+      cursor: var(--pointer);
+
+      svg {
+        fill: ${props.theme.accentText};
+      }
+    `}
+
+  ${breakpoint("tablet")`
+    padding: 4px 12px;
+    padding-right: ${(props: MenuAnchorProps) =>
+      props.disclosure ? 32 : 12}px;
+    font-size: 14px;
+  `}
+`;
+
+export const MenuAnchor = styled.a`
+  ${MenuAnchorCSS}
+`;
+
+const SelectedWrapper = styled.span`
+  width: 24px;
+  height: 24px;
+  margin-right: 4px;
+  margin-left: -8px;
+  flex-shrink: 0;
+  color: ${s("textSecondary")};
+`;
+
+export default React.forwardRef<HTMLAnchorElement, Props>(MenuItem);
@@ -1,8 +1,5 @@
-import { observer } from "mobx-react";
 import * as React from "react";
 import { useMousePosition } from "~/hooks/useMousePosition";
-import usePrevious from "~/hooks/usePrevious";
-import useStores from "~/hooks/useStores";

 type Positions = {
  /** Sub-menu x */
@@ -24,7 +21,7 @@ type Positions = {
 * allow moving cursor to lower parts of sub-menu without the sub-menu
 * disappearing.
 */
-export const MouseSafeArea = observer(function MouseSafeArea_(props: {
+export default function MouseSafeArea(props: {
  parentRef: React.RefObject<HTMLElement | null>;
 }) {
  const {
@@ -33,32 +30,15 @@ export const MouseSafeArea = observer(function MouseSafeArea_(props: {
    height: h = 0,
    width: w = 0,
  } = props.parentRef.current?.getBoundingClientRect() || {};
-  const { ui } = useStores();
  const [mouseX, mouseY] = useMousePosition();
-  const [isVisible, setIsVisible] = React.useState(true);
  const positions = { x, y, h, w, mouseX, mouseY };
-  const distance = Math.abs(mouseX - x);
-  const prevDistance = usePrevious(distance) ?? distance;
-
-  // Hide the safe area if the mouse is moving _away_ from the menu
-  React.useEffect(() => {
-    if (distance > prevDistance) {
-      setIsVisible(false);
-    } else if (distance < prevDistance) {
-      setIsVisible(true);
-    }
-  }, [distance, prevDistance]);
-
-  if (!isVisible) {
-    return null;
-  }

  return (
    <div
      style={{
        position: "absolute",
        top: 0,
-        backgroundColor: ui.debugSafeArea ? "rgba(255,0,0,0.2)" : undefined,
+        // backgroundColor: "rgba(255,0,0,0.1)", // Uncomment to debug
        right: getRight(positions),
        left: getLeft(positions),
        height: h,
@@ -67,26 +47,24 @@ export const MouseSafeArea = observer(function MouseSafeArea_(props: {
      }}
    />
  );
-});
-
-const buffer = 10;
+}

 const getLeft = ({ x, mouseX }: Positions) =>
-  mouseX > x ? undefined : -Math.max(x - mouseX + buffer, buffer) + "px";
+  mouseX > x ? undefined : -Math.max(x - mouseX, 10) + "px";

 const getRight = ({ x, w, mouseX }: Positions) =>
-  mouseX > x ? -Math.max(mouseX - (x + w) + buffer, buffer) + "px" : undefined;
+  mouseX > x ? -Math.max(mouseX - (x + w), 10) + "px" : undefined;

 const getWidth = ({ x, w, mouseX }: Positions) =>
  mouseX > x
-    ? Math.max(mouseX - (x + w - buffer), buffer) + "px"
-    : Math.max(x - mouseX + buffer, buffer) + "px";
+    ? Math.max(mouseX - (x + w), 10) + "px"
+    : Math.max(x - mouseX, 10) + "px";

 const getClipPath = ({ x, y, h, mouseX, mouseY }: Positions) =>
  mouseX > x
-    ? `polygon(0% 0%, 0% 100%, 100% ${
+    ? `polygon(0% 0%, 0% 100%, 100% ${(100 * (mouseY - y)) / h - 10}%, 100% ${
        (100 * (mouseY - y)) / h + 5
-      }%, 100% ${(100 * (mouseY - y)) / h - buffer}%)`
-    : `polygon(100% 0%, 0% ${(100 * (mouseY - y)) / h - buffer}%, 0% ${
+      }%)`
+    : `polygon(100% 0%, 0% ${(100 * (mouseY - y)) / h - 10}%, 0% ${
        (100 * (mouseY - y)) / h + 5
      }%, 100% 100%)`;
@@ -0,0 +1,20 @@
+import { MoreIcon } from "outline-icons";
+import * as React from "react";
+import { MenuButton } from "reakit/Menu";
+import NudeButton from "~/components/NudeButton";
+
+type Props = React.ComponentProps<typeof MenuButton> & {
+  className?: string;
+};
+
+export default function OverflowMenuButton({ className, ...rest }: Props) {
+  return (
+    <MenuButton {...rest}>
+      {(props) => (
+        <NudeButton className={className} {...props}>
+          <MoreIcon />
+        </NudeButton>
+      )}
+    </MenuButton>
+  );
+}
@@ -0,0 +1,15 @@
+import * as React from "react";
+import { MenuSeparator } from "reakit/Menu";
+import styled from "styled-components";
+
+export default function Separator(rest: React.HTMLAttributes<HTMLHRElement>) {
+  return (
+    <MenuSeparator {...rest}>
+      {(props) => <HorizontalRule {...props} />}
+    </MenuSeparator>
+  );
+}
+
+const HorizontalRule = styled.hr`
+  margin: 6px 0;
+`;
@@ -0,0 +1,264 @@
+import { ExpandedIcon } from "outline-icons";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import {
+  MenuButton,
+  MenuItem as BaseMenuItem,
+  MenuStateReturn,
+} from "reakit/Menu";
+import styled, { useTheme } from "styled-components";
+import MenuIconWrapper from "~/components/ContextMenu/MenuIconWrapper";
+import Flex from "~/components/Flex";
+import { actionToMenuItem } from "~/actions";
+import useActionContext from "~/hooks/useActionContext";
+import { useMenuState } from "~/hooks/useMenuState";
+import {
+  Action,
+  ActionContext,
+  MenuSeparator,
+  MenuHeading,
+  MenuItem as TMenuItem,
+} from "~/types";
+import Tooltip from "../Tooltip";
+import Header from "./Header";
+import MenuItem, { MenuAnchor } from "./MenuItem";
+import MouseSafeArea from "./MouseSafeArea";
+import Separator from "./Separator";
+import ContextMenu from ".";
+
+type Props = Omit<MenuStateReturn, "items"> & {
+  actions?: (Action | MenuSeparator | MenuHeading)[];
+  context?: Partial<ActionContext>;
+  items?: TMenuItem[];
+  showIcons?: boolean;
+};
+
+const Disclosure = styled(ExpandedIcon)`
+  transform: rotate(270deg);
+  position: absolute;
+  right: 8px;
+`;
+
+type SubMenuProps = MenuStateReturn & {
+  templateItems: TMenuItem[];
+  parentMenuState: Omit<MenuStateReturn, "items">;
+  title: React.ReactNode;
+};
+
+const SubMenu = React.forwardRef(function _Template(
+  { templateItems, title, parentMenuState, ...rest }: SubMenuProps,
+  ref: React.LegacyRef<HTMLButtonElement>
+) {
+  const { t } = useTranslation();
+  const theme = useTheme();
+  const menu = useMenuState({
+    parentId: parentMenuState.baseId,
+  });
+
+  return (
+    <>
+      <MenuButton ref={ref} {...menu} {...rest}>
+        {(props) => (
+          <MenuAnchor disclosure {...props}>
+            {title} <Disclosure color={theme.textTertiary} />
+          </MenuAnchor>
+        )}
+      </MenuButton>
+      <ContextMenu
+        {...menu}
+        aria-label={t("Submenu")}
+        onClick={parentMenuState.hide}
+        parentMenuState={parentMenuState}
+      >
+        <MouseSafeArea parentRef={menu.unstable_popoverRef} />
+        <Template {...menu} items={templateItems} />
+      </ContextMenu>
+    </>
+  );
+});
+
+export function filterTemplateItems(items: TMenuItem[]): TMenuItem[] {
+  return items
+    .filter((item) => item.visible !== false)
+    .reduce((acc, item) => {
+      // trim separator if the previous item was a separator
+      if (
+        item.type === "separator" &&
+        acc[acc.length - 1]?.type === "separator"
+      ) {
+        return acc;
+      }
+      return [...acc, item];
+    }, [] as TMenuItem[])
+    .filter((item, index, arr) => {
+      if (
+        item.type === "separator" &&
+        (index === 0 || index === arr.length - 1)
+      ) {
+        return false;
+      }
+      return true;
+    });
+}
+
+function Template({ items, actions, context, showIcons, ...menu }: Props) {
+  const ctx = useActionContext({
+    isContextMenu: true,
+  });
+
+  const templateItems = actions
+    ? actions.map((item) =>
+        item.type === "separator" || item.type === "heading"
+          ? item
+          : actionToMenuItem(item, ctx)
+      )
+    : items || [];
+
+  const filteredTemplates = filterTemplateItems(templateItems);
+
+  const iconIsPresentInAnyMenuItem = filteredTemplates.find(
+    (item) =>
+      item.type !== "separator" && item.type !== "heading" && !!item.icon
+  );
+
+  return (
+    <>
+      {filteredTemplates.map((item, index) => {
+        if (
+          iconIsPresentInAnyMenuItem &&
+          item.type !== "separator" &&
+          item.type !== "heading" &&
+          showIcons !== false
+        ) {
+          item.icon = item.icon || <MenuIconWrapper aria-hidden />;
+        }
+
+        if (item.type === "route") {
+          return (
+            <MenuItem
+              as={Link}
+              id={`${item.title}-${index}`}
+              to={item.to}
+              key={`${item.type}-${item.title}-${index}`}
+              disabled={item.disabled}
+              selected={item.selected}
+              icon={showIcons !== false ? item.icon : undefined}
+              {...menu}
+            >
+              {item.title}
+            </MenuItem>
+          );
+        }
+
+        if (item.type === "link") {
+          return (
+            <MenuItem
+              id={`${item.title}-${index}`}
+              href={typeof item.href === "string" ? item.href : item.href.url}
+              key={`${item.type}-${item.title}-${index}`}
+              disabled={item.disabled}
+              selected={item.selected}
+              level={item.level}
+              target={
+                typeof item.href === "string" ? undefined : item.href.target
+              }
+              icon={showIcons !== false ? item.icon : undefined}
+              {...menu}
+            >
+              {item.title}
+            </MenuItem>
+          );
+        }
+
+        if (item.type === "button") {
+          const menuItem = (
+            <MenuItem
+              as="button"
+              id={`${item.title}-${index}`}
+              onClick={item.onClick}
+              disabled={item.disabled}
+              selected={item.selected}
+              dangerous={item.dangerous}
+              key={`${item.type}-${item.title}-${index}`}
+              icon={showIcons !== false ? item.icon : undefined}
+              {...menu}
+            >
+              {item.title}
+            </MenuItem>
+          );
+
+          return item.tooltip ? (
+            <Tooltip
+              content={item.tooltip}
+              placement={"bottom"}
+              key={`tooltip-${item.title}-${index}`}
+            >
+              <div>{menuItem}</div>
+            </Tooltip>
+          ) : (
+            <React.Fragment key={`${item.type}-${item.title}-${index}`}>
+              {menuItem}
+            </React.Fragment>
+          );
+        }
+
+        if (item.type === "submenu") {
+          // Skip rendering empty submenus
+          return item.items.length > 0 ? (
+            <BaseMenuItem
+              key={`${item.type}-${item.title}-${index}`}
+              as={SubMenu}
+              id={`${item.title}-${index}`}
+              templateItems={item.items}
+              parentMenuState={menu}
+              title={
+                <Title
+                  title={item.title}
+                  icon={showIcons !== false ? item.icon : undefined}
+                />
+              }
+              {...menu}
+            />
+          ) : null;
+        }
+
+        if (item.type === "separator") {
+          return <Separator key={`separator-${index}`} />;
+        }
+
+        if (item.type === "heading") {
+          return (
+            <Header key={`heading-${item.title}-${index}`}>{item.title}</Header>
+          );
+        }
+
+        // This should never be reached for Reakit dropdown menu.
+        // Added for exhaustiveness check.
+        if (item.type === "group") {
+          return null;
+        }
+
+        const _exhaustiveCheck: never = item;
+        return _exhaustiveCheck;
+      })}
+    </>
+  );
+}
+
+function Title({
+  title,
+  icon,
+}: {
+  title: React.ReactNode;
+  icon?: React.ReactNode;
+}) {
+  return (
+    <Flex align="center">
+      {icon && <MenuIconWrapper aria-hidden>{icon}</MenuIconWrapper>}
+      {title}
+    </Flex>
+  );
+}
+
+export default React.memo<Props>(Template);
@@ -0,0 +1,317 @@
+import { disableBodyScroll, enableBodyScroll } from "body-scroll-lock";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { Menu, MenuStateReturn } from "reakit/Menu";
+import styled, { DefaultTheme } from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { depths, s } from "@shared/styles";
+import Scrollable from "~/components/Scrollable";
+import useEventListener from "~/hooks/useEventListener";
+import useMenuContext from "~/hooks/useMenuContext";
+import useMenuHeight from "~/hooks/useMenuHeight";
+import useMobile from "~/hooks/useMobile";
+import usePrevious from "~/hooks/usePrevious";
+import useStores from "~/hooks/useStores";
+import useUnmount from "~/hooks/useUnmount";
+import {
+  fadeIn,
+  fadeAndSlideUp,
+  fadeAndSlideDown,
+  mobileContextMenu,
+} from "~/styles/animations";
+
+export type Placement =
+  | "auto-start"
+  | "auto"
+  | "auto-end"
+  | "top-start"
+  | "top"
+  | "top-end"
+  | "right-start"
+  | "right"
+  | "right-end"
+  | "bottom-end"
+  | "bottom"
+  | "bottom-start"
+  | "left-end"
+  | "left"
+  | "left-start";
+
+type Props = MenuStateReturn & {
+  "aria-label"?: string;
+  /** Reference to the rendered menu div element */
+  menuRef?: React.RefObject<HTMLDivElement>;
+  /** The parent menu state if this is a submenu. */
+  parentMenuState?: Omit<MenuStateReturn, "items">;
+  /** Called when the context menu is opened. */
+  onOpen?: () => void;
+  /** Called when the context menu is closed. */
+  onClose?: () => void;
+  /** Called when the context menu is clicked. */
+  onClick?: (ev: React.MouseEvent) => void;
+  /** The maximum width of the context menu. */
+  maxWidth?: number;
+  /** The minimum height of the context menu. */
+  minHeight?: number;
+  children?: React.ReactNode;
+};
+
+const ContextMenu: React.FC<Props> = ({
+  menuRef,
+  children,
+  onOpen,
+  onClose,
+  parentMenuState,
+  ...rest
+}: Props) => {
+  const previousVisible = usePrevious(rest.visible);
+  const { ui } = useStores();
+  const { t } = useTranslation();
+  const { setIsMenuOpen } = useMenuContext();
+  const isMobile = useMobile();
+  const isSubMenu = !!parentMenuState;
+
+  useUnmount(() => {
+    setIsMenuOpen(false);
+  });
+
+  React.useEffect(() => {
+    if (rest.visible && !previousVisible) {
+      onOpen?.();
+
+      if (!isSubMenu) {
+        setIsMenuOpen(true);
+      }
+    }
+
+    if (!rest.visible && previousVisible) {
+      onClose?.();
+
+      if (!isSubMenu) {
+        setIsMenuOpen(false);
+      }
+    }
+  }, [
+    onOpen,
+    onClose,
+    previousVisible,
+    rest.visible,
+    ui.sidebarCollapsed,
+    setIsMenuOpen,
+    isSubMenu,
+    t,
+  ]);
+
+  // Perf win – don't render anything until the menu has been opened
+  if (!rest.visible && !previousVisible) {
+    return null;
+  }
+
+  // sets the menu height based on the available space between the disclosure/
+  // trigger and the bottom of the window
+  return (
+    <>
+      <Menu
+        ref={menuRef}
+        hideOnClickOutside={!isMobile}
+        preventBodyScroll={false}
+        {...rest}
+      >
+        {(props) => (
+          <InnerContextMenu
+            // oxlint-disable-next-line @typescript-eslint/no-explicit-any
+            menuProps={props as any}
+            {...rest}
+            isSubMenu={isSubMenu}
+          >
+            {children}
+          </InnerContextMenu>
+        )}
+      </Menu>
+    </>
+  );
+};
+
+type InnerContextMenuProps = MenuStateReturn & {
+  isSubMenu: boolean;
+  menuProps: { style?: React.CSSProperties; placement: string };
+  children: React.ReactNode;
+  maxWidth?: number;
+  minHeight?: number;
+};
+
+/**
+ * Inner context menu allows deferring expensive window measurement hooks etc
+ * until the menu is actually opened.
+ */
+const InnerContextMenu = (props: InnerContextMenuProps) => {
+  const { menuProps } = props;
+  // kind of hacky, but this is an effective way of telling which way
+  // the menu will _actually_ be placed when taking into account screen
+  // positioning.
+  const topAnchor =
+    menuProps.style?.top === "0" || menuProps.style?.position === "fixed";
+  const rightAnchor = menuProps.placement === "bottom-end";
+  const backgroundRef = React.useRef<HTMLDivElement>(null);
+  const isMobile = useMobile();
+
+  const maxHeight = useMenuHeight({
+    visible: props.visible,
+    elementRef: props.unstable_disclosureRef,
+  });
+
+  // We must manually manage scroll lock for iOS support so that the scrollable
+  // element can be passed into body-scroll-lock. See:
+  // https://github.com/ariakit/ariakit/issues/469
+  React.useEffect(() => {
+    const scrollElement = backgroundRef.current;
+    if (props.visible && scrollElement && !props.isSubMenu) {
+      disableBodyScroll(scrollElement, {
+        reserveScrollBarGap: true,
+      });
+    }
+    return () => {
+      if (scrollElement && !props.isSubMenu) {
+        enableBodyScroll(scrollElement);
+      }
+    };
+  }, [props.isSubMenu, props.visible]);
+
+  useEventListener(
+    "animationstart",
+    (event) => {
+      if (event.target instanceof HTMLElement) {
+        const parent = event.target.parentElement;
+        if (parent) {
+          parent.style.pointerEvents = "none";
+        }
+      }
+    },
+    backgroundRef.current
+  );
+
+  useEventListener(
+    "animationend",
+    (event) => {
+      if (event.target instanceof HTMLElement) {
+        const parent = event.target.parentElement;
+        if (parent) {
+          parent.style.pointerEvents = "auto";
+        }
+      }
+    },
+    backgroundRef.current
+  );
+
+  const style =
+    topAnchor && !isMobile
+      ? {
+          maxHeight,
+        }
+      : undefined;
+
+  return (
+    <>
+      {isMobile && (
+        <Backdrop
+          onClick={(ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            props.hide?.();
+          }}
+        />
+      )}
+      <Position {...menuProps}>
+        <Background
+          dir="auto"
+          maxWidth={props.maxWidth}
+          minHeight={props.minHeight}
+          topAnchor={topAnchor}
+          rightAnchor={rightAnchor}
+          ref={backgroundRef}
+          hiddenScrollbars
+          style={style}
+        >
+          {props.visible || props.animating ? props.children : null}
+        </Background>
+      </Position>
+    </>
+  );
+};
+
+export default ContextMenu;
+
+export const Backdrop = styled.div`
+  animation: ${fadeIn} 200ms ease-in-out;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: ${s("backdrop")};
+  z-index: ${depths.menu - 1};
+`;
+
+export const Position = styled.div`
+  position: absolute;
+  z-index: ${depths.menu};
+
+  // Note: pointer events are re-enabled after the animation ends, see event listeners above
+  pointer-events: none;
+
+  &:focus-visible {
+    transition-delay: 250ms;
+    transition-property: outline-width;
+    transition-duration: 0;
+    outline: none;
+  }
+
+  /*
+   * overrides make mobile-first coding style challenging
+   * so we explicitly define mobile breakpoint here
+   */
+  ${breakpoint("mobile", "tablet")`
+    position: fixed !important;
+    transform: none !important;
+    top: auto !important;
+    right: 8px !important;
+    bottom: 16px !important;
+    left: 8px !important;
+  `};
+`;
+
+type BackgroundProps = {
+  topAnchor?: boolean;
+  rightAnchor?: boolean;
+  maxWidth?: number;
+  minHeight?: number;
+  theme: DefaultTheme;
+};
+
+export const Background = styled(Scrollable)<BackgroundProps>`
+  animation: ${mobileContextMenu} 200ms ease;
+  transform-origin: 50% 100%;
+  max-width: 100%;
+  background: ${s("menuBackground")};
+  border-radius: 6px;
+  padding: 6px;
+  min-width: 180px;
+  min-height: ${(props) => props.minHeight || 44}px;
+  max-height: 75vh;
+  font-weight: normal;
+
+  @media print {
+    display: none;
+  }
+
+  ${breakpoint("tablet")`
+    animation: ${(props: BackgroundProps) =>
+      props.topAnchor ? fadeAndSlideDown : fadeAndSlideUp} 200ms ease;
+    transform-origin: ${(props: BackgroundProps) =>
+      props.rightAnchor ? "75%" : "25%"} 0;
+    max-width: ${(props: BackgroundProps) => props.maxWidth ?? 276}px;
+    max-height: 100vh;
+    background: ${(props: BackgroundProps) => props.theme.menuBackground};
+    box-shadow: ${(props: BackgroundProps) => props.theme.menuShadow};
+  `};
+`;
@@ -1,17 +1,9 @@
-import {
-  CollectionIcon as CollectionIconComponent,
-  HomeIcon,
-  PrivateCollectionIcon,
-} from "outline-icons";
-import { observer } from "mobx-react";
-import { getLuminance } from "polished";
+import { HomeIcon } from "outline-icons";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
-import Icon from "@shared/components/Icon";
-import { colorPalette } from "@shared/utils/collections";
-import type { Option } from "~/components/InputSelect";
-import { InputSelect } from "~/components/InputSelect";
+import CollectionIcon from "~/components/Icons/CollectionIcon";
+import { InputSelect, Option } from "~/components/InputSelect";
 import useStores from "~/hooks/useStores";

 type DefaultCollectionInputSelectProps = {
@@ -19,112 +11,74 @@ type DefaultCollectionInputSelectProps = {
  defaultCollectionId: string | null;
 };

-const DefaultCollectionInputSelect = observer(
-  ({
-    onSelectCollection,
-    defaultCollectionId,
-  }: DefaultCollectionInputSelectProps) => {
-    const { t } = useTranslation();
-    const { collections, ui } = useStores();
-    const [fetching, setFetching] = useState(false);
-    const [fetchError, setFetchError] = useState();
+const DefaultCollectionInputSelect = ({
+  onSelectCollection,
+  defaultCollectionId,
+}: DefaultCollectionInputSelectProps) => {
+  const { t } = useTranslation();
+  const { collections } = useStores();
+  const [fetching, setFetching] = useState(false);
+  const [fetchError, setFetchError] = useState();

-    React.useEffect(() => {
-      async function fetchData() {
-        if (!collections.isLoaded && !fetching && !fetchError) {
-          try {
-            setFetching(true);
-            await collections.fetchPage({
-              limit: 100,
-            });
-          } catch (error) {
-            toast.error(
-              t("Collections could not be loaded, please reload the app")
-            );
-            setFetchError(error);
-          } finally {
-            setFetching(false);
-          }
+  React.useEffect(() => {
+    async function fetchData() {
+      if (!collections.isLoaded && !fetching && !fetchError) {
+        try {
+          setFetching(true);
+          await collections.fetchPage({
+            limit: 100,
+          });
+        } catch (error) {
+          toast.error(
+            t("Collections could not be loaded, please reload the app")
+          );
+          setFetchError(error);
+        } finally {
+          setFetching(false);
        }
      }
-      void fetchData();
-    }, [fetchError, t, fetching, collections]);
-
-    if (fetching) {
-      return null;
    }
+    void fetchData();
+  }, [fetchError, t, fetching, collections]);

-    const isDark = ui.resolvedTheme === "dark";
-
-    // Eagerly resolve collection icon properties within this observer context
-    // to avoid MobX warnings when Radix Select clones elements for the trigger.
-    const options: Option[] = collections.nonPrivate.reduce(
-      (acc, collection) => {
-        const collectionIcon = collection.icon;
-        const rawColor = collection.color ?? colorPalette[0];
-
-        let icon: React.ReactElement;
-        if (!collectionIcon || collectionIcon === "collection") {
-          const color =
-            isDark && rawColor !== "currentColor"
-              ? getLuminance(rawColor) > 0.09
-                ? rawColor
-                : "currentColor"
-              : rawColor;
-          const Component = collection.isPrivate
-            ? PrivateCollectionIcon
-            : CollectionIconComponent;
-          icon = <Component color={color} />;
-        } else {
-          let color = rawColor;
-          if (color !== "currentColor") {
-            if (isDark) {
-              color = getLuminance(color) > 0.09 ? color : "currentColor";
-            } else {
-              color = getLuminance(color) < 0.9 ? color : "currentColor";
-            }
-          }
-          icon = (
-            <Icon
-              value={collectionIcon}
-              color={color}
-              initial={collection.initial}
-              forceColor
-            />
-          );
-        }
-
-        return [
+  const options: Option[] = React.useMemo(
+    () =>
+      collections.nonPrivate.reduce(
+        (acc, collection) => [
          ...acc,
          {
-            type: "item" as const,
+            type: "item",
            label: collection.name,
            value: collection.id,
-            icon,
+            icon: <CollectionIcon collection={collection} />,
          },
-        ];
-      },
-      [
-        {
-          type: "item",
-          label: t("Home"),
-          value: "home",
-          icon: <HomeIcon />,
-        },
-      ] satisfies Option[]
-    );
+        ],
+        [
+          {
+            type: "item",
+            label: t("Home"),
+            value: "home",
+            icon: <HomeIcon />,
+          },
+        ] satisfies Option[]
+      ),
+    [collections.nonPrivate, t]
+  );

-    return (
-      <InputSelect
-        options={options}
-        value={defaultCollectionId ?? "home"}
-        onChange={onSelectCollection}
-        label={t("Start view")}
-        hideLabel
-        short
-      />
-    );
+  if (fetching) {
+    return null;
  }
-);
+
+  return (
+    <InputSelect
+      options={options}
+      value={defaultCollectionId ?? "home"}
+      onChange={onSelectCollection}
+      label={t("Start view")}
+      hideLabel
+      short
+    />
+  );
+};

 export default DefaultCollectionInputSelect;
@@ -1,10 +1,7 @@
 import { observer } from "mobx-react";
-import { Suspense } from "react";
+import Guide from "~/components/Guide";
+import Modal from "~/components/Modal";
 import useStores from "~/hooks/useStores";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-
-const Guide = lazyWithRetry(() => import("~/components/Guide"));
-const Modal = lazyWithRetry(() => import("~/components/Modal"));

 function Dialogs() {
  const { dialogs } = useStores();
@@ -12,7 +9,7 @@ function Dialogs() {
  const modals = [...modalStack];

  return (
-    <Suspense fallback={null}>
+    <>
      {guide ? (
        <Guide
          isOpen={guide.isOpen}
@@ -32,13 +29,11 @@ function Dialogs() {
          }}
          title={modal.title}
          style={modal.style}
-          width={modal.width}
-          height={modal.height}
        >
          {modal.content}
        </Modal>
      ))}
-    </Suspense>
+    </>
  );
 }

@@ -1,8 +1,8 @@
 import { Trans, useTranslation } from "react-i18next";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
-import type { IntegrationType } from "@shared/types";
-import type Integration from "~/models/Integration";
+import { IntegrationType } from "@shared/types";
+import Integration from "~/models/Integration";
 import useStores from "~/hooks/useStores";
 import { useHistory } from "react-router-dom";
 import { settingsPath } from "~/utils/routeHelpers";
@@ -1,18 +1,18 @@
 import { observer } from "mobx-react";
-import { ArchiveIcon, GoToIcon, TrashIcon } from "outline-icons";
+import { ArchiveIcon, GoToIcon, ShapesIcon, TrashIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import Icon from "@shared/components/Icon";
 import type { NavigationNode } from "@shared/types";
-import type Document from "~/models/Document";
+import Document from "~/models/Document";
 import Breadcrumb from "~/components/Breadcrumb";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
-import { archivePath, trashPath } from "~/utils/routeHelpers";
-import { createInternalLinkAction } from "~/actions";
+import { archivePath, settingsPath, trashPath } from "~/utils/routeHelpers";
+import { createInternalLinkActionV2 } from "~/actions";
 import { ActiveDocumentSection } from "~/actions/sections";

 type Props = {
@@ -53,21 +53,28 @@ function DocumentBreadcrumb(
    }

    const outputActions = [
-      createInternalLinkAction({
+      createInternalLinkActionV2({
        name: t("Trash"),
        section: ActiveDocumentSection,
        icon: <TrashIcon />,
        visible: document.isDeleted,
        to: trashPath(),
      }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
        name: t("Archive"),
        section: ActiveDocumentSection,
        icon: <ArchiveIcon />,
        visible: document.isArchived,
        to: archivePath(),
      }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
+        name: t("Templates"),
+        section: ActiveDocumentSection,
+        icon: <ShapesIcon />,
+        visible: document.template,
+        to: settingsPath("templates"),
+      }),
+      createInternalLinkActionV2({
        name: collection?.name,
        section: ActiveDocumentSection,
        icon: collection ? (
@@ -81,7 +88,7 @@ function DocumentBreadcrumb(
            }
          : "",
      }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
        name: t("Deleted Collection"),
        section: ActiveDocumentSection,
        visible: document.isCollectionDeleted,
@@ -89,15 +96,10 @@ function DocumentBreadcrumb(
      }),
      ...path.map((node) => {
        const title = node.title || t("Untitled");
-        return createInternalLinkAction({
+        return createInternalLinkActionV2({
          name: node.icon ? (
            <>
-              <StyledIcon
-                value={node.icon}
-                color={node.color}
-                initial={node.title.charAt(0).toUpperCase()}
-              />{" "}
-              {title}
+              <StyledIcon value={node.icon} color={node.color} /> {title}
            </>
          ) : (
            title
@@ -3,8 +3,8 @@ import { CSS } from "@dnd-kit/utilities";
 import { subDays } from "date-fns";
 import { m } from "framer-motion";
 import { observer } from "mobx-react";
-import { CloseIcon, DocumentIcon, ClockIcon } from "outline-icons";
-import { useRef, useCallback, Suspense } from "react";
+import { CloseIcon, DocumentIcon, ClockIcon, EyeIcon } from "outline-icons";
+import { useRef, useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import styled, { useTheme } from "styled-components";
@@ -13,18 +13,16 @@ import Squircle from "@shared/components/Squircle";
 import { s, hover, ellipsis } from "@shared/styles";
 import { IconType } from "@shared/types";
 import { determineIconType } from "@shared/utils/icon";
-import type Document from "~/models/Document";
-import type Pin from "~/models/Pin";
+import Document from "~/models/Document";
+import Pin from "~/models/Pin";
 import Flex from "~/components/Flex";
 import NudeButton from "~/components/NudeButton";
 import Time from "~/components/Time";
 import useStores from "~/hooks/useStores";
+import { useTextStats } from "~/hooks/useTextStats";
 import CollectionIcon from "./Icons/CollectionIcon";
 import Text from "./Text";
 import Tooltip from "./Tooltip";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-
-const ReadingTime = lazyWithRetry(() => import("./ReadingTime"));

 type Props = {
  /** The pin record */
@@ -78,13 +76,6 @@ function DocumentCard(props: Props) {
  const isRecentlyUpdated =
    new Date(document.updatedAt) > subDays(new Date(), 7);

-  const updatedAt = (
-    <>
-      <Clock size={18} />
-      <Time dateTime={document.updatedAt} addSuffix shorten />
-    </>
-  );
-
  return (
    <Reorderable
      ref={setNodeRef}
@@ -159,11 +150,12 @@ function DocumentCard(props: Props) {
              </Heading>
              <DocumentMeta size="xsmall">
                {isRecentlyUpdated ? (
-                  updatedAt
+                  <>
+                    <Clock size={18} />
+                    <Time dateTime={document.updatedAt} addSuffix shorten />
+                  </>
                ) : (
-                  <Suspense fallback={updatedAt}>
-                    <ReadingTime document={document} />
-                  </Suspense>
+                  <ReadingTime document={document} />
                )}
              </DocumentMeta>
            </div>
@@ -185,14 +177,29 @@ function DocumentCard(props: Props) {
  );
 }

+const ReadingTime = ({ document }: { document: Document }) => {
+  const { t } = useTranslation();
+  const markdown = useMemo(() => document.toMarkdown(), [document]);
+  const stats = useTextStats(markdown);
+
+  return (
+    <>
+      <EyeIcon size={18} />
+      {t(`{{ minutes }}m read`, {
+        minutes: stats.total.readingTime,
+      })}
+    </>
+  );
+};
+
 const DocumentSquircle = ({
  icon,
-  initial,
  color,
+  initial,
 }: {
  icon: string;
-  initial: string;
  color?: string;
+  initial?: string;
 }) => {
  const theme = useTheme();
  const iconType = determineIconType(icon)!;
@@ -1,9 +1,8 @@
 import { action, computed, observable } from "mobx";
-import type { PropsWithChildren } from "react";
-import { createContext, useContext, useMemo } from "react";
-import type { Heading } from "@shared/utils/ProsemirrorHelper";
-import type Document from "~/models/Document";
-import type { Editor } from "~/editor";
+import { createContext, useContext, useMemo, PropsWithChildren } from "react";
+import { Heading } from "@shared/utils/ProsemirrorHelper";
+import Document from "~/models/Document";
+import { Editor } from "~/editor";

 class DocumentContext {
  /** The current document */
@@ -3,15 +3,15 @@ import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import styled from "styled-components";
-import type { NavigationNode } from "@shared/types";
-import type Document from "~/models/Document";
+import { NavigationNode } from "@shared/types";
+import Document from "~/models/Document";
+import { FlexContainer, Footer, StyledText } from "~/scenes/DocumentMove";
 import Button from "~/components/Button";
-import Switch from "~/components/Switch";
-import Text from "~/components/Text";
+import DocumentExplorer from "~/components/DocumentExplorer";
 import useCollectionTrees from "~/hooks/useCollectionTrees";
 import useStores from "~/hooks/useStores";
-import { FlexContainer, Footer } from "./Components";
-import DocumentExplorer from "./DocumentExplorer";
+import Switch from "./Switch";
+import Text from "./Text";

 type Props = {
  /** The original document to duplicate */
@@ -24,7 +24,6 @@ function DocumentCopy({ document, onSubmit }: Props) {
  const { policies } = useStores();
  const collectionTrees = useCollectionTrees();
  const [publish, setPublish] = React.useState<boolean>(!!document.publishedAt);
-  const [copying, setCopying] = React.useState<boolean>(false);
  const [recursive, setRecursive] = React.useState<boolean>(true);
  const [selectedPath, selectPath] = React.useState<NavigationNode | null>(
    null
@@ -37,8 +36,13 @@ function DocumentCopy({ document, onSubmit }: Props) {
        : true
    );

+    if (document.isTemplate) {
+      return nodes
+        .filter((node) => node.type === "collection")
+        .map((node) => ({ ...node, children: [] }));
+    }
    return nodes;
-  }, [policies, collectionTrees]);
+  }, [policies, collectionTrees, document.isTemplate]);

  const copy = async () => {
    if (!selectedPath) {
@@ -47,7 +51,6 @@ function DocumentCopy({ document, onSubmit }: Props) {
    }

    try {
-      setCopying(true);
      const result = await document.duplicate({
        publish,
        recursive,
@@ -62,8 +65,6 @@ function DocumentCopy({ document, onSubmit }: Props) {
      onSubmit(result);
    } catch (_err) {
      toast.error(t("Couldn’t copy the document, try again?"));
-    } finally {
-      setCopying(false);
    }
  };

@@ -75,32 +76,34 @@ function DocumentCopy({ document, onSubmit }: Props) {
        onSelect={selectPath}
        defaultValue={document.parentDocumentId || document.collectionId || ""}
      />
-      <OptionsContainer>
-        {document.collectionId && (
-          <Text size="small">
-            <Switch
-              name="publish"
-              label={t("Publish")}
-              labelPosition="right"
-              checked={publish}
-              onChange={setPublish}
-            />
-          </Text>
-        )}
-        {document.publishedAt && document.childDocuments.length > 0 && (
-          <Text size="small">
-            <Switch
-              name="recursive"
-              label={t("Include nested documents")}
-              labelPosition="right"
-              checked={recursive}
-              onChange={setRecursive}
-            />
-          </Text>
-        )}
-      </OptionsContainer>
+      {!document.isTemplate && (
+        <OptionsContainer>
+          {document.collectionId && (
+            <Text size="small">
+              <Switch
+                name="publish"
+                label={t("Publish")}
+                labelPosition="right"
+                checked={publish}
+                onChange={setPublish}
+              />
+            </Text>
+          )}
+          {document.publishedAt && document.childDocuments.length > 0 && (
+            <Text size="small">
+              <Switch
+                name="recursive"
+                label={t("Include nested documents")}
+                labelPosition="right"
+                checked={recursive}
+                onChange={setRecursive}
+              />
+            </Text>
+          )}
+        </OptionsContainer>
+      )}
      <Footer justify="space-between" align="center" gap={8}>
-        <Text ellipsis type="secondary">
+        <StyledText type="secondary">
          {selectedPath ? (
            <Trans
              defaults="Copy to <em>{{ location }}</em>"
@@ -110,9 +113,9 @@ function DocumentCopy({ document, onSubmit }: Props) {
          ) : (
            t("Select a location to copy")
          )}
-        </Text>
-        <Button disabled={!selectedPath || copying} onClick={copy}>
-          {copying ? `${t("Copying")}…` : t("Copy")}
+        </StyledText>
+        <Button disabled={!selectedPath} onClick={copy}>
+          {t("Copy")}
        </Button>
      </Footer>
    </FlexContainer>
@@ -1,185 +0,0 @@
-import { observer } from "mobx-react";
-import { useCallback, useMemo, useState } from "react";
-import { Trans, useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import styled from "styled-components";
-import { ExportContentType, NotificationEventType } from "@shared/types";
-import type Document from "~/models/Document";
-import ConfirmationDialog from "~/components/ConfirmationDialog";
-import Flex from "~/components/Flex";
-import Text from "~/components/Text";
-import env from "~/env";
-import useCurrentUser from "~/hooks/useCurrentUser";
-import useStores from "~/hooks/useStores";
-
-type Props = {
-  document: Document;
-  onSubmit: () => void;
-};
-
-export const DocumentDownload = observer(({ document, onSubmit }: Props) => {
-  const { t } = useTranslation();
-  const { ui } = useStores();
-  const user = useCurrentUser();
-  const hasChildDocuments = !!document.childDocuments.length;
-
-  const [contentType, setContentType] = useState<ExportContentType>(
-    ExportContentType.Markdown
-  );
-  const [includeChildDocuments, setIncludeChildDocuments] =
-    useState<boolean>(hasChildDocuments);
-
-  const handleContentTypeChange = useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setContentType(ev.target.value as ExportContentType);
-    },
-    []
-  );
-
-  const handleIncludeChildDocumentsChange = useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setIncludeChildDocuments(ev.target.checked);
-    },
-    []
-  );
-
-  const handleSubmit = useCallback(async () => {
-    const response = await document.download({
-      contentType,
-      includeChildDocuments,
-    });
-
-    if (includeChildDocuments && response?.data?.fileOperation) {
-      const fileOperationId = response.data.fileOperation.id;
-      const toastId = `export-${fileOperationId}`;
-
-      const timeoutId = setTimeout(() => {
-        toast.success(t("Export started"), {
-          id: toastId,
-          description: t("A link to your file will be sent through email soon"),
-          duration: 3000,
-        });
-        ui.exportToasts.delete(fileOperationId);
-      }, 6000);
-
-      ui.registerExportToast(fileOperationId, toastId, timeoutId);
-
-      toast.loading(t("Export started"), {
-        id: toastId,
-        description: `${t("Preparing your download")}…`,
-        duration: Infinity,
-      });
-    }
-
-    onSubmit();
-  }, [t, ui, document, contentType, includeChildDocuments, onSubmit]);
-
-  const items = useMemo(() => {
-    const radioItems = [
-      {
-        title: "Markdown",
-        description: t(
-          "A file containing the selected documents in Markdown format."
-        ),
-        value: ExportContentType.Markdown,
-      },
-      {
-        title: "HTML",
-        description: t(
-          "A file containing the selected documents in HTML format."
-        ),
-        value: ExportContentType.Html,
-      },
-    ];
-
-    if (env.PDF_EXPORT_ENABLED) {
-      radioItems.push({
-        title: "PDF",
-        description: t(
-          "A file containing the selected documents in PDF format."
-        ),
-        value: ExportContentType.Pdf,
-      });
-    }
-
-    return radioItems;
-  }, [t]);
-
-  return (
-    <ConfirmationDialog
-      onSubmit={handleSubmit}
-      submitText={includeChildDocuments ? t("Export") : t("Download")}
-    >
-      <Flex gap={12} column>
-        {items.map((item) => (
-          <Option key={item.value}>
-            <StyledInput
-              type="radio"
-              name="format"
-              value={item.value}
-              checked={contentType === item.value}
-              onChange={handleContentTypeChange}
-            />
-            <div>
-              <Text as="p" size="small" weight="bold">
-                {item.title}
-              </Text>
-              {item.description ? (
-                <Text size="small" type="secondary">
-                  {item.description}
-                </Text>
-              ) : null}
-            </div>
-          </Option>
-        ))}
-      </Flex>
-      {hasChildDocuments && (
-        <>
-          <hr style={{ margin: "16px 0 " }} />
-          <Option>
-            <StyledInput
-              type="checkbox"
-              name="includeChildDocuments"
-              checked={includeChildDocuments}
-              onChange={handleIncludeChildDocumentsChange}
-            />
-            <Flex column gap={4}>
-              <Text as="p" size="small" weight="bold">
-                {t("Include child documents")}
-              </Text>
-              <Text as="p" size="small" type="secondary">
-                <Trans
-                  defaults="When selected, exporting the document <em>{{documentName}}</em> may take some time."
-                  values={{
-                    documentName: document.titleWithDefault,
-                  }}
-                  components={{
-                    em: <strong />,
-                  }}
-                />{" "}
-                {user.subscribedToEventType(
-                  NotificationEventType.ExportCompleted
-                ) && t("You will receive an email when it's complete.")}
-              </Text>
-            </Flex>
-          </Option>
-        </>
-      )}
-    </ConfirmationDialog>
-  );
-});
-
-const Option = styled.label`
-  display: flex;
-  align-items: baseline;
-  gap: 16px;
-
-  p {
-    margin: 0;
-  }
-`;
-
-const StyledInput = styled.input`
-  position: relative;
-  top: 1.5px;
-`;
@@ -3,7 +3,6 @@ import concat from "lodash/concat";
 import difference from "lodash/difference";
 import fill from "lodash/fill";
 import filter from "lodash/filter";
-import flatten from "lodash/flatten";
 import includes from "lodash/includes";
 import map from "lodash/map";
 import { observer } from "mobx-react";
@@ -12,14 +11,14 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import AutoSizer from "react-virtualized-auto-sizer";
 import { FixedSizeList as List } from "react-window";
+import scrollIntoView from "scroll-into-view-if-needed";
 import styled, { useTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import Icon from "@shared/components/Icon";
-import type { NavigationNode } from "@shared/types";
+import { NavigationNode } from "@shared/types";
 import { isModKey } from "@shared/utils/keyboard";
-import { ancestors, descendants, flattenTree } from "@shared/utils/tree";
-import DocumentExplorerNode from "./DocumentExplorerNode";
-import DocumentExplorerSearchResult from "./DocumentExplorerSearchResult";
+import DocumentExplorerNode from "~/components/DocumentExplorerNode";
+import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
 import Flex from "~/components/Flex";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { Outline } from "~/components/Input";
@@ -27,6 +26,8 @@ import InputSearch from "~/components/InputSearch";
 import Text from "~/components/Text";
 import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";
+import { ancestors, descendants, flattenTree } from "~/utils/tree";
+import flatten from "lodash/flatten";

 type Props = {
  /** Action taken upon submission of selected item, could be publish, move etc. */
@@ -37,39 +38,9 @@ type Props = {
  items: NavigationNode[];
  /** Automatically expand to and select item with the given id */
  defaultValue?: string;
-  /** Whether to show child documents */
-  showDocuments?: boolean;
 };

-const VERTICAL_PADDING = 6;
-const HORIZONTAL_PADDING = 24;
-
-const innerElementType = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(function innerElementType(
-  { style, ...rest }: React.HTMLAttributes<HTMLDivElement>,
-  ref
-) {
-  return (
-    <div
-      ref={ref}
-      style={{
-        ...style,
-        height: `${parseFloat(style?.height + "") + VERTICAL_PADDING * 2}px`,
-      }}
-      {...rest}
-    />
-  );
-});
-
-function DocumentExplorer({
-  onSubmit,
-  onSelect,
-  items,
-  defaultValue,
-  showDocuments,
-}: Props) {
+function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
  const isMobile = useMobile();
  const { collections, documents } = useStores();
  const { t } = useTranslation();
@@ -78,22 +49,17 @@ function DocumentExplorer({
  const [searchTerm, setSearchTerm] = React.useState<string>();
  const [selectedNode, selectNode] = React.useState<NavigationNode | null>(
    () => {
-      if (!defaultValue) {
-        return null;
-      }
-
-      // Search through all nodes in the tree, not just top-level items
-      const allNodes = flatten(items.map(flattenTree));
-      const node = allNodes.find((item) => item.id === defaultValue);
+      const node =
+        defaultValue && items.find((item) => item.id === defaultValue);
      return node || null;
    }
  );
+  const [initialScrollOffset, setInitialScrollOffset] =
+    React.useState<number>(0);
  const [activeNode, setActiveNode] = React.useState<number>(0);
  const [expandedNodes, setExpandedNodes] = React.useState<string[]>(() => {
    if (defaultValue) {
-      // Search through all nodes in the tree, not just top-level items
-      const allNodes = flatten(items.map(flattenTree));
-      const node = allNodes.find((item) => item.id === defaultValue);
+      const node = items.find((item) => item.id === defaultValue);
      if (node) {
        return ancestors(node).map((ancestorNode) => ancestorNode.id);
      }
@@ -110,6 +76,9 @@ function DocumentExplorer({
  );
  const listRef = React.useRef<List<NavigationNode[]>>(null);

+  const VERTICAL_PADDING = 6;
+  const HORIZONTAL_PADDING = 24;
+
  const searchIndex = React.useMemo(
    () =>
      new FuzzySearch(flatten(items.map(flattenTree)), ["title"], {
@@ -135,6 +104,19 @@ function DocumentExplorer({
    );
  }, [items.length]);

+  React.useEffect(() => {
+    onSelect(selectedNode);
+  }, [selectedNode, onSelect]);
+
+  React.useEffect(() => {
+    if (defaultValue && selectedNode && listRef) {
+      const index = nodes.findIndex((node) => node.id === selectedNode.id);
+      if (index > 0) {
+        setTimeout(() => listRef.current?.scrollToItem(index, "center"), 50);
+      }
+    }
+  }, []);
+
  function getNodes() {
    function includeDescendants(item: NavigationNode): NavigationNode[] {
      return expandedNodes.includes(item.id)
@@ -148,30 +130,23 @@ function DocumentExplorer({
  }

  const nodes = getNodes();
-
-  React.useEffect(() => {
-    onSelect(selectedNode);
-  }, [selectedNode, onSelect]);
-
-  React.useEffect(() => {
-    if (defaultValue && selectedNode && listRef) {
-      const index = nodes.findIndex((node) => node.id === selectedNode.id);
-      if (index > 0) {
-        setTimeout(() => listRef.current?.scrollToItem(index, "center"), 50);
-      }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [defaultValue]);
  const baseDepth = nodes.reduce(
    (min, node) => (node.depth ? Math.min(min, node.depth) : min),
    Infinity
  );
-  const normalizedBaseDepth =
-    (baseDepth === Infinity ? 0 : baseDepth) + (showDocuments ? 0 : 1);
+  const normalizedBaseDepth = baseDepth === Infinity ? 0 : baseDepth;

-  const scrollNodeIntoView = React.useCallback((node: number) => {
-    listRef.current?.scrollToItem(node, "smart");
-  }, []);
+  const scrollNodeIntoView = React.useCallback(
+    (node: number) => {
+      if (itemRefs[node] && itemRefs[node].current) {
+        scrollIntoView(itemRefs[node].current as HTMLSpanElement, {
+          behavior: "auto",
+          block: "center",
+        });
+      }
+    },
+    [itemRefs]
+  );

  const handleSearch = (ev: React.ChangeEvent<HTMLInputElement>) => {
    setSearchTerm(ev.target.value);
@@ -179,16 +154,16 @@ function DocumentExplorer({

  const isExpanded = (node: number) => includes(expandedNodes, nodes[node].id);

-  const preserveScrollOffset = (itemCount: number) => {
+  const calculateInitialScrollOffset = (itemCount: number) => {
    if (listRef.current) {
      const { height, itemSize } = listRef.current.props;
      const { scrollOffset } = listRef.current.state as {
        scrollOffset: number;
      };
      const itemsHeight = itemCount * itemSize;
-      const offset = itemsHeight < Number(height) ? 0 : scrollOffset;
-      setTimeout(() => listRef.current?.scrollTo(offset), 0);
+      return itemsHeight < Number(height) ? 0 : scrollOffset;
    }
+    return 0;
  };

  const collapse = (node: number) => {
@@ -199,7 +174,8 @@ function DocumentExplorer({

    // remove children
    const newNodes = filter(nodes, (n) => !includes(descendantIds, n.id));
-    preserveScrollOffset(newNodes.length);
+    const scrollOffset = calculateInitialScrollOffset(newNodes.length);
+    setInitialScrollOffset(scrollOffset);
  };

  const expand = (node: number) => {
@@ -208,7 +184,8 @@ function DocumentExplorer({
    // add children
    const newNodes = nodes.slice();
    newNodes.splice(node + 1, 0, ...descendants(nodes[node], 1));
-    preserveScrollOffset(newNodes.length);
+    const scrollOffset = calculateInitialScrollOffset(newNodes.length);
+    setInitialScrollOffset(scrollOffset);
  };

  React.useEffect(() => {
@@ -232,8 +209,7 @@ function DocumentExplorer({
  };

  const hasChildren = (node: number) =>
-    nodes[node].children.length > 0 ||
-    (showDocuments !== false && nodes[node].type === "collection");
+    nodes[node].children.length > 0 || nodes[node].type === "collection";

  const toggleCollapse = (node: number) => {
    if (!hasChildren(node)) {
@@ -285,9 +261,7 @@ function DocumentExplorer({
        title = doc?.title ?? node.title;

        if (icon) {
-          renderedIcon = (
-            <Icon value={icon} initial={node.title} color={color} />
-          );
+          renderedIcon = <Icon value={icon} color={color} />;
        } else if (doc?.isStarred) {
          renderedIcon = <StarredIcon color={theme.yellow} />;
        } else {
@@ -395,16 +369,31 @@ function DocumentExplorer({
    }
  };

+  const innerElementType = React.forwardRef<
+    HTMLDivElement,
+    React.HTMLAttributes<HTMLDivElement>
+  >(function innerElementType(
+    { style, ...rest }: React.HTMLAttributes<HTMLDivElement>,
+    ref
+  ) {
+    return (
+      <div
+        ref={ref}
+        style={{
+          ...style,
+          height: `${parseFloat(style?.height + "") + VERTICAL_PADDING * 2}px`,
+        }}
+        {...rest}
+      />
+    );
+  });
+
  return (
    <Container tabIndex={-1} onKeyDown={handleKeyDown}>
      <ListSearch
        ref={inputSearchRef}
        onChange={handleSearch}
-        placeholder={
-          showDocuments
-            ? `${t("Search collections & documents")}…`
-            : `${t("Search collections")}…`
-        }
+        placeholder={`${t("Search collections & documents")}…`}
        autoFocus
      />
      <ListContainer>
@@ -414,12 +403,14 @@ function DocumentExplorer({
              <Flex role="listbox" column>
                <List
                  ref={listRef}
+                  key={nodes.length}
                  width={width}
                  height={height}
                  itemData={nodes}
                  itemCount={nodes.length}
                  itemSize={isMobile ? 48 : 32}
                  innerElementType={innerElementType}
+                  initialScrollOffset={initialScrollOffset}
                  itemKey={(index, results) => results[index].id}
                >
                  {ListItem}
@@ -1,17 +0,0 @@
-import styled from "styled-components";
-import Flex from "../Flex";
-
-export const FlexContainer = styled(Flex)`
-  margin-left: -24px;
-  margin-right: -24px;
-  margin-bottom: -24px;
-  outline: none;
-`;
-
-export const Footer = styled(Flex)`
-  height: 64px;
-  border-top: 1px solid ${(props) => props.theme.horizontalRule};
-  padding-left: 24px;
-  padding-right: 24px;
-  flex-shrink: 0;
-`;
@@ -1,87 +0,0 @@
-import { observer } from "mobx-react";
-import { useState, useMemo } from "react";
-import { useTranslation, Trans } from "react-i18next";
-import { toast } from "sonner";
-import type { NavigationNode } from "@shared/types";
-import type Template from "~/models/Template";
-import Button from "~/components/Button";
-import Text from "~/components/Text";
-import useCollectionTrees from "~/hooks/useCollectionTrees";
-import useStores from "~/hooks/useStores";
-import { FlexContainer, Footer } from "./Components";
-import DocumentExplorer from "./DocumentExplorer";
-
-type Props = {
-  template: Template;
-};
-
-function TemplateMove({ template }: Props) {
-  const { dialogs, policies } = useStores();
-  const { t } = useTranslation();
-  const collectionTrees = useCollectionTrees();
-  const [selectedPath, selectPath] = useState<NavigationNode | null>(null);
-
-  const items = useMemo(
-    () =>
-      collectionTrees
-        .map((node) => ({ ...node, children: [] }))
-        .filter((node) =>
-          node.collectionId
-            ? policies.get(node.collectionId)?.abilities.createDocument
-            : true
-        ),
-    [policies, collectionTrees]
-  );
-
-  const move = async () => {
-    if (!selectedPath) {
-      toast.message(t("Select a location to move"));
-      return;
-    }
-
-    try {
-      const collectionId = (selectedPath.collectionId ??
-        selectedPath.id) as string;
-      await template.save({ collectionId });
-
-      toast.success(t("Template moved"));
-
-      dialogs.closeAllModals();
-    } catch (_err) {
-      toast.error(t("Couldn’t move the template, try again?"));
-    }
-  };
-
-  return (
-    <FlexContainer column>
-      <DocumentExplorer
-        items={items}
-        onSubmit={move}
-        onSelect={selectPath}
-        showDocuments={false}
-      />
-      <Footer justify="space-between" align="center" gap={8}>
-        <Text ellipsis type="secondary">
-          {selectedPath ? (
-            <Trans
-              defaults="Move to <em>{{ location }}</em>"
-              values={{
-                location: selectedPath.title,
-              }}
-              components={{
-                em: <strong />,
-              }}
-            />
-          ) : (
-            t("Select a location to move")
-          )}
-        </Text>
-        <Button disabled={!selectedPath} onClick={move}>
-          {t("Move")}
-        </Button>
-      </Footer>
-    </FlexContainer>
-  );
-}
-
-export default observer(TemplateMove);
@@ -1,3 +0,0 @@
-import DocumentExplorer from "./DocumentExplorer";
-
-export default DocumentExplorer;
@@ -40,8 +40,10 @@ function DocumentExplorerNode(
  ref: React.RefObject<HTMLSpanElement>
 ) {
  const { t } = useTranslation();
-  const DISCLOSURE = 24;
-  const width = (depth + (hasChildren ? 2 : 1)) * DISCLOSURE;
+  const OFFSET = 12;
+  const DISCLOSURE = 20;
+
+  const width = depth ? depth * DISCLOSURE + OFFSET : DISCLOSURE;

  return (
    <Node
@@ -52,7 +54,6 @@ function DocumentExplorerNode(
      style={style}
      onPointerMove={onPointerMove}
      role="option"
-      aria-selected={selected}
    >
      <Spacer width={width}>
        {hasChildren && (
@@ -78,7 +79,7 @@ const Title = styled(Text)`
 const StyledDisclosure = styled(Disclosure)`
  position: relative;
  left: auto;
-  margin: 2px 0;
+  margin-top: 2px;
 `;

 const Spacer = styled(Flex)<{ width: number }>`
@@ -1,9 +1,10 @@
 import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import scrollIntoView from "scroll-into-view-if-needed";
 import styled from "styled-components";
 import { ellipsis } from "@shared/styles";
-import { Node as SearchResult } from "./DocumentExplorerNode";
+import { Node as SearchResult } from "~/components/DocumentExplorerNode";
 import Flex from "~/components/Flex";
 import Text from "~/components/Text";

@@ -31,15 +32,28 @@ function DocumentExplorerSearchResult({
 }: Props) {
  const { t } = useTranslation();

+  const ref = React.useCallback(
+    (node: HTMLSpanElement | null) => {
+      if (active && node) {
+        scrollIntoView(node, {
+          scrollMode: "if-needed",
+          behavior: "auto",
+          block: "nearest",
+        });
+      }
+    },
+    [active]
+  );
+
  return (
    <SearchResult
+      ref={ref}
      selected={selected}
      active={active}
      onClick={onClick}
      style={style}
      onPointerMove={onPointerMove}
      role="option"
-      aria-selected={selected}
    >
      {icon}
      <Flex>
@@ -6,13 +6,12 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import { DocumentIcon } from "outline-icons";
-import styled, { css, useTheme } from "styled-components";
+import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import EventBoundary from "@shared/components/EventBoundary";
 import Icon from "@shared/components/Icon";
 import { s, hover } from "@shared/styles";
-import type Document from "~/models/Document";
+import Document from "~/models/Document";
 import Badge from "~/components/Badge";
 import DocumentMeta from "~/components/DocumentMeta";
 import Flex from "~/components/Flex";
@@ -22,12 +21,11 @@ import StarButton, { AnimatedStar } from "~/components/Star";
 import Tooltip from "~/components/Tooltip";
 import useBoolean from "~/hooks/useBoolean";
 import useCurrentUser from "~/hooks/useCurrentUser";
-import useMobile from "~/hooks/useMobile";
 import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import DocumentMenu from "~/menus/DocumentMenu";
 import { documentPath } from "~/utils/routeHelpers";
 import { determineSidebarContext } from "./Sidebar/components/SidebarContext";
-import { ActionContextProvider } from "~/hooks/useActionContext";
+import useActionContext from "~/hooks/useActionContext";
 import { useDocumentMenuAction } from "~/hooks/useDocumentMenuAction";
 import { ContextMenu } from "./Menu/ContextMenu";
 import useStores from "~/hooks/useStores";
@@ -40,6 +38,7 @@ type Props = {
  showCollection?: boolean;
  showPublished?: boolean;
  showDraft?: boolean;
+  showTemplate?: boolean;
 };

 const SEARCH_RESULT_REGEX = /<b\b[^>]*>(.*?)<\/b>/gi;
@@ -55,11 +54,9 @@ function DocumentListItem(
 ) {
  const { t } = useTranslation();
  const user = useCurrentUser();
-  const theme = useTheme();
  const { userMemberships, groupMemberships } = useStores();
  const locationSidebarContext = useLocationSidebarContext();
  const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();
-  const isMobile = useMobile();

  let itemRef: React.Ref<HTMLAnchorElement> =
    React.useRef<HTMLAnchorElement>(null);
@@ -76,6 +73,7 @@ function DocumentListItem(
    showCollection,
    showPublished,
    showDraft = true,
+    showTemplate,
    highlight,
    context,
    ...rest
@@ -83,7 +81,7 @@ function DocumentListItem(
  const queryIsInTitle =
    !!highlight &&
    !!document.title.toLowerCase().includes(highlight.toLowerCase());
-  const canStar = !document.isArchived;
+  const canStar = !document.isArchived && !document.isTemplate;

  const isShared = !!(
    userMemberships.getByDocumentId(document.id) ||
@@ -96,111 +94,101 @@ function DocumentListItem(
    currentContext: locationSidebarContext,
  });

-  const contextMenuAction = useDocumentMenuAction({ documentId: document.id });
+  const actionContext = useActionContext({
+    isContextMenu: true,
+    activeDocumentId: document.id,
+    activeCollectionId:
+      !isShared && document.collectionId ? document.collectionId : undefined,
+  });
+
+  const contextMenuAction = useDocumentMenuAction({ document });

  return (
-    <ActionContextProvider
-      value={{
-        activeModels: [
-          document,
-          ...(!isShared && document.collection ? [document.collection] : []),
-        ],
-      }}
+    <ContextMenu
+      action={contextMenuAction}
+      context={actionContext}
+      ariaLabel={t("Document options")}
+      onOpen={handleMenuOpen}
+      onClose={handleMenuClose}
    >
-      <ContextMenu
-        action={contextMenuAction}
-        ariaLabel={t("Document options")}
-        onOpen={handleMenuOpen}
-        onClose={handleMenuClose}
+      <DocumentLink
+        ref={itemRef}
+        dir={document.dir}
+        role="menuitem"
+        $isStarred={document.isStarred}
+        $menuOpen={menuOpen}
+        to={{
+          pathname: documentPath(document),
+          state: {
+            title: document.titleWithDefault,
+            sidebarContext,
+          },
+        }}
+        {...rest}
+        {...rovingTabIndex}
      >
-        <DocumentLink
-          ref={itemRef}
-          dir={document.dir}
-          $isStarred={document.isStarred}
-          $menuOpen={menuOpen}
-          to={{
-            pathname: documentPath(document),
-            search: highlight
-              ? `?q=${encodeURIComponent(highlight)}`
-              : undefined,
-            state: {
-              title: document.titleWithDefault,
-              sidebarContext,
-            },
-          }}
-          {...rest}
-          {...rovingTabIndex}
-        >
-          <Flex gap={4} auto>
-            <IconWrapper>
-              {document.icon ? (
+        <Content>
+          <Heading dir={document.dir}>
+            {document.icon && (
+              <>
                <Icon
                  value={document.icon}
                  color={document.color ?? undefined}
                  initial={document.initial}
                />
-              ) : (
-                <DocumentIcon
-                  outline={document.isDraft}
-                  color={theme.textSecondary}
-                />
-              )}
-            </IconWrapper>
-            <Content>
-              <Heading dir={document.dir}>
-                <Title
-                  text={document.titleWithDefault}
-                  highlight={highlight}
-                  dir={document.dir}
-                />
-                {document.isBadgedNew && document.createdBy?.id !== user.id && (
-                  <Badge yellow>{t("New")}</Badge>
-                )}
-                {document.isDraft && showDraft && (
-                  <Tooltip content={t("Only visible to you")} placement="top">
-                    <Badge>{t("Draft")}</Badge>
-                  </Tooltip>
-                )}
-                {canStar && !isMobile && <StarButton document={document} />}
-              </Heading>
-
-              {!queryIsInTitle && (
-                <ResultContext
-                  text={context}
-                  highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
-                  processResult={replaceResultMarks}
-                />
-              )}
-              <DocumentMeta
-                document={document}
-                showCollection={showCollection}
-                showPublished={showPublished}
-                showParentDocuments={showParentDocuments}
-                showLastViewed
-              />
-            </Content>
-          </Flex>
-          <Actions>
-            <DocumentMenu
-              document={document}
-              onOpen={handleMenuOpen}
-              onClose={handleMenuClose}
+                &nbsp;
+              </>
+            )}
+            <Title
+              text={document.titleWithDefault}
+              highlight={highlight}
+              dir={document.dir}
            />
-          </Actions>
-        </DocumentLink>
-      </ContextMenu>
-    </ActionContextProvider>
+            {document.isBadgedNew && document.createdBy?.id !== user.id && (
+              <Badge yellow>{t("New")}</Badge>
+            )}
+            {document.isDraft && showDraft && (
+              <Tooltip content={t("Only visible to you")} placement="top">
+                <Badge>{t("Draft")}</Badge>
+              </Tooltip>
+            )}
+            {canStar && (
+              <StarPositioner>
+                <StarButton document={document} />
+              </StarPositioner>
+            )}
+            {document.isTemplate && showTemplate && (
+              <Badge primary>{t("Template")}</Badge>
+            )}
+          </Heading>
+
+          {!queryIsInTitle && (
+            <ResultContext
+              text={context}
+              highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
+              processResult={replaceResultMarks}
+            />
+          )}
+          <DocumentMeta
+            document={document}
+            showCollection={showCollection}
+            showPublished={showPublished}
+            showParentDocuments={showParentDocuments}
+            showLastViewed
+          />
+        </Content>
+        <Actions>
+          <DocumentMenu
+            document={document}
+            onOpen={handleMenuOpen}
+            onClose={handleMenuClose}
+          />
+        </Actions>
+      </DocumentLink>
+    </ContextMenu>
  );
 }

-const IconWrapper = styled.div`
-  flex-shrink: 0;
-  display: flex;
-  align-items: flex-start;
-  justify-content: flex-start;
-  width: 24px;
-`;
-
 const Content = styled.div`
  flex-grow: 1;
  flex-shrink: 1;
@@ -215,9 +203,12 @@ const Actions = styled(EventBoundary)`
  flex-grow: 0;
  color: ${s("textSecondary")};

-  ${NudeButton}:${hover},
-  ${NudeButton}[aria-expanded= "true"] {
-    background: ${s("sidebarControlHoverBackground")};
+  ${NudeButton} {
+    &:
+      ${hover},
+      &[aria-expanded= "true"] {
+      background: ${s("sidebarControlHoverBackground")};
+    }
  }

  ${breakpoint("tablet")`
@@ -288,19 +279,21 @@ const DocumentLink = styled(Link)<{
    `}
 `;

-const Heading = styled.span<{ rtl?: boolean }>`
+const Heading = styled.h3<{ rtl?: boolean }>`
  display: flex;
  justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
  align-items: center;
  margin-top: 0;
-  margin-bottom: 0.1em;
+  margin-bottom: 0.25em;
  white-space: nowrap;
  color: ${s("text")};
  font-family: ${s("fontFamily")};
  font-weight: 500;
-  font-size: 18px;
-  line-height: 1.2;
-  gap: 4px;
+`;
+
+const StarPositioner = styled(Flex)`
+  margin-left: 4px;
+  align-items: center;
 `;

 const Title = styled(Highlight)`
@@ -1,12 +1,12 @@
-import type { LocationDescriptor } from "history";
+import { LocationDescriptor } from "history";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import styled from "styled-components";
 import { s, ellipsis } from "@shared/styles";
-import type Document from "~/models/Document";
-import type Revision from "~/models/Revision";
+import Document from "~/models/Document";
+import Revision from "~/models/Revision";
 import DocumentBreadcrumb from "~/components/DocumentBreadcrumb";
 import DocumentTasks from "~/components/DocumentTasks";
 import Flex from "~/components/Flex";
@@ -52,6 +52,7 @@ const DocumentMeta: React.FC<Props> = ({
    isDraft,
    lastViewedAt,
    isTasks,
+    isTemplate,
  } = document;

  // Prevent meta information from displaying if updatedBy is not available.
@@ -141,7 +142,7 @@ const DocumentMeta: React.FC<Props> = ({
  const nestedDocumentsCount = collection
    ? collection.getChildrenForDocument(document.id).length
    : 0;
-  const canShowProgressBar = isTasks;
+  const canShowProgressBar = isTasks && !isTemplate;

  const timeSinceNow = () => {
    if (isDraft || !showLastViewed) {
@@ -154,22 +155,26 @@ const DocumentMeta: React.FC<Props> = ({
      }
      return (
        <Viewed>
-          <Separator />
-          <Modified highlight>{t("Never viewed")}</Modified>
+          •&nbsp;<Modified highlight>{t("Never viewed")}</Modified>
        </Viewed>
      );
    }

    return (
      <Viewed>
-        <Separator />
-        {t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
+        •&nbsp;{t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
      </Viewed>
    );
  };

  return (
-    <Container align="center" $rtl={document.dir === "rtl"} {...rest} dir="ltr">
+    <Container
+      align="center"
+      rtl={document.dir === "rtl"}
+      {...rest}
+      dir="ltr"
+      lang=""
+    >
      {to ? (
        <Link to={to} replace={replace}>
          {content}
@@ -181,23 +186,22 @@ const DocumentMeta: React.FC<Props> = ({
        <span>
          &nbsp;{t("in")}&nbsp;
          <Strong>
-            <DocumentBreadcrumb document={document} maxDepth={1} onlyText />
+            <DocumentBreadcrumb document={document} onlyText />
          </Strong>
        </span>
      )}
      {showParentDocuments && nestedDocumentsCount > 0 && (
        <span>
-          <Separator />
-          {nestedDocumentsCount}{" "}
+          &nbsp;• {nestedDocumentsCount}{" "}
          {t("nested document", {
            count: nestedDocumentsCount,
          })}
        </span>
      )}
-      {timeSinceNow()}
+      &nbsp;{timeSinceNow()}
      {canShowProgressBar && (
        <>
-          <Separator />
+          &nbsp;•&nbsp;
          <DocumentTasks document={document} />
        </>
      )}
@@ -206,20 +210,12 @@ const DocumentMeta: React.FC<Props> = ({
  );
 };

-export const Separator = styled.span`
-  padding: 0 0.4em;
-
-  &::after {
-    content: "•";
-  }
-`;
-
 const Strong = styled.strong`
  font-weight: 550;
 `;

-const Container = styled(Flex)<{ $rtl?: boolean }>`
-  justify-content: ${(props) => (props.$rtl ? "flex-end" : "flex-start")};
+const Container = styled(Flex)<{ rtl?: boolean }>`
+  justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
  color: ${s("textTertiary")};
  font-size: 13px;
  white-space: nowrap;
@@ -1,13 +1,12 @@
-import type { TFunction } from "i18next";
+import { TFunction } from "i18next";
 import { observer } from "mobx-react";
 import { DoneIcon } from "outline-icons";
 import { useTranslation } from "react-i18next";
 import styled, { useTheme } from "styled-components";
-import type Document from "~/models/Document";
+import Document from "~/models/Document";
 import CircularProgressBar from "~/components/CircularProgressBar";
 import usePrevious from "~/hooks/usePrevious";
 import { bounceIn } from "~/styles/animations";
-import Flex from "./Flex";

 type Props = {
  document: Document;
@@ -40,9 +39,8 @@ function DocumentTasks({ document }: Props) {
  const done = completed === total;
  const previousDone = usePrevious(done);
  const message = getMessage(t, total, completed);
-
  return (
-    <Flex align="center" style={{ padding: "0 1px" }} gap={2} shrink={false}>
+    <>
      {completed === total ? (
        <Done
          color={theme.accent}
@@ -52,8 +50,8 @@ function DocumentTasks({ document }: Props) {
      ) : (
        <CircularProgressBar percentage={tasksPercentage} />
      )}
-      {message}
-    </Flex>
+      &nbsp;{message}
+    </>
  );
 }

@@ -4,8 +4,8 @@ import { observer } from "mobx-react";
 import { useMemo, useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { dateLocale, dateToRelative } from "@shared/utils/date";
-import type Document from "~/models/Document";
-import type User from "~/models/User";
+import Document from "~/models/Document";
+import User from "~/models/User";
 import { Avatar, AvatarSize } from "~/components/Avatar";
 import ListItem from "~/components/List/Item";
 import PaginatedList from "~/components/PaginatedList";
@@ -1,6 +1,6 @@
 import { observer } from "mobx-react";
 import * as React from "react";
-import type Collection from "~/models/Collection";
+import Collection from "~/models/Collection";

 type Props = {
  enabled: boolean;
@@ -1,8 +1,7 @@
 import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { s, ellipsis } from "@shared/styles";
-import EventBoundary from "@shared/components/EventBoundary";
+import { s } from "@shared/styles";

 type Props = Omit<React.HTMLAttributes<HTMLInputElement>, "onSubmit"> & {
  /** A callback when the title is submitted. */
@@ -33,7 +32,6 @@ function EditableTitle(
  const [isEditing, setIsEditing] = React.useState(rest.isEditing || false);
  const [originalValue, setOriginalValue] = React.useState(title);
  const [value, setValue] = React.useState(title);
-  const [isSubmitting, setIsSubmitting] = React.useState(false);

  React.useImperativeHandle(ref, () => ({
    setIsEditing,
@@ -43,54 +41,30 @@ function EditableTitle(
    setValue(title);
  }, [title]);

-  const handleChange = React.useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      setValue(event.target.value);
-    },
-    []
-  );
+  const handleChange = React.useCallback((event) => {
+    setValue(event.target.value);
+  }, []);

-  const handleDoubleClick = React.useCallback(
-    (event: React.MouseEvent<HTMLSpanElement>) => {
-      if (event.altKey) {
-        return;
-      }
-      event.preventDefault();
-      event.stopPropagation();
-      setIsEditing(true);
-    },
-    []
-  );
+  const handleDoubleClick = React.useCallback((event) => {
+    event.preventDefault();
+    event.stopPropagation();
+    setIsEditing(true);
+  }, []);

-  const stopPropagation = React.useCallback(
-    (event: React.MouseEvent<HTMLSpanElement>) => {
-      event.preventDefault();
-      event.stopPropagation();
-    },
-    []
-  );
+  const stopPropagation = React.useCallback((event) => {
+    event.preventDefault();
+    event.stopPropagation();
+  }, []);

-  const handleFocus = React.useCallback(
-    (event: React.FocusEvent<HTMLInputElement>) => {
-      event.target.select();
-    },
-    []
-  );
+  const handleFocus = React.useCallback((event) => {
+    event.target.select();
+  }, []);

  const handleSave = React.useCallback(
-    async (
-      ev:
-        | React.FocusEvent<HTMLInputElement>
-        | React.KeyboardEvent<HTMLInputElement>
-        | React.FormEvent<HTMLFormElement>
-    ) => {
+    async (ev) => {
      ev.preventDefault();
      ev.stopPropagation();

-      if (isSubmitting) {
-        return;
-      }
-
      const trimmedValue = value.trim();

      if (trimmedValue === originalValue || trimmedValue.length === 0) {
@@ -100,26 +74,22 @@ function EditableTitle(
        return;
      }

-      setIsSubmitting(true);
      try {
        await onSubmit(trimmedValue);
        setOriginalValue(trimmedValue);
-        setIsEditing(false);
      } catch (error) {
-        setValue(value);
-        setIsEditing(true);
-
+        setValue(originalValue);
        toast.error(error.message);
        throw error;
      } finally {
-        setIsSubmitting(false);
+        setIsEditing(false);
      }
    },
-    [originalValue, value, onCancel, onSubmit, isSubmitting]
+    [originalValue, value, onCancel, onSubmit]
  );

  const handleKeyDown = React.useCallback(
-    async (ev: React.KeyboardEvent<HTMLInputElement>) => {
+    async (ev) => {
      if (ev.nativeEvent.isComposing) {
        return;
      }
@@ -142,12 +112,11 @@ function EditableTitle(
  return (
    <>
      {isEditing ? (
-        <EventBoundary as="form" onSubmit={handleSave}>
+        <form onSubmit={handleSave}>
          <Input
            dir="auto"
            type="text"
            lang=""
-            name="title"
            value={value}
            onClick={stopPropagation}
            onKeyDown={handleKeyDown}
@@ -157,23 +126,19 @@ function EditableTitle(
            autoFocus
            {...rest}
          />
-        </EventBoundary>
+        </form>
      ) : (
-        <Text
+        <span
          onDoubleClick={canUpdate ? handleDoubleClick : undefined}
          className={rest.className}
        >
          {value}
-        </Text>
+        </span>
      )}
    </>
  );
 }

-const Text = styled.div`
-  ${ellipsis()}
-`;
-
 const Input = styled.input`
  color: ${s("text")};
  background: ${s("background")};
@@ -3,9 +3,8 @@ import { observer } from "mobx-react";
 import { DOMParser as ProsemirrorDOMParser } from "prosemirror-model";
 import { TextSelection } from "prosemirror-state";
 import * as React from "react";
-import { toast } from "sonner";
 import { mergeRefs } from "react-merge-refs";
-import type { Optional } from "utility-types";
+import { Optional } from "utility-types";
 import insertFiles from "@shared/editor/commands/insertFiles";
 import EditorContainer from "@shared/editor/components/Styles";
 import { AttachmentPreset } from "@shared/types";
@@ -22,7 +21,6 @@ import useEmbeds from "~/hooks/useEmbeds";
 import useStores from "~/hooks/useStores";
 import { uploadFile, uploadFileFromUrl } from "~/utils/files";
 import lazyWithRetry from "~/utils/lazyWithRetry";
-import useShare from "@shared/hooks/useShare";

 const LazyLoadedEditor = lazyWithRetry(() => import("~/editor"));

@@ -35,6 +33,7 @@ export type Props = Optional<
  | "dictionary"
  | "extensions"
 > & {
+  shareId?: string | undefined;
  embedsDisabled?: boolean;
  onSynced?: () => Promise<void>;
  onPublish?: (event: React.MouseEvent) => void;
@@ -42,43 +41,20 @@ export type Props = Optional<
 };

 function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
-  const {
-    id,
-    onChange,
-    onCreateCommentMark,
-    onDeleteCommentMark,
-    onFileUploadStart,
-    onFileUploadStop,
-  } = props;
+  const { id, shareId, onChange, onCreateCommentMark, onDeleteCommentMark } =
+    props;
  const { comments } = useStores();
-  const { shareId } = useShare();
  const dictionary = useDictionary();
  const embeds = useEmbeds(!shareId);
  const localRef = React.useRef<SharedEditor>();
  const preferences = useCurrentUser({ rejectOnEmpty: false })?.preferences;
  const previousCommentIds = React.useRef<string[]>();

-  // Upload progress tracking for delayed toast
-  const progressMap = React.useMemo(() => new Map<string, number>(), []);
-  const uploadState = React.useRef<{
-    toastId?: string | number;
-    timeoutId?: ReturnType<typeof setTimeout>;
-    progress: Map<string, number>;
-  }>({ progress: progressMap });
-
  const handleUploadFile = React.useCallback(
-    async (
-      file: File | string,
-      uploadOptions?: {
-        id?: string;
-        onProgress?: (fractionComplete: number) => void;
-      }
-    ) => {
+    async (file: File | string) => {
      const options = {
-        id: uploadOptions?.id,
        documentId: id,
        preset: AttachmentPreset.DocumentAttachment,
-        onProgress: uploadOptions?.onProgress,
      };
      const result =
        file instanceof File
@@ -91,49 +67,6 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {

  const { handleClickLink } = useEditorClickHandlers({ shareId });

-  // Show toast only after uploads have been running for 2 seconds
-  const handleFileUploadStart = React.useCallback(() => {
-    uploadState.current.timeoutId = setTimeout(() => {
-      uploadState.current.toastId = toast.loading(
-        dictionary.uploadingWithProgress(0)
-      );
-    }, 2000);
-    onFileUploadStart?.();
-  }, [onFileUploadStart, dictionary.uploadingWithProgress]);
-
-  const handleFileUploadProgress = React.useCallback(
-    (fileId: string, fractionComplete: number) => {
-      uploadState.current.progress.set(fileId, fractionComplete);
-
-      // Calculate average progress across all files
-      const progressValues = Array.from(uploadState.current.progress.values());
-      const avgProgress =
-        progressValues.reduce((a, b) => a + b, 0) / progressValues.length;
-      const percent = Math.round(avgProgress * 100);
-
-      // Update toast if visible
-      if (uploadState.current.toastId) {
-        toast.loading(dictionary.uploadingWithProgress(percent), {
-          id: uploadState.current.toastId,
-        });
-      }
-    },
-    [dictionary.uploadingWithProgress]
-  );
-
-  const handleFileUploadStop = React.useCallback(() => {
-    if (uploadState.current.timeoutId) {
-      clearTimeout(uploadState.current.timeoutId);
-      uploadState.current.timeoutId = undefined;
-    }
-    if (uploadState.current.toastId) {
-      toast.dismiss(uploadState.current.toastId);
-      uploadState.current.toastId = undefined;
-    }
-    uploadState.current.progress.clear();
-    onFileUploadStop?.();
-  }, [onFileUploadStop]);
-
  const focusAtEnd = React.useCallback(() => {
    localRef?.current?.focusAtEnd();
  }, [localRef]);
@@ -180,18 +113,16 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {

      return insertFiles(view, event, pos, files, {
        uploadFile: handleUploadFile,
-        onFileUploadStart: handleFileUploadStart,
-        onFileUploadStop: handleFileUploadStop,
-        onFileUploadProgress: handleFileUploadProgress,
+        onFileUploadStart: props.onFileUploadStart,
+        onFileUploadStop: props.onFileUploadStop,
        dictionary,
        isAttachment,
      });
    },
    [
      localRef,
-      handleFileUploadStart,
-      handleFileUploadStop,
-      handleFileUploadProgress,
+      props.onFileUploadStart,
+      props.onFileUploadStop,
      dictionary,
      handleUploadFile,
    ]
@@ -266,12 +197,11 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
      <>
        {paragraphs ? (
          <EditorContainer
-            $rtl={props.dir === "rtl"}
+            rtl={props.dir === "rtl"}
            grow={props.grow}
            style={props.style}
            editorStyle={props.editorStyle}
            commenting={!!props.onClickCommentMark}
-            lang={props.lang}
          >
            <div className="ProseMirror">
              {paragraphs.map((paragraph, index) => (
@@ -292,9 +222,6 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
            {...props}
            onClickLink={handleClickLink}
            onChange={handleChange}
-            onFileUploadStart={handleFileUploadStart}
-            onFileUploadStop={handleFileUploadStop}
-            onFileUploadProgress={handleFileUploadProgress}
            placeholder={props.placeholder || ""}
            defaultValue={props.defaultValue || ""}
          />
@@ -1,233 +0,0 @@
-import * as React from "react";
-import { useDropzone } from "react-dropzone";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import styled from "styled-components";
-import { s } from "@shared/styles";
-import { AttachmentPreset } from "@shared/types";
-import { getDataTransferFiles } from "@shared/utils/files";
-import ConfirmationDialog from "~/components/ConfirmationDialog";
-import Input, { LabelText } from "~/components/Input";
-import Text from "~/components/Text";
-import useStores from "~/hooks/useStores";
-import { uploadFile } from "~/utils/files";
-import { compressImage } from "~/utils/compressImage";
-import { generateEmojiNameFromFilename } from "~/utils/emoji";
-import { AttachmentValidation, EmojiValidation } from "@shared/validations";
-import { bytesToHumanReadable } from "@shared/utils/files";
-import { VStack } from "./primitives/VStack";
-
-type Props = {
-  onSubmit: () => void;
-};
-
-export function EmojiCreateDialog({ onSubmit }: Props) {
-  const { t } = useTranslation();
-  const { emojis } = useStores();
-  const [name, setName] = React.useState("");
-  const [file, setFile] = React.useState<File | null>(null);
-  const [isUploading, setIsUploading] = React.useState(false);
-
-  const handleFileSelection = React.useCallback(
-    (file: File) => {
-      const isValidType = AttachmentValidation.emojiContentTypes.includes(
-        file.type
-      );
-
-      if (!isValidType) {
-        toast.error(
-          t("File type not supported. Please use PNG, JPG, GIF, or WebP.")
-        );
-        return;
-      }
-
-      // Validate file size
-      if (file.size > AttachmentValidation.emojiMaxFileSize) {
-        toast.error(
-          t("File size too large. Maximum size is {{ size }}.", {
-            size: bytesToHumanReadable(AttachmentValidation.emojiMaxFileSize),
-          })
-        );
-        return;
-      }
-
-      setFile(file);
-
-      // Auto-populate name field if it's empty
-      setName((currentName) => {
-        if (!currentName.trim()) {
-          const generatedName = generateEmojiNameFromFilename(file.name);
-          return generatedName || currentName;
-        }
-        return currentName;
-      });
-    },
-    [t]
-  );
-
-  const onDrop = React.useCallback(
-    (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        handleFileSelection(acceptedFiles[0]);
-      }
-    },
-    [handleFileSelection]
-  );
-
-  // Handle paste events
-  React.useEffect(() => {
-    const handlePaste = (event: ClipboardEvent) => {
-      const files = getDataTransferFiles(event);
-      if (files.length > 0) {
-        event.preventDefault();
-        handleFileSelection(files[0]);
-      }
-    };
-
-    document.addEventListener("paste", handlePaste);
-    return () => document.removeEventListener("paste", handlePaste);
-  }, [handleFileSelection]);
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDropAccepted: onDrop,
-    accept: AttachmentValidation.emojiContentTypes,
-    maxSize: AttachmentValidation.emojiMaxFileSize,
-    maxFiles: 1,
-  });
-
-  const handleSubmit = async () => {
-    if (!name.trim()) {
-      toast.error(t("Please enter a name for the emoji"));
-      return;
-    }
-
-    if (!file) {
-      toast.error(t("Please select an image file"));
-      return;
-    }
-
-    setIsUploading(true);
-    try {
-      // Skip compression for GIFs to preserve animation
-      const fileToUpload =
-        file.type === "image/gif"
-          ? file
-          : await compressImage(file, {
-              maxHeight: 64,
-              maxWidth: 64,
-            });
-
-      const attachment = await uploadFile(fileToUpload, {
-        name: file.name,
-        preset: AttachmentPreset.Emoji,
-      });
-
-      await emojis.create({
-        name: name.trim(),
-        attachmentId: attachment.id,
-      });
-
-      toast.success(t("Emoji created successfully"));
-      onSubmit();
-    } finally {
-      setIsUploading(false);
-    }
-  };
-
-  const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const { value } = event.target;
-    setName(value);
-  };
-
-  const isValidName = EmojiValidation.allowedNameCharacters.test(name);
-  const isValid = name.trim().length > 0 && file && isValidName;
-
-  return (
-    <ConfirmationDialog
-      onSubmit={handleSubmit}
-      disabled={!isValid || isUploading}
-      savingText={isUploading ? `${t("Uploading")}…` : undefined}
-      submitText={t("Add emoji")}
-    >
-      <Text as="p" type="secondary">
-        {t(
-          "Square images with transparent backgrounds work best. If your image is too large, we’ll try to resize it for you."
-        )}
-      </Text>
-
-      <LabelText as="label">{t("Upload an image")}</LabelText>
-      <DropZone {...getRootProps()}>
-        <input {...getInputProps()} />
-        <VStack>
-          {file ? (
-            <>
-              <PreviewImage src={URL.createObjectURL(file)} alt="Preview" />
-              <Text size="medium">{file.name}</Text>
-              <Text size="medium" type="secondary">
-                {t("Click or drag to replace")}
-              </Text>
-            </>
-          ) : (
-            <>
-              <Text size="medium">
-                {isDragActive
-                  ? t("Drop the image here")
-                  : t("Click, drop, or paste an image here")}
-              </Text>
-              <Text size="medium" type="secondary">
-                {t("PNG, JPG, GIF, or WebP up to {{ size }}", {
-                  size: bytesToHumanReadable(
-                    AttachmentValidation.emojiMaxFileSize
-                  ),
-                })}
-              </Text>
-            </>
-          )}
-        </VStack>
-      </DropZone>
-
-      <Input
-        label={t("Choose a name")}
-        value={name}
-        onChange={handleNameChange}
-        placeholder="my_custom_emoji"
-        autoFocus
-        required
-        error={
-          !isValidName
-            ? t(
-                "name can only contain lowercase letters, numbers, and underscores."
-              )
-            : undefined
-        }
-      />
-
-      {name.trim() && isValidName && (
-        <Text type="secondary" style={{ marginTop: "8px" }}>
-          {t("This emoji will be available as")} <code>:{name}:</code>
-        </Text>
-      )}
-    </ConfirmationDialog>
-  );
-}
-
-const DropZone = styled.div`
-  border: 2px dashed ${s("inputBorder")};
-  border-radius: 8px;
-  padding: 24px;
-  text-align: center;
-  cursor: var(--pointer);
-  transition: border-color 0.2s;
-  margin-bottom: 1em;
-
-  &:hover {
-    border-color: ${s("inputBorderFocused")};
-  }
-`;
-
-const PreviewImage = styled.img`
-  width: 64px;
-  height: 64px;
-  object-fit: contain;
-  border-radius: 4px;
-`;
@@ -1,8 +1,7 @@
 import { observable } from "mobx";
 import { observer } from "mobx-react";
 import * as React from "react";
-import type { WithTranslation } from "react-i18next";
-import { withTranslation, Trans } from "react-i18next";
+import { withTranslation, Trans, WithTranslation } from "react-i18next";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import { UrlHelper } from "@shared/utils/UrlHelper";
@@ -47,22 +46,20 @@ class ErrorBoundary extends React.Component<Props> {

  componentDidCatch(error: Error) {
    this.error = error;
-    this.trackError();

    if (
      this.props.reloadOnChunkMissing &&
      error.message &&
-      error.message.match(/dynamically imported module/) &&
-      !this.isRepeatedError
+      error.message.match(/dynamically imported module/)
    ) {
      // If the editor bundle fails to load then reload the entire window. This
      // can happen if a deploy happens between the user loading the initial JS
      // bundle and the async-loaded editor JS bundle as the hash will change.
-      // Don't reload if this is a repeated error to avoid infinite reload loops.
      window.location.reload();
      return;
    }

+    this.trackError();
    Logger.error("ErrorBoundary", error);
  }

--- a/Show More
+++ b/Show More