test

Add support for SSL in development
chore(deps): bump y-indexeddb from 9.0.9 to 9.0.11 (#5656 )
2026-06-13 11:25:03 +03:00 · 2023-08-08 23:12:41 -04:00 · 2023-08-08 22:46:31 -04:00 · 2023-08-07 15:08:18 -07:00 · 2023-08-07 14:56:21 -07:00 · 2023-08-07 14:56:04 -07:00
1007 changed files with 44275 additions and 28065 deletions
@@ -14,7 +14,6 @@
    ]
  ],
  "plugins": [
-    "lodash",
    "styled-components",
    [
      "@babel/plugin-proposal-decorators",
@@ -3,7 +3,7 @@ version: 2.1
 defaults: &defaults
  working_directory: ~/outline
  docker:
-    - image: cimg/node:14.19
+    - image: cimg/node:18.12
    - image: cimg/redis:5.0
    - image: cimg/postgres:14.2
      environment:
@@ -20,6 +20,7 @@ defaults: &defaults
    SMTP_FROM_EMAIL: hello@example.com
    AWS_S3_UPLOAD_BUCKET_URL: https://s3.amazonaws.com
    AWS_S3_UPLOAD_BUCKET_NAME: outline-circle
+    NODE_OPTIONS: --max-old-space-size=8000

 executors:
  docker-publisher:
@@ -93,13 +94,18 @@ jobs:
          command: yarn test:server --forceExit
  bundle-size:
    <<: *defaults
+    environment:
+      NODE_ENV: production
    steps:
      - checkout
      - restore_cache:
          key: dependency-cache-{{ checksum "package.json" }}
      - run:
-          name: build-webpack
-          command: yarn build:webpack
+          name: build-vite
+          command: yarn vite:build
+      - run:
+          name: Send bundle stats to RelativeCI
+          command: npx relative-ci-agent
  build-image:
    executor: docker-publisher
    steps:
@@ -30,7 +30,7 @@ REDIS_URL=redis://localhost:6379

 # URL should point to the fully qualified, publicly accessible URL. If using a
 # proxy the port in URL and PORT may be different.
-URL=http://localhost:3000
+URL=https://app.outline.dev:3000
 PORT=3000

 # See [documentation](docs/SERVICES.md) on running a separate collaboration
@@ -99,7 +99,7 @@ OIDC_USERINFO_URI=
 OIDC_USERNAME_CLAIM=preferred_username

 # Display name for OIDC authentication
-OIDC_DISPLAY_NAME=OpenID
+OIDC_DISPLAY_NAME=OpenID Connect

 # Space separated auth scopes.
 OIDC_SCOPES=openid profile email
@@ -139,6 +139,10 @@ MAXIMUM_IMPORT_SIZE=5120000
 # requests and this ends up being duplicative
 DEBUG=http

+# Configure lowest severity level for server logs. Should be one of
+# error, warn, info, http, verbose, debug and silly
+LOG_LEVEL=info
+
 # For a complete Slack integration with search and posting to channels the
 # following configs are also needed, some more details
 # => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a
@@ -162,8 +166,8 @@ SMTP_HOST=
 SMTP_PORT=
 SMTP_USERNAME=
 SMTP_PASSWORD=
-SMTP_FROM_EMAIL=
-SMTP_REPLY_EMAIL=
+SMTP_FROM_EMAIL=hello@example.com
+SMTP_REPLY_EMAIL=hello@example.com
 SMTP_TLS_CIPHERS=
 SMTP_SECURE=true

@@ -177,3 +181,7 @@ RATE_LIMITER_ENABLED=true
 # Configure default throttling parameters for rate limiter
 RATE_LIMITER_REQUESTS=1000
 RATE_LIMITER_DURATION_WINDOW=60
+
+# Iframely API config
+IFRAMELY_URL=
+IFRAMELY_API_KEY=
@@ -3,6 +3,7 @@
  "parserOptions": {
    "sourceType": "module",
    "extraFileExtensions": [".json"],
+    "project": "./tsconfig.json",
    "ecmaFeatures": {
      "jsx": true
    }
@@ -25,10 +26,25 @@
  "rules": {
    "eqeqeq": 2,
    "curly": 2,
+    "no-console": "error",
+    "arrow-body-style": ["error", "as-needed"],
+    "spaced-comment": "error",
    "object-shorthand": "error",
    "no-mixed-operators": "off",
    "no-useless-escape": "off",
    "es/no-regexp-lookbehind-assertions": "error",
+    "react/self-closing-comp": ["error", {
+      "component": true,
+      "html": true
+    }],
+    "@typescript-eslint/no-floating-promises": "error",
+    "@typescript-eslint/await-thenable": "error",
+    "@typescript-eslint/no-misused-promises": [
+      "error",
+      {
+        "checksVoidReturn": false
+      }
+    ],
    "@typescript-eslint/no-unused-vars": [
      "error",
      {
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
  - name: Feature request
-    url: https://github.com/outline/outline/discussions/new
+    url: https://github.com/outline/outline/discussions/new?category=ideas
    about: Request a feature to be added to the project
  - name: Self hosting questions
-    url: https://github.com/outline/outline/discussions/new
+    url: https://github.com/outline/outline/discussions/new?category=self-hosting
    about: Ask questions and discuss running Outline with community members
@@ -7,5 +7,9 @@ version: 2
 updates:
  - package-ecosystem: "npm" # See documentation for possible values
    directory: "/" # Location of package manifests
+    open-pull-requests-limit: 5
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
    schedule:
      interval: "weekly"
@@ -11,4 +11,4 @@ fakes3/*
 .idea
 *.pem
 *.key
-*.cert
+*.cert
@@ -1,11 +1,9 @@
 {
+  "workerIdleMemoryLimit": "0.75",
  "projects": [
    {
      "displayName": "server",
-      "verbose": false,
-      "roots": [
-        "<rootDir>/server"
-      ],
+      "roots": ["<rootDir>/server", "<rootDir>/plugins"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1"
@@ -14,33 +12,22 @@
        "<rootDir>/__mocks__/console.js",
        "<rootDir>/server/test/env.ts"
      ],
-      "setupFilesAfterEnv": [
-        "<rootDir>/server/test/setup.ts"
-      ],
+      "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
      "testEnvironment": "node",
      "runner": "@getoutline/jest-runner-serial"
    },
    {
      "displayName": "app",
-      "verbose": false,
-      "roots": [
-        "<rootDir>/app"
-      ],
+      "roots": ["<rootDir>/app"],
      "moduleNameMapper": {
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js"
      },
-      "modulePaths": [
-        "<rootDir>/app"
-      ],
-      "setupFiles": [
-        "<rootDir>/__mocks__/window.js"
-      ],
-      "setupFilesAfterEnv": [
-        "<rootDir>/app/test/setup.ts"
-      ],
+      "modulePaths": ["<rootDir>/app"],
+      "setupFiles": ["<rootDir>/__mocks__/window.js"],
+      "setupFilesAfterEnv": ["<rootDir>/app/test/setup.ts"],
      "testEnvironment": "jsdom",
      "testEnvironmentOptions": {
        "url": "http://localhost"
@@ -48,37 +35,25 @@
    },
    {
      "displayName": "shared-node",
-      "verbose": false,
-      "roots": [
-        "<rootDir>/shared"
-      ],
+      "roots": ["<rootDir>/shared"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1"
      },
-      "setupFiles": [
-        "<rootDir>/__mocks__/console.js"
-      ],
-      "setupFilesAfterEnv": [
-        "<rootDir>/shared/test/setup.ts"
-      ],
+      "setupFiles": ["<rootDir>/__mocks__/console.js"],
+      "setupFilesAfterEnv": ["<rootDir>/shared/test/setup.ts"],
      "testEnvironment": "node"
    },
    {
      "displayName": "shared-jsdom",
-      "verbose": false,
-      "roots": [
-        "<rootDir>/shared"
-      ],
+      "roots": ["<rootDir>/shared"],
      "moduleNameMapper": {
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js"
      },
-      "setupFiles": [
-        "<rootDir>/__mocks__/window.js"
-      ],
+      "setupFiles": ["<rootDir>/__mocks__/window.js"],
      "testEnvironment": "jsdom",
      "testEnvironmentOptions": {
        "url": "http://localhost"
@@ -5,7 +5,11 @@ ARG APP_PATH
 WORKDIR $APP_PATH

 # ---
-FROM node:16.14.2-alpine3.15 AS runner
+FROM node:18-alpine AS runner
+
+RUN apk update && apk add --no-cache curl && apk add --no-cache ca-certificates
+
+LABEL org.opencontainers.image.source="https://github.com/outline/outline"

 ARG APP_PATH
 WORKDIR $APP_PATH
@@ -1,9 +1,10 @@
 ARG APP_PATH=/opt/outline
-FROM node:16.14.2-alpine3.15 AS deps
+FROM node:18-alpine AS deps

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

 RUN yarn install --no-optional --frozen-lockfile --network-timeout 1000000 && \
  yarn cache clean
@@ -1,7 +1,7 @@
 up:
 	docker-compose up -d redis postgres s3
+	yarn install-local-ssl
 	yarn install --pure-lockfile
-	yarn sequelize db:migrate
 	yarn dev:watch

 build:
@@ -7,26 +7,26 @@
  <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&amp;circle-token=c0c4c2f39990e277385d5c1ae96169c409eb887a"></a>
+  <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, we offer a hosted version of the app at [getoutline.com](https://www.getoutline.com).
+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.

 # Installation

-Please see the [documentation](https://app.getoutline.com/share/770a97da-13e5-401e-9f8a-37949c19f97e/) for running your own copy of Outline in a production configuration.
+Please see the [documentation](https://docs.getoutline.com/s/hosting/) for running your own copy of Outline in a production configuration.

 If you have questions or improvements for the docs please create a thread in [GitHub discussions](https://github.com/outline/outline/discussions).

 # Development

-There is a short guide for [setting up a development environment](https://app.getoutline.com/share/770a97da-13e5-401e-9f8a-37949c19f97e/doc/local-development-5hEhFRXow7) if you wish to contribute changes, fixes, and improvements to Outline.
+There is a short guide for [setting up a development environment](https://docs.getoutline.com/s/hosting/doc/local-development-5hEhFRXow7) if you wish to contribute changes, fixes, and improvements to Outline.

 ## Contributing

@@ -3,13 +3,7 @@
  "description": "Open source wiki and knowledge base for growing teams",
  "website": "https://www.getoutline.com/",
  "repository": "https://github.com/outline/outline",
-  "keywords": [
-    "wiki",
-    "team",
-    "node",
-    "markdown",
-    "slack"
-  ],
+  "keywords": ["wiki", "team", "node", "markdown", "slack"],
  "success_url": "/",
  "formation": {
    "web": {
@@ -94,7 +88,7 @@
    },
    "OIDC_DISPLAY_NAME": {
      "description": "Display name for OIDC authentication",
-      "value": "OpenID",
+      "value": "OpenID Connect",
      "required": false
    },
    "OIDC_SCOPES": {
@@ -188,7 +182,7 @@
      "required": false
    },
    "GOOGLE_ANALYTICS_ID": {
-      "description": "UA-xxxx (optional)",
+      "description": "G-xxxx (optional)",
      "required": false
    },
    "SENTRY_DSN": {
@@ -1,6 +1,7 @@
 {
  "extends": [
    "../.eslintrc",
+    "plugin:react/recommended",
    "plugin:react-hooks/recommended",
  ],
  "plugins": [
@@ -4,6 +4,7 @@ import {
  PadlockIcon,
  PlusIcon,
  StarredIcon,
+  TrashIcon,
  UnstarredIcon,
 } from "outline-icons";
 import * as React from "react";
@@ -12,17 +13,19 @@ import Collection from "~/models/Collection";
 import CollectionEdit from "~/scenes/CollectionEdit";
 import CollectionNew from "~/scenes/CollectionNew";
 import CollectionPermissions from "~/scenes/CollectionPermissions";
+import CollectionDeleteDialog from "~/components/CollectionDeleteDialog";
 import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
 import { createAction } from "~/actions";
 import { CollectionSection } from "~/actions/sections";
 import history from "~/utils/history";

-const ColorCollectionIcon = ({ collection }: { collection: Collection }) => {
-  return <DynamicCollectionIcon collection={collection} />;
-};
+const ColorCollectionIcon = ({ collection }: { collection: Collection }) => (
+  <DynamicCollectionIcon collection={collection} />
+);

 export const openCollection = createAction({
  name: ({ t }) => t("Open collection"),
+  analyticsName: "Open collection",
  section: CollectionSection,
  shortcut: ["o", "c"],
  icon: <CollectionIcon />,
@@ -42,6 +45,7 @@ export const openCollection = createAction({

 export const createCollection = createAction({
  name: ({ t }) => t("New collection"),
+  analyticsName: "New collection",
  section: CollectionSection,
  icon: <PlusIcon />,
  keywords: "create",
@@ -60,6 +64,7 @@ export const createCollection = createAction({
 export const editCollection = createAction({
  name: ({ t, isContextMenu }) =>
    isContextMenu ? `${t("Edit")}…` : t("Edit collection"),
+  analyticsName: "Edit collection",
  section: CollectionSection,
  icon: <EditIcon />,
  visible: ({ stores, activeCollectionId }) =>
@@ -85,6 +90,7 @@ export const editCollection = createAction({
 export const editCollectionPermissions = createAction({
  name: ({ t, isContextMenu }) =>
    isContextMenu ? `${t("Permissions")}…` : t("Collection permissions"),
+  analyticsName: "Collection permissions",
  section: CollectionSection,
  icon: <PadlockIcon />,
  visible: ({ stores, activeCollectionId }) =>
@@ -104,6 +110,7 @@ export const editCollectionPermissions = createAction({

 export const starCollection = createAction({
  name: ({ t }) => t("Star"),
+  analyticsName: "Star collection",
  section: CollectionSection,
  icon: <StarredIcon />,
  keywords: "favorite bookmark",
@@ -117,18 +124,19 @@ export const starCollection = createAction({
      stores.policies.abilities(activeCollectionId).star
    );
  },
-  perform: ({ activeCollectionId, stores }) => {
+  perform: async ({ activeCollectionId, stores }) => {
    if (!activeCollectionId) {
      return;
    }

    const collection = stores.collections.get(activeCollectionId);
-    collection?.star();
+    await collection?.star();
  },
 });

 export const unstarCollection = createAction({
  name: ({ t }) => t("Unstar"),
+  analyticsName: "Unstar collection",
  section: CollectionSection,
  icon: <UnstarredIcon />,
  keywords: "unfavorite unbookmark",
@@ -142,13 +150,47 @@ export const unstarCollection = createAction({
      stores.policies.abilities(activeCollectionId).unstar
    );
  },
-  perform: ({ activeCollectionId, stores }) => {
+  perform: async ({ activeCollectionId, stores }) => {
    if (!activeCollectionId) {
      return;
    }

    const collection = stores.collections.get(activeCollectionId);
-    collection?.unstar();
+    await collection?.unstar();
+  },
+});
+
+export const deleteCollection = createAction({
+  name: ({ t }) => t("Delete"),
+  analyticsName: "Delete collection",
+  section: CollectionSection,
+  icon: <TrashIcon />,
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return stores.policies.abilities(activeCollectionId).delete;
+  },
+  perform: ({ activeCollectionId, stores, t }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
+    if (!collection) {
+      return;
+    }
+
+    stores.dialogs.openModal({
+      isCentered: true,
+      title: t("Delete collection"),
+      content: (
+        <CollectionDeleteDialog
+          collection={collection}
+          onSubmit={stores.dialogs.closeAllModals}
+        />
+      ),
+    });
  },
 });

@@ -157,4 +199,5 @@ export const rootCollectionActions = [
  createCollection,
  starCollection,
  unstarCollection,
+  deleteCollection,
 ];
@@ -5,6 +5,7 @@ import { createAction } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
 import env from "~/env";
 import { client } from "~/utils/ApiClient";
+import Logger from "~/utils/Logger";
 import { deleteAllDatabases } from "~/utils/developer";

 export const clearIndexedDB = createAction({
@@ -35,16 +36,27 @@ export const createTestUsers = createAction({
  },
 });

+export const toggleDebugLogging = createAction({
+  name: ({ t }) => t("Toggle debug logging"),
+  icon: <ToolsIcon />,
+  section: DeveloperSection,
+  perform: async ({ t }) => {
+    Logger.debugLoggingEnabled = !Logger.debugLoggingEnabled;
+    stores.toasts.showToast(
+      Logger.debugLoggingEnabled
+        ? t("Debug logging enabled")
+        : t("Debug logging disabled")
+    );
+  },
+});
+
 export const developer = createAction({
-  name: ({ t }) => t("Developer"),
+  name: ({ t }) => t("Development"),
  keywords: "debug",
  icon: <ToolsIcon />,
  iconInContextMenu: false,
  section: DeveloperSection,
-  visible: ({ event }) =>
-    env.ENVIRONMENT === "development" ||
-    (event instanceof KeyboardEvent && event.altKey),
-  children: [clearIndexedDB, createTestUsers],
+  children: [clearIndexedDB, toggleDebugLogging, createTestUsers],
 });

 export const rootDeveloperActions = [developer];
@@ -22,21 +22,23 @@ import {
  LightBulbIcon,
  UnpublishIcon,
  PublishIcon,
+  CommentIcon,
 } from "outline-icons";
 import * as React from "react";
-import { ExportContentType } from "@shared/types";
+import { ExportContentType, TeamPreference } from "@shared/types";
 import { getEventFiles } from "@shared/utils/files";
 import DocumentDelete from "~/scenes/DocumentDelete";
 import DocumentMove from "~/scenes/DocumentMove";
 import DocumentPermanentDelete from "~/scenes/DocumentPermanentDelete";
+import DocumentPublish from "~/scenes/DocumentPublish";
 import DocumentTemplatizeDialog from "~/components/DocumentTemplatizeDialog";
 import { createAction } from "~/actions";
 import { DocumentSection } from "~/actions/sections";
 import env from "~/env";
 import history from "~/utils/history";
 import {
-  documentInsightsUrl,
-  documentHistoryUrl,
+  documentInsightsPath,
+  documentHistoryPath,
  homePath,
  newDocumentPath,
  searchPath,
@@ -44,6 +46,7 @@ import {

 export const openDocument = createAction({
  name: ({ t }) => t("Open document"),
+  analyticsName: "Open document",
  section: DocumentSection,
  shortcut: ["o", "d"],
  keywords: "go to",
@@ -58,8 +61,11 @@ export const openDocument = createAction({
        // cache if the document is renamed
        id: path.url,
        name: path.title,
-        icon: () =>
-          stores.documents.get(path.id)?.isStarred ? <StarredIcon /> : null,
+        icon: function _Icon() {
+          return stores.documents.get(path.id)?.isStarred ? (
+            <StarredIcon />
+          ) : null;
+        },
        section: DocumentSection,
        perform: () => history.push(path.url),
      }));
@@ -68,14 +74,13 @@ export const openDocument = createAction({

 export const createDocument = createAction({
  name: ({ t }) => t("New document"),
+  analyticsName: "New document",
  section: DocumentSection,
  icon: <NewDocumentIcon />,
  keywords: "create",
-  visible: ({ activeCollectionId, stores }) =>
-    !!activeCollectionId &&
-    stores.policies.abilities(activeCollectionId).update,
+  visible: ({ currentTeamId, stores }) =>
+    !!currentTeamId && stores.policies.abilities(currentTeamId).createDocument,
  perform: ({ activeCollectionId, inStarredSection }) =>
-    activeCollectionId &&
    history.push(newDocumentPath(activeCollectionId), {
      starred: inStarredSection,
    }),
@@ -83,6 +88,7 @@ export const createDocument = createAction({

 export const starDocument = createAction({
  name: ({ t }) => t("Star"),
+  analyticsName: "Star document",
  section: DocumentSection,
  icon: <StarredIcon />,
  keywords: "favorite bookmark",
@@ -95,18 +101,19 @@ export const starDocument = createAction({
      !document?.isStarred && stores.policies.abilities(activeDocumentId).star
    );
  },
-  perform: ({ activeDocumentId, stores }) => {
+  perform: async ({ activeDocumentId, stores }) => {
    if (!activeDocumentId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);
-    document?.star();
+    await document?.star();
  },
 });

 export const unstarDocument = createAction({
  name: ({ t }) => t("Unstar"),
+  analyticsName: "Unstar document",
  section: DocumentSection,
  icon: <UnstarredIcon />,
  keywords: "unfavorite unbookmark",
@@ -120,18 +127,19 @@ export const unstarDocument = createAction({
      stores.policies.abilities(activeDocumentId).unstar
    );
  },
-  perform: ({ activeDocumentId, stores }) => {
+  perform: async ({ activeDocumentId, stores }) => {
    if (!activeDocumentId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);
-    document?.unstar();
+    await document?.unstar();
  },
 });

 export const publishDocument = createAction({
  name: ({ t }) => t("Publish"),
+  analyticsName: "Publish document",
  section: DocumentSection,
  icon: <PublishIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -143,25 +151,36 @@ export const publishDocument = createAction({
      !!document?.isDraft && stores.policies.abilities(activeDocumentId).update
    );
  },
-  perform: ({ activeDocumentId, stores, t }) => {
+  perform: async ({ activeDocumentId, stores, t }) => {
    if (!activeDocumentId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);
+    if (document?.publishedAt) {
+      return;
+    }

-    document?.save({
-      publish: true,
-    });
-
-    stores.toasts.showToast(t("Document published"), {
-      type: "success",
-    });
+    if (document?.collectionId) {
+      await document.save(undefined, {
+        publish: true,
+      });
+      stores.toasts.showToast(t("Document published"), {
+        type: "success",
+      });
+    } else if (document) {
+      stores.dialogs.openModal({
+        title: t("Publish document"),
+        isCentered: true,
+        content: <DocumentPublish document={document} />,
+      });
+    }
  },
 });

 export const unpublishDocument = createAction({
  name: ({ t }) => t("Unpublish"),
+  analyticsName: "Unpublish document",
  section: DocumentSection,
  icon: <UnpublishIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -170,14 +189,14 @@ export const unpublishDocument = createAction({
    }
    return stores.policies.abilities(activeDocumentId).unpublish;
  },
-  perform: ({ activeDocumentId, stores, t }) => {
+  perform: async ({ activeDocumentId, stores, t }) => {
    if (!activeDocumentId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);

-    document?.unpublish();
+    await document?.unpublish();

    stores.toasts.showToast(t("Document unpublished"), {
      type: "success",
@@ -187,6 +206,7 @@ export const unpublishDocument = createAction({

 export const subscribeDocument = createAction({
  name: ({ t }) => t("Subscribe"),
+  analyticsName: "Subscribe to document",
  section: DocumentSection,
  icon: <SubscribeIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -201,14 +221,14 @@ export const subscribeDocument = createAction({
      stores.policies.abilities(activeDocumentId).subscribe
    );
  },
-  perform: ({ activeDocumentId, stores, t }) => {
+  perform: async ({ activeDocumentId, stores, t }) => {
    if (!activeDocumentId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);

-    document?.subscribe();
+    await document?.subscribe();

    stores.toasts.showToast(t("Subscribed to document notifications"), {
      type: "success",
@@ -218,6 +238,7 @@ export const subscribeDocument = createAction({

 export const unsubscribeDocument = createAction({
  name: ({ t }) => t("Unsubscribe"),
+  analyticsName: "Unsubscribe from document",
  section: DocumentSection,
  icon: <UnsubscribeIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -232,14 +253,14 @@ export const unsubscribeDocument = createAction({
      stores.policies.abilities(activeDocumentId).unsubscribe
    );
  },
-  perform: ({ activeDocumentId, stores, currentUserId, t }) => {
+  perform: async ({ activeDocumentId, stores, currentUserId, t }) => {
    if (!activeDocumentId || !currentUserId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);

-    document?.unsubscribe(currentUserId);
+    await document?.unsubscribe(currentUserId);

    stores.toasts.showToast(t("Unsubscribed from document notifications"), {
      type: "success",
@@ -249,24 +270,26 @@ export const unsubscribeDocument = createAction({

 export const downloadDocumentAsHTML = createAction({
  name: ({ t }) => t("HTML"),
+  analyticsName: "Download document as HTML",
  section: DocumentSection,
  keywords: "html export",
  icon: <DownloadIcon />,
  iconInContextMenu: false,
  visible: ({ activeDocumentId, stores }) =>
    !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
-  perform: ({ activeDocumentId, stores }) => {
+  perform: async ({ activeDocumentId, stores }) => {
    if (!activeDocumentId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);
-    document?.download(ExportContentType.Html);
+    await document?.download(ExportContentType.Html);
  },
 });

 export const downloadDocumentAsPDF = createAction({
  name: ({ t }) => t("PDF"),
+  analyticsName: "Download document as PDF",
  section: DocumentSection,
  keywords: "export",
  icon: <DownloadIcon />,
@@ -294,25 +317,27 @@ export const downloadDocumentAsPDF = createAction({

 export const downloadDocumentAsMarkdown = createAction({
  name: ({ t }) => t("Markdown"),
+  analyticsName: "Download document as Markdown",
  section: DocumentSection,
  keywords: "md markdown export",
  icon: <DownloadIcon />,
  iconInContextMenu: false,
  visible: ({ activeDocumentId, stores }) =>
    !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
-  perform: ({ activeDocumentId, stores }) => {
+  perform: async ({ activeDocumentId, stores }) => {
    if (!activeDocumentId) {
      return;
    }

    const document = stores.documents.get(activeDocumentId);
-    document?.download(ExportContentType.Markdown);
+    await document?.download(ExportContentType.Markdown);
  },
 });

 export const downloadDocument = createAction({
  name: ({ t, isContextMenu }) =>
    isContextMenu ? t("Download") : t("Download document"),
+  analyticsName: "Download document",
  section: DocumentSection,
  icon: <DownloadIcon />,
  keywords: "export",
@@ -326,6 +351,7 @@ export const downloadDocument = createAction({
 export const duplicateDocument = createAction({
  name: ({ t, isContextMenu }) =>
    isContextMenu ? t("Duplicate") : t("Duplicate document"),
+  analyticsName: "Duplicate document",
  section: DocumentSection,
  icon: <DuplicateIcon />,
  keywords: "copy",
@@ -362,7 +388,7 @@ export const pinDocumentToCollection = createAction({
      collectionName,
    });
  },
-
+  analyticsName: "Pin document to collection",
  section: DocumentSection,
  icon: <PinIcon />,
  iconInContextMenu: false,
@@ -381,13 +407,19 @@ export const pinDocumentToCollection = createAction({
      return;
    }

-    const document = stores.documents.get(activeDocumentId);
-    await document?.pin(document.collectionId);
+    try {
+      const document = stores.documents.get(activeDocumentId);
+      await document?.pin(document.collectionId);

-    const collection = stores.collections.get(activeCollectionId);
+      const collection = stores.collections.get(activeCollectionId);

-    if (!collection || !location.pathname.startsWith(collection?.url)) {
-      stores.toasts.showToast(t("Pinned to collection"));
+      if (!collection || !location.pathname.startsWith(collection?.url)) {
+        stores.toasts.showToast(t("Pinned to collection"));
+      }
+    } catch (err) {
+      stores.toasts.showToast(err.message, {
+        type: "error",
+      });
    }
  },
 });
@@ -398,6 +430,7 @@ export const pinDocumentToCollection = createAction({
 */
 export const pinDocumentToHome = createAction({
  name: ({ t }) => t("Pin to home"),
+  analyticsName: "Pin document to home",
  section: DocumentSection,
  icon: <PinIcon />,
  iconInContextMenu: false,
@@ -419,16 +452,23 @@ export const pinDocumentToHome = createAction({
    }
    const document = stores.documents.get(activeDocumentId);

-    await document?.pin();
+    try {
+      await document?.pin();

-    if (location.pathname !== homePath()) {
-      stores.toasts.showToast(t("Pinned to team home"));
+      if (location.pathname !== homePath()) {
+        stores.toasts.showToast(t("Pinned to team home"));
+      }
+    } catch (err) {
+      stores.toasts.showToast(err.message, {
+        type: "error",
+      });
    }
  },
 });

 export const pinDocument = createAction({
  name: ({ t }) => t("Pin"),
+  analyticsName: "Pin document",
  section: DocumentSection,
  icon: <PinIcon />,
  children: [pinDocumentToCollection, pinDocumentToHome],
@@ -437,16 +477,18 @@ export const pinDocument = createAction({
 export const printDocument = createAction({
  name: ({ t, isContextMenu }) =>
    isContextMenu ? t("Print") : t("Print document"),
+  analyticsName: "Print document",
  section: DocumentSection,
  icon: <PrintIcon />,
-  visible: ({ activeDocumentId }) => !!activeDocumentId,
+  visible: ({ activeDocumentId }) => !!(activeDocumentId && window.print),
  perform: async () => {
-    window.print();
+    queueMicrotask(window.print);
  },
 });

 export const importDocument = createAction({
  name: ({ t }) => t("Import document"),
+  analyticsName: "Import document",
  section: DocumentSection,
  icon: <ImportIcon />,
  keywords: "upload",
@@ -495,6 +537,7 @@ export const importDocument = createAction({

 export const createTemplate = createAction({
  name: ({ t }) => t("Templatize"),
+  analyticsName: "Templatize document",
  section: DocumentSection,
  icon: <ShapesIcon />,
  keywords: "new create template",
@@ -527,8 +570,9 @@ export const createTemplate = createAction({

 export const openRandomDocument = createAction({
  id: "random",
-  section: DocumentSection,
  name: ({ t }) => t(`Open random document`),
+  analyticsName: "Open random document",
+  section: DocumentSection,
  icon: <ShuffleIcon />,
  perform: ({ stores, activeDocumentId }) => {
    const documentPaths = stores.collections.pathsToDocuments.filter(
@@ -546,9 +590,10 @@ export const openRandomDocument = createAction({
 export const searchDocumentsForQuery = (searchQuery: string) =>
  createAction({
    id: "search",
-    section: DocumentSection,
    name: ({ t }) =>
      t(`Search documents for "{{searchQuery}}"`, { searchQuery }),
+    analyticsName: "Search documents",
+    section: DocumentSection,
    icon: <SearchIcon />,
    perform: () => history.push(searchPath(searchQuery)),
    visible: ({ location }) => location.pathname !== searchPath(),
@@ -556,6 +601,7 @@ export const searchDocumentsForQuery = (searchQuery: string) =>

 export const moveDocument = createAction({
  name: ({ t }) => t("Move"),
+  analyticsName: "Move document",
  section: DocumentSection,
  icon: <MoveIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -572,15 +618,11 @@ export const moveDocument = createAction({
      }

      stores.dialogs.openModal({
-        title: t("Move {{ documentName }}", {
-          documentName: document.noun,
+        title: t("Move {{ documentType }}", {
+          documentType: document.noun,
        }),
-        content: (
-          <DocumentMove
-            document={document}
-            onRequestClose={stores.dialogs.closeAllModals}
-          />
-        ),
+        isCentered: true,
+        content: <DocumentMove document={document} />,
      });
    }
  },
@@ -588,6 +630,7 @@ export const moveDocument = createAction({

 export const archiveDocument = createAction({
  name: ({ t }) => t("Archive"),
+  analyticsName: "Archive document",
  section: DocumentSection,
  icon: <ArchiveIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -613,6 +656,7 @@ export const archiveDocument = createAction({

 export const deleteDocument = createAction({
  name: ({ t }) => t("Delete"),
+  analyticsName: "Delete document",
  section: DocumentSection,
  icon: <TrashIcon />,
  dangerous: true,
@@ -647,6 +691,7 @@ export const deleteDocument = createAction({

 export const permanentlyDeleteDocument = createAction({
  name: ({ t }) => t("Permanently delete"),
+  analyticsName: "Permanently delete document",
  section: DocumentSection,
  icon: <CrossIcon />,
  dangerous: true,
@@ -679,8 +724,32 @@ export const permanentlyDeleteDocument = createAction({
  },
 });

+export const openDocumentComments = createAction({
+  name: ({ t }) => t("Comments"),
+  analyticsName: "Open comments",
+  section: DocumentSection,
+  icon: <CommentIcon />,
+  visible: ({ activeDocumentId, stores }) => {
+    const can = stores.policies.abilities(activeDocumentId ?? "");
+    return (
+      !!activeDocumentId &&
+      can.read &&
+      !can.restore &&
+      !!stores.auth.team?.getPreference(TeamPreference.Commenting)
+    );
+  },
+  perform: ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return;
+    }
+
+    stores.ui.toggleComments(activeDocumentId);
+  },
+});
+
 export const openDocumentHistory = createAction({
  name: ({ t }) => t("History"),
+  analyticsName: "Open document history",
  section: DocumentSection,
  icon: <HistoryIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -695,12 +764,13 @@ export const openDocumentHistory = createAction({
    if (!document) {
      return;
    }
-    history.push(documentHistoryUrl(document));
+    history.push(documentHistoryPath(document));
  },
 });

 export const openDocumentInsights = createAction({
  name: ({ t }) => t("Insights"),
+  analyticsName: "Open document insights",
  section: DocumentSection,
  icon: <LightBulbIcon />,
  visible: ({ activeDocumentId, stores }) => {
@@ -715,7 +785,7 @@ export const openDocumentInsights = createAction({
    if (!document) {
      return;
    }
-    history.push(documentInsightsUrl(document));
+    history.push(documentInsightsPath(document));
  },
 });

@@ -740,6 +810,7 @@ export const rootDocumentActions = [
  printDocument,
  pinDocumentToCollection,
  pinDocumentToHome,
+  openDocumentComments,
  openDocumentHistory,
  openDocumentInsights,
 ];
@@ -30,19 +30,18 @@ import { isMac } from "~/utils/browser";
 import history from "~/utils/history";
 import isCloudHosted from "~/utils/isCloudHosted";
 import {
-  organizationSettingsPath,
-  profileSettingsPath,
-  accountPreferencesPath,
  homePath,
  searchPath,
  draftsPath,
  templatesPath,
  archivePath,
  trashPath,
+  settingsPath,
 } from "~/utils/routeHelpers";

 export const navigateToHome = createAction({
  name: ({ t }) => t("Home"),
+  analyticsName: "Navigate to home",
  section: NavigationSection,
  shortcut: ["d"],
  icon: <HomeIcon />,
@@ -54,12 +53,14 @@ export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
  createAction({
    section: RecentSearchesSection,
    name: searchQuery.query,
+    analyticsName: "Navigate to recent search query",
    icon: <SearchIcon />,
    perform: () => history.push(searchPath(searchQuery.query)),
  });

 export const navigateToDrafts = createAction({
  name: ({ t }) => t("Drafts"),
+  analyticsName: "Navigate to drafts",
  section: NavigationSection,
  icon: <EditIcon />,
  perform: () => history.push(draftsPath()),
@@ -68,6 +69,7 @@ export const navigateToDrafts = createAction({

 export const navigateToTemplates = createAction({
  name: ({ t }) => t("Templates"),
+  analyticsName: "Navigate to templates",
  section: NavigationSection,
  icon: <ShapesIcon />,
  perform: () => history.push(templatesPath()),
@@ -76,6 +78,7 @@ export const navigateToTemplates = createAction({

 export const navigateToArchive = createAction({
  name: ({ t }) => t("Archive"),
+  analyticsName: "Navigate to archive",
  section: NavigationSection,
  shortcut: ["g", "a"],
  icon: <ArchiveIcon />,
@@ -85,6 +88,7 @@ export const navigateToArchive = createAction({

 export const navigateToTrash = createAction({
  name: ({ t }) => t("Trash"),
+  analyticsName: "Navigate to trash",
  section: NavigationSection,
  icon: <TrashIcon />,
  perform: () => history.push(trashPath()),
@@ -93,40 +97,62 @@ export const navigateToTrash = createAction({

 export const navigateToSettings = createAction({
  name: ({ t }) => t("Settings"),
+  analyticsName: "Navigate to settings",
  section: NavigationSection,
  shortcut: ["g", "s"],
  icon: <SettingsIcon />,
  visible: ({ stores }) =>
    stores.policies.abilities(stores.auth.team?.id || "").update,
-  perform: () => history.push(organizationSettingsPath()),
+  perform: () => history.push(settingsPath("details")),
 });

 export const navigateToProfileSettings = createAction({
  name: ({ t }) => t("Profile"),
+  analyticsName: "Navigate to profile settings",
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <ProfileIcon />,
-  perform: () => history.push(profileSettingsPath()),
+  perform: () => history.push(settingsPath()),
+});
+
+export const navigateToNotificationSettings = createAction({
+  name: ({ t }) => t("Notifications"),
+  analyticsName: "Navigate to notification settings",
+  section: NavigationSection,
+  iconInContextMenu: false,
+  icon: <EmailIcon />,
+  perform: () => history.push(settingsPath("notifications")),
 });

 export const navigateToAccountPreferences = createAction({
  name: ({ t }) => t("Preferences"),
+  analyticsName: "Navigate to account preferences",
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <SettingsIcon />,
-  perform: () => history.push(accountPreferencesPath()),
+  perform: () => history.push(settingsPath("preferences")),
 });

 export const openAPIDocumentation = createAction({
  name: ({ t }) => t("API documentation"),
+  analyticsName: "Open API documentation",
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <OpenIcon />,
  perform: () => window.open(developersUrl()),
 });

+export const toggleSidebar = createAction({
+  name: ({ t }) => t("Toggle sidebar"),
+  analyticsName: "Toggle sidebar",
+  keywords: "hide show navigation",
+  section: NavigationSection,
+  perform: ({ stores }) => stores.ui.toggleCollapsedSidebar(),
+});
+
 export const openFeedbackUrl = createAction({
  name: ({ t }) => t("Send us feedback"),
+  analyticsName: "Open feedback",
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <EmailIcon />,
@@ -135,12 +161,14 @@ export const openFeedbackUrl = createAction({

 export const openBugReportUrl = createAction({
  name: ({ t }) => t("Report a bug"),
+  analyticsName: "Open bug report",
  section: NavigationSection,
  perform: () => window.open(githubIssuesUrl()),
 });

 export const openChangelog = createAction({
  name: ({ t }) => t("Changelog"),
+  analyticsName: "Open changelog",
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <OpenIcon />,
@@ -149,6 +177,7 @@ export const openChangelog = createAction({

 export const openKeyboardShortcuts = createAction({
  name: ({ t }) => t("Keyboard shortcuts"),
+  analyticsName: "Open keyboard shortcuts",
  section: NavigationSection,
  shortcut: ["?"],
  iconInContextMenu: false,
@@ -166,6 +195,7 @@ export const downloadApp = createAction({
    t("Download {{ platform }} app", {
      platform: isMac() ? "macOS" : "Windows",
    }),
+  analyticsName: "Download app",
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <BrowserIcon />,
@@ -177,6 +207,7 @@ export const downloadApp = createAction({

 export const logout = createAction({
  name: ({ t }) => t("Log out"),
+  analyticsName: "Log out",
  section: NavigationSection,
  icon: <LogoutIcon />,
  perform: () => stores.auth.logout(),
@@ -194,5 +225,6 @@ export const rootNavigationActions = [
  openBugReportUrl,
  openChangelog,
  openKeyboardShortcuts,
+  toggleSidebar,
  logout,
 ];
@@ -0,0 +1,16 @@
+import { MarkAsReadIcon } from "outline-icons";
+import * as React from "react";
+import { createAction } from "..";
+import { NotificationSection } from "../sections";
+
+export const markNotificationsAsRead = createAction({
+  name: ({ t }) => t("Mark notifications as read"),
+  analyticsName: "Mark notifications as read",
+  section: NotificationSection,
+  icon: <MarkAsReadIcon />,
+  shortcut: ["Shift+Escape"],
+  perform: ({ stores }) => stores.notifications.markAllAsRead(),
+  visible: ({ stores }) => stores.notifications.approximateUnreadCount > 0,
+});
+
+export const rootNotificationActions = [markNotificationsAsRead];
@@ -6,15 +6,19 @@ import stores from "~/stores";
 import { createAction } from "~/actions";
 import { RevisionSection } from "~/actions/sections";
 import history from "~/utils/history";
-import { documentHistoryUrl, matchDocumentHistory } from "~/utils/routeHelpers";
+import {
+  documentHistoryPath,
+  matchDocumentHistory,
+} from "~/utils/routeHelpers";

 export const restoreRevision = createAction({
  name: ({ t }) => t("Restore revision"),
+  analyticsName: "Restore revision",
  icon: <RestoreIcon />,
  section: RevisionSection,
  visible: ({ activeDocumentId, stores }) =>
    !!activeDocumentId && stores.policies.abilities(activeDocumentId).update,
-  perform: async ({ t, event, location, activeDocumentId }) => {
+  perform: async ({ event, location, activeDocumentId }) => {
    event?.preventDefault();
    if (!activeDocumentId) {
      return;
@@ -25,31 +29,21 @@ export const restoreRevision = createAction({
    });
    const revisionId = match?.params.revisionId;

-    const { team } = stores.auth;
    const document = stores.documents.get(activeDocumentId);
    if (!document) {
      return;
    }

-    if (team?.collaborativeEditing) {
-      history.push(document.url, {
-        restore: true,
-        revisionId,
-      });
-    } else {
-      await document.restore({
-        revisionId,
-      });
-      stores.toasts.showToast(t("Document restored"), {
-        type: "success",
-      });
-      history.push(document.url);
-    }
+    history.push(document.url, {
+      restore: true,
+      revisionId,
+    });
  },
 });

 export const copyLinkToRevision = createAction({
  name: ({ t }) => t("Copy link"),
+  analyticsName: "Copy link to revision",
  icon: <LinkIcon />,
  section: RevisionSection,
  perform: async ({ activeDocumentId, stores, t }) => {
@@ -66,7 +60,7 @@ export const copyLinkToRevision = createAction({
      return;
    }

-    const url = `${window.location.origin}${documentHistoryUrl(
+    const url = `${window.location.origin}${documentHistoryPath(
      document,
      revisionId
    )}`;
@@ -7,6 +7,7 @@ import { SettingsSection } from "~/actions/sections";

 export const changeToDarkTheme = createAction({
  name: ({ t }) => t("Dark"),
+  analyticsName: "Change to dark theme",
  icon: <MoonIcon />,
  iconInContextMenu: false,
  keywords: "theme dark night",
@@ -17,6 +18,7 @@ export const changeToDarkTheme = createAction({

 export const changeToLightTheme = createAction({
  name: ({ t }) => t("Light"),
+  analyticsName: "Change to light theme",
  icon: <SunIcon />,
  iconInContextMenu: false,
  keywords: "theme light day",
@@ -27,6 +29,7 @@ export const changeToLightTheme = createAction({

 export const changeToSystemTheme = createAction({
  name: ({ t }) => t("System"),
+  analyticsName: "Change to system theme",
  icon: <BrowserIcon />,
  iconInContextMenu: false,
  keywords: "theme system default",
@@ -38,9 +41,11 @@ export const changeToSystemTheme = createAction({
 export const changeTheme = createAction({
  name: ({ t, isContextMenu }) =>
    isContextMenu ? t("Appearance") : t("Change theme"),
+  analyticsName: "Change theme",
  placeholder: ({ t }) => t("Change theme to"),
-  icon: () =>
-    stores.ui.resolvedTheme === "light" ? <SunIcon /> : <MoonIcon />,
+  icon: function _Icon() {
+    return stores.ui.resolvedTheme === "light" ? <SunIcon /> : <MoonIcon />;
+  },
  keywords: "appearance display",
  section: SettingsSection,
  children: [changeToLightTheme, changeToDarkTheme, changeToSystemTheme],
@@ -9,14 +9,15 @@ import { createAction } from "~/actions";
 import { ActionContext } from "~/types";
 import { TeamSection } from "../sections";

-export const createTeamsList = ({ stores }: { stores: RootStore }) => {
-  return (
-    stores.auth.availableTeams?.map((session) => ({
-      id: `switch-${session.id}`,
-      name: session.name,
-      section: TeamSection,
-      keywords: "change switch workspace organization team",
-      icon: () => (
+export const createTeamsList = ({ stores }: { stores: RootStore }) =>
+  stores.auth.availableTeams?.map((session) => ({
+    id: `switch-${session.id}`,
+    name: session.name,
+    analyticsName: "Switch workspace",
+    section: TeamSection,
+    keywords: "change switch workspace organization team",
+    icon: function _Icon() {
+      return (
        <StyledTeamLogo
          alt={session.name}
          model={{
@@ -27,17 +28,16 @@ export const createTeamsList = ({ stores }: { stores: RootStore }) => {
          }}
          size={24}
        />
-      ),
-      visible: ({ currentTeamId }: ActionContext) =>
-        currentTeamId !== session.id,
-      perform: () => (window.location.href = session.url),
-    })) ?? []
-  );
-};
+      );
+    },
+    visible: ({ currentTeamId }: ActionContext) => currentTeamId !== session.id,
+    perform: () => (window.location.href = session.url),
+  })) ?? [];

 export const switchTeam = createAction({
  name: ({ t }) => t("Switch workspace"),
  placeholder: ({ t }) => t("Select a workspace"),
+  analyticsName: "Switch workspace",
  keywords: "change switch workspace organization team",
  section: TeamSection,
  visible: ({ stores }) =>
@@ -47,12 +47,12 @@ export const switchTeam = createAction({

 export const createTeam = createAction({
  name: ({ t }) => `${t("New workspace")}…`,
+  analyticsName: "New workspace",
  keywords: "create change switch workspace organization team",
  section: TeamSection,
  icon: <PlusIcon />,
-  visible: ({ stores, currentTeamId }) => {
-    return stores.policies.abilities(currentTeamId ?? "").createTeam;
-  },
+  visible: ({ stores, currentTeamId }) =>
+    stores.policies.abilities(currentTeamId ?? "").createTeam,
  perform: ({ t, event, stores }) => {
    event?.preventDefault();
    event?.stopPropagation();
@@ -2,11 +2,13 @@ import { PlusIcon } from "outline-icons";
 import * as React from "react";
 import stores from "~/stores";
 import Invite from "~/scenes/Invite";
+import { UserDeleteDialog } from "~/components/UserDialogs";
 import { createAction } from "~/actions";
 import { UserSection } from "~/actions/sections";

 export const inviteUser = createAction({
  name: ({ t }) => `${t("Invite people")}…`,
+  analyticsName: "Invite people",
  icon: <PlusIcon />,
  keywords: "team member workspace user",
  section: UserSection,
@@ -20,4 +22,31 @@ export const inviteUser = createAction({
  },
 });

+export const deleteUserActionFactory = (userId: string) =>
+  createAction({
+    name: ({ t }) => `${t("Delete user")}…`,
+    analyticsName: "Delete user",
+    keywords: "leave",
+    dangerous: true,
+    section: UserSection,
+    visible: ({ stores }) => stores.policies.abilities(userId).delete,
+    perform: ({ t }) => {
+      const user = stores.users.get(userId);
+      if (!user) {
+        return;
+      }
+
+      stores.dialogs.openModal({
+        title: t("Delete user"),
+        isCentered: true,
+        content: (
+          <UserDeleteDialog
+            user={user}
+            onSubmit={stores.dialogs.closeAllModals}
+          />
+        ),
+      });
+    },
+  });
+
 export const rootUserActions = [inviteUser];
@@ -9,6 +9,7 @@ import {
  MenuItemButton,
  MenuItemWithChildren,
 } from "~/types";
+import Analytics from "~/utils/Analytics";

 function resolve<T>(value: any, context: ActionContext): T {
  return typeof value === "function" ? value(context) : value;
@@ -17,7 +18,24 @@ function resolve<T>(value: any, context: ActionContext): T {
 export function createAction(definition: Optional<Action, "id">): Action {
  return {
    ...definition,
-    id: uuidv4(),
+    perform: definition.perform
+      ? (context) => {
+          // We muse 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(),
  };
 }

@@ -31,9 +49,7 @@ export function actionToMenuItem(
  const title = resolve<string>(action.name, context);
  const icon =
    resolvedIcon && action.iconInContextMenu !== false
-      ? React.cloneElement(resolvedIcon, {
-          color: "currentColor",
-        })
+      ? resolvedIcon
      : undefined;

  if (resolvedChildren) {
@@ -93,12 +109,13 @@ export function actionToKBar(
    {
      id: action.id,
      name: resolvedName,
+      analyticsName: action.analyticsName,
      section: resolvedSection,
      placeholder: resolvedPlaceholder,
      keywords: action.keywords ?? "",
      shortcut: action.shortcut || [],
      icon: resolvedIcon,
-      perform: action.perform ? () => action?.perform?.(context) : undefined,
+      perform: action.perform ? () => action.perform?.(context) : undefined,
    },
    // @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
  ].concat(children.map((child) => ({ ...child, parent: action.id })));
@@ -2,6 +2,7 @@ import { rootCollectionActions } from "./definitions/collections";
 import { rootDeveloperActions } from "./definitions/developer";
 import { rootDocumentActions } from "./definitions/documents";
 import { rootNavigationActions } from "./definitions/navigation";
+import { rootNotificationActions } from "./definitions/notifications";
 import { rootRevisionActions } from "./definitions/revisions";
 import { rootSettingsActions } from "./definitions/settings";
 import { rootTeamActions } from "./definitions/teams";
@@ -12,6 +13,7 @@ export default [
  ...rootDocumentActions,
  ...rootUserActions,
  ...rootNavigationActions,
+  ...rootNotificationActions,
  ...rootRevisionActions,
  ...rootSettingsActions,
  ...rootDeveloperActions,
@@ -12,6 +12,8 @@ export const SettingsSection = ({ t }: ActionContext) => t("Settings");

 export const NavigationSection = ({ t }: ActionContext) => t("Navigation");

+export const NotificationSection = ({ t }: ActionContext) => t("Notification");
+
 export const UserSection = ({ t }: ActionContext) => t("People");

 export const TeamSection = ({ t }: ActionContext) => t("Workspace");
@@ -1,8 +1,9 @@
+/* eslint-disable react/prop-types */
 import * as React from "react";
 import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
 import { Action, ActionContext } from "~/types";

-export type Props = React.ComponentPropsWithoutRef<"button"> & {
+export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Show the button in a disabled state */
  disabled?: boolean;
  /** Hide the button entirely if action is not applicable */
@@ -18,36 +19,52 @@ export type Props = React.ComponentPropsWithoutRef<"button"> & {
 /**
 * Button that can be used to trigger an action definition.
 */
-const ActionButton = React.forwardRef(
-  (
+const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
+  function _ActionButton(
    { action, context, tooltip, hideOnActionDisabled, ...rest }: Props,
    ref: React.Ref<HTMLButtonElement>
-  ) => {
+  ) {
+    const [executing, setExecuting] = React.useState(false);
    const disabled = rest.disabled;

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

-    if (action?.visible && !action.visible(context) && hideOnActionDisabled) {
+    const actionContext = { ...context, isButton: true };
+
+    if (
+      action?.visible &&
+      !action.visible(actionContext) &&
+      hideOnActionDisabled
+    ) {
      return null;
    }

    const label =
-      typeof action.name === "function" ? action.name(context) : action.name;
+      typeof action.name === "function"
+        ? action.name(actionContext)
+        : action.name;

    const button = (
      <button
        {...rest}
        aria-label={label}
-        disabled={disabled}
+        disabled={disabled || executing}
        ref={ref}
        onClick={
-          action?.perform && context
+          action?.perform && actionContext
            ? (ev) => {
                ev.preventDefault();
                ev.stopPropagation();
-                action.perform?.(context);
+                const response = action.perform?.(actionContext);
+                if (response?.finally) {
+                  setExecuting(true);
+                  response.finally(() => setExecuting(false));
+                }
              }
            : rest.onClick
        }
@@ -1,5 +1,6 @@
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import { s } from "@shared/styles";
 import Flex from "~/components/Flex";

 export const Action = styled(Flex)`
@@ -20,7 +21,7 @@ export const Separator = styled.div`
  margin-left: 12px;
  width: 1px;
  height: 28px;
-  background: ${(props) => props.theme.divider};
+  background: ${s("divider")};
 `;

 const Actions = styled(Flex)`
@@ -29,8 +30,8 @@ const Actions = styled(Flex)`
  right: 0;
  left: 0;
  border-radius: 3px;
-  background: ${(props) => props.theme.background};
-  transition: ${(props) => props.theme.backgroundTransition};
+  background: ${s("background")};
+  transition: ${s("backgroundTransition")};
  padding: 12px;
  backdrop-filter: blur(20px);

@@ -5,10 +5,14 @@ import * as React from "react";
 import { IntegrationService } from "@shared/types";
 import env from "~/env";

-const Analytics: React.FC = ({ children }) => {
+type Props = {
+  children?: React.ReactNode;
+};
+
+const Analytics: React.FC = ({ children }: Props) => {
  // Google Analytics 3
  React.useEffect(() => {
-    if (!env.GOOGLE_ANALYTICS_ID) {
+    if (!env.GOOGLE_ANALYTICS_ID?.startsWith("UA-")) {
      return;
    }

@@ -37,25 +41,36 @@ const Analytics: React.FC = ({ children }) => {

  // Google Analytics 4
  React.useEffect(() => {
-    if (env.analytics.service !== IntegrationService.GoogleAnalytics) {
+    const measurementIds = [];
+
+    if (env.analytics.service === IntegrationService.GoogleAnalytics) {
+      measurementIds.push(escape(env.analytics.settings?.measurementId));
+    }
+    if (env.GOOGLE_ANALYTICS_ID?.startsWith("G-")) {
+      measurementIds.push(env.GOOGLE_ANALYTICS_ID);
+    }
+    if (measurementIds.length === 0) {
      return;
    }

-    const measurementId = escape(env.analytics.settings?.measurementId);
+    const params = {
+      allow_google_signals: false,
+      restricted_data_processing: true,
+    };

    window.dataLayer = window.dataLayer || [];
    window.gtag = function () {
      window.dataLayer.push(arguments);
    };
    window.gtag("js", new Date());
-    window.gtag("config", measurementId, {
-      allow_google_signals: false,
-      restricted_data_processing: true,
-    });
+
+    for (const measurementId of measurementIds) {
+      window.gtag("config", measurementId, params);
+    }

    const script = document.createElement("script");
    script.type = "text/javascript";
-    script.src = `https://www.googletagmanager.com/gtag/js?id=${measurementId}`;
+    script.src = `https://www.googletagmanager.com/gtag/js?id=${measurementIds[0]}`;
    script.async = true;
    document.getElementsByTagName("head")[0]?.appendChild(script);
  }, []);
@@ -6,17 +6,11 @@ export default function Arrow() {
      width="13"
      height="30"
      viewBox="0 0 13 30"
-      fill="none"
+      fill="currentColor"
      xmlns="http://www.w3.org/2000/svg"
    >
-      <path
-        fill="currentColor"
-        d="M7.40242 1.48635C8.23085 0.0650039 10.0656 -0.421985 11.5005 0.39863C12.9354 1.21924 13.427 3.03671 12.5986 4.45806L5.59858 16.4681C4.77015 17.8894 2.93538 18.3764 1.5005 17.5558C0.065623 16.7352 -0.426002 14.9177 0.402425 13.4964L7.40242 1.48635Z"
-      />
-      <path
-        fill="currentColor"
-        d="M12.5986 25.5419C13.427 26.9633 12.9354 28.7808 11.5005 29.6014C10.0656 30.422 8.23087 29.935 7.40244 28.5136L0.402438 16.5036C-0.425989 15.0823 0.0656365 13.2648 1.50051 12.4442C2.93539 11.6236 4.77016 12.1106 5.59859 13.5319L12.5986 25.5419Z"
-      />
+      <path d="M7.40242 1.48635C8.23085 0.0650039 10.0656 -0.421985 11.5005 0.39863C12.9354 1.21924 13.427 3.03671 12.5986 4.45806L5.59858 16.4681C4.77015 17.8894 2.93538 18.3764 1.5005 17.5558C0.065623 16.7352 -0.426002 14.9177 0.402425 13.4964L7.40242 1.48635Z" />
+      <path d="M12.5986 25.5419C13.427 26.9633 12.9354 28.7808 11.5005 29.6014C10.0656 30.422 8.23087 29.935 7.40244 28.5136L0.402438 16.5036C-0.425989 15.0823 0.0656365 13.2648 1.50051 12.4442C2.93539 11.6236 4.77016 12.1106 5.59859 13.5319L12.5986 25.5419Z" />
    </svg>
  );
 }
@@ -20,6 +20,10 @@ function ArrowKeyNavigation(
  const handleKeyDown = React.useCallback(
    (ev) => {
      if (onEscape) {
+        if (ev.nativeEvent.isComposing) {
+          return;
+        }
+
        if (ev.key === "Escape") {
          onEscape(ev);
        }
@@ -1,26 +0,0 @@
-import * as React from "react";
-
-type Props = {
-  size?: number;
-  fill?: string;
-  className?: string;
-};
-
-function GoogleLogo({ size = 34, fill = "#FFF", className }: Props) {
-  return (
-    <svg
-      fill={fill}
-      width={size}
-      height={size}
-      viewBox="0 0 34 34"
-      xmlns="http://www.w3.org/2000/svg"
-      className={className}
-    >
-      <g>
-        <path d="M32.6162791,13.9090909 L16.8837209,13.9090909 L16.8837209,20.4772727 L25.9395349,20.4772727 C25.0953488,24.65 21.5651163,27.0454545 16.8837209,27.0454545 C11.3581395,27.0454545 6.90697674,22.5636364 6.90697674,17 C6.90697674,11.4363636 11.3581395,6.95454545 16.8837209,6.95454545 C19.2627907,6.95454545 21.4116279,7.80454545 23.1,9.19545455 L28.0116279,4.25 C25.0186047,1.62272727 21.1813953,0 16.8837209,0 C7.52093023,0 0,7.57272727 0,17 C0,26.4272727 7.52093023,34 16.8837209,34 C25.3255814,34 33,27.8181818 33,17 C33,15.9954545 32.8465116,14.9136364 32.6162791,13.9090909 Z" />
-      </g>
-    </svg>
-  );
-}
-
-export default GoogleLogo;
@@ -1,43 +0,0 @@
-import * as React from "react";
-
-type Props = {
-  size?: number;
-  fill?: string;
-  className?: string;
-};
-
-function MicrosoftLogo({ size = 34, fill = "#FFF", className }: Props) {
-  return (
-    <svg
-      fill={fill}
-      width={size}
-      height={size}
-      viewBox="0 0 34 34"
-      xmlns="http://www.w3.org/2000/svg"
-      className={className}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M18.0002 1H33.9998C33.9998 5.8172 34.0007 10.6344 33.9988 15.4516C28.6666 15.4508 23.3334 15.4516 18.0012 15.4516C17.9993 10.6344 18.0002 5.8172 18.0002 1Z"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M18.0009 17.5173C23.3333 17.5155 28.6667 17.5164 34 17.5164V33H18C18.0009 27.8388 17.9991 22.6776 18.0009 17.5173V17.5173Z"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M0 1H16L15.9988 15.4516H0V1Z"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M0 17.5161C5.3332 17.5179 10.6664 17.5155 15.9996 17.5179C16.0005 22.6789 15.9996 27.839 15.9996 33H0V17.5161Z"
-      />
-    </svg>
-  );
-}
-
-export default MicrosoftLogo;
@@ -1,49 +0,0 @@
-import * as React from "react";
-import styled from "styled-components";
-import GoogleLogo from "./GoogleLogo";
-import MicrosoftLogo from "./MicrosoftLogo";
-import SlackLogo from "./SlackLogo";
-
-type Props = {
-  providerName: string;
-  size?: number;
-  color?: string;
-};
-
-function AuthLogo({ providerName, color, size = 16 }: Props) {
-  switch (providerName) {
-    case "slack":
-      return (
-        <Logo>
-          <SlackLogo size={size} fill={color} />
-        </Logo>
-      );
-
-    case "google":
-      return (
-        <Logo>
-          <GoogleLogo size={size} fill={color} />
-        </Logo>
-      );
-
-    case "azure":
-      return (
-        <Logo>
-          <MicrosoftLogo size={size} fill={color} />
-        </Logo>
-      );
-
-    default:
-      return null;
-  }
-}
-
-const Logo = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 24px;
-  height: 24px;
-`;
-
-export default AuthLogo;
@@ -2,9 +2,9 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Redirect } from "react-router-dom";
-import LoadingIndicator from "~/components/LoadingIndicator";
 import useStores from "~/hooks/useStores";
 import { changeLanguage } from "~/utils/language";
+import LoadingIndicator from "./LoadingIndicator";

 type Props = {
  children: JSX.Element;
@@ -18,20 +18,18 @@ const Authenticated = ({ children }: Props) => {
  // Watching for language changes here as this is the earliest point we have
  // the user available and means we can start loading translations faster
  React.useEffect(() => {
-    changeLanguage(language, i18n);
+    void changeLanguage(language, i18n);
  }, [i18n, language]);

  if (auth.authenticated) {
-    const { user, team } = auth;
-
-    if (!team || !user) {
-      return <LoadingIndicator />;
-    }
-
    return children;
  }

-  auth.logout(true);
+  if (auth.isFetching) {
+    return <LoadingIndicator />;
+  }
+
+  void auth.logout(true);
  return <Redirect to="/" />;
 };

@@ -2,6 +2,7 @@ import { AnimatePresence } from "framer-motion";
 import { observer, useLocalStore } from "mobx-react";
 import * as React from "react";
 import { Switch, Route, useLocation, matchPath } from "react-router-dom";
+import { TeamPreference } from "@shared/types";
 import ErrorSuspended from "~/scenes/ErrorSuspended";
 import DocumentContext from "~/components/DocumentContext";
 import type { DocumentContextValue } from "~/components/DocumentContext";
@@ -14,39 +15,33 @@ import type { Editor as TEditor } from "~/editor";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import history from "~/utils/history";
+import lazyWithRetry from "~/utils/lazyWithRetry";
 import {
  searchPath,
-  matchDocumentSlug as slug,
  newDocumentPath,
  settingsPath,
  matchDocumentHistory,
+  matchDocumentSlug as slug,
  matchDocumentInsights,
 } from "~/utils/routeHelpers";
 import Fade from "./Fade";

-const DocumentHistory = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "document-history" */
-      "~/scenes/Document/components/History"
-    )
+const DocumentComments = lazyWithRetry(
+  () => import("~/scenes/Document/components/Comments")
 );
-const DocumentInsights = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "document-insights" */
-      "~/scenes/Document/components/Insights"
-    )
+const DocumentHistory = lazyWithRetry(
+  () => import("~/scenes/Document/components/History")
 );
-const CommandBar = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "command-bar" */
-      "~/components/CommandBar"
-    )
+const DocumentInsights = lazyWithRetry(
+  () => import("~/scenes/Document/components/Insights")
 );
+const CommandBar = lazyWithRetry(() => import("~/components/CommandBar"));

-const AuthenticatedLayout: React.FC = ({ children }) => {
+type Props = {
+  children?: React.ReactNode;
+};
+
+const AuthenticatedLayout: React.FC = ({ children }: Props) => {
  const { ui, auth } = useStores();
  const location = useLocation();
  const can = usePolicy(ui.activeCollectionId);
@@ -71,7 +66,7 @@ const AuthenticatedLayout: React.FC = ({ children }) => {
      return;
    }
    const { activeCollectionId } = ui;
-    if (!activeCollectionId || !can.update) {
+    if (!activeCollectionId || !can.createDocument) {
      return;
    }
    history.push(newDocumentPath(activeCollectionId));
@@ -98,15 +93,25 @@ const AuthenticatedLayout: React.FC = ({ children }) => {
  const showInsights = !!matchPath(location.pathname, {
    path: matchDocumentInsights,
  });
+  const showComments =
+    !showInsights &&
+    !showHistory &&
+    ui.activeDocumentId &&
+    ui.commentsExpanded.includes(ui.activeDocumentId) &&
+    team?.getPreference(TeamPreference.Commenting);

  const sidebarRight = (
-    <AnimatePresence key={ui.activeDocumentId}>
-      {(showHistory || showInsights) && (
+    <AnimatePresence
+      initial={false}
+      key={ui.activeDocumentId ? "active" : "inactive"}
+    >
+      {(showHistory || showInsights || showComments) && (
        <Route path={`/doc/${slug}`}>
          <SidebarRight>
            <React.Suspense fallback={null}>
              {showHistory && <DocumentHistory />}
              {showInsights && <DocumentInsights />}
+              {showComments && <DocumentComments />}
            </React.Suspense>
          </SidebarRight>
        </Route>
@@ -121,7 +126,9 @@ const AuthenticatedLayout: React.FC = ({ children }) => {
        <RegisterKeyDown trigger="t" handler={goToSearch} />
        <RegisterKeyDown trigger="/" handler={goToSearch} />
        {children}
-        <CommandBar />
+        <React.Suspense fallback={null}>
+          <CommandBar />
+        </React.Suspense>
      </Layout>
    </DocumentContext.Provider>
  );
@@ -2,37 +2,44 @@ import * as React from "react";
 import styled from "styled-components";
 import useBoolean from "~/hooks/useBoolean";
 import Initials from "./Initials";
-import placeholder from "./placeholder.png";
+
+export enum AvatarSize {
+  Small = 16,
+  Medium = 24,
+  Large = 32,
+  XLarge = 48,
+  XXLarge = 64,
+}

 export interface IAvatar {
  avatarUrl: string | null;
-  color: string;
-  initial: string;
-  id: string;
+  color?: string;
+  initial?: string;
+  id?: string;
 }

 type Props = {
-  size: number;
+  size: AvatarSize;
  src?: string;
-  icon?: React.ReactNode;
  model?: IAvatar;
  alt?: string;
  showBorder?: boolean;
  onClick?: React.MouseEventHandler<HTMLImageElement>;
  className?: string;
+  style?: React.CSSProperties;
 };

 function Avatar(props: Props) {
-  const { icon, showBorder, model, ...rest } = props;
+  const { showBorder, model, style, ...rest } = props;
  const src = props.src || model?.avatarUrl;
  const [error, handleError] = useBoolean(false);

  return (
-    <Relative>
-      {src ? (
+    <Relative style={style}>
+      {src && !error ? (
        <CircleImg
          onError={handleError}
-          src={error ? placeholder : src}
+          src={src}
          $showBorder={showBorder}
          {...rest}
        />
@@ -43,32 +50,20 @@ function Avatar(props: Props) {
      ) : (
        <Initials $showBorder={showBorder} {...rest} />
      )}
-      {icon && <IconWrapper>{icon}</IconWrapper>}
    </Relative>
  );
 }

 Avatar.defaultProps = {
-  size: 24,
+  size: AvatarSize.Medium,
 };

 const Relative = styled.div`
  position: relative;
+  user-select: none;
  flex-shrink: 0;
 `;

-const IconWrapper = styled.div`
-  display: flex;
-  position: absolute;
-  bottom: -2px;
-  right: -2px;
-  background: ${(props) => props.theme.primary};
-  border: 2px solid ${(props) => props.theme.background};
-  border-radius: 100%;
-  width: 20px;
-  height: 20px;
-`;
-
 const CircleImg = styled.img<{ size: number; $showBorder?: boolean }>`
  display: block;
  width: ${(props) => props.size}px;
@@ -2,6 +2,7 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled, { css } from "styled-components";
+import { s } from "@shared/styles";
 import User from "~/models/User";
 import Avatar from "~/components/Avatar";
 import Tooltip from "~/components/Tooltip";
@@ -106,7 +107,7 @@ const AvatarWrapper = styled.div<AvatarWrapperProps>`

      &:hover:after {
        border: 2px solid ${(props) => props.$color};
-        box-shadow: inset 0 0 0 2px ${(props) => props.theme.background};
+        box-shadow: inset 0 0 0 2px ${s("background")};
      }
    `}
 `;
@@ -5,9 +5,13 @@ const Badge = styled.span<{ yellow?: boolean; primary?: boolean }>`
  margin-left: 10px;
  padding: 1px 5px 2px;
  background-color: ${({ yellow, primary, theme }) =>
-    yellow ? theme.yellow : primary ? theme.primary : "transparent"};
+    yellow ? theme.yellow : primary ? theme.accent : "transparent"};
  color: ${({ primary, yellow, theme }) =>
-    primary ? theme.white : yellow ? theme.almostBlack : theme.textTertiary};
+    primary
+      ? theme.accentText
+      : yellow
+      ? theme.almostBlack
+      : theme.textTertiary};
  border: 1px solid
    ${({ primary, yellow, theme }) =>
      primary || yellow
@@ -1,7 +1,7 @@
 import * as React from "react";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
-import { depths } from "@shared/styles";
+import { depths, s } from "@shared/styles";
 import env from "~/env";
 import OutlineIcon from "./Icons/OutlineIcon";

@@ -26,16 +26,16 @@ const Link = styled.a`
  font-size: 14px;
  text-decoration: none;
  border-top-right-radius: 2px;
-  color: ${(props) => props.theme.text};
+  color: ${s("text")};
  display: flex;
  align-items: center;

  svg {
-    fill: ${(props) => props.theme.text};
+    fill: ${s("text")};
  }

  &:hover {
-    background: ${(props) => props.theme.sidebarBackground};
+    background: ${s("sidebarBackground")};
  }

  ${breakpoint("tablet")`
@@ -2,6 +2,7 @@ import { GoToIcon } from "outline-icons";
 import * as React from "react";
 import { Link } from "react-router-dom";
 import styled from "styled-components";
+import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import BreadcrumbMenu from "~/menus/BreadcrumbMenu";
 import { MenuInternalLink } from "~/types";
@@ -60,20 +61,18 @@ function Breadcrumb({

 const Slash = styled(GoToIcon)`
  flex-shrink: 0;
-  fill: ${(props) => props.theme.divider};
+  fill: ${s("divider")};
 `;

 const Item = styled(Link)<{ $highlight: boolean; $withIcon: boolean }>`
+  ${ellipsis()}
  display: flex;
  flex-shrink: 1;
  min-width: 0;
  cursor: var(--pointer);
-  color: ${(props) => props.theme.text};
+  color: ${s("text")};
  font-size: 15px;
  height: 24px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
  font-weight: ${(props) => (props.$highlight ? "500" : "inherit")};
  margin-left: ${(props) => (props.$withIcon ? "4px" : "0")};

@@ -1,8 +1,9 @@
 import { LocationDescriptor } from "history";
 import { ExpandedIcon } from "outline-icons";
-import { darken, lighten } from "polished";
+import { darken, lighten, transparentize } from "polished";
 import * as React from "react";
 import styled from "styled-components";
+import { s } from "@shared/styles";
 import ActionButton, {
  Props as ActionButtonProps,
 } from "~/components/ActionButton";
@@ -13,7 +14,6 @@ type RealProps = {
  $borderOnHover?: boolean;
  $neutral?: boolean;
  $danger?: boolean;
-  $iconColor?: string;
 };

 const RealButton = styled(ActionButton)<RealProps>`
@@ -22,8 +22,8 @@ const RealButton = styled(ActionButton)<RealProps>`
  margin: 0;
  padding: 0;
  border: 0;
-  background: ${(props) => props.theme.buttonBackground};
-  color: ${(props) => props.theme.buttonText};
+  background: ${s("accent")};
+  color: ${s("accentText")};
  box-shadow: rgba(0, 0, 0, 0.2) 0px 1px 2px;
  border-radius: 4px;
  font-size: 14px;
@@ -36,14 +36,6 @@ const RealButton = styled(ActionButton)<RealProps>`
  appearance: none !important;
  ${undraggableOnDesktop()}

-  ${(props) =>
-    !props.$borderOnHover &&
-    `
-      svg {
-        fill: ${props.$iconColor || "currentColor"};
-      }
-    `}
-
  &::-moz-focus-inner {
    padding: 0;
    border: 0;
@@ -51,14 +43,14 @@ const RealButton = styled(ActionButton)<RealProps>`

  &:hover:not(:disabled),
  &[aria-expanded="true"] {
-    background: ${(props) => darken(0.05, props.theme.buttonBackground)};
+    background: ${(props) => darken(0.05, props.theme.accent)};
  }

  &:disabled {
    cursor: default;
    pointer-events: none;
-    color: ${(props) => props.theme.white50};
-    background: ${(props) => lighten(0.2, props.theme.buttonBackground)};
+    color: ${(props) => transparentize(0.5, props.theme.accentText)};
+    background: ${(props) => lighten(0.2, props.theme.accent)};

    svg {
      fill: ${(props) => props.theme.white50};
@@ -68,7 +60,7 @@ const RealButton = styled(ActionButton)<RealProps>`
  ${(props) =>
    props.$neutral &&
    `
-    background: ${props.theme.buttonNeutralBackground};
+    background: inherit;
    color: ${props.theme.buttonNeutralText};
    box-shadow: ${
      props.$borderOnHover
@@ -76,15 +68,6 @@ const RealButton = styled(ActionButton)<RealProps>`
        : `rgba(0, 0, 0, 0.07) 0px 1px 2px, ${props.theme.buttonNeutralBorder} 0 0 0 1px inset`
    };

-    ${
-      props.$borderOnHover
-        ? ""
-        : `svg {
-      fill: ${props.$iconColor || "currentColor"};
-    }`
-    }
-
-
    &:hover:not(:disabled),
    &[aria-expanded="true"] {
      background: ${
@@ -155,7 +138,6 @@ export const Inner = styled.span<{

 export type Props<T> = ActionButtonProps & {
  icon?: React.ReactNode;
-  iconColor?: string;
  children?: React.ReactNode;
  disclosure?: boolean;
  neutral?: boolean;
@@ -164,6 +146,7 @@ export type Props<T> = ActionButtonProps & {
  as?: T;
  to?: LocationDescriptor;
  borderOnHover?: boolean;
+  hideIcon?: boolean;
  href?: string;
  "data-on"?: string;
  "data-event-category"?: string;
@@ -182,14 +165,14 @@ const Button = <T extends React.ElementType = "button">(
    neutral,
    action,
    icon,
-    iconColor,
    borderOnHover,
+    hideIcon,
    fullwidth,
    danger,
    ...rest
  } = props;
  const hasText = children !== undefined || value !== undefined;
-  const ic = action?.icon ?? icon;
+  const ic = hideIcon ? undefined : action?.icon ?? icon;
  const hasIcon = ic !== undefined;

  return (
@@ -201,13 +184,12 @@ const Button = <T extends React.ElementType = "button">(
      $danger={danger}
      $fullwidth={fullwidth}
      $borderOnHover={borderOnHover}
-      $iconColor={iconColor}
      {...rest}
    >
      <Inner hasIcon={hasIcon} hasText={hasText} disclosure={disclosure}>
        {hasIcon && ic}
        {hasText && <Label hasIcon={hasIcon}>{children || value}</Label>}
-        {disclosure && <ExpandedIcon color="currentColor" />}
+        {disclosure && <ExpandedIcon />}
      </Inner>
    </RealButton>
  );
@@ -0,0 +1,15 @@
+import styled from "styled-components";
+import Button, { Inner } from "./Button";
+
+const ButtonSmall = styled(Button)`
+  font-size: 13px;
+  height: 26px;
+
+  ${Inner} {
+    padding: 0 6px;
+    line-height: 26px;
+    min-height: 26px;
+  }
+`;
+
+export default ButtonSmall;
@@ -3,6 +3,7 @@ import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";

 type Props = {
+  children?: React.ReactNode;
  withStickyHeader?: boolean;
 };

@@ -26,12 +27,10 @@ const Content = styled.div`
  `};
 `;

-const CenteredContent: React.FC<Props> = ({ children, ...rest }) => {
-  return (
-    <Container {...rest}>
-      <Content>{children}</Content>
-    </Container>
-  );
-};
+const CenteredContent: React.FC<Props> = ({ children, ...rest }: Props) => (
+  <Container {...rest}>
+    <Content>{children}</Content>
+  </Container>
+);

 export default CenteredContent;
@@ -42,7 +42,7 @@ const Circle = ({
      style={{
        transition: "stroke-dashoffset 0.6s ease 0s",
      }}
-    ></circle>
+    />
  );
 };

@@ -63,7 +63,7 @@ const CircularProgressBar = ({
        <Circle color={theme.progressBarBackground} offset={offset} />
        {percentage > 0 && (
          <Circle
-            color={theme.primary}
+            color={theme.accent}
            percentage={percentage}
            offset={offset}
          />
@@ -1,6 +1,9 @@
 import styled from "styled-components";

-const ClickablePadding = styled.div<{ grow?: boolean; minHeight?: string }>`
+const ClickablePadding = styled.div<{
+  grow?: boolean;
+  minHeight?: React.CSSProperties["paddingBottom"];
+}>`
  min-height: ${(props) => props.minHeight || "50vh"};
  flex-grow: 100;
  cursor: text;
@@ -4,12 +4,11 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { usePopoverState, PopoverDisclosure } from "reakit/Popover";
 import Document from "~/models/Document";
-import { AvatarWithPresence } from "~/components/Avatar";
+import AvatarWithPresence from "~/components/Avatar/AvatarWithPresence";
 import DocumentViews from "~/components/DocumentViews";
 import Facepile from "~/components/Facepile";
 import NudeButton from "~/components/NudeButton";
 import Popover from "~/components/Popover";
-import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";

@@ -20,7 +19,6 @@ type Props = {
 function Collaborators(props: Props) {
  const { t } = useTranslation();
  const user = useCurrentUser();
-  const team = useCurrentTeam();
  const currentUserId = user?.id;
  const [requestedUserIds, setRequestedUserIds] = React.useState<string[]>([]);
  const { users, presence, ui } = useStores();
@@ -59,7 +57,7 @@ function Collaborators(props: Props) {

    if (!isEqual(requestedUserIds, ids) && ids.length > 0) {
      setRequestedUserIds(ids);
-      users.fetchPage({ ids, limit: 100 });
+      void users.fetchPage({ ids, limit: 100 });
    }
  }, [document, users, presentIds, document.collaboratorIds, requestedUserIds]);

@@ -79,8 +77,7 @@ function Collaborators(props: Props) {
                const isPresent = presentIds.includes(collaborator.id);
                const isEditing = editingIds.includes(collaborator.id);
                const isObserving = ui.observingUserId === collaborator.id;
-                const isObservable =
-                  team.collaborativeEditing && collaborator.id !== user.id;
+                const isObservable = collaborator.id !== user.id;

                return (
                  <AvatarWithPresence
@@ -39,7 +39,7 @@ function CollectionDeleteDialog({ collection, onSubmit }: Props) {
      <>
        <Text type="secondary">
          <Trans
-            defaults="Are you sure about that? Deleting the <em>{{collectionName}}</em> collection is permanent and cannot be restored, however documents within will be moved to the trash."
+            defaults="Are you sure about that? Deleting the <em>{{collectionName}}</em> collection is permanent and cannot be restored, however all published documents within will be moved to the trash."
            values={{
              collectionName: collection.name,
            }}
@@ -4,6 +4,7 @@ import { transparentize } from "polished";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
+import { s } from "@shared/styles";
 import Collection from "~/models/Collection";
 import Arrow from "~/components/Arrow";
 import ButtonLink from "~/components/ButtonLink";
@@ -70,9 +71,9 @@ function CollectionDescription({ collection }: Props) {
  );

  const handleChange = React.useCallback(
-    (getValue) => {
+    async (getValue) => {
      setDirty(true);
-      handleSave(getValue);
+      await handleSave(getValue);
    },
    [handleSave]
  );
@@ -110,7 +111,7 @@ function CollectionDescription({ collection }: Props) {
                onBlur={handleStopEditing}
                maxLength={1000}
                embedsDisabled
-                readOnlyWriteCheckboxes
+                canUpdate
              />
            </React.Suspense>
          ) : (
@@ -141,7 +142,7 @@ function CollectionDescription({ collection }: Props) {

 const Disclosure = styled(NudeButton)`
  opacity: 0;
-  color: ${(props) => props.theme.divider};
+  color: ${s("divider")};
  position: absolute;
  top: calc(25vh - 50px);
  left: 50%;
@@ -155,12 +156,12 @@ const Disclosure = styled(NudeButton)`
  }

  &:active {
-    color: ${(props) => props.theme.sidebarText};
+    color: ${s("sidebarText")};
  }
 `;

 const Placeholder = styled(ButtonLink)`
-  color: ${(props) => props.theme.placeholder};
+  color: ${s("placeholder")};
  cursor: text;
  min-height: 27px;
 `;
@@ -193,7 +194,7 @@ const Input = styled.div`
  margin: -8px;
  padding: 8px;
  border-radius: 8px;
-  transition: ${(props) => props.theme.backgroundTransition};
+  transition: ${s("backgroundTransition")};

  &:after {
    content: "";
@@ -206,7 +207,7 @@ const Input = styled.div`
    background: linear-gradient(
      180deg,
      ${(props) => transparentize(1, props.theme.background)} 0%,
-      ${(props) => props.theme.background} 100%
+      ${s("background")} 100%
    );
  }

@@ -218,7 +219,7 @@ const Input = styled.div`
  }

  &[data-editing="true"] {
-    background: ${(props) => props.theme.secondaryBackground};
+    background: ${s("secondaryBackground")};
  }

  .block-menu-trigger,
@@ -1,25 +1,20 @@
 import { useKBar, KBarPositioner, KBarAnimator, KBarSearch } from "kbar";
 import { observer } from "mobx-react";
-import { QuestionMarkIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Portal } from "react-portal";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
-import { depths } from "@shared/styles";
+import { depths, s } from "@shared/styles";
 import CommandBarResults from "~/components/CommandBarResults";
 import SearchActions from "~/components/SearchActions";
 import rootActions from "~/actions/root";
 import useCommandBarActions from "~/hooks/useCommandBarActions";
 import useSettingsActions from "~/hooks/useSettingsActions";
-import useStores from "~/hooks/useStores";
 import { CommandBarAction } from "~/types";
-import { metaDisplay } from "~/utils/keyboard";
-import Text from "./Text";

 function CommandBar() {
  const { t } = useTranslation();
-  const { ui } = useStores();
  const settingsActions = useSettingsActions();
  const commandBarActions = React.useMemo(
    () => [...rootActions, settingsActions],
@@ -30,9 +25,9 @@ function CommandBar() {

  const { rootAction } = useKBar((state) => ({
    rootAction: state.currentRootActionId
-      ? ((state.actions[
+      ? (state.actions[
          state.currentRootActionId
-        ] as unknown) as CommandBarAction)
+        ] as unknown as CommandBarAction)
      : undefined,
  }));

@@ -50,17 +45,6 @@ function CommandBar() {
              }…`}
            />
            <CommandBarResults />
-            {ui.commandBarOpenedFromSidebar && (
-              <Hint size="small" type="tertiary">
-                <QuestionMarkIcon size={18} color="currentColor" />
-                {t(
-                  "Open search from anywhere with the {{ shortcut }} shortcut",
-                  {
-                    shortcut: `${metaDisplay} + k`,
-                  }
-                )}
-              </Hint>
-            )}
          </Animator>
        </Positioner>
      </KBarPortal>
@@ -68,7 +52,11 @@ function CommandBar() {
  );
 }

-const KBarPortal: React.FC = ({ children }) => {
+type Props = {
+  children?: React.ReactNode;
+};
+
+const KBarPortal: React.FC = ({ children }: Props) => {
  const { showing } = useKBar((state) => ({
    showing: state.visualState !== "hidden",
  }));
@@ -80,16 +68,6 @@ const KBarPortal: React.FC = ({ children }) => {
  return <Portal>{children}</Portal>;
 };

-const Hint = styled(Text)`
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  border-top: 1px solid ${(props) => props.theme.background};
-  margin: 1px 0 0;
-  padding: 6px 16px;
-  width: 100%;
-`;
-
 const Positioner = styled(KBarPositioner)`
  z-index: ${depths.commandBar};
 `;
@@ -99,12 +77,12 @@ const SearchInput = styled(KBarSearch)`
  width: 100%;
  outline: none;
  border: none;
-  background: ${(props) => props.theme.menuBackground};
-  color: ${(props) => props.theme.text};
+  background: ${s("menuBackground")};
+  color: ${s("text")};

  &:disabled,
  &::placeholder {
-    color: ${(props) => props.theme.placeholder};
+    color: ${s("placeholder")};
  }
 `;

@@ -112,8 +90,8 @@ const Animator = styled(KBarAnimator)`
  max-width: 600px;
  max-height: 75vh;
  width: 90vw;
-  background: ${(props) => props.theme.menuBackground};
-  color: ${(props) => props.theme.text};
+  background: ${s("menuBackground")};
+  color: ${s("text")};
  border-radius: 8px;
  overflow: hidden;
  box-shadow: rgb(0 0 0 / 40%) 0px 16px 60px;
@@ -2,8 +2,10 @@ import { ActionImpl } from "kbar";
 import { ArrowIcon, BackIcon } from "outline-icons";
 import * as React from "react";
 import styled, { css, useTheme } from "styled-components";
+import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import Key from "~/components/Key";
+import Text from "./Text";

 type Props = {
  action: ActionImpl;
@@ -38,10 +40,9 @@ function CommandBarItem(
            // @ts-expect-error no icon on ActionImpl
            React.cloneElement(action.icon, {
              size: 22,
-              color: "currentColor",
            })
          ) : (
-            <ArrowIcon color="currentColor" />
+            <ArrowIcon />
          )}
        </Icon>

@@ -55,44 +56,59 @@ function CommandBarItem(
        {action.children?.length ? "…" : ""}
      </Content>
      {action.shortcut?.length ? (
-        <div
-          style={{
-            display: "grid",
-            gridAutoFlow: "column",
-            gap: "4px",
-          }}
-        >
-          {action.shortcut.map((sc: string) => (
-            <Key key={sc}>{sc}</Key>
+        <Shortcut>
+          {action.shortcut.map((sc: string, index) => (
+            <React.Fragment key={sc}>
+              {index > 0 ? (
+                <>
+                  {" "}
+                  <Text size="xsmall" as="span" type="secondary">
+                    then
+                  </Text>{" "}
+                </>
+              ) : (
+                ""
+              )}
+              {sc.split("+").map((s) => (
+                <Key key={s}>{s}</Key>
+              ))}
+            </React.Fragment>
          ))}
-        </div>
+        </Shortcut>
      ) : null}
    </Item>
  );
 }

+const Shortcut = styled.div`
+  display: grid;
+  grid-auto-flow: column;
+  gap: 4px;
+`;
+
 const Icon = styled(Flex)`
  align-items: center;
  justify-content: center;
  width: 24px;
  height: 24px;
-  color: ${(props) => props.theme.textSecondary};
+  color: ${s("textSecondary")};
  flex-shrink: 0;
 `;

 const Ancestor = styled.span`
-  color: ${(props) => props.theme.textSecondary};
+  color: ${s("textSecondary")};
 `;

 const Content = styled(Flex)`
-  overflow: hidden;
-  text-overflow: ellipsis;
+  ${ellipsis()}
  flex-shrink: 1;
 `;

 const Item = styled.div<{ active?: boolean }>`
-  font-size: 15px;
-  padding: 10px 16px;
+  font-size: 14px;
+  padding: 9px 12px;
+  margin: 0 8px;
+  border-radius: 4px;
  background: ${(props) =>
    props.active ? props.theme.menuItemSelected : "none"};
  display: flex;
@@ -100,9 +116,8 @@ const Item = styled.div<{ active?: boolean }>`
  justify-content: space-between;
  cursor: var(--pointer);

-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
+  ${ellipsis()}
+  user-select: none;
  min-width: 0;

  ${(props) =>
@@ -1,35 +1,45 @@
 import { useMatches, KBarResults } from "kbar";
 import * as React from "react";
 import styled from "styled-components";
+import { s } from "@shared/styles";
 import CommandBarItem from "~/components/CommandBarItem";

 export default function CommandBarResults() {
  const { results, rootActionId } = useMatches();

  return (
-    <KBarResults
-      items={results}
-      maxHeight={400}
-      onRender={({ item, active }) =>
-        typeof item === "string" ? (
-          <Header>{item}</Header>
-        ) : (
-          <CommandBarItem
-            action={item}
-            active={active}
-            currentRootActionId={rootActionId}
-          />
-        )
-      }
-    />
+    <Container>
+      <KBarResults
+        items={results}
+        maxHeight={400}
+        onRender={({ item, active }) =>
+          typeof item === "string" ? (
+            <Header>{item}</Header>
+          ) : (
+            <CommandBarItem
+              action={item}
+              active={active}
+              currentRootActionId={rootActionId}
+            />
+          )
+        }
+      />
+    </Container>
  );
 }

+// Cannot style KBarResults unfortunately, so we must wrap and target the inner
+const Container = styled.div`
+  > div {
+    padding-bottom: 8px;
+  }
+`;
+
 const Header = styled.h3`
  font-size: 13px;
  letter-spacing: 0.04em;
  margin: 0;
  padding: 16px 0 4px 20px;
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};
  height: 36px;
 `;
@@ -0,0 +1,53 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+import { useTranslation, Trans } from "react-i18next";
+import Comment from "~/models/Comment";
+import ConfirmationDialog from "~/components/ConfirmationDialog";
+import Text from "~/components/Text";
+import useStores from "~/hooks/useStores";
+import useToasts from "~/hooks/useToasts";
+
+type Props = {
+  comment: Comment;
+  onSubmit?: () => void;
+};
+
+function CommentDeleteDialog({ comment, onSubmit }: Props) {
+  const { comments } = useStores();
+  const { showToast } = useToasts();
+  const { t } = useTranslation();
+  const hasChildComments = comments.inThread(comment.id).length > 1;
+
+  const handleSubmit = async () => {
+    try {
+      await comment.delete();
+      onSubmit?.();
+    } catch (err) {
+      showToast(err.message, { type: "error" });
+    }
+  };
+
+  return (
+    <ConfirmationDialog
+      onSubmit={handleSubmit}
+      submitText={t("I’m sure – Delete")}
+      savingText={`${t("Deleting")}…`}
+      danger
+    >
+      <Text type="secondary">
+        {hasChildComments ? (
+          <Trans>
+            Are you sure you want to permanently delete this entire comment
+            thread?
+          </Trans>
+        ) : (
+          <Trans>
+            Are you sure you want to permanently delete this comment?
+          </Trans>
+        )}
+      </Text>
+    </ConfirmationDialog>
+  );
+}
+
+export default observer(CommentDeleteDialog);
@@ -15,6 +15,9 @@ type Props = {
  savingText?: string;
  /** If true, the submit button will be a dangerous red */
  danger?: boolean;
+  /** Keep the submit button disabled */
+  disabled?: boolean;
+  children?: React.ReactNode;
 };

 const ConfirmationDialog: React.FC<Props> = ({
@@ -23,7 +26,8 @@ const ConfirmationDialog: React.FC<Props> = ({
  submitText,
  savingText,
  danger,
-}) => {
+  disabled = false,
+}: Props) => {
  const [isSaving, setIsSaving] = React.useState(false);
  const { dialogs } = useStores();
  const { showToast } = useToasts();
@@ -50,7 +54,12 @@ const ConfirmationDialog: React.FC<Props> = ({
    <Flex column>
      <form onSubmit={handleSubmit}>
        <Text type="secondary">{children}</Text>
-        <Button type="submit" disabled={isSaving} danger={danger} autoFocus>
+        <Button
+          type="submit"
+          disabled={isSaving || disabled}
+          danger={danger}
+          autoFocus
+        >
          {isSaving && savingText ? savingText : submitText}
        </Button>
      </form>
@@ -39,8 +39,8 @@ const Button = styled(NudeButton)`
  display: none;
  position: fixed;
  bottom: 0;
-  right: 32px;
  margin: 24px;
+  transform: translateX(-32px);

  ${breakpoint("tablet")`
    display: block;
@@ -1,6 +1,7 @@
 import isPrintableKeyEvent from "is-printable-key-event";
 import * as React from "react";
 import styled from "styled-components";
+import { s } from "@shared/styles";
 import useOnScreen from "~/hooks/useOnScreen";

 type Props = Omit<React.HTMLAttributes<HTMLSpanElement>, "ref" | "onChange"> & {
@@ -29,63 +30,74 @@ 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(
-  (
-    {
-      disabled,
-      onChange,
-      onInput,
-      onBlur,
-      onKeyDown,
-      value,
-      children,
-      className,
-      maxLength,
-      autoFocus,
-      placeholder,
-      readOnly,
-      dir,
-      onClick,
-      ...rest
-    }: Props,
-    ref: React.RefObject<RefHandle>
-  ) => {
-    const contentRef = React.useRef<HTMLSpanElement>(null);
-    const [innerValue, setInnerValue] = React.useState<string>(value);
-    const lastValue = React.useRef("");
+const ContentEditable = React.forwardRef(function _ContentEditable(
+  {
+    disabled,
+    onChange,
+    onInput,
+    onBlur,
+    onKeyDown,
+    value,
+    children,
+    className,
+    maxLength,
+    autoFocus,
+    placeholder,
+    readOnly,
+    dir,
+    onClick,
+    ...rest
+  }: Props,
+  ref: React.RefObject<RefHandle>
+) {
+  const contentRef = React.useRef<HTMLSpanElement>(null);
+  const [innerValue, setInnerValue] = React.useState<string>(value);
+  const lastValue = React.useRef(value);

-    React.useImperativeHandle(ref, () => ({
-      focus: () => {
-        contentRef.current?.focus();
-      },
-      focusAtStart: () => {
-        if (contentRef.current) {
-          contentRef.current.focus();
+  React.useImperativeHandle(ref, () => ({
+    focus: () => {
+      if (contentRef.current) {
+        contentRef.current.focus();
+        // looks unnecessary but required because of https://github.com/outline/outline/issues/5198
+        if (!contentRef.current.innerText) {
          placeCaret(contentRef.current, true);
        }
-      },
-      focusAtEnd: () => {
-        if (contentRef.current) {
-          contentRef.current.focus();
-          placeCaret(contentRef.current, false);
-        }
-      },
-      getComputedDirection: () => {
-        if (contentRef.current) {
-          return window.getComputedStyle(contentRef.current).direction;
-        }
-        return "ltr";
-      },
-    }));
+      }
+    },
+    focusAtStart: () => {
+      if (contentRef.current) {
+        contentRef.current.focus();
+        placeCaret(contentRef.current, true);
+      }
+    },
+    focusAtEnd: () => {
+      if (contentRef.current) {
+        contentRef.current.focus();
+        placeCaret(contentRef.current, false);
+      }
+    },
+    getComputedDirection: () => {
+      if (contentRef.current) {
+        return window.getComputedStyle(contentRef.current).direction;
+      }
+      return "ltr";
+    },
+  }));

-    const wrappedEvent = (
+  const wrappedEvent =
+    (
      callback:
        | React.FocusEventHandler<HTMLSpanElement>
        | React.FormEventHandler<HTMLSpanElement>
        | React.KeyboardEventHandler<HTMLSpanElement>
        | undefined
-    ) => (event: any) => {
-      const text = contentRef.current?.innerText || "";
+    ) =>
+    (event: any) => {
+      if (readOnly) {
+        return;
+      }
+
+      const text = event.currentTarget.textContent || "";

      if (maxLength && isPrintableKeyEvent(event) && text.length >= maxLength) {
        event?.preventDefault();
@@ -94,62 +106,62 @@ const ContentEditable = React.forwardRef(

      if (text !== lastValue.current) {
        lastValue.current = text;
-        onChange && onChange(text);
+        onChange?.(text);
      }

      callback?.(event);
    };

-    // This is to account for being within a React.Suspense boundary, in this
-    // case the component may be rendered with display: none. React 18 may solve
-    // this in the future by delaying useEffect hooks:
-    // https://github.com/facebook/react/issues/14536#issuecomment-861980492
-    const isVisible = useOnScreen(contentRef);
+  // This is to account for being within a React.Suspense boundary, in this
+  // case the component may be rendered with display: none. React 18 may solve
+  // this in the future by delaying useEffect hooks:
+  // https://github.com/facebook/react/issues/14536#issuecomment-861980492
+  const isVisible = useOnScreen(contentRef);

-    React.useEffect(() => {
-      if (autoFocus && isVisible && !disabled && !readOnly) {
-        contentRef.current?.focus();
-      }
-    }, [autoFocus, disabled, isVisible, readOnly, contentRef]);
+  React.useEffect(() => {
+    if (autoFocus && isVisible && !disabled && !readOnly) {
+      contentRef.current?.focus();
+    }
+  }, [autoFocus, disabled, isVisible, readOnly, contentRef]);

-    React.useEffect(() => {
-      if (value !== contentRef.current?.innerText) {
-        setInnerValue(value);
-      }
-    }, [value, contentRef]);
+  React.useEffect(() => {
+    if (contentRef.current && value !== contentRef.current.textContent) {
+      setInnerValue(value);
+    }
+  }, [value, contentRef]);

-    // Ensure only plain text can be pasted into input when pasting from another
-    // rich text source
-    const handlePaste = React.useCallback(
-      (event: React.ClipboardEvent<HTMLSpanElement>) => {
-        event.preventDefault();
-        const text = event.clipboardData.getData("text/plain");
-        window.document.execCommand("insertText", false, text);
-      },
-      []
-    );
+  // Ensure only plain text can be pasted into input when pasting from another
+  // rich text source. Note: If `onPaste` prop is passed then it takes
+  // priority over this behavior.
+  const handlePaste = React.useCallback(
+    (event: React.ClipboardEvent<HTMLSpanElement>) => {
+      event.preventDefault();
+      const text = event.clipboardData.getData("text/plain");
+      window.document.execCommand("insertText", false, text);
+    },
+    []
+  );

-    return (
-      <div className={className} dir={dir} onClick={onClick}>
-        <Content
-          ref={contentRef}
-          contentEditable={!disabled && !readOnly}
-          onInput={wrappedEvent(onInput)}
-          onBlur={wrappedEvent(onBlur)}
-          onKeyDown={wrappedEvent(onKeyDown)}
-          onPaste={handlePaste}
-          data-placeholder={placeholder}
-          suppressContentEditableWarning
-          role="textbox"
-          {...rest}
-        >
-          {innerValue}
-        </Content>
-        {children}
-      </div>
-    );
-  }
-);
+  return (
+    <div className={className} dir={dir} onClick={onClick}>
+      <Content
+        ref={contentRef}
+        contentEditable={!disabled && !readOnly}
+        onInput={wrappedEvent(onInput)}
+        onBlur={wrappedEvent(onBlur)}
+        onKeyDown={wrappedEvent(onKeyDown)}
+        onPaste={handlePaste}
+        data-placeholder={placeholder}
+        suppressContentEditableWarning
+        role="textbox"
+        {...rest}
+      >
+        {innerValue}
+      </Content>
+      {children}
+    </div>
+  );
+});

 function placeCaret(element: HTMLElement, atStart: boolean) {
  if (
@@ -166,13 +178,14 @@ function placeCaret(element: HTMLElement, atStart: boolean) {
 }

 const Content = styled.span`
-  background: ${(props) => props.theme.background};
-  transition: ${(props) => props.theme.backgroundTransition};
-  color: ${(props) => props.theme.text};
-  -webkit-text-fill-color: ${(props) => props.theme.text};
+  background: ${s("background")};
+  transition: ${s("backgroundTransition")};
+  color: ${s("text")};
+  -webkit-text-fill-color: ${s("text")};
  outline: none;
  resize: none;
  cursor: text;
+  word-break: anywhere;

  &:empty {
    display: inline-block;
@@ -180,8 +193,8 @@ const Content = styled.span`

  &:empty::before {
    display: inline-block;
-    color: ${(props) => props.theme.placeholder};
-    -webkit-text-fill-color: ${(props) => props.theme.placeholder};
+    color: ${s("placeholder")};
+    -webkit-text-fill-color: ${s("placeholder")};
    content: attr(data-placeholder);
    pointer-events: none;
    height: 0;
@@ -1,10 +1,11 @@
 import styled from "styled-components";
+import { s } from "@shared/styles";

 const Header = styled.h3`
  font-size: 11px;
  font-weight: 600;
  text-transform: uppercase;
-  color: ${(props) => props.theme.sidebarText};
+  color: ${s("sidebarText")};
  letter-spacing: 0.04em;
  margin: 1em 12px 0.5em;
 `;
@@ -8,6 +8,7 @@ import breakpoint from "styled-components-breakpoint";
 import MenuIconWrapper from "../MenuIconWrapper";

 type Props = {
+  id?: string;
  onClick?: (event: React.SyntheticEvent) => void | Promise<void>;
  active?: boolean;
  selected?: boolean;
@@ -21,6 +22,7 @@ type Props = {
  level?: number;
  icon?: React.ReactElement;
  children?: React.ReactNode;
+  ref?: React.LegacyRef<HTMLButtonElement> | undefined;
 };

 const MenuItem = (
@@ -37,34 +39,26 @@ const MenuItem = (
  }: Props,
  ref: React.Ref<HTMLAnchorElement>
 ) => {
-  const handleClick = React.useCallback(
-    (ev) => {
-      if (onClick) {
+  const content = React.useCallback(
+    (props) => {
+      const handleClick = async (ev: React.MouseEvent) => {
+        hide?.();
+
+        if (onClick) {
+          ev.preventDefault();
+          await onClick(ev);
+        }
+      };
+
+      // 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 handleMouseDown = (ev: React.MouseEvent) => {
        ev.preventDefault();
-        onClick(ev);
-      }
+        ev.stopPropagation();
+      };

-      hide?.();
-    },
-    [onClick, hide]
-  );
-
-  // 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 handleMouseDown = React.useCallback((ev) => {
-    ev.preventDefault();
-    ev.stopPropagation();
-  }, []);
-
-  return (
-    <BaseMenuItem
-      onClick={disabled ? undefined : onClick}
-      disabled={disabled}
-      hide={hide}
-      {...rest}
-    >
-      {(props) => (
+      return (
        <MenuAnchor
          {...props}
          $active={active}
@@ -78,18 +72,26 @@ const MenuItem = (
        >
          {selected !== undefined && (
            <>
-              {selected ? <CheckmarkIcon color="currentColor" /> : <Spacer />}
+              {selected ? <CheckmarkIcon /> : <Spacer />}
              &nbsp;
            </>
          )}
-          {icon && (
-            <MenuIconWrapper>
-              {React.cloneElement(icon, { color: "currentColor" })}
-            </MenuIconWrapper>
-          )}
+          {icon && <MenuIconWrapper>{icon}</MenuIconWrapper>}
          {children}
        </MenuAnchor>
-      )}
+      );
+    },
+    [active, as, hide, icon, onClick, ref, children, selected]
+  );
+
+  return (
+    <BaseMenuItem
+      onClick={disabled ? undefined : onClick}
+      disabled={disabled}
+      hide={hide}
+      {...rest}
+    >
+      {content}
    </BaseMenuItem>
  );
 };
@@ -147,13 +149,13 @@ export const MenuAnchorCSS = css<MenuAnchorProps>`
    &:hover,
    &:focus,
    &.focus-visible {
-      color: ${props.theme.white};
-      background: ${props.dangerous ? props.theme.danger : props.theme.primary};
+      color: ${props.theme.accentText};
+      background: ${props.dangerous ? props.theme.danger : props.theme.accent};
      box-shadow: none;
      cursor: var(--pointer);

      svg {
-        fill: ${props.theme.white};
+        fill: ${props.theme.accentText};
      }
    }
  }
@@ -163,13 +165,13 @@ export const MenuAnchorCSS = css<MenuAnchorProps>`
    props.$active &&
    !props.disabled &&
    `
-      color: ${props.theme.white};
-      background: ${props.dangerous ? props.theme.danger : props.theme.primary};
+      color: ${props.theme.accentText};
+      background: ${props.dangerous ? props.theme.danger : props.theme.accent};
      box-shadow: none;
      cursor: var(--pointer);

      svg {
-        fill: ${props.theme.white};
+        fill: ${props.theme.accentText};
      }
    `}

@@ -24,8 +24,12 @@ type Positions = {
 export default function MouseSafeArea(props: {
  parentRef: React.RefObject<HTMLElement | null>;
 }) {
-  const { x = 0, y = 0, height: h = 0, width: w = 0 } =
-    props.parentRef.current?.getBoundingClientRect() || {};
+  const {
+    x = 0,
+    y = 0,
+    height: h = 0,
+    width: w = 0,
+  } = props.parentRef.current?.getBoundingClientRect() || {};
  const [mouseX, mouseY] = useMousePosition();
  const positions = { x, y, h, w, mouseX, mouseY };

@@ -5,19 +5,14 @@ import NudeButton from "~/components/NudeButton";

 type Props = React.ComponentProps<typeof MenuButton> & {
  className?: string;
-  iconColor?: string;
 };

-export default function OverflowMenuButton({
-  iconColor,
-  className,
-  ...rest
-}: Props) {
+export default function OverflowMenuButton({ className, ...rest }: Props) {
  return (
    <MenuButton {...rest}>
      {(props) => (
        <NudeButton className={className} {...props}>
-          <MoreIcon color={iconColor} />
+          <MoreIcon />
        </NudeButton>
      )}
    </MenuButton>
@@ -44,36 +44,35 @@ type SubMenuProps = MenuStateReturn & {
  title: React.ReactNode;
 };

-const SubMenu = React.forwardRef(
-  (
-    { templateItems, title, parentMenuState, ...rest }: SubMenuProps,
-    ref: React.LegacyRef<HTMLButtonElement>
-  ) => {
-    const { t } = useTranslation();
-    const theme = useTheme();
-    const menu = useMenuState();
+const SubMenu = React.forwardRef(function _Template(
+  { templateItems, title, parentMenuState, ...rest }: SubMenuProps,
+  ref: React.LegacyRef<HTMLButtonElement>
+) {
+  const { t } = useTranslation();
+  const theme = useTheme();
+  const menu = useMenuState();

-    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}
-        >
-          <MouseSafeArea parentRef={menu.unstable_popoverRef} />
-          <Template {...menu} items={templateItems} />
-        </ContextMenu>
-      </>
-    );
-  }
-);
+  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
@@ -134,6 +133,7 @@ function Template({ items, actions, context, ...menu }: Props) {
          return (
            <MenuItem
              as={Link}
+              id={`${item.title}-${index}`}
              to={item.to}
              key={index}
              disabled={item.disabled}
@@ -149,6 +149,7 @@ function Template({ items, actions, context, ...menu }: Props) {
        if (item.type === "link") {
          return (
            <MenuItem
+              id={`${item.title}-${index}`}
              href={item.href}
              key={index}
              disabled={item.disabled}
@@ -167,6 +168,7 @@ function Template({ items, actions, context, ...menu }: Props) {
          return (
            <MenuItem
              as="button"
+              id={`${item.title}-${index}`}
              onClick={item.onClick}
              disabled={item.disabled}
              selected={item.selected}
@@ -185,6 +187,7 @@ function Template({ items, actions, context, ...menu }: Props) {
            <BaseMenuItem
              key={index}
              as={SubMenu}
+              id={`${item.title}-${index}`}
              templateItems={item.items}
              parentMenuState={menu}
              title={<Title title={item.title} icon={item.icon} />}
@@ -4,7 +4,7 @@ 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 } from "@shared/styles";
+import { depths, s } from "@shared/styles";
 import Scrollable from "~/components/Scrollable";
 import useMenuContext from "~/hooks/useMenuContext";
 import useMenuHeight from "~/hooks/useMenuHeight";
@@ -37,15 +37,16 @@ export type Placement =
  | "left-start";

 type Props = MenuStateReturn & {
-  "aria-label": string;
+  "aria-label"?: string;
  /** The parent menu state if this is a submenu. */
-  parentMenuState?: MenuStateReturn;
+  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;
+  children?: React.ReactNode;
 };

 const ContextMenu: React.FC<Props> = ({
@@ -54,14 +55,18 @@ const ContextMenu: React.FC<Props> = ({
  onClose,
  parentMenuState,
  ...rest
-}) => {
+}: Props) => {
  const previousVisible = usePrevious(rest.visible);
-  const maxHeight = useMenuHeight(rest.visible, rest.unstable_disclosureRef);
+  const maxHeight = useMenuHeight({
+    visible: rest.visible,
+    elementRef: rest.unstable_disclosureRef,
+  });
  const backgroundRef = React.useRef<HTMLDivElement>(null);
  const { ui } = useStores();
  const { t } = useTranslation();
  const { setIsMenuOpen } = useMenuContext();
  const isMobile = useMobile();
+  const isSubMenu = !!parentMenuState;

  useUnmount(() => {
    setIsMenuOpen(false);
@@ -71,7 +76,7 @@ const ContextMenu: React.FC<Props> = ({
    if (rest.visible && !previousVisible) {
      onOpen?.();

-      if (!parentMenuState) {
+      if (!isSubMenu) {
        setIsMenuOpen(true);
      }
    }
@@ -79,7 +84,7 @@ const ContextMenu: React.FC<Props> = ({
    if (!rest.visible && previousVisible) {
      onClose?.();

-      if (!parentMenuState) {
+      if (!isSubMenu) {
        setIsMenuOpen(false);
      }
    }
@@ -90,7 +95,7 @@ const ContextMenu: React.FC<Props> = ({
    rest.visible,
    ui.sidebarCollapsed,
    setIsMenuOpen,
-    parentMenuState,
+    isSubMenu,
    t,
  ]);

@@ -99,13 +104,15 @@ const ContextMenu: React.FC<Props> = ({
  // https://github.com/ariakit/ariakit/issues/469
  React.useEffect(() => {
    const scrollElement = backgroundRef.current;
-    if (rest.visible && scrollElement) {
-      disableBodyScroll(scrollElement);
+    if (rest.visible && scrollElement && !isSubMenu) {
+      disableBodyScroll(scrollElement, {
+        reserveScrollBarGap: true,
+      });
    }
    return () => {
-      scrollElement && enableBodyScroll(scrollElement);
+      scrollElement && !isSubMenu && enableBodyScroll(scrollElement);
    };
-  }, [rest.visible]);
+  }, [isSubMenu, rest.visible]);

  // Perf win – don't render anything until the menu has been opened
  if (!rest.visible && !previousVisible) {
@@ -144,7 +151,7 @@ const ContextMenu: React.FC<Props> = ({
                  ref={backgroundRef}
                  hiddenScrollbars
                  style={
-                    maxHeight && topAnchor
+                    topAnchor
                      ? {
                          maxHeight,
                        }
@@ -171,7 +178,7 @@ export const Backdrop = styled.div`
  left: 0;
  right: 0;
  bottom: 0;
-  background: ${(props) => props.theme.backdrop};
+  background: ${s("backdrop")};
  z-index: ${depths.menu - 1};
 `;

@@ -203,7 +210,7 @@ export const Background = styled(Scrollable)<BackgroundProps>`
  animation: ${mobileContextMenu} 200ms ease;
  transform-origin: 50% 100%;
  max-width: 100%;
-  background: ${(props) => props.theme.menuBackground};
+  background: ${s("menuBackground")};
  border-radius: 6px;
  padding: 6px;
  min-width: 180px;
@@ -28,7 +28,7 @@ const DefaultCollectionInputSelect = ({
  const { showToast } = useToasts();

  React.useEffect(() => {
-    async function load() {
+    async function fetchData() {
      if (!collections.isLoaded && !fetching && !fetchError) {
        try {
          setFetching(true);
@@ -48,7 +48,7 @@ const DefaultCollectionInputSelect = ({
        }
      }
    }
-    load();
+    void fetchData();
  }, [showToast, fetchError, t, fetching, collections]);

  const options = React.useMemo(
@@ -73,7 +73,7 @@ const DefaultCollectionInputSelect = ({
            label: (
              <Flex align="center">
                <IconWrapper>
-                  <HomeIcon color="currentColor" />
+                  <HomeIcon />
                </IconWrapper>
                {t("Home")}
              </Flex>
@@ -30,7 +30,7 @@ export default function DesktopEventHandler() {
        action: {
          text: "Install now",
          onClick: () => {
-            Desktop.bridge?.restartAndInstall();
+            void Desktop.bridge?.restartAndInstall();
          },
        },
      });
@@ -1,4 +1,4 @@
-import { observer } from "mobx-react-lite";
+import { observer } from "mobx-react";
 import * as React from "react";
 import Guide from "~/components/Guide";
 import Modal from "~/components/Modal";
@@ -1,8 +1,9 @@
 import styled from "styled-components";
+import { s } from "@shared/styles";

 const Divider = styled.hr`
  border: 0;
-  border-bottom: 1px solid ${(props) => props.theme.divider};
+  border-bottom: 1px solid ${s("divider")};
  margin: 0;
  padding: 0;
 `;
@@ -3,14 +3,21 @@ import { ArchiveIcon, GoToIcon, ShapesIcon, TrashIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
+import type { NavigationNode } from "@shared/types";
 import Document from "~/models/Document";
 import Breadcrumb from "~/components/Breadcrumb";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import useStores from "~/hooks/useStores";
-import { MenuInternalLink, NavigationNode } from "~/types";
-import { collectionUrl } from "~/utils/routeHelpers";
+import { MenuInternalLink } from "~/types";
+import {
+  archivePath,
+  collectionPath,
+  templatesPath,
+  trashPath,
+} from "~/utils/routeHelpers";

 type Props = {
+  children?: React.ReactNode;
  document: Document;
  onlyText?: boolean;
 };
@@ -21,27 +28,27 @@ function useCategory(document: Document): MenuInternalLink | null {
  if (document.isDeleted) {
    return {
      type: "route",
-      icon: <TrashIcon color="currentColor" />,
+      icon: <TrashIcon />,
      title: t("Trash"),
-      to: "/trash",
+      to: trashPath(),
    };
  }

  if (document.isArchived) {
    return {
      type: "route",
-      icon: <ArchiveIcon color="currentColor" />,
+      icon: <ArchiveIcon />,
      title: t("Archive"),
-      to: "/archive",
+      to: archivePath(),
    };
  }

  if (document.isTemplate) {
    return {
      type: "route",
-      icon: <ShapesIcon color="currentColor" />,
+      icon: <ShapesIcon />,
      title: t("Templates"),
-      to: "/templates",
+      to: templatesPath(),
    };
  }

@@ -52,27 +59,29 @@ const DocumentBreadcrumb: React.FC<Props> = ({
  document,
  children,
  onlyText,
-}) => {
+}: Props) => {
  const { collections } = useStores();
  const { t } = useTranslation();
  const category = useCategory(document);
-  const collection = collections.get(document.collectionId);
+  const collection = document.collectionId
+    ? collections.get(document.collectionId)
+    : undefined;

-  let collectionNode: MenuInternalLink;
+  let collectionNode: MenuInternalLink | undefined;

  if (collection) {
    collectionNode = {
      type: "route",
      title: collection.name,
      icon: <CollectionIcon collection={collection} expanded />,
-      to: collectionUrl(collection.url),
+      to: collectionPath(collection.url),
    };
-  } else {
+  } else if (document.collectionId && !collection) {
    collectionNode = {
      type: "route",
      title: t("Deleted Collection"),
      icon: undefined,
-      to: collectionUrl("deleted-collection"),
+      to: collectionPath("deleted-collection"),
    };
  }

@@ -89,7 +98,9 @@ const DocumentBreadcrumb: React.FC<Props> = ({
      output.push(category);
    }

-    output.push(collectionNode);
+    if (collectionNode) {
+      output.push(collectionNode);
+    }

    path.forEach((node: NavigationNode) => {
      output.push({
@@ -119,7 +130,11 @@ const DocumentBreadcrumb: React.FC<Props> = ({
    );
  }

-  return <Breadcrumb items={items} children={children} highlightFirstItem />;
+  return (
+    <Breadcrumb items={items} highlightFirstItem>
+      {children}
+    </Breadcrumb>
+  );
 };

 const SmallSlash = styled(GoToIcon)`
@@ -128,7 +143,7 @@ const SmallSlash = styled(GoToIcon)`
  vertical-align: middle;
  flex-shrink: 0;

-  fill: ${(props) => props.theme.slate};
+  fill: ${(props) => props.theme.textTertiary};
  opacity: 0.5;
 `;

@@ -7,12 +7,14 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import styled, { useTheme } from "styled-components";
+import { s, ellipsis } from "@shared/styles";
 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 { hover } from "~/styles";
 import CollectionIcon from "./Icons/CollectionIcon";
 import EmojiIcon from "./Icons/EmojiIcon";
 import Squircle from "./Squircle";
@@ -35,7 +37,9 @@ function DocumentCard(props: Props) {
  const { collections } = useStores();
  const theme = useTheme();
  const { document, pin, canUpdatePin, isDraggable } = props;
-  const collection = collections.get(document.collectionId);
+  const collection = document.collectionId
+    ? collections.get(document.collectionId)
+    : undefined;
  const {
    attributes,
    listeners,
@@ -54,10 +58,10 @@ function DocumentCard(props: Props) {
  };

  const handleUnpin = React.useCallback(
-    (ev) => {
+    async (ev) => {
      ev.preventDefault();
      ev.stopPropagation();
-      pin?.delete();
+      await pin?.delete();
    },
    [pin]
  );
@@ -127,7 +131,7 @@ function DocumentCard(props: Props) {
                  : document.titleWithDefault}
              </Heading>
              <DocumentMeta size="xsmall">
-                <Clock color="currentColor" size={18} />
+                <Clock size={18} />
                <Time
                  dateTime={document.updatedAt}
                  tooltipDelay={500}
@@ -142,7 +146,7 @@ function DocumentCard(props: Props) {
              {!isDragging && pin && (
                <Tooltip tooltip={t("Unpin")}>
                  <PinButton onClick={handleUnpin} aria-label={t("Unpin")}>
-                    <CloseIcon color="currentColor" />
+                    <CloseIcon />
                  </PinButton>
                </Tooltip>
              )}
@@ -164,9 +168,9 @@ const AnimatePresence = styled(m.div)`
 `;

 const Fold = styled.svg`
-  fill: ${(props) => props.theme.background};
-  stroke: ${(props) => props.theme.inputBorder};
-  background: ${(props) => props.theme.background};
+  fill: ${s("background")};
+  stroke: ${s("inputBorder")};
+  background: ${s("background")};

  position: absolute;
  top: -1px;
@@ -174,11 +178,11 @@ const Fold = styled.svg`
 `;

 const PinButton = styled(NudeButton)`
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};

-  &:hover,
+  &:${hover},
  &:active {
-    color: ${(props) => props.theme.text};
+    color: ${s("text")};
  }
 `;

@@ -188,7 +192,7 @@ const Actions = styled(Flex)`
  right: ${(props) => (props.dir === "rtl" ? "auto" : "4px")};
  left: ${(props) => (props.dir === "rtl" ? "4px" : "auto")};
  opacity: 0;
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};

  // move actions above content
  z-index: 2;
@@ -206,7 +210,7 @@ const Reorderable = styled.div<{ $isDragging: boolean }>`
  z-index: ${(props) => (props.$isDragging ? 1 : "inherit")};
  pointer-events: ${(props) => (props.$isDragging ? "none" : "inherit")};

-  &:hover ${Actions} {
+  &: ${hover} ${Actions} {
    opacity: 1;
  }
 `;
@@ -217,14 +221,12 @@ const Content = styled(Flex)`
 `;

 const DocumentMeta = styled(Text)`
+  ${ellipsis()}
  display: flex;
  align-items: center;
  gap: 2px;
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};
  margin: 0 0 0 -2px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
 `;

 const DocumentLink = styled(Link)<{
@@ -237,9 +239,9 @@ const DocumentLink = styled(Link)<{
  height: 100%;
  border-radius: 8px;
  cursor: var(--pointer);
-  background: ${(props) => props.theme.background};
+  background: ${s("background")};
  transition: transform 50ms ease-in-out;
-  border: 1px solid ${(props) => props.theme.inputBorder};
+  border: 1px solid ${s("inputBorder")};
  border-bottom-width: 2px;
  border-right-width: 2px;

@@ -247,7 +249,7 @@ const DocumentLink = styled(Link)<{
    opacity: 0;
  }

-  &:hover,
+  &:${hover},
  &:active,
  &:focus,
  &:focus-within {
@@ -276,7 +278,7 @@ const Heading = styled.h3`
  max-height: 66px; // 3*line-height
  overflow: hidden;

-  color: ${(props) => props.theme.text};
+  color: ${s("text")};
  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
    Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 `;
@@ -0,0 +1,419 @@
+import FuzzySearch from "fuzzy-search";
+import { includes, difference, concat, filter, map, fill } from "lodash";
+import { observer } from "mobx-react";
+import { StarredIcon, DocumentIcon } from "outline-icons";
+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 "smooth-scroll-into-view-if-needed";
+import styled, { useTheme } from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { NavigationNode } from "@shared/types";
+import parseTitle from "@shared/utils/parseTitle";
+import DocumentExplorerNode from "~/components/DocumentExplorerNode";
+import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
+import Flex from "~/components/Flex";
+import CollectionIcon from "~/components/Icons/CollectionIcon";
+import EmojiIcon from "~/components/Icons/EmojiIcon";
+import { Outline } from "~/components/Input";
+import InputSearch from "~/components/InputSearch";
+import Text from "~/components/Text";
+import useMobile from "~/hooks/useMobile";
+import useStores from "~/hooks/useStores";
+import { isModKey } from "~/utils/keyboard";
+import { ancestors, descendants } from "~/utils/tree";
+
+type Props = {
+  /** Action taken upon submission of selected item, could be publish, move etc. */
+  onSubmit: () => void;
+
+  /** A side-effect of item selection */
+  onSelect: (item: NavigationNode | null) => void;
+
+  /** Items to be shown in explorer */
+  items: NavigationNode[];
+};
+
+function DocumentExplorer({ onSubmit, onSelect, items }: Props) {
+  const isMobile = useMobile();
+  const { collections, documents } = useStores();
+  const { t } = useTranslation();
+  const theme = useTheme();
+
+  const [searchTerm, setSearchTerm] = React.useState<string>();
+  const [selectedNode, selectNode] = React.useState<NavigationNode | null>(
+    null
+  );
+  const [initialScrollOffset, setInitialScrollOffset] =
+    React.useState<number>(0);
+  const [activeNode, setActiveNode] = React.useState<number>(0);
+  const [expandedNodes, setExpandedNodes] = React.useState<string[]>([]);
+  const [itemRefs, setItemRefs] = React.useState<
+    React.RefObject<HTMLSpanElement>[]
+  >([]);
+
+  const inputSearchRef = React.useRef<HTMLInputElement | HTMLTextAreaElement>(
+    null
+  );
+  const listRef = React.useRef<List<NavigationNode[]>>(null);
+
+  const VERTICAL_PADDING = 6;
+  const HORIZONTAL_PADDING = 24;
+
+  const searchIndex = React.useMemo(
+    () =>
+      new FuzzySearch(items, ["title"], {
+        caseSensitive: false,
+      }),
+    [items]
+  );
+
+  React.useEffect(() => {
+    if (searchTerm) {
+      selectNode(null);
+      setExpandedNodes([]);
+    }
+    setActiveNode(0);
+  }, [searchTerm]);
+
+  React.useEffect(() => {
+    setItemRefs((itemRefs) =>
+      map(
+        fill(Array(items.length), 0),
+        (_, i) => itemRefs[i] || React.createRef()
+      )
+    );
+  }, [items.length]);
+
+  React.useEffect(() => {
+    onSelect(selectedNode);
+  }, [selectedNode, onSelect]);
+
+  function getNodes() {
+    function includeDescendants(item: NavigationNode): NavigationNode[] {
+      return expandedNodes.includes(item.id)
+        ? [item, ...descendants(item, 1).flatMap(includeDescendants)]
+        : [item];
+    }
+
+    return searchTerm
+      ? searchIndex.search(searchTerm)
+      : items
+          .filter((item) => item.type === "collection")
+          .flatMap(includeDescendants);
+  }
+
+  const nodes = getNodes();
+
+  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);
+  };
+
+  const isExpanded = (node: number) => includes(expandedNodes, nodes[node].id);
+
+  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;
+      return itemsHeight < Number(height) ? 0 : scrollOffset;
+    }
+    return 0;
+  };
+
+  const collapse = (node: number) => {
+    const descendantIds = descendants(nodes[node]).map((des) => des.id);
+    setExpandedNodes(
+      difference(expandedNodes, [...descendantIds, nodes[node].id])
+    );
+
+    // remove children
+    const newNodes = filter(nodes, (node) => !includes(descendantIds, node.id));
+    const scrollOffset = calculateInitialScrollOffset(newNodes.length);
+    setInitialScrollOffset(scrollOffset);
+  };
+
+  const expand = (node: number) => {
+    setExpandedNodes(concat(expandedNodes, nodes[node].id));
+
+    // add children
+    const newNodes = nodes.slice();
+    newNodes.splice(node + 1, 0, ...descendants(nodes[node], 1));
+    const scrollOffset = calculateInitialScrollOffset(newNodes.length);
+    setInitialScrollOffset(scrollOffset);
+  };
+
+  React.useEffect(() => {
+    collections.orderedData
+      .filter(
+        (collection) => expandedNodes.includes(collection.id) || searchTerm
+      )
+      .forEach((collection) => {
+        void collection.fetchDocuments();
+      });
+  }, [collections, expandedNodes, searchTerm]);
+
+  const isSelected = (node: number) => {
+    if (!selectedNode) {
+      return false;
+    }
+    const selectedNodeId = selectedNode.id;
+    const nodeId = nodes[node].id;
+
+    return selectedNodeId === nodeId;
+  };
+
+  const hasChildren = (node: number) =>
+    nodes[node].children.length > 0 || nodes[node].type === "collection";
+
+  const toggleCollapse = (node: number) => {
+    if (!hasChildren(node)) {
+      return;
+    }
+    if (isExpanded(node)) {
+      collapse(node);
+    } else {
+      expand(node);
+    }
+  };
+
+  const toggleSelect = (node: number) => {
+    if (isSelected(node)) {
+      selectNode(null);
+    } else {
+      selectNode(nodes[node]);
+    }
+  };
+
+  const ListItem = ({
+    index,
+    data,
+    style,
+  }: {
+    index: number;
+    data: NavigationNode[];
+    style: React.CSSProperties;
+  }) => {
+    const node = data[index];
+    const isCollection = node.type === "collection";
+    let icon, title, path;
+
+    if (isCollection) {
+      const col = collections.get(node.collectionId as string);
+      icon = col && (
+        <CollectionIcon collection={col} expanded={isExpanded(index)} />
+      );
+      title = node.title;
+    } else {
+      const doc = documents.get(node.id);
+      const { strippedTitle, emoji } = parseTitle(node.title);
+      title = strippedTitle;
+
+      if (emoji) {
+        icon = <EmojiIcon emoji={emoji} />;
+      } else if (doc?.isStarred) {
+        icon = <StarredIcon color={theme.yellow} />;
+      } else {
+        icon = <DocumentIcon color={theme.textSecondary} />;
+      }
+
+      path = ancestors(node)
+        .map((a) => parseTitle(a.title).strippedTitle)
+        .join(" / ");
+    }
+
+    return searchTerm ? (
+      <DocumentExplorerSearchResult
+        selected={isSelected(index)}
+        active={activeNode === index}
+        style={{
+          ...style,
+          top: (style.top as number) + VERTICAL_PADDING,
+          left: (style.left as number) + HORIZONTAL_PADDING,
+          width: `calc(${style.width} - ${HORIZONTAL_PADDING * 2}px)`,
+        }}
+        onPointerMove={() => setActiveNode(index)}
+        onClick={() => toggleSelect(index)}
+        icon={icon}
+        title={title}
+        path={path}
+      />
+    ) : (
+      <DocumentExplorerNode
+        style={{
+          ...style,
+          top: (style.top as number) + VERTICAL_PADDING,
+          left: (style.left as number) + HORIZONTAL_PADDING,
+          width: `calc(${style.width} - ${HORIZONTAL_PADDING * 2}px)`,
+        }}
+        onPointerMove={() => setActiveNode(index)}
+        onClick={() => toggleSelect(index)}
+        onDisclosureClick={(ev) => {
+          ev.stopPropagation();
+          toggleCollapse(index);
+        }}
+        selected={isSelected(index)}
+        active={activeNode === index}
+        expanded={isExpanded(index)}
+        icon={icon}
+        title={title}
+        depth={node.depth as number}
+        hasChildren={hasChildren(index)}
+        ref={itemRefs[index]}
+      />
+    );
+  };
+
+  const focusSearchInput = () => {
+    inputSearchRef.current?.focus();
+  };
+
+  const next = () => Math.min(activeNode + 1, nodes.length - 1);
+
+  const prev = () => Math.max(activeNode - 1, 0);
+
+  const handleKeyDown = (ev: React.KeyboardEvent<HTMLDivElement>) => {
+    switch (ev.key) {
+      case "ArrowDown": {
+        ev.preventDefault();
+        ev.stopPropagation();
+        setActiveNode(next());
+        scrollNodeIntoView(next());
+        break;
+      }
+      case "ArrowUp": {
+        ev.preventDefault();
+        ev.stopPropagation();
+        if (activeNode === 0) {
+          focusSearchInput();
+        } else {
+          setActiveNode(prev());
+          scrollNodeIntoView(prev());
+        }
+        break;
+      }
+      case "ArrowLeft": {
+        if (!searchTerm && isExpanded(activeNode)) {
+          toggleCollapse(activeNode);
+        }
+        break;
+      }
+      case "ArrowRight": {
+        if (!searchTerm) {
+          toggleCollapse(activeNode);
+          // let the nodes re-render first and then scroll
+          setTimeout(() => scrollNodeIntoView(activeNode), 0);
+        }
+        break;
+      }
+      case "Enter": {
+        if (isModKey(ev)) {
+          onSubmit();
+        } else {
+          toggleSelect(activeNode);
+        }
+        break;
+      }
+    }
+  };
+
+  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={`${t("Search collections & documents")}…`}
+        autoFocus
+      />
+      <ListContainer>
+        {nodes.length ? (
+          <AutoSizer>
+            {({ width, height }: { width: number; height: number }) => (
+              <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}
+                </List>
+              </Flex>
+            )}
+          </AutoSizer>
+        ) : (
+          <FlexContainer>
+            <Text type="secondary">{t("No results found")}.</Text>
+          </FlexContainer>
+        )}
+      </ListContainer>
+    </Container>
+  );
+}
+
+const Container = styled.div``;
+
+const FlexContainer = styled(Flex)`
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+`;
+
+const ListSearch = styled(InputSearch)`
+  ${Outline} {
+    border-radius: 16px;
+  }
+  margin-bottom: 4px;
+  padding-left: 24px;
+  padding-right: 24px;
+`;
+
+const ListContainer = styled.div`
+  height: 65vh;
+
+  ${breakpoint("tablet")`
+    height: 40vh;
+  `}
+`;
+
+export default observer(DocumentExplorer);
@@ -0,0 +1,133 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import styled from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { s, ellipsis } from "@shared/styles";
+import Flex from "~/components/Flex";
+import Disclosure from "~/components/Sidebar/components/Disclosure";
+import Text from "~/components/Text";
+
+type Props = {
+  selected: boolean;
+  active: boolean;
+  style: React.CSSProperties;
+  expanded: boolean;
+  icon?: React.ReactNode;
+  title: string;
+  depth: number;
+  hasChildren: boolean;
+
+  onDisclosureClick: (ev: React.MouseEvent) => void;
+  onPointerMove: (ev: React.MouseEvent) => void;
+  onClick: (ev: React.MouseEvent) => void;
+};
+
+function DocumentExplorerNode(
+  {
+    selected,
+    active,
+    style,
+    expanded,
+    icon,
+    title,
+    depth,
+    hasChildren,
+    onDisclosureClick,
+    onPointerMove,
+    onClick,
+  }: Props,
+  ref: React.RefObject<HTMLSpanElement>
+) {
+  const { t } = useTranslation();
+  const OFFSET = 12;
+  const ICON_SIZE = 24;
+
+  const width = depth ? depth * ICON_SIZE + OFFSET : ICON_SIZE;
+
+  return (
+    <Node
+      ref={ref}
+      selected={selected}
+      active={active}
+      onClick={onClick}
+      style={style}
+      onPointerMove={onPointerMove}
+      role="option"
+    >
+      <Spacer width={width}>
+        {hasChildren && (
+          <StyledDisclosure
+            expanded={expanded}
+            onClick={onDisclosureClick}
+            tabIndex={-1}
+          />
+        )}
+      </Spacer>
+      {icon}
+      <Title>{title || t("Untitled")}</Title>
+    </Node>
+  );
+}
+
+const Title = styled(Text)`
+  ${ellipsis()}
+  margin: 0 4px 0 4px;
+  color: inherit;
+`;
+
+const StyledDisclosure = styled(Disclosure)`
+  position: relative;
+  left: auto;
+  margin-top: 2px;
+`;
+
+const Spacer = styled(Flex)<{ width: number }>`
+  flex-direction: row-reverse;
+  flex-shrink: 0;
+  width: ${(props) => props.width}px;
+`;
+
+export const Node = styled.span<{
+  active: boolean;
+  selected: boolean;
+  style: React.CSSProperties;
+}>`
+  display: flex;
+  user-select: none;
+  overflow: hidden;
+  font-size: 16px;
+  width: ${(props) => props.style.width};
+  color: ${s("text")};
+  cursor: var(--pointer);
+  padding: 12px;
+  border-radius: 6px;
+  background: ${(props) =>
+    !props.selected && props.active && props.theme.listItemHoverBackground};
+
+  svg {
+    flex-shrink: 0;
+  }
+
+  &:focus {
+    outline: none;
+  }
+
+  ${(props) =>
+    props.selected &&
+    `
+      background: ${props.theme.accent};
+      color: ${props.theme.white};
+
+      svg {
+        fill: ${props.theme.white};
+      }
+    `}
+
+  ${breakpoint("tablet")`
+    padding: 4px;
+    font-size: 15px;
+  `}
+`;
+
+export default observer(React.forwardRef(DocumentExplorerNode));
@@ -0,0 +1,84 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import scrollIntoView from "smooth-scroll-into-view-if-needed";
+import styled from "styled-components";
+import { ellipsis } from "@shared/styles";
+import { Node as SearchResult } from "~/components/DocumentExplorerNode";
+import Flex from "~/components/Flex";
+import Text from "~/components/Text";
+
+type Props = {
+  selected: boolean;
+  active: boolean;
+  style: React.CSSProperties;
+  icon?: React.ReactNode;
+  title: string;
+  path?: string;
+
+  onPointerMove: (ev: React.MouseEvent) => void;
+  onClick: (ev: React.MouseEvent) => void;
+};
+
+function DocumentExplorerSearchResult({
+  selected,
+  active,
+  style,
+  icon,
+  title,
+  path,
+  onPointerMove,
+  onClick,
+}: 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"
+    >
+      {icon}
+      <Flex>
+        <Title>{title || t("Untitled")}</Title>
+        <Path $selected={selected} size="xsmall">
+          {path}
+        </Path>
+      </Flex>
+    </SearchResult>
+  );
+}
+
+const Title = styled(Text)`
+  flex-shrink: 0;
+  white-space: nowrap;
+  margin: 0 4px 0 4px;
+  color: inherit;
+`;
+
+const Path = styled(Text)<{ $selected: boolean }>`
+  ${ellipsis()}
+  padding-top: 2px;
+  margin: 0 4px 0 8px;
+  color: ${(props) =>
+    props.$selected ? props.theme.white50 : props.theme.textTertiary};
+`;
+
+export default observer(DocumentExplorerSearchResult);
@@ -6,6 +6,7 @@ import { Link } from "react-router-dom";
 import { CompositeStateReturn, CompositeItem } from "reakit/Composite";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import { s } from "@shared/styles";
 import Document from "~/models/Document";
 import Badge from "~/components/Badge";
 import Button from "~/components/Button";
@@ -177,11 +178,11 @@ const Actions = styled(EventBoundary)`
  margin: 8px;
  flex-shrink: 0;
  flex-grow: 0;
+  color: ${s("textSecondary")};

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

@@ -223,7 +224,7 @@ const DocumentLink = styled(Link)<{
  &:active,
  &:focus,
  &:focus-within {
-    background: ${(props) => props.theme.listItemHoverBackground};
+    background: ${s("listItemHoverBackground")};

    ${Actions} {
      opacity: 1;
@@ -232,7 +233,7 @@ const DocumentLink = styled(Link)<{
    ${AnimatedStar} {
      opacity: 0.5;

-      &:hover {
+      &:${hover} {
        opacity: 1;
      }
    }
@@ -241,7 +242,7 @@ const DocumentLink = styled(Link)<{
  ${(props) =>
    props.$menuOpen &&
    css`
-      background: ${(props) => props.theme.listItemHoverBackground};
+      background: ${s("listItemHoverBackground")};

      ${Actions} {
        opacity: 1;
@@ -257,12 +258,10 @@ const Heading = styled.h3<{ rtl?: boolean }>`
  display: flex;
  justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
  align-items: center;
-  height: 24px;
  margin-top: 0;
  margin-bottom: 0.25em;
-  overflow: hidden;
  white-space: nowrap;
-  color: ${(props) => props.theme.text};
+  color: ${s("text")};
  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
    Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 `;
@@ -280,7 +279,7 @@ const Title = styled(Highlight)`

 const ResultContext = styled(Highlight)`
  display: block;
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};
  font-size: 14px;
  margin-top: -0.25em;
  margin-bottom: 0.25em;
@@ -4,7 +4,9 @@ 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 Document from "~/models/Document";
+import Revision from "~/models/Revision";
 import DocumentBreadcrumb from "~/components/DocumentBreadcrumb";
 import DocumentTasks from "~/components/DocumentTasks";
 import Flex from "~/components/Flex";
@@ -13,11 +15,13 @@ import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";

 type Props = {
+  children?: React.ReactNode;
  showCollection?: boolean;
  showPublished?: boolean;
  showLastViewed?: boolean;
  showParentDocuments?: boolean;
  document: Document;
+  revision?: Revision;
  replace?: boolean;
  to?: LocationDescriptor;
 };
@@ -28,11 +32,12 @@ const DocumentMeta: React.FC<Props> = ({
  showLastViewed,
  showParentDocuments,
  document,
+  revision,
  children,
  replace,
  to,
  ...rest
-}) => {
+}: Props) => {
  const { t } = useTranslation();
  const { collections } = useStores();
  const user = useCurrentUser();
@@ -56,12 +61,23 @@ const DocumentMeta: React.FC<Props> = ({
    return null;
  }

-  const collection = collections.get(document.collectionId);
+  const collection = document.collectionId
+    ? collections.get(document.collectionId)
+    : undefined;
  const lastUpdatedByCurrentUser = user.id === updatedBy.id;
  const userName = updatedBy.name;
  let content;

-  if (deletedAt) {
+  if (revision) {
+    content = (
+      <span>
+        {revision.createdBy?.id === user.id
+          ? t("You updated")
+          : t("{{ userName }} updated", { userName })}{" "}
+        <Time dateTime={revision.createdAt} addSuffix />
+      </span>
+    );
+  } else if (deletedAt) {
    content = (
      <span>
        {lastUpdatedByCurrentUser
@@ -184,7 +200,7 @@ const DocumentMeta: React.FC<Props> = ({

 const Container = styled(Flex)<{ rtl?: boolean }>`
  justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};
  font-size: 13px;
  white-space: nowrap;
  overflow: hidden;
@@ -192,8 +208,7 @@ const Container = styled(Flex)<{ rtl?: boolean }>`
 `;

 const Viewed = styled.span`
-  text-overflow: ellipsis;
-  overflow: hidden;
+  ${ellipsis()}
 `;

 const Modified = styled.span<{ highlight?: boolean }>`
@@ -44,7 +44,7 @@ function DocumentTasks({ document }: Props) {
    <>
      {completed === total ? (
        <Done
-          color={theme.primary}
+          color={theme.accent}
          size={20}
          $animated={done && previousDone === false}
        />
@@ -6,7 +6,7 @@ import { useHistory } from "react-router-dom";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import useStores from "~/hooks/useStores";
 import useToasts from "~/hooks/useToasts";
-import { documentUrl } from "~/utils/routeHelpers";
+import { documentPath } from "~/utils/routeHelpers";

 type Props = {
  documentId: string;
@@ -23,7 +23,7 @@ function DocumentTemplatizeDialog({ documentId }: Props) {
  const handleSubmit = React.useCallback(async () => {
    const template = await document?.templatize();
    if (template) {
-      history.push(documentUrl(template));
+      history.push(documentPath(template));
      showToast(t("Template created, go ahead and customize it"), {
        type: "info",
      });
@@ -1,8 +1,8 @@
-import { formatDistanceToNow } from "date-fns";
 import { sortBy } from "lodash";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { dateToRelative } from "@shared/utils/date";
 import Document from "~/models/Document";
 import User from "~/models/User";
 import Avatar from "~/components/Avatar";
@@ -33,9 +33,10 @@ function DocumentViews({ document, isOpen }: Props) {
    documentViews,
    (view) => !presentIds.includes(view.user.id)
  );
-  const users = React.useMemo(() => sortedViews.map((v) => v.user), [
-    sortedViews,
-  ]);
+  const users = React.useMemo(
+    () => sortedViews.map((v) => v.user),
+    [sortedViews]
+  );

  return (
    <>
@@ -52,7 +53,7 @@ function DocumentViews({ document, isOpen }: Props) {
                ? t("Currently editing")
                : t("Currently viewing")
              : t("Viewed {{ timeAgo }} ago", {
-                  timeAgo: formatDistanceToNow(
+                  timeAgo: dateToRelative(
                    view ? Date.parse(view.lastViewedAt) : new Date()
                  ),
                });
@@ -0,0 +1,21 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+import Collection from "~/models/Collection";
+
+type Props = {
+  enabled: boolean;
+  collection: Collection;
+  children: React.ReactNode;
+};
+
+function DocumentsLoader({ collection, enabled, children }: Props) {
+  React.useEffect(() => {
+    if (enabled) {
+      void collection.fetchDocuments();
+    }
+  }, [collection, enabled]);
+
+  return <>{children}</>;
+}
+
+export default observer(DocumentsLoader);
@@ -1,14 +1,15 @@
-import { formatDistanceToNow } from "date-fns";
-import { deburr, sortBy } from "lodash";
+import { deburr, difference, sortBy } from "lodash";
 import { observer } from "mobx-react";
 import { DOMParser as ProsemirrorDOMParser } from "prosemirror-model";
 import { TextSelection } from "prosemirror-state";
 import * as React from "react";
 import { mergeRefs } from "react-merge-refs";
+import { useHistory } from "react-router-dom";
 import { Optional } from "utility-types";
 import insertFiles from "@shared/editor/commands/insertFiles";
-import { Heading } from "@shared/editor/lib/getHeadings";
 import { AttachmentPreset } from "@shared/types";
+import { Heading } from "@shared/utils/ProsemirrorHelper";
+import { dateLocale, dateToRelative } from "@shared/utils/date";
 import { getDataTransferFiles } from "@shared/utils/files";
 import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
 import { isInternalUrl } from "@shared/utils/urls";
@@ -22,21 +23,16 @@ import useDictionary from "~/hooks/useDictionary";
 import useEmbeds from "~/hooks/useEmbeds";
 import useStores from "~/hooks/useStores";
 import useToasts from "~/hooks/useToasts";
+import useUserLocale from "~/hooks/useUserLocale";
 import { NotFoundError } from "~/utils/errors";
 import { uploadFile } from "~/utils/files";
-import history from "~/utils/history";
 import { isModKey } from "~/utils/keyboard";
+import lazyWithRetry from "~/utils/lazyWithRetry";
 import { sharedDocumentPath } from "~/utils/routeHelpers";
 import { isHash } from "~/utils/urls";
 import DocumentBreadcrumb from "./DocumentBreadcrumb";

-const LazyLoadedEditor = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "preload-shared-editor" */
-      "~/editor"
-    )
-);
+const LazyLoadedEditor = lazyWithRetry(() => import("~/editor"));

 export type Props = Optional<
  EditorProps,
@@ -53,31 +49,39 @@ export type Props = Optional<
  onHeadingsChange?: (headings: Heading[]) => void;
  onSynced?: () => Promise<void>;
  onPublish?: (event: React.MouseEvent) => any;
-  bottomPadding?: string;
+  editorStyle?: React.CSSProperties;
 };

 function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
-  const { id, shareId, onChange, onHeadingsChange } = props;
-  const { documents, auth } = useStores();
+  const {
+    id,
+    shareId,
+    onChange,
+    onHeadingsChange,
+    onCreateCommentMark,
+    onDeleteCommentMark,
+  } = props;
+  const userLocale = useUserLocale();
+  const locale = dateLocale(userLocale);
+  const { auth, comments, documents } = useStores();
  const { showToast } = useToasts();
  const dictionary = useDictionary();
  const embeds = useEmbeds(!shareId);
+  const history = useHistory();
  const localRef = React.useRef<SharedEditor>();
  const preferences = auth.user?.preferences;
  const previousHeadings = React.useRef<Heading[] | null>(null);
+  const [activeLinkElement, setActiveLink] =
+    React.useState<HTMLAnchorElement | null>(null);
+  const previousCommentIds = React.useRef<string[]>();

-  const [
-    activeLinkEvent,
-    setActiveLinkEvent,
-  ] = React.useState<MouseEvent | null>(null);
-
-  const handleLinkActive = React.useCallback((event: MouseEvent) => {
-    setActiveLinkEvent(event);
+  const handleLinkActive = React.useCallback((element: HTMLAnchorElement) => {
+    setActiveLink(element);
    return false;
  }, []);

  const handleLinkInactive = React.useCallback(() => {
-    setActiveLinkEvent(null);
+    setActiveLink(null);
  }, []);

  const handleSearchLink = React.useCallback(
@@ -91,8 +95,10 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {

        try {
          const document = await documents.fetch(slug);
-          const time = formatDistanceToNow(Date.parse(document.updatedAt), {
+          const time = dateToRelative(Date.parse(document.updatedAt), {
            addSuffix: true,
+            shorten: true,
+            locale,
          });

          return [
@@ -114,13 +120,11 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
      const results = await documents.searchTitles(term);

      return sortBy(
-        results.map((document: Document) => {
-          return {
-            title: document.title,
-            subtitle: <DocumentBreadcrumb document={document} onlyText />,
-            url: document.url,
-          };
-        }),
+        results.map((document: Document) => ({
+          title: document.title,
+          subtitle: <DocumentBreadcrumb document={document} onlyText />,
+          url: document.url,
+        })),
        (document) =>
          deburr(document.title)
            .toLowerCase()
@@ -132,7 +136,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
    [documents]
  );

-  const onUploadFile = React.useCallback(
+  const handleUploadFile = React.useCallback(
    async (file: File) => {
      const result = await uploadFile(file, {
        documentId: id,
@@ -143,7 +147,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
    [id]
  );

-  const onClickLink = React.useCallback(
+  const handleClickLink = React.useCallback(
    (href: string, event: MouseEvent) => {
      // on page hash
      if (isHash(href)) {
@@ -165,6 +169,12 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
          }
        }

+        // Link to our own API should be opened in a new tab, not in the app
+        if (navigateTo.startsWith("/api/")) {
+          window.open(href, "_blank");
+          return;
+        }
+
        // If we're navigating to an internal document link then prepend the
        // share route to the URL so that the document is loaded in context
        if (shareId && navigateTo.includes("/doc/")) {
@@ -176,7 +186,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
        window.open(href, "_blank");
      }
    },
-    [shareId]
+    [history, shareId]
  );

  const focusAtEnd = React.useCallback(() => {
@@ -224,7 +234,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
      );

      insertFiles(view, event, pos, files, {
-        uploadFile: onUploadFile,
+        uploadFile: handleUploadFile,
        onFileUploadStart: props.onFileUploadStart,
        onFileUploadStop: props.onFileUploadStop,
        onShowToast: showToast,
@@ -237,7 +247,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
      props.onFileUploadStart,
      props.onFileUploadStop,
      dictionary,
-      onUploadFile,
+      handleUploadFile,
      showToast,
    ]
  );
@@ -266,53 +276,85 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
    }
  }, [localRef, onHeadingsChange]);

+  const updateComments = React.useCallback(() => {
+    if (onCreateCommentMark && onDeleteCommentMark) {
+      const commentMarks = localRef.current?.getComments();
+      const commentIds = comments.orderedData.map((c) => c.id);
+      const commentMarkIds = commentMarks?.map((c) => c.id);
+      const newCommentIds = difference(
+        commentMarkIds,
+        previousCommentIds.current ?? [],
+        commentIds
+      );
+
+      newCommentIds.forEach((commentId) => {
+        const mark = commentMarks?.find((c) => c.id === commentId);
+        if (mark) {
+          onCreateCommentMark(mark.id, mark.userId);
+        }
+      });
+
+      const removedCommentIds = difference(
+        previousCommentIds.current ?? [],
+        commentMarkIds ?? []
+      );
+
+      removedCommentIds.forEach((commentId) => {
+        onDeleteCommentMark(commentId);
+      });
+
+      previousCommentIds.current = commentMarkIds;
+    }
+  }, [onCreateCommentMark, onDeleteCommentMark, comments.orderedData]);
+
  const handleChange = React.useCallback(
    (event) => {
      onChange?.(event);
      updateHeadings();
+      updateComments();
    },
-    [onChange, updateHeadings]
+    [onChange, updateComments, updateHeadings]
  );

  const handleRefChanged = React.useCallback(
    (node: SharedEditor | null) => {
      if (node) {
        updateHeadings();
+        updateComments();
      }
    },
-    [updateHeadings]
+    [updateComments, updateHeadings]
  );

  return (
-    <ErrorBoundary reloadOnChunkMissing>
+    <ErrorBoundary component="div" reloadOnChunkMissing>
      <>
        <LazyLoadedEditor
          ref={mergeRefs([ref, localRef, handleRefChanged])}
-          uploadFile={onUploadFile}
+          uploadFile={handleUploadFile}
          onShowToast={showToast}
          embeds={embeds}
          userPreferences={preferences}
          dictionary={dictionary}
          {...props}
          onHoverLink={handleLinkActive}
-          onClickLink={onClickLink}
+          onClickLink={handleClickLink}
          onSearchLink={handleSearchLink}
          onChange={handleChange}
          placeholder={props.placeholder || ""}
          defaultValue={props.defaultValue || ""}
        />
-        {props.bottomPadding && !props.readOnly && (
+        {props.editorStyle?.paddingBottom && !props.readOnly && (
          <ClickablePadding
            onClick={focusAtEnd}
            onDrop={handleDrop}
            onDragOver={handleDragOver}
-            minHeight={props.bottomPadding}
+            minHeight={props.editorStyle.paddingBottom}
          />
        )}
-        {activeLinkEvent && !shareId && (
+        {activeLinkElement && !shareId && (
          <HoverPreview
-            node={activeLinkEvent.target as HTMLAnchorElement}
-            event={activeLinkEvent}
+            element={activeLinkElement}
            onClose={handleLinkInactive}
          />
        )}
@@ -1,7 +1,8 @@
 import styled from "styled-components";
+import { s } from "@shared/styles";

 const Empty = styled.p`
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};
  user-select: none;
 `;

@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { withTranslation, Trans, WithTranslation } from "react-i18next";
 import styled from "styled-components";
-import { githubIssuesUrl } from "@shared/utils/urlHelpers";
+import { s } from "@shared/styles";
+import { githubIssuesUrl, feedbackUrl } from "@shared/utils/urlHelpers";
 import Button from "~/components/Button";
 import CenteredContent from "~/components/CenteredContent";
 import PageTitle from "~/components/PageTitle";
@@ -13,7 +14,12 @@ import Logger from "~/utils/Logger";
 import isCloudHosted from "~/utils/isCloudHosted";

 type Props = WithTranslation & {
+  /** Whether to reload the page if a chunk fails to load. */
  reloadOnChunkMissing?: boolean;
+  /** Whether to show a title heading. */
+  showTitle?: boolean;
+  /** The wrapping component to use. */
+  component?: React.ComponentType | string;
 };

@observer
@@ -30,7 +36,7 @@ class ErrorBoundary extends React.Component<Props> {
    if (
      this.props.reloadOnChunkMissing &&
      error.message &&
-      error.message.match(/chunk/)
+      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
@@ -51,24 +57,31 @@ class ErrorBoundary extends React.Component<Props> {
  };

  handleReportBug = () => {
-    window.open(githubIssuesUrl());
+    window.open(isCloudHosted ? feedbackUrl() : githubIssuesUrl());
  };

  render() {
-    const { t } = this.props;
+    const { t, component: Component = CenteredContent, showTitle } = this.props;

    if (this.error) {
      const error = this.error;
      const isReported = !!env.SENTRY_DSN && isCloudHosted;
-      const isChunkError = this.error.message.match(/chunk/);
+      const isChunkError = [
+        "module script failed",
+        "dynamically imported module",
+      ].some((msg) => this.error?.message?.includes(msg));

      if (isChunkError) {
        return (
-          <CenteredContent>
-            <PageTitle title={t("Module failed to load")} />
-            <h1>
-              <Trans>Loading Failed</Trans>
-            </h1>
+          <Component>
+            {showTitle && (
+              <>
+                <PageTitle title={t("Module failed to load")} />
+                <h1>
+                  <Trans>Loading Failed</Trans>
+                </h1>
+              </>
+            )}
            <Text type="secondary">
              <Trans>
                Sorry, part of the application failed to load. This may be
@@ -79,16 +92,20 @@ class ErrorBoundary extends React.Component<Props> {
            <p>
              <Button onClick={this.handleReload}>{t("Reload")}</Button>
            </p>
-          </CenteredContent>
+          </Component>
        );
      }

      return (
-        <CenteredContent>
-          <PageTitle title={t("Something Unexpected Happened")} />
-          <h1>
-            <Trans>Something Unexpected Happened</Trans>
-          </h1>
+        <Component>
+          {showTitle && (
+            <>
+              <PageTitle title={t("Something Unexpected Happened")} />
+              <h1>
+                <Trans>Something Unexpected Happened</Trans>
+              </h1>
+            </>
+          )}
          <Text type="secondary">
            <Trans
              defaults="Sorry, an unrecoverable error occurred{{notified}}. Please try reloading the page, it may have been a temporary glitch."
@@ -112,7 +129,7 @@ class ErrorBoundary extends React.Component<Props> {
              </Button>
            )}
          </p>
-        </CenteredContent>
+        </Component>
      );
    }

@@ -121,7 +138,7 @@ class ErrorBoundary extends React.Component<Props> {
 }

 const Pre = styled.pre`
-  background: ${(props) => props.theme.secondaryBackground};
+  background: ${s("secondaryBackground")};
  padding: 16px;
  border-radius: 4px;
  font-size: 12px;
@@ -1,10 +1,11 @@
 import * as React from "react";

 type Props = {
+  children?: React.ReactNode;
  className?: string;
 };

-const EventBoundary: React.FC<Props> = ({ children, className }) => {
+const EventBoundary: React.FC<Props> = ({ children, className }: Props) => {
  const handleClick = React.useCallback((event: React.SyntheticEvent) => {
    event.preventDefault();
    event.stopPropagation();
@@ -7,13 +7,13 @@ import {
  PublishIcon,
  MoveIcon,
  UnpublishIcon,
-  LightningIcon,
 } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation } from "react-router-dom";
 import { CompositeStateReturn } from "reakit/Composite";
 import styled, { css } from "styled-components";
+import { s } from "@shared/styles";
 import Document from "~/models/Document";
 import Event from "~/models/Event";
 import Avatar from "~/components/Avatar";
@@ -24,7 +24,9 @@ import Item, { Actions } from "~/components/List/Item";
 import Time from "~/components/Time";
 import useStores from "~/hooks/useStores";
 import RevisionMenu from "~/menus/RevisionMenu";
-import { documentHistoryUrl } from "~/utils/routeHelpers";
+import { hover } from "~/styles";
+import Logger from "~/utils/Logger";
+import { documentHistoryPath } from "~/utils/routeHelpers";

 type Props = {
  document: Document;
@@ -49,33 +51,30 @@ const EventListItem = ({ event, latest, document, ...rest }: Props) => {
    ref.current?.focus();
  };

-  const prefetchRevision = () => {
+  const prefetchRevision = async () => {
    if (event.name === "revisions.create" && event.modelId) {
-      revisions.fetch(event.modelId);
+      await revisions.fetch(event.modelId);
    }
  };

  switch (event.name) {
    case "revisions.create":
-      icon = <EditIcon color="currentColor" size={16} />;
-      meta = t("{{userName}} edited", opts);
+      icon = <EditIcon size={16} />;
+      meta = latest ? (
+        <>
+          {t("Current version")} &middot; {event.actor.name}
+        </>
+      ) : (
+        t("{{userName}} edited", opts)
+      );
      to = {
-        pathname: documentHistoryUrl(document, event.modelId || ""),
-        state: { retainScrollPosition: true },
-      };
-      break;
-
-    case "documents.live_editing":
-      icon = <LightningIcon color="currentColor" size={16} />;
-      meta = t("Latest");
-      to = {
-        pathname: documentHistoryUrl(document),
+        pathname: documentHistoryPath(document, event.modelId || "latest"),
        state: { retainScrollPosition: true },
      };
      break;

    case "documents.archive":
-      icon = <ArchiveIcon color="currentColor" size={16} />;
+      icon = <ArchiveIcon size={16} />;
      meta = t("{{userName}} archived", opts);
      break;

@@ -84,7 +83,7 @@ const EventListItem = ({ event, latest, document, ...rest }: Props) => {
      break;

    case "documents.delete":
-      icon = <TrashIcon color="currentColor" size={16} />;
+      icon = <TrashIcon size={16} />;
      meta = t("{{userName}} deleted", opts);
      break;

@@ -93,22 +92,22 @@ const EventListItem = ({ event, latest, document, ...rest }: Props) => {
      break;

    case "documents.publish":
-      icon = <PublishIcon color="currentColor" size={16} />;
+      icon = <PublishIcon size={16} />;
      meta = t("{{userName}} published", opts);
      break;

    case "documents.unpublish":
-      icon = <UnpublishIcon color="currentColor" size={16} />;
+      icon = <UnpublishIcon size={16} />;
      meta = t("{{userName}} unpublished", opts);
      break;

    case "documents.move":
-      icon = <MoveIcon color="currentColor" size={16} />;
+      icon = <MoveIcon size={16} />;
      meta = t("{{userName}} moved", opts);
      break;

    default:
-      console.warn("Unhandled event: ", event.name);
+      Logger.warn("Unhandled event", { event });
  }

  if (!meta) {
@@ -150,7 +149,7 @@ const EventListItem = ({ event, latest, document, ...rest }: Props) => {
        </Subtitle>
      }
      actions={
-        isRevision && isActive && event.modelId ? (
+        isRevision && isActive && event.modelId && !latest ? (
          <RevisionMenu document={document} revisionId={event.modelId} />
        ) : undefined
      }
@@ -161,15 +160,16 @@ const EventListItem = ({ event, latest, document, ...rest }: Props) => {
  );
 };

-const BaseItem = React.forwardRef(
-  ({ to, ...rest }: ItemProps, ref?: React.Ref<HTMLAnchorElement>) => {
-    if (to) {
-      return <CompositeListItem to={to} ref={ref} {...rest} />;
-    }
-
-    return <ListItem ref={ref} {...rest} />;
+const BaseItem = React.forwardRef(function _BaseItem(
+  { to, ...rest }: ItemProps,
+  ref?: React.Ref<HTMLAnchorElement>
+) {
+  if (to) {
+    return <CompositeListItem to={to} ref={ref} {...rest} />;
  }
-);
+
+  return <ListItem ref={ref} {...rest} />;
+});

 const Subtitle = styled.span`
  svg {
@@ -197,7 +197,7 @@ const ItemStyle = css`
    left: 23px;
    width: 2px;
    height: calc(100% + 8px);
-    background: ${(props) => props.theme.textSecondary};
+    background: ${s("textSecondary")};
    opacity: 0.25;
  }

@@ -218,7 +218,7 @@ const ItemStyle = css`
  ${Actions} {
    opacity: 0.5;

-    &:hover {
+    &: ${hover} {
      opacity: 1;
    }
  }
@@ -1,14 +1,14 @@
 import { observer } from "mobx-react";
-import { CodeIcon } from "outline-icons";
 import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
 import styled from "styled-components";
-import { FileOperationFormat } from "@shared/types";
+import { FileOperationFormat, NotificationEventType } from "@shared/types";
 import Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Flex from "~/components/Flex";
-import MarkdownIcon from "~/components/Icons/MarkdownIcon";
 import Text from "~/components/Text";
+import env from "~/env";
+import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
 import useToasts from "~/hooks/useToasts";

@@ -21,13 +21,13 @@ function ExportDialog({ collection, onSubmit }: Props) {
  const [format, setFormat] = React.useState<FileOperationFormat>(
    FileOperationFormat.MarkdownZip
  );
+  const [includeAttachments, setIncludeAttachments] =
+    React.useState<boolean>(true);
+  const user = useCurrentUser();
  const { showToast } = useToasts();
-  const { collections, notificationSettings } = useStores();
+  const { collections } = useStores();
  const { t } = useTranslation();
-
-  React.useEffect(() => {
-    notificationSettings.fetchPage({});
-  }, [notificationSettings]);
+  const appName = env.APP_NAME;

  const handleFormatChange = React.useCallback(
    (ev: React.ChangeEvent<HTMLInputElement>) => {
@@ -36,16 +36,50 @@ function ExportDialog({ collection, onSubmit }: Props) {
    []
  );

+  const handleIncludeAttachmentsChange = React.useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setIncludeAttachments(ev.target.checked);
+    },
+    []
+  );
+
  const handleSubmit = async () => {
    if (collection) {
-      await collection.export(format);
+      await collection.export(format, includeAttachments);
    } else {
-      await collections.export(format);
+      await collections.export(format, includeAttachments);
    }
    onSubmit();
    showToast(t("Export started"), { type: "success" });
  };

+  const items = [
+    {
+      title: "Markdown",
+      description: t(
+        "A ZIP file containing the images, and documents in the Markdown format."
+      ),
+      value: FileOperationFormat.MarkdownZip,
+    },
+    {
+      title: "HTML",
+      description: t(
+        "A ZIP file containing the images, and documents as HTML files."
+      ),
+      value: FileOperationFormat.HTMLZip,
+    },
+    {
+      title: "JSON",
+      description: t(
+        "Structured data that can be used to transfer data to another compatible {{ appName }} instance.",
+        {
+          appName,
+        }
+      ),
+      value: FileOperationFormat.JSON,
+    },
+  ];
+
  return (
    <ConfirmationDialog onSubmit={handleSubmit} submitText={t("Export")}>
      {collection && (
@@ -59,68 +93,50 @@ function ExportDialog({ collection, onSubmit }: Props) {
              em: <strong />,
            }}
          />{" "}
-          {notificationSettings.getByEvent("emails.export_completed") &&
+          {user.subscribedToEventType(NotificationEventType.ExportCompleted) &&
            t("You will receive an email when it's complete.")}
        </Text>
      )}
      <Flex gap={12} column>
-        <Option>
-          <Input
-            type="radio"
-            name="format"
-            value={FileOperationFormat.MarkdownZip}
-            checked={format === FileOperationFormat.MarkdownZip}
-            onChange={handleFormatChange}
-          />
-          <Format>
-            <MarkdownIcon size={32} color="currentColor" />
-            Markdown
-          </Format>
-          <Text size="small">
-            <Trans>
-              A ZIP file containing the images, and documents in the Markdown
-              format.
-            </Trans>
-          </Text>
-        </Option>
-        <Option>
-          <Input
-            type="radio"
-            name="format"
-            value={FileOperationFormat.HTMLZip}
-            checked={format === FileOperationFormat.HTMLZip}
-            onChange={handleFormatChange}
-          />
-          <Format>
-            <CodeIcon size={32} color="currentColor" />
-            HTML
-          </Format>
-          <Text size="small">
-            <Trans>
-              A ZIP file containing the images, and documents as HTML files.
-            </Trans>
-          </Text>
-        </Option>
+        {items.map((item) => (
+          <Option key={item.value}>
+            <input
+              type="radio"
+              name="format"
+              value={item.value}
+              checked={format === item.value}
+              onChange={handleFormatChange}
+            />
+            <div>
+              <Text size="small" weight="bold">
+                {item.title}
+              </Text>
+              <Text size="small">{item.description}</Text>
+            </div>
+          </Option>
+        ))}
      </Flex>
+      <hr />
+      <Option>
+        <input
+          type="checkbox"
+          name="includeAttachments"
+          checked={includeAttachments}
+          onChange={handleIncludeAttachmentsChange}
+        />
+        <div>
+          <Text size="small" weight="bold">
+            {t("Include attachments")}
+          </Text>
+          <Text size="small">
+            {t("Including uploaded images and files in the exported data")}.
+          </Text>{" "}
+        </div>
+      </Option>
    </ConfirmationDialog>
  );
 }

-const Format = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  flex-shrink: 0;
-  background: ${(props) => props.theme.secondaryBackground};
-  border-radius: 6px;
-  width: 25%;
-  font-weight: 500;
-  font-size: 14px;
-  text-align: center;
-  padding: 10px 8px;
-  cursor: var(--pointer);
-`;
-
 const Option = styled.label`
  display: flex;
  align-items: center;
@@ -131,12 +147,4 @@ const Option = styled.label`
  }
 `;

-const Input = styled.input`
-  display: none;
-
-  &:checked + ${Format} {
-    box-shadow: inset 0 0 0 2px ${(props) => props.theme.inputBorderFocused};
-  }
-`;
-
 export default observer(ExportDialog);
@@ -1,6 +1,7 @@
 import { observer } from "mobx-react";
 import * as React from "react";
 import styled from "styled-components";
+import { s } from "@shared/styles";
 import User from "~/models/User";
 import Avatar from "~/components/Avatar";
 import Flex from "~/components/Flex";
@@ -59,8 +60,8 @@ const More = styled.div<{ size: number }>`
  height: ${(props) => props.size}px;
  border-radius: 100%;
  background: ${(props) => props.theme.slate};
-  color: ${(props) => props.theme.text};
-  border: 2px solid ${(props) => props.theme.background};
+  color: ${s("text")};
+  border: 2px solid ${s("background")};
  text-align: center;
  font-size: 11px;
  font-weight: 600;
@@ -1,6 +1,7 @@
 import * as React from "react";
 import { useMenuState, MenuButton } from "reakit/Menu";
 import styled from "styled-components";
+import { s } from "@shared/styles";
 import Button, { Inner } from "~/components/Button";
 import ContextMenu from "~/components/ContextMenu";
 import MenuItem from "~/components/ContextMenu/MenuItem";
@@ -80,7 +81,7 @@ const Note = styled(Text)`
  line-height: 1.2em;
  font-size: 14px;
  font-weight: 400;
-  color: ${(props) => props.theme.textTertiary};
+  color: ${s("textTertiary")};
 `;

 const LabelWithNote = styled.div`
@@ -10,6 +10,7 @@ const Flex = styled.div<{
  column?: boolean;
  align?: AlignValues;
  justify?: JustifyValues;
+  wrap?: boolean;
  shrink?: boolean;
  reverse?: boolean;
  gap?: number;
@@ -26,7 +27,9 @@ const Flex = styled.div<{
      : "row"};
  align-items: ${({ align }) => align};
  justify-content: ${({ justify }) => justify};
-  flex-shrink: ${({ shrink }) => (shrink ? 1 : "initial")};
+  flex-wrap: ${({ wrap }) => (wrap ? "wrap" : "initial")};
+  flex-shrink: ${({ shrink }) =>
+    shrink === true ? 1 : shrink === false ? 0 : "initial"};
  gap: ${({ gap }) => (gap ? `${gap}px` : "initial")};
  min-height: 0;
  min-width: 0;
@@ -4,6 +4,7 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { MAX_AVATAR_DISPLAY } from "@shared/constants";
+import { s } from "@shared/styles";
 import CollectionGroupMembership from "~/models/CollectionGroupMembership";
 import Group from "~/models/Group";
 import GroupMembers from "~/scenes/GroupMembers";
@@ -13,6 +14,7 @@ import ListItem from "~/components/List/Item";
 import Modal from "~/components/Modal";
 import useBoolean from "~/hooks/useBoolean";
 import useStores from "~/hooks/useStores";
+import { hover } from "~/styles";
 import NudeButton from "./NudeButton";

 type Props = {
@@ -26,11 +28,8 @@ type Props = {
 function GroupListItem({ group, showFacepile, renderActions }: Props) {
  const { groupMemberships } = useStores();
  const { t } = useTranslation();
-  const [
-    membersModalOpen,
-    setMembersModalOpen,
-    setMembersModalClosed,
-  ] = useBoolean();
+  const [membersModalOpen, setMembersModalOpen, setMembersModalClosed] =
+    useBoolean();
  const memberCount = group.memberCount;
  const membershipsInGroup = groupMemberships.inGroup(group.id);
  const users = membershipsInGroup
@@ -81,12 +80,12 @@ const Image = styled(Flex)`
  justify-content: center;
  width: 32px;
  height: 32px;
-  background: ${(props) => props.theme.secondaryBackground};
+  background: ${s("secondaryBackground")};
  border-radius: 32px;
 `;

 const Title = styled.span`
-  &:hover {
+  &: ${hover} {
    text-decoration: underline;
    cursor: var(--pointer);
  }
@@ -1,11 +1,12 @@
 import * as React from "react";
 import { Dialog, DialogBackdrop, useDialogState } from "reakit/Dialog";
 import styled from "styled-components";
-import { depths } from "@shared/styles";
+import { depths, s } from "@shared/styles";
 import Scrollable from "~/components/Scrollable";
 import usePrevious from "~/hooks/usePrevious";

 type Props = {
+  children?: React.ReactNode;
  isOpen: boolean;
  title?: string;
  onRequestClose: () => void;
@@ -17,7 +18,7 @@ const Guide: React.FC<Props> = ({
  title = "Untitled",
  onRequestClose,
  ...rest
-}) => {
+}: Props) => {
  const dialog = useDialogState({
    animated: 250,
  });
@@ -71,7 +72,7 @@ const Backdrop = styled.div`
  left: 0;
  right: 0;
  bottom: 0;
-  background-color: ${(props) => props.theme.backdrop} !important;
+  background-color: ${s("backdrop")} !important;
  z-index: ${depths.modalOverlay};
  transition: opacity 200ms ease-in-out;
  opacity: 0;
@@ -92,8 +93,8 @@ const Scene = styled.div`
  justify-content: center;
  align-items: flex-start;
  width: 350px;
-  background: ${(props) => props.theme.background};
-  transition: ${(props) => props.theme.backgroundTransition};
+  background: ${s("background")};
+  transition: ${s("backgroundTransition")};
  border-radius: 8px;
  outline: none;
  opacity: 0;
@@ -5,7 +5,7 @@ import { transparentize } from "polished";
 import * as React from "react";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
-import { depths } from "@shared/styles";
+import { depths, s } from "@shared/styles";
 import Button from "~/components/Button";
 import Fade from "~/components/Fade";
 import Flex from "~/components/Flex";
@@ -63,7 +63,6 @@ function Header({ left, title, actions, hasSidebar }: Props) {
            <MobileMenuButton
              onClick={ui.toggleMobileSidebar}
              icon={<MenuIcon />}
-              iconColor="currentColor"
              neutral
            />
          )}
@@ -113,7 +112,7 @@ const Wrapper = styled(Flex)<WrapperProps>`
  top: 0;
  z-index: ${depths.header};
  position: sticky;
-  background: ${(props) => props.theme.background};
+  background: ${s("background")};

  ${(props) =>
    props.$passThrough
@@ -132,7 +131,11 @@ const Wrapper = styled(Flex)<WrapperProps>`
  min-height: 64px;
  justify-content: flex-start;
  ${draggableOnDesktop()}
-  ${fadeOnDesktopBackgrounded()}
+
+  button,
+  [role="button"] {
+    ${fadeOnDesktopBackgrounded()}
+  }

  @supports (backdrop-filter: blur(20px)) {
    backdrop-filter: blur(20px);
@@ -2,6 +2,7 @@ import { escapeRegExp } from "lodash";
 import * as React from "react";
 import replace from "string-replace-to-array";
 import styled from "styled-components";
+import { s } from "@shared/styles";

 type Props = React.HTMLAttributes<HTMLSpanElement> & {
  highlight: (string | null | undefined) | RegExp;
@@ -43,7 +44,7 @@ function Highlight({
 }

 export const Mark = styled.mark`
-  background: ${(props) => props.theme.searchHighlight};
+  background: ${s("searchHighlight")};
  border-radius: 2px;
  padding: 0 2px;
 `;
@@ -1,244 +0,0 @@
-import { transparentize } from "polished";
-import * as React from "react";
-import { Portal } from "react-portal";
-import styled from "styled-components";
-import { depths } from "@shared/styles";
-import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
-import { isExternalUrl } from "@shared/utils/urls";
-import HoverPreviewDocument from "~/components/HoverPreviewDocument";
-import useMobile from "~/hooks/useMobile";
-import useStores from "~/hooks/useStores";
-import { fadeAndSlideDown } from "~/styles/animations";
-
-const DELAY_OPEN = 300;
-const DELAY_CLOSE = 300;
-
-type Props = {
-  node: HTMLAnchorElement;
-  event: MouseEvent;
-  onClose: () => void;
-};
-
-function HoverPreviewInternal({ node, onClose }: Props) {
-  const { documents } = useStores();
-  const slug = parseDocumentSlug(node.href);
-  const [isVisible, setVisible] = React.useState(false);
-  const timerClose = React.useRef<ReturnType<typeof setTimeout>>();
-  const timerOpen = React.useRef<ReturnType<typeof setTimeout>>();
-  const cardRef = React.useRef<HTMLDivElement>(null);
-
-  const startCloseTimer = () => {
-    stopOpenTimer();
-    timerClose.current = setTimeout(() => {
-      if (isVisible) {
-        setVisible(false);
-      }
-      onClose();
-    }, DELAY_CLOSE);
-  };
-
-  const stopCloseTimer = () => {
-    if (timerClose.current) {
-      clearTimeout(timerClose.current);
-    }
-  };
-
-  const startOpenTimer = () => {
-    timerOpen.current = setTimeout(() => setVisible(true), DELAY_OPEN);
-  };
-
-  const stopOpenTimer = () => {
-    if (timerOpen.current) {
-      clearTimeout(timerOpen.current);
-    }
-  };
-
-  React.useEffect(() => {
-    if (slug) {
-      documents.prefetchDocument(slug);
-    }
-
-    startOpenTimer();
-
-    if (cardRef.current) {
-      cardRef.current.addEventListener("mouseenter", stopCloseTimer);
-    }
-
-    if (cardRef.current) {
-      cardRef.current.addEventListener("mouseleave", startCloseTimer);
-    }
-
-    node.addEventListener("mouseout", startCloseTimer);
-    node.addEventListener("mouseover", stopCloseTimer);
-    node.addEventListener("mouseover", startOpenTimer);
-    return () => {
-      node.removeEventListener("mouseout", startCloseTimer);
-      node.removeEventListener("mouseover", stopCloseTimer);
-      node.removeEventListener("mouseover", startOpenTimer);
-
-      if (cardRef.current) {
-        cardRef.current.removeEventListener("mouseenter", stopCloseTimer);
-      }
-
-      if (cardRef.current) {
-        cardRef.current.removeEventListener("mouseleave", startCloseTimer);
-      }
-
-      if (timerClose.current) {
-        clearTimeout(timerClose.current);
-      }
-    };
-  }, [node, slug]);
-
-  const anchorBounds = node.getBoundingClientRect();
-  const cardBounds = cardRef.current?.getBoundingClientRect();
-  const left = cardBounds
-    ? Math.min(anchorBounds.left, window.innerWidth - 16 - 350)
-    : anchorBounds.left;
-  const leftOffset = anchorBounds.left - left;
-
-  return (
-    <Portal>
-      <Position
-        top={anchorBounds.bottom + window.scrollY}
-        left={left}
-        aria-hidden
-      >
-        <div ref={cardRef}>
-          <HoverPreviewDocument url={node.href}>
-            {(content: React.ReactNode) =>
-              isVisible ? (
-                <Animate>
-                  <Card>
-                    <Margin />
-                    <CardContent>{content}</CardContent>
-                  </Card>
-                  <Pointer offset={leftOffset + anchorBounds.width / 2} />
-                </Animate>
-              ) : null
-            }
-          </HoverPreviewDocument>
-        </div>
-      </Position>
-    </Portal>
-  );
-}
-
-function HoverPreview({ node, ...rest }: Props) {
-  const isMobile = useMobile();
-  if (isMobile) {
-    return null;
-  }
-
-  // previews only work for internal doc links for now
-  if (isExternalUrl(node.href)) {
-    return null;
-  }
-
-  return <HoverPreviewInternal {...rest} node={node} />;
-}
-
-const Animate = styled.div`
-  animation: ${fadeAndSlideDown} 150ms ease;
-
-  @media print {
-    display: none;
-  }
-`;
-
-// fills the gap between the card and pointer to avoid a dead zone
-const Margin = styled.div`
-  position: absolute;
-  top: -11px;
-  left: 0;
-  right: 0;
-  height: 11px;
-`;
-
-const CardContent = styled.div`
-  overflow: hidden;
-  max-height: 20em;
-  user-select: none;
-`;
-
-// &:after — gradient mask for overflow text
-const Card = styled.div`
-  backdrop-filter: blur(10px);
-  background: ${(props) => props.theme.background};
-  border-radius: 4px;
-  box-shadow: 0 30px 90px -20px rgba(0, 0, 0, 0.3),
-    0 0 1px 1px rgba(0, 0, 0, 0.05);
-  padding: 16px;
-  width: 350px;
-  font-size: 0.9em;
-  position: relative;
-
-  .placeholder,
-  .heading-anchor {
-    display: none;
-  }
-
-  &:after {
-    content: "";
-    display: block;
-    position: absolute;
-    pointer-events: none;
-    background: linear-gradient(
-      90deg,
-      ${(props) => transparentize(1, props.theme.background)} 0%,
-      ${(props) => transparentize(1, props.theme.background)} 75%,
-      ${(props) => props.theme.background} 90%
-    );
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 1.7em;
-    border-bottom: 16px solid ${(props) => props.theme.background};
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-  }
-`;
-
-const Position = styled.div<{ fixed?: boolean; top?: number; left?: number }>`
-  margin-top: 10px;
-  position: ${({ fixed }) => (fixed ? "fixed" : "absolute")};
-  z-index: ${depths.hoverPreview};
-  display: flex;
-  max-height: 75%;
-
-  ${({ top }) => (top !== undefined ? `top: ${top}px` : "")};
-  ${({ left }) => (left !== undefined ? `left: ${left}px` : "")};
-`;
-
-const Pointer = styled.div<{ offset: number }>`
-  top: -22px;
-  left: ${(props) => props.offset}px;
-  width: 22px;
-  height: 22px;
-  position: absolute;
-  transform: translateX(-50%);
-  pointer-events: none;
-
-  &:before,
-  &:after {
-    content: "";
-    display: inline-block;
-    position: absolute;
-    bottom: 0;
-    right: 0;
-  }
-
-  &:before {
-    border: 8px solid transparent;
-    border-bottom-color: ${(props) =>
-      props.theme.menuBorder || "rgba(0, 0, 0, 0.1)"};
-    right: -1px;
-  }
-
-  &:after {
-    border: 7px solid transparent;
-    border-bottom-color: ${(props) => props.theme.background};
-  }
-`;
-
-export default HoverPreview;
@@ -0,0 +1,108 @@
+import { transparentize } from "polished";
+import { Link } from "react-router-dom";
+import styled, { css } from "styled-components";
+import { s } from "@shared/styles";
+import Text from "~/components/Text";
+
+export const CARD_MARGIN = 16;
+
+const NUMBER_OF_LINES = 10;
+
+const sharedVars = css`
+  --line-height: 1.6em;
+`;
+
+const StyledText = styled(Text)`
+  margin-bottom: 0;
+`;
+
+export const Preview = styled(Link)`
+  cursor: ${(props: any) =>
+    props.as === "div" ? "default" : "var(--pointer)"};
+  border-radius: 4px;
+  box-shadow: 0 30px 90px -20px rgba(0, 0, 0, 0.3),
+    0 0 1px 1px rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+  position: absolute;
+  min-width: 350px;
+  max-width: 375px;
+`;
+
+export const Title = styled.h2`
+  font-size: 1.25em;
+  margin: 0;
+  color: ${s("text")};
+`;
+
+export const Info = styled(StyledText).attrs(() => ({
+  type: "tertiary",
+  size: "xsmall",
+}))`
+  white-space: nowrap;
+`;
+
+export const Description = styled(StyledText)`
+  ${sharedVars}
+  margin-top: 0.5em;
+  line-height: var(--line-height);
+  max-height: calc(var(--line-height) * ${NUMBER_OF_LINES});
+`;
+
+export const Thumbnail = styled.img`
+  object-fit: cover;
+  height: 200px;
+  background: ${s("menuBackground")};
+`;
+
+export const CardContent = styled.div`
+  overflow: hidden;
+  user-select: none;
+`;
+
+// &:after — gradient mask for overflow text
+export const Card = styled.div<{ fadeOut?: boolean; $borderRadius?: string }>`
+  backdrop-filter: blur(10px);
+  background: ${s("menuBackground")};
+  padding: 16px;
+  font-size: 0.9em;
+  position: relative;
+
+  .placeholder,
+  .heading-anchor {
+    display: none;
+  }
+
+  // fills the gap between the card and pointer to avoid a dead zone
+  &::before {
+    content: "";
+    position: absolute;
+    top: -10px;
+    left: 0;
+    right: 0;
+    height: 10px;
+  }
+
+  ${(props) =>
+    props.fadeOut !== false
+      ? `&:after {
+          ${sharedVars}
+          content: "";
+          display: block;
+          position: absolute;
+          pointer-events: none;
+          background: linear-gradient(
+            90deg,
+            ${transparentize(1, props.theme.menuBackground)} 0%,
+            ${transparentize(1, props.theme.menuBackground)} 75%,
+            ${props.theme.menuBackground} 90%
+          );
+          bottom: 0;
+          left: 0;
+          right: 0;
+          height: var(--line-height);
+          border-bottom: 16px solid ${props.theme.menuBackground};
+          border-bottom-left-radius: 4px;
+          border-bottom-right-radius: 4px;
+        }`
+      : ""}
+`;
@@ -0,0 +1,261 @@
+import { m } from "framer-motion";
+import * as React from "react";
+import { Portal } from "react-portal";
+import styled from "styled-components";
+import { depths, s } from "@shared/styles";
+import { UnfurlType } from "@shared/types";
+import LoadingIndicator from "~/components/LoadingIndicator";
+import useEventListener from "~/hooks/useEventListener";
+import useKeyDown from "~/hooks/useKeyDown";
+import useMobile from "~/hooks/useMobile";
+import useOnClickOutside from "~/hooks/useOnClickOutside";
+import useRequest from "~/hooks/useRequest";
+import useStores from "~/hooks/useStores";
+import { client } from "~/utils/ApiClient";
+import { CARD_MARGIN } from "./Components";
+import HoverPreviewDocument from "./HoverPreviewDocument";
+import HoverPreviewLink from "./HoverPreviewLink";
+import HoverPreviewMention from "./HoverPreviewMention";
+
+const DELAY_OPEN = 300;
+const DELAY_CLOSE = 600;
+
+type Props = {
+  /* The HTML element that is being hovered over */
+  element: HTMLAnchorElement;
+  /* A callback on close of the hover preview */
+  onClose: () => void;
+};
+
+function HoverPreviewInternal({ element, onClose }: Props) {
+  const url = element.href || element.dataset.url;
+  const [isVisible, setVisible] = React.useState(false);
+  const timerClose = React.useRef<ReturnType<typeof setTimeout>>();
+  const timerOpen = React.useRef<ReturnType<typeof setTimeout>>();
+  const cardRef = React.useRef<HTMLDivElement>(null);
+  const stores = useStores();
+  const [cardLeft, setCardLeft] = React.useState(0);
+  const [cardTop, setCardTop] = React.useState(0);
+  const [pointerOffset, setPointerOffset] = React.useState(0);
+
+  React.useLayoutEffect(() => {
+    if (isVisible && cardRef.current) {
+      const elem = element.getBoundingClientRect();
+      const card = cardRef.current.getBoundingClientRect();
+
+      const top = elem.bottom + window.scrollY;
+      setCardTop(top);
+
+      let left = elem.left;
+      let pointerOffset = elem.width / 2;
+      if (left + card.width > window.innerWidth) {
+        // shift card leftwards by the amount it went out of screen
+        let shiftBy = left + card.width - window.innerWidth;
+        // shift a littler further to leave some margin between card and window boundary
+        shiftBy += CARD_MARGIN;
+        left -= shiftBy;
+
+        // shift pointer rightwards by same amount so as to position it back correctly
+        pointerOffset += shiftBy;
+      }
+      setCardLeft(left);
+
+      setPointerOffset(pointerOffset);
+    }
+  }, [isVisible, element]);
+
+  const { data, request, loading } = useRequest(
+    React.useCallback(
+      () =>
+        client.post("/urls.unfurl", {
+          url,
+          documentId: stores.ui.activeDocumentId,
+        }),
+      [url, stores.ui.activeDocumentId]
+    )
+  );
+
+  React.useEffect(() => {
+    if (url) {
+      stopOpenTimer();
+      setVisible(false);
+
+      void request();
+    }
+  }, [url, request]);
+
+  const stopOpenTimer = () => {
+    if (timerOpen.current) {
+      clearTimeout(timerOpen.current);
+      timerOpen.current = undefined;
+    }
+  };
+
+  const closePreview = React.useCallback(() => {
+    if (isVisible) {
+      stopOpenTimer();
+      setVisible(false);
+      onClose();
+    }
+  }, [isVisible, onClose]);
+
+  useOnClickOutside(cardRef, closePreview);
+  useKeyDown("Escape", closePreview);
+  useEventListener("scroll", closePreview, window, { capture: true });
+
+  const stopCloseTimer = () => {
+    if (timerClose.current) {
+      clearTimeout(timerClose.current);
+      timerClose.current = undefined;
+    }
+  };
+
+  const startOpenTimer = () => {
+    if (!timerOpen.current) {
+      timerOpen.current = setTimeout(() => setVisible(true), DELAY_OPEN);
+    }
+  };
+
+  const startCloseTimer = React.useCallback(() => {
+    stopOpenTimer();
+    timerClose.current = setTimeout(closePreview, DELAY_CLOSE);
+  }, [closePreview]);
+
+  React.useEffect(() => {
+    const card = cardRef.current;
+
+    if (data) {
+      startOpenTimer();
+
+      if (card) {
+        card.addEventListener("mouseenter", stopCloseTimer);
+        card.addEventListener("mouseleave", startCloseTimer);
+      }
+
+      element.addEventListener("mouseout", startCloseTimer);
+      element.addEventListener("mouseover", stopCloseTimer);
+      element.addEventListener("mouseover", startOpenTimer);
+    }
+
+    return () => {
+      element.removeEventListener("mouseout", startCloseTimer);
+      element.removeEventListener("mouseover", stopCloseTimer);
+      element.removeEventListener("mouseover", startOpenTimer);
+
+      if (card) {
+        card.removeEventListener("mouseenter", stopCloseTimer);
+        card.removeEventListener("mouseleave", startCloseTimer);
+      }
+
+      stopCloseTimer();
+    };
+  }, [element, startCloseTimer, data]);
+
+  if (loading) {
+    return <LoadingIndicator />;
+  }
+
+  if (!data) {
+    return null;
+  }
+
+  return (
+    <Portal>
+      <Position top={cardTop} left={cardLeft} aria-hidden>
+        {isVisible ? (
+          <Animate
+            initial={{ opacity: 0, y: -20, pointerEvents: "none" }}
+            animate={{ opacity: 1, y: 0, pointerEvents: "auto" }}
+          >
+            {data.type === UnfurlType.Mention ? (
+              <HoverPreviewMention
+                ref={cardRef}
+                url={data.thumbnailUrl}
+                title={data.title}
+                info={data.meta.info}
+                color={data.meta.color}
+              />
+            ) : data.type === UnfurlType.Document ? (
+              <HoverPreviewDocument
+                ref={cardRef}
+                id={data.meta.id}
+                url={data.url}
+                title={data.title}
+                description={data.description}
+                info={data.meta.info}
+              />
+            ) : (
+              <HoverPreviewLink
+                ref={cardRef}
+                url={data.url}
+                thumbnailUrl={data.thumbnailUrl}
+                title={data.title}
+                description={data.description}
+              />
+            )}
+            <Pointer offset={pointerOffset} />
+          </Animate>
+        ) : null}
+      </Position>
+    </Portal>
+  );
+}
+
+function HoverPreview({ element, ...rest }: Props) {
+  const isMobile = useMobile();
+  if (isMobile) {
+    return null;
+  }
+
+  return <HoverPreviewInternal {...rest} element={element} />;
+}
+
+const Animate = styled(m.div)`
+  @media print {
+    display: none;
+  }
+`;
+
+const Position = styled.div<{ fixed?: boolean; top?: number; left?: number }>`
+  margin-top: 10px;
+  position: ${({ fixed }) => (fixed ? "fixed" : "absolute")};
+  z-index: ${depths.hoverPreview};
+  display: flex;
+  max-height: 75%;
+
+  ${({ top }) => (top !== undefined ? `top: ${top}px` : "")};
+  ${({ left }) => (left !== undefined ? `left: ${left}px` : "")};
+`;
+
+const Pointer = styled.div<{ offset: number }>`
+  top: -22px;
+  left: ${(props) => props.offset}px;
+  width: 22px;
+  height: 22px;
+  position: absolute;
+  transform: translateX(-50%);
+  pointer-events: none;
+
+  &:before,
+  &:after {
+    content: "";
+    display: inline-block;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+  }
+
+  &:before {
+    border: 8px solid transparent;
+    border-bottom-color: ${(props) =>
+      props.theme.menuBorder || "rgba(0, 0, 0, 0.1)"};
+    right: -1px;
+  }
+
+  &:after {
+    border: 7px solid transparent;
+    border-bottom-color: ${s("menuBackground")};
+  }
+`;
+
+export default HoverPreview;
@@ -0,0 +1,54 @@
+import * as React from "react";
+import Editor from "~/components/Editor";
+import Flex from "~/components/Flex";
+import {
+  Preview,
+  Title,
+  Info,
+  Card,
+  CardContent,
+  Description,
+} from "./Components";
+
+type Props = {
+  /** Document id associated with the editor, if any */
+  id?: string;
+  /** Document url */
+  url: string;
+  /** Title for the preview card */
+  title: string;
+  /** Info about last activity on the document */
+  info: string;
+  /** Text preview of document content */
+  description: string;
+};
+
+const HoverPreviewDocument = React.forwardRef(function _HoverPreviewDocument(
+  { id, url, title, info, description }: Props,
+  ref: React.Ref<HTMLDivElement>
+) {
+  return (
+    <Preview to={url}>
+      <Card ref={ref}>
+        <CardContent>
+          <Flex column gap={2}>
+            <Title>{title}</Title>
+            <Info>{info}</Info>
+            <Description as="div">
+              <React.Suspense fallback={<div />}>
+                <Editor
+                  key={id}
+                  defaultValue={description}
+                  embedsDisabled
+                  readOnly
+                />
+              </React.Suspense>
+            </Description>
+          </Flex>
+        </CardContent>
+      </Card>
+    </Preview>
+  );
+});
+
+export default HoverPreviewDocument;
@@ -0,0 +1,44 @@
+import * as React from "react";
+import Flex from "~/components/Flex";
+import {
+  Preview,
+  Title,
+  Description,
+  Card,
+  CardContent,
+  Thumbnail,
+} from "./Components";
+
+type Props = {
+  /** Link url */
+  url: string;
+  /** Title for the preview card */
+  title: string;
+  /** Url for thumbnail served by the link provider */
+  thumbnailUrl: string;
+  /** Some description about the link provider */
+  description: string;
+};
+
+const HoverPreviewLink = React.forwardRef(function _HoverPreviewLink(
+  { url, thumbnailUrl, title, description }: Props,
+  ref: React.Ref<HTMLDivElement>
+) {
+  return (
+    <Preview as="a" href={url} target="_blank" rel="noopener noreferrer">
+      <Flex column>
+        {thumbnailUrl ? <Thumbnail src={thumbnailUrl} alt={""} /> : null}
+        <Card ref={ref}>
+          <CardContent>
+            <Flex column>
+              <Title>{title}</Title>
+              <Description>{description}</Description>
+            </Flex>
+          </CardContent>
+        </Card>
+      </Flex>
+    </Preview>
+  );
+});
+
+export default HoverPreviewLink;
@@ -0,0 +1,46 @@
+import * as React from "react";
+import Avatar from "~/components/Avatar";
+import { AvatarSize } from "~/components/Avatar/Avatar";
+import Flex from "~/components/Flex";
+import { Preview, Title, Info, Card, CardContent } from "./Components";
+
+type Props = {
+  /** Resource url, avatar url in case of user mention */
+  url: string;
+  /** Title for the preview card*/
+  title: string;
+  /** Info about mentioned user's recent activity */
+  info: string;
+  /** Used for avatar's background color in absence of avatar url */
+  color: string;
+};
+
+const HoverPreviewMention = React.forwardRef(function _HoverPreviewMention(
+  { url, title, info, color }: Props,
+  ref: React.Ref<HTMLDivElement>
+) {
+  return (
+    <Preview as="div">
+      <Card fadeOut={false} ref={ref}>
+        <CardContent>
+          <Flex gap={12}>
+            <Avatar
+              model={{
+                avatarUrl: url,
+                initial: title ? title[0] : "?",
+                color,
+              }}
+              size={AvatarSize.XLarge}
+            />
+            <Flex column gap={2} justify="center">
+              <Title>{title}</Title>
+              <Info>{info}</Info>
+            </Flex>
+          </Flex>
+        </CardContent>
+      </Card>
+    </Preview>
+  );
+});
+
+export default HoverPreviewMention;
@@ -0,0 +1,3 @@
+import HoverPreview from "./HoverPreview";
+
+export default HoverPreview;
@@ -1,61 +0,0 @@
-import { observer } from "mobx-react";
-import * as React from "react";
-import { Link } from "react-router-dom";
-import styled from "styled-components";
-import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
-import DocumentMetaWithViews from "~/components/DocumentMetaWithViews";
-import Editor from "~/components/Editor";
-import useStores from "~/hooks/useStores";
-
-type Props = {
-  url: string;
-  children: (content: React.ReactNode) => React.ReactNode;
-};
-
-function HoverPreviewDocument({ url, children }: Props) {
-  const { documents } = useStores();
-  const slug = parseDocumentSlug(url);
-
-  if (slug) {
-    documents.prefetchDocument(slug);
-  }
-
-  const document = slug ? documents.getByUrl(slug) : undefined;
-  if (!document) {
-    return null;
-  }
-
-  return (
-    <>
-      {children(
-        <Content to={document.url}>
-          <Heading>{document.titleWithDefault}</Heading>
-          <DocumentMetaWithViews
-            isDraft={document.isDraft}
-            document={document}
-          />
-
-          <React.Suspense fallback={<div />}>
-            <Editor
-              key={document.id}
-              defaultValue={document.getSummary()}
-              embedsDisabled
-              readOnly
-            />
-          </React.Suspense>
-        </Content>
-      )}
-    </>
-  );
-}
-
-const Content = styled(Link)`
-  cursor: var(--pointer);
-`;
-
-const Heading = styled.h2`
-  margin: 0 0 0.75em;
-  color: ${(props) => props.theme.text};
-`;
-
-export default observer(HoverPreviewDocument);
@@ -40,23 +40,23 @@ import { useTranslation } from "react-i18next";
 import { useMenuState, MenuButton, MenuItem } from "reakit/Menu";
 import styled, { useTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import { s } from "@shared/styles";
 import { colorPalette } from "@shared/utils/collections";
 import ContextMenu from "~/components/ContextMenu";
 import Flex from "~/components/Flex";
 import { LabelText } from "~/components/Input";
 import NudeButton from "~/components/NudeButton";
 import Text from "~/components/Text";
+import lazyWithRetry from "~/utils/lazyWithRetry";
+import DelayedMount from "./DelayedMount";

 const style = {
  width: 30,
  height: 30,
 };
-const TwitterPicker = React.lazy(
-  () =>
-    import(
-      /* webpackChunkName: "twitter-picker" */
-      "react-color/lib/components/twitter/Twitter"
-    )
+
+const TwitterPicker = lazyWithRetry(
+  () => import("react-color/lib/components/twitter/Twitter")
 );

 export const icons = {
@@ -241,24 +241,36 @@ function IconPicker({ onOpen, onClose, icon, color, onChange }: Props) {
        aria-label={t("Choose icon")}
      >
        <Icons>
-          {Object.keys(icons).map((name) => {
-            return (
-              <MenuItem
-                key={name}
-                onClick={() => onChange(color, name)}
-                {...menu}
-              >
-                {(props) => (
-                  <IconButton style={style} {...props}>
-                    <Icon as={icons[name].component} color={color} size={30} />
-                  </IconButton>
-                )}
-              </MenuItem>
-            );
-          })}
+          {Object.keys(icons).map((name, index) => (
+            <MenuItem
+              key={name}
+              onClick={() => onChange(color, name)}
+              {...menu}
+            >
+              {(props) => (
+                <IconButton
+                  style={
+                    {
+                      ...style,
+                      "--delay": `${index * 8}ms`,
+                    } as React.CSSProperties
+                  }
+                  {...props}
+                >
+                  <Icon as={icons[name].component} color={color} size={30} />
+                </IconButton>
+              )}
+            </MenuItem>
+          ))}
        </Icons>
        <Colors>
-          <React.Suspense fallback={<Loading>{t("Loading")}…</Loading>}>
+          <React.Suspense
+            fallback={
+              <DelayedMount>
+                <Text>{t("Loading")}…</Text>
+              </DelayedMount>
+            }
+          >
            <ColorPicker
              color={color}
              onChange={(color) => onChange(color.hex, icon)}
@@ -291,6 +303,7 @@ function IconPicker({ onOpen, onClose, icon, color, onChange }: Props) {

 const Icon = styled.svg`
  transition: fill 150ms ease-in-out;
+  transition-delay: var(--delay);
 `;

 const Colors = styled(Flex)`
@@ -310,7 +323,7 @@ const Icons = styled.div`
 `;

 const Button = styled(NudeButton)`
-  border: 1px solid ${(props) => props.theme.inputBorder};
+  border: 1px solid ${s("inputBorder")};
  width: 32px;
  height: 32px;
 `;
@@ -322,10 +335,6 @@ const IconButton = styled(NudeButton)`
  height: 30px;
 `;

-const Loading = styled(Text)`
-  padding: 16px;
-`;
-
 const ColorPicker = styled(TwitterPicker)`
  box-shadow: none !important;
  background: transparent !important;
--- a/Show More
+++ b/Show More