make relative

revert previous PRs
2025-08-17 07:19:41 +02:00 · 2021-03-12 18:35:16 +01:00 · 2021-03-12 18:34:51 +01:00
254 changed files with 15468 additions and 24157 deletions
--- a/.github/assets/crowdin.svg
+++ b/.github/assets/crowdin.svg
@@ -1,6 +0,0 @@
-<svg height="50" viewBox="0 0 257 50" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2">
-	<path fill="#fff" d="M-7.977-9.253h288.95v78.13H-7.977z" />
-	<path d="M67.626 32.315c-1.34 0-2.207 0-2.207-1.025 0-.236.079-.551.236-.946l4.02-8.907h12.929c1.34 0 2.128-.08 2.128.946 0 .315-.078.63-.236.946l-.788 1.734h5.439l1.104-2.444c.157-.394.157-.71.157-1.025 0-2.207-2.365-3.31-4.257-3.31H65.655l-5.754 12.691c-.158.394-.158.71-.158 1.025 0 2.365 1.97 3.547 4.73 3.547h20.26l1.26-3.232H67.627zm42.727-14.11H95.059l-6.937 17.342h5.518l5.519-14.032h8.435c1.34 0 2.05-.157 2.05.868 0 .315-.08.63-.237.946l-.789 1.734h5.518l1.104-2.444c.158-.394.158-.71.158-1.025 0-1.025-.552-1.892-1.734-2.522-.946-.473-2.208-.868-3.311-.868zm30.35 0h-21.285l-5.754 12.691c-.158.316-.158.63-.158 1.025 0 1.97 1.419 3.547 3.232 3.547h21.52l5.834-13.007c.158-.394.158-.71.158-1.024 0-2.05-1.734-3.233-3.547-3.233zm-6.701 14.19h-12.85c-1.34 0-1.97-.159-1.97-1.183 0-.316.079-.631.236-.946l4.178-8.908h12.929c1.26 0 1.891-.08 1.891.946 0 .315-.078.63-.236 1.025l-4.178 9.065zm13.953 3.152h28.695l7.41-17.264h-5.676l-6.149 14.032h-9.223l6.149-14.11h-5.676l-6.386 14.031h-6.306c-1.34 0-2.05-.157-2.05-1.182 0-.315.08-.63.237-.946l5.282-11.982h-5.519l-5.518 12.455c-1.103 3.39 2.207 4.966 4.73 4.966zm67.874-23.649l-5.913 1.577-1.97 4.73h-14.584c-3.548 0-6.7 1.576-8.278 4.73l-3.941 9.46c-.788 1.576.63 3.152 3.31 3.152h21.128l10.248-23.649zm-27.591 20.496c-1.183 0-1.735-.788-1.577-1.577l3.469-7.567c.788-1.813 2.68-1.892 4.414-1.892h11.825l-4.73 11.036h-13.401zm26.802 3.153l7.49-17.737-6.307 1.183-7.095 16.554h5.912zm8.435-19.944l1.656-3.705-6.228 1.261-1.577 3.705 6.15-1.26zm22.23 2.601h-20.417l-7.094 17.343h5.518l5.518-14.19h13.48c1.34 0 2.05-.078 2.05 1.026 0 .315-.08.63-.237.946l-5.518 12.297h5.518l5.834-13.007c.157-.315.157-.63.157-1.025 0-1.025-.552-1.892-1.734-2.522-.867-.473-1.892-.868-3.074-.868zm-192.82.868c-8.672-1.025-16.476.71-17.58 6.148 0 .237-.157 1.262-.157 1.42l1.419.157v2.207l-1.34-.157c.551 5.597 3.626 7.252 6.858 7.331h.236c1.42.079 2.917-.237 4.178-.788.08 0 .08-.08.08-.08v-.157c0-.079-.08-.079-.08-.157-.078 0-.078-.08-.157-.08-2.996.395-5.755-2.049-5.755-7.015 0-6.228 4.888-8.514 12.298-8.514.236.158.315-.237 0-.315zM36.803 30.344c.788 0 1.498.158 2.207.237.237 1.655 1.025 3.232 2.208 4.336-1.183-.158-2.208-.71-3.075-1.498a6.051 6.051 0 01-1.34-3.075zm2.68-5.439c0 .237-.157.552-.236.946h-1.025c-.552 0-1.025-.079-1.576-.158v-.157c.63-3.39 4.02-4.73 7.252-5.36a7.997 7.997 0 00-2.76 1.812c-.787.868-1.34 1.813-1.655 2.917z" fill="#2e3340" fill-rule="nonzero" />
-	<path d="M56.274 14.105c-6.543-1.813-34.055-4.02-34.055 11.273.946.158 1.577.315 2.05.394-.079 1.183 0 2.444 0 3.626l-2.444-.394c0 8.83 6.464 11.667 11.588 11.667.868 0 1.656-.078 2.523-.157 2.128-.237 4.178-.867 5.991-1.892.079 0 .079-.08.079-.08v-.157c0-.079-.079-.079-.079-.157-.079 0-.079-.08-.157-.08-4.336.868-10.17-.315-10.17-10.563 0-13.637 19.156-12.77 24.753-13.007.08 0 .08-.079.08-.079v-.157c0-.08 0-.08-.08-.158 0-.079 0-.079-.079-.079zM33.414 39.41a9.362 9.362 0 01-6.78-2.286c-1.892-1.656-3.074-3.942-3.31-6.385 1.655.236 3.704.394 5.438.473a9.43 9.43 0 001.577 4.808c.946 1.42 2.207 2.602 3.705 3.39h-.63zM28.92 24.984l-2.601-.237-2.602-.315c0-7.962 12.77-11.036 18.683-10.484-5.912 1.34-13.086 4.099-13.48 11.036z" fill="#2e3340" fill-rule="nonzero" />
-	<path d="M59.664 9.533c-7.962-2.68-17.027-4.02-25.462-3.941-12.22 0-27.67 3.626-28.064 16.081l3.31.788c-.393 1.577-.393 4.81-.393 4.81s-1.892-.553-2.917-.79c0 14.821 8.671 18.526 17.027 18.526 3.39 0 6.701-.552 9.854-1.734.08 0 .08-.08.08-.08v-.157c0-.079-.08-.079-.08-.157h-.157c-2.602 0-4.651.867-8.75-2.05-7.963-5.597-7.017-20.102 2.128-26.408 9.46-6.701 29.798-4.573 33.267-4.415h.157s.079 0 .079-.079v-.236l-.079-.158zm-36.42 34.292c-9.932 0-14.978-5.36-15.45-15.609 2.68.71 5.202 1.34 7.961 1.734-.157 4.02 1.262 7.962 4.02 11.037a12.488 12.488 0 005.046 2.916l-1.577-.078zM45.632 7.956c-12.06 0-26.014 1.42-28.773 14.584 0 0-7.41-1.182-9.066-1.576C9.843 4.409 38.38 5.67 49.89 7.956h-4.257z" fill="#2e3340" fill-rule="nonzero" />
-</svg>
--- a/.github/assets/sentry.svg
+++ b/.github/assets/sentry.svg
@@ -1,9 +0,0 @@
-<svg class="__sntry__ css-15xgryy e10nushx5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 222 66" height="50" style="background-color: rgb(255, 255, 255);">
-	<defs>
-		<style type="text/css">
-			@media (prefers-color-scheme: dark) {svg.__sntry__ { background-color: #584674 !important; }path.__sntry__ { fill: #ffffff !important; }}
-		</style>
-	</defs>
-	<path d="M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z" transform="translate(11, 11)" fill="#362d59" class="__sntry__">
-	</path>
-</svg>
--- a/.github/assets/vercel.svg
+++ b/.github/assets/vercel.svg
@@ -1,3 +0,0 @@
-<svg height="50" viewBox="0 0 164 50" xmlns="http://www.w3.org/2000/svg" style="background:#fff" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2">
-	<path d="M78.21 15.587c-5.672 0-9.762 3.864-9.762 9.661s4.604 9.66 10.276 9.66c3.427 0 6.448-1.416 8.319-3.805l-3.931-2.372c-1.038 1.186-2.615 1.879-4.388 1.879-2.461 0-4.552-1.342-5.328-3.489h14.397c.113-.601.18-1.223.18-1.879 0-5.79-4.09-9.655-9.763-9.655zm-4.86 7.783c.642-2.142 2.399-3.489 4.855-3.489 2.461 0 4.219 1.347 4.855 3.489h-9.71zm60.187-7.783c-5.673 0-9.763 3.864-9.763 9.661s4.604 9.66 10.276 9.66c3.427 0 6.449-1.416 8.319-3.805l-3.931-2.372c-1.038 1.186-2.615 1.879-4.388 1.879-2.461 0-4.552-1.342-5.328-3.489h14.397c.113-.601.18-1.223.18-1.879 0-5.79-4.09-9.655-9.762-9.655zm-4.856 7.783c.642-2.142 2.4-3.489 4.856-3.489 2.46 0 4.218 1.347 4.855 3.489h-9.711zm-20.054 1.878c0 3.22 2.015 5.367 5.139 5.367 2.116 0 3.704-1.003 4.52-2.64l3.947 2.378c-1.634 2.843-4.696 4.556-8.467 4.556-5.678 0-9.763-3.864-9.763-9.661s4.09-9.66 9.763-9.66c3.77 0 6.828 1.712 8.467 4.556l-3.946 2.377c-.817-1.637-2.405-2.64-4.521-2.64-3.12 0-5.139 2.147-5.139 5.367zm42.378-15.565v24.69h-4.624V9.682h4.624zM24.73 7l18.985 34.35H5.744L24.73 7zm47.465 2.683L57.956 35.446 43.72 9.683h5.338l8.9 16.102 8.898-16.102h5.339zm30.268 6.44v5.202a5.634 5.634 0 00-1.644-.263c-2.985 0-5.138 2.147-5.138 5.367v7.943h-4.624V16.124h4.624v4.938c0-2.727 3.036-4.938 6.782-4.938z" fill-rule="nonzero" />
-</svg>
--- a/.github/workflows/autorelease-excalidraw.yml
+++ b/.github/workflows/autorelease-excalidraw.yml
@@ -1,26 +0,0 @@
-name: Auto release @excalidraw/excalidraw-next
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  Auto-release-excalidraw-next:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 2
-      - name: Setup Node.js 14.x
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-      - name: Set up publish access
-        run: |
-          npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Auto release
-        run: |
-          yarn autorelease
--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,9 @@
 .env.test.local
 .envrc
 .eslintcache
-.history
 .idea
 .vercel
 .vscode
-.yarn
 *.log
 *.tgz
 build
@@ -22,4 +20,3 @@ package-lock.json
 static
 yarn-debug.log*
 yarn-error.log*
-src/packages/excalidraw/types
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@
 ### Option 1 - Manual

 1. Fork and clone the repo
-1. Run `yarn` to install dependencies
+1. Run `npm install` to install dependencies
 1. Create a branch for your PR with `git checkout -b your-branch-name`

 > To keep `master` branch pointing to remote repository and make pull requests from branches on your fork. To do this, run:
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ ARG NODE_ENV=production
 COPY . .
 RUN yarn build:app:docker

-FROM nginx:1.21-alpine
+FROM nginx:1.17-alpine

 COPY --from=build /opt/node_app/build /usr/share/nginx/html

--- a/README.md
+++ b/README.md
@@ -28,10 +28,6 @@ If you like the project, you can become a sponsor at [Open Collective](https://o

 <a href="https://opencollective.com/excalidraw#category-CONTRIBUTE" target="_blank"><img src="https://opencollective.com/excalidraw/tiers/backers.svg?avatarHeight=32"/></a>

-Last but not least, we're thankful to these companies for offering their services for free:
-
-[![Vercel](./.github/assets/vercel.svg)](https://vercel.com) [![Sentry](./.github/assets/sentry.svg)](https://sentry.io) [![Crowdin](./.github/assets/crowdin.svg)](https://crowdin.com)
-
 ## Documentation

 ### Shortcuts
@@ -93,7 +89,7 @@ These instructions will get you a copy of the project up and running on your loc
 #### Requirements

 - [Node.js](https://nodejs.org/en/)
- [Yarn](https://yarnpkg.com/getting-started/install) (v1 or v2.4.2+)
+- [Yarn](https://yarnpkg.com/getting-started/install)
 - [Git](https://git-scm.com/downloads)

 #### Clone the repo
@@ -102,20 +98,6 @@ These instructions will get you a copy of the project up and running on your loc
 git clone https://github.com/excalidraw/excalidraw.git
 ```

-#### Install the dependencies
-
-```bash
-yarn
-```
-
-#### Start the server
-
-```bash
-yarn start
-```
-
-Now you can open [http://localhost:3000](http://localhost:3000) and start coding in your favorite code editor.
-
 #### Commands

 | Command            | Description                       |
--- a/firebase-project/firebase.json
+++ b/firebase-project/firebase.json
@@ -2,8 +2,5 @@
  "firestore": {
    "rules": "firestore.rules",
    "indexes": "firestore.indexes.json"
-  },
-  "storage": {
-    "rules": "storage.rules"
  }
 }
--- a/firebase-project/storage.rules
+++ b/firebase-project/storage.rules
@@ -1,12 +0,0 @@
-rules_version = '2';
-service firebase.storage {
-  match /b/{bucket}/o {
-    match /{migrations} {
-      match /{scenes}/{scene} {
-      	allow get, write: if true;
-        // redundant, but let's be explicit'
-        allow list: if false;
-      }
-    }
-  }
-}
--- a/package.json
+++ b/package.json
@@ -19,35 +19,34 @@
    ]
  },
  "dependencies": {
-    "@sentry/browser": "6.2.5",
-    "@sentry/integrations": "6.2.5",
-    "@testing-library/jest-dom": "5.11.10",
-    "@testing-library/react": "11.2.6",
-    "@types/jest": "26.0.22",
-    "@types/react": "17.0.3",
-    "@types/react-dom": "17.0.3",
-    "@types/socket.io-client": "1.4.36",
-    "browser-fs-access": "0.18.0",
+    "@sentry/browser": "6.2.1",
+    "@sentry/integrations": "6.2.1",
+    "@testing-library/jest-dom": "5.11.9",
+    "@testing-library/react": "11.2.5",
+    "@types/jest": "26.0.20",
+    "@types/react": "17.0.2",
+    "@types/react-dom": "17.0.1",
+    "@types/socket.io-client": "1.4.35",
+    "browser-fs-access": "0.14.1",
    "clsx": "1.1.1",
-    "firebase": "8.3.3",
-    "i18next-browser-languagedetector": "6.1.0",
+    "firebase": "8.2.10",
+    "i18next-browser-languagedetector": "6.0.1",
    "lodash.throttle": "4.1.1",
-    "nanoid": "3.1.22",
+    "nanoid": "3.1.20",
    "open-color": "1.8.0",
    "pako": "1.0.11",
-    "perfect-freehand": "0.4.7",
    "png-chunk-text": "1.0.0",
    "png-chunks-encode": "1.0.0",
    "png-chunks-extract": "1.0.0",
    "points-on-curve": "0.2.0",
    "pwacompat": "2.0.17",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
    "react-scripts": "4.0.3",
-    "roughjs": "4.4.1",
-    "sass": "1.32.10",
+    "roughjs": "4.3.1",
+    "sass": "1.32.8",
    "socket.io-client": "2.3.1",
-    "typescript": "4.2.4"
+    "typescript": "4.2.3"
  },
  "devDependencies": {
    "@excalidraw/eslint-config": "1.0.0",
@@ -55,9 +54,9 @@
    "@types/lodash.throttle": "4.1.6",
    "@types/pako": "1.0.1",
    "@types/resize-observer-browser": "0.1.5",
-    "eslint-config-prettier": "8.3.0",
+    "eslint-config-prettier": "8.1.0",
    "eslint-plugin-prettier": "3.3.1",
-    "firebase-tools": "9.9.0",
+    "firebase-tools": "9.5.0",
    "husky": "4.3.8",
    "jest-canvas-mock": "2.3.1",
    "lint-staged": "10.5.4",
@@ -104,7 +103,6 @@
    "test:other": "yarn prettier --list-different",
    "test:typecheck": "tsc",
    "test:update": "yarn test:app --updateSnapshot --watchAll=false",
-    "test": "yarn test:app",
-    "autorelease": "node scripts/autorelease.js"
+    "test": "yarn test:app"
  }
 }
--- a/public/Virgil.woff2
+++ b/public/Virgil.woff2
--- a/public/index.html
+++ b/public/index.html
@@ -51,7 +51,8 @@
      name="twitter:description"
      content="Excalidraw is a whiteboard tool that lets you easily sketch diagrams that have a hand-drawn feel to them."
    />
-
+    <!-- OG tags require absolute url for images -->
+    <meta name="twitter:image" content="https://excalidraw.com/og-image.png" />
    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />

    <!-- Excalidraw version -->
@@ -87,8 +88,6 @@
    <link rel="stylesheet" href="fonts.css" type="text/css" />
    <script>
      window.EXCALIDRAW_ASSET_PATH = "/";
-      // setting this so that libraries installation reuses this window tab.
-      window.name = "_excalidraw";
    </script>
    <% if (process.env.REACT_APP_GOOGLE_ANALYTICS_ID) { %>
    <script
@@ -107,17 +106,16 @@

    <!-- FIXME: remove this when we update CRA (fix SW caching) -->
    <style>
-      body,
-      html {
+      body {
        margin: 0;
        --ui-font: system-ui, BlinkMacSystemFont, -apple-system, Segoe UI,
          Roboto, Helvetica, Arial, sans-serif;
        font-family: var(--ui-font);
        -webkit-text-size-adjust: 100%;
-
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
+        -webkit-user-select: none;
+        user-select: none;
+        width: 100vw;
+        height: 100vh;
      }

      .visually-hidden {
@@ -127,7 +125,6 @@
        overflow: hidden;
        clip: rect(1px, 1px, 1px, 1px);
        white-space: nowrap; /* added line */
-        user-select: none;
      }

      .LoadingMessage {
@@ -150,24 +147,6 @@
        color: var(--popup-text-color);
        font-size: 1.3em;
      }
-      #root {
-        height: 100%;
-        -webkit-touch-callout: none;
-        -webkit-user-select: none;
-        -khtml-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-
-        @media screen and (min-width: 1200px) {
-          -webkit-touch-callout: default;
-          -webkit-user-select: auto;
-          -khtml-user-select: auto;
-          -moz-user-select: auto;
-          -ms-user-select: auto;
-          user-select: auto;
-        }
-      }
    </style>
  </head>

--- a/public/manifest.json
+++ b/public/manifest.json
@@ -26,50 +26,5 @@
      }
    }
  ],
-  "capture_links": "new_client",
-  "share_target": {
-    "action": "/web-share-target",
-    "method": "POST",
-    "enctype": "multipart/form-data",
-    "params": {
-      "files": [
-        {
-          "name": "file",
-          "accept": ["application/vnd.excalidraw+json", "application/json", ".excalidraw"]
-        }
-      ]
-    }
-  },
-  "screenshots": [
-    {
-      "src": "/screenshots/virtual-whiteboard.png",
-      "type": "image/png",
-      "sizes": "462x945"
-    },
-    {
-      "src": "/screenshots/wireframe.png",
-      "type": "image/png",
-      "sizes": "462x945"
-    },
-    {
-      "src": "/screenshots/illustration.png",
-      "type": "image/png",
-      "sizes": "462x945"
-    },
-    {
-      "src": "/screenshots/shapes.png",
-      "type": "image/png",
-      "sizes": "462x945"
-    },
-    {
-      "src": "/screenshots/collaboration.png",
-      "type": "image/png",
-      "sizes": "462x945"
-    },
-    {
-      "src": "/screenshots/export.png",
-      "type": "image/png",
-      "sizes": "462x945"
-    }
-  ]
+  "capture_links": "new_client"
 }
--- a/public/screenshots/collaboration.png
+++ b/public/screenshots/collaboration.png
--- a/public/screenshots/export.png
+++ b/public/screenshots/export.png
--- a/public/screenshots/illustration.png
+++ b/public/screenshots/illustration.png
--- a/public/screenshots/shapes.png
+++ b/public/screenshots/shapes.png
--- a/public/screenshots/virtual-whiteboard.png
+++ b/public/screenshots/virtual-whiteboard.png
--- a/public/screenshots/wireframe.png
+++ b/public/screenshots/wireframe.png
--- a/scripts/autorelease.js
+++ b/scripts/autorelease.js
@@ -1,51 +0,0 @@
-const fs = require("fs");
-const { exec, execSync } = require("child_process");
-
-const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-const excalidrawPackage = `${excalidrawDir}/package.json`;
-const pkg = require(excalidrawPackage);
-
-const getShortCommitHash = () => {
-  return execSync("git rev-parse --short HEAD").toString().trim();
-};
-
-const publish = () => {
-  try {
-    execSync(`yarn  --frozen-lockfile`);
-    execSync(`yarn --frozen-lockfile`, { cwd: excalidrawDir });
-    execSync(`yarn run build:umd`, { cwd: excalidrawDir });
-    execSync(`yarn --cwd ${excalidrawDir} publish`);
-  } catch (e) {
-    console.error(e);
-  }
-};
-
-// get files changed between prev and head commit
-exec(`git diff --name-only HEAD^ HEAD`, async (error, stdout, stderr) => {
-  if (error || stderr) {
-    console.error(error);
-    process.exit(1);
-  }
-
-  const changedFiles = stdout.trim().split("\n");
-  const filesToIgnoreRegex = /src\/excalidraw-app|packages\/utils/;
-
-  const excalidrawPackageFiles = changedFiles.filter((file) => {
-    return file.indexOf("src") >= 0 && !filesToIgnoreRegex.test(file);
-  });
-
-  if (!excalidrawPackageFiles.length) {
-    process.exit(0);
-  }
-
-  // update package.json
-  pkg.version = `${pkg.version}-${getShortCommitHash()}`;
-  pkg.name = "@excalidraw/excalidraw-next";
-  fs.writeFileSync(excalidrawPackage, JSON.stringify(pkg, null, 2), "utf8");
-
-  // update readme
-  const data = fs.readFileSync(`${excalidrawDir}/README_NEXT.md`, "utf8");
-  fs.writeFileSync(`${excalidrawDir}/README.md`, data, "utf8");
-
-  publish();
-});
--- a/scripts/locales-coverage-description.js
+++ b/scripts/locales-coverage-description.js
@@ -37,9 +37,6 @@ const crowdinMap = {
  "uk-UA": "en-uk",
  "zh-CN": "en-zhcn",
  "zh-TW": "en-zhtw",
-  "lv-LV": "en-lv",
-  "cs-CZ": "en-cs",
-  "kk-KZ": "en-kk",
 };

 const flags = {
@@ -77,9 +74,6 @@ const flags = {
  "uk-UA": "🇺🇦",
  "zh-CN": "🇨🇳",
  "zh-TW": "🇹🇼",
-  "lv-LV": "🇱🇻",
-  "cs-CZ": "🇨🇿",
-  "kk-KZ": "🇰🇿",
 };

 const languages = {
@@ -117,9 +111,6 @@ const languages = {
  "uk-UA": "Українська",
  "zh-CN": "简体中文",
  "zh-TW": "繁體中文",
-  "lv-LV": "Latviešu",
-  "cs-CZ": "Česky",
-  "kk-KZ": "Қазақ тілі",
 };

 const percentages = fs.readFileSync(
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -1,39 +0,0 @@
-const fs = require("fs");
-const util = require("util");
-const exec = util.promisify(require("child_process").exec);
-const updateReadme = require("./updateReadme");
-const updateChangelog = require("./updateChangelog");
-
-const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-const excalidrawPackage = `${excalidrawDir}/package.json`;
-
-const updatePackageVersion = (nextVersion) => {
-  const pkg = require(excalidrawPackage);
-  pkg.version = nextVersion;
-  const content = `${JSON.stringify(pkg, null, 2)}\n`;
-  fs.writeFileSync(excalidrawPackage, content, "utf-8");
-};
-
-const release = async (nextVersion) => {
-  try {
-    updateReadme();
-    await updateChangelog(nextVersion);
-    updatePackageVersion(nextVersion);
-    await exec(`git add -u`);
-    await exec(
-      `git commit -m "docs: release excalidraw@excalidraw@${nextVersion}  🎉"`,
-    );
-    /* eslint-disable no-console */
-    console.log("Done!");
-  } catch (e) {
-    console.error(e);
-    process.exit(1);
-  }
-};
-
-const nextVersion = process.argv.slice(2)[0];
-if (!nextVersion) {
-  console.error("Pass the next version to release!");
-  process.exit(1);
-}
-release(nextVersion);
--- a/scripts/updateChangelog.js
+++ b/scripts/updateChangelog.js
@@ -1,97 +0,0 @@
-const fs = require("fs");
-const util = require("util");
-const exec = util.promisify(require("child_process").exec);
-
-const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-const excalidrawPackage = `${excalidrawDir}/package.json`;
-const pkg = require(excalidrawPackage);
-const lastVersion = pkg.version;
-const existingChangeLog = fs.readFileSync(
-  `${excalidrawDir}/CHANGELOG.md`,
-  "utf8",
-);
-
-const supportedTypes = ["feat", "fix", "style", "refactor", "perf", "build"];
-const headerForType = {
-  feat: "Features",
-  fix: "Fixes",
-  style: "Styles",
-  refactor: " Refactor",
-  perf: "Performance",
-  build: "Build",
-};
-
-const getCommitHashForLastVersion = async () => {
-  try {
-    const commitMessage = `"release @excalidraw/excalidraw@${lastVersion}"`;
-    const { stdout } = await exec(
-      `git log --format=format:"%H" --grep=${commitMessage}`,
-    );
-    return stdout;
-  } catch (e) {
-    console.error(e);
-  }
-};
-
-const getLibraryCommitsSinceLastRelease = async () => {
-  const commitHash = await getCommitHashForLastVersion();
-  const { stdout } = await exec(
-    `git log --pretty=format:%s ${commitHash}...master`,
-  );
-  const commitsSinceLastRelease = stdout.split("\n");
-  const commitList = {};
-  supportedTypes.forEach((type) => {
-    commitList[type] = [];
-  });
-
-  commitsSinceLastRelease.forEach((commit) => {
-    const indexOfColon = commit.indexOf(":");
-    const type = commit.slice(0, indexOfColon);
-    if (!supportedTypes.includes(type)) {
-      return;
-    }
-    const messageWithoutType = commit.slice(indexOfColon + 1).trim();
-    const messageWithCapitalizeFirst =
-      messageWithoutType.charAt(0).toUpperCase() + messageWithoutType.slice(1);
-    const prNumber = commit.match(/\(#([0-9]*)\)/)[1];
-
-    // return if the changelog already contains the pr number which would happen for package updates
-    if (existingChangeLog.includes(prNumber)) {
-      return;
-    }
-    const prMarkdown = `[#${prNumber}](https://github.com/excalidraw/excalidraw/pull/${prNumber})`;
-    const messageWithPRLink = messageWithCapitalizeFirst.replace(
-      /\(#[0-9]*\)/,
-      prMarkdown,
-    );
-    commitList[type].push(messageWithPRLink);
-  });
-  return commitList;
-};
-
-const updateChangelog = async (nextVersion) => {
-  const commitList = await getLibraryCommitsSinceLastRelease();
-  let changelogForLibrary =
-    "## Excalidraw Library\n\n**_This section lists the updates made to the excalidraw library and will not affect the integration._**\n\n";
-  supportedTypes.forEach((type) => {
-    if (commitList[type].length) {
-      changelogForLibrary += `### ${headerForType[type]}\n\n`;
-      const commits = commitList[type];
-      commits.forEach((commit) => {
-        changelogForLibrary += `- ${commit}\n\n`;
-      });
-    }
-  });
-  changelogForLibrary += "---\n";
-  const lastVersionIndex = existingChangeLog.indexOf(`## ${lastVersion}`);
-  let updatedContent =
-    existingChangeLog.slice(0, lastVersionIndex) +
-    changelogForLibrary +
-    existingChangeLog.slice(lastVersionIndex);
-  const currentDate = new Date().toISOString().slice(0, 10);
-  const newVersion = `## ${nextVersion} (${currentDate})`;
-  updatedContent = updatedContent.replace(`## Unreleased`, newVersion);
-  fs.writeFileSync(`${excalidrawDir}/CHANGELOG.md`, updatedContent, "utf8");
-};
-
-module.exports = updateChangelog;
--- a/scripts/updateReadme.js
+++ b/scripts/updateReadme.js
@@ -1,27 +0,0 @@
-const fs = require("fs");
-
-const updateReadme = () => {
-  const excalidrawDir = `${__dirname}/../src/packages/excalidraw`;
-  let data = fs.readFileSync(`${excalidrawDir}/README_NEXT.md`, "utf8");
-
-  // remove note for unstable release
-  data = data.replace(
-    /<!-- unstable-readme-start-->[\s\S]*?<!-- unstable-readme-end-->/,
-    "",
-  );
-
-  // replace "excalidraw-next" with "excalidraw"
-  data = data.replace(/excalidraw-next/g, "excalidraw");
-  data = data.trim();
-
-  const demoIndex = data.indexOf("### Demo");
-  const excalidrawNextNote =
-    "#### Note\n\n**If you don't want to wait for the next stable release and try out the unreleased changes you can use [@excalidraw/excalidraw-next](https://www.npmjs.com/package/@excalidraw/excalidraw-next).**\n\n";
-  // Add excalidraw next note to try out for unreleased changes
-  data = data.slice(0, demoIndex) + excalidrawNextNote + data.slice(demoIndex);
-
-  // update readme
-  fs.writeFileSync(`${excalidrawDir}/README.md`, data, "utf8");
-};
-
-module.exports = updateReadme;
--- a/src/actions/actionAddToLibrary.ts
+++ b/src/actions/actionAddToLibrary.ts
@@ -2,20 +2,18 @@ import { register } from "./register";
 import { getSelectedElements } from "../scene";
 import { getNonDeletedElements } from "../element";
 import { deepCopyElement } from "../element/newElement";
+import { Library } from "../data/library";

 export const actionAddToLibrary = register({
  name: "addToLibrary",
-  perform: (elements, appState, _, app) => {
+  perform: (elements, appState) => {
    const selectedElements = getSelectedElements(
      getNonDeletedElements(elements),
      appState,
    );

-    app.library.loadLibrary().then((items) => {
-      app.library.saveLibrary([
-        ...items,
-        selectedElements.map(deepCopyElement),
-      ]);
+    Library.loadLibrary().then((items) => {
+      Library.saveLibrary([...items, selectedElements.map(deepCopyElement)]);
    });
    return false;
  },
--- a/src/actions/actionAlign.tsx
+++ b/src/actions/actionAlign.tsx
@@ -58,7 +58,7 @@ export const actionAlignTop = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<AlignTopIcon theme={appState.theme} />}
+      icon={<AlignTopIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.alignTop")} — ${getShortcutKey(
        "CtrlOrCmd+Shift+Up",
@@ -87,7 +87,7 @@ export const actionAlignBottom = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<AlignBottomIcon theme={appState.theme} />}
+      icon={<AlignBottomIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.alignBottom")} — ${getShortcutKey(
        "CtrlOrCmd+Shift+Down",
@@ -116,7 +116,7 @@ export const actionAlignLeft = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<AlignLeftIcon theme={appState.theme} />}
+      icon={<AlignLeftIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.alignLeft")} — ${getShortcutKey(
        "CtrlOrCmd+Shift+Left",
@@ -145,7 +145,7 @@ export const actionAlignRight = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<AlignRightIcon theme={appState.theme} />}
+      icon={<AlignRightIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.alignRight")} — ${getShortcutKey(
        "CtrlOrCmd+Shift+Right",
@@ -172,7 +172,7 @@ export const actionAlignVerticallyCentered = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<CenterVerticallyIcon theme={appState.theme} />}
+      icon={<CenterVerticallyIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={t("labels.centerVertically")}
      aria-label={t("labels.centerVertically")}
@@ -197,7 +197,7 @@ export const actionAlignHorizontallyCentered = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<CenterHorizontallyIcon theme={appState.theme} />}
+      icon={<CenterHorizontallyIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={t("labels.centerHorizontally")}
      aria-label={t("labels.centerHorizontally")}
--- a/src/actions/actionCanvas.tsx
+++ b/src/actions/actionCanvas.tsx
@@ -3,13 +3,12 @@ import { getDefaultAppState } from "../appState";
 import { ColorPicker } from "../components/ColorPicker";
 import { resetZoom, trash, zoomIn, zoomOut } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
-import { DarkModeToggle } from "../components/DarkModeToggle";
 import { ZOOM_STEP } from "../constants";
 import { getCommonBounds, getNonDeletedElements } from "../element";
 import { newElementWith } from "../element/mutateElement";
 import { ExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import { CODES, KEYS } from "../keys";
 import { getNormalizedZoom, getSelectedElements } from "../scene";
 import { centerScrollOn } from "../scene/scroll";
@@ -22,8 +21,8 @@ export const actionChangeViewBackgroundColor = register({
  name: "changeViewBackgroundColor",
  perform: (_, appState, value) => {
    return {
-      appState: { ...appState, ...value },
-      commitToHistory: !!value.viewBackgroundColor,
+      appState: { ...appState, viewBackgroundColor: value },
+      commitToHistory: true,
    };
  },
  PanelComponent: ({ appState, updateData }) => {
@@ -33,12 +32,7 @@ export const actionChangeViewBackgroundColor = register({
          label={t("labels.canvasBackground")}
          type="canvasBackground"
          color={appState.viewBackgroundColor}
-          onChange={(color) => updateData({ viewBackgroundColor: color })}
-          isActive={appState.openPopup === "canvasColorPicker"}
-          setActive={(active) =>
-            updateData({ openPopup: active ? "canvasColorPicker" : null })
-          }
-          data-testid="canvas-background-picker"
+          onChange={(color) => updateData(color)}
        />
      </div>
    );
@@ -54,11 +48,12 @@ export const actionClearCanvas = register({
      ),
      appState: {
        ...getDefaultAppState(),
-        theme: appState.theme,
+        appearance: appState.appearance,
        elementLocked: appState.elementLocked,
        exportBackground: appState.exportBackground,
        exportEmbedScene: appState.exportEmbedScene,
        gridSize: appState.gridSize,
+        shouldAddWatermark: appState.shouldAddWatermark,
        showStats: appState.showStats,
        pasteDialog: appState.pasteDialog,
      },
@@ -77,7 +72,6 @@ export const actionClearCanvas = register({
          updateData(null);
        }
      }}
-      data-testid="clear-canvas-button"
    />
  ),
 });
@@ -264,27 +258,3 @@ export const actionZoomToFit = register({
    !event.altKey &&
    !event[KEYS.CTRL_OR_CMD],
 });
-
-export const actionToggleTheme = register({
-  name: "toggleTheme",
-  perform: (_, appState, value) => {
-    return {
-      appState: {
-        ...appState,
-        theme: value || (appState.theme === "light" ? "dark" : "light"),
-      },
-      commitToHistory: false,
-    };
-  },
-  PanelComponent: ({ appState, updateData }) => (
-    <div style={{ marginInlineStart: "0.25rem" }}>
-      <DarkModeToggle
-        value={appState.theme}
-        onChange={(theme) => {
-          updateData(theme);
-        }}
-      />
-    </div>
-  ),
-  keyTest: (event) => event.altKey && event.shiftKey && event.code === CODES.D,
-});
--- a/src/actions/actionClipboard.tsx
+++ b/src/actions/actionClipboard.tsx
@@ -17,8 +17,7 @@ export const actionCopy = register({
    };
  },
  contextItemLabel: "labels.copy",
-  // don't supply a shortcut since we handle this conditionally via onCopy event
-  keyTest: undefined,
+  // Don't assign keyTest since its handled via copy event
 });

 export const actionCut = register({
@@ -50,6 +49,7 @@ export const actionCopyAsSvg = register({
          ? selectedElements
          : getNonDeletedElements(elements),
        appState,
+        app.canvas,
        appState,
      );
      return {
@@ -88,6 +88,7 @@ export const actionCopyAsPng = register({
          ? selectedElements
          : getNonDeletedElements(elements),
        appState,
+        app.canvas,
        appState,
      );
      return {
--- a/src/actions/actionDistribute.tsx
+++ b/src/actions/actionDistribute.tsx
@@ -53,7 +53,7 @@ export const distributeHorizontally = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<DistributeHorizontallyIcon theme={appState.theme} />}
+      icon={<DistributeHorizontallyIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.distributeHorizontally")} — ${getShortcutKey(
        "Alt+H",
@@ -81,7 +81,7 @@ export const distributeVertically = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<DistributeVerticallyIcon theme={appState.theme} />}
+      icon={<DistributeVerticallyIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.distributeVertically")} — ${getShortcutKey("Alt+V")}`}
      aria-label={t("labels.distributeVertically")}
--- a/src/actions/actionExport.tsx
+++ b/src/actions/actionExport.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { trackEvent } from "../analytics";
-import { load, questionCircle, saveAs } from "../components/icons";
+import { load, questionCircle, save, saveAs } from "../components/icons";
 import { ProjectName } from "../components/ProjectName";
 import { ToolButton } from "../components/ToolButton";
 import "../components/ToolIcon.scss";
@@ -8,16 +8,9 @@ import { Tooltip } from "../components/Tooltip";
 import { DarkModeToggle, Appearence } from "../components/DarkModeToggle";
 import { loadFromJSON, saveAsJSON } from "../data";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import { KEYS } from "../keys";
 import { register } from "./register";
-import { supported as fsSupported } from "browser-fs-access";
-import { CheckboxItem } from "../components/CheckboxItem";
-import { getExportSize } from "../scene/export";
-import { DEFAULT_EXPORT_PADDING, EXPORT_SCALES } from "../constants";
-import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { getNonDeletedElements } from "../element";
-import { ActiveFile } from "../components/ActiveFile";

 export const actionChangeProjectName = register({
  name: "changeProjectName",
@@ -25,66 +18,15 @@ export const actionChangeProjectName = register({
    trackEvent("change", "title");
    return { appState: { ...appState, name: value }, commitToHistory: false };
  },
-  PanelComponent: ({ appState, updateData, appProps }) => (
+  PanelComponent: ({ appState, updateData }) => (
    <ProjectName
      label={t("labels.fileTitle")}
      value={appState.name || "Unnamed"}
      onChange={(name: string) => updateData(name)}
-      isNameEditable={
-        typeof appProps.name === "undefined" && !appState.viewModeEnabled
-      }
    />
  ),
 });

-export const actionChangeExportScale = register({
-  name: "changeExportScale",
-  perform: (_elements, appState, value) => {
-    return {
-      appState: { ...appState, exportScale: value },
-      commitToHistory: false,
-    };
-  },
-  PanelComponent: ({ elements: allElements, appState, updateData }) => {
-    const elements = getNonDeletedElements(allElements);
-    const exportSelected = isSomeElementSelected(elements, appState);
-    const exportedElements = exportSelected
-      ? getSelectedElements(elements, appState)
-      : elements;
-
-    return (
-      <>
-        {EXPORT_SCALES.map((s) => {
-          const [width, height] = getExportSize(
-            exportedElements,
-            DEFAULT_EXPORT_PADDING,
-            s,
-          );
-
-          const scaleButtonTitle = `${t(
-            "buttons.scale",
-          )} ${s}x (${width}x${height})`;
-
-          return (
-            <ToolButton
-              key={s}
-              size="s"
-              type="radio"
-              icon={`${s}x`}
-              name="export-canvas-scale"
-              title={scaleButtonTitle}
-              aria-label={scaleButtonTitle}
-              id="export-canvas-scale"
-              checked={s === appState.exportScale}
-              onChange={() => updateData(s)}
-            />
-          );
-        })}
-      </>
-    );
-  },
-});
-
 export const actionChangeExportBackground = register({
  name: "changeExportBackground",
  perform: (_elements, appState, value) => {
@@ -94,12 +36,14 @@ export const actionChangeExportBackground = register({
    };
  },
  PanelComponent: ({ appState, updateData }) => (
-    <CheckboxItem
-      checked={appState.exportBackground}
-      onChange={(checked) => updateData(checked)}
-    >
+    <label>
+      <input
+        type="checkbox"
+        checked={appState.exportBackground}
+        onChange={(event) => updateData(event.target.checked)}
+      />{" "}
      {t("labels.withBackground")}
-    </CheckboxItem>
+    </label>
  ),
 });

@@ -112,20 +56,46 @@ export const actionChangeExportEmbedScene = register({
    };
  },
  PanelComponent: ({ appState, updateData }) => (
-    <CheckboxItem
-      checked={appState.exportEmbedScene}
-      onChange={(checked) => updateData(checked)}
-    >
+    <label style={{ display: "flex" }}>
+      <input
+        type="checkbox"
+        checked={appState.exportEmbedScene}
+        onChange={(event) => updateData(event.target.checked)}
+      />{" "}
      {t("labels.exportEmbedScene")}
-      <Tooltip label={t("labels.exportEmbedScene_details")} long={true}>
-        <div className="Tooltip-icon">{questionCircle}</div>
+      <Tooltip
+        label={t("labels.exportEmbedScene_details")}
+        position="above"
+        long={true}
+      >
+        <div className="TooltipIcon">{questionCircle}</div>
      </Tooltip>
-    </CheckboxItem>
+    </label>
  ),
 });

-export const actionSaveToActiveFile = register({
-  name: "saveToActiveFile",
+export const actionChangeShouldAddWatermark = register({
+  name: "changeShouldAddWatermark",
+  perform: (_elements, appState, value) => {
+    return {
+      appState: { ...appState, shouldAddWatermark: value },
+      commitToHistory: false,
+    };
+  },
+  PanelComponent: ({ appState, updateData }) => (
+    <label>
+      <input
+        type="checkbox"
+        checked={appState.shouldAddWatermark}
+        onChange={(event) => updateData(event.target.checked)}
+      />{" "}
+      {t("labels.addWatermark")}
+    </label>
+  ),
+});
+
+export const actionSaveScene = register({
+  name: "saveScene",
  perform: async (elements, appState, value) => {
    const fileHandleExists = !!appState.fileHandle;
    try {
@@ -154,16 +124,20 @@ export const actionSaveToActiveFile = register({
  },
  keyTest: (event) =>
    event.key === KEYS.S && event[KEYS.CTRL_OR_CMD] && !event.shiftKey,
-  PanelComponent: ({ updateData, appState }) => (
-    <ActiveFile
-      onSave={() => updateData(null)}
-      fileName={appState.fileHandle?.name}
+  PanelComponent: ({ updateData }) => (
+    <ToolButton
+      type="button"
+      icon={save}
+      title={t("buttons.save")}
+      aria-label={t("buttons.save")}
+      showAriaLabel={useIsMobile()}
+      onClick={() => updateData(null)}
    />
  ),
 });

-export const actionSaveFileToDisk = register({
-  name: "saveFileToDisk",
+export const actionSaveAsScene = register({
+  name: "saveAsScene",
  perform: async (elements, appState, value) => {
    try {
      const { fileHandle } = await saveAsJSON(elements, {
@@ -187,9 +161,10 @@ export const actionSaveFileToDisk = register({
      title={t("buttons.saveAs")}
      aria-label={t("buttons.saveAs")}
      showAriaLabel={useIsMobile()}
-      hidden={!fsSupported}
+      hidden={
+        !("chooseFileSystemEntries" in window || "showOpenFilePicker" in window)
+      }
      onClick={() => updateData(null)}
-      data-testid="save-as-button"
    />
  ),
 });
@@ -201,7 +176,7 @@ export const actionLoadScene = register({
      const {
        elements: loadedElements,
        appState: loadedAppState,
-      } = await loadFromJSON(appState, elements);
+      } = await loadFromJSON(appState);
      return {
        elements: loadedElements,
        appState: loadedAppState,
@@ -227,7 +202,6 @@ export const actionLoadScene = register({
      aria-label={t("buttons.load")}
      showAriaLabel={useIsMobile()}
      onClick={updateData}
-      data-testid="load-button"
    />
  ),
 });
@@ -251,8 +225,8 @@ export const actionExportWithDarkMode = register({
    >
      <DarkModeToggle
        value={appState.exportWithDarkMode ? "dark" : "light"}
-        onChange={(theme: Appearence) => {
-          updateData(theme === "dark");
+        onChange={(appearance: Appearence) => {
+          updateData(appearance === "dark");
        }}
        title={t("labels.toggleExportColorScheme")}
      />
--- a/src/actions/actionFinalize.tsx
+++ b/src/actions/actionFinalize.tsx
@@ -18,7 +18,7 @@ import { isBindingElement } from "../element/typeChecks";

 export const actionFinalize = register({
  name: "finalize",
-  perform: (elements, appState, _, { canvas, focusContainer }) => {
+  perform: (elements, appState, _, { canvas }) => {
    if (appState.editingLinearElement) {
      const {
        elementId,
@@ -51,19 +51,19 @@ export const actionFinalize = register({

    let newElements = elements;
    if (window.document.activeElement instanceof HTMLElement) {
-      focusContainer();
+      window.document.activeElement.blur();
    }

    const multiPointElement = appState.multiElement
      ? appState.multiElement
-      : appState.editingElement?.type === "freedraw"
+      : appState.editingElement?.type === "draw"
      ? appState.editingElement
      : null;

    if (multiPointElement) {
      // pen and mouse have hover
      if (
-        multiPointElement.type !== "freedraw" &&
+        multiPointElement.type !== "draw" &&
        appState.lastPointerDownWith !== "touch"
      ) {
        const { points, lastCommittedPoint } = multiPointElement;
@@ -86,7 +86,7 @@ export const actionFinalize = register({
      const isLoop = isPathALoop(multiPointElement.points, appState.zoom.value);
      if (
        multiPointElement.type === "line" ||
-        multiPointElement.type === "freedraw"
+        multiPointElement.type === "draw"
      ) {
        if (isLoop) {
          const linePoints = multiPointElement.points;
@@ -118,24 +118,22 @@ export const actionFinalize = register({
        );
      }

-      if (!appState.elementLocked && appState.elementType !== "freedraw") {
+      if (!appState.elementLocked && appState.elementType !== "draw") {
        appState.selectedElementIds[multiPointElement.id] = true;
      }
    }
-
    if (
-      (!appState.elementLocked && appState.elementType !== "freedraw") ||
+      (!appState.elementLocked && appState.elementType !== "draw") ||
      !multiPointElement
    ) {
      resetCursor(canvas);
    }
-
    return {
      elements: newElements,
      appState: {
        ...appState,
        elementType:
-          (appState.elementLocked || appState.elementType === "freedraw") &&
+          (appState.elementLocked || appState.elementType === "draw") &&
          multiPointElement
            ? appState.elementType
            : "selection",
@@ -147,14 +145,14 @@ export const actionFinalize = register({
        selectedElementIds:
          multiPointElement &&
          !appState.elementLocked &&
-          appState.elementType !== "freedraw"
+          appState.elementType !== "draw"
            ? {
                ...appState.selectedElementIds,
                [multiPointElement.id]: true,
              }
            : appState.selectedElementIds,
      },
-      commitToHistory: appState.elementType === "freedraw",
+      commitToHistory: appState.elementType === "draw",
    };
  },
  keyTest: (event, appState) =>
--- a/src/actions/actionFlip.ts
+++ b/src/actions/actionFlip.ts
@@ -1,207 +0,0 @@
-import { register } from "./register";
-import { getSelectedElements } from "../scene";
-import { getElementMap, getNonDeletedElements } from "../element";
-import { mutateElement } from "../element/mutateElement";
-import { ExcalidrawElement, NonDeleted } from "../element/types";
-import { normalizeAngle, resizeSingleElement } from "../element/resizeElements";
-import { AppState } from "../types";
-import { getTransformHandles } from "../element/transformHandles";
-import { isFreeDrawElement, isLinearElement } from "../element/typeChecks";
-import { updateBoundElements } from "../element/binding";
-import { LinearElementEditor } from "../element/linearElementEditor";
-
-const enableActionFlipHorizontal = (
-  elements: readonly ExcalidrawElement[],
-  appState: AppState,
-) => {
-  const eligibleElements = getSelectedElements(
-    getNonDeletedElements(elements),
-    appState,
-  );
-  return eligibleElements.length === 1 && eligibleElements[0].type !== "text";
-};
-
-const enableActionFlipVertical = (
-  elements: readonly ExcalidrawElement[],
-  appState: AppState,
-) => {
-  const eligibleElements = getSelectedElements(
-    getNonDeletedElements(elements),
-    appState,
-  );
-  return eligibleElements.length === 1;
-};
-
-export const actionFlipHorizontal = register({
-  name: "flipHorizontal",
-  perform: (elements, appState) => {
-    return {
-      elements: flipSelectedElements(elements, appState, "horizontal"),
-      appState,
-      commitToHistory: true,
-    };
-  },
-  keyTest: (event) => event.shiftKey && event.code === "KeyH",
-  contextItemLabel: "labels.flipHorizontal",
-  contextItemPredicate: (elements, appState) =>
-    enableActionFlipHorizontal(elements, appState),
-});
-
-export const actionFlipVertical = register({
-  name: "flipVertical",
-  perform: (elements, appState) => {
-    return {
-      elements: flipSelectedElements(elements, appState, "vertical"),
-      appState,
-      commitToHistory: true,
-    };
-  },
-  keyTest: (event) => event.shiftKey && event.code === "KeyV",
-  contextItemLabel: "labels.flipVertical",
-  contextItemPredicate: (elements, appState) =>
-    enableActionFlipVertical(elements, appState),
-});
-
-const flipSelectedElements = (
-  elements: readonly ExcalidrawElement[],
-  appState: Readonly<AppState>,
-  flipDirection: "horizontal" | "vertical",
-) => {
-  const selectedElements = getSelectedElements(
-    getNonDeletedElements(elements),
-    appState,
-  );
-
-  // remove once we allow for groups of elements to be flipped
-  if (selectedElements.length > 1) {
-    return elements;
-  }
-
-  const updatedElements = flipElements(
-    selectedElements,
-    appState,
-    flipDirection,
-  );
-
-  const updatedElementsMap = getElementMap(updatedElements);
-
-  return elements.map((element) => updatedElementsMap[element.id] || element);
-};
-
-const flipElements = (
-  elements: NonDeleted<ExcalidrawElement>[],
-  appState: AppState,
-  flipDirection: "horizontal" | "vertical",
-): ExcalidrawElement[] => {
-  for (let i = 0; i < elements.length; i++) {
-    flipElement(elements[i], appState);
-    // If vertical flip, rotate an extra 180
-    if (flipDirection === "vertical") {
-      rotateElement(elements[i], Math.PI);
-    }
-  }
-  return elements;
-};
-
-const flipElement = (
-  element: NonDeleted<ExcalidrawElement>,
-  appState: AppState,
-) => {
-  const originalX = element.x;
-  const originalY = element.y;
-  const width = element.width;
-  const height = element.height;
-  const originalAngle = normalizeAngle(element.angle);
-
-  let finalOffsetX = 0;
-  if (isLinearElement(element) || isFreeDrawElement(element)) {
-    finalOffsetX =
-      element.points.reduce((max, point) => Math.max(max, point[0]), 0) * 2 -
-      element.width;
-  }
-
-  // Rotate back to zero, if necessary
-  mutateElement(element, {
-    angle: normalizeAngle(0),
-  });
-  // Flip unrotated by pulling TransformHandle to opposite side
-  const transformHandles = getTransformHandles(element, appState.zoom);
-  let usingNWHandle = true;
-  let newNCoordsX = 0;
-  let nHandle = transformHandles.nw;
-  if (!nHandle) {
-    // Use ne handle instead
-    usingNWHandle = false;
-    nHandle = transformHandles.ne;
-    if (!nHandle) {
-      mutateElement(element, {
-        angle: originalAngle,
-      });
-      return;
-    }
-  }
-
-  if (isLinearElement(element)) {
-    for (let i = 1; i < element.points.length; i++) {
-      LinearElementEditor.movePoint(element, i, [
-        -element.points[i][0],
-        element.points[i][1],
-      ]);
-    }
-    LinearElementEditor.normalizePoints(element);
-  } else {
-    // calculate new x-coord for transformation
-    newNCoordsX = usingNWHandle ? element.x + 2 * width : element.x - 2 * width;
-    resizeSingleElement(
-      element,
-      true,
-      element,
-      usingNWHandle ? "nw" : "ne",
-      false,
-      newNCoordsX,
-      nHandle[1],
-    );
-    // fix the size to account for handle sizes
-    mutateElement(element, {
-      width,
-      height,
-    });
-  }
-
-  // Rotate by (360 degrees - original angle)
-  let angle = normalizeAngle(2 * Math.PI - originalAngle);
-  if (angle < 0) {
-    // check, probably unnecessary
-    angle = normalizeAngle(angle + 2 * Math.PI);
-  }
-  mutateElement(element, {
-    angle,
-  });
-
-  // Move back to original spot to appear "flipped in place"
-  mutateElement(element, {
-    x: originalX + finalOffsetX,
-    y: originalY,
-  });
-
-  updateBoundElements(element);
-};
-
-const rotateElement = (element: ExcalidrawElement, rotationAngle: number) => {
-  const originalX = element.x;
-  const originalY = element.y;
-  let angle = normalizeAngle(element.angle + rotationAngle);
-  if (angle < 0) {
-    // check, probably unnecessary
-    angle = normalizeAngle(2 * Math.PI + angle);
-  }
-  mutateElement(element, {
-    angle,
-  });
-
-  // Move back to original spot
-  mutateElement(element, {
-    x: originalX,
-    y: originalY,
-  });
-};
--- a/src/actions/actionGroup.tsx
+++ b/src/actions/actionGroup.tsx
@@ -134,7 +134,7 @@ export const actionGroup = register({
    <ToolButton
      hidden={!enableActionGroup(elements, appState)}
      type="button"
-      icon={<GroupIcon theme={appState.theme} />}
+      icon={<GroupIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.group")} — ${getShortcutKey("CtrlOrCmd+G")}`}
      aria-label={t("labels.group")}
@@ -181,7 +181,7 @@ export const actionUngroup = register({
    <ToolButton
      type="button"
      hidden={getSelectedGroupIds(appState).length === 0}
-      icon={<UngroupIcon theme={appState.theme} />}
+      icon={<UngroupIcon appearance={appState.appearance} />}
      onClick={() => updateData(null)}
      title={`${t("labels.ungroup")} — ${getShortcutKey("CtrlOrCmd+Shift+G")}`}
      aria-label={t("labels.ungroup")}
--- a/src/actions/actionHistory.tsx
+++ b/src/actions/actionHistory.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import { undo, redo } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { t } from "../i18n";
-import History, { HistoryEntry } from "../history";
+import { SceneHistory, HistoryEntry } from "../history";
 import { ExcalidrawElement } from "../element/types";
 import { AppState } from "../types";
 import { isWindows, KEYS } from "../keys";
@@ -59,7 +59,7 @@ const writeData = (
  return { commitToHistory };
 };

-type ActionCreator = (history: History) => Action;
+type ActionCreator = (history: SceneHistory) => Action;

 export const createUndoAction: ActionCreator = (history) => ({
  name: "undo",
--- a/src/actions/actionMenu.tsx
+++ b/src/actions/actionMenu.tsx
@@ -70,10 +70,7 @@ export const actionFullScreen = register({

 export const actionShortcuts = register({
  name: "toggleShortcuts",
-  perform: (_elements, appState, _, { focusContainer }) => {
-    if (appState.showHelpDialog) {
-      focusContainer();
-    }
+  perform: (_elements, appState) => {
    return {
      appState: {
        ...appState,
--- a/src/actions/actionProperties.tsx
+++ b/src/actions/actionProperties.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { AppState } from "../../src/types";
 import { ButtonIconSelect } from "../components/ButtonIconSelect";
+import { ButtonSelect } from "../components/ButtonSelect";
 import { ColorPicker } from "../components/ColorPicker";
 import { IconPicker } from "../components/IconPicker";
 import {
@@ -13,13 +14,6 @@ import {
  FillCrossHatchIcon,
  FillHachureIcon,
  FillSolidIcon,
-  FontFamilyCodeIcon,
-  FontFamilyHandDrawnIcon,
-  FontFamilyNormalIcon,
-  FontSizeExtraLargeIcon,
-  FontSizeLargeIcon,
-  FontSizeMediumIcon,
-  FontSizeSmallIcon,
  SloppinessArchitectIcon,
  SloppinessArtistIcon,
  SloppinessCartoonistIcon,
@@ -27,15 +21,8 @@ import {
  StrokeStyleDottedIcon,
  StrokeStyleSolidIcon,
  StrokeWidthIcon,
-  TextAlignCenterIcon,
-  TextAlignLeftIcon,
-  TextAlignRightIcon,
 } from "../components/icons";
-import {
-  DEFAULT_FONT_FAMILY,
-  DEFAULT_FONT_SIZE,
-  FONT_FAMILY,
-} from "../constants";
+import { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE } from "../constants";
 import {
  getNonDeletedElements,
  isTextElement,
@@ -48,7 +35,7 @@ import {
  ExcalidrawElement,
  ExcalidrawLinearElement,
  ExcalidrawTextElement,
-  FontFamilyValues,
+  FontFamily,
  TextAlign,
 } from "../element/types";
 import { getLanguage, t } from "../i18n";
@@ -103,18 +90,13 @@ export const actionChangeStrokeColor = register({
  name: "changeStrokeColor",
  perform: (elements, appState, value) => {
    return {
-      ...(value.currentItemStrokeColor && {
-        elements: changeProperty(elements, appState, (el) =>
-          newElementWith(el, {
-            strokeColor: value.currentItemStrokeColor,
-          }),
-        ),
-      }),
-      appState: {
-        ...appState,
-        ...value,
-      },
-      commitToHistory: !!value.currentItemStrokeColor,
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          strokeColor: value,
+        }),
+      ),
+      appState: { ...appState, currentItemStrokeColor: value },
+      commitToHistory: true,
    };
  },
  PanelComponent: ({ elements, appState, updateData }) => (
@@ -129,11 +111,7 @@ export const actionChangeStrokeColor = register({
          (element) => element.strokeColor,
          appState.currentItemStrokeColor,
        )}
-        onChange={(color) => updateData({ currentItemStrokeColor: color })}
-        isActive={appState.openPopup === "strokeColorPicker"}
-        setActive={(active) =>
-          updateData({ openPopup: active ? "strokeColorPicker" : null })
-        }
+        onChange={updateData}
      />
    </>
  ),
@@ -143,18 +121,13 @@ export const actionChangeBackgroundColor = register({
  name: "changeBackgroundColor",
  perform: (elements, appState, value) => {
    return {
-      ...(value.currentItemBackgroundColor && {
-        elements: changeProperty(elements, appState, (el) =>
-          newElementWith(el, {
-            backgroundColor: value.currentItemBackgroundColor,
-          }),
-        ),
-      }),
-      appState: {
-        ...appState,
-        ...value,
-      },
-      commitToHistory: !!value.currentItemBackgroundColor,
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          backgroundColor: value,
+        }),
+      ),
+      appState: { ...appState, currentItemBackgroundColor: value },
+      commitToHistory: true,
    };
  },
  PanelComponent: ({ elements, appState, updateData }) => (
@@ -169,11 +142,7 @@ export const actionChangeBackgroundColor = register({
          (element) => element.backgroundColor,
          appState.currentItemBackgroundColor,
        )}
-        onChange={(color) => updateData({ currentItemBackgroundColor: color })}
-        isActive={appState.openPopup === "backgroundColorPicker"}
-        setActive={(active) =>
-          updateData({ openPopup: active ? "backgroundColorPicker" : null })
-        }
+        onChange={updateData}
      />
    </>
  ),
@@ -200,17 +169,17 @@ export const actionChangeFillStyle = register({
          {
            value: "hachure",
            text: t("labels.hachure"),
-            icon: <FillHachureIcon theme={appState.theme} />,
+            icon: <FillHachureIcon appearance={appState.appearance} />,
          },
          {
            value: "cross-hatch",
            text: t("labels.crossHatch"),
-            icon: <FillCrossHatchIcon theme={appState.theme} />,
+            icon: <FillCrossHatchIcon appearance={appState.appearance} />,
          },
          {
            value: "solid",
            text: t("labels.solid"),
-            icon: <FillSolidIcon theme={appState.theme} />,
+            icon: <FillSolidIcon appearance={appState.appearance} />,
          },
        ]}
        group="fill"
@@ -250,17 +219,32 @@ export const actionChangeStrokeWidth = register({
          {
            value: 1,
            text: t("labels.thin"),
-            icon: <StrokeWidthIcon theme={appState.theme} strokeWidth={2} />,
+            icon: (
+              <StrokeWidthIcon
+                appearance={appState.appearance}
+                strokeWidth={2}
+              />
+            ),
          },
          {
            value: 2,
            text: t("labels.bold"),
-            icon: <StrokeWidthIcon theme={appState.theme} strokeWidth={6} />,
+            icon: (
+              <StrokeWidthIcon
+                appearance={appState.appearance}
+                strokeWidth={6}
+              />
+            ),
          },
          {
            value: 4,
            text: t("labels.extraBold"),
-            icon: <StrokeWidthIcon theme={appState.theme} strokeWidth={10} />,
+            icon: (
+              <StrokeWidthIcon
+                appearance={appState.appearance}
+                strokeWidth={10}
+              />
+            ),
          },
        ]}
        value={getFormValue(
@@ -298,17 +282,17 @@ export const actionChangeSloppiness = register({
          {
            value: 0,
            text: t("labels.architect"),
-            icon: <SloppinessArchitectIcon theme={appState.theme} />,
+            icon: <SloppinessArchitectIcon appearance={appState.appearance} />,
          },
          {
            value: 1,
            text: t("labels.artist"),
-            icon: <SloppinessArtistIcon theme={appState.theme} />,
+            icon: <SloppinessArtistIcon appearance={appState.appearance} />,
          },
          {
            value: 2,
            text: t("labels.cartoonist"),
-            icon: <SloppinessCartoonistIcon theme={appState.theme} />,
+            icon: <SloppinessCartoonistIcon appearance={appState.appearance} />,
          },
        ]}
        value={getFormValue(
@@ -345,17 +329,17 @@ export const actionChangeStrokeStyle = register({
          {
            value: "solid",
            text: t("labels.strokeStyle_solid"),
-            icon: <StrokeStyleSolidIcon theme={appState.theme} />,
+            icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
          },
          {
            value: "dashed",
            text: t("labels.strokeStyle_dashed"),
-            icon: <StrokeStyleDashedIcon theme={appState.theme} />,
+            icon: <StrokeStyleDashedIcon appearance={appState.appearance} />,
          },
          {
            value: "dotted",
            text: t("labels.strokeStyle_dotted"),
-            icon: <StrokeStyleDottedIcon theme={appState.theme} />,
+            icon: <StrokeStyleDottedIcon appearance={appState.appearance} />,
          },
        ]}
        value={getFormValue(
@@ -444,29 +428,13 @@ export const actionChangeFontSize = register({
  PanelComponent: ({ elements, appState, updateData }) => (
    <fieldset>
      <legend>{t("labels.fontSize")}</legend>
-      <ButtonIconSelect
+      <ButtonSelect
        group="font-size"
        options={[
-          {
-            value: 16,
-            text: t("labels.small"),
-            icon: <FontSizeSmallIcon theme={appState.theme} />,
-          },
-          {
-            value: 20,
-            text: t("labels.medium"),
-            icon: <FontSizeMediumIcon theme={appState.theme} />,
-          },
-          {
-            value: 28,
-            text: t("labels.large"),
-            icon: <FontSizeLargeIcon theme={appState.theme} />,
-          },
-          {
-            value: 36,
-            text: t("labels.veryLarge"),
-            icon: <FontSizeExtraLargeIcon theme={appState.theme} />,
-          },
+          { value: 16, text: t("labels.small") },
+          { value: 20, text: t("labels.medium") },
+          { value: 28, text: t("labels.large") },
+          { value: 36, text: t("labels.veryLarge") },
        ]}
        value={getFormValue(
          elements,
@@ -503,32 +471,16 @@ export const actionChangeFontFamily = register({
    };
  },
  PanelComponent: ({ elements, appState, updateData }) => {
-    const options: {
-      value: FontFamilyValues;
-      text: string;
-      icon: JSX.Element;
-    }[] = [
-      {
-        value: FONT_FAMILY.Virgil,
-        text: t("labels.handDrawn"),
-        icon: <FontFamilyHandDrawnIcon theme={appState.theme} />,
-      },
-      {
-        value: FONT_FAMILY.Helvetica,
-        text: t("labels.normal"),
-        icon: <FontFamilyNormalIcon theme={appState.theme} />,
-      },
-      {
-        value: FONT_FAMILY.Cascadia,
-        text: t("labels.code"),
-        icon: <FontFamilyCodeIcon theme={appState.theme} />,
-      },
+    const options: { value: FontFamily; text: string }[] = [
+      { value: 1, text: t("labels.handDrawn") },
+      { value: 2, text: t("labels.normal") },
+      { value: 3, text: t("labels.code") },
    ];

    return (
      <fieldset>
        <legend>{t("labels.fontFamily")}</legend>
-        <ButtonIconSelect<FontFamilyValues | false>
+        <ButtonSelect<FontFamily | false>
          group="font-family"
          options={options}
          value={getFormValue(
@@ -569,24 +521,12 @@ export const actionChangeTextAlign = register({
  PanelComponent: ({ elements, appState, updateData }) => (
    <fieldset>
      <legend>{t("labels.textAlign")}</legend>
-      <ButtonIconSelect<TextAlign | false>
+      <ButtonSelect<TextAlign | false>
        group="text-align"
        options={[
-          {
-            value: "left",
-            text: t("labels.left"),
-            icon: <TextAlignLeftIcon theme={appState.theme} />,
-          },
-          {
-            value: "center",
-            text: t("labels.center"),
-            icon: <TextAlignCenterIcon theme={appState.theme} />,
-          },
-          {
-            value: "right",
-            text: t("labels.right"),
-            icon: <TextAlignRightIcon theme={appState.theme} />,
-          },
+          { value: "left", text: t("labels.left") },
+          { value: "center", text: t("labels.center") },
+          { value: "right", text: t("labels.right") },
        ]}
        value={getFormValue(
          elements,
@@ -640,12 +580,12 @@ export const actionChangeSharpness = register({
          {
            value: "sharp",
            text: t("labels.sharp"),
-            icon: <EdgeSharpIcon theme={appState.theme} />,
+            icon: <EdgeSharpIcon appearance={appState.appearance} />,
          },
          {
            value: "round",
            text: t("labels.round"),
-            icon: <EdgeRoundIcon theme={appState.theme} />,
+            icon: <EdgeRoundIcon appearance={appState.appearance} />,
          },
        ]}
        value={getFormValue(
@@ -713,27 +653,40 @@ export const actionChangeArrowhead = register({
              {
                value: null,
                text: t("labels.arrowhead_none"),
-                icon: <ArrowheadNoneIcon theme={appState.theme} />,
+                icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
                keyBinding: "q",
              },
              {
                value: "arrow",
                text: t("labels.arrowhead_arrow"),
                icon: (
-                  <ArrowheadArrowIcon theme={appState.theme} flip={!isRTL} />
+                  <ArrowheadArrowIcon
+                    appearance={appState.appearance}
+                    flip={!isRTL}
+                  />
                ),
                keyBinding: "w",
              },
              {
                value: "bar",
                text: t("labels.arrowhead_bar"),
-                icon: <ArrowheadBarIcon theme={appState.theme} flip={!isRTL} />,
+                icon: (
+                  <ArrowheadBarIcon
+                    appearance={appState.appearance}
+                    flip={!isRTL}
+                  />
+                ),
                keyBinding: "e",
              },
              {
                value: "dot",
                text: t("labels.arrowhead_dot"),
-                icon: <ArrowheadDotIcon theme={appState.theme} flip={!isRTL} />,
+                icon: (
+                  <ArrowheadDotIcon
+                    appearance={appState.appearance}
+                    flip={!isRTL}
+                  />
+                ),
                keyBinding: "r",
              },
            ]}
@@ -756,27 +709,40 @@ export const actionChangeArrowhead = register({
                value: null,
                text: t("labels.arrowhead_none"),
                keyBinding: "q",
-                icon: <ArrowheadNoneIcon theme={appState.theme} />,
+                icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
              },
              {
                value: "arrow",
                text: t("labels.arrowhead_arrow"),
                keyBinding: "w",
                icon: (
-                  <ArrowheadArrowIcon theme={appState.theme} flip={isRTL} />
+                  <ArrowheadArrowIcon
+                    appearance={appState.appearance}
+                    flip={isRTL}
+                  />
                ),
              },
              {
                value: "bar",
                text: t("labels.arrowhead_bar"),
                keyBinding: "e",
-                icon: <ArrowheadBarIcon theme={appState.theme} flip={isRTL} />,
+                icon: (
+                  <ArrowheadBarIcon
+                    appearance={appState.appearance}
+                    flip={isRTL}
+                  />
+                ),
              },
              {
                value: "dot",
                text: t("labels.arrowhead_dot"),
                keyBinding: "r",
-                icon: <ArrowheadDotIcon theme={appState.theme} flip={isRTL} />,
+                icon: (
+                  <ArrowheadDotIcon
+                    appearance={appState.appearance}
+                    flip={isRTL}
+                  />
+                ),
              },
            ]}
            value={getFormValue<Arrowhead | null>(
--- a/src/actions/actionToggleStats.tsx
+++ b/src/actions/actionToggleStats.tsx
@@ -1,5 +1,4 @@
 import { register } from "./register";
-import { CODES, KEYS } from "../keys";

 export const actionToggleStats = register({
  name: "stats",
@@ -14,6 +13,4 @@ export const actionToggleStats = register({
  },
  checked: (appState) => appState.showStats,
  contextItemLabel: "stats.title",
-  keyTest: (event) =>
-    !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.SLASH,
 });
--- a/src/actions/actionToggleViewMode.tsx
+++ b/src/actions/actionToggleViewMode.tsx
@@ -10,6 +10,7 @@ export const actionToggleViewMode = register({
      appState: {
        ...appState,
        viewModeEnabled: !this.checked!(appState),
+        selectedElementIds: {},
      },
      commitToHistory: false,
    };
--- a/src/actions/actionZindex.tsx
+++ b/src/actions/actionZindex.tsx
@@ -38,7 +38,7 @@ export const actionSendBackward = register({
      onClick={() => updateData(null)}
      title={`${t("labels.sendBackward")} — ${getShortcutKey("CtrlOrCmd+[")}`}
    >
-      <SendBackwardIcon theme={appState.theme} />
+      <SendBackwardIcon appearance={appState.appearance} />
    </button>
  ),
 });
@@ -65,7 +65,7 @@ export const actionBringForward = register({
      onClick={() => updateData(null)}
      title={`${t("labels.bringForward")} — ${getShortcutKey("CtrlOrCmd+]")}`}
    >
-      <BringForwardIcon theme={appState.theme} />
+      <BringForwardIcon appearance={appState.appearance} />
    </button>
  ),
 });
@@ -99,7 +99,7 @@ export const actionSendToBack = register({
          : getShortcutKey("CtrlOrCmd+Shift+[")
      }`}
    >
-      <SendToBackIcon theme={appState.theme} />
+      <SendToBackIcon appearance={appState.appearance} />
    </button>
  ),
 });
@@ -133,7 +133,7 @@ export const actionBringToFront = register({
          : getShortcutKey("CtrlOrCmd+Shift+]")
      }`}
    >
-      <BringToFrontIcon theme={appState.theme} />
+      <BringToFrontIcon appearance={appState.appearance} />
    </button>
  ),
 });
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@@ -26,7 +26,6 @@ export {
  actionZoomOut,
  actionResetZoom,
  actionZoomToFit,
-  actionToggleTheme,
 } from "./actionCanvas";

 export { actionFinalize } from "./actionFinalize";
@@ -34,8 +33,8 @@ export { actionFinalize } from "./actionFinalize";
 export {
  actionChangeProjectName,
  actionChangeExportBackground,
-  actionSaveToActiveFile,
-  actionSaveFileToDisk,
+  actionSaveScene,
+  actionSaveAsScene,
  actionLoadScene,
 } from "./actionExport";

@@ -67,8 +66,6 @@ export {
  distributeVertically,
 } from "./actionDistribute";

-export { actionFlipHorizontal, actionFlipVertical } from "./actionFlip";
-
 export {
  actionCopy,
  actionCut,
--- a/src/actions/manager.tsx
+++ b/src/actions/manager.tsx
@@ -7,18 +7,12 @@ import {
  ActionResult,
 } from "./types";
 import { ExcalidrawElement } from "../element/types";
-import { AppProps, AppState } from "../types";
+import { AppState, ExcalidrawProps } from "../types";
 import { MODES } from "../constants";
-import Library from "../data/library";

 // This is the <App> component, but for now we don't care about anything but its
 // `canvas` state.
-type App = {
-  canvas: HTMLCanvasElement | null;
-  focusContainer: () => void;
-  props: AppProps;
-  library: Library;
-};
+type App = { canvas: HTMLCanvasElement | null; props: ExcalidrawProps };

 export class ActionManager implements ActionsManagerInterface {
  actions = {} as ActionsManagerInterface["actions"];
@@ -57,15 +51,11 @@ export class ActionManager implements ActionsManagerInterface {
    actions.forEach((action) => this.registerAction(action));
  }

-  handleKeyDown(event: React.KeyboardEvent | KeyboardEvent) {
-    const canvasActions = this.app.props.UIOptions.canvasActions;
+  handleKeyDown(event: KeyboardEvent) {
    const data = Object.values(this.actions)
      .sort((a, b) => (b.keyPriority || 0) - (a.keyPriority || 0))
      .filter(
        (action) =>
-          (action.name in canvasActions
-            ? canvasActions[action.name as keyof typeof canvasActions]
-            : true) &&
          action.keyTest &&
          action.keyTest(
            event,
@@ -112,15 +102,7 @@ export class ActionManager implements ActionsManagerInterface {
  // like the user list. We can use this key to extract more
  // data from app state. This is an alternative to generic prop hell!
  renderAction = (name: ActionName, id?: string) => {
-    const canvasActions = this.app.props.UIOptions.canvasActions;
-
-    if (
-      this.actions[name] &&
-      "PanelComponent" in this.actions[name] &&
-      (name in canvasActions
-        ? canvasActions[name as keyof typeof canvasActions]
-        : true)
-    ) {
+    if (this.actions[name] && "PanelComponent" in this.actions[name]) {
      const action = this.actions[name];
      const PanelComponent = action.PanelComponent!;
      const updateData = (formState?: any) => {
@@ -140,7 +122,6 @@ export class ActionManager implements ActionsManagerInterface {
          appState={this.getAppState()}
          updateData={updateData}
          id={id}
-          appProps={this.app.props}
        />
      );
    }
--- a/src/actions/shortcuts.ts
+++ b/src/actions/shortcuts.ts
@@ -23,9 +23,7 @@ export type ShortcutName =
  | "zenMode"
  | "stats"
  | "addToLibrary"
-  | "viewMode"
-  | "flipHorizontal"
-  | "flipVertical";
+  | "viewMode";

 const shortcutMap: Record<ShortcutName, string[]> = {
  cut: [getShortcutKey("CtrlOrCmd+X")],
@@ -57,10 +55,8 @@ const shortcutMap: Record<ShortcutName, string[]> = {
  ungroup: [getShortcutKey("CtrlOrCmd+Shift+G")],
  gridMode: [getShortcutKey("CtrlOrCmd+'")],
  zenMode: [getShortcutKey("Alt+Z")],
-  stats: [getShortcutKey("Alt+/")],
+  stats: [],
  addToLibrary: [],
-  flipHorizontal: [getShortcutKey("Shift+H")],
-  flipVertical: [getShortcutKey("Shift+V")],
  viewMode: [getShortcutKey("Alt+R")],
 };

--- a/src/actions/types.ts
+++ b/src/actions/types.ts
@@ -1,32 +1,22 @@
 import React from "react";
 import { ExcalidrawElement } from "../element/types";
-import { AppState, ExcalidrawProps } from "../types";
-import Library from "../data/library";
+import { AppState } from "../types";

 /** if false, the action should be prevented */
 export type ActionResult =
  | {
      elements?: readonly ExcalidrawElement[] | null;
-      appState?: MarkOptional<
-        AppState,
-        "offsetTop" | "offsetLeft" | "width" | "height"
-      > | null;
+      appState?: MarkOptional<AppState, "offsetTop" | "offsetLeft"> | null;
      commitToHistory: boolean;
      syncHistory?: boolean;
    }
  | false;

-type AppAPI = {
-  canvas: HTMLCanvasElement | null;
-  focusContainer(): void;
-  library: Library;
-};
-
 type ActionFn = (
  elements: readonly ExcalidrawElement[],
  appState: Readonly<AppState>,
  formData: any,
-  app: AppAPI,
+  app: { canvas: HTMLCanvasElement | null },
 ) => ActionResult | Promise<ActionResult>;

 export type UpdaterFn = (res: ActionResult) => void;
@@ -52,7 +42,6 @@ export type ActionName =
  | "changeBackgroundColor"
  | "changeFillStyle"
  | "changeStrokeWidth"
-  | "changeStrokeShape"
  | "changeSloppiness"
  | "changeStrokeStyle"
  | "changeArrowhead"
@@ -66,9 +55,9 @@ export type ActionName =
  | "changeProjectName"
  | "changeExportBackground"
  | "changeExportEmbedScene"
-  | "changeExportScale"
-  | "saveToActiveFile"
-  | "saveFileToDisk"
+  | "changeShouldAddWatermark"
+  | "saveScene"
+  | "saveAsScene"
  | "loadScene"
  | "duplicateSelection"
  | "deleteSelectedElements"
@@ -96,11 +85,8 @@ export type ActionName =
  | "alignHorizontallyCentered"
  | "distributeHorizontally"
  | "distributeVertically"
-  | "flipHorizontal"
-  | "flipVertical"
  | "viewMode"
-  | "exportWithDarkMode"
-  | "toggleTheme";
+  | "exportWithDarkMode";

 export interface Action {
  name: ActionName;
@@ -108,13 +94,12 @@ export interface Action {
    elements: readonly ExcalidrawElement[];
    appState: AppState;
    updateData: (formData?: any) => void;
-    appProps: ExcalidrawProps;
    id?: string;
  }>;
  perform: ActionFn;
  keyPriority?: number;
  keyTest?: (
-    event: React.KeyboardEvent | KeyboardEvent,
+    event: KeyboardEvent,
    appState: AppState,
    elements: readonly ExcalidrawElement[],
  ) => boolean;
@@ -129,7 +114,6 @@ export interface Action {
 export interface ActionsManagerInterface {
  actions: Record<ActionName, Action>;
  registerAction: (action: Action) => void;
-  handleKeyDown: (event: React.KeyboardEvent | KeyboardEvent) => boolean;
+  handleKeyDown: (event: KeyboardEvent) => boolean;
  renderAction: (name: ActionName) => React.ReactElement | null;
-  executeAction: (action: Action) => void;
 }
--- a/src/appState.ts
+++ b/src/appState.ts
@@ -3,22 +3,17 @@ import {
  DEFAULT_FONT_FAMILY,
  DEFAULT_FONT_SIZE,
  DEFAULT_TEXT_ALIGN,
-  EXPORT_SCALES,
 } from "./constants";
 import { t } from "./i18n";
 import { AppState, NormalizedZoomValue } from "./types";
 import { getDateTime } from "./utils";

-const defaultExportScale = EXPORT_SCALES.includes(devicePixelRatio)
-  ? devicePixelRatio
-  : 1;
-
 export const getDefaultAppState = (): Omit<
  AppState,
-  "offsetTop" | "offsetLeft" | "width" | "height"
+  "offsetTop" | "offsetLeft"
 > => {
  return {
-    theme: "light",
+    appearance: "light",
    collaborators: new Map(),
    currentChartType: "bar",
    currentItemBackgroundColor: "transparent",
@@ -44,11 +39,11 @@ export const getDefaultAppState = (): Omit<
    elementType: "selection",
    errorMessage: null,
    exportBackground: true,
-    exportScale: defaultExportScale,
    exportEmbedScene: false,
    exportWithDarkMode: false,
    fileHandle: null,
    gridSize: null,
+    height: window.innerHeight,
    isBindingEnabled: true,
    isLibraryOpen: false,
    isLoading: false,
@@ -58,7 +53,6 @@ export const getDefaultAppState = (): Omit<
    multiElement: null,
    name: `${t("labels.untitled")}-${getDateTime()}`,
    openMenu: null,
-    openPopup: null,
    pasteDialog: { shown: false, data: null },
    previousSelectedElementIds: {},
    resizingElement: null,
@@ -68,6 +62,7 @@ export const getDefaultAppState = (): Omit<
    selectedElementIds: {},
    selectedGroupIds: {},
    selectionElement: null,
+    shouldAddWatermark: false,
    shouldCacheIgnoreZoom: false,
    showHelpDialog: false,
    showStats: false,
@@ -75,6 +70,7 @@ export const getDefaultAppState = (): Omit<
    suggestedBindings: [],
    toastMessage: null,
    viewBackgroundColor: oc.white,
+    width: window.innerWidth,
    zenModeEnabled: false,
    zoom: { value: 1 as NormalizedZoomValue, translation: { x: 0, y: 0 } },
    viewModeEnabled: false,
@@ -96,7 +92,7 @@ const APP_STATE_STORAGE_CONF = (<
 >(
  config: { [K in keyof T]: K extends keyof AppState ? T[K] : never },
 ) => config)({
-  theme: { browser: true, export: false },
+  appearance: { browser: true, export: false },
  collaborators: { browser: false, export: false },
  currentChartType: { browser: true, export: false },
  currentItemBackgroundColor: { browser: true, export: false },
@@ -123,7 +119,6 @@ const APP_STATE_STORAGE_CONF = (<
  errorMessage: { browser: false, export: false },
  exportBackground: { browser: true, export: false },
  exportEmbedScene: { browser: true, export: false },
-  exportScale: { browser: true, export: false },
  exportWithDarkMode: { browser: true, export: false },
  fileHandle: { browser: false, export: false },
  gridSize: { browser: true, export: true },
@@ -139,7 +134,6 @@ const APP_STATE_STORAGE_CONF = (<
  offsetLeft: { browser: false, export: false },
  offsetTop: { browser: false, export: false },
  openMenu: { browser: true, export: false },
-  openPopup: { browser: false, export: false },
  pasteDialog: { browser: false, export: false },
  previousSelectedElementIds: { browser: true, export: false },
  resizingElement: { browser: false, export: false },
@@ -149,6 +143,7 @@ const APP_STATE_STORAGE_CONF = (<
  selectedElementIds: { browser: true, export: false },
  selectedGroupIds: { browser: true, export: false },
  selectionElement: { browser: false, export: false },
+  shouldAddWatermark: { browser: true, export: false },
  shouldCacheIgnoreZoom: { browser: true, export: false },
  showHelpDialog: { browser: false, export: false },
  showStats: { browser: true, export: false },
--- a/src/clipboard.ts
+++ b/src/clipboard.ts
@@ -6,20 +6,16 @@ import { getSelectedElements } from "./scene";
 import { AppState } from "./types";
 import { SVG_EXPORT_TAG } from "./scene/export";
 import { tryParseSpreadsheet, Spreadsheet, VALID_SPREADSHEET } from "./charts";
-import { EXPORT_DATA_TYPES } from "./constants";
+import { canvasToBlob } from "./data/blob";
+
+const TYPE_ELEMENTS = "excalidraw/elements";

 type ElementsClipboard = {
-  type: typeof EXPORT_DATA_TYPES.excalidrawClipboard;
+  type: typeof TYPE_ELEMENTS;
+  created: number;
  elements: ExcalidrawElement[];
 };

-export interface ClipboardData {
-  spreadsheet?: Spreadsheet;
-  elements?: readonly ExcalidrawElement[];
-  text?: string;
-  errorMessage?: string;
-}
-
 let CLIPBOARD = "";
 let PREFER_APP_CLIPBOARD = false;

@@ -35,16 +31,8 @@ export const probablySupportsClipboardBlob =
  "ClipboardItem" in window &&
  "toBlob" in HTMLCanvasElement.prototype;

-const clipboardContainsElements = (
-  contents: any,
-): contents is { elements: ExcalidrawElement[] } => {
-  if (
-    [
-      EXPORT_DATA_TYPES.excalidraw,
-      EXPORT_DATA_TYPES.excalidrawClipboard,
-    ].includes(contents?.type) &&
-    Array.isArray(contents.elements)
-  ) {
+const isElementsClipboard = (contents: any): contents is ElementsClipboard => {
+  if (contents?.type === TYPE_ELEMENTS) {
    return true;
  }
  return false;
@@ -55,7 +43,8 @@ export const copyToClipboard = async (
  appState: AppState,
 ) => {
  const contents: ElementsClipboard = {
-    type: EXPORT_DATA_TYPES.excalidrawClipboard,
+    type: TYPE_ELEMENTS,
+    created: Date.now(),
    elements: getSelectedElements(elements, appState),
  };
  const json = JSON.stringify(contents);
@@ -116,7 +105,12 @@ const getSystemClipboard = async (
 */
 export const parseClipboard = async (
  event: ClipboardEvent | null,
-): Promise<ClipboardData> => {
+): Promise<{
+  spreadsheet?: Spreadsheet;
+  elements?: readonly ExcalidrawElement[];
+  text?: string;
+  errorMessage?: string;
+}> => {
  const systemClipboard = await getSystemClipboard(event);

  // if system clipboard empty, couldn't be resolved, or contains previously
@@ -137,9 +131,15 @@ export const parseClipboard = async (

  try {
    const systemClipboardData = JSON.parse(systemClipboard);
-    if (clipboardContainsElements(systemClipboardData)) {
+    // system clipboard elements are newer than in-app clipboard
+    if (
+      isElementsClipboard(systemClipboardData) &&
+      (!appClipboardData?.created ||
+        appClipboardData.created < systemClipboardData.created)
+    ) {
      return { elements: systemClipboardData.elements };
    }
+    // in-app clipboard is newer than system clipboard
    return appClipboardData;
  } catch {
    // system clipboard doesn't contain excalidraw elements → return plaintext
@@ -151,7 +151,8 @@ export const parseClipboard = async (
  }
 };

-export const copyBlobToClipboardAsPng = async (blob: Blob) => {
+export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
+  const blob = await canvasToBlob(canvas);
  await navigator.clipboard.write([
    new window.ClipboardItem({ "image/png": blob }),
  ]);
--- a/src/components/Actions.tsx
+++ b/src/components/Actions.tsx
@@ -3,14 +3,13 @@ import { ActionManager } from "../actions/manager";
 import { getNonDeletedElements } from "../element";
 import { ExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import {
  canChangeSharpness,
  canHaveArrowheads,
  getTargetElements,
  hasBackground,
-  hasStrokeStyle,
-  hasStrokeWidth,
+  hasStroke,
  hasText,
 } from "../scene";
 import { SHAPES } from "../shapes";
@@ -54,17 +53,10 @@ export const SelectedShapeActions = ({
      {showChangeBackgroundIcons && renderAction("changeBackgroundColor")}
      {showFillIcons && renderAction("changeFillStyle")}

-      {(hasStrokeWidth(elementType) ||
-        targetElements.some((element) => hasStrokeWidth(element.type))) &&
-        renderAction("changeStrokeWidth")}
-
-      {(elementType === "freedraw" ||
-        targetElements.some((element) => element.type === "freedraw")) &&
-        renderAction("changeStrokeShape")}
-
-      {(hasStrokeStyle(elementType) ||
-        targetElements.some((element) => hasStrokeStyle(element.type))) && (
+      {(hasStroke(elementType) ||
+        targetElements.some((element) => hasStroke(element.type))) && (
        <>
+          {renderAction("changeStrokeWidth")}
          {renderAction("changeStrokeStyle")}
          {renderAction("changeSloppiness")}
        </>
@@ -151,14 +143,23 @@ export const SelectedShapeActions = ({
  );
 };

+const LIBRARY_ICON = (
+  // fa-th-large
+  <svg viewBox="0 0 512 512">
+    <path d="M296 32h192c13.255 0 24 10.745 24 24v160c0 13.255-10.745 24-24 24H296c-13.255 0-24-10.745-24-24V56c0-13.255 10.745-24 24-24zm-80 0H24C10.745 32 0 42.745 0 56v160c0 13.255 10.745 24 24 24h192c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24zM0 296v160c0 13.255 10.745 24 24 24h192c13.255 0 24-10.745 24-24V296c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm296 184h192c13.255 0 24-10.745 24-24V296c0-13.255-10.745-24-24-24H296c-13.255 0-24 10.745-24 24v160c0 13.255 10.745 24 24 24z" />
+  </svg>
+);
+
 export const ShapesSwitcher = ({
  canvas,
  elementType,
  setAppState,
+  isLibraryOpen,
 }: {
  canvas: HTMLCanvasElement | null;
  elementType: ExcalidrawElement["type"];
  setAppState: React.Component<any, AppState>["setState"];
+  isLibraryOpen: boolean;
 }) => (
  <>
    {SHAPES.map(({ value, icon, key }, index) => {
@@ -192,6 +193,19 @@ export const ShapesSwitcher = ({
        />
      );
    })}
+    <ToolButton
+      className="Shape ToolIcon_type_button__library"
+      type="button"
+      icon={LIBRARY_ICON}
+      name="editor-library"
+      keyBindingLabel="9"
+      aria-keyshortcuts="9"
+      title={`${capitalizeString(t("toolBar.library"))} — 9`}
+      aria-label={capitalizeString(t("toolBar.library"))}
+      onClick={() => {
+        setAppState({ isLibraryOpen: !isLibraryOpen });
+      }}
+    />
  </>
 );

--- a/src/components/ActiveFile.scss
+++ b/src/components/ActiveFile.scss
@@ -1,21 +0,0 @@
-.excalidraw {
-  .ActiveFile {
-    .ActiveFile__fileName {
-      display: flex;
-      align-items: center;
-
-      span {
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        width: 9.3em;
-      }
-
-      svg {
-        width: 1.15em;
-        margin-inline-end: 0.3em;
-        transform: scaleY(0.9);
-      }
-    }
-  }
-}
--- a/src/components/ActiveFile.tsx
+++ b/src/components/ActiveFile.tsx
@@ -1,29 +0,0 @@
-import React from "react";
-import Stack from "../components/Stack";
-import { ToolButton } from "../components/ToolButton";
-import { save, file } from "../components/icons";
-import { t } from "../i18n";
-
-import "./ActiveFile.scss";
-
-type ActiveFileProps = {
-  fileName?: string;
-  onSave: () => void;
-};
-
-export const ActiveFile = ({ fileName, onSave }: ActiveFileProps) => (
-  <Stack.Row className="ActiveFile" gap={1} align="center">
-    <span className="ActiveFile__fileName">
-      {file}
-      <span>{fileName}</span>
-    </span>
-    <ToolButton
-      type="icon"
-      icon={save}
-      title={t("buttons.save")}
-      aria-label={t("buttons.save")}
-      onClick={onSave}
-      data-testid="save-button"
-    />
-  </Stack.Row>
-);
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
--- a/src/components/BackgroundPickerAndDarkModeToggle.tsx
+++ b/src/components/BackgroundPickerAndDarkModeToggle.tsx
@@ -1,20 +1,26 @@
 import React from "react";
 import { ActionManager } from "../actions/manager";
 import { AppState } from "../types";
+import { DarkModeToggle } from "./DarkModeToggle";

 export const BackgroundPickerAndDarkModeToggle = ({
  appState,
  setAppState,
  actionManager,
-  showThemeBtn,
 }: {
  actionManager: ActionManager;
  appState: AppState;
  setAppState: React.Component<any, AppState>["setState"];
-  showThemeBtn: boolean;
 }) => (
  <div style={{ display: "flex" }}>
    {actionManager.renderAction("changeViewBackgroundColor")}
-    {showThemeBtn && actionManager.renderAction("toggleTheme")}
+    <div style={{ marginInlineStart: "0.25rem" }}>
+      <DarkModeToggle
+        value={appState.appearance}
+        onChange={(appearance) => {
+          setAppState({ appearance });
+        }}
+      />
+    </div>
  </div>
 );
--- a/src/components/ButtonIconCycle.tsx
+++ b/src/components/ButtonIconCycle.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import clsx from "clsx";

 export const ButtonIconCycle = <T extends any>({
@@ -13,11 +14,11 @@ export const ButtonIconCycle = <T extends any>({
 }) => {
  const current = options.find((op) => op.value === value);

-  const cycle = () => {
+  function cycle() {
    const index = options.indexOf(current!);
    const next = (index + 1) % options.length;
    onChange(options[next].value);
-  };
+  }

  return (
    <label key={group} className={clsx({ active: current!.value !== null })}>
--- a/src/components/Card.scss
+++ b/src/components/Card.scss
@@ -1,53 +0,0 @@
-@import "../css/variables.module";
-
-.excalidraw {
-  .Card {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    max-width: 290px;
-
-    margin: 1em;
-
-    text-align: center;
-
-    .Card-icon {
-      font-size: 2.6em;
-      display: flex;
-      flex: 0 0 auto;
-      padding: 1.4rem;
-      border-radius: 50%;
-      background: var(--card-color);
-      color: $oc-white;
-
-      svg {
-        width: 2.8rem;
-        height: 2.8rem;
-      }
-    }
-
-    .Card-details {
-      font-size: 0.96em;
-      min-height: 90px;
-      padding: 0 1em;
-      margin-bottom: auto;
-    }
-
-    & .Card-button.ToolIcon_type_button {
-      height: 2.5rem;
-      margin-top: 1em;
-      margin-bottom: 0.3em;
-      background-color: var(--card-color);
-      &:hover {
-        background-color: var(--card-color-darker);
-      }
-      &:active {
-        background-color: var(--card-color-darkest);
-      }
-      .ToolIcon__label {
-        color: $oc-white;
-      }
-    }
-  }
-}
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -1,20 +0,0 @@
-import OpenColor from "open-color";
-
-import "./Card.scss";
-
-export const Card: React.FC<{
-  color: keyof OpenColor;
-}> = ({ children, color }) => {
-  return (
-    <div
-      className="Card"
-      style={{
-        ["--card-color" as any]: OpenColor[color][7],
-        ["--card-color-darker" as any]: OpenColor[color][8],
-        ["--card-color-darkest" as any]: OpenColor[color][9],
-      }}
-    >
-      {children}
-    </div>
-  );
-};
--- a/src/components/CheckboxItem.scss
+++ b/src/components/CheckboxItem.scss
@@ -1,89 +0,0 @@
-@import "../css/variables.module";
-
-.excalidraw {
-  .Checkbox {
-    margin: 4px 0.3em;
-    display: flex;
-    align-items: center;
-
-    cursor: pointer;
-    user-select: none;
-
-    -webkit-tap-highlight-color: transparent;
-
-    &:hover:not(.is-checked) .Checkbox-box:not(:focus) {
-      box-shadow: 0 0 0 2px #{$oc-blue-4};
-    }
-
-    &:hover:not(.is-checked) .Checkbox-box:not(:focus) {
-      svg {
-        display: block;
-        opacity: 0.3;
-      }
-    }
-
-    &:active {
-      .Checkbox-box {
-        box-shadow: 0 0 2px 1px inset #{$oc-blue-7} !important;
-      }
-    }
-
-    &:hover {
-      .Checkbox-box {
-        background-color: fade-out($oc-blue-1, 0.8);
-      }
-    }
-
-    &.is-checked {
-      .Checkbox-box {
-        background-color: #{$oc-blue-1};
-        svg {
-          display: block;
-        }
-      }
-      &:hover .Checkbox-box {
-        background-color: #{$oc-blue-2};
-      }
-    }
-
-    .Checkbox-box {
-      width: 22px;
-      height: 22px;
-      padding: 0;
-      flex: 0 0 auto;
-
-      margin: 0 1em;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      box-shadow: 0 0 0 2px #{$oc-blue-7};
-      background-color: transparent;
-      border-radius: 4px;
-
-      color: #{$oc-blue-7};
-
-      &:focus {
-        box-shadow: 0 0 0 3px #{$oc-blue-7};
-      }
-
-      svg {
-        display: none;
-        width: 16px;
-        height: 16px;
-        stroke-width: 3px;
-      }
-    }
-
-    .Checkbox-label {
-      display: flex;
-      align-items: center;
-    }
-
-    .Tooltip-icon {
-      width: 1em;
-      height: 1em;
-    }
-  }
-}
--- a/src/components/CheckboxItem.tsx
+++ b/src/components/CheckboxItem.tsx
@@ -1,27 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import { checkIcon } from "./icons";
-
-import "./CheckboxItem.scss";
-
-export const CheckboxItem: React.FC<{
-  checked: boolean;
-  onChange: (checked: boolean) => void;
-}> = ({ children, checked, onChange }) => {
-  return (
-    <div
-      className={clsx("Checkbox", { "is-checked": checked })}
-      onClick={(event) => {
-        onChange(!checked);
-        ((event.currentTarget as HTMLDivElement).querySelector(
-          ".Checkbox-box",
-        ) as HTMLButtonElement).focus();
-      }}
-    >
-      <button className="Checkbox-box" role="checkbox" aria-checked={checked}>
-        {checkIcon}
-      </button>
-      <div className="Checkbox-label">{children}</div>
-    </div>
-  );
-};
--- a/src/components/CollabButton.tsx
+++ b/src/components/CollabButton.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import clsx from "clsx";
 import { ToolButton } from "./ToolButton";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import { users } from "./icons";

 import "./CollabButton.scss";
--- a/src/components/ColorPicker.scss
+++ b/src/components/ColorPicker.scss
@@ -73,7 +73,7 @@
    box-sizing: border-box;
    border: 1px solid #ddd;
    background-color: currentColor !important;
-    filter: var(--theme-filter);
+    filter: var(--appearance-filter);

    &:focus {
      /* TODO: only show the border when the color is too light to see as a shadow */
@@ -160,7 +160,7 @@
  }

  .color-picker-input {
-    width: 11ch; /* length of `transparent` */
+    width: 12ch; /* length of `transparent` + 1 */
    margin: 0;
    font-size: 1rem;
    background-color: var(--input-bg-color);
@@ -192,7 +192,7 @@
    position: relative;
    overflow: hidden;
    background-color: transparent !important;
-    filter: var(--theme-filter);
+    filter: var(--appearance-filter);

    &:after {
      content: "";
@@ -218,7 +218,7 @@
      left: 2px;
    }

-    @include isMobile {
+    @media #{$is-mobile-query} {
      display: none;
    }
  }
@@ -239,7 +239,7 @@
    color: #d4d4d4;
  }

-  &.theme--dark {
+  &.Appearance_dark {
    .color-picker-type-elementBackground .color-picker-keybinding {
      color: $oc-black;
    }
--- a/src/components/ColorPicker.tsx
+++ b/src/components/ColorPicker.tsx
@@ -115,7 +115,6 @@ const Picker = ({
      onClose();
    }
    event.nativeEvent.stopImmediatePropagation();
-    event.stopPropagation();
  };

  return (
@@ -238,16 +237,13 @@ export const ColorPicker = ({
  color,
  onChange,
  label,
-  isActive,
-  setActive,
 }: {
  type: "canvasBackground" | "elementBackground" | "elementStroke";
  color: string | null;
  onChange: (color: string) => void;
  label: string;
-  isActive: boolean;
-  setActive: (active: boolean) => void;
 }) => {
+  const [isActive, setActive] = React.useState(false);
  const pickerButton = React.useRef<HTMLButtonElement>(null);

  return (
--- a/src/components/ContextMenu.scss
+++ b/src/components/ContextMenu.scss
@@ -76,7 +76,7 @@
    z-index: 1;
  }

-  @include isMobile {
+  @media #{$is-mobile-query} {
    .context-menu-option {
      display: block;

--- a/src/components/ContextMenu.tsx
+++ b/src/components/ContextMenu.tsx
@@ -32,63 +32,67 @@ const ContextMenu = ({
  actionManager,
  appState,
 }: ContextMenuProps) => {
+  const isDarkTheme = !!document
+    .querySelector(".excalidraw")
+    ?.classList.contains("Appearance_dark");
  return (
-    <Popover
-      onCloseRequest={onCloseRequest}
-      top={top}
-      left={left}
-      fitInViewport={true}
+    <div
+      className={clsx("excalidraw", {
+        "Appearance_dark Appearance_dark-background-none": isDarkTheme,
+      })}
    >
-      <ul
-        className="context-menu"
-        onContextMenu={(event) => event.preventDefault()}
+      <Popover
+        onCloseRequest={onCloseRequest}
+        top={top}
+        left={left}
+        fitInViewport={true}
      >
-        {options.map((option, idx) => {
-          if (option === "separator") {
-            return <hr key={idx} className="context-menu-option-separator" />;
-          }
+        <ul
+          className="context-menu"
+          onContextMenu={(event) => event.preventDefault()}
+        >
+          {options.map((option, idx) => {
+            if (option === "separator") {
+              return <hr key={idx} className="context-menu-option-separator" />;
+            }

-          const actionName = option.name;
-          const label = option.contextItemLabel
-            ? t(option.contextItemLabel)
-            : "";
-          return (
-            <li key={idx} data-testid={actionName} onClick={onCloseRequest}>
-              <button
-                className={clsx("context-menu-option", {
-                  dangerous: actionName === "deleteSelectedElements",
-                  checkmark: option.checked?.(appState),
-                })}
-                onClick={() => actionManager.executeAction(option)}
-              >
-                <div className="context-menu-option__label">{label}</div>
-                <kbd className="context-menu-option__shortcut">
-                  {actionName
-                    ? getShortcutFromShortcutName(actionName as ShortcutName)
-                    : ""}
-                </kbd>
-              </button>
-            </li>
-          );
-        })}
-      </ul>
-    </Popover>
+            const actionName = option.name;
+            const label = option.contextItemLabel
+              ? t(option.contextItemLabel)
+              : "";
+            return (
+              <li key={idx} data-testid={actionName} onClick={onCloseRequest}>
+                <button
+                  className={clsx("context-menu-option", {
+                    dangerous: actionName === "deleteSelectedElements",
+                    checkmark: option.checked?.(appState),
+                  })}
+                  onClick={() => actionManager.executeAction(option)}
+                >
+                  <div className="context-menu-option__label">{label}</div>
+                  <kbd className="context-menu-option__shortcut">
+                    {actionName
+                      ? getShortcutFromShortcutName(actionName as ShortcutName)
+                      : ""}
+                  </kbd>
+                </button>
+              </li>
+            );
+          })}
+        </ul>
+      </Popover>
+    </div>
  );
 };

-const contextMenuNodeByContainer = new WeakMap<HTMLElement, HTMLDivElement>();
-
-const getContextMenuNode = (container: HTMLElement): HTMLDivElement => {
-  let contextMenuNode = contextMenuNodeByContainer.get(container);
+let contextMenuNode: HTMLDivElement;
+const getContextMenuNode = (): HTMLDivElement => {
  if (contextMenuNode) {
    return contextMenuNode;
  }
-  contextMenuNode = document.createElement("div");
-  container
-    .querySelector(".excalidraw-contextMenuContainer")!
-    .appendChild(contextMenuNode);
-  contextMenuNodeByContainer.set(container, contextMenuNode);
-  return contextMenuNode;
+  const div = document.createElement("div");
+  document.body.appendChild(div);
+  return (contextMenuNode = div);
 };

 type ContextMenuParams = {
@@ -97,16 +101,10 @@ type ContextMenuParams = {
  left: ContextMenuProps["left"];
  actionManager: ContextMenuProps["actionManager"];
  appState: Readonly<AppState>;
-  container: HTMLElement;
 };

-const handleClose = (container: HTMLElement) => {
-  const contextMenuNode = contextMenuNodeByContainer.get(container);
-  if (contextMenuNode) {
-    unmountComponentAtNode(contextMenuNode);
-    contextMenuNode.remove();
-    contextMenuNodeByContainer.delete(container);
-  }
+const handleClose = () => {
+  unmountComponentAtNode(getContextMenuNode());
 };

 export default {
@@ -123,11 +121,11 @@ export default {
          top={params.top}
          left={params.left}
          options={options}
-          onCloseRequest={() => handleClose(params.container)}
+          onCloseRequest={handleClose}
          actionManager={params.actionManager}
          appState={params.appState}
        />,
-        getContextMenuNode(params.container),
+        getContextMenuNode(),
      );
    }
  },
--- a/src/components/DarkModeToggle.tsx
+++ b/src/components/DarkModeToggle.tsx
@@ -2,7 +2,6 @@ import "./ToolIcon.scss";

 import React from "react";
 import { t } from "../i18n";
-import { ToolButton } from "./ToolButton";

 export type Appearence = "light" | "dark";

@@ -13,19 +12,30 @@ export const DarkModeToggle = (props: {
  onChange: (value: Appearence) => void;
  title?: string;
 }) => {
-  const title =
-    props.title ||
-    (props.value === "dark" ? t("buttons.lightMode") : t("buttons.darkMode"));
+  const title = props.title
+    ? props.title
+    : props.value === "dark"
+    ? t("buttons.lightMode")
+    : t("buttons.darkMode");

  return (
-    <ToolButton
-      type="icon"
-      icon={props.value === "light" ? ICONS.MOON : ICONS.SUN}
+    <label
+      className={`ToolIcon ToolIcon_type_floating ToolIcon_size_M`}
      title={title}
-      aria-label={title}
-      onClick={() => props.onChange(props.value === "dark" ? "light" : "dark")}
-      data-testid="toggle-dark-mode"
-    />
+    >
+      <input
+        className="ToolIcon_type_checkbox ToolIcon_toggle_opaque"
+        type="checkbox"
+        onChange={(event) =>
+          props.onChange(event.target.checked ? "dark" : "light")
+        }
+        checked={props.value === "dark"}
+        aria-label={title}
+      />
+      <div className="ToolIcon__icon">
+        {props.value === "light" ? ICONS.MOON : ICONS.SUN}
+      </div>
+    </label>
  );
 };

--- a/src/components/Dialog.scss
+++ b/src/components/Dialog.scss
@@ -31,7 +31,7 @@
    padding: 0 16px 16px;
  }

-  @include isMobile {
+  @media #{$is-mobile-query} {
    .Dialog {
      --metric: calc(var(--space-factor) * 4);
      --inset-left: #{"max(var(--metric), var(--sal))"};
--- a/src/components/Dialog.tsx
+++ b/src/components/Dialog.tsx
@@ -1,14 +1,13 @@
 import clsx from "clsx";
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { useCallbackRefState } from "../hooks/useCallbackRefState";
 import { t } from "../i18n";
-import { useExcalidrawContainer, useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import { KEYS } from "../keys";
 import "./Dialog.scss";
 import { back, close } from "./icons";
 import { Island } from "./Island";
 import { Modal } from "./Modal";
-import { AppState } from "../types";

 export const Dialog = (props: {
  children: React.ReactNode;
@@ -17,11 +16,8 @@ export const Dialog = (props: {
  onCloseRequest(): void;
  title: React.ReactNode;
  autofocus?: boolean;
-  theme?: AppState["theme"];
 }) => {
  const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
-  const [lastActiveElement] = useState(document.activeElement);
-  const { id } = useExcalidrawContainer();

  useEffect(() => {
    if (!islandNode) {
@@ -69,25 +65,19 @@ export const Dialog = (props: {
    return focusableElements ? Array.from(focusableElements) : [];
  };

-  const onClose = () => {
-    (lastActiveElement as HTMLElement).focus();
-    props.onCloseRequest();
-  };
-
  return (
    <Modal
      className={clsx("Dialog", props.className)}
      labelledBy="dialog-title"
      maxWidth={props.small ? 550 : 800}
-      onCloseRequest={onClose}
-      theme={props.theme}
+      onCloseRequest={props.onCloseRequest}
    >
      <Island ref={setIslandNode}>
-        <h2 id={`${id}-dialog-title`} className="Dialog__title">
+        <h2 id="dialog-title" className="Dialog__title">
          <span className="Dialog__titleContent">{props.title}</span>
          <button
            className="Modal__close"
-            onClick={onClose}
+            onClick={props.onCloseRequest}
            aria-label={t("buttons.close")}
          >
            {useIsMobile() ? back : close}
--- a/src/components/ErrorDialog.tsx
+++ b/src/components/ErrorDialog.tsx
@@ -2,7 +2,6 @@ import React, { useState } from "react";
 import { t } from "../i18n";

 import { Dialog } from "./Dialog";
-import { useExcalidrawContainer } from "./App";

 export const ErrorDialog = ({
  message,
@@ -12,7 +11,6 @@ export const ErrorDialog = ({
  onClose?: () => void;
 }) => {
  const [modalIsShown, setModalIsShown] = useState(!!message);
-  const { container: excalidrawContainer } = useExcalidrawContainer();

  const handleClose = React.useCallback(() => {
    setModalIsShown(false);
@@ -20,9 +18,7 @@ export const ErrorDialog = ({
    if (onClose) {
      onClose();
    }
-    // TODO: Fix the A11y issues so this is never needed since we should always focus on last active element
-    excalidrawContainer?.focus();
-  }, [onClose, excalidrawContainer]);
+  }, [onClose]);

  return (
    <>
@@ -32,7 +28,14 @@ export const ErrorDialog = ({
          onCloseRequest={handleClose}
          title={t("errorDialog.title")}
        >
-          <div style={{ whiteSpace: "pre-wrap" }}>{message}</div>
+          <div>
+            {message.split("\n").map((line) => (
+              <>
+                {line}
+                <br />
+              </>
+            ))}
+          </div>
        </Dialog>
      )}
    </>
--- a/src/components/ExportDialog.scss
+++ b/src/components/ExportDialog.scss
@@ -16,7 +16,7 @@
    max-height: 25rem;
  }

-  &.theme--dark .ExportDialog__preview canvas {
+  &.Appearance_dark .ExportDialog__preview canvas {
    filter: none;
  }

@@ -28,7 +28,16 @@
    justify-content: space-between;
  }

-  @include isMobile {
+  .ExportDialog__name {
+    grid-column: project-name;
+    margin: auto;
+
+    .TextInput {
+      height: calc(1rem - 3px);
+    }
+  }
+
+  @media #{$is-mobile-query} {
    .ExportDialog {
      display: flex;
      flex-direction: column;
@@ -57,63 +66,4 @@
      overflow-y: auto;
    }
  }
-
-  .ExportDialog--json {
-    .ExportDialog-cards {
-      display: grid;
-      grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-      justify-items: center;
-      row-gap: 2em;
-
-      @media (max-width: 460px) {
-        grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
-        .Card-details {
-          min-height: 40px;
-        }
-      }
-
-      .ProjectName {
-        width: fit-content;
-        margin: 1em auto;
-        align-items: flex-start;
-        flex-direction: column;
-
-        .TextInput {
-          width: auto;
-        }
-      }
-
-      .ProjectName-label {
-        margin: 0.625em 0;
-        font-weight: bold;
-      }
-    }
-  }
-
-  button.ExportDialog-imageExportButton {
-    width: 5rem;
-    height: 5rem;
-    margin: 0 0.2em;
-
-    border-radius: 1rem;
-    background-color: var(--button-color);
-    box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.28),
-      0 6px 10px 0 rgba(0, 0, 0, 0.14);
-
-    font-family: Cascadia;
-    font-size: 1.8em;
-    color: $oc-white;
-
-    &:hover {
-      background-color: var(--button-color-darker);
-    }
-    &:active {
-      background-color: var(--button-color-darkest);
-      box-shadow: none;
-    }
-
-    svg {
-      width: 0.9em;
-    }
-  }
 }
--- a/src/components/ImageExportDialog.tsx
+++ b/src/components/ImageExportDialog.tsx
@@ -6,19 +6,18 @@ import { canvasToBlob } from "../data/blob";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { CanvasError } from "../errors";
 import { t } from "../i18n";
-import { useIsMobile } from "./App";
+import useIsMobile from "../is-mobile";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { exportToCanvas } from "../scene/export";
+import { exportToCanvas, getExportSize } from "../scene/export";
 import { AppState } from "../types";
 import { Dialog } from "./Dialog";
-import { clipboard, exportImage } from "./icons";
+import "./ExportDialog.scss";
+import { clipboard, exportFile, link } from "./icons";
 import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
-import "./ExportDialog.scss";
-import { supported as fsSupported } from "browser-fs-access";
-import OpenColor from "open-color";
-import { CheckboxItem } from "./CheckboxItem";
-import { DEFAULT_EXPORT_PADDING } from "../constants";
+
+const scales = [1, 2, 3];
+const defaultScale = scales.includes(devicePixelRatio) ? devicePixelRatio : 1;

 const supportsContextFilters =
  "filter" in document.createElement("canvas").getContext("2d")!;
@@ -53,37 +52,15 @@ export type ExportCB = (
  scale?: number,
 ) => void;

-const ExportButton: React.FC<{
-  color: keyof OpenColor;
-  onClick: () => void;
-  title: string;
-  shade?: number;
-}> = ({ children, title, onClick, color, shade = 6 }) => {
-  return (
-    <button
-      className="ExportDialog-imageExportButton"
-      style={{
-        ["--button-color" as any]: OpenColor[color][shade],
-        ["--button-color-darker" as any]: OpenColor[color][shade + 1],
-        ["--button-color-darkest" as any]: OpenColor[color][shade + 2],
-      }}
-      title={title}
-      aria-label={title}
-      onClick={onClick}
-    >
-      {children}
-    </button>
-  );
-};
-
-const ImageExportModal = ({
+const ExportModal = ({
  elements,
  appState,
-  exportPadding = DEFAULT_EXPORT_PADDING,
+  exportPadding = 10,
  actionManager,
  onExportToPng,
  onExportToSvg,
  onExportToClipboard,
+  onExportToBackend,
 }: {
  appState: AppState;
  elements: readonly NonDeletedExcalidrawElement[];
@@ -92,12 +69,18 @@ const ImageExportModal = ({
  onExportToPng: ExportCB;
  onExportToSvg: ExportCB;
  onExportToClipboard: ExportCB;
+  onExportToBackend?: ExportCB;
  onCloseRequest: () => void;
 }) => {
  const someElementIsSelected = isSomeElementSelected(elements, appState);
+  const [scale, setScale] = useState(defaultScale);
  const [exportSelected, setExportSelected] = useState(someElementIsSelected);
  const previewRef = useRef<HTMLDivElement>(null);
-  const { exportBackground, viewBackgroundColor } = appState;
+  const {
+    exportBackground,
+    viewBackgroundColor,
+    shouldAddWatermark,
+  } = appState;

  const exportedElements = exportSelected
    ? getSelectedElements(elements, appState)
@@ -117,6 +100,8 @@ const ImageExportModal = ({
        exportBackground,
        viewBackgroundColor,
        exportPadding,
+        scale,
+        shouldAddWatermark,
      });

      // if converting to blob fails, there's some problem that will
@@ -139,6 +124,8 @@ const ImageExportModal = ({
    exportBackground,
    exportPadding,
    viewBackgroundColor,
+    scale,
+    shouldAddWatermark,
  ]);

  return (
@@ -146,84 +133,106 @@ const ImageExportModal = ({
      <div className="ExportDialog__preview" ref={previewRef} />
      {supportsContextFilters &&
        actionManager.renderAction("exportWithDarkMode")}
-      <div style={{ display: "grid", gridTemplateColumns: "1fr" }}>
-        <div
-          style={{
-            display: "grid",
-            gridTemplateColumns: "repeat(auto-fit, minmax(190px, 1fr))",
-            // dunno why this is needed, but when the items wrap it creates
-            // an overflow
-            overflow: "hidden",
-          }}
-        >
-          {actionManager.renderAction("changeExportBackground")}
-          {someElementIsSelected && (
-            <CheckboxItem
-              checked={exportSelected}
-              onChange={(checked) => setExportSelected(checked)}
-            >
-              {t("labels.onlySelected")}
-            </CheckboxItem>
-          )}
-          {actionManager.renderAction("changeExportEmbedScene")}
+      <Stack.Col gap={2} align="center">
+        <div className="ExportDialog__actions">
+          <Stack.Row gap={2}>
+            <ToolButton
+              type="button"
+              label="PNG"
+              title={t("buttons.exportToPng")}
+              aria-label={t("buttons.exportToPng")}
+              onClick={() => onExportToPng(exportedElements, scale)}
+            />
+            <ToolButton
+              type="button"
+              label="SVG"
+              title={t("buttons.exportToSvg")}
+              aria-label={t("buttons.exportToSvg")}
+              onClick={() => onExportToSvg(exportedElements, scale)}
+            />
+            {probablySupportsClipboardBlob && (
+              <ToolButton
+                type="button"
+                icon={clipboard}
+                title={t("buttons.copyPngToClipboard")}
+                aria-label={t("buttons.copyPngToClipboard")}
+                onClick={() => onExportToClipboard(exportedElements, scale)}
+              />
+            )}
+            {onExportToBackend && (
+              <ToolButton
+                type="button"
+                icon={link}
+                title={t("buttons.getShareableLink")}
+                aria-label={t("buttons.getShareableLink")}
+                onClick={() => onExportToBackend(exportedElements)}
+              />
+            )}
+          </Stack.Row>
+          <div className="ExportDialog__name">
+            {actionManager.renderAction("changeProjectName")}
+          </div>
+          <Stack.Row gap={2}>
+            {scales.map((s) => {
+              const [width, height] = getExportSize(
+                exportedElements,
+                exportPadding,
+                shouldAddWatermark,
+                s,
+              );
+
+              const scaleButtonTitle = `${t(
+                "buttons.scale",
+              )} ${s}x (${width}x${height})`;
+
+              return (
+                <ToolButton
+                  key={s}
+                  size="s"
+                  type="radio"
+                  icon={`${s}x`}
+                  name="export-canvas-scale"
+                  title={scaleButtonTitle}
+                  aria-label={scaleButtonTitle}
+                  id="export-canvas-scale"
+                  checked={s === scale}
+                  onChange={() => setScale(s)}
+                />
+              );
+            })}
+          </Stack.Row>
        </div>
-      </div>
-      <div style={{ display: "flex", alignItems: "center", marginTop: ".6em" }}>
-        <Stack.Row gap={2}>
-          {actionManager.renderAction("changeExportScale")}
-        </Stack.Row>
-        <p style={{ marginLeft: "1em", userSelect: "none" }}>Scale</p>
-      </div>
-      <div
-        style={{
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
-          margin: ".6em 0",
-        }}
-      >
-        {!fsSupported && actionManager.renderAction("changeProjectName")}
-      </div>
-      <Stack.Row gap={2} justifyContent="center" style={{ margin: "2em 0" }}>
-        <ExportButton
-          color="indigo"
-          title={t("buttons.exportToPng")}
-          aria-label={t("buttons.exportToPng")}
-          onClick={() => onExportToPng(exportedElements)}
-        >
-          PNG
-        </ExportButton>
-        <ExportButton
-          color="red"
-          title={t("buttons.exportToSvg")}
-          aria-label={t("buttons.exportToSvg")}
-          onClick={() => onExportToSvg(exportedElements)}
-        >
-          SVG
-        </ExportButton>
-        {probablySupportsClipboardBlob && (
-          <ExportButton
-            title={t("buttons.copyPngToClipboard")}
-            onClick={() => onExportToClipboard(exportedElements)}
-            color="gray"
-            shade={7}
-          >
-            {clipboard}
-          </ExportButton>
+        {actionManager.renderAction("changeExportBackground")}
+        {someElementIsSelected && (
+          <div>
+            <label>
+              <input
+                type="checkbox"
+                checked={exportSelected}
+                onChange={(event) =>
+                  setExportSelected(event.currentTarget.checked)
+                }
+              />{" "}
+              {t("labels.onlySelected")}
+            </label>
+          </div>
        )}
-      </Stack.Row>
+        {actionManager.renderAction("changeExportEmbedScene")}
+        {actionManager.renderAction("changeShouldAddWatermark")}
+      </Stack.Col>
    </div>
  );
 };

-export const ImageExportDialog = ({
+export const ExportDialog = ({
  elements,
  appState,
-  exportPadding = DEFAULT_EXPORT_PADDING,
+  exportPadding = 10,
  actionManager,
  onExportToPng,
  onExportToSvg,
  onExportToClipboard,
+  onExportToBackend,
 }: {
  appState: AppState;
  elements: readonly NonDeletedExcalidrawElement[];
@@ -232,11 +241,14 @@ export const ImageExportDialog = ({
  onExportToPng: ExportCB;
  onExportToSvg: ExportCB;
  onExportToClipboard: ExportCB;
+  onExportToBackend?: ExportCB;
 }) => {
  const [modalIsShown, setModalIsShown] = useState(false);
+  const triggerButton = useRef<HTMLButtonElement>(null);

  const handleClose = React.useCallback(() => {
    setModalIsShown(false);
+    triggerButton.current?.focus();
  }, []);

  return (
@@ -245,16 +257,16 @@ export const ImageExportDialog = ({
        onClick={() => {
          setModalIsShown(true);
        }}
-        data-testid="image-export-button"
-        icon={exportImage}
+        icon={exportFile}
        type="button"
-        aria-label={t("buttons.exportImage")}
+        aria-label={t("buttons.export")}
        showAriaLabel={useIsMobile()}
-        title={t("buttons.exportImage")}
+        title={t("buttons.export")}
+        ref={triggerButton}
      />
      {modalIsShown && (
-        <Dialog onCloseRequest={handleClose} title={t("buttons.exportImage")}>
-          <ImageExportModal
+        <Dialog onCloseRequest={handleClose} title={t("buttons.export")}>
+          <ExportModal
            elements={elements}
            appState={appState}
            exportPadding={exportPadding}
@@ -262,6 +274,7 @@ export const ImageExportDialog = ({
            onExportToPng={onExportToPng}
            onExportToSvg={onExportToSvg}
            onExportToClipboard={onExportToClipboard}
+            onExportToBackend={onExportToBackend}
            onCloseRequest={handleClose}
          />
        </Dialog>
--- a/src/components/FixedSideContainer.scss
+++ b/src/components/FixedSideContainer.scss
@@ -1,5 +1,6 @@
 .excalidraw {
  .FixedSideContainer {
+    --margin: 0.25rem;
    position: absolute;
    pointer-events: none;
  }
@@ -9,9 +10,9 @@
  }

  .FixedSideContainer_side_top {
-    left: var(--space-factor);
-    top: var(--space-factor);
-    right: var(--space-factor);
+    left: var(--margin);
+    top: var(--margin);
+    right: var(--margin);
    z-index: 2;
  }

@@ -22,16 +23,16 @@

 /* TODO: if these are used, make sure to implement RTL support
 .FixedSideContainer_side_left {
-  left: var(--space-factor);
-  top: var(--space-factor);
-  bottom: var(--space-factor);
+  left: var(--margin);
+  top: var(--margin);
+  bottom: var(--margin);
  z-index: 1;
 }

 .FixedSideContainer_side_right {
-  right: var(--space-factor);
-  top: var(--space-factor);
-  bottom: var(--space-factor);
+  right: var(--margin);
+  top: var(--margin);
+  bottom: var(--margin);
  z-index: 3;
 }
 */
--- a/src/excalidraw-app/components/GitHubCorner.tsx
+++ b/src/excalidraw-app/components/GitHubCorner.tsx
@@ -3,19 +3,13 @@ import React from "react";

 // https://github.com/tholman/github-corners
 export const GitHubCorner = React.memo(
-  ({ theme, dir }: { theme: "light" | "dark"; dir: string }) => (
+  ({ appearance }: { appearance: "light" | "dark" }) => (
    <svg
      xmlns="http://www.w3.org/2000/svg"
      width="40"
      height="40"
      viewBox="0 0 250 250"
-      className="rtl-mirror"
-      style={{
-        marginTop: "calc(var(--space-factor) * -1)",
-        [dir === "rtl"
-          ? "marginLeft"
-          : "marginRight"]: "calc(var(--space-factor) * -1)",
-      }}
+      className="github-corner rtl-mirror"
    >
      <a
        href="https://github.com/excalidraw/excalidraw"
@@ -25,18 +19,18 @@ export const GitHubCorner = React.memo(
      >
        <path
          d="M0 0l115 115h15l12 27 108 108V0z"
-          fill={theme === "light" ? oc.gray[6] : oc.gray[7]}
+          fill={appearance === "light" ? oc.gray[6] : oc.gray[8]}
        />
        <path
          className="octo-arm"
          d="M128 109c-15-9-9-19-9-19 3-7 2-11 2-11-1-7 3-2 3-2 4 5 2 11 2 11-3 10 5 15 9 16"
          style={{ transformOrigin: "130px 106px" }}
-          fill={theme === "light" ? oc.white : "var(--default-bg-color)"}
+          fill={appearance === "light" ? oc.white : oc.black}
        />
        <path
          className="octo-body"
          d="M115 115s4 2 5 0l14-14c3-2 6-3 8-3-8-11-15-24 2-41 5-5 10-7 16-7 1-2 3-7 12-11 0 0 5 3 7 16 4 2 8 5 12 9s7 8 9 12c14 3 17 7 17 7-4 8-9 11-11 11 0 6-2 11-7 16-16 16-30 10-41 2 0 3-1 7-5 11l-12 11c-1 1 1 5 1 5z"
-          fill={theme === "light" ? oc.white : "var(--default-bg-color)"}
+          fill={appearance === "light" ? oc.white : oc.black}
        />
      </a>
    </svg>
--- a/src/components/HelpDialog.tsx
+++ b/src/components/HelpDialog.tsx
@@ -153,17 +153,10 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                <Shortcut label={t("toolBar.arrow")} shortcuts={["A", "5"]} />
                <Shortcut label={t("toolBar.line")} shortcuts={["P", "6"]} />
                <Shortcut
-                  label={t("toolBar.freedraw")}
+                  label={t("toolBar.draw")}
                  shortcuts={["Shift+P", "7"]}
                />
                <Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
-                <Shortcut
-                  label={t("helpDialog.editSelectedShape")}
-                  shortcuts={[
-                    getShortcutKey("Enter"),
-                    t("helpDialog.doubleClick"),
-                  ]}
-                />
                <Shortcut
                  label={t("helpDialog.textNewLine")}
                  shortcuts={[
@@ -238,14 +231,6 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                  label={t("labels.viewMode")}
                  shortcuts={[getShortcutKey("Alt+R")]}
                />
-                <Shortcut
-                  label={t("labels.toggleTheme")}
-                  shortcuts={[getShortcutKey("Alt+Shift+D")]}
-                />
-                <Shortcut
-                  label={t("stats.title")}
-                  shortcuts={[getShortcutKey("Alt+/")]}
-                />
              </ShortcutIsland>
            </Column>
            <Column>
@@ -364,22 +349,6 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
                  label={t("labels.ungroup")}
                  shortcuts={[getShortcutKey("CtrlOrCmd+Shift+G")]}
                />
-                <Shortcut
-                  label={t("labels.flipHorizontal")}
-                  shortcuts={[getShortcutKey("Shift+H")]}
-                />
-                <Shortcut
-                  label={t("labels.flipVertical")}
-                  shortcuts={[getShortcutKey("Shift+V")]}
-                />
-                <Shortcut
-                  label={t("labels.showStroke")}
-                  shortcuts={[getShortcutKey("S")]}
-                />
-                <Shortcut
-                  label={t("labels.showBackground")}
-                  shortcuts={[getShortcutKey("G")]}
-                />
              </ShortcutIsland>
            </Column>
          </Columns>
--- a/src/components/HelpIcon.tsx
+++ b/src/components/HelpIcon.tsx
@@ -9,13 +9,7 @@ type HelpIconProps = {
 };

 export const HelpIcon = (props: HelpIconProps) => (
-  <button
-    className="help-icon"
-    onClick={props.onClick}
-    type="button"
-    title={`${props.title} — ?`}
-    aria-label={props.title}
-  >
-    {questionCircle}
-  </button>
+  <label title={`${props.title} — ?`} className="help-icon">
+    <div onClick={props.onClick}>{questionCircle}</div>
+  </label>
 );
--- a/src/components/HintViewer.scss
+++ b/src/components/HintViewer.scss
@@ -19,7 +19,7 @@ $wide-viewport-width: 1000px;
    color: $oc-gray-6;
    font-size: 0.8rem;

-    @include isMobile {
+    @media #{$is-mobile-query} {
      position: static;
      padding-right: 2em;
    }
--- a/src/components/HintViewer.tsx
+++ b/src/components/HintViewer.tsx
@@ -5,7 +5,7 @@ import { getSelectedElements } from "../scene";

 import "./HintViewer.scss";
 import { AppState } from "../types";
-import { isLinearElement, isTextElement } from "../element/typeChecks";
+import { isLinearElement } from "../element/typeChecks";
 import { getShortcutKey } from "../utils";

 interface Hint {
@@ -23,7 +23,7 @@ const getHints = ({ appState, elements }: Hint) => {
    return t("hints.linearElementMulti");
  }

-  if (elementType === "freedraw") {
+  if (elementType === "draw") {
    return t("hints.freeDraw");
  }

@@ -57,14 +57,6 @@ const getHints = ({ appState, elements }: Hint) => {
    return t("hints.lineEditor_info");
  }

-  if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
-    return t("hints.text_selected");
-  }
-
-  if (appState.editingElement && isTextElement(appState.editingElement)) {
-    return t("hints.text_editing");
-  }
-
  return null;
 };

--- a/src/components/IconPicker.scss
+++ b/src/components/IconPicker.scss
@@ -111,7 +111,7 @@
    :root[dir="rtl"] & {
      left: 2px;
    }
-    @include isMobile {
+    @media #{$is-mobile-query} {
      display: none;
    }
  }
@@ -132,7 +132,7 @@
    color: #d4d4d4;
  }

-  &.theme--dark {
+  &.Appearance_dark {
    .picker-type-elementBackground .picker-keybinding {
      color: $oc-black;
    }
--- a/src/components/IconPicker.tsx
+++ b/src/components/IconPicker.tsx
@@ -88,7 +88,6 @@ function Picker<T>({
      onClose();
    }
    event.nativeEvent.stopImmediatePropagation();
-    event.stopPropagation();
  };

  return (
--- a/src/components/Island.scss
+++ b/src/components/Island.scss
@@ -2,6 +2,7 @@
  .Island {
    --padding: 0;
    background-color: var(--island-bg-color);
+    backdrop-filter: saturate(100%) blur(10px);
    box-shadow: var(--shadow-island);
    border-radius: 4px;
    padding: calc(var(--padding) * var(--space-factor));
--- a/src/components/JSONExportDialog.tsx
+++ b/src/components/JSONExportDialog.tsx
@@ -1,127 +0,0 @@
-import React, { useState } from "react";
-import { ActionsManagerInterface } from "../actions/types";
-import { NonDeletedExcalidrawElement } from "../element/types";
-import { t } from "../i18n";
-import { useIsMobile } from "./App";
-import { AppState, ExportOpts } from "../types";
-import { Dialog } from "./Dialog";
-import { exportFile, exportToFileIcon, link } from "./icons";
-import { ToolButton } from "./ToolButton";
-import { actionSaveFileToDisk } from "../actions/actionExport";
-import { Card } from "./Card";
-
-import "./ExportDialog.scss";
-import { supported as fsSupported } from "browser-fs-access";
-
-export type ExportCB = (
-  elements: readonly NonDeletedExcalidrawElement[],
-  scale?: number,
-) => void;
-
-const JSONExportModal = ({
-  elements,
-  appState,
-  actionManager,
-  exportOpts,
-  canvas,
-}: {
-  appState: AppState;
-  elements: readonly NonDeletedExcalidrawElement[];
-  actionManager: ActionsManagerInterface;
-  onCloseRequest: () => void;
-  exportOpts: ExportOpts;
-  canvas: HTMLCanvasElement | null;
-}) => {
-  const { onExportToBackend } = exportOpts;
-  return (
-    <div className="ExportDialog ExportDialog--json">
-      <div className="ExportDialog-cards">
-        {exportOpts.saveFileToDisk && (
-          <Card color="lime">
-            <div className="Card-icon">{exportToFileIcon}</div>
-            <h2>{t("exportDialog.disk_title")}</h2>
-            <div className="Card-details">
-              {t("exportDialog.disk_details")}
-              {!fsSupported && actionManager.renderAction("changeProjectName")}
-            </div>
-            <ToolButton
-              className="Card-button"
-              type="button"
-              title={t("exportDialog.disk_button")}
-              aria-label={t("exportDialog.disk_button")}
-              showAriaLabel={true}
-              onClick={() => {
-                actionManager.executeAction(actionSaveFileToDisk);
-              }}
-            />
-          </Card>
-        )}
-        {onExportToBackend && (
-          <Card color="pink">
-            <div className="Card-icon">{link}</div>
-            <h2>{t("exportDialog.link_title")}</h2>
-            <div className="Card-details">{t("exportDialog.link_details")}</div>
-            <ToolButton
-              className="Card-button"
-              type="button"
-              title={t("exportDialog.link_button")}
-              aria-label={t("exportDialog.link_button")}
-              showAriaLabel={true}
-              onClick={() => onExportToBackend(elements, appState, canvas)}
-            />
-          </Card>
-        )}
-        {exportOpts.renderCustomUI &&
-          exportOpts.renderCustomUI(elements, appState, canvas)}
-      </div>
-    </div>
-  );
-};
-
-export const JSONExportDialog = ({
-  elements,
-  appState,
-  actionManager,
-  exportOpts,
-  canvas,
-}: {
-  appState: AppState;
-  elements: readonly NonDeletedExcalidrawElement[];
-  actionManager: ActionsManagerInterface;
-  exportOpts: ExportOpts;
-  canvas: HTMLCanvasElement | null;
-}) => {
-  const [modalIsShown, setModalIsShown] = useState(false);
-
-  const handleClose = React.useCallback(() => {
-    setModalIsShown(false);
-  }, []);
-
-  return (
-    <>
-      <ToolButton
-        onClick={() => {
-          setModalIsShown(true);
-        }}
-        data-testid="json-export-button"
-        icon={exportFile}
-        type="button"
-        aria-label={t("buttons.export")}
-        showAriaLabel={useIsMobile()}
-        title={t("buttons.export")}
-      />
-      {modalIsShown && (
-        <Dialog onCloseRequest={handleClose} title={t("buttons.export")}>
-          <JSONExportModal
-            elements={elements}
-            appState={appState}
-            actionManager={actionManager}
-            onCloseRequest={handleClose}
-            exportOpts={exportOpts}
-            canvas={canvas}
-          />
-        </Dialog>
-      )}
-    </>
-  );
-};
--- a/src/components/LayerUI.scss
+++ b/src/components/LayerUI.scss
@@ -40,17 +40,50 @@
  .layer-ui__wrapper {
    z-index: var(--zIndex-layerUI);

-    &__top-right {
+    .encrypted-icon {
+      position: relative;
+      margin-inline-start: 15px;
      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-radius: var(--space-factor);
+      color: $oc-green-9;
+
+      svg {
+        width: 1.2rem;
+        height: 1.2rem;
+      }
+    }
+
+    &__github-corner {
+      top: 0;
+
+      :root[dir="ltr"] & {
+        right: 0;
+      }
+
+      :root[dir="rtl"] & {
+        left: 0;
+      }
+
+      position: absolute;
+      width: 40px;
    }

    &__footer {
-      width: 100%;
+      position: absolute;
+      z-index: 100;
+      bottom: 0;

-      &-right {
-        z-index: 100;
-        display: flex;
+      :root[dir="ltr"] & {
+        right: 0;
      }
+
+      :root[dir="rtl"] & {
+        left: 0;
+      }
+
+      width: 190px;
    }

    .zen-mode-transition {
@@ -72,16 +105,12 @@
        transform: translate(-999px, 0);
      }

-      :root[dir="ltr"] &.layer-ui__wrapper__footer-left--transition-left {
+      :root[dir="ltr"] &.App-menu_bottom--transition-left {
        transform: translate(-92px, 0);
      }
-      :root[dir="rtl"] &.layer-ui__wrapper__footer-left--transition-left {
+      :root[dir="rtl"] &.App-menu_bottom--transition-left {
        transform: translate(92px, 0);
      }
-
-      &.layer-ui__wrapper__footer-left--transition-bottom {
-        transform: translate(0, 92px);
-      }
    }

    .disable-zen-mode {
@@ -108,17 +137,5 @@
        transition-delay: 0.8s;
      }
    }
-
-    .layer-ui__wrapper__footer-center {
-      pointer-events: none;
-      & > * {
-        pointer-events: all;
-      }
-    }
-    .layer-ui__wrapper__footer-left,
-    .layer-ui__wrapper__footer-right,
-    .disable-zen-mode--visible {
-      pointer-events: all;
-    }
  }
 }
--- a/src/components/LayerUI.tsx
+++ b/src/components/LayerUI.tsx
@@ -10,33 +10,29 @@ import { ActionManager } from "../actions/manager";
 import { CLASSES } from "../constants";
 import { exportCanvas } from "../data";
 import { importLibraryFromJSON, saveLibraryAsJSON } from "../data/json";
+import { Library } from "../data/library";
 import { isTextElement, showSelectedShapeActions } from "../element";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { Language, t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import { calculateScrollCenter, getSelectedElements } from "../scene";
 import { ExportType } from "../scene/types";
-import {
-  AppProps,
-  AppState,
-  ExcalidrawProps,
-  LibraryItem,
-  LibraryItems,
-} from "../types";
+import { AppState, LibraryItem, LibraryItems } from "../types";
 import { muteFSAbortError } from "../utils";
 import { SelectedShapeActions, ShapesSwitcher, ZoomActions } from "./Actions";
 import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
 import CollabButton from "./CollabButton";
 import { ErrorDialog } from "./ErrorDialog";
-import { ExportCB, ImageExportDialog } from "./ImageExportDialog";
+import { ExportCB, ExportDialog } from "./ExportDialog";
 import { FixedSideContainer } from "./FixedSideContainer";
+import { GitHubCorner } from "./GitHubCorner";
 import { HintViewer } from "./HintViewer";
-import { exportFile, load, trash } from "./icons";
+import { exportFile, load, shield, trash } from "./icons";
 import { Island } from "./Island";
 import "./LayerUI.scss";
 import { LibraryUnit } from "./LibraryUnit";
 import { LoadingMessage } from "./LoadingMessage";
-import { LockButton } from "./LockButton";
+import { LockIcon } from "./LockIcon";
 import { MobileMenu } from "./MobileMenu";
 import { PasteChartDialog } from "./PasteChartDialog";
 import { Section } from "./Section";
@@ -45,9 +41,6 @@ import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
 import { Tooltip } from "./Tooltip";
 import { UserList } from "./UserList";
-import Library from "../data/library";
-import { JSONExportDialog } from "./JSONExportDialog";
-import { LibraryButton } from "./LibraryButton";

 interface LayerUIProps {
  actionManager: ActionManager;
@@ -60,18 +53,16 @@ interface LayerUIProps {
  onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
  zenModeEnabled: boolean;
  showExitZenModeBtn: boolean;
-  showThemeBtn: boolean;
  toggleZenMode: () => void;
  langCode: Language["code"];
  isCollaborating: boolean;
-  renderTopRightUI?: (isMobile: boolean, appState: AppState) => JSX.Element;
-  renderCustomFooter?: (isMobile: boolean, appState: AppState) => JSX.Element;
+  onExportToBackend?: (
+    exportedElements: readonly NonDeletedExcalidrawElement[],
+    appState: AppState,
+    canvas: HTMLCanvasElement | null,
+  ) => void;
+  renderCustomFooter?: (isMobile: boolean) => JSX.Element;
  viewModeEnabled: boolean;
-  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  UIOptions: AppProps["UIOptions"];
-  focusContainer: () => void;
-  library: Library;
-  id: string;
 }

 const useOnClickOutside = (
@@ -103,44 +94,31 @@ const useOnClickOutside = (
 };

 const LibraryMenuItems = ({
-  libraryItems,
+  library,
  onRemoveFromLibrary,
  onAddToLibrary,
  onInsertShape,
  pendingElements,
-  theme,
  setAppState,
  setLibraryItems,
-  libraryReturnUrl,
-  focusContainer,
-  library,
-  id,
 }: {
-  libraryItems: LibraryItems;
+  library: LibraryItems;
  pendingElements: LibraryItem;
  onRemoveFromLibrary: (index: number) => void;
  onInsertShape: (elements: LibraryItem) => void;
  onAddToLibrary: (elements: LibraryItem) => void;
-  theme: AppState["theme"];
  setAppState: React.Component<any, AppState>["setState"];
  setLibraryItems: (library: LibraryItems) => void;
-  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  focusContainer: () => void;
-  library: Library;
-  id: string;
 }) => {
  const isMobile = useIsMobile();
-  const numCells = libraryItems.length + (pendingElements.length > 0 ? 1 : 0);
+  const numCells = library.length + (pendingElements.length > 0 ? 1 : 0);
  const CELLS_PER_ROW = isMobile ? 4 : 6;
  const numRows = Math.max(1, Math.ceil(numCells / CELLS_PER_ROW));
  const rows = [];
  let addedPendingElements = false;

-  const referrer =
-    libraryReturnUrl || window.location.origin + window.location.pathname;
-
  rows.push(
-    <div className="layer-ui__library-header" key="library-header">
+    <div className="layer-ui__library-header">
      <ToolButton
        key="import"
        type="button"
@@ -148,11 +126,11 @@ const LibraryMenuItems = ({
        aria-label={t("buttons.load")}
        icon={load}
        onClick={() => {
-          importLibraryFromJSON(library)
+          importLibraryFromJSON()
            .then(() => {
-              // Close and then open to get the libraries updated
+              // Maybe we should close and open the menu so that the items get updated.
+              // But for now we just close the menu.
              setAppState({ isLibraryOpen: false });
-              setAppState({ isLibraryOpen: true });
            })
            .catch(muteFSAbortError)
            .catch((error) => {
@@ -160,44 +138,35 @@ const LibraryMenuItems = ({
            });
        }}
      />
-      {!!libraryItems.length && (
-        <>
-          <ToolButton
-            key="export"
-            type="button"
-            title={t("buttons.export")}
-            aria-label={t("buttons.export")}
-            icon={exportFile}
-            onClick={() => {
-              saveLibraryAsJSON(library)
-                .catch(muteFSAbortError)
-                .catch((error) => {
-                  setAppState({ errorMessage: error.message });
-                });
-            }}
-          />
-          <ToolButton
-            key="reset"
-            type="button"
-            title={t("buttons.resetLibrary")}
-            aria-label={t("buttons.resetLibrary")}
-            icon={trash}
-            onClick={() => {
-              if (window.confirm(t("alerts.resetLibrary"))) {
-                library.resetLibrary();
-                setLibraryItems([]);
-                focusContainer();
-              }
-            }}
-          />
-        </>
-      )}
-      <a
-        href={`https://libraries.excalidraw.com?target=${
-          window.name || "_blank"
-        }&referrer=${referrer}&useHash=true&token=${id}&theme=${theme}`}
-        target="_excalidraw_libraries"
-      >
+      <ToolButton
+        key="export"
+        type="button"
+        title={t("buttons.export")}
+        aria-label={t("buttons.export")}
+        icon={exportFile}
+        onClick={() => {
+          saveLibraryAsJSON()
+            .catch(muteFSAbortError)
+            .catch((error) => {
+              setAppState({ errorMessage: error.message });
+            });
+        }}
+      />
+      <ToolButton
+        key="reset"
+        type="button"
+        title={t("buttons.resetLibrary")}
+        aria-label={t("buttons.resetLibrary")}
+        icon={trash}
+        onClick={() => {
+          if (window.confirm(t("alerts.resetLibrary"))) {
+            Library.resetLibrary();
+            setLibraryItems([]);
+          }
+        }}
+      />
+
+      <a href="https://libraries.excalidraw.com" target="_excalidraw_libraries">
        {t("labels.libraries")}
      </a>
    </div>,
@@ -210,13 +179,13 @@ const LibraryMenuItems = ({
      const shouldAddPendingElements: boolean =
        pendingElements.length > 0 &&
        !addedPendingElements &&
-        y + x >= libraryItems.length;
+        y + x >= library.length;
      addedPendingElements = addedPendingElements || shouldAddPendingElements;

      children.push(
        <Stack.Col key={x}>
          <LibraryUnit
-            elements={libraryItems[y + x]}
+            elements={library[y + x]}
            pendingElements={
              shouldAddPendingElements ? pendingElements : undefined
            }
@@ -224,7 +193,7 @@ const LibraryMenuItems = ({
            onClick={
              shouldAddPendingElements
                ? onAddToLibrary.bind(null, pendingElements)
-                : onInsertShape.bind(null, libraryItems[y + x])
+                : onInsertShape.bind(null, library[y + x])
            }
          />
        </Stack.Col>,
@@ -249,23 +218,13 @@ const LibraryMenu = ({
  onInsertShape,
  pendingElements,
  onAddToLibrary,
-  theme,
  setAppState,
-  libraryReturnUrl,
-  focusContainer,
-  library,
-  id,
 }: {
  pendingElements: LibraryItem;
  onClickOutside: (event: MouseEvent) => void;
  onInsertShape: (elements: LibraryItem) => void;
  onAddToLibrary: () => void;
-  theme: AppState["theme"];
  setAppState: React.Component<any, AppState>["setState"];
-  libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
-  focusContainer: () => void;
-  library: Library;
-  id: string;
 }) => {
  const ref = useRef<HTMLDivElement | null>(null);
  useOnClickOutside(ref, (event) => {
@@ -291,7 +250,7 @@ const LibraryMenu = ({
          resolve("loading");
        }, 100);
      }),
-      library.loadLibrary().then((items) => {
+      Library.loadLibrary().then((items) => {
        setLibraryItems(items);
        setIsLoading("ready");
      }),
@@ -303,33 +262,24 @@ const LibraryMenu = ({
    return () => {
      clearTimeout(loadingTimerRef.current!);
    };
-  }, [library]);
+  }, []);

-  const removeFromLibrary = useCallback(
-    async (indexToRemove) => {
-      const items = await library.loadLibrary();
-      const nextItems = items.filter((_, index) => index !== indexToRemove);
-      library.saveLibrary(nextItems).catch((error) => {
-        setLibraryItems(items);
-        setAppState({ errorMessage: t("alerts.errorRemovingFromLibrary") });
-      });
-      setLibraryItems(nextItems);
-    },
-    [library, setAppState],
-  );
+  const removeFromLibrary = useCallback(async (indexToRemove) => {
+    const items = await Library.loadLibrary();
+    const nextItems = items.filter((_, index) => index !== indexToRemove);
+    Library.saveLibrary(nextItems);
+    setLibraryItems(nextItems);
+  }, []);

  const addToLibrary = useCallback(
    async (elements: LibraryItem) => {
-      const items = await library.loadLibrary();
+      const items = await Library.loadLibrary();
      const nextItems = [...items, elements];
      onAddToLibrary();
-      library.saveLibrary(nextItems).catch((error) => {
-        setLibraryItems(items);
-        setAppState({ errorMessage: t("alerts.errorAddingToLibrary") });
-      });
+      Library.saveLibrary(nextItems);
      setLibraryItems(nextItems);
    },
-    [onAddToLibrary, library, setAppState],
+    [onAddToLibrary],
  );

  return loadingState === "preloading" ? null : (
@@ -340,18 +290,13 @@ const LibraryMenu = ({
        </div>
      ) : (
        <LibraryMenuItems
-          libraryItems={libraryItems}
+          library={libraryItems}
          onRemoveFromLibrary={removeFromLibrary}
          onAddToLibrary={addToLibrary}
          onInsertShape={onInsertShape}
          pendingElements={pendingElements}
          setAppState={setAppState}
          setLibraryItems={setLibraryItems}
-          libraryReturnUrl={libraryReturnUrl}
-          focusContainer={focusContainer}
-          library={library}
-          theme={theme}
-          id={id}
        />
      )}
    </Island>
@@ -369,72 +314,70 @@ const LayerUI = ({
  onInsertElements,
  zenModeEnabled,
  showExitZenModeBtn,
-  showThemeBtn,
  toggleZenMode,
  isCollaborating,
-  renderTopRightUI,
+  onExportToBackend,
  renderCustomFooter,
  viewModeEnabled,
-  libraryReturnUrl,
-  UIOptions,
-  focusContainer,
-  library,
-  id,
 }: LayerUIProps) => {
  const isMobile = useIsMobile();

-  const renderJSONExportDialog = () => {
-    if (!UIOptions.canvasActions.export) {
-      return null;
-    }
-
-    return (
-      <JSONExportDialog
-        elements={elements}
-        appState={appState}
-        actionManager={actionManager}
-        exportOpts={UIOptions.canvasActions.export}
-        canvas={canvas}
-      />
-    );
-  };
-
-  const renderImageExportDialog = () => {
-    if (!UIOptions.canvasActions.saveAsImage) {
-      return null;
-    }
+  const renderEncryptedIcon = () => (
+    <a
+      className={clsx("encrypted-icon tooltip zen-mode-visibility", {
+        "zen-mode-visibility--hidden": zenModeEnabled,
+      })}
+      href="https://blog.excalidraw.com/end-to-end-encryption/"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      <Tooltip label={t("encrypted.tooltip")} position="above" long={true}>
+        {shield}
+      </Tooltip>
+    </a>
+  );

+  const renderExportDialog = () => {
    const createExporter = (type: ExportType): ExportCB => async (
      exportedElements,
+      scale,
    ) => {
-      await exportCanvas(type, exportedElements, appState, {
-        exportBackground: appState.exportBackground,
-        name: appState.name,
-        viewBackgroundColor: appState.viewBackgroundColor,
-      })
-        .catch(muteFSAbortError)
-        .catch((error) => {
-          console.error(error);
-          setAppState({ errorMessage: error.message });
-        });
+      if (canvas) {
+        await exportCanvas(type, exportedElements, appState, canvas, {
+          exportBackground: appState.exportBackground,
+          name: appState.name,
+          viewBackgroundColor: appState.viewBackgroundColor,
+          scale,
+          shouldAddWatermark: appState.shouldAddWatermark,
+        })
+          .catch(muteFSAbortError)
+          .catch((error) => {
+            console.error(error);
+            setAppState({ errorMessage: error.message });
+          });
+      }
    };

    return (
-      <ImageExportDialog
+      <ExportDialog
        elements={elements}
        appState={appState}
        actionManager={actionManager}
        onExportToPng={createExporter("png")}
        onExportToSvg={createExporter("svg")}
        onExportToClipboard={createExporter("clipboard")}
+        onExportToBackend={
+          onExportToBackend
+            ? (elements) => {
+                onExportToBackend &&
+                  onExportToBackend(elements, appState, canvas);
+              }
+            : undefined
+        }
      />
    );
  };

-  const Separator = () => {
-    return <div style={{ width: ".625em" }} />;
-  };
-
  const renderViewModeCanvasActions = () => {
    return (
      <Section
@@ -448,8 +391,9 @@ const LayerUI = ({
        <Island padding={2} style={{ zIndex: 1 }}>
          <Stack.Col gap={4}>
            <Stack.Row gap={1} justifyContent="space-between">
-              {renderJSONExportDialog()}
-              {renderImageExportDialog()}
+              {actionManager.renderAction("saveScene")}
+              {actionManager.renderAction("saveAsScene")}
+              {renderExportDialog()}
            </Stack.Row>
          </Stack.Col>
        </Island>
@@ -468,12 +412,11 @@ const LayerUI = ({
      <Island padding={2} style={{ zIndex: 1 }}>
        <Stack.Col gap={4}>
          <Stack.Row gap={1} justifyContent="space-between">
-            {actionManager.renderAction("clearCanvas")}
-            <Separator />
            {actionManager.renderAction("loadScene")}
-            {renderJSONExportDialog()}
-            {renderImageExportDialog()}
-            <Separator />
+            {actionManager.renderAction("saveScene")}
+            {actionManager.renderAction("saveAsScene")}
+            {renderExportDialog()}
+            {actionManager.renderAction("clearCanvas")}
            {onCollabButtonClick && (
              <CollabButton
                isCollaborating={isCollaborating}
@@ -486,11 +429,7 @@ const LayerUI = ({
            actionManager={actionManager}
            appState={appState}
            setAppState={setAppState}
-            showThemeBtn={showThemeBtn}
          />
-          {appState.fileHandle && (
-            <>{actionManager.renderAction("saveToActiveFile")}</>
-          )}
        </Stack.Col>
      </Island>
    </Section>
@@ -509,8 +448,7 @@ const LayerUI = ({
        style={{
          // we want to make sure this doesn't overflow so substracting 200
          // which is approximately height of zoom footer and top left menu items with some buffer
-          // if active file name is displayed, subtracting 248 to account for its height
-          maxHeight: `${appState.height - (appState.fileHandle ? 248 : 200)}px`,
+          maxHeight: `${appState.height - 200}px`,
        }}
      >
        <SelectedShapeActions
@@ -544,11 +482,6 @@ const LayerUI = ({
      onInsertShape={onInsertElements}
      onAddToLibrary={deselectItems}
      setAppState={setAppState}
-      libraryReturnUrl={libraryReturnUrl}
-      focusContainer={focusContainer}
-      library={library}
-      theme={appState.theme}
-      id={id}
    />
  ) : null;

@@ -575,12 +508,6 @@ const LayerUI = ({
              {(heading) => (
                <Stack.Col gap={4} align="start">
                  <Stack.Row gap={1}>
-                    <LockButton
-                      zenModeEnabled={zenModeEnabled}
-                      checked={appState.elementLocked}
-                      onChange={onLockToggle}
-                      title={t("toolBar.lock")}
-                    />
                    <Island
                      padding={1}
                      className={clsx({ "zen-mode": zenModeEnabled })}
@@ -592,12 +519,15 @@ const LayerUI = ({
                          canvas={canvas}
                          elementType={appState.elementType}
                          setAppState={setAppState}
+                          isLibraryOpen={appState.isLibraryOpen}
                        />
                      </Stack.Row>
                    </Island>
-                    <LibraryButton
-                      appState={appState}
-                      setAppState={setAppState}
+                    <LockIcon
+                      zenModeEnabled={zenModeEnabled}
+                      checked={appState.elementLocked}
+                      onChange={onLockToggle}
+                      title={t("toolBar.lock")}
                    />
                  </Stack.Row>
                  {libraryMenu}
@@ -605,30 +535,24 @@ const LayerUI = ({
              )}
            </Section>
          )}
-          <div
-            className={clsx(
-              "layer-ui__wrapper__top-right zen-mode-transition",
-              {
-                "transition-right": zenModeEnabled,
-              },
-            )}
+          <UserList
+            className={clsx("zen-mode-transition", {
+              "transition-right": zenModeEnabled,
+            })}
          >
-            <UserList>
-              {appState.collaborators.size > 0 &&
-                Array.from(appState.collaborators)
-                  // Collaborator is either not initialized or is actually the current user.
-                  .filter(([_, client]) => Object.keys(client).length !== 0)
-                  .map(([clientId, client]) => (
-                    <Tooltip
-                      label={client.username || "Unknown user"}
-                      key={clientId}
-                    >
-                      {actionManager.renderAction("goToCollaborator", clientId)}
-                    </Tooltip>
-                  ))}
-            </UserList>
-            {renderTopRightUI?.(isMobile, appState)}
-          </div>
+            {appState.collaborators.size > 0 &&
+              Array.from(appState.collaborators)
+                // Collaborator is either not initialized or is actually the current user.
+                .filter(([_, client]) => Object.keys(client).length !== 0)
+                .map(([clientId, client]) => (
+                  <Tooltip
+                    label={client.username || "Unknown user"}
+                    key={clientId}
+                  >
+                    {actionManager.renderAction("goToCollaborator", clientId)}
+                  </Tooltip>
+                ))}
+          </UserList>
        </div>
      </FixedSideContainer>
    );
@@ -636,61 +560,61 @@ const LayerUI = ({

  const renderBottomAppMenu = () => {
    return (
-      <footer
-        role="contentinfo"
-        className="layer-ui__wrapper__footer App-menu App-menu_bottom"
+      <div
+        className={clsx("App-menu App-menu_bottom zen-mode-transition", {
+          "App-menu_bottom--transition-left": zenModeEnabled,
+        })}
      >
-        <div
-          className={clsx(
-            "layer-ui__wrapper__footer-left zen-mode-transition",
-            {
-              "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
-            },
-          )}
-        >
-          <Stack.Col gap={2}>
-            <Section heading="canvasActions">
-              <Island padding={1}>
-                <ZoomActions
-                  renderAction={actionManager.renderAction}
-                  zoom={appState.zoom}
-                />
-              </Island>
-            </Section>
-          </Stack.Col>
-        </div>
-        <div
-          className={clsx(
-            "layer-ui__wrapper__footer-center zen-mode-transition",
-            {
-              "layer-ui__wrapper__footer-left--transition-bottom": zenModeEnabled,
-            },
-          )}
-        >
-          {renderCustomFooter?.(false, appState)}
-        </div>
-        <div
-          className={clsx(
-            "layer-ui__wrapper__footer-right zen-mode-transition",
-            {
-              "transition-right disable-pointerEvents": zenModeEnabled,
-            },
-          )}
-        >
-          {actionManager.renderAction("toggleShortcuts")}
-        </div>
-        <button
-          className={clsx("disable-zen-mode", {
-            "disable-zen-mode--visible": showExitZenModeBtn,
-          })}
-          onClick={toggleZenMode}
-        >
-          {t("buttons.exitZenMode")}
-        </button>
-      </footer>
+        <Stack.Col gap={2}>
+          <Section heading="canvasActions">
+            <Island padding={1}>
+              <ZoomActions
+                renderAction={actionManager.renderAction}
+                zoom={appState.zoom}
+              />
+            </Island>
+            {renderEncryptedIcon()}
+          </Section>
+        </Stack.Col>
+      </div>
    );
  };

+  const renderGitHubCorner = () => {
+    return (
+      <aside
+        className={clsx(
+          "layer-ui__wrapper__github-corner zen-mode-transition",
+          {
+            "transition-right": zenModeEnabled,
+          },
+        )}
+      >
+        <GitHubCorner appearance={appState.appearance} />
+      </aside>
+    );
+  };
+  const renderFooter = () => (
+    <footer role="contentinfo" className="layer-ui__wrapper__footer">
+      <div
+        className={clsx("zen-mode-transition", {
+          "transition-right disable-pointerEvents": zenModeEnabled,
+        })}
+      >
+        {renderCustomFooter?.(false)}
+        {actionManager.renderAction("toggleShortcuts")}
+      </div>
+      <button
+        className={clsx("disable-zen-mode", {
+          "disable-zen-mode--visible": showExitZenModeBtn,
+        })}
+        onClick={toggleZenMode}
+      >
+        {t("buttons.exitZenMode")}
+      </button>
+    </footer>
+  );
+
  const dialogs = (
    <>
      {appState.isLoading && <LoadingMessage />}
@@ -701,11 +625,7 @@ const LayerUI = ({
        />
      )}
      {appState.showHelpDialog && (
-        <HelpDialog
-          onClose={() => {
-            setAppState({ showHelpDialog: false });
-          }}
-        />
+        <HelpDialog onClose={() => setAppState({ showHelpDialog: false })} />
      )}
      {appState.pasteDialog.shown && (
        <PasteChartDialog
@@ -730,8 +650,7 @@ const LayerUI = ({
        elements={elements}
        actionManager={actionManager}
        libraryMenu={libraryMenu}
-        renderJSONExportDialog={renderJSONExportDialog}
-        renderImageExportDialog={renderImageExportDialog}
+        exportButton={renderExportDialog()}
        setAppState={setAppState}
        onCollabButtonClick={onCollabButtonClick}
        onLockToggle={onLockToggle}
@@ -739,7 +658,6 @@ const LayerUI = ({
        isCollaborating={isCollaborating}
        renderCustomFooter={renderCustomFooter}
        viewModeEnabled={viewModeEnabled}
-        showThemeBtn={showThemeBtn}
      />
    </>
  ) : (
@@ -754,6 +672,8 @@ const LayerUI = ({
      {dialogs}
      {renderFixedSideContainer()}
      {renderBottomAppMenu()}
+      {renderGitHubCorner()}
+      {renderFooter()}
      {appState.scrolledOutside && (
        <button
          className="scroll-back-to-content"
--- a/src/components/LibraryButton.tsx
+++ b/src/components/LibraryButton.tsx
@@ -1,46 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import { t } from "../i18n";
-import { AppState } from "../types";
-import { capitalizeString } from "../utils";
-
-const LIBRARY_ICON = (
-  <svg viewBox="0 0 576 512">
-    <path
-      fill="currentColor"
-      d="M542.22 32.05c-54.8 3.11-163.72 14.43-230.96 55.59-4.64 2.84-7.27 7.89-7.27 13.17v363.87c0 11.55 12.63 18.85 23.28 13.49 69.18-34.82 169.23-44.32 218.7-46.92 16.89-.89 30.02-14.43 30.02-30.66V62.75c.01-17.71-15.35-31.74-33.77-30.7zM264.73 87.64C197.5 46.48 88.58 35.17 33.78 32.05 15.36 31.01 0 45.04 0 62.75V400.6c0 16.24 13.13 29.78 30.02 30.66 49.49 2.6 149.59 12.11 218.77 46.95 10.62 5.35 23.21-1.94 23.21-13.46V100.63c0-5.29-2.62-10.14-7.27-12.99z"
-    ></path>
-  </svg>
-);
-
-export const LibraryButton: React.FC<{
-  appState: AppState;
-  setAppState: React.Component<any, AppState>["setState"];
-}> = ({ appState, setAppState }) => {
-  return (
-    <label
-      className={clsx(
-        "ToolIcon ToolIcon_type_floating ToolIcon__library zen-mode-visibility",
-        `ToolIcon_size_m`,
-        {
-          "zen-mode-visibility--hidden": appState.zenModeEnabled,
-        },
-      )}
-      title={`${capitalizeString(t("toolBar.library"))} — 9`}
-      style={{ marginInlineStart: "var(--space-factor)" }}
-    >
-      <input
-        className="ToolIcon_type_checkbox"
-        type="checkbox"
-        name="editor-library"
-        onChange={(event) => {
-          setAppState({ isLibraryOpen: event.target.checked });
-        }}
-        checked={appState.isLibraryOpen}
-        aria-label={capitalizeString(t("toolBar.library"))}
-        aria-keyshortcuts="9"
-      />
-      <div className="ToolIcon__icon">{LIBRARY_ICON}</div>
-    </label>
-  );
-};
--- a/src/components/LibraryUnit.scss
+++ b/src/components/LibraryUnit.scss
@@ -16,7 +16,7 @@
  }

  .library-unit__dragger > svg {
-    filter: var(--theme-filter);
+    filter: var(--appearance-filter);
    flex-grow: 1;
    max-height: 100%;
    max-width: 100%;
--- a/src/components/LibraryUnit.tsx
+++ b/src/components/LibraryUnit.tsx
@@ -4,7 +4,7 @@ import React, { useEffect, useRef, useState } from "react";
 import { close } from "../components/icons";
 import { MIME_TYPES } from "../constants";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import { exportToSvg } from "../scene/export";
 import { LibraryItem } from "../types";
 import "./LibraryUnit.scss";
@@ -36,27 +36,22 @@ export const LibraryUnit = ({
    if (!elementsToRender) {
      return;
    }
-    let svg: SVGSVGElement;
+    const svg = exportToSvg(elementsToRender, {
+      exportBackground: false,
+      viewBackgroundColor: oc.white,
+      shouldAddWatermark: false,
+    });
+    for (const child of ref.current!.children) {
+      if (child.tagName !== "svg") {
+        continue;
+      }
+      ref.current!.removeChild(child);
+    }
+    ref.current!.appendChild(svg);
+
    const current = ref.current!;
-
-    (async () => {
-      svg = await exportToSvg(elementsToRender, {
-        exportBackground: false,
-        viewBackgroundColor: oc.white,
-      });
-      for (const child of ref.current!.children) {
-        if (child.tagName !== "svg") {
-          continue;
-        }
-        current!.removeChild(child);
-      }
-      current!.appendChild(svg);
-    })();
-
    return () => {
-      if (svg) {
-        current.removeChild(svg);
-      }
+      current.removeChild(svg);
    };
  }, [elements, pendingElements]);

--- a/src/components/LockButton.tsx
+++ b/src/components/LockButton.tsx
@@ -8,8 +8,10 @@ type LockIconSize = "s" | "m";
 type LockIconProps = {
  title?: string;
  name?: string;
+  id?: string;
  checked: boolean;
  onChange?(): void;
+  size?: LockIconSize;
  zenModeEnabled?: boolean;
 };

@@ -39,12 +41,12 @@ const ICONS = {
  ),
 };

-export const LockButton = (props: LockIconProps) => {
+export const LockIcon = (props: LockIconProps) => {
  return (
    <label
      className={clsx(
        "ToolIcon ToolIcon__lock ToolIcon_type_floating zen-mode-visibility",
-        `ToolIcon_size_${DEFAULT_SIZE}`,
+        `ToolIcon_size_${props.size || DEFAULT_SIZE}`,
        {
          "zen-mode-visibility--hidden": props.zenModeEnabled,
        },
@@ -55,6 +57,7 @@ export const LockButton = (props: LockIconProps) => {
        className="ToolIcon_type_checkbox"
        type="checkbox"
        name={props.name}
+        id={props.id}
        onChange={props.onChange}
        checked={props.checked}
        aria-label={props.title}
--- a/src/components/MobileMenu.tsx
+++ b/src/components/MobileMenu.tsx
@@ -13,16 +13,14 @@ import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
 import { Section } from "./Section";
 import CollabButton from "./CollabButton";
 import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
-import { LockButton } from "./LockButton";
+import { LockIcon } from "./LockIcon";
 import { UserList } from "./UserList";
 import { BackgroundPickerAndDarkModeToggle } from "./BackgroundPickerAndDarkModeToggle";
-import { LibraryButton } from "./LibraryButton";

 type MobileMenuProps = {
  appState: AppState;
  actionManager: ActionManager;
-  renderJSONExportDialog: () => React.ReactNode;
-  renderImageExportDialog: () => React.ReactNode;
+  exportButton: React.ReactNode;
  setAppState: React.Component<any, AppState>["setState"];
  elements: readonly NonDeletedExcalidrawElement[];
  libraryMenu: JSX.Element | null;
@@ -30,9 +28,8 @@ type MobileMenuProps = {
  onLockToggle: () => void;
  canvas: HTMLCanvasElement | null;
  isCollaborating: boolean;
-  renderCustomFooter?: (isMobile: boolean, appState: AppState) => JSX.Element;
+  renderCustomFooter?: (isMobile: boolean) => JSX.Element;
  viewModeEnabled: boolean;
-  showThemeBtn: boolean;
 };

 export const MobileMenu = ({
@@ -40,8 +37,7 @@ export const MobileMenu = ({
  elements,
  libraryMenu,
  actionManager,
-  renderJSONExportDialog,
-  renderImageExportDialog,
+  exportButton,
  setAppState,
  onCollabButtonClick,
  onLockToggle,
@@ -49,7 +45,6 @@ export const MobileMenu = ({
  isCollaborating,
  renderCustomFooter,
  viewModeEnabled,
-  showThemeBtn,
 }: MobileMenuProps) => {
  const renderToolbar = () => {
    return (
@@ -65,15 +60,15 @@ export const MobileMenu = ({
                      canvas={canvas}
                      elementType={appState.elementType}
                      setAppState={setAppState}
+                      isLibraryOpen={appState.isLibraryOpen}
                    />
                  </Stack.Row>
                </Island>
-                <LockButton
+                <LockIcon
                  checked={appState.elementLocked}
                  onChange={onLockToggle}
                  title={t("toolBar.lock")}
                />
-                <LibraryButton appState={appState} setAppState={setAppState} />
              </Stack.Row>
              {libraryMenu}
            </Stack.Col>
@@ -110,17 +105,19 @@ export const MobileMenu = ({
    if (viewModeEnabled) {
      return (
        <>
-          {renderJSONExportDialog()}
-          {renderImageExportDialog()}
+          {actionManager.renderAction("saveScene")}
+          {actionManager.renderAction("saveAsScene")}
+          {exportButton}
        </>
      );
    }
    return (
      <>
-        {actionManager.renderAction("clearCanvas")}
        {actionManager.renderAction("loadScene")}
-        {renderJSONExportDialog()}
-        {renderImageExportDialog()}
+        {actionManager.renderAction("saveScene")}
+        {actionManager.renderAction("saveAsScene")}
+        {exportButton}
+        {actionManager.renderAction("clearCanvas")}
        {onCollabButtonClick && (
          <CollabButton
            isCollaborating={isCollaborating}
@@ -133,7 +130,6 @@ export const MobileMenu = ({
            actionManager={actionManager}
            appState={appState}
            setAppState={setAppState}
-            showThemeBtn={showThemeBtn}
          />
        }
      </>
@@ -156,7 +152,7 @@ export const MobileMenu = ({
              <div className="panelColumn">
                <Stack.Col gap={4}>
                  {renderCanvasActions()}
-                  {renderCustomFooter?.(true, appState)}
+                  {renderCustomFooter?.(true)}
                  {appState.collaborators.size > 0 && (
                    <fieldset>
                      <legend>{t("labels.collaborators")}</legend>
--- a/src/components/Modal.scss
+++ b/src/components/Modal.scss
@@ -26,7 +26,8 @@
    right: 0;
    bottom: 0;
    z-index: 1;
-    background-color: transparentize($oc-black, 0.3);
+    background-color: transparentize($oc-black, 0.7);
+    backdrop-filter: blur(2px);
  }

  .Modal__content {
@@ -44,17 +45,13 @@

    // for modals, reset blurry bg
    background: var(--island-bg-color);
+    backdrop-filter: none;

    border: 1px solid var(--dialog-border-color);
    box-shadow: 0 2px 10px transparentize($oc-black, 0.75);
    border-radius: 6px;
-    box-sizing: border-box;

-    &:focus {
-      outline: none;
-    }
-
-    @include isMobile {
+    @media #{$is-mobile-query} {
      max-width: 100%;
      border: 0;
      border-radius: 0;
@@ -84,7 +81,7 @@
    }
  }

-  @include isMobile {
+  @media #{$is-mobile-query} {
    .Modal {
      padding: 0;
    }
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -1,11 +1,9 @@
 import "./Modal.scss";

-import React, { useState, useLayoutEffect, useRef } from "react";
+import React, { useState, useLayoutEffect } from "react";
 import { createPortal } from "react-dom";
 import clsx from "clsx";
 import { KEYS } from "../keys";
-import { useExcalidrawContainer, useIsMobile } from "./App";
-import { AppState } from "../types";

 export const Modal = (props: {
  className?: string;
@@ -13,10 +11,8 @@ export const Modal = (props: {
  maxWidth?: number;
  onCloseRequest(): void;
  labelledBy: string;
-  theme?: AppState["theme"];
 }) => {
-  const { theme = "light" } = props;
-  const modalRoot = useBodyRoot(theme);
+  const modalRoot = useBodyRoot();

  if (!modalRoot) {
    return null;
@@ -25,7 +21,6 @@ export const Modal = (props: {
  const handleKeydown = (event: React.KeyboardEvent) => {
    if (event.key === KEYS.ESCAPE) {
      event.nativeEvent.stopImmediatePropagation();
-      event.stopPropagation();
      props.onCloseRequest();
    }
  };
@@ -42,7 +37,6 @@ export const Modal = (props: {
      <div
        className="Modal__content"
        style={{ "--max-width": `${props.maxWidth}px` }}
-        tabIndex={0}
      >
        {props.children}
      </div>
@@ -51,33 +45,20 @@ export const Modal = (props: {
  );
 };

-const useBodyRoot = (theme: AppState["theme"]) => {
+const useBodyRoot = () => {
  const [div, setDiv] = useState<HTMLDivElement | null>(null);

-  const isMobile = useIsMobile();
-  const isMobileRef = useRef(isMobile);
-  isMobileRef.current = isMobile;
-
-  const { container: excalidrawContainer } = useExcalidrawContainer();
-
  useLayoutEffect(() => {
-    if (div) {
-      div.classList.toggle("excalidraw--mobile", isMobile);
-    }
-  }, [div, isMobile]);
-
-  useLayoutEffect(() => {
-    const isDarkTheme =
-      !!excalidrawContainer?.classList.contains("theme--dark") ||
-      theme === "dark";
+    const isDarkTheme = !!document
+      .querySelector(".excalidraw")
+      ?.classList.contains("Appearance_dark");
    const div = document.createElement("div");

    div.classList.add("excalidraw", "excalidraw-modal-container");
-    div.classList.toggle("excalidraw--mobile", isMobileRef.current);

    if (isDarkTheme) {
-      div.classList.add("theme--dark");
-      div.classList.add("theme--dark-background-none");
+      div.classList.add("Appearance_dark");
+      div.classList.add("Appearance_dark-background-none");
    }
    document.body.appendChild(div);

@@ -86,7 +67,7 @@ const useBodyRoot = (theme: AppState["theme"]) => {
    return () => {
      document.body.removeChild(div);
    };
-  }, [excalidrawContainer, theme]);
+  }, []);

  return div;
 };
--- a/src/components/PasteChartDialog.scss
+++ b/src/components/PasteChartDialog.scss
@@ -2,7 +2,7 @@

 .excalidraw {
  .PasteChartDialog {
-    @include isMobile {
+    @media #{$is-mobile-query} {
      .Island {
        display: flex;
        flex-direction: column;
@@ -13,7 +13,7 @@
      align-items: center;
      justify-content: space-around;
      flex-wrap: wrap;
-      @include isMobile {
+      @media #{$is-mobile-query} {
        flex-direction: column;
        justify-content: center;
      }
--- a/src/components/PasteChartDialog.tsx
+++ b/src/components/PasteChartDialog.tsx
@@ -34,21 +34,20 @@ const ChartPreviewBtn = (props: {
      0,
    );
    setChartElements(elements);
-    let svg: SVGSVGElement;
+
+    const svg = exportToSvg(elements, {
+      exportBackground: false,
+      viewBackgroundColor: oc.white,
+      shouldAddWatermark: false,
+    });
+
    const previewNode = previewRef.current!;

-    (async () => {
-      svg = await exportToSvg(elements, {
-        exportBackground: false,
-        viewBackgroundColor: oc.white,
-      });
+    previewNode.appendChild(svg);

-      previewNode.appendChild(svg);
-
-      if (props.selected) {
-        (previewNode.parentNode as HTMLDivElement).focus();
-      }
-    })();
+    if (props.selected) {
+      (previewNode.parentNode as HTMLDivElement).focus();
+    }

    return () => {
      previewNode.removeChild(svg);
--- a/src/components/Popover.scss
+++ b/src/components/Popover.scss
@@ -1,6 +1,6 @@
 .excalidraw {
  .popover {
-    position: absolute;
+    position: fixed;
    z-index: 10;
  }
 }
--- a/src/components/ProjectName.scss
+++ b/src/components/ProjectName.scss
@@ -1,25 +0,0 @@
-.ProjectName {
-  margin: auto;
-  display: flex;
-  align-items: center;
-
-  .TextInput {
-    height: calc(1rem - 3px);
-    width: 200px;
-    overflow: hidden;
-    text-align: center;
-    margin-left: 8px;
-    text-overflow: ellipsis;
-
-    &--readonly {
-      background: none;
-      border: none;
-      &:hover {
-        background: none;
-      }
-      width: auto;
-      max-width: 200px;
-      padding-left: 2px;
-    }
-  }
-}
--- a/src/components/ProjectName.tsx
+++ b/src/components/ProjectName.tsx
@@ -1,31 +1,28 @@
 import "./TextInput.scss";

-import React, { useState } from "react";
-import { focusNearestParent } from "../utils";
-
-import "./ProjectName.scss";
-import { useExcalidrawContainer } from "./App";
+import React, { Component } from "react";
+import { selectNode, removeSelection } from "../utils";

 type Props = {
  value: string;
  onChange: (value: string) => void;
  label: string;
-  isNameEditable: boolean;
 };

-export const ProjectName = (props: Props) => {
-  const { id } = useExcalidrawContainer();
-  const [fileName, setFileName] = useState<string>(props.value);
-
-  const handleBlur = (event: any) => {
-    focusNearestParent(event.target);
-    const value = event.target.value;
-    if (value !== props.value) {
-      props.onChange(value);
-    }
+export class ProjectName extends Component<Props> {
+  private handleFocus = (event: React.FocusEvent<HTMLElement>) => {
+    selectNode(event.currentTarget);
  };

-  const handleKeyDown = (event: React.KeyboardEvent<HTMLElement>) => {
+  private handleBlur = (event: React.FocusEvent<HTMLElement>) => {
+    const value = event.currentTarget.innerText.trim();
+    if (value !== this.props.value) {
+      this.props.onChange(value);
+    }
+    removeSelection();
+  };
+
+  private handleKeyDown = (event: React.KeyboardEvent<HTMLElement>) => {
    if (event.key === "Enter") {
      event.preventDefault();
      if (event.nativeEvent.isComposing || event.keyCode === 229) {
@@ -34,26 +31,32 @@ export const ProjectName = (props: Props) => {
      event.currentTarget.blur();
    }
  };
+  private makeEditable = (editable: HTMLSpanElement | null) => {
+    if (!editable) {
+      return;
+    }
+    try {
+      editable.contentEditable = "plaintext-only";
+    } catch {
+      editable.contentEditable = "true";
+    }
+  };

-  return (
-    <div className="ProjectName">
-      <label className="ProjectName-label" htmlFor="filename">
-        {`${props.label}${props.isNameEditable ? "" : ":"}`}
-      </label>
-      {props.isNameEditable ? (
-        <input
-          className="TextInput"
-          onBlur={handleBlur}
-          onKeyDown={handleKeyDown}
-          id={`${id}-filename`}
-          value={fileName}
-          onChange={(event) => setFileName(event.target.value)}
-        />
-      ) : (
-        <span className="TextInput TextInput--readonly" id={`${id}-filename`}>
-          {props.value}
-        </span>
-      )}
-    </div>
-  );
-};
+  public render() {
+    return (
+      <span
+        suppressContentEditableWarning
+        ref={this.makeEditable}
+        data-type="wysiwyg"
+        className="TextInput"
+        role="textbox"
+        aria-label={this.props.label}
+        onBlur={this.handleBlur}
+        onKeyDown={this.handleKeyDown}
+        onFocus={this.handleFocus}
+      >
+        {this.props.value}
+      </span>
+    );
+  }
+}
--- a/src/components/Section.tsx
+++ b/src/components/Section.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import { t } from "../i18n";
-import { useExcalidrawContainer } from "./App";

 interface SectionProps extends React.HTMLProps<HTMLElement> {
  heading: string;
@@ -8,14 +7,13 @@ interface SectionProps extends React.HTMLProps<HTMLElement> {
 }

 export const Section = ({ heading, children, ...props }: SectionProps) => {
-  const { id } = useExcalidrawContainer();
  const header = (
-    <h2 className="visually-hidden" id={`${id}-${heading}-title`}>
+    <h2 className="visually-hidden" id={`${heading}-title`}>
      {t(`headings.${heading}`)}
    </h2>
  );
  return (
-    <section {...props} aria-labelledby={`${id}-${heading}-title`}>
+    <section {...props} aria-labelledby={`${heading}-title`}>
      {typeof children === "function" ? (
        children(header)
      ) : (
--- a/src/components/Stats.scss
+++ b/src/components/Stats.scss
@@ -6,7 +6,7 @@
    top: 64px;
    right: 12px;
    font-size: 12px;
-    z-index: 10;
+    z-index: 999;

    h3 {
      margin: 0 24px 8px 0;
--- a/src/components/Stats.tsx
+++ b/src/components/Stats.tsx
@@ -1,22 +1,49 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
+import { copyTextToSystemClipboard } from "../clipboard";
+import { DEFAULT_VERSION } from "../constants";
 import { getCommonBounds } from "../element/bounds";
 import { NonDeletedExcalidrawElement } from "../element/types";
+import {
+  getElementsStorageSize,
+  getTotalStorageSize,
+} from "../excalidraw-app/data/localStorage";
 import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
+import useIsMobile from "../is-mobile";
 import { getTargetElements } from "../scene";
-import { AppState, ExcalidrawProps } from "../types";
+import { AppState } from "../types";
+import { debounce, getVersion, nFormatter } from "../utils";
 import { close } from "./icons";
 import { Island } from "./Island";
 import "./Stats.scss";

+type StorageSizes = { scene: number; total: number };
+
+const getStorageSizes = debounce((cb: (sizes: StorageSizes) => void) => {
+  cb({
+    scene: getElementsStorageSize(),
+    total: getTotalStorageSize(),
+  });
+}, 500);
+
 export const Stats = (props: {
  appState: AppState;
  setAppState: React.Component<any, AppState>["setState"];
  elements: readonly NonDeletedExcalidrawElement[];
  onClose: () => void;
-  renderCustomStats: ExcalidrawProps["renderCustomStats"];
 }) => {
  const isMobile = useIsMobile();
+  const [storageSizes, setStorageSizes] = useState<StorageSizes>({
+    scene: 0,
+    total: 0,
+  });
+
+  useEffect(() => {
+    getStorageSizes((sizes) => {
+      setStorageSizes(sizes);
+    });
+  });
+
+  useEffect(() => () => getStorageSizes.cancel(), []);

  const boundingBox = getCommonBounds(props.elements);
  const selectedElements = getTargetElements(props.elements, props.appState);
@@ -26,6 +53,17 @@ export const Stats = (props: {
    return null;
  }

+  const version = getVersion();
+  let hash;
+  let timestamp;
+
+  if (version !== DEFAULT_VERSION) {
+    timestamp = version.slice(0, 16).replace("T", " ");
+    hash = version.slice(21);
+  } else {
+    timestamp = t("stats.versionNotAvailable");
+  }
+
  return (
    <div className="Stats">
      <Island padding={2}>
@@ -50,7 +88,17 @@ export const Stats = (props: {
              <td>{t("stats.height")}</td>
              <td>{Math.round(boundingBox[3]) - Math.round(boundingBox[1])}</td>
            </tr>
-
+            <tr>
+              <th colSpan={2}>{t("stats.storage")}</th>
+            </tr>
+            <tr>
+              <td>{t("stats.scene")}</td>
+              <td>{nFormatter(storageSizes.scene, 1)}</td>
+            </tr>
+            <tr>
+              <td>{t("stats.total")}</td>
+              <td>{nFormatter(storageSizes.total, 1)}</td>
+            </tr>
            {selectedElements.length === 1 && (
              <tr>
                <th colSpan={2}>{t("stats.element")}</th>
@@ -72,17 +120,31 @@ export const Stats = (props: {
              <>
                <tr>
                  <td>{"x"}</td>
-                  <td>{Math.round(selectedBoundingBox[0])}</td>
+                  <td>
+                    {Math.round(
+                      selectedElements.length === 1
+                        ? selectedElements[0].x
+                        : selectedBoundingBox[0],
+                    )}
+                  </td>
                </tr>
                <tr>
                  <td>{"y"}</td>
-                  <td>{Math.round(selectedBoundingBox[1])}</td>
+                  <td>
+                    {Math.round(
+                      selectedElements.length === 1
+                        ? selectedElements[0].y
+                        : selectedBoundingBox[1],
+                    )}
+                  </td>
                </tr>
                <tr>
                  <td>{t("stats.width")}</td>
                  <td>
                    {Math.round(
-                      selectedBoundingBox[2] - selectedBoundingBox[0],
+                      selectedElements.length === 1
+                        ? selectedElements[0].width
+                        : selectedBoundingBox[2] - selectedBoundingBox[0],
                    )}
                  </td>
                </tr>
@@ -90,7 +152,9 @@ export const Stats = (props: {
                  <td>{t("stats.height")}</td>
                  <td>
                    {Math.round(
-                      selectedBoundingBox[3] - selectedBoundingBox[1],
+                      selectedElements.length === 1
+                        ? selectedElements[0].height
+                        : selectedBoundingBox[3] - selectedBoundingBox[1],
                    )}
                  </td>
                </tr>
@@ -106,7 +170,28 @@ export const Stats = (props: {
                </td>
              </tr>
            )}
-            {props.renderCustomStats?.(props.elements, props.appState)}
+            <tr>
+              <th colSpan={2}>{t("stats.version")}</th>
+            </tr>
+            <tr>
+              <td
+                colSpan={2}
+                style={{ textAlign: "center", cursor: "pointer" }}
+                onClick={async () => {
+                  try {
+                    await copyTextToSystemClipboard(getVersion());
+                    props.setAppState({
+                      toastMessage: t("toast.copyToClipboard"),
+                    });
+                  } catch {}
+                }}
+                title={t("stats.versionCopy")}
+              >
+                {timestamp}
+                <br />
+                {hash}
+              </td>
+            </tr>
          </tbody>
        </table>
      </Island>
--- a/src/components/ToolButton.tsx
+++ b/src/components/ToolButton.tsx
@@ -2,7 +2,6 @@ import "./ToolIcon.scss";

 import React from "react";
 import clsx from "clsx";
-import { useExcalidrawContainer } from "./App";

 type ToolIconSize = "s" | "m";

@@ -30,13 +29,9 @@ type ToolButtonProps =
      children?: React.ReactNode;
      onClick?(): void;
    })
-  | (ToolButtonBaseProps & {
-      type: "icon";
-      children?: React.ReactNode;
-      onClick?(): void;
-    })
  | (ToolButtonBaseProps & {
      type: "radio";
+
      checked: boolean;
      onChange?(): void;
    });
@@ -44,12 +39,11 @@ type ToolButtonProps =
 const DEFAULT_SIZE: ToolIconSize = "m";

 export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
-  const { id: excalId } = useExcalidrawContainer();
  const innerRef = React.useRef(null);
  React.useImperativeHandle(ref, () => innerRef.current);
  const sizeCn = `ToolIcon_size_${props.size || DEFAULT_SIZE}`;

-  if (props.type === "button" || props.type === "icon") {
+  if (props.type === "button") {
    return (
      <button
        className={clsx(
@@ -62,10 +56,8 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
          {
            ToolIcon: !props.hidden,
            "ToolIcon--selected": props.selected,
-            "ToolIcon--plain": props.type === "icon",
          },
        )}
-        data-testid={props["data-testid"]}
        hidden={props.hidden}
        title={props.title}
        aria-label={props["aria-label"]}
@@ -73,16 +65,14 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
        onClick={props.onClick}
        ref={innerRef}
      >
-        {(props.icon || props.label) && (
-          <div className="ToolIcon__icon" aria-hidden="true">
-            {props.icon || props.label}
-            {props.keyBindingLabel && (
-              <span className="ToolIcon__keybinding">
-                {props.keyBindingLabel}
-              </span>
-            )}
-          </div>
-        )}
+        <div className="ToolIcon__icon" aria-hidden="true">
+          {props.icon || props.label}
+          {props.keyBindingLabel && (
+            <span className="ToolIcon__keybinding">
+              {props.keyBindingLabel}
+            </span>
+          )}
+        </div>
        {props.showAriaLabel && (
          <div className="ToolIcon__label">{props["aria-label"]}</div>
        )}
@@ -100,7 +90,7 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
        aria-label={props["aria-label"]}
        aria-keyshortcuts={props["aria-keyshortcuts"]}
        data-testid={props["data-testid"]}
-        id={`${excalId}-${props.id}`}
+        id={props.id}
        onChange={props.onChange}
        checked={props.checked}
        ref={innerRef}
--- a/src/components/ToolIcon.scss
+++ b/src/components/ToolIcon.scss
@@ -8,26 +8,9 @@
    position: relative;
    font-family: Cascadia;
    cursor: pointer;
+    background-color: var(--button-gray-1);
    -webkit-tap-highlight-color: transparent;
    border-radius: var(--space-factor);
-    user-select: none;
-
-    background-color: var(--button-gray-1);
-
-    &:hover {
-      background-color: var(--button-gray-2);
-    }
-    &:active {
-      background-color: var(--button-gray-3);
-    }
-  }
-
-  .ToolIcon--plain {
-    background-color: transparent;
-    .ToolIcon__icon {
-      width: 2rem;
-      height: 2rem;
-    }
  }

  .ToolIcon__icon {
@@ -74,6 +57,14 @@
    margin: 0;
    font-size: inherit;

+    &:hover {
+      background-color: var(--button-gray-1);
+    }
+
+    &:active {
+      background-color: var(--button-gray-2);
+    }
+
    &:focus {
      box-shadow: 0 0 0 2px var(--focus-highlight-color);
    }
@@ -86,14 +77,6 @@
      }
    }

-    &:hover {
-      background-color: var(--button-gray-2);
-    }
-
-    &:active {
-      background-color: var(--button-gray-3);
-    }
-
    &--show {
      visibility: visible;
    }
@@ -111,9 +94,6 @@

    &:not(.ToolIcon_toggle_opaque):checked + .ToolIcon__icon {
      background-color: var(--button-gray-2);
-      &:active {
-        background-color: var(--button-gray-3);
-      }
    }

    &:focus + .ToolIcon__icon {
@@ -141,21 +121,12 @@
    }

    .ToolIcon__icon {
-      background-color: var(--button-gray-1);
-      &:hover {
-        background-color: var(--button-gray-2);
-      }
-      &:active {
-        background-color: var(--button-gray-3);
-      }
-
      width: 2rem;
      height: 2em;
    }
  }

  .ToolIcon.ToolIcon__lock {
-    margin-inline-end: var(--space-factor);
    &.ToolIcon_type_floating {
      margin-left: 0.1rem;
    }
@@ -186,9 +157,10 @@
  // move the lock button out of the way on small viewports
  // it begins to collide with the GitHub icon before we switch to mobile mode
  @media (max-width: 760px) {
-    .ToolIcon.ToolIcon_type_floating {
+    .ToolIcon.ToolIcon__lock {
      display: inline-block;
      position: absolute;
+      top: 60px;
      right: -8px;

      margin-left: 0;
@@ -213,13 +185,16 @@
        position: static;
      }
    }
-    .ToolIcon.ToolIcon__library {
-      top: 100px;
-    }
+  }

-    .ToolIcon.ToolIcon__lock {
-      margin-inline-end: 0;
-      top: 60px;
+  .TooltipIcon {
+    width: 0.9em;
+    height: 0.9em;
+    margin-left: 5px;
+    margin-top: 1px;
+
+    @media #{$is-mobile-query} {
+      display: none;
    }
  }

--- a/src/components/Tooltip.scss
+++ b/src/components/Tooltip.scss
@@ -1,39 +1,58 @@
@import "../css/variables.module";
-.excalidraw-tooltip {
-  position: absolute;
-  z-index: 1000;
-
-  padding: 8px;
-  border-radius: 6px;
-  box-sizing: border-box;
-  pointer-events: none;
-  word-wrap: break-word;
-
-  background: $oc-black;
-
-  line-height: 1.5;
-  text-align: center;
-  font-size: 13px;
-  font-weight: 500;
-  color: $oc-white;
-
-  display: none;
-
-  &.excalidraw-tooltip--visible {
-    display: block;
-  }
-}
-
 .excalidraw {
-  .Tooltip-icon {
-    width: 0.9em;
-    height: 0.9em;
-    margin-left: 5px;
-    margin-top: 1px;
-    display: flex;
+  .Tooltip {
+    position: relative;
+  }

-    @include isMobile {
-      display: none;
+  .Tooltip__label {
+    --arrow-size: 4px;
+    visibility: hidden;
+    background: $oc-black;
+    color: $oc-white;
+    text-align: center;
+    border-radius: 6px;
+    padding: 8px;
+    position: absolute;
+    z-index: 10;
+    font-size: 13px;
+    line-height: 1.5;
+    font-weight: 500;
+    // extra pixel offset for unknown reasons
+    left: calc(50% + var(--arrow-size) / 2 - 1px);
+    transform: translateX(-50%);
+    word-wrap: break-word;
+
+    &::after {
+      content: "";
+      border: var(--arrow-size) solid transparent;
+      position: absolute;
+      left: calc(50% - var(--arrow-size));
+    }
+
+    &--above {
+      bottom: calc(100% + var(--arrow-size) + 3px);
+
+      &::after {
+        border-top-color: $oc-black;
+        top: 100%;
+      }
+    }
+
+    &--below {
+      top: calc(100% + var(--arrow-size) + 3px);
+
+      &::after {
+        border-bottom-color: $oc-black;
+        bottom: 100%;
+      }
    }
  }
+
+  .Tooltip:hover .Tooltip__label {
+    visibility: visible;
+  }
+
+  .Tooltip__label:hover {
+    visibility: visible;
+  }
 }
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,92 +1,31 @@
 import "./Tooltip.scss";

-import React, { useEffect } from "react";
-
-const getTooltipDiv = () => {
-  const existingDiv = document.querySelector<HTMLDivElement>(
-    ".excalidraw-tooltip",
-  );
-  if (existingDiv) {
-    return existingDiv;
-  }
-  const div = document.createElement("div");
-  document.body.appendChild(div);
-  div.classList.add("excalidraw-tooltip");
-  return div;
-};
-
-const updateTooltip = (
-  item: HTMLDivElement,
-  tooltip: HTMLDivElement,
-  label: string,
-  long: boolean,
-) => {
-  tooltip.classList.add("excalidraw-tooltip--visible");
-  tooltip.style.minWidth = long ? "50ch" : "10ch";
-  tooltip.style.maxWidth = long ? "50ch" : "15ch";
-
-  tooltip.textContent = label;
-
-  const {
-    x: itemX,
-    bottom: itemBottom,
-    top: itemTop,
-    width: itemWidth,
-  } = item.getBoundingClientRect();
-
-  const {
-    width: labelWidth,
-    height: labelHeight,
-  } = tooltip.getBoundingClientRect();
-
-  const viewportWidth = window.innerWidth;
-  const viewportHeight = window.innerHeight;
-
-  const margin = 5;
-
-  const left = itemX + itemWidth / 2 - labelWidth / 2;
-  const offsetLeft =
-    left + labelWidth >= viewportWidth ? left + labelWidth - viewportWidth : 0;
-
-  const top = itemBottom + margin;
-  const offsetTop =
-    top + labelHeight >= viewportHeight
-      ? itemBottom - itemTop + labelHeight + margin * 2
-      : 0;
-
-  Object.assign(tooltip.style, {
-    top: `${top - offsetTop}px`,
-    left: `${left - offsetLeft}px`,
-  });
-};
+import React from "react";

 type TooltipProps = {
  children: React.ReactNode;
  label: string;
+  position?: "above" | "below";
  long?: boolean;
 };

-export const Tooltip = ({ children, label, long = false }: TooltipProps) => {
-  useEffect(() => {
-    return () =>
-      getTooltipDiv().classList.remove("excalidraw-tooltip--visible");
-  }, []);
-
-  return (
-    <div
-      onPointerEnter={(event) =>
-        updateTooltip(
-          event.currentTarget as HTMLDivElement,
-          getTooltipDiv(),
-          label,
-          long,
-        )
-      }
-      onPointerLeave={() =>
-        getTooltipDiv().classList.remove("excalidraw-tooltip--visible")
+export const Tooltip = ({
+  children,
+  label,
+  position = "below",
+  long = false,
+}: TooltipProps) => (
+  <div className="Tooltip">
+    <span
+      className={
+        position === "above"
+          ? "Tooltip__label Tooltip__label--above"
+          : "Tooltip__label Tooltip__label--below"
      }
+      style={{ width: long ? "50ch" : "10ch" }}
    >
-      {children}
-    </div>
-  );
-};
+      {label}
+    </span>
+    {children}
+  </div>
+);
--- a/src/components/UserList.scss
+++ b/src/components/UserList.scss
@@ -2,8 +2,7 @@
  .UserList {
    pointer-events: none;
    /*github corner*/
-    padding: var(--space-factor) var(--space-factor) var(--space-factor)
-      var(--space-factor);
+    padding: var(--space-factor) 40px var(--space-factor) var(--space-factor);
    display: flex;
    flex-wrap: wrap;
    justify-content: flex-end;
--- a/src/components/icons.tsx
+++ b/src/components/icons.tsx
@@ -11,12 +11,12 @@ import React from "react";
 import oc from "open-color";
 import clsx from "clsx";

-const activeElementColor = (theme: "light" | "dark") =>
-  theme === "light" ? oc.orange[4] : oc.orange[9];
-const iconFillColor = (theme: "light" | "dark") =>
-  theme === "light" ? oc.black : oc.gray[4];
-const handlerColor = (theme: "light" | "dark") =>
-  theme === "light" ? oc.white : "#1e1e1e";
+const activeElementColor = (appearance: "light" | "dark") =>
+  appearance === "light" ? oc.orange[4] : oc.orange[9];
+const iconFillColor = (appearance: "light" | "dark") =>
+  appearance === "light" ? oc.black : oc.gray[4];
+const handlerColor = (appearance: "light" | "dark") =>
+  appearance === "light" ? oc.white : "#1e1e1e";

 type Opts = {
  width?: number;
@@ -24,10 +24,7 @@ type Opts = {
  mirror?: true;
 } & React.SVGProps<SVGSVGElement>;

-export const createIcon = (
-  d: string | React.ReactNode,
-  opts: number | Opts = 512,
-) => {
+const createIcon = (d: string | React.ReactNode, opts: number | Opts = 512) => {
  const { width = 512, height = width, mirror, style } =
    typeof opts === "number" ? ({ width: opts } as Opts) : opts;
  return (
@@ -44,14 +41,6 @@ export const createIcon = (
  );
 };

-export const checkIcon = createIcon(
-  <polyline fill="none" stroke="currentColor" points="20 6 9 17 4 12" />,
-  {
-    width: 24,
-    height: 24,
-  },
-);
-
 export const link = createIcon(
  "M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z",
  { mirror: true },
@@ -91,19 +80,6 @@ export const exportFile = createIcon(
  { width: 576, height: 512, mirror: true },
 );

-export const exportImage = createIcon(
-  <>
-    <path d="M571 308l-95.7-96.4c-10.1-10.1-27.4-3-27.4 11.3V288h-64v64h64v65.2c0 14.3 17.3 21.4 27.4 11.3L571 332c6.6-6.6 6.6-17.4 0-24zm-187 44v-64 64z" />
-    <path d="M384 121.941V128H256V0h6.059c6.362 0 12.471 2.53 16.97 7.029l97.941 97.941a24.01 24.01 0 017.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z" />
-  </>,
-  { width: 576, height: 512, mirror: true },
-);
-
-export const exportToFileIcon = createIcon(
-  "M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z",
-  { width: 512, height: 512 },
-);
-
 export const zoomIn = createIcon(
  "M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z",
  { width: 448, height: 512 },
@@ -147,22 +123,6 @@ export const shareIOS = createIcon(
  { width: 24, height: 24 },
 );

-export const shareWindows = createIcon(
-  <>
-    <path
-      stroke="currentColor"
-      fill="currentColor"
-      d="M40 5.6v6.1l-4.1.7c-8.9 1.4-16.5 6.9-20.6 15C13 32 10.9 43 12.4 43c.4 0 2.4-1.3 4.4-3 5-3.9 12.1-7 18.2-7.7l5-.6v12.8l11.2-11.3L62.5 22 51.2 10.8 40-.5v6.1zm10.2 22.6L44 34.5v-6.8l-6.9.6c-3.9.3-9.8 1.7-13.2 3.1-3.5 1.4-6.5 2.4-6.7 2.2-.9-1 3-7.5 6.4-10.8C28 18.6 34.4 16 40.1 16c3.7 0 3.9-.1 3.9-3.2V9.5l6.2 6.3 6.3 6.2-6.3 6.2z"
-    />
-    <path
-      stroke="currentColor"
-      fill="currentColor"
-      d="M0 36v20h48v-6.2c0-6 0-6.1-2-4.3-1.1 1-2 2.9-2 4.2V52H4V34c0-17.3-.1-18-2-18s-2 .7-2 20z"
-    />
-  </>,
-  { width: 64, height: 64 },
-);
-
 // Icon imported form Storybook
 // Storybook is licensed under MIT https://github.com/storybookjs/storybook/blob/next/LICENSE
 export const resetZoom = createIcon(
@@ -176,19 +136,19 @@ export const resetZoom = createIcon(
 );

 export const BringForwardIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M22 9.556C22 8.696 21.303 8 20.444 8H16v8H8v4.444C8 21.304 8.697 22 9.556 22h10.888c.86 0 1.556-.697 1.556-1.556V9.556z"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
        />
        <path
          d="M16 3.556C16 2.696 15.303 2 14.444 2H3.556C2.696 2 2 2.697 2 3.556v10.888C2 15.304 2.697 16 3.556 16h10.888c.86 0 1.556-.697 1.556-1.556V3.556z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -197,19 +157,19 @@ export const BringForwardIcon = React.memo(
 );

 export const SendBackwardIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M16 3.556C16 2.696 15.303 2 14.444 2H3.556C2.696 2 2 2.697 2 3.556v10.888C2 15.304 2.697 16 3.556 16h10.888c.86 0 1.556-.697 1.556-1.556V3.556z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
        <path
          d="M22 9.556C22 8.696 21.303 8 20.444 8H9.556C8.696 8 8 8.697 8 9.556v10.888C8 21.304 8.697 22 9.556 22h10.888c.86 0 1.556-.697 1.556-1.556V9.556z"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -218,19 +178,19 @@ export const SendBackwardIcon = React.memo(
 );

 export const BringToFrontIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M13 21a1 1 0 001 1h7a1 1 0 001-1v-7a1 1 0 00-1-1h-3v5h-5v3zM11 3a1 1 0 00-1-1H3a1 1 0 00-1 1v7a1 1 0 001 1h3V6h5V3z"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
        />
        <path
          d="M18 7.333C18 6.597 17.403 6 16.667 6H7.333C6.597 6 6 6.597 6 7.333v9.334C6 17.403 6.597 18 7.333 18h9.334c.736 0 1.333-.597 1.333-1.333V7.333z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -239,19 +199,21 @@ export const BringToFrontIcon = React.memo(
 );

 export const SendToBackIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M18 7.333C18 6.597 17.403 6 16.667 6H7.333C6.597 6 6 6.597 6 7.333v9.334C6 17.403 6.597 18 7.333 18h9.334c.736 0 1.333-.597 1.333-1.333V7.333z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
+          strokeLinejoin="round"
          strokeWidth="2"
        />
        <path
          d="M11 3a1 1 0 00-1-1H3a1 1 0 00-1 1v7a1 1 0 001 1h8V3zM22 14a1 1 0 00-1-1h-7a1 1 0 00-1 1v7a1 1 0 001 1h8v-8z"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeLinejoin="round"
          strokeWidth="2"
        />
      </>,
@@ -266,20 +228,20 @@ export const SendToBackIcon = React.memo(
 // that would make them lie about their function.
 //
 export const AlignTopIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M 2,5 H 22"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeLinecap="round"
        />
        <path
          d="M 6,7 C 5.446,7 5,7.446 5,8 v 9.999992 c 0,0.554 0.446,1 1,1 h 3.0000001 c 0.554,0 0.9999999,-0.446 0.9999999,-1 V 8 C 10,7.446 9.5540001,7 9.0000001,7 Z m 9,0 c -0.554,0 -1,0.446 -1,1 v 5.999992 c 0,0.554 0.446,1 1,1 h 3 c 0.554,0 1,-0.446 1,-1 V 8 C 19,7.446 18.554,7 18,7 Z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -288,20 +250,20 @@ export const AlignTopIcon = React.memo(
 );

 export const AlignBottomIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M 2,19 H 22"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeLinecap="round"
        />
        <path
          d="m 6,16.999992 c -0.554,0 -1,-0.446 -1,-1 V 6 C 5,5.446 5.446,5 6,5 H 9.0000001 C 9.5540001,5 10,5.446 10,6 v 9.999992 c 0,0.554 -0.4459999,1 -0.9999999,1 z m 9,0 c -0.554,0 -1,-0.446 -1,-1 V 10 c 0,-0.554 0.446,-1 1,-1 h 3 c 0.554,0 1,0.446 1,1 v 5.999992 c 0,0.554 -0.446,1 -1,1 z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -310,20 +272,20 @@ export const AlignBottomIcon = React.memo(
 );

 export const AlignLeftIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M 5,2 V 22"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeLinecap="round"
        />
        <path
          d="m 7.000004,5.999996 c 0,-0.554 0.446,-1 1,-1 h 9.999992 c 0.554,0 1,0.446 1,1 v 3.0000001 c 0,0.554 -0.446,0.9999999 -1,0.9999999 H 8.000004 c -0.554,0 -1,-0.4459999 -1,-0.9999999 z m 0,9 c 0,-0.554 0.446,-1 1,-1 h 5.999992 c 0.554,0 1,0.446 1,1 v 3 c 0,0.554 -0.446,1 -1,1 H 8.000004 c -0.554,0 -1,-0.446 -1,-1 z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -332,20 +294,20 @@ export const AlignLeftIcon = React.memo(
 );

 export const AlignRightIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M 19,2 V 22"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeLinecap="round"
        />
        <path
          d="m 16.999996,5.999996 c 0,-0.554 -0.446,-1 -1,-1 H 6.000004 c -0.554,0 -1,0.446 -1,1 v 3.0000001 c 0,0.554 0.446,0.9999999 1,0.9999999 h 9.999992 c 0.554,0 1,-0.4459999 1,-0.9999999 z m 0,9 c 0,-0.554 -0.446,-1 -1,-1 h -5.999992 c -0.554,0 -1,0.446 -1,1 v 3 c 0,0.554 0.446,1 1,1 h 5.999992 c 0.554,0 1,-0.446 1,-1 z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -354,19 +316,20 @@ export const AlignRightIcon = React.memo(
 );

 export const DistributeHorizontallyIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
+        <path d="M5 5V19Z" fill="black" />
        <path
          d="M19 5V19M5 5V19"
-          stroke={iconFillColor(theme)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeLinecap="round"
        />
        <path
          d="M15 9C15.554 9 16 9.446 16 10V14C16 14.554 15.554 15 15 15H9C8.446 15 8 14.554 8 14V10C8 9.446 8.446 9 9 9H15Z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -374,21 +337,29 @@ export const DistributeHorizontallyIcon = React.memo(
    ),
 );

+<svg
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  xmlns="http://www.w3.org/2000/svg"
+></svg>;
+
 export const DistributeVerticallyIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M5 5L19 5M5 19H19"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeLinecap="round"
        />
        <path
          d="M15 9C15.554 9 16 9.446 16 10V14C16 14.554 15.554 15 15 15H9C8.446 15 8 14.554 8 14V10C8 9.446 8.446 9 9 9H15Z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
      </>,
@@ -397,19 +368,19 @@ export const DistributeVerticallyIcon = React.memo(
 );

 export const CenterVerticallyIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="m 5.000004,16.999996 c 0,0.554 0.446,1 1,1 h 3 c 0.554,0 1,-0.446 1,-1 v -10 c 0,-0.554 -0.446,-1 -1,-1 h -3 c -0.554,0 -1,0.446 -1,1 z m 9,-2 c 0,0.554 0.446,1 1,1 h 3 c 0.554,0 1,-0.446 1,-1 v -6 c 0,-0.554 -0.446,-1 -1,-1 h -3 c -0.554,0 -1,0.446 -1,1 z"
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
        <path
          d="M 2,12 H 22"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeDasharray="1, 2.8"
          strokeLinecap="round"
@@ -420,19 +391,19 @@ export const CenterVerticallyIcon = React.memo(
 );

 export const CenterHorizontallyIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
        <path
          d="M 7 5 C 6.446 5 6 5.446 6 6 L 6 9 C 6 9.554 6.446 10 7 10 L 17 10 C 17.554 10 18 9.554 18 9 L 18 6 C 18 5.446 17.554 5 17 5 L 7 5 z M 9 14 C 8.446 14 8 14.446 8 15 L 8 18 C 8 18.554 8.446 19 9 19 L 15 19 C 15.554 19 16 18.554 16 18 L 16 15 C 16 14.446 15.554 14 15 14 L 9 14 z "
-          fill={activeElementColor(theme)}
-          stroke={activeElementColor(theme)}
+          fill={activeElementColor(appearance)}
+          stroke={activeElementColor(appearance)}
          strokeWidth="2"
        />
        <path
          d="M 12,2 V 22"
-          fill={iconFillColor(theme)}
-          stroke={iconFillColor(theme)}
+          fill={iconFillColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
          strokeDasharray="1, 2.8"
          strokeLinecap="round"
@@ -477,91 +448,155 @@ export const shield = createIcon(
  { width: 24 },
 );

-export const file = createIcon(
-  "M369.9 97.9L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM332.1 128H256V51.9l76.1 76.1zM48 464V48h160v104c0 13.3 10.7 24 24 24h104v288H48zm32-48h224V288l-23.5-23.5c-4.7-4.7-12.3-4.7-17 0L176 352l-39.5-39.5c-4.7-4.7-12.3-4.7-17 0L80 352v64zm48-240c-26.5 0-48 21.5-48 48s21.5 48 48 48 48-21.5 48-48-21.5-48-48-48z",
-  { width: 384, height: 512 },
-);
-
-export const GroupIcon = React.memo(({ theme }: { theme: "light" | "dark" }) =>
-  createIcon(
-    <>
-      <path d="M25 26H111V111H25" fill={iconFillColor(theme)} />
-      <path
-        d="M25 111C25 80.2068 25 49.4135 25 26M25 26C48.6174 26 72.2348 26 111 26H25ZM25 26C53.3671 26 81.7343 26 111 26H25ZM111 26C111 52.303 111 78.606 111 111V26ZM111 26C111 51.2947 111 76.5893 111 111V26ZM111 111C87.0792 111 63.1585 111 25 111H111ZM111 111C87.4646 111 63.9293 111 25 111H111ZM25 111C25 81.1514 25 51.3028 25 26V111Z"
-        stroke={iconFillColor(theme)}
-        strokeWidth="2"
-      />
-      <path d="M100 100H160V160H100" fill={iconFillColor(theme)} />
-      <path
-        d="M100 160C100 144.106 100 128.211 100 100M100 100C117.706 100 135.412 100 160 100H100ZM100 100C114.214 100 128.428 100 160 100H100ZM160 100C160 120.184 160 140.369 160 160V100ZM160 100C160 113.219 160 126.437 160 160V100ZM160 160C145.534 160 131.068 160 100 160H160ZM160 160C143.467 160 126.934 160 100 160H160ZM100 160C100 143.661 100 127.321 100 100V160Z"
-        stroke={iconFillColor(theme)}
-        strokeWidth="2"
-      />
-      <g
-        fill={handlerColor(theme)}
-        stroke={iconFillColor(theme)}
-        strokeWidth="6"
-      >
-        <rect x="2.5" y="2.5" width="30" height="30" />
-        <rect x="2.5" y="149.5" width="30" height="30" />
-        <rect x="147.5" y="149.5" width="30" height="30" />
-        <rect x="147.5" y="2.5" width="30" height="30" />
-      </g>
-    </>,
-    { width: 182, height: 182, mirror: true },
-  ),
+export const GroupIcon = React.memo(
+  ({ appearance }: { appearance: "light" | "dark" }) =>
+    createIcon(
+      <>
+        <path d="M25 26H111V111H25" fill={iconFillColor(appearance)} />
+        <path
+          d="M25 111C25 80.2068 25 49.4135 25 26M25 26C48.6174 26 72.2348 26 111 26H25ZM25 26C53.3671 26 81.7343 26 111 26H25ZM111 26C111 52.303 111 78.606 111 111V26ZM111 26C111 51.2947 111 76.5893 111 111V26ZM111 111C87.0792 111 63.1585 111 25 111H111ZM111 111C87.4646 111 63.9293 111 25 111H111ZM25 111C25 81.1514 25 51.3028 25 26V111Z"
+          stroke={iconFillColor(appearance)}
+          strokeWidth="2"
+        />
+        <path d="M100 100H160V160H100" fill={iconFillColor(appearance)} />
+        <path
+          d="M100 160C100 144.106 100 128.211 100 100M100 100C117.706 100 135.412 100 160 100H100ZM100 100C114.214 100 128.428 100 160 100H100ZM160 100C160 120.184 160 140.369 160 160V100ZM160 100C160 113.219 160 126.437 160 160V100ZM160 160C145.534 160 131.068 160 100 160H160ZM160 160C143.467 160 126.934 160 100 160H160ZM100 160C100 143.661 100 127.321 100 100V160Z"
+          stroke={iconFillColor(appearance)}
+          strokeWidth="2"
+        />
+        <rect
+          x="2.5"
+          y="2.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+        <rect
+          x="2.5"
+          y="149.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+        <rect
+          x="147.5"
+          y="149.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+        <rect
+          x="147.5"
+          y="2.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+      </>,
+      { width: 182, height: 182, mirror: true },
+    ),
 );

 export const UngroupIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <>
-        <path d="M25 26H111V111H25" fill={iconFillColor(theme)} />
+        <path d="M25 26H111V111H25" fill={iconFillColor(appearance)} />
        <path
          d="M25 111C25 80.2068 25 49.4135 25 26M25 26C48.6174 26 72.2348 26 111 26H25ZM25 26C53.3671 26 81.7343 26 111 26H25ZM111 26C111 52.303 111 78.606 111 111V26ZM111 26C111 51.2947 111 76.5893 111 111V26ZM111 111C87.0792 111 63.1585 111 25 111H111ZM111 111C87.4646 111 63.9293 111 25 111H111ZM25 111C25 81.1514 25 51.3028 25 26V111Z"
-          stroke={iconFillColor(theme)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
        />
-        <path d="M100 100H160V160H100" fill={iconFillColor(theme)} />
+        <path d="M100 100H160V160H100" fill={iconFillColor(appearance)} />
        <path
          d="M100 160C100 144.106 100 128.211 100 100M100 100C117.706 100 135.412 100 160 100H100ZM100 100C114.214 100 128.428 100 160 100H100ZM160 100C160 120.184 160 140.369 160 160V100ZM160 100C160 113.219 160 126.437 160 160V100ZM160 160C145.534 160 131.068 160 100 160H160ZM160 160C143.467 160 126.934 160 100 160H160ZM100 160C100 143.661 100 127.321 100 100V160Z"
-          stroke={iconFillColor(theme)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="2"
        />
-        <g
-          fill={handlerColor(theme)}
-          stroke={iconFillColor(theme)}
+        <rect
+          x="2.5"
+          y="2.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
          strokeWidth="6"
-        >
-          <rect x="2.5" y="2.5" width="30" height="30" />
-          <rect x="78.5" y="149.5" width="30" height="30" />
-          <rect x="147.5" y="149.5" width="30" height="30" />
-          <rect x="147.5" y="78.5" width="30" height="30" />
-          <rect x="105.5" y="2.5" width="30" height="30" />
-          <rect x="2.5" y="102.5" width="30" height="30" />
-        </g>
+        />
+        <rect
+          x="78.5"
+          y="149.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+        <rect
+          x="147.5"
+          y="149.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+        <rect
+          x="147.5"
+          y="78.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+        <rect
+          x="105.5"
+          y="2.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
+        <rect
+          x="2.5"
+          y="102.5"
+          width="30"
+          height="30"
+          fill={handlerColor(appearance)}
+          stroke={iconFillColor(appearance)}
+          strokeWidth="6"
+        />
      </>,
      { width: 182, height: 182, mirror: true },
    ),
 );

 export const FillHachureIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        fillRule="evenodd"
        clipRule="evenodd"
        d="M20.101 16H28.0934L36 8.95989V4H33.5779L20.101 16ZM30.5704 4L17.0935 16H9.10101L22.5779 4H30.5704ZM19.5704 4L6.09349 16H4V10.7475L11.5779 4H19.5704ZM8.57036 4H4V8.06952L8.57036 4ZM36 11.6378L31.101 16H36V11.6378ZM2 2V18H38V2H2Z"
-        fill={iconFillColor(theme)}
+        fill={iconFillColor(appearance)}
      />,
      { width: 40, height: 20 },
    ),
 );

 export const FillCrossHatchIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
-      <g fill={iconFillColor(theme)} fillRule="evenodd" clipRule="evenodd">
+      <g fill={iconFillColor(appearance)} fillRule="evenodd" clipRule="evenodd">
        <path d="M20.101 16H28.0934L36 8.95989V4H33.5779L20.101 16ZM30.5704 4L17.0935 16H9.10101L22.5779 4H30.5704ZM19.5704 4L6.09349 16H4V10.7475L11.5779 4H19.5704ZM8.57036 4H4V8.06952L8.57036 4ZM36 11.6378L31.101 16H36V11.6378ZM2 2V18H38V2H2Z" />
        <path d="M14.0001 18L3.00006 4.00002L4.5727 2.76438L15.5727 16.7644L14.0001 18ZM25.0001 18L14.0001 4.00002L15.5727 2.76438L26.5727 16.7644L25.0001 18ZM36.0001 18L25.0001 4.00002L26.5727 2.76438L37.5727 16.7644L36.0001 18Z" />
      </g>,
@@ -570,21 +605,26 @@ export const FillCrossHatchIcon = React.memo(
 );

 export const FillSolidIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(<path d="M2 2H38V18H2V2Z" fill={iconFillColor(theme)} />, {
+  ({ appearance }: { appearance: "light" | "dark" }) =>
+    createIcon(<path d="M2 2H38V18H2V2Z" fill={iconFillColor(appearance)} />, {
      width: 40,
      height: 20,
    }),
 );

 export const StrokeWidthIcon = React.memo(
-  ({ theme, strokeWidth }: { theme: "light" | "dark"; strokeWidth: number }) =>
+  ({
+    appearance,
+    strokeWidth,
+  }: {
+    appearance: "light" | "dark";
+    strokeWidth: number;
+  }) =>
    createIcon(
      <path
-        d="M6 10H32"
-        stroke={iconFillColor(theme)}
+        d="M6 10H34"
+        stroke={iconFillColor(appearance)}
        strokeWidth={strokeWidth}
-        strokeLinecap="round"
        fill="none"
      />,
      { width: 40, height: 20 },
@@ -592,14 +632,13 @@ export const StrokeWidthIcon = React.memo(
 );

 export const StrokeStyleSolidIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M6 10H34"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
        fill="none"
-        strokeLinecap="round"
      />,
      {
        width: 40,
@@ -609,43 +648,40 @@ export const StrokeStyleSolidIcon = React.memo(
 );

 export const StrokeStyleDashedIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M6 10H34"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2.5}
        strokeDasharray={"10, 8"}
        fill="none"
-        strokeLinecap="round"
      />,
      { width: 40, height: 20 },
    ),
 );

 export const StrokeStyleDottedIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
-        d="M6 10H36"
-        stroke={iconFillColor(theme)}
+        d="M6 10H34"
+        stroke={iconFillColor(appearance)}
        strokeWidth={2.5}
-        strokeDasharray={"2, 4.5"}
+        strokeDasharray={"4, 4"}
        fill="none"
-        strokeLinecap="round"
      />,
      { width: 40, height: 20 },
    ),
 );

 export const SloppinessArchitectIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M3.00098 16.1691C6.28774 13.9744 19.6399 2.8905 22.7215 3.00082C25.8041 3.11113 19.1158 15.5488 21.4962 16.8309C23.8757 18.1131 34.4155 11.7148 37.0001 10.6919"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
-        strokeLinecap="round"
        fill="none"
      />,
      { width: 40, height: 20, mirror: true },
@@ -653,13 +689,12 @@ export const SloppinessArchitectIcon = React.memo(
 );

 export const SloppinessArtistIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M3 17C6.68158 14.8752 16.1296 9.09849 22.0648 6.54922C28 3.99995 22.2896 13.3209 25 14C27.7104 14.6791 36.3757 9.6471 36.3757 9.6471M6.40706 15C13 11.1918 20.0468 1.51045 23.0234 3.0052C26 4.49995 20.457 12.8659 22.7285 16.4329C25 20 36.3757 13 36.3757 13"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
-        strokeLinecap="round"
        fill="none"
      />,
      { width: 40, height: 20, mirror: true },
@@ -667,13 +702,12 @@ export const SloppinessArtistIcon = React.memo(
 );

 export const SloppinessCartoonistIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M3 15.6468C6.93692 13.5378 22.5544 2.81528 26.6206 3.00242C30.6877 3.18956 25.6708 15.3346 27.4009 16.7705C29.1309 18.2055 35.4001 12.4762 37 11.6177M3.97143 10.4917C6.61158 9.24563 16.3706 2.61886 19.8104 3.01724C23.2522 3.41472 22.0773 12.2013 24.6181 12.8783C27.1598 13.5536 33.3179 8.04068 35.0571 7.07244"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
-        strokeLinecap="round"
        fill="none"
      />,
      { width: 40, height: 20, mirror: true },
@@ -681,13 +715,12 @@ export const SloppinessCartoonistIcon = React.memo(
 );

 export const EdgeSharpIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M10 17L10 5L35 5"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
-        strokeLinecap="round"
        fill="none"
      />,
      { width: 40, height: 20, mirror: true },
@@ -695,13 +728,12 @@ export const EdgeSharpIcon = React.memo(
 );

 export const EdgeRoundIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M10 17V15C10 8 13 5 21 5L33.5 5"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
-        strokeLinecap="round"
        fill="none"
      />,
      { width: 40, height: 20, mirror: true },
@@ -709,11 +741,11 @@ export const EdgeRoundIcon = React.memo(
 );

 export const ArrowheadNoneIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
+  ({ appearance }: { appearance: "light" | "dark" }) =>
    createIcon(
      <path
        d="M6 10H34"
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
        fill="none"
      />,
@@ -725,11 +757,17 @@ export const ArrowheadNoneIcon = React.memo(
 );

 export const ArrowheadArrowIcon = React.memo(
-  ({ theme, flip = false }: { theme: "light" | "dark"; flip?: boolean }) =>
+  ({
+    appearance,
+    flip = false,
+  }: {
+    appearance: "light" | "dark";
+    flip?: boolean;
+  }) =>
    createIcon(
      <g
        transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
-        stroke={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
        strokeWidth={2}
        fill="none"
      >
@@ -741,11 +779,17 @@ export const ArrowheadArrowIcon = React.memo(
 );

 export const ArrowheadDotIcon = React.memo(
-  ({ theme, flip = false }: { theme: "light" | "dark"; flip?: boolean }) =>
+  ({
+    appearance,
+    flip = false,
+  }: {
+    appearance: "light" | "dark";
+    flip?: boolean;
+  }) =>
    createIcon(
      <g
-        stroke={iconFillColor(theme)}
-        fill={iconFillColor(theme)}
+        stroke={iconFillColor(appearance)}
+        fill={iconFillColor(appearance)}
        transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
      >
        <path d="M32 10L6 10" strokeWidth={2} />
@@ -756,12 +800,18 @@ export const ArrowheadDotIcon = React.memo(
 );

 export const ArrowheadBarIcon = React.memo(
-  ({ theme, flip = false }: { theme: "light" | "dark"; flip?: boolean }) =>
+  ({
+    appearance,
+    flip = false,
+  }: {
+    appearance: "light" | "dark";
+    flip?: boolean;
+  }) =>
    createIcon(
      <g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
        <path
          d="M34 10H5.99996M34 10L34 5M34 10L34 15"
-          stroke={iconFillColor(theme)}
+          stroke={iconFillColor(appearance)}
          strokeWidth={2}
          fill="none"
        />
@@ -769,123 +819,3 @@ export const ArrowheadBarIcon = React.memo(
      { width: 40, height: 20 },
    ),
 );
-
-export const FontSizeSmallIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        fill={iconFillColor(theme)}
-        d="M 0 69.092 L 0 55.03 A 124.24 124.24 0 0 0 4.706 57.02 Q 6.826 57.863 8.708 58.5 A 53.466 53.466 0 0 0 12.231 59.571 Q 17.236 60.889 21.387 60.889 A 20.909 20.909 0 0 0 24.265 60.704 Q 25.719 60.502 26.903 60.077 A 8.649 8.649 0 0 0 29.028 58.985 Q 31.689 57.08 31.689 53.321 Q 31.689 51.221 30.518 49.585 A 10.126 10.126 0 0 0 29.282 48.177 Q 28.352 47.287 27.075 46.436 A 23.719 23.719 0 0 0 25.752 45.627 Q 23.774 44.492 20.176 42.735 A 254.44 254.44 0 0 0 17.822 41.602 Q 11.503 38.631 8.236 35.888 A 19.742 19.742 0 0 1 8.008 35.694 A 22.18 22.18 0 0 1 2.783 29.102 Q 0.83 25.342 0.83 20.313 A 22.471 22.471 0 0 1 1.733 13.778 A 17.283 17.283 0 0 1 7.251 5.42 A 21.486 21.486 0 0 1 15.177 1.272 Q 18.361 0.338 22.166 0.09 A 43.573 43.573 0 0 1 25 0 A 42.399 42.399 0 0 1 34.349 1.01 A 39.075 39.075 0 0 1 35.62 1.319 A 67.407 67.407 0 0 1 42.108 3.382 A 83.357 83.357 0 0 1 46.191 5.03 L 41.309 16.797 Q 35.596 14.453 31.86 13.526 A 30.762 30.762 0 0 0 25.417 12.612 A 28.337 28.337 0 0 0 24.512 12.598 A 14.846 14.846 0 0 0 22.022 12.793 Q 19.498 13.224 17.92 14.6 Q 15.625 16.602 15.625 19.824 Q 15.625 21.826 16.553 23.316 Q 17.48 24.805 19.507 26.197 A 18.343 18.343 0 0 0 20.659 26.912 Q 22.596 28.035 26.516 29.953 A 299.99 299.99 0 0 0 29.102 31.201 Q 37.91 35.412 41.841 39.642 A 16.553 16.553 0 0 1 42.822 40.796 A 17.675 17.675 0 0 1 46.301 49.233 A 23.517 23.517 0 0 1 46.533 52.588 A 21.581 21.581 0 0 1 45.471 59.515 A 17.733 17.733 0 0 1 39.575 67.823 Q 33.745 72.486 24.094 73.243 A 49.683 49.683 0 0 1 20.215 73.389 A 51.712 51.712 0 0 1 9.448 72.315 A 40.672 40.672 0 0 1 0 69.092 Z"
-      />,
-      { width: 47, height: 77 },
-    ),
-);
-
-export const FontSizeMediumIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        fill={iconFillColor(theme)}
-        d="M 44.092 71.387 L 30.225 71.387 L 13.037 15.381 L 12.598 15.381 A 1505.093 1505.093 0 0 1 12.959 22.313 Q 13.426 31.715 13.508 36.4 A 102.991 102.991 0 0 1 13.525 38.184 L 13.525 71.387 L 0 71.387 L 0 0 L 20.605 0 L 37.5 54.59 L 37.793 54.59 L 55.713 0 L 76.318 0 L 76.318 71.387 L 62.207 71.387 L 62.207 37.598 Q 62.207 35.205 62.28 32.08 A 160.703 160.703 0 0 1 62.326 30.544 Q 62.452 26.754 62.866 17.168 A 5390.536 5390.536 0 0 1 62.939 15.479 L 62.5 15.479 L 44.092 71.387 Z"
-      />,
-      { width: 77, height: 75 },
-    ),
-);
-
-export const FontSizeLargeIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        fill={iconFillColor(theme)}
-        d="M 44.092 71.387 L 0 71.387 L 0 0 L 15.137 0 L 15.137 58.887 L 44.092 58.887 L 44.092 71.387 Z"
-      />,
-      { width: 45, height: 75 },
-    ),
-);
-
-export const FontSizeExtraLargeIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        fill={iconFillColor(theme)}
-        d="M 42.578 35.4 L 66.699 71.387 L 49.414 71.387 L 32.813 44.385 L 16.211 71.387 L 0 71.387 L 23.682 34.57 L 1.514 0 L 18.213 0 L 33.594 25.684 L 48.682 0 L 64.99 0 L 42.578 35.4 Z M 119.775 71.387 L 75.684 71.387 L 75.684 0 L 90.82 0 L 90.82 58.887 L 119.775 58.887 L 119.775 71.387 Z"
-      />,
-      { width: 120, height: 75 },
-    ),
-);
-
-export const FontFamilyHandDrawnIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        fill={iconFillColor(theme)}
-        d="M290.74 93.24l128.02 128.02-277.99 277.99-114.14 12.6C11.35 513.54-1.56 500.62.14 485.34l12.7-114.22 277.9-277.88zm207.2-19.06l-60.11-60.11c-18.75-18.75-49.16-18.75-67.91 0l-56.55 56.55 128.02 128.02 56.55-56.55c18.75-18.76 18.75-49.16 0-67.91z"
-      />,
-      { width: 448, height: 512 },
-    ),
-);
-
-export const FontFamilyNormalIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <>
-        <path
-          fill={iconFillColor(theme)}
-          d="M 63.818 71.68 L 54.492 71.68 L 45.898 49.561 L 17.578 49.561 L 9.082 71.68 L 0 71.68 L 27.881 0 L 35.986 0 L 63.818 71.68 Z M 20.605 41.602 L 43.213 41.602 L 35.205 19.971 L 31.787 9.277 Q 30.322 15.137 28.711 19.971 L 20.605 41.602 Z"
-        />
-        <path
-          fill={iconFillColor(theme)}
-          d="M 68.994 71.68 L 52.686 71.68 L 47.51 54.688 L 21.484 54.688 L 16.309 71.68 L 0 71.68 L 25.195 0 L 43.701 0 L 68.994 71.68 Z M 25.293 41.992 L 43.896 41.992 A 27590.463 27590.463 0 0 1 42.2 36.532 Q 36.965 19.676 35.937 16.273 A 120.932 120.932 0 0 1 35.815 15.869 A 131.65 131.65 0 0 1 35.396 14.435 Q 34.951 12.879 34.675 11.741 A 34.866 34.866 0 0 1 34.521 11.084 A 141.762 141.762 0 0 1 33.706 14.075 Q 31.482 21.957 25.293 41.992 Z"
-        />
-      </>,
-      { width: 70, height: 78 },
-    ),
-);
-
-export const FontFamilyCodeIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <>
-        <path
-          fill={iconFillColor(theme)}
-          d="M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z"
-        />
-      </>,
-      { width: 640, height: 512 },
-    ),
-);
-
-export const TextAlignLeftIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        d="M12.83 352h262.34A12.82 12.82 0 00288 339.17v-38.34A12.82 12.82 0 00275.17 288H12.83A12.82 12.82 0 000 300.83v38.34A12.82 12.82 0 0012.83 352zm0-256h262.34A12.82 12.82 0 00288 83.17V44.83A12.82 12.82 0 00275.17 32H12.83A12.82 12.82 0 000 44.83v38.34A12.82 12.82 0 0012.83 96zM432 160H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16zm0 256H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16z"
-        fill={iconFillColor(theme)}
-        strokeLinecap="round"
-      />,
-      { width: 448, height: 512 },
-    ),
-);
-
-export const TextAlignCenterIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        d="M432 160H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16zm0 256H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16zM108.1 96h231.81A12.09 12.09 0 00352 83.9V44.09A12.09 12.09 0 00339.91 32H108.1A12.09 12.09 0 0096 44.09V83.9A12.1 12.1 0 00108.1 96zm231.81 256A12.09 12.09 0 00352 339.9v-39.81A12.09 12.09 0 00339.91 288H108.1A12.09 12.09 0 0096 300.09v39.81a12.1 12.1 0 0012.1 12.1z"
-        fill={iconFillColor(theme)}
-      />,
-      { width: 448, height: 512 },
-    ),
-);
-
-export const TextAlignRightIcon = React.memo(
-  ({ theme }: { theme: "light" | "dark" }) =>
-    createIcon(
-      <path
-        d="M16 224h416a16 16 0 0016-16v-32a16 16 0 00-16-16H16a16 16 0 00-16 16v32a16 16 0 0016 16zm416 192H16a16 16 0 00-16 16v32a16 16 0 0016 16h416a16 16 0 0016-16v-32a16 16 0 00-16-16zm3.17-384H172.83A12.82 12.82 0 00160 44.83v38.34A12.82 12.82 0 00172.83 96h262.34A12.82 12.82 0 00448 83.17V44.83A12.82 12.82 0 00435.17 32zm0 256H172.83A12.82 12.82 0 00160 300.83v38.34A12.82 12.82 0 00172.83 352h262.34A12.82 12.82 0 00448 339.17v-38.34A12.82 12.82 0 00435.17 288z"
-        fill={iconFillColor(theme)}
-        strokeLinecap="round"
-      />,
-      { width: 448, height: 512 },
-    ),
-);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dwelle	154f7bd8e5	make relative	2021-03-12 18:35:16 +01:00
dwelle	ba06565673	revert previous PRs	2021-03-12 18:34:51 +01:00