diff --git a/.nvmrc b/.nvmrc
deleted file mode 100644
index 3c032078a4..0000000000
--- a/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-18
diff --git a/dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx b/dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx
index e7852cee94..39e8e18425 100644
--- a/dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx
@@ -9,7 +9,7 @@ You will need to import the `Footer` component from the package and wrap your co
 ```jsx live
 function App() {
   return (
-    <div style={{ height: "500px"}}>
+    <div style={{ height: "500px" }}>
       <Excalidraw>
         <Footer>
           <button
@@ -27,19 +27,19 @@ function App() {
 
 This will only work for `Desktop` devices.
 
-For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useDevice`](#useDevice) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.
+For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useEditorInterface`](#useEditorInterface) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.
 
 Open the `Menu` in the below playground and you will see the `custom footer` rendered.
 
 ```jsx live noInline
 const MobileFooter = ({}) => {
-  const device = useDevice();
-  if (device.editor.isMobile) {
+  const editorInterface = useEditorInterface();
+  if (editorInterface.formFactor === "phone") {
     return (
       <Footer>
         <button
           className="custom-footer"
-          style= {{ marginLeft: '20px', height: '2rem'}}
+          style={{ marginLeft: "20px", height: "2rem" }}
           onClick={() => alert("This is custom footer in mobile menu")}
         >
           custom footer
diff --git a/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md b/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md
index 69bd88a838..ddbc7194d5 100644
--- a/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md
+++ b/dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md
@@ -292,7 +292,7 @@ viewportCoordsToSceneCoords(&#123; clientX: number, clientY: number },<br/>&nbsp
   appState: <a href="https://github.com/excalidraw/excalidraw/blob/master/packages/excalidraw/types.ts#L95">AppState</a><br/>): &#123;x: number, y: number}
 </pre>
 
-### useDevice
+### useEditorInterface
 
 This hook can be used to check the type of device which is being used. It can only be used inside the `children` of `Excalidraw` component.
 
@@ -300,8 +300,8 @@ Open the `main menu` in the below example to view the footer.
 
 ```jsx live noInline
 const MobileFooter = ({}) => {
-  const device = useDevice();
-  if (device.editor.isMobile) {
+  const editorInterface = useEditorInterface();
+  if (editorInterface.formFactor === "phone") {
     return (
       <Footer>
         <button
@@ -336,12 +336,20 @@ render(<App />);
 The `device` has the following `attributes`, some grouped into `viewport` and `editor` objects, per context.
 
 | Name | Type | Description |
-| --- | --- | --- |
-| `viewport.isMobile` | `boolean` | Set to `true` when viewport is in `mobile` breakpoint |
-| `viewport.isLandscape` | `boolean` | Set to `true` when the viewport is in `landscape` mode |
-| `editor.canFitSidebar` | `boolean` | Set to `true` if there's enough space to fit the `sidebar` |
-| `editor.isMobile` | `boolean` | Set to `true` when editor container is in `mobile` breakpoint |
-| `isTouchScreen` | `boolean` | Set to `true` for `touch` when touch event detected |
+| ---- | ---- | ----------- |
+
+The `EditorInterface` object has the following properties:
+
+| Name | Type | Description |
+| --- | --- | --- | --- | --- | --- |
+| `formFactor` | `'phone' | 'tablet' | 'desktop'` | Indicates the device type based on screen size |
+| `desktopUIMode` | `'compact' | 'full'` | UI mode for desktop form factor |
+| `userAgent.raw` | `string` | Raw user agent string |
+| `userAgent.isMobileDevice` | `boolean` | True if device is mobile |
+| `userAgent.platform` | `'ios' | 'android' | 'other' | 'unknown'` | Device platform |
+| `isTouchScreen` | `boolean` | True if touch events are detected |
+| `canFitSidebar` | `boolean` | True if sidebar can fit in the viewport |
+| `isLandscape` | `boolean` | True if viewport is in landscape mode |
 
 ### i18n
 
diff --git a/examples/with-script-in-browser/components/MobileFooter.tsx b/examples/with-script-in-browser/components/MobileFooter.tsx
index a6e1fa1b25..94b54c3daa 100644
--- a/examples/with-script-in-browser/components/MobileFooter.tsx
+++ b/examples/with-script-in-browser/components/MobileFooter.tsx
@@ -12,10 +12,10 @@ const MobileFooter = ({
   excalidrawAPI: ExcalidrawImperativeAPI;
   excalidrawLib: typeof TExcalidraw;
 }) => {
-  const { useDevice, Footer } = excalidrawLib;
+  const { useEditorInterface, Footer } = excalidrawLib;
 
-  const device = useDevice();
-  if (device.editor.isMobile) {
+  const editorInterface = useEditorInterface();
+  if (editorInterface.formFactor === "phone") {
     return (
       <Footer>
         <CustomFooter
diff --git a/excalidraw-app/App.tsx b/excalidraw-app/App.tsx
index a5d01769cc..94ab8e4e3b 100644
--- a/excalidraw-app/App.tsx
+++ b/excalidraw-app/App.tsx
@@ -4,6 +4,7 @@ import {
   TTDDialogTrigger,
   CaptureUpdateAction,
   reconcileElements,
+  useEditorInterface,
 } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { getDefaultAppState } from "@excalidraw/excalidraw/appState";
@@ -137,6 +138,9 @@ import { ExcalidrawPlusIframeExport } from "./ExcalidrawPlusIframeExport";
 
 import "./index.scss";
 
+import { ExcalidrawPlusPromoBanner } from "./components/ExcalidrawPlusPromoBanner";
+import { AppSidebar } from "./components/AppSidebar";
+
 import type { CollabAPI } from "./collab/Collab";
 
 polyfill();
@@ -342,6 +346,8 @@ const ExcalidrawWrapper = () => {
 
   const [langCode, setLangCode] = useAppLangCode();
 
+  const editorInterface = useEditorInterface();
+
   // initial state
   // ---------------------------------------------------------------------------
 
@@ -663,8 +669,8 @@ const ExcalidrawWrapper = () => {
       debugRenderer(
         debugCanvasRef.current,
         appState,
+        elements,
         window.devicePixelRatio,
-        () => forceRefresh((prev) => !prev),
       );
     }
   };
@@ -848,14 +854,22 @@ const ExcalidrawWrapper = () => {
           if (isMobile || !collabAPI || isCollabDisabled) {
             return null;
           }
+
           return (
-            <div className="top-right-ui">
+            <div className="excalidraw-ui-top-right">
+              {excalidrawAPI?.getEditorInterface().formFactor === "desktop" && (
+                <ExcalidrawPlusPromoBanner
+                  isSignedIn={isExcalidrawPlusSignedUser}
+                />
+              )}
+
               {collabError.message && <CollabError collabError={collabError} />}
               <LiveCollaborationTrigger
                 isCollaborating={isCollaborating}
                 onSelect={() =>
                   setShareDialogState({ isOpen: true, type: "share" })
                 }
+                editorInterface={editorInterface}
               />
             </div>
           );
@@ -941,6 +955,8 @@ const ExcalidrawWrapper = () => {
           }}
         />
 
+        <AppSidebar />
+
         {errorMessage && (
           <ErrorDialog onClose={() => setErrorMessage("")}>
             {errorMessage}
diff --git a/excalidraw-app/components/AppFooter.tsx b/excalidraw-app/components/AppFooter.tsx
index 7d42d46bf8..5e2cb27cb3 100644
--- a/excalidraw-app/components/AppFooter.tsx
+++ b/excalidraw-app/components/AppFooter.tsx
@@ -5,7 +5,6 @@ import { isExcalidrawPlusSignedUser } from "../app_constants";
 
 import { DebugFooter, isVisualDebuggerEnabled } from "./DebugCanvas";
 import { EncryptedIcon } from "./EncryptedIcon";
-import { ExcalidrawPlusAppLink } from "./ExcalidrawPlusAppLink";
 
 export const AppFooter = React.memo(
   ({ onChange }: { onChange: () => void }) => {
@@ -19,11 +18,7 @@ export const AppFooter = React.memo(
           }}
         >
           {isVisualDebuggerEnabled() && <DebugFooter onChange={onChange} />}
-          {isExcalidrawPlusSignedUser ? (
-            <ExcalidrawPlusAppLink />
-          ) : (
-            <EncryptedIcon />
-          )}
+          {!isExcalidrawPlusSignedUser && <EncryptedIcon />}
         </div>
       </Footer>
     );
diff --git a/excalidraw-app/components/AppSidebar.scss b/excalidraw-app/components/AppSidebar.scss
new file mode 100644
index 0000000000..ab3156c2d5
--- /dev/null
+++ b/excalidraw-app/components/AppSidebar.scss
@@ -0,0 +1,36 @@
+.excalidraw {
+  .app-sidebar-promo-container {
+    padding: 0.75rem;
+    display: flex;
+    flex-direction: column;
+    text-align: center;
+    gap: 1rem;
+    flex: 1 1 auto;
+  }
+
+  .app-sidebar-promo-image {
+    margin: 1rem 0;
+
+    height: 16.25rem;
+    background-size: contain;
+    background-position: center;
+    background-repeat: no-repeat;
+
+    background-image: radial-gradient(
+        circle,
+        transparent 60%,
+        var(--sidebar-bg-color) 100%
+      ),
+      var(--image-source);
+
+    display: flex;
+  }
+
+  .app-sidebar-promo-text {
+    padding: 0 2rem;
+  }
+
+  .link-button {
+    margin: 0 auto;
+  }
+}
diff --git a/excalidraw-app/components/AppSidebar.tsx b/excalidraw-app/components/AppSidebar.tsx
new file mode 100644
index 0000000000..9ecfc4b40c
--- /dev/null
+++ b/excalidraw-app/components/AppSidebar.tsx
@@ -0,0 +1,79 @@
+import { DefaultSidebar, Sidebar, THEME } from "@excalidraw/excalidraw";
+import {
+  messageCircleIcon,
+  presentationIcon,
+} from "@excalidraw/excalidraw/components/icons";
+import { LinkButton } from "@excalidraw/excalidraw/components/LinkButton";
+import { useUIAppState } from "@excalidraw/excalidraw/context/ui-appState";
+
+import "./AppSidebar.scss";
+
+export const AppSidebar = () => {
+  const { theme, openSidebar } = useUIAppState();
+
+  return (
+    <DefaultSidebar>
+      <DefaultSidebar.TabTriggers>
+        <Sidebar.TabTrigger
+          tab="comments"
+          style={{ opacity: openSidebar?.tab === "comments" ? 1 : 0.4 }}
+        >
+          {messageCircleIcon}
+        </Sidebar.TabTrigger>
+        <Sidebar.TabTrigger
+          tab="presentation"
+          style={{ opacity: openSidebar?.tab === "presentation" ? 1 : 0.4 }}
+        >
+          {presentationIcon}
+        </Sidebar.TabTrigger>
+      </DefaultSidebar.TabTriggers>
+      <Sidebar.Tab tab="comments">
+        <div className="app-sidebar-promo-container">
+          <div
+            className="app-sidebar-promo-image"
+            style={{
+              ["--image-source" as any]: `url(/oss_promo_comments_${
+                theme === THEME.DARK ? "dark" : "light"
+              }.jpg)`,
+              opacity: 0.7,
+            }}
+          />
+          <div className="app-sidebar-promo-text">
+            Make comments with Excalidraw+
+          </div>
+          <LinkButton
+            href={`${
+              import.meta.env.VITE_APP_PLUS_LP
+            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=comments_promo#excalidraw-redirect`}
+          >
+            Sign up now
+          </LinkButton>
+        </div>
+      </Sidebar.Tab>
+      <Sidebar.Tab tab="presentation" className="px-3">
+        <div className="app-sidebar-promo-container">
+          <div
+            className="app-sidebar-promo-image"
+            style={{
+              ["--image-source" as any]: `url(/oss_promo_presentations_${
+                theme === THEME.DARK ? "dark" : "light"
+              }.svg)`,
+              backgroundSize: "60%",
+              opacity: 0.4,
+            }}
+          />
+          <div className="app-sidebar-promo-text">
+            Create presentations with Excalidraw+
+          </div>
+          <LinkButton
+            href={`${
+              import.meta.env.VITE_APP_PLUS_LP
+            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=presentations_promo#excalidraw-redirect`}
+          >
+            Sign up now
+          </LinkButton>
+        </div>
+      </Sidebar.Tab>
+    </DefaultSidebar>
+  );
+};
diff --git a/excalidraw-app/components/DebugCanvas.tsx b/excalidraw-app/components/DebugCanvas.tsx
index 71e3885b12..9df430376b 100644
--- a/excalidraw-app/components/DebugCanvas.tsx
+++ b/excalidraw-app/components/DebugCanvas.tsx
@@ -8,9 +8,15 @@ import {
   getNormalizedCanvasDimensions,
 } from "@excalidraw/excalidraw/renderer/helpers";
 import { type AppState } from "@excalidraw/excalidraw/types";
-import { throttleRAF } from "@excalidraw/common";
+import { arrayToMap, throttleRAF } from "@excalidraw/common";
 import { useCallback } from "react";
 
+import {
+  getGlobalFixedPointForBindableElement,
+  isArrowElement,
+  isBindableElement,
+} from "@excalidraw/element";
+
 import {
   isLineSegment,
   type GlobalPoint,
@@ -21,8 +27,14 @@ import { isCurve } from "@excalidraw/math/curve";
 import React from "react";
 
 import type { Curve } from "@excalidraw/math";
-
-import type { DebugElement } from "@excalidraw/utils/visualdebug";
+import type { DebugElement } from "@excalidraw/common";
+import type {
+  ElementsMap,
+  ExcalidrawArrowElement,
+  ExcalidrawBindableElement,
+  FixedPointBinding,
+  OrderedExcalidrawElement,
+} from "@excalidraw/element/types";
 
 import { STORAGE_KEYS } from "../app_constants";
 
@@ -75,6 +87,176 @@ const renderOrigin = (context: CanvasRenderingContext2D, zoom: number) => {
   context.save();
 };
 
+const _renderBinding = (
+  context: CanvasRenderingContext2D,
+  binding: FixedPointBinding,
+  elementsMap: ElementsMap,
+  zoom: number,
+  width: number,
+  height: number,
+  color: string,
+) => {
+  if (!binding.fixedPoint) {
+    console.warn("Binding must have a fixedPoint");
+    return;
+  }
+
+  const bindable = elementsMap.get(
+    binding.elementId,
+  ) as ExcalidrawBindableElement;
+  const [x, y] = getGlobalFixedPointForBindableElement(
+    binding.fixedPoint,
+    bindable,
+    elementsMap,
+  );
+
+  context.save();
+  context.strokeStyle = color;
+  context.lineWidth = 1;
+  context.beginPath();
+  context.moveTo(x * zoom, y * zoom);
+  context.bezierCurveTo(
+    x * zoom - width,
+    y * zoom - height,
+    x * zoom - width,
+    y * zoom + height,
+    x * zoom,
+    y * zoom,
+  );
+  context.stroke();
+  context.restore();
+};
+
+const _renderBindableBinding = (
+  binding: FixedPointBinding,
+  context: CanvasRenderingContext2D,
+  elementsMap: ElementsMap,
+  zoom: number,
+  width: number,
+  height: number,
+  color: string,
+) => {
+  const bindable = elementsMap.get(
+    binding.elementId,
+  ) as ExcalidrawBindableElement;
+  if (!binding.fixedPoint) {
+    console.warn("Binding must have a fixedPoint");
+    return;
+  }
+
+  const [x, y] = getGlobalFixedPointForBindableElement(
+    binding.fixedPoint,
+    bindable,
+    elementsMap,
+  );
+
+  context.save();
+  context.strokeStyle = color;
+  context.lineWidth = 1;
+  context.beginPath();
+  context.moveTo(x * zoom, y * zoom);
+  context.bezierCurveTo(
+    x * zoom + width,
+    y * zoom + height,
+    x * zoom + width,
+    y * zoom - height,
+    x * zoom,
+    y * zoom,
+  );
+  context.stroke();
+  context.restore();
+};
+
+const renderBindings = (
+  context: CanvasRenderingContext2D,
+  elements: readonly OrderedExcalidrawElement[],
+  zoom: number,
+) => {
+  const elementsMap = arrayToMap(elements);
+  const dim = 16;
+  elements.forEach((element) => {
+    if (element.isDeleted) {
+      return;
+    }
+
+    if (isArrowElement(element)) {
+      if (element.startBinding) {
+        if (
+          !elementsMap
+            .get(element.startBinding.elementId)
+            ?.boundElements?.find((e) => e.id === element.id)
+        ) {
+          return;
+        }
+
+        _renderBinding(
+          context,
+          element.startBinding,
+          elementsMap,
+          zoom,
+          dim,
+          dim,
+          element.startBinding?.mode === "orbit" ? "red" : "black",
+        );
+      }
+
+      if (element.endBinding) {
+        if (
+          !elementsMap
+            .get(element.endBinding.elementId)
+            ?.boundElements?.find((e) => e.id === element.id)
+        ) {
+          return;
+        }
+        _renderBinding(
+          context,
+          element.endBinding,
+          elementsMap,
+          zoom,
+          dim,
+          dim,
+          element.endBinding?.mode === "orbit" ? "red" : "black",
+        );
+      }
+    }
+
+    if (isBindableElement(element) && element.boundElements?.length) {
+      element.boundElements.forEach((boundElement) => {
+        if (boundElement.type !== "arrow") {
+          return;
+        }
+
+        const arrow = elementsMap.get(
+          boundElement.id,
+        ) as ExcalidrawArrowElement;
+
+        if (arrow && arrow.startBinding?.elementId === element.id) {
+          _renderBindableBinding(
+            arrow.startBinding,
+            context,
+            elementsMap,
+            zoom,
+            dim,
+            dim,
+            "green",
+          );
+        }
+        if (arrow && arrow.endBinding?.elementId === element.id) {
+          _renderBindableBinding(
+            arrow.endBinding,
+            context,
+            elementsMap,
+            zoom,
+            dim,
+            dim,
+            "green",
+          );
+        }
+      });
+    }
+  });
+};
+
 const render = (
   frame: DebugElement[],
   context: CanvasRenderingContext2D,
@@ -107,8 +289,8 @@ const render = (
 const _debugRenderer = (
   canvas: HTMLCanvasElement,
   appState: AppState,
+  elements: readonly OrderedExcalidrawElement[],
   scale: number,
-  refresh: () => void,
 ) => {
   const [normalizedWidth, normalizedHeight] = getNormalizedCanvasDimensions(
     canvas,
@@ -131,6 +313,7 @@ const _debugRenderer = (
   );
 
   renderOrigin(context, appState.zoom.value);
+  renderBindings(context, elements, appState.zoom.value);
 
   if (
     window.visualDebug?.currentFrame &&
@@ -182,10 +365,10 @@ export const debugRenderer = throttleRAF(
   (
     canvas: HTMLCanvasElement,
     appState: AppState,
+    elements: readonly OrderedExcalidrawElement[],
     scale: number,
-    refresh: () => void,
   ) => {
-    _debugRenderer(canvas, appState, scale, refresh);
+    _debugRenderer(canvas, appState, elements, scale);
   },
   { trailing: true },
 );
diff --git a/excalidraw-app/components/ExcalidrawPlusAppLink.tsx b/excalidraw-app/components/ExcalidrawPlusAppLink.tsx
deleted file mode 100644
index 04cd963022..0000000000
--- a/excalidraw-app/components/ExcalidrawPlusAppLink.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { isExcalidrawPlusSignedUser } from "../app_constants";
-
-export const ExcalidrawPlusAppLink = () => {
-  if (!isExcalidrawPlusSignedUser) {
-    return null;
-  }
-  return (
-    <a
-      href={`${
-        import.meta.env.VITE_APP_PLUS_APP
-      }?utm_source=excalidraw&utm_medium=app&utm_content=signedInUserRedirectButton#excalidraw-redirect`}
-      target="_blank"
-      rel="noopener"
-      className="plus-button"
-    >
-      Go to Excalidraw+
-    </a>
-  );
-};
diff --git a/excalidraw-app/components/ExcalidrawPlusPromoBanner.tsx b/excalidraw-app/components/ExcalidrawPlusPromoBanner.tsx
new file mode 100644
index 0000000000..8cd0aa1ef9
--- /dev/null
+++ b/excalidraw-app/components/ExcalidrawPlusPromoBanner.tsx
@@ -0,0 +1,22 @@
+export const ExcalidrawPlusPromoBanner = ({
+  isSignedIn,
+}: {
+  isSignedIn: boolean;
+}) => {
+  return (
+    <a
+      href={
+        isSignedIn
+          ? import.meta.env.VITE_APP_PLUS_APP
+          : `${
+              import.meta.env.VITE_APP_PLUS_LP
+            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=guestBanner#excalidraw-redirect`
+      }
+      target="_blank"
+      rel="noopener"
+      className="plus-banner"
+    >
+      Excalidraw+
+    </a>
+  );
+};
diff --git a/excalidraw-app/data/LocalData.ts b/excalidraw-app/data/LocalData.ts
index a2a930a1ac..13cdf09ac4 100644
--- a/excalidraw-app/data/LocalData.ts
+++ b/excalidraw-app/data/LocalData.ts
@@ -16,7 +16,6 @@ import {
   DEFAULT_SIDEBAR,
   debounce,
 } from "@excalidraw/common";
-import { clearElementsForLocalStorage } from "@excalidraw/element";
 import {
   createStore,
   entries,
@@ -28,6 +27,7 @@ import {
 } from "idb-keyval";
 
 import { appJotaiStore, atom } from "excalidraw-app/app-jotai";
+import { getNonDeletedElements } from "@excalidraw/element";
 
 import type { LibraryPersistedData } from "@excalidraw/excalidraw/data/library";
 import type { ImportedDataState } from "@excalidraw/excalidraw/data/types";
@@ -88,7 +88,7 @@ const saveDataStateToLocalStorage = (
 
     localStorage.setItem(
       STORAGE_KEYS.LOCAL_STORAGE_ELEMENTS,
-      JSON.stringify(clearElementsForLocalStorage(elements)),
+      JSON.stringify(getNonDeletedElements(elements)),
     );
     localStorage.setItem(
       STORAGE_KEYS.LOCAL_STORAGE_APP_STATE,
diff --git a/excalidraw-app/data/localStorage.ts b/excalidraw-app/data/localStorage.ts
index bc0df4a678..28c166cd74 100644
--- a/excalidraw-app/data/localStorage.ts
+++ b/excalidraw-app/data/localStorage.ts
@@ -2,7 +2,6 @@ import {
   clearAppStateForLocalStorage,
   getDefaultAppState,
 } from "@excalidraw/excalidraw/appState";
-import { clearElementsForLocalStorage } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 import type { AppState } from "@excalidraw/excalidraw/types";
@@ -50,7 +49,7 @@ export const importFromLocalStorage = () => {
   let elements: ExcalidrawElement[] = [];
   if (savedElements) {
     try {
-      elements = clearElementsForLocalStorage(JSON.parse(savedElements));
+      elements = JSON.parse(savedElements);
     } catch (error: any) {
       console.error(error);
       // Do nothing because elements array is already empty
diff --git a/excalidraw-app/index.scss b/excalidraw-app/index.scss
index 9f320775be..5dde103baa 100644
--- a/excalidraw-app/index.scss
+++ b/excalidraw-app/index.scss
@@ -1,3 +1,5 @@
+@import "../packages/excalidraw/css/variables.module.scss";
+
 .excalidraw {
   --color-primary-contrast-offset: #625ee0; // to offset Chubb illusion
 
@@ -5,12 +7,6 @@
     --color-primary-contrast-offset: #726dff; // to offset Chubb illusion
   }
 
-  .top-right-ui {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-  }
-
   .footer-center {
     justify-content: flex-end;
     margin-top: auto;
@@ -90,22 +86,31 @@
   }
 }
 
-.plus-button {
+.plus-banner {
   display: flex;
   justify-content: center;
   cursor: pointer;
   align-items: center;
   border: 1px solid var(--color-primary);
-  padding: 0.5rem 0.75rem;
+  padding: 0.5rem 0.875rem;
   border-radius: var(--border-radius-lg);
   background-color: var(--island-bg-color);
-  color: var(--color-primary) !important;
   text-decoration: none !important;
 
-  font-size: 0.75rem;
+  font-family: var(--ui-font);
+  font-size: 0.8333rem;
   box-sizing: border-box;
   height: var(--lg-button-size);
 
+  border: none;
+  box-shadow: 0 0 0 1px var(--color-surface-lowest);
+  background-color: var(--color-surface-low);
+  color: var(--button-color, var(--color-on-surface)) !important;
+
+  &:active {
+    box-shadow: 0 0 0 1px var(--color-brand-active);
+  }
+
   &:hover {
     background-color: var(--color-primary);
     color: white !important;
@@ -117,7 +122,7 @@
 }
 
 .theme--dark {
-  .plus-button {
+  .plus-banner {
     &:hover {
       color: black !important;
     }
diff --git a/excalidraw-app/package.json b/excalidraw-app/package.json
index e5dcde0333..8d5a066e53 100644
--- a/excalidraw-app/package.json
+++ b/excalidraw-app/package.json
@@ -23,7 +23,7 @@
     ]
   },
   "engines": {
-    "node": "18.0.0 - 22.x.x"
+    "node": ">=18.0.0"
   },
   "dependencies": {
     "@excalidraw/random-username": "1.0.0",
diff --git a/excalidraw-app/sentry.ts b/excalidraw-app/sentry.ts
index 30b84f3f69..58e34bba53 100644
--- a/excalidraw-app/sentry.ts
+++ b/excalidraw-app/sentry.ts
@@ -1,3 +1,4 @@
+import { getFeatureFlag } from "@excalidraw/common";
 import * as Sentry from "@sentry/browser";
 import callsites from "callsites";
 
@@ -33,6 +34,7 @@ Sentry.init({
     Sentry.captureConsoleIntegration({
       levels: ["error"],
     }),
+    Sentry.featureFlagsIntegration(),
   ],
   beforeSend(event) {
     if (event.request?.url) {
@@ -79,3 +81,14 @@ Sentry.init({
     return event;
   },
 });
+
+const flagsIntegration =
+  Sentry.getClient()?.getIntegrationByName<Sentry.FeatureFlagsIntegration>(
+    "FeatureFlags",
+  );
+if (flagsIntegration) {
+  flagsIntegration.addFeatureFlag(
+    "COMPLEX_BINDINGS",
+    getFeatureFlag("COMPLEX_BINDINGS"),
+  );
+}
diff --git a/excalidraw-app/tests/MobileMenu.test.tsx b/excalidraw-app/tests/MobileMenu.test.tsx
index 400b625ec2..70f2162f9b 100644
--- a/excalidraw-app/tests/MobileMenu.test.tsx
+++ b/excalidraw-app/tests/MobileMenu.test.tsx
@@ -17,30 +17,15 @@ describe("Test MobileMenu", () => {
 
   beforeEach(async () => {
     await render(<ExcalidrawApp />);
-    // @ts-ignore
-    h.app.refreshViewportBreakpoints();
-    // @ts-ignore
-    h.app.refreshEditorBreakpoints();
+    h.app.refreshEditorInterface();
   });
 
   afterAll(() => {
     restoreOriginalGetBoundingClientRect();
   });
 
-  it("should set device correctly", () => {
-    expect(h.app.device).toMatchInlineSnapshot(`
-      {
-        "editor": {
-          "canFitSidebar": false,
-          "isMobile": true,
-        },
-        "isTouchScreen": false,
-        "viewport": {
-          "isLandscape": true,
-          "isMobile": true,
-        },
-      }
-    `);
+  it("should set editor interface correctly", () => {
+    expect(h.app.editorInterface.formFactor).toBe("phone");
   });
 
   it("should initialize with welcome screen and hide once user interacts", async () => {
diff --git a/package.json b/package.json
index 9397d00400..4a3febd4d0 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "vitest-canvas-mock": "0.3.3"
   },
   "engines": {
-    "node": "18.0.0 - 22.x.x"
+    "node": ">=18.0.0"
   },
   "homepage": ".",
   "prettier": "@excalidraw/prettier-config",
diff --git a/packages/common/src/constants.ts b/packages/common/src/constants.ts
index 618d9ca078..f241c7b5dc 100644
--- a/packages/common/src/constants.ts
+++ b/packages/common/src/constants.ts
@@ -6,32 +6,6 @@ import type { AppProps, AppState } from "@excalidraw/excalidraw/types";
 
 import { COLOR_PALETTE } from "./colors";
 
-export const isDarwin = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-export const isWindows = /^Win/.test(navigator.platform);
-export const isAndroid = /\b(android)\b/i.test(navigator.userAgent);
-export const isFirefox =
-  typeof window !== "undefined" &&
-  "netscape" in window &&
-  navigator.userAgent.indexOf("rv:") > 1 &&
-  navigator.userAgent.indexOf("Gecko") > 1;
-export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1;
-export const isSafari =
-  !isChrome && navigator.userAgent.indexOf("Safari") !== -1;
-export const isIOS =
-  /iPad|iPhone/i.test(navigator.platform) ||
-  // iPadOS 13+
-  (navigator.userAgent.includes("Mac") && "ontouchend" in document);
-// keeping function so it can be mocked in test
-export const isBrave = () =>
-  (navigator as any).brave?.isBrave?.name === "isBrave";
-
-export const isMobile =
-  isIOS ||
-  /android|webos|ipod|blackberry|iemobile|opera mini/i.test(
-    navigator.userAgent,
-  ) ||
-  /android|ios|ipod|blackberry|windows phone/i.test(navigator.platform);
-
 export const supportsResizeObserver =
   typeof window !== "undefined" && "ResizeObserver" in window;
 
@@ -131,6 +105,7 @@ export const CLASSES = {
   SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper",
   CONVERT_ELEMENT_TYPE_POPUP: "ConvertElementTypePopup",
   SHAPE_ACTIONS_THEME_SCOPE: "shape-actions-theme-scope",
+  FRAME_NAME: "frame-name",
 };
 
 export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";
@@ -349,26 +324,6 @@ export const DEFAULT_UI_OPTIONS: AppProps["UIOptions"] = {
   },
 };
 
-// breakpoints
-// -----------------------------------------------------------------------------
-
-// mobile: up to 699px
-export const MQ_MAX_MOBILE = 599;
-
-export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
-export const MQ_MAX_HEIGHT_LANDSCAPE = 500;
-
-// tablets
-export const MQ_MIN_TABLET = MQ_MAX_MOBILE + 1; // lower bound (excludes phones)
-export const MQ_MAX_TABLET = 1400; // upper bound (excludes laptops/desktops)
-
-// desktop/laptop
-export const MQ_MIN_WIDTH_DESKTOP = 1440;
-
-// sidebar
-export const MQ_RIGHT_SIDEBAR_MIN_WIDTH = 1229;
-// -----------------------------------------------------------------------------
-
 export const MAX_DECIMALS_FOR_SVG_EXPORT = 2;
 
 export const EXPORT_SCALES = [1, 2, 3];
@@ -549,6 +504,8 @@ export const LINE_POLYGON_POINT_MERGE_DISTANCE = 20;
 
 export const DOUBLE_TAP_POSITION_THRESHOLD = 35;
 
+export const BIND_MODE_TIMEOUT = 700; // ms
+
 // glass background for mobile action buttons
 export const MOBILE_ACTION_BUTTON_BG = {
   background: "var(--mobile-action-button-bg)",
diff --git a/packages/common/src/editorInterface.ts b/packages/common/src/editorInterface.ts
new file mode 100644
index 0000000000..36b55d9182
--- /dev/null
+++ b/packages/common/src/editorInterface.ts
@@ -0,0 +1,223 @@
+export type StylesPanelMode = "compact" | "full" | "mobile";
+
+export type EditorInterface = Readonly<{
+  formFactor: "phone" | "tablet" | "desktop";
+  desktopUIMode: "compact" | "full";
+  userAgent: Readonly<{
+    isMobileDevice: boolean;
+    platform: "ios" | "android" | "other" | "unknown";
+  }>;
+  isTouchScreen: boolean;
+  canFitSidebar: boolean;
+  isLandscape: boolean;
+}>;
+
+// storage key
+const DESKTOP_UI_MODE_STORAGE_KEY = "excalidraw.desktopUIMode";
+
+// breakpoints
+// mobile: up to 699px
+export const MQ_MAX_MOBILE = 599;
+
+export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
+export const MQ_MAX_HEIGHT_LANDSCAPE = 500;
+
+// tablets
+export const MQ_MIN_TABLET = MQ_MAX_MOBILE + 1; // lower bound (excludes phones)
+export const MQ_MAX_TABLET = 1400; // upper bound (excludes laptops/desktops)
+
+// desktop/laptop
+export const MQ_MIN_WIDTH_DESKTOP = 1440;
+
+// sidebar
+export const MQ_RIGHT_SIDEBAR_MIN_WIDTH = 1229;
+
+// -----------------------------------------------------------------------------
+
+// user agent detections
+export const isDarwin = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
+export const isWindows = /^Win/.test(navigator.platform);
+export const isAndroid = /\b(android)\b/i.test(navigator.userAgent);
+export const isFirefox =
+  typeof window !== "undefined" &&
+  "netscape" in window &&
+  navigator.userAgent.indexOf("rv:") > 1 &&
+  navigator.userAgent.indexOf("Gecko") > 1;
+export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1;
+export const isSafari =
+  !isChrome && navigator.userAgent.indexOf("Safari") !== -1;
+export const isIOS =
+  /iPad|iPhone/i.test(navigator.platform) ||
+  // iPadOS 13+
+  (navigator.userAgent.includes("Mac") && "ontouchend" in document);
+// keeping function so it can be mocked in test
+export const isBrave = () =>
+  (navigator as any).brave?.isBrave?.name === "isBrave";
+
+// export const isMobile =
+//   isIOS ||
+//   /android|webos|ipod|blackberry|iemobile|opera mini/i.test(
+//     navigator.userAgent,
+//   ) ||
+//   /android|ios|ipod|blackberry|windows phone/i.test(navigator.platform);
+
+// utilities
+export const isMobileBreakpoint = (width: number, height: number) => {
+  return (
+    width <= MQ_MAX_MOBILE ||
+    (height < MQ_MAX_HEIGHT_LANDSCAPE && width < MQ_MAX_WIDTH_LANDSCAPE)
+  );
+};
+
+export const isTabletBreakpoint = (
+  editorWidth: number,
+  editorHeight: number,
+) => {
+  const minSide = Math.min(editorWidth, editorHeight);
+  const maxSide = Math.max(editorWidth, editorHeight);
+
+  return minSide >= MQ_MIN_TABLET && maxSide <= MQ_MAX_TABLET;
+};
+
+const isMobileOrTablet = (): boolean => {
+  const ua = navigator.userAgent || "";
+  const platform = navigator.platform || "";
+  const uaData = (navigator as any).userAgentData as
+    | { mobile?: boolean; platform?: string }
+    | undefined;
+
+  // --- 1) chromium: prefer ua client hints -------------------------------
+  if (uaData) {
+    const plat = (uaData.platform || "").toLowerCase();
+    const isDesktopOS =
+      plat === "windows" ||
+      plat === "macos" ||
+      plat === "linux" ||
+      plat === "chrome os";
+    if (uaData.mobile === true) {
+      return true;
+    }
+    if (uaData.mobile === false && plat === "android") {
+      const looksTouchTablet =
+        matchMedia?.("(hover: none)").matches &&
+        matchMedia?.("(pointer: coarse)").matches;
+      return looksTouchTablet;
+    }
+    if (isDesktopOS) {
+      return false;
+    }
+  }
+
+  // --- 2) ios (includes ipad) --------------------------------------------
+  if (isIOS) {
+    return true;
+  }
+
+  // --- 3) android legacy ua fallback -------------------------------------
+  if (isAndroid) {
+    const isAndroidPhone = /Mobile/i.test(ua);
+    const isAndroidTablet = !isAndroidPhone;
+    if (isAndroidPhone || isAndroidTablet) {
+      const looksTouchTablet =
+        matchMedia?.("(hover: none)").matches &&
+        matchMedia?.("(pointer: coarse)").matches;
+      return looksTouchTablet;
+    }
+  }
+
+  // --- 4) last resort desktop exclusion ----------------------------------
+  const looksDesktopPlatform =
+    /Win|Linux|CrOS|Mac/.test(platform) ||
+    /Windows NT|X11|CrOS|Macintosh/.test(ua);
+  if (looksDesktopPlatform) {
+    return false;
+  }
+  return false;
+};
+
+export const getFormFactor = (
+  editorWidth: number,
+  editorHeight: number,
+): EditorInterface["formFactor"] => {
+  if (isMobileBreakpoint(editorWidth, editorHeight)) {
+    return "phone";
+  }
+
+  if (isTabletBreakpoint(editorWidth, editorHeight)) {
+    return "tablet";
+  }
+
+  return "desktop";
+};
+
+export const deriveStylesPanelMode = (
+  editorInterface: EditorInterface,
+): StylesPanelMode => {
+  if (editorInterface.formFactor === "phone") {
+    return "mobile";
+  }
+
+  if (editorInterface.formFactor === "tablet") {
+    return "compact";
+  }
+
+  return editorInterface.desktopUIMode;
+};
+
+export const createUserAgentDescriptor = (
+  userAgentString: string,
+): EditorInterface["userAgent"] => {
+  const normalizedUA = userAgentString ?? "";
+  let platform: EditorInterface["userAgent"]["platform"] = "unknown";
+
+  if (isIOS) {
+    platform = "ios";
+  } else if (isAndroid) {
+    platform = "android";
+  } else if (normalizedUA) {
+    platform = "other";
+  }
+
+  return {
+    isMobileDevice: isMobileOrTablet(),
+    platform,
+  } as const;
+};
+
+export const loadDesktopUIModePreference = () => {
+  if (typeof window === "undefined") {
+    return null;
+  }
+
+  try {
+    const stored = window.localStorage.getItem(DESKTOP_UI_MODE_STORAGE_KEY);
+    if (stored === "compact" || stored === "full") {
+      return stored as EditorInterface["desktopUIMode"];
+    }
+  } catch (error) {
+    // ignore storage access issues (e.g., Safari private mode)
+  }
+
+  return null;
+};
+
+const persistDesktopUIMode = (mode: EditorInterface["desktopUIMode"]) => {
+  if (typeof window === "undefined") {
+    return;
+  }
+  try {
+    window.localStorage.setItem(DESKTOP_UI_MODE_STORAGE_KEY, mode);
+  } catch (error) {
+    // ignore storage access issues (e.g., Safari private mode)
+  }
+};
+
+export const setDesktopUIMode = (mode: EditorInterface["desktopUIMode"]) => {
+  if (mode !== "compact" && mode !== "full") {
+    return;
+  }
+
+  persistDesktopUIMode(mode);
+
+  return mode;
+};
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
index 79f243f4f0..cb85d0435f 100644
--- a/packages/common/src/index.ts
+++ b/packages/common/src/index.ts
@@ -10,3 +10,5 @@ export * from "./random";
 export * from "./url";
 export * from "./utils";
 export * from "./emitter";
+export * from "./visualdebug";
+export * from "./editorInterface";
diff --git a/packages/common/src/keys.ts b/packages/common/src/keys.ts
index 948e7f568f..1db356b7ec 100644
--- a/packages/common/src/keys.ts
+++ b/packages/common/src/keys.ts
@@ -1,4 +1,4 @@
-import { isDarwin } from "./constants";
+import { isDarwin } from "./editorInterface";
 
 import type { ValueOf } from "./utility-types";
 
diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
index 7bf73c6581..356f951521 100644
--- a/packages/common/src/utils.ts
+++ b/packages/common/src/utils.ts
@@ -1,10 +1,6 @@
 import { average } from "@excalidraw/math";
 
-import type {
-  ExcalidrawBindableElement,
-  FontFamilyValues,
-  FontString,
-} from "@excalidraw/element/types";
+import type { FontFamilyValues, FontString } from "@excalidraw/element/types";
 
 import type {
   ActiveTool,
@@ -20,8 +16,6 @@ import {
   ENV,
   FONT_FAMILY,
   getFontFamilyFallbacks,
-  isAndroid,
-  isIOS,
   WINDOWS_EMOJI_FALLBACK_FONT,
 } from "./constants";
 
@@ -384,6 +378,10 @@ export const removeSelection = () => {
 
 export const distance = (x: number, y: number) => Math.abs(x - y);
 
+export const isSelectionLikeTool = (type: ToolType | "custom") => {
+  return type === "selection" || type === "lasso";
+};
+
 export const updateActiveTool = (
   appState: Pick<AppState, "activeTool">,
   data: ((
@@ -560,9 +558,6 @@ export const isTransparent = (color: string) => {
   );
 };
 
-export const isBindingFallthroughEnabled = (el: ExcalidrawBindableElement) =>
-  el.fillStyle !== "solid" || isTransparent(el.backgroundColor);
-
 export type ResolvablePromise<T> = Promise<T> & {
   resolve: [T] extends [undefined]
     ? (value?: MaybePromise<Awaited<T>>) => void
@@ -1273,58 +1268,46 @@ export const reduceToCommonValue = <T, R = T>(
   return commonValue;
 };
 
-export const isMobileOrTablet = (): boolean => {
-  const ua = navigator.userAgent || "";
-  const platform = navigator.platform || "";
-  const uaData = (navigator as any).userAgentData as
-    | { mobile?: boolean; platform?: string }
-    | undefined;
-
-  // --- 1) chromium: prefer ua client hints -------------------------------
-  if (uaData) {
-    const plat = (uaData.platform || "").toLowerCase();
-    const isDesktopOS =
-      plat === "windows" ||
-      plat === "macos" ||
-      plat === "linux" ||
-      plat === "chrome os";
-    if (uaData.mobile === true) {
-      return true;
-    }
-    if (uaData.mobile === false && plat === "android") {
-      const looksTouchTablet =
-        matchMedia?.("(hover: none)").matches &&
-        matchMedia?.("(pointer: coarse)").matches;
-      return looksTouchTablet;
-    }
-    if (isDesktopOS) {
-      return false;
-    }
-  }
-
-  // --- 2) ios (includes ipad) --------------------------------------------
-  if (isIOS) {
-    return true;
-  }
-
-  // --- 3) android legacy ua fallback -------------------------------------
-  if (isAndroid) {
-    const isAndroidPhone = /Mobile/i.test(ua);
-    const isAndroidTablet = !isAndroidPhone;
-    if (isAndroidPhone || isAndroidTablet) {
-      const looksTouchTablet =
-        matchMedia?.("(hover: none)").matches &&
-        matchMedia?.("(pointer: coarse)").matches;
-      return looksTouchTablet;
-    }
-  }
-
-  // --- 4) last resort desktop exclusion ----------------------------------
-  const looksDesktopPlatform =
-    /Win|Linux|CrOS|Mac/.test(platform) ||
-    /Windows NT|X11|CrOS|Macintosh/.test(ua);
-  if (looksDesktopPlatform) {
-    return false;
-  }
-  return false;
+type FEATURE_FLAGS = {
+  COMPLEX_BINDINGS: boolean;
+};
+
+const FEATURE_FLAGS_STORAGE_KEY = "excalidraw-feature-flags";
+const DEFAULT_FEATURE_FLAGS: FEATURE_FLAGS = {
+  COMPLEX_BINDINGS: false,
+};
+let featureFlags: FEATURE_FLAGS | null = null;
+
+export const getFeatureFlag = <F extends keyof FEATURE_FLAGS>(
+  flag: F,
+): FEATURE_FLAGS[F] => {
+  if (!featureFlags) {
+    try {
+      const serializedFlags = localStorage.getItem(FEATURE_FLAGS_STORAGE_KEY);
+      if (serializedFlags) {
+        const flags = JSON.parse(serializedFlags);
+        featureFlags = flags ?? DEFAULT_FEATURE_FLAGS;
+      }
+    } catch {}
+  }
+
+  return (featureFlags || DEFAULT_FEATURE_FLAGS)[flag];
+};
+
+export const setFeatureFlag = <F extends keyof FEATURE_FLAGS>(
+  flag: F,
+  value: FEATURE_FLAGS[F],
+) => {
+  try {
+    featureFlags = {
+      ...(featureFlags || DEFAULT_FEATURE_FLAGS),
+      [flag]: value,
+    };
+    localStorage.setItem(
+      FEATURE_FLAGS_STORAGE_KEY,
+      JSON.stringify(featureFlags),
+    );
+  } catch (e) {
+    console.error("unable to set feature flag", e);
+  }
 };
diff --git a/packages/utils/src/visualdebug.ts b/packages/common/src/visualdebug.ts
similarity index 99%
rename from packages/utils/src/visualdebug.ts
rename to packages/common/src/visualdebug.ts
index 961fa919f2..993612959e 100644
--- a/packages/utils/src/visualdebug.ts
+++ b/packages/common/src/visualdebug.ts
@@ -139,7 +139,7 @@ export const debugDrawPoints = (
   }: {
     x: number;
     y: number;
-    points: LocalPoint[];
+    points: readonly LocalPoint[];
   },
   options?: any,
 ) => {
diff --git a/packages/element/src/binding.ts b/packages/element/src/binding.ts
index fa1355309b..c3fcf2767b 100644
--- a/packages/element/src/binding.ts
+++ b/packages/element/src/binding.ts
@@ -1,32 +1,27 @@
 import {
   KEYS,
   arrayToMap,
-  isBindingFallthroughEnabled,
-  tupleToCoors,
+  getFeatureFlag,
   invariant,
-  isDevEnv,
-  isTestEnv,
+  isTransparent,
 } from "@excalidraw/common";
 
 import {
-  lineSegment,
-  pointFrom,
-  pointRotateRads,
-  type GlobalPoint,
-  vectorFromPoint,
-  pointDistanceSq,
-  clamp,
-  pointDistance,
-  pointFromVector,
-  vectorScale,
-  vectorNormalize,
-  vectorCross,
-  pointsEqual,
-  lineSegmentIntersectionPoints,
   PRECISION,
+  clamp,
+  lineSegment,
+  pointDistance,
+  pointDistanceSq,
+  pointFrom,
+  pointFromVector,
+  pointRotateRads,
+  vectorFromPoint,
+  vectorNormalize,
+  vectorScale,
+  type GlobalPoint,
 } from "@excalidraw/math";
 
-import type { LocalPoint, Radians } from "@excalidraw/math";
+import type { LineSegment, LocalPoint, Radians } from "@excalidraw/math";
 
 import type { AppState } from "@excalidraw/excalidraw/types";
 
@@ -37,7 +32,13 @@ import {
   getCenterForBounds,
   getElementBounds,
 } from "./bounds";
-import { intersectElementWithLineSegment } from "./collision";
+import {
+  getAllHoveredElementAtPoint,
+  getHoveredElementForBinding,
+  intersectElementWithLineSegment,
+  isBindableElementInsideOtherBindable,
+  isPointInElement,
+} from "./collision";
 import { distanceToElement } from "./distance";
 import {
   headingForPointFromElement,
@@ -53,46 +54,84 @@ import {
   isBindableElement,
   isBoundToContainer,
   isElbowArrow,
-  isFixedPointBinding,
-  isFrameLikeElement,
-  isLinearElement,
   isRectanguloidElement,
   isTextElement,
 } from "./typeChecks";
 
 import { aabbForElement, elementCenterPoint } from "./bounds";
 import { updateElbowArrowPoints } from "./elbowArrow";
+import { projectFixedPointOntoDiagonal } from "./utils";
 
 import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
 import type { ElementUpdate } from "./mutateElement";
 import type {
-  ExcalidrawBindableElement,
-  ExcalidrawElement,
-  NonDeleted,
-  ExcalidrawLinearElement,
-  PointBinding,
-  NonDeletedExcalidrawElement,
+  BindMode,
   ElementsMap,
-  NonDeletedSceneElementsMap,
-  ExcalidrawTextElement,
   ExcalidrawArrowElement,
+  ExcalidrawBindableElement,
   ExcalidrawElbowArrowElement,
+  ExcalidrawElement,
+  ExcalidrawTextElement,
   FixedPoint,
   FixedPointBinding,
+  NonDeleted,
+  NonDeletedExcalidrawElement,
+  NonDeletedSceneElementsMap,
+  Ordered,
   PointsPositionUpdates,
 } from "./types";
 
-export type SuggestedBinding =
-  | NonDeleted<ExcalidrawBindableElement>
-  | SuggestedPointBinding;
+export type BindingStrategy =
+  // Create a new binding with this mode
+  | {
+      mode: BindMode;
+      element: NonDeleted<ExcalidrawBindableElement>;
+      focusPoint: GlobalPoint;
+    }
+  // Break the binding
+  | {
+      mode: null;
+      element?: undefined;
+      focusPoint?: undefined;
+    }
+  // Keep the existing binding
+  | {
+      mode: undefined;
+      element?: undefined;
+      focusPoint?: undefined;
+    };
 
-export type SuggestedPointBinding = [
-  NonDeleted<ExcalidrawLinearElement>,
-  "start" | "end" | "both",
-  NonDeleted<ExcalidrawBindableElement>,
-];
+/**
+ * gaps exclude element strokeWidth
+ *
+ * IMPORTANT: currently must be > 0 (this also applies to the computed gap)
+ */
+export const BASE_BINDING_GAP = 10;
+export const BASE_BINDING_GAP_ELBOW = 5;
+
+export const getBindingGap = (
+  bindTarget: ExcalidrawBindableElement,
+  opts: Pick<ExcalidrawArrowElement, "elbowed">,
+): number => {
+  return (
+    (opts.elbowed ? BASE_BINDING_GAP_ELBOW : BASE_BINDING_GAP) +
+    bindTarget.strokeWidth / 2
+  );
+};
+
+export const maxBindingDistance_simple = (zoom?: AppState["zoom"]): number => {
+  const BASE_BINDING_DISTANCE = Math.max(BASE_BINDING_GAP, 15);
+  const zoomValue = zoom?.value && zoom.value < 1 ? zoom.value : 1;
+  return clamp(
+    // reducing zoom impact so that the diff between binding distance and
+    // binding gap is kept to minimum when possible
+    BASE_BINDING_DISTANCE / (zoomValue * 1.5),
+    BASE_BINDING_DISTANCE,
+    BASE_BINDING_DISTANCE * 2,
+  );
+};
 
 export const shouldEnableBindingForPointerEvent = (
   event: React.PointerEvent<HTMLElement>,
@@ -104,633 +143,875 @@ export const isBindingEnabled = (appState: AppState): boolean => {
   return appState.isBindingEnabled;
 };
 
-export const FIXED_BINDING_DISTANCE = 5;
-export const BINDING_HIGHLIGHT_THICKNESS = 10;
-
-const getNonDeletedElements = (
+export const bindOrUnbindBindingElement = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  draggingPoints: PointsPositionUpdates,
   scene: Scene,
-  ids: readonly ExcalidrawElement["id"][],
-): NonDeleted<ExcalidrawElement>[] => {
-  const result: NonDeleted<ExcalidrawElement>[] = [];
-  ids.forEach((id) => {
-    const element = scene.getNonDeletedElement(id);
-    if (element != null) {
-      result.push(element);
+  appState: AppState,
+  opts?: {
+    newArrow?: boolean;
+    altKey?: boolean;
+    initialBinding?: boolean;
+  },
+) => {
+  const { start, end } = getBindingStrategyForDraggingBindingElementEndpoints(
+    arrow,
+    draggingPoints,
+    scene.getNonDeletedElementsMap(),
+    scene.getNonDeletedElements(),
+    appState,
+    {
+      ...opts,
+      finalize: true,
+    },
+  );
+
+  bindOrUnbindBindingElementEdge(arrow, start, "start", scene);
+  bindOrUnbindBindingElementEdge(arrow, end, "end", scene);
+  if (start.focusPoint || end.focusPoint) {
+    // If the strategy dictates a focus point override, then
+    // update the arrow points to point to the focus point.
+    const updates: PointsPositionUpdates = new Map();
+
+    if (start.focusPoint) {
+      updates.set(0, {
+        point:
+          updateBoundPoint(
+            arrow,
+            "startBinding",
+            arrow.startBinding,
+            start.element,
+            scene.getNonDeletedElementsMap(),
+          ) || arrow.points[0],
+      });
     }
-  });
-  return result;
+
+    if (end.focusPoint) {
+      updates.set(arrow.points.length - 1, {
+        point:
+          updateBoundPoint(
+            arrow,
+            "endBinding",
+            arrow.endBinding,
+            end.element,
+            scene.getNonDeletedElementsMap(),
+          ) || arrow.points[arrow.points.length - 1],
+      });
+    }
+
+    LinearElementEditor.movePoints(arrow, scene, updates);
+  }
+
+  return { start, end };
 };
 
-export const bindOrUnbindLinearElement = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  startBindingElement: ExcalidrawBindableElement | null | "keep",
-  endBindingElement: ExcalidrawBindableElement | null | "keep",
-  scene: Scene,
-): void => {
-  const elementsMap = scene.getNonDeletedElementsMap();
-  const boundToElementIds: Set<ExcalidrawBindableElement["id"]> = new Set();
-  const unboundFromElementIds: Set<ExcalidrawBindableElement["id"]> = new Set();
-  bindOrUnbindLinearElementEdge(
-    linearElement,
-    startBindingElement,
-    endBindingElement,
-    "start",
-    boundToElementIds,
-    unboundFromElementIds,
-    scene,
-    elementsMap,
-  );
-  bindOrUnbindLinearElementEdge(
-    linearElement,
-    endBindingElement,
-    startBindingElement,
-    "end",
-    boundToElementIds,
-    unboundFromElementIds,
-    scene,
-    elementsMap,
-  );
-
-  const onlyUnbound = Array.from(unboundFromElementIds).filter(
-    (id) => !boundToElementIds.has(id),
-  );
-
-  getNonDeletedElements(scene, onlyUnbound).forEach((element) => {
-    scene.mutateElement(element, {
-      boundElements: element.boundElements?.filter(
-        (element) =>
-          element.type !== "arrow" || element.id !== linearElement.id,
-      ),
-    });
-  });
-};
-
-const bindOrUnbindLinearElementEdge = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  bindableElement: ExcalidrawBindableElement | null | "keep",
-  otherEdgeBindableElement: ExcalidrawBindableElement | null | "keep",
+const bindOrUnbindBindingElementEdge = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  { mode, element, focusPoint }: BindingStrategy,
   startOrEnd: "start" | "end",
-  // Is mutated
-  boundToElementIds: Set<ExcalidrawBindableElement["id"]>,
-  // Is mutated
-  unboundFromElementIds: Set<ExcalidrawBindableElement["id"]>,
   scene: Scene,
-  elementsMap: ElementsMap,
 ): void => {
-  // "keep" is for method chaining convenience, a "no-op", so just bail out
-  if (bindableElement === "keep") {
-    return;
-  }
-
-  // null means break the bind, so nothing to consider here
-  if (bindableElement === null) {
-    const unbound = unbindLinearElement(linearElement, startOrEnd, scene);
-    if (unbound != null) {
-      unboundFromElementIds.add(unbound);
-    }
-    return;
-  }
-
-  // While complext arrows can do anything, simple arrow with both ends trying
-  // to bind to the same bindable should not be allowed, start binding takes
-  // precedence
-  if (isLinearElementSimple(linearElement)) {
-    if (
-      otherEdgeBindableElement == null ||
-      (otherEdgeBindableElement === "keep"
-        ? // TODO: Refactor - Needlessly complex
-          !isLinearElementSimpleAndAlreadyBoundOnOppositeEdge(
-            linearElement,
-            bindableElement,
-            startOrEnd,
-          )
-        : startOrEnd === "start" ||
-          otherEdgeBindableElement.id !== bindableElement.id)
-    ) {
-      bindLinearElement(linearElement, bindableElement, startOrEnd, scene);
-      boundToElementIds.add(bindableElement.id);
-    }
-  } else {
-    bindLinearElement(linearElement, bindableElement, startOrEnd, scene);
-    boundToElementIds.add(bindableElement.id);
+  if (mode === null) {
+    // null means break the binding
+    unbindBindingElement(arrow, startOrEnd, scene);
+  } else if (mode !== undefined) {
+    bindBindingElement(arrow, element, mode, startOrEnd, scene, focusPoint);
   }
 };
 
-const getOriginalBindingsIfStillCloseToArrowEnds = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
+const bindingStrategyForElbowArrowEndpointDragging = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  draggingPoints: PointsPositionUpdates,
   elementsMap: NonDeletedSceneElementsMap,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   zoom?: AppState["zoom"],
-): (NonDeleted<ExcalidrawElement> | null)[] =>
-  (["start", "end"] as const).map((edge) => {
-    const coors = getLinearElementEdgeCoors(linearElement, edge, elementsMap);
-    const elementId =
-      edge === "start"
-        ? linearElement.startBinding?.elementId
-        : linearElement.endBinding?.elementId;
-    if (elementId) {
-      const element = elementsMap.get(elementId);
-      if (
-        isBindableElement(element) &&
-        bindingBorderTest(element, coors, elementsMap, zoom)
-      ) {
-        return element;
+): {
+  start: BindingStrategy;
+  end: BindingStrategy;
+} => {
+  invariant(draggingPoints.size === 1, "Bound elbow arrows cannot be moved");
+
+  const update = draggingPoints.entries().next().value;
+
+  invariant(
+    update,
+    "There should be a position update for dragging an elbow arrow endpoint",
+  );
+
+  const [pointIdx, { point }] = update;
+  const globalPoint = LinearElementEditor.getPointGlobalCoordinates(
+    arrow,
+    point,
+    elementsMap,
+  );
+  const hit = getHoveredElementForBinding(
+    globalPoint,
+    elements,
+    elementsMap,
+    (element) => maxBindingDistance_simple(zoom),
+  );
+
+  const current = hit
+    ? {
+        element: hit,
+        mode: "orbit" as const,
+        focusPoint: LinearElementEditor.getPointAtIndexGlobalCoordinates(
+          arrow,
+          pointIdx,
+          elementsMap,
+        ),
+      }
+    : {
+        mode: null,
+      };
+  const other = { mode: undefined };
+
+  return pointIdx === 0
+    ? { start: current, end: other }
+    : { start: other, end: current };
+};
+
+const bindingStrategyForNewSimpleArrowEndpointDragging = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  draggingPoints: PointsPositionUpdates,
+  elementsMap: NonDeletedSceneElementsMap,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  startDragged: boolean,
+  endDragged: boolean,
+  startIdx: number,
+  endIdx: number,
+  appState: AppState,
+  globalBindMode?: AppState["bindMode"],
+  shiftKey?: boolean,
+): {
+  start: BindingStrategy;
+  end: BindingStrategy;
+} => {
+  let start: BindingStrategy = { mode: undefined };
+  let end: BindingStrategy = { mode: undefined };
+
+  const isMultiPoint = arrow.points.length > 2;
+  const point = LinearElementEditor.getPointGlobalCoordinates(
+    arrow,
+    draggingPoints.get(startDragged ? startIdx : endIdx)!.point,
+    elementsMap,
+  );
+  const hit = getHoveredElementForBinding(point, elements, elementsMap);
+
+  // With new arrows this handles the binding at arrow creation
+  if (startDragged) {
+    if (hit) {
+      start = {
+        element: hit,
+        mode: "inside",
+        focusPoint: point,
+      };
+    } else {
+      start = { mode: null };
+    }
+
+    return { start, end };
+  }
+
+  // With new arrows it represents the continuous dragging of the end point
+  if (endDragged) {
+    const origin = appState?.selectedLinearElement?.initialState.origin;
+
+    // Inside -> inside binding
+    if (hit && arrow.startBinding?.elementId === hit.id) {
+      const center = pointFrom<GlobalPoint>(
+        hit.x + hit.width / 2,
+        hit.y + hit.height / 2,
+      );
+
+      return {
+        start: isMultiPoint
+          ? { mode: undefined }
+          : {
+              mode: "inside",
+              element: hit,
+              focusPoint: origin ?? center,
+            },
+        end: isMultiPoint
+          ? { mode: "orbit", element: hit, focusPoint: point }
+          : { mode: "inside", element: hit, focusPoint: point },
+      };
+    }
+
+    // Check and handle nested shapes
+    if (hit && arrow.startBinding) {
+      const startBinding = arrow.startBinding;
+      const allHits = getAllHoveredElementAtPoint(point, elements, elementsMap);
+
+      if (allHits.find((el) => el.id === startBinding.elementId)) {
+        const otherElement = elementsMap.get(
+          arrow.startBinding.elementId,
+        ) as ExcalidrawBindableElement;
+
+        invariant(otherElement, "Other element must be in the elements map");
+
+        return {
+          start: isMultiPoint
+            ? { mode: undefined }
+            : {
+                mode: otherElement.id !== hit.id ? "orbit" : "inside",
+                element: otherElement,
+                focusPoint: origin ?? pointFrom<GlobalPoint>(arrow.x, arrow.y),
+              },
+          end: {
+            mode: "orbit",
+            element: hit,
+            focusPoint: point,
+          },
+        };
       }
     }
 
-    return null;
-  });
+    // Inside -> outside binding
+    if (arrow.startBinding && arrow.startBinding.elementId !== hit?.id) {
+      const otherElement = elementsMap.get(
+        arrow.startBinding.elementId,
+      ) as ExcalidrawBindableElement;
+      invariant(otherElement, "Other element must be in the elements map");
 
-const getBindingStrategyForDraggingArrowEndpoints = (
-  selectedElement: NonDeleted<ExcalidrawLinearElement>,
-  isBindingEnabled: boolean,
-  draggingPoints: readonly number[],
-  elementsMap: NonDeletedSceneElementsMap,
-  elements: readonly NonDeletedExcalidrawElement[],
-  zoom?: AppState["zoom"],
-): (NonDeleted<ExcalidrawBindableElement> | null | "keep")[] => {
-  const startIdx = 0;
-  const endIdx = selectedElement.points.length - 1;
-  const startDragged = draggingPoints.findIndex((i) => i === startIdx) > -1;
-  const endDragged = draggingPoints.findIndex((i) => i === endIdx) > -1;
-  const start = startDragged
-    ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
-          selectedElement,
-          "start",
-          elementsMap,
-          elements,
-          zoom,
-        )
-      : null // If binding is disabled and start is dragged, break all binds
-    : "keep";
-  const end = endDragged
-    ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
-          selectedElement,
-          "end",
-          elementsMap,
-          elements,
-          zoom,
-        )
-      : null // If binding is disabled and end is dragged, break all binds
-    : "keep";
+      const otherIsInsideBinding =
+        !!appState.selectedLinearElement?.initialState.arrowStartIsInside;
+      const other: BindingStrategy = {
+        mode: otherIsInsideBinding ? "inside" : "orbit",
+        element: otherElement,
+        focusPoint: shiftKey
+          ? elementCenterPoint(otherElement, elementsMap)
+          : origin ?? pointFrom<GlobalPoint>(arrow.x, arrow.y),
+      };
 
-  return [start, end];
-};
+      // We are hovering another element with the end point
+      const isNested =
+        hit &&
+        isBindableElementInsideOtherBindable(otherElement, hit, elementsMap);
+      let current: BindingStrategy;
+      if (hit) {
+        const isInsideBinding =
+          globalBindMode === "inside" || globalBindMode === "skip";
+        current = {
+          mode: isInsideBinding && !isNested ? "inside" : "orbit",
+          element: hit,
+          focusPoint: isInsideBinding || isNested ? point : point,
+        };
+      } else {
+        current = { mode: null };
+      }
 
-const getBindingStrategyForDraggingArrowOrJoints = (
-  selectedElement: NonDeleted<ExcalidrawLinearElement>,
-  elementsMap: NonDeletedSceneElementsMap,
-  elements: readonly NonDeletedExcalidrawElement[],
-  isBindingEnabled: boolean,
-  zoom?: AppState["zoom"],
-): (NonDeleted<ExcalidrawBindableElement> | null | "keep")[] => {
-  // Elbow arrows don't bind when dragged as a whole
-  if (isElbowArrow(selectedElement)) {
-    return ["keep", "keep"];
+      return {
+        start: isMultiPoint ? { mode: undefined } : other,
+        end: current,
+      };
+    }
+
+    // No start binding
+    if (!arrow.startBinding) {
+      if (hit) {
+        const isInsideBinding =
+          globalBindMode === "inside" || globalBindMode === "skip";
+
+        end = {
+          mode: isInsideBinding ? "inside" : "orbit",
+          element: hit,
+          focusPoint: point,
+        };
+      } else {
+        end = { mode: null };
+      }
+
+      return { start, end };
+    }
   }
 
-  const [startIsClose, endIsClose] = getOriginalBindingsIfStillCloseToArrowEnds(
-    selectedElement,
-    elementsMap,
-    zoom,
-  );
-  const start = startIsClose
-    ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
-          selectedElement,
-          "start",
-          elementsMap,
-          elements,
-          zoom,
-        )
-      : null
-    : null;
-  const end = endIsClose
-    ? isBindingEnabled
-      ? getEligibleElementForBindingElement(
-          selectedElement,
-          "end",
-          elementsMap,
-          elements,
-          zoom,
-        )
-      : null
-    : null;
-
-  return [start, end];
+  invariant(false, "New arrow creation should not reach here");
 };
 
-export const bindOrUnbindLinearElements = (
-  selectedElements: NonDeleted<ExcalidrawLinearElement>[],
-  isBindingEnabled: boolean,
-  draggingPoints: readonly number[] | null,
-  scene: Scene,
-  zoom?: AppState["zoom"],
-): void => {
-  selectedElements.forEach((selectedElement) => {
-    const [start, end] = draggingPoints?.length
-      ? // The arrow edge points are dragged (i.e. start, end)
-        getBindingStrategyForDraggingArrowEndpoints(
-          selectedElement,
-          isBindingEnabled,
-          draggingPoints ?? [],
-          scene.getNonDeletedElementsMap(),
-          scene.getNonDeletedElements(),
-          zoom,
-        )
-      : // The arrow itself (the shaft) or the inner joins are dragged
-        getBindingStrategyForDraggingArrowOrJoints(
-          selectedElement,
-          scene.getNonDeletedElementsMap(),
-          scene.getNonDeletedElements(),
-          isBindingEnabled,
-          zoom,
-        );
-
-    bindOrUnbindLinearElement(selectedElement, start, end, scene);
-  });
-};
-
-export const getSuggestedBindingsForArrows = (
-  selectedElements: NonDeleted<ExcalidrawElement>[],
+const bindingStrategyForSimpleArrowEndpointDragging_complex = (
+  point: GlobalPoint,
+  currentBinding: FixedPointBinding | null,
+  oppositeBinding: FixedPointBinding | null,
   elementsMap: NonDeletedSceneElementsMap,
-  zoom: AppState["zoom"],
-): SuggestedBinding[] => {
-  // HOT PATH: Bail out if selected elements list is too large
-  if (selectedElements.length > 50) {
-    return [];
-  }
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  globalBindMode: AppState["bindMode"],
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  finalize?: boolean,
+): { current: BindingStrategy; other: BindingStrategy } => {
+  let current: BindingStrategy = { mode: undefined };
+  let other: BindingStrategy = { mode: undefined };
 
-  return (
-    selectedElements
-      .filter(isLinearElement)
-      .flatMap((element) =>
-        getOriginalBindingsIfStillCloseToArrowEnds(element, elementsMap, zoom),
+  const isMultiPoint = arrow.points.length > 2;
+  const hit = getHoveredElementForBinding(point, elements, elementsMap);
+  const isOverlapping = oppositeBinding
+    ? getAllHoveredElementAtPoint(point, elements, elementsMap).some(
+        (el) => el.id === oppositeBinding.elementId,
       )
-      .filter(
-        (element): element is NonDeleted<ExcalidrawBindableElement> =>
-          element !== null,
-      )
-      // Filter out bind candidates which are in the
-      // same selection / group with the arrow
-      //
-      // TODO: Is it worth turning the list into a set to avoid dupes?
-      .filter(
-        (element) =>
-          selectedElements.filter((selected) => selected.id === element?.id)
-            .length === 0,
-      )
-  );
-};
+    : false;
+  const oppositeElement = oppositeBinding
+    ? (elementsMap.get(oppositeBinding.elementId) as ExcalidrawBindableElement)
+    : null;
+  const otherIsTransparent =
+    isOverlapping && oppositeElement
+      ? isTransparent(oppositeElement.backgroundColor)
+      : false;
+  const isNested =
+    hit &&
+    oppositeElement &&
+    isBindableElementInsideOtherBindable(oppositeElement, hit, elementsMap);
 
-export const maybeSuggestBindingsForLinearElementAtCoords = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  /** scene coords */
-  pointerCoords: {
-    x: number;
-    y: number;
-  }[],
-  scene: Scene,
-  zoom: AppState["zoom"],
-  // During line creation the start binding hasn't been written yet
-  // into `linearElement`
-  oppositeBindingBoundElement?: ExcalidrawBindableElement | null,
-): ExcalidrawBindableElement[] =>
-  Array.from(
-    pointerCoords.reduce(
-      (acc: Set<NonDeleted<ExcalidrawBindableElement>>, coords) => {
-        const hoveredBindableElement = getHoveredElementForBinding(
-          coords,
-          scene.getNonDeletedElements(),
-          scene.getNonDeletedElementsMap(),
-          zoom,
-          isElbowArrow(linearElement),
-          isElbowArrow(linearElement),
-        );
-
-        if (
-          hoveredBindableElement != null &&
-          !isLinearElementSimpleAndAlreadyBound(
-            linearElement,
-            oppositeBindingBoundElement?.id,
-            hoveredBindableElement,
-          )
-        ) {
-          acc.add(hoveredBindableElement);
+  // If the global bind mode is in free binding mode, just bind
+  // where the pointer is and keep the other end intact
+  if (globalBindMode === "inside" || globalBindMode === "skip") {
+    current = hit
+      ? {
+          element:
+            !isOverlapping || !oppositeElement || otherIsTransparent
+              ? hit
+              : oppositeElement,
+          focusPoint: point,
+          mode: "inside",
         }
+      : { mode: null };
+    other =
+      finalize && hit && hit.id === oppositeBinding?.elementId
+        ? { mode: null }
+        : other;
 
-        return acc;
-      },
-      new Set() as Set<NonDeleted<ExcalidrawBindableElement>>,
-    ),
-  );
+    return { current, other };
+  }
 
-export const maybeBindLinearElement = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
+  // Dragged point is outside of any bindable element
+  // so we break any existing binding
+  if (!hit) {
+    return { current: { mode: null }, other };
+  }
+
+  // Already inside binding over the same hit element should remain inside bound
+  if (
+    hit.id === currentBinding?.elementId &&
+    currentBinding.mode === "inside"
+  ) {
+    return {
+      current: { mode: "inside", focusPoint: point, element: hit },
+      other,
+    };
+  }
+
+  // The dragged point is inside the hovered bindable element
+  if (oppositeBinding) {
+    // The opposite binding is on the same element
+    if (oppositeBinding.elementId === hit.id) {
+      // The opposite binding is on the binding gap of the same element
+      if (oppositeBinding.mode === "orbit") {
+        current = { element: hit, mode: "orbit", focusPoint: point };
+        other = { mode: finalize ? null : undefined };
+
+        return { current, other: isMultiPoint ? { mode: undefined } : other };
+      }
+      // The opposite binding is inside the same element
+      // eslint-disable-next-line no-else-return
+      else {
+        current = { element: hit, mode: "inside", focusPoint: point };
+
+        return { current, other: isMultiPoint ? { mode: undefined } : other };
+      }
+    }
+    // The opposite binding is on a different element (or nested)
+    // eslint-disable-next-line no-else-return
+    else {
+      // Handle the nested element case
+      if (isOverlapping && oppositeElement && !otherIsTransparent) {
+        current = {
+          element: oppositeElement,
+          mode: "inside",
+          focusPoint: point,
+        };
+      } else {
+        current = {
+          element: hit,
+          mode: "orbit",
+          focusPoint: isNested ? point : point,
+        };
+      }
+
+      return { current, other: isMultiPoint ? { mode: undefined } : other };
+    }
+  }
+  // The opposite binding is on a different element or no binding
+  else {
+    current = {
+      element: hit,
+      mode: "orbit",
+      focusPoint: point,
+    };
+  }
+
+  // Must return as only one endpoint is dragged, therefore
+  // the end binding strategy might accidentally gets overriden
+  return { current, other: isMultiPoint ? { mode: undefined } : other };
+};
+
+export const getBindingStrategyForDraggingBindingElementEndpoints = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  draggingPoints: PointsPositionUpdates,
+  elementsMap: NonDeletedSceneElementsMap,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   appState: AppState,
-  pointerCoords: { x: number; y: number },
-  scene: Scene,
-): void => {
-  const elements = scene.getNonDeletedElements();
-  const elementsMap = scene.getNonDeletedElementsMap();
-
-  if (appState.startBoundElement != null) {
-    bindLinearElement(
-      linearElement,
-      appState.startBoundElement,
-      "start",
-      scene,
+  opts?: {
+    newArrow?: boolean;
+    shiftKey?: boolean;
+    altKey?: boolean;
+    finalize?: boolean;
+    initialBinding?: boolean;
+    zoom?: AppState["zoom"];
+  },
+): { start: BindingStrategy; end: BindingStrategy } => {
+  if (getFeatureFlag("COMPLEX_BINDINGS")) {
+    return getBindingStrategyForDraggingBindingElementEndpoints_complex(
+      arrow,
+      draggingPoints,
+      elementsMap,
+      elements,
+      appState,
+      opts,
     );
   }
 
-  const hoveredElement = getHoveredElementForBinding(
-    pointerCoords,
-    elements,
+  return getBindingStrategyForDraggingBindingElementEndpoints_simple(
+    arrow,
+    draggingPoints,
     elementsMap,
-    appState.zoom,
-    isElbowArrow(linearElement),
-    isElbowArrow(linearElement),
+    elements,
+    appState,
+    opts,
   );
-
-  if (hoveredElement !== null) {
-    if (
-      !isLinearElementSimpleAndAlreadyBoundOnOppositeEdge(
-        linearElement,
-        hoveredElement,
-        "end",
-      )
-    ) {
-      bindLinearElement(linearElement, hoveredElement, "end", scene);
-    }
-  }
 };
 
-const normalizePointBinding = (
-  binding: { focus: number; gap: number },
-  hoveredElement: ExcalidrawBindableElement,
-) => ({
-  ...binding,
-  gap: Math.min(
-    binding.gap,
-    maxBindingGap(hoveredElement, hoveredElement.width, hoveredElement.height),
-  ),
-});
+const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  draggingPoints: PointsPositionUpdates,
+  elementsMap: NonDeletedSceneElementsMap,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  appState: AppState,
+  opts?: {
+    newArrow?: boolean;
+    shiftKey?: boolean;
+    altKey?: boolean;
+    finalize?: boolean;
+    initialBinding?: boolean;
+    zoom?: AppState["zoom"];
+  },
+): { start: BindingStrategy; end: BindingStrategy } => {
+  const startIdx = 0;
+  const endIdx = arrow.points.length - 1;
+  const startDragged = draggingPoints.has(startIdx);
+  const endDragged = draggingPoints.has(endIdx);
 
-export const bindLinearElement = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  hoveredElement: ExcalidrawBindableElement,
-  startOrEnd: "start" | "end",
-  scene: Scene,
-): void => {
-  if (!isArrowElement(linearElement)) {
-    return;
+  let start: BindingStrategy = { mode: undefined };
+  let end: BindingStrategy = { mode: undefined };
+
+  invariant(
+    arrow.points.length > 1,
+    "Do not attempt to bind linear elements with a single point",
+  );
+
+  // If none of the ends are dragged, we don't change anything
+  if (!startDragged && !endDragged) {
+    return { start, end };
   }
 
-  let binding: PointBinding | FixedPointBinding = {
-    elementId: hoveredElement.id,
-    ...normalizePointBinding(
-      calculateFocusAndGap(
-        linearElement,
-        hoveredElement,
-        startOrEnd,
-        scene.getNonDeletedElementsMap(),
-      ),
-      hoveredElement,
-    ),
-  };
+  // If both ends are dragged, we don't bind to anything
+  // and break existing bindings
+  if (startDragged && endDragged) {
+    return { start: { mode: null }, end: { mode: null } };
+  }
 
-  if (isElbowArrow(linearElement)) {
+  // If binding is disabled and an endpoint is dragged,
+  // we actively break the end binding
+  if (!isBindingEnabled(appState)) {
+    start = startDragged ? { mode: null } : start;
+    end = endDragged ? { mode: null } : end;
+
+    return { start, end };
+  }
+
+  // Handle simpler elbow arrow binding
+  if (isElbowArrow(arrow)) {
+    return bindingStrategyForElbowArrowEndpointDragging(
+      arrow,
+      draggingPoints,
+      elementsMap,
+      elements,
+      opts?.zoom,
+    );
+  }
+
+  const otherBinding = startDragged ? arrow.endBinding : arrow.startBinding;
+  const localPoint = draggingPoints.get(
+    startDragged ? startIdx : endIdx,
+  )?.point;
+  invariant(
+    localPoint,
+    `Local point must be defined for ${
+      startDragged ? "start" : "end"
+    } dragging`,
+  );
+  const globalPoint = LinearElementEditor.getPointGlobalCoordinates(
+    arrow,
+    localPoint,
+    elementsMap,
+  );
+  const hit = getHoveredElementForBinding(
+    globalPoint,
+    elements,
+    elementsMap,
+    (e) => maxBindingDistance_simple(appState.zoom),
+  );
+  const pointInElement = hit && isPointInElement(globalPoint, hit, elementsMap);
+  const otherBindableElement = otherBinding
+    ? (elementsMap.get(
+        otherBinding.elementId,
+      ) as NonDeleted<ExcalidrawBindableElement>)
+    : undefined;
+  const otherFocusPoint =
+    otherBinding &&
+    otherBindableElement &&
+    getGlobalFixedPointForBindableElement(
+      otherBinding.fixedPoint,
+      otherBindableElement,
+      elementsMap,
+    );
+  const otherFocusPointIsInElement =
+    otherBindableElement &&
+    otherFocusPoint &&
+    isPointInElement(otherFocusPoint, otherBindableElement, elementsMap);
+
+  // Handle outside-outside binding to the same element
+  if (otherBinding && otherBinding.elementId === hit?.id) {
+    invariant(
+      !opts?.newArrow || appState.selectedLinearElement?.initialState.origin,
+      "appState.selectedLinearElement.initialState.origin must be defined for new arrows",
+    );
+
+    return {
+      start: {
+        mode: "inside",
+        element: hit,
+        focusPoint: startDragged
+          ? globalPoint
+          : // NOTE: Can only affect the start point because new arrows always drag the end point
+          opts?.newArrow
+          ? appState.selectedLinearElement!.initialState.origin!
+          : LinearElementEditor.getPointAtIndexGlobalCoordinates(
+              arrow,
+              0,
+              elementsMap,
+            ), // startFixedPoint,
+      },
+      end: {
+        mode: "inside",
+        element: hit,
+        focusPoint: endDragged
+          ? globalPoint
+          : LinearElementEditor.getPointAtIndexGlobalCoordinates(
+              arrow,
+              -1,
+              elementsMap,
+            ), // endFixedPoint
+      },
+    };
+  }
+
+  // Handle special alt key case to inside bind no matter what
+  if (opts?.altKey) {
+    return {
+      start: startDragged
+        ? hit
+          ? {
+              mode: "inside",
+              element: hit,
+              focusPoint: globalPoint,
+            }
+          : { mode: null }
+        : start,
+      end: endDragged
+        ? hit
+          ? {
+              mode: "inside",
+              element: hit,
+              focusPoint: globalPoint,
+            }
+          : { mode: null }
+        : end,
+    };
+  }
+
+  // Handle normal cases
+  const current: BindingStrategy = hit
+    ? pointInElement
+      ? {
+          mode: "inside",
+          element: hit,
+          focusPoint: globalPoint,
+        }
+      : {
+          mode: "orbit",
+          element: hit,
+          focusPoint:
+            projectFixedPointOntoDiagonal(
+              arrow,
+              globalPoint,
+              hit,
+              startDragged ? "start" : "end",
+              elementsMap,
+            ) || globalPoint,
+        }
+    : { mode: null };
+
+  const other: BindingStrategy =
+    otherBindableElement &&
+    !otherFocusPointIsInElement &&
+    appState.selectedLinearElement?.initialState.altFocusPoint
+      ? {
+          mode: "orbit",
+          element: otherBindableElement,
+          focusPoint: appState.selectedLinearElement.initialState.altFocusPoint,
+        }
+      : { mode: undefined };
+
+  return {
+    start: startDragged ? current : other,
+    end: endDragged ? current : other,
+  };
+};
+
+const getBindingStrategyForDraggingBindingElementEndpoints_complex = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  draggingPoints: PointsPositionUpdates,
+  elementsMap: NonDeletedSceneElementsMap,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  appState: AppState,
+  opts?: {
+    newArrow?: boolean;
+    shiftKey?: boolean;
+    finalize?: boolean;
+    initialBinding?: boolean;
+  },
+): { start: BindingStrategy; end: BindingStrategy } => {
+  const globalBindMode = appState.bindMode || "orbit";
+  const startIdx = 0;
+  const endIdx = arrow.points.length - 1;
+  const startDragged = draggingPoints.has(startIdx);
+  const endDragged = draggingPoints.has(endIdx);
+
+  let start: BindingStrategy = { mode: undefined };
+  let end: BindingStrategy = { mode: undefined };
+
+  invariant(
+    arrow.points.length > 1,
+    "Do not attempt to bind linear elements with a single point",
+  );
+
+  // If none of the ends are dragged, we don't change anything
+  if (!startDragged && !endDragged) {
+    return { start, end };
+  }
+
+  // If both ends are dragged, we don't bind to anything
+  // and break existing bindings
+  if (startDragged && endDragged) {
+    return { start: { mode: null }, end: { mode: null } };
+  }
+
+  // If binding is disabled and an endpoint is dragged,
+  // we actively break the end binding
+  if (!isBindingEnabled(appState)) {
+    start = startDragged ? { mode: null } : start;
+    end = endDragged ? { mode: null } : end;
+
+    return { start, end };
+  }
+
+  // Handle simpler elbow arrow binding
+  if (isElbowArrow(arrow)) {
+    return bindingStrategyForElbowArrowEndpointDragging(
+      arrow,
+      draggingPoints,
+      elementsMap,
+      elements,
+    );
+  }
+
+  // Handle new arrow creation separately, as it is special
+  if (opts?.newArrow) {
+    const { start, end } = bindingStrategyForNewSimpleArrowEndpointDragging(
+      arrow,
+      draggingPoints,
+      elementsMap,
+      elements,
+      startDragged,
+      endDragged,
+      startIdx,
+      endIdx,
+      appState,
+      globalBindMode,
+      opts?.shiftKey,
+    );
+
+    return { start, end };
+  }
+
+  // Only the start point is dragged
+  if (startDragged) {
+    const localPoint = draggingPoints.get(startIdx)?.point;
+    invariant(localPoint, "Local point must be defined for start dragging");
+    const globalPoint = LinearElementEditor.getPointGlobalCoordinates(
+      arrow,
+      localPoint,
+      elementsMap,
+    );
+
+    const { current, other } =
+      bindingStrategyForSimpleArrowEndpointDragging_complex(
+        globalPoint,
+        arrow.startBinding,
+        arrow.endBinding,
+        elementsMap,
+        elements,
+        globalBindMode,
+        arrow,
+        opts?.finalize,
+      );
+
+    return { start: current, end: other };
+  }
+
+  // Only the end point is dragged
+  if (endDragged) {
+    const localPoint = draggingPoints.get(endIdx)?.point;
+    invariant(localPoint, "Local point must be defined for end dragging");
+    const globalPoint = LinearElementEditor.getPointGlobalCoordinates(
+      arrow,
+      localPoint,
+      elementsMap,
+    );
+    const { current, other } =
+      bindingStrategyForSimpleArrowEndpointDragging_complex(
+        globalPoint,
+        arrow.endBinding,
+        arrow.startBinding,
+        elementsMap,
+        elements,
+        globalBindMode,
+        arrow,
+        opts?.finalize,
+      );
+
+    return { start: other, end: current };
+  }
+
+  return { start, end };
+};
+
+export const bindOrUnbindBindingElements = (
+  selectedArrows: NonDeleted<ExcalidrawArrowElement>[],
+  scene: Scene,
+  appState: AppState,
+): void => {
+  selectedArrows.forEach((arrow) => {
+    bindOrUnbindBindingElement(
+      arrow,
+      new Map(), // No dragging points in this case
+      scene,
+      appState,
+    );
+  });
+};
+
+export const bindBindingElement = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
+  hoveredElement: ExcalidrawBindableElement,
+  mode: BindMode,
+  startOrEnd: "start" | "end",
+  scene: Scene,
+  focusPoint?: GlobalPoint,
+): void => {
+  const elementsMap = scene.getNonDeletedElementsMap();
+
+  let binding: FixedPointBinding;
+
+  if (isElbowArrow(arrow)) {
     binding = {
-      ...binding,
+      elementId: hoveredElement.id,
+      mode: "orbit",
       ...calculateFixedPointForElbowArrowBinding(
-        linearElement,
+        arrow,
         hoveredElement,
         startOrEnd,
-        scene.getNonDeletedElementsMap(),
+        elementsMap,
+      ),
+    };
+  } else {
+    binding = {
+      elementId: hoveredElement.id,
+      mode,
+      ...calculateFixedPointForNonElbowArrowBinding(
+        arrow,
+        hoveredElement,
+        startOrEnd,
+        elementsMap,
+        focusPoint,
       ),
     };
   }
 
-  scene.mutateElement(linearElement, {
+  scene.mutateElement(arrow, {
     [startOrEnd === "start" ? "startBinding" : "endBinding"]: binding,
   });
 
   const boundElementsMap = arrayToMap(hoveredElement.boundElements || []);
-  if (!boundElementsMap.has(linearElement.id)) {
+  if (!boundElementsMap.has(arrow.id)) {
     scene.mutateElement(hoveredElement, {
       boundElements: (hoveredElement.boundElements || []).concat({
-        id: linearElement.id,
+        id: arrow.id,
         type: "arrow",
       }),
     });
   }
 };
 
-// Don't bind both ends of a simple segment
-const isLinearElementSimpleAndAlreadyBoundOnOppositeEdge = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  bindableElement: ExcalidrawBindableElement,
-  startOrEnd: "start" | "end",
-): boolean => {
-  const otherBinding =
-    linearElement[startOrEnd === "start" ? "endBinding" : "startBinding"];
-  return isLinearElementSimpleAndAlreadyBound(
-    linearElement,
-    otherBinding?.elementId,
-    bindableElement,
-  );
-};
-
-export const isLinearElementSimpleAndAlreadyBound = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  alreadyBoundToId: ExcalidrawBindableElement["id"] | undefined,
-  bindableElement: ExcalidrawBindableElement,
-): boolean => {
-  return (
-    alreadyBoundToId === bindableElement.id &&
-    isLinearElementSimple(linearElement)
-  );
-};
-
-const isLinearElementSimple = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-): boolean => linearElement.points.length < 3 && !isElbowArrow(linearElement);
-
-const unbindLinearElement = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
+export const unbindBindingElement = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
   startOrEnd: "start" | "end",
   scene: Scene,
 ): ExcalidrawBindableElement["id"] | null => {
   const field = startOrEnd === "start" ? "startBinding" : "endBinding";
-  const binding = linearElement[field];
+  const binding = arrow[field];
+
   if (binding == null) {
     return null;
   }
-  scene.mutateElement(linearElement, { [field]: null });
-  return binding.elementId;
-};
 
-export const getHoveredElementForBinding = (
-  pointerCoords: {
-    x: number;
-    y: number;
-  },
-  elements: readonly NonDeletedExcalidrawElement[],
-  elementsMap: NonDeletedSceneElementsMap,
-  zoom?: AppState["zoom"],
-  fullShape?: boolean,
-  considerAllElements?: boolean,
-): NonDeleted<ExcalidrawBindableElement> | null => {
-  if (considerAllElements) {
-    let cullRest = false;
-    const candidateElements = getAllElementsAtPositionForBinding(
-      elements,
-      (element) =>
-        isBindableElement(element, false) &&
-        bindingBorderTest(
-          element,
-          pointerCoords,
-          elementsMap,
-          zoom,
-          (fullShape ||
-            !isBindingFallthroughEnabled(
-              element as ExcalidrawBindableElement,
-            )) &&
-            // disable fullshape snapping for frame elements so we
-            // can bind to frame children
-            !isFrameLikeElement(element),
-        ),
-    ).filter((element) => {
-      if (cullRest) {
-        return false;
-      }
-
-      if (!isBindingFallthroughEnabled(element as ExcalidrawBindableElement)) {
-        cullRest = true;
-      }
-
-      return true;
-    }) as NonDeleted<ExcalidrawBindableElement>[] | null;
-
-    // Return early if there are no candidates or just one candidate
-    if (!candidateElements || candidateElements.length === 0) {
-      return null;
-    }
-
-    if (candidateElements.length === 1) {
-      return candidateElements[0] as NonDeleted<ExcalidrawBindableElement>;
-    }
-
-    // Prefer the shape with the border being tested (if any)
-    const borderTestElements = candidateElements.filter((element) =>
-      bindingBorderTest(element, pointerCoords, elementsMap, zoom, false),
-    );
-    if (borderTestElements.length === 1) {
-      return borderTestElements[0];
-    }
-
-    // Prefer smaller shapes
-    return candidateElements
-      .sort(
-        (a, b) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2),
-      )
-      .pop() as NonDeleted<ExcalidrawBindableElement>;
-  }
-
-  const hoveredElement = getElementAtPositionForBinding(
-    elements,
-    (element) =>
-      isBindableElement(element, false) &&
-      bindingBorderTest(
-        element,
-        pointerCoords,
-        elementsMap,
-        zoom,
-        // disable fullshape snapping for frame elements so we
-        // can bind to frame children
-        (fullShape || !isBindingFallthroughEnabled(element)) &&
-          !isFrameLikeElement(element),
+  const oppositeBinding =
+    arrow[startOrEnd === "start" ? "endBinding" : "startBinding"];
+  if (!oppositeBinding || oppositeBinding.elementId !== binding.elementId) {
+    // Only remove the record on the bound element if the other
+    // end is not bound to the same element
+    const boundElement = scene
+      .getNonDeletedElementsMap()
+      .get(binding.elementId) as ExcalidrawBindableElement;
+    scene.mutateElement(boundElement, {
+      boundElements: boundElement.boundElements?.filter(
+        (element) => element.id !== arrow.id,
       ),
-  );
-
-  return hoveredElement as NonDeleted<ExcalidrawBindableElement> | null;
-};
-
-const getElementAtPositionForBinding = (
-  elements: readonly NonDeletedExcalidrawElement[],
-  isAtPositionFn: (element: NonDeletedExcalidrawElement) => boolean,
-) => {
-  let hitElement = null;
-  // We need to to hit testing from front (end of the array) to back (beginning of the array)
-  // because array is ordered from lower z-index to highest and we want element z-index
-  // with higher z-index
-  for (let index = elements.length - 1; index >= 0; --index) {
-    const element = elements[index];
-    if (element.isDeleted) {
-      continue;
-    }
-    if (isAtPositionFn(element)) {
-      hitElement = element;
-      break;
-    }
+    });
   }
 
-  return hitElement;
-};
+  scene.mutateElement(arrow, { [field]: null });
 
-const getAllElementsAtPositionForBinding = (
-  elements: readonly NonDeletedExcalidrawElement[],
-  isAtPositionFn: (element: NonDeletedExcalidrawElement) => boolean,
-) => {
-  const elementsAtPosition: NonDeletedExcalidrawElement[] = [];
-  // We need to to hit testing from front (end of the array) to back (beginning of the array)
-  // because array is ordered from lower z-index to highest and we want element z-index
-  // with higher z-index
-  for (let index = elements.length - 1; index >= 0; --index) {
-    const element = elements[index];
-    if (element.isDeleted) {
-      continue;
-    }
-
-    if (isAtPositionFn(element)) {
-      elementsAtPosition.push(element);
-    }
-  }
-
-  return elementsAtPosition;
-};
-
-const calculateFocusAndGap = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  hoveredElement: ExcalidrawBindableElement,
-  startOrEnd: "start" | "end",
-  elementsMap: NonDeletedSceneElementsMap,
-): { focus: number; gap: number } => {
-  const direction = startOrEnd === "start" ? -1 : 1;
-  const edgePointIndex = direction === -1 ? 0 : linearElement.points.length - 1;
-  const adjacentPointIndex = edgePointIndex - direction;
-
-  const edgePoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-    linearElement,
-    edgePointIndex,
-    elementsMap,
-  );
-  const adjacentPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-    linearElement,
-    adjacentPointIndex,
-    elementsMap,
-  );
-
-  return {
-    focus: determineFocusDistance(
-      hoveredElement,
-      elementsMap,
-      adjacentPoint,
-      edgePoint,
-    ),
-    gap: Math.max(1, distanceToElement(hoveredElement, elementsMap, edgePoint)),
-  };
+  return binding.elementId;
 };
 
 // Supports translating, rotating and scaling `changedElement` with bound
@@ -740,7 +1021,6 @@ export const updateBoundElements = (
   scene: Scene,
   options?: {
     simultaneouslyUpdated?: readonly ExcalidrawElement[];
-    newSize?: { width: number; height: number };
     changedElements?: Map<string, ExcalidrawElement>;
   },
 ) => {
@@ -748,7 +1028,7 @@ export const updateBoundElements = (
     return;
   }
 
-  const { newSize, simultaneouslyUpdated } = options ?? {};
+  const { simultaneouslyUpdated } = options ?? {};
   const simultaneouslyUpdatedElementIds = getSimultaneouslyUpdatedElementIds(
     simultaneouslyUpdated,
   );
@@ -762,7 +1042,7 @@ export const updateBoundElements = (
   }
 
   boundElementsVisitor(elementsMap, changedElement, (element) => {
-    if (!isLinearElement(element) || element.isDeleted) {
+    if (!isArrowElement(element) || element.isDeleted) {
       return;
     }
 
@@ -776,32 +1056,14 @@ export const updateBoundElements = (
       ? elementsMap.get(element.startBinding.elementId)
       : null;
     const endBindingElement = element.endBinding
-      ? elementsMap.get(element.endBinding.elementId)
+      ? // PERF: If the arrow is bound to the same element on both ends.
+        startBindingElement?.id === element.endBinding.elementId
+        ? startBindingElement
+        : elementsMap.get(element.endBinding.elementId)
       : null;
 
-    let startBounds: Bounds | null = null;
-    let endBounds: Bounds | null = null;
-    if (startBindingElement && endBindingElement) {
-      startBounds = getElementBounds(startBindingElement, elementsMap);
-      endBounds = getElementBounds(endBindingElement, elementsMap);
-    }
-
-    const bindings = {
-      startBinding: maybeCalculateNewGapWhenScaling(
-        changedElement,
-        element.startBinding,
-        newSize,
-      ),
-      endBinding: maybeCalculateNewGapWhenScaling(
-        changedElement,
-        element.endBinding,
-        newSize,
-      ),
-    };
-
     // `linearElement` is being moved/scaled already, just update the binding
     if (simultaneouslyUpdatedElementIds.has(element.id)) {
-      scene.mutateElement(element, bindings);
       return;
     }
 
@@ -814,16 +1076,15 @@ export const updateBoundElements = (
           isBindableElement(bindableElement) &&
           (bindingProp === "startBinding" || bindingProp === "endBinding") &&
           (changedElement.id === element[bindingProp]?.elementId ||
-            (changedElement.id ===
+            changedElement.id ===
               element[
                 bindingProp === "startBinding" ? "endBinding" : "startBinding"
-              ]?.elementId &&
-              !doBoundsIntersect(startBounds, endBounds)))
+              ]?.elementId)
         ) {
           const point = updateBoundPoint(
             element,
             bindingProp,
-            bindings[bindingProp],
+            element[bindingProp],
             bindableElement,
             elementsMap,
           );
@@ -843,12 +1104,9 @@ export const updateBoundElements = (
     );
 
     LinearElementEditor.movePoints(element, scene, new Map(updates), {
-      ...(changedElement.id === element.startBinding?.elementId
-        ? { startBinding: bindings.startBinding }
-        : {}),
-      ...(changedElement.id === element.endBinding?.elementId
-        ? { endBinding: bindings.endBinding }
-        : {}),
+      moveMidPointsWithElement:
+        !!startBindingElement &&
+        startBindingElement?.id === endBindingElement?.id,
     });
 
     const boundText = getBoundTextElement(element, elementsMap);
@@ -861,14 +1119,14 @@ export const updateBoundElements = (
 export const updateBindings = (
   latestElement: ExcalidrawElement,
   scene: Scene,
+  appState: AppState,
   options?: {
     simultaneouslyUpdated?: readonly ExcalidrawElement[];
     newSize?: { width: number; height: number };
-    zoom?: AppState["zoom"];
   },
 ) => {
-  if (isLinearElement(latestElement)) {
-    bindOrUnbindLinearElements([latestElement], true, [], scene, options?.zoom);
+  if (isArrowElement(latestElement)) {
+    bindOrUnbindBindingElement(latestElement, new Map(), scene, appState);
   } else {
     updateBoundElements(latestElement, scene, {
       ...options,
@@ -878,7 +1136,7 @@ export const updateBindings = (
 };
 
 const doesNeedUpdate = (
-  boundElement: NonDeleted<ExcalidrawLinearElement>,
+  boundElement: NonDeleted<ExcalidrawArrowElement>,
   changedElement: ExcalidrawBindableElement,
 ) => {
   return (
@@ -931,79 +1189,89 @@ const getDistanceForBinding = (
   zoom?: AppState["zoom"],
 ) => {
   const distance = distanceToElement(bindableElement, elementsMap, point);
-  const bindDistance = maxBindingGap(
-    bindableElement,
-    bindableElement.width,
-    bindableElement.height,
-    zoom,
-  );
+  const bindDistance = maxBindingDistance_simple(zoom);
 
   return distance > bindDistance ? null : distance;
 };
 
 export const bindPointToSnapToElementOutline = (
-  arrow: ExcalidrawElbowArrowElement,
+  arrowElement: ExcalidrawArrowElement,
   bindableElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
   elementsMap: ElementsMap,
+  customIntersector?: LineSegment<GlobalPoint>,
 ): GlobalPoint => {
-  if (isDevEnv() || isTestEnv()) {
-    invariant(arrow.points.length > 1, "Arrow should have at least 2 points");
+  const elbowed = isElbowArrow(arrowElement);
+  const point = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+    arrowElement,
+    startOrEnd === "start" ? 0 : -1,
+    elementsMap,
+  );
+
+  if (arrowElement.points.length < 2) {
+    // New arrow creation, so no snapping
+    return point;
   }
 
+  const edgePoint =
+    isRectanguloidElement(bindableElement) && elbowed
+      ? avoidRectangularCorner(
+          arrowElement,
+          bindableElement,
+          elementsMap,
+          point,
+        )
+      : point;
+  const adjacentPoint =
+    customIntersector && !elbowed
+      ? customIntersector[1]
+      : LinearElementEditor.getPointAtIndexGlobalCoordinates(
+          arrowElement,
+          startOrEnd === "start" ? 1 : -2,
+          elementsMap,
+        );
+  const bindingGap = getBindingGap(bindableElement, arrowElement);
   const aabb = aabbForElement(bindableElement, elementsMap);
-  const localP =
-    arrow.points[startOrEnd === "start" ? 0 : arrow.points.length - 1];
-  const globalP = pointFrom<GlobalPoint>(
-    arrow.x + localP[0],
-    arrow.y + localP[1],
-  );
-  const edgePoint = isRectanguloidElement(bindableElement)
-    ? avoidRectangularCorner(bindableElement, elementsMap, globalP)
-    : globalP;
-  const elbowed = isElbowArrow(arrow);
-  const center = getCenterForBounds(aabb);
-  const adjacentPointIdx = startOrEnd === "start" ? 1 : arrow.points.length - 2;
-  const adjacentPoint = pointRotateRads(
-    pointFrom<GlobalPoint>(
-      arrow.x + arrow.points[adjacentPointIdx][0],
-      arrow.y + arrow.points[adjacentPointIdx][1],
-    ),
-    center,
-    arrow.angle ?? 0,
-  );
+  const bindableCenter = getCenterForBounds(aabb);
 
   let intersection: GlobalPoint | null = null;
   if (elbowed) {
     const isHorizontal = headingIsHorizontal(
-      headingForPointFromElement(bindableElement, aabb, globalP),
+      headingForPointFromElement(bindableElement, aabb, point),
+    );
+    const snapPoint = snapToMid(
+      arrowElement,
+      bindableElement,
+      elementsMap,
+      edgePoint,
     );
-    const snapPoint = snapToMid(bindableElement, elementsMap, edgePoint);
     const otherPoint = pointFrom<GlobalPoint>(
-      isHorizontal ? center[0] : snapPoint[0],
-      !isHorizontal ? center[1] : snapPoint[1],
+      isHorizontal ? bindableCenter[0] : snapPoint[0],
+      !isHorizontal ? bindableCenter[1] : snapPoint[1],
     );
-    const intersector = lineSegment(
-      otherPoint,
-      pointFromVector(
-        vectorScale(
-          vectorNormalize(vectorFromPoint(snapPoint, otherPoint)),
-          Math.max(bindableElement.width, bindableElement.height) * 2,
-        ),
+    const intersector =
+      customIntersector ??
+      lineSegment(
         otherPoint,
-      ),
-    );
+        pointFromVector(
+          vectorScale(
+            vectorNormalize(vectorFromPoint(snapPoint, otherPoint)),
+            Math.max(bindableElement.width, bindableElement.height) * 2,
+          ),
+          otherPoint,
+        ),
+      );
     intersection = intersectElementWithLineSegment(
       bindableElement,
       elementsMap,
       intersector,
-      FIXED_BINDING_DISTANCE,
+      bindingGap,
     ).sort(pointDistanceSq)[0];
 
     if (!intersection) {
       const anotherPoint = pointFrom<GlobalPoint>(
-        !isHorizontal ? center[0] : snapPoint[0],
-        isHorizontal ? center[1] : snapPoint[1],
+        !isHorizontal ? bindableCenter[0] : snapPoint[0],
+        isHorizontal ? bindableCenter[1] : snapPoint[1],
       );
       const anotherIntersector = lineSegment(
         anotherPoint,
@@ -1019,29 +1287,39 @@ export const bindPointToSnapToElementOutline = (
         bindableElement,
         elementsMap,
         anotherIntersector,
-        FIXED_BINDING_DISTANCE,
+        BASE_BINDING_GAP_ELBOW,
       ).sort(pointDistanceSq)[0];
     }
   } else {
-    intersection = intersectElementWithLineSegment(
-      bindableElement,
-      elementsMap,
-      lineSegment(
-        adjacentPoint,
-        pointFromVector(
-          vectorScale(
-            vectorNormalize(vectorFromPoint(edgePoint, adjacentPoint)),
-            pointDistance(edgePoint, adjacentPoint) +
-              Math.max(bindableElement.width, bindableElement.height) * 2,
-          ),
-          adjacentPoint,
-        ),
-      ),
-      FIXED_BINDING_DISTANCE,
-    ).sort(
-      (g, h) =>
-        pointDistanceSq(g, adjacentPoint) - pointDistanceSq(h, adjacentPoint),
-    )[0];
+    let intersector = customIntersector;
+    if (!intersector) {
+      const halfVector = vectorScale(
+        vectorNormalize(vectorFromPoint(edgePoint, adjacentPoint)),
+        pointDistance(edgePoint, adjacentPoint) +
+          Math.max(bindableElement.width, bindableElement.height) +
+          bindingGap * 2,
+      );
+      intersector =
+        customIntersector ??
+        lineSegment(
+          pointFromVector(halfVector, adjacentPoint),
+          pointFromVector(vectorScale(halfVector, -1), adjacentPoint),
+        );
+    }
+
+    intersection =
+      pointDistance(edgePoint, adjacentPoint) < 1
+        ? edgePoint
+        : intersectElementWithLineSegment(
+            bindableElement,
+            elementsMap,
+            intersector,
+            bindingGap,
+          ).sort(
+            (g, h) =>
+              pointDistanceSq(g, adjacentPoint) -
+              pointDistanceSq(h, adjacentPoint),
+          )[0];
   }
 
   if (
@@ -1052,120 +1330,123 @@ export const bindPointToSnapToElementOutline = (
     return edgePoint;
   }
 
-  return elbowed ? intersection : edgePoint;
+  return intersection;
 };
 
 export const avoidRectangularCorner = (
-  element: ExcalidrawBindableElement,
+  arrowElement: ExcalidrawArrowElement,
+  bindTarget: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
   p: GlobalPoint,
 ): GlobalPoint => {
-  const center = elementCenterPoint(element, elementsMap);
-  const nonRotatedPoint = pointRotateRads(p, center, -element.angle as Radians);
+  const center = elementCenterPoint(bindTarget, elementsMap);
+  const nonRotatedPoint = pointRotateRads(
+    p,
+    center,
+    -bindTarget.angle as Radians,
+  );
 
-  if (nonRotatedPoint[0] < element.x && nonRotatedPoint[1] < element.y) {
+  const bindingGap = getBindingGap(bindTarget, arrowElement);
+
+  if (nonRotatedPoint[0] < bindTarget.x && nonRotatedPoint[1] < bindTarget.y) {
     // Top left
-    if (nonRotatedPoint[1] - element.y > -FIXED_BINDING_DISTANCE) {
+    if (nonRotatedPoint[1] - bindTarget.y > -bindingGap) {
       return pointRotateRads<GlobalPoint>(
-        pointFrom(element.x - FIXED_BINDING_DISTANCE, element.y),
+        pointFrom(bindTarget.x - bindingGap, bindTarget.y),
         center,
-        element.angle,
+        bindTarget.angle,
       );
     }
     return pointRotateRads(
-      pointFrom(element.x, element.y - FIXED_BINDING_DISTANCE),
+      pointFrom(bindTarget.x, bindTarget.y - bindingGap),
       center,
-      element.angle,
+      bindTarget.angle,
     );
   } else if (
-    nonRotatedPoint[0] < element.x &&
-    nonRotatedPoint[1] > element.y + element.height
+    nonRotatedPoint[0] < bindTarget.x &&
+    nonRotatedPoint[1] > bindTarget.y + bindTarget.height
   ) {
     // Bottom left
-    if (nonRotatedPoint[0] - element.x > -FIXED_BINDING_DISTANCE) {
+    if (nonRotatedPoint[0] - bindTarget.x > -bindingGap) {
       return pointRotateRads(
-        pointFrom(
-          element.x,
-          element.y + element.height + FIXED_BINDING_DISTANCE,
-        ),
+        pointFrom(bindTarget.x, bindTarget.y + bindTarget.height + bindingGap),
         center,
-        element.angle,
+        bindTarget.angle,
       );
     }
     return pointRotateRads(
-      pointFrom(element.x - FIXED_BINDING_DISTANCE, element.y + element.height),
+      pointFrom(bindTarget.x - bindingGap, bindTarget.y + bindTarget.height),
       center,
-      element.angle,
+      bindTarget.angle,
     );
   } else if (
-    nonRotatedPoint[0] > element.x + element.width &&
-    nonRotatedPoint[1] > element.y + element.height
+    nonRotatedPoint[0] > bindTarget.x + bindTarget.width &&
+    nonRotatedPoint[1] > bindTarget.y + bindTarget.height
   ) {
     // Bottom right
-    if (
-      nonRotatedPoint[0] - element.x <
-      element.width + FIXED_BINDING_DISTANCE
-    ) {
+    if (nonRotatedPoint[0] - bindTarget.x < bindTarget.width + bindingGap) {
       return pointRotateRads(
         pointFrom(
-          element.x + element.width,
-          element.y + element.height + FIXED_BINDING_DISTANCE,
+          bindTarget.x + bindTarget.width,
+          bindTarget.y + bindTarget.height + bindingGap,
         ),
         center,
-        element.angle,
+        bindTarget.angle,
       );
     }
     return pointRotateRads(
       pointFrom(
-        element.x + element.width + FIXED_BINDING_DISTANCE,
-        element.y + element.height,
+        bindTarget.x + bindTarget.width + bindingGap,
+        bindTarget.y + bindTarget.height,
       ),
       center,
-      element.angle,
+      bindTarget.angle,
     );
   } else if (
-    nonRotatedPoint[0] > element.x + element.width &&
-    nonRotatedPoint[1] < element.y
+    nonRotatedPoint[0] > bindTarget.x + bindTarget.width &&
+    nonRotatedPoint[1] < bindTarget.y
   ) {
     // Top right
-    if (
-      nonRotatedPoint[0] - element.x <
-      element.width + FIXED_BINDING_DISTANCE
-    ) {
+    if (nonRotatedPoint[0] - bindTarget.x < bindTarget.width + bindingGap) {
       return pointRotateRads(
-        pointFrom(
-          element.x + element.width,
-          element.y - FIXED_BINDING_DISTANCE,
-        ),
+        pointFrom(bindTarget.x + bindTarget.width, bindTarget.y - bindingGap),
         center,
-        element.angle,
+        bindTarget.angle,
       );
     }
     return pointRotateRads(
-      pointFrom(element.x + element.width + FIXED_BINDING_DISTANCE, element.y),
+      pointFrom(bindTarget.x + bindTarget.width + bindingGap, bindTarget.y),
       center,
-      element.angle,
+      bindTarget.angle,
     );
   }
 
   return p;
 };
 
-export const snapToMid = (
-  element: ExcalidrawBindableElement,
+const snapToMid = (
+  arrowElement: ExcalidrawArrowElement,
+  bindTarget: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
   p: GlobalPoint,
   tolerance: number = 0.05,
 ): GlobalPoint => {
-  const { x, y, width, height, angle } = element;
-  const center = elementCenterPoint(element, elementsMap, -0.1, -0.1);
+  const { x, y, width, height, angle } = bindTarget;
+  const center = elementCenterPoint(bindTarget, elementsMap, -0.1, -0.1);
   const nonRotated = pointRotateRads(p, center, -angle as Radians);
 
+  const bindingGap = getBindingGap(bindTarget, arrowElement);
+
   // snap-to-center point is adaptive to element size, but we don't want to go
   // above and below certain px distance
   const verticalThreshold = clamp(tolerance * height, 5, 80);
   const horizontalThreshold = clamp(tolerance * width, 5, 80);
 
+  // Too close to the center makes it hard to resolve direction precisely
+  if (pointDistance(center, nonRotated) < bindingGap) {
+    return p;
+  }
+
   if (
     nonRotated[0] <= x + width / 2 &&
     nonRotated[1] > center[1] - verticalThreshold &&
@@ -1173,7 +1454,7 @@ export const snapToMid = (
   ) {
     // LEFT
     return pointRotateRads<GlobalPoint>(
-      pointFrom(x - FIXED_BINDING_DISTANCE, center[1]),
+      pointFrom(x - bindingGap, center[1]),
       center,
       angle,
     );
@@ -1183,11 +1464,7 @@ export const snapToMid = (
     nonRotated[0] < center[0] + horizontalThreshold
   ) {
     // TOP
-    return pointRotateRads(
-      pointFrom(center[0], y - FIXED_BINDING_DISTANCE),
-      center,
-      angle,
-    );
+    return pointRotateRads(pointFrom(center[0], y - bindingGap), center, angle);
   } else if (
     nonRotated[0] >= x + width / 2 &&
     nonRotated[1] > center[1] - verticalThreshold &&
@@ -1195,7 +1472,7 @@ export const snapToMid = (
   ) {
     // RIGHT
     return pointRotateRads(
-      pointFrom(x + width + FIXED_BINDING_DISTANCE, center[1]),
+      pointFrom(x + width + bindingGap, center[1]),
       center,
       angle,
     );
@@ -1206,12 +1483,12 @@ export const snapToMid = (
   ) {
     // DOWN
     return pointRotateRads(
-      pointFrom(center[0], y + height + FIXED_BINDING_DISTANCE),
+      pointFrom(center[0], y + height + bindingGap),
       center,
       angle,
     );
-  } else if (element.type === "diamond") {
-    const distance = FIXED_BINDING_DISTANCE;
+  } else if (bindTarget.type === "diamond") {
+    const distance = bindingGap;
     const topLeft = pointFrom<GlobalPoint>(
       x + width / 4 - distance,
       y + height / 4 - distance,
@@ -1258,131 +1535,174 @@ export const snapToMid = (
   return p;
 };
 
-const updateBoundPoint = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
+const compareElementArea = (
+  a: ExcalidrawBindableElement,
+  b: ExcalidrawBindableElement,
+) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2);
+
+export const updateBoundPoint = (
+  arrow: NonDeleted<ExcalidrawArrowElement>,
   startOrEnd: "startBinding" | "endBinding",
-  binding: PointBinding | null | undefined,
+  binding: FixedPointBinding | null | undefined,
   bindableElement: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
+  customIntersector?: LineSegment<GlobalPoint>,
 ): LocalPoint | null => {
   if (
     binding == null ||
     // We only need to update the other end if this is a 2 point line element
-    (binding.elementId !== bindableElement.id &&
-      linearElement.points.length > 2)
+    (binding.elementId !== bindableElement.id && arrow.points.length > 2)
   ) {
     return null;
   }
 
-  const direction = startOrEnd === "startBinding" ? -1 : 1;
-  const edgePointIndex = direction === -1 ? 0 : linearElement.points.length - 1;
-
-  if (isElbowArrow(linearElement) && isFixedPointBinding(binding)) {
-    const fixedPoint =
-      normalizeFixedPoint(binding.fixedPoint) ??
-      calculateFixedPointForElbowArrowBinding(
-        linearElement,
-        bindableElement,
-        startOrEnd === "startBinding" ? "start" : "end",
-        elementsMap,
-      ).fixedPoint;
-    const globalMidPoint = elementCenterPoint(bindableElement, elementsMap);
-    const global = pointFrom<GlobalPoint>(
-      bindableElement.x + fixedPoint[0] * bindableElement.width,
-      bindableElement.y + fixedPoint[1] * bindableElement.height,
-    );
-    const rotatedGlobal = pointRotateRads(
-      global,
-      globalMidPoint,
-      bindableElement.angle,
-    );
-
-    return LinearElementEditor.pointFromAbsoluteCoords(
-      linearElement,
-      rotatedGlobal,
-      elementsMap,
-    );
-  }
-
-  const adjacentPointIndex = edgePointIndex - direction;
-  const adjacentPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-    linearElement,
-    adjacentPointIndex,
-    elementsMap,
-  );
-  const focusPointAbsolute = determineFocusPoint(
+  const global = getGlobalFixedPointForBindableElement(
+    normalizeFixedPoint(binding.fixedPoint),
     bindableElement,
     elementsMap,
-    binding.focus,
-    adjacentPoint,
   );
+  const pointIndex =
+    startOrEnd === "startBinding" ? 0 : arrow.points.length - 1;
+  const elbowed = isElbowArrow(arrow);
+  const otherBinding =
+    startOrEnd === "startBinding" ? arrow.endBinding : arrow.startBinding;
+  const otherBindableElement =
+    otherBinding &&
+    (elementsMap.get(otherBinding.elementId)! as ExcalidrawBindableElement);
+  const bounds = getElementBounds(bindableElement, elementsMap);
+  const otherBounds =
+    otherBindableElement && getElementBounds(otherBindableElement, elementsMap);
+  const isLargerThanOther =
+    otherBindableElement &&
+    compareElementArea(bindableElement, otherBindableElement) <
+      // if both shapes the same size, pretend the other is larger
+      (startOrEnd === "endBinding" ? 1 : 0);
+  const isOverlapping = otherBounds && doBoundsIntersect(bounds, otherBounds);
 
-  let newEdgePoint: GlobalPoint;
-
-  // The linear element was not originally pointing inside the bound shape,
-  // we can point directly at the focus point
-  if (binding.gap === 0) {
-    newEdgePoint = focusPointAbsolute;
-  } else {
-    const edgePointAbsolute =
-      LinearElementEditor.getPointAtIndexGlobalCoordinates(
-        linearElement,
-        edgePointIndex,
-        elementsMap,
-      );
-
-    const center = elementCenterPoint(bindableElement, elementsMap);
-    const interceptorLength =
-      pointDistance(adjacentPoint, edgePointAbsolute) +
-      pointDistance(adjacentPoint, center) +
-      Math.max(bindableElement.width, bindableElement.height) * 2;
-    const intersections = [
-      ...intersectElementWithLineSegment(
-        bindableElement,
-        elementsMap,
-        lineSegment<GlobalPoint>(
-          adjacentPoint,
-          pointFromVector(
-            vectorScale(
-              vectorNormalize(
-                vectorFromPoint(focusPointAbsolute, adjacentPoint),
-              ),
-              interceptorLength,
-            ),
-            adjacentPoint,
-          ),
-        ),
-        binding.gap,
-      ).sort(
-        (g, h) =>
-          pointDistanceSq(g, adjacentPoint) - pointDistanceSq(h, adjacentPoint),
-      ),
-      // Fallback when arrow doesn't point to the shape
-      pointFromVector(
-        vectorScale(
-          vectorNormalize(vectorFromPoint(focusPointAbsolute, adjacentPoint)),
-          pointDistance(adjacentPoint, edgePointAbsolute),
-        ),
-        adjacentPoint,
-      ),
-    ];
-
-    if (intersections.length > 1) {
-      // The adjacent point is outside the shape (+ gap)
-      newEdgePoint = intersections[0];
-    } else if (intersections.length === 1) {
-      // The adjacent point is inside the shape (+ gap)
-      newEdgePoint = focusPointAbsolute;
-    } else {
-      // Shouldn't happend, but just in case
-      newEdgePoint = edgePointAbsolute;
+  // GOAL: If the arrow becomes too short, we want to jump the arrow endpoints
+  // to the exact focus points on the elements.
+  // INTUITION: We're not interested in the exacts length of the arrow (which
+  // will change if we change where we route it), we want to know the length of
+  // the part which lies outside of both shapes and consider that as a trigger
+  // to change where we point the arrow. Avoids jumping the arrow in and out
+  // at every frame.
+  let arrowTooShort = false;
+  if (
+    !isOverlapping &&
+    !elbowed &&
+    arrow.startBinding &&
+    arrow.endBinding &&
+    otherBindableElement &&
+    arrow.points.length === 2
+  ) {
+    const startFocusPoint = getGlobalFixedPointForBindableElement(
+      arrow.startBinding.fixedPoint,
+      startOrEnd === "startBinding" ? bindableElement : otherBindableElement,
+      elementsMap,
+    );
+    const endFocusPoint = getGlobalFixedPointForBindableElement(
+      arrow.endBinding.fixedPoint,
+      startOrEnd === "endBinding" ? bindableElement : otherBindableElement,
+      elementsMap,
+    );
+    const segment = lineSegment(startFocusPoint, endFocusPoint);
+    const startIntersection = intersectElementWithLineSegment(
+      startOrEnd === "endBinding" ? bindableElement : otherBindableElement,
+      elementsMap,
+      segment,
+      0,
+      true,
+    );
+    const endIntersection = intersectElementWithLineSegment(
+      startOrEnd === "startBinding" ? bindableElement : otherBindableElement,
+      elementsMap,
+      segment,
+      0,
+      true,
+    );
+    if (startIntersection.length > 0 && endIntersection.length > 0) {
+      const len = pointDistance(startIntersection[0], endIntersection[0]);
+      arrowTooShort = len < 40;
     }
   }
 
-  return LinearElementEditor.pointFromAbsoluteCoords(
-    linearElement,
-    newEdgePoint,
+  const isNested = (arrowTooShort || isOverlapping) && isLargerThanOther;
+
+  let _customIntersector = customIntersector;
+  if (!elbowed && !_customIntersector) {
+    const [x1, y1, x2, y2] = LinearElementEditor.getElementAbsoluteCoords(
+      arrow,
+      elementsMap,
+    );
+    const center = pointFrom<GlobalPoint>((x1 + x2) / 2, (y1 + y2) / 2);
+    const edgePoint = isRectanguloidElement(bindableElement)
+      ? avoidRectangularCorner(arrow, bindableElement, elementsMap, global)
+      : global;
+    const adjacentPoint = pointRotateRads(
+      pointFrom<GlobalPoint>(
+        arrow.x +
+          arrow.points[pointIndex === 0 ? 1 : arrow.points.length - 2][0],
+        arrow.y +
+          arrow.points[pointIndex === 0 ? 1 : arrow.points.length - 2][1],
+      ),
+      center,
+      arrow.angle as Radians,
+    );
+    const bindingGap = getBindingGap(bindableElement, arrow);
+    const halfVector = vectorScale(
+      vectorNormalize(vectorFromPoint(edgePoint, adjacentPoint)),
+      pointDistance(edgePoint, adjacentPoint) +
+        Math.max(bindableElement.width, bindableElement.height) +
+        bindingGap * 2,
+    );
+    _customIntersector = lineSegment(
+      pointFromVector(halfVector, adjacentPoint),
+      pointFromVector(vectorScale(halfVector, -1), adjacentPoint),
+    );
+  }
+
+  const maybeOutlineGlobal =
+    binding.mode === "orbit" && bindableElement
+      ? isNested
+        ? global
+        : bindPointToSnapToElementOutline(
+            {
+              ...arrow,
+              points: [
+                pointIndex === 0
+                  ? LinearElementEditor.createPointAt(
+                      arrow,
+                      elementsMap,
+                      global[0],
+                      global[1],
+                      null,
+                    )
+                  : arrow.points[0],
+                ...arrow.points.slice(1, -1),
+                pointIndex === arrow.points.length - 1
+                  ? LinearElementEditor.createPointAt(
+                      arrow,
+                      elementsMap,
+                      global[0],
+                      global[1],
+                      null,
+                    )
+                  : arrow.points[arrow.points.length - 1],
+              ],
+            },
+            bindableElement,
+            pointIndex === 0 ? "start" : "end",
+            elementsMap,
+            _customIntersector,
+          )
+      : global;
+
+  return LinearElementEditor.createPointAt(
+    arrow,
     elementsMap,
+    maybeOutlineGlobal[0],
+    maybeOutlineGlobal[1],
+    null,
   );
 };
 
@@ -1424,58 +1744,43 @@ export const calculateFixedPointForElbowArrowBinding = (
   };
 };
 
-const maybeCalculateNewGapWhenScaling = (
-  changedElement: ExcalidrawBindableElement,
-  currentBinding: PointBinding | null | undefined,
-  newSize: { width: number; height: number } | undefined,
-): PointBinding | null | undefined => {
-  if (currentBinding == null || newSize == null) {
-    return currentBinding;
-  }
-  const { width: newWidth, height: newHeight } = newSize;
-  const { width, height } = changedElement;
-  const newGap = Math.max(
-    1,
-    Math.min(
-      maxBindingGap(changedElement, newWidth, newHeight),
-      currentBinding.gap *
-        (newWidth < newHeight ? newWidth / width : newHeight / height),
-    ),
-  );
-
-  return { ...currentBinding, gap: newGap };
-};
-
-const getEligibleElementForBindingElement = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
+export const calculateFixedPointForNonElbowArrowBinding = (
+  linearElement: NonDeleted<ExcalidrawArrowElement>,
+  hoveredElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
-  elementsMap: NonDeletedSceneElementsMap,
-  elements: readonly NonDeletedExcalidrawElement[],
-  zoom?: AppState["zoom"],
-): NonDeleted<ExcalidrawBindableElement> | null => {
-  return getHoveredElementForBinding(
-    getLinearElementEdgeCoors(linearElement, startOrEnd, elementsMap),
-    elements,
-    elementsMap,
-    zoom,
-    isElbowArrow(linearElement),
-    isElbowArrow(linearElement),
-  );
-};
+  elementsMap: ElementsMap,
+  focusPoint?: GlobalPoint,
+): { fixedPoint: FixedPoint } => {
+  const edgePoint = focusPoint
+    ? focusPoint
+    : LinearElementEditor.getPointAtIndexGlobalCoordinates(
+        linearElement,
+        startOrEnd === "start" ? 0 : -1,
+        elementsMap,
+      );
 
-const getLinearElementEdgeCoors = (
-  linearElement: NonDeleted<ExcalidrawLinearElement>,
-  startOrEnd: "start" | "end",
-  elementsMap: NonDeletedSceneElementsMap,
-): { x: number; y: number } => {
-  const index = startOrEnd === "start" ? 0 : -1;
-  return tupleToCoors(
-    LinearElementEditor.getPointAtIndexGlobalCoordinates(
-      linearElement,
-      index,
-      elementsMap,
-    ),
+  // Convert the global point to element-local coordinates
+  const elementCenter = pointFrom(
+    hoveredElement.x + hoveredElement.width / 2,
+    hoveredElement.y + hoveredElement.height / 2,
   );
+
+  // Rotate the point to account for element rotation
+  const nonRotatedPoint = pointRotateRads(
+    edgePoint,
+    elementCenter,
+    -hoveredElement.angle as Radians,
+  );
+
+  // Calculate the ratio relative to the element's bounds
+  const fixedPointX =
+    (nonRotatedPoint[0] - hoveredElement.x) / hoveredElement.width;
+  const fixedPointY =
+    (nonRotatedPoint[1] - hoveredElement.y) / hoveredElement.height;
+
+  return {
+    fixedPoint: normalizeFixedPoint([fixedPointX, fixedPointY]),
+  };
 };
 
 export const fixDuplicatedBindingsAfterDuplication = (
@@ -1591,324 +1896,6 @@ const newBoundElements = (
   return nextBoundElements;
 };
 
-export const bindingBorderTest = (
-  element: NonDeleted<ExcalidrawBindableElement>,
-  { x, y }: { x: number; y: number },
-  elementsMap: NonDeletedSceneElementsMap,
-  zoom?: AppState["zoom"],
-  fullShape?: boolean,
-): boolean => {
-  const p = pointFrom<GlobalPoint>(x, y);
-  const threshold = maxBindingGap(element, element.width, element.height, zoom);
-  const shouldTestInside =
-    // disable fullshape snapping for frame elements so we
-    // can bind to frame children
-    (fullShape || !isBindingFallthroughEnabled(element)) &&
-    !isFrameLikeElement(element);
-
-  // PERF: Run a cheap test to see if the binding element
-  // is even close to the element
-  const bounds = [
-    x - threshold,
-    y - threshold,
-    x + threshold,
-    y + threshold,
-  ] as Bounds;
-  const elementBounds = getElementBounds(element, elementsMap);
-  if (!doBoundsIntersect(bounds, elementBounds)) {
-    return false;
-  }
-
-  // Do the intersection test against the element since it's close enough
-  const intersections = intersectElementWithLineSegment(
-    element,
-    elementsMap,
-    lineSegment(elementCenterPoint(element, elementsMap), p),
-  );
-  const distance = distanceToElement(element, elementsMap, p);
-
-  return shouldTestInside
-    ? intersections.length === 0 || distance <= threshold
-    : intersections.length > 0 && distance <= threshold;
-};
-
-export const maxBindingGap = (
-  element: ExcalidrawElement,
-  elementWidth: number,
-  elementHeight: number,
-  zoom?: AppState["zoom"],
-): number => {
-  const zoomValue = zoom?.value && zoom.value < 1 ? zoom.value : 1;
-
-  // Aligns diamonds with rectangles
-  const shapeRatio = element.type === "diamond" ? 1 / Math.sqrt(2) : 1;
-  const smallerDimension = shapeRatio * Math.min(elementWidth, elementHeight);
-
-  return Math.max(
-    16,
-    // bigger bindable boundary for bigger elements
-    Math.min(0.25 * smallerDimension, 32),
-    // keep in sync with the zoomed highlight
-    BINDING_HIGHLIGHT_THICKNESS / zoomValue + FIXED_BINDING_DISTANCE,
-  );
-};
-
-// The focus distance is the oriented ratio between the size of
-// the `element` and the "focus image" of the element on which
-// all focus points lie, so it's a number between -1 and 1.
-// The line going through `a` and `b` is a tangent to the "focus image"
-// of the element.
-const determineFocusDistance = (
-  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-  // Point on the line, in absolute coordinates
-  a: GlobalPoint,
-  // Another point on the line, in absolute coordinates (closer to element)
-  b: GlobalPoint,
-): number => {
-  const center = elementCenterPoint(element, elementsMap);
-
-  if (pointsEqual(a, b)) {
-    return 0;
-  }
-
-  const rotatedA = pointRotateRads(a, center, -element.angle as Radians);
-  const rotatedB = pointRotateRads(b, center, -element.angle as Radians);
-  const sign =
-    Math.sign(
-      vectorCross(
-        vectorFromPoint(rotatedB, a),
-        vectorFromPoint(rotatedB, center),
-      ),
-    ) * -1;
-  const rotatedInterceptor = lineSegment(
-    rotatedB,
-    pointFromVector(
-      vectorScale(
-        vectorNormalize(vectorFromPoint(rotatedB, rotatedA)),
-        Math.max(element.width * 2, element.height * 2),
-      ),
-      rotatedB,
-    ),
-  );
-  const axes =
-    element.type === "diamond"
-      ? [
-          lineSegment(
-            pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
-            pointFrom<GlobalPoint>(
-              element.x + element.width / 2,
-              element.y + element.height,
-            ),
-          ),
-          lineSegment(
-            pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
-            pointFrom<GlobalPoint>(
-              element.x + element.width,
-              element.y + element.height / 2,
-            ),
-          ),
-        ]
-      : [
-          lineSegment(
-            pointFrom<GlobalPoint>(element.x, element.y),
-            pointFrom<GlobalPoint>(
-              element.x + element.width,
-              element.y + element.height,
-            ),
-          ),
-          lineSegment(
-            pointFrom<GlobalPoint>(element.x + element.width, element.y),
-            pointFrom<GlobalPoint>(element.x, element.y + element.height),
-          ),
-        ];
-  const interceptees =
-    element.type === "diamond"
-      ? [
-          lineSegment(
-            pointFrom<GlobalPoint>(
-              element.x + element.width / 2,
-              element.y - element.height,
-            ),
-            pointFrom<GlobalPoint>(
-              element.x + element.width / 2,
-              element.y + element.height * 2,
-            ),
-          ),
-          lineSegment(
-            pointFrom<GlobalPoint>(
-              element.x - element.width,
-              element.y + element.height / 2,
-            ),
-            pointFrom<GlobalPoint>(
-              element.x + element.width * 2,
-              element.y + element.height / 2,
-            ),
-          ),
-        ]
-      : [
-          lineSegment(
-            pointFrom<GlobalPoint>(
-              element.x - element.width,
-              element.y - element.height,
-            ),
-            pointFrom<GlobalPoint>(
-              element.x + element.width * 2,
-              element.y + element.height * 2,
-            ),
-          ),
-          lineSegment(
-            pointFrom<GlobalPoint>(
-              element.x + element.width * 2,
-              element.y - element.height,
-            ),
-            pointFrom<GlobalPoint>(
-              element.x - element.width,
-              element.y + element.height * 2,
-            ),
-          ),
-        ];
-
-  const ordered = [
-    lineSegmentIntersectionPoints(rotatedInterceptor, interceptees[0]),
-    lineSegmentIntersectionPoints(rotatedInterceptor, interceptees[1]),
-  ]
-    .filter((p): p is GlobalPoint => p !== null)
-    .sort((g, h) => pointDistanceSq(g, b) - pointDistanceSq(h, b))
-    .map(
-      (p, idx): number =>
-        (sign * pointDistance(center, p)) /
-        (element.type === "diamond"
-          ? pointDistance(axes[idx][0], axes[idx][1]) / 2
-          : Math.sqrt(element.width ** 2 + element.height ** 2) / 2),
-    )
-    .sort((g, h) => Math.abs(g) - Math.abs(h));
-
-  const signedDistanceRatio = ordered[0] ?? 0;
-
-  return signedDistanceRatio;
-};
-
-const determineFocusPoint = (
-  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-  // The oriented, relative distance from the center of `element` of the
-  // returned focusPoint
-  focus: number,
-  adjacentPoint: GlobalPoint,
-): GlobalPoint => {
-  const center = elementCenterPoint(element, elementsMap);
-
-  if (focus === 0) {
-    return center;
-  }
-
-  const candidates = (
-    element.type === "diamond"
-      ? [
-          pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
-          pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
-          pointFrom<GlobalPoint>(
-            element.x + element.width,
-            element.y + element.height / 2,
-          ),
-          pointFrom<GlobalPoint>(
-            element.x + element.width / 2,
-            element.y + element.height,
-          ),
-        ]
-      : [
-          pointFrom<GlobalPoint>(element.x, element.y),
-          pointFrom<GlobalPoint>(element.x + element.width, element.y),
-          pointFrom<GlobalPoint>(
-            element.x + element.width,
-            element.y + element.height,
-          ),
-          pointFrom<GlobalPoint>(element.x, element.y + element.height),
-        ]
-  )
-    .map((p) =>
-      pointFromVector(
-        vectorScale(vectorFromPoint(p, center), Math.abs(focus)),
-        center,
-      ),
-    )
-    .map((p) => pointRotateRads(p, center, element.angle as Radians));
-
-  const selected = [
-    vectorCross(
-      vectorFromPoint(adjacentPoint, candidates[0]),
-      vectorFromPoint(candidates[1], candidates[0]),
-    ) > 0 && // TOP
-      (focus > 0
-        ? vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[1]),
-            vectorFromPoint(candidates[2], candidates[1]),
-          ) < 0
-        : vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[3]),
-            vectorFromPoint(candidates[0], candidates[3]),
-          ) < 0),
-    vectorCross(
-      vectorFromPoint(adjacentPoint, candidates[1]),
-      vectorFromPoint(candidates[2], candidates[1]),
-    ) > 0 && // RIGHT
-      (focus > 0
-        ? vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[2]),
-            vectorFromPoint(candidates[3], candidates[2]),
-          ) < 0
-        : vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[0]),
-            vectorFromPoint(candidates[1], candidates[0]),
-          ) < 0),
-    vectorCross(
-      vectorFromPoint(adjacentPoint, candidates[2]),
-      vectorFromPoint(candidates[3], candidates[2]),
-    ) > 0 && // BOTTOM
-      (focus > 0
-        ? vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[3]),
-            vectorFromPoint(candidates[0], candidates[3]),
-          ) < 0
-        : vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[1]),
-            vectorFromPoint(candidates[2], candidates[1]),
-          ) < 0),
-    vectorCross(
-      vectorFromPoint(adjacentPoint, candidates[3]),
-      vectorFromPoint(candidates[0], candidates[3]),
-    ) > 0 && // LEFT
-      (focus > 0
-        ? vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[0]),
-            vectorFromPoint(candidates[1], candidates[0]),
-          ) < 0
-        : vectorCross(
-            vectorFromPoint(adjacentPoint, candidates[2]),
-            vectorFromPoint(candidates[3], candidates[2]),
-          ) < 0),
-  ];
-
-  const focusPoint = selected[0]
-    ? focus > 0
-      ? candidates[1]
-      : candidates[0]
-    : selected[1]
-    ? focus > 0
-      ? candidates[2]
-      : candidates[1]
-    : selected[2]
-    ? focus > 0
-      ? candidates[3]
-      : candidates[2]
-    : focus > 0
-    ? candidates[0]
-    : candidates[3];
-
-  return focusPoint;
-};
-
 export const bindingProperties: Set<BindableProp | BindingProp> = new Set([
   "boundElements",
   "frameId",
@@ -2218,7 +2205,7 @@ export class BindableElement {
 }
 
 export const getGlobalFixedPointForBindableElement = (
-  fixedPointRatio: [number, number],
+  fixedPointRatio: FixedPoint,
   element: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
 ): GlobalPoint => {
@@ -2235,7 +2222,7 @@ export const getGlobalFixedPointForBindableElement = (
 };
 
 export const getGlobalFixedPoints = (
-  arrow: ExcalidrawElbowArrowElement,
+  arrow: ExcalidrawArrowElement,
   elementsMap: ElementsMap,
 ): [GlobalPoint, GlobalPoint] => {
   const startElement =
diff --git a/packages/element/src/bounds.ts b/packages/element/src/bounds.ts
index 0f3970db80..fdc851062c 100644
--- a/packages/element/src/bounds.ts
+++ b/packages/element/src/bounds.ts
@@ -1276,6 +1276,13 @@ export const elementCenterPoint = (
   xOffset: number = 0,
   yOffset: number = 0,
 ) => {
+  if (isLinearElement(element)) {
+    const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
+    const [x, y] = pointFrom<GlobalPoint>((x1 + x2) / 2, (y1 + y2) / 2);
+
+    return pointFrom<GlobalPoint>(x + xOffset, y + yOffset);
+  }
+
   const [x, y] = getCenterForBounds(getElementBounds(element, elementsMap));
 
   return pointFrom<GlobalPoint>(x + xOffset, y + yOffset);
diff --git a/packages/element/src/collision.ts b/packages/element/src/collision.ts
index cc15947edb..17dc9b1987 100644
--- a/packages/element/src/collision.ts
+++ b/packages/element/src/collision.ts
@@ -1,4 +1,4 @@
-import { isTransparent } from "@excalidraw/common";
+import { invariant, isTransparent } from "@excalidraw/common";
 import {
   curveIntersectLineSegment,
   isPointWithinBounds,
@@ -34,10 +34,14 @@ import {
   elementCenterPoint,
   getCenterForBounds,
   getCubicBezierCurveBound,
+  getDiamondPoints,
   getElementBounds,
+  pointInsideBounds,
 } from "./bounds";
 import {
   hasBoundTextElement,
+  isBindableElement,
+  isFrameLikeElement,
   isFreeDrawElement,
   isIframeLikeElement,
   isImageElement,
@@ -58,12 +62,17 @@ import { distanceToElement } from "./distance";
 
 import type {
   ElementsMap,
+  ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
   ExcalidrawEllipseElement,
   ExcalidrawFreeDrawElement,
   ExcalidrawLinearElement,
   ExcalidrawRectanguloidElement,
+  NonDeleted,
+  NonDeletedExcalidrawElement,
+  NonDeletedSceneElementsMap,
+  Ordered,
 } from "./types";
 
 export const shouldTestInside = (element: ExcalidrawElement) => {
@@ -94,6 +103,7 @@ export type HitTestArgs = {
   threshold: number;
   elementsMap: ElementsMap;
   frameNameBound?: FrameNameBounds | null;
+  overrideShouldTestInside?: boolean;
 };
 
 export const hitElementItself = ({
@@ -102,6 +112,7 @@ export const hitElementItself = ({
   threshold,
   elementsMap,
   frameNameBound = null,
+  overrideShouldTestInside = false,
 }: HitTestArgs) => {
   // Hit test against a frame's name
   const hitFrameName = frameNameBound
@@ -134,7 +145,9 @@ export const hitElementItself = ({
   }
 
   // Do the precise (and relatively costly) hit test
-  const hitElement = shouldTestInside(element)
+  const hitElement = (
+    overrideShouldTestInside ? true : shouldTestInside(element)
+  )
     ? // Since `inShape` tests STRICTLY againt the insides of a shape
       // we would need `onShape` as well to include the "borders"
       isPointInElement(point, element, elementsMap) ||
@@ -193,6 +206,116 @@ export const hitElementBoundText = (
   return isPointInElement(point, boundTextElement, elementsMap);
 };
 
+const bindingBorderTest = (
+  element: NonDeleted<ExcalidrawBindableElement>,
+  [x, y]: Readonly<GlobalPoint>,
+  elementsMap: NonDeletedSceneElementsMap,
+  tolerance: number = 0,
+): boolean => {
+  const p = pointFrom<GlobalPoint>(x, y);
+  const shouldTestInside =
+    // disable fullshape snapping for frame elements so we
+    // can bind to frame children
+    !isFrameLikeElement(element);
+
+  // PERF: Run a cheap test to see if the binding element
+  // is even close to the element
+  const t = Math.max(1, tolerance);
+  const bounds = [x - t, y - t, x + t, y + t] as Bounds;
+  const elementBounds = getElementBounds(element, elementsMap);
+  if (!doBoundsIntersect(bounds, elementBounds)) {
+    return false;
+  }
+
+  // If the element is inside a frame, we should clip the element
+  if (element.frameId) {
+    const enclosingFrame = elementsMap.get(element.frameId);
+    if (enclosingFrame && isFrameLikeElement(enclosingFrame)) {
+      const enclosingFrameBounds = getElementBounds(
+        enclosingFrame,
+        elementsMap,
+      );
+      if (!pointInsideBounds(p, enclosingFrameBounds)) {
+        return false;
+      }
+    }
+  }
+
+  // Do the intersection test against the element since it's close enough
+  const intersections = intersectElementWithLineSegment(
+    element,
+    elementsMap,
+    lineSegment(elementCenterPoint(element, elementsMap), p),
+  );
+  const distance = distanceToElement(element, elementsMap, p);
+
+  return shouldTestInside
+    ? intersections.length === 0 || distance <= tolerance
+    : intersections.length > 0 && distance <= t;
+};
+
+export const getAllHoveredElementAtPoint = (
+  point: Readonly<GlobalPoint>,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  elementsMap: NonDeletedSceneElementsMap,
+  toleranceFn?: (element: ExcalidrawBindableElement) => number,
+): NonDeleted<ExcalidrawBindableElement>[] => {
+  const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
+  // We need to to hit testing from front (end of the array) to back (beginning of the array)
+  // because array is ordered from lower z-index to highest and we want element z-index
+  // with higher z-index
+  for (let index = elements.length - 1; index >= 0; --index) {
+    const element = elements[index];
+
+    invariant(
+      !element.isDeleted,
+      "Elements in the function parameter for getAllElementsAtPositionForBinding() should not contain deleted elements",
+    );
+
+    if (
+      isBindableElement(element, false) &&
+      bindingBorderTest(element, point, elementsMap, toleranceFn?.(element))
+    ) {
+      candidateElements.push(element);
+
+      if (!isTransparent(element.backgroundColor)) {
+        break;
+      }
+    }
+  }
+
+  return candidateElements;
+};
+
+export const getHoveredElementForBinding = (
+  point: Readonly<GlobalPoint>,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  elementsMap: NonDeletedSceneElementsMap,
+  toleranceFn?: (element: ExcalidrawBindableElement) => number,
+): NonDeleted<ExcalidrawBindableElement> | null => {
+  const candidateElements = getAllHoveredElementAtPoint(
+    point,
+    elements,
+    elementsMap,
+    toleranceFn,
+  );
+
+  if (!candidateElements || candidateElements.length === 0) {
+    return null;
+  }
+
+  if (candidateElements.length === 1) {
+    return candidateElements[0];
+  }
+
+  // Prefer smaller shapes
+  return candidateElements
+    .sort(
+      (a, b) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2),
+    )
+    .pop() as NonDeleted<ExcalidrawBindableElement>;
+};
+
 /**
  * Intersect a line with an element for binding test
  *
@@ -554,3 +677,61 @@ export const isPointInElement = (
 
   return intersections.length % 2 === 1;
 };
+
+export const isBindableElementInsideOtherBindable = (
+  innerElement: ExcalidrawBindableElement,
+  outerElement: ExcalidrawBindableElement,
+  elementsMap: ElementsMap,
+): boolean => {
+  // Get corner points of the inner element based on its type
+  const getCornerPoints = (
+    element: ExcalidrawElement,
+    offset: number,
+  ): GlobalPoint[] => {
+    const { x, y, width, height, angle } = element;
+    const center = elementCenterPoint(element, elementsMap);
+
+    if (element.type === "diamond") {
+      // Diamond has 4 corner points at the middle of each side
+      const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] =
+        getDiamondPoints(element);
+      const corners: GlobalPoint[] = [
+        pointFrom(x + topX, y + topY - offset), // top
+        pointFrom(x + rightX + offset, y + rightY), // right
+        pointFrom(x + bottomX, y + bottomY + offset), // bottom
+        pointFrom(x + leftX - offset, y + leftY), // left
+      ];
+      return corners.map((corner) => pointRotateRads(corner, center, angle));
+    }
+    if (element.type === "ellipse") {
+      // For ellipse, test points at the extremes (top, right, bottom, left)
+      const cx = x + width / 2;
+      const cy = y + height / 2;
+      const rx = width / 2;
+      const ry = height / 2;
+      const corners: GlobalPoint[] = [
+        pointFrom(cx, cy - ry - offset), // top
+        pointFrom(cx + rx + offset, cy), // right
+        pointFrom(cx, cy + ry + offset), // bottom
+        pointFrom(cx - rx - offset, cy), // left
+      ];
+      return corners.map((corner) => pointRotateRads(corner, center, angle));
+    }
+    // Rectangle and other rectangular shapes (image, text, etc.)
+    const corners: GlobalPoint[] = [
+      pointFrom(x - offset, y - offset), // top-left
+      pointFrom(x + width + offset, y - offset), // top-right
+      pointFrom(x + width + offset, y + height + offset), // bottom-right
+      pointFrom(x - offset, y + height + offset), // bottom-left
+    ];
+    return corners.map((corner) => pointRotateRads(corner, center, angle));
+  };
+
+  const offset = (-1 * Math.max(innerElement.width, innerElement.height)) / 20; // 5% offset
+  const innerCorners = getCornerPoints(innerElement, offset);
+
+  // Check if all corner points of the inner element are inside the outer element
+  return innerCorners.every((corner) =>
+    isPointInElement(corner, outerElement, elementsMap),
+  );
+};
diff --git a/packages/element/src/dragElements.ts b/packages/element/src/dragElements.ts
index 4b17ba20c3..9e82953cc9 100644
--- a/packages/element/src/dragElements.ts
+++ b/packages/element/src/dragElements.ts
@@ -2,6 +2,7 @@ import {
   TEXT_AUTOWRAP_THRESHOLD,
   getGridPoint,
   getFontString,
+  DRAGGING_THRESHOLD,
 } from "@excalidraw/common";
 
 import type {
@@ -13,7 +14,7 @@ import type {
 
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 
-import { updateBoundElements } from "./binding";
+import { unbindBindingElement, updateBoundElements } from "./binding";
 import { getCommonBounds } from "./bounds";
 import { getPerfectElementSize } from "./sizeHelpers";
 import { getBoundTextElement } from "./textElement";
@@ -102,9 +103,26 @@ export const dragSelectedElements = (
     gridSize,
   );
 
+  const elementsToUpdateIds = new Set(
+    Array.from(elementsToUpdate, (el) => el.id),
+  );
+
   elementsToUpdate.forEach((element) => {
-    updateElementCoords(pointerDownState, element, scene, adjustedOffset);
+    const isArrow = !isArrowElement(element);
+    const isStartBoundElementSelected =
+      isArrow ||
+      (element.startBinding
+        ? elementsToUpdateIds.has(element.startBinding.elementId)
+        : false);
+    const isEndBoundElementSelected =
+      isArrow ||
+      (element.endBinding
+        ? elementsToUpdateIds.has(element.endBinding.elementId)
+        : false);
+
     if (!isArrowElement(element)) {
+      updateElementCoords(pointerDownState, element, scene, adjustedOffset);
+
       // skip arrow labels since we calculate its position during render
       const textElement = getBoundTextElement(
         element,
@@ -121,6 +139,33 @@ export const dragSelectedElements = (
       updateBoundElements(element, scene, {
         simultaneouslyUpdated: Array.from(elementsToUpdate),
       });
+    } else if (
+      // NOTE: Add a little initial drag to the arrow dragging when the arrow
+      // is the single element being dragged to avoid accidentally unbinding
+      // the arrow when the user just wants to select it.
+
+      elementsToUpdate.size > 1 ||
+      Math.max(Math.abs(adjustedOffset.x), Math.abs(adjustedOffset.y)) >
+        DRAGGING_THRESHOLD ||
+      (!element.startBinding && !element.endBinding)
+    ) {
+      updateElementCoords(pointerDownState, element, scene, adjustedOffset);
+
+      const shouldUnbindStart =
+        element.startBinding && !isStartBoundElementSelected;
+      const shouldUnbindEnd = element.endBinding && !isEndBoundElementSelected;
+      if (shouldUnbindStart || shouldUnbindEnd) {
+        // NOTE: Moving the bound arrow should unbind it, otherwise we would
+        // have weird situations, like 0 lenght arrow when the user moves
+        // the arrow outside a filled shape suddenly forcing the arrow start
+        // and end point to jump "outside" the shape.
+        if (shouldUnbindStart) {
+          unbindBindingElement(element, "start", scene);
+        }
+        if (shouldUnbindEnd) {
+          unbindBindingElement(element, "end", scene);
+        }
+      }
     }
   });
 };
diff --git a/packages/element/src/elbowArrow.ts b/packages/element/src/elbowArrow.ts
index b988eb25bb..d01648e490 100644
--- a/packages/element/src/elbowArrow.ts
+++ b/packages/element/src/elbowArrow.ts
@@ -17,7 +17,6 @@ import {
   BinaryHeap,
   invariant,
   isAnyTrue,
-  tupleToCoors,
   getSizeFromPoints,
   isDevEnv,
   arrayToMap,
@@ -27,10 +26,11 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 
 import {
   bindPointToSnapToElementOutline,
-  FIXED_BINDING_DISTANCE,
   getHeadingForElbowArrowSnap,
   getGlobalFixedPointForBindableElement,
-  getHoveredElementForBinding,
+  getBindingGap,
+  maxBindingDistance_simple,
+  BASE_BINDING_GAP_ELBOW,
 } from "./binding";
 import { distanceToElement } from "./distance";
 import {
@@ -51,8 +51,8 @@ import {
   type ExcalidrawElbowArrowElement,
   type NonDeletedSceneElementsMap,
 } from "./types";
-
 import { aabbForElement, pointInsideBounds } from "./bounds";
+import { getHoveredElementForBinding } from "./collision";
 
 import type { Bounds } from "./bounds";
 import type { Heading } from "./heading";
@@ -63,6 +63,7 @@ import type {
   FixedPointBinding,
   FixedSegment,
   NonDeletedExcalidrawElement,
+  Ordered,
 } from "./types";
 
 type GridAddress = [number, number] & { _brand: "gridaddress" };
@@ -1243,6 +1244,7 @@ const getElbowArrowData = (
   const startGlobalPoint = getGlobalPoint(
     {
       ...arrow,
+      angle: 0,
       type: "arrow",
       elbowed: true,
       points: nextPoints,
@@ -1257,6 +1259,7 @@ const getElbowArrowData = (
   const endGlobalPoint = getGlobalPoint(
     {
       ...arrow,
+      angle: 0,
       type: "arrow",
       elbowed: true,
       points: nextPoints,
@@ -1274,6 +1277,7 @@ const getElbowArrowData = (
     hoveredStartElement,
     origStartGlobalPoint,
     elementsMap,
+    options?.zoom,
   );
   const endHeading = getBindPointHeading(
     endGlobalPoint,
@@ -1281,6 +1285,7 @@ const getElbowArrowData = (
     hoveredEndElement,
     origEndGlobalPoint,
     elementsMap,
+    options?.zoom,
   );
   const startPointBounds = [
     startGlobalPoint[0] - 2,
@@ -1301,8 +1306,8 @@ const getElbowArrowData = (
         offsetFromHeading(
           startHeading,
           arrow.startArrowhead
-            ? FIXED_BINDING_DISTANCE * 6
-            : FIXED_BINDING_DISTANCE * 2,
+            ? getBindingGap(hoveredStartElement, { elbowed: true }) * 6
+            : getBindingGap(hoveredStartElement, { elbowed: true }) * 2,
           1,
         ),
       )
@@ -1314,8 +1319,8 @@ const getElbowArrowData = (
         offsetFromHeading(
           endHeading,
           arrow.endArrowhead
-            ? FIXED_BINDING_DISTANCE * 6
-            : FIXED_BINDING_DISTANCE * 2,
+            ? getBindingGap(hoveredEndElement, { elbowed: true }) * 6
+            : getBindingGap(hoveredEndElement, { elbowed: true }) * 2,
           1,
         ),
       )
@@ -1362,8 +1367,8 @@ const getElbowArrowData = (
             ? 0
             : BASE_PADDING -
                 (arrow.startArrowhead
-                  ? FIXED_BINDING_DISTANCE * 6
-                  : FIXED_BINDING_DISTANCE * 2),
+                  ? BASE_BINDING_GAP_ELBOW * 6
+                  : BASE_BINDING_GAP_ELBOW * 2),
           BASE_PADDING,
         ),
     boundsOverlap
@@ -1378,8 +1383,8 @@ const getElbowArrowData = (
             ? 0
             : BASE_PADDING -
                 (arrow.endArrowhead
-                  ? FIXED_BINDING_DISTANCE * 6
-                  : FIXED_BINDING_DISTANCE * 2),
+                  ? BASE_BINDING_GAP_ELBOW * 6
+                  : BASE_BINDING_GAP_ELBOW * 2),
           BASE_PADDING,
         ),
     boundsOverlap,
@@ -2239,6 +2244,7 @@ const getBindPointHeading = (
   hoveredElement: ExcalidrawBindableElement | null | undefined,
   origPoint: GlobalPoint,
   elementsMap: ElementsMap,
+  zoom?: AppState["zoom"],
 ): Heading =>
   getHeadingForElbowArrowSnap(
     p,
@@ -2257,21 +2263,20 @@ const getBindPointHeading = (
       ),
     origPoint,
     elementsMap,
+    zoom,
   );
 
 const getHoveredElement = (
   origPoint: GlobalPoint,
   elementsMap: NonDeletedSceneElementsMap,
-  elements: readonly NonDeletedExcalidrawElement[],
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   zoom?: AppState["zoom"],
 ) => {
   return getHoveredElementForBinding(
-    tupleToCoors(origPoint),
+    origPoint,
     elements,
     elementsMap,
-    zoom,
-    true,
-    true,
+    (element) => maxBindingDistance_simple(zoom),
   );
 };
 
diff --git a/packages/element/src/flowchart.ts b/packages/element/src/flowchart.ts
index 6b4e4e2c0e..aad41c9b38 100644
--- a/packages/element/src/flowchart.ts
+++ b/packages/element/src/flowchart.ts
@@ -7,7 +7,7 @@ import type {
   PendingExcalidrawElements,
 } from "@excalidraw/excalidraw/types";
 
-import { bindLinearElement } from "./binding";
+import { bindBindingElement } from "./binding";
 import { updateElbowArrowPoints } from "./elbowArrow";
 import {
   HEADING_DOWN,
@@ -448,8 +448,14 @@ const createBindingArrow = (
 
   const elementsMap = scene.getNonDeletedElementsMap();
 
-  bindLinearElement(bindingArrow, startBindingElement, "start", scene);
-  bindLinearElement(bindingArrow, endBindingElement, "end", scene);
+  bindBindingElement(
+    bindingArrow,
+    startBindingElement,
+    "orbit",
+    "start",
+    scene,
+  );
+  bindBindingElement(bindingArrow, endBindingElement, "orbit", "end", scene);
 
   const changedElements = new Map<string, OrderedExcalidrawElement>();
   changedElements.set(
diff --git a/packages/element/src/index.ts b/packages/element/src/index.ts
index d677859ad5..a365c517de 100644
--- a/packages/element/src/index.ts
+++ b/packages/element/src/index.ts
@@ -1,7 +1,6 @@
 import { toIterable } from "@excalidraw/common";
 
 import { isInvisiblySmallElement } from "./sizeHelpers";
-import { isLinearElementType } from "./typeChecks";
 
 import type {
   ExcalidrawElement,
@@ -55,27 +54,6 @@ export const isNonDeletedElement = <T extends ExcalidrawElement>(
   element: T,
 ): element is NonDeleted<T> => !element.isDeleted;
 
-const _clearElements = (
-  elements: readonly ExcalidrawElement[],
-): ExcalidrawElement[] =>
-  getNonDeletedElements(elements).map((element) =>
-    isLinearElementType(element.type)
-      ? { ...element, lastCommittedPoint: null }
-      : element,
-  );
-
-export const clearElementsForDatabase = (
-  elements: readonly ExcalidrawElement[],
-) => _clearElements(elements);
-
-export const clearElementsForExport = (
-  elements: readonly ExcalidrawElement[],
-) => _clearElements(elements);
-
-export const clearElementsForLocalStorage = (
-  elements: readonly ExcalidrawElement[],
-) => _clearElements(elements);
-
 export * from "./align";
 export * from "./binding";
 export * from "./bounds";
diff --git a/packages/element/src/linearElementEditor.ts b/packages/element/src/linearElementEditor.ts
index 995d866b54..7e7f662786 100644
--- a/packages/element/src/linearElementEditor.ts
+++ b/packages/element/src/linearElementEditor.ts
@@ -9,6 +9,7 @@ import {
   vectorFromPoint,
   curveLength,
   curvePointAtLength,
+  lineSegment,
 } from "@excalidraw/math";
 
 import { getCurvePathOps } from "@excalidraw/utils/shape";
@@ -19,13 +20,16 @@ import {
   shouldRotateWithDiscreteAngle,
   getGridPoint,
   invariant,
-  tupleToCoors,
-  viewportCoordsToSceneCoords,
+  isShallowEqual,
+  getFeatureFlag,
 } from "@excalidraw/common";
 
 import {
   deconstructLinearOrFreeDrawElement,
+  getHoveredElementForBinding,
   isPathALoop,
+  moveArrowAboveBindable,
+  projectFixedPointOntoDiagonal,
   type Store,
 } from "@excalidraw/element";
 
@@ -40,13 +44,11 @@ import type {
   Zoom,
 } from "@excalidraw/excalidraw/types";
 
-import type { Mutable } from "@excalidraw/common/utility-types";
-
 import {
-  bindOrUnbindLinearElement,
-  getHoveredElementForBinding,
+  calculateFixedPointForNonElbowArrowBinding,
+  getBindingStrategyForDraggingBindingElementEndpoints,
   isBindingEnabled,
-  maybeSuggestBindingsForLinearElementAtCoords,
+  updateBoundPoint,
 } from "./binding";
 import {
   getElementAbsoluteCoords,
@@ -57,11 +59,7 @@ import {
 import { headingIsHorizontal, vectorToHeading } from "./heading";
 import { mutateElement } from "./mutateElement";
 import { getBoundTextElement, handleBindTextResize } from "./textElement";
-import {
-  isBindingElement,
-  isElbowArrow,
-  isFixedPointBinding,
-} from "./typeChecks";
+import { isArrowElement, isBindingElement, isElbowArrow } from "./typeChecks";
 
 import { ShapeCache, toggleLinePolygonState } from "./shape";
 
@@ -76,8 +74,6 @@ import type {
   NonDeleted,
   ExcalidrawLinearElement,
   ExcalidrawElement,
-  PointBinding,
-  ExcalidrawBindableElement,
   ExcalidrawTextElementWithContainer,
   ElementsMap,
   NonDeletedSceneElementsMap,
@@ -85,6 +81,9 @@ import type {
   FixedSegment,
   ExcalidrawElbowArrowElement,
   PointsPositionUpdates,
+  NonDeletedExcalidrawElement,
+  Ordered,
+  ExcalidrawBindableElement,
 } from "./types";
 
 /**
@@ -116,6 +115,13 @@ const getNormalizedPoints = ({
   };
 };
 
+type PointMoveOtherUpdates = {
+  startBinding?: FixedPointBinding | null;
+  endBinding?: FixedPointBinding | null;
+  moveMidPointsWithElement?: boolean | null;
+  suggestedBinding?: AppState["suggestedBinding"] | null;
+};
+
 export class LinearElementEditor {
   public readonly elementId: ExcalidrawElement["id"] & {
     _brand: "excalidrawLinearElementId";
@@ -123,34 +129,36 @@ export class LinearElementEditor {
   /** indices */
   public readonly selectedPointsIndices: readonly number[] | null;
 
-  public readonly pointerDownState: Readonly<{
+  public readonly initialState: Readonly<{
     prevSelectedPointsIndices: readonly number[] | null;
     /** index */
     lastClickedPoint: number;
-    lastClickedIsEndPoint: boolean;
-    origin: Readonly<{ x: number; y: number }> | null;
+    origin: Readonly<GlobalPoint> | null;
     segmentMidpoint: {
       value: GlobalPoint | null;
       index: number | null;
       added: boolean;
     };
+    arrowStartIsInside: boolean;
+    altFocusPoint: Readonly<GlobalPoint> | null;
   }>;
 
   /** whether you're dragging a point */
   public readonly isDragging: boolean;
   public readonly lastUncommittedPoint: LocalPoint | null;
+  public readonly lastCommittedPoint: LocalPoint | null;
   public readonly pointerOffset: Readonly<{ x: number; y: number }>;
-  public readonly startBindingElement:
-    | ExcalidrawBindableElement
-    | null
-    | "keep";
-  public readonly endBindingElement: ExcalidrawBindableElement | null | "keep";
   public readonly hoverPointIndex: number;
   public readonly segmentMidPointHoveredCoords: GlobalPoint | null;
   public readonly elbowed: boolean;
   public readonly customLineAngle: number | null;
   public readonly isEditing: boolean;
 
+  // @deprecated renamed to initialState because the data is used during linear
+  // element click creation as well (with multiple pointer down events)
+  // @ts-ignore
+  public readonly pointerDownState: never;
+
   constructor(
     element: NonDeleted<ExcalidrawLinearElement>,
     elementsMap: ElementsMap,
@@ -169,14 +177,12 @@ export class LinearElementEditor {
     }
     this.selectedPointsIndices = null;
     this.lastUncommittedPoint = null;
+    this.lastCommittedPoint = null;
     this.isDragging = false;
     this.pointerOffset = { x: 0, y: 0 };
-    this.startBindingElement = "keep";
-    this.endBindingElement = "keep";
-    this.pointerDownState = {
+    this.initialState = {
       prevSelectedPointsIndices: null,
       lastClickedPoint: -1,
-      lastClickedIsEndPoint: false,
       origin: null,
 
       segmentMidpoint: {
@@ -184,6 +190,8 @@ export class LinearElementEditor {
         index: null,
         added: false,
       },
+      arrowStartIsInside: false,
+      altFocusPoint: null,
     };
     this.hoverPointIndex = -1;
     this.segmentMidPointHoveredCoords = null;
@@ -276,222 +284,381 @@ export class LinearElementEditor {
     });
   }
 
-  /**
-   * @returns whether point was dragged
-   */
+  static handlePointerMove(
+    event: PointerEvent,
+    app: AppClassProperties,
+    scenePointerX: number,
+    scenePointerY: number,
+    linearElementEditor: LinearElementEditor,
+  ): Pick<AppState, "suggestedBinding" | "selectedLinearElement"> | null {
+    const elementsMap = app.scene.getNonDeletedElementsMap();
+    const elements = app.scene.getNonDeletedElements();
+    const { elementId } = linearElementEditor;
+
+    const element = LinearElementEditor.getElement(elementId, elementsMap);
+
+    invariant(element, "Element being dragged must exist in the scene");
+    invariant(element.points.length > 1, "Element must have at least 2 points");
+
+    const idx = element.points.length - 1;
+    const point = element.points[idx];
+    const pivotPoint = element.points[idx - 1];
+    const customLineAngle =
+      linearElementEditor.customLineAngle ??
+      determineCustomLinearAngle(pivotPoint, element.points[idx]);
+    const hoveredElement = getHoveredElementForBinding(
+      pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+      elements,
+      elementsMap,
+    );
+
+    // Determine if point movement should happen and how much
+    let deltaX = 0;
+    let deltaY = 0;
+    if (
+      shouldRotateWithDiscreteAngle(event) &&
+      !hoveredElement &&
+      !element.startBinding &&
+      !element.endBinding
+    ) {
+      const [width, height] = LinearElementEditor._getShiftLockedDelta(
+        element,
+        elementsMap,
+        pivotPoint,
+        pointFrom(scenePointerX, scenePointerY),
+        event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
+        customLineAngle,
+      );
+      const target = pointFrom<LocalPoint>(
+        width + pivotPoint[0],
+        height + pivotPoint[1],
+      );
+
+      deltaX = target[0] - point[0];
+      deltaY = target[1] - point[1];
+    } else {
+      const newDraggingPointPosition = LinearElementEditor.createPointAt(
+        element,
+        elementsMap,
+        scenePointerX - linearElementEditor.pointerOffset.x,
+        scenePointerY - linearElementEditor.pointerOffset.y,
+        event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
+      );
+      deltaX = newDraggingPointPosition[0] - point[0];
+      deltaY = newDraggingPointPosition[1] - point[1];
+    }
+
+    // Apply the point movement if needed
+    let suggestedBinding: AppState["suggestedBinding"] = null;
+    const { positions, updates } = pointDraggingUpdates(
+      [idx],
+      deltaX,
+      deltaY,
+      elementsMap,
+      element,
+      elements,
+      app,
+      event.shiftKey,
+      event.altKey,
+    );
+
+    LinearElementEditor.movePoints(element, app.scene, positions, {
+      startBinding: updates?.startBinding,
+      endBinding: updates?.endBinding,
+      moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+    });
+    // Set the suggested binding from the updates if available
+    if (isBindingElement(element, false)) {
+      if (isBindingEnabled(app.state)) {
+        suggestedBinding = updates?.suggestedBinding ?? null;
+      }
+    }
+
+    // Move the arrow over the bindable object in terms of z-index
+    if (isBindingElement(element)) {
+      moveArrowAboveBindable(
+        LinearElementEditor.getPointGlobalCoordinates(
+          element,
+          element.points[element.points.length - 1],
+          elementsMap,
+        ),
+        element,
+        elements,
+        elementsMap,
+        app.scene,
+      );
+    }
+
+    // PERF: Avoid state updates if not absolutely necessary
+    if (
+      app.state.selectedLinearElement?.customLineAngle === customLineAngle &&
+      linearElementEditor.initialState.altFocusPoint &&
+      (!suggestedBinding ||
+        isShallowEqual(app.state.suggestedBinding ?? [], suggestedBinding))
+    ) {
+      return null;
+    }
+
+    const startBindingElement =
+      isBindingElement(element) &&
+      element.startBinding &&
+      (elementsMap.get(
+        element.startBinding.elementId,
+      ) as ExcalidrawBindableElement | null);
+    const newLinearElementEditor = {
+      ...linearElementEditor,
+      customLineAngle,
+      initialState: {
+        ...linearElementEditor.initialState,
+        altFocusPoint:
+          !linearElementEditor.initialState.altFocusPoint &&
+          startBindingElement &&
+          updates?.suggestedBinding?.id !== startBindingElement.id
+            ? projectFixedPointOntoDiagonal(
+                element,
+                pointFrom<GlobalPoint>(element.x, element.y),
+                startBindingElement,
+                "start",
+                elementsMap,
+              )
+            : linearElementEditor.initialState.altFocusPoint,
+      },
+    };
+
+    return {
+      selectedLinearElement: newLinearElementEditor,
+      suggestedBinding,
+    };
+  }
+
   static handlePointDragging(
     event: PointerEvent,
     app: AppClassProperties,
     scenePointerX: number,
     scenePointerY: number,
     linearElementEditor: LinearElementEditor,
-  ): Pick<AppState, keyof AppState> | null {
-    if (!linearElementEditor) {
-      return null;
-    }
-    const { elementId } = linearElementEditor;
+  ): Pick<AppState, "suggestedBinding" | "selectedLinearElement"> | null {
     const elementsMap = app.scene.getNonDeletedElementsMap();
+    const elements = app.scene.getNonDeletedElements();
+    const { elbowed, elementId, initialState } = linearElementEditor;
+    const selectedPointsIndices = Array.from(
+      linearElementEditor.selectedPointsIndices ?? [],
+    );
+    let { lastClickedPoint } = initialState;
     const element = LinearElementEditor.getElement(elementId, elementsMap);
-    let customLineAngle = linearElementEditor.customLineAngle;
-    if (!element) {
-      return null;
+
+    invariant(element, "Element being dragged must exist in the scene");
+
+    invariant(element.points.length > 1, "Element must have at least 2 points");
+
+    invariant(
+      selectedPointsIndices,
+      "There must be selected points in order to drag them",
+    );
+
+    if (elbowed) {
+      selectedPointsIndices.some((pointIdx, idx) => {
+        if (pointIdx > 0 && pointIdx !== element.points.length - 1) {
+          selectedPointsIndices[idx] = element.points.length - 1;
+          lastClickedPoint = element.points.length - 1;
+          return true;
+        }
+
+        return false;
+      });
     }
 
-    if (
-      isElbowArrow(element) &&
-      !linearElementEditor.pointerDownState.lastClickedIsEndPoint &&
-      linearElementEditor.pointerDownState.lastClickedPoint !== 0
-    ) {
-      return null;
-    }
-
-    const selectedPointsIndices = isElbowArrow(element)
-      ? [
-          !!linearElementEditor.selectedPointsIndices?.includes(0)
-            ? 0
-            : undefined,
-          !!linearElementEditor.selectedPointsIndices?.find((idx) => idx > 0)
-            ? element.points.length - 1
-            : undefined,
-        ].filter((idx): idx is number => idx !== undefined)
-      : linearElementEditor.selectedPointsIndices;
-    const lastClickedPoint = isElbowArrow(element)
-      ? linearElementEditor.pointerDownState.lastClickedPoint > 0
-        ? element.points.length - 1
-        : 0
-      : linearElementEditor.pointerDownState.lastClickedPoint;
+    invariant(
+      lastClickedPoint > -1 &&
+        selectedPointsIndices.includes(lastClickedPoint) &&
+        element.points[lastClickedPoint],
+      `There must be a valid lastClickedPoint in order to drag it. selectedPointsIndices(${JSON.stringify(
+        selectedPointsIndices,
+      )}) points(0..${
+        element.points.length - 1
+      }) lastClickedPoint(${lastClickedPoint})`,
+    );
 
     // point that's being dragged (out of all selected points)
     const draggingPoint = element.points[lastClickedPoint];
+    // The adjacent point to the one dragged point
+    const pivotPoint =
+      element.points[lastClickedPoint === 0 ? 1 : lastClickedPoint - 1];
+    const singlePointDragged = selectedPointsIndices.length === 1;
+    const customLineAngle =
+      linearElementEditor.customLineAngle ??
+      determineCustomLinearAngle(pivotPoint, element.points[lastClickedPoint]);
+    const startIsSelected = selectedPointsIndices.includes(0);
+    const endIsSelected = selectedPointsIndices.includes(
+      element.points.length - 1,
+    );
+    const hoveredElement = getHoveredElementForBinding(
+      pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+      elements,
+      elementsMap,
+    );
 
-    if (selectedPointsIndices && draggingPoint) {
-      if (
-        shouldRotateWithDiscreteAngle(event) &&
-        selectedPointsIndices.length === 1 &&
-        element.points.length > 1
-      ) {
-        const selectedIndex = selectedPointsIndices[0];
-        const referencePoint =
-          element.points[selectedIndex === 0 ? 1 : selectedIndex - 1];
-        customLineAngle =
-          linearElementEditor.customLineAngle ??
-          Math.atan2(
-            element.points[selectedIndex][1] - referencePoint[1],
-            element.points[selectedIndex][0] - referencePoint[0],
-          );
-
-        const [width, height] = LinearElementEditor._getShiftLockedDelta(
-          element,
-          elementsMap,
-          referencePoint,
-          pointFrom(scenePointerX, scenePointerY),
-          event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
-          customLineAngle,
-        );
-
-        LinearElementEditor.movePoints(
-          element,
-          app.scene,
-          new Map([
-            [
-              selectedIndex,
-              {
-                point: pointFrom(
-                  width + referencePoint[0],
-                  height + referencePoint[1],
-                ),
-                isDragging: selectedIndex === lastClickedPoint,
-              },
-            ],
-          ]),
-        );
-      } else {
-        const newDraggingPointPosition = LinearElementEditor.createPointAt(
-          element,
-          elementsMap,
-          scenePointerX - linearElementEditor.pointerOffset.x,
-          scenePointerY - linearElementEditor.pointerOffset.y,
-          event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
-        );
-
-        const deltaX = newDraggingPointPosition[0] - draggingPoint[0];
-        const deltaY = newDraggingPointPosition[1] - draggingPoint[1];
-
-        LinearElementEditor.movePoints(
-          element,
-          app.scene,
-          new Map(
-            selectedPointsIndices.map((pointIndex) => {
-              const newPointPosition: LocalPoint =
-                pointIndex === lastClickedPoint
-                  ? LinearElementEditor.createPointAt(
-                      element,
-                      elementsMap,
-                      scenePointerX - linearElementEditor.pointerOffset.x,
-                      scenePointerY - linearElementEditor.pointerOffset.y,
-                      event[KEYS.CTRL_OR_CMD]
-                        ? null
-                        : app.getEffectiveGridSize(),
-                    )
-                  : pointFrom(
-                      element.points[pointIndex][0] + deltaX,
-                      element.points[pointIndex][1] + deltaY,
-                    );
-              return [
-                pointIndex,
-                {
-                  point: newPointPosition,
-                  isDragging: pointIndex === lastClickedPoint,
-                },
-              ];
-            }),
-          ),
-        );
-      }
-
-      const boundTextElement = getBoundTextElement(element, elementsMap);
-      if (boundTextElement) {
-        handleBindTextResize(element, app.scene, false);
-      }
-
-      // suggest bindings for first and last point if selected
-      let suggestedBindings: ExcalidrawBindableElement[] = [];
-      if (isBindingElement(element, false)) {
-        const firstSelectedIndex = selectedPointsIndices[0] === 0;
-        const lastSelectedIndex =
-          selectedPointsIndices[selectedPointsIndices.length - 1] ===
-          element.points.length - 1;
-        const coords: { x: number; y: number }[] = [];
-
-        if (!firstSelectedIndex !== !lastSelectedIndex) {
-          coords.push({ x: scenePointerX, y: scenePointerY });
-        } else {
-          if (firstSelectedIndex) {
-            coords.push(
-              tupleToCoors(
-                LinearElementEditor.getPointGlobalCoordinates(
-                  element,
-                  element.points[0],
-                  elementsMap,
-                ),
-              ),
-            );
-          }
-
-          if (lastSelectedIndex) {
-            coords.push(
-              tupleToCoors(
-                LinearElementEditor.getPointGlobalCoordinates(
-                  element,
-                  element.points[
-                    selectedPointsIndices[selectedPointsIndices.length - 1]
-                  ],
-                  elementsMap,
-                ),
-              ),
-            );
-          }
-        }
-
-        if (coords.length) {
-          suggestedBindings = maybeSuggestBindingsForLinearElementAtCoords(
-            element,
-            coords,
-            app.scene,
-            app.state.zoom,
-          );
-        }
-      }
-
-      const newLinearElementEditor = {
-        ...linearElementEditor,
-        selectedPointsIndices,
-        segmentMidPointHoveredCoords:
-          lastClickedPoint !== 0 &&
-          lastClickedPoint !== element.points.length - 1
-            ? this.getPointGlobalCoordinates(
-                element,
-                draggingPoint,
-                elementsMap,
-              )
-            : null,
-        hoverPointIndex:
-          lastClickedPoint === 0 ||
-          lastClickedPoint === element.points.length - 1
-            ? lastClickedPoint
-            : -1,
-        isDragging: true,
+    // Determine if point movement should happen and how much
+    let deltaX = 0;
+    let deltaY = 0;
+    if (
+      shouldRotateWithDiscreteAngle(event) &&
+      singlePointDragged &&
+      !hoveredElement &&
+      !element.startBinding &&
+      !element.endBinding
+    ) {
+      const [width, height] = LinearElementEditor._getShiftLockedDelta(
+        element,
+        elementsMap,
+        pivotPoint,
+        pointFrom(scenePointerX, scenePointerY),
+        event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
         customLineAngle,
-      };
+      );
+      const target = pointFrom<LocalPoint>(
+        width + pivotPoint[0],
+        height + pivotPoint[1],
+      );
 
-      return {
-        ...app.state,
-        selectedLinearElement: newLinearElementEditor,
-        suggestedBindings,
-      };
+      deltaX = target[0] - draggingPoint[0];
+      deltaY = target[1] - draggingPoint[1];
+    } else {
+      const newDraggingPointPosition = LinearElementEditor.createPointAt(
+        element,
+        elementsMap,
+        scenePointerX - linearElementEditor.pointerOffset.x,
+        scenePointerY - linearElementEditor.pointerOffset.y,
+        event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
+      );
+      deltaX = newDraggingPointPosition[0] - draggingPoint[0];
+      deltaY = newDraggingPointPosition[1] - draggingPoint[1];
     }
 
-    return null;
+    // Apply the point movement if needed
+    let suggestedBinding: AppState["suggestedBinding"] = null;
+    const { positions, updates } = pointDraggingUpdates(
+      selectedPointsIndices,
+      deltaX,
+      deltaY,
+      elementsMap,
+      element,
+      elements,
+      app,
+      event.shiftKey,
+      event.altKey,
+    );
+
+    LinearElementEditor.movePoints(element, app.scene, positions, {
+      startBinding: updates?.startBinding,
+      endBinding: updates?.endBinding,
+      moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+    });
+
+    // Set the suggested binding from the updates if available
+    if (isBindingElement(element, false)) {
+      if (isBindingEnabled(app.state) && (startIsSelected || endIsSelected)) {
+        suggestedBinding = updates?.suggestedBinding ?? null;
+      }
+    }
+
+    // Move the arrow over the bindable object in terms of z-index
+    if (isBindingElement(element) && startIsSelected !== endIsSelected) {
+      moveArrowAboveBindable(
+        LinearElementEditor.getPointGlobalCoordinates(
+          element,
+          startIsSelected
+            ? element.points[0]
+            : element.points[element.points.length - 1],
+          elementsMap,
+        ),
+        element,
+        elements,
+        elementsMap,
+        app.scene,
+      );
+    }
+
+    // Attached text might need to update if arrow dimensions change
+    const boundTextElement = getBoundTextElement(element, elementsMap);
+    if (boundTextElement) {
+      handleBindTextResize(element, app.scene, false);
+    }
+
+    // Update selected points for elbow arrows because elbow arrows add and
+    // remove points as they route
+    const newSelectedPointsIndices = elbowed
+      ? endIsSelected
+        ? [element.points.length - 1]
+        : [0]
+      : selectedPointsIndices;
+
+    const newLastClickedPoint = elbowed
+      ? newSelectedPointsIndices[0]
+      : lastClickedPoint;
+
+    const newSelectedMidPointHoveredCoords =
+      !startIsSelected && !endIsSelected
+        ? LinearElementEditor.getPointGlobalCoordinates(
+            element,
+            draggingPoint,
+            elementsMap,
+          )
+        : null;
+
+    const newHoverPointIndex = newLastClickedPoint;
+    const startBindingElement =
+      isBindingElement(element) &&
+      element.startBinding &&
+      (elementsMap.get(
+        element.startBinding.elementId,
+      ) as ExcalidrawBindableElement | null);
+    const endBindingElement =
+      isBindingElement(element) &&
+      element.endBinding &&
+      (elementsMap.get(
+        element.endBinding.elementId,
+      ) as ExcalidrawBindableElement | null);
+    const altFocusPointBindableElement =
+      endIsSelected && // The "other" end (i.e. "end") is dragged
+      startBindingElement &&
+      updates?.suggestedBinding?.id !== startBindingElement.id // The end point is not hovering the start bindable + it's binding gap
+        ? startBindingElement
+        : startIsSelected && // The "other" end (i.e. "start") is dragged
+          endBindingElement &&
+          updates?.suggestedBinding?.id !== endBindingElement.id // The start point is not hovering the end bindable + it's binding gap
+        ? endBindingElement
+        : null;
+
+    const newLinearElementEditor: LinearElementEditor = {
+      ...linearElementEditor,
+      selectedPointsIndices: newSelectedPointsIndices,
+      initialState: {
+        ...linearElementEditor.initialState,
+        lastClickedPoint: newLastClickedPoint,
+        altFocusPoint:
+          !linearElementEditor.initialState.altFocusPoint && // We only set it once per arrow drag
+          isBindingElement(element) &&
+          altFocusPointBindableElement
+            ? projectFixedPointOntoDiagonal(
+                element,
+                pointFrom<GlobalPoint>(element.x, element.y),
+                altFocusPointBindableElement,
+                "start",
+                elementsMap,
+              )
+            : linearElementEditor.initialState.altFocusPoint,
+      },
+      segmentMidPointHoveredCoords: newSelectedMidPointHoveredCoords,
+      hoverPointIndex: newHoverPointIndex,
+      isDragging: true,
+      customLineAngle,
+    };
+
+    return {
+      selectedLinearElement: newLinearElementEditor,
+      suggestedBinding,
+    };
   }
 
   static handlePointerUp(
@@ -501,25 +668,18 @@ export class LinearElementEditor {
     scene: Scene,
   ): LinearElementEditor {
     const elementsMap = scene.getNonDeletedElementsMap();
-    const elements = scene.getNonDeletedElements();
-    const pointerCoords = viewportCoordsToSceneCoords(event, appState);
 
-    const { elementId, selectedPointsIndices, isDragging, pointerDownState } =
-      editingLinearElement;
+    const {
+      elementId,
+      selectedPointsIndices,
+      isDragging,
+      initialState: pointerDownState,
+    } = editingLinearElement;
     const element = LinearElementEditor.getElement(elementId, elementsMap);
     if (!element) {
       return editingLinearElement;
     }
 
-    const bindings: Mutable<
-      Partial<
-        Pick<
-          InstanceType<typeof LinearElementEditor>,
-          "startBindingElement" | "endBindingElement"
-        >
-      >
-    > = {};
-
     if (isDragging && selectedPointsIndices) {
       for (const selectedPoint of selectedPointsIndices) {
         if (
@@ -555,36 +715,12 @@ export class LinearElementEditor {
               ]),
             );
           }
-
-          const bindingElement = isBindingEnabled(appState)
-            ? getHoveredElementForBinding(
-                (selectedPointsIndices?.length ?? 0) > 1
-                  ? tupleToCoors(
-                      LinearElementEditor.getPointAtIndexGlobalCoordinates(
-                        element,
-                        selectedPoint!,
-                        elementsMap,
-                      ),
-                    )
-                  : pointerCoords,
-                elements,
-                elementsMap,
-                appState.zoom,
-                isElbowArrow(element),
-                isElbowArrow(element),
-              )
-            : null;
-
-          bindings[
-            selectedPoint === 0 ? "startBindingElement" : "endBindingElement"
-          ] = bindingElement;
         }
       }
     }
 
     return {
       ...editingLinearElement,
-      ...bindings,
       segmentMidPointHoveredCoords: null,
       hoverPointIndex: -1,
       // if clicking without previously dragging a point(s), and not holding
@@ -609,6 +745,11 @@ export class LinearElementEditor {
       isDragging: false,
       pointerOffset: { x: 0, y: 0 },
       customLineAngle: null,
+      initialState: {
+        ...editingLinearElement.initialState,
+        origin: null,
+        arrowStartIsInside: false,
+      },
     };
   }
 
@@ -853,7 +994,6 @@ export class LinearElementEditor {
   } {
     const appState = app.state;
     const elementsMap = scene.getNonDeletedElementsMap();
-    const elements = scene.getNonDeletedElements();
 
     const ret: ReturnType<typeof LinearElementEditor["handlePointerDown"]> = {
       didAddPoint: false,
@@ -871,13 +1011,16 @@ export class LinearElementEditor {
     if (!element) {
       return ret;
     }
+
     const segmentMidpoint = LinearElementEditor.getSegmentMidpointHitCoords(
       linearElementEditor,
       scenePointer,
       appState,
       elementsMap,
     );
+    const point = pointFrom<GlobalPoint>(scenePointer.x, scenePointer.y);
     let segmentMidpointIndex = null;
+
     if (segmentMidpoint) {
       segmentMidpointIndex = LinearElementEditor.getSegmentMidPointIndex(
         linearElementEditor,
@@ -904,29 +1047,26 @@ export class LinearElementEditor {
       store.scheduleCapture();
       ret.linearElementEditor = {
         ...linearElementEditor,
-        pointerDownState: {
+        initialState: {
           prevSelectedPointsIndices: linearElementEditor.selectedPointsIndices,
           lastClickedPoint: -1,
-          lastClickedIsEndPoint: false,
-          origin: { x: scenePointer.x, y: scenePointer.y },
+          origin: point,
           segmentMidpoint: {
             value: segmentMidpoint,
             index: segmentMidpointIndex,
             added: false,
           },
+          arrowStartIsInside:
+            !!app.state.newElement &&
+            (app.state.bindMode === "inside" || app.state.bindMode === "skip"),
+          altFocusPoint: null,
         },
         selectedPointsIndices: [element.points.length - 1],
         lastUncommittedPoint: null,
-        endBindingElement: getHoveredElementForBinding(
-          scenePointer,
-          elements,
-          elementsMap,
-          app.state.zoom,
-          linearElementEditor.elbowed,
-        ),
       };
 
       ret.didAddPoint = true;
+
       return ret;
     }
 
@@ -941,21 +1081,6 @@ export class LinearElementEditor {
     // it would get deselected if the point is outside the hitbox area
     if (clickedPointIndex >= 0 || segmentMidpoint) {
       ret.hitElement = element;
-    } else {
-      // You might be wandering why we are storing the binding elements on
-      // LinearElementEditor and passing them in, instead of calculating them
-      // from the end points of the `linearElement` - this is to allow disabling
-      // binding (which needs to happen at the point the user finishes moving
-      // the point).
-      const { startBindingElement, endBindingElement } = linearElementEditor;
-      if (isBindingEnabled(appState) && isBindingElement(element)) {
-        bindOrUnbindLinearElement(
-          element,
-          startBindingElement,
-          endBindingElement,
-          scene,
-        );
-      }
     }
 
     const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
@@ -984,16 +1109,19 @@ export class LinearElementEditor {
         : null;
     ret.linearElementEditor = {
       ...linearElementEditor,
-      pointerDownState: {
+      initialState: {
         prevSelectedPointsIndices: linearElementEditor.selectedPointsIndices,
         lastClickedPoint: clickedPointIndex,
-        lastClickedIsEndPoint: clickedPointIndex === element.points.length - 1,
-        origin: { x: scenePointer.x, y: scenePointer.y },
+        origin: point,
         segmentMidpoint: {
           value: segmentMidpoint,
           index: segmentMidpointIndex,
           added: false,
         },
+        arrowStartIsInside:
+          !!app.state.newElement &&
+          (app.state.bindMode === "inside" || app.state.bindMode === "skip"),
+        altFocusPoint: null,
       },
       selectedPointsIndices: nextSelectedPointsIndices,
       pointerOffset: targetPoint
@@ -1020,7 +1148,7 @@ export class LinearElementEditor {
     return pointsEqual(point1, point2);
   }
 
-  static handlePointerMove(
+  static handlePointerMoveInEditMode(
     event: React.PointerEvent<HTMLCanvasElement>,
     scenePointerX: number,
     scenePointerY: number,
@@ -1055,20 +1183,16 @@ export class LinearElementEditor {
     let newPoint: LocalPoint;
 
     if (shouldRotateWithDiscreteAngle(event) && points.length >= 2) {
-      const lastCommittedPoint = points[points.length - 2];
-
+      const anchor = points[points.length - 2];
       const [width, height] = LinearElementEditor._getShiftLockedDelta(
         element,
         elementsMap,
-        lastCommittedPoint,
+        anchor,
         pointFrom(scenePointerX, scenePointerY),
         event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
       );
 
-      newPoint = pointFrom(
-        width + lastCommittedPoint[0],
-        height + lastCommittedPoint[1],
-      );
+      newPoint = pointFrom(width + anchor[0], height + anchor[1]);
     } else {
       newPoint = LinearElementEditor.createPointAt(
         element,
@@ -1141,7 +1265,6 @@ export class LinearElementEditor {
 
   static getPointAtIndexGlobalCoordinates(
     element: NonDeleted<ExcalidrawLinearElement>,
-
     indexMaybeFromEnd: number, // -1 for last element
     elementsMap: ElementsMap,
   ): GlobalPoint {
@@ -1149,19 +1272,18 @@ export class LinearElementEditor {
       indexMaybeFromEnd < 0
         ? element.points.length + indexMaybeFromEnd
         : indexMaybeFromEnd;
-    const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
-    const cx = (x1 + x2) / 2;
-    const cy = (y1 + y2) / 2;
+    const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap);
+    const center = pointFrom<GlobalPoint>(cx, cy);
     const p = element.points[index];
     const { x, y } = element;
 
     return p
       ? pointRotateRads(
-          pointFrom(x + p[0], y + p[1]),
-          pointFrom(cx, cy),
+          pointFrom<GlobalPoint>(x + p[0], y + p[1]),
+          center,
           element.angle,
         )
-      : pointRotateRads(pointFrom(x, y), pointFrom(cx, cy), element.angle);
+      : pointRotateRads(pointFrom<GlobalPoint>(x, y), center, element.angle);
   }
 
   static pointFromAbsoluteCoords(
@@ -1409,8 +1531,9 @@ export class LinearElementEditor {
     scene: Scene,
     pointUpdates: PointsPositionUpdates,
     otherUpdates?: {
-      startBinding?: PointBinding | null;
-      endBinding?: PointBinding | null;
+      startBinding?: FixedPointBinding | null;
+      endBinding?: FixedPointBinding | null;
+      moveMidPointsWithElement?: boolean | null;
     },
   ) {
     const { points } = element;
@@ -1456,6 +1579,15 @@ export class LinearElementEditor {
       : points.map((p, idx) => {
           const current = pointUpdates.get(idx)?.point ?? p;
 
+          if (
+            otherUpdates?.moveMidPointsWithElement &&
+            idx !== 0 &&
+            idx !== points.length - 1 &&
+            !pointUpdates.has(idx)
+          ) {
+            return current;
+          }
+
           return pointFrom<LocalPoint>(
             current[0] - offsetX,
             current[1] - offsetY,
@@ -1495,20 +1627,20 @@ export class LinearElementEditor {
       return false;
     }
 
-    const { segmentMidpoint } = linearElementEditor.pointerDownState;
+    const { segmentMidpoint } = linearElementEditor.initialState;
 
     if (
       segmentMidpoint.added ||
       segmentMidpoint.value === null ||
       segmentMidpoint.index === null ||
-      linearElementEditor.pointerDownState.origin === null
+      linearElementEditor.initialState.origin === null
     ) {
       return false;
     }
 
-    const origin = linearElementEditor.pointerDownState.origin!;
+    const origin = linearElementEditor.initialState.origin!;
     const dist = pointDistance(
-      pointFrom(origin.x, origin.y),
+      origin,
       pointFrom(pointerCoords.x, pointerCoords.y),
     );
     if (
@@ -1535,12 +1667,12 @@ export class LinearElementEditor {
     if (!element) {
       return;
     }
-    const { segmentMidpoint } = linearElementEditor.pointerDownState;
+    const { segmentMidpoint } = linearElementEditor.initialState;
     const ret: {
-      pointerDownState: LinearElementEditor["pointerDownState"];
+      pointerDownState: LinearElementEditor["initialState"];
       selectedPointsIndices: LinearElementEditor["selectedPointsIndices"];
     } = {
-      pointerDownState: linearElementEditor.pointerDownState,
+      pointerDownState: linearElementEditor.initialState,
       selectedPointsIndices: linearElementEditor.selectedPointsIndices,
     };
 
@@ -1560,9 +1692,9 @@ export class LinearElementEditor {
     scene.mutateElement(element, { points });
 
     ret.pointerDownState = {
-      ...linearElementEditor.pointerDownState,
+      ...linearElementEditor.initialState,
       segmentMidpoint: {
-        ...linearElementEditor.pointerDownState.segmentMidpoint,
+        ...linearElementEditor.initialState.segmentMidpoint,
         added: true,
       },
       lastClickedPoint: segmentMidpoint.index!,
@@ -1578,8 +1710,8 @@ export class LinearElementEditor {
     offsetX: number,
     offsetY: number,
     otherUpdates?: {
-      startBinding?: PointBinding | null;
-      endBinding?: PointBinding | null;
+      startBinding?: FixedPointBinding | null;
+      endBinding?: FixedPointBinding | null;
     },
     options?: {
       isDragging?: boolean;
@@ -1594,18 +1726,10 @@ export class LinearElementEditor {
         points?: LocalPoint[];
       } = {};
       if (otherUpdates?.startBinding !== undefined) {
-        updates.startBinding =
-          otherUpdates.startBinding !== null &&
-          isFixedPointBinding(otherUpdates.startBinding)
-            ? otherUpdates.startBinding
-            : null;
+        updates.startBinding = otherUpdates.startBinding;
       }
       if (otherUpdates?.endBinding !== undefined) {
-        updates.endBinding =
-          otherUpdates.endBinding !== null &&
-          isFixedPointBinding(otherUpdates.endBinding)
-            ? otherUpdates.endBinding
-            : null;
+        updates.endBinding = otherUpdates.endBinding;
       }
 
       updates.points = Array.from(nextPoints);
@@ -1825,51 +1949,23 @@ export class LinearElementEditor {
     elementsMap: ElementsMap,
     includeBoundText: boolean = false,
   ): [number, number, number, number, number, number] => {
-    let coords: [number, number, number, number, number, number];
-    let x1;
-    let y1;
-    let x2;
-    let y2;
-    if (element.points.length < 2 || !ShapeCache.get(element)) {
-      // XXX this is just a poor estimate and not very useful
-      const { minX, minY, maxX, maxY } = element.points.reduce(
-        (limits, [x, y]) => {
-          limits.minY = Math.min(limits.minY, y);
-          limits.minX = Math.min(limits.minX, x);
+    const shape = ShapeCache.generateElementShape(element, null);
 
-          limits.maxX = Math.max(limits.maxX, x);
-          limits.maxY = Math.max(limits.maxY, y);
+    // first element is always the curve
+    const ops = getCurvePathOps(shape[0]);
 
-          return limits;
-        },
-        { minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
-      );
-      x1 = minX + element.x;
-      y1 = minY + element.y;
-      x2 = maxX + element.x;
-      y2 = maxY + element.y;
-    } else {
-      const shape = ShapeCache.generateElementShape(element, null);
-
-      // first element is always the curve
-      const ops = getCurvePathOps(shape[0]);
-
-      const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
-      x1 = minX + element.x;
-      y1 = minY + element.y;
-      x2 = maxX + element.x;
-      y2 = maxY + element.y;
-    }
+    const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
+    const x1 = minX + element.x;
+    const y1 = minY + element.y;
+    const x2 = maxX + element.x;
+    const y2 = maxY + element.y;
     const cx = (x1 + x2) / 2;
     const cy = (y1 + y2) / 2;
-    coords = [x1, y1, x2, y2, cx, cy];
 
-    if (!includeBoundText) {
-      return coords;
-    }
-    const boundTextElement = getBoundTextElement(element, elementsMap);
+    const boundTextElement =
+      includeBoundText && getBoundTextElement(element, elementsMap);
     if (boundTextElement) {
-      coords = LinearElementEditor.getMinMaxXYWithBoundText(
+      return LinearElementEditor.getMinMaxXYWithBoundText(
         element,
         elementsMap,
         [x1, y1, x2, y2],
@@ -1877,7 +1973,7 @@ export class LinearElementEditor {
       );
     }
 
-    return coords;
+    return [x1, y1, x2, y2, cx, cy];
   };
 
   static moveFixedSegment(
@@ -1886,7 +1982,10 @@ export class LinearElementEditor {
     x: number,
     y: number,
     scene: Scene,
-  ): LinearElementEditor {
+  ): Pick<
+    LinearElementEditor,
+    "segmentMidPointHoveredCoords" | "initialState"
+  > {
     const elementsMap = scene.getNonDeletedElementsMap();
     const element = LinearElementEditor.getElement(
       linearElement.elementId,
@@ -1948,8 +2047,8 @@ export class LinearElementEditor {
       return {
         ...linearElement,
         segmentMidPointHoveredCoords: point,
-        pointerDownState: {
-          ...linearElement.pointerDownState,
+        initialState: {
+          ...linearElement.initialState,
           segmentMidpoint: {
             added: false,
             index: element.fixedSegments![offset].index,
@@ -1984,3 +2083,296 @@ const normalizeSelectedPoints = (
   nextPoints = nextPoints.sort((a, b) => a - b);
   return nextPoints.length ? nextPoints : null;
 };
+
+const pointDraggingUpdates = (
+  selectedPointsIndices: readonly number[],
+  deltaX: number,
+  deltaY: number,
+  elementsMap: NonDeletedSceneElementsMap,
+  element: NonDeleted<ExcalidrawLinearElement>,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  app: AppClassProperties,
+  shiftKey: boolean,
+  altKey: boolean,
+): {
+  positions: PointsPositionUpdates;
+  updates?: PointMoveOtherUpdates;
+} => {
+  const naiveDraggingPoints = new Map(
+    selectedPointsIndices.map((pointIndex) => {
+      return [
+        pointIndex,
+        {
+          point: pointFrom<LocalPoint>(
+            element.points[pointIndex][0] + deltaX,
+            element.points[pointIndex][1] + deltaY,
+          ),
+          isDragging: true,
+        },
+      ];
+    }),
+  );
+
+  // Linear elements have no special logic
+  if (!isArrowElement(element)) {
+    return {
+      positions: naiveDraggingPoints,
+    };
+  }
+
+  const startIsDragged = selectedPointsIndices.includes(0);
+  const endIsDragged = selectedPointsIndices.includes(
+    element.points.length - 1,
+  );
+
+  const { start, end } = getBindingStrategyForDraggingBindingElementEndpoints(
+    element,
+    naiveDraggingPoints,
+    elementsMap,
+    elements,
+    app.state,
+    {
+      newArrow: !!app.state.newElement,
+      shiftKey,
+      altKey,
+    },
+  );
+
+  if (isElbowArrow(element)) {
+    return {
+      positions: naiveDraggingPoints,
+      updates: {
+        suggestedBinding: startIsDragged
+          ? start.element
+          : endIsDragged
+          ? end.element
+          : null,
+      },
+    };
+  }
+
+  if (startIsDragged === endIsDragged) {
+    return {
+      positions: naiveDraggingPoints,
+    };
+  }
+
+  // Generate the next bindings for the arrow
+  const updates: PointMoveOtherUpdates = {
+    suggestedBinding: null,
+  };
+  if (start.mode === null) {
+    updates.startBinding = null;
+  } else if (start.mode) {
+    updates.startBinding = {
+      elementId: start.element.id,
+      mode: start.mode,
+      ...calculateFixedPointForNonElbowArrowBinding(
+        element,
+        start.element,
+        "start",
+        elementsMap,
+        start.focusPoint,
+      ),
+    };
+
+    if (
+      startIsDragged &&
+      (updates.startBinding.mode === "orbit" ||
+        !getFeatureFlag("COMPLEX_BINDINGS"))
+    ) {
+      updates.suggestedBinding = start.element;
+    }
+  } else if (startIsDragged) {
+    updates.suggestedBinding = app.state.suggestedBinding;
+  }
+
+  if (end.mode === null) {
+    updates.endBinding = null;
+  } else if (end.mode) {
+    updates.endBinding = {
+      elementId: end.element.id,
+      mode: end.mode,
+      ...calculateFixedPointForNonElbowArrowBinding(
+        element,
+        end.element,
+        "end",
+        elementsMap,
+        end.focusPoint,
+      ),
+    };
+
+    if (
+      endIsDragged &&
+      (updates.endBinding.mode === "orbit" ||
+        !getFeatureFlag("COMPLEX_BINDINGS"))
+    ) {
+      updates.suggestedBinding = end.element;
+    }
+  } else if (endIsDragged) {
+    updates.suggestedBinding = app.state.suggestedBinding;
+  }
+
+  // Simulate the updated arrow for the bind point calculation
+  const offsetStartLocalPoint = startIsDragged
+    ? pointFrom<LocalPoint>(
+        element.points[0][0] + deltaX,
+        element.points[0][1] + deltaY,
+      )
+    : element.points[0];
+  const offsetEndLocalPoint = endIsDragged
+    ? pointFrom<LocalPoint>(
+        element.points[element.points.length - 1][0] + deltaX,
+        element.points[element.points.length - 1][1] + deltaY,
+      )
+    : element.points[element.points.length - 1];
+  const nextArrow = {
+    ...element,
+    points: [
+      offsetStartLocalPoint,
+      ...element.points.slice(1, -1),
+      offsetEndLocalPoint,
+    ],
+    startBinding:
+      updates.startBinding === undefined
+        ? element.startBinding
+        : updates.startBinding === null
+        ? null
+        : updates.startBinding,
+    endBinding:
+      updates.endBinding === undefined
+        ? element.endBinding
+        : updates.endBinding === null
+        ? null
+        : updates.endBinding,
+  };
+
+  // We need to use a custom intersector to ensure that if there is a big "jump"
+  // in the arrow's position, we can position it with outline avoidance
+  // pixel-perfectly and avoid "dancing" arrows.
+  const customIntersector =
+    start.focusPoint && end.focusPoint
+      ? lineSegment(start.focusPoint, end.focusPoint)
+      : undefined;
+
+  // Needed to handle a special case where an existing arrow is dragged over
+  // the same element it is bound to on the other side
+  const startIsDraggingOverEndElement =
+    element.endBinding &&
+    nextArrow.startBinding &&
+    startIsDragged &&
+    nextArrow.startBinding.elementId === element.endBinding.elementId;
+  const endIsDraggingOverStartElement =
+    element.startBinding &&
+    nextArrow.endBinding &&
+    endIsDragged &&
+    element.startBinding.elementId === nextArrow.endBinding.elementId;
+
+  // We need to update the non-dragged point too if bound,
+  // so we look up the old binding to trigger updateBoundPoint
+  const endBindable = nextArrow.endBinding
+    ? end.element ??
+      (elementsMap.get(
+        nextArrow.endBinding.elementId,
+      )! as ExcalidrawBindableElement)
+    : null;
+
+  const endLocalPoint = startIsDraggingOverEndElement
+    ? nextArrow.points[nextArrow.points.length - 1]
+    : endIsDraggingOverStartElement &&
+      app.state.bindMode !== "inside" &&
+      getFeatureFlag("COMPLEX_BINDINGS")
+    ? nextArrow.points[0]
+    : endBindable
+    ? updateBoundPoint(
+        element,
+        "endBinding",
+        nextArrow.endBinding,
+        endBindable,
+        elementsMap,
+        customIntersector,
+      ) || nextArrow.points[nextArrow.points.length - 1]
+    : nextArrow.points[nextArrow.points.length - 1];
+
+  // We need to keep the simulated next arrow up-to-date, because
+  // updateBoundPoint looks at the opposite point
+  nextArrow.points[nextArrow.points.length - 1] = endLocalPoint;
+
+  // We need to update the non-dragged point too if bound,
+  // so we look up the old binding to trigger updateBoundPoint
+  const startBindable = nextArrow.startBinding
+    ? start.element ??
+      (elementsMap.get(
+        nextArrow.startBinding.elementId,
+      )! as ExcalidrawBindableElement)
+    : null;
+
+  const startLocalPoint =
+    endIsDraggingOverStartElement && getFeatureFlag("COMPLEX_BINDINGS")
+      ? nextArrow.points[0]
+      : startIsDraggingOverEndElement &&
+        app.state.bindMode !== "inside" &&
+        getFeatureFlag("COMPLEX_BINDINGS")
+      ? nextArrow.points[nextArrow.points.length - 1]
+      : startBindable
+      ? updateBoundPoint(
+          element,
+          "startBinding",
+          nextArrow.startBinding,
+          startBindable,
+          elementsMap,
+          customIntersector,
+        ) || nextArrow.points[0]
+      : nextArrow.points[0];
+
+  const endChanged =
+    pointDistance(
+      endLocalPoint,
+      nextArrow.points[nextArrow.points.length - 1],
+    ) !== 0;
+  const startChanged =
+    pointDistance(startLocalPoint, nextArrow.points[0]) !== 0;
+
+  const indicesSet = new Set(selectedPointsIndices);
+  if (startBindable && startChanged) {
+    indicesSet.add(0);
+  }
+  if (endBindable && endChanged) {
+    indicesSet.add(element.points.length - 1);
+  }
+  const indices = Array.from(indicesSet);
+
+  return {
+    updates:
+      updates.startBinding || updates.suggestedBinding
+        ? {
+            startBinding: updates.startBinding,
+            suggestedBinding: updates.suggestedBinding,
+          }
+        : undefined,
+    positions: new Map(
+      indices.map((idx) => {
+        return [
+          idx,
+          idx === 0
+            ? {
+                point: startLocalPoint,
+                isDragging: true,
+              }
+            : idx === element.points.length - 1
+            ? {
+                point: endLocalPoint,
+                isDragging: true,
+              }
+            : naiveDraggingPoints.get(idx)!,
+        ];
+      }),
+    ),
+  };
+};
+
+const determineCustomLinearAngle = (
+  pivotPoint: LocalPoint,
+  draggedPoint: LocalPoint,
+) =>
+  Math.atan2(draggedPoint[1] - pivotPoint[1], draggedPoint[0] - pivotPoint[0]);
diff --git a/packages/element/src/mutateElement.ts b/packages/element/src/mutateElement.ts
index 0fc3e0bb8f..c45c6df08c 100644
--- a/packages/element/src/mutateElement.ts
+++ b/packages/element/src/mutateElement.ts
@@ -46,16 +46,13 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
 
   // casting to any because can't use `in` operator
   // (see https://github.com/microsoft/TypeScript/issues/21732)
-  const { points, fixedSegments, startBinding, endBinding, fileId } =
-    updates as any;
+  const { points, fixedSegments, fileId } = updates as any;
 
   if (
     isElbowArrow(element) &&
     (Object.keys(updates).length === 0 || // normalization case
       typeof points !== "undefined" || // repositioning
-      typeof fixedSegments !== "undefined" || // segment fixing
-      typeof startBinding !== "undefined" ||
-      typeof endBinding !== "undefined") // manual binding to element
+      typeof fixedSegments !== "undefined") // segment fixing
   ) {
     updates = {
       ...updates,
diff --git a/packages/element/src/newElement.ts b/packages/element/src/newElement.ts
index 5d49c47cdc..3d1ea382a5 100644
--- a/packages/element/src/newElement.ts
+++ b/packages/element/src/newElement.ts
@@ -562,7 +562,6 @@ export const newFreeDrawElement = (
     points: opts.points || [],
     pressures: opts.pressures || [],
     simulatePressure: opts.simulatePressure,
-    lastCommittedPoint: null,
   };
 };
 
@@ -576,7 +575,7 @@ export const newLinearElement = (
   const element = {
     ..._newElementBase<ExcalidrawLinearElement>(opts.type, opts),
     points: opts.points || [],
-    lastCommittedPoint: null,
+
     startBinding: null,
     endBinding: null,
     startArrowhead: null,
@@ -611,7 +610,6 @@ export const newArrowElement = <T extends boolean>(
     return {
       ..._newElementBase<ExcalidrawElbowArrowElement>(opts.type, opts),
       points: opts.points || [],
-      lastCommittedPoint: null,
       startBinding: null,
       endBinding: null,
       startArrowhead: opts.startArrowhead || null,
@@ -626,7 +624,6 @@ export const newArrowElement = <T extends boolean>(
   return {
     ..._newElementBase<ExcalidrawArrowElement>(opts.type, opts),
     points: opts.points || [],
-    lastCommittedPoint: null,
     startBinding: null,
     endBinding: null,
     startArrowhead: opts.startArrowhead || null,
diff --git a/packages/element/src/renderElement.ts b/packages/element/src/renderElement.ts
index 209d022413..fd3e00f7fd 100644
--- a/packages/element/src/renderElement.ts
+++ b/packages/element/src/renderElement.ts
@@ -98,7 +98,7 @@ const isPendingImageElement = (
 const shouldResetImageFilter = (
   element: ExcalidrawElement,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState,
+  appState: StaticCanvasAppState | InteractiveCanvasAppState,
 ) => {
   return (
     appState.theme === THEME.DARK &&
@@ -225,7 +225,7 @@ const generateElementCanvas = (
   elementsMap: NonDeletedSceneElementsMap,
   zoom: Zoom,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState,
+  appState: StaticCanvasAppState | InteractiveCanvasAppState,
 ): ExcalidrawElementWithCanvas | null => {
   const canvas = document.createElement("canvas");
   const context = canvas.getContext("2d")!;
@@ -277,7 +277,7 @@ const generateElementCanvas = (
     context.filter = IMAGE_INVERT_FILTER;
   }
 
-  drawElementOnCanvas(element, rc, context, renderConfig, appState);
+  drawElementOnCanvas(element, rc, context, renderConfig);
 
   context.restore();
 
@@ -420,7 +420,6 @@ const drawElementOnCanvas = (
   rc: RoughCanvas,
   context: CanvasRenderingContext2D,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState,
 ) => {
   switch (element.type) {
     case "rectangle":
@@ -566,7 +565,7 @@ const generateElementWithCanvas = (
   element: NonDeletedExcalidrawElement,
   elementsMap: NonDeletedSceneElementsMap,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState,
+  appState: StaticCanvasAppState | InteractiveCanvasAppState,
 ) => {
   const zoom: Zoom = renderConfig
     ? appState.zoom
@@ -623,7 +622,7 @@ const drawElementFromCanvas = (
   elementWithCanvas: ExcalidrawElementWithCanvas,
   context: CanvasRenderingContext2D,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState,
+  appState: StaticCanvasAppState | InteractiveCanvasAppState,
   allElementsMap: NonDeletedSceneElementsMap,
 ) => {
   const element = elementWithCanvas.element;
@@ -741,7 +740,7 @@ export const renderElement = (
   rc: RoughCanvas,
   context: CanvasRenderingContext2D,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState,
+  appState: StaticCanvasAppState | InteractiveCanvasAppState,
 ) => {
   const reduceAlphaForSelection =
     appState.openDialog?.name === "elementLinkSelector" &&
@@ -811,7 +810,7 @@ export const renderElement = (
         context.translate(cx, cy);
         context.rotate(element.angle);
         context.translate(-shiftX, -shiftY);
-        drawElementOnCanvas(element, rc, context, renderConfig, appState);
+        drawElementOnCanvas(element, rc, context, renderConfig);
         context.restore();
       } else {
         const elementWithCanvas = generateElementWithCanvas(
@@ -904,13 +903,7 @@ export const renderElement = (
 
           tempCanvasContext.translate(-shiftX, -shiftY);
 
-          drawElementOnCanvas(
-            element,
-            tempRc,
-            tempCanvasContext,
-            renderConfig,
-            appState,
-          );
+          drawElementOnCanvas(element, tempRc, tempCanvasContext, renderConfig);
 
           tempCanvasContext.translate(shiftX, shiftY);
 
@@ -949,7 +942,7 @@ export const renderElement = (
           }
 
           context.translate(-shiftX, -shiftY);
-          drawElementOnCanvas(element, rc, context, renderConfig, appState);
+          drawElementOnCanvas(element, rc, context, renderConfig);
         }
 
         context.restore();
@@ -1130,7 +1123,7 @@ export function getFreedrawOutlinePoints(element: ExcalidrawFreeDrawElement) {
     smoothing: 0.5,
     streamline: 0.5,
     easing: (t) => Math.sin((t * Math.PI) / 2), // https://easings.net/#easeOutSine
-    last: !!element.lastCommittedPoint, // LastCommittedPoint is added on pointerup
+    last: true,
   };
 
   return getStroke(inputPoints as number[][], options) as [number, number][];
diff --git a/packages/element/src/resizeElements.ts b/packages/element/src/resizeElements.ts
index 4952151c32..a0d647eed8 100644
--- a/packages/element/src/resizeElements.ts
+++ b/packages/element/src/resizeElements.ts
@@ -21,7 +21,11 @@ import type { PointerDownState } from "@excalidraw/excalidraw/types";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import { getArrowLocalFixedPoints, updateBoundElements } from "./binding";
+import {
+  getArrowLocalFixedPoints,
+  unbindBindingElement,
+  updateBoundElements,
+} from "./binding";
 import {
   getElementAbsoluteCoords,
   getCommonBounds,
@@ -47,6 +51,7 @@ import {
 import { wrapText } from "./textWrapping";
 import {
   isArrowElement,
+  isBindingElement,
   isBoundToContainer,
   isElbowArrow,
   isFrameLikeElement,
@@ -75,7 +80,9 @@ import type {
   ExcalidrawImageElement,
   ElementsMap,
   ExcalidrawElbowArrowElement,
+  ExcalidrawArrowElement,
 } from "./types";
+import type { ElementUpdate } from "./mutateElement";
 
 // Returns true when transform (resizing/rotation) happened
 export const transformElements = (
@@ -221,7 +228,25 @@ const rotateSingleElement = (
   }
   const boundTextElementId = getBoundTextElementId(element);
 
-  scene.mutateElement(element, { angle });
+  let update: ElementUpdate<NonDeletedExcalidrawElement> = {
+    angle,
+  };
+
+  if (isBindingElement(element)) {
+    update = {
+      ...update,
+    } as ElementUpdate<ExcalidrawArrowElement>;
+
+    if (element.startBinding) {
+      unbindBindingElement(element, "start", scene);
+    }
+    if (element.endBinding) {
+      unbindBindingElement(element, "end", scene);
+    }
+  }
+
+  scene.mutateElement(element, update);
+
   if (boundTextElementId) {
     const textElement =
       scene.getElement<ExcalidrawTextElementWithContainer>(boundTextElementId);
@@ -395,6 +420,11 @@ const rotateMultipleElements = (
     centerAngle -= centerAngle % SHIFT_LOCKING_ANGLE;
   }
 
+  const rotatedElementsMap = new Map<
+    ExcalidrawElement["id"],
+    NonDeletedExcalidrawElement
+  >(elements.map((element) => [element.id, element]));
+
   for (const element of elements) {
     if (!isFrameLikeElement(element)) {
       const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
@@ -425,6 +455,19 @@ const rotateMultipleElements = (
         simultaneouslyUpdated: elements,
       });
 
+      if (isBindingElement(element)) {
+        if (element.startBinding) {
+          if (!rotatedElementsMap.has(element.startBinding.elementId)) {
+            unbindBindingElement(element, "start", scene);
+          }
+        }
+        if (element.endBinding) {
+          if (!rotatedElementsMap.has(element.endBinding.elementId)) {
+            unbindBindingElement(element, "end", scene);
+          }
+        }
+      }
+
       const boundText = getBoundTextElement(element, elementsMap);
       if (boundText && !isArrowElement(element)) {
         const { x, y } = computeBoundTextPosition(
@@ -838,13 +881,32 @@ export const resizeSingleElement = (
     Number.isFinite(newOrigin.x) &&
     Number.isFinite(newOrigin.y)
   ) {
-    const updates = {
+    let updates: ElementUpdate<ExcalidrawElement> = {
       ...newOrigin,
       width: Math.abs(nextWidth),
       height: Math.abs(nextHeight),
       ...rescaledPoints,
     };
 
+    if (isBindingElement(latestElement)) {
+      if (latestElement.startBinding) {
+        updates = {
+          ...updates,
+        } as ElementUpdate<ExcalidrawArrowElement>;
+
+        if (latestElement.startBinding) {
+          unbindBindingElement(latestElement, "start", scene);
+        }
+      }
+
+      if (latestElement.endBinding) {
+        updates = {
+          ...updates,
+          endBinding: null,
+        } as ElementUpdate<ExcalidrawArrowElement>;
+      }
+    }
+
     scene.mutateElement(latestElement, updates, {
       informMutation: shouldInformMutation,
       isDragging: false,
@@ -862,10 +924,7 @@ export const resizeSingleElement = (
       shouldMaintainAspectRatio,
     );
 
-    updateBoundElements(latestElement, scene, {
-      // TODO: confirm with MARK if this actually makes sense
-      newSize: { width: nextWidth, height: nextHeight },
-    });
+    updateBoundElements(latestElement, scene);
   }
 };
 
@@ -1399,20 +1458,36 @@ export const resizeMultipleElements = (
     }
 
     const elementsToUpdate = elementsAndUpdates.map(({ element }) => element);
+    const resizedElementsMap = new Map<
+      ExcalidrawElement["id"],
+      NonDeletedExcalidrawElement
+    >(elementsAndUpdates.map(({ element }) => [element.id, element]));
 
     for (const {
       element,
       update: { boundTextFontSize, ...update },
     } of elementsAndUpdates) {
-      const { width, height, angle } = update;
+      const { angle } = update;
 
       scene.mutateElement(element, update);
 
       updateBoundElements(element, scene, {
         simultaneouslyUpdated: elementsToUpdate,
-        newSize: { width, height },
       });
 
+      if (isBindingElement(element)) {
+        if (element.startBinding) {
+          if (!resizedElementsMap.has(element.startBinding.elementId)) {
+            unbindBindingElement(element, "start", scene);
+          }
+        }
+        if (element.endBinding) {
+          if (!resizedElementsMap.has(element.endBinding.elementId)) {
+            unbindBindingElement(element, "end", scene);
+          }
+        }
+      }
+
       const boundTextElement = getBoundTextElement(element, elementsMap);
       if (boundTextElement && boundTextFontSize) {
         scene.mutateElement(boundTextElement, {
diff --git a/packages/element/src/resizeTest.ts b/packages/element/src/resizeTest.ts
index 411dcf9a7b..4257d4a7e8 100644
--- a/packages/element/src/resizeTest.ts
+++ b/packages/element/src/resizeTest.ts
@@ -5,17 +5,20 @@ import {
   type Radians,
 } from "@excalidraw/math";
 
-import { SIDE_RESIZING_THRESHOLD } from "@excalidraw/common";
+import {
+  SIDE_RESIZING_THRESHOLD,
+  type EditorInterface,
+} from "@excalidraw/common";
 
 import type { GlobalPoint, LineSegment, LocalPoint } from "@excalidraw/math";
 
-import type { AppState, Device, Zoom } from "@excalidraw/excalidraw/types";
+import type { AppState, Zoom } from "@excalidraw/excalidraw/types";
 
 import { getElementAbsoluteCoords } from "./bounds";
 import {
   getTransformHandlesFromCoords,
   getTransformHandles,
-  getOmitSidesForDevice,
+  getOmitSidesForEditorInterface,
   canResizeFromSides,
 } from "./transformHandles";
 import { isImageElement, isLinearElement } from "./typeChecks";
@@ -51,7 +54,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
   y: number,
   zoom: Zoom,
   pointerType: PointerType,
-  device: Device,
+  editorInterface: EditorInterface,
 ): MaybeTransformHandleType => {
   if (!appState.selectedElementIds[element.id]) {
     return false;
@@ -63,7 +66,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
       zoom,
       elementsMap,
       pointerType,
-      getOmitSidesForDevice(device),
+      getOmitSidesForEditorInterface(editorInterface),
     );
 
   if (
@@ -86,7 +89,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
     return filter[0] as TransformHandleType;
   }
 
-  if (canResizeFromSides(device)) {
+  if (canResizeFromSides(editorInterface)) {
     const [x1, y1, x2, y2, cx, cy] = getElementAbsoluteCoords(
       element,
       elementsMap,
@@ -132,7 +135,7 @@ export const getElementWithTransformHandleType = (
   zoom: Zoom,
   pointerType: PointerType,
   elementsMap: ElementsMap,
-  device: Device,
+  editorInterface: EditorInterface,
 ) => {
   return elements.reduce((result, element) => {
     if (result) {
@@ -146,7 +149,7 @@ export const getElementWithTransformHandleType = (
       scenePointerY,
       zoom,
       pointerType,
-      device,
+      editorInterface,
     );
     return transformHandleType ? { element, transformHandleType } : null;
   }, null as { element: NonDeletedExcalidrawElement; transformHandleType: MaybeTransformHandleType } | null);
@@ -160,14 +163,14 @@ export const getTransformHandleTypeFromCoords = <
   scenePointerY: number,
   zoom: Zoom,
   pointerType: PointerType,
-  device: Device,
+  editorInterface: EditorInterface,
 ): MaybeTransformHandleType => {
   const transformHandles = getTransformHandlesFromCoords(
     [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2],
     0 as Radians,
     zoom,
     pointerType,
-    getOmitSidesForDevice(device),
+    getOmitSidesForEditorInterface(editorInterface),
   );
 
   const found = Object.keys(transformHandles).find((key) => {
@@ -183,7 +186,7 @@ export const getTransformHandleTypeFromCoords = <
     return found as MaybeTransformHandleType;
   }
 
-  if (canResizeFromSides(device)) {
+  if (canResizeFromSides(editorInterface)) {
     const cx = (x1 + x2) / 2;
     const cy = (y1 + y2) / 2;
 
diff --git a/packages/element/src/transformHandles.ts b/packages/element/src/transformHandles.ts
index b311e3af83..0b9458da63 100644
--- a/packages/element/src/transformHandles.ts
+++ b/packages/element/src/transformHandles.ts
@@ -1,8 +1,6 @@
 import {
   DEFAULT_TRANSFORM_HANDLE_SPACING,
-  isAndroid,
-  isIOS,
-  isMobileOrTablet,
+  type EditorInterface,
 } from "@excalidraw/common";
 
 import { pointFrom, pointRotateRads } from "@excalidraw/math";
@@ -10,7 +8,6 @@ import { pointFrom, pointRotateRads } from "@excalidraw/math";
 import type { Radians } from "@excalidraw/math";
 
 import type {
-  Device,
   InteractiveCanvasAppState,
   Zoom,
 } from "@excalidraw/excalidraw/types";
@@ -112,20 +109,21 @@ const generateTransformHandle = (
   return [xx - width / 2, yy - height / 2, width, height];
 };
 
-export const canResizeFromSides = (device: Device) => {
-  if (device.viewport.isMobile) {
-    return false;
-  }
-
-  if (device.isTouchScreen && (isAndroid || isIOS)) {
+export const canResizeFromSides = (editorInterface: EditorInterface) => {
+  if (
+    editorInterface.formFactor === "phone" &&
+    editorInterface.userAgent.isMobileDevice
+  ) {
     return false;
   }
 
   return true;
 };
 
-export const getOmitSidesForDevice = (device: Device) => {
-  if (canResizeFromSides(device)) {
+export const getOmitSidesForEditorInterface = (
+  editorInterface: EditorInterface,
+) => {
+  if (canResizeFromSides(editorInterface)) {
     return DEFAULT_OMIT_SIDES;
   }
 
@@ -330,8 +328,12 @@ export const getTransformHandles = (
 export const hasBoundingBox = (
   elements: readonly NonDeletedExcalidrawElement[],
   appState: InteractiveCanvasAppState,
+  editorInterface: EditorInterface,
 ) => {
-  if (appState.selectedLinearElement?.isEditing) {
+  if (
+    appState.selectedLinearElement?.isEditing ||
+    appState.selectedLinearElement?.isDragging
+  ) {
     return false;
   }
   if (elements.length > 1) {
@@ -348,5 +350,5 @@ export const hasBoundingBox = (
 
   // on mobile/tablet we currently don't show bbox because of resize issues
   // (also prob best for simplicity's sake)
-  return element.points.length > 2 && !isMobileOrTablet();
+  return element.points.length > 2 && !editorInterface.userAgent.isMobileDevice;
 };
diff --git a/packages/element/src/typeChecks.ts b/packages/element/src/typeChecks.ts
index 8433863f29..ee4747bf4c 100644
--- a/packages/element/src/typeChecks.ts
+++ b/packages/element/src/typeChecks.ts
@@ -28,8 +28,6 @@ import type {
   ExcalidrawArrowElement,
   ExcalidrawElbowArrowElement,
   ExcalidrawLineElement,
-  PointBinding,
-  FixedPointBinding,
   ExcalidrawFlowchartNodeElement,
   ExcalidrawLinearElementSubType,
 } from "./types";
@@ -163,7 +161,7 @@ export const isLinearElementType = (
 export const isBindingElement = (
   element?: ExcalidrawElement | null,
   includeLocked = true,
-): element is ExcalidrawLinearElement => {
+): element is ExcalidrawArrowElement => {
   return (
     element != null &&
     (!element.locked || includeLocked === true) &&
@@ -355,15 +353,6 @@ export const getDefaultRoundnessTypeForElement = (
   return null;
 };
 
-export const isFixedPointBinding = (
-  binding: PointBinding | FixedPointBinding,
-): binding is FixedPointBinding => {
-  return (
-    Object.hasOwn(binding, "fixedPoint") &&
-    (binding as FixedPointBinding).fixedPoint != null
-  );
-};
-
 // TODO: Move this to @excalidraw/math
 export const isBounds = (box: unknown): box is Bounds =>
   Array.isArray(box) &&
diff --git a/packages/element/src/types.ts b/packages/element/src/types.ts
index 7ac9dca1c0..0724fb1dfd 100644
--- a/packages/element/src/types.ts
+++ b/packages/element/src/types.ts
@@ -288,23 +288,22 @@ export type ExcalidrawTextElementWithContainer = {
 
 export type FixedPoint = [number, number];
 
-export type PointBinding = {
-  elementId: ExcalidrawBindableElement["id"];
-  focus: number;
-  gap: number;
-};
+export type BindMode = "inside" | "orbit" | "skip";
 
-export type FixedPointBinding = Merge<
-  PointBinding,
-  {
-    // Represents the fixed point binding information in form of a vertical and
-    // horizontal ratio (i.e. a percentage value in the 0.0-1.0 range). This ratio
-    // gives the user selected fixed point by multiplying the bound element width
-    // with fixedPoint[0] and the bound element height with fixedPoint[1] to get the
-    // bound element-local point coordinate.
-    fixedPoint: FixedPoint;
-  }
->;
+export type FixedPointBinding = {
+  elementId: ExcalidrawBindableElement["id"];
+
+  // Represents the fixed point binding information in form of a vertical and
+  // horizontal ratio (i.e. a percentage value in the 0.0-1.0 range). This ratio
+  // gives the user selected fixed point by multiplying the bound element width
+  // with fixedPoint[0] and the bound element height with fixedPoint[1] to get the
+  // bound element-local point coordinate.
+  fixedPoint: FixedPoint;
+
+  // Determines whether the arrow remains outside the shape or is allowed to
+  // go all the way inside the shape up to the exact fixed point.
+  mode: BindMode;
+};
 
 type Index = number;
 
@@ -331,9 +330,8 @@ export type ExcalidrawLinearElement = _ExcalidrawElementBase &
   Readonly<{
     type: "line" | "arrow";
     points: readonly LocalPoint[];
-    lastCommittedPoint: LocalPoint | null;
-    startBinding: PointBinding | null;
-    endBinding: PointBinding | null;
+    startBinding: FixedPointBinding | null;
+    endBinding: FixedPointBinding | null;
     startArrowhead: Arrowhead | null;
     endArrowhead: Arrowhead | null;
   }>;
@@ -360,9 +358,9 @@ export type ExcalidrawElbowArrowElement = Merge<
   ExcalidrawArrowElement,
   {
     elbowed: true;
+    fixedSegments: readonly FixedSegment[] | null;
     startBinding: FixedPointBinding | null;
     endBinding: FixedPointBinding | null;
-    fixedSegments: readonly FixedSegment[] | null;
     /**
      * Marks that the 3rd point should be used as the 2nd point of the arrow in
      * order to temporarily hide the first segment of the arrow without losing
@@ -388,7 +386,6 @@ export type ExcalidrawFreeDrawElement = _ExcalidrawElementBase &
     points: readonly LocalPoint[];
     pressures: readonly number[];
     simulatePressure: boolean;
-    lastCommittedPoint: LocalPoint | null;
   }>;
 
 export type FileId = string & { _brand: "FileId" };
diff --git a/packages/element/src/utils.ts b/packages/element/src/utils.ts
index 44b0fe79c6..c8e6889864 100644
--- a/packages/element/src/utils.ts
+++ b/packages/element/src/utils.ts
@@ -1,6 +1,7 @@
 import {
   DEFAULT_ADAPTIVE_RADIUS,
   DEFAULT_PROPORTIONAL_RADIUS,
+  invariant,
   LINE_CONFIRM_THRESHOLD,
   ROUNDNESS,
 } from "@excalidraw/common";
@@ -10,10 +11,17 @@ import {
   curveCatmullRomCubicApproxPoints,
   curveOffsetPoints,
   lineSegment,
+  lineSegmentIntersectionPoints,
   pointDistance,
   pointFrom,
   pointFromArray,
+  pointFromVector,
+  pointRotateRads,
+  pointTranslate,
   rectangle,
+  vectorFromPoint,
+  vectorNormalize,
+  vectorScale,
   type GlobalPoint,
 } from "@excalidraw/math";
 
@@ -21,11 +29,17 @@ import type { Curve, LineSegment, LocalPoint } from "@excalidraw/math";
 
 import type { NormalizedZoomValue, Zoom } from "@excalidraw/excalidraw/types";
 
-import { getDiamondPoints } from "./bounds";
+import { elementCenterPoint, getDiamondPoints } from "./bounds";
 
 import { generateLinearCollisionShape } from "./shape";
 
+import { isPointInElement } from "./collision";
+import { LinearElementEditor } from "./linearElementEditor";
+import { isRectangularElement } from "./typeChecks";
+
 import type {
+  ElementsMap,
+  ExcalidrawArrowElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
   ExcalidrawFreeDrawElement,
@@ -400,20 +414,10 @@ export function deconstructDiamondElement(
     ), // TOP
   ];
 
-  const corners =
-    offset > 0
-      ? baseCorners.map(
-          (corner) =>
-            curveCatmullRomCubicApproxPoints(
-              curveOffsetPoints(corner, offset),
-            )!,
-        )
-      : [
-          [baseCorners[0]],
-          [baseCorners[1]],
-          [baseCorners[2]],
-          [baseCorners[3]],
-        ];
+  const corners = baseCorners.map(
+    (corner) =>
+      curveCatmullRomCubicApproxPoints(curveOffsetPoints(corner, offset))!,
+  );
 
   const sides = [
     lineSegment<GlobalPoint>(
@@ -481,3 +485,136 @@ export const getCornerRadius = (x: number, element: ExcalidrawElement) => {
 
   return 0;
 };
+
+const getDiagonalsForBindableElement = (
+  element: ExcalidrawElement,
+  elementsMap: ElementsMap,
+) => {
+  // for rectangles, shrink the diagonals a bit because there's something
+  // going on with the focus points around the corners. Ask Mark for details.
+  const OFFSET_PX = element.type === "rectangle" ? 15 : 0;
+  const shrinkSegment = (seg: LineSegment<GlobalPoint>) => {
+    const v = vectorNormalize(vectorFromPoint(seg[1], seg[0]));
+    const offset = vectorScale(v, OFFSET_PX);
+    return lineSegment<GlobalPoint>(
+      pointTranslate(seg[0], offset),
+      pointTranslate(seg[1], vectorScale(offset, -1)),
+    );
+  };
+
+  const center = elementCenterPoint(element, elementsMap);
+  const diagonalOne = shrinkSegment(
+    isRectangularElement(element)
+      ? lineSegment<GlobalPoint>(
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x, element.y),
+            center,
+            element.angle,
+          ),
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width,
+              element.y + element.height,
+            ),
+            center,
+            element.angle,
+          ),
+        )
+      : lineSegment<GlobalPoint>(
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
+            center,
+            element.angle,
+          ),
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width / 2,
+              element.y + element.height,
+            ),
+            center,
+            element.angle,
+          ),
+        ),
+  );
+  const diagonalTwo = shrinkSegment(
+    isRectangularElement(element)
+      ? lineSegment<GlobalPoint>(
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x + element.width, element.y),
+            center,
+            element.angle,
+          ),
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x, element.y + element.height),
+            center,
+            element.angle,
+          ),
+        )
+      : lineSegment<GlobalPoint>(
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
+            center,
+            element.angle,
+          ),
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width,
+              element.y + element.height / 2,
+            ),
+            center,
+            element.angle,
+          ),
+        ),
+  );
+
+  return [diagonalOne, diagonalTwo];
+};
+
+export const projectFixedPointOntoDiagonal = (
+  arrow: ExcalidrawArrowElement,
+  point: GlobalPoint,
+  element: ExcalidrawElement,
+  startOrEnd: "start" | "end",
+  elementsMap: ElementsMap,
+): GlobalPoint | null => {
+  invariant(arrow.points.length >= 2, "Arrow must have at least two points");
+  if (arrow.width < 3 && arrow.height < 3) {
+    return null;
+  }
+
+  const [diagonalOne, diagonalTwo] = getDiagonalsForBindableElement(
+    element,
+    elementsMap,
+  );
+
+  const a = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+    arrow,
+    startOrEnd === "start" ? 1 : arrow.points.length - 2,
+    elementsMap,
+  );
+  const b = pointFromVector<GlobalPoint>(
+    vectorScale(
+      vectorFromPoint(point, a),
+      2 * pointDistance(a, point) +
+        Math.max(
+          pointDistance(diagonalOne[0], diagonalOne[1]),
+          pointDistance(diagonalTwo[0], diagonalTwo[1]),
+        ),
+    ),
+    a,
+  );
+  const intersector = lineSegment<GlobalPoint>(point, b);
+  const p1 = lineSegmentIntersectionPoints(diagonalOne, intersector);
+  const p2 = lineSegmentIntersectionPoints(diagonalTwo, intersector);
+  const d1 = p1 && pointDistance(a, p1);
+  const d2 = p2 && pointDistance(a, p2);
+
+  let p = null;
+  if (d1 != null && d2 != null) {
+    p = d1 < d2 ? p1 : p2;
+  } else {
+    p = p1 || p2 || null;
+  }
+
+  return p && isPointInElement(p, element, elementsMap) ? p : null;
+};
diff --git a/packages/element/src/zindex.ts b/packages/element/src/zindex.ts
index fed9378253..0bb0cda9c2 100644
--- a/packages/element/src/zindex.ts
+++ b/packages/element/src/zindex.ts
@@ -1,18 +1,25 @@
 import { arrayToMap, findIndex, findLastIndex } from "@excalidraw/common";
 
 import type { AppState } from "@excalidraw/excalidraw/types";
+import type { GlobalPoint } from "@excalidraw/math";
 
-import { isFrameLikeElement } from "./typeChecks";
-
+import { isFrameLikeElement, isTextElement } from "./typeChecks";
 import { getElementsInGroup } from "./groups";
-
 import { syncMovedIndices } from "./fractionalIndex";
-
 import { getSelectedElements } from "./selection";
+import { getBoundTextElement, getContainerElement } from "./textElement";
+import { getHoveredElementForBinding } from "./collision";
 
 import type { Scene } from "./Scene";
-
-import type { ExcalidrawElement, ExcalidrawFrameLikeElement } from "./types";
+import type {
+  ExcalidrawArrowElement,
+  ExcalidrawElement,
+  ExcalidrawFrameLikeElement,
+  NonDeletedExcalidrawElement,
+  NonDeletedSceneElementsMap,
+  Ordered,
+  OrderedExcalidrawElement,
+} from "./types";
 
 const isOfTargetFrame = (element: ExcalidrawElement, frameId: string) => {
   return element.frameId === frameId || element.id === frameId;
@@ -139,6 +146,51 @@ const getContiguousFrameRangeElements = (
   return allElements.slice(rangeStart, rangeEnd + 1);
 };
 
+/**
+ * Moves the arrow element above any bindable elements it intersects with or
+ * hovers over.
+ */
+export const moveArrowAboveBindable = (
+  point: GlobalPoint,
+  arrow: ExcalidrawArrowElement,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  elementsMap: NonDeletedSceneElementsMap,
+  scene: Scene,
+): readonly OrderedExcalidrawElement[] => {
+  const hoveredElement = getHoveredElementForBinding(
+    point,
+    elements,
+    elementsMap,
+  );
+
+  if (!hoveredElement) {
+    return elements;
+  }
+
+  const boundTextElement = getBoundTextElement(hoveredElement, elementsMap);
+  const containerElement = isTextElement(hoveredElement)
+    ? getContainerElement(hoveredElement, elementsMap)
+    : null;
+
+  const bindableIds = [
+    hoveredElement.id,
+    boundTextElement?.id,
+    containerElement?.id,
+  ].filter((id): id is NonDeletedExcalidrawElement["id"] => !!id);
+  const bindableIdx = elements.findIndex((el) => bindableIds.includes(el.id));
+  const arrowIdx = elements.findIndex((el) => el.id === arrow.id);
+
+  if (arrowIdx !== -1 && bindableIdx !== -1 && arrowIdx < bindableIdx) {
+    const updatedElements = Array.from(elements);
+    const arrow = updatedElements.splice(arrowIdx, 1)[0];
+    updatedElements.splice(bindableIdx, 0, arrow);
+
+    scene.replaceAllElements(updatedElements);
+  }
+
+  return elements;
+};
+
 /**
  * Returns next candidate index that's available to be moved to. Currently that
  *  is a non-deleted element, and not inside a group (unless we're editing it).
diff --git a/packages/element/tests/binding.test.tsx b/packages/element/tests/binding.test.tsx
index 8690439782..e2495c52f9 100644
--- a/packages/element/tests/binding.test.tsx
+++ b/packages/element/tests/binding.test.tsx
@@ -8,9 +8,13 @@ import { Excalidraw, isLinearElement } from "@excalidraw/excalidraw";
 
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { UI, Pointer, Keyboard } from "@excalidraw/excalidraw/tests/helpers/ui";
-import { fireEvent, render } from "@excalidraw/excalidraw/tests/test-utils";
+import {
+  act,
+  fireEvent,
+  render,
+} from "@excalidraw/excalidraw/tests/test-utils";
 
-import { LinearElementEditor } from "@excalidraw/element";
+import { defaultLang, setLanguage } from "@excalidraw/excalidraw/i18n";
 
 import { getTransformHandles } from "../src/transformHandles";
 import {
@@ -18,459 +22,675 @@ import {
   TEXT_EDITOR_SELECTOR,
 } from "../../excalidraw/tests/queries/dom";
 
+import type {
+  ExcalidrawArrowElement,
+  ExcalidrawLinearElement,
+  FixedPointBinding,
+} from "../src/types";
+
 const { h } = window;
 
 const mouse = new Pointer("mouse");
 
-describe("element binding", () => {
-  beforeEach(async () => {
-    await render(<Excalidraw handleKeyboardGlobally={true} />);
-  });
+describe("binding for simple arrows", () => {
+  describe("when both endpoints are bound inside the same element", () => {
+    beforeEach(async () => {
+      mouse.reset();
 
-  it("should create valid binding if duplicate start/end points", async () => {
-    const rect = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      width: 50,
-      height: 50,
-    });
-    const arrow = API.createElement({
-      type: "arrow",
-      x: 100,
-      y: 0,
-      width: 100,
-      height: 1,
-      points: [
-        pointFrom(0, 0),
-        pointFrom(0, 0),
-        pointFrom(100, 0),
-        pointFrom(100, 0),
-      ],
-    });
-    API.setElements([rect, arrow]);
-    expect(arrow.startBinding).toBe(null);
-
-    // select arrow
-    mouse.clickAt(150, 0);
-
-    // move arrow start to potential binding position
-    mouse.downAt(100, 0);
-    mouse.moveTo(55, 0);
-    mouse.up(0, 0);
-
-    // Point selection is evaluated like the points are rendered,
-    // from right to left. So clicking on the first point should move the joint,
-    // not the start point.
-    expect(arrow.startBinding).toBe(null);
-
-    // Now that the start point is free, move it into overlapping position
-    mouse.downAt(100, 0);
-    mouse.moveTo(55, 0);
-    mouse.up(0, 0);
-
-    expect(API.getSelectedElements()).toEqual([arrow]);
-
-    expect(arrow.startBinding).toEqual({
-      elementId: rect.id,
-      focus: expect.toBeNonNaNNumber(),
-      gap: expect.toBeNonNaNNumber(),
+      await act(() => {
+        return setLanguage(defaultLang);
+      });
+      await render(<Excalidraw handleKeyboardGlobally={true} />);
     });
 
-    // Move the end point to the overlapping binding position
-    mouse.downAt(200, 0);
-    mouse.moveTo(55, 0);
-    mouse.up(0, 0);
+    it("should create an `inside` binding", () => {
+      // Create a rectangle
+      UI.clickTool("rectangle");
+      mouse.reset();
+      mouse.downAt(100, 100);
+      mouse.moveTo(200, 200);
+      mouse.up();
 
-    // Both the start and the end points should be bound
-    expect(arrow.startBinding).toEqual({
-      elementId: rect.id,
-      focus: expect.toBeNonNaNNumber(),
-      gap: expect.toBeNonNaNNumber(),
+      const rect = API.getSelectedElement();
+
+      // Draw arrow with endpoint inside the filled rectangle
+      UI.clickTool("arrow");
+      mouse.downAt(110, 110);
+      mouse.moveTo(160, 160);
+      mouse.up();
+
+      const arrow = API.getSelectedElement() as ExcalidrawLinearElement;
+      expect(arrow.x).toBe(110);
+      expect(arrow.y).toBe(110);
+
+      // Should bind to the rectangle since endpoint is inside
+      expect(arrow.startBinding?.elementId).toBe(rect.id);
+      expect(arrow.endBinding?.elementId).toBe(rect.id);
+
+      const startBinding = arrow.startBinding as FixedPointBinding;
+      expect(startBinding.fixedPoint[0]).toBeGreaterThanOrEqual(0);
+      expect(startBinding.fixedPoint[0]).toBeLessThanOrEqual(1);
+      expect(startBinding.fixedPoint[1]).toBeGreaterThanOrEqual(0);
+      expect(startBinding.fixedPoint[1]).toBeLessThanOrEqual(1);
+      expect(startBinding.mode).toBe("inside");
+
+      const endBinding = arrow.endBinding as FixedPointBinding;
+      expect(endBinding.fixedPoint[0]).toBeGreaterThanOrEqual(0);
+      expect(endBinding.fixedPoint[0]).toBeLessThanOrEqual(1);
+      expect(endBinding.fixedPoint[1]).toBeGreaterThanOrEqual(0);
+      expect(endBinding.fixedPoint[1]).toBeLessThanOrEqual(1);
+      expect(endBinding.mode).toBe("inside");
+
+      // Move the bindable
+      mouse.downAt(100, 150);
+      mouse.moveTo(280, 110);
+      mouse.up();
+
+      // Check if the arrow moved
+      expect(arrow.x).toBe(290);
+      expect(arrow.y).toBe(70);
+
+      // Restore bindable
+      mouse.reset();
+      mouse.downAt(280, 110);
+      mouse.moveTo(130, 110);
+      mouse.up();
+
+      // Move the start point of the arrow to check if
+      // the behavior remains the same for old arrows
+      mouse.reset();
+      mouse.downAt(110, 110);
+      mouse.moveTo(120, 120);
+      mouse.up();
+
+      // Move the bindable again
+      mouse.reset();
+      mouse.downAt(130, 110);
+      mouse.moveTo(280, 110);
+      mouse.up();
+
+      // Check if the arrow moved
+      expect(arrow.x).toBe(290);
+      expect(arrow.y).toBe(70);
     });
-    expect(arrow.endBinding).toEqual({
-      elementId: rect.id,
-      focus: expect.toBeNonNaNNumber(),
-      gap: expect.toBeNonNaNNumber(),
+
+    it("3+ point arrow should be dragged along with the bindable", () => {
+      // Create two rectangles as binding targets
+      const rectLeft = API.createElement({
+        type: "rectangle",
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+      });
+
+      const rectRight = API.createElement({
+        type: "rectangle",
+        x: 300,
+        y: 0,
+        width: 100,
+        height: 100,
+      });
+
+      // Create a non-elbowed arrow with inner points bound to different elements
+      const arrow = API.createElement({
+        type: "arrow",
+        x: 100,
+        y: 50,
+        width: 200,
+        height: 0,
+        points: [
+          pointFrom(0, 0), // start point
+          pointFrom(50, -20), // first inner point
+          pointFrom(150, 20), // second inner point
+          pointFrom(200, 0), // end point
+        ],
+        startBinding: {
+          elementId: rectLeft.id,
+          fixedPoint: [0.5, 0.5],
+          mode: "orbit",
+        },
+        endBinding: {
+          elementId: rectRight.id,
+          fixedPoint: [0.5, 0.5],
+          mode: "orbit",
+        },
+      });
+
+      API.setElements([rectLeft, rectRight, arrow]);
+
+      // Store original inner point positions
+      const originalInnerPoint1 = [...arrow.points[1]];
+      const originalInnerPoint2 = [...arrow.points[2]];
+
+      // Move the right rectangle down by 50 pixels
+      mouse.reset();
+      mouse.downAt(350, 50); // Click on the right rectangle
+      mouse.moveTo(350, 100); // Move it down
+      mouse.up();
+
+      // Verify that inner points did NOT move when bound to different elements
+      // The arrow should NOT translate inner points proportionally when only one end moves
+      expect(arrow.points[1][0]).toBe(originalInnerPoint1[0]);
+      expect(arrow.points[1][1]).toBe(originalInnerPoint1[1]);
+      expect(arrow.points[2][0]).toBe(originalInnerPoint2[0]);
+      expect(arrow.points[2][1]).toBe(originalInnerPoint2[1]);
     });
   });
 
-  //@TODO fix the test with rotation
-  it.skip("rotation of arrow should rebind both ends", () => {
-    const rectLeft = UI.createElement("rectangle", {
-      x: 0,
-      width: 200,
-      height: 500,
-    });
-    const rectRight = UI.createElement("rectangle", {
-      x: 400,
-      width: 200,
-      height: 500,
-    });
-    const arrow = UI.createElement("arrow", {
-      x: 210,
-      y: 250,
-      width: 180,
-      height: 1,
-    });
-    expect(arrow.startBinding?.elementId).toBe(rectLeft.id);
-    expect(arrow.endBinding?.elementId).toBe(rectRight.id);
+  describe("when arrow is outside of shape", () => {
+    beforeEach(async () => {
+      mouse.reset();
 
-    const rotation = getTransformHandles(
-      arrow,
-      h.state.zoom,
-      arrayToMap(h.elements),
-      "mouse",
-    ).rotation!;
-    const rotationHandleX = rotation[0] + rotation[2] / 2;
-    const rotationHandleY = rotation[1] + rotation[3] / 2;
-    mouse.down(rotationHandleX, rotationHandleY);
-    mouse.move(300, 400);
-    mouse.up();
-    expect(arrow.angle).toBeGreaterThan(0.7 * Math.PI);
-    expect(arrow.angle).toBeLessThan(1.3 * Math.PI);
-    expect(arrow.startBinding?.elementId).toBe(rectRight.id);
-    expect(arrow.endBinding?.elementId).toBe(rectLeft.id);
+      await act(() => {
+        return setLanguage(defaultLang);
+      });
+      await render(<Excalidraw handleKeyboardGlobally={true} />);
+    });
+
+    it("should handle new arrow start point binding", () => {
+      // Create a rectangle
+      UI.clickTool("rectangle");
+      mouse.downAt(100, 100);
+      mouse.moveTo(200, 200);
+      mouse.up();
+
+      const rectangle = API.getSelectedElement();
+
+      // Create arrow with arrow tool
+      UI.clickTool("arrow");
+      mouse.downAt(205, 150); // Start close to rectangle
+      mouse.moveTo(250, 150); // End outside
+      mouse.up();
+
+      const arrow = API.getSelectedElement() as ExcalidrawLinearElement;
+
+      // Arrow should have start binding to rectangle
+      expect(arrow.startBinding?.elementId).toBe(rectangle.id);
+      expect(arrow.startBinding?.mode).toBe("orbit"); // Default is orbit, not inside
+      expect(arrow.endBinding).toBeNull();
+    });
+
+    it("should handle new arrow end point binding", () => {
+      // Create a rectangle
+      UI.clickTool("rectangle");
+      mouse.downAt(100, 100);
+      mouse.moveTo(200, 200);
+      mouse.up();
+
+      const rectangle = API.getSelectedElement();
+
+      // Create arrow with end point in binding zone
+      UI.clickTool("arrow");
+      mouse.downAt(50, 150); // Start outside
+      mouse.moveTo(95, 95); // End near rectangle edge (should bind as orbit)
+      mouse.up();
+
+      const arrow = API.getSelectedElement() as ExcalidrawLinearElement;
+
+      // Arrow should have end binding to rectangle
+      expect(arrow.endBinding?.elementId).toBe(rectangle.id);
+      expect(arrow.endBinding?.mode).toBe("orbit");
+      expect(arrow.startBinding).toBeNull();
+    });
+
+    it.skip("should create orbit binding when one of the cursor is inside rectangle", () => {
+      // Create a filled solid rectangle
+      UI.clickTool("rectangle");
+      mouse.downAt(100, 100);
+      mouse.moveTo(200, 200);
+      mouse.up();
+
+      const rect = API.getSelectedElement();
+      API.updateElement(rect, {
+        fillStyle: "solid",
+        backgroundColor: "#a5d8ff",
+      });
+
+      // Draw arrow with endpoint inside the filled rectangle, since only
+      // filled bindables bind inside the shape
+      UI.clickTool("arrow");
+      mouse.downAt(10, 10);
+      mouse.moveTo(160, 160);
+      mouse.up();
+
+      const arrow = API.getSelectedElement() as ExcalidrawLinearElement;
+      expect(arrow.x).toBe(10);
+      expect(arrow.y).toBe(10);
+      expect(arrow.width).toBeCloseTo(85.75985931287957);
+      expect(arrow.height).toBeCloseTo(85.75985931288186);
+
+      // Should bind to the rectangle since endpoint is inside
+      expect(arrow.startBinding).toBe(null);
+      expect(arrow.endBinding?.elementId).toBe(rect.id);
+
+      const endBinding = arrow.endBinding as FixedPointBinding;
+      expect(endBinding.fixedPoint[0]).toBeGreaterThanOrEqual(0);
+      expect(endBinding.fixedPoint[0]).toBeLessThanOrEqual(1);
+      expect(endBinding.fixedPoint[1]).toBeGreaterThanOrEqual(0);
+      expect(endBinding.fixedPoint[1]).toBeLessThanOrEqual(1);
+
+      mouse.reset();
+
+      // Move the bindable
+      mouse.downAt(130, 110);
+      mouse.moveTo(280, 110);
+      mouse.up();
+
+      // Check if the arrow moved
+      expect(arrow.x).toBe(10);
+      expect(arrow.y).toBe(10);
+      expect(arrow.width).toBeCloseTo(234);
+      expect(arrow.height).toBeCloseTo(117);
+
+      // Restore bindable
+      mouse.reset();
+      mouse.downAt(280, 110);
+      mouse.moveTo(130, 110);
+      mouse.up();
+
+      // Move the arrow out
+      mouse.reset();
+      mouse.click(10, 10);
+      mouse.downAt(96.466, 96.466);
+      mouse.moveTo(50, 50);
+      mouse.up();
+
+      expect(arrow.startBinding).toBe(null);
+      expect(arrow.endBinding).toBe(null);
+
+      // Re-bind the arrow by moving the cursor inside the rectangle
+      mouse.reset();
+      mouse.downAt(50, 50);
+      mouse.moveTo(150, 150);
+      mouse.up();
+
+      // Check if the arrow is still on the outside
+      expect(arrow.width).toBeCloseTo(86, 0);
+      expect(arrow.height).toBeCloseTo(86, 0);
+    });
   });
 
-  // TODO fix & reenable once we rewrite tests to work with concurrency
-  it.skip(
-    "editing arrow and moving its head to bind it to element A, finalizing the" +
-      "editing by clicking on element A should end up selecting A",
-    async () => {
-      UI.createElement("rectangle", {
+  describe("additional binding behavior", () => {
+    beforeEach(async () => {
+      mouse.reset();
+
+      await act(() => {
+        return setLanguage(defaultLang);
+      });
+      await render(<Excalidraw handleKeyboardGlobally={true} />);
+    });
+
+    it(
+      "editing arrow and moving its head to bind it to element A, finalizing the" +
+        "editing by clicking on element A should end up selecting A",
+      async () => {
+        UI.createElement("rectangle", {
+          y: 0,
+          size: 100,
+        });
+        // Create arrow bound to rectangle
+        UI.clickTool("arrow");
+        mouse.down(50, -100);
+        mouse.up(0, 80);
+
+        // Edit arrow
+        Keyboard.withModifierKeys({ ctrl: true }, () => {
+          Keyboard.keyPress(KEYS.ENTER);
+        });
+
+        // move arrow head
+        mouse.down();
+        mouse.up(0, 10);
+        expect(API.getSelectedElement().type).toBe("arrow");
+
+        expect(h.state.selectedLinearElement?.isEditing).toBe(true);
+        mouse.reset();
+        mouse.clickAt(-50, -50);
+        expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+        expect(API.getSelectedElement().type).toBe("arrow");
+
+        // Edit arrow
+        Keyboard.withModifierKeys({ ctrl: true }, () => {
+          Keyboard.keyPress(KEYS.ENTER);
+        });
+        expect(h.state.selectedLinearElement?.isEditing).toBe(true);
+        mouse.reset();
+        mouse.clickAt(0, 0);
+        expect(h.state.selectedLinearElement).toBeNull();
+        expect(API.getSelectedElement().type).toBe("rectangle");
+      },
+    );
+
+    it("should unbind on bound element deletion", () => {
+      const rectangle = UI.createElement("rectangle", {
+        x: 60,
         y: 0,
         size: 100,
       });
-      // Create arrow bound to rectangle
+
+      const arrow = UI.createElement("arrow", {
+        x: 0,
+        y: 5,
+        size: 70,
+      });
+
+      expect(arrow.endBinding?.elementId).toBe(rectangle.id);
+
+      mouse.select(rectangle);
+      expect(API.getSelectedElement().type).toBe("rectangle");
+      Keyboard.keyDown(KEYS.DELETE);
+      expect(arrow.endBinding).toBe(null);
+    });
+
+    it("should unbind arrow when arrow is resized", () => {
+      const rectLeft = UI.createElement("rectangle", {
+        x: 0,
+        width: 200,
+        height: 500,
+      });
+      const rectRight = UI.createElement("rectangle", {
+        x: 400,
+        width: 200,
+        height: 500,
+      });
       UI.clickTool("arrow");
-      mouse.down(50, -100);
-      mouse.up(0, 80);
-
-      // Edit arrow with multi-point
-      mouse.doubleClick();
-      // move arrow head
-      mouse.down();
-      mouse.up(0, 10);
-      expect(API.getSelectedElement().type).toBe("arrow");
-
-      // NOTE this mouse down/up + await needs to be done in order to repro
-      // the issue, due to https://github.com/excalidraw/excalidraw/blob/46bff3daceb602accf60c40a84610797260fca94/src/components/App.tsx#L740
       mouse.reset();
-      expect(h.state.selectedLinearElement?.isEditing).toBe(true);
-      mouse.down(0, 0);
-      await new Promise((r) => setTimeout(r, 100));
-      expect(h.state.selectedLinearElement?.isEditing).toBe(false);
-      expect(API.getSelectedElement().type).toBe("rectangle");
+      mouse.clickAt(190, 250);
+      mouse.moveTo(220, 200);
+      mouse.moveTo(300, 200);
+      mouse.clickAt(300, 200);
+      mouse.moveTo(340, 251);
+      mouse.moveTo(410, 251);
+      mouse.clickAt(410, 251);
+      const arrow = h.elements[h.elements.length - 1] as any;
+
+      expect(arrow.startBinding?.elementId).toBe(rectLeft.id);
+      expect(arrow.endBinding?.elementId).toBe(rectRight.id);
+
+      // Drag arrow off of bound rectangle range
+      const handles = getTransformHandles(
+        arrow,
+        h.state.zoom,
+        arrayToMap(h.elements),
+        "mouse",
+      ).se!;
+
+      const elX = handles[0] + handles[2] / 2;
+      const elY = handles[1] + handles[3] / 2;
+      mouse.downAt(elX, elY);
+      mouse.moveTo(300, 400);
       mouse.up();
-      expect(API.getSelectedElement().type).toBe("rectangle");
-    },
-  );
 
-  it("should unbind arrow when moving it with keyboard", () => {
-    const rectangle = UI.createElement("rectangle", {
-      x: 75,
-      y: 0,
-      size: 100,
+      expect(arrow.startBinding).toBe(null);
+      expect(arrow.endBinding).toBe(null);
     });
 
-    // Creates arrow 1px away from bidding with rectangle
-    const arrow = UI.createElement("arrow", {
-      x: 0,
-      y: 0,
-      size: 49,
+    it("should unbind arrow when arrow is rotated", () => {
+      const rectLeft = UI.createElement("rectangle", {
+        x: 0,
+        width: 200,
+        height: 500,
+      });
+      const rectRight = UI.createElement("rectangle", {
+        x: 400,
+        width: 200,
+        height: 500,
+      });
+
+      UI.clickTool("arrow");
+      mouse.reset();
+      mouse.clickAt(190, 250);
+      mouse.moveTo(220, 200);
+      mouse.moveTo(300, 200);
+      mouse.clickAt(300, 200);
+      mouse.moveTo(350, 251);
+      mouse.moveTo(410, 251);
+      mouse.clickAt(410, 251);
+
+      const arrow = API.getSelectedElement() as ExcalidrawArrowElement;
+
+      expect(arrow.startBinding?.elementId).toBe(rectLeft.id);
+      expect(arrow.endBinding?.elementId).toBe(rectRight.id);
+
+      const rotation = getTransformHandles(
+        arrow,
+        h.state.zoom,
+        arrayToMap(h.elements),
+        "mouse",
+      ).rotation!;
+      const rotationHandleX = rotation[0] + rotation[2] / 2;
+      const rotationHandleY = rotation[1] + rotation[3] / 2;
+      mouse.reset();
+      mouse.down(rotationHandleX, rotationHandleY);
+      mouse.move(300, 400);
+      mouse.up();
+      expect(arrow.angle).toBeGreaterThan(0.7 * Math.PI);
+      expect(arrow.angle).toBeLessThan(1.3 * Math.PI);
+      expect(arrow.startBinding).toBeNull();
+      expect(arrow.endBinding).toBeNull();
     });
 
-    expect(arrow.endBinding).toBe(null);
+    it("should not unbind when duplicating via selection group", () => {
+      const rectLeft = UI.createElement("rectangle", {
+        x: 0,
+        width: 200,
+        height: 500,
+      });
+      const rectRight = UI.createElement("rectangle", {
+        x: 400,
+        y: 200,
+        width: 200,
+        height: 500,
+      });
+      const arrow = UI.createElement("arrow", {
+        x: 190,
+        y: 250,
+        width: 217,
+        height: 1,
+      });
+      expect(arrow.startBinding?.elementId).toBe(rectLeft.id);
+      expect(arrow.endBinding?.elementId).toBe(rectRight.id);
 
-    mouse.downAt(49, 49);
-    mouse.moveTo(51, 0);
-    mouse.up(0, 0);
-
-    // Test sticky connection
-    expect(API.getSelectedElement().type).toBe("arrow");
-    Keyboard.keyPress(KEYS.ARROW_RIGHT);
-    expect(arrow.endBinding?.elementId).toBe(rectangle.id);
-    Keyboard.keyPress(KEYS.ARROW_LEFT);
-    expect(arrow.endBinding?.elementId).toBe(rectangle.id);
-
-    // Sever connection
-    expect(API.getSelectedElement().type).toBe("arrow");
-    Keyboard.keyPress(KEYS.ARROW_LEFT);
-    expect(arrow.endBinding).toBe(null);
-    Keyboard.keyPress(KEYS.ARROW_RIGHT);
-    expect(arrow.endBinding).toBe(null);
-  });
-
-  it("should unbind on bound element deletion", () => {
-    const rectangle = UI.createElement("rectangle", {
-      x: 60,
-      y: 0,
-      size: 100,
-    });
-
-    const arrow = UI.createElement("arrow", {
-      x: 0,
-      y: 0,
-      size: 50,
-    });
-
-    expect(arrow.endBinding?.elementId).toBe(rectangle.id);
-
-    mouse.select(rectangle);
-    expect(API.getSelectedElement().type).toBe("rectangle");
-    Keyboard.keyDown(KEYS.DELETE);
-    expect(arrow.endBinding).toBe(null);
-  });
-
-  it("should unbind on text element deletion by submitting empty text", async () => {
-    const text = API.createElement({
-      type: "text",
-      text: "ola",
-      x: 60,
-      y: 0,
-      width: 100,
-      height: 100,
-    });
-
-    API.setElements([text]);
-
-    const arrow = UI.createElement("arrow", {
-      x: 0,
-      y: 0,
-      size: 50,
-    });
-
-    expect(arrow.endBinding?.elementId).toBe(text.id);
-
-    // edit text element and submit
-    // -------------------------------------------------------------------------
-
-    UI.clickTool("text");
-
-    mouse.clickAt(text.x + 50, text.y + 50);
-
-    const editor = await getTextEditor();
-
-    fireEvent.change(editor, { target: { value: "" } });
-    fireEvent.keyDown(editor, { key: KEYS.ESCAPE });
-
-    expect(document.querySelector(TEXT_EDITOR_SELECTOR)).toBe(null);
-    expect(arrow.endBinding).toBe(null);
-  });
-
-  it("should keep binding on text update", async () => {
-    const text = API.createElement({
-      type: "text",
-      text: "ola",
-      x: 60,
-      y: 0,
-      width: 100,
-      height: 100,
-    });
-
-    API.setElements([text]);
-
-    const arrow = UI.createElement("arrow", {
-      x: 0,
-      y: 0,
-      size: 50,
-    });
-
-    expect(arrow.endBinding?.elementId).toBe(text.id);
-
-    // delete text element by submitting empty text
-    // -------------------------------------------------------------------------
-
-    UI.clickTool("text");
-
-    mouse.clickAt(text.x + 50, text.y + 50);
-    const editor = await getTextEditor();
-
-    expect(editor).not.toBe(null);
-
-    fireEvent.change(editor, { target: { value: "asdasdasdasdas" } });
-    fireEvent.keyDown(editor, { key: KEYS.ESCAPE });
-
-    expect(document.querySelector(TEXT_EDITOR_SELECTOR)).toBe(null);
-    expect(arrow.endBinding?.elementId).toBe(text.id);
-  });
-
-  it("should update binding when text containerized", async () => {
-    const rectangle1 = API.createElement({
-      type: "rectangle",
-      id: "rectangle1",
-      width: 100,
-      height: 100,
-      boundElements: [
-        { id: "arrow1", type: "arrow" },
-        { id: "arrow2", type: "arrow" },
-      ],
-    });
-
-    const arrow1 = API.createElement({
-      type: "arrow",
-      id: "arrow1",
-      points: [pointFrom(0, 0), pointFrom(0, -87.45777932247563)],
-      startBinding: {
-        elementId: "rectangle1",
-        focus: 0.2,
-        gap: 7,
-        fixedPoint: [0.5, 1],
-      },
-      endBinding: {
-        elementId: "text1",
-        focus: 0.2,
-        gap: 7,
-        fixedPoint: [1, 0.5],
-      },
-    });
-
-    const arrow2 = API.createElement({
-      type: "arrow",
-      id: "arrow2",
-      points: [pointFrom(0, 0), pointFrom(0, -87.45777932247563)],
-      startBinding: {
-        elementId: "text1",
-        focus: 0.2,
-        gap: 7,
-        fixedPoint: [0.5, 1],
-      },
-      endBinding: {
-        elementId: "rectangle1",
-        focus: 0.2,
-        gap: 7,
-        fixedPoint: [1, 0.5],
-      },
-    });
-
-    const text1 = API.createElement({
-      type: "text",
-      id: "text1",
-      text: "ola",
-      boundElements: [
-        { id: "arrow1", type: "arrow" },
-        { id: "arrow2", type: "arrow" },
-      ],
-    });
-
-    API.setElements([rectangle1, arrow1, arrow2, text1]);
-
-    API.setSelectedElements([text1]);
-
-    expect(h.state.selectedElementIds[text1.id]).toBe(true);
-
-    API.executeAction(actionWrapTextInContainer);
-
-    // new text container will be placed before the text element
-    const container = h.elements.at(-2)!;
-
-    expect(container.type).toBe("rectangle");
-    expect(container.id).not.toBe(rectangle1.id);
-
-    expect(container).toEqual(
-      expect.objectContaining({
-        boundElements: expect.arrayContaining([
-          {
-            type: "text",
-            id: text1.id,
-          },
-          {
-            type: "arrow",
-            id: arrow1.id,
-          },
-          {
-            type: "arrow",
-            id: arrow2.id,
-          },
-        ]),
-      }),
-    );
-
-    expect(arrow1.startBinding?.elementId).toBe(rectangle1.id);
-    expect(arrow1.endBinding?.elementId).toBe(container.id);
-    expect(arrow2.startBinding?.elementId).toBe(container.id);
-    expect(arrow2.endBinding?.elementId).toBe(rectangle1.id);
-  });
-
-  // #6459
-  it("should unbind arrow only from the latest element", () => {
-    const rectLeft = UI.createElement("rectangle", {
-      x: 0,
-      width: 200,
-      height: 500,
-    });
-    const rectRight = UI.createElement("rectangle", {
-      x: 400,
-      width: 200,
-      height: 500,
-    });
-    const arrow = UI.createElement("arrow", {
-      x: 210,
-      y: 250,
-      width: 180,
-      height: 1,
-    });
-    expect(arrow.startBinding?.elementId).toBe(rectLeft.id);
-    expect(arrow.endBinding?.elementId).toBe(rectRight.id);
-
-    // Drag arrow off of bound rectangle range
-    const [elX, elY] = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-      arrow,
-      -1,
-      h.scene.getNonDeletedElementsMap(),
-    );
-    Keyboard.keyDown(KEYS.CTRL_OR_CMD);
-    mouse.downAt(elX, elY);
-    mouse.moveTo(300, 400);
-    mouse.up();
-
-    expect(arrow.startBinding).not.toBe(null);
-    expect(arrow.endBinding).toBe(null);
-  });
-
-  it("should not unbind when duplicating via selection group", () => {
-    const rectLeft = UI.createElement("rectangle", {
-      x: 0,
-      width: 200,
-      height: 500,
-    });
-    const rectRight = UI.createElement("rectangle", {
-      x: 400,
-      y: 200,
-      width: 200,
-      height: 500,
-    });
-    const arrow = UI.createElement("arrow", {
-      x: 210,
-      y: 250,
-      width: 177,
-      height: 1,
-    });
-    expect(arrow.startBinding?.elementId).toBe(rectLeft.id);
-    expect(arrow.endBinding?.elementId).toBe(rectRight.id);
-
-    mouse.downAt(-100, -100);
-    mouse.moveTo(650, 750);
-    mouse.up(0, 0);
-
-    expect(API.getSelectedElements().length).toBe(3);
-
-    mouse.moveTo(5, 5);
-    Keyboard.withModifierKeys({ alt: true }, () => {
-      mouse.downAt(5, 5);
-      mouse.moveTo(1000, 1000);
+      mouse.downAt(-100, -100);
+      mouse.moveTo(650, 750);
       mouse.up(0, 0);
 
-      expect(window.h.elements.length).toBe(6);
-      window.h.elements.forEach((element) => {
-        if (isLinearElement(element)) {
-          expect(element.startBinding).not.toBe(null);
-          expect(element.endBinding).not.toBe(null);
-        } else {
-          expect(element.boundElements).not.toBe(null);
-        }
+      expect(API.getSelectedElements().length).toBe(3);
+
+      mouse.moveTo(5, 5);
+      Keyboard.withModifierKeys({ alt: true }, () => {
+        mouse.downAt(5, 5);
+        mouse.moveTo(1000, 1000);
+        mouse.up(0, 0);
+
+        expect(window.h.elements.length).toBe(6);
+        window.h.elements.forEach((element) => {
+          if (isLinearElement(element)) {
+            expect(element.startBinding).not.toBe(null);
+            expect(element.endBinding).not.toBe(null);
+          } else {
+            expect(element.boundElements).not.toBe(null);
+          }
+        });
       });
     });
   });
+
+  describe("to text elements", () => {
+    beforeEach(async () => {
+      mouse.reset();
+
+      await act(() => {
+        return setLanguage(defaultLang);
+      });
+      await render(<Excalidraw handleKeyboardGlobally={true} />);
+    });
+
+    it("should update binding when text containerized", async () => {
+      const rectangle1 = API.createElement({
+        type: "rectangle",
+        id: "rectangle1",
+        width: 100,
+        height: 100,
+        boundElements: [
+          { id: "arrow1", type: "arrow" },
+          { id: "arrow2", type: "arrow" },
+        ],
+      });
+
+      const arrow1 = API.createElement({
+        type: "arrow",
+        id: "arrow1",
+        points: [pointFrom(0, 0), pointFrom(0, -87.45777932247563)],
+        startBinding: {
+          elementId: "rectangle1",
+          fixedPoint: [0.5, 1],
+          mode: "orbit",
+        },
+        endBinding: {
+          elementId: "text1",
+          fixedPoint: [1, 0.5],
+          mode: "orbit",
+        },
+      });
+
+      const arrow2 = API.createElement({
+        type: "arrow",
+        id: "arrow2",
+        points: [pointFrom(0, 0), pointFrom(0, -87.45777932247563)],
+        startBinding: {
+          elementId: "text1",
+          fixedPoint: [0.5, 1],
+          mode: "orbit",
+        },
+        endBinding: {
+          elementId: "rectangle1",
+          fixedPoint: [1, 0.5],
+          mode: "orbit",
+        },
+      });
+
+      const text1 = API.createElement({
+        type: "text",
+        id: "text1",
+        text: "ola",
+        boundElements: [
+          { id: "arrow1", type: "arrow" },
+          { id: "arrow2", type: "arrow" },
+        ],
+      });
+
+      API.setElements([rectangle1, arrow1, arrow2, text1]);
+
+      API.setSelectedElements([text1]);
+
+      expect(h.state.selectedElementIds[text1.id]).toBe(true);
+
+      API.executeAction(actionWrapTextInContainer);
+
+      // new text container will be placed before the text element
+      const container = h.elements.at(-2)!;
+
+      expect(container.type).toBe("rectangle");
+      expect(container.id).not.toBe(rectangle1.id);
+
+      expect(container).toEqual(
+        expect.objectContaining({
+          boundElements: expect.arrayContaining([
+            {
+              type: "text",
+              id: text1.id,
+            },
+            {
+              type: "arrow",
+              id: arrow1.id,
+            },
+            {
+              type: "arrow",
+              id: arrow2.id,
+            },
+          ]),
+        }),
+      );
+
+      expect(arrow1.startBinding?.elementId).toBe(rectangle1.id);
+      expect(arrow1.endBinding?.elementId).toBe(container.id);
+      expect(arrow2.startBinding?.elementId).toBe(container.id);
+      expect(arrow2.endBinding?.elementId).toBe(rectangle1.id);
+    });
+
+    it("should keep binding on text update", async () => {
+      const text = API.createElement({
+        type: "text",
+        text: "ola",
+        x: 60,
+        y: 0,
+        width: 100,
+        height: 100,
+      });
+
+      API.setElements([text]);
+
+      const arrow = UI.createElement("arrow", {
+        x: 0,
+        y: 0,
+        size: 65,
+      });
+
+      expect(arrow.endBinding?.elementId).toBe(text.id);
+
+      // delete text element by submitting empty text
+      // -------------------------------------------------------------------------
+
+      UI.clickTool("text");
+
+      mouse.clickAt(text.x + 50, text.y + 50);
+      const editor = await getTextEditor();
+
+      expect(editor).not.toBe(null);
+
+      fireEvent.change(editor, { target: { value: "asdasdasdasdas" } });
+      fireEvent.keyDown(editor, { key: KEYS.ESCAPE });
+
+      expect(document.querySelector(TEXT_EDITOR_SELECTOR)).toBe(null);
+      expect(arrow.endBinding?.elementId).toBe(text.id);
+    });
+
+    it("should unbind on text element deletion by submitting empty text", async () => {
+      const text = API.createElement({
+        type: "text",
+        text: "¡olá!",
+        x: 60,
+        y: 0,
+        width: 100,
+        height: 100,
+      });
+
+      API.setElements([text]);
+
+      const arrow = UI.createElement("arrow", {
+        x: 0,
+        y: 0,
+        size: 65,
+      });
+
+      expect(arrow.endBinding?.elementId).toBe(text.id);
+
+      // edit text element and submit
+      // -------------------------------------------------------------------------
+
+      UI.clickTool("text");
+
+      mouse.clickAt(text.x + 50, text.y + 50);
+
+      const editor = await getTextEditor();
+
+      fireEvent.change(editor, { target: { value: "" } });
+      fireEvent.keyDown(editor, { key: KEYS.ESCAPE });
+
+      expect(document.querySelector(TEXT_EDITOR_SELECTOR)).toBe(null);
+      expect(arrow.endBinding).toBe(null);
+    });
+  });
 });
diff --git a/packages/element/tests/bounds.test.ts b/packages/element/tests/bounds.test.ts
index 22c669f28a..1c7cd3cd28 100644
--- a/packages/element/tests/bounds.test.ts
+++ b/packages/element/tests/bounds.test.ts
@@ -135,9 +135,9 @@ describe("getElementBounds", () => {
     } as ExcalidrawLinearElement;
 
     const [x1, y1, x2, y2] = getElementBounds(element, arrayToMap([element]));
-    expect(x1).toEqual(360.3176068760539);
-    expect(y1).toEqual(185.90654264413516);
-    expect(x2).toEqual(480.87005902729743);
-    expect(y2).toEqual(320.4751269334226);
+    expect(x1).toEqual(360.9291017525165);
+    expect(y1).toEqual(185.24770129343722);
+    expect(x2).toEqual(481.4815539037601);
+    expect(y2).toEqual(319.8162855827246);
   });
 });
diff --git a/packages/element/tests/duplicate.test.tsx b/packages/element/tests/duplicate.test.tsx
index 10b9346a6c..b8c5bede27 100644
--- a/packages/element/tests/duplicate.test.tsx
+++ b/packages/element/tests/duplicate.test.tsx
@@ -144,9 +144,8 @@ describe("duplicating multiple elements", () => {
       id: "arrow1",
       startBinding: {
         elementId: "rectangle1",
-        focus: 0.2,
-        gap: 7,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
     });
 
@@ -155,9 +154,8 @@ describe("duplicating multiple elements", () => {
       id: "arrow2",
       endBinding: {
         elementId: "rectangle1",
-        focus: 0.2,
-        gap: 7,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
       boundElements: [{ id: "text2", type: "text" }],
     });
@@ -276,9 +274,8 @@ describe("duplicating multiple elements", () => {
       id: "arrow1",
       startBinding: {
         elementId: "rectangle1",
-        focus: 0.2,
-        gap: 7,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
     });
 
@@ -293,15 +290,13 @@ describe("duplicating multiple elements", () => {
       id: "arrow2",
       startBinding: {
         elementId: "rectangle1",
-        focus: 0.2,
-        gap: 7,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
       endBinding: {
         elementId: "rectangle-not-exists",
-        focus: 0.2,
-        gap: 7,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
     });
 
@@ -310,15 +305,13 @@ describe("duplicating multiple elements", () => {
       id: "arrow3",
       startBinding: {
         elementId: "rectangle-not-exists",
-        focus: 0.2,
-        gap: 7,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
       endBinding: {
         elementId: "rectangle1",
-        focus: 0.2,
-        gap: 7,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
     });
 
@@ -821,7 +814,7 @@ describe("duplication z-order", () => {
     const arrow = UI.createElement("arrow", {
       x: -100,
       y: 50,
-      width: 95,
+      width: 115,
       height: 0,
     });
 
diff --git a/packages/element/tests/elbowArrow.test.tsx b/packages/element/tests/elbowArrow.test.tsx
index b279e596c2..2993e32158 100644
--- a/packages/element/tests/elbowArrow.test.tsx
+++ b/packages/element/tests/elbowArrow.test.tsx
@@ -1,13 +1,10 @@
 import { ARROW_TYPE } from "@excalidraw/common";
 import { pointFrom } from "@excalidraw/math";
 import { Excalidraw } from "@excalidraw/excalidraw";
-
 import { actionSelectAll } from "@excalidraw/excalidraw/actions";
 import { actionDuplicateSelection } from "@excalidraw/excalidraw/actions/actionDuplicateSelection";
-
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { Pointer, UI } from "@excalidraw/excalidraw/tests/helpers/ui";
-
 import {
   act,
   fireEvent,
@@ -15,13 +12,11 @@ import {
   queryByTestId,
   render,
 } from "@excalidraw/excalidraw/tests/test-utils";
-
 import "@excalidraw/utils/test-utils";
+import { bindBindingElement } from "@excalidraw/element";
 
 import type { LocalPoint } from "@excalidraw/math";
 
-import { bindLinearElement } from "../src/binding";
-
 import { Scene } from "../src/Scene";
 
 import type {
@@ -136,6 +131,11 @@ describe("elbow arrow segment move", () => {
 });
 
 describe("elbow arrow routing", () => {
+  beforeEach(async () => {
+    localStorage.clear();
+    await render(<Excalidraw handleKeyboardGlobally={true} />);
+  });
+
   it("can properly generate orthogonal arrow points", () => {
     const scene = new Scene();
     const arrow = API.createElement({
@@ -160,8 +160,8 @@ describe("elbow arrow routing", () => {
     expect(arrow.width).toEqual(90);
     expect(arrow.height).toEqual(200);
   });
+
   it("can generate proper points for bound elbow arrow", () => {
-    const scene = new Scene();
     const rectangle1 = API.createElement({
       type: "rectangle",
       x: -150,
@@ -185,25 +185,23 @@ describe("elbow arrow routing", () => {
       height: 200,
       points: [pointFrom(0, 0), pointFrom(90, 200)],
     }) as ExcalidrawElbowArrowElement;
-    scene.insertElement(rectangle1);
-    scene.insertElement(rectangle2);
-    scene.insertElement(arrow);
+    API.setElements([rectangle1, rectangle2, arrow]);
 
-    bindLinearElement(arrow, rectangle1, "start", scene);
-    bindLinearElement(arrow, rectangle2, "end", scene);
+    bindBindingElement(arrow, rectangle1, "orbit", "start", h.scene);
+    bindBindingElement(arrow, rectangle2, "orbit", "end", h.scene);
 
     expect(arrow.startBinding).not.toBe(null);
     expect(arrow.endBinding).not.toBe(null);
 
-    h.app.scene.mutateElement(arrow, {
+    h.scene.mutateElement(arrow, {
       points: [pointFrom<LocalPoint>(0, 0), pointFrom<LocalPoint>(90, 200)],
     });
 
-    expect(arrow.points).toEqual([
+    expect(arrow.points).toCloselyEqualPoints([
       [0, 0],
-      [45, 0],
-      [45, 200],
-      [90, 200],
+      [39, 0],
+      [39, 200],
+      [78, 200],
     ]);
   });
 });
@@ -242,9 +240,9 @@ describe("elbow arrow ui", () => {
     expect(h.state.currentItemArrowType).toBe(ARROW_TYPE.elbow);
 
     mouse.reset();
-    mouse.moveTo(-43, -99);
+    mouse.moveTo(-53, -99);
     mouse.click();
-    mouse.moveTo(43, 99);
+    mouse.moveTo(53, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -253,11 +251,11 @@ describe("elbow arrow ui", () => {
 
     expect(arrow.type).toBe("arrow");
     expect(arrow.elbowed).toBe(true);
-    expect(arrow.points).toEqual([
+    expect(arrow.points).toCloselyEqualPoints([
       [0, 0],
-      [45, 0],
-      [45, 200],
-      [90, 200],
+      [39, 0],
+      [39, 200],
+      [78, 200],
     ]);
   });
 
@@ -279,9 +277,9 @@ describe("elbow arrow ui", () => {
     UI.clickOnTestId("elbow-arrow");
 
     mouse.reset();
-    mouse.moveTo(-43, -99);
+    mouse.moveTo(-53, -99);
     mouse.click();
-    mouse.moveTo(43, 99);
+    mouse.moveTo(53, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -297,9 +295,11 @@ describe("elbow arrow ui", () => {
 
     expect(arrow.points.map((point) => point.map(Math.round))).toEqual([
       [0, 0],
-      [35, 0],
-      [35, 165],
-      [103, 165],
+      [36, 0],
+      [36, 90],
+      [28, 90],
+      [28, 164],
+      [101, 164],
     ]);
   });
 
@@ -321,9 +321,9 @@ describe("elbow arrow ui", () => {
     UI.clickOnTestId("elbow-arrow");
 
     mouse.reset();
-    mouse.moveTo(-43, -99);
+    mouse.moveTo(-53, -99);
     mouse.click();
-    mouse.moveTo(43, 99);
+    mouse.moveTo(53, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -351,11 +351,11 @@ describe("elbow arrow ui", () => {
     expect(duplicatedArrow.id).not.toBe(originalArrowId);
     expect(duplicatedArrow.type).toBe("arrow");
     expect(duplicatedArrow.elbowed).toBe(true);
-    expect(duplicatedArrow.points).toEqual([
+    expect(duplicatedArrow.points).toCloselyEqualPoints([
       [0, 0],
-      [45, 0],
-      [45, 200],
-      [90, 200],
+      [39, 0],
+      [39, 200],
+      [78, 200],
     ]);
     expect(arrow.startBinding).not.toBe(null);
     expect(arrow.endBinding).not.toBe(null);
@@ -379,9 +379,9 @@ describe("elbow arrow ui", () => {
     UI.clickOnTestId("elbow-arrow");
 
     mouse.reset();
-    mouse.moveTo(-43, -99);
+    mouse.moveTo(-53, -99);
     mouse.click();
-    mouse.moveTo(43, 99);
+    mouse.moveTo(53, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -405,11 +405,11 @@ describe("elbow arrow ui", () => {
     expect(duplicatedArrow.id).not.toBe(originalArrowId);
     expect(duplicatedArrow.type).toBe("arrow");
     expect(duplicatedArrow.elbowed).toBe(true);
-    expect(duplicatedArrow.points).toEqual([
+    expect(duplicatedArrow.points).toCloselyEqualPoints([
       [0, 0],
       [0, 100],
-      [90, 100],
-      [90, 200],
+      [78, 100],
+      [78, 200],
     ]);
   });
 });
diff --git a/packages/element/tests/linearElementEditor.test.tsx b/packages/element/tests/linearElementEditor.test.tsx
index f1306b8728..5759c591dd 100644
--- a/packages/element/tests/linearElementEditor.test.tsx
+++ b/packages/element/tests/linearElementEditor.test.tsx
@@ -217,7 +217,7 @@ describe("Test Linear Elements", () => {
 
     // drag line from midpoint
     drag(midpoint, pointFrom(midpoint[0] + delta, midpoint[1] + delta));
-    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`9`);
+    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`8`);
     expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
     expect(line.points.length).toEqual(3);
     expect(line.points).toMatchInlineSnapshot(`
@@ -329,7 +329,7 @@ describe("Test Linear Elements", () => {
     expect(h.state.selectedLinearElement?.isEditing).toBe(false);
 
     mouse.doubleClick();
-    expect(h.state.selectedLinearElement).toBe(null);
+    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
     await getTextEditor();
   });
 
@@ -357,6 +357,7 @@ describe("Test Linear Elements", () => {
       const originalY = line.y;
       enterLineEditingMode(line);
 
+      expect(h.state.selectedLinearElement?.isEditing).toBe(true);
       expect(line.points.length).toEqual(2);
 
       mouse.clickAt(midpoint[0], midpoint[1]);
@@ -379,7 +380,7 @@ describe("Test Linear Elements", () => {
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
         `11`,
       );
-      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
+      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
       expect(line.points.length).toEqual(3);
       expect(line.points).toMatchInlineSnapshot(`
@@ -549,7 +550,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `14`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`9`);
 
         expect(line.points.length).toEqual(5);
 
@@ -600,7 +601,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `11`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
         const newPoints = LinearElementEditor.getPointsGlobalCoordinates(
           line,
@@ -641,7 +642,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `11`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
         const newPoints = LinearElementEditor.getPointsGlobalCoordinates(
           line,
@@ -689,7 +690,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `17`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`10`);
 
         const newMidPoints = LinearElementEditor.getEditorMidPoints(
           line,
@@ -747,7 +748,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `14`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`9`);
         expect(line.points.length).toEqual(5);
 
         expect((h.elements[0] as ExcalidrawLinearElement).points)
@@ -845,7 +846,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `11`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
         const newPoints = LinearElementEditor.getPointsGlobalCoordinates(
           line,
@@ -1303,7 +1304,7 @@ describe("Test Linear Elements", () => {
       const arrow = UI.createElement("arrow", {
         x: -10,
         y: 250,
-        width: 400,
+        width: 410,
         height: 1,
       });
 
@@ -1316,7 +1317,7 @@ describe("Test Linear Elements", () => {
       const textElement = h.elements[2] as ExcalidrawTextElementWithContainer;
 
       expect(arrow.endBinding?.elementId).toBe(rect.id);
-      expect(arrow.width).toBe(400);
+      expect(arrow.width).toBeCloseTo(399);
       expect(rect.x).toBe(400);
       expect(rect.y).toBe(0);
       expect(
@@ -1335,7 +1336,7 @@ describe("Test Linear Elements", () => {
       mouse.downAt(rect.x, rect.y);
       mouse.moveTo(200, 0);
       mouse.upAt(200, 0);
-      expect(arrow.width).toBeCloseTo(200, 0);
+      expect(arrow.width).toBeCloseTo(199);
       expect(rect.x).toBe(200);
       expect(rect.y).toBe(0);
       expect(handleBindTextResizeSpy).toHaveBeenCalledWith(
diff --git a/packages/element/tests/resize.test.tsx b/packages/element/tests/resize.test.tsx
index 1d0b6ac0b2..ab836d6a0f 100644
--- a/packages/element/tests/resize.test.tsx
+++ b/packages/element/tests/resize.test.tsx
@@ -174,29 +174,29 @@ describe("generic element", () => {
     expect(rectangle.angle).toBeCloseTo(0);
   });
 
-  it("resizes with bound arrow", async () => {
-    const rectangle = UI.createElement("rectangle", {
-      width: 200,
-      height: 100,
-    });
-    const arrow = UI.createElement("arrow", {
-      x: -30,
-      y: 50,
-      width: 28,
-      height: 5,
-    });
+  // it("resizes with bound arrow", async () => {
+  //   const rectangle = UI.createElement("rectangle", {
+  //     width: 200,
+  //     height: 100,
+  //   });
+  //   const arrow = UI.createElement("arrow", {
+  //     x: -30,
+  //     y: 50,
+  //     width: 28,
+  //     height: 5,
+  //   });
 
-    expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
+  //   expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
 
-    UI.resize(rectangle, "e", [40, 0]);
+  //   UI.resize(rectangle, "e", [40, 0]);
 
-    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
+  //   expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
 
-    UI.resize(rectangle, "w", [50, 0]);
+  //   UI.resize(rectangle, "w", [50, 0]);
 
-    expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
-    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(80, 0);
-  });
+  //   expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
+  //   expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(80, 0);
+  // });
 
   it("resizes with a label", async () => {
     const rectangle = UI.createElement("rectangle", {
@@ -510,12 +510,12 @@ describe("arrow element", () => {
       h.state,
     )[0] as ExcalidrawElbowArrowElement;
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.06);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
 
     UI.resize(rectangle, "se", [-200, -150]);
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.06);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
   });
 
@@ -538,11 +538,11 @@ describe("arrow element", () => {
       h.state,
     )[0] as ExcalidrawElbowArrowElement;
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.06);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
 
     UI.resize([rectangle, arrow], "nw", [300, 350]);
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(-0.05);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(-0.06);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.25);
   });
 });
@@ -595,31 +595,31 @@ describe("text element", () => {
     expect(text.fontSize).toBeCloseTo(fontSize * scale);
   });
 
-  it("resizes with bound arrow", async () => {
-    const text = UI.createElement("text");
-    await UI.editText(text, "hello\nworld");
-    const boundArrow = UI.createElement("arrow", {
-      x: -30,
-      y: 25,
-      width: 28,
-      height: 5,
-    });
+  // it("resizes with bound arrow", async () => {
+  //   const text = UI.createElement("text");
+  //   await UI.editText(text, "hello\nworld");
+  //   const boundArrow = UI.createElement("arrow", {
+  //     x: -30,
+  //     y: 25,
+  //     width: 28,
+  //     height: 5,
+  //   });
 
-    expect(boundArrow.endBinding?.elementId).toEqual(text.id);
+  //   expect(boundArrow.endBinding?.elementId).toEqual(text.id);
 
-    UI.resize(text, "ne", [40, 0]);
+  //   UI.resize(text, "ne", [40, 0]);
 
-    expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(30);
+  //   expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(30);
 
-    const textWidth = text.width;
-    const scale = 20 / text.height;
-    UI.resize(text, "nw", [50, 20]);
+  //   const textWidth = text.width;
+  //   const scale = 20 / text.height;
+  //   UI.resize(text, "nw", [50, 20]);
 
-    expect(boundArrow.endBinding?.elementId).toEqual(text.id);
-    expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(
-      30 + textWidth * scale,
-    );
-  });
+  //   expect(boundArrow.endBinding?.elementId).toEqual(text.id);
+  //   expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(
+  //     30 + textWidth * scale,
+  //   );
+  // });
 
   it("updates font size via keyboard", async () => {
     const text = UI.createElement("text");
@@ -801,36 +801,36 @@ describe("image element", () => {
     expect(image.scale).toEqual([1, 1]);
   });
 
-  it("resizes with bound arrow", async () => {
-    const image = API.createElement({
-      type: "image",
-      width: 100,
-      height: 100,
-    });
-    API.setElements([image]);
-    const arrow = UI.createElement("arrow", {
-      x: -30,
-      y: 50,
-      width: 28,
-      height: 5,
-    });
+  // it("resizes with bound arrow", async () => {
+  //   const image = API.createElement({
+  //     type: "image",
+  //     width: 100,
+  //     height: 100,
+  //   });
+  //   API.setElements([image]);
+  //   const arrow = UI.createElement("arrow", {
+  //     x: -30,
+  //     y: 50,
+  //     width: 28,
+  //     height: 5,
+  //   });
 
-    expect(arrow.endBinding?.elementId).toEqual(image.id);
+  //   expect(arrow.endBinding?.elementId).toEqual(image.id);
 
-    UI.resize(image, "ne", [40, 0]);
+  //   UI.resize(image, "ne", [40, 0]);
 
-    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
+  //   expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
 
-    const imageWidth = image.width;
-    const scale = 20 / image.height;
-    UI.resize(image, "nw", [50, 20]);
+  //   const imageWidth = image.width;
+  //   const scale = 20 / image.height;
+  //   UI.resize(image, "nw", [50, 20]);
 
-    expect(arrow.endBinding?.elementId).toEqual(image.id);
-    expect(Math.floor(arrow.width + arrow.endBinding!.gap)).toBeCloseTo(
-      30 + imageWidth * scale,
-      0,
-    );
-  });
+  //   expect(arrow.endBinding?.elementId).toEqual(image.id);
+  //   expect(Math.floor(arrow.width + arrow.endBinding!.gap)).toBeCloseTo(
+  //     30 + imageWidth * scale,
+  //     0,
+  //   );
+  // });
 });
 
 describe("multiple selection", () => {
@@ -997,68 +997,80 @@ describe("multiple selection", () => {
     expect(diagLine.angle).toEqual(0);
   });
 
-  it("resizes with bound arrows", async () => {
-    const rectangle = UI.createElement("rectangle", {
-      position: 0,
-      size: 100,
-    });
-    const leftBoundArrow = UI.createElement("arrow", {
-      x: -110,
-      y: 50,
-      width: 100,
-      height: 0,
-    });
+  // it("resizes with bound arrows", async () => {
+  //   const rectangle = UI.createElement("rectangle", {
+  //     position: 0,
+  //     size: 100,
+  //   });
+  //   const leftBoundArrow = UI.createElement("arrow", {
+  //     x: -110,
+  //     y: 50,
+  //     width: 100,
+  //     height: 0,
+  //   });
 
-    const rightBoundArrow = UI.createElement("arrow", {
-      x: 210,
-      y: 50,
-      width: -100,
-      height: 0,
-    });
+  //   const rightBoundArrow = UI.createElement("arrow", {
+  //     x: 210,
+  //     y: 50,
+  //     width: -100,
+  //     height: 0,
+  //   });
 
-    const selectionWidth = 210;
-    const selectionHeight = 100;
-    const move = [40, 40] as [number, number];
-    const scale = Math.max(
-      1 - move[0] / selectionWidth,
-      1 - move[1] / selectionHeight,
-    );
-    const leftArrowBinding = { ...leftBoundArrow.endBinding };
-    const rightArrowBinding = { ...rightBoundArrow.endBinding };
-    delete rightArrowBinding.gap;
+  //   const selectionWidth = 210;
+  //   const selectionHeight = 100;
+  //   const move = [40, 40] as [number, number];
+  //   const scale = Math.max(
+  //     1 - move[0] / selectionWidth,
+  //     1 - move[1] / selectionHeight,
+  //   );
+  //   const leftArrowBinding: {
+  //     elementId: string;
+  //     gap?: number;
+  //     focus?: number;
+  //   } = {
+  //     ...leftBoundArrow.endBinding,
+  //   } as PointBinding;
+  //   const rightArrowBinding: {
+  //     elementId: string;
+  //     gap?: number;
+  //     focus?: number;
+  //   } = {
+  //     ...rightBoundArrow.endBinding,
+  //   } as PointBinding;
+  //   delete rightArrowBinding.gap;
 
-    UI.resize([rectangle, rightBoundArrow], "nw", move, {
-      shift: true,
-    });
+  //   UI.resize([rectangle, rightBoundArrow], "nw", move, {
+  //     shift: true,
+  //   });
 
-    expect(leftBoundArrow.x).toBeCloseTo(-110);
-    expect(leftBoundArrow.y).toBeCloseTo(50);
-    expect(leftBoundArrow.width).toBeCloseTo(140, 0);
-    expect(leftBoundArrow.height).toBeCloseTo(7, 0);
-    expect(leftBoundArrow.angle).toEqual(0);
-    expect(leftBoundArrow.startBinding).toBeNull();
-    expect(leftBoundArrow.endBinding?.gap).toBeCloseTo(10);
-    expect(leftBoundArrow.endBinding?.elementId).toBe(
-      leftArrowBinding.elementId,
-    );
-    expect(leftBoundArrow.endBinding?.focus).toBe(leftArrowBinding.focus);
+  //   expect(leftBoundArrow.x).toBeCloseTo(-110);
+  //   expect(leftBoundArrow.y).toBeCloseTo(50);
+  //   expect(leftBoundArrow.width).toBeCloseTo(140, 0);
+  //   expect(leftBoundArrow.height).toBeCloseTo(7, 0);
+  //   expect(leftBoundArrow.angle).toEqual(0);
+  //   expect(leftBoundArrow.startBinding).toBeNull();
+  //   expect(leftBoundArrow.endBinding?.gap).toBeCloseTo(10);
+  //   expect(leftBoundArrow.endBinding?.elementId).toBe(
+  //     leftArrowBinding.elementId,
+  //   );
+  //   expect(leftBoundArrow.endBinding?.focus).toBe(leftArrowBinding.focus);
 
-    expect(rightBoundArrow.x).toBeCloseTo(210);
-    expect(rightBoundArrow.y).toBeCloseTo(
-      (selectionHeight - 50) * (1 - scale) + 50,
-    );
-    expect(rightBoundArrow.width).toBeCloseTo(100 * scale);
-    expect(rightBoundArrow.height).toBeCloseTo(0);
-    expect(rightBoundArrow.angle).toEqual(0);
-    expect(rightBoundArrow.startBinding).toBeNull();
-    expect(rightBoundArrow.endBinding?.gap).toBeCloseTo(8.0952);
-    expect(rightBoundArrow.endBinding?.elementId).toBe(
-      rightArrowBinding.elementId,
-    );
-    expect(rightBoundArrow.endBinding?.focus).toBeCloseTo(
-      rightArrowBinding.focus!,
-    );
-  });
+  //   expect(rightBoundArrow.x).toBeCloseTo(210);
+  //   expect(rightBoundArrow.y).toBeCloseTo(
+  //     (selectionHeight - 50) * (1 - scale) + 50,
+  //   );
+  //   expect(rightBoundArrow.width).toBeCloseTo(100 * scale);
+  //   expect(rightBoundArrow.height).toBeCloseTo(0);
+  //   expect(rightBoundArrow.angle).toEqual(0);
+  //   expect(rightBoundArrow.startBinding).toBeNull();
+  //   expect(rightBoundArrow.endBinding?.gap).toBeCloseTo(8.0952);
+  //   expect(rightBoundArrow.endBinding?.elementId).toBe(
+  //     rightArrowBinding.elementId,
+  //   );
+  //   expect(rightBoundArrow.endBinding?.focus).toBeCloseTo(
+  //     rightArrowBinding.focus!,
+  //   );
+  // });
 
   it("resizes with labeled arrows", async () => {
     const topArrow = UI.createElement("arrow", {
@@ -1338,8 +1350,8 @@ describe("multiple selection", () => {
 
     expect(boundArrow.x).toBeCloseTo(380 * scaleX);
     expect(boundArrow.y).toBeCloseTo(240 * scaleY);
-    expect(boundArrow.points[1][0]).toBeCloseTo(-60 * scaleX);
-    expect(boundArrow.points[1][1]).toBeCloseTo(-80 * scaleY);
+    expect(boundArrow.points[1][0]).toBeCloseTo(59.7979);
+    expect(boundArrow.points[1][1]).toBeCloseTo(-79.7305);
 
     expect(arrowLabelPos.x + arrowLabel.width / 2).toBeCloseTo(
       boundArrow.x + boundArrow.points[1][0] / 2,
diff --git a/packages/excalidraw/actions/actionCanvas.tsx b/packages/excalidraw/actions/actionCanvas.tsx
index b0760fd8ba..f9c57a2851 100644
--- a/packages/excalidraw/actions/actionCanvas.tsx
+++ b/packages/excalidraw/actions/actionCanvas.tsx
@@ -51,7 +51,7 @@ import { register } from "./register";
 
 import type { AppState, Offsets } from "../types";
 
-export const actionChangeViewBackgroundColor = register({
+export const actionChangeViewBackgroundColor = register<Partial<AppState>>({
   name: "changeViewBackgroundColor",
   label: "labels.canvasBackground",
   trackEvent: false,
@@ -64,7 +64,7 @@ export const actionChangeViewBackgroundColor = register({
   perform: (_, appState, value) => {
     return {
       appState: { ...appState, ...value },
-      captureUpdate: !!value.viewBackgroundColor
+      captureUpdate: !!value?.viewBackgroundColor
         ? CaptureUpdateAction.IMMEDIATELY
         : CaptureUpdateAction.EVENTUALLY,
     };
@@ -83,7 +83,6 @@ export const actionChangeViewBackgroundColor = register({
         elements={elements}
         appState={appState}
         updateData={updateData}
-        compactMode={appState.stylesPanelMode === "compact"}
       />
     );
   },
@@ -467,7 +466,7 @@ export const actionZoomToFit = register({
     !event[KEYS.CTRL_OR_CMD],
 });
 
-export const actionToggleTheme = register({
+export const actionToggleTheme = register<AppState["theme"]>({
   name: "toggleTheme",
   label: (_, appState) => {
     return appState.theme === THEME.DARK
@@ -475,7 +474,8 @@ export const actionToggleTheme = register({
       : "buttons.darkMode";
   },
   keywords: ["toggle", "dark", "light", "mode", "theme"],
-  icon: (appState) => (appState.theme === THEME.LIGHT ? MoonIcon : SunIcon),
+  icon: (appState, elements) =>
+    appState.theme === THEME.LIGHT ? MoonIcon : SunIcon,
   viewMode: true,
   trackEvent: { category: "canvas" },
   perform: (_, appState, value) => {
diff --git a/packages/excalidraw/actions/actionClipboard.tsx b/packages/excalidraw/actions/actionClipboard.tsx
index d9b011d2bc..8d5ed2a30a 100644
--- a/packages/excalidraw/actions/actionClipboard.tsx
+++ b/packages/excalidraw/actions/actionClipboard.tsx
@@ -20,12 +20,12 @@ import { t } from "../i18n";
 import { actionDeleteSelected } from "./actionDeleteSelected";
 import { register } from "./register";
 
-export const actionCopy = register({
+export const actionCopy = register<ClipboardEvent | null>({
   name: "copy",
   label: "labels.copy",
   icon: DuplicateIcon,
   trackEvent: { category: "element" },
-  perform: async (elements, appState, event: ClipboardEvent | null, app) => {
+  perform: async (elements, appState, event, app) => {
     const elementsToCopy = app.scene.getSelectedElements({
       selectedElementIds: appState.selectedElementIds,
       includeBoundTextElement: true,
@@ -109,12 +109,12 @@ export const actionPaste = register({
   keyTest: undefined,
 });
 
-export const actionCut = register({
+export const actionCut = register<ClipboardEvent | null>({
   name: "cut",
   label: "labels.cut",
   icon: cutIcon,
   trackEvent: { category: "element" },
-  perform: (elements, appState, event: ClipboardEvent | null, app) => {
+  perform: (elements, appState, event, app) => {
     actionCopy.perform(elements, appState, event, app);
     return actionDeleteSelected.perform(elements, appState, null, app);
   },
diff --git a/packages/excalidraw/actions/actionDeleteSelected.tsx b/packages/excalidraw/actions/actionDeleteSelected.tsx
index 694f02b90c..9821abadc8 100644
--- a/packages/excalidraw/actions/actionDeleteSelected.tsx
+++ b/packages/excalidraw/actions/actionDeleteSelected.tsx
@@ -30,6 +30,8 @@ import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { TrashIcon } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 
+import { useStylesPanelMode } from "..";
+
 import { register } from "./register";
 
 import type { AppClassProperties, AppState } from "../types";
@@ -210,12 +212,8 @@ export const actionDeleteSelected = register({
   trackEvent: { category: "element", action: "delete" },
   perform: (elements, appState, formData, app) => {
     if (appState.selectedLinearElement?.isEditing) {
-      const {
-        elementId,
-        selectedPointsIndices,
-        startBindingElement,
-        endBindingElement,
-      } = appState.selectedLinearElement;
+      const { elementId, selectedPointsIndices } =
+        appState.selectedLinearElement;
       const elementsMap = app.scene.getNonDeletedElementsMap();
       const linearElement = LinearElementEditor.getElement(
         elementId,
@@ -252,19 +250,6 @@ export const actionDeleteSelected = register({
         };
       }
 
-      // We cannot do this inside `movePoint` because it is also called
-      // when deleting the uncommitted point (which hasn't caused any binding)
-      const binding = {
-        startBindingElement: selectedPointsIndices?.includes(0)
-          ? null
-          : startBindingElement,
-        endBindingElement: selectedPointsIndices?.includes(
-          linearElement.points.length - 1,
-        )
-          ? null
-          : endBindingElement,
-      };
-
       LinearElementEditor.deletePoints(
         linearElement,
         app,
@@ -277,7 +262,6 @@ export const actionDeleteSelected = register({
           ...appState,
           selectedLinearElement: {
             ...appState.selectedLinearElement,
-            ...binding,
             selectedPointsIndices:
               selectedPointsIndices?.[0] > 0
                 ? [selectedPointsIndices[0] - 1]
@@ -306,6 +290,7 @@ export const actionDeleteSelected = register({
           type: app.state.preferredSelectionTool.type,
         }),
         multiElement: null,
+        newElement: null,
         activeEmbeddable: null,
         selectedLinearElement: null,
       },
@@ -320,22 +305,25 @@ export const actionDeleteSelected = register({
   keyTest: (event, appState, elements) =>
     (event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE) &&
     !event[KEYS.CTRL_OR_CMD],
-  PanelComponent: ({ elements, appState, updateData }) => (
-    <ToolButton
-      type="button"
-      icon={TrashIcon}
-      title={t("labels.delete")}
-      aria-label={t("labels.delete")}
-      onClick={() => updateData(null)}
-      disabled={
-        !isSomeElementSelected(getNonDeletedElements(elements), appState)
-      }
-      style={{
-        ...(appState.stylesPanelMode === "mobile" &&
-        appState.openPopup !== "compactOtherProperties"
-          ? MOBILE_ACTION_BUTTON_BG
-          : {}),
-      }}
-    />
-  ),
+  PanelComponent: ({ elements, appState, updateData, app }) => {
+    const isMobile = useStylesPanelMode() === "mobile";
+
+    return (
+      <ToolButton
+        type="button"
+        icon={TrashIcon}
+        title={t("labels.delete")}
+        aria-label={t("labels.delete")}
+        onClick={() => updateData(null)}
+        disabled={
+          !isSomeElementSelected(getNonDeletedElements(elements), appState)
+        }
+        style={{
+          ...(isMobile && appState.openPopup !== "compactOtherProperties"
+            ? MOBILE_ACTION_BUTTON_BG
+            : {}),
+        }}
+      />
+    );
+  },
 });
diff --git a/packages/excalidraw/actions/actionDuplicateSelection.tsx b/packages/excalidraw/actions/actionDuplicateSelection.tsx
index 69508a0228..462803d205 100644
--- a/packages/excalidraw/actions/actionDuplicateSelection.tsx
+++ b/packages/excalidraw/actions/actionDuplicateSelection.tsx
@@ -27,6 +27,8 @@ import { t } from "../i18n";
 import { isSomeElementSelected } from "../scene";
 import { getShortcutKey } from "../shortcut";
 
+import { useStylesPanelMode } from "..";
+
 import { register } from "./register";
 
 export const actionDuplicateSelection = register({
@@ -107,24 +109,27 @@ export const actionDuplicateSelection = register({
     };
   },
   keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.D,
-  PanelComponent: ({ elements, appState, updateData }) => (
-    <ToolButton
-      type="button"
-      icon={DuplicateIcon}
-      title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
-        "CtrlOrCmd+D",
-      )}`}
-      aria-label={t("labels.duplicateSelection")}
-      onClick={() => updateData(null)}
-      disabled={
-        !isSomeElementSelected(getNonDeletedElements(elements), appState)
-      }
-      style={{
-        ...(appState.stylesPanelMode === "mobile" &&
-        appState.openPopup !== "compactOtherProperties"
-          ? MOBILE_ACTION_BUTTON_BG
-          : {}),
-      }}
-    />
-  ),
+  PanelComponent: ({ elements, appState, updateData, app }) => {
+    const isMobile = useStylesPanelMode() === "mobile";
+
+    return (
+      <ToolButton
+        type="button"
+        icon={DuplicateIcon}
+        title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
+          "CtrlOrCmd+D",
+        )}`}
+        aria-label={t("labels.duplicateSelection")}
+        onClick={() => updateData(null)}
+        disabled={
+          !isSomeElementSelected(getNonDeletedElements(elements), appState)
+        }
+        style={{
+          ...(isMobile && appState.openPopup !== "compactOtherProperties"
+            ? MOBILE_ACTION_BUTTON_BG
+            : {}),
+        }}
+      />
+    );
+  },
 });
diff --git a/packages/excalidraw/actions/actionExport.tsx b/packages/excalidraw/actions/actionExport.tsx
index 908e2463e9..e47a5bb84c 100644
--- a/packages/excalidraw/actions/actionExport.tsx
+++ b/packages/excalidraw/actions/actionExport.tsx
@@ -11,7 +11,7 @@ import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { Theme } from "@excalidraw/element/types";
 
-import { useDevice } from "../components/App";
+import { useEditorInterface } from "../components/App";
 import { CheckboxItem } from "../components/CheckboxItem";
 import { DarkModeToggle } from "../components/DarkModeToggle";
 import { ProjectName } from "../components/ProjectName";
@@ -31,7 +31,9 @@ import "../components/ToolIcon.scss";
 
 import { register } from "./register";
 
-export const actionChangeProjectName = register({
+import type { AppState } from "../types";
+
+export const actionChangeProjectName = register<AppState["name"]>({
   name: "changeProjectName",
   label: "labels.fileTitle",
   trackEvent: false,
@@ -51,7 +53,7 @@ export const actionChangeProjectName = register({
   ),
 });
 
-export const actionChangeExportScale = register({
+export const actionChangeExportScale = register<AppState["exportScale"]>({
   name: "changeExportScale",
   label: "imageExportDialog.scale",
   trackEvent: { category: "export", action: "scale" },
@@ -101,7 +103,9 @@ export const actionChangeExportScale = register({
   },
 });
 
-export const actionChangeExportBackground = register({
+export const actionChangeExportBackground = register<
+  AppState["exportBackground"]
+>({
   name: "changeExportBackground",
   label: "imageExportDialog.label.withBackground",
   trackEvent: { category: "export", action: "toggleBackground" },
@@ -121,7 +125,9 @@ export const actionChangeExportBackground = register({
   ),
 });
 
-export const actionChangeExportEmbedScene = register({
+export const actionChangeExportEmbedScene = register<
+  AppState["exportEmbedScene"]
+>({
   name: "changeExportEmbedScene",
   label: "imageExportDialog.tooltip.embedScene",
   trackEvent: { category: "export", action: "embedScene" },
@@ -242,7 +248,7 @@ export const actionSaveFileToDisk = register({
       icon={saveAs}
       title={t("buttons.saveAs")}
       aria-label={t("buttons.saveAs")}
-      showAriaLabel={useDevice().editor.isMobile}
+      showAriaLabel={useEditorInterface().formFactor === "phone"}
       hidden={!nativeFileSystemSupported}
       onClick={() => updateData(null)}
       data-testid="save-as-button"
@@ -288,7 +294,9 @@ export const actionLoadScene = register({
   keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.O,
 });
 
-export const actionExportWithDarkMode = register({
+export const actionExportWithDarkMode = register<
+  AppState["exportWithDarkMode"]
+>({
   name: "exportWithDarkMode",
   label: "imageExportDialog.label.darkMode",
   trackEvent: { category: "export", action: "toggleTheme" },
diff --git a/packages/excalidraw/actions/actionFinalize.tsx b/packages/excalidraw/actions/actionFinalize.tsx
index 4e7ae67919..97d4f5655a 100644
--- a/packages/excalidraw/actions/actionFinalize.tsx
+++ b/packages/excalidraw/actions/actionFinalize.tsx
@@ -1,10 +1,6 @@
 import { pointFrom } from "@excalidraw/math";
 
-import {
-  maybeBindLinearElement,
-  bindOrUnbindLinearElement,
-  isBindingEnabled,
-} from "@excalidraw/element/binding";
+import { bindOrUnbindBindingElement } from "@excalidraw/element/binding";
 import {
   isValidPolygon,
   LinearElementEditor,
@@ -21,7 +17,7 @@ import {
 import {
   KEYS,
   arrayToMap,
-  tupleToCoors,
+  invariant,
   updateActiveTool,
 } from "@excalidraw/common";
 import { isPathALoop } from "@excalidraw/element";
@@ -30,11 +26,12 @@ import { isInvisiblySmallElement } from "@excalidraw/element";
 
 import { CaptureUpdateAction } from "@excalidraw/element";
 
-import type { LocalPoint } from "@excalidraw/math";
+import type { GlobalPoint, LocalPoint } from "@excalidraw/math";
 import type {
   ExcalidrawElement,
   ExcalidrawLinearElement,
   NonDeleted,
+  PointsPositionUpdates,
 } from "@excalidraw/element/types";
 
 import { t } from "../i18n";
@@ -46,20 +43,37 @@ import { register } from "./register";
 
 import type { AppState } from "../types";
 
-export const actionFinalize = register({
+type FormData = {
+  event: PointerEvent;
+  sceneCoords: { x: number; y: number };
+};
+
+export const actionFinalize = register<FormData>({
   name: "finalize",
   label: "",
   trackEvent: false,
   perform: (elements, appState, data, app) => {
+    let newElements = elements;
     const { interactiveCanvas, focusContainer, scene } = app;
-    const { event, sceneCoords } =
-      (data as {
-        event?: PointerEvent;
-        sceneCoords?: { x: number; y: number };
-      }) ?? {};
     const elementsMap = scene.getNonDeletedElementsMap();
 
-    if (event && appState.selectedLinearElement) {
+    if (data && appState.selectedLinearElement) {
+      const { event, sceneCoords } = data;
+      const element = LinearElementEditor.getElement(
+        appState.selectedLinearElement.elementId,
+        elementsMap,
+      );
+
+      invariant(
+        element,
+        "Arrow element should exist if selectedLinearElement is set",
+      );
+
+      invariant(
+        sceneCoords,
+        "sceneCoords should be defined if actionFinalize is called with event",
+      );
+
       const linearElementEditor = LinearElementEditor.handlePointerUp(
         event,
         appState.selectedLinearElement,
@@ -67,19 +81,48 @@ export const actionFinalize = register({
         app.scene,
       );
 
-      const { startBindingElement, endBindingElement } = linearElementEditor;
-      const element = app.scene.getElement(linearElementEditor.elementId);
       if (isBindingElement(element)) {
-        bindOrUnbindLinearElement(
-          element,
-          startBindingElement,
-          endBindingElement,
-          app.scene,
-        );
+        const newArrow = !!appState.newElement;
+
+        const selectedPointsIndices =
+          newArrow || !appState.selectedLinearElement.selectedPointsIndices
+            ? [element.points.length - 1] // New arrow creation
+            : appState.selectedLinearElement.selectedPointsIndices;
+
+        const draggedPoints: PointsPositionUpdates =
+          selectedPointsIndices.reduce((map, index) => {
+            map.set(index, {
+              point: LinearElementEditor.pointFromAbsoluteCoords(
+                element,
+                pointFrom<GlobalPoint>(sceneCoords.x, sceneCoords.y),
+                elementsMap,
+              ),
+            });
+
+            return map;
+          }, new Map()) ?? new Map();
+
+        bindOrUnbindBindingElement(element, draggedPoints, scene, appState, {
+          newArrow,
+          altKey: event.altKey,
+        });
+      } else if (isLineElement(element)) {
+        if (
+          appState.selectedLinearElement?.isEditing &&
+          !appState.newElement &&
+          !isValidPolygon(element.points)
+        ) {
+          scene.mutateElement(element, {
+            polygon: false,
+          });
+        }
       }
 
       if (linearElementEditor !== appState.selectedLinearElement) {
-        let newElements = elements;
+        // `handlePointerUp()` updated the linear element instance,
+        // so filter out this element if it is too small,
+        // but do an update to all new elements anyway for undo/redo purposes.
+
         if (element && isInvisiblySmallElement(element)) {
           // TODO: #7348 in theory this gets recorded by the store, so the invisible elements could be restored by the undo/redo, which might be not what we would want
           newElements = newElements.map((el) => {
@@ -91,39 +134,8 @@ export const actionFinalize = register({
             return el;
           });
         }
-        return {
-          elements: newElements,
-          appState: {
-            selectedLinearElement: {
-              ...linearElementEditor,
-              selectedPointsIndices: null,
-            },
-            suggestedBindings: [],
-          },
-          captureUpdate: CaptureUpdateAction.IMMEDIATELY,
-        };
-      }
-    }
 
-    if (appState.selectedLinearElement?.isEditing) {
-      const { elementId, startBindingElement, endBindingElement } =
-        appState.selectedLinearElement;
-      const element = LinearElementEditor.getElement(elementId, elementsMap);
-
-      if (element) {
-        if (isBindingElement(element)) {
-          bindOrUnbindLinearElement(
-            element,
-            startBindingElement,
-            endBindingElement,
-            scene,
-          );
-        }
-        if (isLineElement(element) && !isValidPolygon(element.points)) {
-          scene.mutateElement(element, {
-            polygon: false,
-          });
-        }
+        const activeToolLocked = appState.activeTool?.locked;
 
         return {
           elements:
@@ -134,23 +146,31 @@ export const actionFinalize = register({
                   }
                   return el;
                 })
-              : undefined,
+              : newElements,
           appState: {
             ...appState,
             cursorButton: "up",
-            selectedLinearElement: new LinearElementEditor(
-              element,
-              arrayToMap(elementsMap),
-              false, // exit editing mode
-            ),
+            selectedLinearElement: activeToolLocked
+              ? null
+              : {
+                  ...linearElementEditor,
+                  selectedPointsIndices: null,
+                  isEditing: false,
+                  initialState: {
+                    ...linearElementEditor.initialState,
+                    lastClickedPoint: -1,
+                  },
+                },
+            selectionElement: null,
+            suggestedBinding: null,
+            newElement: null,
+            multiElement: null,
           },
           captureUpdate: CaptureUpdateAction.IMMEDIATELY,
         };
       }
     }
 
-    let newElements = elements;
-
     if (window.document.activeElement instanceof HTMLElement) {
       focusContainer();
     }
@@ -174,8 +194,14 @@ export const actionFinalize = register({
 
     if (element) {
       // pen and mouse have hover
-      if (appState.multiElement && element.type !== "freedraw") {
-        const { points, lastCommittedPoint } = element;
+      if (
+        appState.selectedLinearElement &&
+        appState.multiElement &&
+        element.type !== "freedraw" &&
+        appState.lastPointerDownWith !== "touch"
+      ) {
+        const { points } = element;
+        const { lastCommittedPoint } = appState.selectedLinearElement;
         if (
           !lastCommittedPoint ||
           points[points.length - 1] !== lastCommittedPoint
@@ -227,25 +253,6 @@ export const actionFinalize = register({
             polygon: false,
           });
         }
-
-        if (
-          isBindingElement(element) &&
-          !isLoop &&
-          element.points.length > 1 &&
-          isBindingEnabled(appState)
-        ) {
-          const coords =
-            sceneCoords ??
-            tupleToCoors(
-              LinearElementEditor.getPointAtIndexGlobalCoordinates(
-                element,
-                -1,
-                arrayToMap(elements),
-              ),
-            );
-
-          maybeBindLinearElement(element, appState, coords, scene);
-        }
       }
     }
 
@@ -271,6 +278,25 @@ export const actionFinalize = register({
       });
     }
 
+    let selectedLinearElement =
+      element && isLinearElement(element)
+        ? new LinearElementEditor(element, arrayToMap(newElements)) // To select the linear element when user has finished mutipoint editing
+        : appState.selectedLinearElement;
+
+    selectedLinearElement = selectedLinearElement
+      ? {
+          ...selectedLinearElement,
+          isEditing: appState.newElement
+            ? false
+            : selectedLinearElement.isEditing,
+          initialState: {
+            ...selectedLinearElement.initialState,
+            lastClickedPoint: -1,
+            origin: null,
+          },
+        }
+      : selectedLinearElement;
+
     return {
       elements: newElements,
       appState: {
@@ -288,7 +314,7 @@ export const actionFinalize = register({
         multiElement: null,
         editingTextElement: null,
         startBoundElement: null,
-        suggestedBindings: [],
+        suggestedBinding: null,
         selectedElementIds:
           element &&
           !appState.activeTool.locked &&
@@ -298,11 +324,8 @@ export const actionFinalize = register({
                 [element.id]: true,
               }
             : appState.selectedElementIds,
-        // To select the linear element when user has finished mutipoint editing
-        selectedLinearElement:
-          element && isLinearElement(element)
-            ? new LinearElementEditor(element, arrayToMap(newElements))
-            : appState.selectedLinearElement,
+
+        selectedLinearElement,
       },
       // TODO: #7348 we should not capture everything, but if we don't, it leads to incosistencies -> revisit
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
diff --git a/packages/excalidraw/actions/actionFlip.test.tsx b/packages/excalidraw/actions/actionFlip.test.tsx
index 23e4ffc123..0be29c9800 100644
--- a/packages/excalidraw/actions/actionFlip.test.tsx
+++ b/packages/excalidraw/actions/actionFlip.test.tsx
@@ -38,15 +38,13 @@ describe("flipping re-centers selection", () => {
         height: 239.9,
         startBinding: {
           elementId: "rec1",
-          focus: 0,
-          gap: 5,
           fixedPoint: [0.49, -0.05],
+          mode: "orbit",
         },
         endBinding: {
           elementId: "rec2",
-          focus: 0,
-          gap: 5,
           fixedPoint: [-0.05, 0.49],
+          mode: "orbit",
         },
         startArrowhead: null,
         endArrowhead: "arrow",
@@ -74,11 +72,11 @@ describe("flipping re-centers selection", () => {
 
     const rec1 = h.elements.find((el) => el.id === "rec1")!;
     expect(rec1.x).toBeCloseTo(100, 0);
-    expect(rec1.y).toBeCloseTo(100, 0);
+    expect(rec1.y).toBeCloseTo(101, 0);
 
     const rec2 = h.elements.find((el) => el.id === "rec2")!;
     expect(rec2.x).toBeCloseTo(220, 0);
-    expect(rec2.y).toBeCloseTo(250, 0);
+    expect(rec2.y).toBeCloseTo(251, 0);
   });
 });
 
@@ -99,8 +97,8 @@ describe("flipping arrowheads", () => {
       endArrowhead: null,
       endBinding: {
         elementId: rect.id,
-        focus: 0.5,
-        gap: 5,
+        fixedPoint: [0.5, 0.5],
+        mode: "orbit",
       },
     });
 
@@ -139,13 +137,13 @@ describe("flipping arrowheads", () => {
       endArrowhead: "circle",
       startBinding: {
         elementId: rect.id,
-        focus: 0.5,
-        gap: 5,
+        fixedPoint: [0.5, 0.5],
+        mode: "orbit",
       },
       endBinding: {
         elementId: rect2.id,
-        focus: 0.5,
-        gap: 5,
+        fixedPoint: [0.5, 0.5],
+        mode: "orbit",
       },
     });
 
@@ -195,8 +193,8 @@ describe("flipping arrowheads", () => {
       endArrowhead: null,
       endBinding: {
         elementId: rect.id,
-        focus: 0.5,
-        gap: 5,
+        fixedPoint: [0.5, 0.5],
+        mode: "orbit",
       },
     });
 
diff --git a/packages/excalidraw/actions/actionFlip.ts b/packages/excalidraw/actions/actionFlip.ts
index 6456fca8d5..b7e15275d8 100644
--- a/packages/excalidraw/actions/actionFlip.ts
+++ b/packages/excalidraw/actions/actionFlip.ts
@@ -1,17 +1,10 @@
 import { getNonDeletedElements } from "@excalidraw/element";
-import {
-  bindOrUnbindLinearElements,
-  isBindingEnabled,
-} from "@excalidraw/element";
+import { bindOrUnbindBindingElements } from "@excalidraw/element";
 import { getCommonBoundingBox } from "@excalidraw/element";
 import { newElementWith } from "@excalidraw/element";
 import { deepCopyElement } from "@excalidraw/element";
 import { resizeMultipleElements } from "@excalidraw/element";
-import {
-  isArrowElement,
-  isElbowArrow,
-  isLinearElement,
-} from "@excalidraw/element";
+import { isArrowElement, isElbowArrow } from "@excalidraw/element";
 import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 import { CODES, KEYS, arrayToMap } from "@excalidraw/common";
 
@@ -103,7 +96,6 @@ const flipSelectedElements = (
   const updatedElements = flipElements(
     selectedElements,
     elementsMap,
-    appState,
     flipDirection,
     app,
   );
@@ -118,7 +110,6 @@ const flipSelectedElements = (
 const flipElements = (
   selectedElements: NonDeleted<ExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
-  appState: AppState,
   flipDirection: "horizontal" | "vertical",
   app: AppClassProperties,
 ): ExcalidrawElement[] => {
@@ -158,12 +149,10 @@ const flipElements = (
     },
   );
 
-  bindOrUnbindLinearElements(
-    selectedElements.filter(isLinearElement),
-    isBindingEnabled(appState),
-    [],
+  bindOrUnbindBindingElements(
+    selectedElements.filter(isArrowElement),
     app.scene,
-    appState.zoom,
+    app.state,
   );
 
   // ---------------------------------------------------------------------------
diff --git a/packages/excalidraw/actions/actionHistory.tsx b/packages/excalidraw/actions/actionHistory.tsx
index a1971f527c..0232bb33e3 100644
--- a/packages/excalidraw/actions/actionHistory.tsx
+++ b/packages/excalidraw/actions/actionHistory.tsx
@@ -18,6 +18,8 @@ import { HistoryChangedEvent } from "../history";
 import { useEmitter } from "../hooks/useEmitter";
 import { t } from "../i18n";
 
+import { useStylesPanelMode } from "..";
+
 import type { History } from "../history";
 import type { AppClassProperties, AppState } from "../types";
 import type { Action, ActionResult } from "./types";
@@ -73,7 +75,7 @@ export const createUndoAction: ActionCreator = (history) => ({
     ),
   keyTest: (event) =>
     event[KEYS.CTRL_OR_CMD] && matchKey(event, KEYS.Z) && !event.shiftKey,
-  PanelComponent: ({ appState, updateData, data }) => {
+  PanelComponent: ({ appState, updateData, data, app }) => {
     const { isUndoStackEmpty } = useEmitter<HistoryChangedEvent>(
       history.onHistoryChangedEmitter,
       new HistoryChangedEvent(
@@ -81,6 +83,7 @@ export const createUndoAction: ActionCreator = (history) => ({
         history.isRedoStackEmpty,
       ),
     );
+    const isMobile = useStylesPanelMode() === "mobile";
 
     return (
       <ToolButton
@@ -92,9 +95,7 @@ export const createUndoAction: ActionCreator = (history) => ({
         disabled={isUndoStackEmpty}
         data-testid="button-undo"
         style={{
-          ...(appState.stylesPanelMode === "mobile"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
+          ...(isMobile ? MOBILE_ACTION_BUTTON_BG : {}),
         }}
       />
     );
@@ -114,7 +115,7 @@ export const createRedoAction: ActionCreator = (history) => ({
   keyTest: (event) =>
     (event[KEYS.CTRL_OR_CMD] && event.shiftKey && matchKey(event, KEYS.Z)) ||
     (isWindows && event.ctrlKey && !event.shiftKey && matchKey(event, KEYS.Y)),
-  PanelComponent: ({ appState, updateData, data }) => {
+  PanelComponent: ({ appState, updateData, data, app }) => {
     const { isRedoStackEmpty } = useEmitter(
       history.onHistoryChangedEmitter,
       new HistoryChangedEvent(
@@ -122,6 +123,7 @@ export const createRedoAction: ActionCreator = (history) => ({
         history.isRedoStackEmpty,
       ),
     );
+    const isMobile = useStylesPanelMode() === "mobile";
 
     return (
       <ToolButton
@@ -133,9 +135,7 @@ export const createRedoAction: ActionCreator = (history) => ({
         disabled={isRedoStackEmpty}
         data-testid="button-redo"
         style={{
-          ...(appState.stylesPanelMode === "mobile"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
+          ...(isMobile ? MOBILE_ACTION_BUTTON_BG : {}),
         }}
       />
     );
diff --git a/packages/excalidraw/actions/actionNavigate.tsx b/packages/excalidraw/actions/actionNavigate.tsx
index 27f0d6024c..02dcecef50 100644
--- a/packages/excalidraw/actions/actionNavigate.tsx
+++ b/packages/excalidraw/actions/actionNavigate.tsx
@@ -2,6 +2,8 @@ import clsx from "clsx";
 
 import { CaptureUpdateAction } from "@excalidraw/element";
 
+import { invariant } from "@excalidraw/common";
+
 import { getClientColor } from "../clients";
 import { Avatar } from "../components/Avatar";
 import {
@@ -16,12 +18,17 @@ import { register } from "./register";
 import type { GoToCollaboratorComponentProps } from "../components/UserList";
 import type { Collaborator } from "../types";
 
-export const actionGoToCollaborator = register({
+export const actionGoToCollaborator = register<Collaborator>({
   name: "goToCollaborator",
   label: "Go to a collaborator",
   viewMode: true,
   trackEvent: { category: "collab" },
-  perform: (_elements, appState, collaborator: Collaborator) => {
+  perform: (_elements, appState, collaborator) => {
+    invariant(
+      collaborator,
+      "actionGoToCollaborator: collaborator should be defined when actionGoToCollaborator is called",
+    );
+
     if (
       !collaborator.socketId ||
       appState.userToFollow?.socketId === collaborator.socketId ||
diff --git a/packages/excalidraw/actions/actionProperties.tsx b/packages/excalidraw/actions/actionProperties.tsx
index 1a806180b6..1f889438f8 100644
--- a/packages/excalidraw/actions/actionProperties.tsx
+++ b/packages/excalidraw/actions/actionProperties.tsx
@@ -1,4 +1,5 @@
 import { pointFrom } from "@excalidraw/math";
+
 import { useEffect, useMemo, useRef, useState } from "react";
 
 import {
@@ -21,6 +22,7 @@ import {
   isTransparent,
   reduceToCommonValue,
   BOUND_TEXT_PADDING,
+  invariant,
 } from "@excalidraw/common";
 
 import {
@@ -31,7 +33,7 @@ import {
 } from "@excalidraw/element";
 
 import {
-  bindLinearElement,
+  bindBindingElement,
   calculateFixedPointForElbowArrowBinding,
   updateBoundElements,
 } from "@excalidraw/element";
@@ -63,10 +65,13 @@ import {
   toggleLinePolygonState,
 } from "@excalidraw/element";
 
-import type { LocalPoint } from "@excalidraw/math";
+import { deriveStylesPanelMode } from "@excalidraw/common";
+
+import type { LocalPoint, Radians } from "@excalidraw/math";
 
 import type {
   Arrowhead,
+  ContainerBehavior,
   ElementsMap,
   ExcalidrawBindableElement,
   ExcalidrawElement,
@@ -86,9 +91,6 @@ import { RadioSelection } from "../components/RadioSelection";
 import { ColorPicker } from "../components/ColorPicker/ColorPicker";
 import { FontPicker } from "../components/FontPicker/FontPicker";
 import { IconPicker } from "../components/IconPicker";
-// TODO barnabasmolnar/editor-redesign
-// TextAlignTopIcon, TextAlignBottomIcon,TextAlignMiddleIcon,
-// ArrowHead icons
 import { Range } from "../components/Range";
 import {
   ArrowheadArrowIcon,
@@ -160,6 +162,15 @@ import type { AppClassProperties, AppState, Primitive } from "../types";
 
 const FONT_SIZE_RELATIVE_INCREASE_STEP = 0.1;
 
+const getStylesPanelInfo = (app: AppClassProperties) => {
+  const stylesPanelMode = deriveStylesPanelMode(app.editorInterface);
+  return {
+    stylesPanelMode,
+    isCompact: stylesPanelMode !== "full",
+    isMobile: stylesPanelMode === "mobile",
+  } as const;
+};
+
 export const changeProperty = (
   elements: readonly ExcalidrawElement[],
   appState: AppState,
@@ -309,13 +320,15 @@ const changeFontSize = (
 
 // -----------------------------------------------------------------------------
 
-export const actionChangeStrokeColor = register({
+export const actionChangeStrokeColor = register<
+  Pick<AppState, "currentItemStrokeColor">
+>({
   name: "changeStrokeColor",
   label: "labels.stroke",
   trackEvent: false,
   perform: (elements, appState, value) => {
     return {
-      ...(value.currentItemStrokeColor && {
+      ...(value?.currentItemStrokeColor && {
         elements: changeProperty(
           elements,
           appState,
@@ -333,48 +346,50 @@ export const actionChangeStrokeColor = register({
         ...appState,
         ...value,
       },
-      captureUpdate: !!value.currentItemStrokeColor
+      captureUpdate: !!value?.currentItemStrokeColor
         ? CaptureUpdateAction.IMMEDIATELY
         : CaptureUpdateAction.EVENTUALLY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => (
-    <>
-      {appState.stylesPanelMode === "full" && (
-        <h3 aria-hidden="true">{t("labels.stroke")}</h3>
-      )}
-      <ColorPicker
-        topPicks={DEFAULT_ELEMENT_STROKE_PICKS}
-        palette={DEFAULT_ELEMENT_STROKE_COLOR_PALETTE}
-        type="elementStroke"
-        label={t("labels.stroke")}
-        color={getFormValue(
-          elements,
-          app,
-          (element) => element.strokeColor,
-          true,
-          (hasSelection) =>
-            !hasSelection ? appState.currentItemStrokeColor : null,
+  PanelComponent: ({ elements, appState, updateData, app, data }) => {
+    const { stylesPanelMode } = getStylesPanelInfo(app);
+
+    return (
+      <>
+        {stylesPanelMode === "full" && (
+          <h3 aria-hidden="true">{t("labels.stroke")}</h3>
         )}
-        onChange={(color) => updateData({ currentItemStrokeColor: color })}
-        elements={elements}
-        appState={appState}
-        updateData={updateData}
-        compactMode={
-          appState.stylesPanelMode === "compact" ||
-          appState.stylesPanelMode === "mobile"
-        }
-      />
-    </>
-  ),
+        <ColorPicker
+          topPicks={DEFAULT_ELEMENT_STROKE_PICKS}
+          palette={DEFAULT_ELEMENT_STROKE_COLOR_PALETTE}
+          type="elementStroke"
+          label={t("labels.stroke")}
+          color={getFormValue(
+            elements,
+            app,
+            (element) => element.strokeColor,
+            true,
+            (hasSelection) =>
+              !hasSelection ? appState.currentItemStrokeColor : null,
+          )}
+          onChange={(color) => updateData({ currentItemStrokeColor: color })}
+          elements={elements}
+          appState={appState}
+          updateData={updateData}
+        />
+      </>
+    );
+  },
 });
 
-export const actionChangeBackgroundColor = register({
+export const actionChangeBackgroundColor = register<
+  Pick<AppState, "currentItemBackgroundColor" | "viewBackgroundColor">
+>({
   name: "changeBackgroundColor",
   label: "labels.changeBackground",
   trackEvent: false,
   perform: (elements, appState, value, app) => {
-    if (!value.currentItemBackgroundColor) {
+    if (!value?.currentItemBackgroundColor) {
       return {
         appState: {
           ...appState,
@@ -421,38 +436,40 @@ export const actionChangeBackgroundColor = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => (
-    <>
-      {appState.stylesPanelMode === "full" && (
-        <h3 aria-hidden="true">{t("labels.background")}</h3>
-      )}
-      <ColorPicker
-        topPicks={DEFAULT_ELEMENT_BACKGROUND_PICKS}
-        palette={DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE}
-        type="elementBackground"
-        label={t("labels.background")}
-        color={getFormValue(
-          elements,
-          app,
-          (element) => element.backgroundColor,
-          true,
-          (hasSelection) =>
-            !hasSelection ? appState.currentItemBackgroundColor : null,
+  PanelComponent: ({ elements, appState, updateData, app, data }) => {
+    const { stylesPanelMode } = getStylesPanelInfo(app);
+
+    return (
+      <>
+        {stylesPanelMode === "full" && (
+          <h3 aria-hidden="true">{t("labels.background")}</h3>
         )}
-        onChange={(color) => updateData({ currentItemBackgroundColor: color })}
-        elements={elements}
-        appState={appState}
-        updateData={updateData}
-        compactMode={
-          appState.stylesPanelMode === "compact" ||
-          appState.stylesPanelMode === "mobile"
-        }
-      />
-    </>
-  ),
+        <ColorPicker
+          topPicks={DEFAULT_ELEMENT_BACKGROUND_PICKS}
+          palette={DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE}
+          type="elementBackground"
+          label={t("labels.background")}
+          color={getFormValue(
+            elements,
+            app,
+            (element) => element.backgroundColor,
+            true,
+            (hasSelection) =>
+              !hasSelection ? appState.currentItemBackgroundColor : null,
+          )}
+          onChange={(color) =>
+            updateData({ currentItemBackgroundColor: color })
+          }
+          elements={elements}
+          appState={appState}
+          updateData={updateData}
+        />
+      </>
+    );
+  },
 });
 
-export const actionChangeFillStyle = register({
+export const actionChangeFillStyle = register<ExcalidrawElement["fillStyle"]>({
   name: "changeFillStyle",
   label: "labels.fill",
   trackEvent: false,
@@ -460,7 +477,9 @@ export const actionChangeFillStyle = register({
     trackEvent(
       "element",
       "changeFillStyle",
-      `${value} (${app.device.editor.isMobile ? "mobile" : "desktop"})`,
+      `${value} (${
+        app.editorInterface.formFactor === "phone" ? "mobile" : "desktop"
+      })`,
     );
     return {
       elements: changeProperty(elements, appState, (el) =>
@@ -532,7 +551,9 @@ export const actionChangeFillStyle = register({
   },
 });
 
-export const actionChangeStrokeWidth = register({
+export const actionChangeStrokeWidth = register<
+  ExcalidrawElement["strokeWidth"]
+>({
   name: "changeStrokeWidth",
   label: "labels.strokeWidth",
   trackEvent: false,
@@ -588,7 +609,7 @@ export const actionChangeStrokeWidth = register({
   ),
 });
 
-export const actionChangeSloppiness = register({
+export const actionChangeSloppiness = register<ExcalidrawElement["roughness"]>({
   name: "changeSloppiness",
   label: "labels.sloppiness",
   trackEvent: false,
@@ -642,7 +663,9 @@ export const actionChangeSloppiness = register({
   ),
 });
 
-export const actionChangeStrokeStyle = register({
+export const actionChangeStrokeStyle = register<
+  ExcalidrawElement["strokeStyle"]
+>({
   name: "changeStrokeStyle",
   label: "labels.strokeStyle",
   trackEvent: false,
@@ -695,7 +718,7 @@ export const actionChangeStrokeStyle = register({
   ),
 });
 
-export const actionChangeOpacity = register({
+export const actionChangeOpacity = register<ExcalidrawElement["opacity"]>({
   name: "changeOpacity",
   label: "labels.opacity",
   trackEvent: false,
@@ -719,86 +742,100 @@ export const actionChangeOpacity = register({
   ),
 });
 
-export const actionChangeFontSize = register({
-  name: "changeFontSize",
-  label: "labels.fontSize",
-  trackEvent: false,
-  perform: (elements, appState, value, app) => {
-    return changeFontSize(elements, appState, app, () => value, value);
+export const actionChangeFontSize = register<ExcalidrawTextElement["fontSize"]>(
+  {
+    name: "changeFontSize",
+    label: "labels.fontSize",
+    trackEvent: false,
+    perform: (elements, appState, value, app) => {
+      return changeFontSize(
+        elements,
+        appState,
+        app,
+        () => {
+          invariant(value, "actionChangeFontSize: Expected a font size value");
+          return value;
+        },
+        value,
+      );
+    },
+    PanelComponent: ({ elements, appState, updateData, app, data }) => {
+      const { isCompact } = getStylesPanelInfo(app);
+
+      return (
+        <fieldset>
+          <legend>{t("labels.fontSize")}</legend>
+          <div className="buttonList">
+            <RadioSelection
+              group="font-size"
+              options={[
+                {
+                  value: 16,
+                  text: t("labels.small"),
+                  icon: FontSizeSmallIcon,
+                  testId: "fontSize-small",
+                },
+                {
+                  value: 20,
+                  text: t("labels.medium"),
+                  icon: FontSizeMediumIcon,
+                  testId: "fontSize-medium",
+                },
+                {
+                  value: 28,
+                  text: t("labels.large"),
+                  icon: FontSizeLargeIcon,
+                  testId: "fontSize-large",
+                },
+                {
+                  value: 36,
+                  text: t("labels.veryLarge"),
+                  icon: FontSizeExtraLargeIcon,
+                  testId: "fontSize-veryLarge",
+                },
+              ]}
+              value={getFormValue(
+                elements,
+                app,
+                (element) => {
+                  if (isTextElement(element)) {
+                    return element.fontSize;
+                  }
+                  const boundTextElement = getBoundTextElement(
+                    element,
+                    app.scene.getNonDeletedElementsMap(),
+                  );
+                  if (boundTextElement) {
+                    return boundTextElement.fontSize;
+                  }
+                  return null;
+                },
+                (element) =>
+                  isTextElement(element) ||
+                  getBoundTextElement(
+                    element,
+                    app.scene.getNonDeletedElementsMap(),
+                  ) !== null,
+                (hasSelection) =>
+                  hasSelection
+                    ? null
+                    : appState.currentItemFontSize || DEFAULT_FONT_SIZE,
+              )}
+              onChange={(value) => {
+                withCaretPositionPreservation(
+                  () => updateData(value),
+                  isCompact,
+                  !!appState.editingTextElement,
+                  data?.onPreventClose,
+                );
+              }}
+            />
+          </div>
+        </fieldset>
+      );
+    },
   },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => (
-    <fieldset>
-      <legend>{t("labels.fontSize")}</legend>
-      <div className="buttonList">
-        <RadioSelection
-          group="font-size"
-          options={[
-            {
-              value: 16,
-              text: t("labels.small"),
-              icon: FontSizeSmallIcon,
-              testId: "fontSize-small",
-            },
-            {
-              value: 20,
-              text: t("labels.medium"),
-              icon: FontSizeMediumIcon,
-              testId: "fontSize-medium",
-            },
-            {
-              value: 28,
-              text: t("labels.large"),
-              icon: FontSizeLargeIcon,
-              testId: "fontSize-large",
-            },
-            {
-              value: 36,
-              text: t("labels.veryLarge"),
-              icon: FontSizeExtraLargeIcon,
-              testId: "fontSize-veryLarge",
-            },
-          ]}
-          value={getFormValue(
-            elements,
-            app,
-            (element) => {
-              if (isTextElement(element)) {
-                return element.fontSize;
-              }
-              const boundTextElement = getBoundTextElement(
-                element,
-                app.scene.getNonDeletedElementsMap(),
-              );
-              if (boundTextElement) {
-                return boundTextElement.fontSize;
-              }
-              return null;
-            },
-            (element) =>
-              isTextElement(element) ||
-              getBoundTextElement(
-                element,
-                app.scene.getNonDeletedElementsMap(),
-              ) !== null,
-            (hasSelection) =>
-              hasSelection
-                ? null
-                : appState.currentItemFontSize || DEFAULT_FONT_SIZE,
-          )}
-          onChange={(value) => {
-            withCaretPositionPreservation(
-              () => updateData(value),
-              appState.stylesPanelMode === "compact" ||
-                appState.stylesPanelMode === "mobile",
-              !!appState.editingTextElement,
-              data?.onPreventClose,
-            );
-          }}
-        />
-      </div>
-    </fieldset>
-  ),
-});
+);
 
 export const actionDecreaseFontSize = register({
   name: "decreaseFontSize",
@@ -858,7 +895,10 @@ type ChangeFontFamilyData = Partial<
   resetContainers?: true;
 };
 
-export const actionChangeFontFamily = register({
+export const actionChangeFontFamily = register<{
+  currentItemFontFamily: any;
+  currentHoveredFontFamily: any;
+}>({
   name: "changeFontFamily",
   label: "labels.fontFamily",
   trackEvent: false,
@@ -895,6 +935,8 @@ export const actionChangeFontFamily = register({
       };
     }
 
+    invariant(value, "actionChangeFontFamily: value must be defined");
+
     const { currentItemFontFamily, currentHoveredFontFamily } = value;
 
     let nextCaptureUpdateAction: CaptureUpdateActionType =
@@ -1059,6 +1101,7 @@ export const actionChangeFontFamily = register({
     // relying on state batching as multiple `FontPicker` handlers could be called in rapid succession and we want to combine them
     const [batchedData, setBatchedData] = useState<ChangeFontFamilyData>({});
     const isUnmounted = useRef(true);
+    const { stylesPanelMode, isCompact } = getStylesPanelInfo(app);
 
     const selectedFontFamily = useMemo(() => {
       const getFontFamily = (
@@ -1131,14 +1174,14 @@ export const actionChangeFontFamily = register({
 
     return (
       <>
-        {appState.stylesPanelMode === "full" && (
+        {stylesPanelMode === "full" && (
           <legend>{t("labels.fontFamily")}</legend>
         )}
         <FontPicker
           isOpened={appState.openPopup === "fontFamily"}
           selectedFontFamily={selectedFontFamily}
           hoveredFontFamily={appState.currentHoveredFontFamily}
-          compactMode={appState.stylesPanelMode !== "full"}
+          compactMode={stylesPanelMode !== "full"}
           onSelect={(fontFamily) => {
             withCaretPositionPreservation(
               () => {
@@ -1150,8 +1193,7 @@ export const actionChangeFontFamily = register({
                 // defensive clear so immediate close won't abuse the cached elements
                 cachedElementsRef.current.clear();
               },
-              appState.stylesPanelMode === "compact" ||
-                appState.stylesPanelMode === "mobile",
+              isCompact,
               !!appState.editingTextElement,
             );
           }}
@@ -1226,11 +1268,7 @@ export const actionChangeFontFamily = register({
               cachedElementsRef.current.clear();
 
               // Refocus text editor when font picker closes if we were editing text
-              if (
-                (appState.stylesPanelMode === "compact" ||
-                  appState.stylesPanelMode === "mobile") &&
-                appState.editingTextElement
-              ) {
+              if (isCompact && appState.editingTextElement) {
                 restoreCaretPosition(null); // Just refocus without saved position
               }
             }
@@ -1241,7 +1279,7 @@ export const actionChangeFontFamily = register({
   },
 });
 
-export const actionChangeTextAlign = register({
+export const actionChangeTextAlign = register<TextAlign>({
   name: "changeTextAlign",
   label: "Change text alignment",
   trackEvent: false,
@@ -1277,6 +1315,7 @@ export const actionChangeTextAlign = register({
   },
   PanelComponent: ({ elements, appState, updateData, app, data }) => {
     const elementsMap = app.scene.getNonDeletedElementsMap();
+    const { isCompact } = getStylesPanelInfo(app);
 
     return (
       <fieldset>
@@ -1329,8 +1368,7 @@ export const actionChangeTextAlign = register({
             onChange={(value) => {
               withCaretPositionPreservation(
                 () => updateData(value),
-                appState.stylesPanelMode === "compact" ||
-                  appState.stylesPanelMode === "mobile",
+                isCompact,
                 !!appState.editingTextElement,
                 data?.onPreventClose,
               );
@@ -1342,7 +1380,7 @@ export const actionChangeTextAlign = register({
   },
 });
 
-export const actionChangeVerticalAlign = register({
+export const actionChangeVerticalAlign = register<VerticalAlign>({
   name: "changeVerticalAlign",
   label: "Change vertical alignment",
   trackEvent: { category: "element" },
@@ -1377,6 +1415,7 @@ export const actionChangeVerticalAlign = register({
     };
   },
   PanelComponent: ({ elements, appState, updateData, app, data }) => {
+    const { isCompact } = getStylesPanelInfo(app);
     return (
       <fieldset>
         <div className="buttonList">
@@ -1429,8 +1468,7 @@ export const actionChangeVerticalAlign = register({
             onChange={(value) => {
               withCaretPositionPreservation(
                 () => updateData(value),
-                appState.stylesPanelMode === "compact" ||
-                  appState.stylesPanelMode === "mobile",
+                isCompact,
                 !!appState.editingTextElement,
                 data?.onPreventClose,
               );
@@ -1442,7 +1480,7 @@ export const actionChangeVerticalAlign = register({
   },
 });
 
-export const actionChangeRoundness = register({
+export const actionChangeRoundness = register<"sharp" | "round">({
   name: "changeRoundness",
   label: "Change edge roundness",
   trackEvent: false,
@@ -1551,11 +1589,18 @@ const getMarginValue = (margin: number | null) => {
   }
 };
 
-export const actionChangeContainerBehavior = register({
+export const actionChangeContainerBehavior = register<
+  | { textFlow: ContainerBehavior["textFlow"] }
+  | { margin: NonNullable<ReturnType<typeof getMarginValue>> }
+>({
   name: "changeContainerBehavior",
   label: "labels.container",
   trackEvent: false,
   perform: (elements, appState, value, app) => {
+    invariant(
+      value,
+      "actionChangeContainerBehavior: value must be defined",
+    );
     const elementsMap = app.scene.getNonDeletedElementsMap();
     let selected = getSelectedElements(elements, appState, {
       includeBoundTextElement: true,
@@ -1591,7 +1636,8 @@ export const actionChangeContainerBehavior = register({
       }
     }
 
-    if (value.hasOwnProperty("margin")) {
+    if ("margin" in value) {
+      const marginSize = getMargin(value.margin);
       if (containerIdsToUpdate.size === 0) {
         return {
           appState: {
@@ -1599,24 +1645,22 @@ export const actionChangeContainerBehavior = register({
             currentItemContainerBehavior: {
               textFlow:
                 appState.currentItemContainerBehavior?.textFlow ?? "growing",
-              margin: getMargin(value.margin as "small" | "medium" | "large"),
+              margin: marginSize,
             },
           },
           captureUpdate: CaptureUpdateAction.IMMEDIATELY,
         };
       }
-
       const nextElements = changeProperty(elements, appState, (el) =>
         containerIdsToUpdate.has(el.id)
           ? newElementWith(el, {
               containerBehavior: {
                 textFlow: el.containerBehavior?.textFlow ?? "growing",
-                margin: getMargin(value.margin as "small" | "medium" | "large"),
+                margin: marginSize,
               },
             })
           : el,
       );
-
       // Invalidate containers to trigger re-render
       containerIdsToUpdate.forEach((id) => {
         const container = nextElements.find((el) => el.id === id);
@@ -1638,30 +1682,29 @@ export const actionChangeContainerBehavior = register({
           currentItemContainerBehavior: {
             textFlow:
               appState.currentItemContainerBehavior?.textFlow ?? "growing",
-            margin: getMargin(value.margin as "small" | "medium" | "large"),
+            margin: marginSize,
           },
         },
         captureUpdate: CaptureUpdateAction.IMMEDIATELY,
       };
     }
-
+    const textFlow = value.textFlow;
     const nextElements = changeProperty(elements, appState, (el) =>
       containerIdsToUpdate.has(el.id)
         ? newElementWith(el, {
             containerBehavior: {
-              textFlow: value,
+              textFlow,
               margin: el.containerBehavior?.margin ?? BOUND_TEXT_PADDING,
             },
           })
         : el,
     );
-
     return {
       elements: nextElements,
       appState: {
         ...appState,
         currentItemContainerBehavior: {
-          textFlow: value,
+          textFlow,
           margin:
             appState.currentItemContainerBehavior?.margin ?? BOUND_TEXT_PADDING,
         },
@@ -1866,15 +1909,16 @@ const getArrowheadOptions = (flip: boolean) => {
   ] as const;
 };
 
-export const actionChangeArrowhead = register({
+export const actionChangeArrowhead = register<{
+  position: "start" | "end";
+  type: Arrowhead;
+}>({
   name: "changeArrowhead",
   label: "Change arrowheads",
   trackEvent: false,
-  perform: (
-    elements,
-    appState,
-    value: { position: "start" | "end"; type: Arrowhead },
-  ) => {
+  perform: (elements, appState, value) => {
+    invariant(value, "actionChangeArrowhead: value must be defined");
+
     return {
       elements: changeProperty(elements, appState, (el) => {
         if (isLinearElement(el)) {
@@ -1969,7 +2013,7 @@ export const actionChangeArrowProperties = register({
   },
 });
 
-export const actionChangeArrowType = register({
+export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
   name: "changeArrowType",
   label: "Change arrow types",
   trackEvent: false,
@@ -1978,7 +2022,20 @@ export const actionChangeArrowType = register({
       if (!isArrowElement(el)) {
         return el;
       }
+      const elementsMap = app.scene.getNonDeletedElementsMap();
+      const startPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+        el,
+        0,
+        elementsMap,
+      );
+      const endPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+        el,
+        -1,
+        elementsMap,
+      );
       let newElement = newElementWith(el, {
+        x: value === ARROW_TYPE.elbow ? startPoint[0] : el.x,
+        y: value === ARROW_TYPE.elbow ? startPoint[1] : el.y,
         roundness:
           value === ARROW_TYPE.round
             ? {
@@ -1986,9 +2043,31 @@ export const actionChangeArrowType = register({
               }
             : null,
         elbowed: value === ARROW_TYPE.elbow,
+        angle: value === ARROW_TYPE.elbow ? (0 as Radians) : el.angle,
         points:
           value === ARROW_TYPE.elbow || el.elbowed
-            ? [el.points[0], el.points[el.points.length - 1]]
+            ? [
+                LinearElementEditor.pointFromAbsoluteCoords(
+                  {
+                    ...el,
+                    x: startPoint[0],
+                    y: startPoint[1],
+                    angle: 0 as Radians,
+                  },
+                  startPoint,
+                  elementsMap,
+                ),
+                LinearElementEditor.pointFromAbsoluteCoords(
+                  {
+                    ...el,
+                    x: startPoint[0],
+                    y: startPoint[1],
+                    angle: 0 as Radians,
+                  },
+                  endPoint,
+                  elementsMap,
+                ),
+              ]
             : el.points,
       });
 
@@ -2070,7 +2149,13 @@ export const actionChangeArrowType = register({
             newElement.startBinding.elementId,
           ) as ExcalidrawBindableElement;
           if (startElement) {
-            bindLinearElement(newElement, startElement, "start", app.scene);
+            bindBindingElement(
+              newElement,
+              startElement,
+              appState.bindMode === "inside" ? "inside" : "orbit",
+              "start",
+              app.scene,
+            );
           }
         }
         if (newElement.endBinding) {
@@ -2078,7 +2163,13 @@ export const actionChangeArrowType = register({
             newElement.endBinding.elementId,
           ) as ExcalidrawBindableElement;
           if (endElement) {
-            bindLinearElement(newElement, endElement, "end", app.scene);
+            bindBindingElement(
+              newElement,
+              endElement,
+              appState.bindMode === "inside" ? "inside" : "orbit",
+              "end",
+              app.scene,
+            );
           }
         }
       }
diff --git a/packages/excalidraw/actions/actionToggleZenMode.tsx b/packages/excalidraw/actions/actionToggleZenMode.tsx
index 98175b384a..ad445f47dd 100644
--- a/packages/excalidraw/actions/actionToggleZenMode.tsx
+++ b/packages/excalidraw/actions/actionToggleZenMode.tsx
@@ -25,8 +25,11 @@ export const actionToggleZenMode = register({
     };
   },
   checked: (appState) => appState.zenModeEnabled,
-  predicate: (elements, appState, appProps) => {
-    return typeof appProps.zenModeEnabled === "undefined";
+  predicate: (elements, appState, appProps, app) => {
+    return (
+      app.editorInterface.formFactor !== "phone" &&
+      typeof appProps.zenModeEnabled === "undefined"
+    );
   },
   keyTest: (event) =>
     !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.Z,
diff --git a/packages/excalidraw/actions/manager.tsx b/packages/excalidraw/actions/manager.tsx
index f3314bf35e..adac253e22 100644
--- a/packages/excalidraw/actions/manager.tsx
+++ b/packages/excalidraw/actions/manager.tsx
@@ -37,7 +37,9 @@ const trackAction = (
           trackEvent(
             action.trackEvent.category,
             action.trackEvent.action || action.name,
-            `${source} (${app.device.editor.isMobile ? "mobile" : "desktop"})`,
+            `${source} (${
+              app.editorInterface.formFactor === "phone" ? "mobile" : "desktop"
+            })`,
           );
         }
       }
diff --git a/packages/excalidraw/actions/register.ts b/packages/excalidraw/actions/register.ts
index 7c841e3aee..8f22810393 100644
--- a/packages/excalidraw/actions/register.ts
+++ b/packages/excalidraw/actions/register.ts
@@ -2,7 +2,12 @@ import type { Action } from "./types";
 
 export let actions: readonly Action[] = [];
 
-export const register = <T extends Action>(action: T) => {
+export const register = <
+  TData extends any,
+  T extends Action<TData> = Action<TData>,
+>(
+  action: T,
+) => {
   actions = actions.concat(action);
   return action as T & {
     keyTest?: unknown extends T["keyTest"] ? never : T["keyTest"];
diff --git a/packages/excalidraw/actions/types.ts b/packages/excalidraw/actions/types.ts
index 430a04c71d..f078d21fbd 100644
--- a/packages/excalidraw/actions/types.ts
+++ b/packages/excalidraw/actions/types.ts
@@ -32,10 +32,10 @@ export type ActionResult =
     }
   | false;
 
-type ActionFn = (
+type ActionFn<TData = any> = (
   elements: readonly OrderedExcalidrawElement[],
   appState: Readonly<AppState>,
-  formData: any,
+  formData: TData | undefined,
   app: AppClassProperties,
 ) => ActionResult | Promise<ActionResult>;
 
@@ -158,7 +158,7 @@ export type PanelComponentProps = {
   ) => React.JSX.Element | null;
 };
 
-export interface Action {
+export interface Action<TData = any> {
   name: ActionName;
   label:
     | string
@@ -175,7 +175,7 @@ export interface Action {
         elements: readonly ExcalidrawElement[],
       ) => React.ReactNode);
   PanelComponent?: React.FC<PanelComponentProps>;
-  perform: ActionFn;
+  perform: ActionFn<TData>;
   keyPriority?: number;
   keyTest?: (
     event: React.KeyboardEvent | KeyboardEvent,
diff --git a/packages/excalidraw/appState.ts b/packages/excalidraw/appState.ts
index c5b5d27a7f..e94f27f29e 100644
--- a/packages/excalidraw/appState.ts
+++ b/packages/excalidraw/appState.ts
@@ -101,7 +101,7 @@ export const getDefaultAppState = (): Omit<
       panels: STATS_PANELS.generalStats | STATS_PANELS.elementProperties,
     },
     startBoundElement: null,
-    suggestedBindings: [],
+    suggestedBinding: null,
     frameRendering: { enabled: true, clip: true, name: true, outline: true },
     frameToHighlight: null,
     editingFrame: null,
@@ -128,7 +128,7 @@ export const getDefaultAppState = (): Omit<
     searchMatches: null,
     lockedMultiSelections: {},
     activeLockedId: null,
-    stylesPanelMode: "full",
+    bindMode: "orbit",
   };
 };
 
@@ -232,7 +232,7 @@ const APP_STATE_STORAGE_CONF = (<
   shouldCacheIgnoreZoom: { browser: true, export: false, server: false },
   stats: { browser: true, export: false, server: false },
   startBoundElement: { browser: false, export: false, server: false },
-  suggestedBindings: { browser: false, export: false, server: false },
+  suggestedBinding: { browser: false, export: false, server: false },
   frameRendering: { browser: false, export: false, server: false },
   frameToHighlight: { browser: false, export: false, server: false },
   editingFrame: { browser: false, export: false, server: false },
@@ -255,7 +255,7 @@ const APP_STATE_STORAGE_CONF = (<
   searchMatches: { browser: false, export: false, server: false },
   lockedMultiSelections: { browser: true, export: true, server: true },
   activeLockedId: { browser: false, export: false, server: false },
-  stylesPanelMode: { browser: false, export: false, server: false },
+  bindMode: { browser: true, export: false, server: false },
 });
 
 const _clearAppStateForStorage = <
diff --git a/packages/excalidraw/components/Actions.tsx b/packages/excalidraw/components/Actions.tsx
index cf0c1501d8..e90923c5de 100644
--- a/packages/excalidraw/components/Actions.tsx
+++ b/packages/excalidraw/components/Actions.tsx
@@ -52,11 +52,17 @@ import { getFormValue } from "../actions/actionProperties";
 
 import { useTextEditorFocus } from "../hooks/useTextEditorFocus";
 
+import { actionToggleViewMode } from "../actions/actionToggleViewMode";
+
 import { getToolbarTools } from "./shapes";
 
 import "./Actions.scss";
 
-import { useDevice, useExcalidrawContainer } from "./App";
+import {
+  useEditorInterface,
+  useStylesPanelMode,
+  useExcalidrawContainer,
+} from "./App";
 import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
 import { ToolPopover } from "./ToolPopover";
@@ -78,6 +84,7 @@ import {
   adjustmentsIcon,
   DotsHorizontalIcon,
   SelectionIcon,
+  pencilIcon,
 } from "./icons";
 
 import { Island } from "./Island";
@@ -163,7 +170,7 @@ export const SelectedShapeActions = ({
   const isEditingTextOrNewElement = Boolean(
     appState.editingTextElement || appState.newElement,
   );
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const isRTL = document.documentElement.getAttribute("dir") === "rtl";
 
   const showFillIcons =
@@ -311,8 +318,10 @@ export const SelectedShapeActions = ({
         <fieldset>
           <legend>{t("labels.actions")}</legend>
           <div className="buttonList">
-            {!device.editor.isMobile && renderAction("duplicateSelection")}
-            {!device.editor.isMobile && renderAction("deleteSelectedElements")}
+            {editorInterface.formFactor !== "phone" &&
+              renderAction("duplicateSelection")}
+            {editorInterface.formFactor !== "phone" &&
+              renderAction("deleteSelectedElements")}
             {renderAction("group")}
             {renderAction("ungroup")}
             {showLinkIcon && renderAction("hyperlink")}
@@ -1075,6 +1084,9 @@ export const ShapesSwitcher = ({
   UIOptions: AppProps["UIOptions"];
 }) => {
   const [isExtraToolsMenuOpen, setIsExtraToolsMenuOpen] = useState(false);
+  const stylesPanelMode = useStylesPanelMode();
+  const isFullStylesPanel = stylesPanelMode === "full";
+  const isCompactStylesPanel = stylesPanelMode === "compact";
 
   const SELECTION_TOOLS = [
     {
@@ -1092,7 +1104,7 @@ export const ShapesSwitcher = ({
   const frameToolSelected = activeTool.type === "frame";
   const laserToolSelected = activeTool.type === "laser";
   const lassoToolSelected =
-    app.state.stylesPanelMode === "full" &&
+    isFullStylesPanel &&
     activeTool.type === "lasso" &&
     app.state.preferredSelectionTool.type !== "lasso";
 
@@ -1125,7 +1137,7 @@ export const ShapesSwitcher = ({
           // use a ToolPopover for selection/lasso toggle as well
           if (
             (value === "selection" || value === "lasso") &&
-            app.state.stylesPanelMode === "compact"
+            isCompactStylesPanel
           ) {
             return (
               <ToolPopover
@@ -1259,7 +1271,7 @@ export const ShapesSwitcher = ({
           >
             {t("toolBar.laser")}
           </DropdownMenu.Item>
-          {app.state.stylesPanelMode === "full" && (
+          {isFullStylesPanel && (
             <DropdownMenu.Item
               onSelect={() => app.setActiveTool({ type: "lasso" })}
               icon={LassoIcon}
@@ -1329,7 +1341,7 @@ export const UndoRedoActions = ({
   </div>
 );
 
-export const ExitZenModeAction = ({
+export const ExitZenModeButton = ({
   actionManager,
   showExitZenModeBtn,
 }: {
@@ -1346,3 +1358,17 @@ export const ExitZenModeAction = ({
     {t("buttons.exitZenMode")}
   </button>
 );
+
+export const ExitViewModeButton = ({
+  actionManager,
+}: {
+  actionManager: ActionManager;
+}) => (
+  <button
+    type="button"
+    className="disable-view-mode"
+    onClick={() => actionManager.executeAction(actionToggleViewMode)}
+  >
+    {pencilIcon}
+  </button>
+);
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
index c600b35399..1b698c98c6 100644
--- a/packages/excalidraw/components/App.tsx
+++ b/packages/excalidraw/components/App.tsx
@@ -37,7 +37,6 @@ import {
   FRAME_STYLE,
   IMAGE_MIME_TYPES,
   IMAGE_RENDER_TIMEOUT,
-  isBrave,
   LINE_CONFIRM_THRESHOLD,
   MAX_ALLOWED_FILE_BYTES,
   MIME_TYPES,
@@ -55,13 +54,11 @@ import {
   ZOOM_STEP,
   POINTER_EVENTS,
   TOOL_TYPE,
-  isIOS,
   supportsResizeObserver,
   DEFAULT_COLLISION_THRESHOLD,
   DEFAULT_TEXT_ALIGN,
   ARROW_TYPE,
   DEFAULT_REDUCED_GLOBAL_ALPHA,
-  isSafari,
   isLocalLink,
   normalizeLink,
   toValidURL,
@@ -98,27 +95,33 @@ import {
   Emitter,
   MINIMUM_ARROW_SIZE,
   DOUBLE_TAP_POSITION_THRESHOLD,
-  isMobileOrTablet,
-  MQ_MAX_MOBILE,
-  MQ_MIN_TABLET,
-  MQ_MAX_TABLET,
-  MQ_MAX_HEIGHT_LANDSCAPE,
-  MQ_MAX_WIDTH_LANDSCAPE,
+  BIND_MODE_TIMEOUT,
   BOUND_TEXT_PADDING,
+  invariant,
+  getFeatureFlag,
+  createUserAgentDescriptor,
+  getFormFactor,
+  deriveStylesPanelMode,
+  isIOS,
+  isBrave,
+  isSafari,
+  type EditorInterface,
+  type StylesPanelMode,
+  loadDesktopUIModePreference,
+  setDesktopUIMode,
+  isSelectionLikeTool,
 } from "@excalidraw/common";
 
 import {
   getObservedAppState,
   getCommonBounds,
-  maybeSuggestBindingsForLinearElementAtCoords,
   getElementAbsoluteCoords,
-  bindOrUnbindLinearElements,
+  bindOrUnbindBindingElements,
   fixBindingsAfterDeletion,
   getHoveredElementForBinding,
   isBindingEnabled,
   shouldEnableBindingForPointerEvent,
   updateBoundElements,
-  getSuggestedBindingsForArrows,
   LinearElementEditor,
   newElementWith,
   newFrameElement,
@@ -154,7 +157,6 @@ import {
   isFlowchartNodeElement,
   isBindableElement,
   isTextElement,
-  getLockedLinearCursorAlignSize,
   getNormalizedDimensions,
   isElementCompletelyInViewport,
   isElementInViewport,
@@ -240,10 +242,17 @@ import {
   StoreDelta,
   type ApplyToOptions,
   positionElementsOnGrid,
+  calculateFixedPointForNonElbowArrowBinding,
+  bindOrUnbindBindingElement,
+  mutateElement,
+  getElementBounds,
+  doBoundsIntersect,
   isFlowchartType,
+  isPointInElement,
+  maxBindingDistance_simple,
 } from "@excalidraw/element";
 
-import type { LocalPoint, Radians } from "@excalidraw/math";
+import type { GlobalPoint, LocalPoint, Radians } from "@excalidraw/math";
 
 import type {
   ExcalidrawElement,
@@ -268,6 +277,7 @@ import type {
   ExcalidrawArrowElement,
   ExcalidrawElbowArrowElement,
   SceneElementsMap,
+  ExcalidrawBindableElement,
 } from "@excalidraw/element/types";
 
 import type { Mutable, ValueOf } from "@excalidraw/common/utility-types";
@@ -462,7 +472,6 @@ import type {
   LibraryItems,
   PointerDownState,
   SceneData,
-  Device,
   FrameNameBoundsCache,
   SidebarName,
   SidebarTabName,
@@ -483,19 +492,20 @@ import type { Action, ActionResult } from "../actions/types";
 const AppContext = React.createContext<AppClassProperties>(null!);
 const AppPropsContext = React.createContext<AppProps>(null!);
 
-const deviceContextInitialValue = {
-  viewport: {
-    isMobile: false,
-    isLandscape: false,
-  },
-  editor: {
-    isMobile: false,
-    canFitSidebar: false,
-  },
+const editorInterfaceContextInitialValue: EditorInterface = {
+  formFactor: "desktop",
+  desktopUIMode: "full",
+  userAgent: createUserAgentDescriptor(
+    typeof navigator !== "undefined" ? navigator.userAgent : "",
+  ),
   isTouchScreen: false,
+  canFitSidebar: false,
+  isLandscape: true,
 };
-const DeviceContext = React.createContext<Device>(deviceContextInitialValue);
-DeviceContext.displayName = "DeviceContext";
+const EditorInterfaceContext = React.createContext<EditorInterface>(
+  editorInterfaceContextInitialValue,
+);
+EditorInterfaceContext.displayName = "EditorInterfaceContext";
 
 export const ExcalidrawContainerContext = React.createContext<{
   container: HTMLDivElement | null;
@@ -531,7 +541,10 @@ ExcalidrawActionManagerContext.displayName = "ExcalidrawActionManagerContext";
 
 export const useApp = () => useContext(AppContext);
 export const useAppProps = () => useContext(AppPropsContext);
-export const useDevice = () => useContext<Device>(DeviceContext);
+export const useEditorInterface = () =>
+  useContext<EditorInterface>(EditorInterfaceContext);
+export const useStylesPanelMode = () =>
+  deriveStylesPanelMode(useEditorInterface());
 export const useExcalidrawContainer = () =>
   useContext(ExcalidrawContainerContext);
 export const useExcalidrawElements = () =>
@@ -579,7 +592,10 @@ class App extends React.Component<AppProps, AppState> {
   rc: RoughCanvas;
   unmounted: boolean = false;
   actionManager: ActionManager;
-  device: Device = deviceContextInitialValue;
+  editorInterface: EditorInterface = editorInterfaceContextInitialValue;
+  private stylesPanelMode: StylesPanelMode = deriveStylesPanelMode(
+    editorInterfaceContextInitialValue,
+  );
 
   private excalidrawContainerRef = React.createRef<HTMLDivElement>();
 
@@ -588,7 +604,6 @@ class App extends React.Component<AppProps, AppState> {
   public renderer: Renderer;
   public visibleElements: readonly NonDeletedExcalidrawElement[];
   private resizeObserver: ResizeObserver | undefined;
-  private nearestScrollableContainer: HTMLElement | Document | undefined;
   public library: AppClassProperties["library"];
   public libraryItemsFromStorage: LibraryItems | undefined;
   public id: string;
@@ -622,6 +637,8 @@ class App extends React.Component<AppProps, AppState> {
   public flowChartCreator: FlowChartCreator = new FlowChartCreator();
   private flowChartNavigator: FlowChartNavigator = new FlowChartNavigator();
 
+  bindModeHandler: ReturnType<typeof setTimeout> | null = null;
+
   hitLinkElement?: NonDeletedExcalidrawElement;
   lastPointerDownEvent: React.PointerEvent<HTMLElement> | null = null;
   lastPointerUpEvent: React.PointerEvent<HTMLElement> | PointerEvent | null =
@@ -695,6 +712,9 @@ class App extends React.Component<AppProps, AppState> {
       height: window.innerHeight,
     };
 
+    this.refreshEditorInterface();
+    this.stylesPanelMode = deriveStylesPanelMode(this.editorInterface);
+
     this.id = nanoid();
     this.library = new Library(this);
     this.actionManager = new ActionManager(
@@ -741,6 +761,7 @@ class App extends React.Component<AppProps, AppState> {
         setActiveTool: this.setActiveTool,
         setCursor: this.setCursor,
         resetCursor: this.resetCursor,
+        getEditorInterface: () => this.editorInterface,
         updateFrameRendering: this.updateFrameRendering,
         toggleSidebar: this.toggleSidebar,
         onChange: (cb) => this.onChangeEmitter.on(cb),
@@ -842,6 +863,320 @@ class App extends React.Component<AppProps, AppState> {
     }
   }
 
+  private handleSkipBindMode() {
+    if (
+      this.state.selectedLinearElement?.initialState &&
+      !this.state.selectedLinearElement.initialState.arrowStartIsInside
+    ) {
+      invariant(
+        this.lastPointerMoveCoords,
+        "Missing last pointer move coords when changing bind skip mode for arrow start",
+      );
+      const elementsMap = this.scene.getNonDeletedElementsMap();
+      const hoveredElement = getHoveredElementForBinding(
+        pointFrom<GlobalPoint>(
+          this.lastPointerMoveCoords.x,
+          this.lastPointerMoveCoords.y,
+        ),
+        this.scene.getNonDeletedElements(),
+        elementsMap,
+      );
+      const element = LinearElementEditor.getElement(
+        this.state.selectedLinearElement.elementId,
+        elementsMap,
+      );
+
+      if (
+        element?.startBinding &&
+        hoveredElement?.id === element.startBinding.elementId
+      ) {
+        this.setState({
+          selectedLinearElement: {
+            ...this.state.selectedLinearElement,
+            initialState: {
+              ...this.state.selectedLinearElement.initialState,
+              arrowStartIsInside: true,
+            },
+          },
+        });
+      }
+    }
+
+    if (this.state.bindMode === "orbit") {
+      if (this.bindModeHandler) {
+        clearTimeout(this.bindModeHandler);
+        this.bindModeHandler = null;
+      }
+
+      // PERF: It's okay since it's a single trigger from a key handler
+      // or single call from pointer move handler because the bindMode check
+      // will not pass the second time
+      flushSync(() => {
+        this.setState({
+          bindMode: "skip",
+        });
+      });
+
+      if (
+        this.lastPointerMoveCoords &&
+        this.state.selectedLinearElement?.selectedPointsIndices &&
+        this.state.selectedLinearElement?.selectedPointsIndices.length
+      ) {
+        const { x, y } = this.lastPointerMoveCoords;
+        const event =
+          this.lastPointerMoveEvent ?? this.lastPointerDownEvent?.nativeEvent;
+        invariant(event, "Last event must exist");
+        const deltaX = x - this.state.selectedLinearElement.pointerOffset.x;
+        const deltaY = y - this.state.selectedLinearElement.pointerOffset.y;
+        const newState = this.state.multiElement
+          ? LinearElementEditor.handlePointerMove(
+              event,
+              this,
+              deltaX,
+              deltaY,
+              this.state.selectedLinearElement,
+            )
+          : LinearElementEditor.handlePointDragging(
+              event,
+              this,
+              deltaX,
+              deltaY,
+              this.state.selectedLinearElement,
+            );
+        if (newState) {
+          this.setState(newState);
+        }
+      }
+    }
+  }
+
+  private resetDelayedBindMode() {
+    if (this.bindModeHandler) {
+      clearTimeout(this.bindModeHandler);
+      this.bindModeHandler = null;
+    }
+
+    if (this.state.bindMode !== "orbit") {
+      // We need this iteration to complete binding and change
+      // back to orbit mode after that
+      setTimeout(() =>
+        this.setState({
+          bindMode: "orbit",
+        }),
+      );
+    }
+  }
+
+  private previousHoveredBindableElement: NonDeletedExcalidrawElement | null =
+    null;
+
+  private handleDelayedBindModeChange(
+    arrow: ExcalidrawArrowElement,
+    hoveredElement: NonDeletedExcalidrawElement | null,
+  ) {
+    if (arrow.isDeleted || isElbowArrow(arrow)) {
+      return;
+    }
+
+    const effector = () => {
+      this.bindModeHandler = null;
+
+      invariant(
+        this.lastPointerMoveCoords,
+        "Expected lastPointerMoveCoords to be set",
+      );
+
+      if (!this.state.multiElement) {
+        if (
+          !this.state.selectedLinearElement ||
+          !this.state.selectedLinearElement.selectedPointsIndices ||
+          !this.state.selectedLinearElement.selectedPointsIndices.length
+        ) {
+          return;
+        }
+
+        const startDragged =
+          this.state.selectedLinearElement.selectedPointsIndices.includes(0);
+        const endDragged =
+          this.state.selectedLinearElement.selectedPointsIndices.includes(
+            arrow.points.length - 1,
+          );
+
+        // Check if the whole arrow is dragged by selecting all endpoints
+        if ((!startDragged && !endDragged) || (startDragged && endDragged)) {
+          return;
+        }
+      }
+
+      const { x, y } = this.lastPointerMoveCoords;
+      const hoveredElement = getHoveredElementForBinding(
+        pointFrom<GlobalPoint>(x, y),
+        this.scene.getNonDeletedElements(),
+        this.scene.getNonDeletedElementsMap(),
+      );
+
+      if (hoveredElement && this.state.bindMode !== "skip") {
+        invariant(
+          this.state.selectedLinearElement?.elementId === arrow.id,
+          "The selectedLinearElement is expected to not change while a bind mode timeout is ticking",
+        );
+
+        // Once the start is set to inside binding, it remains so
+        const arrowStartIsInside =
+          this.state.selectedLinearElement.initialState.arrowStartIsInside ||
+          arrow.startBinding?.elementId === hoveredElement.id;
+
+        // Change the global binding mode
+        flushSync(() => {
+          invariant(
+            this.state.selectedLinearElement,
+            "this.state.selectedLinearElement must exist",
+          );
+
+          this.setState({
+            bindMode: "inside",
+            selectedLinearElement: {
+              ...this.state.selectedLinearElement,
+              initialState: {
+                ...this.state.selectedLinearElement.initialState,
+                arrowStartIsInside,
+              },
+            },
+          });
+        });
+
+        const event =
+          this.lastPointerMoveEvent ?? this.lastPointerDownEvent?.nativeEvent;
+        invariant(event, "Last event must exist");
+        const deltaX = x - this.state.selectedLinearElement.pointerOffset.x;
+        const deltaY = y - this.state.selectedLinearElement.pointerOffset.y;
+        const newState = this.state.multiElement
+          ? LinearElementEditor.handlePointerMove(
+              event,
+              this,
+              deltaX,
+              deltaY,
+              this.state.selectedLinearElement,
+            )
+          : LinearElementEditor.handlePointDragging(
+              event,
+              this,
+              deltaX,
+              deltaY,
+              this.state.selectedLinearElement,
+            );
+        if (newState) {
+          this.setState(newState);
+        }
+      }
+    };
+
+    let isOverlapping = false;
+    if (this.state.selectedLinearElement?.selectedPointsIndices) {
+      const elementsMap = this.scene.getNonDeletedElementsMap();
+      const startDragged =
+        this.state.selectedLinearElement.selectedPointsIndices.includes(0);
+      const endDragged =
+        this.state.selectedLinearElement.selectedPointsIndices.includes(
+          arrow.points.length - 1,
+        );
+      const startElement = startDragged
+        ? hoveredElement
+        : arrow.startBinding && elementsMap.get(arrow.startBinding.elementId);
+      const endElement = endDragged
+        ? hoveredElement
+        : arrow.endBinding && elementsMap.get(arrow.endBinding.elementId);
+      const startBounds =
+        startElement && getElementBounds(startElement, elementsMap);
+      const endBounds = endElement && getElementBounds(endElement, elementsMap);
+      isOverlapping = !!(
+        startBounds &&
+        endBounds &&
+        startElement.id !== endElement.id &&
+        doBoundsIntersect(startBounds, endBounds)
+      );
+    }
+
+    const startDragged =
+      this.state.selectedLinearElement?.selectedPointsIndices?.includes(0);
+    const endDragged =
+      this.state.selectedLinearElement?.selectedPointsIndices?.includes(
+        arrow.points.length - 1,
+      );
+    const currentBinding = startDragged
+      ? "startBinding"
+      : endDragged
+      ? "endBinding"
+      : null;
+    const otherBinding = startDragged
+      ? "endBinding"
+      : endDragged
+      ? "startBinding"
+      : null;
+    const isAlreadyInsideBindingToSameElement =
+      (otherBinding &&
+        arrow[otherBinding]?.mode === "inside" &&
+        arrow[otherBinding]?.elementId === hoveredElement?.id) ||
+      (currentBinding &&
+        arrow[currentBinding]?.mode === "inside" &&
+        hoveredElement?.id === arrow[currentBinding]?.elementId);
+
+    if (
+      currentBinding &&
+      otherBinding &&
+      arrow[currentBinding]?.mode === "inside" &&
+      hoveredElement?.id !== arrow[currentBinding]?.elementId &&
+      arrow[otherBinding]?.elementId !== arrow[currentBinding]?.elementId
+    ) {
+      // Update binding out of place to orbit mode
+      this.scene.mutateElement(
+        arrow,
+        {
+          [currentBinding]: {
+            ...arrow[currentBinding],
+            mode: "orbit",
+          },
+        },
+        {
+          informMutation: false,
+          isDragging: true,
+        },
+      );
+    }
+
+    if (
+      !hoveredElement ||
+      (this.previousHoveredBindableElement &&
+        hoveredElement.id !== this.previousHoveredBindableElement.id)
+    ) {
+      // Clear the timeout if we're not hovering a bindable
+      if (this.bindModeHandler) {
+        clearTimeout(this.bindModeHandler);
+        this.bindModeHandler = null;
+      }
+
+      // Clear the inside binding mode too
+      if (this.state.bindMode === "inside") {
+        flushSync(() => {
+          this.setState({
+            bindMode: "orbit",
+          });
+        });
+      }
+
+      this.previousHoveredBindableElement = null;
+    } else if (
+      !this.bindModeHandler &&
+      (!this.state.newElement || !arrow.startBinding || isOverlapping) &&
+      !isAlreadyInsideBindingToSameElement
+    ) {
+      // We are hovering a bindable element
+      this.bindModeHandler = setTimeout(effector, BIND_MODE_TIMEOUT);
+    }
+
+    this.previousHoveredBindableElement = hoveredElement;
+  }
+
   private cacheEmbeddableRef(
     element: ExcalidrawIframeLikeElement,
     ref: HTMLIFrameElement | null,
@@ -1467,6 +1802,7 @@ class App extends React.Component<AppProps, AppState> {
       return (
         <div
           id={this.getFrameNameDOMId(f)}
+          className={CLASSES.FRAME_NAME}
           key={f.id}
           style={{
             position: "absolute",
@@ -1565,11 +1901,12 @@ class App extends React.Component<AppProps, AppState> {
 
     return (
       <div
-        className={clsx("excalidraw excalidraw-container", {
+        translate="no"
+        className={clsx("excalidraw excalidraw-container notranslate", {
           "excalidraw--view-mode":
             this.state.viewModeEnabled ||
             this.state.openDialog?.name === "elementLinkSelector",
-          "excalidraw--mobile": this.device.editor.isMobile,
+          "excalidraw--mobile": this.editorInterface.formFactor === "phone",
         })}
         style={{
           ["--ui-pointerEvents" as any]: shouldBlockPointerEvents
@@ -1591,7 +1928,7 @@ class App extends React.Component<AppProps, AppState> {
             <ExcalidrawContainerContext.Provider
               value={this.excalidrawContainerValue}
             >
-              <DeviceContext.Provider value={this.device}>
+              <EditorInterfaceContext.Provider value={this.editorInterface}>
                 <ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
                   <ExcalidrawAppStateContext.Provider value={this.state}>
                     <ExcalidrawElementsContext.Provider
@@ -1804,6 +2141,7 @@ class App extends React.Component<AppProps, AppState> {
                           />
                         )}
                         <InteractiveCanvas
+                          app={this}
                           containerRef={this.excalidrawContainerRef}
                           canvas={this.interactiveCanvas}
                           elementsMap={elementsMap}
@@ -1819,7 +2157,7 @@ class App extends React.Component<AppProps, AppState> {
                           renderScrollbars={
                             this.props.renderScrollbars === true
                           }
-                          device={this.device}
+                          editorInterface={this.editorInterface}
                           renderInteractiveSceneCallback={
                             this.renderInteractiveSceneCallback
                           }
@@ -1855,7 +2193,7 @@ class App extends React.Component<AppProps, AppState> {
                     </ExcalidrawElementsContext.Provider>
                   </ExcalidrawAppStateContext.Provider>
                 </ExcalidrawSetAppStateContext.Provider>
-              </DeviceContext.Provider>
+              </EditorInterfaceContext.Provider>
             </ExcalidrawContainerContext.Provider>
           </AppPropsContext.Provider>
         </AppContext.Provider>
@@ -2372,7 +2710,8 @@ class App extends React.Component<AppProps, AppState> {
 
     if (!scene.appState.preferredSelectionTool.initialized) {
       scene.appState.preferredSelectionTool = {
-        type: this.device.editor.isMobile ? "lasso" : "selection",
+        type:
+          this.editorInterface.formFactor === "phone" ? "lasso" : "selection",
         initialized: true,
       };
     }
@@ -2432,44 +2771,14 @@ class App extends React.Component<AppProps, AppState> {
     }
   };
 
-  private isMobileBreakpoint = (width: number, height: number) => {
+  private getFormFactor = (editorWidth: number, editorHeight: number) => {
     return (
-      width <= MQ_MAX_MOBILE ||
-      (height < MQ_MAX_HEIGHT_LANDSCAPE && width < MQ_MAX_WIDTH_LANDSCAPE)
+      this.props.UIOptions.formFactor ??
+      getFormFactor(editorWidth, editorHeight)
     );
   };
 
-  private isTabletBreakpoint = (editorWidth: number, editorHeight: number) => {
-    const minSide = Math.min(editorWidth, editorHeight);
-    const maxSide = Math.max(editorWidth, editorHeight);
-
-    return minSide >= MQ_MIN_TABLET && maxSide <= MQ_MAX_TABLET;
-  };
-
-  private refreshViewportBreakpoints = () => {
-    const container = this.excalidrawContainerRef.current;
-    if (!container) {
-      return;
-    }
-
-    const { width: editorWidth, height: editorHeight } =
-      container.getBoundingClientRect();
-
-    const prevViewportState = this.device.viewport;
-
-    const nextViewportState = updateObject(prevViewportState, {
-      isLandscape: editorWidth > editorHeight,
-      isMobile: this.isMobileBreakpoint(editorWidth, editorHeight),
-    });
-
-    if (prevViewportState !== nextViewportState) {
-      this.device = { ...this.device, viewport: nextViewportState };
-      return true;
-    }
-    return false;
-  };
-
-  private refreshEditorBreakpoints = () => {
+  public refreshEditorInterface = () => {
     const container = this.excalidrawContainerRef.current;
     if (!container) {
       return;
@@ -2478,47 +2787,56 @@ class App extends React.Component<AppProps, AppState> {
     const { width: editorWidth, height: editorHeight } =
       container.getBoundingClientRect();
 
+    const storedDesktopUIMode = loadDesktopUIModePreference();
+    const userAgentDescriptor = createUserAgentDescriptor(
+      typeof navigator !== "undefined" ? navigator.userAgent : "",
+    );
+    // allow host app to control formFactor and desktopUIMode via props
     const sidebarBreakpoint =
       this.props.UIOptions.dockedSidebarBreakpoint != null
         ? this.props.UIOptions.dockedSidebarBreakpoint
         : MQ_RIGHT_SIDEBAR_MIN_WIDTH;
-
-    const prevEditorState = this.device.editor;
-
-    const nextEditorState = updateObject(prevEditorState, {
-      isMobile: this.isMobileBreakpoint(editorWidth, editorHeight),
+    const nextEditorInterface = updateObject(this.editorInterface, {
+      desktopUIMode:
+        this.props.UIOptions.desktopUIMode ??
+        storedDesktopUIMode ??
+        this.editorInterface.desktopUIMode,
+      formFactor: this.getFormFactor(editorWidth, editorHeight),
+      userAgent: userAgentDescriptor,
       canFitSidebar: editorWidth > sidebarBreakpoint,
+      isLandscape: editorWidth > editorHeight,
     });
 
-    const stylesPanelMode =
-      // NOTE: we could also remove the isMobileOrTablet check here and
-      // always switch to compact mode when the editor is narrow (e.g. < MQ_MIN_WIDTH_DESKTOP)
-      // but not too narrow (> MQ_MAX_WIDTH_MOBILE)
-      this.isTabletBreakpoint(editorWidth, editorHeight) && isMobileOrTablet()
-        ? "compact"
-        : this.isMobileBreakpoint(editorWidth, editorHeight)
-        ? "mobile"
-        : "full";
+    this.editorInterface = nextEditorInterface;
+    this.reconcileStylesPanelMode(nextEditorInterface);
+  };
 
-    // also check if we need to update the app state
-    this.setState((prevState) => ({
-      stylesPanelMode,
-      // reset to box selection mode if the UI changes to full
-      // where you'd not be able to change the mode yourself currently
-      preferredSelectionTool:
-        stylesPanelMode === "full"
-          ? {
-              type: "selection",
-              initialized: true,
-            }
-          : prevState.preferredSelectionTool,
-    }));
-
-    if (prevEditorState !== nextEditorState) {
-      this.device = { ...this.device, editor: nextEditorState };
-      return true;
+  private reconcileStylesPanelMode = (nextEditorInterface: EditorInterface) => {
+    const nextStylesPanelMode = deriveStylesPanelMode(nextEditorInterface);
+    if (nextStylesPanelMode === this.stylesPanelMode) {
+      return;
     }
-    return false;
+
+    const prevStylesPanelMode = this.stylesPanelMode;
+    this.stylesPanelMode = nextStylesPanelMode;
+
+    if (prevStylesPanelMode !== "full" && nextStylesPanelMode === "full") {
+      this.setState((prevState) => ({
+        preferredSelectionTool: {
+          type: "selection",
+          initialized: true,
+        },
+      }));
+    }
+  };
+
+  /** TO BE USED LATER */
+  private setDesktopUIMode = (mode: EditorInterface["desktopUIMode"]) => {
+    const nextMode = setDesktopUIMode(mode);
+    this.editorInterface = updateObject(this.editorInterface, {
+      desktopUIMode: nextMode,
+    });
+    this.reconcileStylesPanelMode(this.editorInterface);
   };
 
   private clearImageShapeCache(filesMap?: BinaryFiles) {
@@ -2590,19 +2908,9 @@ class App extends React.Component<AppProps, AppState> {
       this.focusContainer();
     }
 
-    if (
-      // bounding rects don't work in tests so updating
-      // the state on init would result in making the test enviro run
-      // in mobile breakpoint (0 width/height), making everything fail
-      !isTestEnv()
-    ) {
-      this.refreshViewportBreakpoints();
-      this.refreshEditorBreakpoints();
-    }
-
     if (supportsResizeObserver && this.excalidrawContainerRef.current) {
       this.resizeObserver = new ResizeObserver(() => {
-        this.refreshEditorBreakpoints();
+        this.refreshEditorInterface();
         this.updateDOMRect();
       });
       this.resizeObserver?.observe(this.excalidrawContainerRef.current);
@@ -2656,11 +2964,8 @@ class App extends React.Component<AppProps, AppState> {
     this.scene
       .getElementsIncludingDeleted()
       .forEach((element) => ShapeCache.delete(element));
-    this.refreshViewportBreakpoints();
+    this.refreshEditorInterface();
     this.updateDOMRect();
-    if (!supportsResizeObserver) {
-      this.refreshEditorBreakpoints();
-    }
     this.setState({});
   });
 
@@ -2819,13 +3124,6 @@ class App extends React.Component<AppProps, AppState> {
       this.setState({ showWelcomeScreen: true });
     }
 
-    if (
-      prevProps.UIOptions.dockedSidebarBreakpoint !==
-      this.props.UIOptions.dockedSidebarBreakpoint
-    ) {
-      this.refreshEditorBreakpoints();
-    }
-
     const hasFollowedPersonLeft =
       prevState.userToFollow &&
       !this.state.collaborators.has(prevState.userToFollow.socketId);
@@ -2951,15 +3249,6 @@ class App extends React.Component<AppProps, AppState> {
       this.setState({ editingTextElement: null });
     }
 
-    if (
-      this.state.selectedLinearElement &&
-      !this.state.selectedElementIds[this.state.selectedLinearElement.elementId]
-    ) {
-      // To make sure `selectedLinearElement` is in sync with `selectedElementIds`, however this shouldn't be needed once
-      // we have a single API to update `selectedElementIds`
-      this.setState({ selectedLinearElement: null });
-    }
-
     this.store.commit(elementsMap, this.state);
 
     // Do not notify consumers if we're still loading the scene. Among other
@@ -3180,7 +3469,8 @@ class App extends React.Component<AppProps, AppState> {
       this.addElementsFromPasteOrLibrary({
         elements,
         files: data.files || null,
-        position: isMobileOrTablet() ? "center" : "cursor",
+        position:
+          this.editorInterface.formFactor === "desktop" ? "cursor" : "center",
         retainSeed: isPlainPaste,
       });
       return;
@@ -3205,7 +3495,8 @@ class App extends React.Component<AppProps, AppState> {
         this.addElementsFromPasteOrLibrary({
           elements,
           files,
-          position: isMobileOrTablet() ? "center" : "cursor",
+          position:
+            this.editorInterface.formFactor === "desktop" ? "cursor" : "center",
         });
 
         return;
@@ -3431,7 +3722,7 @@ class App extends React.Component<AppProps, AppState> {
         // from library, not when pasting from clipboard. Alas.
         openSidebar:
           this.state.openSidebar &&
-          this.device.editor.canFitSidebar &&
+          this.editorInterface.canFitSidebar &&
           editorJotaiStore.get(isSidebarDockedAtom)
             ? this.state.openSidebar
             : null,
@@ -3629,7 +3920,7 @@ class App extends React.Component<AppProps, AppState> {
       !isPlainPaste &&
       textElements.length > 1 &&
       PLAIN_PASTE_TOAST_SHOWN === false &&
-      !this.device.editor.isMobile
+      this.editorInterface.formFactor !== "phone"
     ) {
       this.setToast({
         message: t("toast.pasteAsSingleElement", {
@@ -3661,7 +3952,9 @@ class App extends React.Component<AppProps, AppState> {
       trackEvent(
         "toolbar",
         "toggleLock",
-        `${source} (${this.device.editor.isMobile ? "mobile" : "desktop"})`,
+        `${source} (${
+          this.editorInterface.formFactor === "phone" ? "mobile" : "desktop"
+        })`,
       );
     }
     this.setState((prevState) => {
@@ -4013,12 +4306,7 @@ class App extends React.Component<AppProps, AppState> {
       }
 
       if (appState) {
-        this.setState({
-          ...appState,
-          // keep existing stylesPanelMode as it needs to be preserved
-          // or set at startup
-          stylesPanelMode: this.state.stylesPanelMode,
-        } as Pick<AppState, K> | null);
+        this.setState(appState as Pick<AppState, K> | null);
       }
 
       if (elements) {
@@ -4440,6 +4728,11 @@ class App extends React.Component<AppProps, AppState> {
         return;
       }
 
+      // Handle Alt key for bind mode
+      if (event.key === KEYS.ALT && getFeatureFlag("COMPLEX_BINDINGS")) {
+        this.handleSkipBindMode();
+      }
+
       if (this.actionManager.handleKeyDown(event)) {
         return;
       }
@@ -4449,6 +4742,10 @@ class App extends React.Component<AppProps, AppState> {
       }
 
       if (event[KEYS.CTRL_OR_CMD] && this.state.isBindingEnabled) {
+        if (getFeatureFlag("COMPLEX_BINDINGS")) {
+          this.resetDelayedBindMode();
+        }
+
         this.setState({ isBindingEnabled: false });
       }
 
@@ -4459,14 +4756,12 @@ class App extends React.Component<AppProps, AppState> {
           includeElementsInFrames: true,
         });
 
-        const elbowArrow = selectedElements.find(isElbowArrow) as
-          | ExcalidrawArrowElement
-          | undefined;
-
         const arrowIdsToRemove = new Set<string>();
 
         selectedElements
-          .filter(isElbowArrow)
+          .filter((el): el is NonDeleted<ExcalidrawArrowElement> =>
+            isBindingElement(el),
+          )
           .filter((arrow) => {
             const startElementNotInSelection =
               arrow.startBinding &&
@@ -4523,16 +4818,6 @@ class App extends React.Component<AppProps, AppState> {
           });
         });
 
-        this.setState({
-          suggestedBindings: getSuggestedBindingsForArrows(
-            selectedElements.filter(
-              (element) => element.id !== elbowArrow?.id || step !== 0,
-            ),
-            this.scene.getNonDeletedElementsMap(),
-            this.state.zoom,
-          ),
-        });
-
         this.scene.triggerUpdate();
 
         event.preventDefault();
@@ -4596,7 +4881,9 @@ class App extends React.Component<AppProps, AppState> {
               "toolbar",
               shape,
               `keyboard (${
-                this.device.editor.isMobile ? "mobile" : "desktop"
+                this.editorInterface.formFactor === "phone"
+                  ? "mobile"
+                  : "desktop"
               })`,
             );
           }
@@ -4719,10 +5006,7 @@ class App extends React.Component<AppProps, AppState> {
         this.state.openDialog?.name === "elementLinkSelector"
       ) {
         setCursor(this.interactiveCanvas, CURSOR_TYPE.GRAB);
-      } else if (
-        this.state.activeTool.type === "selection" ||
-        this.state.activeTool.type === "lasso"
-      ) {
+      } else if (isSelectionLikeTool(this.state.activeTool.type)) {
         resetCursor(this.interactiveCanvas);
       } else {
         setCursorForShape(this.interactiveCanvas, this.state);
@@ -4735,18 +5019,95 @@ class App extends React.Component<AppProps, AppState> {
       }
       isHoldingSpace = false;
     }
+    if (
+      (event.key === KEYS.ALT && this.state.bindMode === "skip") ||
+      (!event[KEYS.CTRL_OR_CMD] && !isBindingEnabled(this.state))
+    ) {
+      // Handle Alt key release for bind mode
+      this.setState({
+        bindMode: "orbit",
+      });
+
+      // Restart the timer if we're creating/editing a linear element and hovering over an element
+      if (this.lastPointerMoveEvent) {
+        const scenePointer = viewportCoordsToSceneCoords(
+          {
+            clientX: this.lastPointerMoveEvent.clientX,
+            clientY: this.lastPointerMoveEvent.clientY,
+          },
+          this.state,
+        );
+
+        const hoveredElement = getHoveredElementForBinding(
+          pointFrom<GlobalPoint>(scenePointer.x, scenePointer.y),
+          this.scene.getNonDeletedElements(),
+          this.scene.getNonDeletedElementsMap(),
+        );
+
+        if (this.state.selectedLinearElement) {
+          const element = LinearElementEditor.getElement(
+            this.state.selectedLinearElement.elementId,
+            this.scene.getNonDeletedElementsMap(),
+          );
+
+          if (isBindingElement(element) && getFeatureFlag("COMPLEX_BINDINGS")) {
+            this.handleDelayedBindModeChange(element, hoveredElement);
+          }
+        }
+      }
+    }
     if (!event[KEYS.CTRL_OR_CMD] && !this.state.isBindingEnabled) {
       this.setState({ isBindingEnabled: true });
     }
     if (isArrowKey(event.key)) {
-      bindOrUnbindLinearElements(
-        this.scene.getSelectedElements(this.state).filter(isLinearElement),
-        isBindingEnabled(this.state),
-        this.state.selectedLinearElement?.selectedPointsIndices ?? [],
+      bindOrUnbindBindingElements(
+        this.scene.getSelectedElements(this.state).filter(isArrowElement),
         this.scene,
-        this.state.zoom,
+        this.state,
       );
-      this.setState({ suggestedBindings: [] });
+
+      const elementsMap = this.scene.getNonDeletedElementsMap();
+
+      this.scene
+        .getSelectedElements(this.state)
+        .filter(isSimpleArrow)
+        .forEach((element) => {
+          // Update the fixed point bindings for non-elbow arrows
+          // when the pointer is released, so that they are correctly positioned
+          // after the drag.
+          if (element.startBinding) {
+            this.scene.mutateElement(element, {
+              startBinding: {
+                ...element.startBinding,
+                ...calculateFixedPointForNonElbowArrowBinding(
+                  element,
+                  elementsMap.get(
+                    element.startBinding.elementId,
+                  ) as ExcalidrawBindableElement,
+                  "start",
+                  elementsMap,
+                ),
+              },
+            });
+          }
+          if (element.endBinding) {
+            this.scene.mutateElement(element, {
+              endBinding: {
+                ...element.endBinding,
+                ...calculateFixedPointForNonElbowArrowBinding(
+                  element,
+                  elementsMap.get(
+                    element.endBinding.elementId,
+                  ) as ExcalidrawBindableElement,
+                  "end",
+                  elementsMap,
+                ),
+              },
+            });
+          }
+        });
+
+      this.setState({ suggestedBinding: null });
     }
 
     if (!event.altKey) {
@@ -4845,7 +5206,7 @@ class App extends React.Component<AppProps, AppState> {
       this.focusContainer();
     }
     if (!isLinearElementType(nextActiveTool.type)) {
-      this.setState({ suggestedBindings: [] });
+      this.setState({ suggestedBinding: null });
     }
     if (nextActiveTool.type === "image") {
       this.onImageToolbarButtonClick();
@@ -4856,6 +5217,9 @@ class App extends React.Component<AppProps, AppState> {
         snapLines: prevState.snapLines.length ? [] : prevState.snapLines,
         originSnapOffset: null,
         activeEmbeddable: null,
+        selectedLinearElement: isSelectionLikeTool(nextActiveTool.type)
+          ? prevState.selectedLinearElement
+          : null,
       } as const;
 
       if (nextActiveTool.type === "freedraw") {
@@ -4865,6 +5229,7 @@ class App extends React.Component<AppProps, AppState> {
       if (nextActiveTool.type === "lasso") {
         return {
           ...prevState,
+          ...commonResets,
           activeTool: nextActiveTool,
           ...(keepSelection
             ? {}
@@ -4874,23 +5239,22 @@ class App extends React.Component<AppProps, AppState> {
                 editingGroupId: null,
                 multiElement: null,
               }),
-          ...commonResets,
         };
       } else if (nextActiveTool.type !== "selection") {
         return {
           ...prevState,
+          ...commonResets,
           activeTool: nextActiveTool,
           selectedElementIds: makeNextSelectedElementIds({}, prevState),
           selectedGroupIds: makeNextSelectedElementIds({}, prevState),
           editingGroupId: null,
           multiElement: null,
-          ...commonResets,
         };
       }
       return {
         ...prevState,
-        activeTool: nextActiveTool,
         ...commonResets,
+        activeTool: nextActiveTool,
       };
     });
   };
@@ -5102,7 +5466,7 @@ class App extends React.Component<AppProps, AppState> {
       // caret (i.e. deselect). There's not much use for always selecting
       // the text on edit anyway (and users can select-all from contextmenu
       // if needed)
-      autoSelect: !this.device.isTouchScreen,
+      autoSelect: !this.editorInterface.isTouchScreen,
     });
     // deselect all other elements when inserting text
     this.deselectElements();
@@ -5265,7 +5629,7 @@ class App extends React.Component<AppProps, AppState> {
     if (
       considerBoundingBox &&
       this.state.selectedElementIds[element.id] &&
-      hasBoundingBox([element], this.state)
+      hasBoundingBox([element], this.state, this.editorInterface)
     ) {
       // if hitting the bounding box, return early
       // but if not, we should check for other cases as well (e.g. frame name)
@@ -5604,8 +5968,8 @@ class App extends React.Component<AppProps, AppState> {
           this.setState({
             selectedLinearElement: {
               ...this.state.selectedLinearElement,
-              pointerDownState: {
-                ...this.state.selectedLinearElement.pointerDownState,
+              initialState: {
+                ...this.state.selectedLinearElement.initialState,
                 segmentMidpoint: {
                   index: nextIndex,
                   value: hitCoords,
@@ -5740,7 +6104,7 @@ class App extends React.Component<AppProps, AppState> {
           this.scene.getNonDeletedElementsMap(),
           this.state,
           pointFrom(scenePointer.x, scenePointer.y),
-          this.device.editor.isMobile,
+          this.editorInterface.formFactor === "phone",
         )
       ) {
         return element;
@@ -5775,7 +6139,7 @@ class App extends React.Component<AppProps, AppState> {
       elementsMap,
       this.state,
       pointFrom(lastPointerDownCoords.x, lastPointerDownCoords.y),
-      this.device.editor.isMobile,
+      this.editorInterface.formFactor === "phone",
     );
     const lastPointerUpCoords = viewportCoordsToSceneCoords(
       this.lastPointerUpEvent!,
@@ -5786,7 +6150,7 @@ class App extends React.Component<AppProps, AppState> {
       elementsMap,
       this.state,
       pointFrom(lastPointerUpCoords.x, lastPointerUpCoords.y),
-      this.device.editor.isMobile,
+      this.editorInterface.formFactor === "phone",
     );
     if (lastPointerDownHittingLinkIcon && lastPointerUpHittingLinkIcon) {
       hideHyperlinkToolip();
@@ -5837,6 +6201,12 @@ class App extends React.Component<AppProps, AppState> {
   ) => {
     this.savePointer(event.clientX, event.clientY, this.state.cursorButton);
     this.lastPointerMoveEvent = event.nativeEvent;
+    const scenePointer = viewportCoordsToSceneCoords(event, this.state);
+    const { x: scenePointerX, y: scenePointerY } = scenePointer;
+    this.lastPointerMoveCoords = {
+      x: scenePointerX,
+      y: scenePointerY,
+    };
 
     if (gesture.pointers.has(event.pointerId)) {
       gesture.pointers.set(event.pointerId, {
@@ -5886,6 +6256,8 @@ class App extends React.Component<AppProps, AppState> {
           scrollY: zoomState.scrollY + 2 * (deltaY / nextZoom),
           shouldCacheIgnoreZoom: true,
         });
+
+        return null;
       });
       this.resetShouldCacheIgnoreZoomDebounced();
     } else {
@@ -5923,9 +6295,6 @@ class App extends React.Component<AppProps, AppState> {
       }
     }
 
-    const scenePointer = viewportCoordsToSceneCoords(event, this.state);
-    const { x: scenePointerX, y: scenePointerY } = scenePointer;
-
     if (
       !this.state.newElement &&
       isActiveToolNonLinearSnappable(this.state.activeTool.type)
@@ -5977,15 +6346,14 @@ class App extends React.Component<AppProps, AppState> {
       this.state.selectedLinearElement?.isEditing &&
       !this.state.selectedLinearElement.isDragging
     ) {
-      const editingLinearElement = LinearElementEditor.handlePointerMove(
-        event,
-        scenePointerX,
-        scenePointerY,
-        this,
-      );
-      const linearElement = editingLinearElement
-        ? this.scene.getElement(editingLinearElement.elementId)
-        : null;
+      const editingLinearElement = this.state.newElement
+        ? null
+        : LinearElementEditor.handlePointerMoveInEditMode(
+            event,
+            scenePointerX,
+            scenePointerY,
+            this,
+          );
 
       if (
         editingLinearElement &&
@@ -6000,52 +6368,82 @@ class App extends React.Component<AppProps, AppState> {
           });
         });
       }
-      if (
-        editingLinearElement?.lastUncommittedPoint != null &&
-        linearElement &&
-        isBindingElementType(linearElement.type)
-      ) {
-        this.maybeSuggestBindingAtCursor(
-          scenePointer,
-          editingLinearElement.elbowed,
-        );
-      } else if (this.state.suggestedBindings.length) {
-        this.setState({ suggestedBindings: [] });
-      }
     }
 
     if (isBindingElementType(this.state.activeTool.type)) {
       // Hovering with a selected tool or creating new linear element via click
       // and point
       const { newElement } = this.state;
-      if (isBindingElement(newElement, false)) {
-        this.setState({
-          suggestedBindings: maybeSuggestBindingsForLinearElementAtCoords(
-            newElement,
-            [scenePointer],
-            this.scene,
-            this.state.zoom,
-            this.state.startBoundElement,
-          ),
-        });
-      } else {
-        this.maybeSuggestBindingAtCursor(scenePointer, false);
+      if (!newElement && isBindingEnabled(this.state)) {
+        const hoveredElement = getHoveredElementForBinding(
+          pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+          this.scene.getNonDeletedElements(),
+          this.scene.getNonDeletedElementsMap(),
+          (el) => maxBindingDistance_simple(this.state.zoom),
+        );
+        if (hoveredElement) {
+          this.setState({
+            suggestedBinding: hoveredElement,
+          });
+        } else if (this.state.suggestedBinding) {
+          this.setState({
+            suggestedBinding: null,
+          });
+        }
       }
     }
 
-    if (this.state.multiElement) {
-      const { multiElement } = this.state;
-      const { x: rx, y: ry } = multiElement;
-
-      const { points, lastCommittedPoint } = multiElement;
+    if (this.state.multiElement && this.state.selectedLinearElement) {
+      const { multiElement, selectedLinearElement } = this.state;
+      const { x: rx, y: ry, points } = multiElement;
       const lastPoint = points[points.length - 1];
 
+      const { lastCommittedPoint } = selectedLinearElement;
+
       setCursorForShape(this.interactiveCanvas, this.state);
 
       if (lastPoint === lastCommittedPoint) {
-        // if we haven't yet created a temp point and we're beyond commit-zone
-        // threshold, add a point
-        if (
+        const hoveredElement =
+          isArrowElement(this.state.newElement) &&
+          isBindingEnabled(this.state) &&
+          getHoveredElementForBinding(
+            pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+            this.scene.getNonDeletedElements(),
+            this.scene.getNonDeletedElementsMap(),
+            (el) => maxBindingDistance_simple(this.state.zoom),
+          );
+        if (hoveredElement) {
+          this.actionManager.executeAction(actionFinalize, "ui", {
+            event: event.nativeEvent,
+            sceneCoords: {
+              x: scenePointerX,
+              y: scenePointerY,
+            },
+          });
+          this.setState({ suggestedBinding: null, startBoundElement: null });
+          if (!this.state.activeTool.locked) {
+            resetCursor(this.interactiveCanvas);
+            this.setState((prevState) => ({
+              newElement: null,
+              activeTool: updateActiveTool(this.state, {
+                type: this.state.preferredSelectionTool.type,
+              }),
+              selectedElementIds: makeNextSelectedElementIds(
+                {
+                  ...prevState.selectedElementIds,
+                  [multiElement.id]: true,
+                },
+                prevState,
+              ),
+              selectedLinearElement: new LinearElementEditor(
+                multiElement,
+                this.scene.getNonDeletedElementsMap(),
+              ),
+            }));
+          }
+        } else if (
+          // if we haven't yet created a temp point and we're beyond commit-zone
+          // threshold, add a point
           pointDistance(
             pointFrom(scenePointerX - rx, scenePointerY - ry),
             lastPoint,
@@ -6061,6 +6459,21 @@ class App extends React.Component<AppProps, AppState> {
             },
             { informMutation: false, isDragging: false },
           );
+          invariant(
+            this.state.selectedLinearElement?.initialState,
+            "initialState must be set",
+          );
+          this.setState({
+            selectedLinearElement: {
+              ...this.state.selectedLinearElement,
+              lastCommittedPoint: points[points.length - 1],
+              selectedPointsIndices: [multiElement.points.length - 1],
+              initialState: {
+                ...this.state.selectedLinearElement.initialState,
+                lastClickedPoint: multiElement.points.length - 1,
+              },
+            },
+          });
         } else {
           setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER);
           // in this branch, we're inside the commit zone, and no uncommitted
@@ -6082,64 +6495,91 @@ class App extends React.Component<AppProps, AppState> {
           },
           { informMutation: false, isDragging: false },
         );
+        this.setState({
+          selectedLinearElement: {
+            ...selectedLinearElement,
+            selectedPointsIndices:
+              selectedLinearElement.selectedPointsIndices?.includes(
+                multiElement.points.length,
+              )
+                ? [
+                    ...selectedLinearElement.selectedPointsIndices.filter(
+                      (idx) =>
+                        idx !== multiElement.points.length &&
+                        idx !== multiElement.points.length - 1,
+                    ),
+                    multiElement.points.length - 1,
+                  ]
+                : selectedLinearElement.selectedPointsIndices,
+            lastCommittedPoint:
+              multiElement.points[multiElement.points.length - 1],
+            initialState: {
+              ...selectedLinearElement.initialState,
+              lastClickedPoint: multiElement.points.length - 1,
+            },
+          },
+        });
       } else {
-        const [gridX, gridY] = getGridPoint(
-          scenePointerX,
-          scenePointerY,
-          event[KEYS.CTRL_OR_CMD] || isElbowArrow(multiElement)
-            ? null
-            : this.getEffectiveGridSize(),
-        );
-
-        const [lastCommittedX, lastCommittedY] =
-          multiElement?.lastCommittedPoint ?? [0, 0];
-
-        let dxFromLastCommitted = gridX - rx - lastCommittedX;
-        let dyFromLastCommitted = gridY - ry - lastCommittedY;
-
-        if (shouldRotateWithDiscreteAngle(event)) {
-          ({ width: dxFromLastCommitted, height: dyFromLastCommitted } =
-            getLockedLinearCursorAlignSize(
-              // actual coordinate of the last committed point
-              lastCommittedX + rx,
-              lastCommittedY + ry,
-              // cursor-grid coordinate
-              gridX,
-              gridY,
-            ));
-        }
-
         if (isPathALoop(points, this.state.zoom.value)) {
           setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER);
         }
 
-        // update last uncommitted point
-        this.scene.mutateElement(
-          multiElement,
-          {
-            points: [
-              ...points.slice(0, -1),
-              pointFrom<LocalPoint>(
-                lastCommittedX + dxFromLastCommitted,
-                lastCommittedY + dyFromLastCommitted,
-              ),
-            ],
-          },
-          {
-            isDragging: true,
-            informMutation: false,
-          },
+        // Update arrow points
+        const elementsMap = this.scene.getNonDeletedElementsMap();
+
+        if (isSimpleArrow(multiElement)) {
+          const hoveredElement = getHoveredElementForBinding(
+            pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+            this.scene.getNonDeletedElements(),
+            elementsMap,
+          );
+
+          if (getFeatureFlag("COMPLEX_BINDINGS")) {
+            this.handleDelayedBindModeChange(multiElement, hoveredElement);
+          }
+        }
+
+        invariant(
+          this.state.selectedLinearElement,
+          "Expected selectedLinearElement to be set to operate on a linear element",
         );
 
-        // in this path, we're mutating multiElement to reflect
-        // how it will be after adding pointer position as the next point
-        // trigger update here so that new element canvas renders again to reflect this
-        this.triggerRender(false);
+        const newState = LinearElementEditor.handlePointerMove(
+          event.nativeEvent,
+          this,
+          scenePointerX,
+          scenePointerY,
+          this.state.selectedLinearElement,
+        );
+        if (newState) {
+          this.setState(newState);
+        }
       }
 
       return;
     }
 
+    if (this.state.activeTool.type === "arrow") {
+      const hit = getHoveredElementForBinding(
+        pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+        this.scene.getNonDeletedElements(),
+        this.scene.getNonDeletedElementsMap(),
+        (el) => maxBindingDistance_simple(this.state.zoom),
+      );
+      if (
+        hit &&
+        !isPointInElement(
+          pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+          hit,
+          this.scene.getNonDeletedElementsMap(),
+        )
+      ) {
+        this.setState({
+          suggestedBinding: hit,
+        });
+      }
+    }
+
     const hasDeselectedButton = Boolean(event.buttons);
     if (
       hasDeselectedButton ||
@@ -6178,7 +6618,8 @@ class App extends React.Component<AppProps, AppState> {
         // better way of showing them is found
         !(
           isLinearElement(selectedElements[0]) &&
-          (isMobileOrTablet() || selectedElements[0].points.length === 2)
+          (this.editorInterface.userAgent.isMobileDevice ||
+            selectedElements[0].points.length === 2)
         )
       ) {
         const elementWithTransformHandleType =
@@ -6190,7 +6631,7 @@ class App extends React.Component<AppProps, AppState> {
             this.state.zoom,
             event.pointerType,
             this.scene.getNonDeletedElementsMap(),
-            this.device,
+            this.editorInterface,
           );
         if (
           elementWithTransformHandleType &&
@@ -6214,7 +6655,7 @@ class App extends React.Component<AppProps, AppState> {
         scenePointerY,
         this.state.zoom,
         event.pointerType,
-        this.device,
+        this.editorInterface,
       );
       if (transformHandleType) {
         setCursor(
@@ -6309,7 +6750,7 @@ class App extends React.Component<AppProps, AppState> {
             });
           } else if (
             !hitElement ||
-            // Ebow arrows can only be moved when unconnected
+            // Elbow arrows can only be moved when unconnected
             !isElbowArrow(hitElement) ||
             !(hitElement.startBinding || hitElement.endBinding)
           ) {
@@ -6431,7 +6872,7 @@ class App extends React.Component<AppProps, AppState> {
           setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER);
         } else if (this.hitElement(scenePointerX, scenePointerY, element)) {
           if (
-            // Ebow arrows can only be moved when unconnected
+            // Elbow arrows can only be moved when unconnected
             !isElbowArrow(element) ||
             !(element.startBinding || element.endBinding)
           ) {
@@ -6445,7 +6886,7 @@ class App extends React.Component<AppProps, AppState> {
         }
       } else if (this.hitElement(scenePointerX, scenePointerY, element)) {
         if (
-          // Ebow arrows can only be moved when unconnected
+          // Elbow arrow can only be moved when unconnected
           !isElbowArrow(element) ||
           !(element.startBinding || element.endBinding)
         ) {
@@ -6490,6 +6931,13 @@ class App extends React.Component<AppProps, AppState> {
   private handleCanvasPointerDown = (
     event: React.PointerEvent<HTMLElement>,
   ) => {
+    const scenePointer = viewportCoordsToSceneCoords(event, this.state);
+    const { x: scenePointerX, y: scenePointerY } = scenePointer;
+    this.lastPointerMoveCoords = {
+      x: scenePointerX,
+      y: scenePointerY,
+    };
+
     const target = event.target as HTMLElement;
     // capture subsequent pointer events to the canvas
     // this makes other elements non-interactive until pointer up
@@ -6560,7 +7008,7 @@ class App extends React.Component<AppProps, AppState> {
           newElement: null,
           editingTextElement: null,
           startBoundElement: null,
-          suggestedBindings: [],
+          suggestedBinding: null,
           selectedElementIds: makeNextSelectedElementIds(
             Object.keys(this.state.selectedElementIds)
               .filter((key) => key !== element.id)
@@ -6600,10 +7048,12 @@ class App extends React.Component<AppProps, AppState> {
     }
 
     if (
-      !this.device.isTouchScreen &&
+      !this.editorInterface.isTouchScreen &&
       ["pen", "touch"].includes(event.pointerType)
     ) {
-      this.device = updateObject(this.device, { isTouchScreen: true });
+      this.editorInterface = updateObject(this.editorInterface, {
+        isTouchScreen: true,
+      });
     }
 
     if (isPanning) {
@@ -6737,12 +7187,13 @@ class App extends React.Component<AppProps, AppState> {
 
         // block dragging after lasso selection on PCs until the next pointer down
         // (on mobile or tablet, we want to allow user to drag immediately)
-        pointerDownState.drag.blockDragging = !isMobileOrTablet();
+        pointerDownState.drag.blockDragging =
+          this.editorInterface.formFactor === "desktop";
       }
 
       // only for mobile or tablet, if we hit an element, select it immediately like normal selection
       if (
-        isMobileOrTablet() &&
+        this.editorInterface.formFactor !== "desktop" &&
         pointerDownState.hit.element &&
         !hitSelectedElement
       ) {
@@ -6916,6 +7367,10 @@ class App extends React.Component<AppProps, AppState> {
   private handleCanvasPointerUp = (
     event: React.PointerEvent<HTMLCanvasElement>,
   ) => {
+    if (getFeatureFlag("COMPLEX_BINDINGS")) {
+      this.resetDelayedBindMode();
+    }
+
     this.removePointer(event);
     this.lastPointerUpEvent = event;
 
@@ -6923,10 +7378,15 @@ class App extends React.Component<AppProps, AppState> {
       { clientX: event.clientX, clientY: event.clientY },
       this.state,
     );
+    const { x: scenePointerX, y: scenePointerY } = scenePointer;
+    this.lastPointerMoveCoords = {
+      x: scenePointerX,
+      y: scenePointerY,
+    };
     const clicklength =
       event.timeStamp - (this.lastPointerDownEvent?.timeStamp ?? 0);
 
-    if (this.device.editor.isMobile && clicklength < 300) {
+    if (this.editorInterface.formFactor === "phone" && clicklength < 300) {
       const hitElement = this.getElementAtPosition(
         scenePointer.x,
         scenePointer.y,
@@ -6945,7 +7405,7 @@ class App extends React.Component<AppProps, AppState> {
       }
     }
 
-    if (this.device.isTouchScreen) {
+    if (this.editorInterface.isTouchScreen) {
       const hitElement = this.getElementAtPosition(
         scenePointer.x,
         scenePointer.y,
@@ -6975,7 +7435,7 @@ class App extends React.Component<AppProps, AppState> {
       ) {
         this.handleEmbeddableCenterClick(this.hitLinkElement);
       } else {
-        this.redirectToLink(event, this.device.isTouchScreen);
+        this.redirectToLink(event, this.editorInterface.isTouchScreen);
       }
     } else if (this.state.viewModeEnabled) {
       this.setState({
@@ -7266,10 +7726,7 @@ class App extends React.Component<AppProps, AppState> {
   }
 
   private clearSelectionIfNotUsingSelection = (): void => {
-    if (
-      this.state.activeTool.type !== "selection" &&
-      this.state.activeTool.type !== "lasso"
-    ) {
+    if (!isSelectionLikeTool(this.state.activeTool.type)) {
       this.setState({
         selectedElementIds: makeNextSelectedElementIds({}, this.state),
         selectedGroupIds: {},
@@ -7286,10 +7743,7 @@ class App extends React.Component<AppProps, AppState> {
     event: React.PointerEvent<HTMLElement>,
     pointerDownState: PointerDownState,
   ): boolean => {
-    if (
-      this.state.activeTool.type === "selection" ||
-      this.state.activeTool.type === "lasso"
-    ) {
+    if (isSelectionLikeTool(this.state.activeTool.type)) {
       const elements = this.scene.getNonDeletedElements();
       const elementsMap = this.scene.getNonDeletedElementsMap();
       const selectedElements = this.scene.getSelectedElements(this.state);
@@ -7300,7 +7754,8 @@ class App extends React.Component<AppProps, AppState> {
         !isElbowArrow(selectedElements[0]) &&
         !(
           isLinearElement(selectedElements[0]) &&
-          (isMobileOrTablet() || selectedElements[0].points.length === 2)
+          (this.editorInterface.userAgent.isMobileDevice ||
+            selectedElements[0].points.length === 2)
         ) &&
         !(
           this.state.selectedLinearElement &&
@@ -7316,7 +7771,7 @@ class App extends React.Component<AppProps, AppState> {
             this.state.zoom,
             event.pointerType,
             this.scene.getNonDeletedElementsMap(),
-            this.device,
+            this.editorInterface,
           );
         if (elementWithTransformHandleType != null) {
           if (
@@ -7345,7 +7800,7 @@ class App extends React.Component<AppProps, AppState> {
           pointerDownState.origin.y,
           this.state.zoom,
           event.pointerType,
-          this.device,
+          this.editorInterface,
         );
       }
       if (pointerDownState.resize.handleType) {
@@ -7480,20 +7935,34 @@ class App extends React.Component<AppProps, AppState> {
         if (
           (hitElement === null || !someHitElementIsSelected) &&
           !event.shiftKey &&
-          !pointerDownState.hit.hasHitCommonBoundingBoxOfSelectedElements
+          !pointerDownState.hit.hasHitCommonBoundingBoxOfSelectedElements &&
+          (!this.state.selectedLinearElement?.isEditing ||
+            (hitElement &&
+              hitElement?.id !== this.state.selectedLinearElement?.elementId))
         ) {
           this.clearSelection(hitElement);
         }
 
         if (this.state.selectedLinearElement?.isEditing) {
-          this.setState({
-            selectedElementIds: makeNextSelectedElementIds(
-              {
-                [this.state.selectedLinearElement.elementId]: true,
-              },
-              this.state,
-            ),
-          });
+          this.setState((prevState) => ({
+            selectedLinearElement: prevState.selectedLinearElement
+              ? {
+                  ...prevState.selectedLinearElement,
+                  isEditing:
+                    !!hitElement &&
+                    hitElement.id ===
+                      this.state.selectedLinearElement?.elementId,
+                }
+              : null,
+            selectedElementIds: prevState.selectedLinearElement
+              ? makeNextSelectedElementIds(
+                  {
+                    [prevState.selectedLinearElement.elementId]: true,
+                  },
+                  this.state,
+                )
+              : makeNextSelectedElementIds({}, prevState),
+          }));
           // If we click on something
         } else if (hitElement != null) {
           // == deep selection ==
@@ -7793,16 +8262,18 @@ class App extends React.Component<AppProps, AppState> {
     });
 
     const boundElement = getHoveredElementForBinding(
-      pointerDownState.origin,
+      pointFrom<GlobalPoint>(
+        pointerDownState.origin.x,
+        pointerDownState.origin.y,
+      ),
       this.scene.getNonDeletedElements(),
       this.scene.getNonDeletedElementsMap(),
-      this.state.zoom,
     );
 
     this.setState({
       newElement: element,
       startBoundElement: boundElement,
-      suggestedBindings: [],
+      suggestedBinding: null,
     });
   };
 
@@ -7951,17 +8422,37 @@ class App extends React.Component<AppProps, AppState> {
     elementType: ExcalidrawLinearElement["type"],
     pointerDownState: PointerDownState,
   ): void => {
+    if (event.ctrlKey) {
+      flushSync(() => {
+        this.setState({ isBindingEnabled: false });
+      });
+    }
+
     if (this.state.multiElement) {
-      const { multiElement } = this.state;
+      const { multiElement, selectedLinearElement } = this.state;
+
+      invariant(
+        selectedLinearElement,
+        "selectedLinearElement is expected to be set",
+      );
 
       // finalize if completing a loop
       if (
         multiElement.type === "line" &&
         isPathALoop(multiElement.points, this.state.zoom.value)
       ) {
-        this.scene.mutateElement(multiElement, {
-          lastCommittedPoint:
-            multiElement.points[multiElement.points.length - 1],
+        flushSync(() => {
+          this.setState({
+            selectedLinearElement: {
+              ...selectedLinearElement,
+              lastCommittedPoint:
+                multiElement.points[multiElement.points.length - 1],
+              initialState: {
+                ...selectedLinearElement.initialState,
+                lastClickedPoint: -1, // Disable dragging
+              },
+            },
+          });
         });
         this.actionManager.executeAction(actionFinalize);
         return;
@@ -7970,29 +8461,52 @@ class App extends React.Component<AppProps, AppState> {
       // Elbow arrows cannot be created by putting down points
       // only the start and end points can be defined
       if (isElbowArrow(multiElement) && multiElement.points.length > 1) {
-        this.scene.mutateElement(multiElement, {
-          lastCommittedPoint:
-            multiElement.points[multiElement.points.length - 1],
+        this.actionManager.executeAction(actionFinalize, "ui", {
+          event: event.nativeEvent,
+          sceneCoords: {
+            x: pointerDownState.origin.x,
+            y: pointerDownState.origin.y,
+          },
         });
-        this.actionManager.executeAction(actionFinalize);
         return;
       }
 
-      const { x: rx, y: ry, lastCommittedPoint } = multiElement;
+      const { x: rx, y: ry } = multiElement;
+      const { lastCommittedPoint } = selectedLinearElement;
+
+      const hoveredElementForBinding =
+        isBindingEnabled(this.state) &&
+        getHoveredElementForBinding(
+          pointFrom<GlobalPoint>(
+            this.lastPointerMoveCoords?.x ??
+              rx + multiElement.points[multiElement.points.length - 1][0],
+            this.lastPointerMoveCoords?.y ??
+              ry + multiElement.points[multiElement.points.length - 1][1],
+          ),
+          this.scene.getNonDeletedElements(),
+          this.scene.getNonDeletedElementsMap(),
+        );
 
       // clicking inside commit zone → finalize arrow
       if (
-        multiElement.points.length > 1 &&
-        lastCommittedPoint &&
-        pointDistance(
-          pointFrom(
-            pointerDownState.origin.x - rx,
-            pointerDownState.origin.y - ry,
-          ),
-          lastCommittedPoint,
-        ) < LINE_CONFIRM_THRESHOLD
+        (isBindingElement(multiElement) && hoveredElementForBinding) ||
+        (multiElement.points.length > 1 &&
+          lastCommittedPoint &&
+          pointDistance(
+            pointFrom(
+              pointerDownState.origin.x - rx,
+              pointerDownState.origin.y - ry,
+            ),
+            lastCommittedPoint,
+          ) < LINE_CONFIRM_THRESHOLD)
       ) {
-        this.actionManager.executeAction(actionFinalize);
+        this.actionManager.executeAction(actionFinalize, "ui", {
+          event: event.nativeEvent,
+          sceneCoords: {
+            x: pointerDownState.origin.x,
+            y: pointerDownState.origin.y,
+          },
+        });
         return;
       }
 
@@ -8005,11 +8519,7 @@ class App extends React.Component<AppProps, AppState> {
           prevState,
         ),
       }));
-      // clicking outside commit zone → update reference for last committed
-      // point
-      this.scene.mutateElement(multiElement, {
-        lastCommittedPoint: multiElement.points[multiElement.points.length - 1],
-      });
+
       setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER);
     } else {
       const [gridX, gridY] = getGridPoint(
@@ -8081,36 +8591,92 @@ class App extends React.Component<AppProps, AppState> {
               locked: false,
               frameId: topLayerFrame ? topLayerFrame.id : null,
             });
-      this.setState((prevState) => {
-        const nextSelectedElementIds = {
-          ...prevState.selectedElementIds,
-        };
-        delete nextSelectedElementIds[element.id];
-        return {
-          selectedElementIds: makeNextSelectedElementIds(
-            nextSelectedElementIds,
-            prevState,
-          ),
-        };
-      });
-      this.scene.mutateElement(element, {
-        points: [...element.points, pointFrom<LocalPoint>(0, 0)],
-      });
-      const boundElement = getHoveredElementForBinding(
-        pointerDownState.origin,
-        this.scene.getNonDeletedElements(),
-        this.scene.getNonDeletedElementsMap(),
-        this.state.zoom,
-        isElbowArrow(element),
-        isElbowArrow(element),
+
+      const point = pointFrom<GlobalPoint>(
+        pointerDownState.origin.x,
+        pointerDownState.origin.y,
       );
+      const elementsMap = this.scene.getNonDeletedElementsMap();
+      const boundElement = isBindingEnabled(this.state)
+        ? getHoveredElementForBinding(
+            point,
+            this.scene.getNonDeletedElements(),
+            elementsMap,
+          )
+        : null;
+
+      this.scene.mutateElement(element, {
+        points: [pointFrom<LocalPoint>(0, 0), pointFrom<LocalPoint>(0, 0)],
+      });
 
       this.scene.insertElement(element);
-      this.setState({
-        newElement: element,
-        startBoundElement: boundElement,
-        suggestedBindings: [],
+
+      if (isBindingElement(element)) {
+        // Do the initial binding so the binding strategy has the initial state
+        bindOrUnbindBindingElement(
+          element,
+          new Map([
+            [
+              0,
+              {
+                point: pointFrom<LocalPoint>(0, 0),
+                isDragging: false,
+              },
+            ],
+          ]),
+          this.scene,
+          this.state,
+          { newArrow: true, altKey: event.altKey, initialBinding: true },
+        );
+      }
+
+      // NOTE: We need the flushSync here for the
+      // delayed bind mode change to see the right state
+      // (specifically the `newElement`)
+      flushSync(() => {
+        this.setState((prevState) => {
+          let linearElementEditor = null;
+          let nextSelectedElementIds = prevState.selectedElementIds;
+          if (isLinearElement(element)) {
+            linearElementEditor = new LinearElementEditor(
+              element,
+              this.scene.getNonDeletedElementsMap(),
+            );
+
+            const endIdx = element.points.length - 1;
+            linearElementEditor = {
+              ...linearElementEditor,
+              selectedPointsIndices: [endIdx],
+              initialState: {
+                ...linearElementEditor.initialState,
+                lastClickedPoint: endIdx,
+                origin: pointFrom<GlobalPoint>(
+                  pointerDownState.origin.x,
+                  pointerDownState.origin.y,
+                ),
+              },
+            };
+          }
+
+          nextSelectedElementIds = !this.state.activeTool.locked
+            ? makeNextSelectedElementIds({ [element.id]: true }, prevState)
+            : prevState.selectedElementIds;
+
+          return {
+            ...prevState,
+            bindMode: "orbit",
+            newElement: element,
+            startBoundElement: boundElement,
+            suggestedBinding: boundElement || null,
+            selectedElementIds: nextSelectedElementIds,
+            selectedLinearElement: linearElementEditor,
+          };
+        });
       });
+
+      if (isBindingElement(element) && getFeatureFlag("COMPLEX_BINDINGS")) {
+        this.handleDelayedBindModeChange(element, boundElement);
+      }
     }
   };
 
@@ -8316,7 +8882,7 @@ class App extends React.Component<AppProps, AppState> {
       if (
         this.state.selectedLinearElement &&
         this.state.selectedLinearElement.elbowed &&
-        this.state.selectedLinearElement.pointerDownState.segmentMidpoint.index
+        this.state.selectedLinearElement.initialState.segmentMidpoint.index
       ) {
         const [gridX, gridY] = getGridPoint(
           pointerCoords.x,
@@ -8325,8 +8891,7 @@ class App extends React.Component<AppProps, AppState> {
         );
 
         let index =
-          this.state.selectedLinearElement.pointerDownState.segmentMidpoint
-            .index;
+          this.state.selectedLinearElement.initialState.segmentMidpoint.index;
         if (index < 0) {
           const nextCoords = LinearElementEditor.getSegmentMidpointHitCoords(
             {
@@ -8358,8 +8923,9 @@ class App extends React.Component<AppProps, AppState> {
         this.setState({
           selectedLinearElement: {
             ...this.state.selectedLinearElement,
+            isDragging: true,
             segmentMidPointHoveredCoords: ret.segmentMidPointHoveredCoords,
-            pointerDownState: ret.pointerDownState,
+            initialState: ret.initialState,
           },
         });
         return;
@@ -8406,26 +8972,6 @@ class App extends React.Component<AppProps, AppState> {
         event[KEYS.CTRL_OR_CMD] ? null : this.getEffectiveGridSize(),
       );
 
-      // for arrows/lines, don't start dragging until a given threshold
-      // to ensure we don't create a 2-point arrow by mistake when
-      // user clicks mouse in a way that it moves a tiny bit (thus
-      // triggering pointermove)
-      if (
-        !pointerDownState.drag.hasOccurred &&
-        (this.state.activeTool.type === "arrow" ||
-          this.state.activeTool.type === "line")
-      ) {
-        if (
-          pointDistance(
-            pointFrom(pointerCoords.x, pointerCoords.y),
-            pointFrom(pointerDownState.origin.x, pointerDownState.origin.y),
-          ) *
-            this.state.zoom.value <
-          MINIMUM_ARROW_SIZE
-        ) {
-          return;
-        }
-      }
       if (pointerDownState.resize.isResizing) {
         pointerDownState.lastCoords.x = pointerCoords.x;
         pointerDownState.lastCoords.y = pointerCoords.y;
@@ -8469,7 +9015,7 @@ class App extends React.Component<AppProps, AppState> {
               this.setState({
                 selectedLinearElement: {
                   ...this.state.selectedLinearElement,
-                  pointerDownState: ret.pointerDownState,
+                  initialState: ret.pointerDownState,
                   selectedPointsIndices: ret.selectedPointsIndices,
                   segmentMidPointHoveredCoords: null,
                 },
@@ -8479,27 +9025,81 @@ class App extends React.Component<AppProps, AppState> {
 
           return;
         } else if (
-          linearElementEditor.pointerDownState.segmentMidpoint.value !== null &&
-          !linearElementEditor.pointerDownState.segmentMidpoint.added
+          linearElementEditor.initialState.segmentMidpoint.value !== null &&
+          !linearElementEditor.initialState.segmentMidpoint.added
         ) {
           return;
-        }
+        } else if (linearElementEditor.initialState.lastClickedPoint > -1) {
+          const element = LinearElementEditor.getElement(
+            linearElementEditor.elementId,
+            elementsMap,
+          );
 
-        const newState = LinearElementEditor.handlePointDragging(
-          event,
-          this,
-          pointerCoords.x,
-          pointerCoords.y,
-          linearElementEditor,
-        );
-        if (newState) {
-          pointerDownState.lastCoords.x = pointerCoords.x;
-          pointerDownState.lastCoords.y = pointerCoords.y;
-          pointerDownState.drag.hasOccurred = true;
+          if (element?.isDeleted) {
+            return;
+          }
 
-          this.setState(newState);
+          if (isBindingElement(element)) {
+            const hoveredElement = getHoveredElementForBinding(
+              pointFrom<GlobalPoint>(pointerCoords.x, pointerCoords.y),
+              this.scene.getNonDeletedElements(),
+              elementsMap,
+            );
 
-          return;
+            if (getFeatureFlag("COMPLEX_BINDINGS")) {
+              this.handleDelayedBindModeChange(element, hoveredElement);
+            }
+          }
+
+          if (
+            event.altKey &&
+            !this.state.selectedLinearElement?.initialState
+              ?.arrowStartIsInside &&
+            getFeatureFlag("COMPLEX_BINDINGS")
+          ) {
+            this.handleSkipBindMode();
+          }
+
+          // Ignore drag requests if the arrow modification already happened
+          if (linearElementEditor.initialState.lastClickedPoint === -1) {
+            return;
+          }
+
+          const newState = LinearElementEditor.handlePointDragging(
+            event,
+            this,
+            pointerCoords.x,
+            pointerCoords.y,
+            linearElementEditor,
+          );
+
+          if (newState) {
+            pointerDownState.lastCoords.x = pointerCoords.x;
+            pointerDownState.lastCoords.y = pointerCoords.y;
+            pointerDownState.drag.hasOccurred = true;
+
+            // NOTE: Optimize setState calls because it
+            // affects history and performance
+            if (
+              newState.suggestedBinding !== this.state.suggestedBinding ||
+              !isShallowEqual(
+                newState.selectedLinearElement?.selectedPointsIndices ?? [],
+                this.state.selectedLinearElement?.selectedPointsIndices ?? [],
+              ) ||
+              newState.selectedLinearElement?.hoverPointIndex !==
+                this.state.selectedLinearElement?.hoverPointIndex ||
+              newState.selectedLinearElement?.customLineAngle !==
+                this.state.selectedLinearElement?.customLineAngle ||
+              this.state.selectedLinearElement.isDragging !==
+                newState.selectedLinearElement?.isDragging ||
+              this.state.selectedLinearElement?.initialState?.altFocusPoint !==
+                newState.selectedLinearElement?.initialState?.altFocusPoint
+            ) {
+              this.setState(newState);
+            }
+
+            return;
+          }
         }
       }
 
@@ -8550,7 +9150,10 @@ class App extends React.Component<AppProps, AppState> {
         if (
           this.state.activeTool.type === "lasso" &&
           this.lassoTrail.hasCurrentTrail &&
-          !(isMobileOrTablet() && pointerDownState.hit.element) &&
+          !(
+            this.editorInterface.formFactor !== "desktop" &&
+            pointerDownState.hit.element
+          ) &&
           !this.state.activeTool.fromSelection
         ) {
           return;
@@ -8672,13 +9275,13 @@ class App extends React.Component<AppProps, AppState> {
                 const nextCrop = {
                   ...crop,
                   x: clamp(
-                    crop.x -
+                    crop.x +
                       offsetVector[0] * Math.sign(croppingElement.scale[0]),
                     0,
                     image.naturalWidth - crop.width,
                   ),
                   y: clamp(
-                    crop.y -
+                    crop.y +
                       offsetVector[1] * Math.sign(croppingElement.scale[1]),
                     0,
                     image.naturalHeight - crop.height,
@@ -8730,19 +9333,6 @@ class App extends React.Component<AppProps, AppState> {
             selectionElement: null,
           });
 
-          if (
-            selectedElements.length !== 1 ||
-            !isElbowArrow(selectedElements[0])
-          ) {
-            this.setState({
-              suggestedBindings: getSuggestedBindingsForArrows(
-                selectedElements,
-                this.scene.getNonDeletedElementsMap(),
-                this.state.zoom,
-              ),
-            });
-          }
-
           // We duplicate the selected element if alt is pressed on pointer move
           if (event.altKey && !pointerDownState.hit.hasBeenDuplicated) {
             // Move the currently selected elements to the top of the z index stack, and
@@ -8876,6 +9466,15 @@ class App extends React.Component<AppProps, AppState> {
               }));
 
               this.scene.replaceAllElements(elementsWithIndices);
+              selectedElements.forEach((element) => {
+                if (
+                  isBindableElement(element) &&
+                  element.boundElements?.some((other) => other.type === "arrow")
+                ) {
+                  updateBoundElements(element, this.scene);
+                }
+              });
+
               this.maybeCacheVisibleGaps(event, selectedElements, true);
               this.maybeCacheReferenceSnapPoints(event, selectedElements, true);
             });
@@ -8958,58 +9557,40 @@ class App extends React.Component<AppProps, AppState> {
               newElement,
             });
           }
-        } else if (isLinearElement(newElement)) {
+        } else if (isLinearElement(newElement) && !newElement.isDeleted) {
           pointerDownState.drag.hasOccurred = true;
           const points = newElement.points;
-          let dx = gridX - newElement.x;
-          let dy = gridY - newElement.y;
 
-          if (shouldRotateWithDiscreteAngle(event) && points.length === 2) {
-            ({ width: dx, height: dy } = getLockedLinearCursorAlignSize(
-              newElement.x,
-              newElement.y,
-              pointerCoords.x,
-              pointerCoords.y,
-            ));
-          }
+          invariant(
+            points.length > 1,
+            "Do not create linear elements with less than 2 points",
+          );
 
-          if (points.length === 1) {
-            this.scene.mutateElement(
+          let linearElementEditor = this.state.selectedLinearElement;
+          if (!linearElementEditor) {
+            linearElementEditor = new LinearElementEditor(
               newElement,
-              {
-                points: [...points, pointFrom<LocalPoint>(dx, dy)],
-              },
-              { informMutation: false, isDragging: false },
+              this.scene.getNonDeletedElementsMap(),
             );
-          } else if (
-            points.length === 2 ||
-            (points.length > 1 && isElbowArrow(newElement))
-          ) {
-            this.scene.mutateElement(
-              newElement,
-              {
-                points: [...points.slice(0, -1), pointFrom<LocalPoint>(dx, dy)],
+            linearElementEditor = {
+              ...linearElementEditor,
+              selectedPointsIndices: [1],
+              initialState: {
+                ...linearElementEditor.initialState,
+                lastClickedPoint: 1,
               },
-              { isDragging: true, informMutation: false },
-            );
+            };
           }
-
           this.setState({
             newElement,
+            ...LinearElementEditor.handlePointDragging(
+              event,
+              this,
+              gridX,
+              gridY,
+              linearElementEditor,
+            )!,
           });
-
-          if (isBindingElement(newElement, false)) {
-            // When creating a linear element by dragging
-            this.setState({
-              suggestedBindings: maybeSuggestBindingsForLinearElementAtCoords(
-                newElement,
-                [pointerCoords],
-                this.scene,
-                this.state.zoom,
-                this.state.startBoundElement,
-              ),
-            });
-          }
         } else {
           pointerDownState.lastCoords.x = pointerCoords.x;
           pointerDownState.lastCoords.y = pointerCoords.y;
@@ -9160,6 +9741,8 @@ class App extends React.Component<AppProps, AppState> {
     pointerDownState: PointerDownState,
   ): (event: PointerEvent) => void {
     return withBatchedUpdates((childEvent: PointerEvent) => {
+      const elementsMap = this.scene.getNonDeletedElementsMap();
+
       this.removePointer(childEvent);
       pointerDownState.drag.blockDragging = false;
       if (pointerDownState.eventListeners.onMove) {
@@ -9191,7 +9774,6 @@ class App extends React.Component<AppProps, AppState> {
 
       // just in case, tool changes mid drag, always clean up
       this.lassoTrail.endPath();
-      this.lastPointerMoveCoords = null;
 
       SnapCache.setReferenceSnapPoints(null);
       SnapCache.setVisibleGaps(null);
@@ -9243,10 +9825,14 @@ class App extends React.Component<AppProps, AppState> {
         });
       }
 
+      if (getFeatureFlag("COMPLEX_BINDINGS")) {
+        this.resetDelayedBindMode();
+      }
+
       this.setState({
         selectedElementsAreBeingDragged: false,
+        bindMode: "orbit",
       });
-      const elementsMap = this.scene.getNonDeletedElementsMap();
 
       if (
         pointerDownState.drag.hasOccurred &&
@@ -9267,7 +9853,10 @@ class App extends React.Component<AppProps, AppState> {
 
       // Handle end of dragging a point of a linear element, might close a loop
       // and sets binding element
-      if (this.state.selectedLinearElement?.isEditing) {
+      if (
+        this.state.selectedLinearElement?.isEditing &&
+        !this.state.newElement
+      ) {
         if (
           !pointerDownState.boxSelection.hasOccurred &&
           pointerDownState.hit?.element?.id !==
@@ -9281,10 +9870,14 @@ class App extends React.Component<AppProps, AppState> {
             this.state,
             this.scene,
           );
+          this.actionManager.executeAction(actionFinalize, "ui", {
+            event: childEvent,
+            sceneCoords,
+          });
           if (editingLinearElement !== this.state.selectedLinearElement) {
             this.setState({
               selectedLinearElement: editingLinearElement,
-              suggestedBindings: [],
+              suggestedBinding: null,
             });
           }
         }
@@ -9318,6 +9911,23 @@ class App extends React.Component<AppProps, AppState> {
             sceneCoords,
           });
         }
+
+        if (
+          this.state.newElement &&
+          this.state.multiElement &&
+          isLinearElement(this.state.newElement) &&
+          this.state.selectedLinearElement
+        ) {
+          const { multiElement } = this.state;
+
+          this.setState({
+            selectedLinearElement: {
+              ...this.state.selectedLinearElement,
+              lastCommittedPoint:
+                multiElement.points[multiElement.points.length - 1],
+            },
+          });
+        }
       }
 
       this.missingPointerEventCleanupEmitter.clear();
@@ -9369,7 +9979,6 @@ class App extends React.Component<AppProps, AppState> {
         this.scene.mutateElement(newElement, {
           points: [...points, pointFrom<LocalPoint>(dx, dy)],
           pressures,
-          lastCommittedPoint: pointFrom<LocalPoint>(dx, dy),
         });
 
         this.actionManager.executeAction(actionFinalize);
@@ -9378,7 +9987,11 @@ class App extends React.Component<AppProps, AppState> {
       }
 
       if (isLinearElement(newElement)) {
-        if (newElement!.points.length > 1) {
+        if (
+          newElement!.points.length > 1 &&
+          newElement.points[1][0] !== 0 &&
+          newElement.points[1][1] !== 0
+        ) {
           this.store.scheduleCapture();
         }
         const pointerCoords = viewportCoordsToSceneCoords(
@@ -9398,7 +10011,7 @@ class App extends React.Component<AppProps, AppState> {
           newElement &&
           !multiElement
         ) {
-          if (this.device.isTouchScreen) {
+          if (this.editorInterface.isTouchScreen) {
             const FIXED_DELTA_X = Math.min(
               (this.state.width * 0.7) / this.state.zoom.value,
               100,
@@ -9424,7 +10037,7 @@ class App extends React.Component<AppProps, AppState> {
             this.scene.mutateElement(
               newElement,
               {
-                points: [...newElement.points, pointFrom<LocalPoint>(dx, dy)],
+                points: [newElement.points[0], pointFrom<LocalPoint>(dx, dy)],
               },
               { informMutation: false, isDragging: false },
             );
@@ -9435,16 +10048,13 @@ class App extends React.Component<AppProps, AppState> {
             });
           }
         } else if (pointerDownState.drag.hasOccurred && !multiElement) {
-          if (
-            isBindingEnabled(this.state) &&
-            isBindingElement(newElement, false)
-          ) {
+          if (isBindingElement(newElement, false)) {
             this.actionManager.executeAction(actionFinalize, "ui", {
               event: childEvent,
               sceneCoords,
             });
           }
-          this.setState({ suggestedBindings: [], startBoundElement: null });
+          this.setState({ suggestedBinding: null, startBoundElement: null });
           if (!activeTool.locked) {
             resetCursor(this.interactiveCanvas);
             this.setState((prevState) => ({
@@ -10039,15 +10649,9 @@ class App extends React.Component<AppProps, AppState> {
         // the endpoints ("start" or "end").
         const linearElements = this.scene
           .getSelectedElements(this.state)
-          .filter(isLinearElement);
+          .filter(isArrowElement);
 
-        bindOrUnbindLinearElements(
-          linearElements,
-          isBindingEnabled(this.state),
-          this.state.selectedLinearElement?.selectedPointsIndices ?? [],
-          this.scene,
-          this.state.zoom,
-        );
+        bindOrUnbindBindingElements(linearElements, this.scene, this.state);
       }
 
       if (activeTool.type === "laser") {
@@ -10065,7 +10669,7 @@ class App extends React.Component<AppProps, AppState> {
         resetCursor(this.interactiveCanvas);
         this.setState({
           newElement: null,
-          suggestedBindings: [],
+          suggestedBinding: null,
           activeTool: updateActiveTool(this.state, {
             type: this.state.preferredSelectionTool.type,
           }),
@@ -10073,7 +10677,7 @@ class App extends React.Component<AppProps, AppState> {
       } else {
         this.setState({
           newElement: null,
-          suggestedBindings: [],
+          suggestedBinding: null,
         });
       }
 
@@ -10105,6 +10709,67 @@ class App extends React.Component<AppProps, AppState> {
 
   private eraseElements = () => {
     let didChange = false;
+
+    // Binding is double accounted on both elements and if one of them is
+    // deleted, the binding should be removed
+    this.elementsPendingErasure.forEach((id) => {
+      const element = this.scene.getElement(id);
+      if (isBindingElement(element)) {
+        if (element.startBinding) {
+          const bindable = this.scene.getElement(
+            element.startBinding.elementId,
+          )!;
+          // NOTE: We use the raw mutateElement() because we don't want history
+          // entries or multiplayer updates
+          mutateElement(bindable, this.scene.getElementsMapIncludingDeleted(), {
+            boundElements: bindable.boundElements!.filter(
+              (e) => e.id !== element.id,
+            ),
+          });
+        }
+        if (element.endBinding) {
+          const bindable = this.scene.getElement(element.endBinding.elementId)!;
+          // NOTE: We use the raw mutateElement() because we don't want history
+          // entries or multiplayer updates
+          mutateElement(bindable, this.scene.getElementsMapIncludingDeleted(), {
+            boundElements: bindable.boundElements!.filter(
+              (e) => e.id !== element.id,
+            ),
+          });
+        }
+      } else if (isBindableElement(element)) {
+        element.boundElements?.forEach((boundElement) => {
+          if (boundElement.type === "arrow") {
+            const arrow = this.scene.getElement(
+              boundElement.id,
+            ) as ExcalidrawArrowElement;
+            if (arrow?.startBinding?.elementId === element.id) {
+              // NOTE: We use the raw mutateElement() because we don't want history
+              // entries or multiplayer updates
+              mutateElement(
+                arrow,
+                this.scene.getElementsMapIncludingDeleted(),
+                {
+                  startBinding: null,
+                },
+              );
+            }
+            if (arrow?.endBinding?.elementId === element.id) {
+              // NOTE: We use the raw mutateElement() because we don't want history
+              // entries or multiplayer updates
+              mutateElement(
+                arrow,
+                this.scene.getElementsMapIncludingDeleted(),
+                {
+                  endBinding: null,
+                },
+              );
+            }
+          }
+        });
+      }
+    });
+
     const elements = this.scene.getElementsIncludingDeleted().map((ele) => {
       if (
         this.elementsPendingErasure.has(ele.id) ||
@@ -10413,27 +11078,6 @@ class App extends React.Component<AppProps, AppState> {
     }
   };
 
-  private maybeSuggestBindingAtCursor = (
-    pointerCoords: {
-      x: number;
-      y: number;
-    },
-    considerAll: boolean,
-  ): void => {
-    const hoveredBindableElement = getHoveredElementForBinding(
-      pointerCoords,
-      this.scene.getNonDeletedElements(),
-      this.scene.getNonDeletedElementsMap(),
-      this.state.zoom,
-      false,
-      considerAll,
-    );
-    this.setState({
-      suggestedBindings:
-        hoveredBindableElement != null ? [hoveredBindableElement] : [],
-    });
-  };
-
   private clearSelection(hitElement: ExcalidrawElement | null): void {
     this.setState((prevState) => ({
       selectedElementIds: makeNextSelectedElementIds({}, prevState),
@@ -10452,6 +11096,7 @@ class App extends React.Component<AppProps, AppState> {
       selectedElementIds: makeNextSelectedElementIds({}, this.state),
       activeEmbeddable: null,
       previousSelectedElementIds: this.state.selectedElementIds,
+      selectedLinearElement: null,
     });
   }
 
@@ -11010,12 +11655,7 @@ class App extends React.Component<AppProps, AppState> {
           ),
         );
 
-        updateBoundElements(croppingElement, this.scene, {
-          newSize: {
-            width: croppingElement.width,
-            height: croppingElement.height,
-          },
-        });
+        updateBoundElements(croppingElement, this.scene);
 
         this.setState({
           isCropping: transformHandleType && transformHandleType !== "rotation",
@@ -11141,12 +11781,6 @@ class App extends React.Component<AppProps, AppState> {
         pointerDownState.resize.center.y,
       )
     ) {
-      const suggestedBindings = getSuggestedBindingsForArrows(
-        selectedElements,
-        this.scene.getNonDeletedElementsMap(),
-        this.state.zoom,
-      );
-
       const elementsToHighlight = new Set<ExcalidrawElement>();
       selectedFrames.forEach((frame) => {
         getElementsInResizingFrame(
@@ -11159,7 +11793,6 @@ class App extends React.Component<AppProps, AppState> {
 
       this.setState({
         elementsToHighlight: [...elementsToHighlight],
-        suggestedBindings,
       });
 
       return true;
@@ -11216,7 +11849,7 @@ class App extends React.Component<AppProps, AppState> {
     }
 
     const zIndexActions: ContextMenuItems =
-      this.state.stylesPanelMode === "full"
+      this.editorInterface.formFactor === "desktop"
         ? [
             CONTEXT_MENU_SEPARATOR,
             actionSendBackward,
@@ -11272,12 +11905,13 @@ class App extends React.Component<AppProps, AppState> {
     (
       event: WheelEvent | React.WheelEvent<HTMLDivElement | HTMLCanvasElement>,
     ) => {
-      // if not scrolling on canvas/wysiwyg, ignore
       if (
         !(
           event.target instanceof HTMLCanvasElement ||
           event.target instanceof HTMLTextAreaElement ||
-          event.target instanceof HTMLIFrameElement
+          event.target instanceof HTMLIFrameElement ||
+          (event.target instanceof HTMLElement &&
+            event.target.classList.contains(CLASSES.FRAME_NAME))
         )
       ) {
         // prevent zooming the browser (but allow scrolling DOM)
@@ -11472,6 +12106,8 @@ class App extends React.Component<AppProps, AppState> {
     };
   }
 
+  watchState = () => {};
+
   private async updateLanguage() {
     const currentLang =
       languages.find((lang) => lang.code === this.props.langCode) ||
@@ -11491,6 +12127,7 @@ declare global {
       elements: readonly ExcalidrawElement[];
       state: AppState;
       setState: React.Component<any, AppState>["setState"];
+      watchState: (prev: any, next: any) => void | undefined;
       app: InstanceType<typeof App>;
       history: History;
       store: Store;
diff --git a/packages/excalidraw/components/ColorPicker/ColorInput.tsx b/packages/excalidraw/components/ColorPicker/ColorInput.tsx
index 557f9c1c00..7de0af41e4 100644
--- a/packages/excalidraw/components/ColorPicker/ColorInput.tsx
+++ b/packages/excalidraw/components/ColorPicker/ColorInput.tsx
@@ -6,7 +6,7 @@ import { KEYS } from "@excalidraw/common";
 import { getShortcutKey } from "../..//shortcut";
 import { useAtom } from "../../editor-jotai";
 import { t } from "../../i18n";
-import { useDevice } from "../App";
+import { useEditorInterface } from "../App";
 import { activeEyeDropperAtom } from "../EyeDropper";
 import { eyeDropperIcon } from "../icons";
 
@@ -30,7 +30,7 @@ export const ColorInput = ({
   colorPickerType,
   placeholder,
 }: ColorInputProps) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const [innerValue, setInnerValue] = useState(color);
   const [activeSection, setActiveColorPickerSection] = useAtom(
     activeColorPickerSectionAtom,
@@ -99,7 +99,7 @@ export const ColorInput = ({
         placeholder={placeholder}
       />
       {/* TODO reenable on mobile with a better UX */}
-      {!device.editor.isMobile && (
+      {editorInterface.formFactor !== "phone" && (
         <>
           <div
             style={{
diff --git a/packages/excalidraw/components/ColorPicker/ColorPicker.tsx b/packages/excalidraw/components/ColorPicker/ColorPicker.tsx
index 238960fa0b..441ad514d2 100644
--- a/packages/excalidraw/components/ColorPicker/ColorPicker.tsx
+++ b/packages/excalidraw/components/ColorPicker/ColorPicker.tsx
@@ -15,7 +15,7 @@ import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import { useAtom } from "../../editor-jotai";
 import { t } from "../../i18n";
-import { useExcalidrawContainer } from "../App";
+import { useExcalidrawContainer, useStylesPanelMode } from "../App";
 import { ButtonSeparator } from "../ButtonSeparator";
 import { activeEyeDropperAtom } from "../EyeDropper";
 import { PropertiesPopover } from "../PropertiesPopover";
@@ -73,7 +73,6 @@ interface ColorPickerProps {
   palette?: ColorPaletteCustom | null;
   topPicks?: ColorTuple;
   updateData: (formData?: any) => void;
-  compactMode?: boolean;
 }
 
 const ColorPickerPopupContent = ({
@@ -100,6 +99,9 @@ const ColorPickerPopupContent = ({
   getOpenPopup: () => AppState["openPopup"];
 }) => {
   const { container } = useExcalidrawContainer();
+  const stylesPanelMode = useStylesPanelMode();
+  const isCompactMode = stylesPanelMode !== "full";
+  const isMobileMode = stylesPanelMode === "mobile";
   const [, setActiveColorPickerSection] = useAtom(activeColorPickerSectionAtom);
 
   const [eyeDropperState, setEyeDropperState] = useAtom(activeEyeDropperAtom);
@@ -216,11 +218,8 @@ const ColorPickerPopupContent = ({
           type={type}
           elements={elements}
           updateData={updateData}
-          showTitle={
-            appState.stylesPanelMode === "compact" ||
-            appState.stylesPanelMode === "mobile"
-          }
-          showHotKey={appState.stylesPanelMode !== "mobile"}
+          showTitle={isCompactMode}
+          showHotKey={!isMobileMode}
         >
           {colorInputJSX}
         </Picker>
@@ -235,7 +234,6 @@ const ColorPickerTrigger = ({
   label,
   color,
   type,
-  stylesPanelMode,
   mode = "background",
   onToggle,
   editingTextElement,
@@ -243,11 +241,13 @@ const ColorPickerTrigger = ({
   color: string | null;
   label: string;
   type: ColorPickerType;
-  stylesPanelMode?: AppState["stylesPanelMode"];
   mode?: "background" | "stroke";
   onToggle: () => void;
   editingTextElement?: boolean;
 }) => {
+  const stylesPanelMode = useStylesPanelMode();
+  const isCompactMode = stylesPanelMode !== "full";
+  const isMobileMode = stylesPanelMode === "mobile";
   const handleClick = (e: React.MouseEvent) => {
     // use pointerdown so we run before outside-close logic
     e.preventDefault();
@@ -268,9 +268,8 @@ const ColorPickerTrigger = ({
         "is-transparent": !color || color === "transparent",
         "has-outline":
           !color || !isColorDark(color, COLOR_OUTLINE_CONTRAST_THRESHOLD),
-        "compact-sizing":
-          stylesPanelMode === "compact" || stylesPanelMode === "mobile",
-        "mobile-border": stylesPanelMode === "mobile",
+        "compact-sizing": isCompactMode,
+        "mobile-border": isMobileMode,
       })}
       aria-label={label}
       style={color ? { "--swatch-color": color } : undefined}
@@ -283,22 +282,20 @@ const ColorPickerTrigger = ({
       onClick={handleClick}
     >
       <div className="color-picker__button-outline">{!color && slashIcon}</div>
-      {(stylesPanelMode === "compact" || stylesPanelMode === "mobile") &&
-        color &&
-        mode === "stroke" && (
-          <div className="color-picker__button-background">
-            <span
-              style={{
-                color:
-                  color && isColorDark(color, COLOR_OUTLINE_CONTRAST_THRESHOLD)
-                    ? "#fff"
-                    : "#111",
-              }}
-            >
-              {strokeIcon}
-            </span>
-          </div>
-        )}
+      {isCompactMode && color && mode === "stroke" && (
+        <div className="color-picker__button-background">
+          <span
+            style={{
+              color:
+                color && isColorDark(color, COLOR_OUTLINE_CONTRAST_THRESHOLD)
+                  ? "#fff"
+                  : "#111",
+            }}
+          >
+            {strokeIcon}
+          </span>
+        </div>
+      )}
     </Popover.Trigger>
   );
 };
@@ -318,10 +315,8 @@ export const ColorPicker = ({
   useEffect(() => {
     openRef.current = appState.openPopup;
   }, [appState.openPopup]);
-  const compactMode =
-    type !== "canvasBackground" &&
-    (appState.stylesPanelMode === "compact" ||
-      appState.stylesPanelMode === "mobile");
+  const stylesPanelMode = useStylesPanelMode();
+  const isCompactMode = stylesPanelMode !== "full";
 
   return (
     <div>
@@ -329,10 +324,10 @@ export const ColorPicker = ({
         role="dialog"
         aria-modal="true"
         className={clsx("color-picker-container", {
-          "color-picker-container--no-top-picks": compactMode,
+          "color-picker-container--no-top-picks": isCompactMode,
         })}
       >
-        {!compactMode && (
+        {!isCompactMode && (
           <TopPicks
             activeColor={color}
             onChange={onChange}
@@ -340,7 +335,7 @@ export const ColorPicker = ({
             topPicks={topPicks}
           />
         )}
-        {!compactMode && <ButtonSeparator />}
+        {!isCompactMode && <ButtonSeparator />}
         <Popover.Root
           open={appState.openPopup === type}
           onOpenChange={(open) => {
@@ -354,7 +349,6 @@ export const ColorPicker = ({
             color={color}
             label={label}
             type={type}
-            stylesPanelMode={appState.stylesPanelMode}
             mode={type === "elementStroke" ? "stroke" : "background"}
             editingTextElement={!!appState.editingTextElement}
             onToggle={() => {
diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
index 2ef757d5c5..0840dd803d 100644
--- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
+++ b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
@@ -903,7 +903,7 @@ function CommandPaletteInner({
         ref={inputRef}
       />
 
-      {!app.device.viewport.isMobile && (
+      {app.editorInterface.formFactor !== "phone" && (
         <div className="shortcuts-wrapper">
           <CommandShortcutHint shortcut="↑↓">
             {t("commandPalette.shortcuts.select")}
@@ -937,7 +937,7 @@ function CommandPaletteInner({
               onClick={(event) => executeCommand(lastUsed, event)}
               disabled={!isCommandAvailable(lastUsed)}
               onMouseMove={() => setCurrentCommand(lastUsed)}
-              showShortcut={!app.device.viewport.isMobile}
+              showShortcut={app.editorInterface.formFactor !== "phone"}
               appState={uiAppState}
             />
           </div>
@@ -955,7 +955,7 @@ function CommandPaletteInner({
                     isSelected={command.label === currentCommand?.label}
                     onClick={(event) => executeCommand(command, event)}
                     onMouseMove={() => setCurrentCommand(command)}
-                    showShortcut={!app.device.viewport.isMobile}
+                    showShortcut={app.editorInterface.formFactor !== "phone"}
                     appState={uiAppState}
                     size={category === "Library" ? "large" : "small"}
                   />
@@ -1034,7 +1034,7 @@ const CommandItem = ({
             size="var(--icon-size, 1rem)"
             icon={
               typeof command.icon === "function"
-                ? command.icon(appState)
+                ? command.icon(appState, [])
                 : command.icon
             }
           />
diff --git a/packages/excalidraw/components/CommandPalette/types.ts b/packages/excalidraw/components/CommandPalette/types.ts
index 957d699273..3eed838ce8 100644
--- a/packages/excalidraw/components/CommandPalette/types.ts
+++ b/packages/excalidraw/components/CommandPalette/types.ts
@@ -1,6 +1,5 @@
 import type { ActionManager } from "../../actions/manager";
 import type { Action } from "../../actions/types";
-import type { UIAppState } from "../../types";
 
 export type CommandPaletteItem = {
   label: string;
@@ -12,7 +11,7 @@ export type CommandPaletteItem = {
    * (deburred name + keywords)
    */
   haystack?: string;
-  icon?: React.ReactNode | ((appState: UIAppState) => React.ReactNode);
+  icon?: Action["icon"];
   category: string;
   order?: number;
   predicate?: boolean | Action["predicate"];
diff --git a/packages/excalidraw/components/ConvertElementTypePopup.tsx b/packages/excalidraw/components/ConvertElementTypePopup.tsx
index 8e527d5498..596456671c 100644
--- a/packages/excalidraw/components/ConvertElementTypePopup.tsx
+++ b/packages/excalidraw/components/ConvertElementTypePopup.tsx
@@ -844,7 +844,7 @@ const convertElementType = <
       }),
     ) as typeof element;
 
-    updateBindings(nextElement, app.scene);
+    updateBindings(nextElement, app.scene, app.state);
 
     return nextElement;
   }
diff --git a/packages/excalidraw/components/Dialog.tsx b/packages/excalidraw/components/Dialog.tsx
index 00ae2be0cb..55109d07f3 100644
--- a/packages/excalidraw/components/Dialog.tsx
+++ b/packages/excalidraw/components/Dialog.tsx
@@ -9,7 +9,7 @@ import { t } from "../i18n";
 
 import {
   useExcalidrawContainer,
-  useDevice,
+  useEditorInterface,
   useExcalidrawSetAppState,
 } from "./App";
 import { Island } from "./Island";
@@ -51,7 +51,7 @@ export const Dialog = (props: DialogProps) => {
   const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
   const [lastActiveElement] = useState(document.activeElement);
   const { id } = useExcalidrawContainer();
-  const isFullscreen = useDevice().viewport.isMobile;
+  const isFullscreen = useEditorInterface().formFactor === "phone";
 
   useEffect(() => {
     if (!islandNode) {
diff --git a/packages/excalidraw/components/FilledButton.tsx b/packages/excalidraw/components/FilledButton.tsx
index 53b30a0469..7d5c4ccfd1 100644
--- a/packages/excalidraw/components/FilledButton.tsx
+++ b/packages/excalidraw/components/FilledButton.tsx
@@ -20,7 +20,7 @@ export type ButtonColor =
 export type ButtonSize = "medium" | "large";
 
 export type FilledButtonProps = {
-  label: string;
+  label?: string;
 
   children?: React.ReactNode;
   onClick?: (event: React.MouseEvent) => void;
diff --git a/packages/excalidraw/components/FontPicker/FontPickerList.tsx b/packages/excalidraw/components/FontPicker/FontPickerList.tsx
index ff59f05ece..a6202f0227 100644
--- a/packages/excalidraw/components/FontPicker/FontPickerList.tsx
+++ b/packages/excalidraw/components/FontPicker/FontPickerList.tsx
@@ -20,7 +20,12 @@ import type { ValueOf } from "@excalidraw/common/utility-types";
 
 import { Fonts } from "../../fonts";
 import { t } from "../../i18n";
-import { useApp, useAppProps, useExcalidrawContainer } from "../App";
+import {
+  useApp,
+  useAppProps,
+  useExcalidrawContainer,
+  useStylesPanelMode,
+} from "../App";
 import { PropertiesPopover } from "../PropertiesPopover";
 import { QuickSearch } from "../QuickSearch";
 import { ScrollableList } from "../ScrollableList";
@@ -93,6 +98,7 @@ export const FontPickerList = React.memo(
     const app = useApp();
     const { fonts } = app;
     const { showDeprecatedFonts } = useAppProps();
+    const stylesPanelMode = useStylesPanelMode();
 
     const [searchTerm, setSearchTerm] = useState("");
     const inputRef = useRef<HTMLInputElement>(null);
@@ -338,7 +344,7 @@ export const FontPickerList = React.memo(
         onKeyDown={onKeyDown}
         preventAutoFocusOnTouch={!!app.state.editingTextElement}
       >
-        {app.state.stylesPanelMode === "full" && (
+        {stylesPanelMode === "full" && (
           <QuickSearch
             ref={inputRef}
             placeholder={t("quickSearch.placeholder")}
diff --git a/packages/excalidraw/components/HintViewer.tsx b/packages/excalidraw/components/HintViewer.tsx
index 3cb62e7597..875ad4b73d 100644
--- a/packages/excalidraw/components/HintViewer.tsx
+++ b/packages/excalidraw/components/HintViewer.tsx
@@ -11,6 +11,8 @@ import {
 
 import { isNodeInFlowchart } from "@excalidraw/element";
 
+import type { EditorInterface } from "@excalidraw/common";
+
 import { t } from "../i18n";
 import { getShortcutKey } from "../shortcut";
 import { isEraserActive } from "../appState";
@@ -18,12 +20,12 @@ import { isGridModeEnabled } from "../snapping";
 
 import "./HintViewer.scss";
 
-import type { AppClassProperties, Device, UIAppState } from "../types";
+import type { AppClassProperties, UIAppState } from "../types";
 
 interface HintViewerProps {
   appState: UIAppState;
   isMobile: boolean;
-  device: Device;
+  editorInterface: EditorInterface;
   app: AppClassProperties;
 }
 
@@ -35,7 +37,7 @@ const getTaggedShortcutKey = (key: string | string[]) =>
 const getHints = ({
   appState,
   isMobile,
-  device,
+  editorInterface,
   app,
 }: HintViewerProps): null | string | string[] => {
   const { activeTool, isResizing, isRotating, lastPointerDownWith } = appState;
@@ -51,7 +53,7 @@ const getHints = ({
     });
   }
 
-  if (appState.openSidebar && !device.editor.canFitSidebar) {
+  if (appState.openSidebar && !editorInterface.canFitSidebar) {
     return null;
   }
 
@@ -60,6 +62,20 @@ const getHints = ({
       shortcut: getTaggedShortcutKey("Alt"),
     });
   }
+
+  const selectedElements = app.scene.getSelectedElements(appState);
+
+  // creating or dragging arrow point
+  if (
+    appState.selectedLinearElement?.isDragging &&
+    selectedElements[0]?.type === "arrow"
+  ) {
+    return t("hints.arrowBindModifiers", {
+      shortcut_1: getTaggedShortcutKey("Ctrl"),
+      shortcut_2: getTaggedShortcutKey("Alt"),
+    });
+  }
+
   if (activeTool.type === "arrow" || activeTool.type === "line") {
     if (multiMode) {
       return t("hints.linearElementMulti", {
@@ -87,8 +103,6 @@ const getHints = ({
     return t("hints.embeddable");
   }
 
-  const selectedElements = app.scene.getSelectedElements(appState);
-
   if (
     isResizing &&
     lastPointerDownWith === "mouse" &&
@@ -225,13 +239,13 @@ const getHints = ({
 export const HintViewer = ({
   appState,
   isMobile,
-  device,
+  editorInterface,
   app,
 }: HintViewerProps) => {
   const hints = getHints({
     appState,
     isMobile,
-    device,
+    editorInterface,
     app,
   });
 
diff --git a/packages/excalidraw/components/IconPicker.tsx b/packages/excalidraw/components/IconPicker.tsx
index 13c69cf8fd..fab4f109b8 100644
--- a/packages/excalidraw/components/IconPicker.tsx
+++ b/packages/excalidraw/components/IconPicker.tsx
@@ -8,7 +8,7 @@ import { atom, useAtom } from "../editor-jotai";
 import { getLanguage, t } from "../i18n";
 
 import Collapsible from "./Stats/Collapsible";
-import { useDevice, useExcalidrawContainer } from "./App";
+import { useEditorInterface, useExcalidrawContainer } from "./App";
 
 import "./IconPicker.scss";
 
@@ -38,7 +38,7 @@ function Picker<T>({
   onClose: () => void;
   numberOfOptionsToAlwaysShow?: number;
 }) {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const { container } = useExcalidrawContainer();
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
@@ -153,7 +153,7 @@ function Picker<T>({
     );
   };
 
-  const isMobile = device.editor.isMobile;
+  const isMobile = editorInterface.formFactor === "phone";
 
   return (
     <Popover.Content
diff --git a/packages/excalidraw/components/LayerUI.scss b/packages/excalidraw/components/LayerUI.scss
index 5c202a0679..7ee1469e23 100644
--- a/packages/excalidraw/components/LayerUI.scss
+++ b/packages/excalidraw/components/LayerUI.scss
@@ -120,4 +120,53 @@
       margin-bottom: auto;
     }
   }
+
+  .disable-view-mode {
+    display: flex;
+    justify-content: center;
+    cursor: pointer;
+    align-items: center;
+    border: 1px solid var(--color-primary);
+    padding: 0.5rem;
+    border-radius: var(--border-radius-lg);
+    background-color: var(--island-bg-color);
+    text-decoration: none !important;
+
+    font-family: var(--ui-font);
+    font-size: 0.8333rem;
+    box-sizing: border-box;
+
+    width: var(--mobile-action-button-size, var(--default-button-size));
+    height: var(--mobile-action-button-size, var(--default-button-size));
+
+    border: none;
+    box-shadow: 0 0 0 1px var(--color-surface-lowest);
+    background-color: var(--color-surface-low);
+    color: var(--button-color, var(--color-on-surface)) !important;
+
+    &:active {
+      box-shadow: 0 0 0 1px var(--color-brand-active);
+    }
+
+    &:hover {
+      background-color: var(--color-primary);
+      color: white !important;
+    }
+    &:active {
+      background-color: var(--color-primary-darker);
+    }
+
+    svg {
+      width: 20px;
+      height: 20px;
+    }
+  }
+
+  .theme--dark {
+    .plus-banner {
+      &:hover {
+        color: black !important;
+      }
+    }
+  }
 }
diff --git a/packages/excalidraw/components/LayerUI.tsx b/packages/excalidraw/components/LayerUI.tsx
index 4fd6f6d269..17dffdfd9d 100644
--- a/packages/excalidraw/components/LayerUI.tsx
+++ b/packages/excalidraw/components/LayerUI.tsx
@@ -4,7 +4,6 @@ import React from "react";
 import {
   CLASSES,
   DEFAULT_SIDEBAR,
-  MQ_MIN_WIDTH_DESKTOP,
   TOOL_TYPE,
   arrayToMap,
   capitalizeString,
@@ -46,9 +45,9 @@ import Footer from "./footer/Footer";
 import { isSidebarDockedAtom } from "./Sidebar/Sidebar";
 import MainMenu from "./main-menu/MainMenu";
 import { ActiveConfirmDialog } from "./ActiveConfirmDialog";
-import { useDevice } from "./App";
+import { useEditorInterface, useStylesPanelMode } from "./App";
 import { OverwriteConfirmDialog } from "./OverwriteConfirm/OverwriteConfirm";
-import { LibraryIcon } from "./icons";
+import { sidebarRightIcon } from "./icons";
 import { DefaultSidebar } from "./DefaultSidebar";
 import { TTDDialog } from "./TTDDialog/TTDDialog";
 import { Stats } from "./Stats";
@@ -161,27 +160,28 @@ const LayerUI = ({
   isCollaborating,
   generateLinkForSelection,
 }: LayerUIProps) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
+  const stylesPanelMode = useStylesPanelMode();
+  const isCompactStylesPanel = stylesPanelMode === "compact";
   const tunnels = useInitializeTunnels();
 
-  const spacing =
-    appState.stylesPanelMode === "compact"
-      ? {
-          menuTopGap: 4,
-          toolbarColGap: 4,
-          toolbarRowGap: 1,
-          toolbarInnerRowGap: 0.5,
-          islandPadding: 1,
-          collabMarginLeft: 8,
-        }
-      : {
-          menuTopGap: 6,
-          toolbarColGap: 4,
-          toolbarRowGap: 1,
-          toolbarInnerRowGap: 1,
-          islandPadding: 1,
-          collabMarginLeft: 8,
-        };
+  const spacing = isCompactStylesPanel
+    ? {
+        menuTopGap: 4,
+        toolbarColGap: 4,
+        toolbarRowGap: 1,
+        toolbarInnerRowGap: 0.5,
+        islandPadding: 1,
+        collabMarginLeft: 8,
+      }
+    : {
+        menuTopGap: 6,
+        toolbarColGap: 4,
+        toolbarRowGap: 1,
+        toolbarInnerRowGap: 1,
+        islandPadding: 1,
+        collabMarginLeft: 8,
+      };
 
   const TunnelsJotaiProvider = tunnels.tunnelsJotai.Provider;
 
@@ -236,7 +236,7 @@ const LayerUI = ({
   );
 
   const renderSelectedShapeActions = () => {
-    const isCompactMode = appState.stylesPanelMode === "compact";
+    const isCompactMode = isCompactStylesPanel;
 
     return (
       <Section
@@ -308,7 +308,7 @@ const LayerUI = ({
             <div
               className={clsx("selected-shape-actions-container", {
                 "selected-shape-actions-container--compact":
-                  appState.stylesPanelMode === "compact",
+                  isCompactStylesPanel,
               })}
             >
               {shouldRenderSelectedShapeActions && renderSelectedShapeActions()}
@@ -333,14 +333,13 @@ const LayerUI = ({
                           padding={spacing.islandPadding}
                           className={clsx("App-toolbar", {
                             "zen-mode": appState.zenModeEnabled,
-                            "App-toolbar--compact":
-                              appState.stylesPanelMode === "compact",
+                            "App-toolbar--compact": isCompactStylesPanel,
                           })}
                         >
                           <HintViewer
                             appState={appState}
-                            isMobile={device.editor.isMobile}
-                            device={device}
+                            isMobile={editorInterface.formFactor === "phone"}
+                            editorInterface={editorInterface}
                             app={app}
                           />
                           {heading}
@@ -406,8 +405,7 @@ const LayerUI = ({
               "layer-ui__wrapper__top-right zen-mode-transition",
               {
                 "transition-right": appState.zenModeEnabled,
-                "layer-ui__wrapper__top-right--compact":
-                  appState.stylesPanelMode === "compact",
+                "layer-ui__wrapper__top-right--compact": isCompactStylesPanel,
               },
             )}
           >
@@ -417,7 +415,10 @@ const LayerUI = ({
                 userToFollow={appState.userToFollow?.socketId || null}
               />
             )}
-            {renderTopRightUI?.(device.editor.isMobile, appState)}
+            {renderTopRightUI?.(
+              editorInterface.formFactor === "phone",
+              appState,
+            )}
             {!appState.viewModeEnabled &&
               appState.openDialog?.name !== "elementLinkSelector" &&
               // hide button when sidebar docked
@@ -448,7 +449,9 @@ const LayerUI = ({
           trackEvent(
             "sidebar",
             `toggleDock (${docked ? "dock" : "undock"})`,
-            `(${device.editor.isMobile ? "mobile" : "desktop"})`,
+            `(${
+              editorInterface.formFactor === "phone" ? "mobile" : "desktop"
+            })`,
           );
         }}
       />
@@ -469,23 +472,21 @@ const LayerUI = ({
       <DefaultMainMenu UIOptions={UIOptions} />
       <DefaultSidebar.Trigger
         __fallback
-        icon={LibraryIcon}
+        icon={sidebarRightIcon}
         title={capitalizeString(t("toolBar.library"))}
         onToggle={(open) => {
           if (open) {
             trackEvent(
               "sidebar",
               `${DEFAULT_SIDEBAR.name} (open)`,
-              `button (${device.editor.isMobile ? "mobile" : "desktop"})`,
+              `button (${
+                editorInterface.formFactor === "phone" ? "mobile" : "desktop"
+              })`,
             );
           }
         }}
         tab={DEFAULT_SIDEBAR.defaultTab}
-      >
-        {appState.stylesPanelMode === "full" &&
-          appState.width >= MQ_MIN_WIDTH_DESKTOP &&
-          t("toolBar.library")}
-      </DefaultSidebar.Trigger>
+      />
       <DefaultOverwriteConfirmDialog />
       {appState.openDialog?.name === "ttd" && <TTDDialog __fallback />}
       {/* ------------------------------------------------------------------ */}
@@ -496,7 +497,7 @@ const LayerUI = ({
           {appState.errorMessage}
         </ErrorDialog>
       )}
-      {eyeDropperState && !device.editor.isMobile && (
+      {eyeDropperState && editorInterface.formFactor !== "phone" && (
         <EyeDropper
           colorPickerType={eyeDropperState.colorPickerType}
           onCancel={() => {
@@ -575,7 +576,7 @@ const LayerUI = ({
           }
         />
       )}
-      {device.editor.isMobile && (
+      {editorInterface.formFactor === "phone" && (
         <MobileMenu
           app={app}
           appState={appState}
@@ -593,14 +594,14 @@ const LayerUI = ({
           UIOptions={UIOptions}
         />
       )}
-      {!device.editor.isMobile && (
+      {editorInterface.formFactor !== "phone" && (
         <>
           <div
             className="layer-ui__wrapper"
             style={
               appState.openSidebar &&
               isSidebarDocked &&
-              device.editor.canFitSidebar
+              editorInterface.canFitSidebar
                 ? { width: `calc(100% - var(--right-sidebar-width))` }
                 : {}
             }
@@ -645,14 +646,8 @@ const LayerUI = ({
 };
 
 const stripIrrelevantAppStateProps = (appState: AppState): UIAppState => {
-  const {
-    suggestedBindings,
-    startBoundElement,
-    cursorButton,
-    scrollX,
-    scrollY,
-    ...ret
-  } = appState;
+  const { startBoundElement, cursorButton, scrollX, scrollY, ...ret } =
+    appState;
   return ret;
 };
 
diff --git a/packages/excalidraw/components/LibraryMenuItems.tsx b/packages/excalidraw/components/LibraryMenuItems.tsx
index c64351b1b3..547c3bd66f 100644
--- a/packages/excalidraw/components/LibraryMenuItems.tsx
+++ b/packages/excalidraw/components/LibraryMenuItems.tsx
@@ -32,7 +32,7 @@ import "./LibraryMenuItems.scss";
 
 import { TextField } from "./TextField";
 
-import { useDevice } from "./App";
+import { useEditorInterface } from "./App";
 
 import { Button } from "./Button";
 
@@ -75,7 +75,7 @@ export default function LibraryMenuItems({
   selectedItems: LibraryItem["id"][];
   onSelectItems: (id: LibraryItem["id"][]) => void;
 }) {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const libraryContainerRef = useRef<HTMLDivElement>(null);
   const scrollPosition = useScrollPosition<HTMLDivElement>(libraryContainerRef);
 
@@ -392,7 +392,7 @@ export default function LibraryMenuItems({
             ref={searchInputRef}
             type="search"
             className={clsx("library-menu-items-container__search", {
-              hideCancelButton: !device.editor.isMobile,
+              hideCancelButton: editorInterface.formFactor !== "phone",
             })}
             placeholder={t("library.search.inputPlaceholder")}
             value={searchInputValue}
diff --git a/packages/excalidraw/components/LibraryUnit.tsx b/packages/excalidraw/components/LibraryUnit.tsx
index 36607910e5..7d6a599526 100644
--- a/packages/excalidraw/components/LibraryUnit.tsx
+++ b/packages/excalidraw/components/LibraryUnit.tsx
@@ -3,7 +3,7 @@ import { memo, useRef, useState } from "react";
 
 import { useLibraryItemSvg } from "../hooks/useLibraryItemSvg";
 
-import { useDevice } from "./App";
+import { useEditorInterface } from "./App";
 import { CheckboxItem } from "./CheckboxItem";
 import { PlusIcon } from "./icons";
 
@@ -36,7 +36,7 @@ export const LibraryUnit = memo(
     const svg = useLibraryItemSvg(id, elements, svgCache, ref);
 
     const [isHovered, setIsHovered] = useState(false);
-    const isMobile = useDevice().editor.isMobile;
+    const isMobile = useEditorInterface().formFactor === "phone";
     const adder = isPending && (
       <div className="library-unit__adder">{PlusIcon}</div>
     );
diff --git a/packages/excalidraw/components/LinkButton.tsx b/packages/excalidraw/components/LinkButton.tsx
new file mode 100644
index 0000000000..6c53e2da0a
--- /dev/null
+++ b/packages/excalidraw/components/LinkButton.tsx
@@ -0,0 +1,15 @@
+import { FilledButton } from "./FilledButton";
+
+export const LinkButton = ({
+  children,
+  href,
+}: {
+  href: string;
+  children: React.ReactNode;
+}) => {
+  return (
+    <a href={href} target="_blank" rel="noopener" className="link-button">
+      <FilledButton>{children}</FilledButton>
+    </a>
+  );
+};
diff --git a/packages/excalidraw/components/MobileMenu.tsx b/packages/excalidraw/components/MobileMenu.tsx
index 8da02b30b3..ed83263c3c 100644
--- a/packages/excalidraw/components/MobileMenu.tsx
+++ b/packages/excalidraw/components/MobileMenu.tsx
@@ -7,12 +7,14 @@ import { t } from "../i18n";
 import { calculateScrollCenter } from "../scene";
 import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
 
-import { MobileShapeActions } from "./Actions";
+import { ExitViewModeButton, MobileShapeActions } from "./Actions";
 import { MobileToolBar } from "./MobileToolBar";
 import { FixedSideContainer } from "./FixedSideContainer";
 
 import { Island } from "./Island";
 
+import { PenModeButton } from "./PenModeButton";
+
 import type { ActionManager } from "../actions/manager";
 import type {
   AppClassProperties,
@@ -58,6 +60,7 @@ export const MobileMenu = ({
   renderWelcomeScreen,
   UIOptions,
   app,
+  onPenModeToggle,
 }: MobileMenuProps) => {
   const {
     WelcomeScreenCenterTunnel,
@@ -65,8 +68,29 @@ export const MobileMenu = ({
     DefaultSidebarTriggerTunnel,
   } = useTunnels();
   const renderAppTopBar = () => {
-    const topRightUI = renderTopRightUI?.(true, appState) ?? (
-      <DefaultSidebarTriggerTunnel.Out />
+    if (appState.openDialog?.name === "elementLinkSelector") {
+      return null;
+    }
+
+    const topRightUI = (
+      <div className="excalidraw-ui-top-right">
+        {renderTopRightUI?.(true, appState) ??
+          (!appState.viewModeEnabled && (
+            <>
+              <PenModeButton
+                checked={appState.penMode}
+                onChange={() => onPenModeToggle(null)}
+                title={t("toolBar.penMode")}
+                isMobile
+                penDetected={appState.penDetected}
+              />
+              <DefaultSidebarTriggerTunnel.Out />
+            </>
+          ))}
+        {appState.viewModeEnabled && (
+          <ExitViewModeButton actionManager={actionManager} />
+        )}
+      </div>
     );
 
     const topLeftUI = (
@@ -76,13 +100,6 @@ export const MobileMenu = ({
       </div>
     );
 
-    if (
-      appState.viewModeEnabled ||
-      appState.openDialog?.name === "elementLinkSelector"
-    ) {
-      return <div className="App-toolbar-content">{topLeftUI}</div>;
-    }
-
     return (
       <div
         className="App-toolbar-content"
@@ -117,41 +134,43 @@ export const MobileMenu = ({
         {renderWelcomeScreen && <WelcomeScreenCenterTunnel.Out />}
       </div>
 
-      <div
-        className="App-bottom-bar"
-        style={{
-          marginBottom: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN,
-        }}
-      >
-        <MobileShapeActions
-          appState={appState}
-          elementsMap={app.scene.getNonDeletedElementsMap()}
-          renderAction={actionManager.renderAction}
-          app={app}
-          setAppState={setAppState}
-        />
+      {!appState.viewModeEnabled && (
+        <div
+          className="App-bottom-bar"
+          style={{
+            marginBottom: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN,
+          }}
+        >
+          <MobileShapeActions
+            appState={appState}
+            elementsMap={app.scene.getNonDeletedElementsMap()}
+            renderAction={actionManager.renderAction}
+            app={app}
+            setAppState={setAppState}
+          />
 
-        <Island className="App-toolbar">
-          {!appState.viewModeEnabled &&
-            appState.openDialog?.name !== "elementLinkSelector" &&
-            renderToolbar()}
-          {appState.scrolledOutside &&
-            !appState.openMenu &&
-            !appState.openSidebar && (
-              <button
-                type="button"
-                className="scroll-back-to-content"
-                onClick={() => {
-                  setAppState((appState) => ({
-                    ...calculateScrollCenter(elements, appState),
-                  }));
-                }}
-              >
-                {t("buttons.scrollBackToContent")}
-              </button>
-            )}
-        </Island>
-      </div>
+          <Island className="App-toolbar">
+            {!appState.viewModeEnabled &&
+              appState.openDialog?.name !== "elementLinkSelector" &&
+              renderToolbar()}
+            {appState.scrolledOutside &&
+              !appState.openMenu &&
+              !appState.openSidebar && (
+                <button
+                  type="button"
+                  className="scroll-back-to-content"
+                  onClick={() => {
+                    setAppState((appState) => ({
+                      ...calculateScrollCenter(elements, appState),
+                    }));
+                  }}
+                >
+                  {t("buttons.scrollBackToContent")}
+                </button>
+              )}
+          </Island>
+        </div>
+      )}
 
       <FixedSideContainer side="top" className="App-top-bar">
         {renderAppTopBar()}
diff --git a/packages/excalidraw/components/MobileToolBar.tsx b/packages/excalidraw/components/MobileToolBar.tsx
index bc52c01b71..9cd351d2ee 100644
--- a/packages/excalidraw/components/MobileToolBar.tsx
+++ b/packages/excalidraw/components/MobileToolBar.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect } from "react";
 import clsx from "clsx";
 
 import { KEYS, capitalizeString } from "@excalidraw/common";
@@ -101,8 +101,6 @@ export const MobileToolBar = ({
     "arrow" | "line"
   >("arrow");
 
-  const toolbarRef = useRef<HTMLDivElement>(null);
-
   // keep lastActiveGenericShape in sync with active tool if user switches via other UI
   useEffect(() => {
     if (
@@ -143,8 +141,8 @@ export const MobileToolBar = ({
     }
   };
 
-  const toolbarWidth =
-    toolbarRef.current?.getBoundingClientRect()?.width ?? 0 - 8;
+  const [toolbarWidth, setToolbarWidth] = useState(0);
+
   const WIDTH = 36;
   const GAP = 4;
 
@@ -164,6 +162,9 @@ export const MobileToolBar = ({
     "laser",
     "magicframe",
   ].filter((tool) => {
+    if (showTextToolOutside && tool === "text") {
+      return false;
+    }
     if (showImageToolOutside && tool === "image") {
       return false;
     }
@@ -174,21 +175,30 @@ export const MobileToolBar = ({
   });
   const extraToolSelected = extraTools.includes(activeTool.type);
   const extraIcon = extraToolSelected
-    ? activeTool.type === "frame"
+    ? activeTool.type === "text"
+      ? TextIcon
+      : activeTool.type === "image"
+      ? ImageIcon
+      : activeTool.type === "frame"
       ? frameToolIcon
       : activeTool.type === "embeddable"
       ? EmbedIcon
       : activeTool.type === "laser"
       ? laserPointerToolIcon
-      : activeTool.type === "text"
-      ? TextIcon
       : activeTool.type === "magicframe"
       ? MagicIcon
       : extraToolsIcon
     : extraToolsIcon;
 
   return (
-    <div className="mobile-toolbar" ref={toolbarRef}>
+    <div
+      className="mobile-toolbar"
+      ref={(div) => {
+        if (div) {
+          setToolbarWidth(div.getBoundingClientRect().width);
+        }
+      }}
+    >
       {/* Hand Tool */}
       <HandButton
         checked={isHandToolActive(app.state)}
diff --git a/packages/excalidraw/components/PropertiesPopover.tsx b/packages/excalidraw/components/PropertiesPopover.tsx
index ccedd87a02..151d8eff16 100644
--- a/packages/excalidraw/components/PropertiesPopover.tsx
+++ b/packages/excalidraw/components/PropertiesPopover.tsx
@@ -4,7 +4,7 @@ import React, { type ReactNode } from "react";
 
 import { isInteractive } from "@excalidraw/common";
 
-import { useDevice } from "./App";
+import { useEditorInterface } from "./App";
 import { Island } from "./Island";
 
 interface PropertiesPopoverProps {
@@ -39,9 +39,9 @@ export const PropertiesPopover = React.forwardRef<
     },
     ref,
   ) => {
-    const device = useDevice();
+    const editorInterface = useEditorInterface();
     const isMobilePortrait =
-      device.editor.isMobile && !device.viewport.isLandscape;
+      editorInterface.formFactor === "phone" && !editorInterface.isLandscape;
 
     return (
       <Popover.Portal container={container}>
@@ -56,7 +56,8 @@ export const PropertiesPopover = React.forwardRef<
           collisionBoundary={container ?? undefined}
           style={{
             zIndex: "var(--zIndex-ui-styles-popup)",
-            marginLeft: device.editor.isMobile ? "0.5rem" : undefined,
+            marginLeft:
+              editorInterface.formFactor === "phone" ? "0.5rem" : undefined,
           }}
           onPointerLeave={onPointerLeave}
           onKeyDown={onKeyDown}
@@ -64,7 +65,7 @@ export const PropertiesPopover = React.forwardRef<
           onPointerDownOutside={onPointerDownOutside}
           onOpenAutoFocus={(e) => {
             // prevent auto-focus on touch devices to avoid keyboard popup
-            if (preventAutoFocusOnTouch && device.isTouchScreen) {
+            if (preventAutoFocusOnTouch && editorInterface.isTouchScreen) {
               e.preventDefault();
             }
           }}
diff --git a/packages/excalidraw/components/Sidebar/Sidebar.tsx b/packages/excalidraw/components/Sidebar/Sidebar.tsx
index 5f0ca487f2..8226eacef5 100644
--- a/packages/excalidraw/components/Sidebar/Sidebar.tsx
+++ b/packages/excalidraw/components/Sidebar/Sidebar.tsx
@@ -20,7 +20,7 @@ import {
 import { useUIAppState } from "../../context/ui-appState";
 import { atom, useSetAtom } from "../../editor-jotai";
 import { useOutsideClick } from "../../hooks/useOutsideClick";
-import { useDevice, useExcalidrawSetAppState } from "../App";
+import { useEditorInterface, useExcalidrawSetAppState } from "../App";
 import { Island } from "../Island";
 
 import { SidebarHeader } from "./SidebarHeader";
@@ -96,7 +96,7 @@ export const SidebarInner = forwardRef(
       return islandRef.current!;
     });
 
-    const device = useDevice();
+    const editorInterface = useEditorInterface();
 
     const closeLibrary = useCallback(() => {
       const isDialogOpen = !!document.querySelector(".Dialog");
@@ -117,11 +117,11 @@ export const SidebarInner = forwardRef(
           if ((event.target as Element).closest(".sidebar-trigger")) {
             return;
           }
-          if (!docked || !device.editor.canFitSidebar) {
+          if (!docked || !editorInterface.canFitSidebar) {
             closeLibrary();
           }
         },
-        [closeLibrary, docked, device.editor.canFitSidebar],
+        [closeLibrary, docked, editorInterface.canFitSidebar],
       ),
     );
 
@@ -129,7 +129,7 @@ export const SidebarInner = forwardRef(
       const handleKeyDown = (event: KeyboardEvent) => {
         if (
           event.key === KEYS.ESCAPE &&
-          (!docked || !device.editor.canFitSidebar)
+          (!docked || !editorInterface.canFitSidebar)
         ) {
           closeLibrary();
         }
@@ -138,7 +138,7 @@ export const SidebarInner = forwardRef(
       return () => {
         document.removeEventListener(EVENT.KEYDOWN, handleKeyDown);
       };
-    }, [closeLibrary, docked, device.editor.canFitSidebar]);
+    }, [closeLibrary, docked, editorInterface.canFitSidebar]);
 
     return (
       <Island
diff --git a/packages/excalidraw/components/Sidebar/SidebarHeader.tsx b/packages/excalidraw/components/Sidebar/SidebarHeader.tsx
index 9c9e51cf53..5cfc7bca5e 100644
--- a/packages/excalidraw/components/Sidebar/SidebarHeader.tsx
+++ b/packages/excalidraw/components/Sidebar/SidebarHeader.tsx
@@ -2,7 +2,7 @@ import clsx from "clsx";
 import { useContext } from "react";
 
 import { t } from "../../i18n";
-import { useDevice } from "../App";
+import { useEditorInterface } from "../App";
 import { Button } from "../Button";
 import { Tooltip } from "../Tooltip";
 import { CloseIcon, PinIcon } from "../icons";
@@ -16,11 +16,11 @@ export const SidebarHeader = ({
   children?: React.ReactNode;
   className?: string;
 }) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const props = useContext(SidebarPropsContext);
 
   const renderDockButton = !!(
-    device.editor.canFitSidebar && props.shouldRenderDockButton
+    editorInterface.canFitSidebar && props.shouldRenderDockButton
   );
 
   return (
diff --git a/packages/excalidraw/components/Stats/Angle.tsx b/packages/excalidraw/components/Stats/Angle.tsx
index 773f868880..c79e9bb3b1 100644
--- a/packages/excalidraw/components/Stats/Angle.tsx
+++ b/packages/excalidraw/components/Stats/Angle.tsx
@@ -34,6 +34,7 @@ const handleDegreeChange: DragInputCallbackType<AngleProps["property"]> = ({
   shouldChangeByStepSize,
   nextValue,
   scene,
+  app,
 }) => {
   const elementsMap = scene.getNonDeletedElementsMap();
   const origElement = originalElements[0];
@@ -48,7 +49,7 @@ const handleDegreeChange: DragInputCallbackType<AngleProps["property"]> = ({
       scene.mutateElement(latestElement, {
         angle: nextAngle,
       });
-      updateBindings(latestElement, scene);
+      updateBindings(latestElement, scene, app.state);
 
       const boundTextElement = getBoundTextElement(latestElement, elementsMap);
       if (boundTextElement && !isArrowElement(latestElement)) {
@@ -74,7 +75,7 @@ const handleDegreeChange: DragInputCallbackType<AngleProps["property"]> = ({
     scene.mutateElement(latestElement, {
       angle: nextAngle,
     });
-    updateBindings(latestElement, scene);
+    updateBindings(latestElement, scene, app.state);
 
     const boundTextElement = getBoundTextElement(latestElement, elementsMap);
     if (boundTextElement && !isArrowElement(latestElement)) {
diff --git a/packages/excalidraw/components/Stats/MultiDimension.tsx b/packages/excalidraw/components/Stats/MultiDimension.tsx
index 539a2ad59e..4680858dcd 100644
--- a/packages/excalidraw/components/Stats/MultiDimension.tsx
+++ b/packages/excalidraw/components/Stats/MultiDimension.tsx
@@ -94,9 +94,7 @@ const resizeElementInGroup = (
   );
   if (boundTextElement) {
     const newFontSize = boundTextElement.fontSize * scale;
-    updateBoundElements(latestElement, scene, {
-      newSize: { width: updates.width, height: updates.height },
-    });
+    updateBoundElements(latestElement, scene);
     const latestBoundTextElement = elementsMap.get(boundTextElement.id);
     if (latestBoundTextElement && isTextElement(latestBoundTextElement)) {
       scene.mutateElement(latestBoundTextElement, {
diff --git a/packages/excalidraw/components/Stats/MultiPosition.tsx b/packages/excalidraw/components/Stats/MultiPosition.tsx
index 19b52e2f49..35f6cfb897 100644
--- a/packages/excalidraw/components/Stats/MultiPosition.tsx
+++ b/packages/excalidraw/components/Stats/MultiPosition.tsx
@@ -38,6 +38,7 @@ const moveElements = (
   originalElements: readonly ExcalidrawElement[],
   originalElementsMap: ElementsMap,
   scene: Scene,
+  appState: AppState,
 ) => {
   for (let i = 0; i < originalElements.length; i++) {
     const origElement = originalElements[i];
@@ -63,6 +64,7 @@ const moveElements = (
       newTopLeftY,
       origElement,
       scene,
+      appState,
       originalElementsMap,
       false,
     );
@@ -75,6 +77,7 @@ const moveGroupTo = (
   originalElements: ExcalidrawElement[],
   originalElementsMap: ElementsMap,
   scene: Scene,
+  appState: AppState,
 ) => {
   const elementsMap = scene.getNonDeletedElementsMap();
   const [x1, y1, ,] = getCommonBounds(originalElements);
@@ -107,6 +110,7 @@ const moveGroupTo = (
         topLeftY + offsetY,
         origElement,
         scene,
+        appState,
         originalElementsMap,
         false,
       );
@@ -125,6 +129,7 @@ const handlePositionChange: DragInputCallbackType<
   property,
   scene,
   originalAppState,
+  app,
 }) => {
   const elementsMap = scene.getNonDeletedElementsMap();
 
@@ -152,6 +157,7 @@ const handlePositionChange: DragInputCallbackType<
           elementsInUnit.map((el) => el.original),
           originalElementsMap,
           scene,
+          app.state,
         );
       } else {
         const origElement = elementsInUnit[0]?.original;
@@ -178,6 +184,7 @@ const handlePositionChange: DragInputCallbackType<
             newTopLeftY,
             origElement,
             scene,
+            app.state,
             originalElementsMap,
             false,
           );
@@ -203,6 +210,7 @@ const handlePositionChange: DragInputCallbackType<
     originalElements,
     originalElementsMap,
     scene,
+    app.state,
   );
 
   scene.triggerUpdate();
diff --git a/packages/excalidraw/components/Stats/Position.tsx b/packages/excalidraw/components/Stats/Position.tsx
index f89ce26151..8b57183308 100644
--- a/packages/excalidraw/components/Stats/Position.tsx
+++ b/packages/excalidraw/components/Stats/Position.tsx
@@ -34,6 +34,7 @@ const handlePositionChange: DragInputCallbackType<"x" | "y"> = ({
   property,
   scene,
   originalAppState,
+  app,
 }) => {
   const elementsMap = scene.getNonDeletedElementsMap();
   const origElement = originalElements[0];
@@ -131,6 +132,7 @@ const handlePositionChange: DragInputCallbackType<"x" | "y"> = ({
       newTopLeftY,
       origElement,
       scene,
+      app.state,
       originalElementsMap,
     );
     return;
@@ -162,6 +164,7 @@ const handlePositionChange: DragInputCallbackType<"x" | "y"> = ({
     newTopLeftY,
     origElement,
     scene,
+    app.state,
     originalElementsMap,
   );
 };
diff --git a/packages/excalidraw/components/Stats/index.tsx b/packages/excalidraw/components/Stats/index.tsx
index bcfab85206..08c1f64970 100644
--- a/packages/excalidraw/components/Stats/index.tsx
+++ b/packages/excalidraw/components/Stats/index.tsx
@@ -6,7 +6,7 @@ import { useEffect, useMemo, useState, memo } from "react";
 import { STATS_PANELS } from "@excalidraw/common";
 import { getCommonBounds } from "@excalidraw/element";
 import { getUncroppedWidthAndHeight } from "@excalidraw/element";
-import { isElbowArrow, isImageElement } from "@excalidraw/element";
+import { isImageElement } from "@excalidraw/element";
 
 import { frameAndChildrenSelectedTogether } from "@excalidraw/element";
 
@@ -333,16 +333,14 @@ export const StatsInner = memo(
                           appState={appState}
                         />
                       </StatsRow>
-                      {!isElbowArrow(singleElement) && (
-                        <StatsRow>
-                          <Angle
-                            property="angle"
-                            element={singleElement}
-                            scene={scene}
-                            appState={appState}
-                          />
-                        </StatsRow>
-                      )}
+                      <StatsRow>
+                        <Angle
+                          property="angle"
+                          element={singleElement}
+                          scene={scene}
+                          appState={appState}
+                        />
+                      </StatsRow>
                       <StatsRow>
                         <FontSize
                           property="fontSize"
diff --git a/packages/excalidraw/components/Stats/stats.test.tsx b/packages/excalidraw/components/Stats/stats.test.tsx
index c52a721bff..548a16ffa4 100644
--- a/packages/excalidraw/components/Stats/stats.test.tsx
+++ b/packages/excalidraw/components/Stats/stats.test.tsx
@@ -114,7 +114,7 @@ describe("binding with linear elements", () => {
     mouse.up(200, 100);
 
     UI.clickTool("arrow");
-    mouse.down(5, 0);
+    mouse.down(-5, 0);
     mouse.up(300, 50);
 
     elementStats = stats?.querySelector("#elementStats");
@@ -135,18 +135,7 @@ describe("binding with linear elements", () => {
     ) as HTMLInputElement;
     expect(linear.startBinding).not.toBe(null);
     expect(inputX).not.toBeNull();
-    UI.updateInput(inputX, String("204"));
-    expect(linear.startBinding).not.toBe(null);
-  });
-
-  it("should remain bound to linear element on small angle change", async () => {
-    const linear = h.elements[1] as ExcalidrawLinearElement;
-    const inputAngle = UI.queryStatsProperty("A")?.querySelector(
-      ".drag-input",
-    ) as HTMLInputElement;
-
-    expect(linear.startBinding).not.toBe(null);
-    UI.updateInput(inputAngle, String("1"));
+    UI.updateInput(inputX, String("186"));
     expect(linear.startBinding).not.toBe(null);
   });
 
@@ -161,17 +150,6 @@ describe("binding with linear elements", () => {
     UI.updateInput(inputX, String("254"));
     expect(linear.startBinding).toBe(null);
   });
-
-  it("should remain bound to linear element on small angle change", async () => {
-    const linear = h.elements[1] as ExcalidrawLinearElement;
-    const inputAngle = UI.queryStatsProperty("A")?.querySelector(
-      ".drag-input",
-    ) as HTMLInputElement;
-
-    expect(linear.startBinding).not.toBe(null);
-    UI.updateInput(inputAngle, String("45"));
-    expect(linear.startBinding).toBe(null);
-  });
 });
 
 // single element
diff --git a/packages/excalidraw/components/Stats/utils.ts b/packages/excalidraw/components/Stats/utils.ts
index 68d2020987..7628261840 100644
--- a/packages/excalidraw/components/Stats/utils.ts
+++ b/packages/excalidraw/components/Stats/utils.ts
@@ -1,6 +1,10 @@
 import { pointFrom, pointRotateRads } from "@excalidraw/math";
 
-import { getBoundTextElement } from "@excalidraw/element";
+import {
+  getBoundTextElement,
+  isBindingElement,
+  unbindBindingElement,
+} from "@excalidraw/element";
 import { isFrameLikeElement } from "@excalidraw/element";
 
 import {
@@ -12,6 +16,7 @@ import {
 import { getFrameChildren } from "@excalidraw/element";
 
 import { updateBindings } from "@excalidraw/element";
+import { DRAGGING_THRESHOLD } from "@excalidraw/common";
 
 import type { Radians } from "@excalidraw/math";
 
@@ -110,9 +115,25 @@ export const moveElement = (
   newTopLeftY: number,
   originalElement: ExcalidrawElement,
   scene: Scene,
+  appState: AppState,
   originalElementsMap: ElementsMap,
   shouldInformMutation = true,
 ) => {
+  if (
+    isBindingElement(originalElement) &&
+    (originalElement.startBinding || originalElement.endBinding)
+  ) {
+    if (
+      Math.abs(newTopLeftX - originalElement.x) < DRAGGING_THRESHOLD &&
+      Math.abs(newTopLeftY - originalElement.y) < DRAGGING_THRESHOLD
+    ) {
+      return;
+    }
+
+    unbindBindingElement(originalElement, "start", scene);
+    unbindBindingElement(originalElement, "end", scene);
+  }
+
   const elementsMap = scene.getNonDeletedElementsMap();
   const latestElement = elementsMap.get(originalElement.id);
   if (!latestElement) {
@@ -145,7 +166,7 @@ export const moveElement = (
     },
     { informMutation: shouldInformMutation, isDragging: false },
   );
-  updateBindings(latestElement, scene);
+  updateBindings(latestElement, scene, appState);
 
   const boundTextElement = getBoundTextElement(
     originalElement,
@@ -203,7 +224,7 @@ export const moveElement = (
         },
         { informMutation: shouldInformMutation, isDragging: false },
       );
-      updateBindings(latestChildElement, scene, {
+      updateBindings(latestChildElement, scene, appState, {
         simultaneouslyUpdated: originalChildren,
       });
     });
diff --git a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx b/packages/excalidraw/components/canvases/InteractiveCanvas.tsx
index c375a2b168..32c118431e 100644
--- a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx
+++ b/packages/excalidraw/components/canvases/InteractiveCanvas.tsx
@@ -4,7 +4,17 @@ import {
   CURSOR_TYPE,
   isShallowEqual,
   sceneCoordsToViewportCoords,
+  type EditorInterface,
 } from "@excalidraw/common";
+import { AnimationController } from "@excalidraw/excalidraw/renderer/animation";
+
+import type {
+  InteractiveCanvasRenderConfig,
+  InteractiveSceneRenderAnimationState,
+  InteractiveSceneRenderConfig,
+  RenderableElementsMap,
+  RenderInteractiveSceneCallback,
+} from "@excalidraw/excalidraw/scene/types";
 
 import type {
   NonDeletedExcalidrawElement,
@@ -12,15 +22,13 @@ import type {
 } from "@excalidraw/element/types";
 
 import { t } from "../../i18n";
-import { isRenderThrottlingEnabled } from "../../reactUtils";
 import { renderInteractiveScene } from "../../renderer/interactiveScene";
 
 import type {
-  InteractiveCanvasRenderConfig,
-  RenderableElementsMap,
-  RenderInteractiveSceneCallback,
-} from "../../scene/types";
-import type { AppState, Device, InteractiveCanvasAppState } from "../../types";
+  AppClassProperties,
+  AppState,
+  InteractiveCanvasAppState,
+} from "../../types";
 import type { DOMAttributes } from "react";
 
 type InteractiveCanvasProps = {
@@ -35,7 +43,8 @@ type InteractiveCanvasProps = {
   scale: number;
   appState: InteractiveCanvasAppState;
   renderScrollbars: boolean;
-  device: Device;
+  editorInterface: EditorInterface;
+  app: AppClassProperties;
   renderInteractiveSceneCallback: (
     data: RenderInteractiveSceneCallback,
   ) => void;
@@ -70,8 +79,11 @@ type InteractiveCanvasProps = {
   >;
 };
 
+export const INTERACTIVE_SCENE_ANIMATION_KEY = "animateInteractiveScene";
+
 const InteractiveCanvas = (props: InteractiveCanvasProps) => {
   const isComponentMounted = useRef(false);
+  const rendererParams = useRef(null as InteractiveSceneRenderConfig | null);
 
   useEffect(() => {
     if (!isComponentMounted.current) {
@@ -128,29 +140,60 @@ const InteractiveCanvas = (props: InteractiveCanvasProps) => {
         )) ||
       "#6965db";
 
-    renderInteractiveScene(
-      {
-        canvas: props.canvas,
-        elementsMap: props.elementsMap,
-        visibleElements: props.visibleElements,
-        selectedElements: props.selectedElements,
-        allElementsMap: props.allElementsMap,
-        scale: window.devicePixelRatio,
-        appState: props.appState,
-        renderConfig: {
-          remotePointerViewportCoords,
-          remotePointerButton,
-          remoteSelectedElementIds,
-          remotePointerUsernames,
-          remotePointerUserStates,
-          selectionColor,
-          renderScrollbars: props.renderScrollbars,
-        },
-        device: props.device,
-        callback: props.renderInteractiveSceneCallback,
+    rendererParams.current = {
+      app: props.app,
+      canvas: props.canvas,
+      elementsMap: props.elementsMap,
+      visibleElements: props.visibleElements,
+      selectedElements: props.selectedElements,
+      allElementsMap: props.allElementsMap,
+      scale: window.devicePixelRatio,
+      appState: props.appState,
+      renderConfig: {
+        remotePointerViewportCoords,
+        remotePointerButton,
+        remoteSelectedElementIds,
+        remotePointerUsernames,
+        remotePointerUserStates,
+        selectionColor,
+        renderScrollbars: props.renderScrollbars,
+        // NOTE not memoized on so we don't rerender on cursor move
+        lastViewportPosition: props.app.lastViewportPosition,
       },
-      isRenderThrottlingEnabled(),
-    );
+      editorInterface: props.editorInterface,
+      callback: props.renderInteractiveSceneCallback,
+      animationState: {
+        bindingHighlight: undefined,
+      },
+      deltaTime: 0,
+    };
+
+    if (!AnimationController.running(INTERACTIVE_SCENE_ANIMATION_KEY)) {
+      AnimationController.start<InteractiveSceneRenderAnimationState>(
+        INTERACTIVE_SCENE_ANIMATION_KEY,
+        ({ deltaTime, state }) => {
+          const nextAnimationState = renderInteractiveScene({
+            ...rendererParams.current!,
+            deltaTime,
+            animationState: state,
+          }).animationState;
+
+          if (nextAnimationState) {
+            for (const key in nextAnimationState) {
+              if (
+                nextAnimationState[
+                  key as keyof InteractiveSceneRenderAnimationState
+                ] !== undefined
+              ) {
+                return nextAnimationState;
+              }
+            }
+          }
+
+          return undefined;
+        },
+      );
+    }
   });
 
   return (
@@ -201,8 +244,9 @@ const getRelevantAppStateProps = (
   selectedGroupIds: appState.selectedGroupIds,
   selectedLinearElement: appState.selectedLinearElement,
   multiElement: appState.multiElement,
+  newElement: appState.newElement,
   isBindingEnabled: appState.isBindingEnabled,
-  suggestedBindings: appState.suggestedBindings,
+  suggestedBinding: appState.suggestedBinding,
   isRotating: appState.isRotating,
   elementsToHighlight: appState.elementsToHighlight,
   collaborators: appState.collaborators, // Necessary for collab. sessions
@@ -214,6 +258,10 @@ const getRelevantAppStateProps = (
   croppingElementId: appState.croppingElementId,
   searchMatches: appState.searchMatches,
   activeLockedId: appState.activeLockedId,
+  hoveredElementIds: appState.hoveredElementIds,
+  frameRendering: appState.frameRendering,
+  shouldCacheIgnoreZoom: appState.shouldCacheIgnoreZoom,
+  exportScale: appState.exportScale,
 });
 
 const areEqual = (
diff --git a/packages/excalidraw/components/canvases/StaticCanvas.tsx b/packages/excalidraw/components/canvases/StaticCanvas.tsx
index 9e23fa500b..9e6a3324a4 100644
--- a/packages/excalidraw/components/canvases/StaticCanvas.tsx
+++ b/packages/excalidraw/components/canvases/StaticCanvas.tsx
@@ -99,6 +99,7 @@ const getRelevantAppStateProps = (appState: AppState): StaticCanvasAppState => {
     editingGroupId: appState.editingGroupId,
     currentHoveredFontFamily: appState.currentHoveredFontFamily,
     croppingElementId: appState.croppingElementId,
+    suggestedBinding: appState.suggestedBinding,
   };
 
   return relevantAppStateProps;
diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx
index 761d09b3f9..6f358311a2 100644
--- a/packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx
+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx
@@ -35,10 +35,16 @@ const DropdownMenu = ({
       : MenuContentComp;
 
   return (
-    <>
+    <div
+      className="dropdown-menu-container"
+      style={{
+        // remove this div from box layout
+        display: "contents",
+      }}
+    >
       {MenuTriggerComp}
       {open && MenuContentCompWithPlacement}
-    </>
+    </div>
   );
 };
 
diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx
index 5bbb41763b..f92c9df327 100644
--- a/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx
+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx
@@ -5,7 +5,7 @@ import { EVENT, KEYS } from "@excalidraw/common";
 
 import { useOutsideClick } from "../../hooks/useOutsideClick";
 import { useStable } from "../../hooks/useStable";
-import { useDevice } from "../App";
+import { useEditorInterface } from "../App";
 import { Island } from "../Island";
 import Stack from "../Stack";
 
@@ -29,13 +29,20 @@ const MenuContent = ({
   style?: React.CSSProperties;
   placement?: "top" | "bottom";
 }) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const menuRef = useRef<HTMLDivElement>(null);
 
   const callbacksRef = useStable({ onClickOutside });
 
-  useOutsideClick(menuRef, () => {
-    callbacksRef.onClickOutside?.();
+  useOutsideClick(menuRef, (event) => {
+    // prevents closing if clicking on the trigger button
+    if (
+      !menuRef.current
+        ?.closest(".dropdown-menu-container")
+        ?.contains(event.target)
+    ) {
+      callbacksRef.onClickOutside?.();
+    }
   });
 
   useEffect(() => {
@@ -59,7 +66,7 @@ const MenuContent = ({
   }, [callbacksRef]);
 
   const classNames = clsx(`dropdown-menu ${className}`, {
-    "dropdown-menu--mobile": device.editor.isMobile,
+    "dropdown-menu--mobile": editorInterface.formFactor === "phone",
     "dropdown-menu--placement-top": placement === "top",
   }).trim();
 
@@ -73,13 +80,8 @@ const MenuContent = ({
       >
         {/* the zIndex ensures this menu has higher stacking order,
     see https://github.com/excalidraw/excalidraw/pull/1445 */}
-        {device.editor.isMobile ? (
-          <Stack.Col
-            className="dropdown-menu-container"
-            style={{ ["--gap" as any]: 1.25 }}
-          >
-            {children}
-          </Stack.Col>
+        {editorInterface.formFactor === "phone" ? (
+          <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
         ) : (
           <Island
             className="dropdown-menu-container"
diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx
index aea13230b8..d4078a8da4 100644
--- a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx
+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "../App";
+import { useEditorInterface } from "../App";
 
 import { Ellipsify } from "../Ellipsify";
 
@@ -15,14 +15,14 @@ const MenuItemContent = ({
   textStyle?: React.CSSProperties;
   children: React.ReactNode;
 }) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   return (
     <>
       {icon && <div className="dropdown-menu-item__icon">{icon}</div>}
       <div style={textStyle} className="dropdown-menu-item__text">
         <Ellipsify>{children}</Ellipsify>
       </div>
-      {shortcut && !device.editor.isMobile && (
+      {shortcut && editorInterface.formFactor !== "phone" && (
         <div className="dropdown-menu-item__shortcut">{shortcut}</div>
       )}
     </>
diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContentRadio.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContentRadio.tsx
index 14bfe1a904..d8177c50e0 100644
--- a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContentRadio.tsx
+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContentRadio.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "../App";
+import { useEditorInterface } from "../App";
 import { RadioGroup } from "../RadioGroup";
 
 type Props<T> = {
@@ -22,7 +22,7 @@ const DropdownMenuItemContentRadio = <T,>({
   children,
   name,
 }: Props<T>) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
 
   return (
     <>
@@ -37,7 +37,7 @@ const DropdownMenuItemContentRadio = <T,>({
           choices={choices}
         />
       </div>
-      {shortcut && !device.editor.isMobile && (
+      {shortcut && editorInterface.formFactor !== "phone" && (
         <div className="dropdown-menu-item__shortcut dropdown-menu-item__shortcut--orphaned">
           {shortcut}
         </div>
diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx
index a7301fb447..e1f3ef202f 100644
--- a/packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx
+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx
@@ -1,6 +1,6 @@
 import clsx from "clsx";
 
-import { useDevice } from "../App";
+import { useEditorInterface } from "../App";
 
 const MenuTrigger = ({
   className = "",
@@ -14,17 +14,16 @@ const MenuTrigger = ({
   onToggle: () => void;
   title?: string;
 } & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "onSelect">) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const classNames = clsx(
     `dropdown-menu-button ${className}`,
     "zen-mode-transition",
     {
-      "dropdown-menu-button--mobile": device.editor.isMobile,
+      "dropdown-menu-button--mobile": editorInterface.formFactor === "phone",
     },
   ).trim();
   return (
     <button
-      data-prevent-outside-click
       className={classNames}
       onClick={onToggle}
       type="button"
diff --git a/packages/excalidraw/components/footer/Footer.tsx b/packages/excalidraw/components/footer/Footer.tsx
index 3b213d796a..debbf332e6 100644
--- a/packages/excalidraw/components/footer/Footer.tsx
+++ b/packages/excalidraw/components/footer/Footer.tsx
@@ -2,7 +2,7 @@ import clsx from "clsx";
 
 import { actionShortcuts } from "../../actions";
 import { useTunnels } from "../../context/tunnels";
-import { ExitZenModeAction, UndoRedoActions, ZoomActions } from "../Actions";
+import { ExitZenModeButton, UndoRedoActions, ZoomActions } from "../Actions";
 import { HelpButton } from "../HelpButton";
 import { Section } from "../Section";
 import Stack from "../Stack";
@@ -66,7 +66,7 @@ const Footer = ({
           />
         </div>
       </div>
-      <ExitZenModeAction
+      <ExitZenModeButton
         actionManager={actionManager}
         showExitZenModeBtn={showExitZenModeBtn}
       />
diff --git a/packages/excalidraw/components/hyperlink/Hyperlink.tsx b/packages/excalidraw/components/hyperlink/Hyperlink.tsx
index 5e380e4e6e..8e15bb0d54 100644
--- a/packages/excalidraw/components/hyperlink/Hyperlink.tsx
+++ b/packages/excalidraw/components/hyperlink/Hyperlink.tsx
@@ -41,7 +41,7 @@ import { getTooltipDiv, updateTooltipPosition } from "../../components/Tooltip";
 
 import { t } from "../../i18n";
 
-import { useAppProps, useDevice, useExcalidrawAppState } from "../App";
+import { useAppProps, useEditorInterface, useExcalidrawAppState } from "../App";
 import { ToolButton } from "../ToolButton";
 import { FreedrawIcon, TrashIcon, elementLinkIcon } from "../icons";
 import { getSelectedElements } from "../../scene";
@@ -88,7 +88,7 @@ export const Hyperlink = ({
   const elementsMap = scene.getNonDeletedElementsMap();
   const appState = useExcalidrawAppState();
   const appProps = useAppProps();
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
 
   const linkVal = element.link || "";
 
@@ -189,11 +189,11 @@ export const Hyperlink = ({
     if (
       isEditing &&
       inputRef?.current &&
-      !(device.viewport.isMobile || device.isTouchScreen)
+      !(editorInterface.formFactor === "phone" || editorInterface.isTouchScreen)
     ) {
       inputRef.current.select();
     }
-  }, [isEditing, device.viewport.isMobile, device.isTouchScreen]);
+  }, [isEditing, editorInterface.formFactor, editorInterface.isTouchScreen]);
 
   useEffect(() => {
     let timeoutId: number | null = null;
diff --git a/packages/excalidraw/components/icons.tsx b/packages/excalidraw/components/icons.tsx
index 5884201dcf..875c64768a 100644
--- a/packages/excalidraw/components/icons.tsx
+++ b/packages/excalidraw/components/icons.tsx
@@ -2327,6 +2327,53 @@ export const strokeIcon = createIcon(
   tablerIconProps,
 );
 
+export const pencilIcon = createIcon(
+  <g strokeWidth={1.25}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path d="M4 20h4l10.5 -10.5a2.828 2.828 0 1 0 -4 -4l-10.5 10.5v4" />
+    <path d="M13.5 6.5l4 4" />
+  </g>,
+  tablerIconProps,
+);
+
+export const chevronLeftIcon = createIcon(
+  <g strokeWidth={1}>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path d="M11 7l-5 5l5 5" />
+    <path d="M17 7l-5 5l5 5" />
+  </g>,
+  tablerIconProps,
+);
+
+export const sidebarRightIcon = createIcon(
+  <g strokeWidth="1.75">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path d="M4 4m0 2a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2h-12a2 2 0 0 1 -2 -2z" />
+    <path d="M15 4l0 16" />
+  </g>,
+  tablerIconProps,
+);
+
+export const messageCircleIcon = createIcon(
+  <g strokeWidth="1.25">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path d="M3 20l1.3 -3.9c-2.324 -3.437 -1.426 -7.872 2.1 -10.374c3.526 -2.501 8.59 -2.296 11.845 .48c3.255 2.777 3.695 7.266 1.029 10.501c-2.666 3.235 -7.615 4.215 -11.574 2.293l-4.7 1" />
+  </g>,
+  tablerIconProps,
+);
+
+export const presentationIcon = createIcon(
+  <g strokeWidth="1.25">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path d="M3 4l18 0" />
+    <path d="M4 4v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2v-10" />
+    <path d="M12 16l0 4" />
+    <path d="M9 20l6 0" />
+    <path d="M8 12l3 -3l2 2l3 -3" />
+  </g>,
+  tablerIconProps,
+);
+
 export const stickyNoteIcon = createIcon(
   <g>
     <path d="M16 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V8Z" />
@@ -2423,4 +2470,4 @@ export const growingContainerIcon = createIcon(
     <path d="M9 21h1" />
   </g>,
   tablerIconProps,
-);
+);
\ No newline at end of file
diff --git a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx b/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx
index 0efadcfc62..3a611be04b 100644
--- a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx
+++ b/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx
@@ -1,6 +1,6 @@
 import clsx from "clsx";
 
-import { isMobileOrTablet, MQ_MIN_WIDTH_DESKTOP } from "@excalidraw/common";
+import { MQ_MIN_WIDTH_DESKTOP, type EditorInterface } from "@excalidraw/common";
 
 import { t } from "../../i18n";
 import { Button } from "../Button";
@@ -12,15 +12,18 @@ import "./LiveCollaborationTrigger.scss";
 const LiveCollaborationTrigger = ({
   isCollaborating,
   onSelect,
+  editorInterface,
   ...rest
 }: {
   isCollaborating: boolean;
   onSelect: () => void;
+  editorInterface?: EditorInterface;
 } & React.ButtonHTMLAttributes<HTMLButtonElement>) => {
   const appState = useUIAppState();
 
   const showIconOnly =
-    isMobileOrTablet() || appState.width < MQ_MIN_WIDTH_DESKTOP;
+    editorInterface?.formFactor !== "desktop" ||
+    appState.width < MQ_MIN_WIDTH_DESKTOP;
 
   return (
     <Button
diff --git a/packages/excalidraw/components/main-menu/MainMenu.tsx b/packages/excalidraw/components/main-menu/MainMenu.tsx
index 0098ebe526..d028231328 100644
--- a/packages/excalidraw/components/main-menu/MainMenu.tsx
+++ b/packages/excalidraw/components/main-menu/MainMenu.tsx
@@ -5,7 +5,7 @@ import { composeEventHandlers } from "@excalidraw/common";
 import { useTunnels } from "../../context/tunnels";
 import { useUIAppState } from "../../context/ui-appState";
 import { t } from "../../i18n";
-import { useDevice, useExcalidrawSetAppState } from "../App";
+import { useEditorInterface, useExcalidrawSetAppState } from "../App";
 import { UserList } from "../UserList";
 import DropdownMenu from "../dropdownMenu/DropdownMenu";
 import { withInternalFallback } from "../hoc/withInternalFallback";
@@ -27,7 +27,7 @@ const MainMenu = Object.assign(
       onSelect?: (event: Event) => void;
     }) => {
       const { MainMenuTunnel } = useTunnels();
-      const device = useDevice();
+      const editorInterface = useEditorInterface();
       const appState = useUIAppState();
       const setAppState = useExcalidrawSetAppState();
 
@@ -53,19 +53,24 @@ const MainMenu = Object.assign(
                 setAppState({ openMenu: null });
               })}
               placement="bottom"
-              className={device.editor.isMobile ? "main-menu-dropdown" : ""}
+              className={
+                editorInterface.formFactor === "phone"
+                  ? "main-menu-dropdown"
+                  : ""
+              }
             >
               {children}
-              {device.editor.isMobile && appState.collaborators.size > 0 && (
-                <fieldset className="UserList-Wrapper">
-                  <legend>{t("labels.collaborators")}</legend>
-                  <UserList
-                    mobile={true}
-                    collaborators={appState.collaborators}
-                    userToFollow={appState.userToFollow?.socketId || null}
-                  />
-                </fieldset>
-              )}
+              {editorInterface.formFactor === "phone" &&
+                appState.collaborators.size > 0 && (
+                  <fieldset className="UserList-Wrapper">
+                    <legend>{t("labels.collaborators")}</legend>
+                    <UserList
+                      mobile={true}
+                      collaborators={appState.collaborators}
+                      userToFollow={appState.userToFollow?.socketId || null}
+                    />
+                  </fieldset>
+                )}
             </DropdownMenu.Content>
           </DropdownMenu>
         </MainMenuTunnel.In>
diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx
index 8f548823e9..823384abbc 100644
--- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx
+++ b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx
@@ -3,7 +3,7 @@ import { getShortcutFromShortcutName } from "../../actions/shortcuts";
 import { useTunnels } from "../../context/tunnels";
 import { useUIAppState } from "../../context/ui-appState";
 import { t, useI18n } from "../../i18n";
-import { useDevice, useExcalidrawActionManager } from "../App";
+import { useEditorInterface, useExcalidrawActionManager } from "../App";
 import { ExcalidrawLogo } from "../ExcalidrawLogo";
 import { HelpIcon, LoadIcon, usersIcon } from "../icons";
 
@@ -18,12 +18,12 @@ const WelcomeScreenMenuItemContent = ({
   shortcut?: string | null;
   children: React.ReactNode;
 }) => {
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   return (
     <>
       <div className="welcome-screen-menu-item__icon">{icon}</div>
       <div className="welcome-screen-menu-item__text">{children}</div>
-      {shortcut && !device.editor.isMobile && (
+      {shortcut && editorInterface.formFactor !== "phone" && (
         <div className="welcome-screen-menu-item__shortcut">{shortcut}</div>
       )}
     </>
diff --git a/packages/excalidraw/css/styles.scss b/packages/excalidraw/css/styles.scss
index c5b2e12550..4e3cf28656 100644
--- a/packages/excalidraw/css/styles.scss
+++ b/packages/excalidraw/css/styles.scss
@@ -13,10 +13,10 @@
   --zIndex-hyperlinkContainer: 7;
 
   --zIndex-ui-bottom: 60;
-  --zIndex-ui-library: 80;
   --zIndex-ui-context-menu: 90;
   --zIndex-ui-styles-popup: 100;
   --zIndex-ui-top: 100;
+  --zIndex-ui-library: 120;
 
   --zIndex-modal: 1000;
   --zIndex-popup: 1001;
@@ -50,6 +50,11 @@ body.excalidraw-cursor-resize * {
   height: 100%;
   width: 100%;
 
+  button {
+    // browser default. Looks kinda good on low-dpi.
+    font-size: 0.8333rem;
+  }
+
   button,
   label {
     @include buttonNoHighlight;
@@ -293,7 +298,8 @@ body.excalidraw-cursor-resize * {
     }
   }
 
-  .excalidraw-ui-top-left {
+  .excalidraw-ui-top-left,
+  .excalidraw-ui-top-right {
     display: flex;
     align-items: center;
     gap: 0.5rem;
@@ -707,6 +713,11 @@ body.excalidraw-cursor-resize * {
       margin-top: 0rem;
     }
   }
+
+  .link-button {
+    display: flex;
+    text-decoration: none !important;
+  }
 }
 
 .ErrorSplash.excalidraw {
diff --git a/packages/excalidraw/data/__snapshots__/transform.test.ts.snap b/packages/excalidraw/data/__snapshots__/transform.test.ts.snap
index f00a51817d..afef25eeff 100644
--- a/packages/excalidraw/data/__snapshots__/transform.test.ts.snap
+++ b/packages/excalidraw/data/__snapshots__/transform.test.ts.snap
@@ -88,8 +88,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "ellipse-1",
-    "focus": -0.007519379844961235,
-    "gap": 11.562288374879595,
+    "fixedPoint": [
+      0.04,
+      0.4633333333333333,
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
@@ -98,7 +101,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "id": Any<String>,
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -118,8 +120,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id49",
-    "focus": -0.0813953488372095,
-    "gap": 1,
+    "fixedPoint": [
+      1,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1864ab",
   "strokeStyle": "solid",
@@ -144,8 +149,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "ellipse-1",
-    "focus": 0.10666666666666667,
-    "gap": 3.8343264684446097,
+    "fixedPoint": [
+      -0.01,
+      0.44666666666666666,
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
@@ -154,7 +162,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "id": Any<String>,
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -174,8 +181,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "startArrowhead": null,
   "startBinding": {
     "elementId": "diamond-1",
-    "focus": 0,
-    "gap": 4.535423522449215,
+    "fixedPoint": [
+      0.9357142857142857,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#e67700",
   "strokeStyle": "solid",
@@ -334,8 +344,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "text-2",
-    "focus": 0,
-    "gap": 16,
+    "fixedPoint": [
+      -2.05,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
@@ -344,7 +357,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
   "id": Any<String>,
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -364,8 +376,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
   "startArrowhead": null,
   "startBinding": {
     "elementId": "text-1",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      1,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -436,8 +451,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id42",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      0,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
@@ -446,7 +464,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
   "id": Any<String>,
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -466,8 +483,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id41",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      1,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -612,8 +632,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id46",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      0,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
@@ -622,7 +645,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
   "id": Any<String>,
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -642,8 +664,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id45",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      1,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -839,7 +864,6 @@ exports[`Test Transform > should transform linear elements 1`] = `
   "id": Any<String>,
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -887,7 +911,6 @@ exports[`Test Transform > should transform linear elements 2`] = `
   "id": Any<String>,
   "index": "a1",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -934,7 +957,6 @@ exports[`Test Transform > should transform linear elements 3`] = `
   "id": Any<String>,
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -982,7 +1004,6 @@ exports[`Test Transform > should transform linear elements 4`] = `
   "id": Any<String>,
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -1476,8 +1497,11 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "Alice",
-    "focus": -0,
-    "gap": 5.299874999999986,
+    "fixedPoint": [
+      -0.07542628418945944,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
@@ -1486,7 +1510,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "id": Any<String>,
   "index": "a4",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -1508,8 +1531,11 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "startArrowhead": null,
   "startBinding": {
     "elementId": "Bob",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      1.000004978564514,
+      0.5001,
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1539,8 +1565,11 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "B",
-    "focus": 0,
-    "gap": 32,
+    "fixedPoint": [
+      0.46387050630528887,
+      0.48466257668711654,
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
@@ -1549,7 +1578,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "id": Any<String>,
   "index": "a5",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -1567,8 +1595,11 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "startArrowhead": null,
   "startBinding": {
     "elementId": "Bob",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      0.39381496335223337,
+      1,
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1858,7 +1889,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "id": Any<String>,
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -1911,7 +1941,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "id": Any<String>,
   "index": "a1",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -1964,7 +1993,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "id": Any<String>,
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -2017,7 +2045,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "id": Any<String>,
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
diff --git a/packages/excalidraw/data/blob.ts b/packages/excalidraw/data/blob.ts
index e8a5401a7a..4de63d645f 100644
--- a/packages/excalidraw/data/blob.ts
+++ b/packages/excalidraw/data/blob.ts
@@ -7,8 +7,6 @@ import {
   isPromiseLike,
 } from "@excalidraw/common";
 
-import { clearElementsForExport } from "@excalidraw/element";
-
 import type { ValueOf } from "@excalidraw/common/utility-types";
 import type { ExcalidrawElement, FileId } from "@excalidraw/element/types";
 
@@ -159,7 +157,7 @@ export const loadSceneOrLibraryFromBlob = async (
         type: MIME_TYPES.excalidraw,
         data: restore(
           {
-            elements: clearElementsForExport(data.elements || []),
+            elements: data.elements || [],
             appState: {
               theme: localAppState?.theme,
               fileHandle: fileHandle || blob.handle || null,
diff --git a/packages/excalidraw/data/json.ts b/packages/excalidraw/data/json.ts
index b8fb0f62cc..047a2ccdec 100644
--- a/packages/excalidraw/data/json.ts
+++ b/packages/excalidraw/data/json.ts
@@ -6,11 +6,6 @@ import {
   VERSIONS,
 } from "@excalidraw/common";
 
-import {
-  clearElementsForDatabase,
-  clearElementsForExport,
-} from "@excalidraw/element";
-
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import { cleanAppStateForExport, clearAppStateForDatabase } from "../appState";
@@ -57,10 +52,7 @@ export const serializeAsJSON = (
     type: EXPORT_DATA_TYPES.excalidraw,
     version: VERSIONS.excalidraw,
     source: getExportSource(),
-    elements:
-      type === "local"
-        ? clearElementsForExport(elements)
-        : clearElementsForDatabase(elements),
+    elements,
     appState:
       type === "local"
         ? cleanAppStateForExport(appState)
diff --git a/packages/excalidraw/data/restore.ts b/packages/excalidraw/data/restore.ts
index 271175fa13..5a645d2946 100644
--- a/packages/excalidraw/data/restore.ts
+++ b/packages/excalidraw/data/restore.ts
@@ -20,9 +20,12 @@ import {
   BOUND_TEXT_PADDING,
 } from "@excalidraw/common";
 import {
+  calculateFixedPointForNonElbowArrowBinding,
   getNonDeletedElements,
   isFlowchartType,
+  isPointInElement,
   isValidPolygon,
+  projectFixedPointOntoDiagonal,
 } from "@excalidraw/element";
 import { normalizeFixedPoint } from "@excalidraw/element";
 import {
@@ -37,7 +40,6 @@ import {
   isArrowBoundToElement,
   isArrowElement,
   isElbowArrow,
-  isFixedPointBinding,
   isLinearElement,
   isLineElement,
   isTextElement,
@@ -55,7 +57,9 @@ import { isInvisiblySmallElement } from "@excalidraw/element";
 import type { LocalPoint, Radians } from "@excalidraw/math";
 
 import type {
+  ElementsMap,
   ExcalidrawArrowElement,
+  ExcalidrawBindableElement,
   ExcalidrawElbowArrowElement,
   ExcalidrawElement,
   ExcalidrawElementType,
@@ -66,7 +70,6 @@ import type {
   FontFamilyValues,
   NonDeletedSceneElementsMap,
   OrderedExcalidrawElement,
-  PointBinding,
   StrokeRoundness,
 } from "@excalidraw/element/types";
 
@@ -126,38 +129,74 @@ const getFontFamilyByName = (fontFamilyName: string): FontFamilyValues => {
   return DEFAULT_FONT_FAMILY;
 };
 
-const repairBinding = <T extends ExcalidrawLinearElement>(
+const repairBinding = <T extends ExcalidrawArrowElement>(
   element: T,
-  binding: PointBinding | FixedPointBinding | null,
-): T extends ExcalidrawElbowArrowElement
-  ? FixedPointBinding | null
-  : PointBinding | FixedPointBinding | null => {
+  binding: FixedPointBinding | null,
+  elementsMap: Readonly<ElementsMap>,
+  startOrEnd: "start" | "end",
+): FixedPointBinding | null => {
   if (!binding) {
     return null;
   }
 
-  const focus = binding.focus || 0;
-
   if (isElbowArrow(element)) {
     const fixedPointBinding:
       | ExcalidrawElbowArrowElement["startBinding"]
-      | ExcalidrawElbowArrowElement["endBinding"] = isFixedPointBinding(binding)
-      ? {
-          ...binding,
-          focus,
-          fixedPoint: normalizeFixedPoint(binding.fixedPoint ?? [0, 0]),
-        }
-      : null;
+      | ExcalidrawElbowArrowElement["endBinding"] = {
+      ...binding,
+      fixedPoint: normalizeFixedPoint(binding.fixedPoint ?? [0, 0]),
+      mode: binding.mode || "orbit",
+    };
 
     return fixedPointBinding;
   }
 
-  return {
-    ...binding,
-    focus,
-  } as T extends ExcalidrawElbowArrowElement
-    ? FixedPointBinding | null
-    : PointBinding | FixedPointBinding | null;
+  const boundElement =
+    (elementsMap.get(binding.elementId) as ExcalidrawBindableElement) ||
+    undefined;
+  if (boundElement) {
+    if (binding.mode) {
+      return {
+        elementId: binding.elementId,
+        mode: binding.mode || "orbit",
+        fixedPoint: normalizeFixedPoint(binding.fixedPoint || [0.5, 0.5]),
+      } as FixedPointBinding | null;
+    }
+
+    const p = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+      element,
+      startOrEnd === "start" ? 0 : element.points.length - 1,
+      elementsMap,
+    );
+    const mode = isPointInElement(p, boundElement, elementsMap)
+      ? "inside"
+      : "orbit";
+    const focusPoint =
+      mode === "inside"
+        ? p
+        : projectFixedPointOntoDiagonal(
+            element,
+            p,
+            boundElement,
+            startOrEnd,
+            elementsMap,
+          ) || p;
+    const { fixedPoint } = calculateFixedPointForNonElbowArrowBinding(
+      element,
+      boundElement,
+      startOrEnd,
+      elementsMap,
+      focusPoint,
+    );
+
+    return {
+      mode,
+      elementId: binding.elementId,
+      fixedPoint,
+    };
+  }
+
+  return null;
 };
 
 type _ElementForRestoreBase = Required<
@@ -271,7 +310,10 @@ const restoreElementWithProperties = <
 
 export const restoreElement = (
   element: Exclude<ExcalidrawElement, ExcalidrawSelectionElement>,
-  opts?: { deleteInvisibleElements?: boolean },
+  elementsMap: Readonly<ElementsMap>,
+  opts?: {
+    deleteInvisibleElements?: boolean;
+  },
 ): typeof element | null => {
   element = { ...element };
 
@@ -329,7 +371,6 @@ export const restoreElement = (
     case "freedraw": {
       return restoreElementWithProperties(element, {
         points: element.points,
-        lastCommittedPoint: null,
         simulatePressure: element.simulatePressure,
         pressures: element.pressures,
       });
@@ -359,13 +400,9 @@ export const restoreElement = (
       }
 
       return restoreElementWithProperties(element, {
-        type:
-          (element.type as ExcalidrawElementType | "draw") === "draw"
-            ? "line"
-            : element.type,
-        startBinding: repairBinding(element, element.startBinding),
-        endBinding: repairBinding(element, element.endBinding),
-        lastCommittedPoint: null,
+        type: "line",
+        startBinding: null,
+        endBinding: null,
         startArrowhead,
         endArrowhead,
         points,
@@ -382,23 +419,27 @@ export const restoreElement = (
       });
     case "arrow": {
       const { startArrowhead = null, endArrowhead = "arrow" } = element;
-      let x: number | undefined = element.x;
-      let y: number | undefined = element.y;
-      let points: readonly LocalPoint[] | undefined = // migrate old arrow model to new one
+      const x: number | undefined = element.x;
+      const y: number | undefined = element.y;
+      const points: readonly LocalPoint[] | undefined = // migrate old arrow model to new one
         !Array.isArray(element.points) || element.points.length < 2
           ? [pointFrom(0, 0), pointFrom(element.width, element.height)]
           : element.points;
 
-      if (points[0][0] !== 0 || points[0][1] !== 0) {
-        ({ points, x, y } =
-          LinearElementEditor.getNormalizeElementPointsAndCoords(element));
-      }
-
       const base = {
         type: element.type,
-        startBinding: repairBinding(element, element.startBinding),
-        endBinding: repairBinding(element, element.endBinding),
-        lastCommittedPoint: null,
+        startBinding: repairBinding(
+          element as ExcalidrawArrowElement,
+          element.startBinding,
+          elementsMap,
+          "start",
+        ),
+        endBinding: repairBinding(
+          element as ExcalidrawArrowElement,
+          element.endBinding,
+          elementsMap,
+          "end",
+        ),
         startArrowhead,
         endArrowhead,
         points,
@@ -406,15 +447,13 @@ export const restoreElement = (
         y,
         elbowed: (element as ExcalidrawArrowElement).elbowed,
         ...getSizeFromPoints(points),
-      } as const;
+      };
 
       // TODO: Separate arrow from linear element
-      return isElbowArrow(element)
+      const restoredElement = isElbowArrow(element)
         ? restoreElementWithProperties(element as ExcalidrawElbowArrowElement, {
             ...base,
             elbowed: true,
-            startBinding: repairBinding(element, element.startBinding),
-            endBinding: repairBinding(element, element.endBinding),
             fixedSegments:
               element.fixedSegments?.length && base.points.length >= 4
                 ? element.fixedSegments
@@ -423,6 +462,13 @@ export const restoreElement = (
             endIsSpecial: element.endIsSpecial,
           })
         : restoreElementWithProperties(element as ExcalidrawArrowElement, base);
+
+      return {
+        ...restoredElement,
+        ...LinearElementEditor.getNormalizeElementPointsAndCoords(
+          restoredElement,
+        ),
+      };
     }
 
     // generic elements
@@ -553,7 +599,7 @@ const repairFrameMembership = (
 };
 
 export const restoreElements = (
-  elements: ImportedDataState["elements"],
+  targetElements: ImportedDataState["elements"],
   /** NOTE doesn't serve for reconciliation */
   localElements: readonly ExcalidrawElement[] | null | undefined,
   opts?:
@@ -566,18 +612,23 @@ export const restoreElements = (
 ): OrderedExcalidrawElement[] => {
   // used to detect duplicate top-level element ids
   const existingIds = new Set<string>();
+  const elementsMap = arrayToMap(targetElements || []);
   const localElementsMap = localElements ? arrayToMap(localElements) : null;
   const restoredElements = syncInvalidIndices(
-    (elements || []).reduce((elements, element) => {
+    (targetElements || []).reduce((elements, element) => {
       // filtering out selection, which is legacy, no longer kept in elements,
       // and causing issues if retained
       if (element.type === "selection") {
         return elements;
       }
 
-      let migratedElement: ExcalidrawElement | null = restoreElement(element, {
-        deleteInvisibleElements: opts?.deleteInvisibleElements,
-      });
+      let migratedElement: ExcalidrawElement | null = restoreElement(
+        element,
+        elementsMap,
+        {
+          deleteInvisibleElements: opts?.deleteInvisibleElements,
+        },
+      );
       if (migratedElement) {
         const localElement = localElementsMap?.get(element.id);
 
diff --git a/packages/excalidraw/data/transform.test.ts b/packages/excalidraw/data/transform.test.ts
index 0d9fcf3161..b620abfe55 100644
--- a/packages/excalidraw/data/transform.test.ts
+++ b/packages/excalidraw/data/transform.test.ts
@@ -432,12 +432,9 @@ describe("Test Transform", () => {
         boundElements: [{ id: text.id, type: "text" }],
         startBinding: {
           elementId: rectangle.id,
-          focus: 0,
-          gap: 1,
         },
         endBinding: {
           elementId: ellipse.id,
-          focus: -0,
         },
       });
 
@@ -517,12 +514,9 @@ describe("Test Transform", () => {
         boundElements: [{ id: text1.id, type: "text" }],
         startBinding: {
           elementId: text2.id,
-          focus: 0,
-          gap: 1,
         },
         endBinding: {
           elementId: text3.id,
-          focus: -0,
         },
       });
 
@@ -780,8 +774,8 @@ describe("Test Transform", () => {
       const [arrow, rect] = excalidrawElements;
       expect((arrow as ExcalidrawArrowElement).endBinding).toStrictEqual({
         elementId: "rect-1",
-        focus: -0,
-        gap: 25,
+        fixedPoint: [-2.05, 0.5001],
+        mode: "orbit",
       });
       expect(rect.boundElements).toStrictEqual([
         {
diff --git a/packages/excalidraw/data/transform.ts b/packages/excalidraw/data/transform.ts
index fd0d3388ff..5b9f67e652 100644
--- a/packages/excalidraw/data/transform.ts
+++ b/packages/excalidraw/data/transform.ts
@@ -16,7 +16,7 @@ import {
   getLineHeight,
 } from "@excalidraw/common";
 
-import { bindLinearElement } from "@excalidraw/element";
+import { bindBindingElement } from "@excalidraw/element";
 import {
   newArrowElement,
   newElement,
@@ -330,9 +330,10 @@ const bindLinearElementToElement = (
         }
       }
 
-      bindLinearElement(
+      bindBindingElement(
         linearElement,
         startBoundElement as ExcalidrawBindableElement,
+        "orbit",
         "start",
         scene,
       );
@@ -405,9 +406,10 @@ const bindLinearElementToElement = (
         }
       }
 
-      bindLinearElement(
+      bindBindingElement(
         linearElement,
         endBoundElement as ExcalidrawBindableElement,
+        "orbit",
         "end",
         scene,
       );
diff --git a/packages/excalidraw/global.d.ts b/packages/excalidraw/global.d.ts
index e9b6c3f96c..4d6bbbb6c6 100644
--- a/packages/excalidraw/global.d.ts
+++ b/packages/excalidraw/global.d.ts
@@ -101,7 +101,10 @@ declare module "image-blob-reduce" {
 
 interface CustomMatchers {
   toBeNonNaNNumber(): void;
-  toCloselyEqualPoints(points: readonly [number, number][]): void;
+  toCloselyEqualPoints(
+    points: readonly [number, number][],
+    precision?: number,
+  ): void;
 }
 
 declare namespace jest {
diff --git a/packages/excalidraw/hooks/useCreatePortalContainer.ts b/packages/excalidraw/hooks/useCreatePortalContainer.ts
index fb0d24bc3d..c1fe2c9e8f 100644
--- a/packages/excalidraw/hooks/useCreatePortalContainer.ts
+++ b/packages/excalidraw/hooks/useCreatePortalContainer.ts
@@ -2,7 +2,7 @@ import { useState, useLayoutEffect } from "react";
 
 import { THEME } from "@excalidraw/common";
 
-import { useDevice, useExcalidrawContainer } from "../components/App";
+import { useEditorInterface, useExcalidrawContainer } from "../components/App";
 import { useUIAppState } from "../context/ui-appState";
 
 export const useCreatePortalContainer = (opts?: {
@@ -11,7 +11,7 @@ export const useCreatePortalContainer = (opts?: {
 }) => {
   const [div, setDiv] = useState<HTMLDivElement | null>(null);
 
-  const device = useDevice();
+  const editorInterface = useEditorInterface();
   const { theme } = useUIAppState();
 
   const { container: excalidrawContainer } = useExcalidrawContainer();
@@ -20,10 +20,13 @@ export const useCreatePortalContainer = (opts?: {
     if (div) {
       div.className = "";
       div.classList.add("excalidraw", ...(opts?.className?.split(/\s+/) || []));
-      div.classList.toggle("excalidraw--mobile", device.editor.isMobile);
+      div.classList.toggle(
+        "excalidraw--mobile",
+        editorInterface.formFactor === "phone",
+      );
       div.classList.toggle("theme--dark", theme === THEME.DARK);
     }
-  }, [div, theme, device.editor.isMobile, opts?.className]);
+  }, [div, theme, editorInterface.formFactor, opts?.className]);
 
   useLayoutEffect(() => {
     const container = opts?.parentSelector
diff --git a/packages/excalidraw/hooks/useOutsideClick.ts b/packages/excalidraw/hooks/useOutsideClick.ts
index 75d68f6e8b..748eae9923 100644
--- a/packages/excalidraw/hooks/useOutsideClick.ts
+++ b/packages/excalidraw/hooks/useOutsideClick.ts
@@ -5,7 +5,7 @@ import { EVENT } from "@excalidraw/common";
 export function useOutsideClick<T extends HTMLElement>(
   ref: React.RefObject<T | null>,
   /** if performance is of concern, memoize the callback */
-  callback: (event: Event) => void,
+  callback: (event: Event & { target: T }) => void,
   /**
    * Optional callback which is called on every click.
    *
diff --git a/packages/excalidraw/index.tsx b/packages/excalidraw/index.tsx
index 1d599a98ec..a215787381 100644
--- a/packages/excalidraw/index.tsx
+++ b/packages/excalidraw/index.tsx
@@ -263,6 +263,9 @@ export {
   DEFAULT_LASER_COLOR,
   UserIdleState,
   normalizeLink,
+  sceneCoordsToViewportCoords,
+  viewportCoordsToSceneCoords,
+  getFormFactor,
 } from "@excalidraw/common";
 
 export {
@@ -275,17 +278,12 @@ export { CaptureUpdateAction } from "@excalidraw/element";
 
 export { parseLibraryTokensFromUrl, useHandleLibrary } from "./data/library";
 
-export {
-  sceneCoordsToViewportCoords,
-  viewportCoordsToSceneCoords,
-} from "@excalidraw/common";
-
 export { Sidebar } from "./components/Sidebar/Sidebar";
 export { Button } from "./components/Button";
 export { Footer };
 export { MainMenu };
 export { Ellipsify } from "./components/Ellipsify";
-export { useDevice } from "./components/App";
+export { useEditorInterface, useStylesPanelMode } from "./components/App";
 export { WelcomeScreen };
 export { LiveCollaborationTrigger };
 export { Stats } from "./components/Stats";
diff --git a/packages/excalidraw/locales/ar-SA.json b/packages/excalidraw/locales/ar-SA.json
index 5b0db36b24..6d3b0ebb08 100644
--- a/packages/excalidraw/locales/ar-SA.json
+++ b/packages/excalidraw/locales/ar-SA.json
@@ -11,8 +11,8 @@
     "copyAsPng": "نسخ إلى الحافظة بصيغة PNG",
     "copyAsSvg": "نسخ إلى الحافظة بصيغة SVG",
     "copyText": "نسخ إلى الحافظة كنص",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "نسخ المصدر إلى الحافظة",
+    "convertToCode": "تحويل إلى كود",
     "bringForward": "جلب للأمام",
     "sendToBack": "أرسل للخلف",
     "bringToFront": "أحضر للأمام",
@@ -21,7 +21,9 @@
     "copyStyles": "نسخ الأنماط",
     "pasteStyles": "لصق الأنماط",
     "stroke": "الخط",
+    "changeStroke": "تغيير لون القلم",
     "background": "الخلفية",
+    "changeBackground": "تغيير لون الخلفية",
     "fill": "التعبئة",
     "strokeWidth": "سُمك الخط",
     "strokeStyle": "نمط الخط",
@@ -38,12 +40,20 @@
     "arrowhead_none": "لا شيء",
     "arrowhead_arrow": "سهم",
     "arrowhead_bar": "شريط",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "دائرة",
+    "arrowhead_circle_outline": "دائرة (مخططة)",
     "arrowhead_triangle": "مثلث",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "مثلث (مخطط)",
+    "arrowhead_diamond": "ألماسة",
+    "arrowhead_diamond_outline": "ألماسة (مخططة)",
+    "arrowhead_crowfoot_many": "Crow's foot (many)",
+    "arrowhead_crowfoot_one": "Crow's foot (one)",
+    "arrowhead_crowfoot_one_or_many": "Crow's foot (one or many)",
+    "more_options": "خيارات إضافية",
+    "arrowtypes": "نوع السهم",
+    "arrowtype_sharp": "سهم حاد",
+    "arrowtype_round": "سهم منحني",
+    "arrowtype_elbowed": "سهم زاوي",
     "fontSize": "حجم الخط",
     "fontFamily": "نوع الخط",
     "addWatermark": "إضافة \"مصنوعة بواسطة Excalidraw\"",
@@ -53,7 +63,7 @@
     "small": "صغير",
     "medium": "متوسط",
     "large": "كبير",
-    "veryLarge": "كبير جدا",
+    "veryLarge": "كبير جدًا",
     "solid": "كامل",
     "hachure": "خطوط",
     "zigzag": "متعرج",
@@ -67,11 +77,12 @@
     "architect": "معماري",
     "artist": "رسام",
     "cartoonist": "كرتوني",
-    "fileTitle": "إسم الملف",
+    "fileTitle": "اسم الملف",
     "colorPicker": "منتقي اللون",
     "canvasColors": "تستخدم على القماش",
     "canvasBackground": "خلفية اللوحة",
     "drawingCanvas": "لوحة الرسم",
+    "clearCanvas": "مسح اللوحة",
     "layers": "الطبقات",
     "actions": "الإجراءات",
     "language": "اللغة",
@@ -84,28 +95,31 @@
     "group": "تحديد مجموعة",
     "ungroup": "إلغاء تحديد مجموعة",
     "collaborators": "المتعاونون",
-    "showGrid": "إظهار الشبكة",
+    "toggleGrid": "تبديل الشبكة",
     "addToLibrary": "أضف إلى المكتبة",
     "removeFromLibrary": "حذف من المكتبة",
-    "libraryLoadingMessage": "جارٍ تحميل المكتبة…",
+    "libraryLoadingMessage": "جارٍ تحميل المكتبة...",
     "libraries": "تصفح المكتبات",
-    "loadingScene": "جاري تحميل المشهد…",
+    "loadingScene": "جارٍ تحميل المشهد…",
+    "loadScene": "تحميل المشهد من ملف",
     "align": "محاذاة",
-    "alignTop": "محاذاة إلى اﻷعلى",
-    "alignBottom": "محاذاة إلى اﻷسفل",
+    "alignTop": "محاذاة إلى الأعلى",
+    "alignBottom": "محاذاة إلى الأسفل",
     "alignLeft": "محاذاة إلى اليسار",
     "alignRight": "محاذاة إلى اليمين",
     "centerVertically": "توسيط عمودي",
     "centerHorizontally": "توسيط أفقي",
     "distributeHorizontally": "التوزيع الأفقي",
-    "distributeVertically": "التوزيع عمودياً",
-    "flipHorizontal": "قلب عامودي",
-    "flipVertical": "قلب أفقي",
+    "distributeVertically": "التوزيع عموديًا",
+    "flipHorizontal": "قلب أفقي",
+    "flipVertical": "قلب عمودي",
     "viewMode": "نمط العرض",
     "share": "مشاركة",
     "showStroke": "إظهار منتقي لون الخط",
     "showBackground": "إظهار منتقي لون الخلفية",
-    "toggleTheme": "غير النمط",
+    "showFonts": "إظهار منتقي الخط",
+    "toggleTheme": "تبديل الوضع الفاتح/الداكن",
+    "theme": "السمة",
     "personalLib": "المكتبة الشخصية",
     "excalidrawLib": "مكتبتنا",
     "decreaseFontSize": "تصغير حجم الخط",
@@ -115,16 +129,21 @@
     "createContainerFromText": "نص مغلف في حاوية",
     "link": {
       "edit": "تعديل الرابط",
-      "editEmbed": "تحرير الرابط وإدراجه",
-      "create": "إنشاء رابط",
-      "createEmbed": "إنشاء رابط و إدراجه",
+      "editEmbed": "تعديل الرابط القابل للتضمين",
+      "create": "إضافة رابط",
       "label": "رابط",
-      "labelEmbed": "رابط و إدراج",
-      "empty": "لم يتم تعيين رابط"
+      "labelEmbed": "رابط وإدراج",
+      "empty": "لم يتم تعيين رابط",
+      "hint": "اكتب أو الصق الرابط هنا",
+      "goToElement": "الانتقال إلى العنصر المستهدف"
     },
     "lineEditor": {
       "edit": "تحرير السطر",
-      "exit": "الخروج من المُحرر"
+      "editArrow": "تحرير السهم"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "قفل",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "تحديد جميع العناصر في الإطار",
     "removeAllElementsFromFrame": "إزالة جميع العناصر من الإطار",
     "eyeDropper": "اختيار اللون من القماش",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "نص إلى رسم بياني",
+    "prompt": "تعليمات",
+    "followUs": "تابعنا",
+    "discordChat": "دردشة ديسكورد",
+    "zoomToFitViewport": "التكبير لتناسب العرض",
+    "zoomToFitSelection": "تكبير للعنصر المحدد",
+    "zoomToFit": "تكبير لتلائم جميع العناصر",
+    "installPWA": "تثبيت Excalidraw محليًا (PWA)",
+    "autoResize": "تمكين تغيير حجم النص تلقائيًا",
+    "imageCropping": "قص الصورة",
+    "unCroppedDimension": "الأبعاد غير المقصوصة",
+    "copyElementLink": "نسخ رابط الكائن",
+    "linkToElement": "رابط إلى الكائن",
+    "wrapSelectionInFrame": "تغليف التحديد في إطار",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "رابط إلى الكائن",
+    "desc": "انقر على شكل على اللوحة أو الصق رابطًا.",
+    "notFound": "لم يتم العثور على الكائن المرتبط على اللوحة."
   },
   "library": {
     "noItems": "لا توجد عناصر أضيفت بعد...",
     "hint_emptyLibrary": "حدد عنصر على القماش لإضافته هنا، أو تثبيت مكتبة من المستودع العام أدناه.",
-    "hint_emptyPrivateLibrary": "حدد عنصر على القماش لإضافته هنا."
+    "hint_emptyPrivateLibrary": "حدد عنصر على القماش لإضافته هنا.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "البحث على اللوحة",
+    "noMatch": "لم يتم العثور على تطابقات...",
+    "singleResult": "نتيجة",
+    "multipleResults": "نتائج",
+    "placeholder": "ابحث عن نص على اللوحة...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "إعادة تعيين اللوحة",
@@ -151,16 +204,17 @@
     "exportImage": "تصدير الصورة...",
     "export": "حفظ إلى...",
     "copyToClipboard": "نسخ إلى الحافظة",
+    "copyLink": "نسخ الرابط",
     "save": "احفظ للملف الحالي",
     "saveAs": "حفظ كـ",
     "load": "فتح",
     "getShareableLink": "احصل على رابط المشاركة",
-    "close": "غلق",
+    "close": "إغلاق",
     "selectLanguage": "اختر اللغة",
     "scrollBackToContent": "الرجوع إلى المحتوى",
     "zoomIn": "تكبير",
     "zoomOut": "تصغير",
-    "resetZoom": "إعادة تعيين الشاشة",
+    "resetZoom": "إعادة تعيين التكبير",
     "menu": "القائمة",
     "done": "تم",
     "edit": "تعديل",
@@ -171,53 +225,56 @@
     "fullScreen": "شاشة كاملة",
     "darkMode": "الوضع المظلم",
     "lightMode": "الوضع المضيء",
+    "systemMode": "وضع النظام",
     "zenMode": "وضع التأمل",
-    "objectsSnapMode": "التقط إلى العناصر",
-    "exitZenMode": "إلغاء الوضع الليلى",
+    "objectsSnapMode": "التقاط إلى العناصر",
+    "exitZenMode": "إلغاء وضع التأمل",
     "cancel": "إلغاء",
+    "saveLibNames": "",
     "clear": "مسح",
     "remove": "إزالة",
     "embed": "تبديل الإدراج",
-    "publishLibrary": "انشر",
-    "submit": "أرسل",
+    "publishLibrary": "",
+    "submit": "إرسال",
     "confirm": "تأكيد",
     "embeddableInteractionButton": "اضغط للتفاعل"
   },
   "alerts": {
     "clearReset": "هذا سيُزيل كامل اللوحة. هل أنت متأكد؟",
-    "couldNotCreateShareableLink": "تعذر إنشاء رابطة المشاركة.",
+    "couldNotCreateShareableLink": "تعذر إنشاء رابط المشاركة.",
     "couldNotCreateShareableLinkTooBig": "تعذر إنشاء رابط قابل للمشاركة: المشهد كبير جدًا",
     "couldNotLoadInvalidFile": "تعذر التحميل، الملف غير صالح",
-    "importBackendFailed": "فشل الاستيراد من الخادوم.",
+    "importBackendFailed": "فشل الاستيراد من الخادم.",
     "cannotExportEmptyCanvas": "لا يمكن تصدير لوحة فارغة.",
     "couldNotCopyToClipboard": "تعذر النسخ إلى الحافظة.",
     "decryptFailed": "تعذر فك تشفير البيانات.",
-    "uploadedSecurly": "تم تأمين التحميل بتشفير النهاية إلى النهاية، مما يعني أن خادوم Excalidraw والأطراف الثالثة لا يمكنها قراءة المحتوى.",
+    "uploadedSecurly": "تم تأمين التحميل بتشفير النهاية إلى النهاية، مما يعني أن خادم Excalidraw والأطراف الثالثة لا يمكنها قراءة المحتوى.",
     "loadSceneOverridePrompt": "تحميل الرسم الخارجي سيحل محل المحتوى الموجود لديك. هل ترغب في المتابعة؟",
-    "collabStopOverridePrompt": "إيقاف الجلسة سيؤدي إلى الكتابة فوق رسومك السابقة المخزنة داخليا. هل أنت متأكد؟\n\n(إذا كنت ترغب في الاحتفاظ برسمك المخزن داخليا، ببساطة أغلق علامة تبويب المتصفح بدلاً من ذلك.)",
-    "errorAddingToLibrary": "تعذر إضافة العنصر للمكتبة",
+    "collabStopOverridePrompt": "إيقاف الجلسة سيؤدي إلى الكتابة فوق رسومك السابقة المخزنة داخليًا. هل أنت متأكد؟\n\n(إذا كنت ترغب في الاحتفاظ برسمك المخزن داخليًا، أغلق علامة تبويب المتصفح بدلاً من ذلك.)",
+    "errorAddingToLibrary": "تعذر إضافة العنصر إلى المكتبة",
     "errorRemovingFromLibrary": "تعذر إزالة العنصر من المكتبة",
     "confirmAddLibrary": "هذا سيضيف {{numShapes}} شكل إلى مكتبتك. هل أنت متأكد؟",
     "imageDoesNotContainScene": "يبدو أن هذه الصورة لا تحتوي على أي بيانات مشهد. هل قمت بتمكين تضمين المشهد أثناء التصدير؟",
     "cannotRestoreFromImage": "تعذر استعادة المشهد من ملف الصورة",
     "invalidSceneUrl": "تعذر استيراد المشهد من عنوان URL المتوفر. إما أنها مشوهة، أو لا تحتوي على بيانات Excalidraw JSON صالحة.",
-    "resetLibrary": "هذا سوف يمسح مكتبتك. هل أنت متأكد؟",
+    "resetLibrary": "هذا سيؤدي إلى مسح مكتبتك. هل أنت متأكد؟",
     "removeItemsFromsLibrary": "حذف {{count}} عنصر (عناصر) من المكتبة؟",
-    "invalidEncryptionKey": "مفتاح التشفير يجب أن يكون من 22 حرفاً. التعاون المباشر معطل.",
-    "collabOfflineWarning": "لا يوجد اتصال بالانترنت.\nلن يتم حفظ التغييرات التي قمت بها!"
+    "invalidEncryptionKey": "مفتاح التشفير يجب أن يكون من 22 حرفًا. التعاون المباشر معطل.",
+    "collabOfflineWarning": "لا يوجد اتصال بالإنترنت.\nلن يتم حفظ التغييرات التي قمت بها!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "نوع الملف غير مدعوم.",
-    "imageInsertError": "تعذر إدراج الصورة. حاول مرة أخرى لاحقاً...",
-    "fileTooBig": "الملف كبير جداً. الحد الأقصى المسموح به للحجم هو {{maxSize}}.",
+    "imageInsertError": "تعذر إدراج الصورة. حاول مرة أخرى لاحقًا...",
+    "fileTooBig": "الملف كبير جدًا. الحد الأقصى المسموح به للحجم هو {{maxSize}}.",
     "svgImageInsertError": "تعذر إدراج صورة SVG. يبدو أن ترميز SVG غير صحيح.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG غير صالح.",
+    "failedToFetchImage": "فشل تحميل الصورة.",
     "cannotResolveCollabServer": "تعذر الاتصال بخادم التعاون. الرجاء إعادة تحميل الصفحة والمحاولة مرة أخرى.",
     "importLibraryError": "تعذر تحميل المكتبة",
-    "collabSaveFailed": "تعذر الحفظ في قاعدة البيانات. إذا استمرت المشاكل، يفضل أن تحفظ ملفك محليا كي لا تفقد عملك.",
-    "collabSaveFailed_sizeExceeded": "تعذر الحفظ في قاعدة البيانات، يبدو أن القماش كبير للغاية، يفضّل حفظ الملف محليا كي لا تفقد عملك.",
-    "imageToolNotSupported": "",
+    "saveLibraryError": "تعذر حفظ المكتبة. الرجاء حفظ المكتبة الخاصة بك في ملف محلي للتأكد من أنك لا تفقد التغييرات.",
+    "collabSaveFailed": "تعذر الحفظ في قاعدة البيانات. إذا استمرت المشاكل، يُفضل حفظ ملفك محليًا كي لا تفقد عملك.",
+    "collabSaveFailed_sizeExceeded": "تعذر الحفظ في قاعدة البيانات، يبدو أن القماش كبير للغاية، يُفضل حفظ الملف محليًا كي لا تفقد عملك.",
+    "imageToolNotSupported": "تم تعطيل الصور.",
     "brave_measure_text_error": {
       "line1": "يبدو أنك تستخدم متصفح Brave مع إعداد <bold>حظر صارم لتتبع البصمة</bold>.",
       "line2": "قد يؤدي هذا إلى كسر <bold>عناصر النص</bold> في الرسومات الخاصة بك.",
@@ -226,15 +283,16 @@
     },
     "libraryElementTypeError": {
       "embeddable": "لا يمكن إضافة العناصر القابلة للتضمين في المكتبة.",
-      "iframe": "",
-      "image": "سوف يتم دعم إضافة صور إلى المكتبة قريباً!"
+      "iframe": "لا يمكن إضافة عناصر IFrame إلى المكتبة.",
+      "image": "سيتم دعم إضافة صور إلى المكتبة قريبًا!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "تعذر اللصق (تعذر القراءة من حافظة النظام).",
+    "asyncPasteFailedOnParse": "تعذر اللصق.",
+    "copyToSystemClipboardFailed": "تعذر النسخ إلى الحافظة."
   },
   "toolBar": {
     "selection": "تحديد",
+    "lasso": "",
     "image": "إدراج صورة",
     "rectangle": "مستطيل",
     "diamond": "مضلع",
@@ -245,17 +303,33 @@
     "text": "نص",
     "library": "مكتبة",
     "lock": "الحفاظ على أداة التحديد نشطة بعد الرسم",
-    "penMode": "وضع القلم - امنع اللمس",
+    "penMode": "وضع القلم - منع اللمس",
     "link": "إضافة/تحديث الرابط للشكل المحدد",
     "eraser": "ممحاة",
     "frame": "أداة الإطار",
-    "magicframe": "",
+    "magicframe": "Wireframe إلى كود",
     "embeddable": "تضمين ويب",
     "laser": "مؤشر ليزر",
     "hand": "يد (أداة الإزاحة)",
-    "extraTools": "المزيد من أﻷدوات",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "extraTools": "المزيد من الأدوات",
+    "mermaidToExcalidraw": "من Mermaid إلى Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "مستطيل",
+    "diamond": "مضلع",
+    "ellipse": "دائرة",
+    "arrow": "سهم",
+    "line": "خط",
+    "freedraw": "رسم حر",
+    "text": "نص",
+    "image": "صورة",
+    "group": "مجموعة",
+    "frame": "إطار",
+    "magicframe": "Wireframe إلى كود",
+    "embeddable": "تضمين ويب",
+    "selection": "تحديد",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "إجراءات اللوحة",
@@ -263,103 +337,115 @@
     "shapes": "الأشكال"
   },
   "hints": {
-    "canvasPanning": "لتحريك القماش، اضغط على عجلة الفأرة أو مفتاح المسافة أثناء السحب، أو استخدم أداة اليد",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "انقر لبدء نقاط متعددة، اسحب لخط واحد",
-    "freeDraw": "انقر واسحب، افرج عند الانتهاء",
+    "arrowTool": "",
+    "freeDraw": "انقر واسحب، أفرج عند الانتهاء",
     "text": "نصيحة: يمكنك أيضًا إضافة نص بالنقر المزدوج في أي مكان بأداة الاختيار",
     "embeddable": "اضغط مع السحب لإنشاء موقع ويب مضمّن",
-    "text_selected": "انقر نقراً مزدوجاً أو اضغط ادخال لتعديل النص",
-    "text_editing": "اضغط على Esc أو (Ctrl أو Cmd) + Enter لإنهاء التعديل",
-    "linearElementMulti": "انقر فوق النقطة الأخيرة أو اضغط على Esc أو Enter للإنهاء",
-    "lockAngle": "يمكنك تقييد الزاوية بالضغط على SHIFT",
-    "resize": "يمكنك تقييد النسب بالضغط على SHIFT أثناء تغيير الحجم،\nاضغط على ALT لتغيير الحجم من المركز",
-    "resizeImage": "يمكنك تغيير الحجم بحرية بالضغط بأستمرار على SHIFT،\nاضغط بأستمرار على ALT أيضا لتغيير الحجم من المركز",
-    "rotate": "يمكنك تقييد الزوايا من خلال الضغط على SHIFT أثناء الدوران",
-    "lineEditor_info": "اضغط على مفتاح (Ctrl أو Cmd) و انقر بشكل مزدوج، أو اضغط على مفتاحي (Ctrl أو Cmd) و (Enter) لتعديل النقاط",
-    "lineEditor_pointSelected": "اضغط على حذف لإزالة النقطة (النِّقَاط)، Ctrl/Cmd+D للتكرار، أو اسحب للانتقال",
-    "lineEditor_nothingSelected": "اختر نقطة لتعديلها (اضغط على SHIFT لتحديد عدة نِقَاط),\nأو اضغط على ALT و انقر بالفأرة لإضافة نِقَاط جديدة",
-    "placeImage": "انقر لوضع الصورة، أو انقر واسحب لتعيين حجمها يدوياً",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "نشر مكتبتك",
-    "bindTextToElement": "اضغط على إدخال لإضافة نص",
-    "deepBoxSelect": "اضغط على Ctrl\\Cmd للاختيار العميق، ولمنع السحب",
-    "eraserRevert": "اضغط على Alt لاستعادة العناصر المعلَّمة للحذف",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "يمكن على الأرجح تمكين هذه الميزة عن طريق تعيين علم \"dom.events.asyncClipboard.clipboardItem\" إلى \"true\". لتغيير أعلام المتصفح في Firefox، قم بزيارة صفحة \"about:config\".",
-    "disableSnapping": "اضغط على Ctrl أو Cmd لتعطيل الالتقاط"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "تعذر عرض المعاينة",
-    "canvasTooBig": "قد تكون اللوحة كبيرة جداً.",
+    "canvasTooBig": "قد تكون اللوحة كبيرة جدًا.",
     "canvasTooBigTip": "نصيحة: حاول تحريك العناصر البعيدة بشكل أقرب قليلاً."
   },
   "errorSplash": {
     "headingMain": "حدث خطأ. حاول <button>تحديث الصفحة</button>.",
     "clearCanvasMessage": "إذا لم تعمل إعادة التحميل، حاول مرة أخرى ",
-    "clearCanvasCaveat": " هذا سيؤدي إلى فقدان العمل ",
+    "clearCanvasCaveat": "هذا سيؤدي إلى فقدان العمل",
     "trackedToSentry": "تم تتبع الخطأ في المعرف {{eventId}} على نظامنا.",
-    "openIssueMessage": "حرصنا على عدم إضافة معلومات المشهد في بلاغ الخطأ. في حال كون مشهدك لا يحمل أي معلومات خاصة نرجو المتابعة على <button>نظام تتبع الأخطاء</button>. نرجو إضافة المعلومات أدناه بنسخها ولصقها في محتوى البلاغ على GitHub.",
+    "openIssueMessage": "حرصنا على عدم إضافة معلومات المشهد في بلاغ الخطأ. في حال كون مشهدك لا يحمل أي معلومات خاصة، نرجو المتابعة على <button>نظام تتبع الأخطاء</button>. نرجو إضافة المعلومات أدناه بنسخها ولصقها في محتوى البلاغ على GitHub.",
     "sceneContent": "محتوى المشهد:"
   },
+  "shareDialog": {
+    "or": "أو"
+  },
   "roomDialog": {
-    "desc_intro": "يمكنك دعوة الآخرين لمشاركتك نفس الجلسة التي تعمل عليها.",
-    "desc_privacy": "لا تقلق، الجلسة تستخدم التشفير من النهاية إلى النهاية، لذلك فإن أي شيء ترسمه سيبقى خاصاً. لن يتمكن حتى الخادوم الخاص بنا من رؤية ما توصلت إليه.",
+    "desc_intro": "ادعُ الأشخاص للتعاون في الرسم الخاص بك.",
+    "desc_privacy": "لا تقلق، الجلسة مشفرة من النهاية إلى النهاية وخصوصية تمامًا. حتى خادمنا لا يستطيع رؤية ما ترسمه.",
     "button_startSession": "بدء الجلسة",
     "button_stopSession": "إيقاف الجلسة",
-    "desc_inProgressIntro": "تجري الآن المشاركة الحية.",
+    "desc_inProgressIntro": "تجري الآن جلسة تعاون مباشرة.",
     "desc_shareLink": "شارك هذا الرابط مع أي شخص تريده أن يشاركك الجلسة:",
-    "desc_exitSession": "إيقاف الجلسة سيؤدي إلى قطع الاتصال الخاص بك من الغرفة، ولكن ستتمكن من مواصلة العمل مع المشهد، محليا. لاحظ أن هذا لن يؤثر على الأشخاص الآخرين، و سيظلون قادرين على التعاون في إصدارهم.",
-    "shareTitle": "الانضمام إلى جلسة تعاون حية على Excalidraw"
+    "desc_exitSession": "إيقاف الجلسة سيؤدي إلى قطع الاتصال الخاص بك من الغرفة، ولكن ستتمكن من مواصلة العمل مع المشهد محليًا. لاحظ أن هذا لن يؤثر على الأشخاص الآخرين، وسيظلون قادرين على التعاون في إصدارهم.",
+    "shareTitle": "الانضمام إلى جلسة تعاون مباشرة على Excalidraw"
   },
   "errorDialog": {
     "title": "خطأ"
   },
   "exportDialog": {
-    "disk_title": "حفظ الملف للجهاز",
-    "disk_details": "تصدير بيانات المشهد إلى ملف يمكنك الاستيراد منه لاحقاً.",
-    "disk_button": "إحفظ لملف",
+    "disk_title": "حفظ الملف على الجهاز",
+    "disk_details": "تصدير بيانات المشهد إلى ملف يمكنك الاستيراد منه لاحقًا.",
+    "disk_button": "حفظ إلى ملف",
     "link_title": "رابط قابل للمشاركة",
-    "link_details": "صدر الملف للمشاهدة فقط.",
-    "link_button": "التصدير كرابط",
+    "link_details": "تصدير الملف للمشاهدة فقط.",
+    "link_button": "تصدير كرابط",
     "excalidrawplus_description": "حفظ المشهد إلى مساحة العمل +Excalidraw الخاصة بك.",
     "excalidrawplus_button": "تصدير",
-    "excalidrawplus_exportError": "تعذر التصدير إلى +Excalidraw في الوقت الحالي..."
+    "excalidrawplus_exportError": "تعذر التص несп في الوقت الحالي إلى +Excalidraw..."
   },
   "helpDialog": {
     "blog": "اقرأ مدونتنا",
     "click": "انقر",
     "deepSelect": "تحديد عميق",
     "deepBoxSelect": "تحديد عميق داخل المربع، ومنع السحب",
-    "curvedArrow": "سهم مائل",
-    "curvedLine": "خط مائل",
+    "createFlowchart": "إنشاء مخطط تدفق من عنصر عام",
+    "navigateFlowchart": "التنقل في مخطط تدفق",
+    "curvedArrow": "سهم منحني",
+    "curvedLine": "خط منحني",
     "documentation": "دليل الاستخدام",
     "doubleClick": "انقر مرتين",
     "drag": "اسحب",
     "editor": "المحرر",
-    "editLineArrowPoints": "تحرير سطر/نقاط سهم",
+    "editLineArrowPoints": "تحرير نقاط السطر/السهم",
     "editText": "تعديل النص / إضافة تسمية",
-    "github": "عثرت على مشكلة؟ إرسال",
+    "github": "عثرت على مشكلة؟ أرسل",
     "howto": "اتبع التعليمات",
     "or": "أو",
-    "preventBinding": "منع ارتبط السهم",
+    "preventBinding": "منع ارتباط السهم",
     "tools": "الأدوات",
     "shortcuts": "اختصارات لوحة المفاتيح",
     "textFinish": "إنهاء التعديل (محرر النص)",
-    "textNewLine": "أضف سطر جديد (محرر نص)",
+    "textNewLine": "إضافة سطر جديد (محرر النص)",
     "title": "المساعدة",
     "view": "عرض",
     "zoomToFit": "تكبير للملائمة",
     "zoomToSelection": "تكبير للعنصر المحدد",
-    "toggleElementLock": "إغلاق/فتح المحدد",
+    "toggleElementLock": "قفل/فتح المحدد",
     "movePageUpDown": "نقل الصفحة أعلى/أسفل",
-    "movePageLeftRight": "نقل الصفحة يسار/يمين"
+    "movePageLeftRight": "نقل الصفحة يسار/يمين",
+    "cropStart": "بدء قص الصورة",
+    "cropFinish": "إنهاء قص الصورة"
   },
   "clearCanvasDialog": {
     "title": "مسح اللوحة"
   },
   "publishDialog": {
     "title": "نشر المكتبة",
-    "itemName": "إسم العنصر",
-    "authorName": "إسم المؤلف",
-    "githubUsername": "اسم المستخدم في جيت هب",
+    "itemName": "اسم العنصر",
+    "authorName": "اسم المؤلف",
+    "githubUsername": "اسم المستخدم في GitHub",
     "twitterUsername": "اسم المستخدم في تويتر",
     "libraryName": "اسم المكتبة",
     "libraryDesc": "وصف المكتبة",
@@ -368,24 +454,24 @@
       "authorName": "اسمك أو اسم المستخدم",
       "libraryName": "اسم مكتبتك",
       "libraryDesc": "وصف مكتبتك لمساعدة الناس على فهم استخدامها",
-      "githubHandle": "معالج GitHub (اختياري)، حتى تتمكن من تحرير المكتبة عند إرسالها للمراجعة",
+      "githubHandle": "معرف GitHub (اختياري)، حتى تتمكن من تحرير المكتبة عند إرسالها للمراجعة",
       "twitterHandle": "اسم مستخدم تويتر (اختياري)، حتى نعرف من الذي سيتم الإشارة إليه عند الترويج عبر تويتر",
-      "website": "رابط إلى موقعك الشخصي أو في مكان آخر (اختياري)"
+      "website": "رابط إلى موقعك الشخصي أو مكان آخر (اختياري)"
     },
     "errors": {
       "required": "مطلوب",
       "website": "أدخل عنوان URL صالح"
     },
-    "noteDescription": "تقديم مكتبتك لتضمينها في مستودع المكتبة العامة <link></link> لأشخاص آخرين لاستخدامها في رسومهم.",
-    "noteGuidelines": "تحتاج المكتبة إلى الموافقة أولا. يرجى قراءة <link>المعايير</link> قبل تقديمها. سوف تحتاج إلى حساب GitHub للتواصل وإجراء التغييرات عند الطلب، ولكن ليس مطلوبا بشكل صارم.",
-    "noteLicense": "تقديمك يعني موافقتك على نشر المكتبة المقدمة تحت <link>MIT ترخيص</link>، ما يعني أن لأي أحد الحق في استخدامها دون قيود.",
-    "noteItems": "يجب أن يكون لكل عنصر مكتبة اسمه الخاص حتى يكون قابلاً للتصفية. سيتم تضمين عناصر المكتبة التالية:",
+    "noteDescription": "تقديم مكتبتك لتضمينها في مستودع المكتبة العامة <link></link> ليستخدمها الآخرون في رسوماتهم.",
+    "noteGuidelines": "تحتاج المكتبة إلى الموافقة أولاً. يرجى قراءة <link>المعايير</link> قبل تقديمها. ستحتاج إلى حساب GitHub للتواصل وإجراء التغييرات عند الطلب، ولكنه ليس مطلوبًا بشكل صارم.",
+    "noteLicense": "تقديمك يعني موافقتك على نشر المكتبة المقدمة تحت <link>ترخيص MIT</link>، مما يعني أن لأي شخص الحق في استخدامها دون قيود.",
+    "noteItems": "يجب أن يكون لكل عنصر مكتبة اسم خاص به ليكون قابلًا للتصفية. سيتم تضمين عناصر المكتبة التالية:",
     "atleastOneLibItem": "يرجى تحديد عنصر مكتبة واحد على الأقل للبدء",
-    "republishWarning": "ملاحظة: بعض العناصر المحددة معينة على أنه نشرها أو تقديمها من قبل. يجب عليك فقط إعادة إرسال العناصر عند تحديث مكتبة موجودة أو إرسالها."
+    "republishWarning": "ملاحظة: بعض العناصر المحددة معينة على أنها نُشرت أو قُدمت من قبل. يجب عليك فقط إعادة إرسال العناصر عند تحديث مكتبة موجودة أو إرسالها."
   },
   "publishSuccessDialog": {
     "title": "تم إرسال المكتبة",
-    "content": "شكرا لك {{authorName}}. لقد تم إرسال مكتبتك للمراجعة. يمكنك تتبع الحالة"
+    "content": "شكرًا لك {{authorName}}. لقد تم إرسال مكتبتك للمراجعة. يمكنك تتبع الحالة"
   },
   "confirmDialog": {
     "resetLibrary": "إعادة ضبط المكتبة",
@@ -394,15 +480,15 @@
   "imageExportDialog": {
     "header": "تصدير الصورة",
     "label": {
-      "withBackground": "الخلفية",
+      "withBackground": "مع الخلفية",
       "onlySelected": "المحدد فقط",
       "darkMode": "الوضع الداكن",
       "embedScene": "تضمين المشهد",
-      "scale": "الحجم",
+      "scale": "المقياس",
       "padding": "الهوامش"
     },
     "tooltip": {
-      "embedScene": "سيتم حفظ بيانات المشهد في ملف PNG/SVG المصدّر بحيث يمكن استعادة المشهد منه.\nسيزيد حجم الملف المصدر."
+      "embedScene": "سيتم حفظ بيانات المشهد في ملف PNG/SVG المصدر بحيث يمكن استعادة المشهد منه.\nسيزيد هذا من حجم الملف المصدر."
     },
     "title": {
       "exportToPng": "تصدير بصيغة PNG",
@@ -416,18 +502,20 @@
     }
   },
   "encrypted": {
-    "tooltip": "رسوماتك مشفرة من النهاية إلى النهاية حتى أن خوادم Excalidraw لن تراها أبدا.",
-    "link": "مشاركة المدونة في التشفير من النهاية إلى النهاية في Excalidraw"
+    "tooltip": "رسوماتك مشفرة من النهاية إلى النهاية، لذا لا يمكن لخوادم Excalidraw رؤيتها أبدًا.",
+    "link": "مشاركة المدونة حول التشفير من النهاية إلى النهاية في Excalidraw"
   },
   "stats": {
     "angle": "الزاوية",
-    "element": "عنصر",
-    "elements": "العناصر",
+    "shapes": "الأشكال",
     "height": "الارتفاع",
     "scene": "المشهد",
     "selected": "المحدد",
     "storage": "التخزين",
-    "title": "إحصائيات للمهووسين",
+    "fullTitle": "خصائص اللوحة والأشكال",
+    "title": "الخصائص",
+    "generalStats": "عام",
+    "elementProperties": "خصائص الشكل",
     "total": "المجموع",
     "version": "الإصدار",
     "versionCopy": "انقر للنسخ",
@@ -435,17 +523,19 @@
     "width": "العرض"
   },
   "toast": {
-    "addedToLibrary": "تمت الاضافة الى المكتبة!",
-    "copyStyles": "نسخت الانماط.",
-    "copyToClipboard": "نسخ إلى الحافظة.",
+    "addedToLibrary": "تمت الإضافة إلى المكتبة!",
+    "copyStyles": "تم نسخ الأنماط.",
+    "copyToClipboard": "تم النسخ إلى الحافظة.",
     "copyToClipboardAsPng": "تم نسخ {{exportSelection}} إلى الحافظة بصيغة PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "تم نسخ {{exportSelection}} إلى الحافظة بصيغة SVG\n({{exportColorScheme}})",
     "fileSaved": "تم حفظ الملف.",
-    "fileSavedToFilename": "حفظ باسم {filename}",
+    "fileSavedToFilename": "تم الحفظ باسم {filename}",
     "canvas": "لوحة الرسم",
     "selection": "العنصر المحدد",
     "pasteAsSingleElement": "استخدم {{shortcut}} للصق كعنصر واحد،\nأو لصق في محرر نص موجود",
-    "unableToEmbed": "تضمين هذا الرابط غير مسموح حاليًا. افتح بلاغاً على GitHub لطلب عنوان Url القائمة البيضاء",
-    "unrecognizedLinkFormat": "الرابط الذي ضمنته لا يتطابق مع التنسيق المتوقع. الرجاء محاولة لصق النص 'المضمن' المُزوَد من موقع المصدر"
+    "unableToEmbed": "تضمين هذا الرابط غير مسموح حاليًا. افتح بلاغًا على GitHub لطلب إدراج عنوان URL في القائمة البيضاء",
+    "unrecognizedLinkFormat": "الرابط الذي أدرجته لا يتطابق مع التنسيق المتوقع. الرجاء محاولة لصق النص 'المضمن' المُزوَد من موقع المصدر",
+    "elementLinkCopied": "تم نسخ الرابط إلى الحافظة"
   },
   "colors": {
     "transparent": "شفاف",
@@ -466,19 +556,20 @@
   },
   "welcomeScreen": {
     "app": {
-      "center_heading": "جميع بياناتك محفوظة محليا في المتصفح الخاص بك.",
-      "center_heading_plus": "هل تريد الذهاب إلى Excalidraw+ بدلاً من ذلك؟",
-      "menuHint": "التصدير والتفضيلات واللغات ..."
+      "center_heading": "جميع بياناتك محفوظة محليًا في المتصفح الخاص بك.",
+      "center_heading_plus": "هل تريد الانتقال إلى Excalidraw+ بدلاً من ذلك؟",
+      "menuHint": "التصدير، التفضيلات، اللغات..."
     },
     "defaults": {
-      "menuHint": "التصدير والتفضيلات وغيرها...",
-      "center_heading": "الرسم البياني التصويري. بشكل مبسط.",
-      "toolbarHint": "اختر أداة و ابدأ الرسم!",
-      "helpHint": "الاختصارات و المساعدة"
+      "menuHint": "التصدير، التفضيلات، وغيرها...",
+      "center_heading": "الرسم البياني التصويري، ببساطة.",
+      "toolbarHint": "اختر أداة وابدأ الرسم!",
+      "helpHint": "الاختصارات والمساعدة"
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "الألوان المخصصة الأكثر استخداما",
+    "color": "",
+    "mostUsedCustomColors": "الألوان المخصصة الأكثر استخدامًا",
     "colors": "الألوان",
     "shades": "الدرجات",
     "hexCode": "رمز Hex",
@@ -489,12 +580,12 @@
       "exportToImage": {
         "title": "تصدير كصورة",
         "button": "تصدير كصورة",
-        "description": "تصدير بيانات المشهد إلى ملف يمكنك الاستيراد منه لاحقاً."
+        "description": "تصدير بيانات المشهد إلى ملف يمكنك الاستيراد منه لاحقًا."
       },
       "saveToDisk": {
-        "title": "حفظ الملف للجهاز",
-        "button": "حفظ الملف للجهاز",
-        "description": "تصدير بيانات المشهد إلى ملف يمكنك الاستيراد منه لاحقاً."
+        "title": "حفظ الملف على الجهاز",
+        "button": "حفظ الملف على الجهاز",
+        "description": "تصدير بيانات المشهد إلى ملف يمكنك الاستيراد منه لاحقًا."
       },
       "excalidrawPlus": {
         "title": "Excalidraw+",
@@ -511,15 +602,63 @@
       "shareableLink": {
         "title": "تحميل من رابط",
         "button": "استبدال محتواي",
-        "description": "سيتسبب تحميل رسمة خارجية <bold>باستبدال محتواك الموجود حالياً</bold>.<br></br>بإمكانك إجراء النسخ الاحتياطي لرسمتك الحالية باستخدام أحد الخيارات أدناه."
+        "description": "سيتسبب تحميل رسمة خارجية <bold>باستبدال محتواك الموجود حاليًا</bold>.<br></br>بإمكانك إجراء النسخ الاحتياطي لرسمتك الحالية باستخدام أحد الخيارات أدناه."
       }
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid إلى Excalidraw",
+    "button": "إدراج",
+    "description": "حاليًا، يتم دعم <flowchartLink>مخططات التدفق</flowchartLink>، <sequenceLink>التسلسلات</sequenceLink>، و<classLink>الفئات</classLink> فقط. سيتم عرض الأنواع الأخرى كصورة في Excalidraw.",
+    "syntax": "صيغة Mermaid",
+    "preview": "معاينة"
+  },
+  "quickSearch": {
+    "placeholder": "بحث سريع"
+  },
+  "fontList": {
+    "badge": {
+      "old": "قديم"
+    },
+    "sceneFonts": "في هذا المشهد",
+    "availableFonts": "الخطوط المتوفرة",
+    "empty": "لم يتم العثور على خطوط"
+  },
+  "userList": {
+    "empty": "لم يتم العثور على مستخدمين",
+    "hint": {
+      "text": "انقر على المستخدم للمتابعة",
+      "followStatus": "أنت حاليًا تتابع هذا المستخدم",
+      "inCall": "المستخدم في مكالمة صوتية",
+      "micMuted": "ميكروفون المستخدم مكتم",
+      "isSpeaking": "المستخدم يتحدث"
+    }
+  },
+  "commandPalette": {
+    "title": "لوحة الأوامر",
+    "shortcuts": {
+      "select": "اختر",
+      "confirm": "تأكيد",
+      "close": "إغلاق"
+    },
+    "recents": "المستخدمة مؤخرًا",
+    "search": {
+      "placeholder": "ابحث في القوائم، الأوامر، واكتشف الجواهر المخفية",
+      "noMatch": "لا توجد أوامر مطابقة..."
+    },
+    "itemNotAvailable": "الأمر غير متوفر...",
+    "shortcutHint": "للحصول على لوحة الأوامر، استخدم {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/az-AZ.json b/packages/excalidraw/locales/az-AZ.json
index 145fc0ac53..d046949a07 100644
--- a/packages/excalidraw/locales/az-AZ.json
+++ b/packages/excalidraw/locales/az-AZ.json
@@ -11,8 +11,8 @@
     "copyAsPng": "PNG olaraq panoya kopyala",
     "copyAsSvg": "SVG olaraq panoya kopyala",
     "copyText": "Mətn olaraq panoya kopyala",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Mənbəni kopyala",
+    "convertToCode": "Koda çevir",
     "bringForward": "Önə daşı",
     "sendToBack": "Geriyə göndərin",
     "bringToFront": "Önə gətirin",
@@ -21,11 +21,13 @@
     "copyStyles": "Stilləri kopyalayın",
     "pasteStyles": "Stilləri yapışdırın",
     "stroke": "Strok rəngi",
+    "changeStroke": "Ştrix rəngini dəyişdir",
     "background": "Arxa fon",
+    "changeBackground": "Fon rəngini dəyişdir",
     "fill": "Doldur",
     "strokeWidth": "Strok eni",
     "strokeStyle": "Strok stili",
-    "strokeStyle_solid": "Solid",
+    "strokeStyle_solid": "Qatı",
     "strokeStyle_dashed": "Kəsik",
     "strokeStyle_dotted": "Nöqtəli",
     "sloppiness": "Səliqəsizlik",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Heç biri",
     "arrowhead_arrow": "Ox",
     "arrowhead_bar": "Çubuq",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Dairə",
+    "arrowhead_circle_outline": "Çevrə (Kontur)",
     "arrowhead_triangle": "Üçbucaq",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Üçbucaq (kontur)",
+    "arrowhead_diamond": "Almaz",
+    "arrowhead_diamond_outline": "Almaz (kontur)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Şrift ölçüsü",
     "fontFamily": "Şrift qrupu",
     "addWatermark": "\"Made with Excalidraw\" əlavə et",
@@ -54,7 +64,7 @@
     "medium": "Orta",
     "large": "Böyük",
     "veryLarge": "Çox böyük",
-    "solid": "Solid",
+    "solid": "Qatı",
     "hachure": "Ştrix",
     "zigzag": "Ziqzaq",
     "crossHatch": "Çarpaz dəlik",
@@ -72,6 +82,7 @@
     "canvasColors": "Kanvas üzərində istifadə olunur",
     "canvasBackground": "Kanvas arxa fonu",
     "drawingCanvas": "Kanvas çəkmək",
+    "clearCanvas": "Lövhəni təmizlə",
     "layers": "Qatlar",
     "actions": "Hərəkətlər",
     "language": "Dil",
@@ -83,48 +94,56 @@
     "madeWithExcalidraw": "Excalidraw ilə hazırlanmışdır",
     "group": "Qrup şəklində seçim",
     "ungroup": "Qrupsuz seçim",
-    "collaborators": "",
-    "showGrid": "",
-    "addToLibrary": "",
-    "removeFromLibrary": "",
-    "libraryLoadingMessage": "",
-    "libraries": "",
-    "loadingScene": "",
-    "align": "",
-    "alignTop": "",
-    "alignBottom": "",
-    "alignLeft": "",
-    "alignRight": "",
-    "centerVertically": "",
-    "centerHorizontally": "",
-    "distributeHorizontally": "",
-    "distributeVertically": "",
-    "flipHorizontal": "",
-    "flipVertical": "",
-    "viewMode": "",
-    "share": "",
-    "showStroke": "",
-    "showBackground": "",
-    "toggleTheme": "",
-    "personalLib": "",
-    "excalidrawLib": "",
-    "decreaseFontSize": "",
-    "increaseFontSize": "",
-    "unbindText": "",
-    "bindText": "",
-    "createContainerFromText": "",
+    "collaborators": "Əməkdaşlar",
+    "toggleGrid": "Toru dəyiş",
+    "addToLibrary": "Kitabxanaya əlavə et",
+    "removeFromLibrary": "Kitabxanadan sil",
+    "libraryLoadingMessage": "Kitabxana yüklənir...",
+    "libraries": "Kitabxanalara bax",
+    "loadingScene": "Səhnə yüklənir...",
+    "loadScene": "Səhnəni fayldan yüklə",
+    "align": "Hizala",
+    "alignTop": "Yuxarı hizala",
+    "alignBottom": "Aşağı hizala",
+    "alignLeft": "Sola hizala",
+    "alignRight": "Sağa hizala",
+    "centerVertically": "Şaquli ortala",
+    "centerHorizontally": "Üfüqi ortala",
+    "distributeHorizontally": "Üfüqi payla",
+    "distributeVertically": "Şaquli payla",
+    "flipHorizontal": "Üfüqi çevir",
+    "flipVertical": "Şaquli çevir",
+    "viewMode": "Görünüş Rejimi",
+    "share": "Paylaş",
+    "showStroke": "Çevrə rəng seçimini göstər",
+    "showBackground": "Fon rəng seçimini göstər",
+    "showFonts": "",
+    "toggleTheme": "Gecə/Güzdüz rejiminə dəyiş",
+    "theme": "Fon",
+    "personalLib": "Şəxsi kitabxana",
+    "excalidrawLib": "Excalidraw kitabxanası",
+    "decreaseFontSize": "Şrift ölçüsünü azalt",
+    "increaseFontSize": "Şrift ölçüsünü artır",
+    "unbindText": "Mətni çıxar",
+    "bindText": "Mətni konteynerə qoş",
+    "createContainerFromText": "Mətni konteynerə bük",
     "link": {
-      "edit": "",
+      "edit": "Keçidi düzəliş et",
       "editEmbed": "",
       "create": "",
-      "createEmbed": "",
-      "label": "",
+      "label": "Keçid",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "",
-      "exit": ""
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "",
@@ -151,6 +204,7 @@
     "exportImage": "",
     "export": "",
     "copyToClipboard": "",
+    "copyLink": "",
     "save": "",
     "saveAs": "",
     "load": "",
@@ -171,40 +225,43 @@
     "fullScreen": "",
     "darkMode": "",
     "lightMode": "",
-    "zenMode": "",
-    "objectsSnapMode": "",
-    "exitZenMode": "",
-    "cancel": "",
-    "clear": "",
-    "remove": "",
-    "embed": "",
+    "systemMode": "Sistem rejimi",
+    "zenMode": "Zen rejimi",
+    "objectsSnapMode": "Obyektlərə bərkidin",
+    "exitZenMode": "Zen rejimindən çıxış",
+    "cancel": "Ləğv et",
+    "saveLibNames": "",
+    "clear": "Təmizlə",
+    "remove": "Sil",
+    "embed": "Yerləşdirməni aktiv et",
     "publishLibrary": "",
-    "submit": "",
-    "confirm": "",
-    "embeddableInteractionButton": ""
+    "submit": "Göndər",
+    "confirm": "Təsdiqlə",
+    "embeddableInteractionButton": "Əlaqə üçün kliklə"
   },
   "alerts": {
-    "clearReset": "",
-    "couldNotCreateShareableLink": "",
-    "couldNotCreateShareableLinkTooBig": "",
-    "couldNotLoadInvalidFile": "",
-    "importBackendFailed": "",
-    "cannotExportEmptyCanvas": "",
-    "couldNotCopyToClipboard": "",
-    "decryptFailed": "",
-    "uploadedSecurly": "",
-    "loadSceneOverridePrompt": "",
-    "collabStopOverridePrompt": "",
-    "errorAddingToLibrary": "",
-    "errorRemovingFromLibrary": "",
-    "confirmAddLibrary": "",
-    "imageDoesNotContainScene": "",
-    "cannotRestoreFromImage": "",
+    "clearReset": "Bu, bütün lövhəni təmizləyəcək. Sən əminsiniz?",
+    "couldNotCreateShareableLink": "Paylaşıla bilən keçid yaratmaq mümkün olmadı.",
+    "couldNotCreateShareableLinkTooBig": "Paylaşıla bilən link yaratmaq mümkün olmadı. Səhnə çox böyükdür",
+    "couldNotLoadInvalidFile": "Faylı açmaq müknü olmadı",
+    "importBackendFailed": "İdxal zamanı xəta baş verdi.",
+    "cannotExportEmptyCanvas": "Boş lövhəni ixrac etmək mümkün deyil.",
+    "couldNotCopyToClipboard": "Kopyalana bilmədi.",
+    "decryptFailed": "Məlumatın şifrəsini açmaq mümkün olmadı.",
+    "uploadedSecurly": "Yükləmə end-to-end şifrələmə texnologiyası ilə qorunub, yəni Excalidraw serveri və üçüncü tərəflər məzmunu oxuya bilməz.",
+    "loadSceneOverridePrompt": "Xarici rəsmin yüklənməsi mövcud məzmununuzu əvəz edəcək. Davam etmək istəyirsiniz?",
+    "collabStopOverridePrompt": "Sessiyanın dayandırılması əvvəlki, yerli olaraq saxlanılan çertyojunuzun üzərinə yazılacaq. Əminsiniz?",
+    "errorAddingToLibrary": "Kitabxanaya əlavə etmək mümkün olmadı",
+    "errorRemovingFromLibrary": "Kitabxanadan silmək mümkün olmadı",
+    "confirmAddLibrary": "Bu, kitabxananıza {{numShapes}} forma əlavə edəcək. Əminsiniz?",
+    "imageDoesNotContainScene": "Bu təsvirdə heç bir səhnə məlumatı yoxdur. İxrac zamanı səhnə yerləşdirməni aktiv etmisiniz?",
+    "cannotRestoreFromImage": "Səhnəni bu şəkil faylından bərpa etmək mümkün olmadı",
     "invalidSceneUrl": "",
     "resetLibrary": "",
     "removeItemsFromsLibrary": "",
     "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "",
@@ -212,9 +269,9 @@
     "fileTooBig": "",
     "svgImageInsertError": "",
     "failedToFetchImage": "",
-    "invalidSVGString": "",
     "cannotResolveCollabServer": "",
     "importLibraryError": "",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "",
+    "lasso": "",
     "image": "",
     "rectangle": "",
     "diamond": "",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "",
@@ -263,8 +337,10 @@
     "shapes": ""
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "",
+    "arrowTool": "",
     "freeDraw": "",
     "text": "",
     "embeddable": "",
@@ -276,15 +352,18 @@
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "",
@@ -299,6 +378,9 @@
     "openIssueMessage": "",
     "sceneContent": ""
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
     "desc_intro": "",
     "desc_privacy": "",
@@ -328,6 +410,8 @@
     "click": "",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "",
     "curvedLine": "",
     "documentation": "",
@@ -350,7 +434,9 @@
     "zoomToSelection": "",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "",
-    "element": "",
-    "elements": "",
+    "shapes": "",
     "height": "",
     "scene": "",
     "selected": "",
     "storage": "",
+    "fullTitle": "",
     "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "",
     "version": "",
     "versionCopy": "",
@@ -439,13 +527,15 @@
     "copyStyles": "",
     "copyToClipboard": "",
     "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "",
     "fileSavedToFilename": "",
     "canvas": "",
     "selection": "",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/bg-BG.json b/packages/excalidraw/locales/bg-BG.json
index d48f479822..65fcb30748 100644
--- a/packages/excalidraw/locales/bg-BG.json
+++ b/packages/excalidraw/locales/bg-BG.json
@@ -10,9 +10,9 @@
     "copy": "Копирай",
     "copyAsPng": "Копиране в клипборда",
     "copyAsSvg": "Копирано в клипборда като SVG",
-    "copyText": "",
-    "copySource": "",
-    "convertToCode": "",
+    "copyText": "Копирай в клипборда като текст",
+    "copySource": "Копирай източника в клипборда",
+    "convertToCode": "Конвертирай в код",
     "bringForward": "Преместване напред",
     "sendToBack": "Изнасяне назад",
     "bringToFront": "Изнасяне отпред",
@@ -21,7 +21,9 @@
     "copyStyles": "Копирайте стилове",
     "pasteStyles": "Постави стилове",
     "stroke": "Щрих",
+    "changeStroke": "Смени цвета на щрих",
     "background": "Фон",
+    "changeBackground": "Смени цвета на фон",
     "fill": "Наситеност",
     "strokeWidth": "Ширина на щриха",
     "strokeStyle": "Стил на линия",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Без",
     "arrowhead_arrow": "Стрелка",
     "arrowhead_bar": "Връх на стрелката",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Кръг",
+    "arrowhead_circle_outline": "Окръжност",
     "arrowhead_triangle": "Триъгълник",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Триъгълник (очертание)",
+    "arrowhead_diamond": "Диамант",
+    "arrowhead_diamond_outline": "Диамант (очертание)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "Вид стрелка",
+    "arrowtype_sharp": "Остра стрелка",
+    "arrowtype_round": "Извита стрелка",
+    "arrowtype_elbowed": "",
     "fontSize": "Размер на шрифта",
     "fontFamily": "Семейство шрифтове",
     "addWatermark": "Добави \"Направено с Excalidraw\"",
@@ -72,10 +82,11 @@
     "canvasColors": "Използван на платно",
     "canvasBackground": "Фон на платно",
     "drawingCanvas": "Платно за рисуване",
+    "clearCanvas": "Изчисти платното",
     "layers": "Слоеве",
     "actions": "Действия",
     "language": "Език",
-    "liveCollaboration": "",
+    "liveCollaboration": "Сътрудничество на живо...",
     "duplicateSelection": "Дублирай",
     "untitled": "Неозаглавено",
     "name": "Име",
@@ -84,12 +95,13 @@
     "group": "Групирай селекцията",
     "ungroup": "Спри групирането на селекцията",
     "collaborators": "Сътрудници",
-    "showGrid": "Показване на мрежа",
+    "toggleGrid": "Превключване на мрежа",
     "addToLibrary": "Добавяне към библиотеката",
     "removeFromLibrary": "Премахване от библиотеката",
     "libraryLoadingMessage": "Зареждане на библиотеката…",
     "libraries": "Разглеждане на библиотеките",
     "loadingScene": "Зареждане на сцена…",
+    "loadScene": "Зареди сцена от файл",
     "align": "Подравняване",
     "alignTop": "Подравняване отгоре",
     "alignBottom": "Подравняване отдолу",
@@ -103,9 +115,11 @@
     "flipVertical": "Вертикално обръщане",
     "viewMode": "Изглед",
     "share": "Сподели",
-    "showStroke": "",
-    "showBackground": "",
-    "toggleTheme": "Включи тема",
+    "showStroke": "Покажи избора на цвят за щрих",
+    "showBackground": "Покажи избора на цвят за фон",
+    "showFonts": "",
+    "toggleTheme": "Превключване на светла/тъмна тема",
+    "theme": "Тема",
     "personalLib": "Лична Библиотека",
     "excalidrawLib": "Excalidraw Библиотека",
     "decreaseFontSize": "Намали размера на шрифта",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Редактирай линк",
       "editEmbed": "",
-      "create": "",
-      "createEmbed": "",
+      "create": "Добавяне на връзка",
       "label": "Линк",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "Няма зададен линк",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
-      "edit": "",
-      "exit": ""
+      "edit": "Редактирай линия",
+      "editArrow": "Редактирай стрелка"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Заключи",
@@ -134,23 +153,58 @@
     },
     "statusPublished": "Публикувани",
     "sidebarLock": "",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
+    "selectAllElementsInFrame": "Избери всички елементи в рамка",
+    "removeAllElementsFromFrame": "Премахни всички елементи от рамка",
     "eyeDropper": "Избери цвят от платното",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Текст към диаграма",
+    "prompt": "",
+    "followUs": "Последвайте ни",
+    "discordChat": "Дискорд чат",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "Приближи селекцията",
+    "zoomToFit": "Приближи всички елементи",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Няма добавени неща все още...",
-    "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyLibrary": "Избери предмет от платното, за да го добавиш тук или инсталирай библиотека от публичното хранилище по-долу.",
+    "hint_emptyPrivateLibrary": "Избери предмет от платното, за да го добавиш тук.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "резултат",
+    "multipleResults": "резултати",
+    "placeholder": "Търсене на текст по платното...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Нулиране на платно",
-    "exportJSON": "",
-    "exportImage": "",
+    "exportJSON": "Изнасяна към файл",
+    "exportImage": "Изнеси изображение...",
     "export": "Запази на...",
     "copyToClipboard": "Копиране в клипборда",
+    "copyLink": "",
     "save": "Запази към текущ файл",
     "saveAs": "Запиши като",
     "load": "Отвори",
@@ -171,17 +225,19 @@
     "fullScreen": "На цял екран",
     "darkMode": "Тъмен режим",
     "lightMode": "Светъл режим",
+    "systemMode": "Системен режим",
     "zenMode": "Режим Zen",
-    "objectsSnapMode": "",
-    "exitZenMode": "Спиране на Zen режим",
+    "objectsSnapMode": "Прилепване към обекти",
+    "exitZenMode": "Спиране на режим Зен",
     "cancel": "Отмени",
+    "saveLibNames": "",
     "clear": "Изчисти",
     "remove": "Премахване",
-    "embed": "",
-    "publishLibrary": "Публикувай",
+    "embed": "Включи вмъкване",
+    "publishLibrary": "",
     "submit": "Изпрати",
     "confirm": "Потвърждаване",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Натисни, за да взаимодействаш"
   },
   "alerts": {
     "clearReset": "Това ще изчисти цялото платно. Сигурни ли сте?",
@@ -198,31 +254,32 @@
     "errorAddingToLibrary": "Не можем да заредим от библиотеката",
     "errorRemovingFromLibrary": "Не можем да премахнем елемент от библиотеката",
     "confirmAddLibrary": "Ще се добавят {{numShapes}} фигура(и) във вашата библиотека. Сигурни ли сте?",
-    "imageDoesNotContainScene": "",
+    "imageDoesNotContainScene": "Това изображение не изглежда да съдържа каквито и да е данни за сцена. Искате ли да включите вмъкване на сцени при изнасяне?",
     "cannotRestoreFromImage": "Не може да бъде възстановена сцена от този файл",
-    "invalidSceneUrl": "",
-    "resetLibrary": "",
+    "invalidSceneUrl": "Неуспешно поставяне на сцена от предоставения линк. Той е или неправилно оформен, или не съдържа валидни Excalidraw JSON данни.",
+    "resetLibrary": "Това ще изчисти библиотеката ви. Сигурни ли сте?",
     "removeItemsFromsLibrary": "Изтрий {{count}} елемент(а) от библиотеката?",
-    "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "invalidEncryptionKey": "Ключът за енкрипция трябва да е от 22 знака. Сътрудничеството на живо е изключено.",
+    "collabOfflineWarning": "Няма налична интернет връзка.\nВашите промени няма да бъдат запазени!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Този файлов формат не се поддържа.",
-    "imageInsertError": "",
+    "imageInsertError": "Неуспешно поставяне на изображение. Опитайте по-късно...",
     "fileTooBig": "Файлът е твърде голям. Максималния допустим размер е {{maxSize}}.",
-    "svgImageInsertError": "",
-    "failedToFetchImage": "",
-    "invalidSVGString": "Невалиден SVG.",
+    "svgImageInsertError": "Неуспешно поставяне на SVG изборажение. SVG данните изглеждат невалидни.",
+    "failedToFetchImage": "Неуспешно получаване на изборажение.",
     "cannotResolveCollabServer": "",
     "importLibraryError": "Не можем да заредим библиотеката",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Изображенията са изключени.",
     "brave_measure_text_error": {
       "line1": "",
       "line2": "",
       "line3": "Силно препоръчваме да изключите тази настройка. Можете да следвате <link>тези стъпки</link> за това как да го направите.",
-      "line4": ""
+      "line4": "Ако изключването на тази настройка не оправи изобразяването на текстови елементи, моля отворете <issueLink>проблем</issueLink> на нашия GitHub или ни пишете на <discordLink>Дискорд</discordLink>"
     },
     "libraryElementTypeError": {
       "embeddable": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Селекция",
+    "lasso": "",
     "image": "Вмъкване на изображение",
     "rectangle": "Правоъгълник",
     "diamond": "Диамант",
@@ -248,14 +306,30 @@
     "penMode": "",
     "link": "",
     "eraser": "Гума",
-    "frame": "",
+    "frame": "Инструмент за рамки",
     "magicframe": "",
     "embeddable": "",
-    "laser": "",
+    "laser": "Лазерна показалка",
     "hand": "",
     "extraTools": "Още инструменти",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "Mermaid към Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Правоъгълник",
+    "diamond": "Диамант",
+    "ellipse": "Елипса",
+    "arrow": "Стрелка",
+    "line": "Линия",
+    "freedraw": "Свободно рисуване",
+    "text": "Текст",
+    "image": "Изображение",
+    "group": "Група",
+    "frame": "Рамка",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Действия по платното",
@@ -263,28 +337,33 @@
     "shapes": "Фигури"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "Кликнете, за да стартирате няколко точки, плъзнете за една линия",
+    "arrowTool": "",
     "freeDraw": "Натиснете и влачете, пуснете като сте готови",
     "text": "Подсказка: Можете също да добавите текст като натиснете някъде два път с инструмента за селекция",
-    "embeddable": "",
+    "embeddable": "Натисни-премести, за да създадеш вметка за уебсайт",
     "text_selected": "",
     "text_editing": "",
-    "linearElementMulti": "Кликнете върху последната точка или натиснете Escape или Enter, за да завършите",
-    "lockAngle": "Можете да ограничите ъгъла, като задържите SHIFT",
-    "resize": "Може да ограничите при преоразмеряване като задържите SHIFT,\nзадръжте ALT за преоразмерите през центъра",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
     "resizeImage": "",
-    "rotate": "Можете да ограничите ъглите, като държите SHIFT, докато се въртите",
+    "rotate": "",
     "lineEditor_info": "",
-    "lineEditor_pointSelected": "Натиснете Delete за да изтриете точка(и), CtrlOrCmd+D за дуплициране, или извлачете за да преместите",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
-    "publishLibrary": "",
-    "bindTextToElement": "Натиснете Enter, за да добавите",
+    "publishLibrary": "Публикувайте собствена библиотека",
+    "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Невъзможност за показване на preview",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Бяхме много предпазливи да не включите информацията за вашата сцена при грешката. Ако сцената ви не е частна, моля, помислете за последващи действия на нашата <button>тракер за грешки.</button> Моля, включете информация по-долу, като я копирате и добавите в GitHub.",
     "sceneContent": "Съдържание на сцената:"
   },
+  "shareDialog": {
+    "or": "Или"
+  },
   "roomDialog": {
-    "desc_intro": "Можете да поканите хора на текущата си сцена да си сътрудничат с вас.",
-    "desc_privacy": "Не се притеснявайте, сесията използва криптиране от край до край, така че каквото нарисувате ще остане частно. Дори нашият сървър няма да може да види какво предлагате.",
+    "desc_intro": "Поканете хора да работят съвместно на рисунката.",
+    "desc_privacy": "",
     "button_startSession": "Стартирайте сесията",
     "button_stopSession": "Стоп на сесията",
     "desc_inProgressIntro": "Сесията за сътрудничество на живо е в ход.",
@@ -313,10 +395,10 @@
     "title": "Грешка"
   },
   "exportDialog": {
-    "disk_title": "",
+    "disk_title": "Запази към диск",
     "disk_details": "",
-    "disk_button": "",
-    "link_title": "",
+    "disk_button": "Запази като файл",
+    "link_title": "Връзка за споделяне",
     "link_details": "",
     "link_button": "",
     "excalidrawplus_description": "",
@@ -328,6 +410,8 @@
     "click": "клик",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Извита стрелка",
     "curvedLine": "Извита линия",
     "documentation": "Документация",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Приближи селекцията",
     "toggleElementLock": "Заключи/Отключи селекция",
     "movePageUpDown": "Премести страница нагоре/надолу",
-    "movePageLeftRight": "Премести страница наляво/надясно"
+    "movePageLeftRight": "Премести страница наляво/надясно",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Изчисти платното"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Ъгъл",
-    "element": "Елемент",
-    "elements": "Елементи",
+    "shapes": "",
     "height": "Височина",
     "scene": "Сцена",
     "selected": "Селектирано",
     "storage": "Съхранение на данни",
-    "title": "Статистика за хакери",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Общо",
     "version": "Версия",
     "versionCopy": "Настисни за да копираш",
@@ -439,13 +527,15 @@
     "copyStyles": "Копирани стилове.",
     "copyToClipboard": "Копирано в клипборда.",
     "copyToClipboardAsPng": "Копира {{exportSelection}} в клипборда като PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Файлът е запазен.",
     "fileSavedToFilename": "Запазен към {filename}",
     "canvas": "платно",
     "selection": "селекция",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Прозрачен",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Най-често използвани цветове",
     "colors": "Цветове",
     "shades": "Нюанси",
@@ -517,9 +608,57 @@
   },
   "mermaid": {
     "title": "",
-    "button": "",
+    "button": "Вмъкни",
     "description": "",
-    "syntax": "",
-    "preview": ""
+    "syntax": "Mermaid Синтаксис",
+    "preview": "Преглед"
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "Натиснете потребител, за да го следвате",
+      "followStatus": "В момента следвате този потребител",
+      "inCall": "",
+      "micMuted": "Микрофона на потребителят е заглушен",
+      "isSpeaking": "Потребителят говори"
+    }
+  },
+  "commandPalette": {
+    "title": "Палитра команди",
+    "shortcuts": {
+      "select": "Избери",
+      "confirm": "Потвърди",
+      "close": "Затвори"
+    },
+    "recents": "Наскоро използвани",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/bn-BD.json b/packages/excalidraw/locales/bn-BD.json
index 9bb910e80a..9487df9310 100644
--- a/packages/excalidraw/locales/bn-BD.json
+++ b/packages/excalidraw/locales/bn-BD.json
@@ -11,8 +11,8 @@
     "copyAsPng": "পীএনজী ছবির মতন কপি করুন",
     "copyAsSvg": "এসভীজী ছবির মতন কপি করুন",
     "copyText": "লিখিত তথ্যের মতন কপি করুন",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "পিএনজি ছবি ক্লিপবোর্ডে কপি করুন",
+    "convertToCode": "কোডে রূপান্তর করুন",
     "bringForward": "অধিকতর সামনে আনুন",
     "sendToBack": "অধিকতর পিছনে নিয়ে যান",
     "bringToFront": "সবার সামনে আনুন",
@@ -21,7 +21,9 @@
     "copyStyles": "ডিজাইন কপি করুন",
     "pasteStyles": "ডিজাইন পেস্ট করুন",
     "stroke": "রেখাংশ",
+    "changeStroke": "Hi",
     "background": "পটভূমি",
+    "changeBackground": "পটভূমির রঙ পরিবর্তন করুন",
     "fill": "রং",
     "strokeWidth": "রেখাংশের বেধ",
     "strokeStyle": "রেখাংশের ডিজাইন",
@@ -38,12 +40,20 @@
     "arrowhead_none": "কিছু না",
     "arrowhead_arrow": "তীর",
     "arrowhead_bar": "রেখাংশ",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "বৃত্ত",
+    "arrowhead_circle_outline": "বৃত্তীয় (প্রান্তরেখা) প্রান্তরেখা",
     "arrowhead_triangle": "ত্রিভূজ",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "ত্রিভুজ (প্রান্তরেখা) প্রান্তরেখা",
+    "arrowhead_diamond": "হীরক",
+    "arrowhead_diamond_outline": "হীরক (প্রান্তরেখা)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "লেখনীর মাত্রা",
     "fontFamily": "লেখনীর হরফ",
     "addWatermark": "এক্সক্যালিড্র দ্বারা প্রস্তুত",
@@ -72,6 +82,7 @@
     "canvasColors": "ক্যানভাসের রং",
     "canvasBackground": "ক্যানভাসের পটভূমি",
     "drawingCanvas": "ব্যবহৃত ক্যানভাস",
+    "clearCanvas": "পরিষ্কার ক্যানভাস",
     "layers": "মাত্রা",
     "actions": "ক্রিয়া",
     "language": "ভাষা",
@@ -84,12 +95,13 @@
     "group": "দল গঠন করুন",
     "ungroup": "দল বিভেদ করুন",
     "collaborators": "সহযোগী",
-    "showGrid": "গ্রিড দেখান",
+    "toggleGrid": "",
     "addToLibrary": "সংগ্রহে যোগ করুন",
     "removeFromLibrary": "সংগ্রহ থেকে বের করুন",
     "libraryLoadingMessage": "সংগ্রহ তৈরি হচ্ছে",
     "libraries": "সংগ্রহ দেখুন",
     "loadingScene": "দৃশ্য তৈরি হচ্ছে",
+    "loadScene": "",
     "align": "পংক্তিবিন্যাস",
     "alignTop": "উপর পংক্তি",
     "alignBottom": "নিম্ন পংক্তি",
@@ -104,27 +116,34 @@
     "viewMode": "দৃশ্য",
     "share": "ভাগ করুন",
     "showStroke": "",
-    "showBackground": "",
+    "showBackground": "পটভূমির রঙ নির্বাচনকারী অপশন দেখান",
+    "showFonts": "",
     "toggleTheme": "",
-    "personalLib": "",
-    "excalidrawLib": "",
+    "theme": "",
+    "personalLib": "ব্যক্তিগত লাইব্রেরি",
+    "excalidrawLib": "এক্সক্যালিড্র লাইব্রেরি",
     "decreaseFontSize": "লেখনীর মাত্রা কমান",
     "increaseFontSize": "লেখনীর মাত্রা বাড়ান",
-    "unbindText": "",
-    "bindText": "",
+    "unbindText": "লেখার জোড় খুলুন",
+    "bindText": "কন্টেইনারের সাথে লেখা জোড়া লাগান",
     "createContainerFromText": "",
     "link": {
       "edit": "লিঙ্ক সংশোধন",
       "editEmbed": "",
-      "create": "লিঙ্ক তৈরী",
-      "createEmbed": "",
+      "create": "",
       "label": "লিঙ্ক নামকরণ",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "লিংক ও এম্বেড",
+      "empty": "কোন লিংক সেট করা নেই",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
-      "edit": "",
-      "exit": ""
+      "edit": "লাইন সম্পাদনা করুন",
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "আবদ্ধ করুন",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "প্রকাশিত",
     "sidebarLock": "লক",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "selectAllElementsInFrame": "ফ্রেমের ভিতরের সব উপকরণ বাছাই করুন",
+    "removeAllElementsFromFrame": "ফ্রেম থেকে সব উপকরণ মুছুন",
+    "eyeDropper": "ক্যানভাস থেকে রঙ বাছাই করুন",
+    "textToDiagram": "লেখা থেকে ডায়াগ্রাম",
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "সংগ্রহে কিছু যোগ করা হয়নি",
     "hint_emptyLibrary": "এখানে যোগ করার জন্য ক্যানভাসে একটি বস্তু নির্বাচন করুন, অথবা নীচে, প্রকাশ্য সংগ্রহশালা থেকে একটি সংগ্রহ ইনস্টল করুন৷",
-    "hint_emptyPrivateLibrary": "এখানে যোগ করার জন্য ক্যানভাসে একটি বস্তু নির্বাচন করুন"
+    "hint_emptyPrivateLibrary": "এখানে যোগ করার জন্য ক্যানভাসে একটি বস্তু নির্বাচন করুন",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "ক্যানভাস সাফ করুন",
@@ -151,6 +204,7 @@
     "exportImage": "",
     "export": "",
     "copyToClipboard": "ক্লিপবোর্ডে কপি করুন",
+    "copyLink": "",
     "save": "জমা করুন",
     "saveAs": "অন্যভাবে জমা করুন",
     "load": "",
@@ -171,14 +225,16 @@
     "fullScreen": "পূর্ণস্ক্রীন",
     "darkMode": "ডার্ক মোড",
     "lightMode": "লাইট মোড",
+    "systemMode": "",
     "zenMode": "জেন মোড",
     "objectsSnapMode": "",
     "exitZenMode": "জেন মোড বন্ধ করুন",
     "cancel": "বাতিল",
+    "saveLibNames": "",
     "clear": "সাফ",
     "remove": "বিয়োগ",
     "embed": "",
-    "publishLibrary": "সংগ্রহ প্রকাশ করুন",
+    "publishLibrary": "",
     "submit": "জমা করুন",
     "confirm": "নিশ্চিত করুন",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "এটি আপনার সংগ্রহ পরিষ্কার করবে। আপনি কি নিশ্চিত?",
     "removeItemsFromsLibrary": "সংগ্রহ থেকে {{count}} বস্তু বিয়োগ করা হবে। আপনি কি নিশ্চিত?",
     "invalidEncryptionKey": "অবৈধ এনক্রীপশন কী।",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "অসমর্থিত ফাইল।",
@@ -212,9 +269,9 @@
     "fileTooBig": "ফাইলটি খুব বড়। সর্বাধিক অনুমোদিত আকার হল {{maxSize}}৷",
     "svgImageInsertError": "এসভীজী ছবি সন্নিবেশ করা যায়নি। এসভীজী মার্কআপটি অবৈধ মনে হচ্ছে৷",
     "failedToFetchImage": "",
-    "invalidSVGString": "এসভীজী মার্কআপটি অবৈধ মনে হচ্ছে৷",
     "cannotResolveCollabServer": "কোল্যাব সার্ভারের সাথে সংযোগ করা যায়নি। পৃষ্ঠাটি পুনরায় লোড করে আবার চেষ্টা করুন।",
     "importLibraryError": "সংগ্রহ লোড করা যায়নি",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "বাছাই",
+    "lasso": "",
     "image": "চিত্র সন্নিবেশ",
     "rectangle": "আয়তক্ষেত্র",
     "diamond": "রুহিতন",
@@ -246,7 +304,7 @@
     "library": "সংগ্রহ",
     "lock": "আঁকার পরে নির্বাচিত টুল সক্রিয় রাখুন",
     "penMode": "",
-    "link": "একটি নির্বাচিত আকৃতির জন্য লিঙ্ক যোগ বা আপডেট করুন",
+    "link": "",
     "eraser": "ঝাড়ন",
     "frame": "",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "ক্যানভাস কার্যকলাপ",
@@ -263,28 +337,33 @@
     "shapes": "আকার(গুলি)"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "একাধিক বিন্দু শুরু করতে ক্লিক করুন, একক লাইনের জন্য টেনে আনুন",
+    "arrowTool": "",
     "freeDraw": "ক্লিক করুন এবং টেনে আনুন, আপনার কাজ শেষ হলে ছেড়ে দিন",
     "text": "বিশেষ্য: আপনি নির্বাচন টুলের সাথে যে কোনো জায়গায় ডাবল-ক্লিক করে পাঠ্য যোগ করতে পারেন",
     "embeddable": "",
-    "text_selected": "লেখা সম্পাদনা করতে ডাবল-ক্লিক করুন বা এন্টার টিপুন",
-    "text_editing": "লেখা সম্পাদনা শেষ করতে এসকেপ বা কন্ট্রোল/কম্যান্ড যোগে এন্টার টিপুন",
-    "linearElementMulti": "শেষ বিন্দুতে ক্লিক করুন অথবা শেষ করতে এসকেপ বা এন্টার টিপুন",
-    "lockAngle": "ঘোরানোর সময় আপনি শিফ্ট ধরে রেখে কোণ সীমাবদ্ধ করতে পারেন",
-    "resize": "আপনি আকার পরিবর্তন করার সময় শিফ্ট ধরে রেখে অনুপাতকে সীমাবদ্ধ করতে পারেন,\nকেন্দ্র থেকে আকার পরিবর্তন করতে অল্ট ধরে রাখুন",
-    "resizeImage": "আপনি শিফ্ট ধরে রেখে অবাধে আকার পরিবর্তন করতে পারেন, কেন্দ্র থেকে আকার পরিবর্তন করতে অল্ট ধরুন",
-    "rotate": "আপনি ঘোরানোর সময় শিফ্ট ধরে রেখে কোণগুলিকে সীমাবদ্ধ করতে পারেন",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
     "lineEditor_info": "",
-    "lineEditor_pointSelected": "বিন্দু(গুলি) মুছতে ডিলিট টিপুন, কন্ট্রোল/কম্যান্ড যোগে ডি টিপুন নকল করতে অথবা সরানোর জন্য টানুন",
-    "lineEditor_nothingSelected": "সম্পাদনা করার জন্য একটি বিন্দু নির্বাচন করুন (একাধিক নির্বাচন করতে শিফ্ট ধরে রাখুন),\nঅথবা অল্ট ধরে রাখুন এবং নতুন বিন্দু যোগ করতে ক্লিক করুন",
-    "placeImage": "ছবিটি স্থাপন করতে ক্লিক করুন, অথবা নিজে আকার সেট করতে ক্লিক করুন এবং টেনে আনুন",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "আপনার নিজস্ব সংগ্রহ প্রকাশ করুন",
-    "bindTextToElement": "লেখা যোগ করতে এন্টার টিপুন",
+    "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
-    "eraserRevert": "মুছে ফেলার জন্য চিহ্নিত উপাদানগুলিকে ফিরিয়ে আনতে অল্ট ধরে রাখুন",
+    "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "প্রিভিউ দেখাতে অপারগ",
@@ -299,9 +378,12 @@
     "openIssueMessage": "আমরা ত্রুটিতে আপনার দৃশ্যের তথ্য অন্তর্ভুক্ত না করার জন্য খুব সতর্ক ছিলাম। আপনার দৃশ্য ব্যক্তিগত না হলে, আমাদের অনুসরণ করার কথা বিবেচনা করুন <button>ত্রুটি ইতিবৃত্ত।</button> অনুগ্রহ করে GitHub ইস্যুতে অনুলিপি এবং পেস্ট করে নীচের তথ্য অন্তর্ভুক্ত করুন।",
     "sceneContent": "দৃশ্য বিষয়বস্তু:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "আপনি আপনার সাথে সহযোগিতা করার জন্য আপনার বর্তমান দৃশ্যে লোকেদের আমন্ত্রণ জানাতে পারেন৷",
-    "desc_privacy": "চিন্তা করবেন না, সেশনটি এন্ড-টু-এন্ড এনক্রিপশন ব্যবহার করে, তাই আপনি যা আঁকবেন তা গোপন থাকবে। এমনকি আমাদের সার্ভার আপনি যা নিয়ে এসেছেন তা দেখতে সক্ষম হবে না।",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "সেশন শুরু করুন",
     "button_stopSession": "সেশন বন্ধ করুন",
     "desc_inProgressIntro": "লাইভ-সহযোগীতার সেশন এখন চলছে।",
@@ -328,6 +410,8 @@
     "click": "ক্লিক",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "",
     "curvedLine": "",
     "documentation": "",
@@ -350,7 +434,9 @@
     "zoomToSelection": "",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "কোণ",
-    "element": "",
-    "elements": "",
+    "shapes": "",
     "height": "",
     "scene": "",
     "selected": "",
     "storage": "",
+    "fullTitle": "",
     "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "",
     "version": "",
     "versionCopy": "",
@@ -439,13 +527,15 @@
     "copyStyles": "",
     "copyToClipboard": "ক্লিপবোর্ডে কপি করা হয়েছে।",
     "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "",
     "fileSavedToFilename": "",
     "canvas": "",
     "selection": "বাছাই",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/bn-IN.json b/packages/excalidraw/locales/bn-IN.json
new file mode 100644
index 0000000000..9487df9310
--- /dev/null
+++ b/packages/excalidraw/locales/bn-IN.json
@@ -0,0 +1,664 @@
+{
+  "labels": {
+    "paste": "পেস্ট করুন",
+    "pasteAsPlaintext": "প্লেইনটেক্সট হিসাবে পেস্ট করুন",
+    "pasteCharts": "চার্ট পেস্ট করুন",
+    "selectAll": "সবটা সিলেক্ট করুন",
+    "multiSelect": "একাধিক সিলেক্ট করুন",
+    "moveCanvas": "ক্যানভাস সরান",
+    "cut": "কাট করুন",
+    "copy": "কপি করুন",
+    "copyAsPng": "পীএনজী ছবির মতন কপি করুন",
+    "copyAsSvg": "এসভীজী ছবির মতন কপি করুন",
+    "copyText": "লিখিত তথ্যের মতন কপি করুন",
+    "copySource": "পিএনজি ছবি ক্লিপবোর্ডে কপি করুন",
+    "convertToCode": "কোডে রূপান্তর করুন",
+    "bringForward": "অধিকতর সামনে আনুন",
+    "sendToBack": "অধিকতর পিছনে নিয়ে যান",
+    "bringToFront": "সবার সামনে আনুন",
+    "sendBackward": "সবার পিছনে নিয়ে যান",
+    "delete": "মুছা",
+    "copyStyles": "ডিজাইন কপি করুন",
+    "pasteStyles": "ডিজাইন পেস্ট করুন",
+    "stroke": "রেখাংশ",
+    "changeStroke": "Hi",
+    "background": "পটভূমি",
+    "changeBackground": "পটভূমির রঙ পরিবর্তন করুন",
+    "fill": "রং",
+    "strokeWidth": "রেখাংশের বেধ",
+    "strokeStyle": "রেখাংশের ডিজাইন",
+    "strokeStyle_solid": "পুরু",
+    "strokeStyle_dashed": "পাতলা",
+    "strokeStyle_dotted": "বিন্দুবিন্দু",
+    "sloppiness": "ভ্রান্তি",
+    "opacity": "দৃশ্যমানতা",
+    "textAlign": "লেখ অনুভূমি",
+    "edges": "কোণ",
+    "sharp": "তীক্ষ্ণ",
+    "round": "গোল",
+    "arrowheads": "তীরের শীর্ষভাগ",
+    "arrowhead_none": "কিছু না",
+    "arrowhead_arrow": "তীর",
+    "arrowhead_bar": "রেখাংশ",
+    "arrowhead_circle": "বৃত্ত",
+    "arrowhead_circle_outline": "বৃত্তীয় (প্রান্তরেখা) প্রান্তরেখা",
+    "arrowhead_triangle": "ত্রিভূজ",
+    "arrowhead_triangle_outline": "ত্রিভুজ (প্রান্তরেখা) প্রান্তরেখা",
+    "arrowhead_diamond": "হীরক",
+    "arrowhead_diamond_outline": "হীরক (প্রান্তরেখা)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
+    "fontSize": "লেখনীর মাত্রা",
+    "fontFamily": "লেখনীর হরফ",
+    "addWatermark": "এক্সক্যালিড্র দ্বারা প্রস্তুত",
+    "handDrawn": "হাতে আঁকা",
+    "normal": "স্বাভাবিক",
+    "code": "কোড",
+    "small": "ছোট",
+    "medium": "মাঝারি",
+    "large": "বড়",
+    "veryLarge": "অনেক বড়",
+    "solid": "দৃঢ়",
+    "hachure": "ভ্রুলেখা",
+    "zigzag": "আঁকাবাঁকা",
+    "crossHatch": "ক্রস হ্যাচ",
+    "thin": "পাতলা",
+    "bold": "পুরু",
+    "left": "বাম",
+    "center": "কেন্দ্র",
+    "right": "ডান",
+    "extraBold": "অতি পুরু",
+    "architect": "স্থপতি",
+    "artist": "শিল্পী",
+    "cartoonist": "চিত্রকার",
+    "fileTitle": "ফাইলের নাম",
+    "colorPicker": "রং পছন্দ করুন",
+    "canvasColors": "ক্যানভাসের রং",
+    "canvasBackground": "ক্যানভাসের পটভূমি",
+    "drawingCanvas": "ব্যবহৃত ক্যানভাস",
+    "clearCanvas": "পরিষ্কার ক্যানভাস",
+    "layers": "মাত্রা",
+    "actions": "ক্রিয়া",
+    "language": "ভাষা",
+    "liveCollaboration": "সরাসরি পারস্পরিক সহযোগিতা...",
+    "duplicateSelection": "সদৃশ সিলেক্ট",
+    "untitled": "অনামী",
+    "name": "নাম",
+    "yourName": "আপনার নাম",
+    "madeWithExcalidraw": "এক্সক্যালিড্র দ্বারা তৈরি",
+    "group": "দল গঠন করুন",
+    "ungroup": "দল বিভেদ করুন",
+    "collaborators": "সহযোগী",
+    "toggleGrid": "",
+    "addToLibrary": "সংগ্রহে যোগ করুন",
+    "removeFromLibrary": "সংগ্রহ থেকে বের করুন",
+    "libraryLoadingMessage": "সংগ্রহ তৈরি হচ্ছে",
+    "libraries": "সংগ্রহ দেখুন",
+    "loadingScene": "দৃশ্য তৈরি হচ্ছে",
+    "loadScene": "",
+    "align": "পংক্তিবিন্যাস",
+    "alignTop": "উপর পংক্তি",
+    "alignBottom": "নিম্ন পংক্তি",
+    "alignLeft": "বাম পংক্তি",
+    "alignRight": "ডান পংক্তি",
+    "centerVertically": "উলম্ব কেন্দ্রিত",
+    "centerHorizontally": "অনুভূমিক কেন্দ্রিত",
+    "distributeHorizontally": "অনুভূমিকভাবে বিতরণ করুন",
+    "distributeVertically": "উল্লম্বভাবে বিতরণ করুন",
+    "flipHorizontal": "অনুভূমিক আবর্তন",
+    "flipVertical": "উলম্ব আবর্তন",
+    "viewMode": "দৃশ্য",
+    "share": "ভাগ করুন",
+    "showStroke": "",
+    "showBackground": "পটভূমির রঙ নির্বাচনকারী অপশন দেখান",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
+    "personalLib": "ব্যক্তিগত লাইব্রেরি",
+    "excalidrawLib": "এক্সক্যালিড্র লাইব্রেরি",
+    "decreaseFontSize": "লেখনীর মাত্রা কমান",
+    "increaseFontSize": "লেখনীর মাত্রা বাড়ান",
+    "unbindText": "লেখার জোড় খুলুন",
+    "bindText": "কন্টেইনারের সাথে লেখা জোড়া লাগান",
+    "createContainerFromText": "",
+    "link": {
+      "edit": "লিঙ্ক সংশোধন",
+      "editEmbed": "",
+      "create": "",
+      "label": "লিঙ্ক নামকরণ",
+      "labelEmbed": "লিংক ও এম্বেড",
+      "empty": "কোন লিংক সেট করা নেই",
+      "hint": "",
+      "goToElement": ""
+    },
+    "lineEditor": {
+      "edit": "লাইন সম্পাদনা করুন",
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
+    },
+    "elementLock": {
+      "lock": "আবদ্ধ করুন",
+      "unlock": "বিচ্ছিন্ন করুন",
+      "lockAll": "সব আবদ্ধ করুন",
+      "unlockAll": "সব বিচ্ছিন্ন করুন"
+    },
+    "statusPublished": "প্রকাশিত",
+    "sidebarLock": "লক",
+    "selectAllElementsInFrame": "ফ্রেমের ভিতরের সব উপকরণ বাছাই করুন",
+    "removeAllElementsFromFrame": "ফ্রেম থেকে সব উপকরণ মুছুন",
+    "eyeDropper": "ক্যানভাস থেকে রঙ বাছাই করুন",
+    "textToDiagram": "লেখা থেকে ডায়াগ্রাম",
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
+  },
+  "library": {
+    "noItems": "সংগ্রহে কিছু যোগ করা হয়নি",
+    "hint_emptyLibrary": "এখানে যোগ করার জন্য ক্যানভাসে একটি বস্তু নির্বাচন করুন, অথবা নীচে, প্রকাশ্য সংগ্রহশালা থেকে একটি সংগ্রহ ইনস্টল করুন৷",
+    "hint_emptyPrivateLibrary": "এখানে যোগ করার জন্য ক্যানভাসে একটি বস্তু নির্বাচন করুন",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
+  },
+  "buttons": {
+    "clearReset": "ক্যানভাস সাফ করুন",
+    "exportJSON": "জেসন নিবদ্ধ করুন",
+    "exportImage": "",
+    "export": "",
+    "copyToClipboard": "ক্লিপবোর্ডে কপি করুন",
+    "copyLink": "",
+    "save": "জমা করুন",
+    "saveAs": "অন্যভাবে জমা করুন",
+    "load": "",
+    "getShareableLink": "ভাগযোগ্য লিঙ্ক পান",
+    "close": "বন্ধ করুন",
+    "selectLanguage": "ভাষা চিহ্নিত করুন",
+    "scrollBackToContent": "বিষয়বস্তুতে ফেরত যান",
+    "zoomIn": "বড় করুন",
+    "zoomOut": "ছোট করুন",
+    "resetZoom": "স্বাভাবিক করুন",
+    "menu": "তালিকা",
+    "done": "সম্পন্ন",
+    "edit": "সংশোধন করুন",
+    "undo": "ফেরত যান",
+    "redo": "পুনরায় করুন",
+    "resetLibrary": "সংগ্রহ সাফ করুন",
+    "createNewRoom": "নতুন রুম বানান",
+    "fullScreen": "পূর্ণস্ক্রীন",
+    "darkMode": "ডার্ক মোড",
+    "lightMode": "লাইট মোড",
+    "systemMode": "",
+    "zenMode": "জেন মোড",
+    "objectsSnapMode": "",
+    "exitZenMode": "জেন মোড বন্ধ করুন",
+    "cancel": "বাতিল",
+    "saveLibNames": "",
+    "clear": "সাফ",
+    "remove": "বিয়োগ",
+    "embed": "",
+    "publishLibrary": "",
+    "submit": "জমা করুন",
+    "confirm": "নিশ্চিত করুন",
+    "embeddableInteractionButton": ""
+  },
+  "alerts": {
+    "clearReset": "এটি পুরো ক্যানভাস সাফ করবে। আপনি কি নিশ্চিত?",
+    "couldNotCreateShareableLink": "ভাগ করা যায় এমন লিঙ্ক তৈরি করা যায়নি।",
+    "couldNotCreateShareableLinkTooBig": "ভাগ করা যায় এমন লিঙ্ক তৈরি করা যায়নি: দৃশ্যটি খুব বড়",
+    "couldNotLoadInvalidFile": "অবৈধ ফাইল লোড করা যায়নি",
+    "importBackendFailed": "ব্যাকেন্ড থেকে আপলোড ব্যর্থ হয়েছে।",
+    "cannotExportEmptyCanvas": "খালি ক্যানভাস নিবদ্ধ করা যাবে না।",
+    "couldNotCopyToClipboard": "ক্লিপবোর্ডে কপি করা যায়নি।",
+    "decryptFailed": "তথ্য ডিক্রিপ্ট করা যায়নি।",
+    "uploadedSecurly": "আপলোডটি এন্ড-টু-এন্ড এনক্রিপশনের মাধ্যমে সুরক্ষিত করা হয়েছে, যার অর্থ হল এক্সক্যালিড্র সার্ভার এবং তৃতীয় পক্ষের দ্বারা পড়তে পারা সম্ভব নয়।",
+    "loadSceneOverridePrompt": "বাহ্যিক অঙ্কন লোড করা আপনার বিদ্যমান দৃশ্য প্রতিস্থাপন করবে। আপনি কি অবিরত করতে চান?",
+    "collabStopOverridePrompt": "অধিবেশন বন্ধ করা আপনার পূর্ববর্তী, স্থানীয়ভাবে সঞ্চিত অঙ্কন ওভাররাইট করবে। আপনি কি নিশ্চিত?\n\n(যদি আপনি আপনার স্থানীয় অঙ্কন রাখতে চান, তাহলে শুধু ব্রাউজার ট্যাবটি বন্ধ করুন।)",
+    "errorAddingToLibrary": "বস্তুটি সংগ্রহে যোগ করা যায়নি",
+    "errorRemovingFromLibrary": "বস্তুটি সংগ্রহ থেকে বিয়োগ করা যায়নি",
+    "confirmAddLibrary": "এটি আপনার সংগ্রহে {{numShapes}} আকার(গুলি) যোগ করবে। আপনি কি নিশ্চিত?",
+    "imageDoesNotContainScene": "এই ছবিতে কোনো দৃশ্যের তথ্য আছে বলে মনে হয় না৷ আপনি কি নিবদ্ধ করার সময় দৃশ্য এমবেডিং করতে সক্ষম?",
+    "cannotRestoreFromImage": "এই ফাইল থেকে দৃশ্য পুনরুদ্ধার করা যায়নি",
+    "invalidSceneUrl": "সরবরাহ করা লিঙ্ক থেকে দৃশ্য লোড করা যায়নি৷ এটি হয় বিকৃত, অথবা বৈধ এক্সক্যালিড্র জেসন তথ্য নেই৷",
+    "resetLibrary": "এটি আপনার সংগ্রহ পরিষ্কার করবে। আপনি কি নিশ্চিত?",
+    "removeItemsFromsLibrary": "সংগ্রহ থেকে {{count}} বস্তু বিয়োগ করা হবে। আপনি কি নিশ্চিত?",
+    "invalidEncryptionKey": "অবৈধ এনক্রীপশন কী।",
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
+  },
+  "errors": {
+    "unsupportedFileType": "অসমর্থিত ফাইল।",
+    "imageInsertError": "ছবি সন্নিবেশ করা যায়নি। পরে আবার চেষ্টা করুন...",
+    "fileTooBig": "ফাইলটি খুব বড়। সর্বাধিক অনুমোদিত আকার হল {{maxSize}}৷",
+    "svgImageInsertError": "এসভীজী ছবি সন্নিবেশ করা যায়নি। এসভীজী মার্কআপটি অবৈধ মনে হচ্ছে৷",
+    "failedToFetchImage": "",
+    "cannotResolveCollabServer": "কোল্যাব সার্ভারের সাথে সংযোগ করা যায়নি। পৃষ্ঠাটি পুনরায় লোড করে আবার চেষ্টা করুন।",
+    "importLibraryError": "সংগ্রহ লোড করা যায়নি",
+    "saveLibraryError": "",
+    "collabSaveFailed": "",
+    "collabSaveFailed_sizeExceeded": "",
+    "imageToolNotSupported": "",
+    "brave_measure_text_error": {
+      "line1": "",
+      "line2": "",
+      "line3": "",
+      "line4": ""
+    },
+    "libraryElementTypeError": {
+      "embeddable": "",
+      "iframe": "",
+      "image": ""
+    },
+    "asyncPasteFailedOnRead": "",
+    "asyncPasteFailedOnParse": "",
+    "copyToSystemClipboardFailed": ""
+  },
+  "toolBar": {
+    "selection": "বাছাই",
+    "lasso": "",
+    "image": "চিত্র সন্নিবেশ",
+    "rectangle": "আয়তক্ষেত্র",
+    "diamond": "রুহিতন",
+    "ellipse": "উপবৃত্ত",
+    "arrow": "তীর",
+    "line": "রেখা",
+    "freedraw": "কলম",
+    "text": "লেখা",
+    "library": "সংগ্রহ",
+    "lock": "আঁকার পরে নির্বাচিত টুল সক্রিয় রাখুন",
+    "penMode": "",
+    "link": "",
+    "eraser": "ঝাড়ন",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "laser": "",
+    "hand": "",
+    "extraTools": "",
+    "mermaidToExcalidraw": "",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
+  },
+  "headings": {
+    "canvasActions": "ক্যানভাস কার্যকলাপ",
+    "selectedShapeActions": "বাছাই করা আকার(গুলি)র কার্যকলাপ",
+    "shapes": "আকার(গুলি)"
+  },
+  "hints": {
+    "dismissSearch": "",
+    "canvasPanning": "",
+    "linearElement": "একাধিক বিন্দু শুরু করতে ক্লিক করুন, একক লাইনের জন্য টেনে আনুন",
+    "arrowTool": "",
+    "freeDraw": "ক্লিক করুন এবং টেনে আনুন, আপনার কাজ শেষ হলে ছেড়ে দিন",
+    "text": "বিশেষ্য: আপনি নির্বাচন টুলের সাথে যে কোনো জায়গায় ডাবল-ক্লিক করে পাঠ্য যোগ করতে পারেন",
+    "embeddable": "",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
+    "publishLibrary": "আপনার নিজস্ব সংগ্রহ প্রকাশ করুন",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
+    "firefox_clipboard_write": "",
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
+  },
+  "canvasError": {
+    "cannotShowPreview": "প্রিভিউ দেখাতে অপারগ",
+    "canvasTooBig": "ক্যানভাস অনেক বড়।",
+    "canvasTooBigTip": "বিশেষ্য: দূরতম উপাদানগুলোকে একটু কাছাকাছি নিয়ে যাওয়ার চেষ্টা করুন।"
+  },
+  "errorSplash": {
+    "headingMain": "একটি ত্রুটির সম্মুখীন হয়েছে৷ চেষ্টা করুন <button>পৃষ্ঠাটি পুনরায় লোড করার।</button>",
+    "clearCanvasMessage": "যদি পুনরায় লোড করা কাজ না করে, চেষ্টা করুন <button>ক্যানভাস পরিষ্কার করার।</button>",
+    "clearCanvasCaveat": " এর ফলে কাজের ক্ষতি হবে ",
+    "trackedToSentry": "ত্রুটি {{eventId}} আমাদের সিস্টেমে ট্র্যাক করা হয়েছিল।",
+    "openIssueMessage": "আমরা ত্রুটিতে আপনার দৃশ্যের তথ্য অন্তর্ভুক্ত না করার জন্য খুব সতর্ক ছিলাম। আপনার দৃশ্য ব্যক্তিগত না হলে, আমাদের অনুসরণ করার কথা বিবেচনা করুন <button>ত্রুটি ইতিবৃত্ত।</button> অনুগ্রহ করে GitHub ইস্যুতে অনুলিপি এবং পেস্ট করে নীচের তথ্য অন্তর্ভুক্ত করুন।",
+    "sceneContent": "দৃশ্য বিষয়বস্তু:"
+  },
+  "shareDialog": {
+    "or": ""
+  },
+  "roomDialog": {
+    "desc_intro": "",
+    "desc_privacy": "",
+    "button_startSession": "সেশন শুরু করুন",
+    "button_stopSession": "সেশন বন্ধ করুন",
+    "desc_inProgressIntro": "লাইভ-সহযোগীতার সেশন এখন চলছে।",
+    "desc_shareLink": "আপনি যার সাথে সহযোগিতা করতে চান তাদের সাথে এই লিঙ্কটি ভাগ করুন: ",
+    "desc_exitSession": "অধিবেশন বন্ধ করা আপনাকে রুম থেকে সংযোগ বিচ্ছিন্ন করবে, কিন্তু আপনি স্থানীয়ভাবে দৃশ্যের সাথে কাজ চালিয়ে যেতে সক্ষম হবেন। মনে রাখবেন যে এটি অন্য লোকেদের প্রভাবিত করবে না এবং তারা এখনও তাদের সংস্করণে সহযোগিতা করতে সক্ষম হবে।",
+    "shareTitle": "এক্সক্যালিড্র লাইভ সহযোগিতা সেশনে যোগ দিন"
+  },
+  "errorDialog": {
+    "title": "ত্রুটি"
+  },
+  "exportDialog": {
+    "disk_title": "",
+    "disk_details": "",
+    "disk_button": "",
+    "link_title": "",
+    "link_details": "",
+    "link_button": "",
+    "excalidrawplus_description": "",
+    "excalidrawplus_button": "নিবদ্ধ",
+    "excalidrawplus_exportError": ""
+  },
+  "helpDialog": {
+    "blog": "",
+    "click": "ক্লিক",
+    "deepSelect": "",
+    "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
+    "curvedArrow": "",
+    "curvedLine": "",
+    "documentation": "",
+    "doubleClick": "",
+    "drag": "",
+    "editor": "",
+    "editLineArrowPoints": "",
+    "editText": "",
+    "github": "",
+    "howto": "",
+    "or": "অথবা",
+    "preventBinding": "",
+    "tools": "",
+    "shortcuts": "",
+    "textFinish": "",
+    "textNewLine": "",
+    "title": "",
+    "view": "",
+    "zoomToFit": "",
+    "zoomToSelection": "",
+    "toggleElementLock": "",
+    "movePageUpDown": "",
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
+  },
+  "clearCanvasDialog": {
+    "title": ""
+  },
+  "publishDialog": {
+    "title": "",
+    "itemName": "",
+    "authorName": "",
+    "githubUsername": "",
+    "twitterUsername": "",
+    "libraryName": "",
+    "libraryDesc": "",
+    "website": "",
+    "placeholder": {
+      "authorName": "",
+      "libraryName": "",
+      "libraryDesc": "",
+      "githubHandle": "",
+      "twitterHandle": "",
+      "website": ""
+    },
+    "errors": {
+      "required": "",
+      "website": ""
+    },
+    "noteDescription": "",
+    "noteGuidelines": "",
+    "noteLicense": "",
+    "noteItems": "",
+    "atleastOneLibItem": "",
+    "republishWarning": ""
+  },
+  "publishSuccessDialog": {
+    "title": "",
+    "content": ""
+  },
+  "confirmDialog": {
+    "resetLibrary": "",
+    "removeItemsFromLib": ""
+  },
+  "imageExportDialog": {
+    "header": "",
+    "label": {
+      "withBackground": "",
+      "onlySelected": "",
+      "darkMode": "",
+      "embedScene": "",
+      "scale": "",
+      "padding": ""
+    },
+    "tooltip": {
+      "embedScene": ""
+    },
+    "title": {
+      "exportToPng": "",
+      "exportToSvg": "",
+      "copyPngToClipboard": ""
+    },
+    "button": {
+      "exportToPng": "",
+      "exportToSvg": "",
+      "copyPngToClipboard": ""
+    }
+  },
+  "encrypted": {
+    "tooltip": "",
+    "link": ""
+  },
+  "stats": {
+    "angle": "কোণ",
+    "shapes": "",
+    "height": "",
+    "scene": "",
+    "selected": "",
+    "storage": "",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
+    "total": "",
+    "version": "",
+    "versionCopy": "",
+    "versionNotAvailable": "",
+    "width": "প্রস্থ"
+  },
+  "toast": {
+    "addedToLibrary": "সংগ্রহশালায় যুক্ত হয়েছে",
+    "copyStyles": "",
+    "copyToClipboard": "ক্লিপবোর্ডে কপি করা হয়েছে।",
+    "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
+    "fileSaved": "",
+    "fileSavedToFilename": "",
+    "canvas": "",
+    "selection": "বাছাই",
+    "pasteAsSingleElement": "",
+    "unableToEmbed": "",
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
+  },
+  "colors": {
+    "transparent": "",
+    "black": "",
+    "white": "",
+    "red": "",
+    "pink": "",
+    "grape": "",
+    "violet": "",
+    "gray": "",
+    "blue": "",
+    "cyan": "",
+    "teal": "",
+    "green": "",
+    "yellow": "",
+    "orange": "",
+    "bronze": ""
+  },
+  "welcomeScreen": {
+    "app": {
+      "center_heading": "",
+      "center_heading_plus": "",
+      "menuHint": ""
+    },
+    "defaults": {
+      "menuHint": "",
+      "center_heading": "",
+      "toolbarHint": "",
+      "helpHint": ""
+    }
+  },
+  "colorPicker": {
+    "color": "",
+    "mostUsedCustomColors": "",
+    "colors": "",
+    "shades": "",
+    "hexCode": "",
+    "noShades": ""
+  },
+  "overwriteConfirm": {
+    "action": {
+      "exportToImage": {
+        "title": "",
+        "button": "",
+        "description": ""
+      },
+      "saveToDisk": {
+        "title": "",
+        "button": "",
+        "description": ""
+      },
+      "excalidrawPlus": {
+        "title": "",
+        "button": "",
+        "description": ""
+      }
+    },
+    "modal": {
+      "loadFromFile": {
+        "title": "",
+        "button": "",
+        "description": ""
+      },
+      "shareableLink": {
+        "title": "",
+        "button": "",
+        "description": ""
+      }
+    }
+  },
+  "mermaid": {
+    "title": "",
+    "button": "",
+    "description": "",
+    "syntax": "",
+    "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
+  }
+}
diff --git a/packages/excalidraw/locales/ca-ES.json b/packages/excalidraw/locales/ca-ES.json
index 4f601d93a6..105bc8ca2c 100644
--- a/packages/excalidraw/locales/ca-ES.json
+++ b/packages/excalidraw/locales/ca-ES.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Copia al porta-retalls com a PNG",
     "copyAsSvg": "Copia al porta-retalls com a SVG",
     "copyText": "Copia al porta-retalls com a text",
-    "copySource": "Copia l'origen al porta-retalls",
-    "convertToCode": "",
+    "copySource": "Copia al porta-retalls",
+    "convertToCode": "Converteix a codi",
     "bringForward": "Porta endavant",
     "sendToBack": "Envia enrere",
     "bringToFront": "Porta al davant",
@@ -21,7 +21,9 @@
     "copyStyles": "Copia els estils",
     "pasteStyles": "Enganxa els estils",
     "stroke": "Color del traç",
+    "changeStroke": "Canvia el color del traç",
     "background": "Color del fons",
+    "changeBackground": "Canvia el color de fons",
     "fill": "Estil del fons",
     "strokeWidth": "Amplada del traç",
     "strokeStyle": "Estil del traç",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Cap",
     "arrowhead_arrow": "Fletxa",
     "arrowhead_bar": "Barra",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Cercle",
+    "arrowhead_circle_outline": "Circumferència",
     "arrowhead_triangle": "Triangle",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Triangle (vora)",
+    "arrowhead_diamond": "Rombe",
+    "arrowhead_diamond_outline": "Rombe (vora)",
+    "arrowhead_crowfoot_many": "Potes de gall (moltes)",
+    "arrowhead_crowfoot_one": "Potes de gall (una)",
+    "arrowhead_crowfoot_one_or_many": "Potes de gall (una o moltes)",
+    "more_options": "Més opcions",
+    "arrowtypes": "Tipus de fletxa",
+    "arrowtype_sharp": "Fletxa Esmolada",
+    "arrowtype_round": "Fletxa corba",
+    "arrowtype_elbowed": "Fletxa de colzes",
     "fontSize": "Mida de lletra",
     "fontFamily": "Tipus de lletra",
     "addWatermark": "Afegeix-hi «Fet amb Excalidraw»",
@@ -56,7 +66,7 @@
     "veryLarge": "Molt gran",
     "solid": "Sòlid",
     "hachure": "Ratlletes",
-    "zigzag": "",
+    "zigzag": "Ziga-zaga",
     "crossHatch": "Ratlletes creuades",
     "thin": "Fi",
     "bold": "Negreta",
@@ -72,6 +82,7 @@
     "canvasColors": "Usat al llenç",
     "canvasBackground": "Fons del llenç",
     "drawingCanvas": "Llenç de dibuix",
+    "clearCanvas": "Neteja el llenç",
     "layers": "Capes",
     "actions": "Accions",
     "language": "Llengua",
@@ -84,12 +95,13 @@
     "group": "Agrupa la selecció",
     "ungroup": "Desagrupa la selecció",
     "collaborators": "Col·laboradors",
-    "showGrid": "Mostra la graella",
+    "toggleGrid": "Alterna la quadrícula",
     "addToLibrary": "Afegir a la biblioteca",
     "removeFromLibrary": "Eliminar de la biblioteca",
     "libraryLoadingMessage": "S'està carregant la biblioteca…",
     "libraries": "Explora les biblioteques",
     "loadingScene": "S'està carregant l'escena…",
+    "loadScene": "Carrega una escena des d'un fitxer",
     "align": "Alinea",
     "alignTop": "Alinea a la part superior",
     "alignBottom": "Alinea a la part inferior",
@@ -105,26 +117,33 @@
     "share": "Comparteix",
     "showStroke": "Mostra el selector de color del traç",
     "showBackground": "Mostra el selector de color de fons",
-    "toggleTheme": "Activa o desactiva el tema",
+    "showFonts": "Mostra el selector tipogràfic",
+    "toggleTheme": "Alternar tema clar i fosc",
+    "theme": "Tema",
     "personalLib": "Biblioteca personal",
     "excalidrawLib": "Biblioteca d'Excalidraw",
     "decreaseFontSize": "Redueix la mida de la lletra",
     "increaseFontSize": "Augmenta la mida de la lletra",
     "unbindText": "Desvincular el text",
     "bindText": "Ajusta el text al contenidor",
-    "createContainerFromText": "",
+    "createContainerFromText": "Ajusta el text al contenidor",
     "link": {
       "edit": "Edita l'enllaç",
-      "editEmbed": "Edita l'enllaç i incrusta-ho",
-      "create": "Crea un enllaç",
-      "createEmbed": "",
+      "editEmbed": "Editar enllaç incrustable",
+      "create": "Afegir un enllaç",
       "label": "Enllaç",
-      "labelEmbed": "",
-      "empty": "No s'ha definit cap enllaç"
+      "labelEmbed": "Enllaça i encasta",
+      "empty": "No s'ha definit cap enllaç",
+      "hint": "Escriu o enganxa un enllaç aquí",
+      "goToElement": "Anar a l'element objectiu"
     },
     "lineEditor": {
       "edit": "Editar línia",
-      "exit": "Sortir de l'editor de línia"
+      "editArrow": "Edita la fletxa"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Bloca",
@@ -135,15 +154,49 @@
     "statusPublished": "Publicat",
     "sidebarLock": "Manté la barra lateral oberta",
     "selectAllElementsInFrame": "Selecciona tots els elements del marc",
-    "removeAllElementsFromFrame": "Eliminat tots els elements del marc",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "removeAllElementsFromFrame": "Elimina tots els elements del marc",
+    "eyeDropper": "Tria un color del llenç",
+    "textToDiagram": "Text a diagrama",
+    "prompt": "Prompt",
+    "followUs": "Seguiu-nos",
+    "discordChat": "Xat de Discord",
+    "zoomToFitViewport": "Amplia per adaptar-se a la finestra",
+    "zoomToFitSelection": "Zoom per veure la selecció",
+    "zoomToFit": "Zoom per veure tots els elements",
+    "installPWA": "Instal·la Excalidraw localment (PWA)",
+    "autoResize": "Activa la redimensió de text automàtica",
+    "imageCropping": "Retallar la imatge",
+    "unCroppedDimension": "Dimensió sense retallar",
+    "copyElementLink": "Copiar enllaç a objecte",
+    "linkToElement": "Enllaç a l'objecte",
+    "wrapSelectionInFrame": "Embolica la selecció en un marc",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Enllaç a l'objecte",
+    "desc": "Fes clic en una forma al llenç o enganxa un enllaç.",
+    "notFound": "L'objecte enllaçat no s'ha trobat al llenç."
   },
   "library": {
     "noItems": "Encara no s'hi han afegit elements...",
     "hint_emptyLibrary": "Trieu un element o un llenç per a afegir-lo aquí, o instal·leu una biblioteca del repositori públic, més avall.",
-    "hint_emptyPrivateLibrary": "Trieu un element o un llenç per a afegir-lo aquí."
+    "hint_emptyPrivateLibrary": "Trieu un element o un llenç per a afegir-lo aquí.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Troba al llenç",
+    "noMatch": "No hem trobat coincidències...",
+    "singleResult": "resultat",
+    "multipleResults": "resultats",
+    "placeholder": "Troba al llenç...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Neteja el llenç",
@@ -151,6 +204,7 @@
     "exportImage": "Exporta la imatge...",
     "export": "Guardar a...",
     "copyToClipboard": "Copia al porta-retalls",
+    "copyLink": "Copia l'enllaç",
     "save": "Desa al fitxer actual",
     "saveAs": "Anomena i desa",
     "load": "Obrir",
@@ -171,14 +225,16 @@
     "fullScreen": "Pantalla completa",
     "darkMode": "Mode fosc",
     "lightMode": "Mode clar",
+    "systemMode": "Mode del sistema",
     "zenMode": "Mode zen",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Ajusta als objectes",
     "exitZenMode": "Surt de mode zen",
     "cancel": "Cancel·la",
+    "saveLibNames": "",
     "clear": "Neteja",
     "remove": "Suprimeix",
-    "embed": "",
-    "publishLibrary": "Publica",
+    "embed": "Commuta incrustació",
+    "publishLibrary": "",
     "submit": "Envia",
     "confirm": "Confirma",
     "embeddableInteractionButton": "Feu clic per interactuar"
@@ -204,37 +260,39 @@
     "resetLibrary": "Això buidarà la biblioteca. N'esteu segur?",
     "removeItemsFromsLibrary": "Suprimir {{count}} element(s) de la biblioteca?",
     "invalidEncryptionKey": "La clau d'encriptació ha de tenir 22 caràcters. La col·laboració en directe està desactivada.",
-    "collabOfflineWarning": "Sense connexió a internet disponible.\nEls vostres canvis no seran guardats!"
+    "collabOfflineWarning": "Sense connexió a internet disponible.\nEls vostres canvis no seran guardats!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipus de fitxer no suportat.",
     "imageInsertError": "No s'ha pogut insertar la imatge, torneu-ho a provar més tard...",
     "fileTooBig": "El fitxer és massa gros. La mida màxima permesa és {{maxSize}}.",
     "svgImageInsertError": "No ha estat possible inserir la imatge SVG. Les marques SVG semblen invàlides.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG no vàlid.",
+    "failedToFetchImage": "No s'ha pogut obtenir la imatge.",
     "cannotResolveCollabServer": "No ha estat possible connectar amb el servidor collab. Si us plau recarregueu la pàgina i torneu a provar.",
     "importLibraryError": "No s'ha pogut carregar la biblioteca",
+    "saveLibraryError": "No hem pogut desar la llibreria a l'emmagatzematge. Si us plau, deseu la vostra llibreria a un fitxer local per assegurar que no perds els canvis.",
     "collabSaveFailed": "No s'ha pogut desar a la base de dades de fons. Si els problemes persisteixen, hauríeu de desar el fitxer localment per assegurar-vos que no perdeu el vostre treball.",
     "collabSaveFailed_sizeExceeded": "No s'ha pogut desar a la base de dades de fons, sembla que el llenç és massa gran. Hauríeu de desar el fitxer localment per assegurar-vos que no perdeu el vostre treball.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Les imatges no estan habilitades.",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": ""
+      "line1": "Sembla que feu servir el navegador Brave amb el <bold>blocatge agressiu d'indentificació única</bold> activat.",
+      "line2": "Això podria provocar problemes amb els <bold>elements de text</bold> en els vostres dissenys.",
+      "line3": "Us recomanem encaridament que desactiveu aquesta característica. Podeu seguir <link>aquests passos</link> per a fer-ho.",
+      "line4": "Si els elements de text no es mostren correctament malgrat haver desactivat aquesta opció, si us plau, obriu una <issueLink>incidència</issueLink> a la nostra pàgina de GitHub o escriviu-nos a <discordLink>Discord</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "Els elements incrustables no poden afegir-se a la biblioteca.",
+      "iframe": "Elements IFrame no es poden afegir a la biblioteca.",
+      "image": "Suport per a afegir imatges a la biblioteca aviat!"
     },
-    "asyncPasteFailedOnRead": "",
+    "asyncPasteFailedOnRead": "No s'ha pogut enganxar (no s'ha pogut llegir del porta-retalls del sistema).",
     "asyncPasteFailedOnParse": "No s'ha pogut enganxar.",
-    "copyToSystemClipboardFailed": ""
+    "copyToSystemClipboardFailed": "No s'ha pogut copiar al porta-retalls."
   },
   "toolBar": {
     "selection": "Selecció",
+    "lasso": "",
     "image": "Insereix imatge",
     "rectangle": "Rectangle",
     "diamond": "Rombe",
@@ -246,16 +304,32 @@
     "library": "Biblioteca",
     "lock": "Mantenir activa l'eina seleccionada desprès de dibuixar",
     "penMode": "Mode de llapis - evita tocar",
-    "link": "Afegeix / actualitza l'enllaç per a la forma seleccionada",
+    "link": "Afegeix/actualitza l'enllaç per a una forma seleccionada",
     "eraser": "Esborrador",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "frame": "Eina de marc",
+    "magicframe": "De Wireframe a codi",
+    "embeddable": "Incrustació Web",
+    "laser": "Punter làser",
     "hand": "Mà (eina de desplaçament)",
-    "extraTools": "",
-    "mermaidToExcalidraw": "De Mermaid a Excalidraw",
-    "magicSettings": "Preferències d'IA"
+    "extraTools": "Més eines",
+    "mermaidToExcalidraw": "Mermaid a Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rectangle",
+    "diamond": "Rombe",
+    "ellipse": "El·lipse",
+    "arrow": "Fletxa",
+    "line": "Línia",
+    "freedraw": "Dibuix a mà alçada",
+    "text": "Text",
+    "image": "Imatge",
+    "group": "Grup",
+    "frame": "Marc",
+    "magicframe": "De Wireframe a codi",
+    "embeddable": "Incrustació Web",
+    "selection": "Selecció",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Accions del llenç",
@@ -263,28 +337,33 @@
     "shapes": "Formes"
   },
   "hints": {
-    "canvasPanning": "Per moure el llenç, manteniu premuda la roda del ratolí o la barra espaiadora mentre arrossegueu o utilitzeu l'eina manual",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Feu clic per a dibuixar múltiples punts; arrossegueu per a una sola línia",
+    "arrowTool": "",
     "freeDraw": "Feu clic i arrossegueu, deixeu anar per a finalitzar",
     "text": "Consell: també podeu afegir text fent doble clic en qualsevol lloc amb l'eina de selecció",
-    "embeddable": "",
-    "text_selected": "Feu doble clic o premeu Retorn per a editar el text",
-    "text_editing": "Premeu Escapada o Ctrl+Retorn (o Ordre+Retorn) per a finalitzar l'edició",
-    "linearElementMulti": "Feu clic a l'ultim punt, o pitgeu Esc o Retorn per a finalitzar",
-    "lockAngle": "Per restringir els angles, mantenir premut el majúscul (SHIFT)",
-    "resize": "Per restringir les proporcions mentres es canvia la mida, mantenir premut el majúscul (SHIFT); per canviar la mida des del centre, mantenir premut ALT",
-    "resizeImage": "Podeu redimensionar lliurement prement MAJÚSCULA;\nper a redimensionar des del centre, premeu ALT",
-    "rotate": "Per restringir els angles mentre gira, mantenir premut el majúscul (SHIFT)",
-    "lineEditor_info": "Mantingueu premut Ctrl o Cmd i feu doble clic o premeu Ctrl o Cmd + Retorn per editar els punts",
-    "lineEditor_pointSelected": "Premeu Suprimir per a eliminar el(s) punt(s), CtrlOrCmd+D per a duplicar-lo, o arrossegueu-lo per a moure'l",
-    "lineEditor_nothingSelected": "Seleccioneu un punt per a editar-lo (premeu SHIFT si voleu\nselecció múltiple), o manteniu Alt i feu clic per a afegir més punts",
-    "placeImage": "Feu clic per a col·locar la imatge o clic i arrossegar per a establir-ne la mida manualment",
+    "embeddable": "Feu clic i arrossegueu per crear una Incrustació Web",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publiqueu la vostra pròpia llibreria",
-    "bindTextToElement": "Premeu enter per a afegir-hi text",
-    "deepBoxSelect": "Manteniu CtrlOrCmd per a selecció profunda, i per a evitar l'arrossegament",
-    "eraserRevert": "Mantingueu premuda Alt per a revertir els elements seleccionats per a esborrar",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "És probable que aquesta funció es pugui activar posant la marca \"dom.events.asyncClipboard.clipboardItem\" a \"true\". Per canviar les marques del navegador al Firefox, visiteu la pàgina \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "No es pot mostrar la previsualització",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Anàvem amb molta cura de no incloure la informació de la vostra escena en l'error. Si l'escena no és privada, podeu fer-ne el seguiment al nostre <button>rastrejador d'errors.</button> Incloeu la informació a continuació copiant i enganxant a GitHub Issues.",
     "sceneContent": "Contingut de l'escena:"
   },
+  "shareDialog": {
+    "or": "O"
+  },
   "roomDialog": {
-    "desc_intro": "Podeu convidar persones a la vostra escena actual a col·laborar amb vós.",
-    "desc_privacy": "No us preocupeu, la sessió utilitza el xifratge de punta a punta, de manera que qualsevol cosa que dibuixeu romandrà privada. Ni tan sols el nostre servidor podrà veure què feu.",
+    "desc_intro": "Convideu gent a col·laborar en el vostre disseny.",
+    "desc_privacy": "No us amoïneu, la sessió està encriptada d'extrem a extrem i és totalment privada. Ni tan sols el nostre servidor pot veure què dibuixeu.",
     "button_startSession": "Inicia la sessió",
     "button_stopSession": "Atura la sessió",
     "desc_inProgressIntro": "La sessió de col·laboració en directe està en marxa.",
@@ -328,14 +410,16 @@
     "click": "clic",
     "deepSelect": "Selecció profunda",
     "deepBoxSelect": "Seleccioneu profundament dins del quadre i eviteu arrossegar",
+    "createFlowchart": "Crear un diagrama de flux a partir d'un element genèric",
+    "navigateFlowchart": "Navegar per un diagrama de flux",
     "curvedArrow": "Fletxa corba",
     "curvedLine": "Línia corba",
     "documentation": "Documentació",
     "doubleClick": "doble clic",
     "drag": "arrossega",
     "editor": "Editor",
-    "editLineArrowPoints": "",
-    "editText": "",
+    "editLineArrowPoints": "Edita els punts de la línia/fletxa",
+    "editText": "Edita text / afegeix etiqueta",
     "github": "Hi heu trobat un problema? Informeu-ne",
     "howto": "Seguiu les nostres guies",
     "or": "o",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zoom per veure la selecció",
     "toggleElementLock": "Blocar/desblocar la selecció",
     "movePageUpDown": "Mou la pàgina cap amunt/a baix",
-    "movePageLeftRight": "Mou la pàgina cap a l'esquerra/dreta"
+    "movePageLeftRight": "Mou la pàgina cap a l'esquerra/dreta",
+    "cropStart": "Retallar l'imatge",
+    "cropFinish": "Finalitza el retall d'imatge"
   },
   "clearCanvasDialog": {
     "title": "Neteja el llenç"
@@ -392,27 +478,27 @@
     "removeItemsFromLib": "Suprimeix els elements seleccionats de la llibreria"
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "Exporteu la imatge",
     "label": {
-      "withBackground": "",
-      "onlySelected": "Només els seleccionats",
+      "withBackground": "Fons",
+      "onlySelected": "Només seleccionat",
       "darkMode": "Mode fosc",
-      "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "embedScene": "Incrusta escena",
+      "scale": "Escala",
+      "padding": "Marge intern (padding)"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "Les dades de l’escena es desaran al fitxer PNG/SVG de manera que es pugui restaurar l’escena.\nAixò farà augmentar la mida del fitxer exportat."
     },
     "title": {
-      "exportToPng": "Exporta a PNG",
-      "exportToSvg": "Exporta a SVG",
-      "copyPngToClipboard": "Copia el PNG al porta-retalls"
+      "exportToPng": "Exporteu a PNG",
+      "exportToSvg": "Exporteu a SVG",
+      "copyPngToClipboard": "Copieu el PNG al porta-retalls"
     },
     "button": {
       "exportToPng": "PNG",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToSvg": "SVG",
+      "copyPngToClipboard": "Copieu al porta-retalls"
     }
   },
   "encrypted": {
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Angle",
-    "element": "Element",
-    "elements": "Elements",
+    "shapes": "Formes",
     "height": "Altura",
     "scene": "Escena",
     "selected": "Seleccionat",
     "storage": "Emmagatzematge",
-    "title": "Estadístiques per nerds",
+    "fullTitle": "Propietats del Llenç i de la Forma",
+    "title": "Propietats",
+    "generalStats": "General",
+    "elementProperties": "Propietats de la forma",
     "total": "Total",
     "version": "Versió",
     "versionCopy": "Feu clic per a copiar",
@@ -439,26 +527,28 @@
     "copyStyles": "S'han copiat els estils.",
     "copyToClipboard": "S'ha copiat al porta-retalls.",
     "copyToClipboardAsPng": "S'ha copiat {{exportSelection}} al porta-retalls en format PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "S'ha copiat {{exportSelection}} al porta-retalls com a SVG\n({{exportColorScheme}})",
     "fileSaved": "S'ha desat el fitxer.",
     "fileSavedToFilename": "S'ha desat a {filename}",
     "canvas": "el llenç",
     "selection": "la selecció",
     "pasteAsSingleElement": "Fer servir {{shortcut}} per enganxar com un sol element,\no enganxeu-lo en un editor de text existent",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "Actualment no es permet incrustar aquesta URL. Planteja un problema a GitHub per sol·licitar que l'URL estigui a la llista blanca",
+    "unrecognizedLinkFormat": "L'enllaç que has incrustat no coincideix amb el format esperat. Si us plau, intenta enganxar l'enllaç 'embed' proporcionada pel lloc web d'origen",
+    "elementLinkCopied": "Enllaç copiat al porta-retalls"
   },
   "colors": {
     "transparent": "Transparent",
-    "black": "",
-    "white": "",
-    "red": "",
-    "pink": "",
-    "grape": "",
-    "violet": "",
-    "gray": "",
-    "blue": "",
-    "cyan": "",
-    "teal": "",
+    "black": "Negre",
+    "white": "Blanc",
+    "red": "Vermell",
+    "pink": "Rosa",
+    "grape": "Violat (raïm)",
+    "violet": "Violat",
+    "gray": "Gris",
+    "blue": "Blau",
+    "cyan": "Cian",
+    "teal": "Xarxet",
     "green": "Verd",
     "yellow": "Groc",
     "orange": "Taronja",
@@ -478,48 +568,97 @@
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "",
-    "colors": "",
-    "shades": "",
-    "hexCode": "",
-    "noShades": ""
+    "color": "",
+    "mostUsedCustomColors": "Colors personalitzats més usats",
+    "colors": "Colors",
+    "shades": "Ombres",
+    "hexCode": "Codi hexadecimal",
+    "noShades": "No hi ha ombres disponibles per a aquest color"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "Exporta com a imatge",
-        "button": "Exporta com a imatge",
-        "description": ""
+        "title": "Exporteu com a imatge",
+        "button": "Exporteu com a imatge",
+        "description": "Exporta les dades de l'escena com una imatge des de la qual podràs importar-les més tard."
       },
       "saveToDisk": {
-        "title": "Desa al disc",
-        "button": "Desa al disc",
-        "description": ""
+        "title": "Deseu al disc",
+        "button": "Deseu al disc",
+        "description": "Exporta les dades de l'escena a un fitxer des del qual podràs importar-les més tard."
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Excalidraw+",
+        "button": "Exporta a Excalidraw+",
+        "description": "Desa l'escena al teu espai de treball d'Excalidraw+."
       }
     },
     "modal": {
       "loadFromFile": {
         "title": "Carrega des d'un fitxer",
         "button": "Carrega des d'un fitxer",
-        "description": ""
+        "description": "Carregar des d'un fitxer <bold>substituirà el contingut actual</bold>.<br></br>Podeu desar el vostre disseny abans fent servir una de les opcions més avall."
       },
       "shareableLink": {
         "title": "Carrega des d'un enllaç",
-        "button": "",
-        "description": ""
+        "button": "Substitueix el contingut",
+        "description": "Carregar un disseny extern <bold>substituirà el contingut actual</bold>.<br></br>Podeu desar el vostre disseny abans fent servir una de les opcions més avall."
       }
     }
   },
   "mermaid": {
-    "title": "De Mermaid a Excalidraw",
-    "button": "Insereix",
-    "description": "",
+    "title": "Mermaid a Excalidraw",
+    "button": "Inseriu",
+    "description": "Actualment només s'admeten els diagrames <flowchartLink>Flowchart</flowchartLink>, <sequenceLink> Sequence, </sequenceLink> i <classLink> Class </classLink>. Els altres tipus es representaran com a imatge a Excalidraw.",
     "syntax": "Sintaxi de Mermaid",
     "preview": "Previsualització"
+  },
+  "quickSearch": {
+    "placeholder": "Cerca ràpida"
+  },
+  "fontList": {
+    "badge": {
+      "old": "antic"
+    },
+    "sceneFonts": "En aquesta escena",
+    "availableFonts": "Lletres tipogràfiques disponibles",
+    "empty": "No s'ha trobat cap lletra tipogràfica"
+  },
+  "userList": {
+    "empty": "No s'ha trobat cap usuari",
+    "hint": {
+      "text": "Feu clic sobre un usuari per seguir-lo",
+      "followStatus": "Ara per ara seguiu aquest usuari",
+      "inCall": "L'usuari es troba en una trucada de veu",
+      "micMuted": "El micròfon de l'usuari és silenciat",
+      "isSpeaking": "L'usuari parla ara"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta d'ordres",
+    "shortcuts": {
+      "select": "Selecciona",
+      "confirm": "Confirma",
+      "close": "Tanca"
+    },
+    "recents": "Usats recentment",
+    "search": {
+      "placeholder": "Cerca menús, ordres i descobreix joies amagades",
+      "noMatch": "No hi ha ordres coincidents..."
+    },
+    "itemNotAvailable": "Ordre no disponible...",
+    "shortcutHint": "Per obrir la paleta d'ordres, utilitza {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/cs-CZ.json b/packages/excalidraw/locales/cs-CZ.json
index 150fecd3d8..46861984ca 100644
--- a/packages/excalidraw/locales/cs-CZ.json
+++ b/packages/excalidraw/locales/cs-CZ.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Zkopírovat do schránky jako PNG",
     "copyAsSvg": "Zkopírovat do schránky jako SVG",
     "copyText": "Zkopírovat do schránky jako text",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Kopírovat zdroj do schránky",
+    "convertToCode": "Převést na kód",
     "bringForward": "Přenést blíž",
     "sendToBack": "Přenést do pozadí",
     "bringToFront": "Přenést do popředí",
@@ -21,7 +21,9 @@
     "copyStyles": "Kopírovat styly",
     "pasteStyles": "Vložit styly",
     "stroke": "Obrys",
+    "changeStroke": "Změnit barvu ohraničení",
     "background": "Pozadí",
+    "changeBackground": "Změnit barvu pozadí",
     "fill": "Výplň",
     "strokeWidth": "Tloušťka tahu",
     "strokeStyle": "Styl tahu",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Žádný",
     "arrowhead_arrow": "Šipka",
     "arrowhead_bar": "Kóta",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Kruh",
+    "arrowhead_circle_outline": "Kružnice",
     "arrowhead_triangle": "Trojúhelník",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Trojúhelník (obrys)",
+    "arrowhead_diamond": "Kosočtverec",
+    "arrowhead_diamond_outline": "Kosočtverec (obrys)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "Typ šipky",
+    "arrowtype_sharp": "Ostrá šipka",
+    "arrowtype_round": "Zakřivená šipka",
+    "arrowtype_elbowed": "",
     "fontSize": "Velikost písma",
     "fontFamily": "Písmo",
     "addWatermark": "Přidat \"Vyrobeno s Excalidraw\"",
@@ -55,7 +65,7 @@
     "large": "Velké",
     "veryLarge": "Velmi velké",
     "solid": "Plný",
-    "hachure": "Hachure",
+    "hachure": "Šrafování",
     "zigzag": "Klikatě",
     "crossHatch": "Křížový šrafování",
     "thin": "Tenký",
@@ -72,6 +82,7 @@
     "canvasColors": "Použito na plátně",
     "canvasBackground": "Pozadí plátna",
     "drawingCanvas": "Kreslicí plátno",
+    "clearCanvas": "Vyčistit plátno",
     "layers": "Vrstvy",
     "actions": "Akce",
     "language": "Jazyk",
@@ -84,12 +95,13 @@
     "group": "Sloučit výběr do skupiny",
     "ungroup": "Zrušit sloučení skupiny",
     "collaborators": "Spolupracovníci",
-    "showGrid": "Zobrazit mřížku",
+    "toggleGrid": "Přepínač mřížky",
     "addToLibrary": "Přidat do knihovny",
     "removeFromLibrary": "Odebrat z knihovny",
     "libraryLoadingMessage": "Načítání knihovny…",
     "libraries": "Procházet knihovny",
     "loadingScene": "Načítání scény…",
+    "loadScene": "Načíst scénu ze souboru",
     "align": "Zarovnání",
     "alignTop": "Zarovnat nahoru",
     "alignBottom": "Zarovnat dolů",
@@ -105,7 +117,9 @@
     "share": "Sdílet",
     "showStroke": "Zobrazit výběr barvy",
     "showBackground": "Zobrazit výběr barev pozadí",
-    "toggleTheme": "Přepnout tmavý řežim",
+    "showFonts": "Zobrazit výběr písma",
+    "toggleTheme": "Přepnout světlý/tmavý motiv",
+    "theme": "Motiv",
     "personalLib": "Osobní knihovna",
     "excalidrawLib": "Exkalidraw knihovna",
     "decreaseFontSize": "Zmenšit písmo",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Zabalit text do kontejneru",
     "link": {
       "edit": "Upravit odkaz",
-      "editEmbed": "",
-      "create": "Vytvořit odkaz",
-      "createEmbed": "",
+      "editEmbed": "Upravit odkaz pro vložení",
+      "create": "Přidat odkaz",
       "label": "Odkaz",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "Odkaz & vložit",
+      "empty": "Není nastaven žádný odkaz",
+      "hint": "Napište nebo vložte svůj odkaz zde",
+      "goToElement": "Přejít na cílový prvek"
     },
     "lineEditor": {
       "edit": "Upravit čáru",
-      "exit": "Ukončit editor řádků"
+      "editArrow": "Upravit šipku"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Uzamknout",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "Zveřejněno",
     "sidebarLock": "Ponechat postranní panel otevřený",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
+    "selectAllElementsInFrame": "Vybrat všechny prvky v orámování",
+    "removeAllElementsFromFrame": "Odstranit všechny prvky z orámování",
     "eyeDropper": "Vyberte barvu z plátna",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Z textu na diagram",
+    "prompt": "Výzva",
+    "followUs": "Sledujte nás",
+    "discordChat": "Discord chat",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "Přiblížit na výběr",
+    "zoomToFit": "Přiblížit na zobrazení všech prvků",
+    "installPWA": "Instalovat Excalidraw lokálně (PWA)",
+    "autoResize": "Povolit automatickou změnu velikosti textu",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "Kopírovat odkaz na objekt",
+    "linkToElement": "Odkaz na objekt",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Odkaz na objekt",
+    "desc": "Klikněte na tvar na plátně nebo vložte odkaz.",
+    "notFound": "Propojený objekt nebyl na plátně nalezen."
   },
   "library": {
     "noItems": "Dosud neexistují žádné položky...",
     "hint_emptyLibrary": "Vyberte položku na plátně a přidejte ji sem nebo nainstalujte knihovnu z veřejného úložiště níže.",
-    "hint_emptyPrivateLibrary": "Vyberte položku na plátně a přidejte ji sem."
+    "hint_emptyPrivateLibrary": "Vyberte položku na plátně a přidejte ji sem.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Najít na plátně",
+    "noMatch": "Nebyla nalezena žádná shoda...",
+    "singleResult": "výsledek",
+    "multipleResults": "výsledky",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Resetovat plátno",
@@ -151,6 +204,7 @@
     "exportImage": "Exportovat obrázek...",
     "export": "Uložit jako...",
     "copyToClipboard": "Kopírovat do schránky",
+    "copyLink": "Kopírovat odkaz",
     "save": "Uložit do aktuálního souboru",
     "saveAs": "Uložit jako",
     "load": "Otevřít",
@@ -161,7 +215,7 @@
     "zoomIn": "Přiblížit",
     "zoomOut": "Oddálit",
     "resetZoom": "Resetovat přiblížení",
-    "menu": "Menu",
+    "menu": "Hlavní nabídka",
     "done": "Hotovo",
     "edit": "Upravit",
     "undo": "Zpět",
@@ -171,17 +225,19 @@
     "fullScreen": "Celá obrazovka",
     "darkMode": "Tmavý režim",
     "lightMode": "Světlý režim",
+    "systemMode": "Nastavení systému",
     "zenMode": "Zen mód",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Přichytávat k objektům",
     "exitZenMode": "Opustit zen mód",
     "cancel": "Zrušit",
+    "saveLibNames": "",
     "clear": "Vyčistit",
     "remove": "Odstranit",
-    "embed": "",
-    "publishLibrary": "Zveřejnit",
+    "embed": "Přepínač vkládání",
+    "publishLibrary": "",
     "submit": "Odeslat",
     "confirm": "Potvrdit",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Klikněte pro interakci"
   },
   "alerts": {
     "clearReset": "Toto vymaže celé plátno. Jste si jisti?",
@@ -204,20 +260,21 @@
     "resetLibrary": "Tímto vymažete vaši knihovnu. Jste si jisti?",
     "removeItemsFromsLibrary": "Smazat {{count}} položek z knihovny?",
     "invalidEncryptionKey": "Šifrovací klíč musí mít 22 znaků. Live spolupráce je zakázána.",
-    "collabOfflineWarning": "Není k dispozici žádné internetové připojení.\nVaše změny nebudou uloženy!"
+    "collabOfflineWarning": "Není k dispozici žádné internetové připojení.\nVaše změny nebudou uloženy!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Nepodporovaný typ souboru.",
     "imageInsertError": "Nelze vložit obrázek. Zkuste to později...",
     "fileTooBig": "Soubor je příliš velký. Maximální povolená velikost je {{maxSize}}.",
     "svgImageInsertError": "Nelze vložit SVG obrázek. Značení SVG je neplatné.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "Neplatný SVG.",
+    "failedToFetchImage": "Nepodařilo se načíst obrázek.",
     "cannotResolveCollabServer": "Nelze se připojit ke sdílenému serveru. Prosím obnovte stránku a zkuste to znovu.",
     "importLibraryError": "Nelze načíst knihovnu",
+    "saveLibraryError": "",
     "collabSaveFailed": "Nelze uložit do databáze na serveru. Pokud problémy přetrvávají, měli byste uložit soubor lokálně, abyste se ujistili, že neztratíte svou práci.",
     "collabSaveFailed_sizeExceeded": "Nelze uložit do databáze na serveru, plátno se zdá být příliš velké. Měli byste uložit soubor lokálně, abyste se ujistili, že neztratíte svou práci.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Obrázky jsou vypnuty.",
     "brave_measure_text_error": {
       "line1": "Vypadá to, že používáte Brave prohlížeč s povoleným nastavením <bold>Aggressively Block Fingerprinting</bold>.",
       "line2": "To by mohlo vést k narušení <bold>Textových elementů</bold> ve vašich výkresech.",
@@ -230,11 +287,12 @@
       "image": ""
     },
     "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
+    "asyncPasteFailedOnParse": "Nepodařilo se vložit.",
     "copyToSystemClipboardFailed": ""
   },
   "toolBar": {
     "selection": "Výběr",
+    "lasso": "",
     "image": "Vložit obrázek",
     "rectangle": "Obdélník",
     "diamond": "Diamant",
@@ -246,16 +304,32 @@
     "library": "Knihovna",
     "lock": "Po kreslení ponechat vybraný nástroj aktivní",
     "penMode": "Režim Pera - zabránit dotyku",
-    "link": "Přidat/aktualizovat odkaz pro vybraný tvar",
+    "link": "",
     "eraser": "Guma",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "frame": "Orámování",
+    "magicframe": "Z wireframu na kód",
+    "embeddable": "Web Embed",
+    "laser": "Laserové ukazovátko",
     "hand": "Ruka (nástroj pro posouvání)",
-    "extraTools": "",
+    "extraTools": "Více nástrojů",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Obdélník",
+    "diamond": "Kosočtverec",
+    "ellipse": "Elipsa",
+    "arrow": "Šipka",
+    "line": "Čára",
+    "freedraw": "Volné kreslení",
+    "text": "Text",
+    "image": "Obrázek",
+    "group": "Skupina",
+    "frame": "Rám",
+    "magicframe": "Z wireframu na kód",
+    "embeddable": "",
+    "selection": "Výběr",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Akce plátna",
@@ -263,28 +337,33 @@
     "shapes": "Tvary"
   },
   "hints": {
-    "canvasPanning": "Chcete-li přesunout plátno, podržte kolečko nebo mezerník při tažení nebo použijte nástroj Ruka",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Kliknutím pro více bodů, táhnutím pro jednu čáru",
+    "arrowTool": "",
     "freeDraw": "Klikněte a táhněte, pro ukončení pusťte",
     "text": "Tip: Text můžete také přidat dvojitým kliknutím kdekoli pomocí nástroje pro výběr",
     "embeddable": "",
-    "text_selected": "Dvojklikem nebo stisknutím klávesy ENTER upravíte text",
-    "text_editing": "Stiskněte Escape nebo Ctrl/Cmd+ENTER pro dokončení úprav",
-    "linearElementMulti": "Klikněte na poslední bod nebo stiskněte Escape anebo Enter pro dokončení",
-    "lockAngle": "Úhel můžete omezit podržením SHIFT",
-    "resize": "Můžete omezit proporce podržením SHIFT při změně velikosti,\npodržte ALT pro změnu velikosti od středu",
-    "resizeImage": "Můžete volně změnit velikost podržením SHIFT,\npodržením klávesy ALT změníte velikosti od středu",
-    "rotate": "Úhly můžete omezit podržením SHIFT při otáčení",
-    "lineEditor_info": "Podržte Ctrl/Cmd a dvakrát klikněte nebo stiskněte Ctrl/Cmd + Enter pro úpravu bodů",
-    "lineEditor_pointSelected": "Stisknutím tlačítka Delete odstraňte bod(y),\nCtrl/Cmd+D pro duplicitu nebo táhnutím pro přesun",
-    "lineEditor_nothingSelected": "Vyberte bod, který chcete upravit (podržením klávesy SHIFT vyberete více položek),\nnebo podržením klávesy Alt a kliknutím přidáte nové body",
-    "placeImage": "Kliknutím umístěte obrázek, nebo klepnutím a přetažením ručně nastavíte jeho velikost",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publikovat vlastní knihovnu",
-    "bindTextToElement": "Stiskněte Enter pro přidání textu",
-    "deepBoxSelect": "Podržte Ctrl/Cmd pro hluboký výběr a pro zabránění táhnutí",
-    "eraserRevert": "Podržením klávesy Alt vrátíte prvky označené pro smazání",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Tato funkce může být povolena nastavením vlajky \"dom.events.asyncClipboard.clipboardItem\" na \"true\". Chcete-li změnit vlajky prohlížeče ve Firefoxu, navštivte stránku \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Náhled nelze zobrazit",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Byli jsme velmi opatrní, abychom neuváděli informace o Vaší scéně. Pokud vaše scéna není soukromá, zvažte prosím sledování na našem <button>bug trackeru</button>. Uveďte prosím níže uvedené informace kopírováním a vložením do problému na GitHubu.",
     "sceneContent": "Obsah scény:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "Můžete pozvat lidi na vaši aktuální scénu ke spolupráci s vámi.",
-    "desc_privacy": "Nebojte se, relace používá end-to-end šifrování, takže cokoliv nakreslíte zůstane soukromé. Ani náš server nebude schopen vidět, s čím budete pracovat.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Zahájit relaci",
     "button_stopSession": "Ukončit relaci",
     "desc_inProgressIntro": "Živá spolupráce právě probíhá.",
@@ -328,12 +410,14 @@
     "click": "kliknutí",
     "deepSelect": "Hluboký výběr",
     "deepBoxSelect": "Hluboký výběr uvnitř boxu a zabránění táhnnutí",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Zakřivená šipka",
     "curvedLine": "Zakřivená čára",
     "documentation": "Dokumentace",
     "doubleClick": "dvojklik",
     "drag": "tažení",
-    "editor": "Editor",
+    "editor": "",
     "editLineArrowPoints": "Upravit body linií/šipek",
     "editText": "Upravit text / přidat popis",
     "github": "Našel jsi problém? Nahlaš ho",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Přiblížit na výběr",
     "toggleElementLock": "Zamknout/odemknout výběr",
     "movePageUpDown": "Posunout stránku nahoru/dolů",
-    "movePageLeftRight": "Přesunout stránku doleva/doprava"
+    "movePageLeftRight": "Přesunout stránku doleva/doprava",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Vymazat plátno"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Úhel",
-    "element": "Prvek",
-    "elements": "Prvky",
+    "shapes": "Tvary",
     "height": "Výška",
     "scene": "Scéna",
     "selected": "Vybráno",
     "storage": "Úložiště",
-    "title": "Statistika pro nerdy",
+    "fullTitle": "Vlastnosti plátna a tvarů",
+    "title": "Vlastnosti",
+    "generalStats": "Obecné",
+    "elementProperties": "Vlastnosti tvaru",
     "total": "Celkem",
     "version": "Verze",
     "versionCopy": "Kliknutím zkopírujete",
@@ -439,13 +527,15 @@
     "copyStyles": "Styly byly zkopírovány.",
     "copyToClipboard": "Zkopírováno do schránky.",
     "copyToClipboardAsPng": "{{exportSelection}} zkopírován do schránky jako PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Soubor byl uložen.",
     "fileSavedToFilename": "Uloženo do {filename}",
     "canvas": "plátno",
     "selection": "výběr",
     "pasteAsSingleElement": "Pomocí {{shortcut}} vložte jako jeden prvek,\nnebo vložte do existujícího textového editoru",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Průhledná",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Nejpoužívanější vlastní barvy",
     "colors": "Barvy",
     "shades": "Stíny",
@@ -504,22 +595,70 @@
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
+        "title": "Načíst ze souboru",
+        "button": "Načíst ze souboru",
         "description": ""
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
+        "title": "Načíst z odkazu",
+        "button": "Nahradit můj obsah",
         "description": ""
       }
     }
   },
   "mermaid": {
     "title": "",
-    "button": "",
+    "button": "Vložit",
     "description": "",
-    "syntax": "",
-    "preview": ""
+    "syntax": "Mermaid syntaxe",
+    "preview": "Náhled"
+  },
+  "quickSearch": {
+    "placeholder": "Rychlé vyhledávání"
+  },
+  "fontList": {
+    "badge": {
+      "old": "staré"
+    },
+    "sceneFonts": "V této scéně",
+    "availableFonts": "Dostupná písma",
+    "empty": "Nebyla nalezena žádná písma"
+  },
+  "userList": {
+    "empty": "Nebyli nalezeni žádní uživatelé",
+    "hint": {
+      "text": "Klikněte na uživatele pro sledování",
+      "followStatus": "Právě sledujete tohoto uživatele",
+      "inCall": "Uživatel je v hovoru",
+      "micMuted": "Mikrofon uživatele je ztlumen",
+      "isSpeaking": "Uživatel hovoří"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta příkazů",
+    "shortcuts": {
+      "select": "Vybrat",
+      "confirm": "Potvrdit",
+      "close": "Zavřít"
+    },
+    "recents": "Naposledy použito",
+    "search": {
+      "placeholder": "",
+      "noMatch": "Žádné odpovídající příkazy..."
+    },
+    "itemNotAvailable": "Příkaz není k dispozici...",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/da-DK.json b/packages/excalidraw/locales/da-DK.json
index ebefa12ad7..08e7ab4cc7 100644
--- a/packages/excalidraw/locales/da-DK.json
+++ b/packages/excalidraw/locales/da-DK.json
@@ -21,7 +21,9 @@
     "copyStyles": "Kopier stil",
     "pasteStyles": "Indsæt stil",
     "stroke": "Linje",
+    "changeStroke": "Ændr stregfarve",
     "background": "Baggrund",
+    "changeBackground": "Ændr baggrundsfarve",
     "fill": "Udfyld",
     "strokeWidth": "Linjebredde",
     "strokeStyle": "Linjeform",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Ingen",
     "arrowhead_arrow": "Pil",
     "arrowhead_bar": "Bjælke",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Cirkel",
+    "arrowhead_circle_outline": "Cirkel (omrids)",
     "arrowhead_triangle": "Trekant",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Trekant (omrids)",
+    "arrowhead_diamond": "Diamant",
+    "arrowhead_diamond_outline": "Diamant (omrids)",
+    "arrowhead_crowfoot_many": "Kragefod (mange)",
+    "arrowhead_crowfoot_one": "Kragefod (én)",
+    "arrowhead_crowfoot_one_or_many": "Kragefod (én eller mange)",
+    "more_options": "Flere muligheder",
+    "arrowtypes": "Pile type",
+    "arrowtype_sharp": "Skarp pil",
+    "arrowtype_round": "Buet pil",
+    "arrowtype_elbowed": "Albuepil",
     "fontSize": "Skriftstørrelse",
     "fontFamily": "Skrifttypefamilie",
     "addWatermark": "Tilføj \"Lavet med Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Brugt på lærred",
     "canvasBackground": "Lærredsbaggrund",
     "drawingCanvas": "Tegnelærred",
+    "clearCanvas": "Ryd lærred",
     "layers": "Lag",
     "actions": "Handlinger",
     "language": "Sprog",
@@ -81,79 +92,122 @@
     "name": "Navn",
     "yourName": "Dit navn",
     "madeWithExcalidraw": "Fremstillet med Excalidraw",
-    "group": "Grupper valgte",
-    "ungroup": "Opløs gruppe",
-    "collaborators": "Deltagere",
-    "showGrid": "Vis gitter",
-    "addToLibrary": "Føj til Bibliotek",
+    "group": "Gruppér valgte",
+    "ungroup": "Afgruppér valgte",
+    "collaborators": "Samarbejdspartnere",
+    "toggleGrid": "Slå gitter til/fra",
+    "addToLibrary": "Føj til bibliotek",
     "removeFromLibrary": "Fjern fra biblioteket",
     "libraryLoadingMessage": "Indlæser bibliotek…",
     "libraries": "Gennemse biblioteker",
     "loadingScene": "Indlæser scene…",
+    "loadScene": "Indlæs scene fra fil",
     "align": "Justér",
     "alignTop": "Juster til top",
     "alignBottom": "Juster til bund",
     "alignLeft": "Venstrejusteret",
-    "alignRight": "Juster højre",
-    "centerVertically": "Center vertikalt",
-    "centerHorizontally": "Vandret centreret",
+    "alignRight": "Højrejustér",
+    "centerVertically": "Centrér vertikalt",
+    "centerHorizontally": "Centrér horisontalt",
     "distributeHorizontally": "Distribuer vandret",
     "distributeVertically": "Distribuer lodret",
-    "flipHorizontal": "Spejlvend horisontalt",
-    "flipVertical": "Vend lodret",
+    "flipHorizontal": "Vend horisontalt",
+    "flipVertical": "Vend vertikalt",
     "viewMode": "Visningstilstand",
     "share": "Del",
     "showStroke": "Vis stregfarve-vælger",
     "showBackground": "Vis baggrundsfarve-vælger",
-    "toggleTheme": "Skift tema",
+    "showFonts": "Vis skrifttypevælger",
+    "toggleTheme": "Slå lys/mørkt tema til/fra",
+    "theme": "Tema",
     "personalLib": "Personligt bibliotek",
-    "excalidrawLib": "Excalidraw Bibliotek",
-    "decreaseFontSize": "Gør skriften mindre",
-    "increaseFontSize": "Gør skriften større",
-    "unbindText": "Frigør tekst",
-    "bindText": "Bind tekst til beholderen",
-    "createContainerFromText": "Ombryd tekst i en beholder",
+    "excalidrawLib": "",
+    "decreaseFontSize": "",
+    "increaseFontSize": "",
+    "unbindText": "",
+    "bindText": "",
+    "createContainerFromText": "",
     "link": {
-      "edit": "Redigér link",
-      "editEmbed": "Redigér link & indlejret",
-      "create": "Link oprettet",
-      "createEmbed": "Opret link & indlejret",
-      "label": "Links",
-      "labelEmbed": "Link & indlejret",
-      "empty": "Intet link angivet"
+      "edit": "",
+      "editEmbed": "",
+      "create": "",
+      "label": "",
+      "labelEmbed": "",
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
-      "edit": "Rediger Linje",
-      "exit": "Afslut linjeeditor"
+      "edit": "",
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
-      "lock": "Lås",
-      "unlock": "Lås op",
-      "lockAll": "Lås alle",
-      "unlockAll": "Lås alle op"
+      "lock": "",
+      "unlock": "",
+      "lockAll": "",
+      "unlockAll": ""
     },
-    "statusPublished": "Udgiver",
-    "sidebarLock": "Hold sidepanel åben",
-    "selectAllElementsInFrame": "Vælg alle elementer i rammen",
-    "removeAllElementsFromFrame": "Fjern alle elementer fra ramme",
-    "eyeDropper": "Vælg farve fra lærred",
-    "textToDiagram": "Tekst til diagram",
-    "prompt": "Prompt"
+    "statusPublished": "",
+    "sidebarLock": "",
+    "selectAllElementsInFrame": "",
+    "removeAllElementsFromFrame": "",
+    "eyeDropper": "",
+    "textToDiagram": "",
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
-    "noItems": "Ingen varer tilføjet endnu...",
-    "hint_emptyLibrary": "Vælg et element på lærred for at tilføje det her, eller installer et bibliotek fra det offentlige arkiv, nedenfor.",
-    "hint_emptyPrivateLibrary": "Vælg et element på lærred for at tilføje det her."
+    "noItems": "",
+    "hint_emptyLibrary": "",
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
-    "clearReset": "Nulstil lærredet",
-    "exportJSON": "Eksportér til fil",
-    "exportImage": "Eksporter billede...",
-    "export": "Gem til...",
+    "clearReset": "",
+    "exportJSON": "",
+    "exportImage": "",
+    "export": "",
     "copyToClipboard": "Kopier til klippebord",
-    "save": "Gem til nuværende fil",
+    "copyLink": "",
+    "save": "",
     "saveAs": "Gem som",
-    "load": "Åbn",
+    "load": "",
     "getShareableLink": "Lav et delbart link",
     "close": "Luk",
     "selectLanguage": "Vælg sprog",
@@ -161,7 +215,7 @@
     "zoomIn": "Zoom ind",
     "zoomOut": "Zoom ud",
     "resetZoom": "Nulstil zoom",
-    "menu": "Menu",
+    "menu": "",
     "done": "Færdig",
     "edit": "Rediger",
     "undo": "Fortryd",
@@ -171,17 +225,19 @@
     "fullScreen": "Fuld skærm",
     "darkMode": "Mørk tilstand",
     "lightMode": "Lys baggrund",
+    "systemMode": "",
     "zenMode": "Zentilstand",
-    "objectsSnapMode": "Fastgør til objekter",
+    "objectsSnapMode": "",
     "exitZenMode": "Stop zentilstand",
     "cancel": "Annuller",
+    "saveLibNames": "",
     "clear": "Ryd",
     "remove": "Fjern",
-    "embed": "Slå indlejring til/fra",
-    "publishLibrary": "Publicér",
+    "embed": "",
+    "publishLibrary": "",
     "submit": "Gem",
     "confirm": "Bekræft",
-    "embeddableInteractionButton": "Klik for at interagere"
+    "embeddableInteractionButton": ""
   },
   "alerts": {
     "clearReset": "Dette vil rydde hele lærredet. Er du sikker?",
@@ -189,85 +245,105 @@
     "couldNotCreateShareableLinkTooBig": "Kunne ikke oprette delbart link: scenen er for stor",
     "couldNotLoadInvalidFile": "Kunne ikke indlæse ugyldig fil",
     "importBackendFailed": "Import fra backend mislykkedes.",
-    "cannotExportEmptyCanvas": "Kan ikke eksportere tomt lærred.",
-    "couldNotCopyToClipboard": "Kunne ikke kopiere til udklipsholderen.",
-    "decryptFailed": "Kunne ikke dekryptere data.",
-    "uploadedSecurly": "Upload er blevet sikret med ende-til-ende kryptering, hvilket betyder, at Excalidraw server og tredjeparter ikke kan læse indholdet.",
-    "loadSceneOverridePrompt": "Indlæsning af ekstern tegning erstatter dit eksisterende indhold. Ønsker du at fortsætte?",
-    "collabStopOverridePrompt": "Stopper sessionen vil overskrive din tidligere, lokalt gemte tegning. Er du sikker?\n\n(Hvis du ønsker at beholde din lokale tegning, skal du blot lukke browserfanen i stedet.)",
-    "errorAddingToLibrary": "Kunne ikke tilføje element til biblioteket",
-    "errorRemovingFromLibrary": "Kunne ikke fjerne element fra biblioteket",
-    "confirmAddLibrary": "Dette vil tilføje {{numShapes}} form(er) til dit bibliotek. Er du sikker?",
-    "imageDoesNotContainScene": "Dette billede synes ikke at indeholde scene data. Har du aktiveret scene indlejring under eksport?",
-    "cannotRestoreFromImage": "Scene kunne ikke gendannes fra denne billedfil",
-    "invalidSceneUrl": "Kunne ikke importere scene fra den angivne URL. Det er enten misdannet eller indeholder ikke gyldige Excalidraw JSON data.",
-    "resetLibrary": "Dette vil rydde hele lærredet. Er du sikker?",
-    "removeItemsFromsLibrary": "Slet {{count}} vare(r) fra biblioteket?",
-    "invalidEncryptionKey": "Krypteringsnøglen skal være på 22 tegn. Live-samarbejde er deaktiveret.",
-    "collabOfflineWarning": "Ingen internetforbindelse tilgængelig.\nDine ændringer vil ikke blive gemt!"
+    "cannotExportEmptyCanvas": "",
+    "couldNotCopyToClipboard": "",
+    "decryptFailed": "",
+    "uploadedSecurly": "",
+    "loadSceneOverridePrompt": "",
+    "collabStopOverridePrompt": "",
+    "errorAddingToLibrary": "",
+    "errorRemovingFromLibrary": "",
+    "confirmAddLibrary": "",
+    "imageDoesNotContainScene": "",
+    "cannotRestoreFromImage": "",
+    "invalidSceneUrl": "",
+    "resetLibrary": "",
+    "removeItemsFromsLibrary": "",
+    "invalidEncryptionKey": "",
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
-    "unsupportedFileType": "Filtypen er ikke understøttet.",
-    "imageInsertError": "Billedet kunne ikke indsættes. Prøv igen senere...",
-    "fileTooBig": "Filen er for stor. Maksimal tilladt størrelse er {{maxSize}}.",
-    "svgImageInsertError": "Kunne ikke indsætte SVG-billede. SVG-markup'en ser ugyldig ud.",
-    "failedToFetchImage": "Dataene blev ikke hentet.",
-    "invalidSVGString": "Ugyldig SVG.",
-    "cannotResolveCollabServer": "Kunne ikke oprette forbindelse til samarbejdsserveren. Genindlæs siden og prøv igen.",
-    "importLibraryError": "Biblioteket kunne ikke indlæses",
-    "collabSaveFailed": "Kunne ikke gemme i databasen. Hvis problemerne fortsætter, bør du gemme din fil lokalt for at sikre, at du ikke mister dit arbejde.",
-    "collabSaveFailed_sizeExceeded": "Kunne ikke gemme i databasen, lærredet lader til at være for stort. Du bør gemme filen lokalt for at sikre, at du ikke mister dit arbejde.",
-    "imageToolNotSupported": "Billeder er deaktiveret.",
+    "unsupportedFileType": "",
+    "imageInsertError": "",
+    "fileTooBig": "",
+    "svgImageInsertError": "",
+    "failedToFetchImage": "",
+    "cannotResolveCollabServer": "",
+    "importLibraryError": "",
+    "saveLibraryError": "",
+    "collabSaveFailed": "",
+    "collabSaveFailed_sizeExceeded": "",
+    "imageToolNotSupported": "",
     "brave_measure_text_error": {
-      "line1": "Det ser ud til, at du bruger Brave browser med indstillingen <bold>Aggressively Block Fingerprinting</bold> aktiveret.",
-      "line2": "Dette kan resultere i brud på <bold>tekstelementerne</bold> i dine tegninger.",
-      "line3": "Vi anbefaler kraftigt at deaktivere denne indstilling. Du kan følge <link>disse trin</link> om, hvordan du gør det.",
-      "line4": "Hvis deaktivering af denne indstilling ikke løser visning af tekstelementer, åbn venligst et <issueLink>issue</issueLink> på vores GitHub, eller skriv os på <discordLink>Discord</discordLink>"
+      "line1": "",
+      "line2": "",
+      "line3": "",
+      "line4": ""
     },
     "libraryElementTypeError": {
-      "embeddable": "Indlejringselementer kan ikke tilføjes til biblioteket.",
-      "iframe": "IFrame elementer kan ikke tilføjes til biblioteket.",
-      "image": "Understøttelse af at tilføje billeder til biblioteket kommer snart!"
+      "embeddable": "",
+      "iframe": "",
+      "image": ""
     },
-    "asyncPasteFailedOnRead": "Kunne ikke indsætte (kan ikke læse fra systemets udklipsholder).",
-    "asyncPasteFailedOnParse": "Kunne ikke indsætte.",
-    "copyToSystemClipboardFailed": "Kunne ikke kopiere til udklipsholderen."
+    "asyncPasteFailedOnRead": "",
+    "asyncPasteFailedOnParse": "",
+    "copyToSystemClipboardFailed": ""
   },
   "toolBar": {
-    "selection": "&Udvalg",
-    "image": "Indsæt billeder",
-    "rectangle": "Rektangler",
-    "diamond": "Diamanter",
-    "ellipse": "Ellipser",
-    "arrow": "Pile",
-    "line": "Linje",
-    "freedraw": "Tegn",
-    "text": "Tekster",
-    "library": "~Bibliotek",
-    "lock": "Behold valgte værktøj aktiv efter tegning",
-    "penMode": "Pen-tilstand - forhindrer berøring",
-    "link": "Tilføj/ Opdater link for en valgt form",
-    "eraser": "Slet",
-    "frame": "Rammeværktøj",
-    "magicframe": "Wireframe til kode",
-    "embeddable": "Web-indlejring",
-    "laser": "Lasermarkør",
-    "hand": "Hånd (panorering værktøj)",
-    "extraTools": "Flere værktøjer",
-    "mermaidToExcalidraw": "Mermaid til Excalidraw",
-    "magicSettings": "AI indstillinger"
+    "selection": "",
+    "lasso": "",
+    "image": "",
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "library": "",
+    "lock": "",
+    "penMode": "",
+    "link": "",
+    "eraser": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "laser": "",
+    "hand": "",
+    "extraTools": "",
+    "mermaidToExcalidraw": "",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
-    "canvasActions": "Lærred handlinger",
-    "selectedShapeActions": "Valgte figurhandlinger",
-    "shapes": "Former"
+    "canvasActions": "",
+    "selectedShapeActions": "",
+    "shapes": ""
   },
   "hints": {
-    "canvasPanning": "For at flytte lærred, hold musehjulet eller mellemrumstasten mens du trækker, eller brug håndværktøjet",
-    "linearElement": "Klik for at starte flere punkter, træk for enkelt linje",
+    "dismissSearch": "",
+    "canvasPanning": "",
+    "linearElement": "",
+    "arrowTool": "",
     "freeDraw": "Klik og træk, slip når du er færdig",
-    "text": "Tip: du kan også tilføje tekst ved at dobbeltklikke hvor som helst med det valgte værktøj",
-    "embeddable": "Klik på træk for at oprette en hjemmeside indlejret",
+    "text": "",
+    "embeddable": "",
     "text_selected": "",
     "text_editing": "",
     "linearElementMulti": "",
@@ -276,34 +352,40 @@
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
-    "cannotShowPreview": "Kan ikke vise forhåndsvisning",
-    "canvasTooBig": "Lærredet kan være for stort.",
-    "canvasTooBigTip": "Tip: Prøv at flytte de fjerneste elementer lidt tættere sammen."
+    "cannotShowPreview": "",
+    "canvasTooBig": "",
+    "canvasTooBigTip": ""
   },
   "errorSplash": {
-    "headingMain": "Der opstod en fejl. Prøv <button>at genindlæse siden</button>.",
+    "headingMain": "",
     "clearCanvasMessage": "",
     "clearCanvasCaveat": "",
     "trackedToSentry": "",
     "openIssueMessage": "<button></button> Kopiere og indsæt venligst oplysningerne nedenfor i et GitHub problem.",
     "sceneContent": "Scene indhold:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "Du kan invitere folk til din nuværende scene, så de kan samarbejde med dig.",
-    "desc_privacy": "Bare rolig, sessionen bruger end-to-end kryptering, så uanset hvad du tegner vil det forblive privat. Ikke engang vores server vil kunne se, hvad du kommer op med.",
-    "button_startSession": "Start session",
-    "button_stopSession": "Stop session",
+    "desc_intro": "",
+    "desc_privacy": "",
+    "button_startSession": "",
+    "button_stopSession": "",
     "desc_inProgressIntro": "Live-samarbejde session er nu begyndt.",
     "desc_shareLink": "Del dette link med enhver, du ønsker at samarbejde med:",
     "desc_exitSession": "",
@@ -328,6 +410,8 @@
     "click": "",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "",
     "curvedLine": "",
     "documentation": "",
@@ -350,7 +434,9 @@
     "zoomToSelection": "",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "",
-    "element": "",
-    "elements": "",
+    "shapes": "",
     "height": "",
     "scene": "",
     "selected": "",
     "storage": "",
-    "title": "Statistik for nørder",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "",
     "version": "",
     "versionCopy": "Klik for at kopiere",
@@ -439,13 +527,15 @@
     "copyStyles": "Kopieret stilarter.",
     "copyToClipboard": "Kopieret til klippebord.",
     "copyToClipboardAsPng": "Kopieret {{exportSelection}} til klippebord som PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Fil gemt.",
     "fileSavedToFilename": "Gemt som {filename}",
-    "canvas": "canvas",
+    "canvas": "",
     "selection": "markering",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/de-CH.json b/packages/excalidraw/locales/de-CH.json
new file mode 100644
index 0000000000..b7a646d19b
--- /dev/null
+++ b/packages/excalidraw/locales/de-CH.json
@@ -0,0 +1,664 @@
+{
+  "labels": {
+    "paste": "Einfügen",
+    "pasteAsPlaintext": "Als unformatierten Text einfügen",
+    "pasteCharts": "Diagramme einfügen",
+    "selectAll": "Alle auswählen",
+    "multiSelect": "Element zur Auswahl hinzufügen",
+    "moveCanvas": "Leinwand verschieben",
+    "cut": "Ausschneiden",
+    "copy": "Kopieren",
+    "copyAsPng": "In Zwischenablage kopieren (PNG)",
+    "copyAsSvg": "In Zwischenablage kopieren (SVG)",
+    "copyText": "In die Zwischenablage als Text kopieren",
+    "copySource": "Quelle in Zwischenablage kopieren",
+    "convertToCode": "In Code konvertieren",
+    "bringForward": "Nach vorne",
+    "sendToBack": "In den Hintergrund",
+    "bringToFront": "In den Vordergrund",
+    "sendBackward": "Nach hinten",
+    "delete": "Löschen",
+    "copyStyles": "Formatierung kopieren",
+    "pasteStyles": "Formatierung übernehmen",
+    "stroke": "Strich",
+    "changeStroke": "Strichfarbe ändern",
+    "background": "Hintergrund",
+    "changeBackground": "Hintergrundfarbe ändern",
+    "fill": "Füllung",
+    "strokeWidth": "Strichstärke",
+    "strokeStyle": "Konturstil",
+    "strokeStyle_solid": "Durchgezogen",
+    "strokeStyle_dashed": "Gestrichelt",
+    "strokeStyle_dotted": "Gepunktet",
+    "sloppiness": "Sauberkeit",
+    "opacity": "Deckkraft",
+    "textAlign": "Textausrichtung",
+    "edges": "Kanten",
+    "sharp": "Scharf",
+    "round": "Rund",
+    "arrowheads": "Pfeilspitzen",
+    "arrowhead_none": "Keine",
+    "arrowhead_arrow": "Pfeil",
+    "arrowhead_bar": "Balken",
+    "arrowhead_circle": "Kreis",
+    "arrowhead_circle_outline": "Kreis (Umrandung)",
+    "arrowhead_triangle": "Dreieck",
+    "arrowhead_triangle_outline": "Dreieck (Umrandung)",
+    "arrowhead_diamond": "Raute",
+    "arrowhead_diamond_outline": "Raute (Umrandung)",
+    "arrowhead_crowfoot_many": "Krähenfuß (viele)",
+    "arrowhead_crowfoot_one": "Krähenfuß (einer)",
+    "arrowhead_crowfoot_one_or_many": "Krähenfuß (einer oder viele)",
+    "more_options": "Weitere Optionen",
+    "arrowtypes": "Pfeiltyp",
+    "arrowtype_sharp": "Scharfer Pfeil",
+    "arrowtype_round": "Gebogener Pfeil",
+    "arrowtype_elbowed": "Ellenbogen-Pfeil",
+    "fontSize": "Schriftgröße",
+    "fontFamily": "Schriftfamilie",
+    "addWatermark": "\"Made with Excalidraw\" hinzufügen",
+    "handDrawn": "Handgezeichnet",
+    "normal": "Normal",
+    "code": "Code",
+    "small": "Klein",
+    "medium": "Mittel",
+    "large": "Groß",
+    "veryLarge": "Sehr groß",
+    "solid": "Deckend",
+    "hachure": "Schraffiert",
+    "zigzag": "Zickzack",
+    "crossHatch": "Kreuzschraffiert",
+    "thin": "Dünn",
+    "bold": "Fett",
+    "left": "Links",
+    "center": "Zentriert",
+    "right": "Rechts",
+    "extraBold": "Extra Fett",
+    "architect": "Architekt",
+    "artist": "Künstler",
+    "cartoonist": "Karikaturist",
+    "fileTitle": "Dateiname",
+    "colorPicker": "Farbauswähler",
+    "canvasColors": "Auf Leinwand verwendet",
+    "canvasBackground": "Zeichenflächenhintergrund",
+    "drawingCanvas": "Leinwand",
+    "clearCanvas": "Zeichenfläche löschen",
+    "layers": "Ebenen",
+    "actions": "Aktionen",
+    "language": "Sprache",
+    "liveCollaboration": "Live-Zusammenarbeit...",
+    "duplicateSelection": "Duplizieren",
+    "untitled": "Unbenannt",
+    "name": "Name",
+    "yourName": "Dein Name",
+    "madeWithExcalidraw": "Made with Excalidraw",
+    "group": "Auswahl gruppieren",
+    "ungroup": "Gruppierung aufheben",
+    "collaborators": "Mitarbeitende",
+    "toggleGrid": "Raster umschalten",
+    "addToLibrary": "Zur Bibliothek hinzufügen",
+    "removeFromLibrary": "Aus Bibliothek entfernen",
+    "libraryLoadingMessage": "Lade Bibliothek…",
+    "libraries": "Bibliotheken durchsuchen",
+    "loadingScene": "Lade Zeichnung…",
+    "loadScene": "Szene aus Datei laden",
+    "align": "Ausrichten",
+    "alignTop": "Obere Kanten",
+    "alignBottom": "Untere Kanten",
+    "alignLeft": "Linke Kanten",
+    "alignRight": "Rechte Kanten",
+    "centerVertically": "Vertikal zentrieren",
+    "centerHorizontally": "Horizontal zentrieren",
+    "distributeHorizontally": "Horizontal verteilen",
+    "distributeVertically": "Vertikal verteilen",
+    "flipHorizontal": "Horizontal spiegeln",
+    "flipVertical": "Vertikal spiegeln",
+    "viewMode": "Ansichtsmodus",
+    "share": "Teilen",
+    "showStroke": "Auswahl für Strichfarbe anzeigen",
+    "showBackground": "Hintergrundfarbe auswählen",
+    "showFonts": "Schriftauswahl anzeigen",
+    "toggleTheme": "Helles/dunkles Design umschalten",
+    "theme": "Design",
+    "personalLib": "Persönliche Bibliothek",
+    "excalidrawLib": "Excalidraw Bibliothek",
+    "decreaseFontSize": "Schriftgröße verringern",
+    "increaseFontSize": "Schriftgröße erhöhen",
+    "unbindText": "Text lösen",
+    "bindText": "Text an Container binden",
+    "createContainerFromText": "Text in Container einbetten",
+    "link": {
+      "edit": "Link bearbeiten",
+      "editEmbed": "Einbettbaren Link bearbeiten",
+      "create": "Link hinzufügen",
+      "label": "Link",
+      "labelEmbed": "Verlinken & einbetten",
+      "empty": "Kein Link festgelegt",
+      "hint": "Link hier eingeben oder einfügen",
+      "goToElement": "Gehe zu Zielelement"
+    },
+    "lineEditor": {
+      "edit": "Linie bearbeiten",
+      "editArrow": "Pfeil bearbeiten"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
+    },
+    "elementLock": {
+      "lock": "Sperren",
+      "unlock": "Entsperren",
+      "lockAll": "Alle sperren",
+      "unlockAll": "Alle entsperren"
+    },
+    "statusPublished": "Veröffentlicht",
+    "sidebarLock": "Seitenleiste offen lassen",
+    "selectAllElementsInFrame": "Alle Elemente im Rahmen auswählen",
+    "removeAllElementsFromFrame": "Alle Elemente aus dem Rahmen entfernen",
+    "eyeDropper": "Farbe von der Zeichenfläche auswählen",
+    "textToDiagram": "Text zu Diagramm",
+    "prompt": "Eingabe",
+    "followUs": "Folge uns",
+    "discordChat": "Discord-Chat",
+    "zoomToFitViewport": "Zoom auf Ansicht anpassen",
+    "zoomToFitSelection": "Zoom auf Auswahl anpassen",
+    "zoomToFit": "Zoom auf alle Elemente anpassen",
+    "installPWA": "Excalidraw lokal installieren (PWA)",
+    "autoResize": "Aktiviere automatische Textgrößenanpassung",
+    "imageCropping": "Bild zuschneiden",
+    "unCroppedDimension": "Nicht zugeschnittene Dimension",
+    "copyElementLink": "Link zum Objekt kopieren",
+    "linkToElement": "Link zum Objekt",
+    "wrapSelectionInFrame": "Auswahl in Rahmen einbetten",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Link zum Objekt",
+    "desc": "Klicke auf eine Form auf der Zeichenfläche oder füge einen Link ein.",
+    "notFound": "Verknüpftes Objekt wurde nicht auf der Zeichenfläche gefunden."
+  },
+  "library": {
+    "noItems": "Noch keine Elemente hinzugefügt...",
+    "hint_emptyLibrary": "Wähle ein Element auf der Zeichenfläche, um es hier hinzuzufügen. Oder installiere eine Bibliothek aus dem öffentlichen Verzeichnis.",
+    "hint_emptyPrivateLibrary": "Wähle ein Element von der Zeichenfläche, um es hier hinzuzufügen.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Auf Zeichenfläche suchen",
+    "noMatch": "Keine Treffer gefunden...",
+    "singleResult": "Ergebnis",
+    "multipleResults": "Ergebnisse",
+    "placeholder": "Text auf Zeichenfläche suchen...",
+    "frames": "",
+    "texts": ""
+  },
+  "buttons": {
+    "clearReset": "Zeichenfläche löschen & Hintergrundfarbe zurücksetzen",
+    "exportJSON": "In Datei exportieren",
+    "exportImage": "Exportiere Bild...",
+    "export": "Speichern als...",
+    "copyToClipboard": "In Zwischenablage kopieren",
+    "copyLink": "Link kopieren",
+    "save": "In aktueller Datei speichern",
+    "saveAs": "Speichern unter",
+    "load": "Öffnen",
+    "getShareableLink": "Teilbaren Link erhalten",
+    "close": "Schließen",
+    "selectLanguage": "Sprache auswählen",
+    "scrollBackToContent": "Zurück zum Inhalt",
+    "zoomIn": "Vergrößern",
+    "zoomOut": "Verkleinern",
+    "resetZoom": "Zoom zurücksetzen",
+    "menu": "Menü",
+    "done": "Fertig",
+    "edit": "Bearbeiten",
+    "undo": "Rückgängig machen",
+    "redo": "Wiederholen",
+    "resetLibrary": "Bibliothek zurücksetzen",
+    "createNewRoom": "Neuen Raum erstellen",
+    "fullScreen": "Vollbildanzeige",
+    "darkMode": "Dunkles Design",
+    "lightMode": "Helles Design",
+    "systemMode": "System-Modus",
+    "zenMode": "Zen-Modus",
+    "objectsSnapMode": "Einrasten an Objekten",
+    "exitZenMode": "Zen-Modus verlassen",
+    "cancel": "Abbrechen",
+    "saveLibNames": "",
+    "clear": "Löschen",
+    "remove": "Entfernen",
+    "embed": "Einbettung umschalten",
+    "publishLibrary": "",
+    "submit": "Absenden",
+    "confirm": "Bestätigen",
+    "embeddableInteractionButton": "Klicken, um zu interagieren"
+  },
+  "alerts": {
+    "clearReset": "Dies wird die ganze Zeichenfläche löschen. Bist du dir sicher?",
+    "couldNotCreateShareableLink": "Konnte keinen teilbaren Link erstellen.",
+    "couldNotCreateShareableLinkTooBig": "Konnte keinen teilbaren Link erstellen: Die Zeichnung ist zu groß",
+    "couldNotLoadInvalidFile": "Ungültige Datei konnte nicht geladen werden",
+    "importBackendFailed": "Import vom Server ist fehlgeschlagen.",
+    "cannotExportEmptyCanvas": "Leere Zeichenfläche kann nicht exportiert werden.",
+    "couldNotCopyToClipboard": "Kopieren in die Zwischenablage fehlgeschlagen.",
+    "decryptFailed": "Daten konnten nicht entschlüsselt werden.",
+    "uploadedSecurly": "Der Upload wurde mit Ende-zu-Ende-Verschlüsselung gespeichert. Weder Excalidraw noch Dritte können den Inhalt einsehen.",
+    "loadSceneOverridePrompt": "Das Laden einer externen Zeichnung ersetzt den vorhandenen Inhalt. Möchtest du fortfahren?",
+    "collabStopOverridePrompt": "Das Stoppen der Sitzung wird deine vorherige, lokal gespeicherte Zeichnung überschreiben. Bist du dir sicher?\n\n(Wenn du deine lokale Zeichnung behalten möchtest, schließe stattdessen den Browser-Tab.)",
+    "errorAddingToLibrary": "Das Element konnte nicht zur Bibliothek hinzugefügt werden",
+    "errorRemovingFromLibrary": "Das Element konnte nicht aus der Bibliothek entfernt werden",
+    "confirmAddLibrary": "Dies fügt {{numShapes}} Form(en) zu deiner Bibliothek hinzu. Bist du dir sicher?",
+    "imageDoesNotContainScene": "Dieses Bild scheint keine Szenendaten zu enthalten. Hast Du das Einbetten der Szene während des Exports aktiviert?",
+    "cannotRestoreFromImage": "Die Zeichnung konnte aus dieser Bilddatei nicht wiederhergestellt werden",
+    "invalidSceneUrl": "Die Szene konnte nicht von der angegebenen URL importiert werden. Sie ist entweder fehlerhaft oder enthält keine gültigen Excalidraw JSON-Daten.",
+    "resetLibrary": "Dieses löscht deine Bibliothek. Bist du sicher?",
+    "removeItemsFromsLibrary": "{{count}} Element(e) aus der Bibliothek löschen?",
+    "invalidEncryptionKey": "Verschlüsselungsschlüssel muss 22 Zeichen lang sein. Die Live-Zusammenarbeit ist deaktiviert.",
+    "collabOfflineWarning": "Keine Internetverbindung verfügbar.\nDeine Änderungen werden nicht gespeichert!",
+    "localStorageQuotaExceeded": ""
+  },
+  "errors": {
+    "unsupportedFileType": "Nicht unterstützter Dateityp.",
+    "imageInsertError": "Das Bild konnte nicht eingefügt werden. Versuche es später erneut...",
+    "fileTooBig": "Die Datei ist zu groß. Die maximal zulässige Größe ist {{maxSize}}.",
+    "svgImageInsertError": "SVG-Bild konnte nicht eingefügt werden. Das SVG-Markup sieht ungültig aus.",
+    "failedToFetchImage": "Bild konnte nicht abgerufen werden.",
+    "cannotResolveCollabServer": "Konnte keine Verbindung zum Collab-Server herstellen. Bitte lade die Seite neu und versuche es erneut.",
+    "importLibraryError": "Bibliothek konnte nicht geladen werden",
+    "saveLibraryError": "Bibliothek konnte nicht gespeichert werden. Bitte speichere deine Bibliothek lokal in einer Datei, um sicherzustellen, dass keine Änderungen verloren gehen.",
+    "collabSaveFailed": "Keine Speicherung in der Backend-Datenbank möglich. Wenn die Probleme weiterhin bestehen, solltest Du Deine Datei lokal speichern, um sicherzustellen, dass Du Deine Arbeit nicht verlierst.",
+    "collabSaveFailed_sizeExceeded": "Keine Speicherung in der Backend-Datenbank möglich, die Zeichenfläche scheint zu groß zu sein. Du solltest Deine Datei lokal speichern, um sicherzustellen, dass Du Deine Arbeit nicht verlierst.",
+    "imageToolNotSupported": "Bilder sind deaktiviert.",
+    "brave_measure_text_error": {
+      "line1": "Sieht so aus, als ob Du den Brave-Browser verwendest und die <bold>aggressive Blockierung von Fingerabdrücken</bold> aktiviert hast.",
+      "line2": "Dies könnte dazu führen, dass die <bold>Textelemente</bold> in Ihren Zeichnungen zerstört werden.",
+      "line3": "Wir empfehlen dringend, diese Einstellung zu deaktivieren. Dazu kannst Du <link>diesen Schritten</link> folgen.",
+      "line4": "Wenn die Deaktivierung dieser Einstellung die fehlerhafte Anzeige von Textelementen nicht behebt, öffne bitte ein <issueLink>Ticket</issueLink> auf unserem GitHub oder schreibe uns auf <discordLink>Discord</discordLink>"
+    },
+    "libraryElementTypeError": {
+      "embeddable": "Einbettbare Elemente können der Bibliothek nicht hinzugefügt werden.",
+      "iframe": "IFrame-Elemente können nicht zur Bibliothek hinzugefügt werden.",
+      "image": "Unterstützung für das Hinzufügen von Bildern in die Bibliothek kommt bald!"
+    },
+    "asyncPasteFailedOnRead": "Einfügen fehlgeschlagen (konnte aus der Zwischenablage des Systems nicht gelesen werden).",
+    "asyncPasteFailedOnParse": "Einfügen fehlgeschlagen.",
+    "copyToSystemClipboardFailed": "Kopieren in die Zwischenablage fehlgeschlagen."
+  },
+  "toolBar": {
+    "selection": "Auswahl",
+    "lasso": "",
+    "image": "Bild einfügen",
+    "rectangle": "Rechteck",
+    "diamond": "Raute",
+    "ellipse": "Ellipse",
+    "arrow": "Pfeil",
+    "line": "Linie",
+    "freedraw": "Zeichnen",
+    "text": "Text",
+    "library": "Bibliothek",
+    "lock": "Ausgewähltes Werkzeug nach Zeichnen aktiv lassen",
+    "penMode": "Stift-Modus - Berührung verhindern",
+    "link": "Link für ausgewählte Form hinzufügen / aktualisieren",
+    "eraser": "Radierer",
+    "frame": "Rahmenwerkzeug",
+    "magicframe": "Wireframe zu Code",
+    "embeddable": "Web-Einbettung",
+    "laser": "Laserpointer",
+    "hand": "Hand (Schwenkwerkzeug)",
+    "extraTools": "Weitere Werkzeuge",
+    "mermaidToExcalidraw": "Mermaid zu Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rechteck",
+    "diamond": "Raute",
+    "ellipse": "Ellipse",
+    "arrow": "Pfeil",
+    "line": "Linie",
+    "freedraw": "Frei zeichnen",
+    "text": "Text",
+    "image": "Bild",
+    "group": "Gruppe",
+    "frame": "Rahmen",
+    "magicframe": "Wireframe zu Code",
+    "embeddable": "Web-Einbettung",
+    "selection": "Auswahl",
+    "iframe": "IFrame"
+  },
+  "headings": {
+    "canvasActions": "Aktionen für Zeichenfläche",
+    "selectedShapeActions": "Aktionen für Auswahl",
+    "shapes": "Formen"
+  },
+  "hints": {
+    "dismissSearch": "",
+    "canvasPanning": "",
+    "linearElement": "Klicken für Linie mit mehreren Punkten, Ziehen für einzelne Linie",
+    "arrowTool": "",
+    "freeDraw": "Klicke und ziehe. Lass los, wenn du fertig bist",
+    "text": "Tipp: Du kannst auch Text hinzufügen, indem du mit dem Auswahlwerkzeug auf eine beliebige Stelle doppelklickst",
+    "embeddable": "Klicken und ziehen, um eine Webseiten-Einbettung zu erstellen",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
+    "publishLibrary": "Veröffentliche deine eigene Bibliothek",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
+    "firefox_clipboard_write": "Diese Funktion kann wahrscheinlich aktiviert werden, indem die Einstellung \"dom.events.asyncClipboard.clipboardItem\" auf \"true\" gesetzt wird. Um die Browsereinstellungen in Firefox zu ändern, besuche die Seite \"about:config\".",
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
+  },
+  "canvasError": {
+    "cannotShowPreview": "Vorschau kann nicht angezeigt werden",
+    "canvasTooBig": "Die Leinwand ist möglicherweise zu groß.",
+    "canvasTooBigTip": "Tipp: Schiebe die am weitesten entfernten Elemente ein wenig näher zusammen."
+  },
+  "errorSplash": {
+    "headingMain": "Es ist ein Fehler aufgetreten. Versuche <button>die Seite neu zu laden.</button>",
+    "clearCanvasMessage": "Wenn das Neuladen nicht funktioniert, versuche <button>die Zeichenfläche zu löschen.</button>",
+    "clearCanvasCaveat": " Dies wird zum Verlust von Daten führen ",
+    "trackedToSentry": "Der Fehler mit der Kennung {{eventId}} wurde in unserem System registriert.",
+    "openIssueMessage": "Wir waren sehr vorsichtig und haben deine Zeichnungsinformationen nicht in die Fehlerinformationen aufgenommen. Wenn deine Zeichnung nicht privat ist, unterstütze uns bitte über unseren <button>Bug-Tracker</button>. Bitte teile die unten stehenden Informationen mit uns im GitHub Issue (Kopieren und Einfügen).",
+    "sceneContent": "Zeichnungsinhalt:"
+  },
+  "shareDialog": {
+    "or": "Oder"
+  },
+  "roomDialog": {
+    "desc_intro": "Lade Leute ein, an deiner Zeichnung mitzuarbeiten.",
+    "desc_privacy": "Keine Sorge, die Sitzung ist Ende-zu-Ende verschlüsselt und vollständig privat. Nicht einmal unser Server kann sehen, was du zeichnest.",
+    "button_startSession": "Sitzung starten",
+    "button_stopSession": "Sitzung beenden",
+    "desc_inProgressIntro": "Die Live-Sitzung wird nun ausgeführt.",
+    "desc_shareLink": "Teile diesen Link mit allen, mit denen du zusammenarbeiten möchtest:",
+    "desc_exitSession": "Wenn du die Sitzung beendest, wird deine Verbindung zum Raum getrennt. Du kannst jedoch lokal weiter an der Zeichnung arbeiten. Beachte, dass dies keine Auswirkungen auf andere hat und diese weiterhin gemeinsam an ihrer Version arbeiten können.",
+    "shareTitle": "An einer Live-Kollaborationssitzung auf Excalidraw teilnehmen"
+  },
+  "errorDialog": {
+    "title": "Fehler"
+  },
+  "exportDialog": {
+    "disk_title": "Auf Festplatte speichern",
+    "disk_details": "Exportiere die Zeichnungsdaten in eine Datei, die Du später importieren kannst.",
+    "disk_button": "Als Datei speichern",
+    "link_title": "Teilbarer Link",
+    "link_details": "Als schreibgeschützten Link exportieren.",
+    "link_button": "Als Link exportieren",
+    "excalidrawplus_description": "Speichere die Szene in deinem Excalidraw+ Arbeitsbereich.",
+    "excalidrawplus_button": "Exportieren",
+    "excalidrawplus_exportError": "Konnte nicht nach Excalidraw+ exportieren..."
+  },
+  "helpDialog": {
+    "blog": "Lies unseren Blog",
+    "click": "klicken",
+    "deepSelect": "Auswahl innerhalb der Gruppe",
+    "deepBoxSelect": "Auswahl innerhalb der Gruppe, und Ziehen vermeiden",
+    "createFlowchart": "Erstelle ein Flussdiagramm aus einem generischen Element",
+    "navigateFlowchart": "Durchsuche ein Flussdiagramm",
+    "curvedArrow": "Gebogener Pfeil",
+    "curvedLine": "Gebogene Linie",
+    "documentation": "Dokumentation",
+    "doubleClick": "doppelklicken",
+    "drag": "ziehen",
+    "editor": "Editor",
+    "editLineArrowPoints": "Linien-/Pfeil-Punkte bearbeiten",
+    "editText": "Text bearbeiten / Label hinzufügen",
+    "github": "Ein Problem gefunden? Informiere uns",
+    "howto": "Folge unseren Anleitungen",
+    "or": "oder",
+    "preventBinding": "Pfeil-Bindung verhindern",
+    "tools": "Werkzeuge",
+    "shortcuts": "Tastaturkürzel",
+    "textFinish": "Bearbeitung beenden (Texteditor)",
+    "textNewLine": "Neue Zeile hinzufügen (Texteditor)",
+    "title": "Hilfe",
+    "view": "Ansicht",
+    "zoomToFit": "Zoomen um alle Elemente einzupassen",
+    "zoomToSelection": "Auf Auswahl zoomen",
+    "toggleElementLock": "Auswahl sperren/entsperren",
+    "movePageUpDown": "Seite nach oben/unten verschieben",
+    "movePageLeftRight": "Seite nach links/rechts verschieben",
+    "cropStart": "Bild zuschneiden",
+    "cropFinish": "Zuschneiden des Bildes beenden"
+  },
+  "clearCanvasDialog": {
+    "title": "Zeichenfläche löschen"
+  },
+  "publishDialog": {
+    "title": "Bibliothek veröffentlichen",
+    "itemName": "Elementname",
+    "authorName": "Name des Autors",
+    "githubUsername": "GitHub-Benutzername",
+    "twitterUsername": "Twitter-Benutzername",
+    "libraryName": "Name der Bibliothek",
+    "libraryDesc": "Beschreibung der Bibliothek",
+    "website": "Webseite",
+    "placeholder": {
+      "authorName": "Dein Name oder Benutzername",
+      "libraryName": "Name deiner Bibliothek",
+      "libraryDesc": "Beschreibung deiner Bibliothek, um anderen Nutzern bei der Verwendung zu helfen",
+      "githubHandle": "GitHub-Handle (optional), damit du die Bibliothek bearbeiten kannst, wenn sie zur Überprüfung eingereicht wurde",
+      "twitterHandle": "Twitter-Benutzername (optional), damit wir wissen, wen wir bei Werbung über Twitter nennen können",
+      "website": "Link zu deiner persönlichen Webseite oder zu anderer Seite (optional)"
+    },
+    "errors": {
+      "required": "Erforderlich",
+      "website": "Gültige URL eingeben"
+    },
+    "noteDescription": "Sende deine Bibliothek ein, um in die <link>öffentliche Bibliotheks-Repository aufgenommen zu werden</link>damit andere Nutzer sie in ihren Zeichnungen verwenden können.",
+    "noteGuidelines": "Die Bibliothek muss zuerst manuell freigegeben werden. Bitte lies die <link>Richtlinien</link> vor dem Absenden. Du benötigst ein GitHub-Konto, um zu kommunizieren und Änderungen vorzunehmen, falls erforderlich, aber es ist nicht unbedingt erforderlich.",
+    "noteLicense": "Mit dem Absenden stimmst du zu, dass die Bibliothek unter der <link>MIT-Lizenz, </link>die zusammengefasst beinhaltet, dass jeder sie ohne Einschränkungen nutzen kann.",
+    "noteItems": "Jedes Bibliothekselement muss einen eigenen Namen haben, damit es gefiltert werden kann. Die folgenden Bibliothekselemente werden hinzugefügt:",
+    "atleastOneLibItem": "Bitte wähle mindestens ein Bibliothekselement aus, um zu beginnen",
+    "republishWarning": "Hinweis: Einige der ausgewählten Elemente sind bereits als veröffentlicht/eingereicht markiert. Du solltest Elemente nur erneut einreichen, wenn Du eine existierende Bibliothek oder Einreichung aktualisierst."
+  },
+  "publishSuccessDialog": {
+    "title": "Bibliothek übermittelt",
+    "content": "Vielen Dank {{authorName}}. Deine Bibliothek wurde zur Überprüfung eingereicht. Du kannst den Status verfolgen<link>hier</link>"
+  },
+  "confirmDialog": {
+    "resetLibrary": "Bibliothek zurücksetzen",
+    "removeItemsFromLib": "Ausgewählte Elemente aus der Bibliothek entfernen"
+  },
+  "imageExportDialog": {
+    "header": "Bild exportieren",
+    "label": {
+      "withBackground": "Hintergrund",
+      "onlySelected": "Nur ausgewählte",
+      "darkMode": "Dunkler Modus",
+      "embedScene": "Szene einbetten",
+      "scale": "Skalierung",
+      "padding": "Abstand"
+    },
+    "tooltip": {
+      "embedScene": "Die Zeichnungsdaten werden in der exportierten PNG/SVG-Datei gespeichert, sodass das Dokument später weiter bearbeitet werden kann. \nDieses wird die exportierte Datei vergrößern."
+    },
+    "title": {
+      "exportToPng": "Als PNG exportieren",
+      "exportToSvg": "Als SVG exportieren",
+      "copyPngToClipboard": "PNG in die Zwischenablage kopieren"
+    },
+    "button": {
+      "exportToPng": "PNG",
+      "exportToSvg": "SVG",
+      "copyPngToClipboard": "In Zwischenablage kopieren"
+    }
+  },
+  "encrypted": {
+    "tooltip": "Da deine Zeichnungen Ende-zu-Ende verschlüsselt werden, sehen auch unsere Excalidraw-Server sie niemals.",
+    "link": "Blogbeitrag über Ende-zu-Ende-Verschlüsselung in Excalidraw"
+  },
+  "stats": {
+    "angle": "Winkel",
+    "shapes": "Formen",
+    "height": "Höhe",
+    "scene": "Zeichnung",
+    "selected": "Ausgewählt",
+    "storage": "Speicher",
+    "fullTitle": "Zeichenflächen- & Formeigenschaften",
+    "title": "Eigenschaften",
+    "generalStats": "Allgemein",
+    "elementProperties": "Formeigenschaften",
+    "total": "Gesamt",
+    "version": "Version",
+    "versionCopy": "Zum Kopieren klicken",
+    "versionNotAvailable": "Version nicht verfügbar",
+    "width": "Breite"
+  },
+  "toast": {
+    "addedToLibrary": "Zur Bibliothek hinzugefügt",
+    "copyStyles": "Formatierungen kopiert.",
+    "copyToClipboard": "In die Zwischenablage kopiert.",
+    "copyToClipboardAsPng": "{{exportSelection}} als PNG in die Zwischenablage kopiert\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} als SVG in die Zwischenablage kopiert ({{exportColorScheme}})",
+    "fileSaved": "Datei gespeichert.",
+    "fileSavedToFilename": "Als {filename} gespeichert",
+    "canvas": "Zeichenfläche",
+    "selection": "Auswahl",
+    "pasteAsSingleElement": "Verwende {{shortcut}} , um als einzelnes Element\neinzufügen oder in einen existierenden Texteditor einzufügen",
+    "unableToEmbed": "Einbetten dieser URL ist derzeit nicht zulässig. Erstelle einen Issue auf GitHub, um die URL freigeben zu lassen",
+    "unrecognizedLinkFormat": "Der Link, den Du eingebettet hast, stimmt nicht mit dem erwarteten Format überein. Bitte versuche den 'embed' String einzufügen, der von der Quellseite zur Verfügung gestellt wird",
+    "elementLinkCopied": "Link in Zwischenablage kopiert"
+  },
+  "colors": {
+    "transparent": "Transparent",
+    "black": "Schwarz",
+    "white": "Weiß",
+    "red": "Rot",
+    "pink": "Pink",
+    "grape": "Traube",
+    "violet": "Violett",
+    "gray": "Grau",
+    "blue": "Blau",
+    "cyan": "Cyan",
+    "teal": "Blaugrün",
+    "green": "Grün",
+    "yellow": "Gelb",
+    "orange": "Orange",
+    "bronze": "Bronze"
+  },
+  "welcomeScreen": {
+    "app": {
+      "center_heading": "Alle Daten werden lokal in Deinem Browser gespeichert.",
+      "center_heading_plus": "Möchtest du stattdessen zu Excalidraw+ gehen?",
+      "menuHint": "Exportieren, Einstellungen, Sprachen, ..."
+    },
+    "defaults": {
+      "menuHint": "Exportieren, Einstellungen und mehr...",
+      "center_heading": "Diagramme. Einfach. Gemacht.",
+      "toolbarHint": "Wähle ein Werkzeug & beginne zu zeichnen!",
+      "helpHint": "Kurzbefehle & Hilfe"
+    }
+  },
+  "colorPicker": {
+    "color": "",
+    "mostUsedCustomColors": "Beliebteste benutzerdefinierte Farben",
+    "colors": "Farben",
+    "shades": "Schattierungen",
+    "hexCode": "Hex-Code",
+    "noShades": "Keine Schattierungen für diese Farbe verfügbar"
+  },
+  "overwriteConfirm": {
+    "action": {
+      "exportToImage": {
+        "title": "Als Bild exportieren",
+        "button": "Als Bild exportieren",
+        "description": "Exportiere die Zeichnungsdaten als ein Bild, von dem Du später importieren kannst."
+      },
+      "saveToDisk": {
+        "title": "Auf Festplatte speichern",
+        "button": "Auf Festplatte speichern",
+        "description": "Exportiere die Zeichnungsdaten in eine Datei, von der Du später importieren kannst."
+      },
+      "excalidrawPlus": {
+        "title": "Excalidraw+",
+        "button": "Export nach Excalidraw+",
+        "description": "Speichere die Szene in deinem Excalidraw+-Arbeitsbereich."
+      }
+    },
+    "modal": {
+      "loadFromFile": {
+        "title": "Aus Datei laden",
+        "button": "Aus Datei laden",
+        "description": "Das Laden aus einer Datei wird <bold>Deinen vorhandenen Inhalt ersetzen</bold>.<br></br>Du kannst Deine Zeichnung zuerst mit einer der folgenden Optionen sichern."
+      },
+      "shareableLink": {
+        "title": "Aus Link laden",
+        "button": "Meinen Inhalt ersetzen",
+        "description": "Das Laden einer externen Zeichnung wird <bold>Deinen vorhandenen Inhalt ersetzen</bold>.<br></br>Du kannst Deine Zeichnung zuerst mit einer der folgenden Optionen sichern."
+      }
+    }
+  },
+  "mermaid": {
+    "title": "Mermaid zu Excalidraw",
+    "button": "Einfügen",
+    "description": "Derzeit werden nur <flowchartLink>Flussdiagramme</flowchartLink>, <sequenceLink>Sequenzdiagramme</sequenceLink> und <classLink>Klassendiagramme</classLink> unterstützt. Die anderen Typen werden als Bild in Excalidraw dargestellt.",
+    "syntax": "Mermaid-Syntax",
+    "preview": "Vorschau"
+  },
+  "quickSearch": {
+    "placeholder": "Schnellsuche"
+  },
+  "fontList": {
+    "badge": {
+      "old": "alt"
+    },
+    "sceneFonts": "In dieser Szene",
+    "availableFonts": "Verfügbare Schriftarten",
+    "empty": "Keine Schriftarten gefunden"
+  },
+  "userList": {
+    "empty": "Keine Benutzer gefunden",
+    "hint": {
+      "text": "Klicke auf Benutzer um zu folgen",
+      "followStatus": "Du folgst derzeit diesem Benutzer",
+      "inCall": "Benutzer ist in einem Sprachanruf",
+      "micMuted": "Mikrofon des Benutzers ist stumm geschaltet",
+      "isSpeaking": "Benutzer spricht"
+    }
+  },
+  "commandPalette": {
+    "title": "Befehlspalette",
+    "shortcuts": {
+      "select": "Auswählen",
+      "confirm": "Bestätigen",
+      "close": "Schließen"
+    },
+    "recents": "Zuletzt verwendet",
+    "search": {
+      "placeholder": "Suche in Menüs und Befehlen, entdecke versteckte Funktionen",
+      "noMatch": "Keine passenden Befehle..."
+    },
+    "itemNotAvailable": "Befehl ist nicht verfügbar...",
+    "shortcutHint": "Benutze {{shortcut}} für Befehlspalette"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
+  }
+}
diff --git a/packages/excalidraw/locales/de-DE.json b/packages/excalidraw/locales/de-DE.json
index 5ce97646e8..b7a646d19b 100644
--- a/packages/excalidraw/locales/de-DE.json
+++ b/packages/excalidraw/locales/de-DE.json
@@ -1,7 +1,7 @@
 {
   "labels": {
     "paste": "Einfügen",
-    "pasteAsPlaintext": "Als reinen Text einfügen",
+    "pasteAsPlaintext": "Als unformatierten Text einfügen",
     "pasteCharts": "Diagramme einfügen",
     "selectAll": "Alle auswählen",
     "multiSelect": "Element zur Auswahl hinzufügen",
@@ -21,7 +21,9 @@
     "copyStyles": "Formatierung kopieren",
     "pasteStyles": "Formatierung übernehmen",
     "stroke": "Strich",
+    "changeStroke": "Strichfarbe ändern",
     "background": "Hintergrund",
+    "changeBackground": "Hintergrundfarbe ändern",
     "fill": "Füllung",
     "strokeWidth": "Strichstärke",
     "strokeStyle": "Konturstil",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "Dreieck (Umrandung)",
     "arrowhead_diamond": "Raute",
     "arrowhead_diamond_outline": "Raute (Umrandung)",
+    "arrowhead_crowfoot_many": "Krähenfuß (viele)",
+    "arrowhead_crowfoot_one": "Krähenfuß (einer)",
+    "arrowhead_crowfoot_one_or_many": "Krähenfuß (einer oder viele)",
+    "more_options": "Weitere Optionen",
+    "arrowtypes": "Pfeiltyp",
+    "arrowtype_sharp": "Scharfer Pfeil",
+    "arrowtype_round": "Gebogener Pfeil",
+    "arrowtype_elbowed": "Ellenbogen-Pfeil",
     "fontSize": "Schriftgröße",
     "fontFamily": "Schriftfamilie",
     "addWatermark": "\"Made with Excalidraw\" hinzufügen",
@@ -72,6 +82,7 @@
     "canvasColors": "Auf Leinwand verwendet",
     "canvasBackground": "Zeichenflächenhintergrund",
     "drawingCanvas": "Leinwand",
+    "clearCanvas": "Zeichenfläche löschen",
     "layers": "Ebenen",
     "actions": "Aktionen",
     "language": "Sprache",
@@ -84,12 +95,13 @@
     "group": "Auswahl gruppieren",
     "ungroup": "Gruppierung aufheben",
     "collaborators": "Mitarbeitende",
-    "showGrid": "Raster anzeigen",
+    "toggleGrid": "Raster umschalten",
     "addToLibrary": "Zur Bibliothek hinzufügen",
     "removeFromLibrary": "Aus Bibliothek entfernen",
     "libraryLoadingMessage": "Lade Bibliothek…",
     "libraries": "Bibliotheken durchsuchen",
     "loadingScene": "Lade Zeichnung…",
+    "loadScene": "Szene aus Datei laden",
     "align": "Ausrichten",
     "alignTop": "Obere Kanten",
     "alignBottom": "Untere Kanten",
@@ -105,26 +117,33 @@
     "share": "Teilen",
     "showStroke": "Auswahl für Strichfarbe anzeigen",
     "showBackground": "Hintergrundfarbe auswählen",
-    "toggleTheme": "Design umschalten",
+    "showFonts": "Schriftauswahl anzeigen",
+    "toggleTheme": "Helles/dunkles Design umschalten",
+    "theme": "Design",
     "personalLib": "Persönliche Bibliothek",
     "excalidrawLib": "Excalidraw Bibliothek",
-    "decreaseFontSize": "Schriftgröße verkleinern",
-    "increaseFontSize": "Schrift vergrößern",
+    "decreaseFontSize": "Schriftgröße verringern",
+    "increaseFontSize": "Schriftgröße erhöhen",
     "unbindText": "Text lösen",
     "bindText": "Text an Container binden",
     "createContainerFromText": "Text in Container einbetten",
     "link": {
       "edit": "Link bearbeiten",
-      "editEmbed": "Link bearbeiten & einbetten",
-      "create": "Link erstellen",
-      "createEmbed": "Link erstellen & einbetten",
+      "editEmbed": "Einbettbaren Link bearbeiten",
+      "create": "Link hinzufügen",
       "label": "Link",
       "labelEmbed": "Verlinken & einbetten",
-      "empty": "Kein Link festgelegt"
+      "empty": "Kein Link festgelegt",
+      "hint": "Link hier eingeben oder einfügen",
+      "goToElement": "Gehe zu Zielelement"
     },
     "lineEditor": {
       "edit": "Linie bearbeiten",
-      "exit": "Linieneditor verlassen"
+      "editArrow": "Pfeil bearbeiten"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Sperren",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "Alle Elemente aus dem Rahmen entfernen",
     "eyeDropper": "Farbe von der Zeichenfläche auswählen",
     "textToDiagram": "Text zu Diagramm",
-    "prompt": "Eingabe"
+    "prompt": "Eingabe",
+    "followUs": "Folge uns",
+    "discordChat": "Discord-Chat",
+    "zoomToFitViewport": "Zoom auf Ansicht anpassen",
+    "zoomToFitSelection": "Zoom auf Auswahl anpassen",
+    "zoomToFit": "Zoom auf alle Elemente anpassen",
+    "installPWA": "Excalidraw lokal installieren (PWA)",
+    "autoResize": "Aktiviere automatische Textgrößenanpassung",
+    "imageCropping": "Bild zuschneiden",
+    "unCroppedDimension": "Nicht zugeschnittene Dimension",
+    "copyElementLink": "Link zum Objekt kopieren",
+    "linkToElement": "Link zum Objekt",
+    "wrapSelectionInFrame": "Auswahl in Rahmen einbetten",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Link zum Objekt",
+    "desc": "Klicke auf eine Form auf der Zeichenfläche oder füge einen Link ein.",
+    "notFound": "Verknüpftes Objekt wurde nicht auf der Zeichenfläche gefunden."
   },
   "library": {
     "noItems": "Noch keine Elemente hinzugefügt...",
     "hint_emptyLibrary": "Wähle ein Element auf der Zeichenfläche, um es hier hinzuzufügen. Oder installiere eine Bibliothek aus dem öffentlichen Verzeichnis.",
-    "hint_emptyPrivateLibrary": "Wähle ein Element von der Zeichenfläche, um es hier hinzuzufügen."
+    "hint_emptyPrivateLibrary": "Wähle ein Element von der Zeichenfläche, um es hier hinzuzufügen.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Auf Zeichenfläche suchen",
+    "noMatch": "Keine Treffer gefunden...",
+    "singleResult": "Ergebnis",
+    "multipleResults": "Ergebnisse",
+    "placeholder": "Text auf Zeichenfläche suchen...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Zeichenfläche löschen & Hintergrundfarbe zurücksetzen",
@@ -151,6 +204,7 @@
     "exportImage": "Exportiere Bild...",
     "export": "Speichern als...",
     "copyToClipboard": "In Zwischenablage kopieren",
+    "copyLink": "Link kopieren",
     "save": "In aktueller Datei speichern",
     "saveAs": "Speichern unter",
     "load": "Öffnen",
@@ -171,14 +225,16 @@
     "fullScreen": "Vollbildanzeige",
     "darkMode": "Dunkles Design",
     "lightMode": "Helles Design",
+    "systemMode": "System-Modus",
     "zenMode": "Zen-Modus",
     "objectsSnapMode": "Einrasten an Objekten",
     "exitZenMode": "Zen-Modus verlassen",
     "cancel": "Abbrechen",
+    "saveLibNames": "",
     "clear": "Löschen",
     "remove": "Entfernen",
     "embed": "Einbettung umschalten",
-    "publishLibrary": "Veröffentlichen",
+    "publishLibrary": "",
     "submit": "Absenden",
     "confirm": "Bestätigen",
     "embeddableInteractionButton": "Klicken, um zu interagieren"
@@ -204,7 +260,8 @@
     "resetLibrary": "Dieses löscht deine Bibliothek. Bist du sicher?",
     "removeItemsFromsLibrary": "{{count}} Element(e) aus der Bibliothek löschen?",
     "invalidEncryptionKey": "Verschlüsselungsschlüssel muss 22 Zeichen lang sein. Die Live-Zusammenarbeit ist deaktiviert.",
-    "collabOfflineWarning": "Keine Internetverbindung verfügbar.\nDeine Änderungen werden nicht gespeichert!"
+    "collabOfflineWarning": "Keine Internetverbindung verfügbar.\nDeine Änderungen werden nicht gespeichert!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Nicht unterstützter Dateityp.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Die Datei ist zu groß. Die maximal zulässige Größe ist {{maxSize}}.",
     "svgImageInsertError": "SVG-Bild konnte nicht eingefügt werden. Das SVG-Markup sieht ungültig aus.",
     "failedToFetchImage": "Bild konnte nicht abgerufen werden.",
-    "invalidSVGString": "Ungültige SVG.",
     "cannotResolveCollabServer": "Konnte keine Verbindung zum Collab-Server herstellen. Bitte lade die Seite neu und versuche es erneut.",
     "importLibraryError": "Bibliothek konnte nicht geladen werden",
+    "saveLibraryError": "Bibliothek konnte nicht gespeichert werden. Bitte speichere deine Bibliothek lokal in einer Datei, um sicherzustellen, dass keine Änderungen verloren gehen.",
     "collabSaveFailed": "Keine Speicherung in der Backend-Datenbank möglich. Wenn die Probleme weiterhin bestehen, solltest Du Deine Datei lokal speichern, um sicherzustellen, dass Du Deine Arbeit nicht verlierst.",
     "collabSaveFailed_sizeExceeded": "Keine Speicherung in der Backend-Datenbank möglich, die Zeichenfläche scheint zu groß zu sein. Du solltest Deine Datei lokal speichern, um sicherzustellen, dass Du Deine Arbeit nicht verlierst.",
     "imageToolNotSupported": "Bilder sind deaktiviert.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Auswahl",
+    "lasso": "",
     "image": "Bild einfügen",
     "rectangle": "Rechteck",
     "diamond": "Raute",
@@ -255,7 +313,23 @@
     "hand": "Hand (Schwenkwerkzeug)",
     "extraTools": "Weitere Werkzeuge",
     "mermaidToExcalidraw": "Mermaid zu Excalidraw",
-    "magicSettings": "KI-Einstellungen"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rechteck",
+    "diamond": "Raute",
+    "ellipse": "Ellipse",
+    "arrow": "Pfeil",
+    "line": "Linie",
+    "freedraw": "Frei zeichnen",
+    "text": "Text",
+    "image": "Bild",
+    "group": "Gruppe",
+    "frame": "Rahmen",
+    "magicframe": "Wireframe zu Code",
+    "embeddable": "Web-Einbettung",
+    "selection": "Auswahl",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Aktionen für Zeichenfläche",
@@ -263,28 +337,33 @@
     "shapes": "Formen"
   },
   "hints": {
-    "canvasPanning": "Um die Zeichenfläche zu verschieben, halte das Mausrad oder die Leertaste während des Ziehens, oder verwende das Hand-Werkzeug",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Klicken für Linie mit mehreren Punkten, Ziehen für einzelne Linie",
+    "arrowTool": "",
     "freeDraw": "Klicke und ziehe. Lass los, wenn du fertig bist",
     "text": "Tipp: Du kannst auch Text hinzufügen, indem du mit dem Auswahlwerkzeug auf eine beliebige Stelle doppelklickst",
     "embeddable": "Klicken und ziehen, um eine Webseiten-Einbettung zu erstellen",
-    "text_selected": "Doppelklicken oder Eingabetaste drücken, um Text zu bearbeiten",
-    "text_editing": "Drücke Escape oder CtrlOrCmd+Eingabetaste, um die Bearbeitung abzuschließen",
-    "linearElementMulti": "Zum Beenden auf den letzten Punkt klicken oder Escape oder Eingabe drücken",
-    "lockAngle": "Du kannst Winkel einschränken, indem du SHIFT gedrückt hältst",
-    "resize": "Du kannst die Proportionen einschränken, indem du SHIFT während der Größenänderung gedrückt hältst. Halte ALT gedrückt, um die Größe vom Zentrum aus zu ändern",
-    "resizeImage": "Du kannst die Größe frei ändern, indem du SHIFT gedrückt hältst; halte ALT, um die Größe vom Zentrum aus zu ändern",
-    "rotate": "Du kannst Winkel einschränken, indem du SHIFT während der Drehung gedrückt hältst",
-    "lineEditor_info": "CtrlOrCmd halten und Doppelklick oder CtrlOrCmd + Eingabe drücken, um Punkte zu bearbeiten",
-    "lineEditor_pointSelected": "Drücke Löschen, um Punkt(e) zu entfernen, CtrlOrCmd+D zum Duplizieren oder ziehe zum Verschieben",
-    "lineEditor_nothingSelected": "Wähle einen zu bearbeitenden Punkt (halte SHIFT gedrückt um mehrere Punkte auszuwählen),\noder halte Alt gedrückt und klicke um neue Punkte hinzuzufügen",
-    "placeImage": "Klicken, um das Bild zu platzieren oder klicken und ziehen um seine Größe manuell zu setzen",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Veröffentliche deine eigene Bibliothek",
-    "bindTextToElement": "Zum Hinzufügen Eingabetaste drücken",
-    "deepBoxSelect": "Halte CtrlOrCmd gedrückt, um innerhalb der Gruppe auszuwählen, und um Ziehen zu vermeiden",
-    "eraserRevert": "Halte Alt gedrückt, um die zum Löschen markierten Elemente zurückzusetzen",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Diese Funktion kann wahrscheinlich aktiviert werden, indem die Einstellung \"dom.events.asyncClipboard.clipboardItem\" auf \"true\" gesetzt wird. Um die Browsereinstellungen in Firefox zu ändern, besuche die Seite \"about:config\".",
-    "disableSnapping": "Halte CtrlOrCmd gedrückt, um das Einrasten zu deaktivieren"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Vorschau kann nicht angezeigt werden",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Wir waren sehr vorsichtig und haben deine Zeichnungsinformationen nicht in die Fehlerinformationen aufgenommen. Wenn deine Zeichnung nicht privat ist, unterstütze uns bitte über unseren <button>Bug-Tracker</button>. Bitte teile die unten stehenden Informationen mit uns im GitHub Issue (Kopieren und Einfügen).",
     "sceneContent": "Zeichnungsinhalt:"
   },
+  "shareDialog": {
+    "or": "Oder"
+  },
   "roomDialog": {
-    "desc_intro": "Du kannst Leute zu deiner aktuellen Zeichnung einladen um mit ihnen zusammenzuarbeiten.",
-    "desc_privacy": "Keine Sorge, die Sitzung nutzt eine Ende-zu-Ende-Verschlüsselung. Alles was du zeichnest, bleibt privat. Auch unser Server sieht nicht, was du dir einfallen lässt.",
+    "desc_intro": "Lade Leute ein, an deiner Zeichnung mitzuarbeiten.",
+    "desc_privacy": "Keine Sorge, die Sitzung ist Ende-zu-Ende verschlüsselt und vollständig privat. Nicht einmal unser Server kann sehen, was du zeichnest.",
     "button_startSession": "Sitzung starten",
     "button_stopSession": "Sitzung beenden",
     "desc_inProgressIntro": "Die Live-Sitzung wird nun ausgeführt.",
@@ -328,6 +410,8 @@
     "click": "klicken",
     "deepSelect": "Auswahl innerhalb der Gruppe",
     "deepBoxSelect": "Auswahl innerhalb der Gruppe, und Ziehen vermeiden",
+    "createFlowchart": "Erstelle ein Flussdiagramm aus einem generischen Element",
+    "navigateFlowchart": "Durchsuche ein Flussdiagramm",
     "curvedArrow": "Gebogener Pfeil",
     "curvedLine": "Gebogene Linie",
     "documentation": "Dokumentation",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Auf Auswahl zoomen",
     "toggleElementLock": "Auswahl sperren/entsperren",
     "movePageUpDown": "Seite nach oben/unten verschieben",
-    "movePageLeftRight": "Seite nach links/rechts verschieben"
+    "movePageLeftRight": "Seite nach links/rechts verschieben",
+    "cropStart": "Bild zuschneiden",
+    "cropFinish": "Zuschneiden des Bildes beenden"
   },
   "clearCanvasDialog": {
     "title": "Zeichenfläche löschen"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Winkel",
-    "element": "Element",
-    "elements": "Elemente",
+    "shapes": "Formen",
     "height": "Höhe",
     "scene": "Zeichnung",
     "selected": "Ausgewählt",
     "storage": "Speicher",
-    "title": "Statistiken für Nerds",
+    "fullTitle": "Zeichenflächen- & Formeigenschaften",
+    "title": "Eigenschaften",
+    "generalStats": "Allgemein",
+    "elementProperties": "Formeigenschaften",
     "total": "Gesamt",
     "version": "Version",
     "versionCopy": "Zum Kopieren klicken",
@@ -439,13 +527,15 @@
     "copyStyles": "Formatierungen kopiert.",
     "copyToClipboard": "In die Zwischenablage kopiert.",
     "copyToClipboardAsPng": "{{exportSelection}} als PNG in die Zwischenablage kopiert\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} als SVG in die Zwischenablage kopiert ({{exportColorScheme}})",
     "fileSaved": "Datei gespeichert.",
     "fileSavedToFilename": "Als {filename} gespeichert",
     "canvas": "Zeichenfläche",
     "selection": "Auswahl",
     "pasteAsSingleElement": "Verwende {{shortcut}} , um als einzelnes Element\neinzufügen oder in einen existierenden Texteditor einzufügen",
     "unableToEmbed": "Einbetten dieser URL ist derzeit nicht zulässig. Erstelle einen Issue auf GitHub, um die URL freigeben zu lassen",
-    "unrecognizedLinkFormat": "Der Link, den Du eingebettet hast, stimmt nicht mit dem erwarteten Format überein. Bitte versuche den 'embed' String einzufügen, der von der Quellseite zur Verfügung gestellt wird"
+    "unrecognizedLinkFormat": "Der Link, den Du eingebettet hast, stimmt nicht mit dem erwarteten Format überein. Bitte versuche den 'embed' String einzufügen, der von der Quellseite zur Verfügung gestellt wird",
+    "elementLinkCopied": "Link in Zwischenablage kopiert"
   },
   "colors": {
     "transparent": "Transparent",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Beliebteste benutzerdefinierte Farben",
     "colors": "Farben",
     "shades": "Schattierungen",
@@ -521,5 +612,53 @@
     "description": "Derzeit werden nur <flowchartLink>Flussdiagramme</flowchartLink>, <sequenceLink>Sequenzdiagramme</sequenceLink> und <classLink>Klassendiagramme</classLink> unterstützt. Die anderen Typen werden als Bild in Excalidraw dargestellt.",
     "syntax": "Mermaid-Syntax",
     "preview": "Vorschau"
+  },
+  "quickSearch": {
+    "placeholder": "Schnellsuche"
+  },
+  "fontList": {
+    "badge": {
+      "old": "alt"
+    },
+    "sceneFonts": "In dieser Szene",
+    "availableFonts": "Verfügbare Schriftarten",
+    "empty": "Keine Schriftarten gefunden"
+  },
+  "userList": {
+    "empty": "Keine Benutzer gefunden",
+    "hint": {
+      "text": "Klicke auf Benutzer um zu folgen",
+      "followStatus": "Du folgst derzeit diesem Benutzer",
+      "inCall": "Benutzer ist in einem Sprachanruf",
+      "micMuted": "Mikrofon des Benutzers ist stumm geschaltet",
+      "isSpeaking": "Benutzer spricht"
+    }
+  },
+  "commandPalette": {
+    "title": "Befehlspalette",
+    "shortcuts": {
+      "select": "Auswählen",
+      "confirm": "Bestätigen",
+      "close": "Schließen"
+    },
+    "recents": "Zuletzt verwendet",
+    "search": {
+      "placeholder": "Suche in Menüs und Befehlen, entdecke versteckte Funktionen",
+      "noMatch": "Keine passenden Befehle..."
+    },
+    "itemNotAvailable": "Befehl ist nicht verfügbar...",
+    "shortcutHint": "Benutze {{shortcut}} für Befehlspalette"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/el-GR.json b/packages/excalidraw/locales/el-GR.json
index f6fa2f0f9e..746e242361 100644
--- a/packages/excalidraw/locales/el-GR.json
+++ b/packages/excalidraw/locales/el-GR.json
@@ -11,17 +11,19 @@
     "copyAsPng": "Αντιγραφή στο πρόχειρο ως PNG",
     "copyAsSvg": "Αντιγραφή στο πρόχειρο ως SVG",
     "copyText": "Αντιγραφή στο πρόχειρο ως κείμενο",
-    "copySource": "",
-    "convertToCode": "",
-    "bringForward": "Στο προσκήνιο",
-    "sendToBack": "Ένα επίπεδο πίσω",
-    "bringToFront": "Ένα επίπεδο μπροστά",
+    "copySource": "Αντιγραφή προέλευσης στο πρόχειρο",
+    "convertToCode": "Μετατροπή σε κώδικα",
+    "bringForward": "Μεταφορά μπροστά",
+    "sendToBack": "Στείλ' το στο τέλος",
+    "bringToFront": "Φερ' το μπροστά",
     "sendBackward": "Στο παρασκήνιο",
     "delete": "Διαγραφή",
     "copyStyles": "Αντιγραφή εμφάνισης",
     "pasteStyles": "Επικόλληση εμφάνισης",
     "stroke": "Μολυβιά",
+    "changeStroke": "Αλλαγή χρώματος πινελιάς",
     "background": "Φόντο",
+    "changeBackground": "Αλλαγή χρώματος παρασκηνίου",
     "fill": "Γέμισμα",
     "strokeWidth": "Πάχος μολυβιάς",
     "strokeStyle": "Στυλ περιγράμματος",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Κανένα",
     "arrowhead_arrow": "Βέλος",
     "arrowhead_bar": "Μπάρα",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Κύκλος",
+    "arrowhead_circle_outline": "Κύκλος (περίγραμμα)",
     "arrowhead_triangle": "Τρίγωνο",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Τρίγωνο (περίγραμμα)",
+    "arrowhead_diamond": "Ρόμβος",
+    "arrowhead_diamond_outline": "Ρόμβος (περίγραμμα)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "Τύπος βέλους",
+    "arrowtype_sharp": "Αιχμηρό βέλος",
+    "arrowtype_round": "Κυρτό βέλος",
+    "arrowtype_elbowed": "Γωνιακό βέλος",
     "fontSize": "Μέγεθος γραμματοσειράς",
     "fontFamily": "Γραμματοσειρά",
     "addWatermark": "Προσθήκη \"Φτιαγμένο με Excalidraw\"",
@@ -56,7 +66,7 @@
     "veryLarge": "Πολύ μεγάλο",
     "solid": "Συμπαγής",
     "hachure": "Εκκόλαψη",
-    "zigzag": "",
+    "zigzag": "Τεθλασμένη γραμμή",
     "crossHatch": "Διασταυρούμενη εκκόλαψη",
     "thin": "Λεπτή",
     "bold": "Έντονη",
@@ -72,6 +82,7 @@
     "canvasColors": "Χρησιμοποείται στον καμβά",
     "canvasBackground": "Φόντο καμβά",
     "drawingCanvas": "Σχεδίαση καμβά",
+    "clearCanvas": "Καθαρισμός καμβά",
     "layers": "Στρώματα",
     "actions": "Ενέργειες",
     "language": "Γλώσσα",
@@ -84,12 +95,13 @@
     "group": "Δημιουργία ομάδας από επιλογή",
     "ungroup": "Κατάργηση ομάδας από επιλογή",
     "collaborators": "Συνεργάτες",
-    "showGrid": "Προβολή πλέγματος",
+    "toggleGrid": "Εναλλαγή ορατότητας πλέγματος",
     "addToLibrary": "Προσθήκη στη βιβλιοθήκη",
     "removeFromLibrary": "Αφαίρεση από τη βιβλιοθήκη",
     "libraryLoadingMessage": "Φόρτωση βιβλιοθήκης…",
     "libraries": "Άλλες βιβλιοθήκες",
     "loadingScene": "Φόρτωση σκηνής…",
+    "loadScene": "Φόρτωση σκηνής από αρχείο",
     "align": "Στοίχιση",
     "alignTop": "Στοίχιση πάνω",
     "alignBottom": "Στοίχιση κάτω",
@@ -105,26 +117,33 @@
     "share": "Κοινοποίηση",
     "showStroke": "Εμφάνιση επιλογέα χρωμάτων πινελιάς",
     "showBackground": "Εμφάνιση επιλογέα χρώματος φόντου",
-    "toggleTheme": "Εναλλαγή θέματος",
+    "showFonts": "Εμφάνιση επιλογέα γραμματοσειράς",
+    "toggleTheme": "Εναλλαγή φωτεινού/σκοτεινού θέματος",
+    "theme": "Θέμα",
     "personalLib": "Προσωπική Βιβλιοθήκη",
     "excalidrawLib": "Βιβλιοθήκη Excalidraw",
     "decreaseFontSize": "Μείωση μεγέθους γραμματοσειράς",
     "increaseFontSize": "Αύξηση μεγέθους γραμματοσειράς",
     "unbindText": "Αποσύνδεση κειμένου",
     "bindText": "Δέσμευση κειμένου στο δοχείο",
-    "createContainerFromText": "",
+    "createContainerFromText": "Αναδίπλωση κειμένου σε δοχείο",
     "link": {
       "edit": "Επεξεργασία συνδέσμου",
       "editEmbed": "",
-      "create": "Δημιουργία συνδέσμου",
-      "createEmbed": "",
+      "create": "",
       "label": "Σύνδεσμος",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "Σύνδεσμος & ενσωμάτωση",
+      "empty": "Δεν έχει οριστεί σύνδεσμος",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Επεξεργασία γραμμής",
-      "exit": "Έξοδος επεξεργαστή κειμένου"
+      "editArrow": "Επεξεργασία βέλους"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Κλείδωμα",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "Δημοσιευμένο",
     "sidebarLock": "Κρατήστε την πλαϊνή μπάρα ανοιχτή",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "selectAllElementsInFrame": "Επιλογή όλων των στοιχείων στο πλαίσιο",
+    "removeAllElementsFromFrame": "Αφαίρεση όλων των στοιχείων από το πλαίσιο",
+    "eyeDropper": "Διαλέξτε χρώμα απ' τον καμβά",
+    "textToDiagram": "Κείμενο σε διάγραμμα",
+    "prompt": "Εντολή",
+    "followUs": "Ακολουθήστε μας",
+    "discordChat": "Συνομιλία Discord",
+    "zoomToFitViewport": "Εστίαση για να χωρέσει στο παράθυρο προβολής",
+    "zoomToFitSelection": "Εστίαση για να χωρέσει στην επιλογή",
+    "zoomToFit": "Εστίαση για να χωρέσει σε όλα τα στοιχεία",
+    "installPWA": "Τοπική εγκατάσταση Excalidraw (PWA)",
+    "autoResize": "Ενεργοποίηση αυτόματης αλλαγής μεγέθους κειμένου",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Δεν έχουν προστεθεί αντικείμενα ακόμη...",
     "hint_emptyLibrary": "Επιλέξτε ένα στοιχείο στον καμβά για να το προσθέσετε εδώ, ή εγκαταστήστε μια βιβλιοθήκη από το δημόσιο αποθετήριο, παρακάτω.",
-    "hint_emptyPrivateLibrary": "Επιλέξτε ένα στοιχείο στον καμβά για να το προσθέσετε εδώ."
+    "hint_emptyPrivateLibrary": "Επιλέξτε ένα στοιχείο στον καμβά για να το προσθέσετε εδώ.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Επαναφορά του καμβά",
@@ -151,6 +204,7 @@
     "exportImage": "Εξαγωγή εικόνας...",
     "export": "Αποθήκευση ως...",
     "copyToClipboard": "Αντιγραφή στο πρόχειρο",
+    "copyLink": "Αντιγραφή συνδέσμου",
     "save": "Αποθήκευση στο τρέχον αρχείο",
     "saveAs": "Αποθήκευση ως",
     "load": "Άνοιγμα",
@@ -171,17 +225,19 @@
     "fullScreen": "Πλήρης οθόνη",
     "darkMode": "Σκοτεινή λειτουργία",
     "lightMode": "Φωτεινή λειτουργία",
+    "systemMode": "Λειτουργία συστήματος",
     "zenMode": "Λειτουργία Zεν",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Προσκόλληση σε αντικείμενα",
     "exitZenMode": "Έξοδος από την λειτουργία Zen",
     "cancel": "Ακύρωση",
+    "saveLibNames": "",
     "clear": "Καθαρισμός",
     "remove": "Κατάργηση",
-    "embed": "",
-    "publishLibrary": "Δημοσίευση",
+    "embed": "Εναλλαγή ενσωμάτωσης",
+    "publishLibrary": "",
     "submit": "Υποβολή",
     "confirm": "Επιβεβαίωση",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Κάντε κλικ για αλληλεπίδραση"
   },
   "alerts": {
     "clearReset": "Αυτό θα σβήσει ολόκληρο τον καμβά. Είσαι σίγουρος;",
@@ -204,37 +260,39 @@
     "resetLibrary": "Αυτό θα καθαρίσει τη βιβλιοθήκη σας. Είστε σίγουροι;",
     "removeItemsFromsLibrary": "Διαγραφή {{count}} αντικειμένου(ων) από τη βιβλιοθήκη;",
     "invalidEncryptionKey": "Το κλειδί κρυπτογράφησης πρέπει να είναι 22 χαρακτήρες. Η ζωντανή συνεργασία είναι απενεργοποιημένη.",
-    "collabOfflineWarning": "Δεν υπάρχει διαθέσιμη σύνδεση στο internet.\nΟι αλλαγές σας δεν θα αποθηκευτούν!"
+    "collabOfflineWarning": "Δεν υπάρχει διαθέσιμη σύνδεση στο internet.\nΟι αλλαγές σας δεν θα αποθηκευτούν!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Μη υποστηριζόμενος τύπος αρχείου.",
     "imageInsertError": "Αδυναμία εισαγωγής εικόνας. Προσπαθήστε ξανά αργότερα...",
     "fileTooBig": "Το αρχείο είναι πολύ μεγάλο. Το μέγιστο επιτρεπόμενο μέγεθος είναι {{maxSize}}.",
     "svgImageInsertError": "Αδυναμία εισαγωγής εικόνας SVG. Η σήμανση της SVG δεν φαίνεται έγκυρη.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "Μη έγκυρο SVG.",
+    "failedToFetchImage": "Αποτυχία ανάκτησης εικόνας.",
     "cannotResolveCollabServer": "Αδυναμία σύνδεσης με τον διακομιστή συνεργασίας. Παρακαλώ ανανεώστε τη σελίδα και προσπαθήστε ξανά.",
     "importLibraryError": "Αδυναμία φόρτωσης βιβλιοθήκης",
+    "saveLibraryError": "Αδύνατη η αποθήκευση της βιβλιοθήκης στον δίσκο. Παρακαλώ αποθηκεύστε τη βιβλιοθήκη σας σε ένα αρχείο τοπικά για να βεβαιωθείτε ότι δε θα χάσετε τις αλλαγές.",
     "collabSaveFailed": "Η αποθήκευση στη βάση δεδομένων δεν ήταν δυνατή. Αν το προβλήματα παραμείνει, θα πρέπει να αποθηκεύσετε το αρχείο σας τοπικά για να βεβαιωθείτε ότι δεν χάνετε την εργασία σας.",
     "collabSaveFailed_sizeExceeded": "Η αποθήκευση στη βάση δεδομένων δεν ήταν δυνατή, ο καμβάς φαίνεται να είναι πολύ μεγάλος. Θα πρέπει να αποθηκεύσετε το αρχείο τοπικά για να βεβαιωθείτε ότι δεν θα χάσετε την εργασία σας.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Οι εικόνες είναι απενεργοποιημένες.",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": ""
+      "line1": "Φαίνεται ότι χρησιμοποιείτε τον περιηγητή Brave με ενεργοποιημένη τη ρύθμιση <bold>Aggressively Block Fingerprinting</bold>.",
+      "line2": "Αυτό θα μπορεί να οδηγήσει στη διάλυση των <bold>Στοιχείων Κειμένου</bold> στο σχέδιό σας.",
+      "line3": "Σας συνιστούμε να απενεργοποιήσετε αυτή τη ρύθμιση. Μπορείτε να ακολουθήσετε <link>αυτά τα βήματα</link> για το πώς να το κάνετε.",
+      "line4": "Εάν η απενεργοποίηση αυτής της ρύθμισης δε διορθώσει την εμφάνιση των στοιχείων κειμένου, παρακαλώ ανοίξτε ένα <issueLink>θέμα</issueLink> στο GitHub, ή γράψτε μας στο <discordLink>Discord</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "Τα ενσωματώσιμα στοιχεία δεν μπορούν να προστεθούν στη βιβλιοθήκη.",
+      "iframe": "Τα στοιχεία IFrame δεν μπορούν να προστεθούν στη βιβλιοθήκη.",
+      "image": "Η υποστήριξη για προσθήκη εικόνων στη βιβλιοθήκη έρχεται σύντομα!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Δεν ήταν δυνατή η επικόλληση (δεν ήταν δυνατή η ανάγνωση από το πρόχειρο του συστήματος).",
+    "asyncPasteFailedOnParse": "Αδυναμία επικόλλησης.",
+    "copyToSystemClipboardFailed": "Αδυναμία αντιγραφής στο πρόχειρο."
   },
   "toolBar": {
     "selection": "Επιλογή",
+    "lasso": "",
     "image": "Εισαγωγή εικόνας",
     "rectangle": "Ορθογώνιο",
     "diamond": "Ρόμβος",
@@ -246,16 +304,32 @@
     "library": "Βιβλιοθήκη",
     "lock": "Κράτησε επιλεγμένο το εργαλείο μετά το σχέδιο",
     "penMode": "Λειτουργία μολυβιού - αποτροπή αφής",
-    "link": "Προσθήκη/ Ενημέρωση συνδέσμου για ένα επιλεγμένο σχήμα",
+    "link": "Προσθήκη / Ενημέρωση συνδέσμου για επιλεγμένο σχήμα",
     "eraser": "Γόμα",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
-    "hand": "",
-    "extraTools": "",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "frame": "Εργαλείο πλαισίου",
+    "magicframe": "Wireframe σε κώδικα",
+    "embeddable": "Web Embed",
+    "laser": "Δείκτης λέιζερ",
+    "hand": "Χέρι (εργαλείο μετακίνησης)",
+    "extraTools": "Περισσότερα εργαλεία",
+    "mermaidToExcalidraw": "Mermaid σε Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Ορθογώνιο",
+    "diamond": "Ρόμβος",
+    "ellipse": "Έλλειψη",
+    "arrow": "Βέλος",
+    "line": "Γραμμή",
+    "freedraw": "Ελεύθερη σχεδίαση",
+    "text": "Κείμενο",
+    "image": "Εικόνα",
+    "group": "Ομάδα",
+    "frame": "Πλαίσιο",
+    "magicframe": "Wireframe σε κώδικα",
+    "embeddable": "Web Embed",
+    "selection": "Επιλογή",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Ενέργειες καμβά",
@@ -263,28 +337,33 @@
     "shapes": "Σχήματα"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "Κάνε κλικ για να ξεκινήσεις πολλαπλά σημεία, σύρε για μια γραμμή",
+    "arrowTool": "",
     "freeDraw": "Κάντε κλικ και σύρτε, απελευθερώσατε όταν έχετε τελειώσει",
     "text": "Tip: μπορείτε επίσης να προσθέστε κείμενο με διπλό-κλικ οπουδήποτε με το εργαλείο επιλογών",
-    "embeddable": "",
-    "text_selected": "Κάντε διπλό κλικ ή πατήστε ENTER για να επεξεργαστείτε το κείμενο",
-    "text_editing": "Πατήστε Escape ή CtrlOrCmd+ENTER για να ολοκληρώσετε την επεξεργασία",
-    "linearElementMulti": "Κάνε κλικ στο τελευταίο σημείο ή πάτησε Escape ή Enter για να τελειώσεις",
-    "lockAngle": "Μπορείτε να περιορίσετε τη γωνία κρατώντας πατημένο το SHIFT",
-    "resize": "Μπορείς να περιορίσεις τις αναλογίες κρατώντας το SHIFT ενώ αλλάζεις μέγεθος,\nκράτησε πατημένο το ALT για αλλαγή μεγέθους από το κέντρο",
-    "resizeImage": "Μπορείτε να αλλάξετε το μέγεθος ελεύθερα κρατώντας πατημένο το SHIFT,\nκρατήστε πατημένο το ALT για να αλλάξετε το μέγεθος από το κέντρο",
-    "rotate": "Μπορείς να περιορίσεις τις γωνίες κρατώντας πατημένο το πλήκτρο SHIFT κατά την περιστροφή",
-    "lineEditor_info": "Κρατήστε πατημένο Ctrl ή Cmd και πατήστε το πλήκτρο Ctrl ή Cmd + Enter για επεξεργασία σημείων",
-    "lineEditor_pointSelected": "Πατήστε Διαγραφή για αφαίρεση σημείου(ων),\nCtrlOrCmd+D για αντιγραφή, ή σύρετε για μετακίνηση",
-    "lineEditor_nothingSelected": "Επιλέξτε ένα σημείο για να επεξεργαστείτε (κρατήστε πατημένο το SHIFT για να επιλέξετε πολλαπλά),\nή κρατήστε πατημένο το Alt και κάντε κλικ για να προσθέσετε νέα σημεία",
-    "placeImage": "Κάντε κλικ για να τοποθετήσετε την εικόνα ή κάντε κλικ και σύρετε για να ορίσετε το μέγεθός της χειροκίνητα",
+    "embeddable": "Κάντε κλικ και σύρετε για να δημιουργήσετε μια ενσωματωμένη ιστοσελίδα",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Δημοσιεύστε τη δική σας βιβλιοθήκη",
-    "bindTextToElement": "Πατήστε Enter για προσθήκη κειμένου",
-    "deepBoxSelect": "Κρατήστε πατημένο το CtrlOrCmd για να επιλέξετε βαθιά, και να αποτρέψετε τη μεταφορά",
-    "eraserRevert": "Κρατήστε πατημένο το Alt για να επαναφέρετε τα στοιχεία που σημειώθηκαν για διαγραφή",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Αυτή η επιλογή μπορεί πιθανώς να ενεργοποιηθεί αλλάζοντας την ρύθμιση \"dom.events.asyncClipboard.clipboardItem\" σε \"true\". Για να αλλάξετε τις ρυθμίσεις του προγράμματος περιήγησης στο Firefox, επισκεφθείτε τη σελίδα \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Αδυναμία εμφάνισης προεπισκόπησης",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Ήμασταν πολύ προσεκτικοί για να μην συμπεριλάβουμε τις πληροφορίες της σκηνής σου στο σφάλμα. Αν η σκηνή σου δεν είναι ιδιωτική, παρακαλώ σκέψου να ακολουθήσεις το δικό μας <button>ανιχνευτής σφαλμάτων.</button> Παρακαλώ να συμπεριλάβετε τις παρακάτω πληροφορίες, αντιγράφοντας και επικολλώντας το ζήτημα στο GitHub.",
     "sceneContent": "Περιεχόμενο σκηνής:"
   },
+  "shareDialog": {
+    "or": "Ή"
+  },
   "roomDialog": {
-    "desc_intro": "Μπορείς να προσκαλέσεις άλλους να δουλέψουν μαζί σου.",
-    "desc_privacy": "Μην ανησυχείς, η συνεδρία χρησιμοποιεί κρυπτογράφηση από σημείο σε σημείο, άρα οτιδήποτε κάνεις θα παραμείνει ανοιχτό μόνο σε εσένα. Ούτε οι μηχανές μας μπορούν να δουν τι κάνεις.",
+    "desc_intro": "Προσκαλέστε άτομα για να συνεργαστείτε στο σχέδιό σας.",
+    "desc_privacy": "Μην ανησυχείτε, η συνεδρία είναι κρυπτογραφημένη από άκρο σε άκρο, και πλήρως ιδιωτική. Ούτε ο διακομιστής μας μπορεί να δει τι σχεδιάζετε.",
     "button_startSession": "Έναρξη Συνεδρίας",
     "button_stopSession": "Τερματισμός Συνεδρίας",
     "desc_inProgressIntro": "Η ζωντανή συνεργασία με άλλους είναι σε ενεργή.",
@@ -328,14 +410,16 @@
     "click": "κλικ",
     "deepSelect": "Βαθιά επιλογή",
     "deepBoxSelect": "Βαθιά επιλογή μέσα στο πλαίσιο και αποτροπή συρσίματος",
+    "createFlowchart": "Δημιουργία διαγράμματος ροής από ένα γενικό στοιχείο",
+    "navigateFlowchart": "Πλοήγηση σε ένα διάγραμμα ροής",
     "curvedArrow": "Κυρτό βέλος",
     "curvedLine": "Κυρτή γραμμή",
     "documentation": "Εγχειρίδιο",
     "doubleClick": "διπλό κλικ",
     "drag": "σύρε",
     "editor": "Επεξεργαστής",
-    "editLineArrowPoints": "",
-    "editText": "",
+    "editLineArrowPoints": "Επεξεργασία σημείων γραμμής/βέλους",
+    "editText": "Επεξεργασία κειμένου / προσθήκη ετικέτας",
     "github": "Βρήκατε πρόβλημα; Υποβάλετε το",
     "howto": "Ακολουθήστε τους οδηγούς μας",
     "or": "ή",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Ζουμ στην επιλογή",
     "toggleElementLock": "Κλείδωμα/Ξεκλείδωμα επιλογής",
     "movePageUpDown": "Μετακίνηση σελίδας πάνω/κάτω",
-    "movePageLeftRight": "Μετακίνηση σελίδας αριστερά/δεξιά"
+    "movePageLeftRight": "Μετακίνηση σελίδας αριστερά/δεξιά",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Καθαρισμός καμβά"
@@ -359,8 +445,8 @@
     "title": "Δημοσίευση βιβλιοθήκης",
     "itemName": "Όνομα αντικειμένου",
     "authorName": "Όνομα δημιουργού",
-    "githubUsername": "GitHub username",
-    "twitterUsername": "Twitter username",
+    "githubUsername": "Όνομα χρήστη GitHub",
+    "twitterUsername": "Όνομα χρήστη Twitter",
     "libraryName": "Όνομα βιβλιοθήκης",
     "libraryDesc": "Περιγραφή βιβλιοθήκης",
     "website": "Ιστοσελίδα",
@@ -392,27 +478,27 @@
     "removeItemsFromLib": "Αφαίρεση επιλεγμένων αντικειμένων από τη βιβλιοθήκη"
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "Εξαγωγή εικόνας",
     "label": {
-      "withBackground": "",
-      "onlySelected": "",
-      "darkMode": "",
-      "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "withBackground": "Παρασκήνιο",
+      "onlySelected": "Μόνο τα επιλεγμένα",
+      "darkMode": "Σκοτεινό θέμα",
+      "embedScene": "Ενσωμάτωση σκηνής",
+      "scale": "Κλιμάκωση",
+      "padding": "Περιθώριο"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "Τα δεδομένα σκηνής θα αποθηκευτούν στο αρχείο PNG/SVG προς εξαγωγή ώστε η σκηνή να είναι δυνατό να αποκατασταθεί από αυτό.\nΘα αυξήσει το μέγεθος του αρχείου προς εξαγωγή."
     },
     "title": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "Εξαγωγή σε PNG",
+      "exportToSvg": "Εξαγωγή σε SVG",
+      "copyPngToClipboard": "Αντιγραφή PNG στο πρόχειρο"
     },
     "button": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "PNG",
+      "exportToSvg": "SVG",
+      "copyPngToClipboard": "Αντιγραφή στο πρόχειρο"
     }
   },
   "encrypted": {
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Γωνία",
-    "element": "Στοιχείο",
-    "elements": "Στοιχεία",
+    "shapes": "Σχήματα",
     "height": "Ύψος",
     "scene": "Σκηνή",
     "selected": "Επιλεγμένα",
     "storage": "Χώρος",
-    "title": "Στατιστικά για σπασίκλες",
+    "fullTitle": "Ιδιότητες Καμβά & Σχήματος",
+    "title": "Ιδιότητες",
+    "generalStats": "Γενικά",
+    "elementProperties": "Ιδιότητες σχήματος",
     "total": "Σύνολο ",
     "version": "Έκδοση",
     "versionCopy": "Κάνε κλικ για αντιγραφή",
@@ -439,13 +527,15 @@
     "copyStyles": "Αντιγράφηκαν στυλ.",
     "copyToClipboard": "Αντιγράφηκε στο πρόχειρο.",
     "copyToClipboardAsPng": "Αντιγράφηκε {{exportSelection}} στο πρόχειρο ως PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Το αρχείο αποθηκεύτηκε.",
     "fileSavedToFilename": "Αποθηκεύτηκε στο {filename}",
     "canvas": "καμβάς",
     "selection": "επιλογή",
     "pasteAsSingleElement": "Χρησιμοποίησε το {{shortcut}} για να επικολλήσεις ως ένα μόνο στοιχείο,\nή να επικολλήσεις σε έναν υπάρχοντα επεξεργαστή κειμένου",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "Η ενσωμάτωση αυτού του url δεν επιτρέπεται αυτήν τη στιγμή. Θέστε ένα πρόβλημα στο GitHub για να ζητήσετε το url να είναι στη λίστα των επιτρεπόμενων.",
+    "unrecognizedLinkFormat": "Ο σύνδεσμος που ενσωματώσατε δεν ταιριάζει με την αναμενόμενη μορφή. Παρακαλώ προσπαθήστε να επικολλήσετε τη συμβολοσειρά 'embed' που παρέχεται από τον ιστότοπο προορισμού",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Διαφανές",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Πιο χρησιμοποιούμενα χρώματα",
     "colors": "Χρώματα",
     "shades": "Αποχρώσεις",
@@ -487,39 +578,87 @@
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Εξαγωγή ως εικόνα",
+        "button": "Εξαγωγή ως εικόνα",
+        "description": "Εξαγωγή δεδομένων σκηνής σε ένα αρχείο από το οποίο μπορείτε να εισάγετε αργότερα."
       },
       "saveToDisk": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Αποθήκευση στο δίσκο",
+        "button": "Αποθήκευση στο δίσκο",
+        "description": "Εξαγωγή δεδομένων σκηνής σε ένα αρχείο από το οποίο μπορείτε να εισάγετε αργότερα."
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Excalidraw+",
+        "button": "Εξαγωγή σε Excalidraw+",
+        "description": "Αποθηκεύστε τη σκηνή στο χώρο εργασίας σας Excalidraw+."
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Φόρτωση από αρχείο",
+        "button": "Φόρτωση από αρχείο",
+        "description": "Η φόρτωση από αρχείο θα <bold>αντικαταστήσει το υπάρχον περιεχόμενό σας</bold>.<br></br>Μπορείτε πρώτα να δημιουργήσετε αντίγραφα ασφαλείας του σχεδίου σας χρησιμοποιώντας μία από τις παρακάτω επιλογές."
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Φόρτωση από σύνδεσμο",
+        "button": "Αντικατάσταση του περιεχομένου μου",
+        "description": "Η φόρτωση εξωτερικού σχεδίου θα <bold>αντικαταστήσει το υπάρχον περιεχόμενο</bold>.<br></br>Μπορείτε να δημιουργήσετε αντίγραφα ασφαλείας του σχεδίου σας πρώτα χρησιμοποιώντας μία από τις παρακάτω επιλογές."
       }
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid σε Excalidraw",
+    "button": "Εισαγωγή",
+    "description": "Επί του παρόντος υποστηρίζονται μόνο Διαγράμματα <flowchartLink>Ροής</flowchartLink>,<sequenceLink> Ακολουθίας, </sequenceLink> και <classLink>Κλάσεων</classLink>. Οι άλλοι τύποι θα αποδοθούν ως εικόνα στο Excalidraw.",
+    "syntax": "Σύνταξη Mermaid",
+    "preview": "Προεπισκόπηση"
+  },
+  "quickSearch": {
+    "placeholder": "Γρήγορη αναζήτηση"
+  },
+  "fontList": {
+    "badge": {
+      "old": "παλιό"
+    },
+    "sceneFonts": "Σε αυτή τη σκηνή",
+    "availableFonts": "Διαθέσιμες γραμματοσειρές",
+    "empty": "Δεν βρέθηκαν γραμματοσειρές"
+  },
+  "userList": {
+    "empty": "Δεν βρέθηκαν χρήστες",
+    "hint": {
+      "text": "Κάντε κλικ στο χρήστη για να τον ακολουθήσετε",
+      "followStatus": "Ακολουθείτε αυτόν τον χρήστη",
+      "inCall": "Ο χρήστης βρίσκεται σε κλήση",
+      "micMuted": "Το μικρόφωνο του χρήστη είναι σε σίγαση",
+      "isSpeaking": "Ο χρήστης μιλάει"
+    }
+  },
+  "commandPalette": {
+    "title": "Παλέτα Εντολών",
+    "shortcuts": {
+      "select": "Επιλογή",
+      "confirm": "Επιβεβαίωση",
+      "close": "Κλείσιμο"
+    },
+    "recents": "Πρόσφατα χρησιμοποιημένα",
+    "search": {
+      "placeholder": "Αναζητήστε μενού, εντολές και ανακαλύψτε κρυμμένα διαμάντια",
+      "noMatch": "Δεν υπάρχουν εντολές που ταιριάζουν..."
+    },
+    "itemNotAvailable": "Η εντολή δεν είναι διαθέσιμη...",
+    "shortcutHint": "Για την παλέτα εντολών, χρησιμοποιήστε το {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/en.json b/packages/excalidraw/locales/en.json
index 3b382893d4..96e280e46c 100644
--- a/packages/excalidraw/locales/en.json
+++ b/packages/excalidraw/locales/en.json
@@ -347,6 +347,7 @@
     "canvasPanning": "To move canvas, hold {{shortcut_1}} or {{shortcut_2}} while dragging, or use the hand tool",
     "linearElement": "Click to start multiple points, drag for single line",
     "arrowTool": "Click to start multiple points, drag for single line. Press {{shortcut}} again to change arrow type.",
+    "arrowBindModifiers": "Hold {{shortcut_1}} to disable binding, or {{shortcut_2}} to bind at a fixed point",
     "freeDraw": "Click and drag, release when you're finished",
     "text": "Tip: you can also add text by double-clicking anywhere with the selection tool",
     "embeddable": "Click-drag to create a website embed",
diff --git a/packages/excalidraw/locales/es-ES.json b/packages/excalidraw/locales/es-ES.json
index ab7152829a..fd37153f48 100644
--- a/packages/excalidraw/locales/es-ES.json
+++ b/packages/excalidraw/locales/es-ES.json
@@ -21,7 +21,9 @@
     "copyStyles": "Copiar estilos",
     "pasteStyles": "Pegar estilos",
     "stroke": "Trazo",
+    "changeStroke": "Cambiar el color del trazo",
     "background": "Fondo",
+    "changeBackground": "Cambiar el color de fondo",
     "fill": "Rellenar",
     "strokeWidth": "Grosor del trazo",
     "strokeStyle": "Estilo del trazo",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "Triángulo (contorno)",
     "arrowhead_diamond": "Diamante",
     "arrowhead_diamond_outline": "Diamante (contorno)",
+    "arrowhead_crowfoot_many": "Pie de la corona (varios)",
+    "arrowhead_crowfoot_one": "Pie de la corona (uno)",
+    "arrowhead_crowfoot_one_or_many": "Pie de la corona (uno o varios)",
+    "more_options": "Más opciones",
+    "arrowtypes": "Tipo de flecha",
+    "arrowtype_sharp": "Flecha Afilada",
+    "arrowtype_round": "Flecha Curva",
+    "arrowtype_elbowed": "Flecha de codo",
     "fontSize": "Tamaño de la fuente",
     "fontFamily": "Tipo de fuente",
     "addWatermark": "Agregar \"Hecho con Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Usado en lienzo",
     "canvasBackground": "Fondo del lienzo",
     "drawingCanvas": "Lienzo de dibujo",
+    "clearCanvas": "Lona transparente",
     "layers": "Capas",
     "actions": "Acciones",
     "language": "Idioma",
@@ -84,12 +95,13 @@
     "group": "Agrupar selección",
     "ungroup": "Desagrupar selección",
     "collaborators": "Colaboradores",
-    "showGrid": "Mostrar cuadrícula",
+    "toggleGrid": "Alternar rejilla",
     "addToLibrary": "Añadir a la biblioteca",
     "removeFromLibrary": "Eliminar de la biblioteca",
     "libraryLoadingMessage": "Cargando biblioteca…",
     "libraries": "Explorar bibliotecas",
     "loadingScene": "Cargando escena…",
+    "loadScene": "Cargar escena desde archivo",
     "align": "Alinear",
     "alignTop": "Alineación superior",
     "alignBottom": "Alineación inferior",
@@ -105,7 +117,9 @@
     "share": "Compartir",
     "showStroke": "Mostrar selector de color de trazo",
     "showBackground": "Mostrar el selector de color de fondo",
-    "toggleTheme": "Cambiar tema",
+    "showFonts": "Mostrar selector de fuentes",
+    "toggleTheme": "Cambiar tema claro/oscuro",
+    "theme": "Tema",
     "personalLib": "Biblioteca personal",
     "excalidrawLib": "Biblioteca Excalidraw",
     "decreaseFontSize": "Disminuir tamaño de letra",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Envolver el texto en un contenedor",
     "link": {
       "edit": "Editar enlace",
-      "editEmbed": "Editar enlace e incrustar",
-      "create": "Crear enlace",
-      "createEmbed": "Crear enlace e incrustar",
+      "editEmbed": "Editar enlace incrustable",
+      "create": "Añadir enlace",
       "label": "Enlace",
       "labelEmbed": "Enlazar e incrustar",
-      "empty": "No se ha establecido un enlace"
+      "empty": "No se ha establecido un enlace",
+      "hint": "Escribe o pega tu enlace aquí",
+      "goToElement": "Ir al elemento objetivo"
     },
     "lineEditor": {
       "edit": "Editar línea",
-      "exit": "Salir del editor en línea"
+      "editArrow": "Editar flecha"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Bloquear",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "Eliminar todos los elementos del marco",
     "eyeDropper": "Seleccionar un color del lienzo",
     "textToDiagram": "Texto a diagrama",
-    "prompt": "Sugerencia"
+    "prompt": "Prompt",
+    "followUs": "Síguenos",
+    "discordChat": "Chat de Discord",
+    "zoomToFitViewport": "Zoom para encajar en la ventana",
+    "zoomToFitSelection": "Zoom para ajustar la selección",
+    "zoomToFit": "Zoom para mostrar todos los elementos",
+    "installPWA": "Instalar Excalidraw localmente (PWA)",
+    "autoResize": "Activar redimensionado automático de texto",
+    "imageCropping": "Recortar imagen",
+    "unCroppedDimension": "Dimensión no recortada",
+    "copyElementLink": "Copiar enlace al objeto",
+    "linkToElement": "Enlace al objeto",
+    "wrapSelectionInFrame": "Ajustar la selección en el marco",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Enlace al objeto",
+    "desc": "Haga clic en una forma en lienzo o pegue un enlace.",
+    "notFound": "El objeto vinculado no se encontró en el lienzo."
   },
   "library": {
     "noItems": "No hay elementos añadidos todavía...",
     "hint_emptyLibrary": "Seleccione un elemento en el lienzo para añadirlo aquí, o instale una biblioteca del repositorio público, a continuación.",
-    "hint_emptyPrivateLibrary": "Seleccione un elemento del lienzo para añadirlo aquí."
+    "hint_emptyPrivateLibrary": "Seleccione un elemento del lienzo para añadirlo aquí.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Encontrar en lienzo",
+    "noMatch": "No hay coincidencias...",
+    "singleResult": "resultado",
+    "multipleResults": "resultados",
+    "placeholder": "Encontrar texto en lienzo...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Limpiar lienzo y reiniciar el color de fondo",
@@ -151,6 +204,7 @@
     "exportImage": "Exportar imagen...",
     "export": "Guardar en...",
     "copyToClipboard": "Copiar al portapapeles",
+    "copyLink": "Copiar enlace",
     "save": "Guardar en archivo actual",
     "saveAs": "Guardar como",
     "load": "Abrir",
@@ -171,14 +225,16 @@
     "fullScreen": "Pantalla completa",
     "darkMode": "Modo oscuro",
     "lightMode": "Modo claro",
+    "systemMode": "Modo del sistema",
     "zenMode": "Modo Zen",
     "objectsSnapMode": "Ajustar a los objetos",
     "exitZenMode": "Salir del modo Zen",
     "cancel": "Cancelar",
+    "saveLibNames": "",
     "clear": "Borrar",
     "remove": "Eliminar",
-    "embed": "",
-    "publishLibrary": "Publicar",
+    "embed": "Alternar incrustación",
+    "publishLibrary": "",
     "submit": "Enviar",
     "confirm": "Confirmar",
     "embeddableInteractionButton": "Pulsa para interactuar"
@@ -204,7 +260,8 @@
     "resetLibrary": "Esto borrará tu biblioteca. ¿Estás seguro?",
     "removeItemsFromsLibrary": "¿Eliminar {{count}} elemento(s) de la biblioteca?",
     "invalidEncryptionKey": "La clave de cifrado debe tener 22 caracteres. La colaboración en vivo está deshabilitada.",
-    "collabOfflineWarning": "No hay conexión a internet disponible.\n¡No se guardarán los cambios!"
+    "collabOfflineWarning": "No hay conexión a internet disponible.\n¡No se guardarán los cambios!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipo de archivo no admitido.",
@@ -212,22 +269,22 @@
     "fileTooBig": "Archivo demasiado grande. El tamaño máximo permitido es {{maxSize}}.",
     "svgImageInsertError": "No se pudo insertar la imagen SVG. El código SVG parece inválido.",
     "failedToFetchImage": "Error al obtener la imagen.",
-    "invalidSVGString": "SVG no válido.",
     "cannotResolveCollabServer": "No se pudo conectar al servidor colaborador. Por favor, vuelva a cargar la página y vuelva a intentarlo.",
     "importLibraryError": "No se pudo cargar la librería",
+    "saveLibraryError": "No se pudo guardar la biblioteca en el almacenamiento. Por favor, guarde su biblioteca en un archivo localmente para asegurarse de que no pierde los cambios.",
     "collabSaveFailed": "No se pudo guardar en la base de datos del backend. Si los problemas persisten, debería guardar su archivo localmente para asegurarse de que no pierde su trabajo.",
     "collabSaveFailed_sizeExceeded": "No se pudo guardar en la base de datos del backend, el lienzo parece ser demasiado grande. Debería guardar el archivo localmente para asegurarse de que no pierde su trabajo.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Las imágenes están desactivadas.",
     "brave_measure_text_error": {
       "line1": "Parece que estás usando el navegador Brave con el ajuste <bold>Forzar el bloqueo de huellas digitales</bold> habilitado.",
       "line2": "Esto podría resultar en errores en los <bold>Elementos de Texto</bold> en tus dibujos.",
       "line3": "Recomendamos fuertemente deshabilitar esta configuración. Puedes seguir <link>estos pasos</link> sobre cómo hacerlo.",
-      "line4": ""
+      "line4": "Si deshabilitar esta opción no arregla la visualización de elementos conformados por texto, por favor abre un <issueLink>problema</issueLink> en nuestro GitHub o escríbanos en <discordLink>Discord</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
+      "embeddable": "Los elementos incrustables no pueden ser añadidos a la biblioteca.",
       "iframe": "Los elementos IFrame no se pueden agregar a la biblioteca.",
-      "image": ""
+      "image": "¡Soporte para añadir imágenes a la biblioteca muy pronto!"
     },
     "asyncPasteFailedOnRead": "No se pudo pegar (no se pudo leer desde el portapapeles del sistema).",
     "asyncPasteFailedOnParse": "No se pudo pegar.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Selección",
+    "lasso": "",
     "image": "Insertar imagen",
     "rectangle": "Rectángulo",
     "diamond": "Diamante",
@@ -248,14 +306,30 @@
     "penMode": "Modo Lápiz - previene toque",
     "link": "Añadir/Actualizar enlace para una forma seleccionada",
     "eraser": "Borrar",
-    "frame": "",
+    "frame": "Herramienta Estructura",
     "magicframe": "Esquema a código",
     "embeddable": "Incrustar Web",
     "laser": "Puntero láser",
     "hand": "Mano (herramienta de panoramización)",
     "extraTools": "Más herramientas",
     "mermaidToExcalidraw": "Mermaid a Excalidraw",
-    "magicSettings": "Ajustes AI"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rectángulo",
+    "diamond": "Rombo",
+    "ellipse": "Elipse",
+    "arrow": "Flecha",
+    "line": "Línea",
+    "freedraw": "Dibujar a mano",
+    "text": "Texto",
+    "image": "Imagen",
+    "group": "Grupo",
+    "frame": "Marco",
+    "magicframe": "Esquema a código",
+    "embeddable": "Incrustar Web",
+    "selection": "Selección",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Acciones del lienzo",
@@ -263,28 +337,33 @@
     "shapes": "Formas"
   },
   "hints": {
-    "canvasPanning": "Para mover el lienzo, mantenga la rueda del ratón o la barra espaciadora mientras arrastra o utilice la herramienta de mano",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Haz clic para dibujar múltiples puntos, arrastrar para solo una línea",
+    "arrowTool": "",
     "freeDraw": "Haz clic y arrastra, suelta al terminar",
     "text": "Consejo: también puedes añadir texto haciendo doble clic en cualquier lugar con la herramienta de selección",
     "embeddable": "Haga clic y arrastre para crear un sitio web incrustado",
-    "text_selected": "Doble clic o pulse ENTER para editar el texto",
-    "text_editing": "Pulse Escape o Ctrl/Cmd + ENTER para terminar de editar",
-    "linearElementMulti": "Haz clic en el último punto o presiona Escape o Enter para finalizar",
-    "lockAngle": "Puedes restringir el ángulo manteniendo presionado el botón SHIFT",
-    "resize": "Para mantener las proporciones mantén SHIFT presionado mientras modificas el tamaño, \nmantén presionado ALT para modificar el tamaño desde el centro",
-    "resizeImage": "Puede redimensionar libremente pulsando SHIFT,\npulse ALT para redimensionar desde el centro",
-    "rotate": "Puedes restringir los ángulos manteniendo presionado SHIFT mientras giras",
-    "lineEditor_info": "Mantenga pulsado CtrlOrCmd y haga doble click o presione CtrlOrCmd + Enter para editar puntos",
-    "lineEditor_pointSelected": "Presione Suprimir para eliminar el/los punto(s), CtrlOrCmd+D para duplicarlo, o arrástrelo para moverlo",
-    "lineEditor_nothingSelected": "Seleccione un punto a editar (mantenga MAYÚSCULAS para seleccionar múltiples),\no mantenga pulsado Alt y haga click para añadir nuevos puntos",
-    "placeImage": "Haga clic para colocar la imagen o haga click y arrastre para establecer su tamaño manualmente",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publica tu propia biblioteca",
-    "bindTextToElement": "Presione Entrar para agregar",
-    "deepBoxSelect": "Mantén CtrlOrCmd para seleccionar en profundidad, y para evitar arrastrar",
-    "eraserRevert": "Mantenga pulsado Alt para revertir los elementos marcados para su eliminación",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Esta característica puede ser habilitada estableciendo la bandera \"dom.events.asyncClipboard.clipboardItem\" a \"true\". Para cambiar las banderas del navegador en Firefox, visite la página \"about:config\".",
-    "disableSnapping": "Mantén pulsado CtrlOrCmd para desactivar el ajuste"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "No se puede mostrar la vista previa",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Fuimos muy cautelosos de no incluir la información de tu escena en el error. Si tu escena no es privada, por favor considera seguir nuestro <button>rastreador de errores.</button> Por favor, incluya la siguiente información copiándola y pegándola en el issue de GitHub.",
     "sceneContent": "Contenido de la escena:"
   },
+  "shareDialog": {
+    "or": "O"
+  },
   "roomDialog": {
-    "desc_intro": "Puede invitar a otras personas a tu actual escena para que colaboren contigo.",
-    "desc_privacy": "No te preocupes, la sesión usa encriptación de punta a punta, por lo que todo lo que se dibuje se mantendrá privadamente. Ni siquiera nuestro servidor podrá ver lo que haces.",
+    "desc_intro": "Invita a gente a colaborar en tu dibujo.",
+    "desc_privacy": "No te preocupes, la sesión está encriptada de extremo a extremo y es totalmente privada. Ni siquiera nuestro servidor puede ver lo que dibujas.",
     "button_startSession": "Iniciar sesión",
     "button_stopSession": "Detener sesión",
     "desc_inProgressIntro": "La sesión de colaboración en vivo está ahora en progreso.",
@@ -325,9 +407,11 @@
   },
   "helpDialog": {
     "blog": "Lea nuestro blog",
-    "click": "click",
+    "click": "clic",
     "deepSelect": "Selección profunda",
     "deepBoxSelect": "Seleccione en profundidad dentro de la caja, y evite arrastrar",
+    "createFlowchart": "Crear un diagrama de flujo a partir de un elemento genérico",
+    "navigateFlowchart": "Navegar un diagrama de flujo",
     "curvedArrow": "Flecha curva",
     "curvedLine": "Línea curva",
     "documentation": "Documentación",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Ampliar selección",
     "toggleElementLock": "Bloquear/desbloquear selección",
     "movePageUpDown": "Mover página hacia arriba/abajo",
-    "movePageLeftRight": "Mover página hacia la izquierda/derecha"
+    "movePageLeftRight": "Mover página hacia la izquierda/derecha",
+    "cropStart": "Recortar imagen",
+    "cropFinish": "Terminar recorte de imagen"
   },
   "clearCanvasDialog": {
     "title": "Borrar lienzo"
@@ -402,7 +488,7 @@
       "padding": "Espaciado"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "Los datos de la escena se guardarán en el archivo PNG/SVG exportado, así la escena puede ser restaurada desde la misma. Esto acción aumentará el tamaño del archivo exportado."
     },
     "title": {
       "exportToPng": "Exportar a PNG",
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Ángulo",
-    "element": "Elemento",
-    "elements": "Elementos",
+    "shapes": "Formas",
     "height": "Alto",
     "scene": "Escena",
     "selected": "Seleccionado",
     "storage": "Almacenamiento",
-    "title": "Estadísticas para nerds",
+    "fullTitle": "Propiedades del Lienzo y Forma",
+    "title": "Propiedades",
+    "generalStats": "General",
+    "elementProperties": "Propiedades de forma",
     "total": "Total",
     "version": "Versión",
     "versionCopy": "Click para copiar",
@@ -439,13 +527,15 @@
     "copyStyles": "Estilos copiados.",
     "copyToClipboard": "Copiado en el portapapeles.",
     "copyToClipboardAsPng": "Copiado {{exportSelection}} al portapapeles como PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Copiado {{exportSelection}} al portapapeles como PNG\n({{exportColorScheme}})",
     "fileSaved": "Archivo guardado.",
     "fileSavedToFilename": "Guardado en {filename}",
     "canvas": "lienzo",
     "selection": "selección",
     "pasteAsSingleElement": "Usa {{shortcut}} para pegar como un solo elemento,\no pegar en un editor de texto existente",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "Incorporar esta url no está permitido actualmente. Señale esta incidencia en nuestro GitHub para solicitar que esta url esté entre las permitidas",
+    "unrecognizedLinkFormat": "El enlace que incrustó no coincide con el formato esperado. Por favor intente pegar la cadena 'embed' proporcionada por el sitio de origen",
+    "elementLinkCopied": "Enlace copiado al portapapeles"
   },
   "colors": {
     "transparent": "Transparente",
@@ -478,18 +568,19 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Colores personalizados más utilizados",
     "colors": "Colores",
-    "shades": "",
+    "shades": "Sombras",
     "hexCode": "Código Hexadecimal",
-    "noShades": ""
+    "noShades": "No hay sombras disponibles para este color"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
         "title": "Exportar como imagen",
         "button": "Exportar como imagen",
-        "description": ""
+        "description": "Exporta los datos de la escena como una imagen desde el cual podrás importarlo más tarde."
       },
       "saveToDisk": {
         "title": "Guardar en el disco",
@@ -497,16 +588,16 @@
         "description": "Exporta los datos de la escena a un archivo desde el cual podrás importar más tarde."
       },
       "excalidrawPlus": {
-        "title": "",
+        "title": "Excalidraw+",
         "button": "Exportar a Excalidraw+",
-        "description": ""
+        "description": "Guarda la escena en su espacio de trabajo de Excalidraw+."
       }
     },
     "modal": {
       "loadFromFile": {
         "title": "Cargar desde un archivo",
         "button": "Cargar desde un archivo",
-        "description": ""
+        "description": "Cargando desde un archivo <bold>reemplazará tu contenido actual</bold> <br></br>Puedes primero hacer una copia de seguridad usando una de las siguientes opciones."
       },
       "shareableLink": {
         "title": "Cargar desde un enlace",
@@ -518,8 +609,56 @@
   "mermaid": {
     "title": "Mermaid a Excalidraw",
     "button": "Insertar",
-    "description": "Actualmente sólo <flowchartLink>Flowchart</flowchartLink>,<sequenceLink> Secuencia, </sequenceLink> y <classLink>Class </classLink>Diagramas son soportados. Los otros tipos se renderizarán como imagen en Excalidraw.",
+    "description": "Actualmente sólo estos tipos de <flowchartLink>diagrama de flujo</flowchartLink>,<sequenceLink> Secuencia, </sequenceLink> y <classLink>Clase </classLink> son soportados. Los otros tipos de diagramas se renderizarán como imagen en Excalidraw.",
     "syntax": "Sintaxis Mermaid",
     "preview": "Vista previa"
+  },
+  "quickSearch": {
+    "placeholder": "Búsqueda rápida"
+  },
+  "fontList": {
+    "badge": {
+      "old": "viejo"
+    },
+    "sceneFonts": "En esta escena",
+    "availableFonts": "Fuentes disponibles",
+    "empty": "No se han encontrado fuentes"
+  },
+  "userList": {
+    "empty": "No se han encontrado usuarios",
+    "hint": {
+      "text": "Haga clic en el usuario para seguir",
+      "followStatus": "Ya estás siguiendo a este usuario",
+      "inCall": "El usuario está en una llamada de voz",
+      "micMuted": "El micrófono del usuario está silenciado",
+      "isSpeaking": "El usuario está hablando"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta de comandos",
+    "shortcuts": {
+      "select": "Seleccionar",
+      "confirm": "Confirmar",
+      "close": "Cerrar"
+    },
+    "recents": "Usado recientemente",
+    "search": {
+      "placeholder": "Busca menús, comandos y descubre gemas ocultas",
+      "noMatch": "No hay comandos coincidentes..."
+    },
+    "itemNotAvailable": "Comando no disponible...",
+    "shortcutHint": "Para la paleta de comandos, utilice {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/eu-ES.json b/packages/excalidraw/locales/eu-ES.json
index 19c9adb5f1..6136a2fbdd 100644
--- a/packages/excalidraw/locales/eu-ES.json
+++ b/packages/excalidraw/locales/eu-ES.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Kopiatu arbelera PNG gisa",
     "copyAsSvg": "Kopiatu arbelera SVG gisa",
     "copyText": "Kopiatu arbelera testu gisa",
-    "copySource": "Kopiatu iturria arbelean",
-    "convertToCode": "Bihurtu kodea",
+    "copySource": "Kopiatu jatorria arbelean",
+    "convertToCode": "Kodera bihurtu",
     "bringForward": "Ekarri aurrerago",
     "sendToBack": "Eraman atzera",
     "bringToFront": "Ekarri aurrera",
@@ -21,7 +21,9 @@
     "copyStyles": "Kopiatu estiloak",
     "pasteStyles": "Itsatsi estiloak",
     "stroke": "Marra",
+    "changeStroke": "Marraren kolorea aldatu",
     "background": "Atzeko planoa",
+    "changeBackground": "Atzealdeko kolorea aldatu",
     "fill": "Bete",
     "strokeWidth": "Marraren zabalera",
     "strokeStyle": "Marraren estiloa",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Bat ere ez",
     "arrowhead_arrow": "Gezia",
     "arrowhead_bar": "Barra",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Zirkulua",
+    "arrowhead_circle_outline": "Zirkulua (eskema)",
     "arrowhead_triangle": "Hirukia",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Triangelua (eskema)",
+    "arrowhead_diamond": "Erromboa",
+    "arrowhead_diamond_outline": "Erromboa (eskema)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Letra-tamaina",
     "fontFamily": "Letra-tipoa",
     "addWatermark": "Gehitu \"Excalidraw bidez egina\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Oihalean erabilita",
     "canvasBackground": "Oihalaren atzeko planoa",
     "drawingCanvas": "Marrazteko oihala",
+    "clearCanvas": "Garbitu",
     "layers": "Geruzak",
     "actions": "Ekintzak",
     "language": "Hizkuntza",
@@ -84,12 +95,13 @@
     "group": "Hautapena taldea bihurtu",
     "ungroup": "Desegin hautapenaren taldea",
     "collaborators": "Kolaboratzaileak",
-    "showGrid": "Erakutsi sareta",
+    "toggleGrid": "Txandakatu sareta",
     "addToLibrary": "Gehitu liburutegira",
     "removeFromLibrary": "Kendu liburutegitik",
     "libraryLoadingMessage": "Liburutegia kargatzen…",
     "libraries": "Arakatu liburutegiak",
     "loadingScene": "Eszena kargatzen…",
+    "loadScene": "Fitxategitik kargatu",
     "align": "Lerrokatu",
     "alignTop": "Lerrokatu goian",
     "alignBottom": "Lerrokatu behean",
@@ -105,7 +117,9 @@
     "share": "Partekatu",
     "showStroke": "Erakutsi marraren kolore-hautatzailea",
     "showBackground": "Erakutsi atzeko planoaren kolore-hautatzailea",
-    "toggleTheme": "Aldatu gaia",
+    "showFonts": "",
+    "toggleTheme": "Gaia argia/iluna aktibatu",
+    "theme": "Itxura",
     "personalLib": "Liburutegi pertsonala",
     "excalidrawLib": "Excalidraw liburutegia",
     "decreaseFontSize": "Txikitu letra tamaina",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Bilatu testua edukiontzi batean",
     "link": {
       "edit": "Editatu esteka",
-      "editEmbed": "Editatu esteka eta kapsulatu",
-      "create": "Sortu esteka",
-      "createEmbed": "Sortu esteka eta kapsulatu",
+      "editEmbed": "",
+      "create": "",
       "label": "Esteka",
       "labelEmbed": "Esteka eta kapsula",
-      "empty": "Ez da estekarik ezarri"
+      "empty": "Ez da estekarik ezarri",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Editatu lerroa",
-      "exit": "Irten lerro-editoretik"
+      "editArrow": "Gezia aldatu"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Blokeatu",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "Kendu markoko elementu guztiak",
     "eyeDropper": "Aukeratu kolorea oihaletik",
     "textToDiagram": "Testutik diagramara",
-    "prompt": ""
+    "prompt": "Galdetu",
+    "followUs": "Jarraitu gaitzazu",
+    "discordChat": "Discord txata",
+    "zoomToFitViewport": "Zoom ikuspegira",
+    "zoomToFitSelection": "Zoom hautapenera",
+    "zoomToFit": "Egin zoom elementu guztiak ikusteko",
+    "installPWA": "Instalatu Excalidraw lokalean (PWA)",
+    "autoResize": "Textu zabalera automatikoa aktibatu",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Oraindik ez da elementurik gehitu...",
     "hint_emptyLibrary": "Hautatu oihaleko elementu bat hemen gehitzeko, edo instalatu liburutegi bat beheko biltegi publikotik.",
-    "hint_emptyPrivateLibrary": "Hautatu oihaleko elementu bat hemen gehitzeko."
+    "hint_emptyPrivateLibrary": "Hautatu oihaleko elementu bat hemen gehitzeko.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Garbitu oihala",
@@ -151,6 +204,7 @@
     "exportImage": "Esportatu irudia...",
     "export": "Gorde hemen...",
     "copyToClipboard": "Kopiatu arbelera",
+    "copyLink": "",
     "save": "Gorde uneko fitxategian",
     "saveAs": "Gorde honela",
     "load": "Ireki",
@@ -171,14 +225,16 @@
     "fullScreen": "Pantaila osoa",
     "darkMode": "Modu iluna",
     "lightMode": "Modu argia",
+    "systemMode": "",
     "zenMode": "Zen modua",
     "objectsSnapMode": "Atxiki objektuei",
     "exitZenMode": "Irten Zen modutik",
     "cancel": "Utzi",
+    "saveLibNames": "",
     "clear": "Garbitu",
     "remove": "Kendu",
     "embed": "Aldatu kapsulatzea",
-    "publishLibrary": "Argitaratu",
+    "publishLibrary": "",
     "submit": "Bidali",
     "confirm": "Bai",
     "embeddableInteractionButton": "Egin klik elkar eragiteko"
@@ -204,7 +260,8 @@
     "resetLibrary": "Honek zure liburutegia garbituko du. Ziur zaude?",
     "removeItemsFromsLibrary": "Liburutegitik {{count}} elementu ezabatu?",
     "invalidEncryptionKey": "Enkriptazio-gakoak 22 karaktere izan behar ditu. Zuzeneko lankidetza desgaituta dago.",
-    "collabOfflineWarning": "Ez dago Interneteko konexiorik.\nZure aldaketak ez dira gordeko!"
+    "collabOfflineWarning": "Ez dago Interneteko konexiorik.\nZure aldaketak ez dira gordeko!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Onartu gabeko fitxategi mota.",
@@ -212,12 +269,12 @@
     "fileTooBig": "Fitxategia handiegia da. Onartutako gehienezko tamaina {{maxSize}} da.",
     "svgImageInsertError": "Ezin izan da SVG irudia txertatu. SVG markak baliogabea dirudi.",
     "failedToFetchImage": "Ezin izan da irudia eskuratu.",
-    "invalidSVGString": "SVG baliogabea.",
     "cannotResolveCollabServer": "Ezin izan da elkarlaneko zerbitzarira konektatu. Mesedez, berriro kargatu orria eta saiatu berriro.",
     "importLibraryError": "Ezin izan da liburutegia kargatu",
+    "saveLibraryError": "Ezin izan da liburutegian gorde. Mesedez, gorde fitxategi lokal batetara aldaketarik ez galtzeko.",
     "collabSaveFailed": "Ezin izan da backend datu-basean gorde. Arazoak jarraitzen badu, zure fitxategia lokalean gorde beharko zenuke zure lana ez duzula galtzen ziurtatzeko.",
     "collabSaveFailed_sizeExceeded": "Ezin izan da backend datu-basean gorde, ohiala handiegia dela dirudi. Fitxategia lokalean gorde beharko zenuke zure lana galtzen ez duzula ziurtatzeko.",
-    "imageToolNotSupported": "Irudiak desgaituta daude.",
+    "imageToolNotSupported": "Irudiak desgaituak daude.",
     "brave_measure_text_error": {
       "line1": "Brave arakatzailea erabiltzen ari zarela dirudi <bold>Blokeatu hatz-markak erasokorki</bold> ezarpena gaituta.",
       "line2": "Honek zure marrazkietako <bold>Testu-elementuak</bold> hautsi ditzake.",
@@ -226,7 +283,7 @@
     },
     "libraryElementTypeError": {
       "embeddable": "Kapsulatutako elementuak ezin dira liburutegira gehitu.",
-      "iframe": "IFrame elementuak ezin dira liburutegira gehitu.",
+      "iframe": "Kapsulatutako elementuak ezin dira liburutegira gehitu.",
       "image": "Laster egongo da irudiak liburutegian gehitzeko laguntza!"
     },
     "asyncPasteFailedOnRead": "Ezin izan da itsatsi (ezin izan da sistemaren arbeletik irakurri).",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Hautapena",
+    "lasso": "",
     "image": "Txertatu irudia",
     "rectangle": "Laukizuzena",
     "diamond": "Diamantea",
@@ -249,13 +307,29 @@
     "link": "Gehitu / Eguneratu esteka hautatutako forma baterako",
     "eraser": "Borragoma",
     "frame": "Marko tresna",
-    "magicframe": "Wireframe kodetzeko",
+    "magicframe": "Wireframetik kodera",
     "embeddable": "Web kapsulatzea",
     "laser": "Laser punteroa",
     "hand": "Eskua (panoratze tresna)",
     "extraTools": "Tresna gehiago",
-    "mermaidToExcalidraw": "",
-    "magicSettings": "AI ezarpenak"
+    "mermaidToExcalidraw": "Mermaid-etik Excalidraw-ra",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Canvas ekintzak",
@@ -263,28 +337,33 @@
     "shapes": "Formak"
   },
   "hints": {
-    "canvasPanning": "Oihala mugitzeko, eutsi saguaren gurpila edo zuriune-barra arrastatzean, edo erabili esku tresna",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Egin klik hainbat puntu hasteko, arrastatu lerro bakarrerako",
+    "arrowTool": "",
     "freeDraw": "Egin klik eta arrastatu, askatu amaitutakoan",
     "text": "Aholkua: testua gehitu dezakezu edozein lekutan klik bikoitza eginez hautapen tresnarekin",
     "embeddable": "Egin klik eta arrastatu webgunea kapsulatzeko",
-    "text_selected": "Egin klik bikoitza edo sakatu SARTU testua editatzeko",
-    "text_editing": "Sakatu Esc edo Ctrl+SARTU editatzen amaitzeko",
-    "linearElementMulti": "Egin klik azken puntuan edo sakatu Esc edo Sartu amaitzeko",
-    "lockAngle": "SHIFT sakatuta angelua mantendu dezakezu",
-    "resize": "Proportzioak mantendu ditzakezu SHIFT sakatuta tamaina aldatzen duzun bitartean.\nsakatu ALT erditik tamaina aldatzeko",
-    "resizeImage": "Tamaina libreki alda dezakezu SHIFT sakatuta,\nsakatu ALT erditik tamaina aldatzeko",
-    "rotate": "Angeluak mantendu ditzakezu SHIFT sakatuta biratzen duzun bitartean",
-    "lineEditor_info": "Eutsi sakatuta Ctrl edo Cmd eta egin klik bikoitza edo sakatu Ctrl edo Cmd + Sartu puntuak editatzeko",
-    "lineEditor_pointSelected": "Sakatu Ezabatu puntuak kentzeko,\nKtrl+D bikoizteko, edo arrastatu mugitzeko",
-    "lineEditor_nothingSelected": "Hautatu editatzeko puntu bat (SHIFT sakatuta anitz hautatzeko),\nedo eduki Alt sakatuta eta egin klik puntu berriak gehitzeko",
-    "placeImage": "Egin klik irudia kokatzeko, edo egin klik eta arrastatu bere tamaina eskuz ezartzeko",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Argitaratu zure liburutegia",
-    "bindTextToElement": "Sakatu Sartu testua gehitzeko",
-    "deepBoxSelect": "Eutsi Ctrl edo Cmd sakatuta aukeraketa sakona egiteko eta arrastatzea saihesteko",
-    "eraserRevert": "Eduki Alt sakatuta ezabatzeko markatutako elementuak leheneratzeko",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Ezaugarri hau \"dom.events.asyncClipboard.clipboardItem\" marka \"true\" gisa ezarrita gaitu daiteke. Firefox-en arakatzailearen banderak aldatzeko, bisitatu \"about:config\" orrialdera.",
-    "disableSnapping": "Eduki sakatuta Ctrl edo Cmd tekla atxikipena desgaitzeko"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Ezin da oihala aurreikusi",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Oso kontuz ibili gara zure eszenaren informazioa errorean ez sartzeko. Zure eszena pribatua ez bada, kontuan hartu gure <button>erroreen jarraipena egitea.</button> Sartu beheko informazioa kopiatu eta itsatsi bidez GitHub issue-n.",
     "sceneContent": "Eszenaren edukia:"
   },
+  "shareDialog": {
+    "or": "Edo"
+  },
   "roomDialog": {
-    "desc_intro": "Jendea zure uneko eszenara gonbida dezakezu zurekin elkarlanean aritzeko.",
-    "desc_privacy": "Ez kezkatu, saioak muturretik muturrerako enkriptatzea erabiltzen du, beraz, marrazten duzuna pribatua izango da. Gure zerbitzariak ere ezingo du ikusi zer egiten duzun.",
+    "desc_intro": "Gonbidatu jendea zure marrazkira.",
+    "desc_privacy": "Lasai, sesioa encriptatua dago eta erabat pribatua da. Gure zerbitzarian ere ezin da ikusi zure marrazkia.",
     "button_startSession": "Hasi saioa",
     "button_stopSession": "Itxi saioa",
     "desc_inProgressIntro": "Zuzeneko lankidetza saioa abian da.",
@@ -328,6 +410,8 @@
     "click": "sakatu",
     "deepSelect": "Hautapen sakona",
     "deepBoxSelect": "Hautapen sakona egin laukizuzen bidez, eta saihestu arrastatzea",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Gezi kurbatua",
     "curvedLine": "Lerro kurbatua",
     "documentation": "Dokumentazioa",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zooma hautapenera",
     "toggleElementLock": "Blokeatu/desbloketatu hautapena",
     "movePageUpDown": "Mugitu orria gora/behera",
-    "movePageLeftRight": "Mugitu orria ezker/eskuin"
+    "movePageLeftRight": "Mugitu orria ezker/eskuin",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Garbitu oihala"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Angelua",
-    "element": "Elementua",
-    "elements": "Elementuak",
+    "shapes": "",
     "height": "Altuera",
     "scene": "Eszena",
     "selected": "Hautatua",
     "storage": "Biltegia",
-    "title": "Datuak",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Guztira",
     "version": "Bertsioa",
     "versionCopy": "Klikatu kopiatzeko",
@@ -439,13 +527,15 @@
     "copyStyles": "Estiloak kopiatu dira.",
     "copyToClipboard": "Arbelean kopiatu da.",
     "copyToClipboardAsPng": "{{exportSelection}} kopiatu da arbelean PNG gisa\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Fitxategia gorde da.",
     "fileSavedToFilename": "{filename}-n gorde da",
     "canvas": "oihala",
     "selection": "hautapena",
     "pasteAsSingleElement": "Erabili {{shortcut}} elementu bakar gisa itsasteko,\nedo itsatsi lehendik dagoen testu-editore batean",
     "unableToEmbed": "Url hau txertatzea ez da une honetan onartzen. Sortu issue bat GitHub-en Urla zerrenda zurian sartzea eskatzeko",
-    "unrecognizedLinkFormat": "Kapsulatu duzun esteka ez dator bat espero den formatuarekin. Mesedez, saiatu iturburu-guneak emandako 'kapsulatu' katea itsasten"
+    "unrecognizedLinkFormat": "Kapsulatu duzun esteka ez dator bat espero den formatuarekin. Mesedez, saiatu iturburu-guneak emandako 'kapsulatu' katea itsasten",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Gardena",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Gehien erabilitako kolore pertsonalizatuak",
     "colors": "Koloreak",
     "shades": "Ñabardurak",
@@ -516,10 +607,58 @@
     }
   },
   "mermaid": {
-    "title": "",
+    "title": "Mermaid-etik Excalidraw-ra",
     "button": "Txertatu",
-    "description": "",
-    "syntax": "",
+    "description": "Momentu honetan <flowchartLink>Flowchart</flowchartLink>, <sequenceLink> Sequence, </sequenceLink> eta <classLink>Class </classLink>Diagramak onartzen dira. Beste motak irudi gisa errendatuko dira Excalidrawn.",
+    "syntax": "Mermaid sintaxia",
     "preview": "Aurrebista"
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "Klik erabiltzailean jarraitzeko",
+      "followStatus": "Dagoeneko erabiltzaile hau jarraitzen ari zara",
+      "inCall": "Erabiltzailea dei batean dago",
+      "micMuted": "Erabiltzailearen mikronofoa isildua dago",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/fa-IR.json b/packages/excalidraw/locales/fa-IR.json
index 838973e527..78ab76c03e 100644
--- a/packages/excalidraw/locales/fa-IR.json
+++ b/packages/excalidraw/locales/fa-IR.json
@@ -1,27 +1,29 @@
 {
   "labels": {
-    "paste": "جای گذاری",
-    "pasteAsPlaintext": "جای‌گذاری به عنوان متن ساده",
-    "pasteCharts": "قراردادن نمودارها",
+    "paste": "جایگذاری",
+    "pasteAsPlaintext": "جایگذاری به عنوان متن ساده",
+    "pasteCharts": "جایگذاری نمودارها",
     "selectAll": "انتخاب همه",
-    "multiSelect": "یک ایتم به انتخاب شده ها اضافه کنید.",
+    "multiSelect": "یک ایتم به انتخاب شده ها اضافه کنید",
     "moveCanvas": "جابجایی بوم",
     "cut": "بریدن",
     "copy": "کپی",
     "copyAsPng": "کپی در حافطه موقت به صورت PNG",
     "copyAsSvg": "کپی در حافطه موقت به صورت SVG",
     "copyText": "کپی در حافطه موقت به صورت متن",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "کپی منبع در حافظه موقت",
+    "convertToCode": "تبدیل به کد",
     "bringForward": "جلو آوردن",
-    "sendToBack": "پس فرستادن",
+    "sendToBack": "ارسال به عقب",
     "bringToFront": "جلو آوردن",
     "sendBackward": "پس فرستادن",
     "delete": "حذف",
     "copyStyles": "کپی سبک",
-    "pasteStyles": "جای گذاری سبک",
+    "pasteStyles": "جایگذاری سبک",
     "stroke": "حاشیه",
+    "changeStroke": "تغییر رنگ حاشیه",
     "background": "پس زمینه",
+    "changeBackground": "تغییر رنگ پس زمینه",
     "fill": "رنگ آمیزی",
     "strokeWidth": "ضخامت حاشیه",
     "strokeStyle": "استایل حاشیه",
@@ -30,24 +32,32 @@
     "strokeStyle_dotted": "نقطه چین",
     "sloppiness": "دقت",
     "opacity": "شفافیت",
-    "textAlign": "چیدمان متن",
+    "textAlign": "تراز متن",
     "edges": "لبه ها",
     "sharp": "تیز",
-    "round": "دور",
+    "round": "گرد",
     "arrowheads": "سر پیکان",
     "arrowhead_none": "هیچ کدام",
     "arrowhead_arrow": "پیکان",
     "arrowhead_bar": "میله ای",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "دایره",
+    "arrowhead_circle_outline": "دایره (پیرامون)",
     "arrowhead_triangle": "مثلث",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "مثلث (پیرامون)",
+    "arrowhead_diamond": "الماس",
+    "arrowhead_diamond_outline": "الماس (پیرامون)",
+    "arrowhead_crowfoot_many": "پای کلاغی (بسیار)",
+    "arrowhead_crowfoot_one": "پای کلاغی (یک)",
+    "arrowhead_crowfoot_one_or_many": "پای کلاغی (یک یا بسیار)",
+    "more_options": "امکانات بیشتر",
+    "arrowtypes": "نوع پیکان",
+    "arrowtype_sharp": "پیکان تیز",
+    "arrowtype_round": "پیکان منحنی",
+    "arrowtype_elbowed": "پیکان گوشه‌دار",
     "fontSize": "اندازه قلم",
     "fontFamily": "نوع قلم",
     "addWatermark": "\"ساخته شده با Excalidraw\" را اضافه کن",
-    "handDrawn": "دست نویس",
+    "handDrawn": "دست‌نویس",
     "normal": "عادی",
     "code": "کد",
     "small": "کوچک",
@@ -69,14 +79,15 @@
     "cartoonist": "کارتونیست",
     "fileTitle": "نام فایل",
     "colorPicker": "انتخابگر رنگ",
-    "canvasColors": "رنگ های بوم",
-    "canvasBackground": "بوم",
+    "canvasColors": "اسنفاده شده در بوم",
+    "canvasBackground": "پس‌زمینه بوم",
     "drawingCanvas": "بوم نقاشی",
+    "clearCanvas": "پاکسازی بوم",
     "layers": "لایه ها",
     "actions": "عملیات",
     "language": "زبان",
     "liveCollaboration": "همکاری آنلاین...",
-    "duplicateSelection": "تکرار",
+    "duplicateSelection": "تکراری",
     "untitled": "بدون عنوان",
     "name": "نام",
     "yourName": "نام شما",
@@ -84,12 +95,13 @@
     "group": "گروهبندی انتخابها",
     "ungroup": "حذف گروهبندی انتخابها",
     "collaborators": "همکاران",
-    "showGrid": "نمایش گرید",
+    "toggleGrid": "تغییر وضعیت خطوط شطرنجی",
     "addToLibrary": "افزودن به کتابخانه",
     "removeFromLibrary": "حذف از کتابخانه",
     "libraryLoadingMessage": "بارگذاری کتابخانه…",
     "libraries": "مرور کردن کتابخانه ها",
     "loadingScene": "باگذاری صحنه…",
+    "loadScene": "بارگذاری صحنه از فایل",
     "align": "تراز",
     "alignTop": "تراز به بالا",
     "alignBottom": "تراز به پایین",
@@ -105,9 +117,11 @@
     "share": "اشتراک‌گذاری",
     "showStroke": "نمایش انتخاب کننده رنگ حاشیه",
     "showBackground": "نمایش انتخاب کننده رنگ پس زمینه",
-    "toggleTheme": "تغییر تم",
+    "showFonts": "نمایش انتخاب فونت",
+    "toggleTheme": "تغییر وضعیت پوسته روشن/تیره",
+    "theme": "پوسته",
     "personalLib": "کتابخانه شخصی",
-    "excalidrawLib": "کتابخانه",
+    "excalidrawLib": "کتابخانه Excalidraw",
     "decreaseFontSize": "کاهش اندازه فونت",
     "increaseFontSize": "افزایش دادن اندازه فونت",
     "unbindText": "بازکردن نوشته",
@@ -115,16 +129,21 @@
     "createContainerFromText": "متن را در یک جایگاه بپیچید",
     "link": {
       "edit": "ویرایش لینک",
-      "editEmbed": "",
-      "create": "ایجاد پیوند",
-      "createEmbed": "",
+      "editEmbed": "تغیر لینک",
+      "create": "افزودن لینک",
       "label": "لینک",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "لینک و افزونه",
+      "empty": "هیچ لینکی ست نشده",
+      "hint": "لینک خود را بنویسید یا جایگذاری کنید",
+      "goToElement": "رفتن به المان مد نظر"
     },
     "lineEditor": {
       "edit": "ویرایش لینک",
-      "exit": "خروج از ویرایشگر"
+      "editArrow": "ویرایش پیکان"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "قفل",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "منتشر شده",
     "sidebarLock": "باز نگه داشتن سایدبار",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
-    "eyeDropper": "انتخاب رنگ از کرباس",
-    "textToDiagram": "",
-    "prompt": ""
+    "selectAllElementsInFrame": "همه آیتم های در فریم را انتخاب کنید",
+    "removeAllElementsFromFrame": "حذف همه آیتم های داخل فریم",
+    "eyeDropper": "انتخاب رنگ از بوم",
+    "textToDiagram": "متن به دیاگرام",
+    "prompt": "فوری",
+    "followUs": "ما را دنبال کنید",
+    "discordChat": "چت دیسکورد",
+    "zoomToFitViewport": "بزرگنمایی به اندازه نمایشگر",
+    "zoomToFitSelection": "بزرگنمایی به اندازه قسمت انتخاب شده",
+    "zoomToFit": "بزرگنمایی برای دیدن تمام آیتم ها",
+    "installPWA": "نصب Excalidraw روی دستگاه (PWA)",
+    "autoResize": "فعالسازی تنظیم خودکار سایز",
+    "imageCropping": "برش عکس",
+    "unCroppedDimension": "اندازه غیر برشی",
+    "copyElementLink": "کپی لینک به آیتم",
+    "linkToElement": "لینک به آیتم",
+    "wrapSelectionInFrame": "انتخاب را در قاب قرار دهید",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "لینک به آیتم",
+    "desc": "روی شکل یا بوم کلیک کنید، یا لینک را جایگذاری کنید.",
+    "notFound": "آیتم لینک شده در بوم پیدا نشد."
   },
   "library": {
     "noItems": "آیتمی به اینجا اضافه نشده...",
     "hint_emptyLibrary": "یک آیتم روی بوم را برای اضافه شده به اینجا انتخاب کنید، یا یک کتابخانه از مخزن عمومی در بخش پایین را نصب کنید.",
-    "hint_emptyPrivateLibrary": "یک آیتم روی بوم را برای اضافه شدن به اینجا انتخاب کنید."
+    "hint_emptyPrivateLibrary": "یک آیتم روی بوم را برای اضافه شدن به اینجا انتخاب کنید.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "جستجو در بوم",
+    "noMatch": "هیچ موردی یافت نشد...",
+    "singleResult": "نتیجه",
+    "multipleResults": "نتایج",
+    "placeholder": "جستجوی متن در بوم...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "پاکسازی بوم نقاشی",
@@ -151,6 +204,7 @@
     "exportImage": "خروجی گرفتن از تصویر...",
     "export": "ذخیره در...",
     "copyToClipboard": "کپی در حافظه موقت",
+    "copyLink": "کپی لینک",
     "save": "ذخیره در همین فایل",
     "saveAs": "ذخیره با نام",
     "load": "باز کردن",
@@ -171,17 +225,19 @@
     "fullScreen": "تمام‌صفحه",
     "darkMode": "حالت تیره",
     "lightMode": "حالت روشن",
+    "systemMode": "حالت سیستم",
     "zenMode": "حالت ذن",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "به اشیاء بچسبد",
     "exitZenMode": "خروج از حالت تمرکز",
     "cancel": "لغو",
-    "clear": "پاک کردن",
+    "saveLibNames": "",
+    "clear": "پاکسازی",
     "remove": "پاک کردن",
-    "embed": "",
-    "publishLibrary": "انتشار",
+    "embed": "تغییر افزونه",
+    "publishLibrary": "",
     "submit": "ارسال",
     "confirm": "تایید",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "کلیک برای تعامل"
   },
   "alerts": {
     "clearReset": "این کار کل صفحه را پاک میکند. آیا مطمئنید؟",
@@ -190,8 +246,8 @@
     "couldNotLoadInvalidFile": "عدم توانایی در بازگذاری فایل نامعتبر",
     "importBackendFailed": "بارگیری از پشت صحنه با شکست مواجه شد.",
     "cannotExportEmptyCanvas": "بوم خالی قابل تبدیل نیست.",
-    "couldNotCopyToClipboard": "به کلیپ بورد کپی نشد.",
-    "decryptFailed": "رمزگشایی داده ها امکان پذیر نیست.",
+    "couldNotCopyToClipboard": "در بریده‌دان رونویسی نشد.",
+    "decryptFailed": "رمزگشایی داده ها امکان‌پذیر نیست.",
     "uploadedSecurly": "آپلود با رمزگذاری دو طرفه انجام میشود، به این معنی که سرور Excalidraw و اشخاص ثالث نمی توانند مطالب شما را بخوانند.",
     "loadSceneOverridePrompt": "بارگزاری یک طرح خارجی محتوای فعلی رو از بین میبرد. آیا میخواهید ادامه دهید؟",
     "collabStopOverridePrompt": "با توقف بوم نقاشی، نقشه قبلی و ذخیره شده محلی شما را بازنویسی می کند. مطمئنی؟\n\n(اگر می خواهید نقاشی محلی خود را حفظ کنید، به سادگی برگه مرورگر را ببندید.)",
@@ -204,37 +260,39 @@
     "resetLibrary": "ین کار کل صفحه را پاک میکند. آیا مطمئنید?",
     "removeItemsFromsLibrary": "حذف {{count}} آیتم(ها) از کتابخانه?",
     "invalidEncryptionKey": "کلید رمزگذاری باید 22 کاراکتر باشد. همکاری زنده غیرفعال است.",
-    "collabOfflineWarning": "اتصال به اینترنت در دسترس نیست.\nتغییرات شما ذخیره نمی شود!"
+    "collabOfflineWarning": "اتصال به اینترنت در دسترس نیست.\nتغییرات شما ذخیره نمی شود!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "نوع فایل پشتیبانی نشده.",
     "imageInsertError": "عکس ارسال نشد. بعداً دوباره تلاش کنید...",
     "fileTooBig": "فایل خیلی بزرگ است حداکثر اندازه مجاز {{maxSize}}.",
     "svgImageInsertError": "تصویر SVG وارد نشد. نشانه گذاری SVG نامعتبر به نظر می رسد.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG نادرست.",
+    "failedToFetchImage": "گرفتن تصویر ناموفق بود.",
     "cannotResolveCollabServer": "به سرور collab متصل نشد. لطفا صفحه را مجددا بارگذاری کنید و دوباره تلاش کنید.",
     "importLibraryError": "داده‌ها بارگذاری نشدند",
+    "saveLibraryError": "ذخیره‌سازی در سرور با مشکل مواجه شد. لطفا فایل خود را در دستگاه خود به صورت محلی ذخیره کنید تا مطمئن شوید تغییرات اعمال شده را از دست نخواهید داد.",
     "collabSaveFailed": "در پایگاه داده باطن ذخیره نشد. اگر مشکلات همچنان ادامه داشت، باید فایل خود را به صورت محلی ذخیره کنید تا مطمئن شوید کار خود را از دست نمی دهید.",
     "collabSaveFailed_sizeExceeded": "در پایگاه داده بکند ذخیره نشد. اگر مشکلات همچنان ادامه داشت، باید فایل خود را به صورت محلی ذخیره کنید تا مطمئن شوید کار خود را از دست نمی دهید.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "تصاویر غیر فعال شدند.",
     "brave_measure_text_error": {
       "line1": "به نظر می‌رسد از مرورگر Brave با تنظیم <bold> مسدود کردن شدید اثرانگشت</bold> استفاده می‌کنید.",
       "line2": "این می تواند منجر به شکستن <bold>عناصر متن</bold> در نقاشی های شما شود.",
       "line3": "اکیداً توصیه می کنیم این تنظیم را غیرفعال کنید. برای نحوه انجام این کار می‌توانید <link>این مراحل</link> را دنبال کنید.",
-      "line4": "اگر غیرفعال کردن این تنظیم نمایش عناصر متنی را برطرف نکرد، لطفاً یک <issueLink>مشکل</issueLink> را در GitHub ما باز کنید یا برای ما در <discordLink>Discord</discordLink> بنویسید."
+      "line4": "اگر غیرفعال کردن این تنظیم نمایش عناصر متنی را برطرف نکرد، لطفاً یک <issueLink>مشکل</issueLink> را در GitHub ما باز کنید یا برای ما در <discordLink>Discord</discordLink> بنویسید"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "عناصر افزوده شده نمی توانند به کتابخانه افزوده شوند.",
+      "iframe": "عناصر IFrame نمی توانند به کتابخانه افزوده شوند.",
+      "image": "پشتیبانی از افزودن تصاویر به کتابخانه به زودی اضافه خواهد شد!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "نمی تواند جاگذاری شود (نمی تواند از کلیپبورد بخواند).",
+    "asyncPasteFailedOnParse": "نمیتواند جایگذاری شود.",
+    "copyToSystemClipboardFailed": "نمی تواند در کلیپبورد کپی شود."
   },
   "toolBar": {
     "selection": "گزینش",
+    "lasso": "",
     "image": "وارد کردن تصویر",
     "rectangle": "مستطیل",
     "diamond": "لوزی",
@@ -246,45 +304,66 @@
     "library": "کتابخانه",
     "lock": "ابزار انتخاب شده را بعد از کشیدن نگه دار",
     "penMode": "حالت قلم - جلوگیری از تماس",
-    "link": "افزودن/به‌روزرسانی پیوند برای شکل انتخابی",
+    "link": "افزودن/به‌روزرسانی لینک برای شکل انتخابی",
     "eraser": "پاک کن",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "frame": "ابزار فریم",
+    "magicframe": "وایرفریم به کد",
+    "embeddable": "افزونه وب",
+    "laser": "اشاره گر لیزری",
     "hand": "دست (ابزار پانینگ)",
     "extraTools": "ابزارهای بیشتر",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "مرمید به excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "مستطیل",
+    "diamond": "لوزی",
+    "ellipse": "بیضی",
+    "arrow": "پیکان",
+    "line": "خط",
+    "freedraw": "کشیدن",
+    "text": "متن",
+    "image": "تصویر",
+    "group": "گروه",
+    "frame": "قاب",
+    "magicframe": "وایرفریم به کد",
+    "embeddable": "افزونه وب",
+    "selection": "انتخاب",
+    "iframe": "آی فریم"
   },
   "headings": {
     "canvasActions": "عملیات روی بوم",
     "selectedShapeActions": "عملیات روی شکل انتخاب شده",
-    "shapes": "شکل‌ها"
+    "shapes": "اشکال"
   },
   "hints": {
-    "canvasPanning": "برای حرکت دادن بوم، چرخ ماوس یا فاصله را در حین کشیدن نگه دارید یا از ابزار دستی استفاده کنید",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "برای چند نقطه کلیک و برای یک خط بکشید",
+    "arrowTool": "",
     "freeDraw": "کلیک کنید و بکشید و وقتی کار تمام شد رها کنید",
     "text": "نکته: با برنامه انتخاب شده شما میتوانید با دوبار کلیک کردن هرکجا میخواید متن اظاف کنید",
-    "embeddable": "",
-    "text_selected": "دوبار کلیک کنید یا Enter را فشار دهید تا نقاط را ویرایش کنید",
-    "text_editing": "Escape یا CtrlOrCmd+ENTER را فشار دهید تا ویرایش تمام شود",
-    "linearElementMulti": "روی آخرین نقطه کلیک کنید یا کلید ESC را بزنید یا کلید Enter را بزنید برای اتمام کار",
-    "lockAngle": "با نگه داشتن SHIFT هنگام چرخش می توانید زاویه ها را محدود کنید",
-    "resize": "می توانید با نگه داشتن SHIFT در هنگام تغییر اندازه، نسبت ها را محدود کنید،ALT را برای تغییر اندازه از مرکز نگه دارید",
-    "resizeImage": "با نگه داشتن SHIFT می توانید آزادانه اندازه را تغییر دهید،\nبرای تغییر اندازه از مرکز، ALT را نگه دارید",
-    "rotate": "با نگه داشتن SHIFT هنگام چرخش می توانید زاویه ها را محدود کنید",
-    "lineEditor_info": "CtrlOrCmd را نگه دارید و دوبار کلیک کنید یا CtrlOrCmd + Enter را فشار دهید تا نقاط را ویرایش کنید.",
-    "lineEditor_pointSelected": "برای حذف نقطه Delete برای کپی زدن Ctrl یا Cmd+D را بزنید و یا برای جابجایی بکشید",
-    "lineEditor_nothingSelected": "یک نقطه را برای ویرایش انتخاب کنید (SHIFT را برای انتخاب چندگانه نگه دارید)،\nیا Alt را نگه دارید و برای افزودن نقاط جدید کلیک کنید",
-    "placeImage": "برای قرار دادن تصویر کلیک کنید، یا کلیک کنید و بکشید تا اندازه آن به صورت دستی تنظیم شود",
+    "embeddable": "کلیک-درگ برای ساخت افزونه وب",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "کتابخانه خود را منتشر کنید",
-    "bindTextToElement": "برای افزودن اینتر را بزنید",
-    "deepBoxSelect": "CtrlOrCmd را برای انتخاب عمیق و جلوگیری از کشیدن نگه دارید",
-    "eraserRevert": "Alt را نگه دارید تا عناصر علامت گذاری شده برای حذف برگردند",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "احتمالاً می‌توان این ویژگی را با تنظیم پرچم «dom.events.asyncClipboard.clipboardItem» روی «true» فعال کرد. برای تغییر پرچم های مرورگر در فایرفاکس، از صفحه \"about:config\" دیدن کنید.",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "پیش نمایش نشان داده نمی شود",
@@ -292,16 +371,19 @@
     "canvasTooBigTip": "نکته: سعی کنید دورترین عناصر را کمی به همدیگر نزدیک کنید."
   },
   "errorSplash": {
-    "headingMain": "",
-    "clearCanvasMessage": "اگر بازنشانی صفحه مشکل را حل نکرد این را امتحان کنید ",
+    "headingMain": "مشکلی رخ داده. امتحان کنید <button> بارگذاری مجدد صفحه </button>.",
+    "clearCanvasMessage": "اگر بازنشانی صفحه مشکل را حل نکرد <button>پاک کردن بوم</button> را امتحان کنید.",
     "clearCanvasCaveat": " این باعث میشود کارهای شما ذخیره نشود ",
-    "trackedToSentry": "",
-    "openIssueMessage": "",
+    "trackedToSentry": "خطا با شناسه {{eventId}} در سیستم ما رهگیری شد.",
+    "openIssueMessage": "ما بسیار محتاط بودیم که اطلاعات صحنه شما را در خطا لحاظ نکنیم. اگر صحنه شما خصوصی نیست، لطفاً ما را دنبال کنید\n<button> رد یابی خطا </button>. لطفاً اطلاعات زیر را با کپی و جایگذاری در مشکل GitHub وارد کنید.",
     "sceneContent": "محتوای صحنه:"
   },
+  "shareDialog": {
+    "or": "یا"
+  },
   "roomDialog": {
-    "desc_intro": "می توانید افرادی را به صحنه فعلی خود دعوت کنید تا با شما همکاری کنند.",
-    "desc_privacy": "نگران نباشید، این جلسه از رمزگذاری دوطرفه استفاده می کند، پس هر چیزی بکشید خصوصی خواهد ماند. حتی سرور ما نمیتواند ببیند چیزی که شما طراحی میکنید.",
+    "desc_intro": "از دیگران برای همکاری در کار خود دعوت کنید.",
+    "desc_privacy": "نگران نباشید، این نشست به صورت پایانه-به-پایانه رمزنگاری شده است و کاملا امن است. حتی سرورهای ما نیز قادر به دیدن ترسیمات شما نیستند.",
     "button_startSession": "شروع جلسه",
     "button_stopSession": "پایان جلسه",
     "desc_inProgressIntro": "جلسه همکاری آنلاین در حال انجام است.",
@@ -328,6 +410,8 @@
     "click": "کلیک",
     "deepSelect": "انتخاب عمیق",
     "deepBoxSelect": "انتخاب عمیق در کادر، و جلوگیری از کشیدن",
+    "createFlowchart": "از هر آیتمی یک فلوچارت ایجاد کنید",
+    "navigateFlowchart": "پیمایش یک فلوچارت",
     "curvedArrow": "فلش خمیده",
     "curvedLine": "منحنی",
     "documentation": "مستندات",
@@ -350,7 +434,9 @@
     "zoomToSelection": "بزرگنمایی قسمت انتخاب شده",
     "toggleElementLock": "قفل/بازکردن انتخاب شده ها",
     "movePageUpDown": "حرکت صفحه به بالا/پایین",
-    "movePageLeftRight": "حرکت صفحه به چپ/راست"
+    "movePageLeftRight": "حرکت صفحه به چپ/راست",
+    "cropStart": "برش تصویر",
+    "cropFinish": "پایان برش تصویر"
   },
   "clearCanvasDialog": {
     "title": "پاک کردن بوم"
@@ -363,22 +449,22 @@
     "twitterUsername": "نام کاربری توییتر",
     "libraryName": "نام کتابخانه",
     "libraryDesc": "توضیحات کتابخانه",
-    "website": "تارنما",
+    "website": "وب‎سایت",
     "placeholder": {
       "authorName": "نام یا نام کاربری شما",
       "libraryName": "اسم کتابخانه",
       "libraryDesc": "شرحی از کتابخانه شما برای کمک به مردم برای درک استفاده از آن",
       "githubHandle": "دسته GitHub (اختیاری)، بنابراین می توانید پس از ارسال برای بررسی، کتابخانه را ویرایش کنید",
-      "twitterHandle": "نام کاربری توییتر (اختیاری)، بنابراین می دانیم هنگام تبلیغ در توییتر به چه کسی اعتبار دهیم",
+      "twitterHandle": "نام کاربری توییتر (اختیاری)، بنابراین می‌دانیم هنگام تبلیغ در توییتر به چه کسی اعتبار دهیم",
       "website": "پیوند به وب سایت شخصی شما یا هر جای دیگر (اختیاری)"
     },
     "errors": {
       "required": "لازم",
       "website": "وارد کردن آدرس درست"
     },
-    "noteDescription": "",
-    "noteGuidelines": "",
-    "noteLicense": "",
+    "noteDescription": "کتابخانه خود را ارسال کنید تا در <link/> مخرن کتابخانه عمومی <link> برای بقیه مردم گنجانده شود تا در طرح هایشان استفاده کنند.",
+    "noteGuidelines": "کتابخانه باید ابتدا به صورت دستی تأیید شود. لطفا قبل انتشار <link>راهنما</link> را مطالعه کنید. برای برقراری ارتباط و ایجاد تغییرات در صورت درخواست، به یک حساب GitHub نیاز دارید، اما خیلی الزامی نیست.",
+    "noteLicense": "با ارسال، موافقت می کنید که کتابخانه تحت عنوان <link>MIT License</link> منتشر شود،که به طور خلاصه به این معنی است که هر کسی می تواند بدون محدودیت از آنها استفاده کند.",
     "noteItems": "هر مورد کتابخانه باید نام خاص خود را داشته باشد تا قابل فیلتر باشد. اقلام کتابخانه زیر شامل خواهد شد:",
     "atleastOneLibItem": "لطفاً حداقل یک مورد از کتابخانه را برای شروع انتخاب کنید",
     "republishWarning": "توجه: برخی از موارد انتخاب شده به عنوان قبلاً منتشر شده/ارسال شده علامت گذاری شده اند. شما فقط باید هنگام به‌روزرسانی یک کتابخانه موجود یا ارسال، موارد را دوباره ارسال کنید."
@@ -389,30 +475,30 @@
   },
   "confirmDialog": {
     "resetLibrary": "تنظیم مجدد کتابخانه",
-    "removeItemsFromLib": "موارد انتخاب شده از موارد پسندیده حذف شوند"
+    "removeItemsFromLib": "موارد انتخاب شده از کتابخوانه حذف شوند"
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "خروجی گرفتن از تصویر",
     "label": {
       "withBackground": "پس زمینه",
-      "onlySelected": "",
-      "darkMode": "حالت تیره",
-      "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "onlySelected": "فقط انتخاب شده ها",
+      "darkMode": "حالت تاریک",
+      "embedScene": "صحنه افزونه",
+      "scale": "نسبت",
+      "padding": "فاصله"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "داده های صحنه در فایل PNG/SVG صادر شده ذخیره می شود تا صحنه را بتوان از آن بازیابی کرد.\nاندازه فایل خروجی را افزایش می دهد."
     },
     "title": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "تبدیل به PNG",
+      "exportToSvg": "تبدیل به SVG",
+      "copyPngToClipboard": "کپی PNG در حافظه موقت"
     },
     "button": {
       "exportToPng": "PNG",
       "exportToSvg": "SVG",
-      "copyPngToClipboard": "کپی در کلیپ‌بورد"
+      "copyPngToClipboard": "کپی در حافظه موقت"
     }
   },
   "encrypted": {
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "زاویه",
-    "element": "اِلمان",
-    "elements": "اِلمان ها",
+    "shapes": "اشکال",
     "height": "ارتفاع",
     "scene": "صحنه",
     "selected": "انتخاب شده",
     "storage": "حافظه",
-    "title": "آمار برای نردها",
+    "fullTitle": "ویژگی‌های بوم و شکل",
+    "title": "ویژگی‌ها",
+    "generalStats": "عمومی",
+    "elementProperties": "ویژگی‌های شکل",
     "total": "مجموع",
     "version": "نسخه",
     "versionCopy": "برای کپی کردن کلیک کنید",
@@ -436,16 +524,18 @@
   },
   "toast": {
     "addedToLibrary": "به مجموعه اضافه شد",
-    "copyStyles": "کپی سبک.",
+    "copyStyles": "سبک کپی شد.",
     "copyToClipboard": "در کلیپ‌بورد کپی شد.",
-    "copyToClipboardAsPng": "کپی {{exportSelection}} در کلیپبورد به عنوان PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsPng": "کپی {{exportSelection}} در حافظه موقت به عنوان PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} در حافظه موقت به عنوان\n({{exportColorScheme}}) رونویسی شد",
     "fileSaved": "فایل ذخیره شد.",
     "fileSavedToFilename": "ذخیره در {filename}",
     "canvas": "بوم",
     "selection": "انتخاب",
     "pasteAsSingleElement": "از {{shortcut}} برای چسباندن به عنوان یک عنصر استفاده کنید،\nیا در یک ویرایشگر متن موجود جایگذاری کنید",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "قرار دادن این Url در حال حاضر مجاز نیست. درGitHub برای درخواست Url Whitelisted مشکلی ایجاد کنید",
+    "unrecognizedLinkFormat": "پیوندی که افزودید با قالب مورد انتظار مطابقت ندارد. لطفاً سعی کنید رشته \"افزونه\" ارائه شده توسط سایت منبع را بچسبانید",
+    "elementLinkCopied": "لینک در کلیپ‌بورد کپی شد"
   },
   "colors": {
     "transparent": "شفاف",
@@ -478,48 +568,97 @@
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "",
+    "color": "",
+    "mostUsedCustomColors": "رنگ های به‌تازگی به‌کار گرفته شده",
     "colors": "رنگ‌ها",
     "shades": "جلوه‌ها",
     "hexCode": "کدِ هگز",
-    "noShades": ""
+    "noShades": "هیچ سایه ای برای این رنگ در دسترس نیست"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "صادر کردن به عنوان تصاویر",
+        "button": "صادر کردن به عنوان تصاویر",
+        "description": "خروجی از داده های صحنه به عنوان تصویر که میتوانید بعدا بیافزایید."
       },
       "saveToDisk": {
         "title": "ذخیره در دیسک",
         "button": "ذخیره در دیسک",
-        "description": ""
+        "description": "خروجی از داده های صحنه را به عنوان فایل که بعدا می توانید بیافزایید."
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Excalidraw+",
+        "button": "خروجی به Excalidraw+",
+        "description": "ذخیره صفحه در میز کار Excalidraw+."
       }
     },
     "modal": {
       "loadFromFile": {
         "title": "بارگذاری از فایل",
         "button": "بارگذاری از فایل",
-        "description": ""
+        "description": "بارگذاری از فایل <bold>جایگزین بشه با محتوای موجود</bold>.<br></br> می توانید ابتدا با استفاده از یکی از گزینه های زیر از نقاشی خود نسخه پشتیبان تهیه کنید."
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "بارگذاری از پیوند",
+        "button": "جایگزینی محتوای من",
+        "description": "بارگذاری از فایل <bold>جایگزین بشه با محتوای موجود</bold>.<br></br> می توانید ابتدا با استفاده از یکی از گزینه های زیر از نقاشی خود نسخه پشتیبان تهیه کنید."
       }
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": "پیش‌نمایش"
+    "title": "مرمید به excalidraw",
+    "button": "درج",
+    "description": "فعلا فقط <flowchartLink> فلوچارت </flowchartLink> ، <sequenceLink> توالی </sequenceLink> و <classLink> کلاس </classLink> نمودارها پشتیبانی می شوند. انواع دیگر به صورت تصویر در Excalidraw ارائه خواهند شد.",
+    "syntax": "مرمید syntax",
+    "preview": "پیشنمایش"
+  },
+  "quickSearch": {
+    "placeholder": "جستجو فوری"
+  },
+  "fontList": {
+    "badge": {
+      "old": "قدیمی"
+    },
+    "sceneFonts": "در این صحنه",
+    "availableFonts": "قلم های در دسترس",
+    "empty": "قلمی یافت نشد"
+  },
+  "userList": {
+    "empty": "کاربری یافت نشد",
+    "hint": {
+      "text": "روی کاربر بزنید تا دنبالش کنید",
+      "followStatus": "هم‌اینک این کاربر را دنبال میکنید",
+      "inCall": "کاربر در تماسی صوتی است",
+      "micMuted": "میکروفون کاربر بی‌صدا است",
+      "isSpeaking": "کاربر در حال صحبت است"
+    }
+  },
+  "commandPalette": {
+    "title": "تخته فرمان‌ها",
+    "shortcuts": {
+      "select": "انتخاب",
+      "confirm": "تایید",
+      "close": "بستن"
+    },
+    "recents": "اخیراً استفاده شده",
+    "search": {
+      "placeholder": "در فهرست‌ها و دستورها را جستجو کنید هم سنگهای پنهان را کشف کنید",
+      "noMatch": "دستوری یافت نشد..."
+    },
+    "itemNotAvailable": "دستور در دسترس نیست...",
+    "shortcutHint": "برای تخته دستور ها {{shortcut}} را بکار بگیرید"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/fi-FI.json b/packages/excalidraw/locales/fi-FI.json
index 4193c93adf..176727cebc 100644
--- a/packages/excalidraw/locales/fi-FI.json
+++ b/packages/excalidraw/locales/fi-FI.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Kopioi leikepöydälle PNG-tiedostona",
     "copyAsSvg": "Kopioi leikepöydälle SVG-tiedostona",
     "copyText": "Kopioi tekstinä",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Kopioi lähde leikepöydälle",
+    "convertToCode": "Muunna koodiksi",
     "bringForward": "Tuo eteenpäin",
     "sendToBack": "Vie taakse",
     "bringToFront": "Tuo eteen",
@@ -21,7 +21,9 @@
     "copyStyles": "Kopioi tyyli",
     "pasteStyles": "Liitä tyyli",
     "stroke": "Piirto",
+    "changeStroke": "",
     "background": "Tausta",
+    "changeBackground": "",
     "fill": "Täyttö",
     "strokeWidth": "Viivan leveys",
     "strokeStyle": "Viivan tyyli",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Ei mitään",
     "arrowhead_arrow": "Nuoli",
     "arrowhead_bar": "Tasapää",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Ympyrä",
+    "arrowhead_circle_outline": "Ympyrä (ääriviiva)",
     "arrowhead_triangle": "Kolmio",
-    "arrowhead_triangle_outline": "",
+    "arrowhead_triangle_outline": "Kolmio (ääriviiva)",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Kirjasinkoko",
     "fontFamily": "Kirjasintyyppi",
     "addWatermark": "Lisää \"Tehty Excalidrawilla\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Käytössä piirtoalueella",
     "canvasBackground": "Piirtoalueen tausta",
     "drawingCanvas": "Piirtoalue",
+    "clearCanvas": "Tyhjennä piirtoalue",
     "layers": "Tasot",
     "actions": "Toiminnot",
     "language": "Kieli",
@@ -84,12 +95,13 @@
     "group": "Ryhmitä valinta",
     "ungroup": "Pura valittu ryhmä",
     "collaborators": "Yhteistyökumppanit",
-    "showGrid": "Näytä ruudukko",
+    "toggleGrid": "Näytä tai piilota ruudukko",
     "addToLibrary": "Lisää kirjastoon",
     "removeFromLibrary": "Poista kirjastosta",
     "libraryLoadingMessage": "Ladataan kirjastoa…",
     "libraries": "Selaa kirjastoja",
     "loadingScene": "Ladataan työtä…",
+    "loadScene": "",
     "align": "Tasaa",
     "alignTop": "Tasaa ylös",
     "alignBottom": "Tasaa alas",
@@ -105,7 +117,9 @@
     "share": "Jaa",
     "showStroke": "Näytä viivan värin valitsin",
     "showBackground": "Näytä taustavärin valitsin",
-    "toggleTheme": "Vaihda teema",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "Teema",
     "personalLib": "Oma kirjasto",
     "excalidrawLib": "Excalidraw kirjasto",
     "decreaseFontSize": "Pienennä kirjasinkokoa",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Muokkaa linkkiä",
       "editEmbed": "",
-      "create": "Luo linkki",
-      "createEmbed": "",
+      "create": "",
       "label": "Linkki",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "Linkkiä ei ole asetettu",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Muokkaa riviä",
-      "exit": "Poistu rivieditorista"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Lukitse",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "",
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Teksti kaavioksi",
+    "prompt": "",
+    "followUs": "Seuraa meitä",
+    "discordChat": "Discord-keskustelu",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Kirjastossa ei ole vielä yhtään kohdetta...",
     "hint_emptyLibrary": "Valitse lisättävä kohde piirtoalueelta, tai asenna alta julkinen kirjasto.",
-    "hint_emptyPrivateLibrary": "Valitse lisättävä kohde piirtoalueelta."
+    "hint_emptyPrivateLibrary": "Valitse lisättävä kohde piirtoalueelta.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Tyhjennä piirtoalue",
@@ -151,6 +204,7 @@
     "exportImage": "Vie kuva...",
     "export": "Tallenna nimellä...",
     "copyToClipboard": "Kopioi leikepöydälle",
+    "copyLink": "",
     "save": "Tallenna nykyiseen tiedostoon",
     "saveAs": "Tallenna nimellä",
     "load": "Avaa",
@@ -171,14 +225,16 @@
     "fullScreen": "Koko näyttö",
     "darkMode": "Tumma tila",
     "lightMode": "Vaalea tila",
+    "systemMode": "Järjestelmätila",
     "zenMode": "Zen-tila",
     "objectsSnapMode": "",
     "exitZenMode": "Poistu zen-tilasta",
     "cancel": "Peruuta",
+    "saveLibNames": "",
     "clear": "Pyyhi",
     "remove": "Poista",
     "embed": "",
-    "publishLibrary": "Julkaise",
+    "publishLibrary": "",
     "submit": "Lähetä",
     "confirm": "Vahvista",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "Tämä tyhjentää kirjastosi. Jatketaanko?",
     "removeItemsFromsLibrary": "Poista {{count}} kohdetta kirjastosta?",
     "invalidEncryptionKey": "Salausavaimen on oltava 22 merkkiä pitkä. Live-yhteistyö ei ole käytössä.",
-    "collabOfflineWarning": "Internet-yhteyttä ei ole saatavilla.\nMuutoksiasi ei tallenneta!"
+    "collabOfflineWarning": "Internet-yhteyttä ei ole saatavilla.\nMuutoksiasi ei tallenneta!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tiedostotyyppiä ei tueta.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Tiedosto on liian suuri. Suurin sallittu koko on {{maxSize}}.",
     "svgImageInsertError": "SVG- kuvaa ei voitu lisätä. Tiedoston SVG-sisältö näyttää virheelliseltä.",
     "failedToFetchImage": "",
-    "invalidSVGString": "Virheellinen SVG.",
     "cannotResolveCollabServer": "Yhteyden muodostaminen collab-palvelimeen epäonnistui. Virkistä sivu ja yritä uudelleen.",
     "importLibraryError": "Kokoelman lataaminen epäonnistui",
+    "saveLibraryError": "",
     "collabSaveFailed": "Ei voitu tallentaan palvelimen tietokantaan. Jos ongelmia esiintyy, sinun kannatta tallentaa tallentaa tiedosto paikallisesti varmistaaksesi, että et menetä työtäsi.",
     "collabSaveFailed_sizeExceeded": "Ei voitu tallentaan palvelimen tietokantaan. Jos ongelmia esiintyy, sinun kannatta tallentaa tallentaa tiedosto paikallisesti varmistaaksesi, että et menetä työtäsi.",
     "imageToolNotSupported": "",
@@ -230,11 +287,12 @@
       "image": ""
     },
     "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnParse": "Ei voitu liittää.",
+    "copyToSystemClipboardFailed": "Kopiointi leikepöydälle epäonnistui."
   },
   "toolBar": {
     "selection": "Valinta",
+    "lasso": "",
     "image": "Lisää kuva",
     "rectangle": "Suorakulmio",
     "diamond": "Vinoneliö",
@@ -246,16 +304,32 @@
     "library": "Kirjasto",
     "lock": "Pidä valittu työkalu aktiivisena piirron jälkeen",
     "penMode": "Kynätila - estä kosketus",
-    "link": "Lisää/päivitä linkki valitulle muodolle",
+    "link": "",
     "eraser": "Poistotyökalu",
     "frame": "",
     "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "embeddable": "Verkkoupote",
+    "laser": "Laserosoitin",
     "hand": "Käsi (panning-työkalu)",
-    "extraTools": "",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "extraTools": "Lisää työkaluja",
+    "mermaidToExcalidraw": "Mermaid Excalidrawiksi",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Piirtoalueen toiminnot",
@@ -263,28 +337,33 @@
     "shapes": "Muodot"
   },
   "hints": {
-    "canvasPanning": "Piirtoalueen liikuttamiseksi pidä hiiren pyörää tai välilyöntiä pohjassa tai käytä käsityökalua",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Klikkaa piirtääksesi useampi piste, raahaa piirtääksesi yksittäinen viiva",
+    "arrowTool": "",
     "freeDraw": "Paina ja raahaa, päästä irti kun olet valmis",
     "text": "Vinkki: voit myös lisätä tekstiä kaksoisnapsauttamalla mihin tahansa valintatyökalulla",
     "embeddable": "",
-    "text_selected": "Kaksoisnapsauta tai paina ENTER muokataksesi tekstiä",
-    "text_editing": "Paina Escape tai CtrlOrCmd+ENTER lopettaaksesi muokkaamisen",
-    "linearElementMulti": "Lopeta klikkaamalla viimeistä pistettä, painamalla Escape- tai Enter-näppäintä",
-    "lockAngle": "Voit rajoittaa kulmaa pitämällä SHIFT-näppäintä alaspainettuna",
-    "resize": "Voit rajoittaa mittasuhteet pitämällä SHIFT-näppäintä alaspainettuna kun muutat kokoa, pidä ALT-näppäintä alaspainettuna muuttaaksesi kokoa keskipisteen suhteen",
-    "resizeImage": "Voit muuttaa kokoa vapaasti pitämällä SHIFTiä pohjassa, pidä ALT pohjassa muuttaaksesi kokoa keskipisteen ympäri",
-    "rotate": "Voit rajoittaa kulman pitämällä SHIFT pohjassa pyörittäessäsi",
-    "lineEditor_info": "Pidä CtrlOrCmd pohjassa ja kaksoisnapsauta tai paina CtrlOrCmd + Enter muokataksesi pisteitä",
-    "lineEditor_pointSelected": "Poista piste(et) painamalla delete, monista painamalla CtrlOrCmd+D, tai liikuta raahaamalla",
-    "lineEditor_nothingSelected": "Valitse muokattava piste (monivalinta pitämällä SHIFT pohjassa), tai paina Alt ja klikkaa lisätäksesi uusia pisteitä",
-    "placeImage": "Klikkaa asettaaksesi kuvan, tai klikkaa ja raahaa asettaaksesi sen koon manuaalisesti",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Julkaise oma kirjasto",
-    "bindTextToElement": "Lisää tekstiä painamalla enter",
-    "deepBoxSelect": "Käytä syvävalintaa ja estä raahaus painamalla CtrlOrCmd",
-    "eraserRevert": "Pidä Alt alaspainettuna, kumotaksesi merkittyjen elementtien poistamisen",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Tämä ominaisuus voidaan todennäköisesti ottaa käyttöön asettamalla \"dom.events.asyncClipboard.clipboardItem\" kohta \"true\":ksi. Vaihtaaksesi selaimen kohdan Firefoxissa, käy \"about:config\" sivulla.",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Esikatselua ei voitu näyttää",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Olimme varovaisia emmekä sisällyttäneet tietoa piirroksestasi virheeseen. Mikäli piirroksesi ei ole yksityinen, harkitsethan kertovasi meille <button>virheenseurantajärjestelmässämme.</button> Sisällytä alla olevat tiedot kopioimalla ne GitHub-ongelmaan.",
     "sceneContent": "Piirroksen tiedot:"
   },
+  "shareDialog": {
+    "or": "Tai"
+  },
   "roomDialog": {
-    "desc_intro": "Voit kutsua ihmisiä piirrokseesi tekemään yhteistyötä kanssasi.",
-    "desc_privacy": "Älä huoli, istunto käyttää päästä-päähän-salausta, joten mitä tahansa piirrätkin, se pysyy salassa. Edes palvelimemme eivät näe mitä keksit.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Aloita istunto",
     "button_stopSession": "Lopeta istunto",
     "desc_inProgressIntro": "Jaettu istunto on nyt käynnissä.",
@@ -328,6 +410,8 @@
     "click": "klikkaa",
     "deepSelect": "Syvävalinta",
     "deepBoxSelect": "Käytä syvävalintaa ja estä raahaus",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Kaareva nuoli",
     "curvedLine": "Kaareva viiva",
     "documentation": "Käyttöohjeet",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Näytä valinta",
     "toggleElementLock": "Lukitse / poista lukitus valinta",
     "movePageUpDown": "Siirrä sivua ylös/alas",
-    "movePageLeftRight": "Siirrä sivua vasemmalle/oikealle"
+    "movePageLeftRight": "Siirrä sivua vasemmalle/oikealle",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Pyyhi piirtoalue"
@@ -396,7 +482,7 @@
     "label": {
       "withBackground": "",
       "onlySelected": "",
-      "darkMode": "",
+      "darkMode": "Tumma tila",
       "embedScene": "",
       "scale": "",
       "padding": ""
@@ -407,12 +493,12 @@
     "title": {
       "exportToPng": "",
       "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "copyPngToClipboard": "Kopioi PNG leikepöydälle"
     },
     "button": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "PNG",
+      "exportToSvg": "SVG",
+      "copyPngToClipboard": "Kopioi leikepöydälle"
     }
   },
   "encrypted": {
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Kulma",
-    "element": "Elementti",
-    "elements": "Elementit",
+    "shapes": "",
     "height": "Korkeus",
     "scene": "Teos",
     "selected": "Valitut",
     "storage": "Tallennustila",
-    "title": "Tilastoja nörteille",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Yhteensä",
     "version": "Versio",
     "versionCopy": "Klikkaa kopioidaksesi",
@@ -439,30 +527,32 @@
     "copyStyles": "Tyylit kopioitiin.",
     "copyToClipboard": "Kopioitiin leikepöydälle.",
     "copyToClipboardAsPng": "Kopioitiin {{exportSelection}} leikepöydälle PNG:nä\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Tiedosto tallennettu.",
     "fileSavedToFilename": "Tallennettiin kohteeseen {filename}",
     "canvas": "piirtoalue",
     "selection": "valinta",
     "pasteAsSingleElement": "Käytä {{shortcut}} liittääksesi yhtenä elementtinä,\ntai liittääksesi olemassa olevaan tekstieditoriin",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Läpinäkyvä",
-    "black": "",
-    "white": "",
-    "red": "",
-    "pink": "",
-    "grape": "",
-    "violet": "",
-    "gray": "",
-    "blue": "",
-    "cyan": "",
-    "teal": "",
-    "green": "",
-    "yellow": "",
-    "orange": "",
-    "bronze": ""
+    "black": "Musta",
+    "white": "Valkoinen",
+    "red": "Punainen",
+    "pink": "Pinkki",
+    "grape": "Rypäle",
+    "violet": "Violetti",
+    "gray": "Harmaa",
+    "blue": "Sininen",
+    "cyan": "Syaani",
+    "teal": "Sinivihreä",
+    "green": "Vihreä",
+    "yellow": "Keltainen",
+    "orange": "Oranssi",
+    "bronze": "Pronssi"
   },
   "welcomeScreen": {
     "app": {
@@ -478,34 +568,35 @@
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "",
-    "colors": "",
-    "shades": "",
-    "hexCode": "",
+    "color": "",
+    "mostUsedCustomColors": "Eniten käytetyt omat värit",
+    "colors": "Värit",
+    "shades": "Varjot",
+    "hexCode": "Hex koodi",
     "noShades": ""
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
+        "title": "Vie kuva",
+        "button": "Vie kuva",
         "description": ""
       },
       "saveToDisk": {
-        "title": "",
-        "button": "",
+        "title": "Tallenna levylle",
+        "button": "Tallenna levylle",
         "description": ""
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
+        "title": "Excalidraw+",
+        "button": "Vie Excalidraw+:aan",
         "description": ""
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
+        "title": "Lataa tiedostosta",
+        "button": "Lataa tiedostosta",
         "description": ""
       },
       "shareableLink": {
@@ -520,6 +611,54 @@
     "button": "",
     "description": "",
     "syntax": "",
-    "preview": ""
+    "preview": "Esikatsele"
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "Valitse",
+      "confirm": "Vahvista",
+      "close": "Sulje"
+    },
+    "recents": "Viimeksi käytetty",
+    "search": {
+      "placeholder": "Hae valikoita, komentoja ja löydä piilotettuja helmiä",
+      "noMatch": "Ei vastaavia komentoja..."
+    },
+    "itemNotAvailable": "Komento ei ole käytettävissä...",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/fr-FR.json b/packages/excalidraw/locales/fr-FR.json
index 674204d125..a2c6c83e63 100644
--- a/packages/excalidraw/locales/fr-FR.json
+++ b/packages/excalidraw/locales/fr-FR.json
@@ -21,7 +21,9 @@
     "copyStyles": "Copier les styles",
     "pasteStyles": "Coller les styles",
     "stroke": "Trait",
+    "changeStroke": "Changer la couleur du trait",
     "background": "Arrière-plan",
+    "changeBackground": "Changer la couleur d'arrière-plan",
     "fill": "Remplissage",
     "strokeWidth": "Largeur du contour",
     "strokeStyle": "Style du trait",
@@ -39,11 +41,19 @@
     "arrowhead_arrow": "Flèche",
     "arrowhead_bar": "Barre",
     "arrowhead_circle": "Cercle",
-    "arrowhead_circle_outline": "Contour du cercle",
+    "arrowhead_circle_outline": "Cercle (contour)",
     "arrowhead_triangle": "Triangle",
     "arrowhead_triangle_outline": "Triangle (contour)",
     "arrowhead_diamond": "Losange",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_diamond_outline": "Losange (contour)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "Pied de Corde (un)",
+    "arrowhead_crowfoot_one_or_many": "Pied du corbeau (un ou plusieurs)",
+    "more_options": "Plus d'options",
+    "arrowtypes": "Type de flèche",
+    "arrowtype_sharp": "Flèche pointue",
+    "arrowtype_round": "Flèche incurvée",
+    "arrowtype_elbowed": "Flèche coudée",
     "fontSize": "Taille de la police",
     "fontFamily": "Police",
     "addWatermark": "Ajouter \"Réalisé avec Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Utilisé sur la zone de dessin",
     "canvasBackground": "Arrière-plan du canevas",
     "drawingCanvas": "Zone de dessin",
+    "clearCanvas": "Effacer la zone de dessin",
     "layers": "Disposition",
     "actions": "Actions",
     "language": "Langue",
@@ -84,12 +95,13 @@
     "group": "Grouper la sélection",
     "ungroup": "Dégrouper la sélection",
     "collaborators": "Collaborateurs",
-    "showGrid": "Afficher la grille",
+    "toggleGrid": "Afficher/Cacher la grille",
     "addToLibrary": "Ajouter à la bibliothèque",
     "removeFromLibrary": "Supprimer de la bibliothèque",
     "libraryLoadingMessage": "Chargement de la bibliothèque…",
     "libraries": "Parcourir les bibliothèques",
     "loadingScene": "Chargement de la scène…",
+    "loadScene": "Charger une scène depuis un fichier",
     "align": "Alignement",
     "alignTop": "Aligner en haut",
     "alignBottom": "Aligner en bas",
@@ -105,7 +117,9 @@
     "share": "Partager",
     "showStroke": "Afficher le sélecteur de couleur de trait",
     "showBackground": "Afficher le sélecteur de couleur de fond",
-    "toggleTheme": "Changer le thème",
+    "showFonts": "Afficher le sélecteur de polices",
+    "toggleTheme": "Basculer mode clair/sombre",
+    "theme": "Thème",
     "personalLib": "Bibliothèque personnelle",
     "excalidrawLib": "Bibliothèque Excalidraw",
     "decreaseFontSize": "Diminuer la taille de police",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Encadrer le texte dans un conteneur",
     "link": {
       "edit": "Modifier le lien",
-      "editEmbed": "Éditer le lien & intégrer",
+      "editEmbed": "Editer le lien intégrable",
       "create": "Ajouter un lien",
-      "createEmbed": "Créer un lien & intégrer",
       "label": "Lien",
       "labelEmbed": "Lier & intégrer",
-      "empty": "Aucun lien défini"
+      "empty": "Aucun lien défini",
+      "hint": "Tapez ou collez votre lien ici",
+      "goToElement": "Aller à l'élément cible"
     },
     "lineEditor": {
       "edit": "Modifier la ligne",
-      "exit": "Quitter l'éditeur de ligne"
+      "editArrow": "Modifier la flèche"
+    },
+    "polygon": {
+      "breakPolygon": "Briser le polygone",
+      "convertToPolygon": "Convertir en polygone"
     },
     "elementLock": {
       "lock": "Verrouiller",
@@ -136,14 +155,48 @@
     "sidebarLock": "Maintenir la barre latérale ouverte",
     "selectAllElementsInFrame": "Sélectionner tous les éléments du cadre",
     "removeAllElementsFromFrame": "Supprimer tous les éléments du cadre",
-    "eyeDropper": "Choisir la couleur depuis la toile",
-    "textToDiagram": "Texte vers Diagramme",
-    "prompt": "Consignes"
+    "eyeDropper": "Choisir la couleur depuis le canevas",
+    "textToDiagram": "Texte vers diagramme",
+    "prompt": "Demander",
+    "followUs": "Suivez-nous",
+    "discordChat": "Salon Discord",
+    "zoomToFitViewport": "Zoomer pour tenir dans la fenêtre d'affichage",
+    "zoomToFitSelection": "Zoomer pour s'adapter à la sélection",
+    "zoomToFit": "Zoomer pour voir tous les éléments",
+    "installPWA": "Installer Excalidraw localement (PWA)",
+    "autoResize": "Activer le redimensionnement automatique du texte",
+    "imageCropping": "Recadrage de l'image",
+    "unCroppedDimension": "Dimension non recadrée",
+    "copyElementLink": "Copier le lien vers un objet",
+    "linkToElement": "Lien vers un objet",
+    "wrapSelectionInFrame": "Mettre la sélection dans un cadre",
+    "tab": "Onglet",
+    "shapeSwitch": "Changer de forme"
+  },
+  "elementLink": {
+    "title": "Lien vers un objet",
+    "desc": "Cliquez sur une forme sur le canvas ou collez un lien.",
+    "notFound": "L'objet lié n'a pas été trouvé sur le canvas."
   },
   "library": {
     "noItems": "Aucun élément n'a encore été ajouté ...",
     "hint_emptyLibrary": "Sélectionnez un élément sur le canevas pour l'ajouter ici ou installez une bibliothèque depuis le dépôt public, ci-dessous.",
-    "hint_emptyPrivateLibrary": "Sélectionnez un élément sur le canevas pour l'ajouter ici."
+    "hint_emptyPrivateLibrary": "Sélectionnez un élément sur le canevas pour l'ajouter ici.",
+    "search": {
+      "inputPlaceholder": "Rechercher dans la bibliothèque",
+      "heading": "Correspondance de la bibliothèque",
+      "noResults": "Aucun élément correspondant trouvé...",
+      "clearSearch": "Effacer la recherche"
+    }
+  },
+  "search": {
+    "title": "Rechercher sur le canevas",
+    "noMatch": "Aucun résultat trouvé...",
+    "singleResult": "résultat",
+    "multipleResults": "résultats",
+    "placeholder": "Rechercher du texte sur la toile...",
+    "frames": "Cadres",
+    "texts": "Textes"
   },
   "buttons": {
     "clearReset": "Réinitialiser le canevas",
@@ -151,6 +204,7 @@
     "exportImage": "Exporter l'image...",
     "export": "Enregistrer sous...",
     "copyToClipboard": "Copier dans le presse-papier",
+    "copyLink": "",
     "save": "Enregistrer dans le fichier actuel",
     "saveAs": "Enregistrer sous",
     "load": "Ouvrir",
@@ -171,14 +225,16 @@
     "fullScreen": "Plein écran",
     "darkMode": "Mode sombre",
     "lightMode": "Mode clair",
+    "systemMode": "Mode système",
     "zenMode": "Mode zen",
     "objectsSnapMode": "Aimanter aux objets",
     "exitZenMode": "Quitter le mode zen",
     "cancel": "Annuler",
+    "saveLibNames": "Enregistrez et quittez",
     "clear": "Effacer",
     "remove": "Supprimer",
     "embed": "Activer/Désactiver l'intégration",
-    "publishLibrary": "Publier",
+    "publishLibrary": "Renommer ou publier",
     "submit": "Envoyer",
     "confirm": "Confirmer",
     "embeddableInteractionButton": "Cliquez pour interagir"
@@ -204,7 +260,8 @@
     "resetLibrary": "Cela va effacer votre bibliothèque. Êtes-vous sûr·e ?",
     "removeItemsFromsLibrary": "Supprimer {{count}} élément(s) de la bibliothèque ?",
     "invalidEncryptionKey": "La clé de chiffrement doit comporter 22 caractères. La collaboration en direct est désactivée.",
-    "collabOfflineWarning": "Aucune connexion internet disponible.\nVos modifications ne seront pas enregistrées !"
+    "collabOfflineWarning": "Aucune connexion internet disponible.\nVos modifications ne seront pas enregistrées !",
+    "localStorageQuotaExceeded": "Quota de stockage du navigateur dépassé. Les modifications ne seront pas enregistrées."
   },
   "errors": {
     "unsupportedFileType": "Type de fichier non supporté.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Le fichier est trop volumineux. La taille maximale autorisée est de {{maxSize}}.",
     "svgImageInsertError": "Impossible d'insérer l'image SVG. Le balisage SVG semble invalide.",
     "failedToFetchImage": "Échec de récupération de l'image.",
-    "invalidSVGString": "SVG invalide.",
     "cannotResolveCollabServer": "Impossible de se connecter au serveur collaboratif. Veuillez recharger la page et réessayer.",
     "importLibraryError": "Impossible de charger la bibliothèque",
+    "saveLibraryError": "Impossible d'enregistrer la bibliothèque sur le stockage. Veuillez enregistrer votre bibliothèque dans un fichier localement pour éviter de perdre vos modifications.",
     "collabSaveFailed": "Impossible d'enregistrer dans la base de données en arrière-plan. Si des problèmes persistent, vous devriez enregistrer votre fichier localement pour vous assurer de ne pas perdre votre travail.",
     "collabSaveFailed_sizeExceeded": "Impossible d'enregistrer dans la base de données en arrière-plan, le tableau semble trop grand. Vous devriez enregistrer le fichier localement pour vous assurer de ne pas perdre votre travail.",
     "imageToolNotSupported": "Les images sont désactivées.",
@@ -226,7 +283,7 @@
     },
     "libraryElementTypeError": {
       "embeddable": "Les éléments intégrés ne peuvent pas être ajoutés à la librairie.",
-      "iframe": "",
+      "iframe": "Les éléments IFrame ne peuvent pas être ajoutés à la bibliothèque.",
       "image": "Le support pour l'ajout d'images à la librairie arrive bientôt !"
     },
     "asyncPasteFailedOnRead": "Impossible de coller (impossible de lire le presse-papiers système).",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Sélection",
+    "lasso": "Sélection lasso",
     "image": "Insérer une image",
     "rectangle": "Rectangle",
     "diamond": "Losange",
@@ -246,16 +304,32 @@
     "library": "Bibliothèque",
     "lock": "Garder l'outil sélectionné actif après le dessin",
     "penMode": "Mode stylo - évite le toucher",
-    "link": "Ajouter/mettre à jour le lien pour une forme sélectionnée",
+    "link": "Ajouter / Mettre à jour un lien pour une forme sélectionnée",
     "eraser": "Gomme",
     "frame": "Outil de cadre",
-    "magicframe": "",
+    "magicframe": "Modèle en fil de fer vers code",
     "embeddable": "Intégration Web",
     "laser": "Pointeur laser",
     "hand": "Mains (outil de déplacement de la vue)",
     "extraTools": "Plus d'outils",
     "mermaidToExcalidraw": "De Mermaid à Excalidraw",
-    "magicSettings": "Paramètres IA"
+    "convertElementType": "Basculer le type de forme"
+  },
+  "element": {
+    "rectangle": "Rectangle",
+    "diamond": "Losange",
+    "ellipse": "Ellipse",
+    "arrow": "Flèche",
+    "line": "Ligne",
+    "freedraw": "Dessin libre",
+    "text": "Texte",
+    "image": "Image",
+    "group": "Groupe",
+    "frame": "Cadre",
+    "magicframe": "Wireframe à code",
+    "embeddable": "Intégration Web",
+    "selection": "Sélection",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Actions du canevas",
@@ -263,28 +337,33 @@
     "shapes": "Formes"
   },
   "hints": {
-    "canvasPanning": "Pour déplacer la zone de dessin, maintenez la molette de la souris enfoncée ou la barre d'espace tout en faisant glisser, ou utiliser l'outil main.",
+    "dismissSearch": "{{shortcut}} pour fermer la recherche",
+    "canvasPanning": "Pour déplacer le canevas, maintenez {{shortcut_1}} ou {{shortcut_2}} enfoncé tout en faisant glisser, ou utilisez l'outil main",
     "linearElement": "Cliquez pour démarrer plusieurs points, faites glisser pour une seule ligne",
+    "arrowTool": "Cliquez pour démarrer plusieurs points, faites glisser pour une ligne unique. Appuyez à nouveau sur {{shortcut}} pour changer le type de flèche.",
     "freeDraw": "Cliquez et faites glissez, relâchez quand vous avez terminé",
     "text": "Astuce : vous pouvez aussi ajouter du texte en double-cliquant n'importe où avec l'outil de sélection",
     "embeddable": "Cliquez et glissez pour créer une intégration de site web",
-    "text_selected": "Double-cliquez ou appuyez sur ENTRÉE pour modifier le texte",
-    "text_editing": "Appuyez sur ÉCHAP ou Ctrl/Cmd+ENTRÉE pour terminer l'édition",
-    "linearElementMulti": "Cliquez sur le dernier point ou appuyez sur Échap ou Entrée pour terminer",
-    "lockAngle": "Vous pouvez restreindre l'angle en maintenant MAJ",
-    "resize": "Vous pouvez conserver les proportions en maintenant la touche MAJ pendant le redimensionnement, maintenez la touche ALT pour redimensionner par rapport au centre",
-    "resizeImage": "Vous pouvez redimensionner librement en maintenant SHIFT,\nmaintenez ALT pour redimensionner depuis le centre",
-    "rotate": "Vous pouvez restreindre les angles en maintenant MAJ pendant la rotation",
-    "lineEditor_info": "Maintenez CtrlOrCmd et Double-cliquez ou appuyez sur CtrlOrCmd + Entrée pour modifier les points",
-    "lineEditor_pointSelected": "Appuyer sur Suppr. pour supprimer des points, Ctrl ou Cmd+D pour dupliquer, ou faire glisser pour déplacer",
-    "lineEditor_nothingSelected": "Sélectionner un point pour éditer (maintenir la touche MAJ pour en sélectionner plusieurs),\nou maintenir la touche Alt enfoncée et cliquer pour ajouter de nouveaux points",
-    "placeImage": "Cliquez pour placer l'image, ou cliquez et faites glisser pour définir sa taille manuellement",
+    "text_selected": "Double-cliquez ou appuyez sur {{shortcut}} pour modifier le texte",
+    "text_editing": "Appuyez sur {{shortcut_1}} ou {{shortcut_2}} pour terminer la modification",
+    "linearElementMulti": "Cliquez sur le dernier point ou appuyez sur {{shortcut_1}} ou {{shortcut_2}} pour terminer",
+    "lockAngle": "Vous pouvez limiter l'angle en maintenant la touche {{shortcut}} enfoncée",
+    "resize": "Vous pouvez contraindre les proportions en maintenant {{shortcut_1}} pendant le redimensionnement,\nmaintenez {{shortcut_2}} enfoncé pour redimensionner depuis le centre",
+    "resizeImage": "Vous pouvez redimensionner librement en maintenant {{shortcut_1}},\nmaintenez {{shortcut_2}} enfoncé pour redimensionner depuis le centre",
+    "rotate": "Vous pouvez contraindre les angles en maintenant {{shortcut}} enfoncé pendant la rotation",
+    "lineEditor_info": "Maintenez {{shortcut_1}} et Double-cliquez ou appuyez sur {{shortcut_2}} pour modifier les points",
+    "lineEditor_line_info": "Double-cliquez ou appuyez sur {{shortcut}} pour modifier le texte",
+    "lineEditor_pointSelected": "Appuyez sur {{shortcut_1}} pour supprimer le(s) point(s),\n{{shortcut_2}} pour dupliquer, ou faites glisser pour déplacer",
+    "lineEditor_nothingSelected": "Sélectionnez un point à éditer (maintenez {{shortcut_1}} enfoncé pour en sélectionner plusieurs),\nou maintenez {{shortcut_2}} et cliquez pour ajouter de nouveaux points",
     "publishLibrary": "Publier votre propre bibliothèque",
-    "bindTextToElement": "Appuyer sur Entrée pour ajouter du texte",
-    "deepBoxSelect": "Maintenir Ctrl ou Cmd pour sélectionner dans les groupes et empêcher le déplacement",
-    "eraserRevert": "Maintenez Alt enfoncé pour annuler les éléments marqués pour suppression",
+    "bindTextToElement": "{{shortcut}} pour ajouter du texte",
+    "createFlowchart": "{{shortcut}} pour créer un diagramme",
+    "deepBoxSelect": "Maintenez {{shortcut}} enfoncé pour sélectionner en profondeur, et pour éviter le glissement",
+    "eraserRevert": "Maintenez {{shortcut}} pour annuler les éléments marqués pour suppression",
     "firefox_clipboard_write": "Cette fonctionnalité devrait pouvoir être activée en définissant l'option \"dom.events.asyncClipboard.clipboard.clipboardItem\" à \"true\". Pour modifier les paramètres du navigateur dans Firefox, visitez la page \"about:config\".",
-    "disableSnapping": "Maintenez CtrlOuCmd pour désactiver l'aimantation"
+    "disableSnapping": "Maintenez {{shortcut}} pour désactiver l'accrochage",
+    "enterCropEditor": "Double-cliquez sur l'image ou appuyez sur {{shortcut}} pour recadrer l'image",
+    "leaveCropEditor": "Cliquez à l'extérieur de l'image ou appuyez sur {{shortcut_1}} ou {{shortcut_2}} pour terminer le recadrage"
   },
   "canvasError": {
     "cannotShowPreview": "Impossible d’afficher l’aperçu",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Nous avons fait très attention à ne pas inclure les informations de votre scène dans l'erreur. Si votre scène n'est pas privée, veuillez envisager de poursuivre sur notre <button>outil de suivi des bugs.</button> Veuillez inclure les informations ci-dessous en les copiant-collant dans le ticket GitHub.",
     "sceneContent": "Contenu de la scène :"
   },
+  "shareDialog": {
+    "or": "Ou"
+  },
   "roomDialog": {
-    "desc_intro": "Vous pouvez inviter des personnes à collaborer avec vous sur votre scène actuelle.",
-    "desc_privacy": "Pas d'inquiétude, la session utilise le chiffrement de bout en bout, donc tout ce que vous dessinez restera privé. Même notre serveur ne pourra voir ce que vous faites.",
+    "desc_intro": "Invitez des personnes à collaborer sur votre dessin.",
+    "desc_privacy": "Ne vous inquiétez pas, la session est chiffrée de bout en bout et entièrement privée. Même notre serveur ne peut pas voir ce que vous dessinez.",
     "button_startSession": "Démarrer la session",
     "button_stopSession": "Arrêter la session",
     "desc_inProgressIntro": "La session de collaboration en direct est maintenant en cours.",
@@ -328,6 +410,8 @@
     "click": "clic",
     "deepSelect": "Sélection dans les groupes",
     "deepBoxSelect": "Sélectionner dans les groupes, et empêcher le déplacement",
+    "createFlowchart": "Créer un diagramme à partir d'un élément",
+    "navigateFlowchart": "",
     "curvedArrow": "Flèche courbée",
     "curvedLine": "Ligne courbée",
     "documentation": "Documentation",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zoomer sur la sélection",
     "toggleElementLock": "Verrouiller/déverrouiller la sélection",
     "movePageUpDown": "Déplacer la page vers le haut/bas",
-    "movePageLeftRight": "Déplacer la page vers la gauche/droite"
+    "movePageLeftRight": "Déplacer la page vers la gauche/droite",
+    "cropStart": "Rogner l’image",
+    "cropFinish": "Terminer le recadrage de l'image"
   },
   "clearCanvasDialog": {
     "title": "Effacer la zone de dessin"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Angle",
-    "element": "Élément",
-    "elements": "Éléments",
+    "shapes": "Formes",
     "height": "Hauteur",
     "scene": "Scène",
     "selected": "Sélection",
     "storage": "Stockage",
-    "title": "Stats pour les nerds",
+    "fullTitle": "Propriétés du canevas et des formes",
+    "title": "Propriétés",
+    "generalStats": "Général",
+    "elementProperties": "Propriétés de la forme",
     "total": "Total",
     "version": "Version",
     "versionCopy": "Cliquer pour copier",
@@ -439,13 +527,15 @@
     "copyStyles": "Styles copiés.",
     "copyToClipboard": "Copié dans le presse-papier.",
     "copyToClipboardAsPng": "{{exportSelection}} copié dans le presse-papier en PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} copié dans le presse-papier en SVG\n({{exportColorScheme}})",
     "fileSaved": "Fichier enregistré.",
     "fileSavedToFilename": "Enregistré sous {filename}",
     "canvas": "canevas",
     "selection": "sélection",
     "pasteAsSingleElement": "Utiliser {{shortcut}} pour coller comme un seul élément,\nou coller dans un éditeur de texte existant",
     "unableToEmbed": "Intégrer cet URL n'est actuellement pas autorisé. Ouvrez un ticket sur GitHub pour demander son ajout à la liste blanche",
-    "unrecognizedLinkFormat": "Le lien que vous avez intégré ne correspond pas au format attendu. Veuillez essayer de coller la chaîne d'intégration fournie par le site source"
+    "unrecognizedLinkFormat": "Le lien que vous avez intégré ne correspond pas au format attendu. Veuillez essayer de coller la chaîne d'intégration fournie par le site source",
+    "elementLinkCopied": "Lien copié dans le presse-papiers"
   },
   "colors": {
     "transparent": "Transparent",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "Couleur ",
     "mostUsedCustomColors": "Couleurs personnalisées les plus fréquemment utilisées",
     "colors": "Couleurs",
     "shades": "Nuances",
@@ -518,8 +609,56 @@
   "mermaid": {
     "title": "De Mermaid à Excalidraw",
     "button": "Insérer",
-    "description": "",
+    "description": "Actuellement, seuls les diagrammes <flowchartLink>Flowchart</flowchartLink>,<sequenceLink> Sequence, </sequenceLink> et <classLink>de classe </classLink>sont pris en charge. Les autres types seront rendus en tant qu'image dans Excalidraw.",
     "syntax": "Syntaxe Mermaid",
     "preview": "Prévisualisation"
+  },
+  "quickSearch": {
+    "placeholder": "Recherche rapide"
+  },
+  "fontList": {
+    "badge": {
+      "old": "ancien"
+    },
+    "sceneFonts": "Dans cette scène",
+    "availableFonts": "Polices disponibles",
+    "empty": "Aucune police trouvée"
+  },
+  "userList": {
+    "empty": "Aucun utilisateurs trouvé",
+    "hint": {
+      "text": "Cliquez sur l'utilisateur pour le suivre",
+      "followStatus": "Vous suivez actuellement cet utilisateur",
+      "inCall": "L'utilisateur est dans un appel vocal",
+      "micMuted": "Le micro de l'utilisateur est muet",
+      "isSpeaking": "L'utilisateur parle"
+    }
+  },
+  "commandPalette": {
+    "title": "Palette de commandes",
+    "shortcuts": {
+      "select": "Sélectionner",
+      "confirm": "Confirmer",
+      "close": "Fermer"
+    },
+    "recents": "Récemment utilisé",
+    "search": {
+      "placeholder": "Recherchez dans les menus, les commandes et découvrez des gemmes cachées",
+      "noMatch": "Aucune commande correspondante..."
+    },
+    "itemNotAvailable": "Commande non disponible...",
+    "shortcutHint": "Pour la palette de commandes, utilisez {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "Ctrl",
+    "option": "Option",
+    "cmd": "Cmd",
+    "alt": "Alt",
+    "escape": "Échap",
+    "enter": "Entrée",
+    "shift": "Maj",
+    "spacebar": "Espace",
+    "delete": "Supprimer",
+    "mmb": "Clic molette"
   }
 }
diff --git a/packages/excalidraw/locales/gl-ES.json b/packages/excalidraw/locales/gl-ES.json
index b0e6a7508c..d558c2850a 100644
--- a/packages/excalidraw/locales/gl-ES.json
+++ b/packages/excalidraw/locales/gl-ES.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Copiar no portapapeis como PNG",
     "copyAsSvg": "Copiar no portapapeis como SVG",
     "copyText": "Copia no portapapeis como texto",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Copiar fonte ao portapapeis",
+    "convertToCode": "Converter a código",
     "bringForward": "Traer cara adiante",
     "sendToBack": "Enviar cara atrás",
     "bringToFront": "Traer á fronte",
@@ -21,7 +21,9 @@
     "copyStyles": "Copiar estilo",
     "pasteStyles": "Pegar estilo",
     "stroke": "Trazo",
+    "changeStroke": "",
     "background": "Fondo",
+    "changeBackground": "",
     "fill": "Recheo",
     "strokeWidth": "Largo do trazo",
     "strokeStyle": "Estilo do trazo",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Ningunha",
     "arrowhead_arrow": "Frecha",
     "arrowhead_bar": "Barra",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Círculo",
+    "arrowhead_circle_outline": "Círculo (contorno)",
     "arrowhead_triangle": "Triángulo",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Triángulo (contorno)",
+    "arrowhead_diamond": "Diamante",
+    "arrowhead_diamond_outline": "Diamante (contorno)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Tamaño da fonte",
     "fontFamily": "Tipo de fonte",
     "addWatermark": "Engadir \"Feito con Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Usado en lenzo",
     "canvasBackground": "Fondo do lenzo",
     "drawingCanvas": "Lenzo de debuxo",
+    "clearCanvas": "",
     "layers": "Capas",
     "actions": "Accións",
     "language": "Idioma",
@@ -84,12 +95,13 @@
     "group": "Agrupar selección",
     "ungroup": "Desagrupar selección",
     "collaborators": "Colaboradores",
-    "showGrid": "Mostrar cuadrícula",
+    "toggleGrid": "",
     "addToLibrary": "Engadir á biblioteca",
     "removeFromLibrary": "Eliminar da biblioteca",
     "libraryLoadingMessage": "Cargando biblioteca…",
     "libraries": "Explorar bibliotecas",
     "loadingScene": "Cargando escena…",
+    "loadScene": "",
     "align": "Aliñamento",
     "alignTop": "Aliñamento superior",
     "alignBottom": "Aliñamento inferior",
@@ -105,7 +117,9 @@
     "share": "Compartir",
     "showStroke": "Mostrar selector de cores do trazo",
     "showBackground": "Mostrar selector de cores do fondo",
-    "toggleTheme": "Alternar tema",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "Biblioteca Persoal",
     "excalidrawLib": "Biblioteca Excalidraw",
     "decreaseFontSize": "Diminuír tamaño da fonte",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Editar ligazón",
       "editEmbed": "",
-      "create": "Crear ligazón",
-      "createEmbed": "",
+      "create": "",
       "label": "Ligazón",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "Non se estableceu un enlace",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Editar liña",
-      "exit": "Saír do editor de liñas"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Bloquear",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "",
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Texto a diagrama",
+    "prompt": "",
+    "followUs": "Síguenos",
+    "discordChat": "Chat de Discord",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Aínda non hai elementos engadidos...",
     "hint_emptyLibrary": "Seleccione un elemento no lenzo para engadilo aquí, ou instale unha biblioteca dende o repositorio público, como se detalla a continuación.",
-    "hint_emptyPrivateLibrary": "Seleccione un elemento do lenzo para engadilo aquí."
+    "hint_emptyPrivateLibrary": "Seleccione un elemento do lenzo para engadilo aquí.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Limpar o lenzo",
@@ -151,6 +204,7 @@
     "exportImage": "Exportar imaxe...",
     "export": "Gardar en...",
     "copyToClipboard": "Copiar ao portapapeis",
+    "copyLink": "",
     "save": "Gardar no ficheiro actual",
     "saveAs": "Gardar como",
     "load": "Abrir",
@@ -171,14 +225,16 @@
     "fullScreen": "Pantalla completa",
     "darkMode": "Modo escuro",
     "lightMode": "Modo claro",
+    "systemMode": "",
     "zenMode": "Modo zen",
     "objectsSnapMode": "",
     "exitZenMode": "Saír do modo zen",
     "cancel": "Cancelar",
+    "saveLibNames": "",
     "clear": "Limpar",
     "remove": "Eliminar",
     "embed": "",
-    "publishLibrary": "Publicar",
+    "publishLibrary": "",
     "submit": "Enviar",
     "confirm": "Confirmar",
     "embeddableInteractionButton": "Faga clic para interactuar"
@@ -204,20 +260,21 @@
     "resetLibrary": "Isto limpará a súa biblioteca. Está seguro?",
     "removeItemsFromsLibrary": "Eliminar {{count}} elemento(s) da biblioteca?",
     "invalidEncryptionKey": "A clave de cifrado debe ter 22 caracteres. A colaboración en directo está desactivada.",
-    "collabOfflineWarning": "Non hai conexión a Internet dispoñible.\nOs teus cambios non serán gardados!"
+    "collabOfflineWarning": "Non hai conexión a Internet dispoñible.\nOs teus cambios non serán gardados!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipo de ficheiro non soportado.",
     "imageInsertError": "Non se puido inserir a imaxe. Probe de novo máis tarde...",
     "fileTooBig": "O ficheiro é demasiado grande. O tamaño máximo permitido é {{maxSize}}.",
     "svgImageInsertError": "Non se puido inserir como imaxe SVG. O marcado SVG semella inválido.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG inválido.",
+    "failedToFetchImage": "Non se puido obter a imaxe.",
     "cannotResolveCollabServer": "Non se puido conectar ao servidor de colaboración. Por favor recargue a páxina e probe de novo.",
     "importLibraryError": "Non se puido cargar a biblioteca",
+    "saveLibraryError": "",
     "collabSaveFailed": "Non se puido gardar na base de datos. Se o problema persiste, deberías gardar o teu arquivo de maneira local para asegurarte de non perdelo teu traballo.",
     "collabSaveFailed_sizeExceeded": "Non se puido gardar na base de datos, o lenzo semella demasiado grande. Deberías gardar o teu arquivo de maneira local para asegurarte de non perdelo teu traballo.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "As imaxes están desactivadas.",
     "brave_measure_text_error": {
       "line1": "",
       "line2": "",
@@ -230,11 +287,12 @@
       "image": ""
     },
     "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnParse": "Non se puido copiar.",
+    "copyToSystemClipboardFailed": "Non se puido copiar ao portapapeis."
   },
   "toolBar": {
     "selection": "Selección",
+    "lasso": "",
     "image": "Inserir imaxe",
     "rectangle": "Rectángulo",
     "diamond": "Diamante",
@@ -246,7 +304,7 @@
     "library": "Biblioteca",
     "lock": "Manter a ferramenta seleccionada activa despois de debuxar",
     "penMode": "Modo lapis - evitar o contacto",
-    "link": "Engadir/ Actualizar ligazón para a forma seleccionada",
+    "link": "",
     "eraser": "Goma de borrar",
     "frame": "",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "Man (ferramenta de desprazamento)",
     "extraTools": "Máis ferramentas",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Accións do lenzo",
@@ -263,28 +337,33 @@
     "shapes": "Formas"
   },
   "hints": {
-    "canvasPanning": "Para mover o lenzo, manteña pulsada a roda do rato ou a barra de espazo mentres arrastra, ou utilice a ferramenta da man",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Faga clic para iniciar varios puntos, arrastre para unha sola liña",
+    "arrowTool": "",
     "freeDraw": "Fai clic e arrastra, solta cando acabes",
     "text": "Consello: tamén podes engadir texto facendo dobre-clic en calquera lugar coa ferramenta de selección",
     "embeddable": "Faga clic e arrastre para crear un sitio web embebido",
-    "text_selected": "Dobre-clic ou prema ENTER para editar o texto",
-    "text_editing": "Prema Escape ou CtrlOrCmd+ENTER para finalizar a edición",
-    "linearElementMulti": "Faga clic no último punto ou prema Escape ou Enter para rematar",
-    "lockAngle": "Pode reducir o ángulo mantendo SHIFT",
-    "resize": "Pode reducir as proporcións mantendo SHIFT mentres axusta o tamaño,\nmanteña ALT para axustalo dende o centro",
-    "resizeImage": "Pode axustar o tamaño libremente mantendo SHIFT,\nmanteña ALT para axustalo dende o centro",
-    "rotate": "Podes reducir os ángulos mantendo SHIFT mentres os rotas",
-    "lineEditor_info": "Manteña pulsado CtrlOrCmd e faga dobre clic ou prema CtrlOrCmd + Enter para editar puntos",
-    "lineEditor_pointSelected": "Prema Suprimir para eliminar o(s) punto(s)\nCtrlOrCmd+D para duplicalos, ou arrastre para movelos",
-    "lineEditor_nothingSelected": "Seleccione un punto para editar (manteña pulsado SHIFT para selección múltiple),\nou manteña pulsado Alt e faga clic para engadir novos puntos",
-    "placeImage": "Faga clic para colocar a imaxe, ou faga clic e arrastre para establecer o seu tamaño manualmente",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publica a túa propia biblioteca",
-    "bindTextToElement": "Prema a tecla enter para engadir texto",
-    "deepBoxSelect": "Manteña pulsado CtrlOrCmd para seleccionar en profundidade e evitar o arrastre",
-    "eraserRevert": "Manteña pulsado Alt para reverter os elementos marcados para a súa eliminación",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Esta función pódese activar establecendo a opción \"dom.events.asyncClipboard.clipboardItem\" a \"true\". Para cambiar as opcións do navegador en Firefox, visita a páxina \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Non se pode mostrar a vista previa",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Fomos moi cautelosos de non incluír a información da súa escena no erro. Se a súa escena non é privada, por favor, considere o seguimento do noso <button>rastrexador de erros.</button> Por favor inclúa a seguinte información copiándoa e pegándoa na issue de Github.",
     "sceneContent": "Contido da escena:"
   },
+  "shareDialog": {
+    "or": "Ou"
+  },
   "roomDialog": {
-    "desc_intro": "Podes invitar xente a colaborar contigo na túa escena actual.",
-    "desc_privacy": "Non te preocupes, a sesión usa cifrado de punto a punto, polo que calquera cousa que debuxes mantense privada. Nin tan sequera o noso servidor será capaz de ver o que fas.",
+    "desc_intro": "Invita xente a colaborar no teu diagrama.",
+    "desc_privacy": "",
     "button_startSession": "Comezar sesión",
     "button_stopSession": "Rematar sesión",
     "desc_inProgressIntro": "A sesión de colaboración en directo está agora en progreso.",
@@ -328,6 +410,8 @@
     "click": "clic",
     "deepSelect": "Selección en profundidade",
     "deepBoxSelect": "Selección en profundidade dentro da caixa, evitando o arrastre",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Frecha curva",
     "curvedLine": "Liña curva",
     "documentation": "Documentación",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zoom á selección",
     "toggleElementLock": "Bloquear/desbloquear selección",
     "movePageUpDown": "Mover páxina cara enriba/abaixo",
-    "movePageLeftRight": "Mover páxina cara a esquerda/dereita"
+    "movePageLeftRight": "Mover páxina cara a esquerda/dereita",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Limpar lenzo"
@@ -395,14 +481,14 @@
     "header": "Exportar imaxe",
     "label": {
       "withBackground": "Fondo",
-      "onlySelected": "",
+      "onlySelected": "Só seleccionados",
       "darkMode": "Modo escuro",
       "embedScene": "",
       "scale": "",
       "padding": ""
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "Os datos da escena serán gardados no ficheiro PNG/SVG exportado polo que a escena poderá ser restaurada dende el. Isto aumentará o tamaño do ficheiro exportado."
     },
     "title": {
       "exportToPng": "Exportar a PNG",
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Ángulo",
-    "element": "Elemento",
-    "elements": "Elementos",
+    "shapes": "",
     "height": "Alto",
     "scene": "Escena",
     "selected": "Seleccionado",
     "storage": "Almacenamento",
-    "title": "Estadísticas para nerds",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Total",
     "version": "Versión",
     "versionCopy": "Faga clic para copiar",
@@ -439,13 +527,15 @@
     "copyStyles": "Estilos copiados.",
     "copyToClipboard": "Copiado ao portapapeis.",
     "copyToClipboardAsPng": "Copiar {{exportSelection}} ao portapapeis como PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Ficheiro gardado.",
     "fileSavedToFilename": "Gardado en {filename}",
     "canvas": "lenzo",
     "selection": "selección",
     "pasteAsSingleElement": "Usa {{shortcut}} para pegar como un único elemento\nou pega nun editor de texto existente",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Transparente",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "Cores",
     "shades": "",
@@ -517,9 +608,57 @@
   },
   "mermaid": {
     "title": "",
-    "button": "",
+    "button": "Inserir",
     "description": "",
     "syntax": "",
-    "preview": ""
+    "preview": "Vista previa"
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "Fai clic no usuario para seguilo",
+      "followStatus": "Xa estás a seguir a este usuario",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/he-IL.json b/packages/excalidraw/locales/he-IL.json
index 83bf3e718e..09ae7ee1aa 100644
--- a/packages/excalidraw/locales/he-IL.json
+++ b/packages/excalidraw/locales/he-IL.json
@@ -1,27 +1,29 @@
 {
   "labels": {
-    "paste": "הדבק",
-    "pasteAsPlaintext": "הדבק ללא עיצוב",
-    "pasteCharts": "הדבק גרפים",
-    "selectAll": "בחר הכל",
-    "multiSelect": "הוסף רכיב לבחירה",
-    "moveCanvas": "הזז את הקנבס",
-    "cut": "גזור",
-    "copy": "העתק",
-    "copyAsPng": "העתק ללוח כ PNG",
-    "copyAsSvg": "העתק ללוח כ SVG",
+    "paste": "הדבקה",
+    "pasteAsPlaintext": "הדבקה ללא עיצוב",
+    "pasteCharts": "הדבקת תרשימים",
+    "selectAll": "בחירה בהכול",
+    "multiSelect": "הוספת רכיב לבחירה",
+    "moveCanvas": "הזזת הקנבס",
+    "cut": "גזירה",
+    "copy": "העתקה",
+    "copyAsPng": "העתקה ללוח כ־PNG",
+    "copyAsSvg": "העתקה ללוח כ־SVG",
     "copyText": "העתק ללוח כטקסט",
-    "copySource": "",
-    "convertToCode": "",
-    "bringForward": "הבא שכבה קדימה",
-    "sendToBack": "שלח אחורה",
-    "bringToFront": "העבר לחזית",
-    "sendBackward": "העבר שכבה אחורה",
-    "delete": "מחק",
-    "copyStyles": "העתק סגנון",
-    "pasteStyles": "הדבק סגנון",
+    "copySource": "העתקת המקור ללוח הגזירים",
+    "convertToCode": "המרה לקוד",
+    "bringForward": "קירוב השכבה",
+    "sendToBack": "הרחקה אחורה",
+    "bringToFront": "קירוב לחזית",
+    "sendBackward": "הרחקה אחורה עד הסוף",
+    "delete": "מחיקה",
+    "copyStyles": "העתקת סגנון",
+    "pasteStyles": "הדבקת סגנונות",
     "stroke": "קו מתאר",
+    "changeStroke": "החלפת צבע קו מתאר",
     "background": "רקע",
+    "changeBackground": "החלפת צבע הרקע",
     "fill": "מילוי",
     "strokeWidth": "עובי קו מתאר",
     "strokeStyle": "סגנון קו המתאר",
@@ -38,15 +40,23 @@
     "arrowhead_none": "ללא",
     "arrowhead_arrow": "חץ",
     "arrowhead_bar": "קצה אנכי",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "עיגול",
+    "arrowhead_circle_outline": "עיגול (קו מתאר)",
     "arrowhead_triangle": "משולש",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "משולש (קו מתאר)",
+    "arrowhead_diamond": "יהלום",
+    "arrowhead_diamond_outline": "יהלום (קו מתאר)",
+    "arrowhead_crowfoot_many": "רגל עורב (הרבה)",
+    "arrowhead_crowfoot_one": "רגל עורב (אחת)",
+    "arrowhead_crowfoot_one_or_many": "רגל עורב (אחת או הרבה)",
+    "more_options": "אפשרויות נוספות",
+    "arrowtypes": "סוג החץ",
+    "arrowtype_sharp": "חץ מחודד",
+    "arrowtype_round": "חץ מעוקל",
+    "arrowtype_elbowed": "חץ זוויתי",
     "fontSize": "גודל גופן",
     "fontFamily": "גופן",
-    "addWatermark": "הוסף \"נוצר באמצעות Excalidraw\"",
+    "addWatermark": "הוספת „נוצר באמצעות Excalidraw”",
     "handDrawn": "ציור יד",
     "normal": "רגיל",
     "code": "קוד",
@@ -54,77 +64,86 @@
     "medium": "בינוני",
     "large": "גדול",
     "veryLarge": "גדול מאוד",
-    "solid": "מוצק",
+    "solid": "אחיד",
     "hachure": "קווים מקבילים קצרים להצגת כיוון וחדות שיפוע במפה",
     "zigzag": "זיגזג",
-    "crossHatch": "קווים מוצלבים שתי וערב",
+    "crossHatch": "קווים מוצלבים",
     "thin": "דק",
     "bold": "מודגש",
     "left": "שמאל",
     "center": "מרכז",
     "right": "ימין",
     "extraBold": "מודגש במיוחד",
-    "architect": "ארכיטקט",
+    "architect": "אדריכלות",
     "artist": "אמן",
     "cartoonist": "קריקטוריסט",
     "fileTitle": "שם קובץ",
-    "colorPicker": "בוחר צבעים",
+    "colorPicker": "בורר צבעים",
     "canvasColors": "בשימוש בקנבס",
     "canvasBackground": "רקע קנבס",
     "drawingCanvas": "קנבס ציור",
+    "clearCanvas": "ניקוי הקנבס",
     "layers": "שכבות",
     "actions": "פעולות",
     "language": "שפה",
-    "liveCollaboration": "התחל שיתוף חי...",
-    "duplicateSelection": "שכפל",
+    "liveCollaboration": "התחלת שיתוף חי…",
+    "duplicateSelection": "שכפול",
     "untitled": "ללא כותרת",
     "name": "שם",
     "yourName": "שמך",
     "madeWithExcalidraw": "נוצר באמצעות Excalidraw",
-    "group": "קבץ",
-    "ungroup": "פרק קבוצה",
+    "group": "קיבוץ הבחירה",
+    "ungroup": "פירוק קבוצה",
     "collaborators": "שותפים",
-    "showGrid": "הצג רשת",
-    "addToLibrary": "הוסף לספריה",
-    "removeFromLibrary": "הסר מספריה",
-    "libraryLoadingMessage": "טוען ספריה…",
-    "libraries": "עיין בספריות",
-    "loadingScene": "טוען תצוגה…",
-    "align": "יישר",
-    "alignTop": "יישר למעלה",
-    "alignBottom": "יישר למטה",
-    "alignLeft": "יישר לשמאל",
-    "alignRight": "יישר לימין",
-    "centerVertically": "מרכז אנכית",
-    "centerHorizontally": "מרכז אופקית",
-    "distributeHorizontally": "חלוקה אופקית",
-    "distributeVertically": "חלוקה אנכית",
-    "flipHorizontal": "הפוך אופקית",
-    "flipVertical": "הפוך אנכית",
+    "toggleGrid": "הצגת/הסתרת רשת",
+    "addToLibrary": "הוספה לספרייה",
+    "removeFromLibrary": "הסרה מהספרייה",
+    "libraryLoadingMessage": "הספרייה נטענת…",
+    "libraries": "עיון בספריות",
+    "loadingScene": "הסצנה נטענת…",
+    "loadScene": "טעינת סצנה מקובץ",
+    "align": "יישור",
+    "alignTop": "יישור למעלה",
+    "alignBottom": "יישור למטה",
+    "alignLeft": "יישור לשמאל",
+    "alignRight": "יישור לימין",
+    "centerVertically": "מירכוז אנכי",
+    "centerHorizontally": "מירכוז אופקי",
+    "distributeHorizontally": "פיזור אופקי",
+    "distributeVertically": "פיזור אנכי",
+    "flipHorizontal": "היפוך אופקי",
+    "flipVertical": "היפוך אנכי",
     "viewMode": "מצב תצוגה",
-    "share": "שתף",
-    "showStroke": "הצג בוחר צבע מברשת",
-    "showBackground": "הצג בוחר צבע רקע",
-    "toggleTheme": "שינוי ערכת העיצוב",
+    "share": "שיתוף",
+    "showStroke": "הצגת בורר צבע מברשת",
+    "showBackground": "הצגת בורר צבע רקע",
+    "showFonts": "הצגת בורר הגופנים",
+    "toggleTheme": "החלפת מצב מואר/חשוך",
+    "theme": "ערכת עיצוב",
     "personalLib": "ספריה פרטית",
-    "excalidrawLib": "הספריה של Excalidraw",
-    "decreaseFontSize": "הקטן את גודל הגופן",
-    "increaseFontSize": "הגדל את גודל הגופן",
+    "excalidrawLib": "הספרייה של Excalidraw",
+    "decreaseFontSize": "הקטנת הכתב",
+    "increaseFontSize": "הגדלת הכתב",
     "unbindText": "ביטול קיבוע הטקסט",
     "bindText": "קיבוע הטקסט למיכל",
-    "createContainerFromText": "ארוז טקסט במיכל",
+    "createContainerFromText": "אריזת טקסט במיכל",
     "link": {
       "edit": "עריכת קישור",
-      "editEmbed": "ערוך קישור ושבץ",
-      "create": "יצירת קישור",
-      "createEmbed": "צור קישור ושבץ",
+      "editEmbed": "עריכת קישור מוטמע",
+      "create": "הוספת קישור",
       "label": "קישור",
-      "labelEmbed": "קשר ושבץ",
-      "empty": "לא נקבע קישור"
+      "labelEmbed": "קישור ושיבוץ",
+      "empty": "לא נקבע קישור",
+      "hint": "יש להקליד או להדביק את הקישור שלך כאן",
+      "goToElement": "העברה לפריט היעד"
     },
     "lineEditor": {
-      "edit": "ערוך קו",
-      "exit": "צא מעורך הקו"
+      "edit": "עריכת קו",
+      "editArrow": "עריכת חץ"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "נעילה",
@@ -133,65 +152,102 @@
       "unlockAll": "שחרור הכול"
     },
     "statusPublished": "פורסם",
-    "sidebarLock": "שמור את סרגל הצד פתוח",
-    "selectAllElementsInFrame": "בחר את כל האלמנטים במסגרת",
-    "removeAllElementsFromFrame": "הסר את כל האלמנטים שבמסגרת",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "sidebarLock": "להשאיר את סרגל הצד פתוח",
+    "selectAllElementsInFrame": "בחירת כל הרכיבים במסגרת",
+    "removeAllElementsFromFrame": "הסרת כל הרכיבים מהמסגרת",
+    "eyeDropper": "בחירת צבע מתוך הקנבס",
+    "textToDiagram": "טקסט לתרשים",
+    "prompt": "בקשה",
+    "followUs": "לעקוב אחרינו",
+    "discordChat": "צ׳אט ב־Discord",
+    "zoomToFitViewport": "התאמת התקריב לגודל המסך",
+    "zoomToFitSelection": "להתמקד בחלק הנבחר",
+    "zoomToFit": "להציג את כל הרכיבים",
+    "installPWA": "התקנת Excalidraw לשימוש מקומי (PWA)",
+    "autoResize": "לאפשר התאמה אוטומטית של גודל הכתב",
+    "imageCropping": "חיתוך תמונה",
+    "unCroppedDimension": "ממדים ללא חיתוך",
+    "copyElementLink": "העתקת קישור לפריט",
+    "linkToElement": "קישור לפריט",
+    "wrapSelectionInFrame": "לעטוף את הבחירה במסגרת",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "קישור לפריט",
+    "desc": "יש ללחוץ על צורה בקנבס או להדביק קישור.",
+    "notFound": "פריט מקושר לא נמצא בקנבס."
   },
   "library": {
-    "noItems": "עוד לא הוספת דברים...",
-    "hint_emptyLibrary": "בחר משהו בקנבס כדי להוסיף אותו לכאן, או שתתקין ספריה מהספריה הציבורית מטה.",
-    "hint_emptyPrivateLibrary": "בחר משהו בקנבס כדי להוסיף אותו לכאן."
+    "noItems": "עוד לא הוספת דברים…",
+    "hint_emptyLibrary": "נא לבחור משהו בקנבס כדי להוסיף אותו לכאן, או להתקין ספרייה מהמאגר הציבורי שלמטה.",
+    "hint_emptyPrivateLibrary": "נא לבחור משהו בקנבס כדי להוסיף אותו לכאן.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "איתור בלוח הציור",
+    "noMatch": "לא נמצאו תוצאות…",
+    "singleResult": "תוצאה",
+    "multipleResults": "תוצאות",
+    "placeholder": "איתור טקסט בלוח הציור…",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
-    "clearReset": "אפס את הקנבאס",
-    "exportJSON": "ייצא לקובץ",
-    "exportImage": "ייצוא התמונה...",
-    "export": "שמור ל...",
-    "copyToClipboard": "העתק ללוח",
-    "save": "שמור לקובץ נוכחי",
+    "clearReset": "איפוס לוח הציור",
+    "exportJSON": "ייצוא לקובץ",
+    "exportImage": "ייצוא התמונה…",
+    "export": "שמירה אל…",
+    "copyToClipboard": "העתקה ללוח",
+    "copyLink": "העתקת קישור",
+    "save": "שמירה לקובץ הנוכחי",
     "saveAs": "שמירה בשם",
-    "load": "פתח",
-    "getShareableLink": "קבל קישור לשיתוף",
-    "close": "סגור",
-    "selectLanguage": "בחר שפה",
-    "scrollBackToContent": "גלול בחזרה לתוכן",
-    "zoomIn": "הגדל",
-    "zoomOut": "הקטן",
-    "resetZoom": "איפוס זום",
+    "load": "פתיחה",
+    "getShareableLink": "קבלת קישור לשיתוף",
+    "close": "סגירה",
+    "selectLanguage": "בחירת שפה",
+    "scrollBackToContent": "גלילה בחזרה לתוכן",
+    "zoomIn": "הגדלה",
+    "zoomOut": "הקטנה",
+    "resetZoom": "איפוס תקריב",
     "menu": "תפריט",
     "done": "בוצע",
-    "edit": "ערוך",
-    "undo": "בטל",
-    "redo": "בצע מחדש",
-    "resetLibrary": "איפוס ספריה",
-    "createNewRoom": "צור חדר חדש",
+    "edit": "עריכה",
+    "undo": "ביטול",
+    "redo": "ביצוע מחדש",
+    "resetLibrary": "איפוס ספרייה",
+    "createNewRoom": "יצירת חדר חדש",
     "fullScreen": "מסך מלא",
     "darkMode": "מצב כהה",
     "lightMode": "מצב בהיר",
-    "zenMode": "מצב זן",
-    "objectsSnapMode": "",
-    "exitZenMode": "צא ממצב זן",
+    "systemMode": "מצב מערכת",
+    "zenMode": "מצב ריכוז",
+    "objectsSnapMode": "הצמדה לעצמים",
+    "exitZenMode": "יציאה ממצב ריכוז",
     "cancel": "ביטול",
+    "saveLibNames": "",
     "clear": "ניקוי",
-    "remove": "הסר",
-    "embed": "",
-    "publishLibrary": "פרסום",
+    "remove": "הסרה",
+    "embed": "להציג את ההטמעה",
+    "publishLibrary": "",
     "submit": "שליחה",
-    "confirm": "אשר",
-    "embeddableInteractionButton": ""
+    "confirm": "אישור",
+    "embeddableInteractionButton": "לחיצה לתפעול"
   },
   "alerts": {
-    "clearReset": "פעולה זו תנקה את כל הקנבס. אתה בטוח?",
-    "couldNotCreateShareableLink": "יצירת קישור לשיתוף נכשל.",
-    "couldNotCreateShareableLinkTooBig": "יצירת קישור לשיתוף נכשל: התצוגה גדולה מדי",
+    "clearReset": "פעולה זו תנקה את כל לוח הציור. להמשיך?",
+    "couldNotCreateShareableLink": "יצירת קישור לשיתוף נכשלה.",
+    "couldNotCreateShareableLinkTooBig": "יצירת קישור לשיתוף נכשלה: הסצנה גדולה מדי",
     "couldNotLoadInvalidFile": "טעינת קובץ לא תקין נכשלה",
-    "importBackendFailed": "ייבוא מהשרת נכשל.",
-    "cannotExportEmptyCanvas": "לא ניתן לייצא קנבאס ריק.",
-    "couldNotCopyToClipboard": "לא ניתן היה להעתיק ללוח.",
-    "decryptFailed": "פיענוח ההצפנה של המידע נכשל.",
+    "importBackendFailed": "ייבוא מהמנגנון נכשל.",
+    "cannotExportEmptyCanvas": "לא ניתן לייצא לוח ציור ריק.",
+    "couldNotCopyToClipboard": "לא ניתן להעתיק ללוח.",
+    "decryptFailed": "פענוח הצפנת הנתונים נכשל.",
     "uploadedSecurly": "ההעלאה אובטחה באמצעות הצפנה מקצה לקצה, פירוש הדבר שהשרת של Excalidraw וגורמי צד ג׳ לא יכולים לקרוא את התוכן.",
     "loadSceneOverridePrompt": "טעינה של ציור חיצוני תחליף את התוכן הקיים שלך. האם תרצה להמשיך?",
     "collabStopOverridePrompt": "עצירת השיתוף תוביל למחיקת הציור הקודם ששמור מקומית בדפדפן. האם אתה בטוח?\n\n(אם תרצה לשמור את הציור המקומי, סגור את הטאב של הדפדפן במקום.)",
@@ -204,37 +260,39 @@
     "resetLibrary": "פעולה זו תנקה את כל הספריה שלך. אתה בטוח?",
     "removeItemsFromsLibrary": "מחק {{count}} פריט(ים) מהספריה?",
     "invalidEncryptionKey": "מפתח ההצפנה חייב להיות בן 22 תוים. השיתוף החי מנוטרל.",
-    "collabOfflineWarning": "אין חיבור זמין לאינטרנט.\nהשינויים שלך לא ישמרו!"
+    "collabOfflineWarning": "אין חיבור זמין לאינטרנט.\nהשינויים שלך לא ישמרו!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "סוג הקובץ אינו נתמך.",
     "imageInsertError": "לא ניתן היה להוסיף את התמונה. אנא נסה שוב מאוחר יותר...",
     "fileTooBig": "הקובץ גדול מדי. הגודל המירבי המותר הינו {{maxSize}}.",
     "svgImageInsertError": "לא ניתן היה להוסיף את תמונת ה-SVG. הסימונים בתוך קובץ ה-SVG עשויים להיות שגויים.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG שגוי.",
+    "failedToFetchImage": "משיכת התמונה נכשלה.",
     "cannotResolveCollabServer": "לא הצלחתי להתחבר לשרת השיתוף. אנא רענן את הדף ונסה שוב.",
     "importLibraryError": "לא ניתן היה לטעון את הספריה",
+    "saveLibraryError": "שמירת הספריה בזיכרון לא הצליחה. יש לשמור את הספריה מקומית כקובץ כדי לוודא שהשינויים לא ילכו לאיבוד.",
     "collabSaveFailed": "לא הצלחתי להתחבר למסד הנתונים האחורי. אם הבעיה ממשיכה, כדאי שתשמור את הקובץ מקומית כדי לוודא שלא תאבד את העבודה שלך.",
     "collabSaveFailed_sizeExceeded": "לא הצלחתי לשמור למסד הנתונים האחורי, נראה שהקנבס שלך גדול מדי. כדאי שתשמור את הקובץ מקומית כדי לוודא שלא תאבד את העבודה שלך.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "תמונות מושבתות.",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": ""
+      "line1": "נראה שהנכם משתמשים בדפדפן Brave אשר מוגדר<bold>למנוע באופן אגרסיבי חתימה אלקטרונית</bold>.",
+      "line2": "ההגדרה הזאת יכולה לשבור את<bold>רכיבי הטקסט</bold> בעבודתך.",
+      "line3": "אנו ממליצים לבטל את ההגדרה הזו. תוכלו ללמוד <link>כאן</link> כיצד לעשות זאת.",
+      "line4": "אם ביטול ההגדרה אינו מתקן את הצגת רכיבי הטקסט אנא פתחו סוגיה בדף ה<issueLink>גיטהאב</issueLink> או כתבו לנו <discordLink>בדיסקורד</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "אי אפשר להוסיף רכיבי הטמעה לספרייה.",
+      "iframe": "אי אפשר להוסיף רכיבי מסגרות שיבוץ (IFrame) לספרייה.",
+      "image": "תמיכה בהוספת תמונות לספרייה תושק בקרוב!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "לא ניתן להדביק (אי אפשר לקרוא מלוח המערכת).",
+    "asyncPasteFailedOnParse": "לא ניתן להדביק.",
+    "copyToSystemClipboardFailed": "לא ניתן להעתיק ללוח."
   },
   "toolBar": {
     "selection": "בחירה",
+    "lasso": "",
     "image": "הוספת תמונה",
     "rectangle": "מלבן",
     "diamond": "יהלום",
@@ -246,16 +304,32 @@
     "library": "ספריה",
     "lock": "השאר את הכלי הנבחר פעיל גם לאחר סיום הציור",
     "penMode": "מצב עט - מנע נגיעה",
-    "link": "הוספה/עדכון קישור של הצורה שנבחרה",
+    "link": "הוספת / עדכון קישור לצורה מסוימת",
     "eraser": "מחק",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "frame": "כלי מסגרת",
+    "magicframe": "תרשים קווי מתאר לקוד",
+    "embeddable": "הטמעה באתר",
+    "laser": "סמן לייזר",
     "hand": "יד (כלי הזזה)",
-    "extraTools": "",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "extraTools": "כלים נוספים",
+    "mermaidToExcalidraw": "Mermaid ל־Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "מלבן",
+    "diamond": "יהלום",
+    "ellipse": "אליפסה",
+    "arrow": "חץ",
+    "line": "קו",
+    "freedraw": "ציור חופשי",
+    "text": "טקסט",
+    "image": "תמונה",
+    "group": "קבוצה",
+    "frame": "מסגרת",
+    "magicframe": "מתרשים קווי מתאר לקוד",
+    "embeddable": "הטמעה באתר",
+    "selection": "בחירה",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "פעולות קנבאס",
@@ -263,28 +337,33 @@
     "shapes": "צורות"
   },
   "hints": {
-    "canvasPanning": "כדי להזיז את הקנבס, החזק את גלגל העכבר לחוץ או את מקש הרווח לחוץ תוך כדי גרירה, או השתמש בכלי היד",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "לחץ להתחלת מספר נקודות, גרור לקו יחיד",
+    "arrowTool": "",
     "freeDraw": "לחץ וגרור, שחרר כשסיימת",
     "text": "טיפ: אפשר להוסיף טקסט על ידי לחיצה כפולה בכל מקום עם כלי הבחירה",
-    "embeddable": "",
-    "text_selected": "לחץ לחיצה כפולה או הקש על אנטר לעריכת הטקסט",
-    "text_editing": "כדי לסיים את העריכה לחץ על מקש Escape או על Ctrl (Cmd במחשבי אפל) ומקש Enter",
-    "linearElementMulti": "הקלק על הנקודה האחרונה או הקש Escape או Enter לסיום",
-    "lockAngle": "ניתן להגביל את הזוויות על ידי החזקה של מקש ה- SHIFT",
-    "resize": "ניתן להגביל פרופורציות על ידי לחיצה על SHIFT תוך כדי שינוי גודל,\nהחזק ALT בשביל לשנות גודל ביחס למרכז",
-    "resizeImage": "אתה יכול לשנות את הגודל בחופשיות על ידי החזקת מקש SHIFT,\nהחזק את מקש ALT כדי לבצע שינוי גודל מהמרכז",
-    "rotate": "ניתן להגביל זוויות על ידי לחיצה על SHIFT תוך כדי סיבוב",
-    "lineEditor_info": "החזק Ctrl / Cmd ובצע לחיצה כפולה או לחץ Ctrl / Cmd + Enter לעריכת נקודות",
-    "lineEditor_pointSelected": "לחץ Delete למחיקת נקודה/ות,\nCtrl / Cmd + D לשכפול, או גרור להזזה",
-    "lineEditor_nothingSelected": "בחר נקודה כדי לערוך (החזק SHIFT לבחירת כמה),\nאו החזק Alt והקלק להוספת נקודות חדשות",
-    "placeImage": "הקלק להנחת התמונה, או הקלק וגרור להגדרת הגודל שלו ידנית",
+    "embeddable": "לחצו וגררו כדי ליצור הטמעת אתר",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "פרסם ספריה משלך",
-    "bindTextToElement": "הקש Enter כדי להוספת טקסט",
-    "deepBoxSelect": "החזק Ctrl / Cmd לבחירה עמוקה ולמניעת גרירה",
-    "eraserRevert": "החזק Alt להחזרת רכיבים מסומנים למחיקה",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "יכולות זה ניתנת להפעלה על ידי שינוי הדגל של \"dom.events.asyncClipboard.clipboardItem\" למצב \"true\". כדי לשנות את הדגל בדפדפן Firefox, בקר בעמוד ״about:config״.",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "לא ניתן להראות תצוגה מקדימה",
@@ -292,16 +371,19 @@
     "canvasTooBigTip": "טיפ: נסה להזיז את הרכיבים הרחוקים ביותר מעט קרוב יותר האחד לשני."
   },
   "errorSplash": {
-    "headingMain": "",
+    "headingMain": "התעוררה איזו שגיאה. נא לנסות <button>לרענן את העמוד</button>.",
     "clearCanvasMessage": "אם טעינה מחדש לא עובדת, נסה ",
     "clearCanvasCaveat": " זה יגרום לאובדן העבודה ",
-    "trackedToSentry": "",
-    "openIssueMessage": "",
+    "trackedToSentry": "השגיאה עם המזהה {{eventId}} במעקב במערכת שלך.",
+    "openIssueMessage": "אנו נזהרים מאוד לא להכניס מידע על הסצנה שלך בתוך דיווח התקלה. אם הסצנה אינה פרטית, אנא שקלו לשלוח אותה ל<button>מעקב השגיאות שלנו</button>. אנא הוסיפו בתחתית הבאג מידע על ידי העתקה והדבקה לתוך הסוגיה ב-GitHub.",
     "sceneContent": "תוכן הקנבאס:"
   },
+  "shareDialog": {
+    "or": "או"
+  },
   "roomDialog": {
-    "desc_intro": "אתה יכול להזמין אנשים לקנבאס הנוכחי שלך לעבודה משותפת.",
-    "desc_privacy": "אל דאגה, השיתוף מוצפן מקצה לקצה, כך שכל מה שתצייר ישאר פרטי. אפילו השרתים שלנו לא יוכלו לראות את מה שאתה ממציא.",
+    "desc_intro": "הזמנת משתתפים לעבודה משותפת.",
+    "desc_privacy": "אל דאגה, סשן העבודה מוצפן מקצה לקצה והוא פרטי לגמרי. אפילו השרתים שלנו לא יכולים לראות מה ציירתם.",
     "button_startSession": "התחל שיתוף",
     "button_stopSession": "הפסק שיתוף",
     "desc_inProgressIntro": "שיתוף חי פעיל כרגע.",
@@ -328,14 +410,16 @@
     "click": "קליק",
     "deepSelect": "בחירה עמוקה",
     "deepBoxSelect": "בחירה עמוקה בתוך קופסה ומניעת גרירה",
+    "createFlowchart": "יצירת תרשים זרימה מתוך רכיב רגיל",
+    "navigateFlowchart": "ניווט בתוך תרשים הזרימה",
     "curvedArrow": "חץ מעוגל",
     "curvedLine": "קו מעוגל",
     "documentation": "תיעוד",
     "doubleClick": "לחיצה כפולה",
     "drag": "גרור",
     "editor": "עורך",
-    "editLineArrowPoints": "",
-    "editText": "",
+    "editLineArrowPoints": "עריכת נקודות קו/חץ",
+    "editText": "עריכת טקסט / הוספת תווית",
     "github": "מצאת בעיה? דווח",
     "howto": "עקוב אחר המדריכים שלנו",
     "or": "או",
@@ -350,7 +434,9 @@
     "zoomToSelection": "התמקד בבחירה",
     "toggleElementLock": "נעילה/ביטול הנעילה של הרכיבים הנבחרים",
     "movePageUpDown": "זוז עמוד למעלה/למטה",
-    "movePageLeftRight": "זוז עמוד שמאלה/ימינה"
+    "movePageLeftRight": "זוז עמוד שמאלה/ימינה",
+    "cropStart": "חיתוך תמונה",
+    "cropFinish": "סיים לחתוך תמונה"
   },
   "clearCanvasDialog": {
     "title": "ניקוי הקנבס"
@@ -376,9 +462,9 @@
       "required": "נדרש",
       "website": "הזינו כתובת URL תקינה"
     },
-    "noteDescription": "",
-    "noteGuidelines": "",
-    "noteLicense": "",
+    "noteDescription": "שלח את הספריה שלך כך שתצורף ל<link>מאגר הספריות הציבורי</link> כך שאנשים נוספים יוכלו להשתמש בה בעבודות שלהם.",
+    "noteGuidelines": "תחילה הספריה נדרשת לעבור אישור ידני. אנא קראו את <link>הנחיות</link> לפני שאתם לוחצים על שליחה. יש צורך בחשבון GitHub כדי לתקשר ולבצע שינויים אם נדרש, אך אין זה הכרחי לשיתוף הספריה.",
+    "noteLicense": "על ידי לחיצה על שליחה את/ה מסכימ/ה שהספריה תפורסם תחת <link>רישיון MIT</link>, אשר, בקצרה, מאפשר לכל אחד להשתמש בספריה ללא הגבלה.",
     "noteItems": "לכל פריט בסיפריה חייב להיות שם כדי שאפשר יהיה לסנן. הפריטי סיפריה הבאים יהיו כלולים:",
     "atleastOneLibItem": "אנא בחר לפחות פריט אחד מספריה כדי להתחיל",
     "republishWarning": "הערה: חלק מהפריטים שבחרת מסומנים ככאלו שכבר פורסמו/נשלחו. אתה צריך לשלוח פריטים מחדש כאשר אתה מעדכן ספריה או הגשה קיימים."
@@ -392,27 +478,27 @@
     "removeItemsFromLib": "הסר את הפריטים הנבחרים מהספריה"
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "ייצוא תמונה",
     "label": {
-      "withBackground": "",
-      "onlySelected": "",
-      "darkMode": "",
-      "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "withBackground": "רקע",
+      "onlySelected": "רק את מה שנבחר",
+      "darkMode": "מצב כהה",
+      "embedScene": "הטמעת סצנה",
+      "scale": "קנה מידה",
+      "padding": "ריפוד"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "הייצוא יבוצע לקובץ מסוג PNG/SVG כדי שהמידע על הסצנה ישמר בו וניתן יהיה לבצע שחזור ממנו.\nיגדיל את גודל הקובץ של הייצוא."
     },
     "title": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "ייצוא ל־PNG",
+      "exportToSvg": "ייצוא ל־SVG",
+      "copyPngToClipboard": "העתקת PNG ללוח"
     },
     "button": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "PNG",
+      "exportToSvg": "SVG",
+      "copyPngToClipboard": "העתקה ללוח"
     }
   },
   "encrypted": {
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "זווית",
-    "element": "רכיב",
-    "elements": "רכיבים",
+    "shapes": "צורות",
     "height": "גובה",
     "scene": "תצוגה",
     "selected": "נבחר",
     "storage": "אחסון",
-    "title": "סטטיסטיקות לחנונים",
+    "fullTitle": "הגדרות הקנבס והצורות",
+    "title": "מאפיינים",
+    "generalStats": "כללי",
+    "elementProperties": "מאפייני צורה",
     "total": "סה״כ",
     "version": "גרסה",
     "versionCopy": "לחץ להעתקה",
@@ -439,30 +527,32 @@
     "copyStyles": "סגנונות הועתקו.",
     "copyToClipboard": "הועתק ללוח.",
     "copyToClipboardAsPng": "{{exportSelection}} הועתקה ללוח כ-PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} הועתקה ללוח כ-SVG\n({{exportColorScheme}})",
     "fileSaved": "קובץ נשמר.",
     "fileSavedToFilename": "נשמר לקובץ {filename}",
     "canvas": "קנבאס",
     "selection": "בחירה",
     "pasteAsSingleElement": "השתמש ב- {{shortcut}} כדי להדביק כפריט יחיד,\nאו הדבק לתוך עורך טקסט קיים",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "הטמעת כתובת הרשת הזו אינה מותרת לעת עתה. העלו סוגיה ב-GitHub כדי לבקש שכתובת זו תכנס לרשימה המותרת",
+    "unrecognizedLinkFormat": "הקישור שהוטמע אינו בפורמט המצופה. אנא נסו להדביק מחדש את מחרוזת ההטמעה מהאתר המבוקש",
+    "elementLinkCopied": "קישור הועתק ללוח"
   },
   "colors": {
     "transparent": "שקוף",
-    "black": "",
-    "white": "",
-    "red": "",
-    "pink": "",
-    "grape": "",
-    "violet": "",
-    "gray": "",
-    "blue": "",
-    "cyan": "",
-    "teal": "",
-    "green": "",
-    "yellow": "",
-    "orange": "",
-    "bronze": ""
+    "black": "שחור",
+    "white": "לבן",
+    "red": "אדום",
+    "pink": "ורוד",
+    "grape": "ענבים",
+    "violet": "סגול",
+    "gray": "אפור",
+    "blue": "כחול",
+    "cyan": "ציאן",
+    "teal": "ירוק-כחול",
+    "green": "ירוק",
+    "yellow": "צהוב",
+    "orange": "כתום",
+    "bronze": "ברונזה"
   },
   "welcomeScreen": {
     "app": {
@@ -478,48 +568,97 @@
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "",
-    "colors": "",
-    "shades": "",
-    "hexCode": "",
-    "noShades": ""
+    "color": "",
+    "mostUsedCustomColors": "הצבעים המותאמים הכי נפוצים",
+    "colors": "צבעים",
+    "shades": "הצללות",
+    "hexCode": "קוד הקסדצימלי",
+    "noShades": "אין הצללות זמינות לצבע הזה"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "ייצוא כתמונה",
+        "button": "ייצוא כתמונה",
+        "description": "ייצוא נתוני הסצנה כתמונה אותה אפשר לייבא בהמשך."
       },
       "saveToDisk": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "שמירה לכונן",
+        "button": "שמירה לכונן",
+        "description": "ייצוא נתוני הסצנה לקובץ אותו אפשר לייבא בהמשך."
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Excalidraw+‎",
+        "button": "ייצוא ל־Excalidraw+‎",
+        "description": "שמירת הסצנה לסביבת העבודה שלך ב־+Excalidraw."
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "טעינה מקובץ",
+        "button": "טעינה מקובץ",
+        "description": "טעינת הקובץ <bold>תחליף את התוכן הקיים</bold>.<br></br>אתם יכולים לגבות את העבודה שלכם תחילה בעזרת האפשרויות שלהלן."
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "טעינה מקישור",
+        "button": "החלפת התוכן שלי",
+        "description": "טעינת הקובץ <bold>תחליף את התוכן הקיים</bold>.<br></br>אתם יכולים לגבות את העבודה שלכם תחילה בעזרת האפשרויות שלהלן."
       }
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid ל־Excalidraw",
+    "button": "הוספה",
+    "description": "לעת עתה נתמכים רק <flowchartLink>תרשימי זרימה</flowchartLink>, <sequenceLink>תהליכים</sequenceLink>, <classLink>ודיאגרמת מחלקה</classLink>. שאר הסוגים ייוצרו כתמונות ב-Excalidraw.",
+    "syntax": "תחביר Mermaid",
+    "preview": "תצוגה מקדימה"
+  },
+  "quickSearch": {
+    "placeholder": "חיפוש מהיר"
+  },
+  "fontList": {
+    "badge": {
+      "old": "ישן"
+    },
+    "sceneFonts": "בסצינה הנוכחית",
+    "availableFonts": "הפונטים הקיימים",
+    "empty": "לא נמצאו פונטים"
+  },
+  "userList": {
+    "empty": "לא נמצאו משתמשים",
+    "hint": {
+      "text": "יש ללחוץ על משתמש כדי לעקוב",
+      "followStatus": "המשתמש ברשימת המעקב שלך",
+      "inCall": "המשתמש בשיחה קולית",
+      "micMuted": "המיקרופון של המשתמש מושתק",
+      "isSpeaking": "המשתמש מדבר"
+    }
+  },
+  "commandPalette": {
+    "title": "לוח פקודות",
+    "shortcuts": {
+      "select": "בחירה",
+      "confirm": "אישור",
+      "close": "סגירה"
+    },
+    "recents": "בשימוש לאחרונה",
+    "search": {
+      "placeholder": "תפריטי חיפוש, פקודות ואבני חן נעלמות",
+      "noMatch": "אין פקודות תואמות…"
+    },
+    "itemNotAvailable": "הפקודה לא זמינה…",
+    "shortcutHint": "ללוח פקודות, יש להשתמש ב־{{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/hi-IN.json b/packages/excalidraw/locales/hi-IN.json
index 4cac567aae..f2f79de38a 100644
--- a/packages/excalidraw/locales/hi-IN.json
+++ b/packages/excalidraw/locales/hi-IN.json
@@ -1,55 +1,65 @@
 {
   "labels": {
-    "paste": "चिपकाएँ",
+    "paste": "पेस्ट",
     "pasteAsPlaintext": "सादे पाठ के रूप में चिपकाएं",
     "pasteCharts": "चार्ट चिपकाएँ",
-    "selectAll": "सभी चुनें",
-    "multiSelect": "आकार को चयन में जोड़ें",
-    "moveCanvas": "कैनवास को स्थानांतरित करें",
+    "selectAll": "सेलेक्ट ऑल",
+    "multiSelect": "अवयव को चयन में सम्मिलित करें",
+    "moveCanvas": "चित्रपटल को स्थानांतरित करें",
     "cut": "काटें",
-    "copy": "प्रतिलिपि",
-    "copyAsPng": "क्लिपबोर्ड पर कॉपी करें ,पीएनजी के रूप में",
-    "copyAsSvg": "क्लिपबोर्ड पर कॉपी करें,एसवीजी के रूप में",
-    "copyText": "लेखन के रूप में पटल पर कॉपी करें",
-    "copySource": "स्त्रोत को प्रति-फलक पे प्रतिलिपित करे.",
+    "copy": "प्रतिलिपि बनाएँ",
+    "copyAsPng": "क्लिपबोर्ड पर पीएनजी के रूप में प्रतिलिपि बनायें",
+    "copyAsSvg": "क्लिपबोर्ड पर एसवीजी के रूप में प्रतिलिपि बनायें",
+    "copyText": "पाठ के रूप में क्लिपबोर्ड पर प्रतिलिपि बनायें",
+    "copySource": "स्त्रोत रूप में क्लिपबोर्ड पर प्रतिलिपि बनाएँ",
     "convertToCode": "सांकेतिक लिपि में परिवर्तित करे",
-    "bringForward": "सामने लाएं",
+    "bringForward": "सबसे सामने लाएं",
     "sendToBack": "पीछे भेजें",
-    "bringToFront": "सामने लाएँ",
-    "sendBackward": "पीचे भीजे",
-    "delete": "मिटाए",
-    "copyStyles": "कॉपी स्टाइल",
-    "pasteStyles": "स्टाइल पेस्ट करें",
+    "bringToFront": "सामने लायें",
+    "sendBackward": "सबसे पीछे भेजे",
+    "delete": "हटायें",
+    "copyStyles": "अंदाज़ की प्रतिलिपि बनायें",
+    "pasteStyles": "अंदाज़ चिपकाये",
     "stroke": "रेखा",
+    "changeStroke": "कूँची का रंग बदले",
     "background": "पृष्ठभूमि",
+    "changeBackground": "पृष्ठभूमि का रंग बदले",
     "fill": "भरें",
     "strokeWidth": "रेखा की चौड़ाई",
-    "strokeStyle": "स्ट्रोक का आकार",
+    "strokeStyle": "स्ट्रोक का अंदाज़",
     "strokeStyle_solid": "ठोस",
     "strokeStyle_dashed": "डैश",
     "strokeStyle_dotted": "बिंदीदार",
     "sloppiness": "बेढ़ंगापन",
     "opacity": "अपारदर्शिता",
-    "textAlign": "टेक्स्ट संरेखन",
-    "edges": "किनारा",
-    "sharp": "नुकीला",
-    "round": "गोल",
+    "textAlign": "पाठ्य संरेखन",
+    "edges": "किनारे",
+    "sharp": "तीखा",
+    "round": "गोलाकार",
     "arrowheads": "तीर शीर्ष",
     "arrowhead_none": "कोई भी नहीं",
     "arrowhead_arrow": "तीर",
-    "arrowhead_bar": "बार",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_bar": "छड़",
+    "arrowhead_circle": "वृत्त",
+    "arrowhead_circle_outline": "वृत्त (बाह्यरेखा)",
     "arrowhead_triangle": "त्रिकोण",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
-    "fontSize": "फ़ॉन्ट का आकार",
-    "fontFamily": "फ़ॉन्ट का परिवार",
-    "addWatermark": "ऐड \"मेड विथ एक्सकैलिडराव\"",
-    "handDrawn": "हाथ से बनाया हुआ",
-    "normal": "साधारण",
-    "code": "कोड",
+    "arrowhead_triangle_outline": "त्रिभुज (बाह्यरेखा)",
+    "arrowhead_diamond": "ईंट",
+    "arrowhead_diamond_outline": "ईंट (बाह्यरेखा)",
+    "arrowhead_crowfoot_many": "चिड़िया पैर (अनेक)",
+    "arrowhead_crowfoot_one": "चिड़िया पैर (एक)",
+    "arrowhead_crowfoot_one_or_many": "चिड़िया पैर (एक या अनेक)",
+    "more_options": "और विकल्प",
+    "arrowtypes": "तीर प्रकार",
+    "arrowtype_sharp": "तीक्ष्ण तीर",
+    "arrowtype_round": "गोलाकार तीर",
+    "arrowtype_elbowed": "कोहनी तीर",
+    "fontSize": "अक्षर का आकार",
+    "fontFamily": "अक्षर वर्ग",
+    "addWatermark": "\"एक्स काली ड्रॉ द्वारा बनाया हुवा\" जोड़े",
+    "handDrawn": "हस्त रेखित",
+    "normal": "सामान्य",
+    "code": "सांकेतिक लिपि",
     "small": "छोटा",
     "medium": "मध्यम",
     "large": "बड़ा",
@@ -58,11 +68,11 @@
     "hachure": "हैशूर",
     "zigzag": "तेढ़ी मेढ़ी",
     "crossHatch": "क्रॉस हैच",
-    "thin": "पतला",
+    "thin": "महीन",
     "bold": "मोटा",
-    "left": "बाएं",
+    "left": "बायें",
     "center": "मध्य",
-    "right": "दाएँ",
+    "right": "दायें",
     "extraBold": "बहुत मोटा",
     "architect": "वास्तुकार",
     "artist": "कलाकार",
@@ -70,26 +80,28 @@
     "fileTitle": "फ़ाइल का नाम",
     "colorPicker": "रंग चयन",
     "canvasColors": "कॅनवास पर प्रयोगित",
-    "canvasBackground": "कैनवास बैकग्राउंड",
-    "drawingCanvas": "कैनवास बना रहे हैं",
+    "canvasBackground": "चित्रपटल पृष्ठभूमि",
+    "drawingCanvas": "चित्रपटल",
+    "clearCanvas": "चित्रपलट स्वच्छ करे",
     "layers": "परतें",
     "actions": "कार्रवाई",
     "language": "भाषा",
     "liveCollaboration": "जीवंत सहयोग...",
-    "duplicateSelection": "डुप्लिकेट",
+    "duplicateSelection": "प्रतिरूप",
     "untitled": "अशीर्षित",
     "name": "नाम",
     "yourName": "आपका नाम",
-    "madeWithExcalidraw": "मेड विथ एक्सकैलिडराव",
+    "madeWithExcalidraw": "एक्स काली ड्रॉ द्वारा बनाया हुवा",
     "group": "समूह चयन",
     "ungroup": "समूह चयन असमूहीकृत करें",
     "collaborators": "सहयोगी",
-    "showGrid": "ग्रिड दिखाएं",
-    "addToLibrary": "लाइब्रेरी से जोड़ें",
-    "removeFromLibrary": "लाइब्रेरी से निकालें",
-    "libraryLoadingMessage": "लाइब्रेरी खुल रही है",
-    "libraries": "लाइब्रेरी ब्राउज़ करें",
+    "toggleGrid": "जाली दिखना टॉगल करें",
+    "addToLibrary": "लाइब्रेरी में सम्मिलित करें",
+    "removeFromLibrary": "समूहकोष से अलग करें",
+    "libraryLoadingMessage": "समूहकोष खुल रहा है",
+    "libraries": "समूह कोष पड़तालें",
     "loadingScene": "दृश्य खुल रहा है",
+    "loadScene": "फ़ाइल से दृश्य लायें",
     "align": "संरेखित करें",
     "alignTop": "ऊपर संरेखित करें",
     "alignBottom": "नीचे संरेखित करें",
@@ -98,60 +110,102 @@
     "centerVertically": "लंबवत केन्द्रित",
     "centerHorizontally": "क्षैतिज केन्द्रित",
     "distributeHorizontally": "क्षैतिज रूप से वितरित करें",
-    "distributeVertically": "खड़ी रूप से वितरित करें",
+    "distributeVertically": "लंबवत वितरित करें",
     "flipHorizontal": "दायें बायें पलटे",
     "flipVertical": "ऊपर नीचे पलटे",
-    "viewMode": "अलग अलग देखें",
-    "share": "शेयर करें",
-    "showStroke": "",
-    "showBackground": "पृष्ठभूमि रंग वरक़ दिखाये",
-    "toggleTheme": "",
+    "viewMode": "देखने के प्रकार",
+    "share": "साझा करें",
+    "showStroke": "कूँची रंग चयक दिखायें",
+    "showBackground": "पृष्ठभूमि रंग चयक दिखाये",
+    "showFonts": "लिपि चुनक दिखायें",
+    "toggleTheme": "अंधेरी/उजेलि संरचना पलटे",
+    "theme": "संरचना पद्धति",
     "personalLib": "वैयक्तिक समूहकोष",
     "excalidrawLib": "एक्सकेलीड्रॉ समूहकोष",
-    "decreaseFontSize": "आकार घटाइऐ",
-    "increaseFontSize": "फ़ॉन्ट आकार बढ़ाएँ",
+    "decreaseFontSize": "अक्षर आकार घटायें",
+    "increaseFontSize": "अक्षर आकार बढ़ायें",
     "unbindText": "लिपि को बंधमुक्त करें",
-    "bindText": "लेखन को कोश से जोड़े",
-    "createContainerFromText": "मूलपाठ कंटेनर में मोड के दिखाए",
+    "bindText": "पाठ्य को कोष से जोड़े",
+    "createContainerFromText": "पाठ्य कोष में मोड के दिखायें",
     "link": {
       "edit": "कड़ी संपादित करे",
-      "editEmbed": "",
-      "create": "",
-      "createEmbed": "",
-      "label": "",
-      "labelEmbed": "",
-      "empty": ""
+      "editEmbed": "अंतर्निहित-कड़ी संपादन",
+      "create": "कड़ी जोड़े",
+      "label": "कड़ी",
+      "labelEmbed": "कड़ी और जड़ना",
+      "empty": "कोई कड़ी नहीं हैं",
+      "hint": "अपनी कड़ी टाइप करे अथवा कड़ी चिपकाए",
+      "goToElement": "निर्धारित तत्व की तरफ जाए"
     },
     "lineEditor": {
       "edit": "रेखा संपादित करे",
-      "exit": "रेखा संपादक के बाहर"
+      "editArrow": "तीर संपादन"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "ताले में रखें",
-      "unlock": "ताले से बाहर",
+      "unlock": "ताला खोलें",
       "lockAll": "सब ताले के अंदर रखे",
       "unlockAll": "सब ताले के बाहर निकाले"
     },
     "statusPublished": "प्रकाशित",
     "sidebarLock": "साइडबार खुला रखे.",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
+    "selectAllElementsInFrame": "चौखट के सर्व अवयव चुने",
+    "removeAllElementsFromFrame": "चौखट से सर्व अवयव हटायें",
     "eyeDropper": "चित्रफलक से रंग चुने",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "पाठ से रेखाचित्र",
+    "prompt": "प्रश्न",
+    "followUs": "हमारा अनुकरण करें",
+    "discordChat": "डिस्कॉर्ड संवाद",
+    "zoomToFitViewport": "दृश्यचौखट में पूरी तरह से बैठने के लिए झूम करें.",
+    "zoomToFitSelection": "चयन पूरा दिखने इतना झूम करे",
+    "zoomToFit": "सभी तत्व दिखे इतना झूम करें",
+    "installPWA": "एक्सकाली ड्रॉ को स्थानीयरूप में इंस्टॉल करें (PWA)",
+    "autoResize": "स्वयं आकार पुनः निर्धारण",
+    "imageCropping": "प्रतिमा काटना",
+    "unCroppedDimension": "कटाई पूर्व आयाम",
+    "copyElementLink": "वस्तु की कड़ी कॉपी करें",
+    "linkToElement": "वस्तु की कड़ी",
+    "wrapSelectionInFrame": "चौकट में चुने हुवे को लपेटे",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "वस्तु की कड़ी",
+    "desc": "चित्र-पटल पर किसी आकार पर क्लिक करें अथवा कड़ी को चिपकाये",
+    "notFound": "चित्र-पटल पर कड़ी वाली वस्तु नहीं मिली"
   },
   "library": {
-    "noItems": "अभी तक कोई आइटम जोडा नहीं गया.",
-    "hint_emptyLibrary": "यहाँ जोड़ने के लिए पटल से एक वस्तु चुने, अथवा जन कोष से एक संग्रह नीचे स्थापित करें.",
-    "hint_emptyPrivateLibrary": "यहाँ जोड़ने के लिए पटल से एक वस्तु चुने."
+    "noItems": "अभी तक कोई अवयव जोडा नहीं गया.",
+    "hint_emptyLibrary": "यहाँ जोड़ने के लिए चित्रपटल से एक अवयव चुने, अथवा जन कोष से एक संग्रह नीचे स्थापित करें.",
+    "hint_emptyPrivateLibrary": "यहाँ जोड़ने के लिए चित्रपटल से एक अवयव चुने.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "पटल पर धूंडे",
+    "noMatch": "कोई मिलता जुलता नहीं मिला",
+    "singleResult": "परिणाम",
+    "multipleResults": "परिणाम",
+    "placeholder": "पटल पर पाठ्य धूंडे",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
-    "clearReset": "कैनवास रीसेट करें",
-    "exportJSON": "",
+    "clearReset": "चित्रपटल स्वच्छ करें",
+    "exportJSON": "फ़ाइल में निर्यात करें",
     "exportImage": "प्रतिमा निर्यात करे...",
     "export": "यंहा सुरक्षित करे...",
     "copyToClipboard": "क्लिपबोर्ड पर प्रतिलिपि बनाएँ",
-    "save": "",
+    "copyLink": "लिंक कॉपी करें",
+    "save": "वर्तमान फ़ाईल में सुरक्षित करें",
     "saveAs": "सेव करे इस तरह",
     "load": "खोलें",
     "getShareableLink": "साझा करने योग्य लिंक प्राप्त करें",
@@ -160,74 +214,77 @@
     "scrollBackToContent": "सामग्री पर वापस स्क्रॉल करें",
     "zoomIn": "बड़ा करें",
     "zoomOut": "छोटा करें",
-    "resetZoom": "ज़ूम रीसेट करें",
-    "menu": "मेन्यू",
+    "resetZoom": "बड़ा छोटा करना पहले जैसा करें",
+    "menu": "चयन सूची",
     "done": "समाप्त",
-    "edit": "संशोधन करें",
+    "edit": "संपादित करें",
     "undo": "पूर्ववत् करें",
     "redo": "फिर से करें",
-    "resetLibrary": "",
+    "resetLibrary": "संग्रह को पुनः स्थापित करें",
     "createNewRoom": "एक नया कमरा बनाएं",
-    "fullScreen": "पूरी स्क्रीन",
-    "darkMode": "डार्क मोड",
-    "lightMode": "लाइट मोड",
-    "zenMode": "ज़ेन मोड",
+    "fullScreen": "पूर्ण दृश्यपटल",
+    "darkMode": "कम प्रकाश प्रणाली",
+    "lightMode": "अधिक प्रकाश प्रणाली",
+    "systemMode": "तांत्रिक प्रणाली",
+    "zenMode": "एकाग्र प्रणाली",
     "objectsSnapMode": "वस्तुओं से पकड़े",
-    "exitZenMode": "जेन मोड से बाहर निकलें",
-    "cancel": "",
+    "exitZenMode": "एकाग्र स्थिति से बाहर निकलें",
+    "cancel": "रद्द करें",
+    "saveLibNames": "",
     "clear": "साफ़ करे",
     "remove": "हटाएं",
-    "embed": "",
-    "publishLibrary": "प्रकाशित करें",
+    "embed": "जड़ना पलटें",
+    "publishLibrary": "",
     "submit": "प्रस्तुत करे",
     "confirm": "पुष्टि करें",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "संवाद स्थापना के लिए क्लिक करें"
   },
   "alerts": {
-    "clearReset": "इससे पूरा कैनवास साफ हो जाएगा। क्या आपको यकीन है?",
+    "clearReset": "इससे पूरा चित्रपटल साफ हो जाएगा। क्या आप निश्चित है?",
     "couldNotCreateShareableLink": "साझा करने योग्य लिंक नहीं बनाया जा सका।",
-    "couldNotCreateShareableLinkTooBig": "लिंक शेयर नहीं कर सकता: दृश्य बहुत बड़ा",
+    "couldNotCreateShareableLinkTooBig": "कड़ी साझा नहीं की जा सकती कारण: दृश्य बहुत बड़ा हैं",
     "couldNotLoadInvalidFile": "अमान्य फ़ाइल लोड नहीं की जा सकी",
     "importBackendFailed": "बैकएंड से आयात करना विफल रहा।",
-    "cannotExportEmptyCanvas": "खाली कैनवास निर्यात नहीं कर सकता।",
+    "cannotExportEmptyCanvas": "खाली चित्रपटल निर्यात नहीं कर सकते",
     "couldNotCopyToClipboard": "क्लिपबोर्ड पर कॉपी नहीं किया जा सका",
-    "decryptFailed": "डेटा को डिक्रिप्ट नहीं किया जा सका।",
-    "uploadedSecurly": "अपलोड को एंड-टू-एंड एन्क्रिप्शन के साथ सुरक्षित किया गया है, जिसका मतलब है कि एक्सक्लूसिव सर्वर और थर्ड पार्टी कंटेंट नहीं पढ़ सकते हैं।",
-    "loadSceneOverridePrompt": "लोड हो रहा है बाहरी ड्राइंग आपके मौजूदा सामग्री को बदल देगा। क्या आप जारी रखना चाहते हैं?",
-    "collabStopOverridePrompt": "चालू सत्र समाप्ति से आपका संग्रहित पूर्व स्थानीय अधिलेखन नष्ट होकर पुनः अधिलेखित होगा, क्या आपको यक़ीन हैं? ( यदी आपको पूर्व स्थापित अधिलेखन सुरक्षित चाहिये तो बस ब्राउज़र टैब बंद करे)",
+    "decryptFailed": "डेटा को विसंकेतन नहीं किया जा सका।",
+    "uploadedSecurly": "अपलोड को आद्यंत एन्क्रिप्शन के साथ सुरक्षित किया गया है, जिसका मतलब है कि एक्सकालीड्रॉ सर्वर और अन्य पक्ष आपका पाठ्य नहीं पढ़ सकते हैं।",
+    "loadSceneOverridePrompt": "बाहरी रेखाचित्र आयत करने से वह आपके मौजूदा सामग्री को बदल/हटा देगा। क्या आप इसे होने देना चाहते हैं?",
+    "collabStopOverridePrompt": "चालू सत्र के समाप्ति से आपका संग्रहित पूर्व स्थानीय अधिलेखन नष्ट होकर पुनः अधिलेखित होगा, क्या आपको यक़ीन हैं? ( यदी आपको पूर्व स्थापित अधिलेखन सुरक्षित चाहिये तो बस ब्राउज़र टैब बंद करे)",
     "errorAddingToLibrary": "संग्रह में जोडा न जा सका",
     "errorRemovingFromLibrary": "संग्रह से हटाया नहीं जा सका",
-    "confirmAddLibrary": "लाइब्रेरी जोड़ें पुष्‍टि करें आकार संख्या",
-    "imageDoesNotContainScene": "ऐसा लगता है कि इस छवि में कोई दृश्य डेटा नहीं है। क्या आपने निर्यात के दौरान दृश्य एम्बेडिंग अनुमतित की है?",
-    "cannotRestoreFromImage": "छवि फ़ाइल बहाल दृश्य नहीं है",
-    "invalidSceneUrl": "दिये गये युआरेल से दृश्य आयात नहीं किया जा सका. यह या तो अनुचित है, या इसमें उचित Excalidraw JSON डेटा नहीं है।",
-    "resetLibrary": "यह पूरा संग्रह रिक्त करेगा. क्या आपको यक़ीन हैं?",
+    "confirmAddLibrary": "{{numShapes}} आकार आपके संग्रह में जुड़ेंगे, क्या उसे होने देना चाहते हों?",
+    "imageDoesNotContainScene": "ऐसा लगता है कि इस छवि में कोई दृश्य डेटा नहीं है। क्या आपने निर्यात के दौरान दृश्य जड़ने की अनुमति दी है?",
+    "cannotRestoreFromImage": "प्रतिमा फ़ाइल से दृश्य पुनःस्थापित न हो सका",
+    "invalidSceneUrl": "दिये गये यु-आर-एल से दृश्य आयात नहीं किया जा सका. यह यू-आर-एल या तो अयोग्य है, या इसमें उचित एक्स-काली-ड्रॉ JSON डेटा नहीं है।",
+    "resetLibrary": "यह पूरा संग्रह रिक्त करेगा. क्या आप इसे होने देना चहाते हों?",
     "removeItemsFromsLibrary": "{{count}} वस्तु(यें) संग्रह से हटायें?",
     "invalidEncryptionKey": "कूटलेखन कुंजी 22 अक्षरों की होनी चाहिये, इसलिये जीवंत सहयोग अक्षम हैं",
-    "collabOfflineWarning": "कोई इंटरनेट कनेक्शन उपलब्ध नहीं है।\nआपके बदलाव सहेजे नहीं जाएंगे!"
+    "collabOfflineWarning": "कोई इंटरनेट कनेक्शन उपलब्ध नहीं है।\nआपके बदलाव सहेजे नहीं जाएंगे!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "असमर्थित फाइल प्रकार",
-    "imageInsertError": "छवि सम्मिलित नहीं की जा सकी. पुनः प्रयत्न करे...",
+    "imageInsertError": "प्रतिमा सन्निवेश नहीं की जा सकी. पुनः प्रयत्न करे...",
     "fileTooBig": "फ़ाइल ज़रूरत से ज़्यादा बड़ी हैं. अधिकतम अनुमित परिमाण {{maxSize}} हैं",
-    "svgImageInsertError": "एसवीजी छवि सम्मिलित नहीं कर सके, एसवीजी रचना अनुचित हैं",
-    "failedToFetchImage": "",
-    "invalidSVGString": "अनुचित SVG",
+    "svgImageInsertError": "एसवीजी प्रतिमा सम्मिलित नहीं कर सके, एसवीजी संरचना लगता है कि अयोग्य हैं.",
+    "failedToFetchImage": "प्रतिमा लाने में विफल.",
     "cannotResolveCollabServer": "कॉलेब सर्वर से कनेक्शन नहीं हो पा रहा. कृपया पृष्ठ को पुनः लाने का प्रयास करे.",
     "importLibraryError": "संग्रह प्रतिष्ठापित नहीं किया जा सका",
-    "collabSaveFailed": "किसी कारण वश अंदरूनी डेटाबेस में सहेजा नहीं जा सका। यदि समस्या बनी रहती है, तो किये काम को खोने न देने के लिये अपनी फ़ाइल को स्थानीय रूप से सहेजे।",
+    "saveLibraryError": "संग्रह सुरक्षित नहीं किया जा सका. कृपया अपने संग्रह को एक स्थानीय फ़ाइल में सुरक्षित करें जिससे आपके परिवर्तनों सुरक्षित रहेंगे.",
+    "collabSaveFailed": "किसी कारण वश अंदरूनी डेटाबेस में सुरक्षित नहीं जा सका। यदि समस्या बनी रहती है, तो किये काम को खोने न देने के लिये अपनी फ़ाइल को स्थानीय रूप से सुरक्षित करें.",
     "collabSaveFailed_sizeExceeded": "लगता है कि पृष्ठ तल काफ़ी बड़ा है, इस्कारण अंदरूनी डेटाबेस में सहेजा नहीं जा सका। किये काम को खोने न देने के लिये अपनी फ़ाइल को स्थानीय रूप से सहेजे।",
-    "imageToolNotSupported": "प्रतिमायें अक्षम की गयी हैं",
+    "imageToolNotSupported": "प्रतिमायें निर्योग्य की गयी हैं",
     "brave_measure_text_error": {
-      "line1": "लगता है कि आप Brave ब्राउज़र का उपयोग कर रहे और साथ में <bold>आक्रामक उँगलियो के छाप </bold> का चयन किया हुवा है",
-      "line2": "यह आपके चित्रों के <bold>पाठ तत्वों</bold>को खंडित कर सकता हैं",
-      "line3": "हमें आपसे ठोस आग्रह है की आप सेट्टिंग में इस विकल्प का चयन ना करे.<link> इस अनुक्रम </link> का पालन करके इसका पता लगा सकते हैं",
+      "line1": "लगता है कि आप Brave ब्राउज़र का उपयोग कर रहे और साथ में <bold>आक्रामक उँगलियो के छाप निरोधन </bold> का चयन किया हुवा है",
+      "line2": "यह आपके चित्रों के <bold>पाठ अवयवों</bold>को खंडित कर सकता हैं",
+      "line3": "हमें आपसे ठोस आग्रह है की आप सेट्टिंग में इस विकल्प का चयन ना करे.<link> इस अनुक्रम </link> का पालन करके ये कैसे करे, इसका पता लगा सकते हैं",
       "line4": "यदि इस सेटिंग्स को अक्षम करने पर भी पृष्ठ ठीक नहीं दिखता हो तो, हमारे GitHub पर एक <issueLink>मुद्दा प्रस्तुत</issueLink> करे, या हमें <discordLink>डिस्कोर्ड</discordLink> पर लिखित सम्पर्क करें"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "आयफ़्रेम तत्व समूहकोष में जोडा नहीं जा सका.",
-      "image": ""
+      "embeddable": "जड़ने लायक़ अवयवों को समूहकोष में जोडा नहीं जा सका.",
+      "iframe": "आइफ़्रेम के अवयवों को समूहकोष में जोडा नहीं जा सका.",
+      "image": "प्रतिमायें समूह कोष में जोड़ना शीघ्र ही संभव होगा!"
     },
     "asyncPasteFailedOnRead": "चिपकाया नहीं जा सका (सिस्टम क्लिपबोर्ड से पढ़ा नहीं जा सका).",
     "asyncPasteFailedOnParse": "चिपकाया नहीं जा सका.",
@@ -235,27 +292,44 @@
   },
   "toolBar": {
     "selection": "चयन",
-    "image": "छवि सम्मिलित करें",
+    "lasso": "",
+    "image": "प्रतिमा सम्मिलित करें",
     "rectangle": "आयात",
-    "diamond": "तिर्यग्वर्ग",
+    "diamond": "ईंट",
     "ellipse": "दीर्घवृत्त",
     "arrow": "तीर",
     "line": "रेखा",
     "freedraw": "चित्रांतित करे",
     "text": "पाठ",
-    "library": "लाइब्रेरी",
-    "lock": "ड्राइंग के बाद चयनित टूल को सक्रिय रखें",
-    "penMode": "पेन का मोड - स्पर्श टाले",
-    "link": "",
+    "library": "संग्रह",
+    "lock": "ड्राइंग के बाद चयनित उपकरण को सक्रिय रखें",
+    "penMode": "पेन का अंदाज़ - स्पर्श टाले",
+    "link": "चयनित आकृति की कड़ी जोड़े/अद्यतन करें",
     "eraser": "रबड़",
-    "frame": "",
+    "frame": "चौखट उपकरण",
     "magicframe": "तारिक ढाँचें को सांकेतिक लिपि में",
-    "embeddable": "",
+    "embeddable": "वेब जड़ायें",
     "laser": "लेसर टॉर्च",
-    "hand": "हाथ ( खिसकाने का औज़ार)",
-    "extraTools": "",
+    "hand": "हाथ ( खिसका के देखने का औज़ार)",
+    "extraTools": "अधिक उपकरण",
     "mermaidToExcalidraw": "मर्मेड से एक्सकाली में",
-    "magicSettings": "कृतिम बुद्धिमत्ता सेटिंग्स"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "आयत",
+    "diamond": "ईंट",
+    "ellipse": "दीर्घवृत्त",
+    "arrow": "तीर",
+    "line": "रेखा",
+    "freedraw": "मुक्त चित्रांकन",
+    "text": "पाठ",
+    "image": "छवि",
+    "group": "समूह",
+    "frame": "ढांचा",
+    "magicframe": "तारिक ढाँचें को सांकेतिक लिपि में",
+    "embeddable": "वेब जडें",
+    "selection": "चयन",
+    "iframe": "आईफ्रेम"
   },
   "headings": {
     "canvasActions": "कैनवास क्रिया",
@@ -263,75 +337,85 @@
     "shapes": "आकृतियाँ"
   },
   "hints": {
-    "canvasPanning": "कैनवास को सरकाने के लिए, ड्रैग करते समय माउस व्हील को पकड़े रखे या स्पेसबार को दबाए रखे, अथवा हाथ वाले औज़ार का उपयोग करें",
-    "linearElement": "कई बिंदुओं को शुरू करने के लिए क्लिक करें, सिंगल लाइन के लिए खींचें",
-    "freeDraw": "क्लिक करें और खींचें। समाप्त करने के लिए, छोड़ो",
-    "text": "आप चयन टूल से कहीं भी डबल-क्लिक करके टेक्स्ट जोड़ सकते हैं",
-    "embeddable": "",
+    "dismissSearch": "",
+    "canvasPanning": "",
+    "linearElement": "कई बिंदुओं को शुरू करने के लिए क्लिक करें, एकमात्र रेखा के लिए खींचें",
+    "arrowTool": "",
+    "freeDraw": "क्लिक करें और खींचें। समाप्त करने के लिए, छोडे",
+    "text": "आप चयन उपकरण से कहीं भी डबल-क्लिक करके पाठ्य को जोड़ सकते हों",
+    "embeddable": "वेबसाइट बनाकर जड़ने के लिए क्लिक-ड़्रैग करें",
     "text_selected": "",
     "text_editing": "",
-    "linearElementMulti": "अंतिम बिंदु पर क्लिक करें या समाप्त होने के लिए एस्केप या एंटर दबाएं",
-    "lockAngle": "आप घूर्णन करते समय SHIFT पकड़कर कोणों को मोड़ सकते हैं",
-    "resize": "आकार बदलते समय आप SHIFT को पकड़ कर अनुपात में कमी कर सकते हैं,\nकेंद्र से आकार बदलने के लिए ALT दबाए रखें",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
     "resizeImage": "",
-    "rotate": "आप घूर्णन करते समय SHIFT पकड़कर कोणों को विवश कर सकते हैं",
-    "lineEditor_info": "बिंदुओं को सम्पादित करने के लिए CtrlOrCmd को दबायें रखते हुये डबल क्लिक करे, अथवा CtrlOrCmd + Enter साथ दबाये",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
-    "publishLibrary": "",
+    "publishLibrary": "आपका अपना समूहकोष प्रकाशित करे",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
-    "eraserRevert": "मिटाने के लिए चुने हुए चीजों को ना चुनने के लिए Alt साथ में दबाए",
+    "eraserRevert": "",
     "firefox_clipboard_write": "\"dom.events.asyncClipboard.clipboardItem\" फ़्लैग को \"true\" पर सेट करके इस सुविधा को संभवतः सक्षम किया जा सकता है। Firefox में ब्राउज़र फ़्लैग बदलने के लिए, \"about:config\" पृष्ठ पर जाएँ।",
-    "disableSnapping": "स्नैपिंग को निष्क्रिय करने के लिए CtrlOrCmd दबाए रखें"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "पूर्वावलोकन नहीं दिखा सकते हैं",
-    "canvasTooBig": "कैनवास बहुत बड़ा",
-    "canvasTooBigTip": "कैनवास बहुत बड़ा टिप"
+    "canvasTooBig": "चित्रपटल शायद बहुत बड़ा हो सकता हैं",
+    "canvasTooBigTip": "सुझाव: सबसे दूर वाले अवयवों को थोड़ा आपस में पास-पास लायें."
   },
   "errorSplash": {
-    "headingMain": "एक त्रुटि का सामना करना पड़ा। प्रयत्न <button>इस पृष्ठ को पुनः लोड करें</button>",
-    "clearCanvasMessage": "यदि पुनः लोड करना काम नहीं करता है, तो प्रयास करें <button>कैनवास साफ करना।</button>",
-    "clearCanvasCaveat": " इससे काम का नुकसान होगा ",
-    "trackedToSentry": "पहचानकर्ता के साथ त्रुटि {{eventId}} हमारे सिस्टम पर नज़र रखी गई थी।",
-    "openIssueMessage": "हम बहुत सतर्क थे कि त्रुटि पर आपकी दृश्य जानकारी शामिल न करें। यदि आपका दृश्य निजी नहीं है, तो कृपया हमारे बारे में विचार करें <button>बग ट्रैकर</button> कृपया GitHub मुद्दे को कॉपी और पेस्ट करके नीचे दी गई जानकारी शामिल करें।",
+    "headingMain": "एक त्रुटि का सामना करना पड़ा।</button> पृष्ठ को पुनः लोड </button> करने का प्रयत्न करें.",
+    "clearCanvasMessage": "यदि पुनः लोड करना काम नहीं करता है, <button>चित्रपटल साफ</button> करने का प्रयास करें.",
+    "clearCanvasCaveat": " इससे किए हुये कार्य का नुकसान होगा ",
+    "trackedToSentry": "पहचानकर्ता के साथ त्रुटि {{eventId}} पर हमारे सिस्टम ने नज़र रखी हुये थी।",
+    "openIssueMessage": "हम बहुत सतर्क थे कि त्रुटि विवरण में आपके दृश्य कीजानकारी शामिल न हों। यदि आपका दृश्य निजी नहीं है, तो कृपया हमसे <button>बग ट्रैकर</button> पर सम्पर्क बनाए रख़े. कृपया GitHub मुद्दे में, नीचे दी गई जानकारी कॉपी और पेस्ट करके शामिल करें।",
     "sceneContent": "दृश्य सामग्री:"
   },
+  "shareDialog": {
+    "or": "या"
+  },
   "roomDialog": {
-    "desc_intro": "आप अपने वर्तमान दृश्य के लोगों को अपने साथ सहयोग करने के लिए आमंत्रित कर सकते हैं।",
-    "desc_privacy": "चिंता न करें, सत्र अंत-से-अंत एन्क्रिप्शन का उपयोग करता है, इसलिए आप जो भी ड्रा करेंगे वह निजी रहेगा। यहां तक कि हमारा सर्वर भी नहीं देख पाएगा कि आप क्या कर रहे हैं।",
+    "desc_intro": "अपनी चित्रकला पर सहयोग करने के लिए लोगों को आमंत्रित करें।",
+    "desc_privacy": "चिंता न करें, सत्र शुरू से अंत तक कूट रूप में है, और पूरी तरह से निजी है। यहां तक ​​कि हमारा परिसेवक भी यह नहीं देख सकता कि आप क्या बनाते हैं।",
     "button_startSession": "सत्र प्रारंभ करें",
-    "button_stopSession": "सत्र रुकें",
-    "desc_inProgressIntro": "लाइव सहयोग सत्र अब जारी है।",
+    "button_stopSession": "सत्र समाप्त करें",
+    "desc_inProgressIntro": "जीवंत सहयोग सत्र अब जारी है।",
     "desc_shareLink": "इस लिंक को आप जिस किसी के साथ भी सहयोग करना चाहते हैं, उसके साथ साझा करें",
-    "desc_exitSession": "सत्र रोकना आपको रूम से बाहर कर देगा, लेकिन आप स्थानीय स्तर पर दृश्य के साथ काम करना जारी रख पाएंगे। ध्यान दें कि यह अन्य लोगों को प्रभावित नहीं करेगा, और वे अभी भी अपने संस्करण पर सहयोग करने में सक्षम होंगे।",
-    "shareTitle": ""
+    "desc_exitSession": "सत्र रोकना आपको रूम से बाहर कर देगा, किंतु आप स्थानीय स्तर पर दृश्य के साथ काम करना जारी रख सकते हो। ध्यान दें कि यह अन्य लोगों को प्रभावित नहीं करेगा, और वे अभी भी अपने संस्करण पर सहयोग करने में सक्षम होंगे।",
+    "shareTitle": "जीवंत सहयोग सत्र में जुड़े"
   },
   "errorDialog": {
-    "title": "गलती"
+    "title": "त्रुटि"
   },
   "exportDialog": {
-    "disk_title": "",
-    "disk_details": "",
-    "disk_button": "",
-    "link_title": "",
-    "link_details": "",
-    "link_button": "",
-    "excalidrawplus_description": "",
-    "excalidrawplus_button": "",
-    "excalidrawplus_exportError": ""
+    "disk_title": "डिस्क पर सुरक्षित करे",
+    "disk_details": "दृश्य डेटा एक फ़ाइल में निर्यात करे, जहांसे आप उसे पुनः आयात कर सके",
+    "disk_button": "फ़ाइल में सुरक्षित करें",
+    "link_title": "साझा करने योग्य कड़ी",
+    "link_details": "केवल पढ़ी जा सके ऐसी कड़ी में निर्यात करें",
+    "link_button": "कड़ी स्वरूप में निर्यात करे",
+    "excalidrawplus_description": "दृश्य को एक्सकालीड्रॉप्लस कार्यस्थल में सुरक्षित रखें",
+    "excalidrawplus_button": "निर्यात",
+    "excalidrawplus_exportError": "इस वक्त एक्सकालीड्रॉप्लस में निर्यात नहीं किया जा सका..."
   },
   "helpDialog": {
     "blog": "हमारा ब्लॉग पढे",
     "click": "क्लिक करें",
-    "deepSelect": "",
-    "deepBoxSelect": "",
+    "deepSelect": "गहरा चयन",
+    "deepBoxSelect": "बक्से के अंदर गहरा चयन करे और घसीटने की रोकथाम करे",
+    "createFlowchart": "सामान्य अवयव से फ़्लोचार्ट बनायें",
+    "navigateFlowchart": "फ़्लोचार्ट का अनुपालन करें",
     "curvedArrow": "वक्र तीर",
     "curvedLine": "वक्र रेखा",
-    "documentation": "",
-    "doubleClick": "",
+    "documentation": "प्रलेखिकरण",
+    "doubleClick": "डबल-क्लिक",
     "drag": "खींचें",
     "editor": "संपादक",
     "editLineArrowPoints": "रेखा/तीर बिंदु सम्पादित करे",
@@ -340,115 +424,121 @@
     "howto": "हमारे गाइड का पालन करें",
     "or": "या",
     "preventBinding": "तीर बंधन रोकें",
-    "tools": "औज़ार",
+    "tools": "उपकरण",
     "shortcuts": "कीबोर्ड के शॉर्टकट्स",
-    "textFinish": "",
-    "textNewLine": "",
+    "textFinish": "संपादन पूर्ण करे (पाठ संपादक)",
+    "textNewLine": "नई पंक्ति जोड़ें (पाठ संपादक)",
     "title": "मदद",
     "view": "दृश्य",
-    "zoomToFit": "सभी तत्वों को फिट करने के लिए ज़ूम करें",
+    "zoomToFit": "सभी अवयाओं को फिट करने के लिए ज़ूम करें",
     "zoomToSelection": "चयन तक ज़ूम करे",
     "toggleElementLock": "ताले के अंदर/बाहर चुनाव",
     "movePageUpDown": "पृष्ठ ऊपर/नीचे करे",
-    "movePageLeftRight": "पृष्ठ बायी/दायी तरफ करे"
+    "movePageLeftRight": "पृष्ठ बायी/दायी तरफ करे",
+    "cropStart": "प्रतिमा काटें",
+    "cropFinish": "प्रतिमा काटना समाप्त करें"
   },
   "clearCanvasDialog": {
-    "title": ""
+    "title": "चित्रपलट स्वच्छ करे"
   },
   "publishDialog": {
-    "title": "",
-    "itemName": "",
-    "authorName": "",
-    "githubUsername": "",
-    "twitterUsername": "",
-    "libraryName": "",
-    "libraryDesc": "",
-    "website": "",
+    "title": "समूह कोष प्रकाशित करे",
+    "itemName": "वस्तु का नाम",
+    "authorName": "लेखक का नाम",
+    "githubUsername": "ग़िटहब उपयोक्ता का नाम",
+    "twitterUsername": "ट्विटर उपयोक्ता का नाम",
+    "libraryName": "समूहकोष का नाम",
+    "libraryDesc": "समूहकोष विवरण",
+    "website": "वेबसाइट",
     "placeholder": {
-      "authorName": "",
-      "libraryName": "",
-      "libraryDesc": "",
-      "githubHandle": "",
-      "twitterHandle": "",
-      "website": ""
+      "authorName": "आपका नाम अथवा उपयोक्तानाम",
+      "libraryName": "आपके समूहकोष का नाम",
+      "libraryDesc": "आपके समूह कोष का विवरण, जिससे अन्य उपयोक्ता उसका उपयोग समझ सके",
+      "githubHandle": "ग़िट हब हैंडल (वैकल्पिल), जिससे आप समूह कोष को उसके एक बार समीक्षा के लिये प्रस्तुत करने के उपरांत संपादित कर सके.",
+      "twitterHandle": "ट्विटर उपयोक्ता का नाम ( ऐच्छिक), जिससे हम ट्विटर पर प्रवर्तन करते समय उचित उपयोक्ता को श्रेय दे सके",
+      "website": "आपकी व्येयक्तिक वेब साइट या अन्य साइट की कड़ी ( ऐच्छिक)"
     },
     "errors": {
-      "required": "",
-      "website": "मान्य URL प्रविष्ट करें"
+      "required": "आवश्यक",
+      "website": "मान्य URL दर्ज करें"
     },
-    "noteDescription": "संग्रह सम्मिलित करने हेतु प्रस्तुत करें <link>सार्वजनिक संग्रहालय</link>अन्य वक्तियों को उनके चित्रकारी में उपयोग के लिये",
-    "noteGuidelines": "संग्रह को पहले स्वीकृति आवश्यक कृपया यह पढ़ें <link>दिशा-निर्देश</link>",
-    "noteLicense": "जमा करके, आप सहमत हैं कि संग्रहण को <link>MIT लाइसेंस</link> के तहत प्रकाशित किया जाएगा, जिसका संक्षिप्त अर्थ है कि कोई भी बिना किसी प्रतिबंध के उनका उपयोग कर सकता है।",
-    "noteItems": "",
-    "atleastOneLibItem": "",
-    "republishWarning": "टिप्पणी: कुछ चुने हुवे आइटम पहले ही प्रकाशित/प्रस्तुत किए जा चुके हैं। किसी प्रकाशित संग्रह को अद्यतन करते समय या पहले से प्रस्तुत आइटम को पुन्हा प्रस्तुत करते समय, आप बस उसे केवल अद्यतन करें ।"
+    "noteDescription": "अन्य वक्तियों को उनके चित्रकारी में उपयोग के लिये आपका संग्रह <link> सार्वजनिक समग्रहालय</link> में सम्मिलित करने हेतु प्रस्तुत करें.",
+    "noteGuidelines": "संग्रह को पहले स्वीकृति मिलना आवश्यक कृपया हैं. दिए हुवे <link>दिशा-निर्देश</link> पढ़े. संचार और बदलने के लिए आपके पास एक ग़िट हब खाता होना चाहिए है. परंतु, यह अति आवश्यक नाही हैं.",
+    "noteLicense": "जमा करके, आप मानते है कि आप सहमत हैं कि संग्रहण को <link>MIT लाइसेंस</link> के तहत प्रकाशित किया जाएगा, जिसका संक्षिप्त अर्थ है कि कोई भी बिना किसी प्रतिबंध के उनका उपयोग कर सकता है।",
+    "noteItems": "प्रत्तेक समूह कोष अवयव का उसका नाम होना आवश्यक हैं, जिसे उसे छान कर तलाशा जा सकें",
+    "atleastOneLibItem": "प्रारम्भ करने के लिये समूह कोष से कम से कम एक अवयव चुने",
+    "republishWarning": "टिप्पणी: कुछ चुने हुवे आइटम पहले ही प्रकाशित/प्रस्तुत किए जा चुके हैं। किसी प्रकाशित संग्रह को अद्यतन करते समय या पहले से प्रस्तुत अवयवों को पुन्हा प्रस्तुत करते समय, आप बस उसे केवल अद्यतन करें ।"
   },
   "publishSuccessDialog": {
-    "title": "",
+    "title": "समूह कोष प्रस्तुत करें",
     "content": "{{authorName}} धन्यवाद. आपका संग्रहण समीक्षा के लिए दर्ज हो चुका है. समीक्षा स्थिति <link>यहाँ</link>जान सकते हैं."
   },
   "confirmDialog": {
-    "resetLibrary": "",
-    "removeItemsFromLib": ""
+    "resetLibrary": "संग्रह को पुनः स्थापित करें",
+    "removeItemsFromLib": "चयनित अवयव समूह कोष से अलग करें"
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "प्रतिमा निर्यात करे",
     "label": {
-      "withBackground": "",
-      "onlySelected": "",
-      "darkMode": "",
-      "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "withBackground": "पृष्ठभूमि",
+      "onlySelected": "केवल चयनित",
+      "darkMode": "कम प्रकाश प्रणाली",
+      "embedScene": "दृश्य जड़े",
+      "scale": "परिमाप",
+      "padding": "भराई"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "दृश्य डेटा निर्यतित पी-एन-जी/ एस-वी-जी फ़ाइल में सुरक्षित किया जाएगा, जिससे दृश्य को पुनःस्थापित किया जा सकता है. यह निर्यतित फ़ाइल का आकार बढ़ा देगा."
     },
     "title": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "पी-एन-जी के स्वरूप में निर्यात करे",
+      "exportToSvg": "एस-वी0जी के स्वरूप में निर्यात करे",
+      "copyPngToClipboard": "पी-एन-जी के स्वरूप में क्लिपबोर्ड पर प्रतिरूपित करें"
     },
     "button": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "पी-एन-जी",
+      "exportToSvg": "एस-वी-जी",
+      "copyPngToClipboard": "क्लिपबोर्ड पर प्रतिलिपि बनाएँ"
     }
   },
   "encrypted": {
     "tooltip": "आपके चित्र अंत-से-अंत एन्क्रिप्टेड हैं, इसलिए एक्सक्लूसिव्रॉव के सर्वर उन्हें कभी नहीं देखेंगे।",
-    "link": ""
+    "link": "एक्सकाली मैं ब्लॉग पोस्ट आद्यंत गोपित"
   },
   "stats": {
     "angle": "कोण",
-    "element": "एलिमेंट",
-    "elements": "एलिमेंट",
+    "shapes": "आकृतियाँ",
     "height": "ऊंचाई",
     "scene": "दृश्य",
     "selected": "चयनित",
     "storage": "संग्रह",
-    "title": "बेवकूफ के लिए आँकड़े",
+    "fullTitle": "पटल और आकार के गुण",
+    "title": "गुण",
+    "generalStats": "साधारणत:",
+    "elementProperties": "आकृति के गुण",
     "total": "कुल",
     "version": "संस्करण",
-    "versionCopy": "काॅपी करने के लिए क्लिक करें",
+    "versionCopy": "प्रतिलिपि के लिए क्लिक करें",
     "versionNotAvailable": "संस्करण उपलब्ध नहीं है",
     "width": "चौड़ाई"
   },
   "toast": {
-    "addedToLibrary": "",
-    "copyStyles": "काॅपी कीए स्टाइल",
-    "copyToClipboard": "क्लिपबोर्ड में कॉपी कीए",
-    "copyToClipboardAsPng": "",
-    "fileSaved": "",
-    "fileSavedToFilename": "",
-    "canvas": "",
-    "selection": "",
+    "addedToLibrary": "समूहकोष में जोडा गया",
+    "copyStyles": "प्रतिलिपित शैली",
+    "copyToClipboard": "क्लिपबोर्ड में प्रतिलिपित",
+    "copyToClipboardAsPng": "{{exportSelection}} को क्लिपबोर्ड पर पी-एन-जी( {{exportColorScheme}}) पर प्रतिरूपित किया गया",
+    "copyToClipboardAsSvg": "{{exportSelection}} को क्लिपबोर्ड पर एस-वी-जी ( {{exportColorScheme}}) स्वरूप में प्रतिलिपित किया",
+    "fileSaved": "फ़ाइल सुरक्षित की गयी",
+    "fileSavedToFilename": "{filename} में सुरक्षित की गयी",
+    "canvas": "चित्रपटल",
+    "selection": "चयन",
     "pasteAsSingleElement": "एक अवयव के रूप में चिपकाने के लिए {{shortcut}} का उपयोग करें,\nया किसी मौजूदा पाठ संपादक में चिपकायें",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "यह यू-आर-एल जड़ने हेतु अस्वीकृत हैं. इस यू-आर-एल को श्वेतसूची मैं सम्मिलित कराने हेतु ग़िटहब पर मुद्दा उठायें",
+    "unrecognizedLinkFormat": "जो कड़ी आपने जड़ी हैं, वह अनपेक्षित प्रारूप में हैं. कृपया मूल साइट द्वारा मुहैय्या कराया हुवा 'जड़ने हेतु' पाठ चिपकाने का प्रयास करें.",
+    "elementLinkCopied": "कड़ी क्लिप बोर्ड पर कॉपी की गयी"
   },
   "colors": {
-    "transparent": "",
+    "transparent": "पारदर्शक",
     "black": "काला",
     "white": "सफ़ेद",
     "red": "लाल",
@@ -467,7 +557,7 @@
   "welcomeScreen": {
     "app": {
       "center_heading": "आपका सर्व डेटा ब्राउज़र के भीतर स्थानिक जगह पे सुरक्षित किया गया.",
-      "center_heading_plus": "बजाय आपको Excalidraw+ पर जाना है?",
+      "center_heading_plus": "बजाय आपको एक्स-काली-ड्रॉ-प्लस पर जाना है?",
       "menuHint": "निर्यात, पसंद, भाषायें, ..."
     },
     "defaults": {
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "अधिकांश उपयोगित रंग",
     "colors": "रंग",
     "shades": "छाया",
@@ -487,9 +578,9 @@
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "छवि स्वरूप में निर्यात करे",
-        "button": "छवि स्वरूप निर्यात करे",
-        "description": "दृष्य डेटा छवि स्वरूप में निर्यात करे, उस स्वरूप से आप उसे पुनः आयात कर सकते हो"
+        "title": "प्रतिमा स्वरूप में निर्यात करे",
+        "button": "प्रतिमा स्वरूप में निर्यात करे",
+        "description": "दृष्य डेटा प्रतिमा स्वरूप में निर्यात करे, उस स्वरूप से आप उसे पुनः आयात कर सकते हो"
       },
       "saveToDisk": {
         "title": "डिस्क में सम्हाले",
@@ -497,29 +588,77 @@
         "description": "दृष्य डेटा बाहरी फ़ाइल में निर्यात करे, जहाँसे आप उसे पुनः आयात कर सकते हो"
       },
       "excalidrawPlus": {
-        "title": "एक्षकालीड्रॉ+",
-        "button": "एक्षकालीड्रॉ+ में निर्यात करे",
-        "description": "दृष्य को आपके एक्षकालीड्रॉ+ के कर्यस्थल में सम्हाले"
+        "title": "एक्स-काली-ड्रॉ-प्लस",
+        "button": "एकस-काल-ड्रॉ-प्लस में निर्यात करे",
+        "description": "दृष्य को आपके एक्स-काली-ड्रॉ-प्लस के कर्यस्थल में सम्हाले"
       }
     },
     "modal": {
       "loadFromFile": {
         "title": "फ़ाइल से लोड करें:",
         "button": "फ़ाइल से लोड करें:",
-        "description": "फ़ाइल से लोड करने पर <bold>यह आपके कार्य की जगह लेलेगा </bold><br></br>आपकी ड्रॉइंग निम्न दर्शित विकल्पो में से एक चुनके और उपयोग करके सम्हाल सकते हैं"
+        "description": "फ़ाइल से लोड करने पर <bold>यह आपके कार्य की जगह लेलेगा </bold><br></br>आपकी ड्रॉइंग निम्न दर्शित विकल्पो में से एक चुनके और उपयोग करके सहेज सकते हैं"
       },
       "shareableLink": {
         "title": "लिंक से लोड करें:",
-        "button": "इस जगह प्रतिस्थापित करे",
-        "description": "बाहर का चित्र लोड करने पर <bold>यह आपके कार्य की जगह लेलेगा </bold><br></br>आप आपकी ड्रॉइंग पहले निम्न दर्शित विकल्पो में से एक चुनके और उपयोग करके सम्हाल सकते हों."
+        "button": "मेरी सामग्री बदले",
+        "description": "बाहर का चित्र लोड करने पर <bold>यह आपके कार्य की जगह लेलेगा </bold><br></br>आप आपकी ड्रॉइंग पहले निम्न दर्शित विकल्पो में से एक चुनके और उपयोग करके सहेज सकते हों."
       }
     }
   },
   "mermaid": {
     "title": "मर्मेड से एक्सकाली में",
-    "button": "अंदर डाले",
-    "description": "",
-    "syntax": "मर्मेड संरचना नियम",
+    "button": "सन्निवेश करे",
+    "description": "वर्तमान में केवल <flowchartLink>बहाव चित्र</flowchartLink>, <sequenceLink> अनुक्रम चित्र </sequenceLink> और <classLink>वर्ग चित्र</classLink> का चित्रिकरण संभव हैं. अन्य चित्र प्रकार एक्सकाली प्रतिमा जैसे चित्रित किए जायेंगे.",
+    "syntax": "मर्मेड विन्यास",
     "preview": "पूर्वावलोकन"
+  },
+  "quickSearch": {
+    "placeholder": "त्वरित खोज"
+  },
+  "fontList": {
+    "badge": {
+      "old": "पुराना"
+    },
+    "sceneFonts": "इस दृश्य में",
+    "availableFonts": "उपलब्ध लिपियां",
+    "empty": "कोई लिपि नहीं मिली"
+  },
+  "userList": {
+    "empty": "कोई उपयोक्ता नहीं मिला",
+    "hint": {
+      "text": "उपयोक्ता का अनुकरण करने के लिए उसपर क्लिक करें",
+      "followStatus": "आप इस उपयोक्ता का अनुकरण कर रहें हैं.",
+      "inCall": "व्यक्ति अभी संभाषण मैं व्यस्त हैं",
+      "micMuted": "व्यक्ति का माइक्रोफ़ोन अभी मूक अवस्था मैं हैं",
+      "isSpeaking": "व्यक्ति अभी बोलने मैं व्यस्त हैं"
+    }
+  },
+  "commandPalette": {
+    "title": "आदेश फ़लक",
+    "shortcuts": {
+      "select": "चुनें",
+      "confirm": "पुष्टि करें",
+      "close": "बंद करें"
+    },
+    "recents": "हाल ही में उपयोग किया गया",
+    "search": {
+      "placeholder": "मेनू, आदेशों कों धूंड़े और गुप्त नग प्राप्त करें",
+      "noMatch": "कोई आदेश मेल नाही खा सका....."
+    },
+    "itemNotAvailable": "आदेश उपलब्ध नाही हैं.",
+    "shortcutHint": "आदेश फलक के लिए, {{shortcut}} का उपयोग कीजिए"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/hu-HU.json b/packages/excalidraw/locales/hu-HU.json
index e367aa6e90..a4ff50d044 100644
--- a/packages/excalidraw/locales/hu-HU.json
+++ b/packages/excalidraw/locales/hu-HU.json
@@ -21,7 +21,9 @@
     "copyStyles": "Stílus másolása",
     "pasteStyles": "Stílus beillesztése",
     "stroke": "Körvonal",
+    "changeStroke": "Vonal szín megváltoztatása",
     "background": "Háttér",
+    "changeBackground": "Háttérszín megváltoztatása",
     "fill": "Kitöltés",
     "strokeWidth": "Körvonal vastagsága",
     "strokeStyle": "Körvonal stílusa",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Nincs",
     "arrowhead_arrow": "Nyíl",
     "arrowhead_bar": "Oszlop",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Kör",
+    "arrowhead_circle_outline": "Kör (Körvonal)",
     "arrowhead_triangle": "Háromszög",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Háromszög (Körvonal)",
+    "arrowhead_diamond": "Rombusz",
+    "arrowhead_diamond_outline": "Rombusz (Körvonal)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "Nyíl típus",
+    "arrowtype_sharp": "Hegyes nyíl",
+    "arrowtype_round": "Ívelt nyíl",
+    "arrowtype_elbowed": "",
     "fontSize": "Betűméret",
     "fontFamily": "Betűkészlet család",
     "addWatermark": "Add hozzá, hogy \"Excalidraw-val készült\"",
@@ -72,10 +82,11 @@
     "canvasColors": "Rajzvászonon használt",
     "canvasBackground": "Vászon háttérszíne",
     "drawingCanvas": "Rajzvászon",
+    "clearCanvas": "Rajzfelület törlése",
     "layers": "Rétegek",
     "actions": "Műveletek",
     "language": "Nyelv",
-    "liveCollaboration": "Élő együttműködés...",
+    "liveCollaboration": "",
     "duplicateSelection": "Duplikálás",
     "untitled": "Névtelen",
     "name": "Név",
@@ -84,12 +95,13 @@
     "group": "Csoportosítás",
     "ungroup": "Csoportbontás",
     "collaborators": "Közreműködők",
-    "showGrid": "Rács megjelenítése",
+    "toggleGrid": "",
     "addToLibrary": "Hozzáadás a könyvtárhoz",
     "removeFromLibrary": "Eltávólítás a könyvtárból",
     "libraryLoadingMessage": "Könyvtár betöltése…",
     "libraries": "Könyvtárak böngészése",
     "loadingScene": "Jelenet betöltése…",
+    "loadScene": "",
     "align": "Igazítás",
     "alignTop": "Felülre igazítás",
     "alignBottom": "Alulra igazítás",
@@ -105,55 +117,97 @@
     "share": "Megosztás",
     "showStroke": "Körvonal színválasztó megjelenítése",
     "showBackground": "Háttérszín-választó megjelenítése",
-    "toggleTheme": "Téma váltása",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "Téma",
     "personalLib": "Személyes könyvtár",
     "excalidrawLib": "Excalidraw könyvtár",
     "decreaseFontSize": "Betűméret csökkentése",
     "increaseFontSize": "Betűméret növelése",
     "unbindText": "Szövegkötés feloldása",
     "bindText": "",
-    "createContainerFromText": "Szöveg bekeretezése",
+    "createContainerFromText": "",
     "link": {
       "edit": "Hivatkozás szerkesztése",
-      "editEmbed": "Link szerkesztése / beágyazása",
-      "create": "Hivatkozás létrehozása",
-      "createEmbed": "Link létrehozása / beágyazása",
+      "editEmbed": "",
+      "create": "Hivatkozás hozzáadása",
       "label": "Hivatkozás",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "",
-      "exit": ""
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
-      "lock": "Rögzítés",
-      "unlock": "Rögzítés feloldása",
-      "lockAll": "Összes rögzítése",
+      "lock": "",
+      "unlock": "",
+      "lockAll": "Összes zárolása",
       "unlockAll": "Összes feloldása"
     },
-    "statusPublished": "",
+    "statusPublished": "Közzétéve",
     "sidebarLock": "",
     "selectAllElementsInFrame": "",
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Szövegből diagram",
+    "prompt": "",
+    "followUs": "Kövess minket",
+    "discordChat": "Discord chat",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Vászon törlése",
     "exportJSON": "Exportálás fájlba",
-    "exportImage": "Kép exportálása...",
-    "export": "Mentés másként...",
+    "exportImage": "",
+    "export": "",
     "copyToClipboard": "Vágólapra másolás",
+    "copyLink": "",
     "save": "Mentés az aktuális fájlba",
     "saveAs": "Mentés másként",
-    "load": "Megnyitás",
+    "load": "",
     "getShareableLink": "Megosztható link létrehozása",
     "close": "Bezárás",
     "selectLanguage": "Nyelv kiválasztása",
@@ -171,14 +225,16 @@
     "fullScreen": "Teljes képernyő",
     "darkMode": "Sötét mód",
     "lightMode": "Világos mód",
+    "systemMode": "",
     "zenMode": "Letisztult mód",
     "objectsSnapMode": "",
     "exitZenMode": "Kilépés a letisztult módból",
     "cancel": "Mégsem",
+    "saveLibNames": "",
     "clear": "Kiűrítés",
     "remove": "Eltávolítás",
     "embed": "",
-    "publishLibrary": "Közzététel",
+    "publishLibrary": "",
     "submit": "Elküldés",
     "confirm": "Megerősítés",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "Ezzel törlöd a könyvtárát. biztos vagy ebben?",
     "removeItemsFromsLibrary": "{{count}} elemet törölsz a könyvtárból?",
     "invalidEncryptionKey": "A titkosítási kulcsnak 22 karakterből kell állnia. Az élő együttműködés le van tiltva.",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Nem támogatott fájltípus.",
@@ -212,9 +269,9 @@
     "fileTooBig": "A fájl túl nagy. A megengedett maximális méret {{maxSize}}.",
     "svgImageInsertError": "Nem sikerült beszúrni az SVG-képet. Az SVG szintaktika érvénytelennek tűnik.",
     "failedToFetchImage": "",
-    "invalidSVGString": "Érvénytelen SVG.",
     "cannotResolveCollabServer": "",
     "importLibraryError": "",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Kijelölés",
+    "lasso": "",
     "image": "Kép beszúrása",
     "rectangle": "Téglalap",
     "diamond": "Rombusz",
@@ -246,16 +304,32 @@
     "library": "Könyvtár",
     "lock": "Rajzolás után az aktív eszközt tartsa kijelölve",
     "penMode": "",
-    "link": "Hivatkozás hozzáadása/frissítése a kiválasztott alakzathoz",
-    "eraser": "Radír",
+    "link": "",
+    "eraser": "",
     "frame": "",
     "magicframe": "",
-    "embeddable": "Weblap beágyazása",
-    "laser": "Lézermutató",
+    "embeddable": "",
+    "laser": "",
     "hand": "",
-    "extraTools": "További eszközök",
+    "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Vászon műveletek",
@@ -263,28 +337,33 @@
     "shapes": "Alakzatok"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "Kattintással görbe, az eger húzásával pedig egyenes nyilat rajzolhatsz",
+    "arrowTool": "",
     "freeDraw": "Kattints és húzd, majd engedd el, amikor végeztél",
     "text": "Tipp: A kijelölés eszközzel a dupla kattintás új szöveget hoz létre",
     "embeddable": "",
-    "text_selected": "Kattints duplán, vagy nyomj entert a szöveg szerkesztéséhez",
-    "text_editing": "Nyomjd meg az Escape vagy a Ctrl/Cmd+ENTER billentyűkombinációt a szerkesztés befejezéséhez",
-    "linearElementMulti": "Kattints a következő ív pozíciójára, vagy fejezd be a nyilat az Escape vagy Enter megnyomásával",
-    "lockAngle": "A SHIFT billentyű lenyomva tartásával korlátozhatja forgatás szögét",
-    "resize": "A SHIFT billentyű lenyomva tartásával az átméretezés megtartja az arányokat,\naz ALT lenyomva tartásával pedig a középpont egy helyben marad",
-    "resizeImage": "A SHIFT billentyű lenyomva tartásával szabadon átméretezheted,\ntartsd lenyomva az ALT billentyűt a középről való átméretezéshez",
-    "rotate": "A SHIFT billentyű lenyomva tartásával korlátozhatja a szögek illesztését",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
     "lineEditor_info": "",
-    "lineEditor_pointSelected": "Nyomd meg a Törlés gombot a pont(ok) eltávolításához,\nA Ctrl/Cmd+D a többszörözéshez, vagy húzással mozgathatja",
-    "lineEditor_nothingSelected": "Válaszd ki a szerkeszteni kívánt pontot (több kijelöléséhez tartsd lenyomva a SHIFT billentyűt),\nvagy Alt, és kattintson az új pontok hozzáadásához",
-    "placeImage": "Kattints a kép elhelyezéséhez, vagy kattints és méretezd manuálisan",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Tedd közzé saját könyvtáradat",
-    "bindTextToElement": "Nyomd meg az Entert szöveg hozzáadáshoz",
-    "deepBoxSelect": "Tartsd lenyomva a Ctrl/Cmd billentyűt a mély kijelöléshez és a húzás megakadályozásához",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Előnézet nem jeleníthető meg",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Vigyáztunk arra, hogy a jelenthez tartozó információ ne jelenjen meg a hibaüzenetben. Ha a jeleneted nem bizalmas, kérjük add hozzá a <button>hibakövető rendszerünkhöz.</button> Kérjük, másolja be az alábbi információkat a GitHub problémába.",
     "sceneContent": "Jelenet tartalma:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "Meghívhat embereket a jelenlegi jelenetbe, hogy együttműködjenek önnel.",
-    "desc_privacy": "Ne aggódj, a munkamenet végpontok közötti titkosítást használ, tehát bármit rajzolsz, privát marad. Még a szerverünkről se lehet belenézni.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Munkamenet indítása",
     "button_stopSession": "Munkamenet leállítása",
     "desc_inProgressIntro": "Az élő együttműködési munkamenet folyamatban van.",
@@ -328,6 +410,8 @@
     "click": "kattintás",
     "deepSelect": "Mély kijelölés",
     "deepBoxSelect": "Mély kijelölés a dobozon belül, és a húzás megakadályozása",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Ívelt nyíl",
     "curvedLine": "Ívelt vonal",
     "documentation": "Dokumentáció",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Kijelölésre nagyítás",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Rajzvászon alaphelyzetbe"
@@ -410,9 +496,9 @@
       "copyPngToClipboard": ""
     },
     "button": {
-      "exportToPng": "PNG",
-      "exportToSvg": "SVG",
-      "copyPngToClipboard": "Vágólapra másolás"
+      "exportToPng": "",
+      "exportToSvg": "",
+      "copyPngToClipboard": ""
     }
   },
   "encrypted": {
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Szög",
-    "element": "Elem",
-    "elements": "Elemek",
+    "shapes": "",
     "height": "Magasság",
     "scene": "Jelenet",
     "selected": "Kijelölt",
     "storage": "Tárhely",
-    "title": "Statisztikák",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Összesen",
     "version": "Verzió",
     "versionCopy": "Kattints a másoláshoz",
@@ -439,30 +527,32 @@
     "copyStyles": "Másolt stílusok.",
     "copyToClipboard": "Vágólapra másolva.",
     "copyToClipboardAsPng": "Az {{exportSelection}} PNG formátumban a vágólapra másolva \n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Fájl elmentve.",
     "fileSavedToFilename": "Mentve mint {filename}",
     "canvas": "rajzvászon",
     "selection": "kijelölés",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Átlátszó",
-    "black": "Fekete",
-    "white": "Fehér",
-    "red": "Piros",
-    "pink": "Rózsaszín",
+    "black": "",
+    "white": "",
+    "red": "",
+    "pink": "",
     "grape": "",
-    "violet": "Ibolya",
-    "gray": "Szürke",
-    "blue": "Kék",
-    "cyan": "Cián",
-    "teal": "Kékes-zöld",
-    "green": "Zöld",
-    "yellow": "Sárga",
-    "orange": "Narancssárga",
-    "bronze": "Bronz"
+    "violet": "",
+    "gray": "",
+    "blue": "",
+    "cyan": "",
+    "teal": "",
+    "green": "",
+    "yellow": "",
+    "orange": "",
+    "bronze": ""
   },
   "welcomeScreen": {
     "app": {
@@ -478,38 +568,39 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
-    "hexCode": "Hexadecimális kód",
+    "hexCode": "",
     "noShades": ""
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "Exportálás képként",
-        "button": "Exportálás képként",
+        "title": "",
+        "button": "",
         "description": ""
       },
       "saveToDisk": {
-        "title": "Mentés a lemezre",
-        "button": "Mentés a lemezre",
+        "title": "",
+        "button": "",
         "description": ""
       },
       "excalidrawPlus": {
-        "title": "Excalidraw+",
+        "title": "",
         "button": "",
         "description": ""
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "Betöltés fájlból",
-        "button": "Betöltés fájlból",
+        "title": "",
+        "button": "",
         "description": ""
       },
       "shareableLink": {
-        "title": "Feltöltás linkből",
+        "title": "",
         "button": "",
         "description": ""
       }
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/id-ID.json b/packages/excalidraw/locales/id-ID.json
index b35e1bae4b..affd18bc91 100644
--- a/packages/excalidraw/locales/id-ID.json
+++ b/packages/excalidraw/locales/id-ID.json
@@ -4,15 +4,15 @@
     "pasteAsPlaintext": "Tempel sebagai teks biasa",
     "pasteCharts": "Tempel diagram",
     "selectAll": "Pilih semua",
-    "multiSelect": "Tambahkan elemen ke pilihan",
+    "multiSelect": "Tambah unsur ke seleksi",
     "moveCanvas": "Pindahkan kanvas",
     "cut": "Potong",
     "copy": "Salin",
     "copyAsPng": "Salin ke papan klip sebagai PNG",
     "copyAsSvg": "Salin ke papan klip sebagai SVG",
     "copyText": "Salin ke papan klip sebagai teks",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Salin sumber ke papan klip",
+    "convertToCode": "Konversi ke kode",
     "bringForward": "Bawa maju",
     "sendToBack": "Kirim ke belakang",
     "bringToFront": "Bawa ke depan",
@@ -21,7 +21,9 @@
     "copyStyles": "Salin gaya",
     "pasteStyles": "Tempelkan gaya",
     "stroke": "Guratan",
+    "changeStroke": "Ubah warna garis",
     "background": "Latar",
+    "changeBackground": "Ubah warna background",
     "fill": "Isian",
     "strokeWidth": "Lebar guratan",
     "strokeStyle": "Gaya guratan",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Tidak ada",
     "arrowhead_arrow": "Panah",
     "arrowhead_bar": "Batang",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Lingkaran",
+    "arrowhead_circle_outline": "Lingkaran (garis)",
     "arrowhead_triangle": "Segitiga",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Segitiga (garis)",
+    "arrowhead_diamond": "Diamond",
+    "arrowhead_diamond_outline": "Diamond (garis)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "Pilihan lain",
+    "arrowtypes": "Jenis panah",
+    "arrowtype_sharp": "Panah runcing",
+    "arrowtype_round": "Panah melengkung",
+    "arrowtype_elbowed": "Panah siku",
     "fontSize": "Ukuran font",
     "fontFamily": "Jenis font",
     "addWatermark": "Tambahkan \"Dibuat dengan Excalidraw\"",
@@ -56,7 +66,7 @@
     "veryLarge": "Sangat besar",
     "solid": "Padat",
     "hachure": "Garis-garis",
-    "zigzag": "Zigzag",
+    "zigzag": "Bentuk Z",
     "crossHatch": "Asiran silang",
     "thin": "Lembut",
     "bold": "Tebal",
@@ -72,6 +82,7 @@
     "canvasColors": "Digunakan di kanvas",
     "canvasBackground": "Latar Kanvas",
     "drawingCanvas": "Kanvas",
+    "clearCanvas": "Hapus kanvas",
     "layers": "Lapisan",
     "actions": "Aksi",
     "language": "Bahasa",
@@ -84,12 +95,13 @@
     "group": "Kelompokan pilihan",
     "ungroup": "Pisahkan pilihan",
     "collaborators": "Kolaborator",
-    "showGrid": "Tampilkan grid",
+    "toggleGrid": "Toggle grid",
     "addToLibrary": "Tambahkan ke pustaka",
     "removeFromLibrary": "Hapus dari pustaka",
     "libraryLoadingMessage": "Memuat pustaka…",
     "libraries": "Telusur pustaka",
     "loadingScene": "Memuat pemandangan…",
+    "loadScene": "Muat dari file",
     "align": "Perataan",
     "alignTop": "Rata atas",
     "alignBottom": "Rata bawah",
@@ -105,7 +117,9 @@
     "share": "Bagikan",
     "showStroke": "Tampilkan garis pengambil warna",
     "showBackground": "Tampilkan latar pengambil warna",
-    "toggleTheme": "Ubah tema",
+    "showFonts": "Tampilkan pilihan warna",
+    "toggleTheme": "Toggle tema terang/gelap",
+    "theme": "Tema",
     "personalLib": "Pustaka Pribadi",
     "excalidrawLib": "Pustaka Excalidraw",
     "decreaseFontSize": "Kecilkan ukuran font",
@@ -115,35 +129,74 @@
     "createContainerFromText": "Bungkus teks dalam kontainer",
     "link": {
       "edit": "Edit tautan",
-      "editEmbed": "",
-      "create": "Buat tautan",
-      "createEmbed": "",
+      "editEmbed": "Sunting tautan bisa semat",
+      "create": "Tambah tautan",
       "label": "Tautan",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "Tautan & sematan",
+      "empty": "Tidak ada tautan yang ditetapkan",
+      "hint": "Ketik atau tempel tautan di sini",
+      "goToElement": "Ke unsur sasaran"
     },
     "lineEditor": {
       "edit": "Edit tautan",
-      "exit": "Keluar editor garis"
+      "editArrow": "Ubah Panah"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
-      "lock": "Kunci",
+      "lock": "Kuncikan",
       "unlock": "Lepas",
-      "lockAll": "Kunci semua",
+      "lockAll": "Kuncikan semua",
       "unlockAll": "Lepas semua"
     },
     "statusPublished": "Telah terbit",
     "sidebarLock": "Biarkan sidebar tetap terbuka",
-    "selectAllElementsInFrame": "Pilih semua elemen di bingkai",
-    "removeAllElementsFromFrame": "Hapus semua elemen dari bingkai",
+    "selectAllElementsInFrame": "Pilih semua unsur di bingkai",
+    "removeAllElementsFromFrame": "Hapus semua unsur dari bingkai",
     "eyeDropper": "Ambil warna dari kanvas",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Teks menjadi diagram",
+    "prompt": "Prompt",
+    "followUs": "Ikuti kami",
+    "discordChat": "Obrolan Discord",
+    "zoomToFitViewport": "Perbesar agar sesuai dengan viewport",
+    "zoomToFitSelection": "Memperbesar agar sesuai dengan pilihan",
+    "zoomToFit": "Memperbesar agar unsur pas semua",
+    "installPWA": "Install Excalidraw secara lokal (PWA)",
+    "autoResize": "Mengaktifkan pengubahan ukuran teks secara otomatis",
+    "imageCropping": "Pemangkasan gambar",
+    "unCroppedDimension": "Dimensi yang tidak dipotong",
+    "copyElementLink": "Salin tautan ke objek",
+    "linkToElement": "Taut ke objek",
+    "wrapSelectionInFrame": "Bungkus pilihan dalam bingkai",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Taut ke objek",
+    "desc": "Pencet bentuk pada kanvas atau tempel tautan.",
+    "notFound": "Objek tertaut tidak ditemukan di kanvas."
   },
   "library": {
     "noItems": "Belum ada item yang ditambahkan...",
     "hint_emptyLibrary": "Pilih item pada kanvas untuk menambahkan nya di sini, atau pasang pustaka dari gudang di bawah ini.",
-    "hint_emptyPrivateLibrary": "Pilih item pada kanvas untuk menambahkan nya di sini."
+    "hint_emptyPrivateLibrary": "Pilih item pada kanvas untuk menambahkan nya di sini.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Temukan di kanvas",
+    "noMatch": "Tidak ada kecocokan yang ditemukan...",
+    "singleResult": "hasil",
+    "multipleResults": "semua hasil",
+    "placeholder": "Temukan teks di kanvas...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Setel Ulang Kanvas",
@@ -151,6 +204,7 @@
     "exportImage": "Ekspor gambar...",
     "export": "Simpan ke...",
     "copyToClipboard": "Salin ke Papan Klip",
+    "copyLink": "Salin tautan",
     "save": "Simpan ke file sekarang",
     "saveAs": "Simpan sebagai",
     "load": "Buka",
@@ -163,7 +217,7 @@
     "resetZoom": "Reset Pembesaran",
     "menu": "Menu",
     "done": "Selesai",
-    "edit": "Edit",
+    "edit": "Sunting",
     "undo": "Urungkan",
     "redo": "Ulangi",
     "resetLibrary": "Reset pustaka",
@@ -171,17 +225,19 @@
     "fullScreen": "Layar penuh",
     "darkMode": "Mode gelap",
     "lightMode": "Mode terang",
+    "systemMode": "Mode sistem",
     "zenMode": "Mode zen",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Snap to objects",
     "exitZenMode": "Keluar dari mode zen",
     "cancel": "Batal",
+    "saveLibNames": "",
     "clear": "Hapus",
     "remove": "Hapus",
-    "embed": "",
-    "publishLibrary": "Terbitkan",
+    "embed": "Mati/nyala penyematan",
+    "publishLibrary": "",
     "submit": "Kirimkan",
     "confirm": "Konfirmasi",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Pencet untuk interaksi"
   },
   "alerts": {
     "clearReset": "Ini akan menghapus semua yang ada dikanvas. Apakah kamu yakin ?",
@@ -198,43 +254,45 @@
     "errorAddingToLibrary": "Tidak dapat menambahkan item ke pustaka",
     "errorRemovingFromLibrary": "Tidak dapat membuang item dari pustaka",
     "confirmAddLibrary": "Ini akan menambahkan {{numShapes}} bentuk ke pustaka Anda. Anda yakin?",
-    "imageDoesNotContainScene": "Gambar ini sepertinya tidak terdapat data pemandangan. Sudahkah Anda mengaktifkan penyematan pemandangan ketika ekspor?",
+    "imageDoesNotContainScene": "Gambar ini tampaknya tidak ada data pemandangan. Apakah penyematan pemandangan sudah diaktifkan saat ekspor?",
     "cannotRestoreFromImage": "Pemandangan tidak dapat dipulihkan dari file gambar ini",
     "invalidSceneUrl": "Tidak dapat impor pemandangan dari URL. Kemungkinan URL itu rusak atau tidak berisi data JSON Excalidraw yang valid.",
     "resetLibrary": "Ini akan menghapus pustaka Anda. Anda yakin?",
     "removeItemsFromsLibrary": "Hapus {{count}} item dari pustaka?",
     "invalidEncryptionKey": "Sandi enkripsi harus 22 karakter. Kolaborasi langsung dinonaktifkan.",
-    "collabOfflineWarning": "Tidak ada koneksi internet.\nPerubahan tidak akan disimpan!"
+    "collabOfflineWarning": "Tidak ada koneksi internet.\nPerubahan tidak akan disimpan!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipe file tidak didukung.",
     "imageInsertError": "Tidak dapat menyisipkan gambar. Coba lagi nanti...",
     "fileTooBig": "File terlalu besar. Ukuran maksimum yang dibolehkan {{maxSize}}.",
     "svgImageInsertError": "Tidak dapat menyisipkan gambar SVG. Markup SVG sepertinya tidak valid.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG tidak valid.",
+    "failedToFetchImage": "Gagal memuat gambar.",
     "cannotResolveCollabServer": "Tidak dapat terhubung ke server kolab. Muat ulang laman dan coba lagi.",
     "importLibraryError": "Tidak dapat memuat pustaka",
+    "saveLibraryError": "Tidak dapat menyimpan library ke penyimpanan. Simpanlah library Anda ke file secara lokal untuk memastikan Anda tidak kehilangan perubahan.",
     "collabSaveFailed": "Tidak dapat menyimpan ke dalam basis data server. Jika masih berlanjut, Anda sebaiknya simpan berkas Anda secara lokal untuk memastikan pekerjaan Anda tidak hilang.",
     "collabSaveFailed_sizeExceeded": "Tidak dapat menyimpan ke dalam basis data server, tampaknya ukuran kanvas terlalu besar. Anda sebaiknya simpan berkas Anda secara lokal untuk memastikan pekerjaan Anda tidak hilang.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Gambar dinonaktifkan.",
     "brave_measure_text_error": {
       "line1": "Sepertinya Anda menggunkan peramban Brave dengan pengaturan <bold>Blokir Fingerprinting yang Agresif</bold> diaktifkan.",
-      "line2": "Ini dapat membuat <bold>Elemen Teks</bold> dalam gambar mu.",
+      "line2": "Ini dapat merusak <bold>Unsur Teks</bold> pada gambarmu.",
       "line3": "Kami sangat menyarankan mematikan pengaturan ini. Anda dapat mengikuti <link>langkah-langkah ini</link> untuk melakukannya.",
-      "line4": "Jika mematikan pengaturan ini tidak membenarkan tampilan elemen teks, mohon buka\n<issueLink>isu</issueLink> di GitHub kami, atau chat kami di <discordLink>Discord</discordLink>"
+      "line4": "Jika mematikan pengaturan ini tidak memperbaiki unsur teks, silakan buka <issueLink>issue</issueLink> di GitHub kami, atau hubungi kami di <discordLink>Discord</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "Unsur bisa semat tidak dapat ditambah ke pustaka.",
+      "iframe": "Unsur IFrame tidak dapat ditambah ke pustaka.",
+      "image": "Dukungan menambah gambar ke pustaka segera hadir!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Tidak dapat menempel (tidak dapat membaca dari papan klip sistem).",
+    "asyncPasteFailedOnParse": "Tidak dapat menempel.",
+    "copyToSystemClipboardFailed": "Tidak bisa menyalin ke papan klip."
   },
   "toolBar": {
     "selection": "Pilihan",
+    "lasso": "",
     "image": "Sisipkan gambar",
     "rectangle": "Persegi",
     "diamond": "Berlian",
@@ -249,13 +307,29 @@
     "link": "Tambah/Perbarui tautan untuk bentuk yang dipilih",
     "eraser": "Penghapus",
     "frame": "Alat bingkai",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "magicframe": "Wireframe menjadi code",
+    "embeddable": "Sematan Web",
+    "laser": "Penunjuk laser",
     "hand": "Tangan (alat panning)",
     "extraTools": "Alat-alat lain",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "Mermaid menjadi Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Persegi Panjang",
+    "diamond": "Wajik",
+    "ellipse": "Elips",
+    "arrow": "Panah",
+    "line": "Garis",
+    "freedraw": "Gambar bebas",
+    "text": "Teks",
+    "image": "Gambar",
+    "group": "Kelompok",
+    "frame": "Bingkai",
+    "magicframe": "Wireframe-kan code",
+    "embeddable": "Sematan Web",
+    "selection": "Seleksi",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Opsi Kanvas",
@@ -263,33 +337,38 @@
     "shapes": "Bentuk"
   },
   "hints": {
-    "canvasPanning": "Untuk memindahkan kanvas, tekan roda mouse atau spacebar sambil menyeret, atau menggunakan alat tangan",
-    "linearElement": "Klik untuk memulai banyak poin, seret untuk satu baris",
+    "dismissSearch": "",
+    "canvasPanning": "",
+    "linearElement": "Pencet untuk membuat titik-titik, seret untuk satu garis",
+    "arrowTool": "",
     "freeDraw": "Klik dan seret, lepaskan jika Anda selesai",
     "text": "Tip: Anda juga dapat menambahkan teks dengan klik ganda di mana saja dengan alat pemilihan",
-    "embeddable": "",
-    "text_selected": "Klik ganda atau tekan ENTER untuk edit teks",
-    "text_editing": "Tekan Escape atau CtrlAtauCmd+ENTER untuk selesai mengedit",
-    "linearElementMulti": "Klik pada titik akhir atau tekan Escape atau Enter untuk menyelesaikan",
-    "lockAngle": "Anda dapat menjaga sudut dengan menahan SHIFT",
-    "resize": "Anda dapat menjaga proposi dengan menekan SHIFT sambil mengubah ukuran,\ntekan AlT untuk mengubah ukuran dari tengah",
-    "resizeImage": "Anda dapat mengubah secara bebas dengan menekan SHIFT,\nTekan ALT untuk mengubah dari tengah",
-    "rotate": "Anda dapat menjaga sudut dengan menahan SHIFT sambil memutar",
-    "lineEditor_info": "Tekan Ctrl/Cmd dan Dobel-klik atau tekan Ctrl/Cmd +Enter untuk mengedit poin",
-    "lineEditor_pointSelected": "Tekan Delete untuk menghapus titik, Ctrl/Cmd + D untuk menduplikasi, atau seret untuk memindahkan",
-    "lineEditor_nothingSelected": "Pilih titik untuk mengedit (tekan SHIFT untuk pilih banyak), atau tekan Alt dan klik untuk tambahkan titik baru",
-    "placeImage": "Klik untuk tempatkan gambar, atau klik dan jatuhkan untuk tetapkan ukuran secara manual",
+    "embeddable": "Pencet-seret untuk membuat sematan situs",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Terbitkan pustaka Anda",
-    "bindTextToElement": "Tekan enter untuk tambahkan teks",
-    "deepBoxSelect": "Tekan Ctrl atau Cmd untuk memilih yang di dalam, dan mencegah penggeseran",
-    "eraserRevert": "Tahan Alt untuk mengembalikan elemen yang ditandai untuk dihapus",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Fitur ini dapat diaktifkan melalui pengaturan flag \"dom.events.asyncClipboard.clipboardItem\" ke \"true\". Untuk mengganti flag di Firefox, pergi ke laman \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Tidak dapat menampilkan pratinjau",
     "canvasTooBig": "Kanvas mungkin terlalu besar.",
-    "canvasTooBigTip": "Tip: coba pindahkan elemen-terjauh lebih dekat bersama."
+    "canvasTooBigTip": "Kiat: coba pindahkan unsur terjauh lebih dekat lagi."
   },
   "errorSplash": {
     "headingMain": "Mengalami sebuah kesalahan. Cobalah <button>muat ulang halaman.</button>",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Kami sangat berhati-hati untuk tidak menyertakan informasi pemandangan Anda pada kesalahan. Jika pemandangan Anda tidak bersifat pribadi, mohon pertimbangkan menindak lanjut pada <button>pelacak bug.</button> Mohon sertakan informasi dibawah ini dengan menyalin dan menempelkan di Github issue.",
     "sceneContent": "Pemandangan konten:"
   },
+  "shareDialog": {
+    "or": "Atau"
+  },
   "roomDialog": {
-    "desc_intro": "Anda dapat mengundang orang ke pemandangan Anda saat ini untuk berkolaborasi dengan Anda.",
-    "desc_privacy": "Jangan khawatir, sesi menggunakan enkripsi end-to-end, sehingga apa pun yang Anda gambar akan tetap bersifat pribadi. Bahkan server kami tidak dapat melihat apa yang Anda lakukan.",
+    "desc_intro": "Ajak orang-orang ikut menggambar denganmu.",
+    "desc_privacy": "Tenang, sesi ini terenkripsi ujung-ke-ujung, sepenuhnya privat. Bahkan gambarmu tidak terlihat server kami.",
     "button_startSession": "Mulai sesi",
     "button_stopSession": "Hentikan sesi",
     "desc_inProgressIntro": "Sesi kolaborasi sedang berlangsung sekarang.",
@@ -328,12 +410,14 @@
     "click": "klik",
     "deepSelect": "Pilih dalam",
     "deepBoxSelect": "Pilih dalam kotak, dan cegah penggeseran",
+    "createFlowchart": "Buat bagan alir dari unsur generik",
+    "navigateFlowchart": "Menavigasi bagan alir",
     "curvedArrow": "Panah lengkung",
     "curvedLine": "Garis lengkung",
     "documentation": "Dokumentasi",
     "doubleClick": "klik-ganda",
     "drag": "seret",
-    "editor": "Editor",
+    "editor": "Penyunting",
     "editLineArrowPoints": "Edit titik garis/panah",
     "editText": "Edit teks / tambah label",
     "github": "Menemukan masalah? Kirimkan",
@@ -346,11 +430,13 @@
     "textNewLine": "Tambahkan garis baru (editor teks)",
     "title": "Bantuan",
     "view": "Tampilan",
-    "zoomToFit": "Perbesar agar sesuai dengan semua elemen",
+    "zoomToFit": "Memperbesar agar unsur pas semua",
     "zoomToSelection": "Perbesar ke seleksi",
-    "toggleElementLock": "Kunci/lepas seleksi",
+    "toggleElementLock": "Lepas/kuncikan seleksi",
     "movePageUpDown": "Pindah halaman keatas/kebawah",
-    "movePageLeftRight": "Pindah halaman kebawah/keatas"
+    "movePageLeftRight": "Pindah halaman kebawah/keatas",
+    "cropStart": "Pangkas gambar",
+    "cropFinish": "Sudahi pangkas gambar"
   },
   "clearCanvasDialog": {
     "title": "Hapus kanvas"
@@ -402,7 +488,7 @@
       "padding": "Lapisan"
     },
     "tooltip": {
-      "embedScene": "Data pemandangan akan disimpan dalam file PNG/SVG yang diekspor sehingga pemandangan itu dapat dipulihkan darinya.\nAkan membesarkan ukuran file yang diekspor."
+      "embedScene": "Data pemandangan akan diekspor ke bentuk PNG/SVG sehingga pemandangan dapat dipulihkan darinya.\nUkuran berkas ekspor akan membesar."
     },
     "title": {
       "exportToPng": "Ekspor ke PNG",
@@ -421,14 +507,16 @@
   },
   "stats": {
     "angle": "Sudut",
-    "element": "Elemen",
-    "elements": "Elemen",
+    "shapes": "Bentuk",
     "height": "Tinggi",
     "scene": "Pemandangan",
     "selected": "Terpilih",
     "storage": "Penyimpanan",
-    "title": "Statistik untuk nerd",
-    "total": "Total",
+    "fullTitle": "Properti Kanvas & Bentuk",
+    "title": "Properti",
+    "generalStats": "Umum",
+    "elementProperties": "Properti bentuk",
+    "total": "Jumlah",
     "version": "Versi",
     "versionCopy": "Klik untuk salin",
     "versionNotAvailable": "Versi tidak tersedia",
@@ -439,13 +527,15 @@
     "copyStyles": "Gaya tersalin.",
     "copyToClipboard": "Tersalin ke papan klip.",
     "copyToClipboardAsPng": "Tersalin {{exportSelection}} ke clipboard sebagai PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} tersalin ke papan klip sebagai SVG\n({{exportColorScheme}})",
     "fileSaved": "File tersimpan.",
     "fileSavedToFilename": "Disimpan ke {filename}",
     "canvas": "kanvas",
     "selection": "pilihan",
-    "pasteAsSingleElement": "Gunakan {{shortcut}} untuk menempelkan sebagai satu elemen,\natau tempelkan ke teks editor yang ada",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "pasteAsSingleElement": "Gunakan {{shortcut}} untuk menempel unsur tunggal,\natau tempel ke penyunting teks",
+    "unableToEmbed": "Menyemat URL ini saat ini tidak boleh. Ajukan \"Issue\" di GitHub untuk meminta URL masuk daftar putih",
+    "unrecognizedLinkFormat": "Tautan yang disematkan tidak sesuai dengan syarat format. Coba tempel untaian 'embed' (semat) yang disediakan situs sumber",
+    "elementLinkCopied": "Tautan disalin ke papan klip"
   },
   "colors": {
     "transparent": "Transparan",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Warna yang sering dipakai",
     "colors": "Warna",
     "shades": "Nuansa",
@@ -516,10 +607,58 @@
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid menjadi Excalidraw",
+    "button": "Sisipkan",
+    "description": "Saat ini hanya <flowchartLink>Flowchart</flowchartLink>, <sequenceLink>Sekuen, </sequenceLink>, dan <classLink>Kelas</classLink>Diagram yang didukung. Jenis lainnya akan dirender sebagai gambar di Excalidraw.",
+    "syntax": "Syntax Mermaid",
+    "preview": "Pratinjau"
+  },
+  "quickSearch": {
+    "placeholder": "Pencarian Cepat"
+  },
+  "fontList": {
+    "badge": {
+      "old": "lebih lama"
+    },
+    "sceneFonts": "Pada layar ini",
+    "availableFonts": "Font yang tersedia",
+    "empty": "Tidak ada font yang ditemukan"
+  },
+  "userList": {
+    "empty": "Tidak ada pengguna yang ditemukan",
+    "hint": {
+      "text": "Klik pada pengguna untuk mengikuti",
+      "followStatus": "Anda saat ini mengikuti pengguna ini",
+      "inCall": "Pengguna sedang dalam panggilan telephon",
+      "micMuted": "Mikrofon user sedang dimatikan",
+      "isSpeaking": "Pengguna sedang berbicara"
+    }
+  },
+  "commandPalette": {
+    "title": "Daftar Perintah",
+    "shortcuts": {
+      "select": "Pilih",
+      "confirm": "Konfirmasi",
+      "close": "Keluar"
+    },
+    "recents": "Baru digunakan",
+    "search": {
+      "placeholder": "Cari menu, perintah dan temukan hidden gems",
+      "noMatch": "Tidak ada perintah yang sesuai..."
+    },
+    "itemNotAvailable": "Perintah tidak tersedia...",
+    "shortcutHint": "Untuk palet perintah, gunakan {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/it-IT.json b/packages/excalidraw/locales/it-IT.json
index 6ab03f0abb..dba7ccd6a9 100644
--- a/packages/excalidraw/locales/it-IT.json
+++ b/packages/excalidraw/locales/it-IT.json
@@ -21,7 +21,9 @@
     "copyStyles": "Copia stili",
     "pasteStyles": "Incolla stili",
     "stroke": "Tratto",
+    "changeStroke": "Cambia il colore del tratto",
     "background": "Sfondo",
+    "changeBackground": "Cambia il colore dello sfondo",
     "fill": "Riempimento",
     "strokeWidth": "Spessore del tratto",
     "strokeStyle": "Stile del tratto",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "Triangolo (contorno)",
     "arrowhead_diamond": "Diamante",
     "arrowhead_diamond_outline": "Diamante (contorno)",
+    "arrowhead_crowfoot_many": "Zampe di gallina (molti)",
+    "arrowhead_crowfoot_one": "Zampa di gallina (una)",
+    "arrowhead_crowfoot_one_or_many": "Zampe di gallina (una o molte)",
+    "more_options": "Altre opzioni",
+    "arrowtypes": "Tipo di freccia",
+    "arrowtype_sharp": "Freccia affilata",
+    "arrowtype_round": "Freccia curva",
+    "arrowtype_elbowed": "Freccia a gomito",
     "fontSize": "Dimensione carattere",
     "fontFamily": "Carattere",
     "addWatermark": "Aggiungi \"Creato con Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Usato su tela",
     "canvasBackground": "Sfondo tela",
     "drawingCanvas": "Area di disegno",
+    "clearCanvas": "Pulisci area di disegno",
     "layers": "Livelli",
     "actions": "Azioni",
     "language": "Lingua",
@@ -84,12 +95,13 @@
     "group": "Crea gruppo da selezione",
     "ungroup": "Dividi gruppo da selezione",
     "collaborators": "Collaboratori",
-    "showGrid": "Visualizza griglia",
+    "toggleGrid": "Attiva/disattiva griglia",
     "addToLibrary": "Aggiungi alla libreria",
     "removeFromLibrary": "Rimuovi dalla libreria",
     "libraryLoadingMessage": "Caricamento libreria…",
     "libraries": "Sfoglia librerie",
     "loadingScene": "Caricamento della scena…",
+    "loadScene": "Carica scena da file",
     "align": "Allinea",
     "alignTop": "Allinea in alto",
     "alignBottom": "Allinea in basso",
@@ -105,7 +117,9 @@
     "share": "Condividi",
     "showStroke": "Mostra selettore colore del tratto",
     "showBackground": "Mostra selettore colore di sfondo",
-    "toggleTheme": "Cambia tema",
+    "showFonts": "Mostra selettore font",
+    "toggleTheme": "Attiva/Disattiva tema chiaro/scuro",
+    "theme": "Tema",
     "personalLib": "Libreria Personale",
     "excalidrawLib": "Libreria di Excalidraw",
     "decreaseFontSize": "Riduci dimensione dei caratteri",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Avvolgi il testo in un container",
     "link": {
       "edit": "Modifica link",
-      "editEmbed": "Modifica collegamento e incorpora",
-      "create": "Crea link",
-      "createEmbed": "Crea collegamento e incorpora",
+      "editEmbed": "Modifica link incorporabile",
+      "create": "Aggiungi link",
       "label": "Link",
       "labelEmbed": "Collega & incorpora",
-      "empty": "Nessun collegamento impostato"
+      "empty": "Nessun collegamento impostato",
+      "hint": "Digita o incolla qui il tuo link",
+      "goToElement": "Vai all'elemento di destinazione"
     },
     "lineEditor": {
       "edit": "Modifica linea",
-      "exit": "Esci dall'editor di linea"
+      "editArrow": "Modifica freccia"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Blocca",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "Rimuovi tutti gli elementi dal riquadro",
     "eyeDropper": "Scegli il colore della tela",
     "textToDiagram": "Testo a diagramma",
-    "prompt": "Prompt"
+    "prompt": "Prompt",
+    "followUs": "Seguici",
+    "discordChat": "Chat di Discord",
+    "zoomToFitViewport": "Ingrandisci per adattarsi alla vista",
+    "zoomToFitSelection": "Ingrandisci per adattare la selezione",
+    "zoomToFit": "Zoom per adattare tutti gli elementi",
+    "installPWA": "Installa Excalidraw localmente (PWA)",
+    "autoResize": "Abilita ridimensionamento automatico del testo",
+    "imageCropping": "Ritaglio immagine",
+    "unCroppedDimension": "Dimensione non ritagliata",
+    "copyElementLink": "Copia il link all'oggetto",
+    "linkToElement": "Link all'oggetto",
+    "wrapSelectionInFrame": "Avvolgi la selezione nella cornice",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Link all'oggetto",
+    "desc": "Fare clic su una forma su tela o incollare un link.",
+    "notFound": "L'oggetto collegato non è stato trovato sulla tela."
   },
   "library": {
     "noItems": "Nessun elemento ancora aggiunto...",
     "hint_emptyLibrary": "Seleziona un elemento sulla tela per aggiungerlo qui, o installa una libreria dal repository pubblico qui sotto.",
-    "hint_emptyPrivateLibrary": "Seleziona un elemento sulla tela per aggiungerlo qui."
+    "hint_emptyPrivateLibrary": "Seleziona un elemento sulla tela per aggiungerlo qui.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Trova sulla tela",
+    "noMatch": "Non è stato trovato nessun risultato...",
+    "singleResult": "risultato",
+    "multipleResults": "risultati",
+    "placeholder": "Trova testo sulla tela...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Svuota la tela",
@@ -151,6 +204,7 @@
     "exportImage": "Esporta immagine...",
     "export": "Salva in...",
     "copyToClipboard": "Copia negli appunti",
+    "copyLink": "Copia link",
     "save": "Salva sul file corrente",
     "saveAs": "Salva con nome",
     "load": "Apri",
@@ -171,14 +225,16 @@
     "fullScreen": "Schermo intero",
     "darkMode": "Tema scuro",
     "lightMode": "Tema chiaro",
+    "systemMode": "Modalità del sistema",
     "zenMode": "Modalità Zen",
     "objectsSnapMode": "Aggancia agli oggetti",
     "exitZenMode": "Uscire dalla modalità zen",
     "cancel": "Annulla",
+    "saveLibNames": "",
     "clear": "Cancella",
     "remove": "Rimuovi",
     "embed": "Attiva/disattiva incorporamento",
-    "publishLibrary": "Pubblica",
+    "publishLibrary": "",
     "submit": "Invia",
     "confirm": "Conferma",
     "embeddableInteractionButton": "Clicca per interagire"
@@ -204,7 +260,8 @@
     "resetLibrary": "Questa azione cancellerà l'intera libreria. Sei sicuro?",
     "removeItemsFromsLibrary": "Eliminare {{count}} elementi dalla libreria?",
     "invalidEncryptionKey": "La chiave di cifratura deve essere composta da 22 caratteri. La collaborazione live è disabilitata.",
-    "collabOfflineWarning": "Nessuna connessione internet disponibile.\nLe tue modifiche non verranno salvate!"
+    "collabOfflineWarning": "Nessuna connessione internet disponibile.\nLe tue modifiche non verranno salvate!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipo di file non supportato.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Il file è troppo grande. La dimensione massima consentita è {{maxSize}}.",
     "svgImageInsertError": "Impossibile inserire l'immagine SVG. Il markup SVG non sembra corretto.",
     "failedToFetchImage": "Impossibile recuperare l'immagine.",
-    "invalidSVGString": "SVG non valido.",
     "cannotResolveCollabServer": "Impossibile connettersi al server di collab. Ricarica la pagina e riprova.",
     "importLibraryError": "Impossibile caricare la libreria",
+    "saveLibraryError": "Impossibile salvare la libreria nell'archiviazione. Si prega di salvare la libreria in un file locale per assicurarsi di non perdere le modifiche.",
     "collabSaveFailed": "Impossibile salvare nel database di backend. Se i problemi persistono, dovresti salvare il tuo file localmente per assicurarti di non perdere il tuo lavoro.",
     "collabSaveFailed_sizeExceeded": "Impossibile salvare nel database di backend, la tela sembra essere troppo grande. Dovresti salvare il file localmente per assicurarti di non perdere il tuo lavoro.",
     "imageToolNotSupported": "Le immagini sono disabilitate.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Selezione",
+    "lasso": "",
     "image": "Inserisci immagine",
     "rectangle": "Rettangolo",
     "diamond": "Rombo",
@@ -246,16 +304,32 @@
     "library": "Libreria",
     "lock": "Mantieni lo strumento selezionato attivo dopo aver disegnato",
     "penMode": "Modalità penna - previene il tocco",
-    "link": "Aggiungi/ aggiorna il link per una forma selezionata",
+    "link": "Aggiungi / aggiorna collegamento per una forma selezionata",
     "eraser": "Gomma",
     "frame": "Strumento riquadro",
-    "magicframe": "",
+    "magicframe": "Dal wireframe al codice",
     "embeddable": "Incorporamento Web",
     "laser": "Puntatore laser",
     "hand": "Mano (strumento di panoramica)",
     "extraTools": "Altri strumenti",
-    "mermaidToExcalidraw": "",
-    "magicSettings": "Impostazioni di IA"
+    "mermaidToExcalidraw": "Da Mermaid a Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rettangolo",
+    "diamond": "Diamante",
+    "ellipse": "Ellisse",
+    "arrow": "Freccia",
+    "line": "Linea",
+    "freedraw": "Disegno libero",
+    "text": "Testo",
+    "image": "Immagine",
+    "group": "Gruppo",
+    "frame": "Cornice",
+    "magicframe": "Dal wireframe al codice",
+    "embeddable": "Incorporamento Web",
+    "selection": "Selezione",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Azioni sulla Tela",
@@ -263,28 +337,33 @@
     "shapes": "Forme"
   },
   "hints": {
-    "canvasPanning": "Per spostare la tela, tieni premuta la rotellina del mouse o la barra spaziatrice mentre trascini oppure usa lo strumento mano",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Clicca per iniziare una linea in più punti, trascina per singola linea",
+    "arrowTool": "",
     "freeDraw": "Clicca e trascina, rilascia quando avrai finito",
     "text": "Suggerimento: puoi anche aggiungere del testo facendo doppio clic ovunque con lo strumento di selezione",
     "embeddable": "Fare click e trascina per creare un incorporamento web",
-    "text_selected": "Fai doppio click o premi INVIO per modificare il testo",
-    "text_editing": "Premi ESC o CtrlOCmd+INVIO per completare le modifiche",
-    "linearElementMulti": "Clicca sull'ultimo punto o premi Esc o Invio per finire",
-    "lockAngle": "Puoi limitare l'angolo tenendo premuto SHIFT",
-    "resize": "Per vincolare le proporzioni, tieni premuto MAIUSC durante il ridimensionamento;\nper ridimensionare dal centro, tieni premuto ALT",
-    "resizeImage": "Puoi ridimensionare liberamente tenendo premuto SHIFT,\ntieni premuto ALT per ridimensionare dal centro",
-    "rotate": "Puoi mantenere gli angoli tenendo premuto SHIFT durante la rotazione",
-    "lineEditor_info": "Tieni premuto Ctrl o Cmd e doppio clic oppure premi Ctrl o Cmd + Invio per modificare i punti",
-    "lineEditor_pointSelected": "Premi Elimina per rimuovere il punto(i),\nCtrlOCmd+D per duplicare o trascinare per spostare",
-    "lineEditor_nothingSelected": "Seleziona un punto da modificare (tieni premuto MAIUSC per selezionare più punti),\noppure tieni premuto Alt e fai clic per aggiungere nuovi punti",
-    "placeImage": "Fai click per posizionare l'immagine, o click e trascina per impostarne la dimensione manualmente",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Pubblica la tua libreria",
-    "bindTextToElement": "Premi invio per aggiungere il testo",
-    "deepBoxSelect": "Tieni premuto CtrlOCmd per selezionare in profondità e per impedire il trascinamento",
-    "eraserRevert": "Tieni premuto Alt per ripristinare gli elementi contrassegnati per l'eliminazione",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Questa funzione può essere abilitata impostando il flag \"dom.events.asyncClipboard.clipboardItem\" su \"true\". Per modificare i flag del browser in Firefox, visitare la pagina \"about:config\".",
-    "disableSnapping": "Tieni premuto Ctrl o Cmd per disabilitare lo snap"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Impossibile visualizzare l'anteprima",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Siamo stati molto cauti nel non includere informazioni della scena nell'errore. Se la tua scena non è privata, ti preghiamo di considerare la sua inclusione nel nostro <button>bug tracker.</button> Per favore includi le informazioni riportate qui sotto copiandole e incollandole nella issue di GitHub.",
     "sceneContent": "Contenuto della scena:"
   },
+  "shareDialog": {
+    "or": "O"
+  },
   "roomDialog": {
-    "desc_intro": "Puoi invitare persone nella tua scena attuale per collaborare con te.",
-    "desc_privacy": "Non preoccuparti, la sessione utilizza la crittografia end-to-end, quindi qualsiasi cosa disegni rimarrà privata. Nemmeno il nostro server sarà in grado di vedere cosa hai creato.",
+    "desc_intro": "Invita altri a collaborare al tuo disegno.",
+    "desc_privacy": "Non preoccuparti, la sessione utilizza la crittografia end-to-end ed è completamente privata. Nemmeno il nostro server è in grado di vedere ciò che disegni.",
     "button_startSession": "Avvia sessione",
     "button_stopSession": "Termina sessione",
     "desc_inProgressIntro": "La sessione di collaborazione è attualmente in corso.",
@@ -328,6 +410,8 @@
     "click": "click",
     "deepSelect": "Selezione profonda",
     "deepBoxSelect": "Seleziona in profondità all'interno della casella e previene il trascinamento",
+    "createFlowchart": "Crea un diagramma di flusso da un elemento generico",
+    "navigateFlowchart": "Naviga un diagramma di flusso",
     "curvedArrow": "Freccia curva",
     "curvedLine": "Linea curva",
     "documentation": "Documentazione",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zoom alla selezione",
     "toggleElementLock": "Blocca/sblocca selezione",
     "movePageUpDown": "Sposta la pagina su/giù",
-    "movePageLeftRight": "Sposta la pagina a sinistra/destra"
+    "movePageLeftRight": "Sposta la pagina a sinistra/destra",
+    "cropStart": "Ritaglia immagine",
+    "cropFinish": "Termina ritaglio immagine"
   },
   "clearCanvasDialog": {
     "title": "Svuota la tela"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Angolo",
-    "element": "Elemento",
-    "elements": "Elementi",
+    "shapes": "Forme",
     "height": "Altezza",
     "scene": "Scena",
     "selected": "Selezionato",
     "storage": "Memoria",
-    "title": "Statistiche per nerd",
+    "fullTitle": "Proprietà della tela & forma",
+    "title": "Proprietà",
+    "generalStats": "Generale",
+    "elementProperties": "Proprietà delle forme",
     "total": "Totale",
     "version": "Versione",
     "versionCopy": "Clicca per copiare",
@@ -439,13 +527,15 @@
     "copyStyles": "Stili copiati.",
     "copyToClipboard": "Copiato negli appunti.",
     "copyToClipboardAsPng": "{{exportSelection}} copiato negli appunti come PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Copiato {{exportSelection}} negli appunti come SVG\n({{exportColorScheme}})",
     "fileSaved": "File salvato.",
     "fileSavedToFilename": "Salvato in {filename}",
     "canvas": "tela",
     "selection": "selezione",
     "pasteAsSingleElement": "Usa {{shortcut}} per incollare come un singolo elemento,\no incollare in un editor di testo esistente",
     "unableToEmbed": "Incorporare questo url non è permesso. Crea una issue su GitHub per richiedere che l'url sia autorizzato",
-    "unrecognizedLinkFormat": "Il link che hai incorporato non corrisponde al formato previsto. Prova a incollare la stringa 'embed' fornita dal sito di origine"
+    "unrecognizedLinkFormat": "Il link che hai incorporato non corrisponde al formato previsto. Prova a incollare la stringa 'embed' fornita dal sito di origine",
+    "elementLinkCopied": "Link copiato negli appunti"
   },
   "colors": {
     "transparent": "Trasparente",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Colori personalizzati più utilizzati",
     "colors": "Colori",
     "shades": "Sfumature",
@@ -516,10 +607,58 @@
     }
   },
   "mermaid": {
-    "title": "",
+    "title": "Da Mermaid a Excalidraw",
     "button": "Inserisci",
-    "description": "",
-    "syntax": "",
+    "description": "Attualmente sono supportati solo diagrammi di <flowchartLink>flusso</flowchartLink>,<sequenceLink> sequenza, </sequenceLink> e <classLink>classe </classLink>. Gli altri tipi saranno rappresentati come immagini in Excalidraw.",
+    "syntax": "Sintassi Mermaid",
     "preview": "Anteprima"
+  },
+  "quickSearch": {
+    "placeholder": "Ricerca rapida"
+  },
+  "fontList": {
+    "badge": {
+      "old": "vecchio"
+    },
+    "sceneFonts": "In questa scena",
+    "availableFonts": "Font disponibili",
+    "empty": "Nessun font trovato"
+  },
+  "userList": {
+    "empty": "Nessun utente trovato",
+    "hint": {
+      "text": "Clicca sull'utente per seguirlo",
+      "followStatus": "Stai attualmente seguendo questo utente",
+      "inCall": "Utente è in una chiamata vocale",
+      "micMuted": "Il microfono dell'utente è disattivato",
+      "isSpeaking": "L'utente sta parlando"
+    }
+  },
+  "commandPalette": {
+    "title": "Comando della tavolozza",
+    "shortcuts": {
+      "select": "Selezione",
+      "confirm": "Conferma",
+      "close": "Chiudi"
+    },
+    "recents": "Usate di recente",
+    "search": {
+      "placeholder": "Cerca menu, comandi e scopri gemme nascoste",
+      "noMatch": "Nessun comando corrisponde..."
+    },
+    "itemNotAvailable": "Il comando non è disponibile...",
+    "shortcutHint": "Per i comandi della tavolozza, usa {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/ja-JP.json b/packages/excalidraw/locales/ja-JP.json
index 611a8c6a83..8af0d56380 100644
--- a/packages/excalidraw/locales/ja-JP.json
+++ b/packages/excalidraw/locales/ja-JP.json
@@ -11,8 +11,8 @@
     "copyAsPng": "PNGとしてクリップボードへコピー",
     "copyAsSvg": "SVGとしてクリップボードへコピー",
     "copyText": "テキストとしてクリップボードにコピー",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "ソースをクリップボードにコピー",
+    "convertToCode": "コードに変換",
     "bringForward": "前面に移動",
     "sendToBack": "最背面に移動",
     "bringToFront": "最前面に移動",
@@ -21,7 +21,9 @@
     "copyStyles": "スタイルのコピー",
     "pasteStyles": "スタイルの貼り付け",
     "stroke": "線",
+    "changeStroke": "線の色を変更",
     "background": "背景",
+    "changeBackground": "背景色変更",
     "fill": "塗りつぶし",
     "strokeWidth": "線の太さ",
     "strokeStyle": "線の種類",
@@ -38,12 +40,20 @@
     "arrowhead_none": "なし",
     "arrowhead_arrow": "矢印",
     "arrowhead_bar": "バー",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "丸",
+    "arrowhead_circle_outline": "丸 (中抜き)",
     "arrowhead_triangle": "三角",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "三角 (中抜き)",
+    "arrowhead_diamond": "ひし形",
+    "arrowhead_diamond_outline": "ひし形 (中抜き)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "詳細設定",
+    "arrowtypes": "矢印の種類",
+    "arrowtype_sharp": "鋭い矢印",
+    "arrowtype_round": "曲線矢印",
+    "arrowtype_elbowed": "ひじ矢印",
     "fontSize": "フォントの大きさ",
     "fontFamily": "フォントの種類",
     "addWatermark": "\"Made with Excalidraw\"と表示",
@@ -58,20 +68,21 @@
     "hachure": "斜線",
     "zigzag": "ジグザグ",
     "crossHatch": "網掛け",
-    "thin": "細",
+    "thin": "細字",
     "bold": "太字",
     "left": "左寄せ",
     "center": "中央寄せ",
     "right": "右寄せ",
     "extraBold": "極太",
-    "architect": "正確",
-    "artist": "アート",
-    "cartoonist": "漫画風",
+    "architect": "建築家",
+    "artist": "アーティスト",
+    "cartoonist": "漫画家",
     "fileTitle": "ファイル名",
-    "colorPicker": "色選択",
+    "colorPicker": "カラーピッカー",
     "canvasColors": "キャンバス上で使用",
     "canvasBackground": "キャンバスの背景",
     "drawingCanvas": "キャンバスの描画",
+    "clearCanvas": "キャンバスを片付ける",
     "layers": "レイヤー",
     "actions": "操作",
     "language": "言語",
@@ -84,19 +95,20 @@
     "group": "グループ化",
     "ungroup": "グループ化を解除",
     "collaborators": "共同編集者",
-    "showGrid": "グリッドを表示",
+    "toggleGrid": "グリッドを切り替え",
     "addToLibrary": "ライブラリに追加",
     "removeFromLibrary": "ライブラリから削除",
     "libraryLoadingMessage": "ライブラリを読み込み中…",
     "libraries": "ライブラリを参照する",
     "loadingScene": "シーンを読み込み中…",
+    "loadScene": "ファイルからシーン",
     "align": "配置",
     "alignTop": "上揃え",
     "alignBottom": "下揃え",
     "alignLeft": "左揃え",
     "alignRight": "右揃え",
-    "centerVertically": "縦方向に中央揃え",
-    "centerHorizontally": "横方向に中央揃え",
+    "centerVertically": "垂直方向に中央揃え",
+    "centerHorizontally": "水平方向に中央揃え",
     "distributeHorizontally": "水平方向に分散配置",
     "distributeVertically": "垂直方向に分散配置",
     "flipHorizontal": "水平方向に反転",
@@ -105,7 +117,9 @@
     "share": "共有",
     "showStroke": "ストロークカラーピッカーを表示",
     "showBackground": "背景色ピッカーを表示",
-    "toggleTheme": "テーマの切り替え",
+    "showFonts": "フォント選択を表示",
+    "toggleTheme": "ライト/ダークテーマに変更",
+    "theme": "テーマ",
     "personalLib": "個人ライブラリ",
     "excalidrawLib": "Excalidrawライブラリ",
     "decreaseFontSize": "フォントサイズを縮小",
@@ -115,16 +129,21 @@
     "createContainerFromText": "コンテナ内でテキストを折り返す",
     "link": {
       "edit": "リンクを編集",
-      "editEmbed": "リンクの編集と埋め込み",
-      "create": "リンクを作成",
-      "createEmbed": "リンクの作成と埋め込み",
+      "editEmbed": "埋め込みリンク編集",
+      "create": "リンクを追加",
       "label": "リンク",
       "labelEmbed": "リンクと埋め込み",
-      "empty": "リンクが設定されていません"
+      "empty": "リンクが設定されていません",
+      "hint": "リンクを入力・貼り付け",
+      "goToElement": "対象要素に移動"
     },
     "lineEditor": {
       "edit": "行を編集",
-      "exit": "行エディタを終了"
+      "editArrow": "矢印を編集"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "ロック",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "フレーム内のすべての要素を選択",
     "removeAllElementsFromFrame": "フレーム内のすべての要素を削除",
     "eyeDropper": "キャンバスから色を選択",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "テキストからダイアグラムを生成",
+    "prompt": "プロンプト",
+    "followUs": "フォローする",
+    "discordChat": "Discord チャット",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "まだアイテムが追加されていません…",
     "hint_emptyLibrary": "キャンバス上のアイテムを選択してここに追加するか、以下の公開リポジトリからライブラリをインストールしてください。",
-    "hint_emptyPrivateLibrary": "キャンバス上のアイテムを選択すると、ここに追加されます。"
+    "hint_emptyPrivateLibrary": "キャンバス上のアイテムを選択すると、ここに追加されます。",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "キャンバスで検索",
+    "noMatch": "一致なし…",
+    "singleResult": "結果",
+    "multipleResults": "結果数",
+    "placeholder": "キャンバス内のテキストを検索…",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "キャンバスのリセット",
@@ -151,10 +204,11 @@
     "exportImage": "画像のエクスポート...",
     "export": "名前を付けて保存...",
     "copyToClipboard": "クリップボードにコピー",
+    "copyLink": "リンクをコピー",
     "save": "現在のファイルに保存",
     "saveAs": "名前を付けて保存",
     "load": "開く",
-    "getShareableLink": "共有URLの取得",
+    "getShareableLink": "共有可能なリンクを取得する",
     "close": "閉じる",
     "selectLanguage": "言語の選択",
     "scrollBackToContent": "コンテンツまでスクロールで戻る",
@@ -171,17 +225,19 @@
     "fullScreen": "フルスクリーン",
     "darkMode": "ダークモード",
     "lightMode": "ライトモード",
-    "zenMode": "Zenモード",
-    "objectsSnapMode": "",
+    "systemMode": "システムモード",
+    "zenMode": "集中モード",
+    "objectsSnapMode": "オブジェクトにスナップ",
     "exitZenMode": "集中モードをやめる",
     "cancel": "キャンセル",
+    "saveLibNames": "",
     "clear": "消去",
     "remove": "削除",
     "embed": "埋め込みの切り替え",
-    "publishLibrary": "公開",
+    "publishLibrary": "",
     "submit": "送信",
     "confirm": "確認",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "クリックして操作"
   },
   "alerts": {
     "clearReset": "この操作によってキャンバス全体が消えます。よろしいですか？",
@@ -203,21 +259,22 @@
     "invalidSceneUrl": "指定された URL からシーンをインポートできませんでした。不正な形式であるか、有効な Excalidraw JSON データが含まれていません。",
     "resetLibrary": "ライブラリを消去します。本当によろしいですか？",
     "removeItemsFromsLibrary": "{{count}} 個のアイテムをライブラリから削除しますか？",
-    "invalidEncryptionKey": "暗号化キーは22文字でなければなりません。ライブコラボレーションは無効化されています。",
-    "collabOfflineWarning": "インターネットに接続されていません。\n変更は保存されません！"
+    "invalidEncryptionKey": "暗号化キーは22文字でなければなりません。共同編集は無効化されています。",
+    "collabOfflineWarning": "インターネットに接続されていません。\n変更は保存されません！",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "サポートされていないファイル形式です。",
     "imageInsertError": "画像を挿入できませんでした。後でもう一度お試しください...",
     "fileTooBig": "ファイルが大きすぎます。許可される最大サイズは {{maxSize}} です。",
     "svgImageInsertError": "SVGイメージを挿入できませんでした。SVGマークアップは無効に見えます。",
-    "failedToFetchImage": "",
-    "invalidSVGString": "無効なSVGです。",
+    "failedToFetchImage": "画像の読み込みに失敗しました。",
     "cannotResolveCollabServer": "コラボレーションサーバに接続できませんでした。ページを再読み込みして、もう一度お試しください。",
     "importLibraryError": "ライブラリを読み込めませんでした。",
+    "saveLibraryError": "",
     "collabSaveFailed": "バックエンドデータベースに保存できませんでした。問題が解決しない場合は、作業を失わないようにローカルにファイルを保存してください。",
     "collabSaveFailed_sizeExceeded": "キャンバスが大きすぎるため、バックエンドデータベースに保存できませんでした。問題が解決しない場合は、作業を失わないようにローカルにファイルを保存してください。",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "画像ツールは使用不可です。",
     "brave_measure_text_error": {
       "line1": "<bold>Aggressly Block Fingerprinting</bold> の設定が有効なBraveブラウザを使用しているようです。",
       "line2": "これにより、図面の <bold>テキスト要素</bold> が壊れる可能性があります。",
@@ -225,16 +282,17 @@
       "line4": "この設定を無効にすると、テキスト要素の表示が修正されません。 GitHub で <issueLink>Issue</issueLink> を開くか、 <discordLink>Discord</discordLink> にご記入ください"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "埋め込み要素はライブラリに追加できません。",
+      "iframe": "IFrame 要素はライブラリに追加できません。",
+      "image": "ライブラリに画像を追加する機能はもうすぐ実装されます！"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "貼り付けできませんでした (システムのクリップボードを読み取れませんでした)。",
+    "asyncPasteFailedOnParse": "貼り付けできませんでした。",
+    "copyToSystemClipboardFailed": "クリップボードにコピーできませんでした。"
   },
   "toolBar": {
     "selection": "選択",
+    "lasso": "",
     "image": "画像を挿入",
     "rectangle": "矩形",
     "diamond": "ひし形",
@@ -246,16 +304,32 @@
     "library": "ライブラリ",
     "lock": "描画後も使用中のツールを選択したままにする",
     "penMode": "ペンモード - タッチ防止",
-    "link": "選択した図形のリンクを追加/更新",
+    "link": "",
     "eraser": "消しゴム",
     "frame": "フレームツール",
-    "magicframe": "",
+    "magicframe": "ワイヤーフレームからコードを生成",
     "embeddable": "Web埋め込み",
-    "laser": "",
+    "laser": "レーザーポインター",
     "hand": "手 (パンニングツール)",
     "extraTools": "その他のツール",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "Mermaid を Excalidraw に変換",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "楕円",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "文字",
+    "image": "画像",
+    "group": "グループ",
+    "frame": "フレーム",
+    "magicframe": "ワイヤーフレームからコードを生成",
+    "embeddable": "",
+    "selection": "",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "キャンバス操作",
@@ -263,28 +337,33 @@
     "shapes": "図形"
   },
   "hints": {
-    "canvasPanning": "キャンバスを移動するには、マウスホイールまたはスペースバーを押しながらドラッグするか、手ツールを使用します",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "クリックすると複数の頂点からなる曲線を開始、ドラッグすると直線",
+    "arrowTool": "",
     "freeDraw": "クリックしてドラッグします。離すと終了します",
     "text": "ヒント: 選択ツールを使用して任意の場所をダブルクリックしてテキストを追加することもできます",
-    "embeddable": "",
-    "text_selected": "テキストを編集するには、ダブルクリックまたはEnterキーを押します",
-    "text_editing": "Esc キーまたは CtrlOrCmd+ENTER キーを押して編集を終了します",
-    "linearElementMulti": "最後のポイントをクリックするか、エスケープまたはEnterを押して終了します",
-    "lockAngle": "SHIFTを押したままにすると、角度を制限することができます",
-    "resize": "サイズを変更中にSHIFTを押すと縦横比を固定できます。Altを押すと中央からサイズを変更できます",
-    "resizeImage": "SHIFTを長押しすると自由にサイズを変更できます。\n中央からサイズを変更するにはALTを長押しします",
-    "rotate": "回転中にSHIFT キーを押すと角度を制限することができます",
-    "lineEditor_info": "CtrlOrCmd を押したままダブルクリックするか、CtrlOrCmd + Enter を押して点を編集します",
-    "lineEditor_pointSelected": "Deleteキーを押すと点を削除、CtrlOrCmd+Dで複製、マウスドラッグで移動",
-    "lineEditor_nothingSelected": "編集する点を選択（SHIFTを押したままで複数選択）、\nAltキーを押しながらクリックすると新しい点を追加",
-    "placeImage": "クリックして画像を配置するか、クリックしてドラッグしてサイズを手動で設定します",
+    "embeddable": "クリックしてドラッグし、ウェブサイトを埋め込む",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "自分のライブラリを公開",
-    "bindTextToElement": "Enterを押してテキストを追加",
-    "deepBoxSelect": "CtrlOrCmd を押し続けることでドラッグを抑止し、深い選択を行います",
-    "eraserRevert": "Alt を押し続けることで削除マークされた要素を元に戻す",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "この機能は、\"dom.events.asyncClipboard.clipboardItem\" フラグを \"true\" に設定することで有効になる可能性があります。Firefox でブラウザーの設定を変更するには、\"about:config\" ページを参照してください。",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "プレビューを表示できません",
@@ -299,9 +378,12 @@
     "openIssueMessage": "エラーに関するシーン情報を含めないように非常に慎重に設定しました。もしあなたのシーンがプライベートでない場合は、私たちのフォローアップを検討してください。 <button>バグ報告</button> GitHub のIssueに以下の情報をコピーして貼り付けてください。",
     "sceneContent": "シーンの内容:"
   },
+  "shareDialog": {
+    "or": "または"
+  },
   "roomDialog": {
-    "desc_intro": "他の人を編集中のあなたの画面に招待して共同編集することができます。",
-    "desc_privacy": "このセッションはエンドツーエンド暗号化されており、描画内容は保護されています。運営サーバーからも内容は見えません。",
+    "desc_intro": "図面にコラボレーションするよう人々を招待します。",
+    "desc_privacy": "心配しないでください、セッションはエンドツーエンドで暗号化されており、完全にプライベートです。私たちのサーバーでさえも、あなたが描いたものを見ることができません。",
     "button_startSession": "セッションを開始する",
     "button_stopSession": "セッションを終了する",
     "desc_inProgressIntro": "共同編集セッションが有効になっています。",
@@ -328,13 +410,15 @@
     "click": "クリック",
     "deepSelect": "深い選択",
     "deepBoxSelect": "ボックス内の深い選択、およびドラッグの抑止",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "カーブした矢印",
     "curvedLine": "曲線",
     "documentation": "ドキュメント",
     "doubleClick": "ダブルクリック",
     "drag": "ドラッグ",
     "editor": "エディタ",
-    "editLineArrowPoints": "",
+    "editLineArrowPoints": "線/矢印の点を編集",
     "editText": "テキストの編集 / ラベルの追加",
     "github": "不具合報告はこちら",
     "howto": "ヘルプ・マニュアル",
@@ -350,7 +434,9 @@
     "zoomToSelection": "選択要素にズーム",
     "toggleElementLock": "選択したアイテムをロック/ロック解除",
     "movePageUpDown": "ページを上下に移動",
-    "movePageLeftRight": "ページを左右に移動"
+    "movePageLeftRight": "ページを左右に移動",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "キャンバスを消去"
@@ -395,14 +481,14 @@
     "header": "画像をエクスポート",
     "label": {
       "withBackground": "背景",
-      "onlySelected": "",
+      "onlySelected": "選択した図形のみ",
       "darkMode": "ダークモード",
-      "embedScene": "",
+      "embedScene": "シーンを埋め込む",
       "scale": "スケール",
       "padding": "余白"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "シーンデータをエクスポートする PNG/SVG ファイルに保存し、シーンを復元できるようにします。\nファイルサイズは増加します。"
     },
     "title": {
       "exportToPng": "PNG にエクスポート",
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "角度",
-    "element": "要素",
-    "elements": "要素",
+    "shapes": "",
     "height": "高さ",
     "scene": "シーン",
     "selected": "選択済み",
     "storage": "ストレージ",
-    "title": "詳細統計情報",
+    "fullTitle": "",
+    "title": "プロパティ",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "合計",
     "version": "バージョン",
     "versionCopy": "クリックしてコピー",
@@ -439,13 +527,15 @@
     "copyStyles": "スタイルをコピーしました。",
     "copyToClipboard": "クリップボードにコピー",
     "copyToClipboardAsPng": "{{exportSelection}} を PNG 形式でクリップボードにコピーしました\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "ファイルを保存しました",
     "fileSavedToFilename": "{filename} に保存しました",
     "canvas": "キャンバス",
     "selection": "選択",
     "pasteAsSingleElement": "{{shortcut}} を使用して単一の要素として貼り付けるか、\n既存のテキストエディタに貼り付け",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "この URL の埋め込みは現在許可されていません。URL のホワイトリストへの追加をリクエストするには、GitHub で Issue を上げてください。",
+    "unrecognizedLinkFormat": "埋め込もうとしたリンクは期待するフォーマットと一致しません。埋め込み元のサイトで提供される「embed」の文字列を貼り付けてください。",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "透明",
@@ -454,11 +544,11 @@
     "red": "赤",
     "pink": "ピンク",
     "grape": "グレープ",
-    "violet": "バイオレット",
+    "violet": "紫",
     "gray": "灰色",
     "blue": "青",
     "cyan": "シアン",
-    "teal": "ティール",
+    "teal": "青緑",
     "green": "緑",
     "yellow": "黄",
     "orange": "オレンジ",
@@ -478,23 +568,24 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "最も使用されているカスタム色",
     "colors": "色",
     "shades": "影",
-    "hexCode": "Hexコード",
-    "noShades": ""
+    "hexCode": "16進コード",
+    "noShades": "この色で利用できる影はありません"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
         "title": "画像としてエクスポート",
         "button": "画像としてエクスポート",
-        "description": ""
+        "description": "シーンデータを後でインポートできる画像としてエクスポートします。"
       },
       "saveToDisk": {
         "title": "ディスクに保存",
         "button": "ディスクに保存",
-        "description": ""
+        "description": "シーンデータを後でインポートできるファイルにエクスポートします。"
       },
       "excalidrawPlus": {
         "title": "Excalidraw+",
@@ -506,20 +597,68 @@
       "loadFromFile": {
         "title": "ファイルからロード",
         "button": "ファイルからロード",
-        "description": ""
+        "description": "ファイルからのロードは、<bold>現在の描画内容を置き換えます</bold>。<br></br>その前に、以下の選択肢のいずれかにより描画内容を保存できます。"
       },
       "shareableLink": {
         "title": "リンクからロード",
-        "button": "",
-        "description": ""
+        "button": "描画内容を置き換える",
+        "description": "外部図面のロードは、<bold>現在の描画内容を置き換えます</bold>。<br></br>その前に、以下の選択肢のいずれかにより描画内容を保存できます。"
       }
     }
   },
   "mermaid": {
+    "title": "Mermaid を Excalidraw に変換",
+    "button": "挿入",
+    "description": "現在、<flowchartLink>Flowchart</flowchartLink>、<sequenceLink>Sequence</sequenceLink>、<classLink>Class</classLink> のダイアグラムのみに対応しています。その他の種類は、Excalidraw では画像として描画されます。",
+    "syntax": "Mermaid 構文",
+    "preview": "プレビュー"
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "このシーン内",
+    "availableFonts": "利用可能フォント",
+    "empty": "フォントなし"
+  },
+  "userList": {
+    "empty": "ユーザーなし",
+    "hint": {
+      "text": "ユーザーをクリックしてフォロー",
+      "followStatus": "現在このユーザーをフォローしています",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
     "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "shortcuts": {
+      "select": "選択",
+      "confirm": "確認",
+      "close": "閉じる"
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": "コマンドパレットには{{shortcut}}を使用"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/kaa.json b/packages/excalidraw/locales/kaa.json
index cdca8cbe69..f80f628fa2 100644
--- a/packages/excalidraw/locales/kaa.json
+++ b/packages/excalidraw/locales/kaa.json
@@ -9,8 +9,8 @@
     "cut": "Qıyıw",
     "copy": "Kóshirip alıw",
     "copyAsPng": "Almasıw buferine PNG retinde kóshirip alıw",
-    "copyAsSvg": "Almasıw buferine SVG retinde kóshirip alıw",
-    "copyText": "Almasıw buferine tekst retinde kóshirip alıw",
+    "copyAsSvg": "",
+    "copyText": "",
     "copySource": "",
     "convertToCode": "",
     "bringForward": "",
@@ -21,7 +21,9 @@
     "copyStyles": "",
     "pasteStyles": "",
     "stroke": "Jiyek",
+    "changeStroke": "",
     "background": "Fon",
+    "changeBackground": "",
     "fill": "",
     "strokeWidth": "",
     "strokeStyle": "",
@@ -35,7 +37,7 @@
     "sharp": "",
     "round": "",
     "arrowheads": "",
-    "arrowhead_none": "Joq",
+    "arrowhead_none": "",
     "arrowhead_arrow": "Jebe",
     "arrowhead_bar": "",
     "arrowhead_circle": "",
@@ -44,19 +46,27 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Shrift ólshemi",
-    "fontFamily": "Shrift toplamı",
+    "fontFamily": "",
     "addWatermark": "",
     "handDrawn": "",
     "normal": "",
     "code": "Kod",
     "small": "",
-    "medium": "Ortasha",
+    "medium": "",
     "large": "Úlken",
     "veryLarge": "Júdá úlken",
     "solid": "",
     "hachure": "",
-    "zigzag": "Zigzag",
+    "zigzag": "",
     "crossHatch": "",
     "thin": "Jińishke",
     "bold": "Qalıń",
@@ -65,14 +75,15 @@
     "right": "",
     "extraBold": "",
     "architect": "",
-    "artist": "Súwretshi",
+    "artist": "",
     "cartoonist": "",
     "fileTitle": "Fayl ataması",
-    "colorPicker": "Reńdi tańlaw",
+    "colorPicker": "",
     "canvasColors": "",
     "canvasBackground": "",
     "drawingCanvas": "",
-    "layers": "Qatlamlar",
+    "clearCanvas": "",
+    "layers": "",
     "actions": "Háreketler",
     "language": "Til",
     "liveCollaboration": "",
@@ -84,12 +95,13 @@
     "group": "",
     "ungroup": "",
     "collaborators": "Qatnasıwshılar",
-    "showGrid": "",
+    "toggleGrid": "",
     "addToLibrary": "Kitapxanaǵa qosıw",
     "removeFromLibrary": "Kitapxanadan alıp taslaw",
     "libraryLoadingMessage": "Kitapxana júklenbekte…",
     "libraries": "Kitapxanalardı kóriw",
     "loadingScene": "Saxna júklenbekte…",
+    "loadScene": "",
     "align": "",
     "alignTop": "",
     "alignBottom": "",
@@ -105,7 +117,9 @@
     "share": "Bólisiw",
     "showStroke": "",
     "showBackground": "",
-    "toggleTheme": "Temanı ózgertiw",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "Jeke kitapxana",
     "excalidrawLib": "Excalidraw kitapxanası",
     "decreaseFontSize": "Shrift ólshemin kishireytiw",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Siltemeni ózgertiw",
       "editEmbed": "",
-      "create": "Siltemeni jaratıw",
-      "createEmbed": "",
+      "create": "",
       "label": "Silteme",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Qatardı ózgertiw",
-      "exit": "Qatardı ózgertiw redaktorınan shıǵıw"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Qulıplaw",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "",
@@ -151,6 +204,7 @@
     "exportImage": "Súwretti eksportlaw...",
     "export": "Retinde saqlaw...",
     "copyToClipboard": "Almasıw buferine kóshirip alındı",
+    "copyLink": "",
     "save": "Ámeldegi faylǵa saqlaw",
     "saveAs": "Retinde saqlaw",
     "load": "Ashıw",
@@ -171,14 +225,16 @@
     "fullScreen": "Tolıq ekran",
     "darkMode": "Qarańǵı tema",
     "lightMode": "Jaqtı tema",
+    "systemMode": "",
     "zenMode": "",
     "objectsSnapMode": "",
     "exitZenMode": "",
     "cancel": "Biykarlaw",
+    "saveLibNames": "",
     "clear": "Tazalaw",
     "remove": "Óshiriw",
     "embed": "",
-    "publishLibrary": "Jariyalaw",
+    "publishLibrary": "",
     "submit": "Jiberiw",
     "confirm": "Tastıyıqlaw",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "",
     "removeItemsFromsLibrary": "",
     "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "",
@@ -212,9 +269,9 @@
     "fileTooBig": "",
     "svgImageInsertError": "",
     "failedToFetchImage": "",
-    "invalidSVGString": "Jaramsız SVG.",
     "cannotResolveCollabServer": "",
     "importLibraryError": "Kitapxananı júklew ámelge aspadı",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "",
+    "lasso": "",
     "image": "Súwret qoyıw",
     "rectangle": "Tórt múyeshlik",
     "diamond": "",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "",
@@ -263,8 +337,10 @@
     "shapes": "Figuralar"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "",
+    "arrowTool": "",
     "freeDraw": "",
     "text": "",
     "embeddable": "",
@@ -276,18 +352,21 @@
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
-    "bindTextToElement": "Tekst qosıw ushın Enter túymesin basıń",
+    "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
-    "cannotShowPreview": "Aldınnan kóriwdi kórsetiw múmkin emes",
+    "cannotShowPreview": "",
     "canvasTooBig": "",
     "canvasTooBigTip": ""
   },
@@ -299,6 +378,9 @@
     "openIssueMessage": "",
     "sceneContent": ""
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
     "desc_intro": "",
     "desc_privacy": "",
@@ -328,6 +410,8 @@
     "click": "basıw",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "",
     "curvedLine": "",
     "documentation": "Hújjetshilik",
@@ -350,7 +434,9 @@
     "zoomToSelection": "",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -366,15 +452,15 @@
     "website": "Veb-sayt",
     "placeholder": {
       "authorName": "Atıńız yamasa paydalanıwshı atı",
-      "libraryName": "Kitapxanańız ataması",
+      "libraryName": "",
       "libraryDesc": "",
       "githubHandle": "",
       "twitterHandle": "",
-      "website": "Jeke veb-saytıńız yamasa basqa saytqa silteme (májbúriy emes)"
+      "website": ""
     },
     "errors": {
-      "required": "Májbúriy",
-      "website": "Jaramlı URL mánzil kirgiziń"
+      "required": "",
+      "website": ""
     },
     "noteDescription": "",
     "noteGuidelines": "",
@@ -384,7 +470,7 @@
     "republishWarning": ""
   },
   "publishSuccessDialog": {
-    "title": "Kitapxana jiberildi",
+    "title": "",
     "content": ""
   },
   "confirmDialog": {
@@ -398,7 +484,7 @@
       "onlySelected": "",
       "darkMode": "Qarańǵı tema",
       "embedScene": "",
-      "scale": "Kólem",
+      "scale": "",
       "padding": ""
     },
     "tooltip": {
@@ -410,8 +496,8 @@
       "copyPngToClipboard": ""
     },
     "button": {
-      "exportToPng": "PNG",
-      "exportToSvg": "SVG",
+      "exportToPng": "",
+      "exportToSvg": "",
       "copyPngToClipboard": "Almasıw buferine kóshirip alıw"
     }
   },
@@ -421,31 +507,35 @@
   },
   "stats": {
     "angle": "",
-    "element": "Element",
-    "elements": "Elementler",
+    "shapes": "",
     "height": "",
     "scene": "Saxna",
     "selected": "Tańlandı",
     "storage": "",
+    "fullTitle": "",
     "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "",
     "version": "Versiya",
     "versionCopy": "Kóshirip alıw ushın basıń",
     "versionNotAvailable": "",
-    "width": "Eni"
+    "width": ""
   },
   "toast": {
     "addedToLibrary": "Kitapxanaǵa qosıldı",
     "copyStyles": "",
     "copyToClipboard": "Almasıw buferine kóshirip alındı.",
     "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Fayl saqlandı.",
     "fileSavedToFilename": "{filename} saqlandı",
     "canvas": "",
     "selection": "",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "",
@@ -467,18 +557,19 @@
   "welcomeScreen": {
     "app": {
       "center_heading": "",
-      "center_heading_plus": "Excalidraw+ ge ótiwdi qáleysiz be?",
+      "center_heading_plus": "",
       "menuHint": "Eksportlaw, sazlawlar, tiller, ..."
     },
     "defaults": {
       "menuHint": "Eksportlaw, sazlawlar hám basqa...",
-      "center_heading": "Diagrammalar. Ápiwayı.",
+      "center_heading": "",
       "toolbarHint": "",
       "helpHint": ""
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "Kóp qollanılatuǵın arnawlı reńler",
+    "color": "",
+    "mostUsedCustomColors": "",
     "colors": "Reńler",
     "shades": "",
     "hexCode": "",
@@ -497,7 +588,7 @@
         "description": ""
       },
       "excalidrawPlus": {
-        "title": "Excalidraw+",
+        "title": "",
         "button": "",
         "description": ""
       }
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/kab-KAB.json b/packages/excalidraw/locales/kab-KAB.json
index ed10f51d05..41a84b3dfe 100644
--- a/packages/excalidraw/locales/kab-KAB.json
+++ b/packages/excalidraw/locales/kab-KAB.json
@@ -21,7 +21,9 @@
     "copyStyles": "Nɣel iɣunab",
     "pasteStyles": "Senṭeḍ iɣunab",
     "stroke": "Azizdew",
+    "changeStroke": "",
     "background": "Agilal",
+    "changeBackground": "",
     "fill": "Taččart",
     "strokeWidth": "Tehri n yizirig",
     "strokeStyle": "Aɣanib n tizirig",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Tiddi n tsefsit",
     "fontFamily": "Tawacult n tsefsiyin",
     "addWatermark": "Seddu \"Yettwaxdem s Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Yettwaseqdec di teɣzut n usuneɣ",
     "canvasBackground": "Agilal n teɣzut n usuneɣ",
     "drawingCanvas": "Taɣzut n usuneɣ",
+    "clearCanvas": "",
     "layers": "Tissiyin",
     "actions": "Tigawin",
     "language": "Tutlayt",
@@ -84,12 +95,13 @@
     "group": "Segrew tafrayt",
     "ungroup": "Kkess asegrew i tefrayt",
     "collaborators": "Imɛiwnen",
-    "showGrid": "Beqqeḍ aferrug",
+    "toggleGrid": "",
     "addToLibrary": "Rnu ɣer temkarḍit",
     "removeFromLibrary": "Kkes si temkarḍit",
     "libraryLoadingMessage": "Asali n temkarḍit…",
     "libraries": "Snirem timkarḍiyin",
     "loadingScene": "Asali n usayes…",
+    "loadScene": "",
     "align": "Reyyec",
     "alignTop": "Areyyec uksawen",
     "alignBottom": "Areyyec ukessar",
@@ -105,7 +117,9 @@
     "share": "Bḍu",
     "showStroke": "Beqqeḍ amelqaḍ n yini n yizirig",
     "showBackground": "Beqqeḍ amelqaḍ n yini n ugilal",
-    "toggleTheme": "Snifel asentel",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "Asentel",
     "personalLib": "Tamkarḍit tudmawant",
     "excalidrawLib": "Tamkarḍit n Excalidraw",
     "decreaseFontSize": "Senqes tiddi n tsefsit",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Ẓreg aseɣwen",
       "editEmbed": "",
-      "create": "Snulfu-d aseɣwen",
-      "createEmbed": "",
+      "create": "Rnu asaɣ",
       "label": "Aseɣwen",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Ẓreg izirig",
-      "exit": "Ffeɣ seg umaẓrag n yizirig"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Sekkeṛ",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "Ḍfeṛ-aɣ-d",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Ulac iferdisen yettwarnan yakan...",
     "hint_emptyLibrary": "Fren aferdis di teɣzut nusuneɣ akken at-ternuḍ dagi, neɣ sbedd tamkarḍit seg usarsay azayez, ukessar-agi.",
-    "hint_emptyPrivateLibrary": "Fren aferdis di teɣzut nusuneɣ akken at-ternuḍ dagi."
+    "hint_emptyPrivateLibrary": "Fren aferdis di teɣzut nusuneɣ akken at-ternuḍ dagi.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Ales awennez n teɣzut n usuneɣ",
@@ -151,6 +204,7 @@
     "exportImage": "Sifeḍ tugna...",
     "export": "Sekles di...",
     "copyToClipboard": "Nɣel ɣer tecfawit",
+    "copyLink": "Nɣel asaɣ",
     "save": "Sekles deg ufaylu amiran",
     "saveAs": "Sekles am",
     "load": "Ldi",
@@ -171,14 +225,16 @@
     "fullScreen": "Agdil aččuran",
     "darkMode": "Askar imsulles",
     "lightMode": "Askar afaw",
+    "systemMode": "",
     "zenMode": "Askar Zen",
     "objectsSnapMode": "",
     "exitZenMode": "Ffeɣ seg uskar Zen",
     "cancel": "Sefsex",
+    "saveLibNames": "",
     "clear": "Sfeḍ",
     "remove": "Kkes",
     "embed": "",
-    "publishLibrary": "Ẓreg",
+    "publishLibrary": "",
     "submit": "Azen",
     "confirm": "Sentem",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "Ayagi ad isfeḍ tamkarḍit-inek•m. Tetḥeqqeḍ?",
     "removeItemsFromsLibrary": "Ad tekkseḍ {{count}} n uferdis (en) si temkarḍit?",
     "invalidEncryptionKey": "Tasarut n uwgelhen isefk ad tesɛu 22 n yiekkilen. Amɛiwen srid yensa.",
-    "collabOfflineWarning": "Ulac tuqqna n internet.\nIbedilen-ik ur ttwaklasen ara!"
+    "collabOfflineWarning": "Ulac tuqqna n internet.\nIbedilen-ik ur ttwaklasen ara!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Anaw n ufaylu ur yettwasefrak ara.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Afaylu meqqer aṭas. Tiddi tafellayt yurgen d {{maxSize}}.",
     "svgImageInsertError": "D awezɣi tugra n tugna SVG. Acraḍ SVG yettban-d d armeɣtu.",
     "failedToFetchImage": "",
-    "invalidSVGString": "SVG armeɣtu.",
     "cannotResolveCollabServer": "Ulamek tuqqna s aqeddac n umyalel. Ma ulac uɣilif ales asali n usebter sakin eɛreḍ tikkelt-nniḍen.",
     "importLibraryError": "Ur d-ssalay ara tamkarḍit",
+    "saveLibraryError": "",
     "collabSaveFailed": "Ulamek asekles deg uzadur n yisefka deg ugilal. Ma ikemmel wugur, isefk ad teskelseḍ afaylu s wudem adigan akken ad tetḥeqqeḍ ur tesruḥuyeḍ ara amahil-inek•inem.",
     "collabSaveFailed_sizeExceeded": "Ulamek asekles deg uzadur n yisefka deg ugilal, taɣzut n usuneɣ tettban-d temqer aṭas. Isefk ad teskelseḍ afaylu s wudem adigan akken ad tetḥeqqeḍ ur tesruḥuyeḍ ara amahil-inek•inem.",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Tafrayt",
+    "lasso": "",
     "image": "Ger tugna",
     "rectangle": "Asrem",
     "diamond": "Ameɣṛun",
@@ -246,7 +304,7 @@
     "library": "Tamkarḍit",
     "lock": "Eǧǧ afecku n tefrayt yermed mbaɛd asuneɣ",
     "penMode": "Askar n yimru - gdel tanalit",
-    "link": "Rnu/leqqem aseɣwen i talɣa yettwafernen",
+    "link": "",
     "eraser": "Sfeḍ",
     "frame": "",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "Afus (afecku n usmutti n tmuɣli)",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Asrem",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "Izirig",
+    "freedraw": "",
+    "text": "Aḍris",
+    "image": "Tugna",
+    "group": "Sigrew",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Tigawin n teɣzut n usuneɣ",
@@ -263,28 +337,33 @@
     "shapes": "Talɣiwin"
   },
   "hints": {
-    "canvasPanning": "Akken ad tesmuttiḍ taɣzut n usuneɣ, ṭṭef ṛṛuda n umumed, neɣ seqdec afecku Afus",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Ssit akken ad tebduḍ aṭas n tenqiḍin, zuɣer i yiwen n yizirig",
+    "arrowTool": "",
     "freeDraw": "Ssit yerna zuɣer, serreḥ ticki tfukeḍ",
     "text": "Tixidest: tzemreḍ daɣen ad ternuḍ aḍris s usiti snat n tikkal anida tebɣiḍ s ufecku n tefrayt",
     "embeddable": "",
-    "text_selected": "Ssit snat n tikkal neɣ ssed taqeffalt Kcem akken ad tẓergeḍ aḍris",
-    "text_editing": "Ssit Escape neɣ CtrlOrCmd+ENTER akken ad tfakkeḍ asiẓreg",
-    "linearElementMulti": "Ssit ɣef tenqiḍt taneggarut neɣ ssed taqeffalt Escape neɣ taqeffalt Kcem akken ad tfakkeḍ",
-    "lockAngle": "Tzemreḍ ad tḥettmeḍ tiɣmert s tuṭṭfa n tqeffalt SHIFT",
-    "resize": "Tzemreḍ ad tḥettemeḍ assaɣ s tuṭṭfa n tqeffalt SHIFT mi ara tettbeddileḍ tiddi,\nma teṭṭfeḍ ALT abeddel n tiddi ad yili si tlemmast",
-    "resizeImage": "Tzemreḍ ad talseḍ tiddi s tilelli s tuṭṭfa n SHIFT,\nṭṭef ALT akken ad talseḍ tiddi si tlemmast",
-    "rotate": "Tzemreḍ ad tḥettemeḍ tiɣemmar s tuṭṭfa n SHIFT di tuzzya",
-    "lineEditor_info": "Ssed ɣef CtrlOrCmd yerna ssit snat n tikkal neɣ ssed ɣef CtrlOrCmd + Kcem akken ad tẓergeḍ tineqqiḍin",
-    "lineEditor_pointSelected": "Ssed taqeffalt kkes akken ad tekkseḍ tanqiḍ (tinqiḍin),\nCtrlOrCmd+D akken ad tsiselgeḍ, neɣ zuɣer akken ad tesmuttiḍ",
-    "lineEditor_nothingSelected": "Fren tanqiḍt akken ad tẓergeḍ (ṭṭef SHIFT akken ad tferneḍ aṭas),\nneɣ ṭṭef Alt akken ad ternuḍ tinqiḍin timaynutin",
-    "placeImage": "Ssit akken ad tserseḍ tugna, neɣ ssit u zuɣer akken ad tesbaduḍ tiddi-ines s ufus",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Siẓreg tamkarḍit-inek•inem",
-    "bindTextToElement": "Ssed ɣef kcem akken ad ternuḍ aḍris",
-    "deepBoxSelect": "Ṭṭef CtrlOrCmd akken ad tferneḍ s telqey, yerna ad trewleḍ i uzuɣer",
-    "eraserRevert": "Ssed Alt akken ad tsefsxeḍ iferdisen yettwacerḍen i tukksa",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Ulamek abeqqeḍ n teskant",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Nḥuder aṭas akken ur nseddu ara talɣut n usayes-inek (m) di tuccḍa. Ma yella asayes-inek (m) mačči d amaẓlay, ttxil-k (m) xemmem ad ḍefreḍ <button>afecku n weḍfar n yibugen.</button> Ma ulac uɣilif seddu talɣut ukessar-agi s wenɣal akked usenṭeḍ di GitHub issue.",
     "sceneContent": "Agbur n usayes:"
   },
+  "shareDialog": {
+    "or": "Neɣ"
+  },
   "roomDialog": {
-    "desc_intro": "Tzemreḍ ad d-teɛerḍeḍ medden ɣer usayes-inek (m) amiran akken ad ttekkin yid-k.",
-    "desc_privacy": "Ur tqelliq ara, tiɣimit tsseqdac awgelhen ixef s ixef, dɣa ayen ara tsunɣeḍ ad iqqim d amaẓlay. Ula d aqeddac-nneɣ ur yezmir ara ad iwali acu txeddemeḍ.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Bdu tiɣimit",
     "button_stopSession": "Ḥbes tiɣimit",
     "desc_inProgressIntro": "Tiɣimit n umɛawen s srid tetteddu akka tura.",
@@ -328,6 +410,8 @@
     "click": "ssit",
     "deepSelect": "Afran s telqey",
     "deepBoxSelect": "Afran s telqey s tnaka, yerna ad tyrewleḍ i uzuɣer",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Taneccabt izelgen",
     "curvedLine": "Izirig izelgen",
     "documentation": "Tasemlit",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Simɣur ɣer tefrayt",
     "toggleElementLock": "Sekkeṛ/kkes asekker i tefrayt",
     "movePageUpDown": "Smutti asebter d asawen/akessar",
-    "movePageLeftRight": "Smutti asebter s azelmaḍ/ayfus"
+    "movePageLeftRight": "Smutti asebter s azelmaḍ/ayfus",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Sfeḍ taɣzut n usuneɣ"
@@ -410,7 +496,7 @@
       "copyPngToClipboard": ""
     },
     "button": {
-      "exportToPng": "",
+      "exportToPng": "PNG",
       "exportToSvg": "",
       "copyPngToClipboard": ""
     }
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Tiɣmeṛt",
-    "element": "Aferdis",
-    "elements": "Iferdisen",
+    "shapes": "",
     "height": "Tattayt",
     "scene": "Asayes",
     "selected": "Yettwafren",
     "storage": "Aḥraz",
+    "fullTitle": "",
     "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Aɣrud",
     "version": "Alqem",
     "versionCopy": "Sit ad tneɣleḍ",
@@ -439,29 +527,31 @@
     "copyStyles": "Iɣunab yettwaneɣlen.",
     "copyToClipboard": "Yettwaɣel ɣer tecfawit.",
     "copyToClipboardAsPng": "{{exportSelection}} yettwanɣel ɣer tecfawit am PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Afaylu yettwasekles.",
     "fileSavedToFilename": "Yettwasekles di {filename}",
     "canvas": "taɣzut n usuneɣ",
     "selection": "tafrayt",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Afrawan",
-    "black": "",
-    "white": "",
-    "red": "",
-    "pink": "",
+    "black": "Aberkan",
+    "white": "Amellal",
+    "red": "Azeggaɣ",
+    "pink": "Axuxi",
     "grape": "",
-    "violet": "",
-    "gray": "",
-    "blue": "",
+    "violet": "Aṛzaz",
+    "gray": "Aɣiɣdi",
+    "blue": "Azegzaw",
     "cyan": "",
     "teal": "",
-    "green": "",
-    "yellow": "",
-    "orange": "",
+    "green": "Adal",
+    "yellow": "Awraɣ",
+    "orange": "Ačinawi",
     "bronze": ""
   },
   "welcomeScreen": {
@@ -478,8 +568,9 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
-    "colors": "",
+    "colors": "Initen",
     "shades": "",
     "hexCode": "",
     "noShades": ""
@@ -492,12 +583,12 @@
         "description": ""
       },
       "saveToDisk": {
-        "title": "",
-        "button": "",
+        "title": "Sekles ar uḍebsi",
+        "button": "Sekles ar uḍebsi",
         "description": ""
       },
       "excalidrawPlus": {
-        "title": "",
+        "title": "Excalidraw+",
         "button": "",
         "description": ""
       }
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/kk-KZ.json b/packages/excalidraw/locales/kk-KZ.json
index 9b11fcaffe..537ccf8129 100644
--- a/packages/excalidraw/locales/kk-KZ.json
+++ b/packages/excalidraw/locales/kk-KZ.json
@@ -21,7 +21,9 @@
     "copyStyles": "Стильдерді көшіру",
     "pasteStyles": "Стильдерді қою",
     "stroke": "",
+    "changeStroke": "",
     "background": "",
+    "changeBackground": "",
     "fill": "",
     "strokeWidth": "",
     "strokeStyle": "",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Қаріп өлшемі",
     "fontFamily": "Қаріп тобы",
     "addWatermark": "",
@@ -72,6 +82,7 @@
     "canvasColors": "",
     "canvasBackground": "",
     "drawingCanvas": "",
+    "clearCanvas": "",
     "layers": "",
     "actions": "",
     "language": "Тіл",
@@ -84,12 +95,13 @@
     "group": "",
     "ungroup": "",
     "collaborators": "",
-    "showGrid": "",
+    "toggleGrid": "",
     "addToLibrary": "",
     "removeFromLibrary": "",
     "libraryLoadingMessage": "",
     "libraries": "",
     "loadingScene": "",
+    "loadScene": "",
     "align": "",
     "alignTop": "",
     "alignBottom": "",
@@ -105,7 +117,9 @@
     "share": "",
     "showStroke": "",
     "showBackground": "",
+    "showFonts": "",
     "toggleTheme": "",
+    "theme": "",
     "personalLib": "",
     "excalidrawLib": "",
     "decreaseFontSize": "",
@@ -117,14 +131,19 @@
       "edit": "",
       "editEmbed": "",
       "create": "",
-      "createEmbed": "",
       "label": "",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "",
-      "exit": ""
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "",
@@ -151,6 +204,7 @@
     "exportImage": "",
     "export": "",
     "copyToClipboard": "",
+    "copyLink": "",
     "save": "",
     "saveAs": "",
     "load": "",
@@ -171,10 +225,12 @@
     "fullScreen": "",
     "darkMode": "",
     "lightMode": "",
+    "systemMode": "",
     "zenMode": "",
     "objectsSnapMode": "",
     "exitZenMode": "",
     "cancel": "",
+    "saveLibNames": "",
     "clear": "",
     "remove": "",
     "embed": "",
@@ -204,7 +260,8 @@
     "resetLibrary": "",
     "removeItemsFromsLibrary": "",
     "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "",
@@ -212,9 +269,9 @@
     "fileTooBig": "Файл өте үлкен. Максималды рұқсат етілген көлем {{maxSize}}.",
     "svgImageInsertError": "",
     "failedToFetchImage": "",
-    "invalidSVGString": "",
     "cannotResolveCollabServer": "",
     "importLibraryError": "",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "",
+    "lasso": "",
     "image": "Суретті қою",
     "rectangle": "",
     "diamond": "",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "",
@@ -263,8 +337,10 @@
     "shapes": ""
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "",
+    "arrowTool": "",
     "freeDraw": "",
     "text": "",
     "embeddable": "",
@@ -276,15 +352,18 @@
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "",
@@ -299,6 +378,9 @@
     "openIssueMessage": "",
     "sceneContent": ""
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
     "desc_intro": "",
     "desc_privacy": "",
@@ -328,6 +410,8 @@
     "click": "шерту",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Майысқан нұсқар",
     "curvedLine": "Майысқан сызық",
     "documentation": "Құжаттама",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Таңдалғанды үлкейту",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Бұрыш",
-    "element": "Элемент",
-    "elements": "Элементтер",
+    "shapes": "",
     "height": "Биіктігі",
     "scene": "Сахна",
     "selected": "Таңдалды",
     "storage": "Сақтау көлемі",
+    "fullTitle": "",
     "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Барлығы",
     "version": "Нұсқа",
     "versionCopy": "Көшіру үшін басыңыз",
@@ -439,13 +527,15 @@
     "copyStyles": "Стильдер көшірілді.",
     "copyToClipboard": "",
     "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Файл сақталды.",
     "fileSavedToFilename": "{filename} сақталды",
     "canvas": "",
     "selection": "таңдау",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/km-KH.json b/packages/excalidraw/locales/km-KH.json
index 3aca3ce9b7..63db8479e9 100644
--- a/packages/excalidraw/locales/km-KH.json
+++ b/packages/excalidraw/locales/km-KH.json
@@ -21,7 +21,9 @@
     "copyStyles": "ចម្លងរចនាប័ទ្ម",
     "pasteStyles": "បិទភ្ជាប់រចនាប័ទ្ម",
     "stroke": "ខ្វាច់",
+    "changeStroke": "",
     "background": "ផ្ទៃខាងក្រោយ",
+    "changeBackground": "",
     "fill": "បំពេញ",
     "strokeWidth": "ទទឹងខ្វាច់",
     "strokeStyle": "រចនាប័ទ្មរបស់ខ្វាច់",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "ទំហំពុម្ពអក្សរ",
     "fontFamily": "ក្រុម​ពុម្ពអក្សរ",
     "addWatermark": "បន្ថែមវ៉ាត់ធើម៉ាក \"Made with Excalidraw\"",
@@ -55,8 +65,8 @@
     "large": "ធំ",
     "veryLarge": "ធំខ្លាំង",
     "solid": "តាន់",
-    "hachure": "Hachure",
-    "zigzag": "Zigzag",
+    "hachure": "",
+    "zigzag": "",
     "crossHatch": "បន្ទាត់ឆ្នូតៗ",
     "thin": "ស្តើង",
     "bold": "ដឹត",
@@ -72,6 +82,7 @@
     "canvasColors": "ប្រើលើបាវ",
     "canvasBackground": "ផ្ទៃខាងក្រោយបាវ",
     "drawingCanvas": "តំបន់គំនូរ",
+    "clearCanvas": "",
     "layers": "ស្រទាប់",
     "actions": "សកម្មភាព",
     "language": "ភាសា",
@@ -84,12 +95,13 @@
     "group": "ការជ្រើសរើសជាក្រុម",
     "ungroup": "បំបែកក្រុមការជ្រើសរើសជាក្រុម",
     "collaborators": "អ្នកសហការ",
-    "showGrid": "បង្ហាញក្រឡាចត្រង្គ",
+    "toggleGrid": "",
     "addToLibrary": "បន្ថែមទៅបណ្ណាល័យ",
     "removeFromLibrary": "លុបចេញពីបណ្ណាល័យ",
     "libraryLoadingMessage": "កំពុងផ្ទុកបណ្ណាល័យ...",
     "libraries": "រកមើលបណ្ណាល័យ",
     "loadingScene": "កំពុង​ផ្ទុក​ស៊ីន...",
+    "loadScene": "",
     "align": "តម្រឹម",
     "alignTop": "តម្រឹមផ្នែកខាងលើ",
     "alignBottom": "តម្រឹមផ្នែកខាងក្រោម",
@@ -105,7 +117,9 @@
     "share": "ចែករំលែក",
     "showStroke": "បង្ហាញឧបករណ៍ជ្រើសរើសពណ៌ខ្វាច់",
     "showBackground": "បង្ហាញឧបករណ៍ជ្រើសរើសពណ៌ផ្ទៃខាងក្រោយ",
-    "toggleTheme": "បិទ/បើកប្រធានបទ",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "បណ្ណាល័យផ្ទាល់ខ្លួន",
     "excalidrawLib": "បណ្ណាល័យ Excalidraw",
     "decreaseFontSize": "បន្ថយទំហំពុម្ពអក្សរ",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "កែតំណភ្ជាប់",
       "editEmbed": "",
-      "create": "បង្កើតតំណភ្ជាប់",
-      "createEmbed": "",
+      "create": "",
       "label": "តំណ",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "កែសម្រួលបន្ទាត់",
-      "exit": "ចាកចេញពីការកែសម្រួលបន្ទាត់"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "ចាក់សោ",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "មិនទាន់មានធាតុបន្ថែមទេ...",
     "hint_emptyLibrary": "ជ្រើសរើសធាតុនៅលើបាវដើម្បីបន្ថែមវានៅទីនេះ ឬដំឡើងបណ្ណាល័យពីឃ្លាំងសាធារណៈខាងក្រោម។",
-    "hint_emptyPrivateLibrary": "ជ្រើសរើសធាតុនៅលើបាវដើម្បីបន្ថែមវានៅទីនេះ"
+    "hint_emptyPrivateLibrary": "ជ្រើសរើសធាតុនៅលើបាវដើម្បីបន្ថែមវានៅទីនេះ",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "កំណត់បាវឡើងវិញ",
@@ -151,6 +204,7 @@
     "exportImage": "នាំរូបភាពចេញ",
     "export": "រក្សាទុក​នៅ...",
     "copyToClipboard": "ចម្លងទៅក្តារតម្បៀតខ្ទាស់",
+    "copyLink": "",
     "save": "រក្សាទុកទៅឯកសារបច្ចុប្បន្ន",
     "saveAs": "រក្សាទុក​ជា",
     "load": "បើក",
@@ -171,14 +225,16 @@
     "fullScreen": "ពេញ​អេក្រង់",
     "darkMode": "ម៉ូដងងឹត",
     "lightMode": "ម៉ូដភ្លឺ",
+    "systemMode": "",
     "zenMode": "ម៉ូត Zen",
     "objectsSnapMode": "",
     "exitZenMode": "ចេញពី zen​ ម៉ូត",
     "cancel": "បោះបង់",
+    "saveLibNames": "",
     "clear": "សម្អាត",
     "remove": "ដកចេញ",
     "embed": "",
-    "publishLibrary": "បោះពុម្ពផ្សាយ",
+    "publishLibrary": "",
     "submit": "ដាក់​ស្នើ",
     "confirm": "បញ្ជាក់",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "វានឹងសម្អាតបាវទាំងមូល។ តើ​អ្នក​ប្រាកដ​ឬ​អត់?",
     "removeItemsFromsLibrary": "តើអ្នកប្រាកដថាចង់លុប {{count}} ធាតុចេញពីបណ្ណាល័យទេ?",
     "invalidEncryptionKey": "សោអ៊ីនគ្រីបត្រូវតែមាន 22 តួអក្សរ។ ការសហការផ្ទាល់ត្រូវបានបិទ។",
-    "collabOfflineWarning": "គ្មានការតភ្ជាប់អ៊ីនធឺណិត។\nការផ្លាស់ប្តូររបស់អ្នកនឹងមិនត្រូវបានរក្សាទុកទេ!"
+    "collabOfflineWarning": "គ្មានការតភ្ជាប់អ៊ីនធឺណិត។\nការផ្លាស់ប្តូររបស់អ្នកនឹងមិនត្រូវបានរក្សាទុកទេ!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "ប្រភេទឯកសារមិនត្រូវបានគាំទ្រទេ។",
@@ -212,9 +269,9 @@
     "fileTooBig": "ឯកសារធំពេក។ ទំហំអតិបរមាដែលអនុញ្ញាតគឺ {{maxSize}}។",
     "svgImageInsertError": "មិនអាចបញ្ចូលរូបភាព SVG បានទេ។ ស្លាក SVG ហាក់ដូចជាមិនត្រឹមត្រូវ។",
     "failedToFetchImage": "",
-    "invalidSVGString": "SVG មិន​ត្រឹមត្រូវ។",
     "cannotResolveCollabServer": "មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេសហការផ្ទាល់បានទេ។ សូមផ្ទុកទំព័រឡើងវិញ ហើយព្យាយាមម្តងទៀត។",
     "importLibraryError": "មិនអាចផ្ទុកបណ្ណាល័យបានទេ។",
+    "saveLibraryError": "",
     "collabSaveFailed": "មិនអាចរក្សាទុកទៅម៉ាស៊ីនមេបានទេ។ ប្រសិនបើបញ្ហានៅតែបន្តកើតមាន​ អ្នកគួរតែរក្សាទុកឯកសាររបស់អ្នកនៅលើកុំព្យូទ័ររបស់អ្នកសិន ដើម្បីធានាថាការងាររបស់អ្នកមិនបាត់បង់។",
     "collabSaveFailed_sizeExceeded": "មិនអាចរក្សាទុកទៅម៉ាស៊ីនមេបានទេ, ផ្ទាំងបាវហាក់ដូចជាធំពេក។ អ្នកគួរតែរក្សាទុកឯកសាររបស់អ្នកនៅលើកុំព្យូទ័ររបស់អ្នកសិន ដើម្បីធានាថាការងាររបស់អ្នកមិនបាត់បង់។",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "ការជ្រើសរើស",
+    "lasso": "",
     "image": "បញ្ចូលរូបភាព",
     "rectangle": "ចតុ​កោណ​កែង​",
     "diamond": "ពេជ្រ",
@@ -246,7 +304,7 @@
     "library": "បណ្ណាល័យ",
     "lock": "រក្សារឧបករណ៍ដែលបានជ្រើសរើសបន្ទាប់ពីគូររួច",
     "penMode": "របៀបប៊ិច - ជៀសវាងការប៉ះ",
-    "link": "បន្ថែម/ធ្វើបច្ចុប្បន្នភាពតំណភ្ជាប់សម្រាប់រូបរាងដែលបានជ្រើសរើស",
+    "link": "",
     "eraser": "ជ័រលុប",
     "frame": "",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "ដៃ (panning tool)",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "សកម្មភាពបាវ",
@@ -263,28 +337,33 @@
     "shapes": "រាង"
   },
   "hints": {
-    "canvasPanning": "ដើម្បីផ្លាស់ទីបាវ សូមសង្កត់កង់កណ្ដុរឬគ្រាប់ចុចspacebarខណៈពេលកំពុងអូស ឬប្រើឧបករណ៍ដៃ។",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "ចុចដើម្បីបង្កើតចំណុចច្រើន អូសដើម្បីបង្កើតបន្ទាត់មួយ",
+    "arrowTool": "",
     "freeDraw": "ចុច​ហើយ​អូស លែង​ពេល​រួចរាល់",
     "text": "គន្លឹះ៖ អ្នកក៏អាចបន្ថែមអត្ថបទដោយចុចពីរដងនៅកន្លែងណាមួយដោយប្រើឧបករណ៍ជ្រើសរើស",
     "embeddable": "",
-    "text_selected": "ចុចពីរដង ឬចុច ENTER ដើម្បីកែសម្រួលអត្ថបទ",
-    "text_editing": "ចុច Escape ឬ CtrlOrCmd +ENTER ដើម្បីបញ្ចប់ការកែសម្រួល",
-    "linearElementMulti": "ចុចលើចំណុចចុងក្រោយ ឬចុច Esc/Enter ដើម្បីបញ្ចប់",
-    "lockAngle": "អ្នកអាចសង្កត់ Shift ដើម្បីកំណត់មុំ",
-    "resize": "អ្នកអាចសង្កត់ SHIFT ដើម្បីបងំ្ខឲមានសមាមាត្រ ខណៈពេលដែលប្តូរទំហំ\nសង្កត់ ALT ដើម្បីប្តូរទំហំពីកណ្តាល",
-    "resizeImage": "អ្នកអាចប្តូរទំហំរូបភាពដោយសេរីដោយសង្កត់ SHIFT,\nសង្កត់ ALT ដើម្បីប្តូរទំហំពីកណ្តាល",
-    "rotate": "អ្នកអាចសង្កត់ Shift ខណៈពេលកំពុងបង្វិល ដើម្បីកម្រិតមុំ",
-    "lineEditor_info": "សង្កត់ CtrlOrCmd ហើយចុចពីរដង ឬចុច CtrlOrCmd + Enter ដើម្បីកែសម្រួលចំណុច",
-    "lineEditor_pointSelected": "ចុច Delete ដើម្បីលុបចំណុច(ច្រើន)\nCtrlOrCmd+D ដើម្បីចម្លង, ឬអូសដើម្បីផ្លាស់ទី",
-    "lineEditor_nothingSelected": "ជ្រើសរើសចំណុចដែលត្រូវកែសម្រួល (សង្កត់ SHIFT ដើម្បីជ្រើសរើសច្រើនចំណុច)\nឬ សង្កត់ Alt ហើយចុចដើម្បីបន្ថែមចំណុចថ្មី។",
-    "placeImage": "ចុចដើម្បីដាក់រូបភាព ឬចុចហើយអូសដើម្បីកំណត់ទំហំរបស់រូបភាពដោយដៃ",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "បោះពុម្ពផ្សាយបណ្ណាល័យផ្ទាល់ខ្លួនរបស់អ្នក",
-    "bindTextToElement": "ចុច Enter ដើម្បីបន្ថែមអត្ថបទ",
-    "deepBoxSelect": "សង្កត់ CtrlOrCmd ដើម្បីជ្រើសរើសយ៉ាងជ្រៅ និងជៀសវាងការអូស",
-    "eraserRevert": "សង្កត់ Alt ដើម្បីដកការជ្រើសរើសធាតុដែលត្រូវបានសម្គាល់សម្រាប់ការលុប",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "បើកមុខងារនេះដោយកំណត់ទង់ \"dom.events.asyncClipboard.clipboardItem\" ទៅ \"true\" \nដើម្បីផ្លាស់ប្តូរទង់កម្មវិធីរុករកនៅក្នុង Firefox សូមចូលទៅកាន់ទំព័រ \"about:config\"។",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "មិនអាចបង្ហាញការមើលជាមុនបាន",
@@ -299,9 +378,12 @@
     "openIssueMessage": "យើងមានការប្រុងប្រយ័ត្នខ្លាំងណាស់ក្នុងការមិនបញ្ចូលព័ត៌មានរបស់ស៊ីនរបស់អ្នកទៅលើកំហុស។ ប្រសិនបើស៊ីនរបស់អ្នកមិនមានលក្ខណៈឯកជនទេ សូមពិចារណាបន្តទៅកាន់ <button>កម្មវិធីតាមដានកំហុសរបស់យើង។</button> សូមបញ្ចូលព័ត៌មានខាងក្រោមដោយចម្លង និងបិទភ្ជាប់វាទៅក្នុងបញ្ហារបស់ GitHub។",
     "sceneContent": "មាតិកាបាវ៖"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "អ្នកអាចអញ្ជើញអ្នកដទៃឱ្យសហការជាមួយអ្នកនៅលើស៊ីនបច្ចុប្បន្ន។",
-    "desc_privacy": "កុំបារម្ភ វគ្គប្រើការអ៊ិនគ្រីបពីចុងដល់ចប់ ដូច្នេះអ្វីដែលអ្នកគូរនឹងនៅតែជាឯកជន។ សូម្បីតែម៉ាស៊ីនមេរបស់យើងក៏នឹងមិនអាចមើលឃើញអ្វីដែលអ្នកកំពុងធ្វើដែរ។",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "ចាប់ផ្តើមវគ្គ",
     "button_stopSession": "បញ្ឈប់វគ្គ",
     "desc_inProgressIntro": "វគ្គសហការផ្ទាល់ឥឡូវនេះកំពុងដំណើរការ។",
@@ -328,6 +410,8 @@
     "click": "ចុច",
     "deepSelect": "ការជ្រើសរើសជាក្រុម",
     "deepBoxSelect": "ជ្រើសរើសជាក្រុម និង ជៀសវាងការអូសទាញផ្លាស់ទី",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "ព្រួញកោង",
     "curvedLine": "ព្រួញកោង",
     "documentation": "ឯកសារ",
@@ -350,7 +434,9 @@
     "zoomToSelection": "ពង្រីកទៅការជ្រើសរើស",
     "toggleElementLock": "ចាក់សោ/ដោះសោការជ្រើសរើស",
     "movePageUpDown": "ផ្លាស់ទីទំព័រឡើងលើ/ចុះក្រោម",
-    "movePageLeftRight": "ផ្លាស់ទីទំព័រទៅឆ្វេង/ស្ដាំ"
+    "movePageLeftRight": "ផ្លាស់ទីទំព័រទៅឆ្វេង/ស្ដាំ",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "សម្អាតបាវ"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "មុំ",
-    "element": "ធាតុ",
-    "elements": "ធាតុច្រើន",
+    "shapes": "",
     "height": "កម្ពស់",
     "scene": "ស៊ីន",
     "selected": "បានជ្រើសរើស",
     "storage": "ការផ្ទុក",
-    "title": "ស្ថិតិសម្រាប់ nerds",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "សរុប",
     "version": "ជំនាន់:",
     "versionCopy": "ចុចដើម្បីចម្លង",
@@ -439,13 +527,15 @@
     "copyStyles": "រចនាប័ទ្មត្រូវបានចម្លង។",
     "copyToClipboard": "បានចម្លងទៅក្ដារតម្បៀតខ្ទាស់។",
     "copyToClipboardAsPng": "បានចម្លង {{exportSelection}} ទៅក្ដារតម្បៀតខ្ទាស់ជា PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "ឯកសារត្រូវបានរក្សាទុក។",
     "fileSavedToFilename": "បានរក្សាទុកនៅក្នុង {filename}",
     "canvas": "តំបន់គំនូរ",
     "selection": "ការជ្រើសរើស",
     "pasteAsSingleElement": "ប្រើ {{shortcut}} ដើម្បីបិទភ្ជាប់ជាធាតុតែមួយ,\nឬបិទភ្ជាប់ទៅក្នុងកម្មវិធីនិពន្ធអត្ថបទដែលមានស្រាប់",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "ថ្លាមើលធ្លុះ",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "ពណ៌ផ្ទាល់ខ្លួនដែលប្រើច្រើនបំផុត",
     "colors": "ពណ៌",
     "shades": "ស្រមោល",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/ko-KR.json b/packages/excalidraw/locales/ko-KR.json
index bb518ea347..eb70f66117 100644
--- a/packages/excalidraw/locales/ko-KR.json
+++ b/packages/excalidraw/locales/ko-KR.json
@@ -11,8 +11,8 @@
     "copyAsPng": "클립보드로 PNG 이미지 복사",
     "copyAsSvg": "클립보드로 SVG 이미지 복사",
     "copyText": "클립보드로 텍스트 복사",
-    "copySource": "소스코드를 클립보드로 복사",
-    "convertToCode": "코드로 변환",
+    "copySource": "클립보드에 복사하기",
+    "convertToCode": "코드로 변환하기",
     "bringForward": "앞으로 가져오기",
     "sendToBack": "맨 뒤로 보내기",
     "bringToFront": "맨 앞으로 가져오기",
@@ -21,7 +21,9 @@
     "copyStyles": "스타일 복사하기",
     "pasteStyles": "스타일 붙여넣기",
     "stroke": "선 색상",
+    "changeStroke": "선 색상 변경",
     "background": "배경색",
+    "changeBackground": "배경색 변경",
     "fill": "채우기",
     "strokeWidth": "선 굵기",
     "strokeStyle": "선",
@@ -39,11 +41,19 @@
     "arrowhead_arrow": "화살표",
     "arrowhead_bar": "막대",
     "arrowhead_circle": "원",
-    "arrowhead_circle_outline": "원 (외곽선)",
+    "arrowhead_circle_outline": "원(윤곽선)",
     "arrowhead_triangle": "삼각형",
-    "arrowhead_triangle_outline": "삼각형 (외곽선)",
+    "arrowhead_triangle_outline": "삼각형(윤곽선)",
     "arrowhead_diamond": "마름모",
-    "arrowhead_diamond_outline": "마름모 (외곽선)",
+    "arrowhead_diamond_outline": "마름모(윤곽선)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "화살표 모양",
+    "arrowtype_sharp": "뾰족한 화살표",
+    "arrowtype_round": "곡선 화살표",
+    "arrowtype_elbowed": "꺾인 화살표",
     "fontSize": "글자 크기",
     "fontFamily": "글꼴",
     "addWatermark": "\"Made with Excalidraw\" 추가",
@@ -72,6 +82,7 @@
     "canvasColors": "캔버스에서 사용되었음",
     "canvasBackground": "캔버스 배경",
     "drawingCanvas": "캔버스 그리기",
+    "clearCanvas": "캔버스 지우기",
     "layers": "레이어",
     "actions": "동작",
     "language": "언어",
@@ -80,16 +91,17 @@
     "untitled": "제목 없음",
     "name": "이름",
     "yourName": "이름 입력",
-    "madeWithExcalidraw": "Made with Excalidraw",
+    "madeWithExcalidraw": "Excalidraw에서 생성됨",
     "group": "그룹 생성",
     "ungroup": "그룹 해제",
     "collaborators": "공동 작업자",
-    "showGrid": "그리드 보기",
+    "toggleGrid": "격자 켜기/끄기",
     "addToLibrary": "라이브러리에 추가",
     "removeFromLibrary": "라이브러리에서 제거",
     "libraryLoadingMessage": "라이브러리 불러오는 중…",
     "libraries": "라이브러리 찾기",
     "loadingScene": "화면 불러오는 중…",
+    "loadScene": "파일에서 화면 불러오기",
     "align": "정렬",
     "alignTop": "상단 정렬",
     "alignBottom": "하단 정렬",
@@ -105,7 +117,9 @@
     "share": "공유",
     "showStroke": "윤곽선 색상 선택기 열기",
     "showBackground": "배경 색상 선택기 열기",
-    "toggleTheme": "테마 전환",
+    "showFonts": "글꼴 선택기 표시",
+    "toggleTheme": "밝은 모드/다크 모드 전환",
+    "theme": "테마",
     "personalLib": "개인 라이브러리",
     "excalidrawLib": "Excalidraw 라이브러리",
     "decreaseFontSize": "폰트 사이즈 줄이기",
@@ -115,16 +129,21 @@
     "createContainerFromText": "텍스트를 컨테이너에 담기",
     "link": {
       "edit": "링크 수정하기",
-      "editEmbed": "링크 & 임베드 수정하기",
-      "create": "링크 만들기",
-      "createEmbed": "링크 & 임베드 만들기",
+      "editEmbed": "",
+      "create": "",
       "label": "링크",
       "labelEmbed": "링크 & 임베드",
-      "empty": "링크를 지정하지 않았습니다"
+      "empty": "링크를 지정하지 않았습니다",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "선 수정하기",
-      "exit": "선 편집기 종료"
+      "editArrow": "화살표 수정"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "잠금",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "프레임의 모든 요소 선택",
     "removeAllElementsFromFrame": "프레임의 모든 요소 삭제",
     "eyeDropper": "캔버스에서 색상 고르기",
-    "textToDiagram": "텍스트를 다이어그램으로",
-    "prompt": "프롬프트"
+    "textToDiagram": "텍스트를 표로 만들기",
+    "prompt": "프롬프트",
+    "followUs": "팔로우",
+    "discordChat": "Discord 채팅방",
+    "zoomToFitViewport": "뷰포트에 맞게 확대/축소",
+    "zoomToFitSelection": "선택 영역으로 확대/축소",
+    "zoomToFit": "모든 요소가 보이도록 확대/축소",
+    "installPWA": "Excalidraw 설치(PWA)",
+    "autoResize": "텍스트 크기 자동 조절 켜기",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "추가된 아이템 없음",
     "hint_emptyLibrary": "캔버스 위에서 아이템을 선택하여 여기에 추가를 하거나, 아래의 공용 저장소에서 라이브러리를 설치하세요.",
-    "hint_emptyPrivateLibrary": "캔버스 위에서 아이템을 선택하여 여기 추가하세요."
+    "hint_emptyPrivateLibrary": "캔버스 위에서 아이템을 선택하여 여기 추가하세요.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "캔버스에서 찾기",
+    "noMatch": "결과를 찾을 수 없습니다...",
+    "singleResult": "개의 결과",
+    "multipleResults": "개의 결과",
+    "placeholder": "캔버스에서 텍스트 찾기...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "캔버스 초기화",
@@ -151,6 +204,7 @@
     "exportImage": "이미지 내보내기",
     "export": "다른 이름으로 저장...",
     "copyToClipboard": "클립보드로 복사",
+    "copyLink": "링크 복사",
     "save": "현재 파일에 저장",
     "saveAs": "다른 이름으로 저장",
     "load": "열기",
@@ -171,14 +225,16 @@
     "fullScreen": "전체화면",
     "darkMode": "다크 모드",
     "lightMode": "밝은 모드",
+    "systemMode": "시스템 모드",
     "zenMode": "젠 모드",
     "objectsSnapMode": "다른 요소들에 정렬시키기",
     "exitZenMode": "젠 모드 종료하기",
     "cancel": "취소",
+    "saveLibNames": "",
     "clear": "지우기",
     "remove": "삭제",
     "embed": "임베딩 토글",
-    "publishLibrary": "게시하기",
+    "publishLibrary": "",
     "submit": "제출",
     "confirm": "확인",
     "embeddableInteractionButton": "클릭하여 상호작용"
@@ -204,7 +260,8 @@
     "resetLibrary": "당신의 라이브러리를 초기화 합니다. 계속하시겠습니까?",
     "removeItemsFromsLibrary": "{{count}}개의 아이템을 라이브러리에서 삭제하시겠습니까?",
     "invalidEncryptionKey": "암호화 키는 반드시 22글자여야 합니다. 실시간 협업이 비활성화됩니다.",
-    "collabOfflineWarning": "인터넷에 연결되어 있지 않습니다.\n변경 사항들이 저장되지 않습니다!"
+    "collabOfflineWarning": "인터넷에 연결되어 있지 않습니다.\n변경 사항들이 저장되지 않습니다!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "지원하지 않는 파일 형식 입니다.",
@@ -212,12 +269,12 @@
     "fileTooBig": "파일이 너무 큽니다. 최대 크기는 {{maxSize}} 입니다.",
     "svgImageInsertError": "SVG 이미지를 삽입하지 못했습니다. SVG 문법이 유효하지 않은 것 같습니다.",
     "failedToFetchImage": "이미지를 가져오는데 실패했습니다.",
-    "invalidSVGString": "유효하지 않은 SVG입니다.",
     "cannotResolveCollabServer": "협업 서버에 접속하는데 실패했습니다. 페이지를 새로고침하고 다시 시도해보세요.",
     "importLibraryError": "라이브러리를 불러오지 못했습니다.",
+    "saveLibraryError": "라이브러리를 저장공간에 저장하지 못했습니다. 변경 사항들을 잃지 않으려면 라이브러리를 로컬 저장소에 저장하여 주세요.",
     "collabSaveFailed": "데이터베이스에 저장하지 못했습니다. 문제가 계속 된다면, 작업 내용을 잃지 않도록 로컬 저장소에 저장해 주세요.",
     "collabSaveFailed_sizeExceeded": "데이터베이스에 저장하지 못했습니다. 캔버스가 너무 큰 거 같습니다. 문제가 계속 된다면, 작업 내용을 잃지 않도록 로컬 저장소에 저장해 주세요.",
-    "imageToolNotSupported": "이미지가 비활성화 되었습니다.",
+    "imageToolNotSupported": "이미지가 비활성화되어 있습니다.",
     "brave_measure_text_error": {
       "line1": "귀하께서는 <bold>강력한 지문 차단 설정</bold>이 활성화된 Brave browser를 사용하고 계신 것 같습니다.",
       "line2": "이 기능으로 인해 화이트보드의 <bold>텍스트 요소들</bold>이 손상될 수 있습니다.",
@@ -226,15 +283,16 @@
     },
     "libraryElementTypeError": {
       "embeddable": "임베드 요소들은 라이브러리에 추가할 수 없습니다.",
-      "iframe": "IFrame 요소들은 라이브러리에 추가할 수 없습니다.",
+      "iframe": "IFrame 요소는 라이브러리에 추가할 수 없습니다.",
       "image": "라이브러리에 이미지 삽입 기능은 곧 지원될 예정입니다!"
     },
-    "asyncPasteFailedOnRead": "붙여넣는데 실패했습니다. (시스템 클립보드를 읽는데 실패했습니다)",
-    "asyncPasteFailedOnParse": "붙여넣는데 실패했습니다.",
-    "copyToSystemClipboardFailed": "클립보드로 복사하는데 실패했습니다."
+    "asyncPasteFailedOnRead": "붙여넣는 데 실패했습니다(시스템 클립보드를 읽을 수 없습니다).",
+    "asyncPasteFailedOnParse": "붙여넣는 데 실패했습니다.",
+    "copyToSystemClipboardFailed": "클립보드로 복사하지 못했습니다."
   },
   "toolBar": {
     "selection": "선택",
+    "lasso": "",
     "image": "이미지 삽입",
     "rectangle": "사각형",
     "diamond": "다이아몬드",
@@ -246,7 +304,7 @@
     "library": "라이브러리",
     "lock": "선택된 도구 유지하기",
     "penMode": "펜 모드 - 터치 방지",
-    "link": "선택한 도형에 대해서 링크를 추가/업데이트",
+    "link": "선택한 도형에 링크 추가 / 변경",
     "eraser": "지우개",
     "frame": "프레임 도구",
     "magicframe": "와이어프레임을 코드로",
@@ -254,8 +312,24 @@
     "laser": "레이저 포인터",
     "hand": "손 (패닝 도구)",
     "extraTools": "다른 도구",
-    "mermaidToExcalidraw": "Mermaid에서 불러오기",
-    "magicSettings": "AI 설정"
+    "mermaidToExcalidraw": "Mermaid를 Excalidraw로",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "직사각형",
+    "diamond": "마름모",
+    "ellipse": "타원",
+    "arrow": "화살표",
+    "line": "선",
+    "freedraw": "자유 선",
+    "text": "텍스트",
+    "image": "이미지",
+    "group": "그룹",
+    "frame": "프레임",
+    "magicframe": "와이어프레임을 코드로",
+    "embeddable": "웹 임베드",
+    "selection": "선택한 요소",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "캔버스 동작",
@@ -263,28 +337,33 @@
     "shapes": "모양"
   },
   "hints": {
-    "canvasPanning": "캔버스를 옮기려면 마우스 휠이나 스페이스바를 누르고 드래그하거나, 손 도구를 사용하기",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "여러 점을 연결하려면 클릭하고, 직선을 그리려면 바로 드래그하세요.",
+    "arrowTool": "",
     "freeDraw": "클릭 후 드래그하세요. 완료되면 놓으세요.",
     "text": "팁: 선택 툴로 아무 곳이나 더블 클릭해 텍스트를 추가할 수도 있습니다.",
     "embeddable": "클릭 및 드래그하여 웹사이트 임베드 만들기",
-    "text_selected": "더블 클릭 또는 ENTER를 눌러서 텍스트 수정",
-    "text_editing": "ESC나 CtrlOrCmd+ENTER를 눌러서 수정을 종료하기",
-    "linearElementMulti": "마지막 지점을 클릭하거나 Esc 또는 Enter 키를 눌러 완료하세요.",
-    "lockAngle": "SHIFT 키를 누르면서 회전하면 각도를 제한할 수 있습니다.",
-    "resize": "SHIFT 키를 누르면서 조정하면 크기의 비율이 제한됩니다.\nALT를 누르면서 조정하면 중앙을 기준으로 크기를 조정합니다.",
-    "resizeImage": "SHIFT를 눌러서 자유롭게 크기를 변경하거나,\nALT를 눌러서 중앙을 고정하고 크기를 변경하기",
-    "rotate": "SHIFT 키를 누르면서 회전하면 각도를 제한할 수 있습니다.",
-    "lineEditor_info": "꼭짓점을 수정하려면 CtrlOrCmd 키를 누르고 더블 클릭을 하거나 CtrlOrCmd + Enter를 누르세요.",
-    "lineEditor_pointSelected": "Delete 키로 꼭짓점을 제거하거나,\nCtrlOrCmd+D 로 복제하거나, 드래그 해서 이동시키기",
-    "lineEditor_nothingSelected": "꼭짓점을 선택해서 수정하거나 (SHIFT를 눌러서 여러개 선택),\nAlt를 누르고 클릭해서 새로운 꼭짓점 추가하기",
-    "placeImage": "클릭해서 이미지를 배치하거나, 클릭하고 드래그해서 사이즈를 조정하기",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "당신만의 라이브러리를 게시하기",
-    "bindTextToElement": "Enter 키를 눌러서 텍스트 추가하기",
-    "deepBoxSelect": "CtrlOrCmd 키를 눌러서 깊게 선택하고, 드래그하지 않도록 하기",
-    "eraserRevert": "Alt를 눌러서 삭제하도록 지정된 요소를 되돌리기",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "이 기능은 설정에서 \"dom.events.asyncClipboard.clipboardItem\" 플래그를 \"true\"로 설정하여 활성화할 수 있습니다. Firefox에서 브라우저 플래그를 수정하려면, \"about:config\" 페이지에 접속하세요.",
-    "disableSnapping": "CtrlOrCmd 키를 눌러서 다른 요소와의 정렬 무시하기"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "미리보기를 볼 수 없습니다",
@@ -299,9 +378,12 @@
     "openIssueMessage": "저희는 화면 정보를 오류에 포함하지 않도록 매우 주의하고 있습니다. 혹시 화면에 민감한 내용이 없다면 이곳에 업로드를 고려해주세요.<button>버그 트래커</button> 아래 정보를 GitHub 이슈에 복사 및 붙여넣기해 주세요.",
     "sceneContent": "화면 내용:"
   },
+  "shareDialog": {
+    "or": "또는"
+  },
   "roomDialog": {
-    "desc_intro": "현재 화면에 공동 작업자를 초대해 협업할 수 있습니다.",
-    "desc_privacy": "안심하세요, 세션은 종단 간 암호화를 사용하므로 당신의 작업은 비공개로 유지되며 서버조차도 작업 내용을 알 수 없습니다.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "세션 시작",
     "button_stopSession": "세션 중단",
     "desc_inProgressIntro": "실시간 협업 세션이 진행 중입니다.",
@@ -328,6 +410,8 @@
     "click": "클릭",
     "deepSelect": "깊게 선택",
     "deepBoxSelect": "영역을 깊게 선택하고, 드래그하지 않도록 하기",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "곡선 화살표",
     "curvedLine": "곡선",
     "documentation": "설명서",
@@ -350,7 +434,9 @@
     "zoomToSelection": "선택 영역으로 확대/축소",
     "toggleElementLock": "선택한 항목을 잠금/잠금 해제",
     "movePageUpDown": "페이지 움직이기 위/아래",
-    "movePageLeftRight": "페이지 움직이기 좌/우"
+    "movePageLeftRight": "페이지 움직이기 좌/우",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "캔버스 지우기"
@@ -410,8 +496,8 @@
       "copyPngToClipboard": "클립보드로 PNG 복사"
     },
     "button": {
-      "exportToPng": "PNG",
-      "exportToSvg": "SVG",
+      "exportToPng": "",
+      "exportToSvg": "",
       "copyPngToClipboard": "클립보드로 복사"
     }
   },
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "각도",
-    "element": "요소",
-    "elements": "요소",
+    "shapes": "",
     "height": "높이",
     "scene": "화면",
     "selected": "선택됨",
     "storage": "저장공간",
-    "title": "덕후들을 위한 통계",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "합계",
     "version": "버전",
     "versionCopy": "복사하려면 클릭",
@@ -439,13 +527,15 @@
     "copyStyles": "스타일 복사.",
     "copyToClipboard": "클립보드로 복사.",
     "copyToClipboardAsPng": "{{exportSelection}}를 클립보드에 PNG로 복사했습니다\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "파일이 저장되었습니다.",
     "fileSavedToFilename": "{filename} 로 저장되었습니다",
     "canvas": "캔버스",
     "selection": "선택한 요소",
     "pasteAsSingleElement": "단일 요소로 붙여넣거나, 기존 텍스트 에디터에 붙여넣으려면 {{shortcut}} 을 사용하세요.",
     "unableToEmbed": "이 URL의 임베딩이 허용되지 않았습니다. GitHub에 이슈를 남겨서 이 URL이 화이트리스트에 등재될 수 있도록 요청하세요",
-    "unrecognizedLinkFormat": "임베딩하려는 링크의 형식이 잘못된 것 같습니다. 원본 사이트에서 제공하는 \"임베딩\" 텍스트를 그대로 붙여 넣어 주세요"
+    "unrecognizedLinkFormat": "임베딩하려는 링크의 형식이 잘못된 것 같습니다. 원본 사이트에서 제공하는 \"임베딩\" 텍스트를 그대로 붙여 넣어 주세요",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "투명",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "가장 많이 사용된 색상들",
     "colors": "색상",
     "shades": "색조",
@@ -497,7 +588,7 @@
         "description": "나중에 다시 불러올 수 있도록 화면 데이터를 내보냅니다."
       },
       "excalidrawPlus": {
-        "title": "Excalidraw+",
+        "title": "",
         "button": "Excalidraw+로 내보내기",
         "description": "화면을 당신의 Excalidraw+ 작업 공간으로 저장합니다."
       }
@@ -516,10 +607,58 @@
     }
   },
   "mermaid": {
-    "title": "Mermaid에서 불러오기",
-    "button": "삽입하기",
-    "description": "지금은 <flowchartLink>순서도</flowchartLink>,<sequenceLink> 시퀀스</sequenceLink>, <classLink>클래스 </classLink>다이어그램만 지원합니다. 다른 형식들은 Excalidraw에서는 이미지로 표시됩니다.",
-    "syntax": "Mermaid 구문",
-    "preview": "미리보기"
+    "title": "",
+    "button": "",
+    "description": "",
+    "syntax": "",
+    "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "유저를 클릭해서 따라가기",
+      "followStatus": "이 사용자를 따라가고 있습니다",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/ku-TR.json b/packages/excalidraw/locales/ku-TR.json
index c7e60bbafd..25d2158eab 100644
--- a/packages/excalidraw/locales/ku-TR.json
+++ b/packages/excalidraw/locales/ku-TR.json
@@ -21,7 +21,9 @@
     "copyStyles": "لەبەرگرتنەوەی ستایل",
     "pasteStyles": "دانانەوەی ستایل",
     "stroke": "هێڵکار",
+    "changeStroke": "",
     "background": "پاشبنەما",
+    "changeBackground": "",
     "fill": "پڕکردنەوە",
     "strokeWidth": "پانی هێڵکاری",
     "strokeStyle": "ستایلی هێڵکاری",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "قەبارەی فۆنت",
     "fontFamily": "خێزانی فۆنت",
     "addWatermark": "زیادبکە \"Made with Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "بەکارهاتووە لەسەر تابلۆ",
     "canvasBackground": "پاشبنەمای تابلۆ",
     "drawingCanvas": "کێشانی تابلۆ",
+    "clearCanvas": "",
     "layers": "چینەکان",
     "actions": "کردارەکان",
     "language": "زمان",
@@ -84,12 +95,13 @@
     "group": "دیاریکردنی گروپ",
     "ungroup": "گروپی دیاریکراوەکان لابەرە",
     "collaborators": "هاوکارەکان",
-    "showGrid": "گرید نیشانبدە",
+    "toggleGrid": "",
     "addToLibrary": "زیادکردن بۆ کتێبخانە",
     "removeFromLibrary": "لابردن لە کتێبخانە",
     "libraryLoadingMessage": "...بارکردنی کتێبخانە",
     "libraries": "گەڕانی کتێبخانە",
     "loadingScene": "...بارکردنی دیمەنەکە",
+    "loadScene": "",
     "align": "لاچەنکردن",
     "alignTop": "لاچەنکردن بۆ سەرەوە",
     "alignBottom": "لاچەنکردن بۆ خوارەوە",
@@ -105,7 +117,9 @@
     "share": "هاوبەشی پێکردن",
     "showStroke": "ڕەنگهەڵگری هێڵکار نیشانبدە",
     "showBackground": "ڕەنگهەڵگری باکگراوند نیشانبدە",
-    "toggleTheme": "دۆخی ڕوکار بگۆڕە",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "کتێبخانەی کەسی",
     "excalidrawLib": "کتێبخانەی Excalidraw",
     "decreaseFontSize": "کەمکردنەوەی قەبارەی فۆنت",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "دەستکاریکردنی بەستەر",
       "editEmbed": "",
-      "create": "دروستکردنی بەستەر",
-      "createEmbed": "",
+      "create": "",
       "label": "بەستەر",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "دەستکاری کردنی دێڕ",
-      "exit": "دەرچوون لە دەستکاریکەری دێڕ"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "قفڵکردن",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "هەموو توخمەکانی ناو چوارچێوەکە لابەرە",
     "eyeDropper": "ڕەنگێک لەسەر تابلۆکە هەڵبژێرە",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "هێشتا هیچ بڕگەیەک زیاد نەکراوە...",
     "hint_emptyLibrary": "شتێک لەسەر تابلۆ هەڵبژێرە بۆ ئەوەی لێرە زیادی بکەیت، یان کتێبخانەیەک لە کۆگا گشتیەکەوە دابمەزرێنە، لە خوارەوە.",
-    "hint_emptyPrivateLibrary": "شتێک لەسەر تابلۆ هەڵبژێرە بۆ ئەوەی لێرە زیادی بکەیت."
+    "hint_emptyPrivateLibrary": "شتێک لەسەر تابلۆ هەڵبژێرە بۆ ئەوەی لێرە زیادی بکەیت.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "تابلۆکە وەک سەرەتا لێبکەوە",
@@ -151,6 +204,7 @@
     "exportImage": "وێنە هەناردە بکە...",
     "export": "پاشەکەوت بکە بۆ...",
     "copyToClipboard": "له‌به‌ری بگره‌وه‌ بۆ ته‌خته‌نووس",
+    "copyLink": "",
     "save": "پاشەکەوت بکە بۆ فایلی بەردەست",
     "saveAs": "پاشەکەوتکردن وەک",
     "load": "بکەرەوە",
@@ -171,14 +225,16 @@
     "fullScreen": "پڕ بە شاشە",
     "darkMode": "دۆخی تاریک",
     "lightMode": "دۆخی ڕووناک",
+    "systemMode": "",
     "zenMode": "دۆخی زێن",
     "objectsSnapMode": "",
     "exitZenMode": "بەجێهێشتنی دۆخی زێن",
     "cancel": "هەڵوەشاندنەوە",
+    "saveLibNames": "",
     "clear": "خاوێنکردنەوە",
     "remove": "لابردن",
     "embed": "",
-    "publishLibrary": "بڵاوکردنەوە",
+    "publishLibrary": "",
     "submit": "پێشکەشکردن",
     "confirm": "دوپاتکردنەوە",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "ئەمە کتێبخانەکەت خاوێن دەکاتەوە. ئایا دڵنیایت?",
     "removeItemsFromsLibrary": "سڕینەوەی {{count}} ئایتم(ەکان) لە کتێبخانە؟",
     "invalidEncryptionKey": "کلیلی رەمزاندن دەبێت لە 22 پیت بێت. هاوکاری ڕاستەوخۆ لە کارخراوە.",
-    "collabOfflineWarning": "هێڵی ئینتەرنێت بەردەست نییە.\n گۆڕانکارییەکانت سەیڤ ناکرێن!"
+    "collabOfflineWarning": "هێڵی ئینتەرنێت بەردەست نییە.\n گۆڕانکارییەکانت سەیڤ ناکرێن!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "جۆری فایلی پشتگیری نەکراو.",
@@ -212,9 +269,9 @@
     "fileTooBig": "فایلەکە زۆر گەورەیە. زۆرترین قەبارەی ڕێگەپێدراو {{maxSize}}}.",
     "svgImageInsertError": "نەیتوانی وێنەی SVG داخڵ بکات. نیشانەی ئێس ڤی جی نادروست دیارە.",
     "failedToFetchImage": "",
-    "invalidSVGString": "ئێس ڤی جی نادروستە.",
     "cannotResolveCollabServer": "ناتوانێت پەیوەندی بکات بە سێرڤەری کۆلاب. تکایە لاپەڕەکە دووبارە باربکەوە و دووبارە هەوڵ بدەوە.",
     "importLibraryError": "نەیتوانی کتێبخانە بار بکات",
+    "saveLibraryError": "",
     "collabSaveFailed": "نەتوانرا لە بنکەدراوەی ڕاژەدا پاشەکەوت بکرێت. ئەگەر کێشەکان بەردەوام بوون، پێویستە فایلەکەت لە ناوخۆدا هەڵبگریت بۆ ئەوەی دڵنیا بیت کە کارەکانت لەدەست نادەیت.",
     "collabSaveFailed_sizeExceeded": "نەتوانرا لە بنکەدراوەی ڕاژەدا پاشەکەوت بکرێت، پێدەچێت تابلۆکە زۆر گەورە بێت. پێویستە فایلەکە لە ناوخۆدا هەڵبگریت بۆ ئەوەی دڵنیا بیت کە کارەکانت لەدەست نادەیت.",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "دەستنیشانکردن",
+    "lasso": "",
     "image": "داخڵکردنی وێنە",
     "rectangle": "لاکێشە",
     "diamond": "ئەڵماس",
@@ -246,7 +304,7 @@
     "library": "کتێبخانە",
     "lock": "ئامێرە دیاریکراوەکان چالاک بهێڵەوە دوای وێنەکێشان",
     "penMode": "شێوازی قەڵەم - دەست لێدان ڕابگرە",
-    "link": "زیادکردن/ نوێکردنەوەی لینک بۆ شێوەی دیاریکراو",
+    "link": "",
     "eraser": "سڕەر",
     "frame": "ئامرازی چوارچێوە",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "دەست (ئامرازی پانکردن)",
     "extraTools": "ئامرازی زیاتر",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "کردارەکانی تابلۆ",
@@ -263,28 +337,33 @@
     "shapes": "شێوەکان"
   },
   "hints": {
-    "canvasPanning": "بۆ جوڵاندنی تابلۆ، ویلی ماوسەکەت یان دوگمەی سپەیس بگرە لەکاتی ڕاکێشاندە، یانیش ئامرازی دەستەکە بەکاربهێنە",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "کرتە بکە بۆ دەستپێکردنی چەند خاڵێک، ڕایبکێشە بۆ یەک هێڵ",
+    "arrowTool": "",
     "freeDraw": "کرتە بکە و ڕایبکێشە، کاتێک تەواو بوویت دەست هەڵگرە",
     "text": "زانیاری: هەروەها دەتوانیت دەق زیادبکەیت بە دوو کرتەکردن لە هەر شوێنێک لەگەڵ ئامڕازی دەستنیشانکردن",
     "embeddable": "",
-    "text_selected": "دووجار کلیک بکە یان ENTER بکە بۆ دەستکاریکردنی دەق",
-    "text_editing": "بۆ تەواوکردنی دەستکاریکردنەکە Escape یان Ctrl/Cmd+ENTER بکە",
-    "linearElementMulti": "کلیک لەسەر کۆتا خاڵ بکە یان Escape یان Enter بکە بۆ تەواوکردن",
-    "lockAngle": "دەتوانیت گۆشە سنووردار بکەیت بە ڕاگرتنی SHIFT",
-    "resize": "دەتوانیت ڕێژەکان سنووردار بکەیت بە ڕاگرتنی SHIFT لەکاتی گۆڕینی قەبارەدا،\nALT ڕابگرە بۆ گۆڕینی قەبارە لە ناوەندەوە",
-    "resizeImage": "دەتوانیت بە ئازادی قەبارە بگۆڕیت بە ڕاگرتنی SHIFT،\nALT ڕابگرە بۆ گۆڕینی قەبارە لە ناوەندەوە",
-    "rotate": "دەتوانیت گۆشەکان سنووردار بکەیت بە ڕاگرتنی SHIFT لەکاتی سوڕانەوەدا",
-    "lineEditor_info": "یان Ctrl یان Cmd بگرە و دوانە کلیک بکە یانیش پەنجە بنێ بە Ctrl یان Cmd + ئینتەر بۆ دەستکاریکردنی خاڵەکان",
-    "lineEditor_pointSelected": "بۆ لابردنی خاڵەکان Delete دابگرە، Ctrl Cmd+D بکە بۆ لەبەرگرتنەوە، یان بۆ جووڵە ڕاکێشان بکە",
-    "lineEditor_nothingSelected": "خاڵێک هەڵبژێرە بۆ دەستکاریکردن (SHIFT ڕابگرە بۆ هەڵبژاردنی چەندین)،\nیان Alt ڕابگرە و کلیک بکە بۆ زیادکردنی خاڵە نوێیەکان",
-    "placeImage": "کلیک بکە بۆ دانانی وێنەکە، یان کلیک بکە و ڕایبکێشە بۆ ئەوەی قەبارەکەی بە دەستی دابنێیت",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "کتێبخانەی تایبەت بە خۆت بڵاوبکەرەوە",
-    "bindTextToElement": "بۆ زیادکردنی دەق enter بکە",
-    "deepBoxSelect": "CtrlOrCmd ڕابگرە بۆ هەڵبژاردنی قووڵ، و بۆ ڕێگریکردن لە ڕاکێشان",
-    "eraserRevert": "بۆ گەڕاندنەوەی ئەو توخمانەی کە بۆ سڕینەوە نیشانە کراون، Alt ڕابگرە",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "ئەم تایبەتمەندییە بە ئەگەرێکی زۆرەوە دەتوانرێت چالاک بکرێت بە ڕێکخستنی ئاڵای \"dom.events.asyncClipboard.clipboardItem\" بۆ \"true\". بۆ گۆڕینی ئاڵاکانی وێبگەڕ لە فایەرفۆکسدا، سەردانی لاپەڕەی \"about:config\" بکە.",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "ناتوانرێ پێشبینین پیشان بدرێت",
@@ -299,9 +378,12 @@
     "openIssueMessage": "ئێمە زۆر وریا بووین کە زانیارییەکانی دیمەنەکەت لەسەر هەڵەکە نەخەینەڕوو. ئەگەر دیمەنەکەت تایبەت نییە، تکایە بیر لە بەدواداچوون بکەنەوە بۆ ئێمە <button>شوێنپێهەڵگری هەڵە.</button> تکایە ئەم زانیارییانەی خوارەوە کۆپی بکە و لە بەشی کێشەکانی Github دایبنێ.",
     "sceneContent": "پێکهاتەی ناو دیمەنەکە:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "دەتوانیت خەڵک بانگهێشت بکەیت بۆ دیمەنی ئێستات بۆ هاوکاری کردن لەگەڵت.",
-    "desc_privacy": "نیگەران مەبە، دانیشتنەکە کۆدکردنی کۆتایی بە کۆتایی بەکاردەهێنێت، بۆیە هەرچییەک بکێشیت بە تایبەتی دەمێنێتەوە. تەنانەت سێرڤەرەکەمان ناتوانێت بزانێت کە تۆ چیت دروستکردووە.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "دەستپێکردنی دانیشتن",
     "button_stopSession": "وەستاندنی دانیشتن",
     "desc_inProgressIntro": "دانیشتنی هاوکاری ڕاستەوخۆ ئێستا لە ئارادایە.",
@@ -328,6 +410,8 @@
     "click": "گرتە",
     "deepSelect": "دەستنیشانکردنی قوڵ",
     "deepBoxSelect": "لەناو بۆکسەکەدا بە قووڵی هەڵبژێرە، و ڕێگری لە ڕاکێشان بکە",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "تیری نوشتاوە",
     "curvedLine": "هێڵی نوشتاوە",
     "documentation": "دۆکیومێنتەیشن",
@@ -350,7 +434,9 @@
     "zoomToSelection": "زووم بکە بۆ دەستنیشانکراوەکان",
     "toggleElementLock": "قفڵ/کردنەوەی دەستنیشانکراوەکان",
     "movePageUpDown": "لاپەڕەکە بجوڵێنە بۆ سەرەوە/خوارەوە",
-    "movePageLeftRight": "لاپەڕەکە بجوڵێنە بۆ چەپ/ڕاست"
+    "movePageLeftRight": "لاپەڕەکە بجوڵێنە بۆ چەپ/ڕاست",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "تابلۆکە خاوێن بکەرەوە"
@@ -410,8 +496,8 @@
       "copyPngToClipboard": "لەبەربگرەوە بۆ سەر تەختەنوس"
     },
     "button": {
-      "exportToPng": "PNG",
-      "exportToSvg": "SVG",
+      "exportToPng": "",
+      "exportToSvg": "",
       "copyPngToClipboard": "له‌به‌ری بگره‌وه‌ بۆ ته‌خته‌نووس"
     }
   },
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "گۆشە",
-    "element": "توخم",
-    "elements": "توخمەکان",
+    "shapes": "",
     "height": "بەرزی",
     "scene": "دیمەنەکە",
     "selected": "دەستنیشانکراوەکان",
     "storage": "بیرگە",
-    "title": "ئامار بۆ نێردەکان",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "گشتی",
     "version": "وەشان",
     "versionCopy": "کلیک بۆ لەبەرگرتنەوە",
@@ -439,13 +527,15 @@
     "copyStyles": "ستایلی کۆپیکراو.",
     "copyToClipboard": "لەبەرگیرایەوە بۆ تەختەنوس.",
     "copyToClipboardAsPng": "کۆپی کراوە {{exportSelection}} بۆ کلیپبۆرد وەک PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "فایل هەڵگیرا.",
     "fileSavedToFilename": "هەڵگیراوە بۆ {filename}",
     "canvas": "تابلۆ",
     "selection": "دەستنیشانکراوەکان",
     "pasteAsSingleElement": "بۆ دانانەوە وەکو یەک توخم یان دانانەوە بۆ نێو دەسکاریکەرێکی دەق کە بوونی هەیە {{shortcut}} بەکاربهێنە",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "ڕوون",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "زۆرترین ڕەنگە باوە بەکارهاتووەکان",
     "colors": "ڕەنگەکان",
     "shades": "سێبەرەکان",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/lt-LT.json b/packages/excalidraw/locales/lt-LT.json
index 2ddffe6e27..aa9f39f71d 100644
--- a/packages/excalidraw/locales/lt-LT.json
+++ b/packages/excalidraw/locales/lt-LT.json
@@ -21,7 +21,9 @@
     "copyStyles": "Kopijuoti stilius",
     "pasteStyles": "Įklijuoti stilius",
     "stroke": "Linija",
+    "changeStroke": "",
     "background": "Fonas",
+    "changeBackground": "",
     "fill": "Užpildymas",
     "strokeWidth": "Linijos storis",
     "strokeStyle": "Linijos stilius",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Šrifto dydis",
     "fontFamily": "Šriftas",
     "addWatermark": "Sukurta su Excalidraw",
@@ -72,6 +82,7 @@
     "canvasColors": "",
     "canvasBackground": "Drobės fonas",
     "drawingCanvas": "",
+    "clearCanvas": "",
     "layers": "Sluoksniai",
     "actions": "Veiksmai",
     "language": "Kalba",
@@ -84,12 +95,13 @@
     "group": "Grupuoti pasirinkimą",
     "ungroup": "Išgrupuoti pasirinkimą",
     "collaborators": "Bendradarbiautojai",
-    "showGrid": "Rodyti tinklelį",
+    "toggleGrid": "",
     "addToLibrary": "Pridėti į biblioteką",
     "removeFromLibrary": "Pašalinti iš bibliotekos",
     "libraryLoadingMessage": "",
     "libraries": "Naršyti bibliotekas",
     "loadingScene": "",
+    "loadScene": "",
     "align": "Lygiuoti",
     "alignTop": "Lygiuoti viršuje",
     "alignBottom": "Lygiuoti apačioje",
@@ -105,7 +117,9 @@
     "share": "Dalintis",
     "showStroke": "",
     "showBackground": "",
+    "showFonts": "",
     "toggleTheme": "",
+    "theme": "",
     "personalLib": "Asmeninė biblioteka",
     "excalidrawLib": "Exaclidraw biblioteka",
     "decreaseFontSize": "",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Redeguoti nuorodą",
       "editEmbed": "",
-      "create": "Sukurti nuorodą",
-      "createEmbed": "",
+      "create": "",
       "label": "Nuoroda",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "",
-      "exit": ""
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Užrakinti",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "",
@@ -151,6 +204,7 @@
     "exportImage": "",
     "export": "",
     "copyToClipboard": "Kopijuoti į iškarpinę",
+    "copyLink": "",
     "save": "",
     "saveAs": "Išsaugoti kaip",
     "load": "",
@@ -171,14 +225,16 @@
     "fullScreen": "Visas ekranas",
     "darkMode": "Tamsus režimas",
     "lightMode": "Šviesus režimas",
+    "systemMode": "",
     "zenMode": "„Zen“ režimas",
     "objectsSnapMode": "",
     "exitZenMode": "Išeiti iš „Zen“ režimo",
     "cancel": "Atšaukti",
+    "saveLibNames": "",
     "clear": "Išvalyti",
     "remove": "Pašalinti",
     "embed": "",
-    "publishLibrary": "Paskelbti",
+    "publishLibrary": "",
     "submit": "Pateikti",
     "confirm": "Patvirtinti",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "Tai išvalys tavo biblioteką. Ar tikrai to nori?",
     "removeItemsFromsLibrary": "Ištrinti {{count}} elementą/-us iš bibliotekos?",
     "invalidEncryptionKey": "Šifravimo raktas turi būti iš 22 simbolių. Redagavimas gyvai yra išjungtas.",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Nepalaikomas failo tipas.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Per didelis failas. Didžiausias leidžiamas dydis yra {{maxSize}}.",
     "svgImageInsertError": "Nepavyko įtraukti SVG paveiksliuko. Panašu, jog SVG yra nevalidus.",
     "failedToFetchImage": "",
-    "invalidSVGString": "Nevalidus SVG.",
     "cannotResolveCollabServer": "Nepavyko prisijungti prie serverio bendradarbiavimui. Perkrauk puslapį ir pabandyk prisijungti dar kartą.",
     "importLibraryError": "Nepavyko įkelti bibliotekos",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Žymėjimas",
+    "lasso": "",
     "image": "Įkelti paveiksliuką",
     "rectangle": "Stačiakampis",
     "diamond": "Deimantas",
@@ -246,7 +304,7 @@
     "library": "Biblioteka",
     "lock": "Baigus piešti, išlaikyti pasirinktą įrankį",
     "penMode": "Rašyklio režimas - neleisti prisilietimų",
-    "link": "Pridėti / Atnaujinti pasirinktos figūros nuorodą",
+    "link": "",
     "eraser": "Trintukas",
     "frame": "",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Veiksmai su drobe",
@@ -263,8 +337,10 @@
     "shapes": "Figūros"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "Paspaudimai sukurs papildomus taškus, nepertraukiamas tempimas sukurs liniją",
+    "arrowTool": "",
     "freeDraw": "Spausk ir tempk, paleisk kai norėsi pabaigti",
     "text": "Užuomina: tekstą taip pat galima pridėti bet kur su dvigubu pelės paspaudimu, kol parinkas žymėjimo įrankis",
     "embeddable": "",
@@ -276,15 +352,18 @@
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "",
@@ -299,6 +378,9 @@
     "openIssueMessage": "",
     "sceneContent": ""
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
     "desc_intro": "",
     "desc_privacy": "",
@@ -328,6 +410,8 @@
     "click": "paspaudimas",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Banguota rodyklė",
     "curvedLine": "Banguota linija",
     "documentation": "Dokumentacija",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Priartinti iki pažymėtos vietos",
     "toggleElementLock": "",
     "movePageUpDown": "Pajudinti puslapį aukštyn/žemyn",
-    "movePageLeftRight": "Pajudinti puslapį kairėn/dešinėn"
+    "movePageLeftRight": "Pajudinti puslapį kairėn/dešinėn",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Išvalyti drobę"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "",
-    "element": "Elementas",
-    "elements": "Elementai",
+    "shapes": "",
     "height": "Aukštis",
     "scene": "Scena",
     "selected": "Pasirinkta",
     "storage": "Saugykla",
-    "title": "Informacija moksliukams",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "",
     "version": "",
     "versionCopy": "",
@@ -439,13 +527,15 @@
     "copyStyles": "",
     "copyToClipboard": "Nukopijuota į iškarpinę.",
     "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Failas išsaugotas.",
     "fileSavedToFilename": "Išsaugota į {filename}",
     "canvas": "drobė",
     "selection": "",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Permatoma",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/lv-LV.json b/packages/excalidraw/locales/lv-LV.json
index edfb28e51f..42abe5cdb1 100644
--- a/packages/excalidraw/locales/lv-LV.json
+++ b/packages/excalidraw/locales/lv-LV.json
@@ -21,7 +21,9 @@
     "copyStyles": "Kopēt stilus",
     "pasteStyles": "Ielīmēt stilus",
     "stroke": "Svītras krāsa",
+    "changeStroke": "",
     "background": "Fona krāsa",
+    "changeBackground": "",
     "fill": "Aizpildījums",
     "strokeWidth": "Svītras platums",
     "strokeStyle": "Svītras stils",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Teksta lielums",
     "fontFamily": "Fontu saime",
     "addWatermark": "Pievienot \"Radīts ar Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Izmantots tāfelei",
     "canvasBackground": "Ainas fons",
     "drawingCanvas": "Tāfele",
+    "clearCanvas": "",
     "layers": "Slāņi",
     "actions": "Darbības",
     "language": "Valoda",
@@ -84,12 +95,13 @@
     "group": "Grupēt atlasīto",
     "ungroup": "Atgrupēt atlasīto",
     "collaborators": "Dalībnieki",
-    "showGrid": "Rādīt režģi",
+    "toggleGrid": "",
     "addToLibrary": "Pievienot bibliotēkai",
     "removeFromLibrary": "Izņemt no bibliotēkas",
     "libraryLoadingMessage": "Ielādē bibliotēku…",
     "libraries": "Apskatīt bibliotēkas",
     "loadingScene": "Ielādē ainu…",
+    "loadScene": "",
     "align": "Līdzināt",
     "alignTop": "Līdzināt augšpusē",
     "alignBottom": "Līdzināt lejā",
@@ -105,7 +117,9 @@
     "share": "Kopīgot",
     "showStroke": "Rādīt svītras krāsas atlasītāju",
     "showBackground": "Rādīt fona krāsas atlasītāju",
-    "toggleTheme": "Pārslēgt krāsu tēmu",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "Personīgā bibliotēka",
     "excalidrawLib": "Excalidraw bibliotēka",
     "decreaseFontSize": "Samazināt fonta izmēru",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Rediģēt saiti",
       "editEmbed": "",
-      "create": "Izveidot saiti",
-      "createEmbed": "",
+      "create": "",
       "label": "Saite",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Rediģēt līniju",
-      "exit": "Aizvērt līnijas redaktoru"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Fiksēt",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Neviena vienība vēl nav pievienota...",
     "hint_emptyLibrary": "Atlasiet objektu tāfelē, lai to šeit pievienotu, vai pievienojiet publisku bibliotēku zemāk.",
-    "hint_emptyPrivateLibrary": "Atlasiet objektu tāfelē, lai to šeit pievienotu."
+    "hint_emptyPrivateLibrary": "Atlasiet objektu tāfelē, lai to šeit pievienotu.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Atiestatīt tāfeli",
@@ -151,6 +204,7 @@
     "exportImage": "Eksportēt attēlu...",
     "export": "Saglabāt uz...",
     "copyToClipboard": "Kopēt starpliktuvē",
+    "copyLink": "",
     "save": "Saglabāt pašreizējo datni",
     "saveAs": "Saglabāt kā",
     "load": "Atvērt",
@@ -171,14 +225,16 @@
     "fullScreen": "Pilnekrāna režīms",
     "darkMode": "Tumšais režīms",
     "lightMode": "Gaišais režīms",
+    "systemMode": "",
     "zenMode": "Zen režīms",
     "objectsSnapMode": "",
     "exitZenMode": "Pamest Zen režīmu",
     "cancel": "Atcelt",
+    "saveLibNames": "",
     "clear": "Notīrīt",
     "remove": "Noņemt",
     "embed": "",
-    "publishLibrary": "Publicēt",
+    "publishLibrary": "",
     "submit": "Iesniegt",
     "confirm": "Apstiprināt",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "Šī funkcija iztukšos bibliotēku. Vai turpināt?",
     "removeItemsFromsLibrary": "Vai izņemt {{count}} vienumu(s) no bibliotēkas?",
     "invalidEncryptionKey": "Šifrēšanas atslēgai jābūt 22 simbolus garai. Tiešsaistes sadarbība ir izslēgta.",
-    "collabOfflineWarning": "Nav pieejams interneta pieslēgums.\nJūsu izmaiņas netiks saglabātas!"
+    "collabOfflineWarning": "Nav pieejams interneta pieslēgums.\nJūsu izmaiņas netiks saglabātas!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Neatbalstīts datnes veids.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Datne ir par lielu. Lielākais atļautais izmērs ir {{maxSize}}.",
     "svgImageInsertError": "Nevarēja ievietot SVG attēlu. Šķiet, ka SVG marķējums nav derīgs.",
     "failedToFetchImage": "",
-    "invalidSVGString": "Nederīgs SVG.",
     "cannotResolveCollabServer": "Nevarēja savienoties ar sadarbošanās serveri. Lūdzu, pārlādējiet lapu un mēģiniet vēlreiz.",
     "importLibraryError": "Nevarēja ielādēt bibliotēku",
+    "saveLibraryError": "",
     "collabSaveFailed": "Darbs nav saglabāts datubāzē. Ja problēma turpinās, saglabājiet datni lokālajā krātuvē, lai nodrošinātos pret darba pazaudēšanu.",
     "collabSaveFailed_sizeExceeded": "Darbs nav saglabāts datubāzē, šķiet, ka tāfele ir pārāk liela. Saglabājiet datni lokālajā krātuvē, lai nodrošinātos pret darba pazaudēšanu.",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Atlase",
+    "lasso": "",
     "image": "Ievietot attēlu",
     "rectangle": "Taisnstūris",
     "diamond": "Rombs",
@@ -246,7 +304,7 @@
     "library": "Bibliotēka",
     "lock": "Paturēt izvēlēto rīku pēc darbības",
     "penMode": "Pildspalvas režīms – novērst pieskaršanos",
-    "link": "Pievienot/rediģēt atlasītās figūras saiti",
+    "link": "",
     "eraser": "Dzēšgumija",
     "frame": "",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "Roka (panoramēšanas rīks)",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Tāfeles darbības",
@@ -263,28 +337,33 @@
     "shapes": "Formas"
   },
   "hints": {
-    "canvasPanning": "Lai bīdītu tāfeli, turiet nospiestu ritināšanas vai atstarpes taustiņu, vai izmanto rokas rīku",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Klikšķiniet, lai sāktu zīmēt vairākus punktus; velciet, lai zīmētu līniju",
+    "arrowTool": "",
     "freeDraw": "Spiediet un velciet; atlaidiet, kad pabeidzat",
     "text": "Ieteikums: lai pievienotu tekstu, varat arī jebkur dubultklikšķināt ar atlases rīku",
     "embeddable": "",
-    "text_selected": "Dubultklikšķiniet vai spiediet ievades taustiņu, lai rediģētu tekstu",
-    "text_editing": "Spiediet iziešanas taustiņu vai CtrlOrCmd+ENTER, lai beigtu rediģēt",
-    "linearElementMulti": "Klikšķiniet uz pēdējā punkta vai spiediet izejas vai ievades taustiņu, lai pabeigtu",
-    "lockAngle": "Varat ierobežot leņķi, turot nospiestu SHIFT",
-    "resize": "Kad maināt izmēru, varat ierobežot proporcijas, turot nospiestu SHIFT,\nvai arī ALT, lai mainītu izmēru ap centru",
-    "resizeImage": "Varat brīvi mainīt izmēru, turot nospiestu SHIFT;\nturiet nospiestu ALT, lai mainītu izmēru ap centru",
-    "rotate": "Rotējot varat ierobežot leņķi, turot nospiestu SHIFT",
-    "lineEditor_info": "Turiet CtrlOrCmd un dubultklikšķiniet, vai spiediet CtrlOrCmd + Enter, lai rediģētu punktus",
-    "lineEditor_pointSelected": "Spiediet dzēšanas taustiņu, lai noņemtu punktus, – CtrlOrCmd+D, lai to kopētu, vai velciet, lai pārvietotu",
-    "lineEditor_nothingSelected": "Atlasiet punktu, lai labotu (turiet nospiestu SHIFT, lai atlasītu vairākus),\nvai turiet Alt un clikšķiniet, lai pievienotu jaunus punktus",
-    "placeImage": "Klikšķiniet, lai novietotu attēlu, vai spiediet un velciet, lai iestatītu tā izmēru",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publicēt savu bibliotēku",
-    "bindTextToElement": "Spiediet ievades taustiņu, lai pievienotu tekstu",
-    "deepBoxSelect": "Turient nospiestu Ctrl vai Cmd, lai atlasītu dziļumā un lai nepieļautu objektu pavilkšanu",
-    "eraserRevert": "Turiet Alt, lai noņemtu elementus no dzēsšanas atlases",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Šis iestatījums var tikt ieslēgts ar \"dom.events.asyncClipboard.clipboardItem\" marķieri pārslēgtu uz \"true\". Lai mainītu pārlūka marķierus Firefox, apmeklē \"about:config\" lapu.",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Nevar rādīt priekšskatījumu",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Mēs uzmanījāmies, lai neiekļautu jūsu ainas informāciju šajā kļūdā. Ja jūsu aina nav privāta, lūdzu ziņojiet par šo kļūdu mūsu <button>kļūdu uzskaitē.</button> Lūdzu, miniet sekojošo informāciju to kopējot un ielīmējot jūsu ziņojumā platformā GitHub.",
     "sceneContent": "Ainas saturs:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "Varat ielūgt cilvēkus pašreizējajā ainā, lai sadarbotos ar tiem.",
-    "desc_privacy": "Neuztraucieties, sesija izmanto šifrēšanu no gala līdz galam, tātad jūsu zīmējums paliks privāts. Pat mūsu serveri nevarēs redzēt, ar ko esat nācis klajā.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Sākt sesiju",
     "button_stopSession": "Beigt sesiju",
     "desc_inProgressIntro": "Notiek tiešsaistes sadarbības sesija.",
@@ -328,6 +410,8 @@
     "click": "klikšķis",
     "deepSelect": "Atlasīt dziļumā",
     "deepBoxSelect": "Atlasīt dziļumā kastes ietvaros, un nepieļaut pavilkšanu",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Liekta bulta",
     "curvedLine": "Liekta līnija",
     "documentation": "Dokumentācija",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Iestatīt mērogu, lai rādītu atlasi",
     "toggleElementLock": "Fiksēt/atbrīvot atlasīto",
     "movePageUpDown": "Pārvietot lapu augšup/lejup",
-    "movePageLeftRight": "Pārvietot lapu pa labi/kreisi"
+    "movePageLeftRight": "Pārvietot lapu pa labi/kreisi",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Notīrīt tāfeli"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Leņķis",
-    "element": "Elements",
-    "elements": "Elementi",
+    "shapes": "",
     "height": "Augstums",
     "scene": "Aina",
     "selected": "Atlasīti",
     "storage": "Krātuve",
-    "title": "Statistika entuziastiem",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Kopā",
     "version": "Versija",
     "versionCopy": "Klikšķiniet, lai nokopētu",
@@ -439,13 +527,15 @@
     "copyStyles": "Nokopēja stilus.",
     "copyToClipboard": "Nokopēja starpliktuvē.",
     "copyToClipboardAsPng": "Nokopēja {{exportSelection}} starpliktuvē kā PNG ({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Datne saglabāta.",
     "fileSavedToFilename": "Saglabāts kā {filename}",
     "canvas": "tāfeli",
     "selection": "atlasi",
     "pasteAsSingleElement": "Izmantojiet {{shortcut}}, lai ielīmētu kā jaunu elementu, vai ielīmētu esošā teksta lauciņā",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Caurspīdīgs",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/mr-IN.json b/packages/excalidraw/locales/mr-IN.json
index 5d13a2ffe1..584bcd0443 100644
--- a/packages/excalidraw/locales/mr-IN.json
+++ b/packages/excalidraw/locales/mr-IN.json
@@ -21,7 +21,9 @@
     "copyStyles": "शैली कॉपी करा",
     "pasteStyles": "कॉपी केलेली शैली वापरा",
     "stroke": "रेघे चा रंग",
+    "changeStroke": "रेषेचा रंग बदला",
     "background": "पार्श्वभूमी",
+    "changeBackground": "पार्श्वभूमीचा रंग बदला",
     "fill": "भरा",
     "strokeWidth": "रेघ रुंदी",
     "strokeStyle": "रेघ शैली",
@@ -38,12 +40,20 @@
     "arrowhead_none": "कुठलाहि नाही",
     "arrowhead_arrow": "बाण",
     "arrowhead_bar": "दांडुक",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "वृत्त",
+    "arrowhead_circle_outline": "वृत्त (बाह्यरेखा)",
     "arrowhead_triangle": "त्रिकोण",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "त्रिभुज (बाह्यरेखा)",
+    "arrowhead_diamond": "चौकट",
+    "arrowhead_diamond_outline": "चौकट (बाह्यरेखा)",
+    "arrowhead_crowfoot_many": "चिमणि पाय (अनेक)",
+    "arrowhead_crowfoot_one": "चिमणि पाय (एक)",
+    "arrowhead_crowfoot_one_or_many": "चिमणि पाय (एक अथवा अनेक)",
+    "more_options": "आणिक विकल्प",
+    "arrowtypes": "बाणाचे प्रकार",
+    "arrowtype_sharp": "तीक्ष्ण तीर",
+    "arrowtype_round": "वक्राकार तीर",
+    "arrowtype_elbowed": "समकोणिय तीर",
     "fontSize": "अक्षर आकार",
     "fontFamily": "अक्षर समूह",
     "addWatermark": "\"एक्सकेलीड्रॉ ने बनवलेलं\" जोडा",
@@ -72,6 +82,7 @@
     "canvasColors": "कॅनवास वर वापरलेले",
     "canvasBackground": "पटल पार्श्वभूमि",
     "drawingCanvas": "चित्र पटल",
+    "clearCanvas": "पटल स्वच्छ करा",
     "layers": "स्तर",
     "actions": "क्रिया",
     "language": "भाषा",
@@ -84,12 +95,13 @@
     "group": "समूह निवड",
     "ungroup": "समूह निवड ला रद्द करा",
     "collaborators": "Sahayog",
-    "showGrid": "ग्रिड दाखवा",
+    "toggleGrid": "जाळी ऑन ऑफ़ करा",
     "addToLibrary": "संग्रह मधे सम्मिलित करा",
     "removeFromLibrary": "संग्रहातून काढ़ा",
     "libraryLoadingMessage": "संग्रह लोड होत आहे…",
     "libraries": "संग्रह देखे",
     "loadingScene": "दृश्य लोड होत आहे…",
+    "loadScene": "फ़ाइल पासून दृश्य लोड करा",
     "align": "संरेखित करा",
     "alignTop": "वर संरेखित करा",
     "alignBottom": "खाली संरेखित करा",
@@ -105,7 +117,9 @@
     "share": "सामायिक करा",
     "showStroke": "रेघ रंग निवड यंत्र दाखवा",
     "showBackground": "पार्श्वभूमि: रंग निवड यंत्र दाखवा",
-    "toggleTheme": "शैली बदला",
+    "showFonts": "लिपि निवड़क दाखवा",
+    "toggleTheme": "उजेड़ाची किव्हा अंधाराची प्रणाली बदला",
+    "theme": "संरचना पद्धति",
     "personalLib": "वैयक्तिक संग्रह",
     "excalidrawLib": "एक्सकेलीड्रॉ संग्रह",
     "decreaseFontSize": "अक्षर आकार छोटा करा",
@@ -115,16 +129,21 @@
     "createContainerFromText": "मजकूर कंटेनर मधे मोडून दाखवा",
     "link": {
       "edit": "दुवा संपादन",
-      "editEmbed": "कड़ी सम्पादित करा आणि रुतवा",
-      "create": "दुवा तयार करा",
-      "createEmbed": "नवीन कड़ी बनवा आणि रुतवा",
+      "editEmbed": "रुतलेल्या दुवा ह्याचे संपादन",
+      "create": "दुवा जोडा",
       "label": "दुवा",
       "labelEmbed": "कड़ी आणि रूतवणे",
-      "empty": "कुठलिही कड़ी दिली नाही"
+      "empty": "कुठलिही कड़ी दिली नाही",
+      "hint": "आपला दुवा येथे टाइप करा अथवा येथे चिटकवा",
+      "goToElement": "निर्धारित घटक या वर जावे"
     },
     "lineEditor": {
       "edit": "रेघ संपादन",
-      "exit": "रेघ संपादकाबाहेर"
+      "editArrow": "बाण संपादन"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "कुलूपात ठेवा",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "चौकटीतले सर्व तत्वांचे चयन करा",
     "removeAllElementsFromFrame": "चौकटीतून सर्व काढून टाका",
     "eyeDropper": "चित्रफलकातून रंग निवडा",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "लिपि पासून चित्र",
+    "prompt": "प्रश्न",
+    "followUs": "आमचं अनुकरण करा",
+    "discordChat": "डिस्कोर्ड संवाद",
+    "zoomToFitViewport": "पूर्ण दृश्यरूप आकार",
+    "zoomToFitSelection": "निवडी प्रयंत दृश्यरूप आकार करा",
+    "zoomToFit": "सर्व तत्व दिसतील असे दृश्यरूप आकार करा",
+    "installPWA": "एक्षकाली ड्रॉ स्थानीय स्वरूपात इंस्टॉल करावे (PWA)",
+    "autoResize": "स्वयं आकार पुनः निर्धारण",
+    "imageCropping": "प्रतिमा कापणे",
+    "unCroppedDimension": "कापण्या पूर्विचे परिमाण",
+    "copyElementLink": "वस्तू ह्याचा दुवा कॉपी करावे",
+    "linkToElement": "वस्तू ह्याचा दुवा",
+    "wrapSelectionInFrame": "चौकटित निवडलेले गुंडाळा",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "वस्तू ह्याचा दुवा",
+    "desc": "चित्र-पटल वरचा कोणताही आकारावर क्लिक करावे अथवा दुवा ह्याला चिटकावे.",
+    "notFound": "चित्र-पटल वर दुवा वाली वस्तू सापडली नाही."
   },
   "library": {
     "noItems": "अजून कोणतेही आइटम जोडलेले नाही...",
     "hint_emptyLibrary": "पटल वर एक वस्तु निवडुन एथे जोडा, किव्हा एक संग्रह जन कोष कडुन खाली स्थापित करा.",
-    "hint_emptyPrivateLibrary": "ईथे जोडण्या साठी पटल वरून एक वस्तु निवडा."
+    "hint_emptyPrivateLibrary": "ईथे जोडण्या साठी पटल वरून एक वस्तु निवडा.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "पटल वर पहा",
+    "noMatch": "मिळते जुळते काहिही सापडले नाही...",
+    "singleResult": "निकाल",
+    "multipleResults": "निकाल",
+    "placeholder": "पटल वर पाठ्य शोधा...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "पटल पुसा",
@@ -151,6 +204,7 @@
     "exportImage": "प्रतिमा निर्यात करा...",
     "export": "येथे सुरक्षित करा...",
     "copyToClipboard": "फळी वर कॉपी करा",
+    "copyLink": "कड़ी ची कॉपी करावी",
     "save": "वर्तमान फ़ाइल मधे जतन करा",
     "saveAs": "ह्या नावाने जतन करा",
     "load": "उघडा",
@@ -171,14 +225,16 @@
     "fullScreen": "पूर्ण दृश्यपटल",
     "darkMode": "अंधार स्थिथि",
     "lightMode": "उजेड स्थिति",
+    "systemMode": "तांत्रिक पद्धत",
     "zenMode": "ध्यानग्र स्थिति",
     "objectsSnapMode": "वस्तूंपासून पकड़ा",
     "exitZenMode": "ध्यानग्र स्थितितून बाहेर",
     "cancel": "रद्द",
+    "saveLibNames": "",
     "clear": "स्वछ",
     "remove": "हटवा",
-    "embed": "रुतवणे उलटे करा",
-    "publishLibrary": "प्रकाशित करा",
+    "embed": "रुतवणे पलटे करा",
+    "publishLibrary": "",
     "submit": "जमा करा",
     "confirm": "पुष्टि करा",
     "embeddableInteractionButton": "संवादा साठी क्लिक करा"
@@ -204,7 +260,8 @@
     "resetLibrary": "पटल स्वच्छ होणार, तुम्हाला खात्री आहे का?",
     "removeItemsFromsLibrary": "संग्रहातून {{count}} तत्व (एक किव्हा अनेक) काढू?",
     "invalidEncryptionKey": "कूटबद्धन कुंजी 22 अक्षरांची असणे आवश्यक आहे. थेट सहयोग अक्षम केले आहे.",
-    "collabOfflineWarning": "इंटरनेट कनेक्शन उपलब्ध नाही.\nतुमचे बदल जतन केले जाणार नाहीत!"
+    "collabOfflineWarning": "इंटरनेट कनेक्शन उपलब्ध नाही.\nतुमचे बदल जतन केले जाणार नाहीत!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "असमर्थित फाइल प्रकार.",
@@ -212,9 +269,9 @@
     "fileTooBig": "फाइल फार मोठी आहे. आकाराची कमाल परवानगी {{maxSize}} आहे.",
     "svgImageInsertError": "एस-वी-जी प्रतिमा आत घालवू शकलो नाही. एस-वी-जी-मार्क-अप यंत्र अयोग्य आहे.",
     "failedToFetchImage": "प्रतिमा आणणे नाही जमले.",
-    "invalidSVGString": "अयोग्य एस-वी-जी.",
     "cannotResolveCollabServer": "कॉलेब-सर्वर हे पोहोचत नाही आहे. पान परत लोड करायचा प्रयत्न करावे.",
     "importLibraryError": "संग्रह प्रतिस्थापित नाही करता आला",
+    "saveLibraryError": "संग्रह सुरक्षित नाही करता आला. कृपया तुमचा संग्रह स्थानिक फ़ाइल मधे सुरक्षित करा त्याने तुमचे बदल सुरक्षित राहतील.",
     "collabSaveFailed": "काही कारणा निमित्त आतल्या डेटाबेसमध्ये जतन करू शकत नाही। समस्या तशिस राहिल्यास, तुम्ही तुमचे काम गमावणार नाही याची खात्री करण्यासाठी तुम्ही तुमची फाइल स्थानिक जतन करावी.",
     "collabSaveFailed_sizeExceeded": "लगता है कि पृष्ठ तल काफ़ी बड़ा है, इस्कारण अंदरूनी डेटाबेस में सहेजा नहीं जा सका। किये काम को खोने न देने के लिये अपनी फ़ाइल को स्थानीय रूप से सहेजे।\n\nबॅकएंड डेटाबेसमध्ये जतन करू शकत नाही, कॅनव्हास खूप मोठा असल्याचे दिसते. तुम्ही तुमचे काम गमावणार नाही याची खात्री करण्यासाठी तुम्ही फाइल स्थानिक पातळीवर जतन करावी.",
     "imageToolNotSupported": "प्रतिमां अक्षम केली गेली आहेत.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "निवड",
+    "lasso": "",
     "image": "प्रतिमा आत घाला",
     "rectangle": "आयत",
     "diamond": "चौकोन आकाराचा",
@@ -255,7 +313,23 @@
     "hand": "हात ( सरकवण्या चे उपकरण)",
     "extraTools": "आणिक यंत्रे",
     "mermaidToExcalidraw": "मर्मेड पासून एक्सकाली मधे",
-    "magicSettings": "कृतिम बुद्दिवत्ता सेटिंग्स"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "आयत",
+    "diamond": "चौकट",
+    "ellipse": "लंबवर्तुळाकार",
+    "arrow": "बाण",
+    "line": "रेषा",
+    "freedraw": "मुक्त चित्रांकन",
+    "text": "पाठ्य",
+    "image": "प्रतिमा",
+    "group": "गट",
+    "frame": "चौकट",
+    "magicframe": "वायरफ़्रेम पासून सांकेतिक लिपि",
+    "embeddable": "वेब रुतवा",
+    "selection": "निवड",
+    "iframe": "आयफ़्रेम"
   },
   "headings": {
     "canvasActions": "पटल क्रिया",
@@ -263,28 +337,33 @@
     "shapes": "आकार"
   },
   "hints": {
-    "canvasPanning": "कॅनव्हास सरकवण्या साठी, ड्रॅग करताना माउस व्हील धरा किंवा स्पेसबार दाबून ठेवा अथवा हात वालं उपकरण वापरा",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "अनेक बिंदु साठी क्लिक करा, रेघे साठी ड्रैग करा",
+    "arrowTool": "",
     "freeDraw": "क्लिक आणि ड्रैग करा, झालं तेव्हा सोडा",
     "text": "टीप: तुम्हीं निवड यंत्रानी कोठेही दुहेरी क्लिक करून टेक्स्ट जोडू शकता",
     "embeddable": "वेबसाइट रुतोण्या साठी दाबून-खेचा (क्लिक-ड्रैग करा)",
-    "text_selected": "लेखन संपादन साठी दुहेरी क्लिक करा किव्हा एंटर दाबा",
-    "text_editing": "संपादन संपवायचं असल्यास एस्केप दाबा किव्हा कंट्रोल या कम्मांड बरोबार एंटर दाबा",
-    "linearElementMulti": "शेवटच्या बिंदु वर क्लिक करा किव्हा एस्केप या एंटर दाबा",
-    "lockAngle": "शिफ्ट धरून तुम्ही कोन मर्यादित करू शकता",
-    "resize": "आकार छोटा मोठा करताना SHIFT धरून तुम्ही प्रमाण मर्यादित करू शकता, \nकेंद्रापासून आकार छोटा मोठा करण्यासाठी ALT धरून ठेवा",
-    "resizeImage": "SHIFT धरून तुम्ही मुक्तपणे आकार मोठा छोटा करु शकता,\nकेंद्रापासून आकार मोठा छोटा करण्यासाठी ALT धरून ठेवा",
-    "rotate": "फिरवत असताना शिफ्ट धरून तुम्ही कोन मर्यादित करू शकता",
-    "lineEditor_info": "पॉइंट संपादित करण्यासाठी CtrlOrCmd दाबून ठेवुन डबल-क्लिक करा किंवा CtrlOrCmd + Enter बरोबर दाबा",
-    "lineEditor_pointSelected": "बिंदु (एक किव्हा अनेक) काढ़ण्या साठी डिलीट की दाबा,\nCtrlOrCmd बरोबार D प्रति साठी,\nकिव्हा ड्रेग हलवण्या साठी",
-    "lineEditor_nothingSelected": "संपादित करण्यासाठी एक बिंदू निवडा (अनेक निवडण्यासाठी SHIFT धरून ठेवा),\nकिंवा Alt धरून ठेवा आणि नवीन बिंदू जोडण्यासाठी क्लिक करा",
-    "placeImage": "प्रतिमा ठेवण्यासाठी क्लिक करा, किंवा त्याचा आकार बदलण्या साठी क्लिक करा आणि ड्रॅग करा",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "आपला खाजगी संग्रह प्रकाशित करा",
-    "bindTextToElement": "मजकूर जोडण्यासाठी एंटर की दाबा",
-    "deepBoxSelect": "खोल निवड ह्या साठी कंट्रोल किव्हा कमांड दाबून ठेवा, आणि बाहेर खेचणे वाचवण्या साठी पण",
-    "eraserRevert": "खोडण्या साठी घेतलेल्या वस्तु ना घेण्या साठी Alt दाबून ठेवावे",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "हे वैशिष्ट्य \"dom.events.asyncClipboard.clipboardItem\" फ्लॅग \"सत्य\" वर सेट करून शक्यतो सक्षम केले जाऊ शकते. Firefox मध्ये ब्राउझर फ्लॅग बदलण्यासाठी, \"about:config\" पृष्ठावर जा.",
-    "disableSnapping": "स्नैपिंग अक्षम करण्या साठी CtrlOrCmd दाबून ठेवा"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "पूर्वावलोकन दाखवू शकत नाही",
@@ -299,9 +378,12 @@
     "openIssueMessage": "त्रुटीत तुमची दृश्य माहिती समाविष्ट न करण्यासाठी आम्ही खूप सावध होतो. तुमचा सीन खाजगी नसल्यास, कृपया आम्हाला पुढ च्या कारवाई साठी सम्पर्क साधा <button>त्रुटि व्यवस्थापन.</button> कृपया गिटहब समस्येमध्ये कॉपी आणि पेस्ट करून खालिल माहिती समाविष्ट करा.",
     "sceneContent": "दृश्य विषय:"
   },
+  "shareDialog": {
+    "or": "किंव्हा"
+  },
   "roomDialog": {
-    "desc_intro": "तुम्‍ही तुमच्‍या सध्‍याच्‍या दृश्यासाठी लोकांना आपल्‍यासह सहयोग करण्‍यासाठी आमंत्रित करू शकता.",
-    "desc_privacy": "काळजी करू नका, सत्र या टोकापासून त्या टोकापर्यंत कूटबद्धता वापरते, त्यामुळे तुम्ही जे काही काढाल ते खाजगी राहील. तुम्ही काय घेऊन आला आहात हे आमचा सर्व्हर ही देखील पाहू शकत नाही.",
+    "desc_intro": "तुमच्या चित्रात सहभागी व्हायला लोकांना आमंत्रित करा.",
+    "desc_privacy": "चिंते चं कही कारण नाही, सत्र ह्या टोका ते त्या टोका पर्यंत कूटबद्ध आहे, वर पूर्ण प्रकारे खाजगी पण. आपण काय चित्रित करता आहे हे आमचे सर्व्हर देखील पाहू शकत नाही.",
     "button_startSession": "सत्र सुरु करा",
     "button_stopSession": "सत्र थाम्बवा",
     "desc_inProgressIntro": "थेट सहयोग सत्र चालू आहे.",
@@ -328,6 +410,8 @@
     "click": "क्लिक करा",
     "deepSelect": "खोल निवड",
     "deepBoxSelect": "चौकट मधे खोल निवड करा आणि बाहेर ओढणे वाचवा",
+    "createFlowchart": "एका सामान्य अवयवा पासून प्रवाहचित्र बनवा",
+    "navigateFlowchart": "प्रवाहचित्रा चं अनुकरण करा",
     "curvedArrow": "वक्र बाण",
     "curvedLine": "वक्र रेघ",
     "documentation": "कागदपत्रे",
@@ -350,7 +434,9 @@
     "zoomToSelection": "निवडी प्रयंत दृश्यरूप आकार करा",
     "toggleElementLock": "कुलूपातून आत/बाहेर निवड",
     "movePageUpDown": "पान वर/खाली करा",
-    "movePageLeftRight": "पान डावी/उजवी कडे करा"
+    "movePageLeftRight": "पान डावी/उजवी कडे करा",
+    "cropStart": "प्रतिमा ह्याची कापणी करा",
+    "cropFinish": "प्रतिमा ह्याची कापणी संपूर्ण करा"
   },
   "clearCanvasDialog": {
     "title": "पटल स्वच्छ करा"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "कोण",
-    "element": "वस्तु",
-    "elements": "वस्तु",
+    "shapes": "आकार",
     "height": "उंची",
     "scene": "दृश्य",
     "selected": "निवडलेले",
     "storage": "साठवण",
-    "title": "अभ्यासू लोगो के लिये आंकडे",
+    "fullTitle": "पटल आणि आकार गुण",
+    "title": "गुण",
+    "generalStats": "सर्वसामान्य",
+    "elementProperties": "अकाराचे गुण",
     "total": "योग",
     "version": "आवृत्ती",
     "versionCopy": "कॉपी करायला क्लिक करा",
@@ -439,13 +527,15 @@
     "copyStyles": "कॉपी केलेली शैली.",
     "copyToClipboard": "फळी वर कॉपी झाली.",
     "copyToClipboardAsPng": "{{exportSelection}} फळी वर पी-एन-जी स्वरूपात कॉपी झाली\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} फळी वर एस-वी-जी स्वरूपात कॉपी झाली\n({{exportColorScheme}})",
     "fileSaved": "फ़ाइल जतन झाली.",
     "fileSavedToFilename": "{filename} मधे जतन झाली",
     "canvas": "पटल",
     "selection": "निवड",
     "pasteAsSingleElement": "एक घटक म्हणून चिपकावण्या साठी {{shortcut}} वापरा,\nकिंवा विद्यमान मजकूर संपादकात चिपकवा",
     "unableToEmbed": "युआरेल रूतवणे प्रतिबंधित आहेत. आपली युआरेल श्वेतसूचित आणण्या साठी कृपया एक मुद्दा ग़िटहब वर उठवा",
-    "unrecognizedLinkFormat": "जी युआरेल तुम्हीं रतवली आहे, ती आपेक्षित प्रकारे नाही आहे. कृपया स्त्रोत साइट नी 'रूतवण्या साठी दिलेलि लिपि' चिपकावण्याचा प्रयास करा"
+    "unrecognizedLinkFormat": "जी युआरेल तुम्हीं रतवली आहे, ती आपेक्षित प्रकारे नाही आहे. कृपया स्त्रोत साइट नी 'रूतवण्या साठी दिलेलि लिपि' चिपकावण्याचा प्रयास करा",
+    "elementLinkCopied": "दुवा क्लिप बोर्ड वर कॉपी झाली"
   },
   "colors": {
     "transparent": "पारदर्शक",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "सर्वात जास्त वापरणीस रंग",
     "colors": "रंग",
     "shades": "रंगछटा",
@@ -518,8 +609,56 @@
   "mermaid": {
     "title": "मर्मेड पासून एक्सकाली मधे",
     "button": "शिरवा",
-    "description": "",
+    "description": "सध्या फक्त <flowchartLink> प्रवाह चित्र (फ़्लो चार्ट) </flowchartLink> आणि <sequenceLink> क्रम चित्र (सिकवेंस ड़ायग्राम) </sequenceLink> करता येतात. बाक़ीचे चित्र प्रकार एक्सकाली चित्र पद्धति नी चित्रित होतील.",
     "syntax": "मर्मेड संरचना नियम",
     "preview": "पूर्वावलोकन"
+  },
+  "quickSearch": {
+    "placeholder": "जलद शोध"
+  },
+  "fontList": {
+    "badge": {
+      "old": "ज़ुनं"
+    },
+    "sceneFonts": "ह्या दृश्या मधे",
+    "availableFonts": "उपलब्ध लीपीं",
+    "empty": "लिपि सपडली नाहीं"
+  },
+  "userList": {
+    "empty": "वापरकर्ते सापडले नाहीत",
+    "hint": {
+      "text": "प्रयोक्ताचं अनुकरण करण्या साठी त्या वर क्लिक करा",
+      "followStatus": "तुम्हीं सध्या ह्या उपयोक्ता चं अनुकरण करत आहेत",
+      "inCall": "व्यक्ति सध्या संभाषण मधे व्यस्त आहे",
+      "micMuted": "व्यक्ति चा माइक्रोफ़ोन सध्या मूक केलेला आहे",
+      "isSpeaking": "व्यक्ति सध्या बोलत आहे"
+    }
+  },
+  "commandPalette": {
+    "title": "आदेशांचं चयन पलट",
+    "shortcuts": {
+      "select": "निवडा",
+      "confirm": "निश्चित करा",
+      "close": "बंद करा"
+    },
+    "recents": "अलिकडेच वापरलेले",
+    "search": {
+      "placeholder": "निवड़क, आदेश शोधा आणि लपलेले नग प्राप्त करा",
+      "noMatch": "कोणतेही जुळणारे आदेश नाहीत..."
+    },
+    "itemNotAvailable": "आदेश उपलब्ध नाही...",
+    "shortcutHint": "आदेश फलक साठी, {{shortcut}} वापरा"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/my-MM.json b/packages/excalidraw/locales/my-MM.json
index 290fa4ae4b..7d2bad85e2 100644
--- a/packages/excalidraw/locales/my-MM.json
+++ b/packages/excalidraw/locales/my-MM.json
@@ -21,7 +21,9 @@
     "copyStyles": "ပုံစံကူး",
     "pasteStyles": "ပုံစံထား",
     "stroke": "မျဉ်း",
+    "changeStroke": "",
     "background": "နောက်ခံ",
+    "changeBackground": "",
     "fill": "ဖြည့်",
     "strokeWidth": "မျဉ်းအထူ",
     "strokeStyle": "မျဉ်းပုံစံ",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "စာလုံးအရွယ်",
     "fontFamily": "စာလုံးပုံစံ",
     "addWatermark": "\"Excalidraw ဖြင့်ဖန်တီးသည်။\" စာသားထည့်",
@@ -72,6 +82,7 @@
     "canvasColors": "",
     "canvasBackground": "ကားချပ်နောက်ခံ",
     "drawingCanvas": "ပုံဆွဲကားချပ်",
+    "clearCanvas": "",
     "layers": "အလွှာများ",
     "actions": "လုပ်ဆောင်ချက်များ",
     "language": "ဘာသာစကား",
@@ -84,12 +95,13 @@
     "group": "အုပ်စုဖွဲ့",
     "ungroup": "အုပ်စုဖျက်သိမ်း",
     "collaborators": "ပူးပေါင်းပါဝင်သူများ",
-    "showGrid": "",
+    "toggleGrid": "",
     "addToLibrary": "မှတ်တမ်းတင်",
     "removeFromLibrary": "မှတ်တမ်းမှထုတ်",
     "libraryLoadingMessage": "မှတ်တမ်းအား တင်သွင်းနေသည်…",
     "libraries": "စာကြည့်တိုက်တွင်ရှာဖွေပါ",
     "loadingScene": "မြင်ကွင်းဖော်နေသည်…",
+    "loadScene": "",
     "align": "ချိန်ညှိ",
     "alignTop": "ထိပ်ညှိ",
     "alignBottom": "အခြေညှိ",
@@ -105,7 +117,9 @@
     "share": "",
     "showStroke": "",
     "showBackground": "",
+    "showFonts": "",
     "toggleTheme": "",
+    "theme": "",
     "personalLib": "",
     "excalidrawLib": "",
     "decreaseFontSize": "",
@@ -117,14 +131,19 @@
       "edit": "",
       "editEmbed": "",
       "create": "",
-      "createEmbed": "",
       "label": "",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "",
-      "exit": ""
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "ကားချပ်ရှင်းလင်း",
@@ -151,6 +204,7 @@
     "exportImage": "",
     "export": "",
     "copyToClipboard": "ကူးယူ",
+    "copyLink": "",
     "save": "",
     "saveAs": "ပြောင်းသိမ်း",
     "load": "",
@@ -171,10 +225,12 @@
     "fullScreen": "",
     "darkMode": "",
     "lightMode": "",
+    "systemMode": "",
     "zenMode": "",
     "objectsSnapMode": "",
     "exitZenMode": "ဇင်မြင်ကွင်းမှထွက်",
     "cancel": "",
+    "saveLibNames": "",
     "clear": "",
     "remove": "",
     "embed": "",
@@ -204,7 +260,8 @@
     "resetLibrary": "",
     "removeItemsFromsLibrary": "",
     "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "",
@@ -212,9 +269,9 @@
     "fileTooBig": "",
     "svgImageInsertError": "",
     "failedToFetchImage": "",
-    "invalidSVGString": "",
     "cannotResolveCollabServer": "",
     "importLibraryError": "",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "ရွေးချယ်",
+    "lasso": "",
     "image": "",
     "rectangle": "စတုဂံ",
     "diamond": "စိန်",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "ကားချပ်လုပ်ဆောင်ချက်",
@@ -263,28 +337,33 @@
     "shapes": "ပုံသဏ္ဌာန်များ"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "အမှတ်များချမှတ်ရေးဆွဲရန်ကလစ်နှိပ်ပါ၊ မျဉ်းတစ်ကြောင်းတည်းအတွက် တရွတ်ဆွဲပါ။",
+    "arrowTool": "",
     "freeDraw": "ကလစ်နှိပ်၍ တရွတ်ဆွဲပါ၊ ပြီးလျှင်လွှတ်ပါ။",
     "text": "မှတ်ချက်။ ။မည်သည့်ကိရိယာရွေးထားသည်ဖြစ်စေ ကလစ်နှစ်ချက်နှိပ်၍စာသားထည့်နိုင်သည်",
     "embeddable": "",
     "text_selected": "",
     "text_editing": "",
-    "linearElementMulti": "နောက်ဆုံးအမှတ်ပေါ်တွင်ကလစ်နှိပ်ခြင်း၊ Escape (သို့) Enter နှိပ်ခြင်းတို့ဖြင့်အဆုံးသတ်နိုင်",
+    "linearElementMulti": "",
     "lockAngle": "",
-    "resize": "အချိုးအစားကန့်သတ်ရန် Shift နှင့် ဗဟိုမှချိန်ညှိရန် Alt တို့ကိုနှိပ်ထားနိုင်သည်",
+    "resize": "",
     "resizeImage": "",
-    "rotate": "Shift ကိုနှိပ်ထားခြင်းဖြင့် ထောင့်အလိုက်လှည့်နိုင်သည်",
+    "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "နမူနာမပြသနိုင်ပါ",
@@ -299,9 +378,12 @@
     "openIssueMessage": "ချို့ယွင်းမှုမှတ်တမ်းတွင် အရေးကြီးအချက်အလက်များပါဝင်မှုမရှိစေရန်အထူးသတိပြုပါသည်။ မပါဝင်ပါက ဆက်လက်ဆောင်ရွက်ရန် <button>ချို့ယွင်းမှုအားခြေရာကောက်ပါ။</button> အောက်ပါအချက်အလက်များအား Github တွင် Issue အနေဖြင့်ဖြည့်သွင်းဖော်ပြပေးပါ။",
     "sceneContent": "မြင်ကွင်းပါအချက်အလက်။ ။"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "လက်ရှိမြင်ကွင်းတွင်ပူးပေါင်းရေးဆွဲရန် အခြားသူများအား ဖိတ်ကြားနိုင်သည်။",
-    "desc_privacy": "နှစ်ဘက်စွန်းတိုင်လျှို့ဝှက်ထားသဖြင့်ရေးဆွဲသမျှအား ဆာဗာပေါ်မှပင်လျှင်ကြည့်ရှုနိုင်မည်မဟုတ်ပါ။ မစိုးရိမ်ပါနှင့်။",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "ပူးပေါင်းမှုစတင်",
     "button_stopSession": "ပူးပေါင်းမှုအဆုံးသတ်",
     "desc_inProgressIntro": "တိုက်ရိုက်ပူးပေါင်းရေးဆွဲမှုများပြုလုပ်နေပါသည်။",
@@ -328,6 +410,8 @@
     "click": "",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "",
     "curvedLine": "",
     "documentation": "",
@@ -350,7 +434,9 @@
     "zoomToSelection": "",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "ထောင့်",
-    "element": "",
-    "elements": "",
+    "shapes": "",
     "height": "အမြင့်",
     "scene": "မြင်ကွင်း",
     "selected": "ရွေးချယ်သည်",
     "storage": "သိုလှောင်ခန်း",
-    "title": "အက္ခရာများအတွက်အချက်အလက်များ",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "စုစုပေါင်း",
     "version": "",
     "versionCopy": "",
@@ -439,13 +527,15 @@
     "copyStyles": "",
     "copyToClipboard": "",
     "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "",
     "fileSavedToFilename": "",
     "canvas": "",
     "selection": "",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/nb-NO.json b/packages/excalidraw/locales/nb-NO.json
index 13372b59f5..5468515b81 100644
--- a/packages/excalidraw/locales/nb-NO.json
+++ b/packages/excalidraw/locales/nb-NO.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Kopier til PNG",
     "copyAsSvg": "Kopier til utklippstavlen som SVG",
     "copyText": "Kopier til utklippstavlen som tekst",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Kopier kilde til utklippstavle",
+    "convertToCode": "Konverter til kode",
     "bringForward": "Flytt framover",
     "sendToBack": "Send bakerst",
     "bringToFront": "Flytt forrest",
@@ -21,7 +21,9 @@
     "copyStyles": "Kopier stiler",
     "pasteStyles": "Lim inn stiler",
     "stroke": "Strek",
+    "changeStroke": "Endre farge på omriss",
     "background": "Bakgrunn",
+    "changeBackground": "Endre bakgrunnsfarge",
     "fill": "Fyll",
     "strokeWidth": "Strektykkelse",
     "strokeStyle": "Strekstil",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Ingen",
     "arrowhead_arrow": "Pil",
     "arrowhead_bar": "Søyle",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Sirkel",
+    "arrowhead_circle_outline": "Sirkel (omriss)",
     "arrowhead_triangle": "Trekant",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Trekant (omriss)",
+    "arrowhead_diamond": "Diamant",
+    "arrowhead_diamond_outline": "Diamant (omriss)",
+    "arrowhead_crowfoot_many": "Kråkefot (mange)",
+    "arrowhead_crowfoot_one": "Kråkefot (én)",
+    "arrowhead_crowfoot_one_or_many": "Kråkefot (én eller mange)",
+    "more_options": "Flere alternativer",
+    "arrowtypes": "Type pil",
+    "arrowtype_sharp": "Skarp pil",
+    "arrowtype_round": "Buet pil",
+    "arrowtype_elbowed": "Albuepil",
     "fontSize": "Skriftstørrelse",
     "fontFamily": "Fontfamilie",
     "addWatermark": "Legg til \"Laget med Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Brukes på lerretet",
     "canvasBackground": "Lerretsbakgrunn",
     "drawingCanvas": "Lerret",
+    "clearCanvas": "Tøm lerret",
     "layers": "Lag",
     "actions": "Handlinger",
     "language": "Språk",
@@ -84,12 +95,13 @@
     "group": "Gruppér utvalg",
     "ungroup": "Avgruppér utvalg",
     "collaborators": "Samarbeidspartnere",
-    "showGrid": "Vis rutenett",
+    "toggleGrid": "Vis/skjul rutenett",
     "addToLibrary": "Legg til i bibliotek",
     "removeFromLibrary": "Fjern fra bibliotek",
     "libraryLoadingMessage": "Laster bibliotek…",
     "libraries": "Bla gjennom biblioteker",
     "loadingScene": "Laster inn scene…",
+    "loadScene": "Last scene fra fil",
     "align": "Juster",
     "alignTop": "Juster øverst",
     "alignBottom": "Juster nederst",
@@ -105,7 +117,9 @@
     "share": "Del",
     "showStroke": "Vis fargevelger for kantfarge",
     "showBackground": "Vis fargevelger for bakgrunnsfarge",
-    "toggleTheme": "Veksle tema",
+    "showFonts": "Vis skriftvelger",
+    "toggleTheme": "Vis/skjul lys/mørkt tema",
+    "theme": "Tema",
     "personalLib": "Personlig bibliotek",
     "excalidrawLib": "Excalidraw-bibliotek",
     "decreaseFontSize": "Reduser skriftstørrelse",
@@ -115,16 +129,21 @@
     "createContainerFromText": "La tekst flyte i en beholder",
     "link": {
       "edit": "Rediger lenke",
-      "editEmbed": "Rediger lenke og bygg inn",
-      "create": "Opprett lenke",
-      "createEmbed": "Opprett lenke og bygg inn",
+      "editEmbed": "Rediger innebyggbar lenke",
+      "create": "Legg til lenke",
       "label": "Lenke",
       "labelEmbed": "Lenk & bygg inn",
-      "empty": "Ingen lenke er valgt"
+      "empty": "Ingen lenke er valgt",
+      "hint": "Skriv eller lim inn lenken din her",
+      "goToElement": "Gå til målelement"
     },
     "lineEditor": {
       "edit": "Rediger linje",
-      "exit": "Avslutt linjeredigering"
+      "editArrow": "Rediger pil"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Lås",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "Velg alle elementene i rammen",
     "removeAllElementsFromFrame": "Fjern alle elementer fra rammen",
     "eyeDropper": "Velg farge fra lerretet",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Tekst til diagram",
+    "prompt": "Tekst",
+    "followUs": "Følg oss",
+    "discordChat": "Discord-chat",
+    "zoomToFitViewport": "Zoom for å få plass i visning",
+    "zoomToFitSelection": "Zoom for å passe utvalg",
+    "zoomToFit": "Zoom for å se alle elementer",
+    "installPWA": "Installer Excalidraw lokalt (PWA)",
+    "autoResize": "Aktiver automatisk endring av tekststørrelse",
+    "imageCropping": "Bildebeskjæring",
+    "unCroppedDimension": "Ikke-beskåret dimensjon",
+    "copyElementLink": "Kopier lenke til objekt",
+    "linkToElement": "Lenke til objekt",
+    "wrapSelectionInFrame": "Brekk om utvalg i ramme",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Lenke til objekt",
+    "desc": "Klikk på en figur på lerretet eller lim inn en lenke.",
+    "notFound": "Koblet objekt ble ikke funnet på lerretet."
   },
   "library": {
     "noItems": "Ingen elementer lagt til ennå...",
     "hint_emptyLibrary": "Velg et objekt på lerretet for å legge det til her, eller installer et bibliotek fra den offentlige samlingen under.",
-    "hint_emptyPrivateLibrary": "Velg et objekt på lerretet for å legge det til her."
+    "hint_emptyPrivateLibrary": "Velg et objekt på lerretet for å legge det til her.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Finn på lerretet",
+    "noMatch": "Ingen treff funnet...",
+    "singleResult": "resultat",
+    "multipleResults": "resultater",
+    "placeholder": "Finn tekst på lerret...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Tøm lerretet og tilbakestill bakgrunnsfargen",
@@ -151,6 +204,7 @@
     "exportImage": "Eksporter bilde...",
     "export": "Lagre som...",
     "copyToClipboard": "Kopier til utklippstavle",
+    "copyLink": "Kopier lenke",
     "save": "Lagre til aktiv fil",
     "saveAs": "Lagre som",
     "load": "Åpne",
@@ -171,14 +225,16 @@
     "fullScreen": "Fullskjerm",
     "darkMode": "Mørk modus",
     "lightMode": "Lys modus",
+    "systemMode": "Systemmodus",
     "zenMode": "Zen-modus",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Fest til elementer",
     "exitZenMode": "Avslutt zen-modus",
     "cancel": "Avbryt",
+    "saveLibNames": "",
     "clear": "Tøm",
     "remove": "Fjern",
     "embed": "Slå av/på innebygging",
-    "publishLibrary": "Publiser",
+    "publishLibrary": "",
     "submit": "Send inn",
     "confirm": "Bekreft",
     "embeddableInteractionButton": "Klikk for å samhandle"
@@ -204,20 +260,21 @@
     "resetLibrary": "Dette vil tømme biblioteket ditt. Er du sikker?",
     "removeItemsFromsLibrary": "Slett {{count}} element(er) fra biblioteket?",
     "invalidEncryptionKey": "Krypteringsnøkkel må ha 22 tegn. Live-samarbeid er deaktivert.",
-    "collabOfflineWarning": "Ingen Internett-tilkobling tilgjengelig.\nEndringer dine vil ikke bli lagret!"
+    "collabOfflineWarning": "Ingen Internett-tilkobling tilgjengelig.\nEndringer dine vil ikke bli lagret!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Filtypen støttes ikke.",
     "imageInsertError": "Kunne ikke sette inn bildet. Prøv igjen senere...",
     "fileTooBig": "Filen er for stor. Maksimal tillatt størrelse er {{maxSize}}.",
     "svgImageInsertError": "Kunne ikke sette inn SVG-bilde. SVG-koden ser ugyldig ut.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "Ugyldig SVG.",
+    "failedToFetchImage": "Kunne ikke hente bilde.",
     "cannotResolveCollabServer": "Kunne ikke koble til samarbeidsserveren. Vennligst oppdater siden og prøv på nytt.",
     "importLibraryError": "Kunne ikke laste bibliotek",
+    "saveLibraryError": "Kunne ikke lagre biblioteket ditt. Vennligst lagre biblioteket til en fil lokalt for å sikre at du ikke mister endringer.",
     "collabSaveFailed": "Kan ikke lagre i backend-databasen. Hvis problemer vedvarer, bør du lagre filen lokalt for å sikre at du ikke mister arbeidet.",
     "collabSaveFailed_sizeExceeded": "Kunne ikke lagre til backend-databasen, lerretet ser ut til å være for stort. Du bør lagre filen lokalt for å sikre at du ikke mister arbeidet ditt.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Bilder er deaktivert.",
     "brave_measure_text_error": {
       "line1": "Ser ut som om du bruker Brave nettleser med <bold>Aggressivt Block Finger</bold> -innstillingen aktivert.",
       "line2": "Dette kan resultere i å bryte <bold>tekst-elementene</bold> i tegningene.",
@@ -226,15 +283,16 @@
     },
     "libraryElementTypeError": {
       "embeddable": "Innebygde elementer kan ikke legges til i biblioteket.",
-      "iframe": "",
+      "iframe": "IFrame-elementer kan ikke legges til i biblioteket.",
       "image": "Støtte for å legge til bilder i biblioteket kommer snart!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Kunne ikke lime inn (kunne ikke lese fra systemets utklippstavle).",
+    "asyncPasteFailedOnParse": "Kunne ikke lime inn.",
+    "copyToSystemClipboardFailed": "Kunne ikke kopiere til utklippstavlen."
   },
   "toolBar": {
     "selection": "Velg",
+    "lasso": "",
     "image": "Sett inn bilde",
     "rectangle": "Rektangel",
     "diamond": "Diamant",
@@ -246,16 +304,32 @@
     "library": "Bibliotek",
     "lock": "Behold merket verktøy som aktivt",
     "penMode": "Pennemodus - forhindre berøring",
-    "link": "Legg til / oppdater link for en valgt figur",
+    "link": "Legg til / oppdater lenke for en valgt figur",
     "eraser": "Viskelær",
     "frame": "Rammeverktøy",
-    "magicframe": "",
+    "magicframe": "Wireframe til kode",
     "embeddable": "Nettinnbygging",
-    "laser": "",
+    "laser": "Laserpeker",
     "hand": "Hånd (panoreringsverktøy)",
     "extraTools": "Flere verktøy",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "Mermaid til Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rektangel",
+    "diamond": "Diamant",
+    "ellipse": "Ellipse",
+    "arrow": "Pil",
+    "line": "Linje",
+    "freedraw": "Frihåndstegning",
+    "text": "Tekst",
+    "image": "Bilde",
+    "group": "Gruppe",
+    "frame": "Ramme",
+    "magicframe": "Wireframe til kode",
+    "embeddable": "Nettinnbygging",
+    "selection": "Valg",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Handlinger: lerret",
@@ -263,28 +337,33 @@
     "shapes": "Former"
   },
   "hints": {
-    "canvasPanning": "For å flytte lerretet, hold musehjulet eller mellomromstasten mens du drar, eller bruk hånd-verktøyet",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Klikk for å starte linje med flere punkter, eller dra for en enkel linje",
+    "arrowTool": "",
     "freeDraw": "Klikk og dra, slipp når du er ferdig",
     "text": "Tips: du kan også legge til tekst ved å dobbeltklikke hvor som helst med utvalgsverktøyet",
     "embeddable": "Klikk og dra for å opprette en nettside innebygd",
-    "text_selected": "Dobbeltklikk eller trykk ENTER for å redigere tekst",
-    "text_editing": "Trykk Escape eller Ctrl/Cmd+Enter for å fullføre redigering",
-    "linearElementMulti": "Klikk på siste punkt eller trykk Escape eller Enter for å fullføre",
-    "lockAngle": "Du kan låse vinkelen ved å holde nede SHIFT",
-    "resize": "Du kan beholde forholdet ved å trykke SHIFT mens du endrer størrelse,\ntrykk ALT for å endre størrelsen fra midten",
-    "resizeImage": "Du kan endre størrelse fritt ved å holde SHIFT,\nhold ALT for å endre størrelse fra midten",
-    "rotate": "Du kan låse vinklene ved å holde SHIFT mens du roterer",
-    "lineEditor_info": "Hold Ctrl/Cmd og dobbelklikk eller trykk Ctrl/Cmd + Enter for å endre punkter",
-    "lineEditor_pointSelected": "Trykk på Slett for å fjerne punktet, Ctrl / Cmd+D for å duplisere, eller dra for å flytte",
-    "lineEditor_nothingSelected": "Velg et punkt å redigere (hold SHIFT for å velge flere),\neller hold Alt og klikk for å legge til nye punkter",
-    "placeImage": "Klikk for å plassere bildet, eller klikk og dra for å angi størrelsen manuelt",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publiser ditt eget bibliotek",
-    "bindTextToElement": "Trykk Enter for å legge til tekst",
-    "deepBoxSelect": "Hold CTRL/CMD for å markere dypt og forhindre flytting",
-    "eraserRevert": "Hold Alt for å reversere elementene merket for sletting",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Denne funksjonen kan sannsynligvis aktiveres ved å sette \"dom.events.asyncClipboard.clipboardItem\" flagget til \"true\". For å endre nettleserens flagg i Firefox, besøk \"about:config\"-siden.",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Kan ikke vise forhåndsvisning",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Vi er veldig nøye med å ikke inkludere dine scene-opplysninger i feilen. Hvis din scene ikke er privat, vurder å følge opp i vårt <button>feilrapporteringssystem.</button> Ta med opplysningene nedenfor ved å kopiere og lime inn i GitHub-saken.",
     "sceneContent": "Scene-innhold:"
   },
+  "shareDialog": {
+    "or": "Eller"
+  },
   "roomDialog": {
-    "desc_intro": "Du kan invitere personer til scenen din for å samarbeide med deg.",
-    "desc_privacy": "Ta det med ro, sesjonen bruker ende-til-ende-kryptering, så alt du tegner forblir privat. Ikke en gang serveren vår kan se hva du lager.",
+    "desc_intro": "Inviter folk til å samarbeide om tegningen din.",
+    "desc_privacy": "Ikke bekymre deg, økten er ende-til-ende kryptert og fullt privat. Ikke engang vår server kan se hva du tegner.",
     "button_startSession": "Start økt",
     "button_stopSession": "Stopp sesjon",
     "desc_inProgressIntro": "Sanntids-samarbeidsøkt er nå i gang.",
@@ -328,6 +410,8 @@
     "click": "klikk",
     "deepSelect": "Marker dypt",
     "deepBoxSelect": "Marker dypt innad i boks og forhindre flytting",
+    "createFlowchart": "Lag et flytdiagram ut fra et generisk element",
+    "navigateFlowchart": "Naviger et flytdiagram",
     "curvedArrow": "Buet pil",
     "curvedLine": "Buet linje",
     "documentation": "Dokumentasjon",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zoom til utvalg",
     "toggleElementLock": "Lås/lås opp utvalg",
     "movePageUpDown": "Flytt side opp/ned",
-    "movePageLeftRight": "Flytt siden til venstre/høyre"
+    "movePageLeftRight": "Flytt siden til venstre/høyre",
+    "cropStart": "Beskjær bilde",
+    "cropFinish": "Fullfør bildebeskjæring"
   },
   "clearCanvasDialog": {
     "title": "Tøm lerret"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Vinkel",
-    "element": "Element",
-    "elements": "Elementer",
+    "shapes": "Former",
     "height": "Høyde",
     "scene": "Scene",
     "selected": "Valgt",
     "storage": "Lagring",
-    "title": "Statistikk for nerder",
+    "fullTitle": "Lerret- og formegenskaper",
+    "title": "Egenskaper",
+    "generalStats": "Generelt",
+    "elementProperties": "Egenskaper for form",
     "total": "Totalt",
     "version": "Versjon",
     "versionCopy": "Klikk for å kopiere",
@@ -439,13 +527,15 @@
     "copyStyles": "Kopierte stiler.",
     "copyToClipboard": "Kopiert til utklippstavlen.",
     "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavlen som PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Kopierte {{exportSelection}} til utklippstavlen som SVG\n({{exportColorScheme}})",
     "fileSaved": "Fil lagret.",
     "fileSavedToFilename": "Lagret til {filename}",
     "canvas": "lerret",
     "selection": "utvalg",
     "pasteAsSingleElement": "Bruk {{shortcut}} for å lime inn som ett enkelt element,\neller lim inn i en eksisterende tekstbehandler",
     "unableToEmbed": "Innbygging av denne nettadressen er ikke tillatt. Oppret en sak på GitHub for å be om url-hvitelisting",
-    "unrecognizedLinkFormat": "Linken du bygget inn samsvarer ikke med det forventede formatet. Prøv å lime inn \"bygg inn\"-strengen fra kildesiden"
+    "unrecognizedLinkFormat": "Linken du bygget inn samsvarer ikke med det forventede formatet. Prøv å lime inn \"bygg inn\"-strengen fra kildesiden",
+    "elementLinkCopied": "Lenke kopiert til utklippstavlen"
   },
   "colors": {
     "transparent": "Gjennomsiktig",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Mest brukte egendefinerte farger",
     "colors": "Farger",
     "shades": "Toner",
@@ -516,10 +607,58 @@
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid til Excalidraw",
+    "button": "Sett inn",
+    "description": "Foreløpig er bare <flowchartLink>Flowchart</flowchartLink>-,<sequenceLink> Sequence</sequenceLink>- og <classLink>klasse </classLink>-diagrammer støttet. De andre typene vil bli gjengitt som bilde i Excalidraw.",
+    "syntax": "Mermaid-syntaks",
+    "preview": "Forhåndsvisning"
+  },
+  "quickSearch": {
+    "placeholder": "Hurtigsøk"
+  },
+  "fontList": {
+    "badge": {
+      "old": "gammel"
+    },
+    "sceneFonts": "I denne scenen",
+    "availableFonts": "Tilgjengelige skrifttyper",
+    "empty": "Ingen skrifttyper funnet"
+  },
+  "userList": {
+    "empty": "Ingen brukere funnet",
+    "hint": {
+      "text": "Klikk på en bruker for å følge",
+      "followStatus": "Du følger denne brukeren",
+      "inCall": "Brukeren er i et taleanrop",
+      "micMuted": "Brukerens mikrofon er dempet",
+      "isSpeaking": "Bruker snakker"
+    }
+  },
+  "commandPalette": {
+    "title": "Kommandopalett",
+    "shortcuts": {
+      "select": "Velg",
+      "confirm": "Bekreft",
+      "close": "Lukk"
+    },
+    "recents": "Nylig brukt",
+    "search": {
+      "placeholder": "Søk etter menyer, kommandoer og oppdag skjulte skatter",
+      "noMatch": "Ingen treff for kommandoer..."
+    },
+    "itemNotAvailable": "Kommandoen er ikke tilgjengelig...",
+    "shortcutHint": "For kommandopalett, bruk {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/nl-NL.json b/packages/excalidraw/locales/nl-NL.json
index 5ef98343b8..d42e446bdb 100644
--- a/packages/excalidraw/locales/nl-NL.json
+++ b/packages/excalidraw/locales/nl-NL.json
@@ -12,7 +12,7 @@
     "copyAsSvg": "Kopieer naar klembord als SVG",
     "copyText": "Kopieer naar klembord als tekst",
     "copySource": "",
-    "convertToCode": "",
+    "convertToCode": "Zet om naar code",
     "bringForward": "Breng naar voren",
     "sendToBack": "Stuur naar achtergrond",
     "bringToFront": "Breng naar voorgrond",
@@ -21,7 +21,9 @@
     "copyStyles": "Kopieer opmaak",
     "pasteStyles": "Plak opmaak",
     "stroke": "Lijn",
+    "changeStroke": "",
     "background": "Achtergrond",
+    "changeBackground": "",
     "fill": "Invulling",
     "strokeWidth": "Lijnbreedte",
     "strokeStyle": "Lijnstijl",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Geen",
     "arrowhead_arrow": "Pijl",
     "arrowhead_bar": "Balk",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Rond",
+    "arrowhead_circle_outline": "Rond (omtrek)",
     "arrowhead_triangle": "Driehoek",
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Tekstgrootte",
     "fontFamily": "Lettertype",
     "addWatermark": "Voeg \"Gemaakt met Excalidraw\" toe",
@@ -51,7 +61,7 @@
     "normal": "Normaal",
     "code": "Code",
     "small": "Klein",
-    "medium": "Medium",
+    "medium": "",
     "large": "Groot",
     "veryLarge": "Zeer groot",
     "solid": "Ingekleurd",
@@ -72,6 +82,7 @@
     "canvasColors": "Gebruikt op canvas",
     "canvasBackground": "Canvas achtergrond",
     "drawingCanvas": "Canvas",
+    "clearCanvas": "",
     "layers": "Lagen",
     "actions": "Acties",
     "language": "Taal",
@@ -84,12 +95,13 @@
     "group": "Groeperen",
     "ungroup": "Groep opheffen",
     "collaborators": "Deelnemers",
-    "showGrid": "Raster weergeven",
+    "toggleGrid": "",
     "addToLibrary": "Voeg toe aan bibliotheek",
     "removeFromLibrary": "Verwijder uit bibliotheek",
     "libraryLoadingMessage": "Bibliotheek laden…",
     "libraries": "Blader door bibliotheken",
     "loadingScene": "Scène laden…",
+    "loadScene": "",
     "align": "Uitlijnen",
     "alignTop": "Boven uitlijnen",
     "alignBottom": "Onder uitlijnen",
@@ -105,7 +117,9 @@
     "share": "Deel",
     "showStroke": "Toon lijn kleur kiezer",
     "showBackground": "Toon achtergrondkleur kiezer",
-    "toggleTheme": "Thema aan/uit",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "Persoonlijke bibliotheek",
     "excalidrawLib": "Excalidraw bibliotheek",
     "decreaseFontSize": "Letters verkleinen",
@@ -115,16 +129,21 @@
     "createContainerFromText": "",
     "link": {
       "edit": "Wijzig link",
-      "editEmbed": "Link bewerken & insluiten",
-      "create": "Maak link",
-      "createEmbed": "Link maken en insluiten",
+      "editEmbed": "",
+      "create": "",
       "label": "Link",
       "labelEmbed": "Link toevoegen & insluiten",
-      "empty": "Er is geen link ingesteld"
+      "empty": "Er is geen link ingesteld",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Bewerk regel",
-      "exit": "Verlaat regel-editor"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Vergrendel",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "Volg ons",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Nog geen items toegevoegd...",
     "hint_emptyLibrary": "Selecteer een item op het canvas om het hier toe te voegen of installeer een bibliotheek uit de openbare repository, hieronder.",
-    "hint_emptyPrivateLibrary": "Selecteer een item op het canvas om het hier toe te voegen."
+    "hint_emptyPrivateLibrary": "Selecteer een item op het canvas om het hier toe te voegen.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Canvas opnieuw instellen",
@@ -151,6 +204,7 @@
     "exportImage": "Exporteer afbeelding...",
     "export": "Sla op...",
     "copyToClipboard": "Kopieer",
+    "copyLink": "",
     "save": "Opslaan naar huidige bestand",
     "saveAs": "Opslaan als",
     "load": "Open",
@@ -171,14 +225,16 @@
     "fullScreen": "Volledig scherm",
     "darkMode": "Donkere modus",
     "lightMode": "Lichte modus",
+    "systemMode": "",
     "zenMode": "Zen modus",
     "objectsSnapMode": "",
     "exitZenMode": "Verlaat zen modus",
     "cancel": "Annuleren",
+    "saveLibNames": "",
     "clear": "Wissen",
     "remove": "Verwijderen",
     "embed": "Insluiten in-/uitschakelen",
-    "publishLibrary": "Publiceren",
+    "publishLibrary": "",
     "submit": "Versturen",
     "confirm": "Bevestigen",
     "embeddableInteractionButton": "Klik voor interactie"
@@ -204,7 +260,8 @@
     "resetLibrary": "Dit zal je bibliotheek wissen. Weet je het zeker?",
     "removeItemsFromsLibrary": "Verwijder {{count}} item(s) uit bibliotheek?",
     "invalidEncryptionKey": "Encryptiesleutel moet 22 tekens zijn. Live samenwerking is uitgeschakeld.",
-    "collabOfflineWarning": "Geen internetverbinding beschikbaar.\nJe wijzigingen worden niet opgeslagen!"
+    "collabOfflineWarning": "Geen internetverbinding beschikbaar.\nJe wijzigingen worden niet opgeslagen!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Niet-ondersteund bestandstype.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Bestand is te groot. Maximale grootte is {{maxSize}}.",
     "svgImageInsertError": "Kon geen SVG-afbeelding invoegen. De SVG-opmaak ziet er niet geldig uit.",
     "failedToFetchImage": "",
-    "invalidSVGString": "Ongeldige SVG.",
     "cannotResolveCollabServer": "Kan geen verbinding maken met de collab server. Herlaad de pagina en probeer het opnieuw.",
     "importLibraryError": "Kon bibliotheek niet laden",
+    "saveLibraryError": "",
     "collabSaveFailed": "Kan niet opslaan in de backend database. Als de problemen blijven bestaan, moet u het bestand lokaal opslaan om ervoor te zorgen dat u uw werk niet verliest.",
     "collabSaveFailed_sizeExceeded": "Kan de backend database niet opslaan, het canvas lijkt te groot te zijn. U moet het bestand lokaal opslaan om ervoor te zorgen dat u uw werk niet verliest.",
     "imageToolNotSupported": "",
@@ -230,11 +287,12 @@
       "image": "Ondersteuning voor het toevoegen van afbeeldingen aan de bibliotheek komt binnenkort!"
     },
     "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnParse": "Kon niet plakken.",
+    "copyToSystemClipboardFailed": "Kon niet naar klembord kopiëren."
   },
   "toolBar": {
     "selection": "Selectie",
+    "lasso": "",
     "image": "Voeg afbeelding in",
     "rectangle": "Rechthoek",
     "diamond": "Ruit",
@@ -246,16 +304,32 @@
     "library": "Bibliotheek",
     "lock": "Geselecteerde tool actief houden na tekenen",
     "penMode": "Pen modus - Blokkeer aanraken",
-    "link": "Link toevoegen / bijwerken voor een geselecteerde vorm",
+    "link": "",
     "eraser": "Gum",
-    "frame": "",
+    "frame": "Frame tool",
     "magicframe": "",
     "embeddable": "Web insluiten",
-    "laser": "",
+    "laser": "Laseraanwijzer",
     "hand": "",
-    "extraTools": "",
+    "extraTools": "Meer tools",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Canvasacties",
@@ -263,28 +337,33 @@
     "shapes": "Vormen"
   },
   "hints": {
-    "canvasPanning": "Om de canvas te verplaatsen, houd muiswiel of spatiebalk ingedrukt tijdens slepen, of gebruik het handgereedschap",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Klik om meerdere punten te starten, sleep voor één lijn",
+    "arrowTool": "",
     "freeDraw": "Klik en sleep, laat los als je klaar bent",
     "text": "Tip: je kunt tekst toevoegen door ergens dubbel te klikken met de selectietool",
     "embeddable": "Klink-sleep om een website-insluiting te maken",
-    "text_selected": "Dubbelklik of druk op ENTER om tekst te bewerken",
-    "text_editing": "Druk op Escape of CtrlOrCmd+ENTER om het bewerken te voltooien",
-    "linearElementMulti": "Klik op het laatste punt of druk op Escape of Enter om te stoppen",
-    "lockAngle": "Je kunt de hoek beperken door SHIFT ingedrukt te houden",
-    "resize": "Houd tijdens het vergroten SHIFT ingedrukt om verhoudingen te behouden,\ngebruik ALT om vanuit het midden te vergroten/verkleinen",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
     "resizeImage": "",
-    "rotate": "Je kan hoeken beperken door SHIFT ingedrukt te houden wanneer je draait",
-    "lineEditor_info": "Houd CtrlOrCmd en Dubbelklik of druk op CtrlOrCmd + Enter om punten te bewerken",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "Publiceer je eigen bibliotheek",
-    "bindTextToElement": "Druk op enter om tekst toe te voegen",
+    "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Kan voorbeeld niet tonen",
@@ -299,9 +378,12 @@
     "openIssueMessage": "We waren voorzichtig om je scène-informatie niet in de fout toe te voegen. Als je scène niet privé is, overweeg dan alstublieft het opvolgen op onze <button>bugtracker.</button> Kopieer de informatie hieronder naar de GitHub issue.",
     "sceneContent": "Scène-inhoud:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "Je kunt mensen uitnodigen om met je samen te werken.",
-    "desc_privacy": "Geen zorgen, de sessie gebruikt end-to-end encryptie, dus wat je tekent blijft privé. Zelfs onze server zal niet kunnen zien wat je tekent.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Start sessie",
     "button_stopSession": "Stop sessie",
     "desc_inProgressIntro": "De live-samenwerkingssessie is nu gestart.",
@@ -328,29 +410,33 @@
     "click": "klik",
     "deepSelect": "Deep selecteer",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Gebogen pijl",
     "curvedLine": "Kromme lijn",
     "documentation": "Documentatie",
     "doubleClick": "dubbelklikken",
     "drag": "slepen",
-    "editor": "Editor",
+    "editor": "",
     "editLineArrowPoints": "",
     "editText": "",
     "github": "Probleem gevonden? Verzenden",
     "howto": "Volg onze handleidingen",
     "or": "of",
     "preventBinding": "Pijlbinding voorkomen",
-    "tools": "Tools",
+    "tools": "",
     "shortcuts": "Sneltoetsen",
     "textFinish": "Voltooi het bewerken (teksteditor)",
     "textNewLine": "Nieuwe regel toevoegen (teksteditor)",
-    "title": "Help",
+    "title": "",
     "view": "Weergave",
     "zoomToFit": "Zoom in op alle elementen",
     "zoomToSelection": "Inzoomen op selectie",
     "toggleElementLock": "",
     "movePageUpDown": "Pagina omhoog/omlaag",
-    "movePageLeftRight": "Verplaats pagina links/rechts"
+    "movePageLeftRight": "Verplaats pagina links/rechts",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Wis canvas"
@@ -363,7 +449,7 @@
     "twitterUsername": "Twitter gebruikersnaam",
     "libraryName": "Naam bibliotheek",
     "libraryDesc": "Beschrijving van de bibliotheek",
-    "website": "Website",
+    "website": "",
     "placeholder": {
       "authorName": "Je naam of gebruikersnaam",
       "libraryName": "Naam van je bibliotheek",
@@ -394,24 +480,24 @@
   "imageExportDialog": {
     "header": "",
     "label": {
-      "withBackground": "",
+      "withBackground": "Achtergrond",
       "onlySelected": "",
-      "darkMode": "",
+      "darkMode": "Dark mode",
       "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "scale": "Schaal",
+      "padding": "Padding"
     },
     "tooltip": {
       "embedScene": ""
     },
     "title": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "Exporteer naar PNG",
+      "exportToSvg": "Exporteer naar SVG",
+      "copyPngToClipboard": "Kopieer PNG naar klembord"
     },
     "button": {
-      "exportToPng": "",
-      "exportToSvg": "",
+      "exportToPng": "PNG",
+      "exportToSvg": "SVG",
       "copyPngToClipboard": ""
     }
   },
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Hoek",
-    "element": "Element",
-    "elements": "Elementen",
+    "shapes": "",
     "height": "Hoogte",
     "scene": "Scene",
     "selected": "Geselecteerd",
     "storage": "Opslag",
-    "title": "Statistieken voor nerds",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Totaal",
     "version": "Versie",
     "versionCopy": "Klik om te kopiëren",
@@ -439,20 +527,22 @@
     "copyStyles": "Stijlen gekopieerd.",
     "copyToClipboard": "Gekopieerd naar het klembord.",
     "copyToClipboardAsPng": "{{exportSelection}} naar klembord gekopieerd als PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Bestand opgeslagen.",
     "fileSavedToFilename": "Opgeslagen als {filename}",
     "canvas": "canvas",
     "selection": "selectie",
     "pasteAsSingleElement": "Gebruik {{shortcut}} om te plakken als een enkel element,\nof plak in een bestaande teksteditor",
     "unableToEmbed": "Het insluiten van deze url is momenteel niet toegestaan. Zet een probleem op GitHub om de URL op de whitelist te zetten",
-    "unrecognizedLinkFormat": "De link die u hebt ingesloten komt niet overeen met het verwachte formaat. Probeer de 'embed' string van de bronsite te plakken"
+    "unrecognizedLinkFormat": "De link die u hebt ingesloten komt niet overeen met het verwachte formaat. Probeer de 'embed' string van de bronsite te plakken",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Transparant",
-    "black": "",
-    "white": "",
-    "red": "",
-    "pink": "",
+    "black": "Zwart",
+    "white": "Wit",
+    "red": "Rood",
+    "pink": "Roze",
     "grape": "",
     "violet": "",
     "gray": "",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/nn-NO.json b/packages/excalidraw/locales/nn-NO.json
index 6658dba2ba..888acef25e 100644
--- a/packages/excalidraw/locales/nn-NO.json
+++ b/packages/excalidraw/locales/nn-NO.json
@@ -21,11 +21,13 @@
     "copyStyles": "Kopier stilar",
     "pasteStyles": "Lim inn stilar",
     "stroke": "Strek",
+    "changeStroke": "",
     "background": "Bakgrunn",
+    "changeBackground": "",
     "fill": "Fyll",
     "strokeWidth": "Strekbreidd",
     "strokeStyle": "Strekstil",
-    "strokeStyle_solid": "Solid",
+    "strokeStyle_solid": "",
     "strokeStyle_dashed": "Stipla",
     "strokeStyle_dotted": "Prikka",
     "sloppiness": "Ujamnheit",
@@ -44,17 +46,25 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Skriftstorleik",
     "fontFamily": "Skrifttype",
     "addWatermark": "Legg til «Laga med Excalidraw»",
     "handDrawn": "Handteikna",
-    "normal": "Normal",
+    "normal": "",
     "code": "Kode",
     "small": "Liten",
-    "medium": "Medium",
+    "medium": "",
     "large": "Stor",
     "veryLarge": "Svært stor",
-    "solid": "Solid",
+    "solid": "",
     "hachure": "Skravert",
     "zigzag": "",
     "crossHatch": "Krysskravert",
@@ -72,6 +82,7 @@
     "canvasColors": "Brukt på lerretet",
     "canvasBackground": "Lerretsbakgrunn",
     "drawingCanvas": "Lerret",
+    "clearCanvas": "",
     "layers": "Lag",
     "actions": "Handlingar",
     "language": "Språk",
@@ -84,12 +95,13 @@
     "group": "Grupper utval",
     "ungroup": "Avgrupper utval",
     "collaborators": "Samarbeidarar",
-    "showGrid": "Vis rutenett",
+    "toggleGrid": "",
     "addToLibrary": "Legg til i bibliotek",
     "removeFromLibrary": "Fjern frå bibliotek",
     "libraryLoadingMessage": "Laster bibliotek…",
     "libraries": "Blad gjennom bibliotek",
     "loadingScene": "Laster scene…",
+    "loadScene": "",
     "align": "Juster",
     "alignTop": "Juster til topp",
     "alignBottom": "Juster til botn",
@@ -105,7 +117,9 @@
     "share": "Del",
     "showStroke": "Vis fargeveljar for linjer",
     "showBackground": "Vis fargeveljar for bakgrunn",
-    "toggleTheme": "Veksle tema",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "Personleg bibliotek",
     "excalidrawLib": "Excalidraw-bibliotek",
     "decreaseFontSize": "Gjer skriftstorleik mindre",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "Rediger lenke",
       "editEmbed": "",
-      "create": "Lag lenke",
-      "createEmbed": "",
+      "create": "",
       "label": "Lenke",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "",
-      "exit": ""
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "Følg oss",
+    "discordChat": "Discord chat",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Tilbakestill lerretet",
@@ -151,6 +204,7 @@
     "exportImage": "",
     "export": "",
     "copyToClipboard": "Kopier til utklippstavla",
+    "copyLink": "",
     "save": "Lagre til noverande fil",
     "saveAs": "Lagre som",
     "load": "",
@@ -171,14 +225,16 @@
     "fullScreen": "Fullskjerm",
     "darkMode": "Mørk modus",
     "lightMode": "Lys modus",
+    "systemMode": "",
     "zenMode": "Zen-modus",
     "objectsSnapMode": "",
     "exitZenMode": "Avslutt zen-modus",
     "cancel": "Avbryt",
+    "saveLibNames": "",
     "clear": "Tøm",
     "remove": "Fjern",
     "embed": "",
-    "publishLibrary": "Publiser",
+    "publishLibrary": "",
     "submit": "Send inn",
     "confirm": "Stadfest",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "Dette vil fjerne alt innhald frå biblioteket. Er du sikker?",
     "removeItemsFromsLibrary": "Slette {{count}} element frå biblioteket?",
     "invalidEncryptionKey": "Krypteringsnøkkelen må ha 22 teikn. Sanntidssamarbeid er deaktivert.",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Filtypen er ikkje støtta.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Fila er for stor. Maksimal tillate storleik er {{maxSize}}.",
     "svgImageInsertError": "Kunne ikkje sette inn SVG-biletet. SVG-koden ser ugyldig ut.",
     "failedToFetchImage": "",
-    "invalidSVGString": "Ugyldig SVG.",
     "cannotResolveCollabServer": "Kunne ikkje kople til samarbeidsserveren. Ver vennleg å oppdatere inn sida og prøv på nytt.",
     "importLibraryError": "",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,10 +292,11 @@
   },
   "toolBar": {
     "selection": "Vel",
+    "lasso": "",
     "image": "Sett in bilete",
     "rectangle": "Rektangel",
     "diamond": "Diamant",
-    "ellipse": "Ellipse",
+    "ellipse": "",
     "arrow": "Pil",
     "line": "Linje",
     "freedraw": "Teikn",
@@ -246,7 +304,7 @@
     "library": "Bibliotek",
     "lock": "Hald fram med valt verktøy",
     "penMode": "",
-    "link": "Legg til/ oppdater lenke til valt figur",
+    "link": "",
     "eraser": "Viskelêr",
     "frame": "",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Handlingar: lerret",
@@ -263,28 +337,33 @@
     "shapes": "Formar"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "Klikk for å starte linje med fleire punkt, eller drag for ei enkel linje",
+    "arrowTool": "",
     "freeDraw": "Klikk og drag, slepp når du er ferdig",
     "text": "Tips: du kan òg leggje til tekst ved å dobbeltklikke kor som helst med utvalgsverktyet",
     "embeddable": "",
-    "text_selected": "Dobbelklikk eller trykk ENTER for å redigere teksta",
-    "text_editing": "Trykk Escape eller CtrlOrCmd+ENTER for å fullføre redigeringa",
-    "linearElementMulti": "Klikk på siste punkt eller trykk Escape eller Enter for å fullføre",
-    "lockAngle": "Du kan begrense vinkelen ved å holde nede SKIFT",
-    "resize": "Du kan halde fram med forholdet ved å trykke SHIFT medan du endrar storleik,\ntrykk ALT for å endre storleiken frå midten",
-    "resizeImage": "Du kan endre storleiken fritt ved å halde inne SHIFT,\nhald ALT for å endre storleik frå sentrum",
-    "rotate": "Du kan låse vinklane ved å halde SHIFT medan du roterer",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
     "lineEditor_info": "",
-    "lineEditor_pointSelected": "Trykk på Slett for å fjerne punkt(a),\nCtrl / Cmd+D for å duplisere, eller drag for å flytte",
-    "lineEditor_nothingSelected": "Vel eit punkt å redigere (hald inne SHIFT for å velje fleire),\neller hald inne Alt og klikk for å legge til nye punkt",
-    "placeImage": "Klikk for å plassere biletet, eller klikk og drag for å velje storleik manuelt",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publiser ditt eige bibliotek",
-    "bindTextToElement": "Trykk på enter for å legge til tekst",
-    "deepBoxSelect": "Hald inne Ctrl / Cmd for å velje djupt, og forhindre flytting",
-    "eraserRevert": "Hald inne Alt for å reversere markering av element for sletting",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Kan ikkje vise førehandsvising",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Vi er veldig nøye med å ikkje inkludere scene-opplysingane dine i feilmeldinga. Viss scena di ikkje er privat kan du vurdere å følge opp i <button>feilrapporteringssystemet vårt.</button> Ta med opplysingane nedanfor ved å kopiere og lime inn i GitHub-saka.",
     "sceneContent": "Scene-innhald:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "Du kan invitere personar til scena di for å samarbeide med deg.",
-    "desc_privacy": "Ta det med ro; økta brukar ende-til-ende-kryptering, så alt du teiknar held fram med å vere privat. Ikkje ein gong serveren vår kan sjå kva du lagar.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Start økt",
     "button_stopSession": "Stopp økt",
     "desc_inProgressIntro": "Sanntids-samarbeidsøkt er no i gang.",
@@ -328,11 +410,13 @@
     "click": "klikk",
     "deepSelect": "Marker djupt",
     "deepBoxSelect": "Marker djupt inni boksen og forhindr flytting",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Boga pil",
     "curvedLine": "Boga linje",
     "documentation": "Dokumentasjon",
     "doubleClick": "dobbelklikk",
-    "drag": "drag",
+    "drag": "",
     "editor": "Redigering",
     "editLineArrowPoints": "",
     "editText": "",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zoom til utval",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Tøm lerretet"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Vinkel",
-    "element": "Element",
-    "elements": "Element",
+    "shapes": "",
     "height": "Høgde",
-    "scene": "Scene",
+    "scene": "",
     "selected": "Valde",
     "storage": "Lagring",
-    "title": "Statistikk for nerdar",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Totalt",
     "version": "Versjon",
     "versionCopy": "Klikk for å kopiere",
@@ -439,13 +527,15 @@
     "copyStyles": "Kopierte stilane.",
     "copyToClipboard": "Kopiert til utklippstavla.",
     "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavla som PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Fila er lagra.",
     "fileSavedToFilename": "Lagra som {filename}",
     "canvas": "lerret",
     "selection": "val",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Gjennomsiktig",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/oc-FR.json b/packages/excalidraw/locales/oc-FR.json
index 3d9594c04b..e830cdbf43 100644
--- a/packages/excalidraw/locales/oc-FR.json
+++ b/packages/excalidraw/locales/oc-FR.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Copiar al quichapapièrs coma PNG",
     "copyAsSvg": "Copiar al quichapapièrs coma SVG",
     "copyText": "Copiar al quichapapièrs coma tèxt",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Copiar la font al quichapapièrs",
+    "convertToCode": "Convertir lo còdi",
     "bringForward": "En avant",
     "sendToBack": "En arrièr",
     "bringToFront": "A l’endavant",
@@ -21,7 +21,9 @@
     "copyStyles": "Copiar los estiles",
     "pasteStyles": "Pegar los estils",
     "stroke": "Contorn",
+    "changeStroke": "",
     "background": "Rèireplan",
+    "changeBackground": "",
     "fill": "Empliment",
     "strokeWidth": "Largor de contorn",
     "strokeStyle": "Estil de contorn",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Cap",
     "arrowhead_arrow": "Sageta",
     "arrowhead_bar": "Barra",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Cèrcle",
+    "arrowhead_circle_outline": "Cèrcle (contorn)",
     "arrowhead_triangle": "Triangle",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Triangle (contirn)",
+    "arrowhead_diamond": "Lausange",
+    "arrowhead_diamond_outline": "Lausange (contorn)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "Talha polissa",
     "fontFamily": "Familha de polissa",
     "addWatermark": "Apondre « Fabricat amb Excalidraw »",
@@ -72,6 +82,7 @@
     "canvasColors": "Utilizada suls canabassses",
     "canvasBackground": "Rèireplan del canabàs",
     "drawingCanvas": "Zòna de dessenh",
+    "clearCanvas": "Escafar canabàs",
     "layers": "Calques",
     "actions": "Accions",
     "language": "Lenga",
@@ -84,12 +95,13 @@
     "group": "Gropar la seleccion",
     "ungroup": "Desunir la seleccion",
     "collaborators": "Collaborators",
-    "showGrid": "Afichar la gresilha",
+    "toggleGrid": "",
     "addToLibrary": "Apondre a la bibliotèca",
     "removeFromLibrary": "Suprimir de la bibliotèca",
     "libraryLoadingMessage": "Cargament de la bibliotèca…",
     "libraries": "Percórrer las bibliotècas",
     "loadingScene": "Cargament de la scèna…",
+    "loadScene": "",
     "align": "Alinhament",
     "alignTop": "Alinhar ennaut",
     "alignBottom": "Alinhar enbàs",
@@ -105,7 +117,9 @@
     "share": "Partejar",
     "showStroke": "Mostrar lo selector de color de contorn",
     "showBackground": "Mostrar lo selector de color de fons",
-    "toggleTheme": "Alternar tèma",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "Tèma",
     "personalLib": "Bibliotèca personala",
     "excalidrawLib": "Bibliotèca Excalidraw",
     "decreaseFontSize": "Reduire talha polissa",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Envelopar lo tèxte dins un contenedor",
     "link": {
       "edit": "Modificar lo ligam",
-      "editEmbed": "Modificar lo ligam e l’integracion",
-      "create": "Crear un ligam",
-      "createEmbed": "Crear un ligam e son integracion",
+      "editEmbed": "",
+      "create": "",
       "label": "Ligam",
       "labelEmbed": "Ligam e integracion",
-      "empty": "Cap de ligam pas definit"
+      "empty": "Cap de ligam pas definit",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Modificar la linha",
-      "exit": "Sortir de l’editor de linha"
+      "editArrow": "Modificar sageta"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Verrolhar",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "Seleccionar totes los elements del quadre",
     "removeAllElementsFromFrame": "Tirar totes los elements d’al quadre",
     "eyeDropper": "Prendre la color a partir d’un canabàs",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Tèxte pel diagram",
+    "prompt": "Fenèstra de dialòg",
+    "followUs": "Seguissètz-nos",
+    "discordChat": "Chat Discord",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "Cap d’element pas encara apondut...",
     "hint_emptyLibrary": "Seleccionatz un element d’apondre aquí, o installatz una bibliotèca del depaus public, çai-jos.",
-    "hint_emptyPrivateLibrary": "Seleccionatz un element d’apondre aquí pel canabàs."
+    "hint_emptyPrivateLibrary": "Seleccionatz un element d’apondre aquí pel canabàs.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Reïnicializar lo canabàs",
@@ -151,6 +204,7 @@
     "exportImage": "Exportar imatges...",
     "export": "Enregistrar dins...",
     "copyToClipboard": "Copiar al quichapapièrs",
+    "copyLink": "",
     "save": "Salvar al fichièr actual",
     "saveAs": "Enregistrar jos",
     "load": "Dobrir",
@@ -171,14 +225,16 @@
     "fullScreen": "Ecran complèt",
     "darkMode": "Mòde escur",
     "lightMode": "Mòde clar",
+    "systemMode": "Mòde sistèma",
     "zenMode": "Mòde escur",
     "objectsSnapMode": "Ancorar als objèctes",
     "exitZenMode": "Sortir del mòde zen",
     "cancel": "Anullar",
+    "saveLibNames": "",
     "clear": "Escafar",
     "remove": "Tirar",
     "embed": "Alternar l’integracion",
-    "publishLibrary": "Publicar",
+    "publishLibrary": "",
     "submit": "Enviar",
     "confirm": "Confirmar",
     "embeddableInteractionButton": "Clicar per interagir"
@@ -204,7 +260,8 @@
     "resetLibrary": "Aquò suprimirà vòstra bibliotèca. O volètz vertadièrament ?",
     "removeItemsFromsLibrary": "Suprimir {{count}} element(s) de la bibliotèca ?",
     "invalidEncryptionKey": "La clau de chiframent deu conténer 22 caractèrs. La collaboracion en dirèct es desactivada.",
-    "collabOfflineWarning": "Cap de connexion pas disponibla.\nVòstras modificacions seràn pas salvadas !"
+    "collabOfflineWarning": "Cap de connexion pas disponibla.\nVòstras modificacions seràn pas salvadas !",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipe de fichièr pas pres en carga.",
@@ -212,16 +269,16 @@
     "fileTooBig": "Fichièr tròp pesuc. La talha maximala autorizada es {{maxSize}}.",
     "svgImageInsertError": "Insercion d’imatge SVG impossibla. Las balisas SVG semblan invalidas.",
     "failedToFetchImage": "Fracàs de la recuperacion de l’imatge.",
-    "invalidSVGString": "SVG invalid.",
     "cannotResolveCollabServer": "Connexion impossibla al servidor collab. Mercés de recargar la pagina e tornar ensajar.",
     "importLibraryError": "Impossible de cargar la bibliotèca",
-    "collabSaveFailed": "",
-    "collabSaveFailed_sizeExceeded": "",
-    "imageToolNotSupported": "",
+    "saveLibraryError": "",
+    "collabSaveFailed": "Enregistrament impossible dins la basa de donada del backend. Se lo problèma persistís, deuriatz enregistrar lo fichièr localament per vos assegurar que perdretz pas vòstre trabalh.",
+    "collabSaveFailed_sizeExceeded": "Enregistrament impossible dins la basa de donada del backend, lo canabàs sembla tròp pesuc. Deuriatz enregistrar lo fichièr localament per vos assegurar que perdretz pas vòstre trabalh.",
+    "imageToolNotSupported": "Los imatges son desactivats.",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
+      "line1": "Semblatz utilizar lo navegador Brave amb lo paramètre <bold>Blocatge agressiu de las emprentas numericas</bold> activat.",
+      "line2": "Aquò pòt menar a copar <bold>l’element Tèxte</bold> de vòstres dessenhs.",
+      "line3": "Recomandam fòrt de desactivar aqueste paramètre. Podètz seguir <link>aquestas etapas</link> per veire cossí o far.",
       "line4": ""
     },
     "libraryElementTypeError": {
@@ -229,12 +286,13 @@
       "iframe": "",
       "image": ""
     },
-    "asyncPasteFailedOnRead": "Empegatge impossible (lectura impossibla a partir del quichapapièrs).",
+    "asyncPasteFailedOnRead": "",
     "asyncPasteFailedOnParse": "Empegatge impossible.",
     "copyToSystemClipboardFailed": "Còpia impossibla al quichapapièrs."
   },
   "toolBar": {
     "selection": "Seleccion",
+    "lasso": "",
     "image": "Inserir imatge",
     "rectangle": "Rectangle",
     "diamond": "Lausange",
@@ -246,7 +304,7 @@
     "library": "Bibliotèca",
     "lock": "Mantenir activa l’aisina aprèp dessenhar",
     "penMode": "Mòde estilo - empachar lo contact",
-    "link": "Apondre/Actualizar lo ligam per una fòrma seleccionada",
+    "link": "",
     "eraser": "Goma",
     "frame": "Esplech quadre",
     "magicframe": "",
@@ -255,7 +313,23 @@
     "hand": "Man (aisina de desplaçament de la vista)",
     "extraTools": "Mai d’aisinas",
     "mermaidToExcalidraw": "De Mermaid cap a Excalidraw",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rectangle",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "Sageta",
+    "line": "Linha",
+    "freedraw": "",
+    "text": "Tèxt",
+    "image": "Imatge",
+    "group": "Grop",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "Seleccion",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "Accions del canabàs",
@@ -263,28 +337,33 @@
     "shapes": "Formas"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "Clicatz per començar mantun punt, lisatz per una sola linha",
+    "arrowTool": "",
     "freeDraw": "Clicatz e lisatz, relargatz un còp acabat",
     "text": "Astúcia : podètz tanben apondre de tèxt en doble clicant ont que siá amb l’aisina de seleccion",
     "embeddable": "",
-    "text_selected": "Clicatz dos còps o quichatz ENTRADA per modificar lo tèxt",
-    "text_editing": "Quichatz ESCAPAR o CtrlOrCmd+ENTRADA per acabar la modificacion",
-    "linearElementMulti": "Clicatz sul darrièr punt o quichatz Ecap o Entrada per acabar",
-    "lockAngle": "Podètz restrénger l’angle en mantenent MAJ",
-    "resize": "Podètz servar las proporcions en mantenent la tòca MAJ pendent lo redimensionament,\nmantenètz la tòca ALT per redimensionar a partir del centre",
-    "resizeImage": "Podètz retalhar liurament en quichant CTRL,\nquichatz ALT per retalhar a partir del centre",
-    "rotate": "Podètz restrénger los angles en mantenent MAJ pendent la rotacion",
-    "lineEditor_info": "Tenètz quichat Ctrl o Cmd e doble clic o quichatz Ctrl o Cmd + Entrada per modificar los ponches",
-    "lineEditor_pointSelected": "Quichar Suprimir per tirar lo(s) punt(s),\nCtrlOCmd+D per duplicar, o lisatz per desplaçar",
-    "lineEditor_nothingSelected": "Seleccionar un punt d’editar (manténer Maj. per ne seleccionar mantun),\no manténer Alt e clicar per n’apondre de novèls",
-    "placeImage": "Clicatz per plaçar l’imatge, o clicatz e lisatz per definir sa talha manualament",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publicar vòstra pròpria bibliotèca",
-    "bindTextToElement": "Quichatz Entrada per apondre de tèxte",
-    "deepBoxSelect": "Gardar CtrlOCmd per una seleccion gropada e empachar lo desplaçament",
-    "eraserRevert": "Tenètz quichat Alt per anullar los elements marcats per supression",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Afichatge impossible de l’apercebut",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Èrem plan prudents per inclure pas d’informacions de la scèna vòstra sus l’error. Se vòstra scèna es pas privada, volgatz considerar de perseguir sus nòstre <button>traçadors d’avarias.</button> Volgatz inclure las informacions çai-jos en las copiant e pegant a l’issue GitHub.",
     "sceneContent": "Contengut de la scèna :"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "Podètz convidar lo monde a vòstra scèna actuala per participar amb vos.",
-    "desc_privacy": "Vos en fagatz pas, la session utiliza lo chiframent del cap a la fin, çò que dessenetz demorarà privat. Mai nòstres servidors poiràn pas veire vòstra creacion.",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "Començar la session",
     "button_stopSession": "Arrestar la session",
     "desc_inProgressIntro": "La session de collaboracion es ara en cors.",
@@ -328,6 +410,8 @@
     "click": "clic",
     "deepSelect": "Seleccion prigonda",
     "deepBoxSelect": "Seleccionar demest un grop e empacha lo desplaçament",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "Sageta corba",
     "curvedLine": "Linha corba",
     "documentation": "Documentacion",
@@ -335,7 +419,7 @@
     "drag": "lisar",
     "editor": "Editor",
     "editLineArrowPoints": "",
-    "editText": "Modificar lo tèxte / apondre etiqueta",
+    "editText": "",
     "github": "Problèma trobat ? Senhalatz-lo",
     "howto": "Seguissètz nòstras guidas",
     "or": "o",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zoomar la seleccion",
     "toggleElementLock": "Verrolhar/Desverrolhar la seleccion",
     "movePageUpDown": "Desplaçar la pagina ennaut/enbàs",
-    "movePageLeftRight": "Desplaçar la pagina a esquèrra/drecha"
+    "movePageLeftRight": "Desplaçar la pagina a esquèrra/drecha",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Escafar canabàs"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Angle",
-    "element": "Element",
-    "elements": "Elements",
+    "shapes": "",
     "height": "Nautor",
     "scene": "Scèna",
     "selected": "Seleccionat",
     "storage": "Emmagazinatge",
-    "title": "Estatisticas pels nerds",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "Total",
     "version": "Version",
     "versionCopy": "Clicar per copiar",
@@ -439,13 +527,15 @@
     "copyStyles": "Estiles copiats.",
     "copyToClipboard": "Copiats al quichapapièrs.",
     "copyToClipboardAsPng": "{{exportSelection}} copiat coma PNG ({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Fichièr enregistrat.",
     "fileSavedToFilename": "Enregistrat jos {filename}",
     "canvas": "canabàs",
     "selection": "seleccion",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Transparéncia",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Colors personalizadas mai utilizadas",
     "colors": "Colors",
     "shades": "Nuanças",
@@ -489,7 +580,7 @@
       "exportToImage": {
         "title": "Exportar coma imatge",
         "button": "Exportar coma imatge",
-        "description": ""
+        "description": "Exportar las donadas de la scèna coma un imatge que podètz importar mai tard."
       },
       "saveToDisk": {
         "title": "Salvar al disc",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "Sintaxi Mermaid",
     "preview": "Apercebut"
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "Clicar l’utilizaire per lo seguir",
+      "followStatus": "Seguissètz actualament aqueste utilizaire",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": "La persona parla"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta de comanda",
+    "shortcuts": {
+      "select": "Seleccionar",
+      "confirm": "Confirmar",
+      "close": "Tampar"
+    },
+    "recents": "Utilizada recentament",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "La comanda es pas disponibla...",
+    "shortcutHint": "Per contrarotlar la paleta, utilizatz {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/pa-IN.json b/packages/excalidraw/locales/pa-IN.json
index 7bfe56fb15..281430830a 100644
--- a/packages/excalidraw/locales/pa-IN.json
+++ b/packages/excalidraw/locales/pa-IN.json
@@ -21,7 +21,9 @@
     "copyStyles": "ਸਟਾਇਲ ਕਾਪੀ ਕਰੋ",
     "pasteStyles": "ਸਟਾਇਲ ਪੇਸਟ ਕਰੋ",
     "stroke": "ਰੇਖਾ",
+    "changeStroke": "",
     "background": "ਬੈਕਗਰਾਉਂਡ",
+    "changeBackground": "",
     "fill": "ਭਰਨਾ",
     "strokeWidth": "ਰੇਖਾ ਦੀ ਚੌੜਾਈ",
     "strokeStyle": "ਰੇਖਾ ਦਾ ਸਟਾਇਲ",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "ਫੌਂਟ ਅਕਾਰ",
     "fontFamily": "ਫੌਂਟ ਪਰਿਵਾਰ",
     "addWatermark": "\"Excalidraw ਨਾਲ ਬਣਾਇਆ\" ਜੋੜੋ",
@@ -72,6 +82,7 @@
     "canvasColors": "ਕੈਨਵਸ 'ਤੇ ਵਰਤਿਆ",
     "canvasBackground": "ਕੈਨਵਸ ਦਾ ਬੈਕਗਰਾਉਂਡ",
     "drawingCanvas": "ਡਰਾਇੰਗ ਕੈਨਵਸ",
+    "clearCanvas": "",
     "layers": "ਪਰਤਾਂ",
     "actions": "ਕਾਰਵਾਈਆਂ",
     "language": "ਭਾਸ਼ਾ",
@@ -84,12 +95,13 @@
     "group": "ਚੋਣ ਦਾ ਗਰੁੱਪ ਬਣਾਓ",
     "ungroup": "ਚੋਣ ਦਾ ਗਰੁੱਪ ਤੋੜੋ",
     "collaborators": "ਸਹਿਯੋਗੀ",
-    "showGrid": "ਜਾਲੀ ਦਿਖਾਓ",
+    "toggleGrid": "",
     "addToLibrary": "ਲਾਇਬ੍ਰੇਰੀ ਵਿੱਚ ਜੋੜੋ",
     "removeFromLibrary": "ਲਾਇਬ੍ਰੇਰੀ 'ਚੋਂ ਹਟਾਓ",
     "libraryLoadingMessage": "ਲਾਇਬ੍ਰੇਰੀ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…",
     "libraries": "ਲਾਇਬ੍ਰੇਰੀਆਂ ਬਰਾਉਜ਼ ਕਰੋ",
     "loadingScene": "ਦ੍ਰਿਸ਼ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
+    "loadScene": "",
     "align": "ਇਕਸਾਰ",
     "alignTop": "ਉੱਪਰ ਇਕਸਾਰ ਕਰੋ",
     "alignBottom": "ਹੇਠਾਂ ਇਕਸਾਰ ਕਰੋ",
@@ -105,7 +117,9 @@
     "share": "ਸਾਂਝਾ ਕਰੋ",
     "showStroke": "ਰੇਖਾ ਦਾ ਰੰਗ ਚੋਣਕਾਰ ਦਿਖਾਓ",
     "showBackground": "ਬੈਕਗਰਾਉਂਡ ਦਾ ਰੰਗ ਚੋਣਕਾਰ ਦਿਖਾਓ",
-    "toggleTheme": "ਥੀਮ ਬਦਲੋ",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
     "personalLib": "ਨਿੱਜੀ ਲਾਇਬ੍ਰੇਰੀ",
     "excalidrawLib": "ਐਕਸਕਲੀਡਰਾਅ ਲਾਇਬ੍ਰੇਰੀ",
     "decreaseFontSize": "ਫੌਂਟ ਦਾ ਅਕਾਰ ਘਟਾਓ",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "ਕੜੀ ਸੋਧੋ",
       "editEmbed": "",
-      "create": "ਕੜੀ ਬਣਾਓ",
-      "createEmbed": "",
+      "create": "",
       "label": "ਕੜੀ",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "ਪੰਕਤੀ ਸੋਧੋ",
-      "exit": "ਪੰਕਤੀ ਸੋਧਕ 'ਤੋਂ ਬਾਹਰ ਨਿਕਲੋ"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "ਲਾਕ ਕਰੋ",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "ਹਾਲੇ ਤੱਕ ਕੋਈ ਚੀਜ ਜੋੜੀ ਨਹੀਂ ਗਈ...",
     "hint_emptyLibrary": "ਇੱਥੇ ਆਈਟਮ ਜੋੜਨ ਲਈ ਉਸਨੂੰ ਕੈਨਵਸ ‘ਤੇ ਚੁਣੋ, ਜਾਂ ਹੇਠਾਂ ਪਬਲਿਕ ਰਿਪਾਜ਼ੀਟਰੀ ‘ਚੋਂ ਲਾਇਬ੍ਰੇਰੀ ਸਥਾਪਤ ਕਰੋ।",
-    "hint_emptyPrivateLibrary": "ਇੱਥੇ ਆਈਟਮ ਜੋੜਨ ਲਈ ਉਸਨੂੰ ਕੈਨਵਸ ‘ਤੇ ਚੁਣੋ।"
+    "hint_emptyPrivateLibrary": "ਇੱਥੇ ਆਈਟਮ ਜੋੜਨ ਲਈ ਉਸਨੂੰ ਕੈਨਵਸ ‘ਤੇ ਚੁਣੋ।",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "ਕੈਨਵਸ ਰੀਸੈੱਟ ਕਰੋ",
@@ -151,6 +204,7 @@
     "exportImage": "ਤਸਵੀਰ ਨਿਰਯਾਤ ਕਰੋ...",
     "export": "ਇਸ ਵਿੱਚ ਸਾਂਭੋ...",
     "copyToClipboard": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ",
+    "copyLink": "",
     "save": "ਮੌਜੂਦਾ ਫਾਈਲ ਵਿੱਚ ਸਾਂਭੋ",
     "saveAs": "ਇਸ ਵਜੋਂ ਸਾਂਭੋ",
     "load": "ਖੋਲ੍ਹੋ",
@@ -171,14 +225,16 @@
     "fullScreen": "ਪੂਰੀ ਸਕਰੀਨ",
     "darkMode": "ਡਾਰਕ ਮੋਡ",
     "lightMode": "ਲਾਇਟ ਮੋਡ",
+    "systemMode": "",
     "zenMode": "ਜ਼ੈੱਨ ਮੋਡ",
     "objectsSnapMode": "",
     "exitZenMode": "ਜ਼ੈੱਨ ਮੋਡ 'ਚੋਂ ਬਾਹਰ ਨਿਕਲੋ",
     "cancel": "ਰੱਦ ਕਰੋ",
+    "saveLibNames": "",
     "clear": "ਸਾਫ਼ ਕਰੋ",
     "remove": "ਹਟਾਓ",
     "embed": "",
-    "publishLibrary": "ਪ੍ਰਕਾਸ਼ਤ ਕਰੋ",
+    "publishLibrary": "",
     "submit": "ਜਮ੍ਹਾ ਕਰਵਾਓ",
     "confirm": "ਪੁਸ਼ਟੀ ਕਰੋ",
     "embeddableInteractionButton": ""
@@ -204,7 +260,8 @@
     "resetLibrary": "ਇਹ ਤੁਹਾਡੀ ਲਾਇਬ੍ਰੇਰੀ ਨੂੰ ਸਾਫ ਕਰ ਦੇਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਇੰਝ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
     "removeItemsFromsLibrary": "ਲਾਇਬ੍ਰੇਰੀ ਵਿੱਚੋਂ {{count}} ਚੀਜ਼(-ਜ਼ਾਂ) ਮਿਟਾਉਣੀਆਂ ਹਨ?",
     "invalidEncryptionKey": "ਇਨਕਰਿਪਸ਼ਨ ਕੁੰਜੀ ‌‌22 ਅੱਖਰਾਂ ਦੀ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ। ਲਾਇਵ ਸਹਿਯੋਗ ਬੰਦ ਹੈ।",
-    "collabOfflineWarning": "ਕੋਈ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ\nਤੁਹਾਡੀਆਂ ਤਬਦੀਲੀਆਂ ਸਾਂਭੀਆਂ ਨਹੀਂ ਜਾਣਗੀਆਂ।"
+    "collabOfflineWarning": "ਕੋਈ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ\nਤੁਹਾਡੀਆਂ ਤਬਦੀਲੀਆਂ ਸਾਂਭੀਆਂ ਨਹੀਂ ਜਾਣਗੀਆਂ।",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "ਫਾਈਲ ਦੀ ਕਿਸਮ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕੀਤਾ ਜਾਂਦਾ।",
@@ -212,9 +269,9 @@
     "fileTooBig": "ਫਾਈਲ ਬਹੁਤ ਜ਼ਿਆਦਾ ਵੱਡੀ ਹੈ। ਵੱਧ-ਤੋਂ-ਵੱਧ ਪ੍ਰਵਾਨਤ ਅਕਾਰ {{maxSize}} ਹੈ।",
     "svgImageInsertError": "SVG ਤਸਵੀਰ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕੇ। SVG ਮਾਰਕ-ਅੱਪ ਨਜਾਇਜ਼ ਲੱਗ ਰਿਹਾ ਹੈ।",
     "failedToFetchImage": "",
-    "invalidSVGString": "SVG ਨਜਾਇਜ਼ ਹੈ।",
     "cannotResolveCollabServer": "",
     "importLibraryError": "ਲਾਇਬ੍ਰੇਰੀ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "ਚੋਣਕਾਰ",
+    "lasso": "",
     "image": "ਤਸਵੀਰ ਸ਼ਾਮਲ ਕਰੋ",
     "rectangle": "ਆਇਤ",
     "diamond": "ਹੀਰਾ",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "ਕੈਨਵਸ ਦੀਆਂ ਕਾਰਵਾਈਆਂ",
@@ -263,28 +337,33 @@
     "shapes": "ਆਕ੍ਰਿਤੀਆਂ"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਬਿੰਦੂਆਂ ਲਈ ਕਲਿੱਕ ਕਰਕੇ ਸ਼ੁਰੂਆਤ ਕਰੋ, ਇਕਹਿਰੀ ਲਕੀਰ ਲਈ ਘਸੀਟੋ",
+    "arrowTool": "",
     "freeDraw": "ਕਲਿੱਕ ਕਰਕੇ ਘਸੀਟੋ, ਪੂਰਾ ਹੋਣ 'ਤੇ ਛੱਡ ਦਿਉ",
     "text": "ਨੁਸਖਾ: ਤੁਸੀਂ ਚੋਣਕਾਰ ਸੰਦ ਰਾਹੀਂ ਕਿਤੇ ਵੀ ਡਬਲ-ਕਲਿੱਕ ਕਰਕੇ ਵੀ ਪਾਠ ਜੋੜ ਸਕਦੇ ਹੋ",
     "embeddable": "",
-    "text_selected": "ਪਾਠ ਨੂੰ ਸੋਧਣ ਲਈ ਡਬਲ-ਕਲਿੱਕ ਕਰੋ ਜਾਂ ਐਂਟਰ ਦਬਾਓ",
-    "text_editing": "ਸੋਧ ਮੁਕੰਮਲ ਕਰਨ ਲਈ ਐਸਕੇਪ (Esc) ਜਾਂ Ctrl-ਜਾਂ-Cmd+ਐਂਟਰ (enter) ਦਬਾਓ",
-    "linearElementMulti": "ਮੁਕੰਮਲ ਕਰਨ ਲਈ ਆਖਰੀ ਬਿੰਦੂ 'ਤੇ ਕਲਿੱਕ ਕਰੋ ਜਾਂ ਇਸਕੇਪ ਜਾਂ ਐਂਟਰ ਦਬਾਓ",
-    "lockAngle": "ਤੁਸੀਂ SHIFT ਦਬਾਈ ਰੱਖ ਕੇ ਕੋਣਾਂ ਨੂੰ ਕਾਬੂ ਕਰ ਸਕਦੇ ਹੋ",
-    "resize": "ਤੁਸੀਂ ਅਕਾਰ ਬਦਲਦੇ ਸਮੇਂ SHIFT ਦਬਾਈ ਰੱਖ ਕੇ ਅਨੁਪਾਤ ਨੂੰ ਕਾਬੂ ਕਰ ਸਕਦੇ ਹੋ, ਵਿਚਕਾਰ ਤੋਂ ਅਕਾਰ ਬਦਲਣ ਲਈ ALT ਦਬਾਓ",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
     "resizeImage": "",
-    "rotate": "ਤੁਸੀਂ ਘੁਮਾਉਂਦੇ ਹੋਏ SHIFT ਦਬਾਈ ਰੱਖ ਕੇ ਕੋਣਾਂ ਨੂੰ ਕਾਬੂ ਕਰ ਸਕਦੇ ਹੋ",
+    "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "ਆਪਣੀ ਲਾਇਬ੍ਰੇਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕਰੋ",
-    "bindTextToElement": "ਪਾਠ ਜੋੜਨ ਲਈ ਐੰਟਰ ਦਬਾਓ",
+    "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "ਝਲਕ ਨਹੀਂ ਦਿਖਾ ਸਕਦੇ",
@@ -299,9 +378,12 @@
     "openIssueMessage": "ਅਸੀਂ ਬੜੇ ਸਾਵਧਾਨ ਸੀ ਕਿ ਗਲਤੀ ਵਿੱਚ ਤੁਹਾਡੇ ਦ੍ਰਿਸ਼ ਦੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਨਾ ਕਰੀਏ। ਜੇ ਤੁਹਾਡਾ ਦ੍ਰਿਸ਼ ਨਿੱਜੀ ਨਹੀਂ ਹੈ ਤਾਂ ਇਸ 'ਤੇ ਸਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜੀ <button>ਬੱਗ ਟਰੈਕਰ।</button>ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਨੂੰ ਕਾਪੀ ਕਰਕੇ ਗਿੱਟਹੱਬ ਮੁੱਦੇ ਵਿੱਚ ਪੇਸਟ ਕਰਕੇ ਸ਼ਾਮਲ ਕਰੋ ਜੀ।",
     "sceneContent": "ਦ੍ਰਿਸ਼ ਦੀ ਸਮੱਗਰੀ:"
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
-    "desc_intro": "ਤੁਸੀਂ ਲੋਕਾਂ ਨੂੰ ਆਪਣੇ ਨਾਲ ਮੌਜੂਦਾ ਦ੍ਰਿਸ਼ 'ਤੇ ਸਹਿਯੋਗ ਕਰਨ ਲਈ ਸੱਦਾ ਭੇਜ ਸਕਦੇ ਹੋ।",
-    "desc_privacy": "ਫਿਕਰ ਨਾ ਕਰੋ, ਇਜਲਾਸ ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇਨਕਰਿਪਸ਼ਨ ਵਰਤਦਾ ਹੈ, ਸੋ ਜੋ ਕੁਝ ਵੀ ਤੁਸੀਂ ਵਾਹੁੰਦੇ ਹੋ ਉਹ ਨਿੱਜੀ ਹੀ ਰਹਿੰਦਾ ਹੈ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸਾਡੇ ਸਰਵਰ ਵੀ ਨਹੀਂ ਜਾਣ ਸਕਣਗੇ ਕਿ ਤੁਸੀਂ ਕੀ ਬਣਾਇਆ ਹੈ।",
+    "desc_intro": "",
+    "desc_privacy": "",
     "button_startSession": "ਇਜਲਾਸ ਸ਼ੁਰੂ ਕਰੋ",
     "button_stopSession": "ਇਜਲਾਸ ਰੋਕੋ",
     "desc_inProgressIntro": "ਲਾਇਵ ਸਹਿਯੋਗ ਇਜਲਾਸ ਹੁਣ ਚੱਲ ਰਿਹਾ ਹੈ।",
@@ -328,6 +410,8 @@
     "click": "ਕਲਿੱਕ",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "ਵਿੰਗਾ ਤੀਰ",
     "curvedLine": "ਵਿੰਗੀ ਲਕੀਰ",
     "documentation": "ਕਾਗਜ਼ਾਤ",
@@ -350,7 +434,9 @@
     "zoomToSelection": "ਚੋਣ ਤੱਕ ਜ਼ੂਮ ਕਰੋ",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "ਕੈਨਵਸ ਨੂੰ ਸਾਫ਼ ਕਰੋ"
@@ -410,8 +496,8 @@
       "copyPngToClipboard": "PNG ਨੂੰ ਕਲਿੱਪੋਬਰਡ ‘ਤੇ ਕਾਪੀ ਕਰੋ"
     },
     "button": {
-      "exportToPng": "PNG",
-      "exportToSvg": "SVG",
+      "exportToPng": "",
+      "exportToSvg": "",
       "copyPngToClipboard": "ਗੱਤੇ 'ਤੇ ਕਾਪੀ ਕਰੋ"
     }
   },
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "ਕੋਣ",
-    "element": "ਐਲੀਮੈਂਟ",
-    "elements": "ਐਲੀਮੈਂਟ",
+    "shapes": "",
     "height": "ਉਚਾਈ",
     "scene": "ਦ੍ਰਿਸ਼",
     "selected": "ਚੁਣੇ",
     "storage": "ਸਟੋਰੇਜ",
-    "title": "ਪੜਾਕੂਆਂ ਲਈ ਅੰਕੜੇ",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "ਕੁੱਲ",
     "version": "ਸੰਸਕਰਨ",
     "versionCopy": "ਕਾਪੀ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
@@ -439,13 +527,15 @@
     "copyStyles": "ਕਾਪੀ ਕੀਤੇ ਸਟਾਇਲ।",
     "copyToClipboard": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕੀਤਾ।",
     "copyToClipboardAsPng": "{{exportSelection}} ਨੂੰ ਕਲਿੱਪਬੋਰਡ 'ਤੇ PNG ਵਜੋਂ ਕਾਪੀ ਕੀਤਾ ({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "ਫਾਈਲ ਸਾਂਭੀ ਗਈ।",
     "fileSavedToFilename": "{filename} ਵਿੱਚ ਸਾਂਭੀ",
     "canvas": "ਕੈਨਵਸ",
     "selection": "ਚੋਣ",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "ਪਾਰਦਰਸ਼ੀ",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "ਸਭ ਤੋਂ ਵੱਧ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਕਸਟਮ ਰੰਗ",
     "colors": "ਰੰਗ",
     "shades": "ਸ਼ੇਡਾਂ",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/percentages.json b/packages/excalidraw/locales/percentages.json
index eb3cd087b7..65fac824eb 100644
--- a/packages/excalidraw/locales/percentages.json
+++ b/packages/excalidraw/locales/percentages.json
@@ -1,56 +1,59 @@
 {
-  "ar-SA": 94,
-  "az-AZ": 17,
-  "bg-BG": 71,
-  "bn-BD": 52,
-  "ca-ES": 83,
-  "cs-CZ": 86,
-  "da-DK": 61,
-  "de-DE": 100,
-  "el-GR": 80,
+  "ar-SA": 91,
+  "az-AZ": 27,
+  "bg-BG": 70,
+  "bn-BD": 42,
+  "bn-IN": 42,
+  "ca-ES": 91,
+  "cs-CZ": 82,
+  "da-DK": 31,
+  "de-CH": 91,
+  "de-DE": 91,
+  "el-GR": 86,
   "en": 100,
-  "es-ES": 96,
-  "eu-ES": 97,
-  "fa-IR": 84,
-  "fi-FI": 76,
+  "es-ES": 91,
+  "eu-ES": 78,
+  "fa-IR": 91,
+  "fi-FI": 67,
   "fr-FR": 99,
-  "gl-ES": 86,
-  "he-IL": 77,
-  "hi-IN": 76,
-  "hu-HU": 76,
-  "id-ID": 91,
-  "it-IT": 98,
-  "ja-JP": 90,
-  "kaa": 36,
-  "kab-KAB": 76,
-  "kk-KZ": 18,
-  "km-KH": 83,
-  "ko-KR": 100,
-  "ku-TR": 87,
-  "lt-LT": 48,
-  "lv-LV": 77,
-  "mr-IN": 98,
-  "my-MM": 35,
-  "nb-NO": 93,
-  "nl-NL": 75,
-  "nn-NO": 67,
-  "oc-FR": 92,
-  "pa-IN": 78,
-  "pl-PL": 99,
-  "pt-BR": 91,
-  "pt-PT": 83,
-  "ro-RO": 99,
-  "ru-RU": 92,
-  "si-LK": 7,
-  "sk-SK": 100,
-  "sl-SI": 100,
-  "sv-SE": 100,
-  "ta-IN": 81,
-  "th-TH": 44,
-  "tr-TR": 87,
-  "uk-UA": 93,
-  "vi-VN": 49,
+  "gl-ES": 67,
+  "he-IL": 91,
+  "hi-IN": 91,
+  "hu-HU": 53,
+  "id-ID": 90,
+  "it-IT": 91,
+  "ja-JP": 82,
+  "kaa": 23,
+  "kab-KAB": 60,
+  "kk-KZ": 14,
+  "km-KH": 60,
+  "ko-KR": 81,
+  "ku-TR": 64,
+  "lt-LT": 37,
+  "lv-LV": 57,
+  "mr-IN": 91,
+  "my-MM": 27,
+  "nb-NO": 91,
+  "nl-NL": 59,
+  "nn-NO": 48,
+  "oc-FR": 75,
+  "pa-IN": 58,
+  "pl-PL": 100,
+  "pt-BR": 90,
+  "pt-PT": 91,
+  "ro-RO": 100,
+  "ru-RU": 91,
+  "si-LK": 75,
+  "sk-SK": 91,
+  "sl-SI": 91,
+  "sv-SE": 91,
+  "ta-IN": 86,
+  "th-TH": 63,
+  "tr-TR": 94,
+  "uk-UA": 90,
+  "uz-UZ": 0,
+  "vi-VN": 75,
   "zh-CN": 100,
-  "zh-HK": 22,
-  "zh-TW": 100
+  "zh-HK": 17,
+  "zh-TW": 91
 }
diff --git a/packages/excalidraw/locales/pl-PL.json b/packages/excalidraw/locales/pl-PL.json
index bc869c19ce..05b10d692a 100644
--- a/packages/excalidraw/locales/pl-PL.json
+++ b/packages/excalidraw/locales/pl-PL.json
@@ -8,28 +8,30 @@
     "moveCanvas": "Przesuń obszar roboczy",
     "cut": "Wytnij",
     "copy": "Kopiuj",
-    "copyAsPng": "Skopiuj do schowka jako plik PNG",
-    "copyAsSvg": "Skopiuj do schowka jako plik SVG",
-    "copyText": "Skopiuj do schowka jako tekst",
-    "copySource": "Skopiuj źródło do schowka",
-    "convertToCode": "Skonwertuj do kodu",
-    "bringForward": "Przenieś wyżej",
+    "copyAsPng": "Kopiuj do schowka jako plik PNG",
+    "copyAsSvg": "Kopiuj do schowka jako plik SVG",
+    "copyText": "Kopiuj do schowka jako tekst",
+    "copySource": "Kopiuj źródło do schowka",
+    "convertToCode": "Skonwertuj na kod",
+    "bringForward": "Przesuń warstwę wyżej",
     "sendToBack": "Przenieś na spód",
     "bringToFront": "Przenieś na wierzch",
-    "sendBackward": "Przenieś niżej",
+    "sendBackward": "Przenieś warstwę niżej",
     "delete": "Usuń",
     "copyStyles": "Kopiuj style",
     "pasteStyles": "Wklej style",
-    "stroke": "Kolor obramowania",
-    "background": "Kolor wypełnienia",
+    "stroke": "Kreska",
+    "changeStroke": "Zmień kolor kreski",
+    "background": "Tło",
+    "changeBackground": "Zmień kolor tła",
     "fill": "Wypełnienie",
-    "strokeWidth": "Grubość obramowania",
-    "strokeStyle": "Styl obrysu",
+    "strokeWidth": "Szerokość kreski",
+    "strokeStyle": "Styl kreski",
     "strokeStyle_solid": "Pełny",
-    "strokeStyle_dashed": "Kreskowany",
+    "strokeStyle_dashed": "Linia przerywana",
     "strokeStyle_dotted": "Kropkowany",
     "sloppiness": "Styl kreski",
-    "opacity": "Przeźroczystość",
+    "opacity": "Przezroczystość",
     "textAlign": "Wyrównanie tekstu",
     "edges": "Krawędzie",
     "sharp": "Ostry",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Brak",
     "arrowhead_arrow": "Strzałka",
     "arrowhead_bar": "Kreska",
-    "arrowhead_circle": "Okrąg",
-    "arrowhead_circle_outline": "Okrąg (obrys)",
+    "arrowhead_circle": "Koło",
+    "arrowhead_circle_outline": "Koło (puste)",
     "arrowhead_triangle": "Trójkąt",
-    "arrowhead_triangle_outline": "Trójkąt (obrys)",
+    "arrowhead_triangle_outline": "Trójkąt (pusty)",
     "arrowhead_diamond": "Romb",
-    "arrowhead_diamond_outline": "Romb (obrys)",
+    "arrowhead_diamond_outline": "Romb (pusty)",
+    "arrowhead_crowfoot_many": "Notacja Martina (wiele)",
+    "arrowhead_crowfoot_one": "Notacja Martina (jeden)",
+    "arrowhead_crowfoot_one_or_many": "Notacja Martina (jeden lub wiele)",
+    "more_options": "Więcej opcji",
+    "arrowtypes": "Typ strzałki",
+    "arrowtype_sharp": "Ostra strzałka",
+    "arrowtype_round": "Zaokrąglona strzałka",
+    "arrowtype_elbowed": "Łamana strzałka",
     "fontSize": "Rozmiar tekstu",
     "fontFamily": "Krój pisma",
     "addWatermark": "Dodaj \"Zrobione w Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Używane na płótnie",
     "canvasBackground": "Kolor dokumentu",
     "drawingCanvas": "Obszar roboczy",
+    "clearCanvas": "Wyczyść płótno",
     "layers": "Warstwy",
     "actions": "Akcje",
     "language": "Język",
@@ -84,12 +95,13 @@
     "group": "Zgrupuj wybrane",
     "ungroup": "Rozgrupuj wybrane",
     "collaborators": "Współtwórcy",
-    "showGrid": "Pokaż siatkę",
+    "toggleGrid": "Przełącz widoczność siatki",
     "addToLibrary": "Dodaj do biblioteki",
     "removeFromLibrary": "Usuń z biblioteki",
     "libraryLoadingMessage": "Wczytywanie biblioteki…",
     "libraries": "Przeglądaj biblioteki",
     "loadingScene": "Wczytywanie sceny…",
+    "loadScene": "Wczytaj scenę z pliku",
     "align": "Wyrównaj",
     "alignTop": "Wyrównaj do góry",
     "alignBottom": "Wyrównaj do dołu",
@@ -105,7 +117,9 @@
     "share": "Udostępnij",
     "showStroke": "Pokaż próbnik kolorów obrysu",
     "showBackground": "Pokaż próbnik koloru tła",
-    "toggleTheme": "Przełącz motyw",
+    "showFonts": "Pokaż selektor czcionek",
+    "toggleTheme": "Przełącz motyw jasny / ciemny",
+    "theme": "Motyw",
     "personalLib": "Biblioteka prywatna",
     "excalidrawLib": "Biblioteka Excalidraw",
     "decreaseFontSize": "Zmniejsz rozmiar czcionki",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Zawijaj tekst w kontenerze",
     "link": {
       "edit": "Edytuj łącze",
-      "editEmbed": "Edytuj i osadź link",
-      "create": "Utwórz łącze",
-      "createEmbed": "Stwórz i osadź link",
+      "editEmbed": "Edytuj osadzalne łącze",
+      "create": "Dodaj link",
       "label": "Łącze",
       "labelEmbed": "Podlinkuj i osadź",
-      "empty": "Nie ustawiono linku"
+      "empty": "Brakujący link",
+      "hint": "Wpisz lub wklej swój link tutaj",
+      "goToElement": "Przejdź do elementu docelowego"
     },
     "lineEditor": {
       "edit": "Edytuj linię",
-      "exit": "Wyjdź z edytora linii"
+      "editArrow": "Edytuj strzałkę"
+    },
+    "polygon": {
+      "breakPolygon": "Przerwij wielokąt",
+      "convertToPolygon": "Przekształć w wielokąt"
     },
     "elementLock": {
       "lock": "Zablokuj",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "Zaznacz wszystkie elementy w ramce",
     "removeAllElementsFromFrame": "Usuń wszystkie elementy z ramki",
     "eyeDropper": "Wybierz kolor z płótna",
-    "textToDiagram": "Tekst do diagramu",
-    "prompt": ""
+    "textToDiagram": "Generuj diagram z opisu",
+    "prompt": "Opis",
+    "followUs": "Obserwuj nas",
+    "discordChat": "Czat Discorda",
+    "zoomToFitViewport": "Dopasuj widok do ekranu",
+    "zoomToFitSelection": "Dopasuj widok do zaznaczenia",
+    "zoomToFit": "Dopasuj widok do całej zawartości",
+    "installPWA": "Zainstaluj Excalidraw lokalnie (PWA)",
+    "autoResize": "Włącz automatyczne zmiany rozmiaru tekstu",
+    "imageCropping": "Przycinanie obrazu",
+    "unCroppedDimension": "Nieprzycięty wymiar",
+    "copyElementLink": "Kopiuj link do obiektu",
+    "linkToElement": "Link do obiektu",
+    "wrapSelectionInFrame": "Owiń wybór w ramkę",
+    "tab": "Tab",
+    "shapeSwitch": "Wybór kształtu"
+  },
+  "elementLink": {
+    "title": "Link do obiektu",
+    "desc": "Kliknij kształt na obszarze roboczym lub wklej link.",
+    "notFound": "Powiązany obiekt nie został znaleziony na płótnie."
   },
   "library": {
     "noItems": "Nie dodano jeszcze żadnych elementów...",
     "hint_emptyLibrary": "Wybierz element na płótnie, aby go tutaj dodać, lub zainstaluj bibliotekę z poniższego publicznego repozytorium.",
-    "hint_emptyPrivateLibrary": "Wybierz element, aby dodać go tutaj."
+    "hint_emptyPrivateLibrary": "Wybierz element, aby dodać go tutaj.",
+    "search": {
+      "inputPlaceholder": "Szukaj w bibliotece",
+      "heading": "Znalezione w bibliotece",
+      "noResults": "Nie znaleziono pasujących elementów...",
+      "clearSearch": "Usuń historię wyszukiwania"
+    }
+  },
+  "search": {
+    "title": "Znajdź na płótnie",
+    "noMatch": "Nie znaleziono pasujących elementów...",
+    "singleResult": "wynik",
+    "multipleResults": "wyniki",
+    "placeholder": "Znajdź tekst na płótnie...",
+    "frames": "Ramki",
+    "texts": "Teksty"
   },
   "buttons": {
     "clearReset": "Wyczyść dokument i zresetuj kolor dokumentu",
@@ -151,6 +204,7 @@
     "exportImage": "Eksportuj obraz...",
     "export": "Zapisz jako...",
     "copyToClipboard": "Skopiuj do schowka",
+    "copyLink": "Kopiuj link",
     "save": "Zapisz do bieżącego pliku",
     "saveAs": "Zapisz jako",
     "load": "Otwórz",
@@ -171,14 +225,16 @@
     "fullScreen": "Pełny ekran",
     "darkMode": "Ciemny motyw",
     "lightMode": "Jasny motyw",
+    "systemMode": "Motyw systemowy",
     "zenMode": "Tryb Zen",
     "objectsSnapMode": "Przyciąganie do obiektów",
     "exitZenMode": "Wyjdź z trybu Zen",
     "cancel": "Anuluj",
+    "saveLibNames": "Zapisz nazwę(-y) i wyjdź",
     "clear": "Wyczyść",
     "remove": "Usuń",
     "embed": "Przełącz osadzenie",
-    "publishLibrary": "Opublikuj",
+    "publishLibrary": "Zmień nazwę lub opublikuj",
     "submit": "Prześlij",
     "confirm": "Zatwierdź",
     "embeddableInteractionButton": "Kliknij, aby wejść w interakcję"
@@ -204,7 +260,8 @@
     "resetLibrary": "To wyczyści twoją bibliotekę. Jesteś pewien?",
     "removeItemsFromsLibrary": "Usunąć {{count}} element(ów) z biblioteki?",
     "invalidEncryptionKey": "Klucz szyfrowania musi składać się z 22 znaków. Współpraca na żywo jest wyłączona.",
-    "collabOfflineWarning": "Brak połączenia z Internetem.\nTwoje zmiany nie zostaną zapisane!"
+    "collabOfflineWarning": "Brak połączenia z Internetem.\nTwoje zmiany nie zostaną zapisane!",
+    "localStorageQuotaExceeded": "Przekroczono limit pamięci przeglądarki. Zmiany nie zostaną zapisane."
   },
   "errors": {
     "unsupportedFileType": "Nieobsługiwany typ pliku.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Plik jest zbyt duży. Maksymalny dozwolony rozmiar to {{maxSize}}.",
     "svgImageInsertError": "Nie udało się wstawić obrazu SVG. Znacznik SVG wygląda na nieprawidłowy.",
     "failedToFetchImage": "Nie udało się załadować obrazu.",
-    "invalidSVGString": "Nieprawidłowy SVG.",
     "cannotResolveCollabServer": "Nie można połączyć się z serwerem współpracy w czasie rzeczywistym. Proszę odświeżyć stronę i spróbować ponownie.",
     "importLibraryError": "Wystąpił błąd w trakcie ładowania biblioteki",
+    "saveLibraryError": "Nie można zapisać biblioteki do pamięci. Proszę zapisać bibliotekę do pliku lokalnie, aby upewnić się, że nie stracisz zmian.",
     "collabSaveFailed": "Nie udało się zapisać w bazie danych. Jeśli problemy nie ustąpią, zapisz plik lokalnie, aby nie utracić swojej pracy.",
     "collabSaveFailed_sizeExceeded": "Nie udało się zapisać w bazie danych — dokument jest za duży. Zapisz plik lokalnie, aby nie utracić swojej pracy.",
     "imageToolNotSupported": "Dodawanie obrazów jest wyłączone.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Zaznaczenie",
+    "lasso": "Wybór lassem",
     "image": "Wstaw obraz",
     "rectangle": "Prostokąt",
     "diamond": "Romb",
@@ -255,7 +313,23 @@
     "hand": "Ręka (narzędzie do przesuwania)",
     "extraTools": "Więcej narzędzi",
     "mermaidToExcalidraw": "Konwertuj diagram Mermaid do Excalidraw",
-    "magicSettings": "Ustawienia AI"
+    "convertElementType": "Przełącz typ kształtu"
+  },
+  "element": {
+    "rectangle": "Prostokąt",
+    "diamond": "Romb",
+    "ellipse": "Elipsa",
+    "arrow": "Strzałka",
+    "line": "Linia",
+    "freedraw": "Rysowanie odręczne",
+    "text": "Tekst",
+    "image": "Obraz",
+    "group": "Grupa",
+    "frame": "Ramka",
+    "magicframe": "Kod ze szkicu",
+    "embeddable": "Osadzenie",
+    "selection": "Zaznaczenie",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Narzędzia",
@@ -263,28 +337,33 @@
     "shapes": "Kształty"
   },
   "hints": {
-    "canvasPanning": "Aby przesunąć płótno, przytrzymaj kółko myszy lub spację podczas przeciągania, albo użyj narzędzia ręki",
+    "dismissSearch": "Naciśnij {{shortcut}}, aby odrzucić wyszukiwanie",
+    "canvasPanning": "Aby przesunąć płótno, przytrzymaj {{shortcut_1}} lub {{shortcut_2}} podczas przeciągania, albo użyj narzędzia ręki",
     "linearElement": "Naciśnij, aby zrobić punkt, przeciągnij, aby narysować linię",
+    "arrowTool": "Kliknij, aby rozpocząć rysowanie wielu punktów; przeciągnij, aby narysować pojedynczą linię. Naciśnij ponownie {{shortcut}}, aby zmienić typ strzałki.",
     "freeDraw": "Naciśnij i przeciągnij by rysować, puść kiedy skończysz",
     "text": "Wskazówka: możesz również dodać tekst klikając dwukrotnie gdziekolwiek za pomocą narzędzia zaznaczania",
     "embeddable": "Kliknij i przeciągnij, aby stworzyć osadzenie strony",
-    "text_selected": "Kliknij dwukrotnie lub naciśnij ENTER, aby edytować tekst",
-    "text_editing": "Naciśnij Escape lub Ctrl (Cmd w macOS) + ENTER, aby zakończyć edycję",
-    "linearElementMulti": "Aby zakończyć krzywą, ponownie kliknij w ostatni punkt, bądź naciśnij Esc albo Enter",
-    "lockAngle": "Możesz ograniczyć kąt trzymając SHIFT",
-    "resize": "Możesz zachować proporcję trzymająć wcisnięty SHIFT, przytrzymaj ALT by zmienić rozmiar względem środka",
-    "resizeImage": "Możesz zmienić rozmiar swobodnie trzymając SHIFT,\nprzytrzymaj ALT, aby przeskalować względem środka obiektu",
-    "rotate": "Możesz obracać element w równych odstępach trzymając wciśnięty SHIFT",
-    "lineEditor_info": "Przytrzymaj CtrlOrCmd i kliknij dwukrotnie lub naciśnij CtrlOrCmd + Enter, aby edytować punkty",
-    "lineEditor_pointSelected": "Naciśnij przycisk Delete, aby usunąć punkt. Ctrl/Cmd+D, aby go zduplikować. Przeciągnij, aby go przenieść",
-    "lineEditor_nothingSelected": "Wybierz punkt do edycji (przytrzymaj SHIFT, aby wybrać wiele),\nlub przytrzymaj Alt i kliknij, aby dodać nowe punkty",
-    "placeImage": "Kliknij, aby umieścić obraz, lub kliknij i przeciągnij, aby ustawić jego rozmiar ręcznie",
+    "text_selected": "Kliknij dwukrotnie lub naciśnij {{shortcut}}, aby edytować tekst",
+    "text_editing": "Naciśnij {{shortcut_1}} lub {{shortcut_2}}, aby zakończyć edycję",
+    "linearElementMulti": "Kliknij ostatni punkt lub naciśnij {{shortcut_1}} lub {{shortcut_2}}, aby zakończyć",
+    "lockAngle": "Możesz ograniczyć kąt, przytrzymując {{shortcut}}",
+    "resize": "Możesz zachować proporcje, przytrzymując {{shortcut_1}} podczas zmiany rozmiaru;\nprzytrzymaj {{shortcut_2}}, aby zmienić rozmiar względem środka",
+    "resizeImage": "Możesz dowolnie zmieniać rozmiar, przytrzymując {{shortcut_1}};\nprzytrzymaj {{shortcut_2}}, aby zmienić rozmiar względem środka.",
+    "rotate": "Możesz ograniczyć kąty, przytrzymując {{shortcut}} podczas obracania",
+    "lineEditor_info": "Przytrzymaj {{shortcut_1}} i kliknij dwukrotnie lub naciśnij {{shortcut_2}}, aby edytować punkty",
+    "lineEditor_line_info": "Kliknij dwukrotnie lub naciśnij {{shortcut}}, aby edytować punkty",
+    "lineEditor_pointSelected": "Naciśnij {{shortcut_1}}, aby usunąć punkty,\n{{shortcut_2}}, aby je powielić, lub przeciągnij, aby je przenieść",
+    "lineEditor_nothingSelected": "Wybierz punkt do edycji (przytrzymaj {{shortcut_1}}, aby wybrać wiele punktów)\nlub przytrzymaj {{shortcut_2}} i kliknij myszą, aby dodać nowe punkty",
     "publishLibrary": "Opublikuj własną bibliotekę",
-    "bindTextToElement": "Wciśnij enter, aby dodać tekst",
-    "deepBoxSelect": "Przytrzymaj CtrlOrCmd, aby wybrać w obrębie grupy i uniknąć przeciągania",
-    "eraserRevert": "Przytrzymaj Alt, aby przywrócić elementy oznaczone do usunięcia",
+    "bindTextToElement": "Naciśnij {{shortcut}}, aby dodać tekst",
+    "createFlowchart": "Naciśnij {{shortcut}}, aby utworzyć diagram",
+    "deepBoxSelect": "Przytrzymaj {{shortcut}}, aby wybrać w obrębie grupy i zapobiec przeciągnięciu",
+    "eraserRevert": "Przytrzymaj {{shortcut}}, aby przywrócić elementy oznaczone do usunięcia",
     "firefox_clipboard_write": "Ta funkcja może być włączona poprzez ustawienie flagi \"dom.events.asyncClipboard.clipboardItem\" na \"true\". Aby zmienić flagi przeglądarki w Firefox, odwiedź stronę \"about:config\".",
-    "disableSnapping": "Przytrzymaj Ctrl lub Cmd, aby wyłączyć przyciąganie"
+    "disableSnapping": "Przytrzymaj {{shortcut}} aby wyłączyć przyciąganie",
+    "enterCropEditor": "Kliknij dwukrotnie obraz lub naciśnij {{shortcut}}, aby przyciąć obraz",
+    "leaveCropEditor": "Kliknij obszar poza obrazem albo naciśnij {{shortcut_1}} lub {{shortcut_2}}, aby zakończyć przycinanie"
   },
   "canvasError": {
     "cannotShowPreview": "Nie można wyświetlić podglądu",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Szanujemy twoją prywatność i raport nie zawierał żadnych danych dotyczących tego nad czym pracowałeś, natomiast jeżeli jesteś w stanie podzielić się tym nad czym pracowałeś, prosimy o dodatkowy raport poprzez <button>nasze narzędzie do raportowania błędów.</button> Prosimy o dołączenie poniższej informacji poprzez skopiowanie jej i umieszczenie jej w zgłoszeniu na portalu GitHub.",
     "sceneContent": "Zawartość dokumentu:"
   },
+  "shareDialog": {
+    "or": "Lub"
+  },
   "roomDialog": {
-    "desc_intro": "Będziesz w stanie pracować wraz z osobami które zaprosisz do współpracy.",
-    "desc_privacy": "By zapewnić Ci prywatność, sesja współpracy na żywo jest zabezpieczona szyfrowaniem end-to-end, co oznacza, że poza tobą i osobami z którymi podzielisz się linkiem, nikt nie ma dostępu do tego co będziecie tworzyć.",
+    "desc_intro": "Zaproś ludzi do wspólnego rysunku.",
+    "desc_privacy": "Nie martw się, sesja jest szyfrowana end-to-end i w pełni prywatna. Nawet nasz serwer nie widzi co rysujesz.",
     "button_startSession": "Rozpocznij sesję",
     "button_stopSession": "Zakończ sesję",
     "desc_inProgressIntro": "Sesja współpracy na żywo właśnie się rozpoczęła.",
@@ -328,6 +410,8 @@
     "click": "kliknięcie",
     "deepSelect": "Wybór w obrębie grupy",
     "deepBoxSelect": "Wybór w obrębie grupy i unikanie przeciągania",
+    "createFlowchart": "Twórz diagram używając generycznych elementów",
+    "navigateFlowchart": "Nawiguj diagram",
     "curvedArrow": "Zakrzywiona strzałka",
     "curvedLine": "Zakrzywiona linia",
     "documentation": "Dokumentacja",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Przybliż do zaznaczenia",
     "toggleElementLock": "Zablokuj/odblokuj zaznaczenie",
     "movePageUpDown": "Przesuń stronę w górę/w dół",
-    "movePageLeftRight": "Przenieś stronę w lewo/prawo"
+    "movePageLeftRight": "Przenieś stronę w lewo/prawo",
+    "cropStart": "Przytnij obraz",
+    "cropFinish": "Zakończ przycinanie obrazu"
   },
   "clearCanvasDialog": {
     "title": "Wyczyść płótno"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Kąt",
-    "element": "Element",
-    "elements": "Elementy",
+    "shapes": "Kształty",
     "height": "Wysokość",
     "scene": "Scena",
     "selected": "Zaznaczenie",
     "storage": "Pamięć",
-    "title": "Statystyki dla nerdów",
+    "fullTitle": "Właściwości płótna i kształtu",
+    "title": "Właściwości",
+    "generalStats": "Ogólne",
+    "elementProperties": "Właściwości kształtu",
     "total": "Łącznie",
     "version": "Wersja",
     "versionCopy": "Kliknij, aby skopiować",
@@ -439,13 +527,15 @@
     "copyStyles": "Skopiowano style.",
     "copyToClipboard": "Skopiowano do schowka.",
     "copyToClipboardAsPng": "Skopiowano {{exportSelection}} do schowka jako PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Skopiowano {{exportSelection}} do schowka jako SVG\n({{exportColorScheme}})",
     "fileSaved": "Zapisano plik.",
     "fileSavedToFilename": "Zapisano jako {filename}",
     "canvas": "płótno",
     "selection": "zaznaczenie",
     "pasteAsSingleElement": "Użyj {{shortcut}}, aby wkleić jako pojedynczy element,\nlub wklej do istniejącego edytora tekstu",
     "unableToEmbed": "Osadzenie tego linku jest obecnie niedozwolone. Zgłoś propozycję na portalu GitHub, aby dodać go do listy dozwolonych wyjątków",
-    "unrecognizedLinkFormat": "Osadzony link ma niewłaściwy format. Spróbuj wkleić całą zawartość pola \"embed\" z oryginalnej strony."
+    "unrecognizedLinkFormat": "Osadzony link ma niewłaściwy format. Spróbuj wkleić całą zawartość pola \"embed\" z oryginalnej strony.",
+    "elementLinkCopied": "Łącze skopiowane do schowka"
   },
   "colors": {
     "transparent": "Przezroczysty",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "Kolor",
     "mostUsedCustomColors": "Najczęściej używane kolory",
     "colors": "Kolory",
     "shades": "Odcienie",
@@ -521,5 +612,53 @@
     "description": "Obecnie wspierane są jedynie <flowchartLink>proste grafy</flowchartLink>, <sequenceLink>sekwencje</sequenceLink> i <classLink>diagramy klas</classLink>. Pozostałe typy będą wyświetlane jako obrazy w Excalidraw.",
     "syntax": "Składnia diagramów Mermaid",
     "preview": "Podgląd"
+  },
+  "quickSearch": {
+    "placeholder": "Szybkie wyszukiwanie"
+  },
+  "fontList": {
+    "badge": {
+      "old": "stara"
+    },
+    "sceneFonts": "W tej scenie",
+    "availableFonts": "Dostępne czcionki",
+    "empty": "Nie znaleziono czcionek"
+  },
+  "userList": {
+    "empty": "Nie znaleziono użytkowników",
+    "hint": {
+      "text": "Kliknij na użytkownika, aby obserwować",
+      "followStatus": "Obserwujesz tego użytkownika",
+      "inCall": "Użytkownik jest w trakcie połączenia głosowego",
+      "micMuted": "Mikrofon użytkownik jest wyciszony",
+      "isSpeaking": "Użytkownik przemawia"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta poleceń",
+    "shortcuts": {
+      "select": "Wybierz",
+      "confirm": "Potwierdź",
+      "close": "Zamknij"
+    },
+    "recents": "Ostatnio używane",
+    "search": {
+      "placeholder": "Szukaj w menu, poleceniach i odkrywaj ukryte funkcje",
+      "noMatch": "Brak pasujących komend..."
+    },
+    "itemNotAvailable": "Polecenie jest niedostępne...",
+    "shortcutHint": "Przywołaj paletę poleceń za pomocą {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "Ctrl",
+    "option": "Option",
+    "cmd": "Cmd",
+    "alt": "Alt",
+    "escape": "Esc",
+    "enter": "Enter",
+    "shift": "Shift",
+    "spacebar": "Spacja",
+    "delete": "Del",
+    "mmb": "Kółko myszy"
   }
 }
diff --git a/packages/excalidraw/locales/pt-BR.json b/packages/excalidraw/locales/pt-BR.json
index b9701b0e51..b63ae06fab 100644
--- a/packages/excalidraw/locales/pt-BR.json
+++ b/packages/excalidraw/locales/pt-BR.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Copiar para a área de transferência como PNG",
     "copyAsSvg": "Copiar para a área de transferência como SVG",
     "copyText": "Copiar para área de transferência como texto",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Copiar fonte para área de transferência",
+    "convertToCode": "Converter para código",
     "bringForward": "Trazer para a frente",
     "sendToBack": "Enviar para o fundo",
     "bringToFront": "Trazer para o primeiro plano",
@@ -21,10 +21,12 @@
     "copyStyles": "Copiar os estilos",
     "pasteStyles": "Colar os estilos",
     "stroke": "Contorno",
+    "changeStroke": "Alterar cor da borda",
     "background": "Fundo",
+    "changeBackground": "Alterar cor de fundo",
     "fill": "Preenchimento",
     "strokeWidth": "Espessura do traço",
-    "strokeStyle": "Estilo de traço",
+    "strokeStyle": "Estilo do traço",
     "strokeStyle_solid": "Sólido",
     "strokeStyle_dashed": "Tracejado",
     "strokeStyle_dotted": "Pontilhado",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Nenhuma",
     "arrowhead_arrow": "Flecha",
     "arrowhead_bar": "Barra",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Círculo",
+    "arrowhead_circle_outline": "Circulo (contorno)",
     "arrowhead_triangle": "Triângulo",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Triângulo (contorno)",
+    "arrowhead_diamond": "Diamante",
+    "arrowhead_diamond_outline": "Diamante (contorno)",
+    "arrowhead_crowfoot_many": "Pé de pássaro (muitos)",
+    "arrowhead_crowfoot_one": "Pé de pássaro (um)",
+    "arrowhead_crowfoot_one_or_many": "Pé de pássaro (um ou muitos)",
+    "more_options": "Mais opções",
+    "arrowtypes": "Tipo de seta",
+    "arrowtype_sharp": "Seta afiada",
+    "arrowtype_round": "Seta curva",
+    "arrowtype_elbowed": "Seta dobrada",
     "fontSize": "Tamanho da fonte",
     "fontFamily": "Família da fonte",
     "addWatermark": "Adicionar \"Feito com Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Usado na tela",
     "canvasBackground": "Fundo da tela",
     "drawingCanvas": "Tela de desenho",
+    "clearCanvas": "Limpar a tela",
     "layers": "Camadas",
     "actions": "Ações",
     "language": "Idioma",
@@ -84,12 +95,13 @@
     "group": "Agrupar seleção",
     "ungroup": "Desagrupar seleção",
     "collaborators": "Colaboradores",
-    "showGrid": "Mostrar grade",
+    "toggleGrid": "Alternar grade",
     "addToLibrary": "Adicionar à biblioteca",
     "removeFromLibrary": "Remover da biblioteca",
     "libraryLoadingMessage": "Carregando biblioteca…",
     "libraries": "Procurar bibliotecas",
     "loadingScene": "Carregando cena…",
+    "loadScene": "Carregar cenário de arquivo",
     "align": "Alinhamento",
     "alignTop": "Alinhar ao topo",
     "alignBottom": "Alinhar embaixo",
@@ -105,7 +117,9 @@
     "share": "Compartilhar",
     "showStroke": "Exibir seletor de cores do traço",
     "showBackground": "Exibir seletor de cores do fundo",
-    "toggleTheme": "Alternar tema",
+    "showFonts": "Exibir seletor de fonte",
+    "toggleTheme": "Alternar tema claro/escuro",
+    "theme": "Tema",
     "personalLib": "Biblioteca Pessoal",
     "excalidrawLib": "Biblioteca do Excalidraw",
     "decreaseFontSize": "Diminuir o tamanho da fonte",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Envolver texto em um contêiner",
     "link": {
       "edit": "Editar link",
-      "editEmbed": "",
-      "create": "Criar link",
-      "createEmbed": "",
+      "editEmbed": "Editar link incorporável",
+      "create": "Adicionar link",
       "label": "Link",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "Vincular e incorporar",
+      "empty": "Nenhum link foi definido",
+      "hint": "Digite ou cole o seu link aqui",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "Editar linha",
-      "exit": "Sair do editor de linha"
+      "editArrow": "Editar seta"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Bloquear",
@@ -137,20 +156,55 @@
     "selectAllElementsInFrame": "Selecionar todos os elementos no quadro",
     "removeAllElementsFromFrame": "Remover todos os elementos do quadro",
     "eyeDropper": "Escolher cor da tela",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Texto para diagrama",
+    "prompt": "Prompt",
+    "followUs": "Siga-nos",
+    "discordChat": "Discord",
+    "zoomToFitViewport": "Zoom para caber na tela",
+    "zoomToFitSelection": "Ampliar para ajustar a seleção",
+    "zoomToFit": "Ampliar para encaixar todos os elementos",
+    "installPWA": "Instalar excalidraw localmente (PWA)",
+    "autoResize": "Habilitar redimensionamento automático de texto",
+    "imageCropping": "Recorte de imagem",
+    "unCroppedDimension": "Dimensão sem recortes",
+    "copyElementLink": "Copiar link para o objeto",
+    "linkToElement": "Links para o objeto",
+    "wrapSelectionInFrame": "Ajustar seleção no frame",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "Clique em uma forma na tela ou cole um link.",
+    "notFound": "Objeto vinculado não foi encontrado na tela."
   },
   "library": {
     "noItems": "Nenhum item adicionado ainda...",
     "hint_emptyLibrary": "Selecione um item na tela para adicioná-lo aqui, ou instale uma biblioteca do repositório público, abaixo.",
-    "hint_emptyPrivateLibrary": "Selecione um item na tela para adicioná-lo aqui."
+    "hint_emptyPrivateLibrary": "Selecione um item na tela para adicioná-lo aqui.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Procurar na tela",
+    "noMatch": "Nenhum resultado encontrado...",
+    "singleResult": "resultado",
+    "multipleResults": "resultados",
+    "placeholder": "Procurar texto na tela...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
-    "clearReset": "Limpar o canvas e redefinir a cor de fundo",
+    "clearReset": "Limpar a tela",
     "exportJSON": "Exportar arquivo",
     "exportImage": "Exportar imagem...",
     "export": "Salvar como...",
-    "copyToClipboard": "Copiar para o clipboard",
+    "copyToClipboard": "Copiar para a área de transferência",
+    "copyLink": "Copiar link",
     "save": "Salvar para o arquivo atual",
     "saveAs": "Salvar como",
     "load": "Abrir",
@@ -171,17 +225,19 @@
     "fullScreen": "Tela cheia",
     "darkMode": "Modo escuro",
     "lightMode": "Modo claro",
+    "systemMode": "Modo do sistema",
     "zenMode": "Modo Zen",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Encaixar em objetos",
     "exitZenMode": "Sair do modo zen",
     "cancel": "Cancelar",
+    "saveLibNames": "",
     "clear": "Limpar",
     "remove": "Remover",
-    "embed": "",
-    "publishLibrary": "Publicar",
+    "embed": "Alternar incorporação",
+    "publishLibrary": "",
     "submit": "Enviar",
     "confirm": "Confirmar",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Clique para interagir"
   },
   "alerts": {
     "clearReset": "Isto irá limpar toda a tela. Você tem certeza?",
@@ -189,7 +245,7 @@
     "couldNotCreateShareableLinkTooBig": "Não foi possível criar um link compartilhável: a cena é muito grande",
     "couldNotLoadInvalidFile": "Não foi possível carregar o arquivo inválido",
     "importBackendFailed": "A importação do servidor falhou.",
-    "cannotExportEmptyCanvas": "Não é possível exportar um canvas vazio.",
+    "cannotExportEmptyCanvas": "Não é possível exportar uma tela vazia.",
     "couldNotCopyToClipboard": "Não foi possível copiar para a área de transferência.",
     "decryptFailed": "Não foi possível descriptografar os dados.",
     "uploadedSecurly": "O upload foi protegido com criptografia de ponta a ponta, o que significa que o servidor do Excalidraw e terceiros não podem ler o conteúdo.",
@@ -204,20 +260,21 @@
     "resetLibrary": "Isto limpará a sua biblioteca. Você tem certeza?",
     "removeItemsFromsLibrary": "Excluir {{count}} item(ns) da biblioteca?",
     "invalidEncryptionKey": "A chave de encriptação deve ter 22 caracteres. A colaboração ao vivo está desabilitada.",
-    "collabOfflineWarning": "Sem conexão com a internet disponível.\nSuas alterações não serão salvas!"
+    "collabOfflineWarning": "Sem conexão com a internet disponível.\nSuas alterações não serão salvas!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipo de arquivo não suportado.",
     "imageInsertError": "Não foi possível inserir imagem. Tente novamente mais tarde...",
     "fileTooBig": "O arquivo é muito grande. O tamanho máximo permitido é {{maxSize}}.",
     "svgImageInsertError": "Não foi possível inserir a imagem SVG. A marcação SVG parece inválida.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG Inválido.",
+    "failedToFetchImage": "Falha ao buscar imagem.",
     "cannotResolveCollabServer": "Não foi possível conectar-se ao servidor colaborativo. Por favor, recarregue a página e tente novamente.",
     "importLibraryError": "Não foi possível carregar a biblioteca",
+    "saveLibraryError": "Não foi possível salvar a biblioteca no armazenamento. Salve sua biblioteca em um arquivo localmente para garantir que você não perca as alterações.",
     "collabSaveFailed": "Não foi possível salvar no banco de dados do servidor. Se os problemas persistirem, salve o arquivo localmente para garantir que não perca o seu trabalho.",
     "collabSaveFailed_sizeExceeded": "Não foi possível salvar no banco de dados do servidor, a tela parece ser muito grande. Se os problemas persistirem, salve o arquivo localmente para garantir que não perca o seu trabalho.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Imagens estão desabilitadas.",
     "brave_measure_text_error": {
       "line1": "Parece que você está usando o navegador Brave com a configuração <bold>Bloquear Impressões Digitais</bold> no modo agressivo.",
       "line2": "Isso pode acabar quebrando <bold>Elementos de Texto</bold> em seus desenhos.",
@@ -225,16 +282,17 @@
       "line4": "Se desativar essa configuração não corrigir a exibição de elementos de texto, por favor abra uma <issueLink>issue</issueLink> em nosso GitHub, ou mande uma mensagem em nosso <discordLink>Discord</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "Elementos incorporáveis não podem ser adicionados à biblioteca.",
+      "iframe": "Elementos do IFrame não podem ser adicionados à biblioteca.",
+      "image": "Suporte para adicionar imagens à biblioteca em breve!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Não foi possível colar (não foi possível ler da área de transferência do sistema).",
+    "asyncPasteFailedOnParse": "Não foi possível colar.",
+    "copyToSystemClipboardFailed": "Não foi possível copiar para a área de transferência."
   },
   "toolBar": {
     "selection": "Seleção",
+    "lasso": "",
     "image": "Inserir imagem",
     "rectangle": "Retângulo",
     "diamond": "Losango",
@@ -246,16 +304,32 @@
     "library": "Biblioteca",
     "lock": "Manter ativa a ferramenta selecionada após desenhar",
     "penMode": "Modo caneta — impede o toque",
-    "link": "Adicionar/Atualizar link para uma forma selecionada",
+    "link": "Adicionar / Atualizar link para uma forma selecionada",
     "eraser": "Borracha",
     "frame": "Ferramenta de quadro",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "magicframe": "Wireframe para código",
+    "embeddable": "Página web incorporada",
+    "laser": "Ponteiro de laser",
     "hand": "Mão (ferramenta de rolagem)",
     "extraTools": "Mais ferramentas",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "Mermaid para Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Retângulo",
+    "diamond": "Diamante",
+    "ellipse": "Elipse",
+    "arrow": "Seta",
+    "line": "Linha",
+    "freedraw": "Desenho livre",
+    "text": "Texto",
+    "image": "Imagem",
+    "group": "Grupo",
+    "frame": "Moldura",
+    "magicframe": "Wireframe para código",
+    "embeddable": "Página web incorporada",
+    "selection": "Seleção",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Ações da tela",
@@ -263,28 +337,33 @@
     "shapes": "Formas"
   },
   "hints": {
-    "canvasPanning": "Para mover a tela, segure a roda do mouse ou a barra de espaço enquanto arrasta ou use a ferramenta de mão",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Clique para iniciar vários pontos, arraste para uma única linha",
+    "arrowTool": "",
     "freeDraw": "Toque e arraste, solte quando terminar",
     "text": "Dica: você também pode adicionar texto clicando duas vezes em qualquer lugar com a ferramenta de seleção",
-    "embeddable": "",
-    "text_selected": "Clique duplo ou tecle ENTER para editar o texto",
-    "text_editing": "Pressione Esc ou Ctrl/Cmd+ENTER para encerrar a edição",
-    "linearElementMulti": "Clique no último ponto ou pressione Escape ou Enter para terminar",
-    "lockAngle": "Você pode restringir o ângulo segurando o SHIFT",
-    "resize": "Você pode restringir proporções segurando SHIFT enquanto redimensiona,\nsegure ALT para redimensionar do centro",
-    "resizeImage": "Você pode redimensionar livremente segurando SHIFT,\nsegure ALT para redimensionar a partir do centro",
-    "rotate": "Você pode restringir os ângulos segurando SHIFT enquanto gira",
-    "lineEditor_info": "Pressione CtrlOuCmd e duplo-clique ou pressione CtrlOuCmd + Enter para editar pontos",
-    "lineEditor_pointSelected": "Pressione Delete para remover o(s) ponto(s),\nCtrl/Cmd+D para duplicar ou arraste para mover",
-    "lineEditor_nothingSelected": "Selecione um ponto para editar (segure SHIFT para selecionar vários) ou segure Alt e clique para adicionar novos pontos",
-    "placeImage": "Clique para colocar a imagem, ou clique e arraste para definir manualmente o seu tamanho",
+    "embeddable": "Clique e arraste para criar um site incorporado",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publicar sua própria biblioteca",
-    "bindTextToElement": "Pressione Enter para adicionar o texto",
-    "deepBoxSelect": "Segure Ctrl/Cmd para seleção profunda e para evitar arrastar",
-    "eraserRevert": "Segure a tecla Alt para inverter os elementos marcados para exclusão",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Esse recurso pode ser ativado configurando a opção \"dom.events.asyncClipboard.clipboardItem\" como \"true\". Para alterar os sinalizadores do navegador no Firefox, visite a página \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Não é possível mostrar pré-visualização",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Fomos muito cautelosos para não incluir suas informações de cena no erro. Se sua cena não for privada, por favor, considere seguir nosso <button>rastreador de bugs.</button> Por favor, inclua informações abaixo, copiando e colando para a issue do GitHub.",
     "sceneContent": "Conteúdo da cena:"
   },
+  "shareDialog": {
+    "or": "Ou"
+  },
   "roomDialog": {
-    "desc_intro": "Você pode convidar pessoas para sua cena atual para colaborar com você.",
-    "desc_privacy": "Não se preocupe, a sessão usa criptografia de ponta a ponta; portanto, o que você desenhar permanecerá privado. Nem mesmo nosso servidor poderá ver o que você cria.",
+    "desc_intro": "Convide pessoas para colaborar em seu desenho.",
+    "desc_privacy": "Não se preocupe, a sessão é criptografada de ponta a ponta e totalmente privada. Nem mesmo nosso servidor pode ver o que você desenha.",
     "button_startSession": "Iniciar sessão",
     "button_stopSession": "Parar sessão",
     "desc_inProgressIntro": "A sessão de colaboração ao vivo está agora em andamento.",
@@ -317,7 +399,7 @@
     "disk_details": "Exportar os dados da cena para um arquivo que você poderá importar mais tarde.",
     "disk_button": "Salvar em um arquivo",
     "link_title": "Link compartilhável",
-    "link_details": "Exportar como link de apenas leitura.",
+    "link_details": "Exportar como link de somente leitura.",
     "link_button": "Exportar link",
     "excalidrawplus_description": "Salvar a cena na sua área de trabalho Excalidraw+.",
     "excalidrawplus_button": "Exportar",
@@ -328,6 +410,8 @@
     "click": "clicar",
     "deepSelect": "Seleção profunda",
     "deepBoxSelect": "Use a seleção profunda dentro da caixa para previnir arrastar",
+    "createFlowchart": "Crie um fluxograma a partir de um elemento genérico",
+    "navigateFlowchart": "Navegar por um fluxograma",
     "curvedArrow": "Seta curva",
     "curvedLine": "Linha curva",
     "documentation": "Documentação",
@@ -344,13 +428,15 @@
     "shortcuts": "Atalhos de teclado",
     "textFinish": "Encerrar edição (editor de texto)",
     "textNewLine": "Adicionar nova linha (editor de texto)",
-    "title": "Ajudar",
+    "title": "Ajuda",
     "view": "Visualizar",
     "zoomToFit": "Ampliar para encaixar todos os elementos",
     "zoomToSelection": "Ampliar a seleção",
     "toggleElementLock": "Bloquear/desbloquear seleção",
     "movePageUpDown": "Mover a página para cima/baixo",
-    "movePageLeftRight": "Mover a página para esquerda/direita"
+    "movePageLeftRight": "Mover a página para esquerda/direita",
+    "cropStart": "Recortar imagem",
+    "cropFinish": "Finalizar corte da imagem"
   },
   "clearCanvasDialog": {
     "title": "Limpar a tela"
@@ -367,7 +453,7 @@
     "placeholder": {
       "authorName": "Seu nome ou nome de usuário",
       "libraryName": "Nome da sua biblioteca",
-      "libraryDesc": "Descrição para ajudar as pessoas a entenderem o uso da sua da sua biblioteca",
+      "libraryDesc": "Descrição para ajudar as pessoas a entenderem o uso da sua biblioteca",
       "githubHandle": "Identificador do GitHub (opcional), para que você possa editar a biblioteca depois de enviar para revisão",
       "twitterHandle": "Nome de usuário do Twitter (opcional), para que saibamos quem deve ser creditado se promovermos no Twitter",
       "website": "Link para o seu site pessoal ou outro lugar (opcional)"
@@ -377,7 +463,7 @@
       "website": "Informe uma URL válida"
     },
     "noteDescription": "Envie sua biblioteca para ser incluída no <link>repositório de biblioteca pública</link>para outras pessoas usarem em seus desenhos.",
-    "noteGuidelines": "A biblioteca precisa ser aprovada manualmente primeiro. Por favor leia o <link>orientações</link> antes de enviar. Você precisará de uma conta do GitHub para se comunicar e fazer alterações quando solicitado, mas não é estritamente necessário.",
+    "noteGuidelines": "A biblioteca precisa ser aprovada manualmente primeiro. Por favor, leia o <link>orientações</link> antes de enviar. Você precisará de uma conta do GitHub para se comunicar e fazer alterações quando solicitado, mas não é estritamente necessário.",
     "noteLicense": "Ao enviar, você concorda que a biblioteca será publicada sob a <link>Licença MIT, </link>o que, em suma, significa que qualquer pessoa pode utilizá-los sem restrições.",
     "noteItems": "Cada item da biblioteca deve ter seu próprio nome para que seja filtrável. Os seguintes itens da biblioteca serão incluídos:",
     "atleastOneLibItem": "Por favor, selecione pelo menos um item da biblioteca para começar",
@@ -385,7 +471,7 @@
   },
   "publishSuccessDialog": {
     "title": "Biblioteca enviada",
-    "content": "Obrigado {{authorName}}. Sua biblioteca foi enviada para análise. Você pode acompanhar o status<link>aqui</link>"
+    "content": "Obrigado {{authorName}}. Sua biblioteca foi enviada para análise. Você pode acompanhar o status <link>aqui</link>"
   },
   "confirmDialog": {
     "resetLibrary": "Redefinir biblioteca",
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Ângulo",
-    "element": "Elemento",
-    "elements": "Elementos",
+    "shapes": "Formas",
     "height": "Altura",
     "scene": "Cena",
     "selected": "Selecionado",
     "storage": "Armazenamento",
-    "title": "Estatísticas para nerds",
+    "fullTitle": "Propriedades da Tela e da Forma",
+    "title": "Propriedades",
+    "generalStats": "Geral",
+    "elementProperties": "Propriedades da forma",
     "total": "Total",
     "version": "Versão",
     "versionCopy": "Clique para copiar",
@@ -439,13 +527,15 @@
     "copyStyles": "Estilos copiados.",
     "copyToClipboard": "Copiado para área de transferência.",
     "copyToClipboardAsPng": "{{exportSelection}} copiado para a área de transferência como PNG ({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Copiado {{exportSelection}} para a área de transferência com SVG ({{exportColorScheme}})",
     "fileSaved": "Arquivo salvo.",
     "fileSavedToFilename": "Salvo em {filename}",
     "canvas": "tela",
     "selection": "seleção",
     "pasteAsSingleElement": "Use {{shortcut}} para colar como um único elemento,\nou cole em um editor de texto já existente",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "No momento não é permitido incorporar esta URL. Crie uma issue no GitHub para solicitar a lista branca da URL",
+    "unrecognizedLinkFormat": "O link incorporado não corresponde ao formato esperado. Por favor, tente colar a string 'incorporada' que foi fornecida pelo site de origem",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Transparente",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Cores personalizadas mais usadas",
     "colors": "Cores",
     "shades": "Tons",
@@ -516,10 +607,58 @@
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid para Excalidraw",
+    "button": "Inserir",
+    "description": "Atualmente apenas os diagramas<flowchartLink>Flowchart</flowchartLink><sequenceLink>Sequência,</sequenceLink> e <classLink>Class</classLink>são suportados. Os outros tipos serão renderizados como uma imagem no Excalidraw.",
+    "syntax": "Sintaxe em Mermaid",
+    "preview": "Visualizar"
+  },
+  "quickSearch": {
+    "placeholder": "Busca rápida"
+  },
+  "fontList": {
+    "badge": {
+      "old": "antigo"
+    },
+    "sceneFonts": "Neste cenário",
+    "availableFonts": "Fontes disponíveis",
+    "empty": "Nenhuma fonte encontrada"
+  },
+  "userList": {
+    "empty": "Nenhum usuário encontrado",
+    "hint": {
+      "text": "Clique no usuário para seguir",
+      "followStatus": "Atualmente você está seguindo este usuário",
+      "inCall": "O usuário está em uma chamada de voz",
+      "micMuted": "O microfone do usuário está silenciado",
+      "isSpeaking": "O usuário está falando"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta de comandos",
+    "shortcuts": {
+      "select": "Selecionar",
+      "confirm": "Confirmar",
+      "close": "Fechar"
+    },
+    "recents": "Usado recentemente",
+    "search": {
+      "placeholder": "Procure menus, comandos e descubra gemas ocultas",
+      "noMatch": "Nenhum comando correspondente..."
+    },
+    "itemNotAvailable": "Comando indisponível...",
+    "shortcutHint": "Para a paleta de comandos, use {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/pt-PT.json b/packages/excalidraw/locales/pt-PT.json
index 283853b68a..9c0e6d9ec4 100644
--- a/packages/excalidraw/locales/pt-PT.json
+++ b/packages/excalidraw/locales/pt-PT.json
@@ -5,47 +5,57 @@
     "pasteCharts": "Colar gráficos",
     "selectAll": "Selecionar tudo",
     "multiSelect": "Adicionar elemento à seleção",
-    "moveCanvas": "Mover tela",
+    "moveCanvas": "Mover área de desenho",
     "cut": "Cortar",
     "copy": "Copiar",
     "copyAsPng": "Copiar para a área de transferência como PNG",
     "copyAsSvg": "Copiar para a área de transferência como SVG",
-    "copyText": "Copiar para Área de Transferência como texto",
-    "copySource": "",
-    "convertToCode": "",
-    "bringForward": "Trazer para o primeiro plano",
-    "sendToBack": "Enviar para o plano de fundo",
-    "bringToFront": "Trazer para o primeiro plano",
-    "sendBackward": "Enviar para trás",
+    "copyText": "Copiar para área de transferência como texto",
+    "copySource": "Copiar origem para área de transferência",
+    "convertToCode": "Converter para código",
+    "bringForward": "Subir para a frente de tudo",
+    "sendToBack": "Baixar",
+    "bringToFront": "Subir",
+    "sendBackward": "Baixar para trás de tudo",
     "delete": "Apagar",
-    "copyStyles": "Copiar os estilos",
-    "pasteStyles": "Colar os estilos",
-    "stroke": "Contornos",
+    "copyStyles": "Copiar estilos",
+    "pasteStyles": "Colar estilos",
+    "stroke": "Contorno",
+    "changeStroke": "Alterar cor do traço",
     "background": "Fundo",
+    "changeBackground": "Alterar cor do fundo",
     "fill": "Preenchimento",
     "strokeWidth": "Espessura do traço",
-    "strokeStyle": "Estilo de traço",
+    "strokeStyle": "Estilo do traço",
     "strokeStyle_solid": "Sólido",
     "strokeStyle_dashed": "Tracejado",
     "strokeStyle_dotted": "Pontilhado",
-    "sloppiness": "Desleixo",
+    "sloppiness": "Precisão do traço",
     "opacity": "Opacidade",
     "textAlign": "Alinhamento do texto",
     "edges": "Arestas",
-    "sharp": "Aguçado",
-    "round": "Redondo",
+    "sharp": "Reto",
+    "round": "Arredondado",
     "arrowheads": "Pontas",
     "arrowhead_none": "Nenhuma",
     "arrowhead_arrow": "Seta",
     "arrowhead_bar": "Barra",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Círculo",
+    "arrowhead_circle_outline": "Círculo (contorno)",
     "arrowhead_triangle": "Triângulo",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
-    "fontSize": "Tamanho da fonte",
-    "fontFamily": "Família da fontes",
+    "arrowhead_triangle_outline": "Triângulo (contorno)",
+    "arrowhead_diamond": "Losango",
+    "arrowhead_diamond_outline": "Losango (contorno)",
+    "arrowhead_crowfoot_many": "Pé de coroa (muitos)",
+    "arrowhead_crowfoot_one": "Pé de coroa (um)",
+    "arrowhead_crowfoot_one_or_many": "Pé de coroa (um ou muitos)",
+    "more_options": "Mais opções",
+    "arrowtypes": "Tipo de seta",
+    "arrowtype_sharp": "Seta retilínea",
+    "arrowtype_round": "Seta curva",
+    "arrowtype_elbowed": "Seta em cotovelo",
+    "fontSize": "Tamanho do tipo de letra",
+    "fontFamily": "Família do tipo de letra",
     "addWatermark": "Adicionar \"Feito com Excalidraw\"",
     "handDrawn": "Manuscrito",
     "normal": "Normal",
@@ -55,23 +65,24 @@
     "large": "Grande",
     "veryLarge": "Muito grande",
     "solid": "Sólido",
-    "hachure": "Eclosão",
-    "zigzag": "ziguezague",
-    "crossHatch": "Sombreado",
+    "hachure": "Sombreado",
+    "zigzag": "Ziguezague",
+    "crossHatch": "Sombreado trama",
     "thin": "Fino",
-    "bold": "Espesso",
+    "bold": "Negrito",
     "left": "Esquerda",
-    "center": "Centralizar",
+    "center": "Centro",
     "right": "Direita",
-    "extraBold": "Muito espesso",
-    "architect": "Arquitecto",
+    "extraBold": "Extra negrito",
+    "architect": "Arquiteto",
     "artist": "Artista",
     "cartoonist": "Caricaturista",
     "fileTitle": "Nome do ficheiro",
     "colorPicker": "Seletor de cores",
-    "canvasColors": "Usado na tela",
+    "canvasColors": "Usado na área de desenho",
     "canvasBackground": "Fundo da área de desenho",
     "drawingCanvas": "Área de desenho",
+    "clearCanvas": "Apagar área de desenho",
     "layers": "Camadas",
     "actions": "Ações",
     "language": "Idioma",
@@ -84,12 +95,13 @@
     "group": "Agrupar seleção",
     "ungroup": "Desagrupar seleção",
     "collaborators": "Colaboradores",
-    "showGrid": "Mostrar grelha",
+    "toggleGrid": "Ativar/desativar grelha",
     "addToLibrary": "Adicionar à biblioteca",
     "removeFromLibrary": "Remover da biblioteca",
     "libraryLoadingMessage": "A carregar a biblioteca…",
     "libraries": "Procurar bibliotecas",
     "loadingScene": "A carregar a cena…",
+    "loadScene": "Carregar cena de um ficheiro",
     "align": "Alinhamento",
     "alignTop": "Alinhar ao topo",
     "alignBottom": "Alinhar ao fundo",
@@ -105,62 +117,104 @@
     "share": "Partilhar",
     "showStroke": "Mostrar seletor de cores do traço",
     "showBackground": "Mostrar seletor de cores do fundo",
-    "toggleTheme": "Alternar tema",
+    "showFonts": "Mostrar seletor de fonte",
+    "toggleTheme": "Alternar tema claro/escuro",
+    "theme": "Tema",
     "personalLib": "Biblioteca pessoal",
     "excalidrawLib": "Biblioteca do Excalidraw",
     "decreaseFontSize": "Reduzir o tamanho do tipo de letra",
     "increaseFontSize": "Aumentar o tamanho do tipo de letra",
-    "unbindText": "Desvincular texto",
+    "unbindText": "Desligar texto",
     "bindText": "Ligar texto ao recipiente",
     "createContainerFromText": "Envolver texto num recipiente",
     "link": {
-      "edit": "Editar ligação",
-      "editEmbed": "",
-      "create": "Criar ligação",
-      "createEmbed": "",
-      "label": "Ligação",
-      "labelEmbed": "",
-      "empty": ""
+      "edit": "Editar hiperligação",
+      "editEmbed": "Editar hiperligação incorporável",
+      "create": "Adicionar hiperligação",
+      "label": "Hiperligação",
+      "labelEmbed": "Hiperligar e incorporar",
+      "empty": "Não está definida nenhuma hiperligação",
+      "hint": "Escreva ou cole a sua hiperligação aqui",
+      "goToElement": "Ir para o elemento alvo"
     },
     "lineEditor": {
       "edit": "Editar linha",
-      "exit": "Sair do editor de linha"
+      "editArrow": "Editar seta"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Bloquear",
       "unlock": "Desbloquear",
-      "lockAll": "Bloquear todos",
-      "unlockAll": "Desbloquear todos"
+      "lockAll": "Bloquear tudo",
+      "unlockAll": "Desbloquear tudo"
     },
     "statusPublished": "Publicado",
     "sidebarLock": "Manter a barra lateral aberta",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "selectAllElementsInFrame": "Selecionar todos os elementos na moldura",
+    "removeAllElementsFromFrame": "Remover todos os elementos na moldura",
+    "eyeDropper": "Escolher cor da área de desenho",
+    "textToDiagram": "Texto para diagrama",
+    "prompt": "Entrada de código",
+    "followUs": "Siga-nos",
+    "discordChat": "Conversação no Discord",
+    "zoomToFitViewport": "Aproximar para enquadrar no cisualizador",
+    "zoomToFitSelection": "Aproximar para enquadrar a seleção",
+    "zoomToFit": "Aproximar para enquadrar todos os elementos",
+    "installPWA": "Instalar Excalidraw localmente (PWA)",
+    "autoResize": "Ativar redimensionamento automático do texto",
+    "imageCropping": "Corte de imagem",
+    "unCroppedDimension": "Dimensão sem corte",
+    "copyElementLink": "Copiar hiperligação para o objeto",
+    "linkToElement": "Hiperligação para o objeto",
+    "wrapSelectionInFrame": "Ajustar seleção no quadro",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Hiperligação para o objeto",
+    "desc": "Clique numa forma na tela ou cole uma hiperligação.",
+    "notFound": "O objeto hiperligado não foi encontrado na tela."
   },
   "library": {
-    "noItems": "Ainda não foram adicionados nenhuns itens...",
-    "hint_emptyLibrary": "Seleccione um item na tela para adicioná-lo aqui, ou então instale uma biblioteca do repositório público abaixo.",
-    "hint_emptyPrivateLibrary": "Seleccione um item na tela para adicioná-lo aqui."
+    "noItems": "Ainda não foram adicionados itens...",
+    "hint_emptyLibrary": "Selecione um item na área de desenho para adicioná-lo aqui ou então instale uma biblioteca do repositório público abaixo.",
+    "hint_emptyPrivateLibrary": "Selecione um item na área de desenho para adicioná-lo aqui.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Pesquisar na área de desenho",
+    "noMatch": "Não foram encontrados resultados...",
+    "singleResult": "resultado",
+    "multipleResults": "resultados",
+    "placeholder": "Pesquisar texto na área de desenho...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
-    "clearReset": "Limpar a área de desenho e redefinir a cor de fundo",
+    "clearReset": "Limpar a área de desenho",
     "exportJSON": "Exportar para ficheiro",
     "exportImage": "Exportar imagem...",
     "export": "Guardar para...",
-    "copyToClipboard": "Copiar para o clipboard",
+    "copyToClipboard": "Copiar para a área de transferência",
+    "copyLink": "Copiar hiperligação",
     "save": "Guardar no ficheiro atual",
     "saveAs": "Guardar como",
     "load": "Abrir",
-    "getShareableLink": "Obter um link de partilha",
+    "getShareableLink": "Obter uma hiperligação de partilha",
     "close": "Fechar",
     "selectLanguage": "Selecionar idioma",
     "scrollBackToContent": "Voltar ao conteúdo",
-    "zoomIn": "Aumentar zoom",
-    "zoomOut": "Diminuir zoom",
-    "resetZoom": "Redefinir zoom",
+    "zoomIn": "Aproximar",
+    "zoomOut": "Afastar",
+    "resetZoom": "Repor ampliação",
     "menu": "Menu",
     "done": "Concluído",
     "edit": "Editar",
@@ -171,91 +225,111 @@
     "fullScreen": "Ecrã inteiro",
     "darkMode": "Modo escuro",
     "lightMode": "Modo claro",
+    "systemMode": "Modo do sistema",
     "zenMode": "Modo zen",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Atrair aos objetos",
     "exitZenMode": "Sair do modo zen",
     "cancel": "Cancelar",
+    "saveLibNames": "",
     "clear": "Limpar",
     "remove": "Remover",
-    "embed": "",
-    "publishLibrary": "Publicar",
+    "embed": "Alternar incorporação",
+    "publishLibrary": "",
     "submit": "Enviar",
     "confirm": "Confirmar",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Clique para interagir"
   },
   "alerts": {
     "clearReset": "Isto irá limpar toda a área de desenho. Tem a certeza?",
-    "couldNotCreateShareableLink": "Não foi possível criar um link partilhável.",
-    "couldNotCreateShareableLinkTooBig": "Não foi possível criar um link partilhável: a cena é muito grande",
+    "couldNotCreateShareableLink": "Não foi possível criar uma hiperligação partilhável.",
+    "couldNotCreateShareableLinkTooBig": "Não foi possível criar uma hiperligação partilhável: a cena é muito grande",
     "couldNotLoadInvalidFile": "Não foi possível carregar o ficheiro inválido",
     "importBackendFailed": "A importação do servidor falhou.",
     "cannotExportEmptyCanvas": "Não é possível exportar uma área de desenho vazia.",
     "couldNotCopyToClipboard": "Não foi possível copiar para a área de transferência.",
     "decryptFailed": "Não foi possível desencriptar os dados.",
-    "uploadedSecurly": "O upload foi protegido com criptografia de ponta a ponta, o que significa que o servidor do Excalidraw e terceiros não podem ler o conteúdo.",
+    "uploadedSecurly": "O envio foi protegido com encriptação de ponta a ponta, o que significa que o servidor do Excalidraw e terceiros não podem ler o conteúdo.",
     "loadSceneOverridePrompt": "Se carregar um desenho externo substituirá o conteúdo existente. Quer continuar?",
     "collabStopOverridePrompt": "Ao interromper a sessão irá substituir o último desenho guardado. Tem a certeza?\n\n(Caso queira manter o último desenho, simplesmente feche a janela do navegador.)",
     "errorAddingToLibrary": "Não foi possível adicionar o item à biblioteca",
     "errorRemovingFromLibrary": "Não foi possível remover o item da biblioteca",
-    "confirmAddLibrary": "Isso adicionará {{numShapes}} forma(s) à sua biblioteca. Tem a certeza?",
+    "confirmAddLibrary": "Isto irá adicionar {{numShapes}} forma(s) à sua biblioteca. Tem a certeza?",
     "imageDoesNotContainScene": "Esta imagem parece não conter dados de cenas. Ativou a incorporação da cena durante a exportação?",
     "cannotRestoreFromImage": "Não foi possível restaurar a cena deste ficheiro de imagem",
     "invalidSceneUrl": "Não foi possível importar a cena a partir do URL fornecido. Ou está mal formado ou não contém dados JSON do Excalidraw válidos.",
     "resetLibrary": "Isto irá limpar a sua biblioteca. Tem a certeza?",
     "removeItemsFromsLibrary": "Apagar {{count}} item(ns) da biblioteca?",
-    "invalidEncryptionKey": "Chave de encriptação deve ter 22 caracteres. A colaboração ao vivo está desativada.",
-    "collabOfflineWarning": "Sem ligação à internet disponível.\nAs suas alterações não serão salvas!"
+    "invalidEncryptionKey": "A chave de encriptação deve ter 22 caracteres. A colaboração ao vivo está desativada.",
+    "collabOfflineWarning": "A ligação à Internet não está disponível.\nAs suas alterações não serão guardadas!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Tipo de ficheiro não suportado.",
     "imageInsertError": "Não foi possível inserir a imagem, tente novamente mais tarde...",
     "fileTooBig": "O ficheiro é muito grande. O tamanho máximo permitido é {{maxSize}}.",
     "svgImageInsertError": "Não foi possível inserir a imagem SVG. A marcação SVG parece inválida.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG inválido.",
-    "cannotResolveCollabServer": "Não foi possível fazer a ligação ao servidor colaborativo. Por favor, volte a carregar a página e tente novamente.",
+    "failedToFetchImage": "Falha ao processar a imagem.",
+    "cannotResolveCollabServer": "Não foi possível fazer a ligação ao servidor colaborativo. Por favor volte a carregar a página e tente novamente.",
     "importLibraryError": "Não foi possível carregar a biblioteca",
+    "saveLibraryError": "Não foi possível guardar a biblioteca no armazenamento. Guarde a sua biblioteca num ficheiro local para garantir que não perde as alterações.",
     "collabSaveFailed": "Não foi possível guardar na base de dados de backend. Se os problemas persistirem, guarde o ficheiro localmente para garantir que não perde o seu trabalho.",
-    "collabSaveFailed_sizeExceeded": "Não foi possível guardar na base de dados de backend, o ecrã parece estar muito grande. Deve guardar o ficheiro localmente para garantir que não perde o seu trabalho.",
-    "imageToolNotSupported": "",
+    "collabSaveFailed_sizeExceeded": "Não foi possível guardar na base de dados de backend, parece que a a área de desenho é muito grande. Deve guardar o ficheiro localmente para garantir que não perde o seu trabalho.",
+    "imageToolNotSupported": "As imagens estão desativadas.",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": ""
+      "line1": "Parece que está a utilizar o navegador Brave com a configuração <bold>Bloquear impressões digitais (fingerprinting) no modo restrito/agressivo</bold> ativada.",
+      "line2": "Isto pode resultar na quebra dos <bold>Elementos de texto</bold> nos seus desenhos.",
+      "line3": "Recomendamos vivamente a desativação desta configuração. Pode seguir <link>estes passos</link> para saber como o fazer.",
+      "line4": "Se a desativação desta configuração não corrigir a apresentação de elementos de texto, reporte um <issueLink>problema</issueLink> no nosso GitHub ou diga-nos no <discordLink>Discord</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "Os elementos incorporáveis não podem ser adicionados à biblioteca.",
+      "iframe": "Os elementos IFrame não podem ser adicionados à biblioteca.",
+      "image": "Brevemente será possível adicionar imagens à biblioteca!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Não foi possível colar (não foi possível ler da área de transferência do sistema).",
+    "asyncPasteFailedOnParse": "Não foi possível colar.",
+    "copyToSystemClipboardFailed": "Não foi possível copiar para a área de transferência."
   },
   "toolBar": {
     "selection": "Seleção",
+    "lasso": "",
     "image": "Inserir imagem",
     "rectangle": "Retângulo",
     "diamond": "Losango",
     "ellipse": "Elipse",
-    "arrow": "Flecha",
+    "arrow": "Seta",
     "line": "Linha",
     "freedraw": "Desenhar",
     "text": "Texto",
     "library": "Biblioteca",
     "lock": "Manter a ferramenta selecionada ativa após desenhar",
     "penMode": "Modo caneta - impedir toque",
-    "link": "Acrescentar/ Adicionar ligação para uma forma seleccionada",
+    "link": "Adicionar / atualizar hiperligação para uma forma selecionada",
     "eraser": "Borracha",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
-    "hand": "Mão (ferramenta de movimento da tela)",
-    "extraTools": "",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "frame": "Ferramenta de moldura",
+    "magicframe": "Esquema para código",
+    "embeddable": "Incorporar web",
+    "laser": "Ponteiro laser",
+    "hand": "Mão (ferramenta de deslocar vista)",
+    "extraTools": "Mais ferramentas",
+    "mermaidToExcalidraw": "Mermaid para Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Retângulo",
+    "diamond": "Diamante",
+    "ellipse": "Ellipse",
+    "arrow": "Seta",
+    "line": "Linha",
+    "freedraw": "Desenho livre",
+    "text": "Texto",
+    "image": "Imagem",
+    "group": "Grupo",
+    "frame": "Frame",
+    "magicframe": "Wireframe para código",
+    "embeddable": "Web Embed",
+    "selection": "Seleção",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Ações da área de desenho",
@@ -263,28 +337,33 @@
     "shapes": "Formas"
   },
   "hints": {
-    "canvasPanning": "Para mover a tela, carregue na roda do rato ou na barra de espaço enquanto arrasta, ou use a ferramenta da mão",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Clique para iniciar vários pontos, arraste para uma única linha",
-    "freeDraw": "Clique e arraste, large quando terminar",
+    "arrowTool": "",
+    "freeDraw": "Clique e arraste, largue quando terminar",
     "text": "Dica: também pode adicionar texto clicando duas vezes em qualquer lugar com a ferramenta de seleção",
-    "embeddable": "",
-    "text_selected": "Clique duas vezes ou pressione a tecla Enter para editar o texto",
-    "text_editing": "Pressione a tecla Escape ou CtrlOrCmd+ENTER para terminar a edição",
-    "linearElementMulti": "Clique no último ponto ou pressione Escape ou Enter para terminar",
-    "lockAngle": "Pode restringir o ângulo mantendo premida a tecla SHIFT",
-    "resize": "Pode restringir as proporções mantendo a tecla SHIFT premida enquanto redimensiona,\nmantenha a tecla ALT premida para redimensionar a partir do centro",
-    "resizeImage": "Pode redimensionar livremente mantendo pressionada a tecla SHIFT,\nmantenha pressionada a tecla ALT para redimensionar do centro",
-    "rotate": "Pode restringir os ângulos mantendo a tecla SHIFT premida enquanto roda",
-    "lineEditor_info": "Pressione CtrlOrCmd e faça um duplo-clique ou pressione CtrlOrCmd + Enter para editar pontos",
-    "lineEditor_pointSelected": "Carregue na tecla Delete para remover o(s) ponto(s), CtrlOuCmd+D para duplicar, ou arraste para mover",
-    "lineEditor_nothingSelected": "Seleccione um ponto para editar (carregue em SHIFT para seleccionar vários),\nou carregue em Alt e clique para acrescentar novos pontos",
-    "placeImage": "Clique para colocar a imagem ou clique e arraste para definir o seu tamanho manualmente",
+    "embeddable": "Clique e arraste para criar uma incorporação do site",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publique a sua própria biblioteca",
-    "bindTextToElement": "Carregue Enter para acrescentar texto",
-    "deepBoxSelect": "Mantenha a tecla CtrlOrCmd carregada para selecção profunda, impedindo o arrastamento",
-    "eraserRevert": "Carregue também em Alt para reverter os elementos marcados para serem apagados",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Esta função pode provavelmente ser ativada definindo a opção \"dom.events.asyncClipboard.clipboardItem\" como \"true\". Para alterar os sinalizadores do navegador no Firefox, visite a página \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Não é possível mostrar uma pré-visualização",
@@ -292,21 +371,24 @@
     "canvasTooBigTip": "Dica: tente aproximar um pouco os elementos mais distantes."
   },
   "errorSplash": {
-    "headingMain": "Foi encontrado um erro. Tente <button>recarregar a página.</button>",
-    "clearCanvasMessage": "Se a recarga não funcionar, tente <button>a limpar a área de desenho.</button>",
-    "clearCanvasCaveat": " Isso resultará em perda de trabalho ",
+    "headingMain": "Foi encontrado um erro. Tente <button>recarregar a página</button>.",
+    "clearCanvasMessage": "Se o recarregar da página não funcionar, tente <button>limpar a área de desenho</button>.",
+    "clearCanvasCaveat": " Isto resultará na perda do trabalho ",
     "trackedToSentry": "O erro com o identificador {{eventId}} foi rastreado no nosso sistema.",
-    "openIssueMessage": "Fomos muito cautelosos para não incluir suas informações de cena no erro. Se sua cena não for privada, por favor, considere seguir nosso <button>rastreador de bugs.</button> Por favor, inclua informações abaixo, copiando e colando no relatório de erros no GitHub.",
+    "openIssueMessage": "Tivemos muito cuidado para não incluir as informações da sua cena no erro. Se a sua cena não for privada, considere fazer o acompanhamento no nosso <button>rastreador de problemas</button>. Inclua as informações abaixo copiando e colando no problema do GitHub.",
     "sceneContent": "Conteúdo da cena:"
   },
+  "shareDialog": {
+    "or": "Ou"
+  },
   "roomDialog": {
-    "desc_intro": "Pode convidar pessoas para colaborarem na sua cena atual.",
-    "desc_privacy": "Não se preocupe, a sessão usa criptografia de ponta-a-ponta, por isso o que desenhar permanecerá privado. Nem mesmo o nosso servidor poderá ver o que cria.",
+    "desc_intro": "Convide pessoas para colaborar no seu desenho.",
+    "desc_privacy": "Não se preocupe, a sessão é encriptada e totalmente privada. Nem mesmo o nosso servidor pode ver o que está a desenhar.",
     "button_startSession": "Iniciar sessão",
     "button_stopSession": "Parar sessão",
-    "desc_inProgressIntro": "A sessão de colaboração ao vivo está agora em andamento.",
-    "desc_shareLink": "Partilhe este link com qualquer pessoa com quem queira colaborar:",
-    "desc_exitSession": "Interrompendo a sessão irá desconectar-se da sala, mas poderá continuar a trabalhar com a cena localmente. Note que isso não afetará outras pessoas e elas ainda poderão colaborar nas versões deles.",
+    "desc_inProgressIntro": "A sessão de colaboração ao vivo está agora a decorrer.",
+    "desc_shareLink": "Partilhe esta hiperligação com qualquer pessoa com quem queira colaborar:",
+    "desc_exitSession": "Se interromper a sessão, será desconectado da sala, mas poderá continuar a trabalhar com a cena localmente. Tenha em atenção que isto não afetará as outras pessoas, que poderão continuar a colaborar na sua versão.",
     "shareTitle": "Participe numa sessão de colaboração ao vivo no Excalidraw"
   },
   "errorDialog": {
@@ -316,25 +398,27 @@
     "disk_title": "Guardar no disco",
     "disk_details": "Exportar os dados da cena para um ficheiro do qual poderá importar mais tarde.",
     "disk_button": "Guardar num ficheiro",
-    "link_title": "Link partilhável",
-    "link_details": "Exportar como um link de apenas leitura.",
-    "link_button": "Exportar para link",
-    "excalidrawplus_description": "Guardar a cena no seu espaço de trabalho Excalidraw+",
+    "link_title": "Hiperligação partilhável",
+    "link_details": "Exportar como uma hiperligação de apenas leitura.",
+    "link_button": "Exportar para hiperligação",
+    "excalidrawplus_description": "Guardar a cena no seu espaço de trabalho do Excalidraw+.",
     "excalidrawplus_button": "Exportar",
     "excalidrawplus_exportError": "Não foi possível exportar para o Excalidraw+ neste momento..."
   },
   "helpDialog": {
     "blog": "Leia o nosso blogue",
     "click": "clicar",
-    "deepSelect": "Selecção profunda",
-    "deepBoxSelect": "Selecção profunda dentro da caixa, impedindo que seja arrastada",
+    "deepSelect": "Seleção profunda",
+    "deepBoxSelect": "Seleção profunda dentro da caixa, impedindo que seja arrastada",
+    "createFlowchart": "Criar um fluxograma a partir de um elemento genérico",
+    "navigateFlowchart": "Navegar num fluxograma",
     "curvedArrow": "Seta curva",
     "curvedLine": "Linha curva",
     "documentation": "Documentação",
     "doubleClick": "clique duplo",
     "drag": "arrastar",
     "editor": "Editor",
-    "editLineArrowPoints": "Editar pontos de linha/seta",
+    "editLineArrowPoints": "Editar pontos da linha / seta",
     "editText": "Editar texto / adicionar etiqueta",
     "github": "Encontrou algum problema? Informe-nos",
     "howto": "Siga os nossos guias",
@@ -342,24 +426,26 @@
     "preventBinding": "Prevenir fixação de seta",
     "tools": "Ferramentas",
     "shortcuts": "Atalhos de teclado",
-    "textFinish": "Finalizar edição (editor texto)",
+    "textFinish": "Finalizar edição (editor de texto)",
     "textNewLine": "Adicionar nova linha (editor de texto)",
     "title": "Ajuda",
-    "view": "Visualizar",
-    "zoomToFit": "Ajustar para todos os elementos caberem",
-    "zoomToSelection": "Ampliar a seleção",
-    "toggleElementLock": "Trancar/destrancar selecção",
+    "view": "Visualização",
+    "zoomToFit": "Enquadrar vista em todos os elementos",
+    "zoomToSelection": "Enquadrar vista na seleção",
+    "toggleElementLock": "Bloquear / desbloquear seleção",
     "movePageUpDown": "Mover página para cima / baixo",
-    "movePageLeftRight": "Mover página para esquerda / direita"
+    "movePageLeftRight": "Mover página para esquerda / direita",
+    "cropStart": "Recortar imagem",
+    "cropFinish": "Finalizar recorte da imagem"
   },
   "clearCanvasDialog": {
-    "title": "Apagar tela"
+    "title": "Apagar área de desenho"
   },
   "publishDialog": {
     "title": "Publicar biblioteca",
     "itemName": "Nome do item",
     "authorName": "Nome do autor",
-    "githubUsername": "Nome de utilizador do GitHub",
+    "githubUsername": "Nome de utilizador no GitHub",
     "twitterUsername": "Nome de utilizador no Twitter",
     "libraryName": "Nome da biblioteca",
     "libraryDesc": "Descrição da biblioteca",
@@ -367,67 +453,69 @@
     "placeholder": {
       "authorName": "Introduza o seu nome ou nome de utilizador",
       "libraryName": "Nome da sua biblioteca",
-      "libraryDesc": "Descrição da sua biblioteca para ajudar as pessoas a entender a utilização dela",
-      "githubHandle": "Identificador do GitHub (opcional), para que possa editar a biblioteca depois desta ser enviada para revisão",
-      "twitterHandle": "Nome do Twitter (opcional), para que saibamos quem merece os créditos na promoção via Twitter",
-      "website": "Ligação para a sua página pessoal ou qualquer outra (opcional)"
+      "libraryDesc": "Descrição da sua biblioteca para ajudar as pessoas a compreenderem a sua utilização",
+      "githubHandle": "Identificador do GitHub (handle opcional), para que possa editar a biblioteca depois desta ser enviada para revisão",
+      "twitterHandle": "Nome de utilizador no Twitter (opcional), para que saibamos a quem atribuir os créditos quando promovermos através do Twitter",
+      "website": "Hiperligação para o seu sítio web pessoal ou outro (opcional)"
     },
     "errors": {
       "required": "Obrigatório",
       "website": "Introduza um URL válido"
     },
-    "noteDescription": "Envie a sua biblioteca para ser incluída no <link>repositório de bibliotecas públicas</link>para outras pessoas a poderem usar nos seus próprios desenhos.",
-    "noteGuidelines": "A biblioteca precisa ser aprovada manualmente primeiro. Por favor, leia <link>orientações</link> antes de enviar. Vai precisar de uma conta no GitHub para comunicar e fazer alterações se solicitado, mas não é estritamente necessária.",
-    "noteLicense": "Ao enviar, concorda que a biblioteca será publicada sob a <link>Licença MIT, </link>o que significa, de forma resumida, que qualquer pessoa pode utilizá-la sem restrições.",
-    "noteItems": "Cada item da biblioteca deve ter o seu próprio nome para que este seja pesquisável com filtros. Os seguintes itens da biblioteca serão incluídos:",
-    "atleastOneLibItem": "Por favor, seleccione pelo menos um item da biblioteca para começar",
-    "republishWarning": "Nota: alguns dos itens seleccionados estão marcados como já publicados/enviados. Só deve reenviar itens ao actualizar uma biblioteca existente ou submissão."
+    "noteDescription": "Envie a sua biblioteca para ser incluída no <link>repositório de bibliotecas públicas</link> para que outras pessoas a possam utilizar nos seus desenhos.",
+    "noteGuidelines": "A biblioteca precisa de ser aprovada manualmente primeiro. Por favor, leia as <link>orientações</link> antes de enviar. Precisará de uma conta GitHub para comunicar e fazer alterações, se solicitado, mas não é estritamente necessário.",
+    "noteLicense": "Ao submeter, concorda que a biblioteca será publicada ao abrigo da <link>Licença MIT</link>, o que, resumidamente, significa que qualquer pessoa pode utilizá-la sem restrições.",
+    "noteItems": "Cada item de biblioteca deve ter o seu próprio nome para que possa ser filtrado. Serão incluídos os seguintes itens de biblioteca:",
+    "atleastOneLibItem": "Por favor selecione pelo menos um item da biblioteca para começar",
+    "republishWarning": "Nota: alguns dos itens selecionados estão marcados como já publicados / submetidos. Só deve voltar a submeter itens quando atualizar uma biblioteca ou submissão existente."
   },
   "publishSuccessDialog": {
     "title": "Biblioteca enviada",
-    "content": "Obrigado {{authorName}}. A sua biblioteca foi enviada para análise. Pode acompanhar o status<link>aqui</link>"
+    "content": "Obrigado {{authorName}}. A sua biblioteca foi enviada para análise. Pode acompanhar o estado dela <link>aqui</link>"
   },
   "confirmDialog": {
     "resetLibrary": "Repor a biblioteca",
-    "removeItemsFromLib": "Remover os itens seleccionados da biblioteca"
+    "removeItemsFromLib": "Remover os itens selecionados da biblioteca"
   },
   "imageExportDialog": {
     "header": "Exportar imagem",
     "label": {
-      "withBackground": "",
-      "onlySelected": "",
-      "darkMode": "",
-      "embedScene": "Cena embutida",
-      "scale": "",
+      "withBackground": "Fundo",
+      "onlySelected": "Apenas o selecionado",
+      "darkMode": "Modo escuro",
+      "embedScene": "Cena incorporada",
+      "scale": "Redimensionar",
       "padding": "Espaçamento"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "Os dados da cena serão guardados no ficheiro PNG / SVG exportado para que a cena possa ser restaurada a partir dele.\nIsto aumentará o tamanho do ficheiro exportado."
     },
     "title": {
       "exportToPng": "Exportar em PNG",
       "exportToSvg": "Exportar em SVG",
-      "copyPngToClipboard": ""
+      "copyPngToClipboard": "Copiar PNG para área de transferência"
     },
     "button": {
       "exportToPng": "PNG",
       "exportToSvg": "SVG",
-      "copyPngToClipboard": ""
+      "copyPngToClipboard": "Copiar para a área de transferência"
     }
   },
   "encrypted": {
-    "tooltip": "Os seus desenhos são encriptados de ponta-a-ponta, por isso os servidores do Excalidraw nunca os verão.",
-    "link": "Publicação de blogue na encriptação ponta-a-ponta no Excalidraw"
+    "tooltip": "Os seus desenhos são encriptados de ponta a ponta para que os servidores do Excalidraw nunca os vejam.",
+    "link": "Publicação no blogue sobre a encriptação de ponta a ponta no Excalidraw"
   },
   "stats": {
     "angle": "Ângulo",
-    "element": "Elemento",
-    "elements": "Elementos",
+    "shapes": "Formas",
     "height": "Altura",
     "scene": "Cena",
     "selected": "Selecionado",
     "storage": "Armazenamento",
-    "title": "Estatísticas para nerds",
+    "fullTitle": "Área de desenho e propriedades da forma",
+    "title": "Propriedades",
+    "generalStats": "Geral",
+    "elementProperties": "Propriedades da forma",
     "total": "Total",
     "version": "Versão",
     "versionCopy": "Clique para copiar",
@@ -435,17 +523,19 @@
     "width": "Largura"
   },
   "toast": {
-    "addedToLibrary": "Acrescentado à biblioteca",
+    "addedToLibrary": "Adicionado à biblioteca",
     "copyStyles": "Estilos copiados.",
     "copyToClipboard": "Copiado para a área de transferência.",
     "copyToClipboardAsPng": "{{exportSelection}} copiado para a área de transferência como PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} copiado para a área de transferência como SVG\n({{exportColorScheme}})",
     "fileSaved": "Ficheiro guardado.",
     "fileSavedToFilename": "Guardado como {filename}",
     "canvas": "área de desenho",
     "selection": "seleção",
     "pasteAsSingleElement": "Usar {{shortcut}} para colar como um único elemento,\nou colar num editor de texto existente",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "A incorporação deste URL não é atualmente permitida. Reporte o problema no GitHub para solicitar a inclusão do URL na lista branca para deixar de o bloquear",
+    "unrecognizedLinkFormat": "A ligação que incorporou não corresponde ao formato esperado. Tente colar a cadeia de caracteres 'incorporada' fornecida pelo sítio de origem",
+    "elementLinkCopied": "Hiperligação copiada para a área de transferência"
   },
   "colors": {
     "transparent": "Transparente",
@@ -457,8 +547,8 @@
     "violet": "Violeta",
     "gray": "Cinza",
     "blue": "Azul",
-    "cyan": "",
-    "teal": "",
+    "cyan": "Ciano",
+    "teal": "Verde-azulado",
     "green": "Verde",
     "yellow": "Amarelo",
     "orange": "Laranja",
@@ -466,7 +556,7 @@
   },
   "welcomeScreen": {
     "app": {
-      "center_heading": "Todos os dados são guardados no seu navegador local.",
+      "center_heading": "Todos os seus dados são guardados no seu navegador local.",
       "center_heading_plus": "Queria antes ir para o Excalidraw+?",
       "menuHint": "Exportar, preferências, idiomas..."
     },
@@ -478,48 +568,97 @@
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "",
+    "color": "",
+    "mostUsedCustomColors": "Cores personalizadas mais usadas",
     "colors": "Cores",
     "shades": "Tons",
-    "hexCode": "",
-    "noShades": ""
+    "hexCode": "Código hex",
+    "noShades": "Sem tons disponíveis para esta cor"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Exportar como imagem",
+        "button": "Exportar como imagem",
+        "description": "Exportar os dados da cena como uma imagem a partir da qual pode importar mais tarde."
       },
       "saveToDisk": {
         "title": "Guardar no disco",
         "button": "Guardar no disco",
-        "description": ""
+        "description": "Exportar os dados da cena para um ficheiro do qual poderá importar mais tarde."
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Excalidraw+",
+        "button": "Exportar para Excalidraw+",
+        "description": "Guardar a cena no seu espaço de trabalho do Excalidraw+."
       }
     },
     "modal": {
       "loadFromFile": {
         "title": "Carregar a partir de ficheiro",
         "button": "Carregar a partir de ficheiro",
-        "description": ""
+        "description": "Carregar a partir de um ficheiro irá <bold>substituir o conteúdo existente</bold>.<br></br>Pode fazer primeiro uma cópia de segurança do seu desenho utilizando uma das opções abaixo."
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Carregar da hiperligação",
+        "button": "Substituir o meu conteúdo",
+        "description": "Carregar um desenho externo irá <bold>substituir o conteúdo existente</bold>.<br></br>Pode fazer primeiro uma cópia de segurança do seu desenho utilizando uma das opções abaixo."
       }
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid para Excalidraw",
+    "button": "Inserir",
+    "description": "Atualmente apenas são suportados diagramas <flowchartLink>fluxo</flowchartLink>, <sequenceLink>sequência, </sequenceLink> e <classLink>classe</classLink>. Os outros tipos serão renderizados como imagem no Excalidraw.",
+    "syntax": "Sintaxe Mermaid",
+    "preview": "Pré-visualizar"
+  },
+  "quickSearch": {
+    "placeholder": "Pesquisa rápida"
+  },
+  "fontList": {
+    "badge": {
+      "old": "antigo"
+    },
+    "sceneFonts": "Nesta cena",
+    "availableFonts": "Fontes disponíveis",
+    "empty": "Nenhuma fonte encontrada"
+  },
+  "userList": {
+    "empty": "Nenhum utilizador encontrado",
+    "hint": {
+      "text": "Clique no utilizador para o seguir",
+      "followStatus": "Está a seguir este utilizador",
+      "inCall": "Utilizador está numa chamada de voz",
+      "micMuted": "O microfone do utilizador está desligado",
+      "isSpeaking": "O utilizador está a falar"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta de comandos",
+    "shortcuts": {
+      "select": "Selecionar",
+      "confirm": "Confirmar",
+      "close": "Fechar"
+    },
+    "recents": "Usado recentemente",
+    "search": {
+      "placeholder": "Procure menus, comandos e descubra pedras preciosas ocultas",
+      "noMatch": "Nenhum comando correspondente..."
+    },
+    "itemNotAvailable": "Comando não está disponível...",
+    "shortcutHint": "Para a paleta de comandos, use {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/ro-RO.json b/packages/excalidraw/locales/ro-RO.json
index 32bcf98187..9700336f66 100644
--- a/packages/excalidraw/locales/ro-RO.json
+++ b/packages/excalidraw/locales/ro-RO.json
@@ -21,7 +21,9 @@
     "copyStyles": "Copiere stiluri",
     "pasteStyles": "Lipire stiluri",
     "stroke": "Contur",
+    "changeStroke": "Modificare culoare contur",
     "background": "Fundal",
+    "changeBackground": "Modificare culoare de contur",
     "fill": "Umplere",
     "strokeWidth": "Lățimea conturului",
     "strokeStyle": "Stilul conturului",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "Triunghi (contur)",
     "arrowhead_diamond": "Romb",
     "arrowhead_diamond_outline": "Romb (contur)",
+    "arrowhead_crowfoot_many": "Model entitate-asociere (multe)",
+    "arrowhead_crowfoot_one": "Model entitate-asociere (unul)",
+    "arrowhead_crowfoot_one_or_many": "Model entitate-asociere (unul sau multe)",
+    "more_options": "Mai multe opțiuni",
+    "arrowtypes": "Tip de săgeată",
+    "arrowtype_sharp": "Săgeată ascuțită",
+    "arrowtype_round": "Săgeată curbată",
+    "arrowtype_elbowed": "Săgeată arcuită",
     "fontSize": "Dimensiune font",
     "fontFamily": "Familia de fonturi",
     "addWatermark": "Adaugă „Realizat cu Excalidraw”",
@@ -72,6 +82,7 @@
     "canvasColors": "Folosite pe pânză",
     "canvasBackground": "Fundalul pânzei",
     "drawingCanvas": "Pânză pentru desenat",
+    "clearCanvas": "Ștergere pânză",
     "layers": "Straturi",
     "actions": "Acțiuni",
     "language": "Limbă",
@@ -84,12 +95,13 @@
     "group": "Grupare selecție",
     "ungroup": "Degrupare selecție",
     "collaborators": "Colaboratori",
-    "showGrid": "Afișare grilă",
+    "toggleGrid": "Comutare grilă",
     "addToLibrary": "Adăugare la bibliotecă",
     "removeFromLibrary": "Eliminare din bibliotecă",
     "libraryLoadingMessage": "Se încarcă biblioteca…",
     "libraries": "Răsfoiește bibliotecile",
     "loadingScene": "Se încarcă scena…",
+    "loadScene": "Încărcare scenă din fișier",
     "align": "Aliniere",
     "alignTop": "Aliniere sus",
     "alignBottom": "Aliniere jos",
@@ -105,7 +117,9 @@
     "share": "Distribuie",
     "showStroke": "Afișare selector culoare contur",
     "showBackground": "Afișare selector culoare fundal",
-    "toggleTheme": "Comutare temă",
+    "showFonts": "Afișare selector font",
+    "toggleTheme": "Comutare temă luminoasă/întunecată",
+    "theme": "Temă",
     "personalLib": "Biblioteca personală",
     "excalidrawLib": "Biblioteca Excalidraw",
     "decreaseFontSize": "Micșorează dimensiunea fontului",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Încadrare text într-un container",
     "link": {
       "edit": "Editare URL",
-      "editEmbed": "Editare URL și încorporare",
-      "create": "Creare URL",
-      "createEmbed": "Creare URL și încorporare",
+      "editEmbed": "Editare link încorporabil",
+      "create": "Adăugare link",
       "label": "URL",
       "labelEmbed": "URL și încorporare",
-      "empty": "Nu este setat niciun URL"
+      "empty": "Nu este setat niciun URL",
+      "hint": "Tastează-ți sau lipsește-ți linkul aici",
+      "goToElement": "Accesează elementul țintă"
     },
     "lineEditor": {
       "edit": "Editare linie",
-      "exit": "Părăsire editor de linii"
+      "editArrow": "Editare săgeată"
+    },
+    "polygon": {
+      "breakPolygon": "Întrerupere poligon",
+      "convertToPolygon": "Convertire în poligon"
     },
     "elementLock": {
       "lock": "Blocare",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "Publicat",
     "sidebarLock": "Păstrează deschisă bara laterală",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
+    "selectAllElementsInFrame": "Selectează toate elementele din cadru",
+    "removeAllElementsFromFrame": "Elimină toate elementele din cadru",
     "eyeDropper": "Alegere culoare din pânză",
     "textToDiagram": "Text la diagramă",
-    "prompt": "Solicitare"
+    "prompt": "Mesaj sistem",
+    "followUs": "Urmărește-ne",
+    "discordChat": "Conversații pe Discord",
+    "zoomToFitViewport": "Transfocare pentru a se potrivi în poarta de vizualizare",
+    "zoomToFitSelection": "Transfocare pentru a cuprinde selecția",
+    "zoomToFit": "Transfocare pentru a cuprinde toate elementele",
+    "installPWA": "Instalează Excalidraw la nivel local (PWA)",
+    "autoResize": "Activare autoredimensionare text",
+    "imageCropping": "Decupare imagine",
+    "unCroppedDimension": "Dimensiune nedecupată",
+    "copyElementLink": "Copiere link către obiect",
+    "linkToElement": "Link către obiect",
+    "wrapSelectionInFrame": "Încapsulare selecție în cadru",
+    "tab": "Filă",
+    "shapeSwitch": "Comutare formă"
+  },
+  "elementLink": {
+    "title": "Link către obiect",
+    "desc": "Dă clic pe o formă pe pânză sau lipește un link.",
+    "notFound": "Obiectul linkuit nu a fost găsit pe pânză."
   },
   "library": {
     "noItems": "Niciun element adăugat încă...",
     "hint_emptyLibrary": "Selectează un element de pe pânză pentru a-l adăuga aici sau instalează o bibliotecă din depozitul public, de mai jos.",
-    "hint_emptyPrivateLibrary": "Selectează un element de pe pânză pentru a-l adăuga aici."
+    "hint_emptyPrivateLibrary": "Selectează un element de pe pânză pentru a-l adăuga aici.",
+    "search": {
+      "inputPlaceholder": "Căutare în bibliotecă",
+      "heading": "Potriviri din bibliotecă",
+      "noResults": "Niciun element potrivit găsit...",
+      "clearSearch": "Ștergere căutare"
+    }
+  },
+  "search": {
+    "title": "Găsire pe pânză",
+    "noMatch": "Nicio potrivire găsită...",
+    "singleResult": "rezultat",
+    "multipleResults": "rezultate",
+    "placeholder": "Găsire text pe pânză...",
+    "frames": "Cadre",
+    "texts": "Texte"
   },
   "buttons": {
     "clearReset": "Resetare pânză",
@@ -151,6 +204,7 @@
     "exportImage": "Exportare imagine...",
     "export": "Salvare în...",
     "copyToClipboard": "Copiere în memoria temporară",
+    "copyLink": "Copiere link",
     "save": "Salvare în fișierul curent",
     "saveAs": "Salvare ca",
     "load": "Deschidere",
@@ -163,7 +217,7 @@
     "resetZoom": "Resetare transfocare",
     "menu": "Meniu",
     "done": "Efectuat",
-    "edit": "Edit",
+    "edit": "Editare",
     "undo": "Anulare",
     "redo": "Refacere",
     "resetLibrary": "Resetare bibliotecă",
@@ -171,14 +225,16 @@
     "fullScreen": "Ecran complet",
     "darkMode": "Mod întunecat",
     "lightMode": "Mod luminos",
+    "systemMode": "Mod de sistem",
     "zenMode": "Mod zen",
     "objectsSnapMode": "Ancorare la obiecte",
     "exitZenMode": "Ieșire din modul zen",
     "cancel": "Anulare",
+    "saveLibNames": "Salvare nume și ieșire",
     "clear": "Ștergere",
     "remove": "Eliminare",
     "embed": "Comutare încorporare",
-    "publishLibrary": "Publicare",
+    "publishLibrary": "Redenumire sau publicare",
     "submit": "Trimitere",
     "confirm": "Confirmare",
     "embeddableInteractionButton": "Clic pentru interacționare"
@@ -204,7 +260,8 @@
     "resetLibrary": "Această opțiune va elimina conținutul din bibliotecă. Confirmi?",
     "removeItemsFromsLibrary": "Ștergi {{count}} element(e) din bibliotecă?",
     "invalidEncryptionKey": "Cheia de criptare trebuie să aibă 22 de caractere. Colaborarea în direct este dezactivată.",
-    "collabOfflineWarning": "Nu este disponibilă nicio conexiune la internet.\nModificările nu vor fi salvate!"
+    "collabOfflineWarning": "Nu este disponibilă nicio conexiune la internet.\nModificările nu vor fi salvate!",
+    "localStorageQuotaExceeded": "Cota pentru spațiul de stocare al navigatorului a fost depășită. Modificările nu vor fi salvate."
   },
   "errors": {
     "unsupportedFileType": "Tip de fișier neacceptat.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Fișierul este prea mare. Dimensiunea maximă permisă este de {{maxSize}}.",
     "svgImageInsertError": "Imaginea SVG nu a putut fi introdus. Marcajul SVG pare invalid.",
     "failedToFetchImage": "Preluarea imaginii a eșuat.",
-    "invalidSVGString": "SVG invalid.",
     "cannotResolveCollabServer": "Nu a putut fi realizată conexiunea la serverul de colaborare. Reîncarcă pagina și încearcă din nou.",
     "importLibraryError": "Biblioteca nu a putut fi încărcată",
+    "saveLibraryError": "Nu s-a putut salva biblioteca în spațiul de stocare. Salvează-ți biblioteca într-un fișier local pentru a te asigura că nu pierzi modificările.",
     "collabSaveFailed": "Nu s-a putut salva în baza de date la nivel de server. Dacă problemele persistă, ar trebui să salvezi fișierul la nivel local pentru a te asigura că nu îți pierzi munca.",
     "collabSaveFailed_sizeExceeded": "Nu s-a putut salva în baza de date la nivel de server, întrucât se pare că pânza este prea mare. Ar trebui să salvezi fișierul la nivel local pentru a te asigura că nu îți pierzi munca.",
     "imageToolNotSupported": "Imaginile sunt dezactivate.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Selecție",
+    "lasso": "Selecție lasou",
     "image": "Introducere imagine",
     "rectangle": "Dreptunghi",
     "diamond": "Romb",
@@ -246,16 +304,32 @@
     "library": "Bibliotecă",
     "lock": "Menține activ instrumentul selectat după desenare",
     "penMode": "Mod stilou – împiedică atingerea",
-    "link": "Adăugare/actualizare URL pentru forma selectată",
+    "link": "Adăugare/actualizare link pentru o formă selectată",
     "eraser": "Radieră",
-    "frame": "",
+    "frame": "Instrument cadru",
     "magicframe": "Structură-de-fire la cod",
     "embeddable": "Încorporare web",
     "laser": "Indicator laser",
     "hand": "Mână (instrument de panoramare)",
-    "extraTools": "",
+    "extraTools": "Mai multe instrumente",
     "mermaidToExcalidraw": "Mermaid la Excalidraw",
-    "magicSettings": "Setări IA"
+    "convertElementType": "Comutare tip formă"
+  },
+  "element": {
+    "rectangle": "Dreptunghi",
+    "diamond": "Romb",
+    "ellipse": "Elipsă",
+    "arrow": "Săgeată",
+    "line": "Linie",
+    "freedraw": "Desenare liberă",
+    "text": "Text",
+    "image": "Imagine",
+    "group": "Grup",
+    "frame": "Cadru",
+    "magicframe": "Structură-de-fire la cod",
+    "embeddable": "Încorporare web",
+    "selection": "Selecție",
+    "iframe": "iFrame"
   },
   "headings": {
     "canvasActions": "Acțiuni pentru pânză",
@@ -263,28 +337,33 @@
     "shapes": "Forme"
   },
   "hints": {
-    "canvasPanning": "Pentru a muta pânză, ține apăsată rotița mausului sau bara de spațiu sau folosește instrumentul în formă de mână",
+    "dismissSearch": "{{shortcut}} pentru a închide căutarea",
+    "canvasPanning": "Pentru a muta pânză, ține {{shortcut_1}} sau {{shortcut_2}} în timp ce glisezi sau folosește instrumentul în formă de mână",
     "linearElement": "Dă clic pentru a crea mai multe puncte, glisează pentru a forma o singură linie",
+    "arrowTool": "Dă clic pentru a crea mai multe puncte, glisează pentru a forma o singură linie. Apasă {{shortcut}} din nou pentru a modifica tipul săgeții.",
     "freeDraw": "Dă clic pe pânză și glisează cursorul, apoi eliberează-l când ai terminat",
     "text": "Sfat: poți adăuga text și dând dublu clic oriunde cu instrumentul de selecție",
     "embeddable": "Dă clic și trage pentru a crea un cod de încorporare de pagină web",
-    "text_selected": "Dă dublu clic sau apasă tasta Enter pentru a edita textul",
-    "text_editing": "Apasă tasta Escape sau Ctrl sau Cmd + Enter pentru a finaliza editarea",
-    "linearElementMulti": "Dă clic pe ultimul punct sau apasă tasta Escape sau tasta Enter pentru a termina",
-    "lockAngle": "Poți constrânge unghiul prin ținerea apăsată a tastei SHIFT",
-    "resize": "Poți constrânge proporțiile, ținând apăsată tasta SHIFT în timp ce redimensionezi,\nține apăsată tasta ALT pentru a redimensiona de la centru",
-    "resizeImage": "Poți redimensiona liber ținând apăsată tasta SHIFT,\nține apăsată tasta ALT pentru a redimensiona din centru",
-    "rotate": "Poți constrânge unghiurile, ținând apăsată tasta SHIFT în timp ce rotești",
-    "lineEditor_info": "Ține apăsată tasta Ctrl sau Cmd și dă dublu clic sau apasă tasta Ctrl sau Cmd + Enter pentru a edita puncte",
-    "lineEditor_pointSelected": "Apasă tasta Delete pentru a elimina punctele,\ncombinația de taste Ctrl sau Cmd + D pentru a le duplica sau glisează-le pentru a le schimba poziția",
-    "lineEditor_nothingSelected": "Selectează un punct pentru a-l edita (ține apăsată tasta SHIFT pentru a selecta mai multe),\nsau ține apăsată tasta Alt și dă clic pentru a adăuga puncte noi",
-    "placeImage": "Dă clic pentru a poziționa imaginea sau dă clic și glisează pentru a seta manual dimensiunea imaginii",
+    "text_selected": "Dă dublu clic sau apasă {{shortcut}} pentru a edita textul",
+    "text_editing": "Apasă {{shortcut_1}} sau {{shortcut_2}} pentru a finaliza editarea",
+    "linearElementMulti": "Dă clic pe ultimul punct sau apasă {{shortcut_1}} sau {{shortcut_2}} pentru a finaliza",
+    "lockAngle": "Poți constrânge unghiul prin ținerea apăsată a {{shortcut}}",
+    "resize": "Poți constrânge proporțiile, ținând apăsat {{shortcut_1}} în timp ce redimensionezi,\nține apăsat {{shortcut_2}} pentru a redimensiona de la centru",
+    "resizeImage": "Poți constrânge proporțiile, ținând apăsat {{shortcut_1}},\nține apăsat {{shortcut_2}} pentru a redimensiona de la centru",
+    "rotate": "Poți constrânge unghiurile, ținând apăsat {{shortcut}} în timp ce rotești",
+    "lineEditor_info": "Ține apăsat {{shortcut_1}} și dă dublu clic sau apasă {{shortcut_2}} pentru a edita punctele",
+    "lineEditor_line_info": "Dă dublu clic sau apasă {{shortcut}} pentru a edita punctele",
+    "lineEditor_pointSelected": "Apasă {{shortcut_1}} pentru a elimina punctele,\n{{shortcut_2}} pentru a duplica sau glisează pentru a muta",
+    "lineEditor_nothingSelected": "Selectează un punct pentru a-l edita (ține apăsat {{shortcut_1}} pentru a selecta mai multe),\nsau ține apăsat {{shortcut_2}} și dă clic pentru a adăuga puncte noi",
     "publishLibrary": "Publică propria bibliotecă",
-    "bindTextToElement": "Apasă tasta Enter pentru a adăuga text",
-    "deepBoxSelect": "Ține apăsată tasta Ctrl sau Cmd pentru a efectua selectarea de adâncime și pentru a preveni glisarea",
-    "eraserRevert": "Ține apăsată tasta Alt pentru a anula elementele marcate pentru ștergere",
+    "bindTextToElement": "{{shortcut}} pentru a adăuga text",
+    "createFlowchart": "{{shortcut}} pentru a crea o organigramă",
+    "deepBoxSelect": "Ține apăsat {{shortcut}} pentru a efectua selectarea de adâncime și pentru a preveni glisarea",
+    "eraserRevert": "Ține apăsat {{shortcut}} pentru a anula elementele marcate pentru ștergere",
     "firefox_clipboard_write": "Această caracteristică poate fi probabil activată prin setarea preferinței „dom.events.asyncClipboard.clipboardItem” ca „true”. Pentru a schimba preferințele navigatorului în Firefox, accesează pagina „about:config”.",
-    "disableSnapping": "Ține apăsat CtrlOrCmd pentru a dezactiva ancorarea"
+    "disableSnapping": "Ține apăsat {{shortcut}} pentru a dezactiva ancorarea",
+    "enterCropEditor": "Dă dublu clic pe imagine sau apasă {{shortcut}} pentru a decupa imaginea",
+    "leaveCropEditor": "Dă clic în afara imaginii sau apasă {{shortcut_1}} sau {{shortcut_2}} pentru a finaliza decuparea"
   },
   "canvasError": {
     "cannotShowPreview": "Nu se poate afișa previzualizarea",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Am luat măsuri de precauție pentru a nu include informații despre scenă în eroare. Dacă scena nu este privată, oferă-ne mai multe informații în <button>monitorul nostru pentru erori</button>. Include informațiile de mai jos copiindu-le și lipindu-le în tichetul cu problemă de pe GitHub.",
     "sceneContent": "Conținutul scenei:"
   },
+  "shareDialog": {
+    "or": "Sau"
+  },
   "roomDialog": {
-    "desc_intro": "Poți invita alte persoane pentru a colabora la scena actuală.",
-    "desc_privacy": "Nu te îngrijora. Sesiunea utilizează criptarea integrală, astfel încât orice desenezi va rămâne privat. Nici măcar serverul nostru nu va putea vedea pe ce ai lucrat.",
+    "desc_intro": "Invită persoane să colaboreze la desenul tău.",
+    "desc_privacy": "Nu-ți face griji, sesiunea este criptată integral și complet privată. Nici măcar serverul nostru nu poate vedea ce desenezi.",
     "button_startSession": "Pornire sesiune",
     "button_stopSession": "Oprire sesiune",
     "desc_inProgressIntro": "Sesiunea de colaborare în direct este în curs de desfășurare.",
@@ -328,6 +410,8 @@
     "click": "clic",
     "deepSelect": "Selectare de adâncime",
     "deepBoxSelect": "Selectare de adâncime în casetă și prevenire glisare",
+    "createFlowchart": "Crează o organigramă dintr-un element generic",
+    "navigateFlowchart": "Navighează o organigramă",
     "curvedArrow": "Săgeată curbată",
     "curvedLine": "Linie curbată",
     "documentation": "Documentație",
@@ -346,11 +430,13 @@
     "textNewLine": "Adaugă o linie nouă (editor de text)",
     "title": "Ajutor",
     "view": "Vizualizare",
-    "zoomToFit": "Transfocare pentru a cuprinde totul",
+    "zoomToFit": "Transfocare pentru a cuprinde toate elementele",
     "zoomToSelection": "Transfocare la selecție",
     "toggleElementLock": "Blocare/deblocare selecție",
     "movePageUpDown": "Deplasare pagină sus/jos",
-    "movePageLeftRight": "Deplasare pagină stânga/dreapta"
+    "movePageLeftRight": "Deplasare pagină stânga/dreapta",
+    "cropStart": "Decupare imagine",
+    "cropFinish": "Finalizare decupare imagine"
   },
   "clearCanvasDialog": {
     "title": "Ștergere pânză"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Unghi",
-    "element": "Element",
-    "elements": "Elemente",
+    "shapes": "Forme",
     "height": "Înălțime",
     "scene": "Scenă",
     "selected": "Selectate",
     "storage": "Stocare",
-    "title": "Statistici pentru pasionați",
+    "fullTitle": "Proprietăți pentru pânză și forme",
+    "title": "Proprietăți",
+    "generalStats": "General",
+    "elementProperties": "Proprietăți pentru forme",
     "total": "Total",
     "version": "Versiune",
     "versionCopy": "Clic pentru copiere",
@@ -439,13 +527,15 @@
     "copyStyles": "Stiluri copiate.",
     "copyToClipboard": "Copiat în memoria temporară.",
     "copyToClipboardAsPng": "S-a copiat {{exportSelection}} în memoria temporară sub formă de PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "S-a copiat {{exportSelection}} în memoria temporară sub formă de SVG\n({{exportColorScheme}})",
     "fileSaved": "Fișier salvat.",
     "fileSavedToFilename": "Salvat în {filename}",
     "canvas": "pânza",
     "selection": "selecția",
     "pasteAsSingleElement": "Folosește {{shortcut}} pentru a insera ca un singur element\nsau insera într-un editor de text existent",
     "unableToEmbed": "Încorporarea acestui URL nu este permisă momentan. Deschideți un tichet cu probleme pe GitHub pentru a solicita adăugarea acestui URL în lista albă",
-    "unrecognizedLinkFormat": "URL-ul pe care l-ai încorporat nu coincide cu formatul așteptat. Încearcă să lipești șirul „de încorporat” furnizat de pagina sursă"
+    "unrecognizedLinkFormat": "URL-ul pe care l-ai încorporat nu coincide cu formatul așteptat. Încearcă să lipești șirul „de încorporat” furnizat de pagina sursă",
+    "elementLinkCopied": "Link copiat în memoria temporară"
   },
   "colors": {
     "transparent": "Transparent",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "Culoare",
     "mostUsedCustomColors": "Cele mai utilizate culori personalizate",
     "colors": "Culori",
     "shades": "Nuanțe",
@@ -521,5 +612,53 @@
     "description": "În prezent, numai <flowchartLink>Organigramele</flowchartLink>, <sequenceLink>Diagramele de secvență</sequenceLink> și <classLink>Diagramele de clasă</classLink> sunt acceptate. Celelalte tipuri vor fi redate ca imagine în Excalidraw.",
     "syntax": "Sintaxă Mermaid",
     "preview": "Previzualizare"
+  },
+  "quickSearch": {
+    "placeholder": "Căutare rapidă"
+  },
+  "fontList": {
+    "badge": {
+      "old": "vechi"
+    },
+    "sceneFonts": "În această scenă",
+    "availableFonts": "Fonturi disponibile",
+    "empty": "Niciun font găsit"
+  },
+  "userList": {
+    "empty": "Niciun utilizator găsit",
+    "hint": {
+      "text": "Dă clic pe un utilizator pentru a-l urmări",
+      "followStatus": "În prezent urmărești acest utilizator",
+      "inCall": "Utilizatorul este angajat într-un apel vocal",
+      "micMuted": "Microfonul utilizatorul este pus pe mut",
+      "isSpeaking": "Utilizatorul vorbește"
+    }
+  },
+  "commandPalette": {
+    "title": "Paletă de comenzi",
+    "shortcuts": {
+      "select": "Selectare",
+      "confirm": "Confirmare",
+      "close": "Închidere"
+    },
+    "recents": "Utilizate recent",
+    "search": {
+      "placeholder": "Caută meniuri, comenzi și descoperă nestemate ascunse",
+      "noMatch": "Nicio comandă potrivită..."
+    },
+    "itemNotAvailable": "Comanda nu este disponibilă...",
+    "shortcutHint": "Pentru paleta de comenzi, folosește {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "Ctrl",
+    "option": "Opțiune",
+    "cmd": "Cmd",
+    "alt": "Alt",
+    "escape": "Esc",
+    "enter": "Enter",
+    "shift": "Shift",
+    "spacebar": "Space",
+    "delete": "Delete",
+    "mmb": "Rotiță maus"
   }
 }
diff --git a/packages/excalidraw/locales/ru-RU.json b/packages/excalidraw/locales/ru-RU.json
index 41df7d7592..b7fb22e9a9 100644
--- a/packages/excalidraw/locales/ru-RU.json
+++ b/packages/excalidraw/locales/ru-RU.json
@@ -11,7 +11,7 @@
     "copyAsPng": "Скопировать в буфер обмена как PNG",
     "copyAsSvg": "Скопировать в буфер обмена как SVG",
     "copyText": "Скопировать в буфер обмена как текст",
-    "copySource": "Копировать источник в буфер обмена",
+    "copySource": "Скопировать источник в буфер обмена",
     "convertToCode": "Преобразовать в код",
     "bringForward": "Переместить вперед",
     "sendToBack": "На задний план",
@@ -21,7 +21,9 @@
     "copyStyles": "Скопировать стили",
     "pasteStyles": "Вставить стили",
     "stroke": "Обводка",
+    "changeStroke": "Изменить цвет обводки",
     "background": "Фон",
+    "changeBackground": "Изменить цвет фона",
     "fill": "Заливка",
     "strokeWidth": "Толщина штриха",
     "strokeStyle": "Стиль обводки",
@@ -33,17 +35,25 @@
     "textAlign": "Выравнивание текста",
     "edges": "Края",
     "sharp": "Острые",
-    "round": "Скругленные",
+    "round": "Скруглённые",
     "arrowheads": "Стрелка",
     "arrowhead_none": "Нет",
     "arrowhead_arrow": "Cтрелка",
     "arrowhead_bar": "Черта",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Круг",
+    "arrowhead_circle_outline": "Круг (контур)",
     "arrowhead_triangle": "Треугольник",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Треугольник (контур)",
+    "arrowhead_diamond": "Ромб",
+    "arrowhead_diamond_outline": "Ромб (контур)",
+    "arrowhead_crowfoot_many": "Морщинки (много)",
+    "arrowhead_crowfoot_one": "Морщинки (одна)",
+    "arrowhead_crowfoot_one_or_many": "Морщинки (одна или много)",
+    "more_options": "Больше вариантов",
+    "arrowtypes": "Тип стрелки",
+    "arrowtype_sharp": "Острая стрелка",
+    "arrowtype_round": "Изогнутая стрелка",
+    "arrowtype_elbowed": "Прямоугольная стрелка",
     "fontSize": "Размер шрифта",
     "fontFamily": "Семейство шрифтов",
     "addWatermark": "Добавить «Создано в Excalidraw»",
@@ -72,6 +82,7 @@
     "canvasColors": "Используется на холсте",
     "canvasBackground": "Фон холста",
     "drawingCanvas": "Полотно",
+    "clearCanvas": "Очистить холст",
     "layers": "Слои",
     "actions": "Действия",
     "language": "Язык",
@@ -84,12 +95,13 @@
     "group": "Сгруппировать выделение",
     "ungroup": "Разделить выделение",
     "collaborators": "Участники",
-    "showGrid": "Показать сетку",
+    "toggleGrid": "Переключить сетку",
     "addToLibrary": "Добавить в библиотеку",
     "removeFromLibrary": "Удалить из библиотеки",
     "libraryLoadingMessage": "Загрузка библиотеки…",
     "libraries": "Просмотреть библиотеки",
     "loadingScene": "Загрузка сцены…",
+    "loadScene": "Загрузить сцену из файла",
     "align": "Выровнять",
     "alignTop": "Выровнять по верхнему краю",
     "alignBottom": "Выровнять по нижнему краю",
@@ -105,7 +117,9 @@
     "share": "Поделиться",
     "showStroke": "Показать выбор цвета обводки",
     "showBackground": "Показать выбор цвета фона",
-    "toggleTheme": "Переключить тему",
+    "showFonts": "Показать выбор шрифта",
+    "toggleTheme": "Переключить светлую/тёмную тему",
+    "theme": "Тема",
     "personalLib": "Личная библиотека",
     "excalidrawLib": "Библиотека Excalidraw",
     "decreaseFontSize": "Уменьшить шрифт",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Поместить текст в контейнер",
     "link": {
       "edit": "Редактировать ссылку",
-      "editEmbed": "",
-      "create": "Создать ссылку",
-      "createEmbed": "",
+      "editEmbed": "Редактировать встраиваемую ссылку",
+      "create": "Добавить ссылку",
       "label": "Ссылка",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "Ссылка и встраивание",
+      "empty": "Ссылка не установлена",
+      "hint": "Введите или вставьте ссылку здесь",
+      "goToElement": "Перейти к элементу"
     },
     "lineEditor": {
       "edit": "Редактирование строки",
-      "exit": "Выход из редактора строки"
+      "editArrow": "Изменить стрелку"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Блокировать",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "Опубликовано",
     "sidebarLock": "Держать боковую панель открытой",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
+    "selectAllElementsInFrame": "Выбрать все элементы фрейма",
+    "removeAllElementsFromFrame": "Убрать все элементы из фрейма",
     "eyeDropper": "Взять образец цвета с холста",
     "textToDiagram": "Текст в диаграмму",
-    "prompt": ""
+    "prompt": "Промпт",
+    "followUs": "Подписаться",
+    "discordChat": "Чат в Discord",
+    "zoomToFitViewport": "Масштабировать до области просмотра",
+    "zoomToFitSelection": "Увеличить до выделенного",
+    "zoomToFit": "Приблизьте все элементы",
+    "installPWA": "Установить Excalidraw локально (PWA)",
+    "autoResize": "Включить автоизменение размера текста",
+    "imageCropping": "Обрезка изображения",
+    "unCroppedDimension": "Необрезанный размер",
+    "copyElementLink": "Скопировать ссылку на объект",
+    "linkToElement": "Ссылка на объект",
+    "wrapSelectionInFrame": "Поместить выделенное в фрейм",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Ссылка на объект",
+    "desc": "Нажмите на фигуру на холсте или вставьте ссылку.",
+    "notFound": "Связанный объект не найден на холсте."
   },
   "library": {
     "noItems": "Пока ничего не добавлено...",
     "hint_emptyLibrary": "Выберите объект на холсте, чтобы добавить его сюда, или установите библиотеку из публичного репозитория ниже.",
-    "hint_emptyPrivateLibrary": "Выберите объект на холсте, чтобы добавить его сюда."
+    "hint_emptyPrivateLibrary": "Выберите объект на холсте, чтобы добавить его сюда.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Найти на холсте",
+    "noMatch": "Совпадения не найдены...",
+    "singleResult": "результат",
+    "multipleResults": "результатов",
+    "placeholder": "Найти текст на холсте...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Очистить холст и сбросить цвет фона",
@@ -151,6 +204,7 @@
     "exportImage": "Экспортировать изображение...",
     "export": "Сохранить как...",
     "copyToClipboard": "Скопировать в буфер обмена",
+    "copyLink": "Скопировать ссылку",
     "save": "Сохранить в текущий файл",
     "saveAs": "Сохранить как",
     "load": "Открыть",
@@ -165,69 +219,72 @@
     "done": "Готово",
     "edit": "Изменить",
     "undo": "Шаг назад",
-    "redo": "Шаг вперед",
+    "redo": "Шаг вперёд",
     "resetLibrary": "Сброс библиотеки",
     "createNewRoom": "Создать новую комнату",
     "fullScreen": "Полный экран",
-    "darkMode": "Темная тема",
+    "darkMode": "Тёмная тема",
     "lightMode": "Светлая тема",
-    "zenMode": "Режим Дзен",
+    "systemMode": "Системный режим",
+    "zenMode": "Режим «Дзен»",
     "objectsSnapMode": "Привязка к объектам",
-    "exitZenMode": "Выключить режим концентрации внимания",
+    "exitZenMode": "Отключить режим «Дзен»",
     "cancel": "Отменить",
+    "saveLibNames": "",
     "clear": "Очистить",
     "remove": "Удалить",
-    "embed": "",
-    "publishLibrary": "Опубликовать",
+    "embed": "Включить встраивание",
+    "publishLibrary": "",
     "submit": "Отправить",
     "confirm": "Подтвердить",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Нажмите для взаимодействия"
   },
   "alerts": {
     "clearReset": "Это очистит весь холст. Вы уверены?",
     "couldNotCreateShareableLink": "Не удалось создать общедоступную ссылку.",
     "couldNotCreateShareableLinkTooBig": "Нельзя создать ссылку, чтобы поделиться. Сцена слишком большая",
     "couldNotLoadInvalidFile": "Не удалось загрузить недопустимый файл",
-    "importBackendFailed": "Не удалось импортировать из бэкэнда.",
+    "importBackendFailed": "Не удалось импортировать с сервера.",
     "cannotExportEmptyCanvas": "Не может экспортировать пустой холст.",
     "couldNotCopyToClipboard": "Не удалось скопировать в буфер обмена.",
     "decryptFailed": "Не удалось расшифровать данные.",
     "uploadedSecurly": "Загружаемые данные защищена сквозным шифрованием, что означает, что сервер Excalidraw и третьи стороны не могут прочитать содержимое.",
     "loadSceneOverridePrompt": "Загрузка рисунка приведёт к замене имеющегося содержимого. Вы хотите продолжить?",
-    "collabStopOverridePrompt": "Остановка сессии перезапишет ваш предыдущий, локально сохранённый рисунок. Вы уверены? \n\n(Если вы хотите оставить ваш локальный рисунок, просто закройте вкладку браузера)",
+    "collabStopOverridePrompt": "Остановка сессии перезапишет ваш предыдущий, локально сохранённый рисунок. Вы уверены? \n\n(Если вы хотите оставить ваш локальный рисунок, просто закройте вкладку браузера).",
     "errorAddingToLibrary": "Не удалось добавить объект в библиотеку",
     "errorRemovingFromLibrary": "Не удалось удалить объект из библиотеки",
-    "confirmAddLibrary": "Будет добавлено {{numShapes}} фигур в вашу библиотеку. Продолжить?",
+    "confirmAddLibrary": "Будут добавлены фигуры ({{numShapes}}) в вашу библиотеку. Продолжить?",
     "imageDoesNotContainScene": "Это изображение не содержит данных сцены. Вы включили встраивание сцены во время экспорта?",
     "cannotRestoreFromImage": "Сцена не может быть восстановлена из этого изображения",
     "invalidSceneUrl": "Невозможно импортировать сцену с предоставленного URL. Неверный формат, или не содержит верных Excalidraw JSON данных.",
     "resetLibrary": "Это очистит вашу библиотеку. Вы уверены?",
-    "removeItemsFromsLibrary": "Удалить {{count}} объект(ов) из библиотеки?",
+    "removeItemsFromsLibrary": "Удалить объекты ({{count}}) из библиотеки?",
     "invalidEncryptionKey": "Ключ шифрования должен состоять из 22 символов. Одновременное редактирование отключено.",
-    "collabOfflineWarning": "Отсутствует интернет-соединение.\nВаши изменения не будут сохранены!"
+    "collabOfflineWarning": "Отсутствует интернет-соединение.\nВаши изменения не будут сохранены!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Неподдерживаемый тип файла.",
     "imageInsertError": "Не удалось вставить изображение. Попробуйте позже...",
-    "fileTooBig": "Очень большой файл. Максимально разрешенный размер {{maxSize}}.",
+    "fileTooBig": "Очень большой файл. Максимально разрешённый размер – {{maxSize}}.",
     "svgImageInsertError": "Не удалось вставить изображение SVG. Разметка SVG выглядит недействительной.",
     "failedToFetchImage": "Не удалось получить изображение.",
-    "invalidSVGString": "Некорректный SVG.",
     "cannotResolveCollabServer": "Не удалось подключиться к серверу совместного редактирования. Перезагрузите страницу и повторите попытку.",
     "importLibraryError": "Не удалось загрузить библиотеку",
+    "saveLibraryError": "Не удалось сохранить библиотеку в хранилище. Пожалуйста, сохраните библиотеку в файл локально, чтобы не потерять изменения.",
     "collabSaveFailed": "Не удалось сохранить в базу данных. Если проблема повторится, нужно будет сохранить файл локально, чтобы быть уверенным, что вы не потеряете вашу работу.",
     "collabSaveFailed_sizeExceeded": "Не удалось сохранить в базу данных. Похоже, что холст слишком большой. Нужно сохранить файл локально, чтобы быть уверенным, что вы не потеряете вашу работу.",
     "imageToolNotSupported": "Изображения отключены.",
     "brave_measure_text_error": {
-      "line1": "Похоже, вы используете браузер Brave с включенной опцией <bold>Агрессивно блокировать отслеживание</bold>.",
-      "line2": "Это может привести к поломке <bold>Текстовых объектов</bold> на рисунке.",
+      "line1": "Похоже, вы используете браузер Brave с включённой настройкой <bold>«Агрессивное блокирование определения отпечатков»</bold>.",
+      "line2": "Это может привести к поломке <bold>текстовых объектов</bold> на рисунке.",
       "line3": "Мы настоятельно рекомендуем отключить эту настройку. Для этого нужно выполнить <link>эти шаги</link>.",
-      "line4": "Если отключение этой настройки не исправит отображение текстовых объектов, создайте <issueLink>issue</issueLink> на нашем GitHub или напишите нам в <discordLink>Discord</discordLink>"
+      "line4": "Если отключение этой настройки не исправит отображение текстовых объектов, создайте <issueLink>Issue</issueLink> на нашем GitHub или напишите нам в <discordLink>Discord</discordLink>"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
+      "embeddable": "Встраиваемые элементы не могут быть добавлены в библиотеку.",
       "iframe": "Элементы IFrame не могут быть добавлены в библиотеку.",
-      "image": ""
+      "image": "Поддержка добавления изображений в библиотеку скоро будет доступна!"
     },
     "asyncPasteFailedOnRead": "Не удалось вставить (невозможно прочитать из системного буфера обмена).",
     "asyncPasteFailedOnParse": "Не удалось вставить.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Выделение области",
+    "lasso": "",
     "image": "Вставить изображение",
     "rectangle": "Прямоугольник",
     "diamond": "Ромб",
@@ -245,17 +303,33 @@
     "text": "Текст",
     "library": "Библиотека",
     "lock": "Сохранять выбранный инструмент активным после рисования",
-    "penMode": "Режим пера - предотвращение касания",
-    "link": "Добавить/обновить ссылку для выбранной фигуры",
+    "penMode": "Режим пера – предотвращение касания",
+    "link": "Добавить / Обновить ссылку для выбранной фигуры",
     "eraser": "Ластик",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
+    "frame": "Фреймовый инструмент",
+    "magicframe": "Каркас для кода",
+    "embeddable": "Встроенная страница",
     "laser": "Лазерная указка",
     "hand": "Рука (перемещение холста)",
-    "extraTools": "",
-    "mermaidToExcalidraw": "Из Mermaid в Excalidraw",
-    "magicSettings": "Параметры AI"
+    "extraTools": "Дополнительные инструменты",
+    "mermaidToExcalidraw": "Mermaid в Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Прямоугольник",
+    "diamond": "Ромб",
+    "ellipse": "Эллипс",
+    "arrow": "Стрелка",
+    "line": "Линия",
+    "freedraw": "Свободное рисование",
+    "text": "Текст",
+    "image": "Изображение",
+    "group": "Группа",
+    "frame": "Фрейм",
+    "magicframe": "Каркас для кода",
+    "embeddable": "Встроенная страница",
+    "selection": "Выделение",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Операции холста",
@@ -263,45 +337,53 @@
     "shapes": "Фигуры"
   },
   "hints": {
-    "canvasPanning": "Чтобы двигать холст, удерживайте колесо мыши или пробел во время перетаскивания, или используйте инструмент \"Рука\"",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Нажмите, чтобы начать несколько точек, перетащите для одной линии",
+    "arrowTool": "",
     "freeDraw": "Нажмите и перетаскивайте, отпустите по завершении",
     "text": "Совет: при выбранном инструменте выделения дважды щёлкните в любом месте, чтобы добавить текст",
-    "embeddable": "",
-    "text_selected": "Дважды щелкните мышью или нажмите ENTER, чтобы редактировать текст",
-    "text_editing": "Нажмите Escape либо Ctrl или Cmd + ENTER для завершения редактирования",
-    "linearElementMulti": "Кликните на последней точке или нажмите Escape или Enter чтобы закончить",
-    "lockAngle": "Вы можете ограничить угол удерживая SHIFT",
-    "resize": "Вы можете ограничить пропорции, удерживая SHIFT во время изменения размеров,\nудерживайте ALT чтобы изменить размер из центра",
-    "resizeImage": "Вы можете свободно изменять размеры, удерживая кнопку SHIFT,\nудерживайте кнопку ALT, чтобы изменять размер относительно центра",
-    "rotate": "Вы можете ограничить углы, удерживая SHIFT во время вращения",
-    "lineEditor_info": "Удерживайте CtrlOrCmd и дважды кликните или нажмите CtrlOrCmd + Enter для редактирования точек",
-    "lineEditor_pointSelected": "Нажмите Delete для удаления точки (точек),\nCtrl+D или Cmd+D для дублирования, перетащите для перемещения",
-    "lineEditor_nothingSelected": "Выберите точку для редактирования (удерживайте SHIFT выбора нескольких точек),\nили удерживайте Alt и кликните для добавления новых точек",
-    "placeImage": "Щелкните, чтобы разместить изображение, или нажмите и перетащите, чтобы установить его размер вручную",
+    "embeddable": "Перетащите для встраивания веб-сайта",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Опубликовать свою собственную библиотеку",
-    "bindTextToElement": "Нажмите Enter для добавления текста",
-    "deepBoxSelect": "Удерживайте Ctrl или Cmd для глубокого выделения, чтобы предотвратить перетаскивание",
-    "eraserRevert": "Удерживайте Alt, чтобы вернуть элементы, отмеченные для удаления",
-    "firefox_clipboard_write": "Эта функция может быть включена при изменении значения флага \"dom.events.asyncClipboard.clipboardItem\" на \"true\". Чтобы изменить флаги браузера в Firefox, посетите страницу \"about:config\".",
-    "disableSnapping": ""
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
+    "firefox_clipboard_write": "Эта функция может быть включена при изменении значения флага «dom.events.asyncClipboard.clipboardItem» на «true». Чтобы изменить флаги браузера в Firefox, зайдите на страницу «about:config».",
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
-    "cannotShowPreview": "Не удается отобразить предпросмотр",
+    "cannotShowPreview": "Не удалось отобразить предпросмотр",
     "canvasTooBig": "Сцена слишком большая.",
     "canvasTooBigTip": "Совет: попробуйте сблизить элементы рисунка."
   },
   "errorSplash": {
-    "headingMain": "Возникла ошибка. Попробуйте <button>перезагрузить страницу.</button>",
-    "clearCanvasMessage": "Если перезагрузка страницы не помогла, попробуйте <button>очистить холст.</button>",
+    "headingMain": "Возникла ошибка. Попробуйте <button>перезагрузить страницу</button>.",
+    "clearCanvasMessage": "Если перезагрузка страницы не помогла, попробуйте <button>очистить холст</button>.",
     "clearCanvasCaveat": " Текущая работа будет утеряна ",
     "trackedToSentry": "Ошибка с идентификатором {{eventId}} отслеживается в нашей системе.",
-    "openIssueMessage": "Для безопасности информация о вашей сцене не включена в ошибку. Если в сцене нет ничего конфиденциального, пожалуйста следуйте нашим <button>баг трекере.</button> Пожалуйста, приложите информацию ниже, скопировав и вставив её, в issue GitHub.",
+    "openIssueMessage": "Для безопасности информация о вашей сцене не включена в ошибку. Если в сцене нет ничего конфиденциального, пожалуйста следуйте нашему <button>баг трекеру</button>. Пожалуйста, приложите информацию ниже, скопировав и вставив её, в Issue на GitHub.",
     "sceneContent": "Содержание сцены:"
   },
+  "shareDialog": {
+    "or": "Или"
+  },
   "roomDialog": {
-    "desc_intro": "Вы можете пригласить людей в текущую сцену для совместной работы.",
-    "desc_privacy": "Не беспокойтесь — во время сеанса используется сквозное шифрование. Всё, что вы нарисуете, останется конфиденциальным и не будет доступно даже нашему серверу.",
+    "desc_intro": "Пригласить людей для участия в рисовании.",
+    "desc_privacy": "Не волнуйтесь, сеанс защищён сквозным шифрованием и полностью приватный. Даже наш сервер не сможет увидеть, что вы рисуете.",
     "button_startSession": "Начать сеанс",
     "button_stopSession": "Завершить сеанс",
     "desc_inProgressIntro": "Сеанс совместной работы запущен.",
@@ -328,10 +410,12 @@
     "click": "нажать",
     "deepSelect": "Глубокое выделение",
     "deepBoxSelect": "Глубокое выделение рамкой, и предотвращение перетаскивания",
+    "createFlowchart": "Создать диаграмму из базового элемента",
+    "navigateFlowchart": "Навигация по диаграмме",
     "curvedArrow": "Изогнутая стрелка",
     "curvedLine": "Изогнутая линия",
     "documentation": "Документация",
-    "doubleClick": "двойной клик",
+    "doubleClick": "двойной щелчок",
     "drag": "перетащить",
     "editor": "Редактор",
     "editLineArrowPoints": "Редактировать концы линий/стрелок",
@@ -344,13 +428,15 @@
     "shortcuts": "Горячие клавиши",
     "textFinish": "Закончить редактирование (текстовый редактор)",
     "textNewLine": "Добавить новую строку (текстовый редактор)",
-    "title": "Помощь",
+    "title": "Справка",
     "view": "Просмотр",
     "zoomToFit": "Отмастштабировать, чтобы поместились все элементы",
     "zoomToSelection": "Увеличить до выделенного",
     "toggleElementLock": "Заблокировать/разблокировать выделение",
     "movePageUpDown": "Сдвинуть страницу вверх/вниз",
-    "movePageLeftRight": "Сдвинуть страницу вправо/влево"
+    "movePageLeftRight": "Сдвинуть страницу вправо/влево",
+    "cropStart": "Обрезать изображение",
+    "cropFinish": "Закончить обрезку изображения"
   },
   "clearCanvasDialog": {
     "title": "Очистить холст"
@@ -360,7 +446,7 @@
     "itemName": "Название объекта",
     "authorName": "Имя автора",
     "githubUsername": "Имя пользователя GitHub",
-    "twitterUsername": "Имя пользователя в Twitter",
+    "twitterUsername": "Имя пользователя в Твиттере",
     "libraryName": "Название библиотеки",
     "libraryDesc": "Описание библиотеки",
     "website": "Веб-сайт",
@@ -369,7 +455,7 @@
       "libraryName": "Название вашей библиотеки",
       "libraryDesc": "Описание вашей библиотеки, которое поможет людям понять её назначение",
       "githubHandle": "Имя пользователя GitHub (необязательно), чтобы вы смогли редактировать библиотеку после её отправки на проверку",
-      "twitterHandle": "Имя пользователя в Twitter (необязательно), чтобы мы знали, кого упомянуть при продвижении в Twitter",
+      "twitterHandle": "Имя пользователя в Твиттере (необязательно), чтобы мы знали, кого упомянуть при продвижении в Твиттере",
       "website": "Ссылка на ваш личный или какой-то другой сайт (необязательно)"
     },
     "errors": {
@@ -377,15 +463,15 @@
       "website": "Введите допустимый URL-адрес"
     },
     "noteDescription": "Отправить вашу библиотеку для включения в <link>хранилище публичных библиотек</link>, чтобы другие люди могли использовать объекты из вашей библиотеки в своих рисунках.",
-    "noteGuidelines": "Библиотека должна быть подтверждена вручную. Пожалуйста, прочтите <link>рекомендации</link> перед отправкой. Вам понадобится учетная запись GitHub, чтобы общаться и вносить изменения при необходимости, но это не обязательно.",
-    "noteLicense": "Выполняя отправку, вы соглашаетесь с тем, что библиотека будет опубликована под <link>лицензией MIT, </link>, что, вкратце, означает, что каждый может использовать её без ограничений.",
-    "noteItems": "Каждый объект в библиотеке должен иметь свое собственное имя, чтобы по нему можно было фильтровать. Следующие объекты библиотеки будут включены:",
+    "noteGuidelines": "Библиотека должна быть подтверждена вручную. Пожалуйста, прочтите <link>рекомендации</link> перед отправкой. Вам понадобится учётная запись GitHub, чтобы общаться и вносить изменения при необходимости, но это не обязательно.",
+    "noteLicense": "Выполняя отправку, вы соглашаетесь с тем, что библиотека будет опубликована под <link>лицензией MIT</link>, что, вкратце, означает, что каждый может использовать её без ограничений.",
+    "noteItems": "Каждый объект в библиотеке должен иметь своё собственное имя, чтобы по нему можно было фильтровать. Следующие объекты библиотеки будут включены:",
     "atleastOneLibItem": "Пожалуйста, выберите хотя бы один объект в библиотеке, чтобы начать",
     "republishWarning": "Примечание: некоторые из выбранных элементов помечены как уже опубликованные/отправленные. Вы должны повторно отправить элементы только при обновлении существующей библиотеки или сдаче работы."
   },
   "publishSuccessDialog": {
     "title": "Библиотека отправлена",
-    "content": "Благодарим вас, {{authorName}}. Ваша библиотека была отправлена на проверку. Вы можете отслеживать статус<link>здесь</link>"
+    "content": "Благодарим вас, {{authorName}}. Ваша библиотека была отправлена на проверку. Вы можете отслеживать статус <link>здесь</link>"
   },
   "confirmDialog": {
     "resetLibrary": "Сброс библиотеки",
@@ -396,7 +482,7 @@
     "label": {
       "withBackground": "Фон",
       "onlySelected": "Только выделенное",
-      "darkMode": "Темная тема",
+      "darkMode": "Тёмная тема",
       "embedScene": "Встроить сцену",
       "scale": "Масштаб",
       "padding": "Отступ"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Угол",
-    "element": "Элемент",
-    "elements": "Элементы",
+    "shapes": "Фигуры",
     "height": "Высота",
     "scene": "Сцены",
     "selected": "Выбран",
     "storage": "Хранилище",
-    "title": "Статистика для ботаников",
+    "fullTitle": "Свойства холста и фигуры",
+    "title": "Свойства",
+    "generalStats": "Общее",
+    "elementProperties": "Свойства формы",
     "total": "Всего",
     "version": "Версия",
     "versionCopy": "Копировать",
@@ -439,13 +527,15 @@
     "copyStyles": "Скопированы стили.",
     "copyToClipboard": "Скопировано в буфер обмена.",
     "copyToClipboardAsPng": "{{exportSelection}} скопировано как PNG ({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} скопировано в буфер обмена как SVG\n({{exportColorScheme}})",
     "fileSaved": "Файл сохранён.",
     "fileSavedToFilename": "Сохранено в {filename}",
     "canvas": "холст",
     "selection": "выделение",
     "pasteAsSingleElement": "Используйте {{shortcut}}, чтобы вставить один объект,\nили вставьте в существующий текстовый редактор",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "Встраивание этого URL в данный момент не разрешено. Сделайте Issue на GitHub для добавления URL в белый список",
+    "unrecognizedLinkFormat": "Ссылка, которую вы ввели не соответствует ожидаемому формату. Пожалуйста, попробуйте вставить строку «встраивание», предоставленную исходным сайтом",
+    "elementLinkCopied": "Ссылка скопирована в буфер обмена"
   },
   "colors": {
     "transparent": "Прозрачный",
@@ -474,10 +564,11 @@
       "menuHint": "Экспорт, настройки и другое...",
       "center_heading": "Диаграммы. Просто.",
       "toolbarHint": "Выберите инструмент и начните рисовать!",
-      "helpHint": "Сочетания клавиш и помощь"
+      "helpHint": "Сочетания клавиш и справка"
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Часто используемые пользовательские цвета",
     "colors": "Цвета",
     "shades": "Оттенки",
@@ -489,37 +580,85 @@
       "exportToImage": {
         "title": "Экспортировать как изображение",
         "button": "Экспортировать как изображение",
-        "description": ""
+        "description": "Экспортируйте данные сцены как изображение, из которого вы сможете импортировать позже."
       },
       "saveToDisk": {
         "title": "Сохранить на диск",
         "button": "Сохранить на диск",
-        "description": ""
+        "description": "Экспортировать данные сцены в файл, из которого можно импортировать позже."
       },
       "excalidrawPlus": {
         "title": "Excalidraw+",
         "button": "Экспорт в Excalidraw+",
-        "description": ""
+        "description": "Сохраните сцену в ваше рабочее пространство Excalidraw+."
       }
     },
     "modal": {
       "loadFromFile": {
         "title": "Загрузить из файла",
         "button": "Загрузить из файла",
-        "description": ""
+        "description": "Загрузка из файла <bold>заменит существующее содержимое</bold>.<br></br>Вы можете сначала создать резервную копию своего рисунка, используя один из приведённых ниже вариантов."
       },
       "shareableLink": {
         "title": "Загрузить по ссылке",
-        "button": "",
-        "description": ""
+        "button": "Заменить содержимое",
+        "description": "Загрузка внешнего рисунка <bold>заменит существующее содержимое</bold>.<br></br>Вы можете сначала создать резервную копию своего рисунка, используя один из приведённых ниже вариантов."
       }
     }
   },
   "mermaid": {
     "title": "Из Mermaid в Excalidraw",
     "button": "Вставить",
-    "description": "",
+    "description": "В настоящее время поддерживаются только <flowchartLink>блок-схемы</flowchartLink>, <sequenceLink>диаграммы последовательности</sequenceLink> и <classLink>диаграммы классов</classLink>. Другие типы будут отображаться в виде изображения в Excalidraw.",
     "syntax": "Синтаксис Mermaid",
     "preview": "Предпросмотр"
+  },
+  "quickSearch": {
+    "placeholder": "Быстрый поиск"
+  },
+  "fontList": {
+    "badge": {
+      "old": "старый"
+    },
+    "sceneFonts": "В этой сцене",
+    "availableFonts": "Доступные шрифты",
+    "empty": "Шрифты не найдены"
+  },
+  "userList": {
+    "empty": "Пользователи не найдены",
+    "hint": {
+      "text": "Нажмите на пользователя, чтобы подписаться",
+      "followStatus": "Вы подписаны на этого пользователя",
+      "inCall": "Пользователь находится в голосовом звонке",
+      "micMuted": "Микрофон пользователя заглушён",
+      "isSpeaking": "Пользователь говорит"
+    }
+  },
+  "commandPalette": {
+    "title": "Палитра команд",
+    "shortcuts": {
+      "select": "Выбрать",
+      "confirm": "Подтвердить",
+      "close": "Закрыть"
+    },
+    "recents": "Недавно использованные",
+    "search": {
+      "placeholder": "Поиск меню, команд и скрытых сокровищ",
+      "noMatch": "Нет подходящих команд..."
+    },
+    "itemNotAvailable": "Команда недоступна...",
+    "shortcutHint": "Используйте {{shortcut}} для командной палитры"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/si-LK.json b/packages/excalidraw/locales/si-LK.json
index 95f1914c91..3429352f58 100644
--- a/packages/excalidraw/locales/si-LK.json
+++ b/packages/excalidraw/locales/si-LK.json
@@ -1,7 +1,7 @@
 {
   "labels": {
     "paste": "අලවන්න",
-    "pasteAsPlaintext": "",
+    "pasteAsPlaintext": "සරල පෙළ ලෙස අලවන්න",
     "pasteCharts": "ප්‍රස්ථාරය",
     "selectAll": "සියල්ලම",
     "multiSelect": "තෝරා ගැනීමට අංගය එකතු කරන්න",
@@ -10,54 +10,64 @@
     "copy": "පිටපත් කරන්න",
     "copyAsPng": "PNG ලෙස පිටපත් කරන්න",
     "copyAsSvg": "SVG ලෙස පිටපත් කරන්න",
-    "copyText": "",
-    "copySource": "",
-    "convertToCode": "",
+    "copyText": "පෙළ පිටපත් කරන්න",
+    "copySource": "මූලාශ්‍රය පිටපත් කරන්න",
+    "convertToCode": "කේතයට පරිවර්තනය කරන්න",
     "bringForward": "ඉදිරියට ගෙන්න",
     "sendToBack": "පසුපසටම ගෙනියන්න",
     "bringToFront": "ඉදිරියටම ගෙන්න",
     "sendBackward": "පසුපසට ගෙනියන්න",
     "delete": "මකන්න",
-    "copyStyles": "",
-    "pasteStyles": "",
-    "stroke": "",
-    "background": "",
-    "fill": "",
-    "strokeWidth": "",
-    "strokeStyle": "",
-    "strokeStyle_solid": "",
-    "strokeStyle_dashed": "",
-    "strokeStyle_dotted": "",
-    "sloppiness": "",
-    "opacity": "",
-    "textAlign": "",
-    "edges": "",
-    "sharp": "",
-    "round": "",
-    "arrowheads": "",
-    "arrowhead_none": "",
-    "arrowhead_arrow": "",
-    "arrowhead_bar": "",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
-    "arrowhead_triangle": "",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
-    "fontSize": "",
-    "fontFamily": "",
-    "addWatermark": "",
-    "handDrawn": "",
-    "normal": "",
-    "code": "",
-    "small": "",
-    "medium": "",
-    "large": "",
+    "copyStyles": "ශෛලීන් පිටපත් කරන්න",
+    "pasteStyles": "ශෛලීන් අලවන්න",
+    "stroke": "පහර",
+    "changeStroke": "",
+    "background": "පසුබිම",
+    "changeBackground": "",
+    "fill": "පිරවුම",
+    "strokeWidth": "පහර පළල",
+    "strokeStyle": "පහර ශෛලිය",
+    "strokeStyle_solid": "ඝන",
+    "strokeStyle_dashed": "කඩකිරීම්",
+    "strokeStyle_dotted": "තිත් සහිත",
+    "sloppiness": "අනියම් බව",
+    "opacity": "පාරදෘශ්‍යතාව",
+    "textAlign": "පෙළ පෙළගැස්ම",
+    "edges": "දාර",
+    "sharp": "තියුණු",
+    "round": "වට",
+    "arrowheads": "ඊතල හිස",
+    "arrowhead_none": "කිසිවක් නැත",
+    "arrowhead_arrow": "ඊතලය",
+    "arrowhead_bar": "බාර්",
+    "arrowhead_circle": "වෘත්තය",
+    "arrowhead_circle_outline": "වෘත්ත රූපරේඛාව",
+    "arrowhead_triangle": "ත්‍රිකෝණය",
+    "arrowhead_triangle_outline": "ත්‍රිකෝණ රූපරේඛාව",
+    "arrowhead_diamond": "දියමන්ති",
+    "arrowhead_diamond_outline": "දියමන්ති රූපරේඛාව",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
+    "fontSize": "අකුරු ප්‍රමාණය",
+    "fontFamily": "අකුරු පවුල",
+    "addWatermark": "ජලසලකුණ එක් කරන්න",
+    "handDrawn": "අතින් ඇඳි",
+    "normal": "සාමාන්‍ය",
+    "code": "කේත",
+    "small": "කුඩා",
+    "medium": "මධ්‍යම",
+    "large": "විශාල",
     "veryLarge": "ඉතා විශාල",
-    "solid": "විශාල",
-    "hachure": "මධ්‍යම",
-    "zigzag": "",
-    "crossHatch": "",
+    "solid": "ඝන",
+    "hachure": "හැචුර",
+    "zigzag": "සිග්සැග්",
+    "crossHatch": "හරස් හැචුර",
     "thin": "කෙට්ටු",
     "bold": "තද",
     "left": "වම",
@@ -69,173 +79,243 @@
     "cartoonist": "සැකිලිරූකරු",
     "fileTitle": "ගොනු නාමය",
     "colorPicker": "පාට තෝරකය",
-    "canvasColors": "",
+    "canvasColors": "කැන්වස පාට",
     "canvasBackground": "කැන්වස පසුබිම",
     "drawingCanvas": "චිත්‍රක කැන්වසය",
+    "clearCanvas": "",
     "layers": "ලේයර",
     "actions": "ක්‍රියාකාරකම",
-    "language": "භාෂාව ",
-    "liveCollaboration": "",
-    "duplicateSelection": "",
-    "untitled": "",
+    "language": "භාෂාව",
+    "liveCollaboration": "සජීවී සහයෝගිතාව",
+    "duplicateSelection": "තෝරාගැනීම පිටපත් කරන්න",
+    "untitled": "නිර්නාමික",
     "name": "නම",
-    "yourName": "",
-    "madeWithExcalidraw": "",
-    "group": "",
-    "ungroup": "",
-    "collaborators": "",
-    "showGrid": "",
-    "addToLibrary": "",
-    "removeFromLibrary": "",
-    "libraryLoadingMessage": "",
-    "libraries": "",
-    "loadingScene": "",
-    "align": "",
-    "alignTop": "",
-    "alignBottom": "",
-    "alignLeft": "",
-    "alignRight": "",
-    "centerVertically": "",
-    "centerHorizontally": "",
-    "distributeHorizontally": "",
-    "distributeVertically": "",
-    "flipHorizontal": "",
-    "flipVertical": "",
-    "viewMode": "",
-    "share": "",
-    "showStroke": "",
-    "showBackground": "",
-    "toggleTheme": "",
-    "personalLib": "",
-    "excalidrawLib": "",
-    "decreaseFontSize": "",
-    "increaseFontSize": "",
-    "unbindText": "",
-    "bindText": "",
-    "createContainerFromText": "",
+    "yourName": "ඔබගේ නම",
+    "madeWithExcalidraw": "Excalidraw සමඟ සාදන ලද",
+    "group": "කණ්ඩායම",
+    "ungroup": "කණ්ඩායම් ඉවත් කරන්න",
+    "collaborators": "සහයෝගිකයන්",
+    "toggleGrid": "",
+    "addToLibrary": "පුස්තකාලයට එක් කරන්න",
+    "removeFromLibrary": "පුස්තකාලයෙන් ඉවත් කරන්න",
+    "libraryLoadingMessage": "පුස්තකාලය පූරණය වෙමින් පවතී",
+    "libraries": "පුස්තකාල",
+    "loadingScene": "දර්ශනය පූරණය වෙමින්",
+    "loadScene": "",
+    "align": "පෙළගැස්වීම",
+    "alignTop": "ඉහළට පෙළගස්වන්න",
+    "alignBottom": "පහළට පෙළගස්වන්න",
+    "alignLeft": "වමට පෙළගස්වන්න",
+    "alignRight": "දකුණට පෙළගස්වන්න",
+    "centerVertically": "සිරස්ව මැදට",
+    "centerHorizontally": "තිරස්ව මැදට",
+    "distributeHorizontally": "තිරස්ව බෙදාහරින්න",
+    "distributeVertically": "සිරස්ව බෙදාහරින්න",
+    "flipHorizontal": "තිරස්ව පෙරළන්න",
+    "flipVertical": "සිරස්ව පෙරළන්න",
+    "viewMode": "දසුන් මාදිලිය",
+    "share": "බෙදාහදා ගන්න",
+    "showStroke": "පහර පෙන්වන්න",
+    "showBackground": "පසුබිම පෙන්වන්න",
+    "showFonts": "",
+    "toggleTheme": "තේමාව ටොගල් කරන්න",
+    "theme": "",
+    "personalLib": "පුද්ගලික පුස්තකාලය",
+    "excalidrawLib": "Excalidraw පුස්තකාලය",
+    "decreaseFontSize": "අකුරු ප්‍රමාණය අඩු කරන්න",
+    "increaseFontSize": "අකුරු ප්‍රමාණය වැඩි කරන්න",
+    "unbindText": "පෙළ විසන්ධි කරන්න",
+    "bindText": "පෙළ බන්ධනය කරන්න",
+    "createContainerFromText": "පෙළෙන් බහාලුමක් සාදන්න",
     "link": {
-      "edit": "",
-      "editEmbed": "",
-      "create": "",
-      "createEmbed": "",
-      "label": "",
-      "labelEmbed": "",
-      "empty": ""
+      "edit": "සංස්කරණය",
+      "editEmbed": "බිහිදැමීම සංස්කරණය",
+      "create": "සාදන්න",
+      "label": "ලේබලය",
+      "labelEmbed": "බිහිදැමීම ලේබලය",
+      "empty": "හිස්",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
-      "edit": "",
-      "exit": ""
+      "edit": "සංස්කරණය",
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
-      "lock": "",
-      "unlock": "",
-      "lockAll": "",
-      "unlockAll": ""
+      "lock": "අගුලු දමන්න",
+      "unlock": "අගුලු ඉවත් කරන්න",
+      "lockAll": "සියල්ල අගුලු දමන්න",
+      "unlockAll": "සියල්ල අගුලු ඉවත් කරන්න"
     },
-    "statusPublished": "",
-    "sidebarLock": "",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "statusPublished": "ප්‍රකාශිත තත්ත්වය",
+    "sidebarLock": "පැති තීරුව අගුලු",
+    "selectAllElementsInFrame": "අඳින ලද රාමුවේ සියලුම අංග තෝරන්න",
+    "removeAllElementsFromFrame": "රාමුවෙන් සියලුම අංග ඉවත් කරන්න",
+    "eyeDropper": "අක්ෂි බිංදුකරු",
+    "textToDiagram": "පෙළෙන් රූපසටහනකට",
+    "prompt": "ප්‍රේරකය",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
-    "noItems": "",
-    "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "noItems": "අයිතම නැත",
+    "hint_emptyLibrary": "පුස්තකාලය හිස් බව පෙන්වයි",
+    "hint_emptyPrivateLibrary": "පුද්ගලික පුස්තකාලය හිස් බව පෙන්වයි",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
-    "clearReset": "",
-    "exportJSON": "",
-    "exportImage": "",
-    "export": "",
-    "copyToClipboard": "",
-    "save": "",
-    "saveAs": "",
-    "load": "",
-    "getShareableLink": "",
-    "close": "",
-    "selectLanguage": "",
-    "scrollBackToContent": "",
-    "zoomIn": "",
-    "zoomOut": "",
-    "resetZoom": "",
-    "menu": "",
-    "done": "",
-    "edit": "",
-    "undo": "",
-    "redo": "",
-    "resetLibrary": "",
-    "createNewRoom": "",
-    "fullScreen": "",
-    "darkMode": "",
-    "lightMode": "",
-    "zenMode": "",
-    "objectsSnapMode": "",
-    "exitZenMode": "",
-    "cancel": "",
-    "clear": "",
-    "remove": "",
-    "embed": "",
+    "clearReset": "පිරිසිදු කර ප්‍රතිස්ථාපනය",
+    "exportJSON": "JSON ලෙස නිර්යාත කරන්න",
+    "exportImage": "පින්තූරය ලෙස නිර්යාත කරන්න",
+    "export": "නිර්යාත",
+    "copyToClipboard": "ක්ලිප්බෝඩ් එකට පිටපත් කරන්න",
+    "copyLink": "",
+    "save": "සුරකින්න",
+    "saveAs": "ලෙස සුරකින්න",
+    "load": "පූරණය",
+    "getShareableLink": "බෙදාහැරිය හැකි සබැඳිය ලබා ගන්න",
+    "close": "වසන්න",
+    "selectLanguage": "භාෂාව තෝරන්න",
+    "scrollBackToContent": "අන්තර්ගතයට ආපසු යන්න",
+    "zoomIn": "විශාලනය",
+    "zoomOut": "කුඩාකිරීම",
+    "resetZoom": "විශාලනය යළි සකසන්න",
+    "menu": "මෙනුව",
+    "done": "සම්පූර්ණයි",
+    "edit": "සංස්කරණය",
+    "undo": "පසුගමන",
+    "redo": "නැවත කරන්න",
+    "resetLibrary": "පුස්තකාලය යළි සකසන්න",
+    "createNewRoom": "නව කාමරයක් සාදන්න",
+    "fullScreen": "පූර්ණ තිරය",
+    "darkMode": "අඳුරු මාදිලිය",
+    "lightMode": "ලා පැහැ මාදිලිය",
+    "systemMode": "",
+    "zenMode": "සෙන් මාදිලිය",
+    "objectsSnapMode": "වස්තු ස්නැප් මාදිලිය",
+    "exitZenMode": "සෙන් මාදිලියෙන් ඉවත් වන්න",
+    "cancel": "අවලංගු කරන්න",
+    "saveLibNames": "",
+    "clear": "පිරිසිදු",
+    "remove": "ඉවත් කරන්න",
+    "embed": "බිහිදැමීම",
     "publishLibrary": "",
-    "submit": "",
-    "confirm": "",
-    "embeddableInteractionButton": ""
+    "submit": "ඉදිරිපත් කරන්න",
+    "confirm": "තහවුරු කරන්න",
+    "embeddableInteractionButton": "බිහිදැමීමේ අන්තර්ක්‍රියා බොත්තම"
   },
   "alerts": {
-    "clearReset": "",
-    "couldNotCreateShareableLink": "",
-    "couldNotCreateShareableLinkTooBig": "",
-    "couldNotLoadInvalidFile": "",
-    "importBackendFailed": "",
-    "cannotExportEmptyCanvas": "",
-    "couldNotCopyToClipboard": "",
-    "decryptFailed": "",
-    "uploadedSecurly": "",
-    "loadSceneOverridePrompt": "",
-    "collabStopOverridePrompt": "",
-    "errorAddingToLibrary": "",
-    "errorRemovingFromLibrary": "",
-    "confirmAddLibrary": "",
-    "imageDoesNotContainScene": "",
-    "cannotRestoreFromImage": "",
-    "invalidSceneUrl": "",
-    "resetLibrary": "",
-    "removeItemsFromsLibrary": "",
-    "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "clearReset": "පිරිසිදු කිරීම හා යළි සැකසීම ගැන ඇඟවීම",
+    "couldNotCreateShareableLink": "බෙදාහැරිය හැකි සබැඳියක් සෑදීමට නොහැකි විය",
+    "couldNotCreateShareableLinkTooBig": "බෙදාහැරිය හැකි සබැඳියක් ඉතා විශාල බැවින් සෑදීමට නොහැකි විය",
+    "couldNotLoadInvalidFile": "වලංගු නොවන ගොනුවක් පූරණය කළ නොහැක",
+    "importBackendFailed": "පසුබිම ආයාතය අසාර්ථකයි",
+    "cannotExportEmptyCanvas": "හිස් කැන්වසයක් නිර්යාත කළ නොහැක",
+    "couldNotCopyToClipboard": "ක්ලිප්බෝඩ් එකට පිටපත් කළ නොහැක",
+    "decryptFailed": "විකේතනය අසාර්ථකයි",
+    "uploadedSecurly": "ආරක්ෂිතව උඩුගත කරන ලදි",
+    "loadSceneOverridePrompt": "දර්ශනය පූරණය කිරීම ආවරණය ගැන ඇඟවීම",
+    "collabStopOverridePrompt": "සහයෝගිතාව නැවැත්වීම ආවරණය ගැන ඇඟවීම",
+    "errorAddingToLibrary": "පුස්තකාලයට එක් කිරීමේ දෝෂය",
+    "errorRemovingFromLibrary": "පුස්තකාලයෙන් ඉවත් කිරීමේ දෝෂය",
+    "confirmAddLibrary": "පුස්තකාලයට එක් කිරීම තහවුරු කරන්න",
+    "imageDoesNotContainScene": "පින්තූරයේ දර්ශනයක් අඩංගු නොවේ",
+    "cannotRestoreFromImage": "පින්තූරයෙන් ප්‍රතිස්ථාපනය කළ නොහැක",
+    "invalidSceneUrl": "වලංගු නොවන දර්ශන URL",
+    "resetLibrary": "පුස්තකාලය යළි සකසන්න",
+    "removeItemsFromsLibrary": "පුස්තකාලයෙන් අයිතම ඉවත් කරන්න",
+    "invalidEncryptionKey": "වලංගු නොවන ගුප්තකේතන යතුර",
+    "collabOfflineWarning": "සහයෝගිතාව ඕෆ්ලයින් ඇඟවීම",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
-    "unsupportedFileType": "",
-    "imageInsertError": "",
-    "fileTooBig": "",
-    "svgImageInsertError": "",
-    "failedToFetchImage": "",
-    "invalidSVGString": "",
-    "cannotResolveCollabServer": "",
-    "importLibraryError": "",
-    "collabSaveFailed": "",
-    "collabSaveFailed_sizeExceeded": "",
-    "imageToolNotSupported": "",
+    "unsupportedFileType": "සහාය නොදක්වන ගොනු වර්ගය",
+    "imageInsertError": "පින්තූර ඇතුළත් කිරීමේ දෝෂය",
+    "fileTooBig": "ගොනුව ඉතා විශාලයි",
+    "svgImageInsertError": "SVG පින්තූර ඇතුළත් කිරීමේ දෝෂය",
+    "failedToFetchImage": "පින්තූරය ලබා ගැනීමට අසමත් විය",
+    "cannotResolveCollabServer": "සහයෝගිතා සේවාදායකය විසඳිය නොහැක",
+    "importLibraryError": "පුස්තකාල ආයාත දෝෂය",
+    "saveLibraryError": "",
+    "collabSaveFailed": "සහයෝගිතා සුරැකීම අසාර්ථකයි",
+    "collabSaveFailed_sizeExceeded": "ප්‍රමාණය ඉක්මවූ බැවින් සහයෝගිතා සුරැකීම අසාර්ථකයි",
+    "imageToolNotSupported": "පින්තූර මෙවලම සහාය නොදක්වයි",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": ""
+      "line1": "බ්‍රේව් බ්‍රව්සරයේ පෙළ මැනීමේ දෝෂය",
+      "line2": "මෙම දෝෂය බ්‍රේව් බ්‍රව්සරයේ ගැටලුවකි",
+      "line3": "කරුණාකර වෙනත් බ්‍රව්සරයක් භාවිතා කරන්න",
+      "line4": "අපගේ උපදෙස් පිටුවට පිවිසෙන්න"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "බිහිදැමිය හැකි අංග වර්ග දෝෂය",
+      "iframe": "iframe අංග වර්ග දෝෂය",
+      "image": "පින්තූර අංග වර්ග දෝෂය"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "අසින්ක් ඇලවීම කියවීමේදී අසාර්ථකයි",
+    "asyncPasteFailedOnParse": "අසින්ක් ඇලවීම විග්‍රහ කිරීමේදී අසාර්ථකයි",
+    "copyToSystemClipboardFailed": "පද්ධති ක්ලිප්බෝඩ් එකට පිටපත් කිරීම අසාර්ථකයි"
   },
   "toolBar": {
-    "selection": "",
-    "image": "",
+    "selection": "තේරීම",
+    "lasso": "",
+    "image": "පින්තූරය",
+    "rectangle": "සෘජුකෝණාස්‍රය",
+    "diamond": "දියමන්ති",
+    "ellipse": "ඉලිප්සය",
+    "arrow": "ඊතලය",
+    "line": "රේඛාව",
+    "freedraw": "නිදහස් ඇඳීම",
+    "text": "පෙළ",
+    "library": "පුස්තකාලය",
+    "lock": "අගුල",
+    "penMode": "පෑන් මාදිලිය",
+    "link": "සබැඳිය",
+    "eraser": "මකනය",
+    "frame": "රාමුව",
+    "magicframe": "මැජික් රාමුව",
+    "embeddable": "බිහිදැමිය හැකි",
+    "laser": "ලේසර්",
+    "hand": "අත",
+    "extraTools": "අමතර මෙවලම්",
+    "mermaidToExcalidraw": "Mermaid වලින් Excalidraw වෙත",
+    "convertElementType": ""
+  },
+  "element": {
     "rectangle": "",
     "diamond": "",
     "ellipse": "",
@@ -243,31 +323,27 @@
     "line": "",
     "freedraw": "",
     "text": "",
-    "library": "",
-    "lock": "",
-    "penMode": "",
-    "link": "",
-    "eraser": "",
+    "image": "",
+    "group": "",
     "frame": "",
     "magicframe": "",
     "embeddable": "",
-    "laser": "",
-    "hand": "",
-    "extraTools": "",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
-    "canvasActions": "",
-    "selectedShapeActions": "",
-    "shapes": ""
+    "canvasActions": "කැන්වස ක්‍රියා",
+    "selectedShapeActions": "තෝරාගත් හැඩතල ක්‍රියා",
+    "shapes": "හැඩතල"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
-    "linearElement": "",
-    "freeDraw": "",
-    "text": "",
-    "embeddable": "",
+    "linearElement": "රේඛීය අංගය",
+    "arrowTool": "",
+    "freeDraw": "නිදහස් ඇඳීම",
+    "text": "පෙළ",
+    "embeddable": "බිහිදැමිය හැකි",
     "text_selected": "",
     "text_editing": "",
     "linearElementMulti": "",
@@ -276,250 +352,313 @@
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
-    "publishLibrary": "",
+    "publishLibrary": "පුස්තකාලය ප්‍රකාශනය",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
-    "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "firefox_clipboard_write": "Firefox ක්ලිප්බෝඩ් ලිවීම",
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
-    "cannotShowPreview": "",
-    "canvasTooBig": "",
-    "canvasTooBigTip": ""
+    "cannotShowPreview": "පූර්වදර්ශනය පෙන්විය නොහැක",
+    "canvasTooBig": "කැන්වසය ඉතා විශාලයි",
+    "canvasTooBigTip": "කැන්වසය ඉතා විශාල බවට ඉඟිය"
   },
   "errorSplash": {
-    "headingMain": "",
-    "clearCanvasMessage": "",
-    "clearCanvasCaveat": "",
-    "trackedToSentry": "",
-    "openIssueMessage": "",
-    "sceneContent": ""
+    "headingMain": "ප්‍රධාන දෝෂය",
+    "clearCanvasMessage": "කැන්වසය පිරිසිදු කිරීමේ පණිවිඩය",
+    "clearCanvasCaveat": "කැන්වසය පිරිසිදු කිරීමේ සීමාව",
+    "trackedToSentry": "Sentry වෙත ලුහුබඳින ලදි",
+    "openIssueMessage": "නිකුතුව විවෘත කිරීමේ පණිවිඩය",
+    "sceneContent": "දර්ශන අන්තර්ගතය"
+  },
+  "shareDialog": {
+    "or": ""
   },
   "roomDialog": {
-    "desc_intro": "",
-    "desc_privacy": "",
-    "button_startSession": "",
-    "button_stopSession": "",
-    "desc_inProgressIntro": "",
-    "desc_shareLink": "",
-    "desc_exitSession": "",
-    "shareTitle": ""
+    "desc_intro": "කාමර සංවාද හැඳින්වීම",
+    "desc_privacy": "පෞද්ගලිකත්ව විස්තර",
+    "button_startSession": "සැසිය ආරම්භ කරන්න",
+    "button_stopSession": "සැසිය නවත්වන්න",
+    "desc_inProgressIntro": "පවත්නා සැසි හැඳින්වීම",
+    "desc_shareLink": "බෙදාහැරිය හැකි සබැඳි විස්තර",
+    "desc_exitSession": "සැසියෙන් ඉවත්වීමේ විස්තර",
+    "shareTitle": "බෙදාහැරීමේ මාතෘකාව"
   },
   "errorDialog": {
-    "title": ""
+    "title": "දෝෂ සංවාද මාතෘකාව"
   },
   "exportDialog": {
-    "disk_title": "",
-    "disk_details": "",
-    "disk_button": "",
-    "link_title": "",
-    "link_details": "",
-    "link_button": "",
-    "excalidrawplus_description": "",
-    "excalidrawplus_button": "",
-    "excalidrawplus_exportError": ""
+    "disk_title": "තැටි මාතෘකාව",
+    "disk_details": "තැටි විස්තර",
+    "disk_button": "තැටි බොත්තම",
+    "link_title": "සබැඳි මාතෘකාව",
+    "link_details": "සබැඳි විස්තර",
+    "link_button": "සබැඳි බොත්තම",
+    "excalidrawplus_description": "ExcalidrawPlus විස්තර",
+    "excalidrawplus_button": "ExcalidrawPlus බොත්තම",
+    "excalidrawplus_exportError": "ExcalidrawPlus නිර්යාත දෝෂය"
   },
   "helpDialog": {
-    "blog": "",
-    "click": "",
-    "deepSelect": "",
-    "deepBoxSelect": "",
-    "curvedArrow": "",
-    "curvedLine": "",
-    "documentation": "",
-    "doubleClick": "",
-    "drag": "",
-    "editor": "",
-    "editLineArrowPoints": "",
-    "editText": "",
-    "github": "",
-    "howto": "",
-    "or": "",
-    "preventBinding": "",
-    "tools": "",
-    "shortcuts": "",
-    "textFinish": "",
-    "textNewLine": "",
-    "title": "",
-    "view": "",
-    "zoomToFit": "",
-    "zoomToSelection": "",
-    "toggleElementLock": "",
-    "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "blog": "බ්ලොග්",
+    "click": "ක්ලික්",
+    "deepSelect": "ගැඹුරු තේරීම",
+    "deepBoxSelect": "ගැඹුරු කොටු තේරීම",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
+    "curvedArrow": "වක්‍ර ඊතලය",
+    "curvedLine": "වක්‍ර රේඛාව",
+    "documentation": "ලේඛන",
+    "doubleClick": "ද්විත්ව ක්ලික්",
+    "drag": "අදින්න",
+    "editor": "සංස්කාරක",
+    "editLineArrowPoints": "රේඛා ඊතල ලක්ෂ්‍ය සංස්කරණය",
+    "editText": "පෙළ සංස්කරණය",
+    "github": "GitHub",
+    "howto": "කෙසේද",
+    "or": "හෝ",
+    "preventBinding": "බන්ධනය වැළැක්වීම",
+    "tools": "මෙවලම්",
+    "shortcuts": "කෙටිමං",
+    "textFinish": "පෙළ අවසන්",
+    "textNewLine": "පෙළ නව රේඛාව",
+    "title": "මාතෘකාව",
+    "view": "දසුන",
+    "zoomToFit": "විශාලනයට ගැළපීම",
+    "zoomToSelection": "තේරීමට විශාලනය",
+    "toggleElementLock": "අංග අගුලු ටොගල්",
+    "movePageUpDown": "පිටුව ඉහළට/පහළට ගෙනයාම",
+    "movePageLeftRight": "පිටුව වමට/දකුණට ගෙනයාම",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
-    "title": ""
+    "title": "කැන්වසය පිරිසිදු කිරීමේ සංවාදය"
   },
   "publishDialog": {
-    "title": "",
-    "itemName": "",
-    "authorName": "",
-    "githubUsername": "",
-    "twitterUsername": "",
-    "libraryName": "",
-    "libraryDesc": "",
-    "website": "",
+    "title": "ප්‍රකාශන සංවාදය",
+    "itemName": "අයිතම නම",
+    "authorName": "කතුවරයාගේ නම",
+    "githubUsername": "GitHub පරිශීලක නම",
+    "twitterUsername": "Twitter පරිශීලක නම",
+    "libraryName": "පුස්තකාලයේ නම",
+    "libraryDesc": "පුස්තකාල විස්තර",
+    "website": "වෙබ් අඩවිය",
     "placeholder": {
-      "authorName": "",
-      "libraryName": "",
-      "libraryDesc": "",
-      "githubHandle": "",
-      "twitterHandle": "",
-      "website": ""
+      "authorName": "කතුවරයාගේ නම ඇතුලත් කරන්න",
+      "libraryName": "පුස්තකාලයේ නම ඇතුලත් කරන්න",
+      "libraryDesc": "පුස්තකාල විස්තර ඇතුලත් කරන්න",
+      "githubHandle": "GitHub හසුරුව ඇතුලත් කරන්න",
+      "twitterHandle": "Twitter හසුරුව ඇතුලත් කරන්න",
+      "website": "වෙබ් අඩවිය ඇතුලත් කරන්න"
     },
     "errors": {
-      "required": "",
-      "website": ""
+      "required": "අවශ්‍යයි",
+      "website": "වලංගු නොවන වෙබ් අඩවි URL"
     },
-    "noteDescription": "",
-    "noteGuidelines": "",
-    "noteLicense": "",
-    "noteItems": "",
-    "atleastOneLibItem": "",
-    "republishWarning": ""
+    "noteDescription": "සටහන් විස්තර",
+    "noteGuidelines": "සටහන් මාර්ගෝපදේශ",
+    "noteLicense": "සටහන් බලපත්‍රය",
+    "noteItems": "සටහන් අයිතම",
+    "atleastOneLibItem": "අවම වශයෙන් එක් පුස්තකාල අයිතමයක්",
+    "republishWarning": "නැවත ප්‍රකාශන ඇඟවීම"
   },
   "publishSuccessDialog": {
-    "title": "",
-    "content": ""
+    "title": "ප්‍රකාශන සාර්ථකත්ව සංවාදය",
+    "content": "ප්‍රකාශන සාර්ථකත්ව අන්තර්ගතය"
   },
   "confirmDialog": {
-    "resetLibrary": "",
-    "removeItemsFromLib": ""
+    "resetLibrary": "පුස්තකාලය යළි සකස් කිරීම තහවුරු කරන්න",
+    "removeItemsFromLib": "පුස්තකාලයෙන් අයිතම ඉවත් කිරීම තහවුරු කරන්න"
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "පින්තූර නිර්යාත සංවාදය",
     "label": {
-      "withBackground": "",
-      "onlySelected": "",
-      "darkMode": "",
-      "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "withBackground": "පසුබිම සමඟ",
+      "onlySelected": "තෝරාගත් පමණක්",
+      "darkMode": "අඳුරු මාදිලිය",
+      "embedScene": "දර්ශනය බිහිදැමීම",
+      "scale": "පරිමාණය",
+      "padding": "පෑඩිං"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "දර්ශනය බිහිදැමීම ගැන ඉඟිය"
     },
     "title": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "PNG ලෙස නිර්යාත",
+      "exportToSvg": "SVG ලෙස නිර්යාත",
+      "copyPngToClipboard": "PNG ලෙස ක්ලිප්බෝඩ් එකට පිටපත්"
     },
     "button": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "PNG ලෙස නිර්යාත කරන්න",
+      "exportToSvg": "SVG ලෙස නිර්යාත කරන්න",
+      "copyPngToClipboard": "PNG ලෙස ක්ලිප්බෝඩ් එකට පිටපත් කරන්න"
     }
   },
   "encrypted": {
-    "tooltip": "",
-    "link": ""
+    "tooltip": "ගුප්තකේතන ඉඟිය",
+    "link": "ගුප්තකේතන සබැඳිය"
   },
   "stats": {
-    "angle": "",
-    "element": "",
-    "elements": "",
-    "height": "",
-    "scene": "",
-    "selected": "",
-    "storage": "",
-    "title": "",
-    "total": "",
-    "version": "",
-    "versionCopy": "",
-    "versionNotAvailable": "",
-    "width": ""
+    "angle": "කෝණය",
+    "shapes": "",
+    "height": "උස",
+    "scene": "දර්ශනය",
+    "selected": "තෝරාගත්",
+    "storage": "ගබඩා",
+    "fullTitle": "",
+    "title": "සංඛ්‍යාලේඛන මාතෘකාව",
+    "generalStats": "",
+    "elementProperties": "",
+    "total": "මුළු",
+    "version": "අනුවාදය",
+    "versionCopy": "අනුවාද පිටපත",
+    "versionNotAvailable": "අනුවාදය ලබා ගත නොහැක",
+    "width": "පළල"
   },
   "toast": {
-    "addedToLibrary": "",
-    "copyStyles": "",
-    "copyToClipboard": "",
-    "copyToClipboardAsPng": "",
-    "fileSaved": "",
-    "fileSavedToFilename": "",
-    "canvas": "",
-    "selection": "",
-    "pasteAsSingleElement": "",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "addedToLibrary": "පුස්තකාලයට එක් කරන ලදි",
+    "copyStyles": "ශෛලීන් පිටපත් කරන ලදි",
+    "copyToClipboard": "ක්ලිප්බෝඩ් එකට පිටපත් කරන ලදි",
+    "copyToClipboardAsPng": "PNG ලෙස ක්ලිප්බෝඩ් එකට පිටපත් කරන ලදි",
+    "copyToClipboardAsSvg": "",
+    "fileSaved": "ගොනුව සුරැකිණි",
+    "fileSavedToFilename": "ගොනුව ගොනු නාමයට සුරැකිණි",
+    "canvas": "කැන්වස ටෝස්ට්",
+    "selection": "තේරීම ටෝස්ට්",
+    "pasteAsSingleElement": "තනි අංගයක් ලෙස ඇලවීම",
+    "unableToEmbed": "බිහිදැමීමට නොහැක",
+    "unrecognizedLinkFormat": "නොහඳුනන සබැඳි ආකෘතිය",
+    "elementLinkCopied": ""
   },
   "colors": {
-    "transparent": "",
-    "black": "",
-    "white": "",
-    "red": "",
-    "pink": "",
-    "grape": "",
-    "violet": "",
-    "gray": "",
-    "blue": "",
-    "cyan": "",
-    "teal": "",
-    "green": "",
-    "yellow": "",
-    "orange": "",
-    "bronze": ""
+    "transparent": "පාරදෘශ්‍ය",
+    "black": "කළු",
+    "white": "සුදු",
+    "red": "රතු",
+    "pink": "රෝස",
+    "grape": "දම්",
+    "violet": "දම්පාට",
+    "gray": "අළු",
+    "blue": "නිල්",
+    "cyan": "සයන්",
+    "teal": "ටීල්",
+    "green": "කොළ",
+    "yellow": "කහ",
+    "orange": "තැඹිලි",
+    "bronze": "ලෝකඩ"
   },
   "welcomeScreen": {
     "app": {
-      "center_heading": "",
-      "center_heading_plus": "",
-      "menuHint": ""
+      "center_heading": "අයදුම් මධ්‍ය ශීර්ෂය",
+      "center_heading_plus": "අයදුම් මධ්‍ය ශීර්ෂය Plus",
+      "menuHint": "මෙනු ඉඟිය"
     },
     "defaults": {
-      "menuHint": "",
-      "center_heading": "",
-      "toolbarHint": "",
-      "helpHint": ""
+      "menuHint": "පෙරනිමි මෙනු ඉඟිය",
+      "center_heading": "පෙරනිමි මධ්‍ය ශීර්ෂය",
+      "toolbarHint": "මෙවලම් තීරු ඉඟිය",
+      "helpHint": "උපකාර ඉඟිය"
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "",
-    "colors": "",
-    "shades": "",
-    "hexCode": "",
-    "noShades": ""
+    "color": "",
+    "mostUsedCustomColors": "බහුලව භාවිතා වන අභිරුචි පාට",
+    "colors": "පාට",
+    "shades": "සෙවනැලි",
+    "hexCode": "හෙක්ස් කේත",
+    "noShades": "සෙවනැලි නැත"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "පින්තූරයට නිර්යාත ආවරණය",
+        "button": "පින්තූරයට නිර්යාත බොත්තම",
+        "description": "පින්තූරයට නිර්යාත විස්තර"
       },
       "saveToDisk": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "තැටියට සුරැකීම ආවරණය",
+        "button": "තැටියට සුරැකීම බොත්තම",
+        "description": "තැටියට සුරැකීම විස්තර"
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "ExcalidrawPlus ආවරණය",
+        "button": "ExcalidrawPlus බොත්තම",
+        "description": "ExcalidrawPlus විස්තර"
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "ගොනුවෙන් පූරණය ආවරණය",
+        "button": "ගොනුවෙන් පූරණය බොත්තම",
+        "description": "ගොනුවෙන් පූරණය විස්තර"
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "බෙදාහැරිය හැකි සබැඳි ආවරණය",
+        "button": "බෙදාහැරිය හැකි සබැඳි බොත්තම",
+        "description": "බෙදාහැරිය හැකි සබැඳි විස්තර"
       }
     }
   },
   "mermaid": {
+    "title": "Mermaid මාතෘකාව",
+    "button": "Mermaid බොත්තම",
+    "description": "Mermaid විස්තර",
+    "syntax": "Mermaid වාක්‍ය ඛණ්ඩය",
+    "preview": "Mermaid පූර්වදර්ශනය"
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
     "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/sk-SK.json b/packages/excalidraw/locales/sk-SK.json
index 9f4135e208..2bda266d52 100644
--- a/packages/excalidraw/locales/sk-SK.json
+++ b/packages/excalidraw/locales/sk-SK.json
@@ -21,7 +21,9 @@
     "copyStyles": "Kopírovať štýly",
     "pasteStyles": "Vložiť štýly",
     "stroke": "Obrys",
+    "changeStroke": "Zmeniť farbu orámovania",
     "background": "Pozadie",
+    "changeBackground": "Zmeniť farbu pozadia",
     "fill": "Výplň",
     "strokeWidth": "Hrúbka obrysu",
     "strokeStyle": "Štýl obrysu",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "Trojuholník (obrys)",
     "arrowhead_diamond": "Diamant",
     "arrowhead_diamond_outline": "Diamant (obrys)",
+    "arrowhead_crowfoot_many": "Crow's foot (viacero)",
+    "arrowhead_crowfoot_one": "Crow's foot (jedna)",
+    "arrowhead_crowfoot_one_or_many": "Crow's foot (jedna k viacero)",
+    "more_options": "Ďalšie možnosti",
+    "arrowtypes": "Typ šípky",
+    "arrowtype_sharp": "Ostrá šípka",
+    "arrowtype_round": "Zakrivená šípka",
+    "arrowtype_elbowed": "Zalomená šípka",
     "fontSize": "Veľkosť písma",
     "fontFamily": "Písmo",
     "addWatermark": "Pridať \"Vytvorené s Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Použité na plátne",
     "canvasBackground": "Pozadie plátna",
     "drawingCanvas": "Kresliace plátno",
+    "clearCanvas": "Vyčistiť plátno",
     "layers": "Vrstvy",
     "actions": "Akcie",
     "language": "Jazyk",
@@ -84,12 +95,13 @@
     "group": "Zoskupiť",
     "ungroup": "Zrušiť zoskupenie",
     "collaborators": "Spolupracovníci",
-    "showGrid": "Zobraziť mriežku",
+    "toggleGrid": "Prepnúť mriežku",
     "addToLibrary": "Pridať do knižnice",
     "removeFromLibrary": "Odstrániť z knižnice",
     "libraryLoadingMessage": "Načítavanie knižnice…",
     "libraries": "Prehliadať knižnice",
     "loadingScene": "Načítavanie scény…",
+    "loadScene": "Načítať scénu zo súboru",
     "align": "Zarovnanie",
     "alignTop": "Zarovnať nahor",
     "alignBottom": "Zarovnať nadol",
@@ -105,7 +117,9 @@
     "share": "Zdieľať",
     "showStroke": "Zobraziť výber farby pre obrys",
     "showBackground": "Zobraziť výber farby pre pozadie",
-    "toggleTheme": "Prepnúť tému",
+    "showFonts": "Zobraziť výber písma",
+    "toggleTheme": "Prepnúť svetlú/tmavú tému",
+    "theme": "Téma",
     "personalLib": "Moja knižnica",
     "excalidrawLib": "Excalidraw knižnica",
     "decreaseFontSize": "Zmenšiť veľkosť písma",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Zabaliť text do kontajneru",
     "link": {
       "edit": "Upraviť odkaz",
-      "editEmbed": "Editovať a zapustiť odkaz",
-      "create": "Vytvoriť odkaz",
-      "createEmbed": "Vytvoriť a zapustiť odkaz",
+      "editEmbed": "Editovať zapustený odkaz",
+      "create": "Pridať odkaz",
       "label": "Odkaz",
       "labelEmbed": "Zapustiť odkaz",
-      "empty": "Nie je nastavený žiaden odkaz"
+      "empty": "Nie je nastavený žiaden odkaz",
+      "hint": "Zadajte alebo vložte váš odkaz",
+      "goToElement": "Prejsť k cielenému prvku"
     },
     "lineEditor": {
       "edit": "Upraviť čiaru",
-      "exit": "Ukončiť editovanie čiary"
+      "editArrow": "Upraviť šípku"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Zamknúť",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "Odstrániť všetky prvky z rámu",
     "eyeDropper": "Vybrať farbu z plátna",
     "textToDiagram": "Text na diagram",
-    "prompt": "Inštrukcia"
+    "prompt": "Inštrukcia",
+    "followUs": "Sledujte nás",
+    "discordChat": "Discord chat",
+    "zoomToFitViewport": "Priblížiť na veľkosť zobrazenia",
+    "zoomToFitSelection": "Priblížiť na výber",
+    "zoomToFit": "Priblížiť aby boli zahrnuté všetky prvky",
+    "installPWA": "Inštalovať Excalidraw lokálne (PWA)",
+    "autoResize": "Zapnúť automatickú zmenu veľkosti textu",
+    "imageCropping": "Orezanie obrázka",
+    "unCroppedDimension": "Pôvodné rozmery",
+    "copyElementLink": "Kopírovať odkaz na objekt",
+    "linkToElement": "Odkaz na objekt",
+    "wrapSelectionInFrame": "Zabaliť výber do rámu",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Odkaz na objekt",
+    "desc": "Kliknite na tvar na plátne alebo vložte odkaz.",
+    "notFound": "Odkázaný objekt nebol nájdený na plátne."
   },
   "library": {
     "noItems": "Zatiaľ neboli pridané žiadne položky...",
     "hint_emptyLibrary": "Vyberte položku z plátna pre jej pridanie do knižnice alebo použite knižnicu z verejného zoznamu knižníc nižšie.",
-    "hint_emptyPrivateLibrary": "Vyberte položku z plátna pre jej pridanie do knižnice."
+    "hint_emptyPrivateLibrary": "Vyberte položku z plátna pre jej pridanie do knižnice.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Vyhľadať v plátne",
+    "noMatch": "Neboli nájdené žiadne výsledky...",
+    "singleResult": "výsledok",
+    "multipleResults": "výsledky",
+    "placeholder": "Vyhľadať text v plátne...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Obnoviť plátno",
@@ -151,6 +204,7 @@
     "exportImage": "Exportovať obrázok...",
     "export": "Uložiť do...",
     "copyToClipboard": "Kopírovať do schránky",
+    "copyLink": "Kopírovať odkaz",
     "save": "Uložiť do aktuálneho súboru",
     "saveAs": "Uložiť ako",
     "load": "Otvoriť",
@@ -171,14 +225,16 @@
     "fullScreen": "Celá obrazovka",
     "darkMode": "Tmavý režim",
     "lightMode": "Svetlý režim",
+    "systemMode": "Systémový režim",
     "zenMode": "Režim zen",
     "objectsSnapMode": "Prichytiť k objektom",
     "exitZenMode": "Zrušiť režim zen",
     "cancel": "Zrušiť",
+    "saveLibNames": "",
     "clear": "Vymazať",
     "remove": "Odstrániť",
     "embed": "Prepnúť zapustenie",
-    "publishLibrary": "Uverejniť",
+    "publishLibrary": "",
     "submit": "Potvrdiť",
     "confirm": "Potvrdiť",
     "embeddableInteractionButton": "Kliknite pre interakciu"
@@ -188,7 +244,7 @@
     "couldNotCreateShareableLink": "Nepodarilo sa vytvoriť odkaz na zdieľanie.",
     "couldNotCreateShareableLinkTooBig": "Nepodarilo sa vytvoriť odkaz na zdieľanie: scéna je príliš veľká",
     "couldNotLoadInvalidFile": "Nepodarilo sa načítať nevalidný súbor",
-    "importBackendFailed": "Nepdarilo sa importovanie zo serveru.",
+    "importBackendFailed": "Nepodarilo sa importovanie zo serveru.",
     "cannotExportEmptyCanvas": "Nie je možné exportovať prázdne plátno.",
     "couldNotCopyToClipboard": "Kopírovanie do schránky sa nepodarilo.",
     "decryptFailed": "Nepodarilo sa rozšifrovať údaje.",
@@ -204,7 +260,8 @@
     "resetLibrary": "Týmto vyprázdnite vašu knižnicu. Ste si istý?",
     "removeItemsFromsLibrary": "Odstrániť {{count}} položiek z knižnice?",
     "invalidEncryptionKey": "Šifrovací kľúč musí mať 22 znakov. Živá spolupráca je vypnutá.",
-    "collabOfflineWarning": "Internetové pripojenie nie je dostupné.\nVaše zmeny nebudú uložené!"
+    "collabOfflineWarning": "Internetové pripojenie nie je dostupné.\nVaše zmeny nebudú uložené!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Nepodporovaný typ súboru.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Súbor je príliš veľký. Maximálna povolená veľkosť je {{maxSize}}.",
     "svgImageInsertError": "Nepodarilo sa vložiť SVG obrázok. SVG formát je pravdepodobne nevalidný.",
     "failedToFetchImage": "Načítanie obrázka zlyhalo.",
-    "invalidSVGString": "Nevalidné SVG.",
     "cannotResolveCollabServer": "Nepodarilo sa pripojiť ku kolaboračnému serveru. Prosím obnovte stránku a skúste to znovu.",
     "importLibraryError": "Nepodarilo sa načítať knižnicu",
+    "saveLibraryError": "Nepodarilo sa uložiť knižnicu. Prosím uložte si vašu knižnicu lokálne do súboru, aby ste nestratili zmeny.",
     "collabSaveFailed": "Uloženie do databázy sa nepodarilo. Ak tento problém pretrváva uložte si váš súbor lokálne aby ste nestratili vašu prácu.",
     "collabSaveFailed_sizeExceeded": "Uloženie do databázy sa nepodarilo, pretože veľkosť plátna je príliš veľká. Uložte si váš súbor lokálne aby ste nestratili vašu prácu.",
     "imageToolNotSupported": "Obrázky sú vypnuté.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Výber",
+    "lasso": "",
     "image": "Vložiť obrázok",
     "rectangle": "Obdĺžnik",
     "diamond": "Diamant",
@@ -246,7 +304,7 @@
     "library": "Knižnica",
     "lock": "Nechať zvolený nástroj aktívny po skončení kreslenia",
     "penMode": "Režim pera – zabrániť dotyku",
-    "link": "Pridať/ Upraviť odkaz pre vybraný tvar",
+    "link": "Pridať / Upraviť odkaz pre vybraný tvar",
     "eraser": "Guma",
     "frame": "Nástroj rám",
     "magicframe": "Drôtený model na kód",
@@ -255,7 +313,23 @@
     "hand": "Ruka (nástroj pre pohyb plátna)",
     "extraTools": "Ďalšie nástroje",
     "mermaidToExcalidraw": "Mermaid do Excalidraw",
-    "magicSettings": "AI nastavenia"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Obdĺžnik",
+    "diamond": "Diamant",
+    "ellipse": "Elipsa",
+    "arrow": "Šípka",
+    "line": "Čiara",
+    "freedraw": "Voľný ťah",
+    "text": "Text",
+    "image": "Obrázok",
+    "group": "Skupina",
+    "frame": "Rám",
+    "magicframe": "Drôtený model na kód",
+    "embeddable": "Web Embed",
+    "selection": "Výber",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Akcie plátna",
@@ -263,28 +337,33 @@
     "shapes": "Tvary"
   },
   "hints": {
-    "canvasPanning": "Pre pohyb plátna podržte koliesko myši alebo medzerník počas ťahania, alebo použite nástroj ruka",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Kliknite na vloženie viacerých bodov, potiahnite na vytvorenie jednej priamky",
+    "arrowTool": "",
     "freeDraw": "Kliknite a ťahajte, pustite na ukončenie",
     "text": "Tip: text môžete pridať aj dvojklikom kdekoľvek, ak je zvolený nástroj výber",
     "embeddable": "Kliknite a ťahajte pre zapustenie webovej stránky",
-    "text_selected": "Použite dvojklik alebo stlačte Enter na editáciu textu",
-    "text_editing": "Stlačte Escape alebo CtrlOrCmd+ENTER na ukončenie editovania",
-    "linearElementMulti": "Kliknite na počiatočný bod alebo stlačte Escape alebo Enter na ukončenie",
-    "lockAngle": "Počas rotácie obmedzíte uhol podržaním SHIFT",
-    "resize": "Počas zmeny veľkosti zachováte proporcie podržaním SHIFT,\\npodržaním ALT meníte veľkosť so zachovaním stredu",
-    "resizeImage": "Podržte SHIFT pre voľnú zmenu veľkosti, podržte ALT pre zmenu veľkosti od stredu",
-    "rotate": "Počas rotácie obmedzíte uhol podržaním SHIFT",
-    "lineEditor_info": "Podržte CtrlOrCmd a kliknite dva krát alebo stlačte CtrlOrCmd + Enter pre editáciu bodov",
-    "lineEditor_pointSelected": "Stačte Delete na vymazanie bodu (bodov), CtrlOrCmd+D na duplikovanie, alebo potiahnite na presunutie",
-    "lineEditor_nothingSelected": "Zvoľte bod na upravovanie (podržte SHIFT pre zvolenie viacerých bodov) alebo podržte Alt a kliknite na pridanie nového bodu",
-    "placeImage": "Kliknite pre umiestnenie obrázka alebo kliknite a ťahajte pre zmenu jeho veľkosti",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Uverejniť vašu knižnicu",
-    "bindTextToElement": "Stlačte enter na pridanie textu",
-    "deepBoxSelect": "Podržte CtrlOrCmd na výber v skupine alebo zamedzeniu poťiahnutia",
-    "eraserRevert": "Podržte Alt pre prehodenie položiek určených na vymazanie",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Táto sa funkcionalita sa dá zapnúť nastavením \"dom.events.asyncClipboard.clipboardItem\" na \"true\". Pre zmenu nastavení vo Firefox-e otvorte stránku \"about:config\".",
-    "disableSnapping": "Podržte CtrlOrCmd pre vypnutie prichytávania"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Nie je možné zobraziť náhľad plátna",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Boli sme veľmi opatrní, aby informácie vašej scény neboli v chybe zaznamenané. Ak vaša scéna nie je súkromná, prosím zvážte pokračovanie na naše <button>hlásenie chýb.</button> Prosím zahrňte informácie nižšie pomocou kopírovania a prilepenia do GitHub issue.",
     "sceneContent": "Obsah scény:"
   },
+  "shareDialog": {
+    "or": "Alebo"
+  },
   "roomDialog": {
-    "desc_intro": "Pozvite niekoho do svojej aktuálnej scény a pracujte spoločne.",
-    "desc_privacy": "Nemajte obavy, schôdza používa end-to-end šifrovanie, takže všetko čo nakreslíte je súkromné. Dokonca, ani náš server dedokáže prečítať, čo ste vytvorili.",
+    "desc_intro": "Pozvite ľudí a spolupracujte s nimi na vašich kresbách.",
+    "desc_privacy": "Nemajte obavy, relácia je end-to-end šifrovaná a úplne privátna. Ani náš server nedokáže vidieť čo kreslíte.",
     "button_startSession": "Začať schôdzu",
     "button_stopSession": "Ukončiť schôdzu",
     "desc_inProgressIntro": "Práve prebieha živá schôdza.",
@@ -327,7 +409,9 @@
     "blog": "Prečítajte si náš blog",
     "click": "kliknutie",
     "deepSelect": "Výber v skupine",
-    "deepBoxSelect": "Výber v skupine alebo zamedzenie poťiahnutia",
+    "deepBoxSelect": "Výber v skupine alebo zamedzenie potiahnutia",
+    "createFlowchart": "Vytvorte vývojový diagram z generického prvku",
+    "navigateFlowchart": "Navigácia v diagrame",
     "curvedArrow": "Zakrivená šípka",
     "curvedLine": "Zakrivená čiara",
     "documentation": "Dokumentácia",
@@ -337,7 +421,7 @@
     "editLineArrowPoints": "Editácia bodov čiary/šípky",
     "editText": "Editácia textu / pridanie štítku",
     "github": "Objavili ste problém? Nahláste ho",
-    "howto": "Postupujte podľa naších návodov",
+    "howto": "Postupujte podľa našich návodov",
     "or": "alebo",
     "preventBinding": "Zakázať pripájanie šípky",
     "tools": "Nástroje",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Priblížiť na výber",
     "toggleElementLock": "Zamknúť/odomknúť vybrané",
     "movePageUpDown": "Posunúť stranu hore/dole",
-    "movePageLeftRight": "Posunúť stranu doľava/doprava"
+    "movePageLeftRight": "Posunúť stranu doľava/doprava",
+    "cropStart": "Orezať obrázok",
+    "cropFinish": "Dokončiť orezávanie obrázka"
   },
   "clearCanvasDialog": {
     "title": "Vyčistiť plátno"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Uhol",
-    "element": "Prvok",
-    "elements": "Prvky",
+    "shapes": "Tvary",
     "height": "Výška",
     "scene": "Scéna",
     "selected": "Vybrané",
     "storage": "Úložisko",
-    "title": "Štatistiky",
+    "fullTitle": "Vlastnosti plátna a tvaru",
+    "title": "Vlastnosti",
+    "generalStats": "Všeobecné",
+    "elementProperties": "Vlastnosti tvaru",
     "total": "Celkom",
     "version": "Verzia",
     "versionCopy": "Kliknutím skopírujete",
@@ -439,13 +527,15 @@
     "copyStyles": "Štýly skopírované.",
     "copyToClipboard": "Skopírované do schránky.",
     "copyToClipboardAsPng": "Kopírovanie {{exportSelection}} do schránky ako PNG prebehlo úspešne\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Kopírovanie {{exportSelection}} do schránky ako SVG prebehlo úspešne\n({{exportColorScheme}})",
     "fileSaved": "Súbor uložený.",
     "fileSavedToFilename": "Uložený ako {filename}",
     "canvas": "plátna",
     "selection": "výberu",
     "pasteAsSingleElement": "Použitím {{shortcut}} vložte ako samostatný prvok alebo vložte do existujúceho editovaného textu",
     "unableToEmbed": "Zapustenie tejto URL nie je povolené. Vytvorte issue na GitHub-e a požiadajte povolenie tejto URL",
-    "unrecognizedLinkFormat": "Odkaz, ktorý sa snažíte zapustiť nie je v očakávanom formáte. Prosím skúste vložiť 'odkaz na zdieľanie' poskytnutý zdrojovou webovou stránkou"
+    "unrecognizedLinkFormat": "Odkaz, ktorý sa snažíte zapustiť nie je v očakávanom formáte. Prosím skúste vložiť 'odkaz na zdieľanie' poskytnutý zdrojovou webovou stránkou",
+    "elementLinkCopied": "Odkaz bol skopírovaný do schránky"
   },
   "colors": {
     "transparent": "Priehľadná",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Najpoužívanejšie vlastné farby",
     "colors": "Farby",
     "shades": "Odtiene",
@@ -521,5 +612,53 @@
     "description": "Aktuálne sú podporované iba <flowchartLink>vývojové diagramy</flowchartLink>, <sequenceLink>sekvenčné diagramy</sequenceLink> a <classLink>diagramy tried</classLink>. Ostatné typy budú v Excalidraw vykreslené ako obrázky.",
     "syntax": "Mermaid syntax",
     "preview": "Ukážka"
+  },
+  "quickSearch": {
+    "placeholder": "Rýchle vyhľadávanie"
+  },
+  "fontList": {
+    "badge": {
+      "old": "staré"
+    },
+    "sceneFonts": "V tejto scéne",
+    "availableFonts": "Dostupné písma",
+    "empty": "Nenašli sa žiadne písma"
+  },
+  "userList": {
+    "empty": "Nenašli sa žiadni používatelia",
+    "hint": {
+      "text": "Kliknite na používateľa pre jeho sledovanie",
+      "followStatus": "Aktuálne sledujete tohto používateľa",
+      "inCall": "Používateľ je účastník hovoru",
+      "micMuted": "Používateľ má stlmený mikrofón",
+      "isSpeaking": "Používateľ hovorí"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta príkazov",
+    "shortcuts": {
+      "select": "Vybrať",
+      "confirm": "Potvrdiť",
+      "close": "Zavrieť"
+    },
+    "recents": "Nedávno použité",
+    "search": {
+      "placeholder": "Prehľadávajte menu, príkazy a objavte skryté poklady",
+      "noMatch": "Žiadne vyhovujúce príkazy..."
+    },
+    "itemNotAvailable": "Príkaz nie je dostupný...",
+    "shortcutHint": "Použite paletu príkazov pomocou {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/sl-SI.json b/packages/excalidraw/locales/sl-SI.json
index 2cd7e289f9..8045ab0402 100644
--- a/packages/excalidraw/locales/sl-SI.json
+++ b/packages/excalidraw/locales/sl-SI.json
@@ -21,7 +21,9 @@
     "copyStyles": "Kopiraj slog",
     "pasteStyles": "Prilepi slog",
     "stroke": "Poteza",
+    "changeStroke": "Spremeni barvo poteze",
     "background": "Ozadje",
+    "changeBackground": "Spremeni barvo ozadja",
     "fill": "Polnilo",
     "strokeWidth": "Debelina poteze",
     "strokeStyle": "Slog poteze",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "Trikotnik (oris)",
     "arrowhead_diamond": "Diamant",
     "arrowhead_diamond_outline": "Diamant (oris)",
+    "arrowhead_crowfoot_many": "Vranja noga (več)",
+    "arrowhead_crowfoot_one": "Vranja noga (ena)",
+    "arrowhead_crowfoot_one_or_many": "Vranja noga (ena ali več)",
+    "more_options": "Več možnosti",
+    "arrowtypes": "Vrsta puščice",
+    "arrowtype_sharp": "Ostra puščica",
+    "arrowtype_round": "Ukrivljena puščica",
+    "arrowtype_elbowed": "Puščica tipa komolca",
     "fontSize": "Velikost pisave",
     "fontFamily": "Družina pisave",
     "addWatermark": "Dodaj \"Izdelano z Excalidraw\"",
@@ -72,6 +82,7 @@
     "canvasColors": "Uporabljeno na platnu",
     "canvasBackground": "Ozadje platna",
     "drawingCanvas": "Platno za risanje",
+    "clearCanvas": "Počisti platno",
     "layers": "Plasti",
     "actions": "Dejanja",
     "language": "Jezik",
@@ -84,12 +95,13 @@
     "group": "Združi izbor",
     "ungroup": "Razdruži izbor",
     "collaborators": "Sodelavci",
-    "showGrid": "Prikaži mrežo",
+    "toggleGrid": "Preklopi mrežo",
     "addToLibrary": "Dodaj v knjižnico",
     "removeFromLibrary": "Odstrani iz knjižnice",
     "libraryLoadingMessage": "Nalaganje knjižnice ...",
     "libraries": "Brskaj po knjižnicah",
     "loadingScene": "Nalaganje scene...",
+    "loadScene": "Naloži sceno iz datoteke",
     "align": "Poravnava",
     "alignTop": "Poravnaj na vrh",
     "alignBottom": "Poravnaj na dno",
@@ -105,7 +117,9 @@
     "share": "Deli",
     "showStroke": "Prikaži izbirnik barv poteze",
     "showBackground": "Prikaži izbirnik barv ozadja",
-    "toggleTheme": "Obrni temo",
+    "showFonts": "Pokaži izbirnik pisave",
+    "toggleTheme": "Preklapljanje med svetlo/temno temo",
+    "theme": "Tema",
     "personalLib": "Osebna knjižnica",
     "excalidrawLib": "Knjižnica Excalidraw",
     "decreaseFontSize": "Zmanjšaj velikost pisave",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Zavij besedilo v vsebnik",
     "link": {
       "edit": "Uredi povezavo",
-      "editEmbed": "Uredi povezavo in vdelaj",
-      "create": "Ustvari povezavo",
-      "createEmbed": "Ustvari povezavo in vdelaj",
+      "editEmbed": "Uredi vdelano povezavo",
+      "create": "Dodaj povezavo",
       "label": "Povezava",
       "labelEmbed": "Povezava in vdelovanje",
-      "empty": "Povezava ni nastavljena"
+      "empty": "Povezava ni nastavljena",
+      "hint": "Tukaj vnesite ali prilepite svojo povezavo",
+      "goToElement": "Pojdite na ciljni element"
     },
     "lineEditor": {
       "edit": "Uredi črto",
-      "exit": "Zapri urejanje črte"
+      "editArrow": "Uredi puščico"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Zakleni",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "Izbriši vse elemente v okvirju",
     "eyeDropper": "Izberi barvo s platna",
     "textToDiagram": "Besedilo v diagram",
-    "prompt": "Poziv"
+    "prompt": "Poziv",
+    "followUs": "Sledi nas",
+    "discordChat": "Klepet v Discordu",
+    "zoomToFitViewport": "Približaj na vidno polje",
+    "zoomToFitSelection": "Približaj na izbor",
+    "zoomToFit": "Približaj na vse elemente",
+    "installPWA": "Namesti Excalidraw lokalno (PWA)",
+    "autoResize": "Omogoči samodejno spreminjanje velikosti besedila",
+    "imageCropping": "Obrezovanje slike",
+    "unCroppedDimension": "Neobrezana dimenzija",
+    "copyElementLink": "Kopiraj povezavo do objekta",
+    "linkToElement": "Povezava do objekta",
+    "wrapSelectionInFrame": "Zavij izbor v okvir",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Povezava do objekta",
+    "desc": "Kliknite obliko na platnu ali prilepite povezavo.",
+    "notFound": "Objekta s povezave ni bilo mogoče najti na platnu."
   },
   "library": {
     "noItems": "Dodan še ni noben element...",
     "hint_emptyLibrary": "Izberite element na platnu, da ga dodate sem, ali namestite knjižnico iz javnega skladišča spodaj.",
-    "hint_emptyPrivateLibrary": "Izberite element na platnu, da ga dodate sem."
+    "hint_emptyPrivateLibrary": "Izberite element na platnu, da ga dodate sem.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Poišči na platnu",
+    "noMatch": "Ni zadetkov ...",
+    "singleResult": "rezultat",
+    "multipleResults": "rezultata/i/ov",
+    "placeholder": "Poišči besedilo na platnu ...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Ponastavi platno",
@@ -151,6 +204,7 @@
     "exportImage": "Izvozi sliko...",
     "export": "Shrani v...",
     "copyToClipboard": "Kopiraj v odložišče",
+    "copyLink": "Kopiraj povezavo",
     "save": "Shrani v trenutno datoteko",
     "saveAs": "Shrani kot",
     "load": "Odpri",
@@ -171,14 +225,16 @@
     "fullScreen": "Celozaslonski način",
     "darkMode": "Temni način",
     "lightMode": "Svetli način",
+    "systemMode": "Sistemski način",
     "zenMode": "Način Zen",
     "objectsSnapMode": "Pripenjanje na predmete",
     "exitZenMode": "Zapri način Zen",
     "cancel": "Prekliči",
+    "saveLibNames": "",
     "clear": "Počisti",
     "remove": "Odstrani",
     "embed": "Preklopi vdelavo",
-    "publishLibrary": "Objavi",
+    "publishLibrary": "",
     "submit": "Pošlji",
     "confirm": "Potrdi",
     "embeddableInteractionButton": "Kliknite za interakcijo"
@@ -204,7 +260,8 @@
     "resetLibrary": "To bo počistilo vašo knjižnico. Ali ste prepričani?",
     "removeItemsFromsLibrary": "Izbriši elemente ({{count}}) iz knjižnice?",
     "invalidEncryptionKey": "Ključ za šifriranje mora vsebovati 22 znakov. Sodelovanje v živo je onemogočeno.",
-    "collabOfflineWarning": "Internetna povezava ni na voljo.\nVaše spremembe ne bodo shranjene!"
+    "collabOfflineWarning": "Internetna povezava ni na voljo.\nVaše spremembe ne bodo shranjene!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Nepodprt tip datoteke.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Datoteka je prevelika. Največja dovoljena velikost je {{maxSize}}.",
     "svgImageInsertError": "Vstavljanje slike SVG ni uspelo. Oznake SVG so videti neveljavne.",
     "failedToFetchImage": "Pridobivanje slike ni uspelo.",
-    "invalidSVGString": "Neveljaven SVG.",
     "cannotResolveCollabServer": "Povezave s strežnikom za sodelovanje ni bilo mogoče vzpostaviti. Ponovno naložite stran in poskusite znova.",
     "importLibraryError": "Nalaganje knjižnice ni uspelo",
+    "saveLibraryError": "Knjižnice ni bilo mogoče shraniti v shrambo. Prosimo, shranite svojo knjižnico v datoteko lokalno, da ne boste izgubili sprememb.",
     "collabSaveFailed": "Ni bilo mogoče shraniti v zaledno bazo podatkov. Če se težave nadaljujejo, shranite datoteko lokalno, da ne boste izgubili svojega dela.",
     "collabSaveFailed_sizeExceeded": "Ni bilo mogoče shraniti v zaledno bazo podatkov, zdi se, da je platno preveliko. Datoteko shranite lokalno, da ne izgubite svojega dela.",
     "imageToolNotSupported": "Slike so onemogočene.",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "Izbor",
+    "lasso": "",
     "image": "Vstavi sliko",
     "rectangle": "Pravokotnik",
     "diamond": "Diamant",
@@ -246,7 +304,7 @@
     "library": "Knjižnica",
     "lock": "Ohrani izbrano orodje aktivno po risanju",
     "penMode": "Način peresa - prepreči dotik",
-    "link": "Dodaj/posodobi povezavo za izbrano obliko",
+    "link": "Dodaj / posodobi povezavo za izbrano obliko",
     "eraser": "Radirka",
     "frame": "Okvir",
     "magicframe": "Žični okvir v kodo",
@@ -255,7 +313,23 @@
     "hand": "Roka (orodje za premikanje)",
     "extraTools": "Več orodij",
     "mermaidToExcalidraw": "Mermaid v Excalidraw",
-    "magicSettings": "Nastavitve AI"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Pravokotnik",
+    "diamond": "Diamant",
+    "ellipse": "Elipsa",
+    "arrow": "Puščica",
+    "line": "Črta",
+    "freedraw": "Prosto risanje",
+    "text": "Besedilo",
+    "image": "Slika",
+    "group": "Skupina",
+    "frame": "Okvir",
+    "magicframe": "Žični okvir v kodo",
+    "embeddable": "Spletna vdelava",
+    "selection": "Izbor",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Dejanja za platno",
@@ -263,28 +337,33 @@
     "shapes": "Oblike"
   },
   "hints": {
-    "canvasPanning": "Za premikanje platna med vlečenjem držite kolesce miške ali preslednico ali uporabite orodje roka",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Kliknite za začetek več točk, povlecite za posamezno črto",
+    "arrowTool": "",
     "freeDraw": "Kliknite in povlecite, spustite, ko končate",
     "text": "Namig: besedilo lahko dodate tudi z dvoklikom kjer koli z orodjem za izbiro",
     "embeddable": "Kliknite in povlecite, da ustvarite spletno vdelavo",
-    "text_selected": "Dvokliknite ali pritisnite tipko Enter, da uredite besedilo",
-    "text_editing": "Pritisnite tipko Escape ali CtrlOrCmd+Enter za zaključek urejanja",
-    "linearElementMulti": "Kliknite zadnjo točko ali pritisnite Escape ali Enter, da končate",
-    "lockAngle": "Kot lahko omejite tako, da držite tipko Shift",
-    "resize": "Razmerja lahko omejite tako, da držite tipko Shift med spreminjanjem velikosti. Držite tipko Alt, da spremenite velikost od središča",
-    "resizeImage": "Velikost lahko prosto spreminjate tako, da držite tipko Shift. Držite tipko Alt, da spremenite velikost od središča",
-    "rotate": "Kote lahko omejite tako, da med vrtenjem držite tipko Shift",
-    "lineEditor_info": "Držite CtrlOrCmd in dvokliknite ali pritisnite CtrlOrCmd + Enter za urejanje točk",
-    "lineEditor_pointSelected": "Pritisnite tipko Delete, da odstranite točko(e), CtrlOrCmd+D za podvojitev ali povlecite za premikanje",
-    "lineEditor_nothingSelected": "Izberite točko za urejanje (pridržite tipko Shift za izbiro več točk), ali držite tipko Alt in kliknite za dodajanje novih točk",
-    "placeImage": "Kliknite, da postavite sliko, ali kliknite in povlecite, da ročno nastavite njeno velikost",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Objavi svojo knjižnico",
-    "bindTextToElement": "Pritisnite tipko Enter za dodajanje besedila",
-    "deepBoxSelect": "Držite tipko CtrlOrCmd za globoko izbiro in preprečitev vlečenja",
-    "eraserRevert": "Pridržite tipko Alt, da razveljavite elemente, označene za brisanje",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "To funkcijo lahko verjetno omogočite z nastavitvijo zastavice \"dom.events.asyncClipboard.clipboardItem\" na \"true\". Če želite spremeniti zastavice brskalnika v Firefoxu, obiščite stran \"about:config\".",
-    "disableSnapping": "Držite CtrlOrCmd, da onemogočite pripenjanje"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Predogleda ni bilo mogoče prikazati",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Zelo smo bili previdni, da v podatke o napaki nismo vključili vaših podatkov o sceni. Če vaša scena ni zasebna, vas prosimo, da napišete več podrobnosti na našem <button>sledilniku hroščev.</button> Prosimo, vključite spodnje informacije tako, da jih kopirate in prilepite v GitHub vprašanje.",
     "sceneContent": "Vsebina scene:"
   },
+  "shareDialog": {
+    "or": "Ali"
+  },
   "roomDialog": {
-    "desc_intro": "Na vašo trenutno sceno lahko povabite osebe, ki bodo sodelovale z vami.",
-    "desc_privacy": "Brez skrbi. Seja uporablja šifriranje od konca do konca, tako da bo vse, kar narišete, ostalo zasebno. Niti naš strežnik ne bo mogel videti, kaj si izmislite.",
+    "desc_intro": "Povabite ljudi k sodelovanju pri vaši risbi.",
+    "desc_privacy": "Ne skrbite, seja je šifrirana od konca do konca in popolnoma zasebna. Niti naš strežnik ne vidi, kaj rišete.",
     "button_startSession": "Začni sejo",
     "button_stopSession": "Ustavi sejo",
     "desc_inProgressIntro": "Seja sodelovanja v živo je v teku.",
@@ -328,6 +410,8 @@
     "click": "klik",
     "deepSelect": "Globoka izbira",
     "deepBoxSelect": "Globoka izbira znotraj polja in preprečitev vlečenja",
+    "createFlowchart": "Ustvarite diagram poteka iz generičnega elementa",
+    "navigateFlowchart": "Krmarjenje po diagramu poteka",
     "curvedArrow": "Ukrivljena puščica",
     "curvedLine": "Ukrivljena črta",
     "documentation": "Dokumentacija",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Približaj na izbor",
     "toggleElementLock": "Zakleni/odkleni izbor",
     "movePageUpDown": "Premakni stran gor/dol",
-    "movePageLeftRight": "Premakni stran levo/desno"
+    "movePageLeftRight": "Premakni stran levo/desno",
+    "cropStart": "Obreži sliko",
+    "cropFinish": "Dokončaj obrezovanje slike"
   },
   "clearCanvasDialog": {
     "title": "Počisti platno"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Kot",
-    "element": "Element",
-    "elements": "Elementi",
+    "shapes": "Oblike",
     "height": "Višina",
     "scene": "Scena",
     "selected": "Izbrano",
     "storage": "Shramba",
-    "title": "Statistika za napredne uporabnike",
+    "fullTitle": "Lastnosti platna in oblike",
+    "title": "Lastnosti",
+    "generalStats": "Splošno",
+    "elementProperties": "Lastnosti oblike",
     "total": "Skupaj",
     "version": "Različica",
     "versionCopy": "Kliknite za kopiranje",
@@ -439,13 +527,15 @@
     "copyStyles": "Slogi kopirani.",
     "copyToClipboard": "Kopirano v odložišče.",
     "copyToClipboardAsPng": "Kopirano v odložišče kot PNG ({{exportSelection}}, {{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Kopirano v odložišče kot SVG ({{exportSelection}}, {{exportColorScheme}})",
     "fileSaved": "Datoteka shranjena.",
     "fileSavedToFilename": "Shranjeno v {filename}",
     "canvas": "platno",
     "selection": "izbor",
     "pasteAsSingleElement": "Uporabite {{shortcut}}, da prilepite kot en element,\n ali prilepite v obstoječ urejevalnik besedil",
     "unableToEmbed": "Vdelava tega URL-ja trenutno ni dovoljena. Ustvarite vprašanje na GitHub-u in prosite za vmestitev URL-ja na seznam dovoljenih",
-    "unrecognizedLinkFormat": "Povezava, ki ste jo vdelali, se ne ujema s pričakovano obliko. Poskusite prilepiti niz za vdelavo, ki ste ga prejeli na izvorni strani"
+    "unrecognizedLinkFormat": "Povezava, ki ste jo vdelali, se ne ujema s pričakovano obliko. Poskusite prilepiti niz za vdelavo, ki ste ga prejeli na izvorni strani",
+    "elementLinkCopied": "Povezava kopirana na odložišče"
   },
   "colors": {
     "transparent": "Prosojno",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Najpogosteje uporabljene barve po meri",
     "colors": "Barve",
     "shades": "Odtenki",
@@ -521,5 +612,53 @@
     "description": "Trenutno so podprti samo <flowchartLink>diagrami poteka</flowchartLink>, <sequenceLink>diagrami zaporedij</sequenceLink> in <classLink>Razredni diagrami</classLink>. Druge vrste bodo upodobljene kot slike v Excalidraw.",
     "syntax": "Sintaksa Mermaid",
     "preview": "Predogled"
+  },
+  "quickSearch": {
+    "placeholder": "Hitro iskanje"
+  },
+  "fontList": {
+    "badge": {
+      "old": "stara"
+    },
+    "sceneFonts": "V tej sceni",
+    "availableFonts": "Razpoložljive pisave",
+    "empty": "Ni pisav"
+  },
+  "userList": {
+    "empty": "Ni uporabnikov",
+    "hint": {
+      "text": "Klikni na uporabnika za sledenje",
+      "followStatus": "Trenutno slediš temu uporabniku",
+      "inCall": "Uporabnik je v glasovnem klicu",
+      "micMuted": "Uporabnikov mikrofon je izklopljen",
+      "isSpeaking": "Uporabnik govori"
+    }
+  },
+  "commandPalette": {
+    "title": "Paleta ukazov",
+    "shortcuts": {
+      "select": "Izberi",
+      "confirm": "Potrdi",
+      "close": "Zapri"
+    },
+    "recents": "Nedavno uporabljeno",
+    "search": {
+      "placeholder": "Išči po menijih, ukazih in odkrij skrite funkcije",
+      "noMatch": "Ni ustreznih ukazov ..."
+    },
+    "itemNotAvailable": "Ukaz ni na voljo ...",
+    "shortcutHint": "Za paleto ukazov uporabi {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/sv-SE.json b/packages/excalidraw/locales/sv-SE.json
index d5a788fd4f..74be891ba2 100644
--- a/packages/excalidraw/locales/sv-SE.json
+++ b/packages/excalidraw/locales/sv-SE.json
@@ -21,7 +21,9 @@
     "copyStyles": "Kopiera stil",
     "pasteStyles": "Klistra in stil",
     "stroke": "Linje",
+    "changeStroke": "Ändra streckfärg",
     "background": "Bakgrund",
+    "changeBackground": "Ändra bakgrundsfärg",
     "fill": "Fyllnad",
     "strokeWidth": "Linjebredd",
     "strokeStyle": "Linjestil",
@@ -42,8 +44,16 @@
     "arrowhead_circle_outline": "Cirkel (kontur)",
     "arrowhead_triangle": "Triangel",
     "arrowhead_triangle_outline": "Triangel (kontur)",
-    "arrowhead_diamond": "Diamant",
-    "arrowhead_diamond_outline": "Diamant (kontur)",
+    "arrowhead_diamond": "Romb",
+    "arrowhead_diamond_outline": "Romb (kontur)",
+    "arrowhead_crowfoot_many": "Kråkfot (många)",
+    "arrowhead_crowfoot_one": "Kråkfot (en)",
+    "arrowhead_crowfoot_one_or_many": "Kråkfot (en eller många)",
+    "more_options": "Fler alternativ",
+    "arrowtypes": "Piltyp",
+    "arrowtype_sharp": "Rak",
+    "arrowtype_round": "Böjd",
+    "arrowtype_elbowed": "Vinklad",
     "fontSize": "Teckenstorlek",
     "fontFamily": "Teckensnitt",
     "addWatermark": "Lägg till \"Skapad med Excalidraw\"",
@@ -65,13 +75,14 @@
     "right": "Höger",
     "extraBold": "Extra fet",
     "architect": "Arkitekt",
-    "artist": "Artist",
+    "artist": "Konstnär",
     "cartoonist": "Serietecknare",
     "fileTitle": "Filnamn",
     "colorPicker": "Färgväljare",
     "canvasColors": "Används på canvas",
     "canvasBackground": "Canvas-bakgrund",
     "drawingCanvas": "Ritar canvas",
+    "clearCanvas": "Rensa canvas",
     "layers": "Lager",
     "actions": "Åtgärder",
     "language": "Språk",
@@ -84,12 +95,13 @@
     "group": "Gruppera markering",
     "ungroup": "Avgruppera markering",
     "collaborators": "Medarbetare",
-    "showGrid": "Visa rutnät",
+    "toggleGrid": "Visa/dölj rutnät",
     "addToLibrary": "Lägg till i biblioteket",
     "removeFromLibrary": "Ta bort från bibliotek",
     "libraryLoadingMessage": "Laddar bibliotek…",
     "libraries": "Bläddra i bibliotek",
     "loadingScene": "Laddar skiss…",
+    "loadScene": "Ladda scen från fil",
     "align": "Justera",
     "alignTop": "Justera överkant",
     "alignBottom": "Justera underkant",
@@ -105,7 +117,9 @@
     "share": "Dela",
     "showStroke": "Visa färgväljare för linjefärg",
     "showBackground": "Visa färgväljare för bakgrundsfärg",
-    "toggleTheme": "Växla tema",
+    "showFonts": "Visa typsnittsväljare",
+    "toggleTheme": "Växla ljus/mörkt tema",
+    "theme": "Tema",
     "personalLib": "Personligt bibliotek",
     "excalidrawLib": "Excalidraw bibliotek",
     "decreaseFontSize": "Minska fontstorleken",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Radbryt text i en avgränsad yta",
     "link": {
       "edit": "Redigera länk",
-      "editEmbed": "Redigera länk & bädda in",
-      "create": "Skapa länk",
-      "createEmbed": "Skapa länk & bädda in",
+      "editEmbed": "Redigera inbäddningsbar länk",
+      "create": "Lägg till länk",
       "label": "Länk",
       "labelEmbed": "Länka & bädda in",
-      "empty": "Ingen länk är angiven"
+      "empty": "Ingen länk är angiven",
+      "hint": "Skriv eller klistra in din länk här",
+      "goToElement": "Gå till målelementet"
     },
     "lineEditor": {
       "edit": "Redigera linje",
-      "exit": "Avsluta linjeredigerare"
+      "editArrow": "Redigera pil"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Lås",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "Ta bort alla element från rutan",
     "eyeDropper": "Välj färg från canvas",
     "textToDiagram": "Text till diagram",
-    "prompt": "Fråga"
+    "prompt": "Inmatning",
+    "followUs": "Följ oss",
+    "discordChat": "Discord chat",
+    "zoomToFitViewport": "Zooma för att passa in i vyn",
+    "zoomToFitSelection": "Zooma för att passa urval",
+    "zoomToFit": "Zooma för att rymma alla element",
+    "installPWA": "Installera Excalidraw lokalt (PWA)",
+    "autoResize": "Aktivera automatisk skalning av text",
+    "imageCropping": "Bildbeskärning",
+    "unCroppedDimension": "Obeskuren dimension",
+    "copyElementLink": "Kopiera länk till objektet",
+    "linkToElement": "Länk till objektet",
+    "wrapSelectionInFrame": "Omslut urvaled i ram",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Länk till objektet",
+    "desc": "Klicka på en figur på canvas eller klistra in en länk.",
+    "notFound": "Länkat objekt hittades inte på canvas."
   },
   "library": {
     "noItems": "Inga objekt tillagda ännu...",
     "hint_emptyLibrary": "Välj ett objekt på canvasen för att lägga till det här, eller installera ett bibliotek från det publika arkivet, nedan.",
-    "hint_emptyPrivateLibrary": "Välj ett objekt på canvasen för att lägga till det här."
+    "hint_emptyPrivateLibrary": "Välj ett objekt på canvasen för att lägga till det här.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Hitta på canvas",
+    "noMatch": "Inga träffar hittades...",
+    "singleResult": "resultat",
+    "multipleResults": "resultat",
+    "placeholder": "Hitta text på canvas...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Återställ canvasen",
@@ -151,6 +204,7 @@
     "exportImage": "Exportera bild...",
     "export": "Spara till...",
     "copyToClipboard": "Kopiera till urklipp",
+    "copyLink": "Kopiera länk",
     "save": "Spara till aktuell fil",
     "saveAs": "Spara som",
     "load": "Öppna",
@@ -171,14 +225,16 @@
     "fullScreen": "Helskärm",
     "darkMode": "Mörkt läge",
     "lightMode": "Ljust läge",
+    "systemMode": "Systemläge",
     "zenMode": "Zen-läge",
     "objectsSnapMode": "Fäst mot objekt",
     "exitZenMode": "Gå ur zen-läge",
     "cancel": "Avbryt",
+    "saveLibNames": "",
     "clear": "Rensa",
     "remove": "Ta bort",
     "embed": "Växla inbäddning",
-    "publishLibrary": "Publicera",
+    "publishLibrary": "",
     "submit": "Skicka",
     "confirm": "Bekräfta",
     "embeddableInteractionButton": "Klicka för att interagera"
@@ -204,7 +260,8 @@
     "resetLibrary": "Detta kommer att rensa ditt bibliotek. Är du säker?",
     "removeItemsFromsLibrary": "Ta bort {{count}} objekt från biblioteket?",
     "invalidEncryptionKey": "Krypteringsnyckeln måste vara 22 tecken. Livesamarbetet är inaktiverat.",
-    "collabOfflineWarning": "Ingen internetanslutning tillgänglig.\nDina ändringar kommer inte att sparas!"
+    "collabOfflineWarning": "Ingen internetanslutning tillgänglig.\nDina ändringar kommer inte att sparas!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Filtypen stöds inte.",
@@ -212,9 +269,9 @@
     "fileTooBig": "Filen är för stor. Maximal tillåten storlek är {{maxSize}}.",
     "svgImageInsertError": "Kunde inte infoga SVG-bild. SVG-koden ser ogiltig ut.",
     "failedToFetchImage": "Kunde inte hämta bilden.",
-    "invalidSVGString": "Ogiltig SVG.",
     "cannotResolveCollabServer": "Det gick inte att ansluta till samarbets-servern. Ladda om sidan och försök igen.",
     "importLibraryError": "Kunde inte ladda bibliotek",
+    "saveLibraryError": "Det gick inte att spara biblioteket till lagring. Spara biblioteket till en fil lokalt för att se till att du inte förlorar ändringar.",
     "collabSaveFailed": "Det gick inte att spara i backend-databasen. Om problemen kvarstår bör du spara filen lokalt för att se till att du inte förlorar ditt arbete.",
     "collabSaveFailed_sizeExceeded": "Det gick inte att spara till backend-databasen, whiteboarden verkar vara för stor. Du bör spara filen lokalt för att du inte ska förlora ditt arbete.",
     "imageToolNotSupported": "Bilder är inaktiverade.",
@@ -229,12 +286,13 @@
       "iframe": "IFrame-element kan inte läggas till i biblioteket.",
       "image": "Stöd för att lägga till bilder till biblioteket kommer snart!"
     },
-    "asyncPasteFailedOnRead": "Kunde inte klistra in (kunde inte läsa från urklipp).",
+    "asyncPasteFailedOnRead": "Det gick inte att klistra in (kunde inte läsa från urklipp).",
     "asyncPasteFailedOnParse": "Kunde inte klistra in.",
-    "copyToSystemClipboardFailed": "Kunde inte kopiera till urklipp."
+    "copyToSystemClipboardFailed": "Det gick inte att kopiera till urklipp."
   },
   "toolBar": {
     "selection": "Markering",
+    "lasso": "",
     "image": "Infoga bild",
     "rectangle": "Rektangel",
     "diamond": "Diamant",
@@ -255,7 +313,23 @@
     "hand": "Hand (panoreringsverktyg)",
     "extraTools": "Fler verktyg",
     "mermaidToExcalidraw": "Mermaid till Excalidraw",
-    "magicSettings": "AI-inställningar"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Rektangel",
+    "diamond": "Romb",
+    "ellipse": "Ellips",
+    "arrow": "Pil",
+    "line": "Linje",
+    "freedraw": "Frihand",
+    "text": "Text",
+    "image": "Bild",
+    "group": "Grupp",
+    "frame": "Ram",
+    "magicframe": "Trådram till kod",
+    "embeddable": "Bädda in (web)",
+    "selection": "Markering",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Canvas-åtgärder",
@@ -263,28 +337,33 @@
     "shapes": "Former"
   },
   "hints": {
-    "canvasPanning": "För att flytta whiteboarden, håll mushjulet eller mellanslagstangenten medan du drar eller använd handverktyget",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Klicka för att starta flera punkter, dra för en linje",
+    "arrowTool": "",
     "freeDraw": "Klicka och dra, släpp när du är klar",
     "text": "Tips: du kan också lägga till text genom att dubbelklicka var som helst med markeringsverktyget",
     "embeddable": "Klicka-dra för att skapa en webbplats-inbäddning",
-    "text_selected": "Dubbelklicka eller tryck ENTER för att redigera text",
-    "text_editing": "Tryck Escape eller CtrlOrCmd + ENTER för att slutföra redigeringen",
-    "linearElementMulti": "Klicka på sista punkten eller tryck Escape eller Enter för att avsluta",
-    "lockAngle": "Du kan begränsa vinkeln genom att hålla SKIFT",
-    "resize": "Du kan behålla proportioner genom att hålla SHIFT medan du ändrar storlek,\nhåller du ALT ändras storlek relativt mitten",
-    "resizeImage": "Du kan ändra storlek fritt genom att hålla SHIFT,\nhåll ALT för att ändra storlek från mitten",
-    "rotate": "Du kan begränsa vinklar genom att hålla SHIFT medan du roterar",
-    "lineEditor_info": "Håll Ctrl/Cmd och dubbelklicka eller tryck på Ctrl/Cmd + Enter för att redigera punkter",
-    "lineEditor_pointSelected": "Tryck på Ta bort för att ta bort punkt(er), Ctrl + D eller Cmd + D för att duplicera, eller dra för att flytta",
-    "lineEditor_nothingSelected": "Välj en punkt att redigera (håll SHIFT för att välja flera),\neller håll ned Alt och klicka för att lägga till nya punkter",
-    "placeImage": "Klicka för att placera bilden, eller klicka och dra för att ställa in dess storlek manuellt",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Publicera ditt eget bibliotek",
-    "bindTextToElement": "Tryck på Enter för att lägga till text",
-    "deepBoxSelect": "Håll Ctrl eller Cmd för att djupvälja, och för att förhindra att dra",
-    "eraserRevert": "Håll Alt för att återställa de element som är markerade för borttagning",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Denna funktion kan sannolikt aktiveras genom att ställa in \"dom.events.asyncClipboard.clipboardItem\" flaggan till \"true\". För att ändra webbläsarens flaggor i Firefox, besök \"about:config\" sidan.",
-    "disableSnapping": "Håll Ctrl eller Cmd för att inaktivera fästning"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Kan inte visa förhandsgranskning",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Vi var mycket försiktiga med att inte inkludera din skissinformation om felet. Om din skiss inte är privat, vänligen överväga att följa upp på vår <button>buggspårare.</button> Vänligen inkludera information nedan genom att kopiera och klistra in i GitHub-problemet.",
     "sceneContent": "Skissinnehåll:"
   },
+  "shareDialog": {
+    "or": "Eller"
+  },
   "roomDialog": {
-    "desc_intro": "Du kan bjuda in personer till din nuvarande skiss för att samarbeta med dig.",
-    "desc_privacy": "Oroa dig inte, sessionen använder kryptering från ände till ände, så vad du än ritar kommer att förbli privat. Inte ens vår server kommer att kunna se vad du skissar.",
+    "desc_intro": "Bjud in personer att samarbeta på din ritning.",
+    "desc_privacy": "Oroa dig inte, sessionen är krypterad och helt privat. Inte ens vår server kan se vad du ritar.",
     "button_startSession": "Starta sessionen",
     "button_stopSession": "Stoppa session",
     "desc_inProgressIntro": "Nu pågår en live-samarbetssession.",
@@ -328,6 +410,8 @@
     "click": "klicka",
     "deepSelect": "Djupval",
     "deepBoxSelect": "Djupval inom boxen, och förhindra att dra",
+    "createFlowchart": "Skapa ett flödesschema från ett generiskt element",
+    "navigateFlowchart": "Navigera ett flödesschema",
     "curvedArrow": "Böjd pil",
     "curvedLine": "Böjd linje",
     "documentation": "Dokumentation",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Zooma till markering",
     "toggleElementLock": "Lås/Lås upp valda",
     "movePageUpDown": "Flytta sida upp/ner",
-    "movePageLeftRight": "Flytta sida vänster/höger"
+    "movePageLeftRight": "Flytta sida vänster/höger",
+    "cropStart": "Beskär bild",
+    "cropFinish": "Slutför bildbeskärningen"
   },
   "clearCanvasDialog": {
     "title": "Rensa canvas"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Vinkel",
-    "element": "Element",
-    "elements": "Element",
+    "shapes": "Former",
     "height": "Höjd",
     "scene": "Skiss",
     "selected": "Valda",
     "storage": "Lagring",
-    "title": "Statistik för nördar",
+    "fullTitle": "Egenskaper för Canvas & Form",
+    "title": "Egenskaper",
+    "generalStats": "Allmän",
+    "elementProperties": "Formegenskaper",
     "total": "Totalt",
     "version": "Version",
     "versionCopy": "Klicka för att kopiera",
@@ -439,13 +527,15 @@
     "copyStyles": "Kopierade stilar.",
     "copyToClipboard": "Kopierad till urklipp.",
     "copyToClipboardAsPng": "Kopierade {{exportSelection}} till urklipp som PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Kopierade {{exportSelection}} till urklipp som SVG\n({{exportColorScheme}})",
     "fileSaved": "Fil sparad.",
     "fileSavedToFilename": "Sparad till {filename}",
-    "canvas": "canvas",
+    "canvas": "arbetsyta",
     "selection": "markering",
     "pasteAsSingleElement": "Använd {{shortcut}} för att klistra in som ett enda element,\neller klistra in i en befintlig textredigerare",
     "unableToEmbed": "Att bädda in denna webbadress är för närvarande inte tillåtet. Skapa en problemrapport på GitHub för att begära att webbadressen vitlistas.",
-    "unrecognizedLinkFormat": "Länken du bäddade in matchar inte det förväntade formatet. Försök klistra in 'embed'-strängen som tillhandahålls av källwebbplatsen"
+    "unrecognizedLinkFormat": "Länken du bäddade in matchar inte det förväntade formatet. Försök klistra in 'embed'-strängen som tillhandahålls av källwebbplatsen",
+    "elementLinkCopied": "Länk har kopierats till urklipp"
   },
   "colors": {
     "transparent": "Genomskinlig",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Mest frekvent använda anpassade färger",
     "colors": "Färger",
     "shades": "Nyanser",
@@ -521,5 +612,53 @@
     "description": "För närvarande stöds endast <flowchartLink>Flödesdiagram</flowchartLink>,<sequenceLink> Sekvensdiagram </sequenceLink> och <classLink>Klassdiagram</classLink>. De andra typerna kommer att återges som bild i Excalidraw.",
     "syntax": "Mermaid-syntax",
     "preview": "Förhandsgranska"
+  },
+  "quickSearch": {
+    "placeholder": "Snabbsök"
+  },
+  "fontList": {
+    "badge": {
+      "old": "gammal"
+    },
+    "sceneFonts": "I den här scenen",
+    "availableFonts": "Tillgängliga typsnitt",
+    "empty": "Inga typsnitt hittades"
+  },
+  "userList": {
+    "empty": "Inga användare hittades",
+    "hint": {
+      "text": "Klicka på användaren för att följa",
+      "followStatus": "Du följer den här användaren",
+      "inCall": "Användaren är i ett röstsamtal",
+      "micMuted": "Användarens mikrofon är avstängd",
+      "isSpeaking": "Användaren pratar"
+    }
+  },
+  "commandPalette": {
+    "title": "Kommandopalett",
+    "shortcuts": {
+      "select": "Välj",
+      "confirm": "Bekräfta",
+      "close": "Stäng"
+    },
+    "recents": "Nyligen använda",
+    "search": {
+      "placeholder": "Sök menyer, kommandon och upptäck dolda pärlor",
+      "noMatch": "Inga matchande kommandon..."
+    },
+    "itemNotAvailable": "Kommandot är inte tillgängligt...",
+    "shortcutHint": "För kommandopalett, använd {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/ta-IN.json b/packages/excalidraw/locales/ta-IN.json
index 577d5bb9ea..106586292c 100644
--- a/packages/excalidraw/locales/ta-IN.json
+++ b/packages/excalidraw/locales/ta-IN.json
@@ -11,8 +11,8 @@
     "copyAsPng": "நகலகத்திற்கு PNG ஆக நகலெடு",
     "copyAsSvg": "நகலகத்திற்கு SVG ஆக நகலெடு",
     "copyText": "நகலகத்திற்கு உரையாக நகலெடு",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "மூலத்தை நகலகத்திற்கு நகலெடு",
+    "convertToCode": "குறியீடாக மாற்று",
     "bringForward": "முன்நோக்கி கொண்டுவா",
     "sendToBack": "பின்னே அனுப்பு",
     "bringToFront": "முன்னே கொண்டுவா",
@@ -21,7 +21,9 @@
     "copyStyles": "ஒயில்களை நகலெடு",
     "pasteStyles": "ஒயில்களை ஒட்டு",
     "stroke": "கீறல்",
+    "changeStroke": "கீறல் நிறத்தை மாற்று",
     "background": "பின்புலம்",
+    "changeBackground": "பின்புல நிறத்தை மாற்று",
     "fill": "நிரப்பல்",
     "strokeWidth": "கீறல் அகலம்",
     "strokeStyle": "கீறல் ஒயில்",
@@ -38,14 +40,22 @@
     "arrowhead_none": "ஏதுமில்லை",
     "arrowhead_arrow": "அம்பு",
     "arrowhead_bar": "பட்டை",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "வட்டம்",
+    "arrowhead_circle_outline": "வட்டம் (எல்லைக்கோடு)",
     "arrowhead_triangle": "முக்கோணம்",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "முக்கோணம் (எல்லைக்கோடு)",
+    "arrowhead_diamond": "வைரம்",
+    "arrowhead_diamond_outline": "வைரம் (எல்லைக்கோடு)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "கூடுதல் விருப்பங்கள்",
+    "arrowtypes": "அம்புக்குறி வகை",
+    "arrowtype_sharp": "கூர்மையான குறி",
+    "arrowtype_round": "வளைந்தக் குறி",
+    "arrowtype_elbowed": "",
     "fontSize": "எழுத்துரு அளவு",
-    "fontFamily": "எழுத்துரு குடும்பம்",
+    "fontFamily": "எழுத்துருக் குடும்பம்",
     "addWatermark": "\"எக்ஸ்கேலிட்ரா கொண்டு ஆனது\"-ஐச் சேர்",
     "handDrawn": "கையால்-வரைந்த",
     "normal": "இயல்பு",
@@ -70,8 +80,9 @@
     "fileTitle": "கோப்புப் பெயர்",
     "colorPicker": "நிறத் தேர்வி",
     "canvasColors": "கித்தானில் பயன்படுத்தப்பட்டது",
-    "canvasBackground": "கித்தான் பின்னணி",
+    "canvasBackground": "கித்தான் பின்புலம்",
     "drawingCanvas": "கித்தான் வரைகிறது",
+    "clearCanvas": "கித்தானைத் துடை",
     "layers": "அடுக்குகள்",
     "actions": "செயல்கள்",
     "language": "மொழி",
@@ -84,12 +95,13 @@
     "group": "தேர்ந்ததை ஒன்றிணை",
     "ungroup": "தேர்ந்ததைப் பிரி",
     "collaborators": "கூட்டுப்பணியினர்",
-    "showGrid": "கட்டதைக் காட்டு",
+    "toggleGrid": "கட்டத்தை இருநிலைமாற்று",
     "addToLibrary": "நூலகத்தில் சேர்",
     "removeFromLibrary": "நூலகத்திலிருந்து நீக்கு",
     "libraryLoadingMessage": "நூலகத்தை ஏற்றுகிறது…",
     "libraries": "நூலகங்களை உலாவு",
     "loadingScene": "காட்சியை ஏற்றுகிறது…",
+    "loadScene": "கோப்பிலிருந்து காட்சியை ஏற்று",
     "align": "சீரமை",
     "alignTop": "மேலே சீரமை",
     "alignBottom": "கீழே சீரமை",
@@ -104,8 +116,10 @@
     "viewMode": "பார்வை பயன்முறை",
     "share": "பகிர்",
     "showStroke": "கீறல் நிற எடுப்பானைக் காட்டு",
-    "showBackground": "பின்னணி நிற எடுப்பானைக் காட்டு",
-    "toggleTheme": "தோற்றத்தை நிலைமாற்று",
+    "showBackground": "பின்புலம் நிற எடுப்பானைக் காட்டு",
+    "showFonts": "எழுத்துருத் தேர்வியைக் காட்டு",
+    "toggleTheme": "வெளிர்ந்த/கருமை தோற்றத்தை இருநிலைமாற்று",
+    "theme": "தோற்றம்",
     "personalLib": "தனக்குரிய நூலகம்",
     "excalidrawLib": "எக்ஸ்கேலிட்ரா நூலகம்",
     "decreaseFontSize": "எழுத்துரு அளவைக் குறை",
@@ -116,15 +130,20 @@
     "link": {
       "edit": "தொடுப்பைத் திருத்து",
       "editEmbed": "",
-      "create": "தொடுப்பைப் படை",
-      "createEmbed": "",
+      "create": "இணைப்பைச் சேர்க்கவும்",
       "label": "தொடுப்பு",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "தொடுப்பு & உட்பொதிப்பு",
+      "empty": "தொடுப்பு அமைக்கப்படவில்லை",
+      "hint": "உங்கள் இணைப்பை இங்கே உள்ளிடவும்",
+      "goToElement": "இலக்கு கூறுக்கு செல்லவும்"
     },
     "lineEditor": {
       "edit": "தொடுப்பைத் திருத்து",
-      "exit": "வரி திருத்தியிலிருந்து வெளியேறு"
+      "editArrow": "அம்பைத் திருத்து"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "பூட்டு",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "வெளியிடப்பட்டது",
     "sidebarLock": "பக்கப்பட்டையைத் திறந்தே வை",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
+    "selectAllElementsInFrame": "சட்டகத்திலுள்ள எல்லா உறுப்புகளையும் தேர்ந்தெடு",
+    "removeAllElementsFromFrame": "சட்டகத்திலுள்ள எல்லா உறுப்புகளையும் நீக்கு",
     "eyeDropper": "கித்தானிலிருந்து நிறம் தேர்ந்தெடு",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "உரையிலிருந்து வரைபடம்",
+    "prompt": "தூண்டுக்குறி",
+    "followUs": "எங்களைப் பின்தொடர்க",
+    "discordChat": "டிஸ்கார்டு அரட்டை",
+    "zoomToFitViewport": "பார்வைச்சாளரத்தில் பொருந்தும் வகையில் பெரிதாக்கு",
+    "zoomToFitSelection": "தேர்விற்கு பொருந்தும் வகையில் பெரிதாக்கு",
+    "zoomToFit": "அனைத்து கூறுகளுக்கும் பொருந்துமாறு பெரிதாக்கு",
+    "installPWA": "",
+    "autoResize": "உரையின் தானியங்கி அளவுத்திருத்தத்தை இயக்கு",
+    "imageCropping": "படத்தை வெட்டுதல்",
+    "unCroppedDimension": "முழு அளவு",
+    "copyElementLink": "இணைப்பை நகலெடு",
+    "linkToElement": "இணைப்பு",
+    "wrapSelectionInFrame": "தேர்வை வடிவத்தில் சுற்று",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "இணைப்பு",
+    "desc": "வடிவத்தைச் சொடுக்கவும் அல்லது ஒட்டவும்.",
+    "notFound": "பொருள் கிடைக்கவில்லை."
   },
   "library": {
     "noItems": "இதுவரை உருப்படிகள் சேரக்கப்படவில்லை...",
     "hint_emptyLibrary": "கித்தானிலுள்ள உருப்படியை இங்குச் சேர்க்க தேர்ந்தெடு, அல்லது கீழுள்ள பொது களஞ்சியத்திலிருந்து நூலகத்தை நிறுவு.",
-    "hint_emptyPrivateLibrary": "கித்தானிலுள்ள உருப்படியை இங்குச் சேர்க்க தேர்ந்தெடு."
+    "hint_emptyPrivateLibrary": "கித்தானிலுள்ள உருப்படியை இங்குச் சேர்க்க தேர்ந்தெடு.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "கன்வாஸில் தேடு",
+    "noMatch": "பொருத்தங்கள் எதுவும் இல்லை...",
+    "singleResult": "முடிவு",
+    "multipleResults": "முடிவுகள்",
+    "placeholder": "கன்வாஸில் உரையைத் தேடு...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "கித்தானை அகரமாக்கு",
@@ -151,6 +204,7 @@
     "exportImage": "படத்தை ஏற்றுமதிசெய்...",
     "export": "இதில் சேமி...",
     "copyToClipboard": "நகலகத்திற்கு நகலெடு",
+    "copyLink": "இணைப்பை நகலெடு",
     "save": "தற்போதைய கோப்புக்குச் சேமி",
     "saveAs": "இப்படி சேமி",
     "load": "திற",
@@ -171,17 +225,19 @@
     "fullScreen": "முழுத் திரை",
     "darkMode": "கருமை பயன்முறை",
     "lightMode": "வெளிர்ந்த பயன்முறை",
+    "systemMode": "இயங்குதள பயன்முறை",
     "zenMode": "ஜென் பயன்முறை",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "பொருட்களுடன் பற்று",
     "exitZenMode": "ஜென் பயன்முறையை விலகு",
     "cancel": "ரத்துசெய்",
+    "saveLibNames": "",
     "clear": "துடை",
     "remove": "நீக்கு",
-    "embed": "",
-    "publishLibrary": "பிரசுரி",
+    "embed": "உட்பதிதலை இருநிலைமாற்று",
+    "publishLibrary": "",
     "submit": "சமர்ப்பி",
     "confirm": "உறுதிசெய்",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "இடைவினைபுரிய சொடுக்கு"
   },
   "alerts": {
     "clearReset": "இது முழு கித்தானையும் துடைக்கும். நீங்கள் உறுதியா?",
@@ -192,7 +248,7 @@
     "cannotExportEmptyCanvas": "காலியான கித்தானை ஏற்றுமதிசெய்ய முடியாது.",
     "couldNotCopyToClipboard": "நகலகத்திற்கு நகலெடுக்க முடியவில்லை.",
     "decryptFailed": "தரவை மறைநீக்க முடியவில்லை.",
-    "uploadedSecurly": "பதிவேற்றம் இருமுனை மறையாகத்தால் பாதுகாக்கப்பட்டுள்ளது, எனவே எக்ஸ்கேலிட்ரா சேவையகமும் மூன்றாம் தரப்பினரும் உள்ளடக்கத்தை வாசிக்கமுடியாது.",
+    "uploadedSecurly": "பதிவேற்றம் இருமுனை மறையாகத்தால் பாதுகாக்கப்பட்டுள்ளது, எனவே எக்ஸ்கேலிட்ரா சேவையகமும் மூன்றாம் தரப்பினரும் உள்ளடக்கத்தை வாசிக்க முடியாது.",
     "loadSceneOverridePrompt": "வெளிப்புறச்சித்திரமேற்றல் இருக்கிற உள்ளடக்கத்தை இடங்கொள்ளும். தொடர விருப்பமா?",
     "collabStopOverridePrompt": "அமர்வை நிறுத்துதல் முன்னர் அகமாக தேக்கிய உம் சித்திரத்தை மேலெழுதும். நீங்கள் உறுதியா?\n\n(உம் அக சித்திரத்தை வைக்கவேண்டுமெனில், சும்மா உலாவி தாவலை மூடுக அதற்குபதிலாக.)",
     "errorAddingToLibrary": "உருப்படியை நூலகத்தில் சேர்க்க இயலா",
@@ -200,24 +256,25 @@
     "confirmAddLibrary": "இதனால் {{numShapes}} வடிவம்(கள்) உம் நூலகத்தில் சேரும். நீங்கள் உறுதியா?",
     "imageDoesNotContainScene": "இப்படத்தில் காட்சி தரவு ஏதும் இருப்பதுபோல் தெரியவில்லை. ஏற்றுமதியின்போது காட்சி உட்பதிதலை இயக்கினீரா?",
     "cannotRestoreFromImage": "இப்படக்கோப்பிலிருந்து காட்சி மீட்டெடுக்கப்பட முடியாது",
-    "invalidSceneUrl": "வழங்கப்பட்ட உரலியிலிருந்து காட்சியை இறக்கவியலா. இது தவறான வடிவத்தில் உள்ளது, அ செல்லத்தக்க எக்ஸ்கேலிட்ரா JSON தரவைக் கொண்டில்லை.",
+    "invalidSceneUrl": "வழங்கப்பட்ட உரலியிலிருந்து காட்சியை இறக்கவியலா. இது தவறான வடிவத்தில் உள்ளது, அல்லது செல்லாத எக்ஸ்கேலிட்ரா JSON தரவைக் கொண்டில்லை.",
     "resetLibrary": "இது உங்கள் நுலகத்தைத் துடைக்கும். நீங்கள் உறுதியா?",
     "removeItemsFromsLibrary": "{{count}} உருப்படி(கள்)-ஐ உம் நூலகத்திலிருந்து அழிக்கவா?",
     "invalidEncryptionKey": "மறையாக்க விசை 22 வரியுருக்கள் கொண்டிருக்கவேண்டும். நேரடி கூட்டுப்பணி முடக்கப்பட்டது.",
-    "collabOfflineWarning": "இணைய இணைப்பு இல்லை.\nஉமது மாற்றங்கள் சேமிக்கப்படா!"
+    "collabOfflineWarning": "இணைய இணைப்பு இல்லை.\nஉமது மாற்றங்கள் சேமிக்கப்படா!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "ஆதரிக்கப்படா கோப்பு வகை.",
     "imageInsertError": "படத்தைப் புகுத்தவியலா. பிறகு மீண்டும் முயலவும்...",
     "fileTooBig": "கோப்பு மிகப்பெரிது. அனுமதிக்கப்பட்ட அதிகபட்ச அளவு {{maxSize}}.",
-    "svgImageInsertError": "எஸ்விஜி படத்தைப் புகுத்தவியலா. எஸ்விஜியின் மார்க்அப் செல்லாததாக தெரிகிறது.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "செல்லாத SVG.",
+    "svgImageInsertError": "எஸ்விஜி படத்தைப் புகுத்தவியலா. எஸ்விஜியின் மார்க்அப் செல்லாததாகத் தெரிகிறது.\n",
+    "failedToFetchImage": "படத்தைப் பெறுதல் தோல்வி.",
     "cannotResolveCollabServer": "கூட்டுப்பணிச் சேவையகத்துடன் இணைக்க முடியவில்லை. பக்கத்தை மீளேற்றி மீண்டும் முயலவும்.",
     "importLibraryError": "நூலகத்தை ஏற்ற முடியவில்லை",
+    "saveLibraryError": "",
     "collabSaveFailed": "பின்முனை தரவுத்தளத்தில் சேமிக்க முடியவில்லை. சிக்கல்கள் நீடித்தால், உமது வேலைகளை இழக்காமலிருப்பதை உறுதிசெய்ய உமது கோப்பை உள்ளகத்தில் சேமிக்க வேண்டும்.",
     "collabSaveFailed_sizeExceeded": "பின்முனை தரவுத்தளத்தில் சேமிக்க முடியவில்லை, கித்தான் மிகப்பெரிதாகத் தெரிகிறது. உமது வேலைகளை இழக்காமலிருப்பதை உறுதிசெய்ய உமது கோப்பை உள்ளகத்தில் சேமிக்க வேண்டும்.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "படங்கள் முடக்கப்பட்டுள்ளன.",
     "brave_measure_text_error": {
       "line1": "",
       "line2": "",
@@ -226,15 +283,16 @@
     },
     "libraryElementTypeError": {
       "embeddable": "",
-      "iframe": "",
+      "iframe": "IFrame சேர்க்க முடியாது.",
       "image": ""
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "ஒட்ட முடியவில்லை (கணினி கிளிப்போர்டிலிருந்து வாசிக்க முடியவில்லை).",
+    "asyncPasteFailedOnParse": "ஒட்ட முடியவில்லை.",
+    "copyToSystemClipboardFailed": "நகலகத்திற்கு நகலெடுக்க முடியவில்லை."
   },
   "toolBar": {
     "selection": "தெரிவு",
+    "lasso": "",
     "image": "படத்தைப் புகுத்து",
     "rectangle": "செவ்வகம்",
     "diamond": "வைரம்",
@@ -246,16 +304,32 @@
     "library": "நூலகம்",
     "lock": "தேர்ந்த கருவியை வரைந்த பின்பும் வைத்திரு",
     "penMode": "பேனா - தடுப்பு தொடுதல்",
-    "link": "தேர்தெடுத்த வடிவத்திற்குத் தொடுப்பைச் சேர்/ புதுப்பி",
+    "link": "தேர்தெடுத்த வடிவத்திற்குத் தொடுப்பைச் சேர் / புதுப்பி",
     "eraser": "அழிப்பி",
     "frame": "சட்டகம் கருவி",
     "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "embeddable": "வலை நுழைப்பு",
+    "laser": "சீரொளி குறிமுள்",
     "hand": "கை (பார்வை நகர்கும் கருவி)",
     "extraTools": "மற்ற கருவிகள்",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "செவ்வகம்",
+    "diamond": "வைரம்",
+    "ellipse": "நீள்வட்டம்",
+    "arrow": "அம்புக்குறி",
+    "line": "கோடு",
+    "freedraw": "வரை",
+    "text": "எழுத்து",
+    "image": "படம்",
+    "group": "குழு",
+    "frame": "வடிவு",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "தேர்வு",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "கித்தான் செயல்கள்",
@@ -263,28 +337,33 @@
     "shapes": "வடிவங்கள்"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "பல புள்ளிகளைத் துவக்க சொடுக்கு, ஒற்றை வரிக்கு பிடித்திழு",
+    "arrowTool": "",
     "freeDraw": "சொடுக்கி பிடித்திழு, முடித்ததும் விடுவி",
     "text": "துணுக்குதவி: தெரிவு கருவி கொண்டு எங்காவது இரு-சொடுக்கி உரையைச் சேர்க்கலாம்",
-    "embeddable": "",
-    "text_selected": "உரையைத் திருத்த இரு-சொடுக்கு அ ENTERஐ அழுத்து",
-    "text_editing": "திருத்துவதை முடிக்க Escape அ CtrlOrCmd+ENTERஐ அழுத்து",
-    "linearElementMulti": "கடைசி புள்ளியில் சொடுக்கு அ முடிக்க Escape அ Enter அழுத்து",
-    "lockAngle": "SHIFTஐ அழுத்திப்பிடித்து கோணத்தை வற்புறுத்தலாம்",
-    "resize": "மறுஅளவிடுகையில் SHIFTஐ அழுத்திப்பிடித்து விகிதசமத்தை வற்புறுத்தலாம்,\nமையத்திலிருந்து மறுஅளவிட ALTஐ அழுத்திப்பிடி",
-    "resizeImage": "SHIFTஐ நீண்டழுத்தி கட்டற்று அளவுமாற்றலாம்,\nமையத்திலிருந்து அளவுமாற்ற ALTஐ நீண்டழுத்துக",
-    "rotate": "சுழற்றுகையில் SHIFTஐ அழுத்திப்பிடித்து கோணங்களை வற்புறுத்தலாம்",
+    "embeddable": "இழுத்து வலை நுழைப்பு உருவாக்கு",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
     "lineEditor_info": "",
-    "lineEditor_pointSelected": "புள்ளி(கள்)ஐ நீக்க Deleteஐ அழுத்து,\nநகலாக்க CtrlOrCmd+D, அ நகர்த்த பிடித்திழு",
-    "lineEditor_nothingSelected": "திருத்த புள்ளியைத் தேர்ந்தெடு (பலவற்றை தேர SHIFTஐ அழுத்திப்பிடி),\nஅ புதிய புள்ளிகளைச் சேர்க்க Altஐ அழுத்திப்பிடித்துச் சொடுக்கு",
-    "placeImage": "படத்தை வைக்கச் சொடுக்கு, அ கைமுறையாக அளவு அமைக்க சொடுக்கி பிடித்திழு",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "உம் சொந்த நூலகத்தைப் பிரசுரி",
-    "bindTextToElement": "உரையைச் சேர்க்க enterஐ அழுத்து",
-    "deepBoxSelect": "ஆழ்ந்துத் தேரவும் பிடித்திழுத்தலைத் தவிர்க்கவும் CtrlOrCmdஐ அழுத்திப்பிடி",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "முன்னோட்டம் காட்ட இயலவில்லை",
@@ -299,9 +378,12 @@
     "openIssueMessage": "பிழையில் உம் காட்சி தகவலை உள்ளடக்காமலிருக்க நாங்கள் மிக எச்சரிக்கையாக இருந்தோம். உம் காட்சி தனிப்பட்டதில்லையெனில், பின்தொடர்வதற்கு பரிசீலிக்கவும் எங்கள் <button>பிழை தடமி.</button> கீழுள்ள தகவலை நகலெடுத்து ஒட்டி GitHub சிக்கலுள் உள்ளடக்கவும்.",
     "sceneContent": "காட்சி உள்ளடக்கம்:"
   },
+  "shareDialog": {
+    "or": "அல்லது"
+  },
   "roomDialog": {
-    "desc_intro": "உம்முடன் கூட்டுப்பணிசெய்ய மக்களை தற்போதைய காட்சிக்கு அழைப்பிடலாம்.",
-    "desc_privacy": "வருந்தாதீர், அமர்வு இருமுனை மறையகத்தைப் பயன்படுத்துகிறது, ஆக நீங்கள் வரைவது எதுவும் தனிப்பட்டதாக இருக்கும். எங்கள் சேவையகத்தால் கூட நீங்கள் என்ன செய்ததைப் பார்க்கவியலாது.",
+    "desc_intro": "வரைபடத்தில் இணைந்து வேலை செய்ய நண்பர்களை அழைக்கவும்.",
+    "desc_privacy": "கவலைப்படாதீர்கள், இது முழுமையாகக் குறியாக்கம் செய்யப்பட்டு தனிப்பட்டது. எங்கள் சர்வரும் உங்கள் வரைபடத்தைக் காண முடியாது.",
     "button_startSession": "அமர்வைத் துவக்கு",
     "button_stopSession": "அமர்வை நிறுத்து",
     "desc_inProgressIntro": "நேரடி-கூட்டுப்பணி அமர்வு தற்போது செயலிலுள்ளது.",
@@ -328,14 +410,16 @@
     "click": "சொடுக்கு",
     "deepSelect": "ஆழ்ந்துத் தேர்",
     "deepBoxSelect": "பெட்டியினுள் ஆழ்ந்துத் தேர், மற்றும் பிடித்திழுத்தலைத் தவிர்",
+    "createFlowchart": "செயல்வழிப் படம் உருவாக்கு",
+    "navigateFlowchart": "",
     "curvedArrow": "வளைந்த அம்பு",
     "curvedLine": "வளைந்த வரி",
     "documentation": "ஆவணமாக்கல்",
     "doubleClick": "இரு-சொடுக்கு",
     "drag": "பிடித்திழு",
     "editor": "திருத்தி",
-    "editLineArrowPoints": "",
-    "editText": "",
+    "editLineArrowPoints": "வரி/அம்பு புள்ளிகளைத் திருத்து",
+    "editText": "உரையைத் திருத்து / முத்திரையைச் சேர்",
     "github": "சிக்கலைக் கண்டீரா? சமர்ப்பி",
     "howto": "எங்கள் கையேடுகளைப் பின்பற்றுக",
     "or": "அ",
@@ -350,7 +434,9 @@
     "zoomToSelection": "தெரிவுக்கு விரிவாக்கு",
     "toggleElementLock": "தேர்ந்தெடுப்பைப் பூட்டு/பூட்டவிழ்",
     "movePageUpDown": "மேலே/கீழே நகர்த்தவும்",
-    "movePageLeftRight": "இடது/வலது பக்கம் நகர்த்தவும்"
+    "movePageLeftRight": "இடது/வலது பக்கம் நகர்த்தவும்",
+    "cropStart": "படத்தை வெட்டு",
+    "cropFinish": "முடி"
   },
   "clearCanvasDialog": {
     "title": "கித்தானைத் துடை"
@@ -381,7 +467,7 @@
     "noteLicense": "சமர்ப்பிப்பதனால், நூலகம் இதனடியில் பிரசரிக்கப்பட ஏற்கிறீர்கள் <link>MIT உரிமம், </link>சுருக்கமாக எவருமிதைப் வரையறையின்றி பயன்படுத்தலாமென குறிக்கிறது.",
     "noteItems": "வடிக்கட்டக்கூடியதாகவிருக்க ஒவ்வொரு நூலகவுருப்படிக்கும் சொந்த பெயர் இருக்கவேண்டும். பின்வரும் நூலகவுருப்படிகள் உள்ளடக்கப்படும்:",
     "atleastOneLibItem": "ஆரம்பிக்க ஒரு நூலக உருப்படியையாவது தேர்ந்தெடுக்கவும்",
-    "republishWarning": ""
+    "republishWarning": "சில உருப்படிகள் ஏற்கனவே சமர்ப்பிக்கப்பட்டவை. புதுப்பிக்கும்போது மட்டும் மீண்டும் சமர்ப்பிக்கவும்."
   },
   "publishSuccessDialog": {
     "title": "நூலகம் சமர்ப்பிக்கப்பட்டது",
@@ -394,25 +480,25 @@
   "imageExportDialog": {
     "header": "படத்தை ஏற்றுமதிதல",
     "label": {
-      "withBackground": "பின்னணி",
+      "withBackground": "பின்புலம்",
       "onlySelected": "தேர்ந்ததை மட்டும்",
       "darkMode": "இருள் பயன்முறை",
       "embedScene": "காட்சியை உட்பொதி",
       "scale": "அளவுகோல்",
-      "padding": ""
+      "padding": "இடைவெளி"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "தளவட்டத் தரவை PNG/SVG கோப்பில் சேமிக்கப்படும், இதன் மூலம் தளவட்டை மீட்டமைக்கலாம். கோப்பு அளவு அதிகரிக்கும்."
     },
     "title": {
       "exportToPng": "PNGக்கு ஏற்றுமதிசெய்",
       "exportToSvg": "SVGக்கு ஏற்றுமதிசெய்",
-      "copyPngToClipboard": ""
+      "copyPngToClipboard": "PNGஐ நகலகத்திற்கு நகலெடு"
     },
     "button": {
       "exportToPng": "PNG",
       "exportToSvg": "SVG",
-      "copyPngToClipboard": ""
+      "copyPngToClipboard": "நகலகத்திற்கு நகலெடு"
     }
   },
   "encrypted": {
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "கோணம்",
-    "element": "உறுப்பு",
-    "elements": "உறுப்புகள்",
+    "shapes": "வடிவங்கள்",
     "height": "உயரம்",
     "scene": "காட்சி",
     "selected": "தேர்ந்தவை",
     "storage": "சேமிப்பகம்",
-    "title": "மேதாவிகளுக்கான புள்ளிவிவரங்கள்",
+    "fullTitle": "கன்வாஸ் & வடிவ பண்புகள்",
+    "title": "அமைப்புகள்",
+    "generalStats": "பொது",
+    "elementProperties": "வடிவத்தின் அமைப்புகள்",
     "total": "மொத்தம்",
     "version": "பதிப்பு",
     "versionCopy": "நகலெடுக்க சொடுக்கு",
@@ -439,13 +527,15 @@
     "copyStyles": "ஒயில்கள் நகலெடுக்கப்பட்டன.",
     "copyToClipboard": "நகலகத்திற்கு நகலெடுக்கப்பட்டது.",
     "copyToClipboardAsPng": "{{exportSelection}}-ஐ நகலகத்திற்கு PNG ஆக நகலெடுத்தது\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "{{exportSelection}} ({{exportColorScheme}}) SVG நகல்",
     "fileSaved": "கோப்பு சேமிக்கப்பட்டது.",
     "fileSavedToFilename": "{filename}-க்கு சேமிக்கப்பட்டது",
     "canvas": "கித்தான்",
     "selection": "தெரிவு",
-    "pasteAsSingleElement": "",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "pasteAsSingleElement": "{{shortcut}} பயன்படுத்தி ஒன்றாக ஒட்டவும், அல்லது உள்ள உரை தொகுப்பியில் ஒட்டவும்",
+    "unableToEmbed": "இந்த Url-ஐ நுழைக்க தற்போது அனுமதி இல்லை. Url-ஐ வெள்ளிய பட்டியலில் சேர்க்க GitHub-ல் பிரச்சனை எழுப்பவும்",
+    "unrecognizedLinkFormat": "நீங்கள் நுழைத்த இணைப்பு எதிர்பார்க்கப்படும் வடிவத்துடன் பொருந்தவில்லை. மூலத்தளத்தால் வழங்கப்பட்ட 'embed' ஸ்டிரிங்கை ஒட்ட முயற்சிக்கவும்",
+    "elementLinkCopied": "இணைப்பு கிளிப்போர்டிற்கு நகலெடுக்கப்பட்டது"
   },
   "colors": {
     "transparent": "ஒளிபுகுத்தன்மை",
@@ -467,59 +557,108 @@
   "welcomeScreen": {
     "app": {
       "center_heading": "",
-      "center_heading_plus": "",
-      "menuHint": ""
+      "center_heading_plus": "நீங்கள் Excalidraw+க்கு செல்ல விரும்புகிறீர்களா?",
+      "menuHint": "விருப்பத்தேர்வுகள், மொழிகள் போன்றனவை ஏற்றுமதிசெய்..."
     },
     "defaults": {
-      "menuHint": "",
+      "menuHint": "விருப்பத்தேர்வுகள் மற்றும் பலவற்றை ஏற்றுமதிசெய்...",
       "center_heading": "எளிமையாக வரைபடங்கள் உருவாக்க!",
       "toolbarHint": "கருவியைத் தேர்ந்தெடு & வரை!",
       "helpHint": "குறுக்குவழிகள் & உதவி"
     }
   },
   "colorPicker": {
-    "mostUsedCustomColors": "",
-    "colors": "",
-    "shades": "",
-    "hexCode": "",
-    "noShades": ""
+    "color": "",
+    "mostUsedCustomColors": "அதகம் பயன்படுத்தப்பட்ட தனிப்பயன் நிறங்கள்",
+    "colors": "நிறங்கள்",
+    "shades": "சாயல்கள்",
+    "hexCode": "ஹெக்ஸ் குறியீடு",
+    "noShades": "இந்நிறத்திற்குச் சாயல்கள் இல்லை"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "படமாக ஏற்றுமதிசெய்",
+        "button": "படமாக ஏற்றுமதிசெய்",
+        "description": "காட்சித் தரவை நீங்கள் பின்னர் இறக்குமதி செய்யக்கூடிய ஒரு படமாக ஏற்றுமதிசெய்க."
       },
       "saveToDisk": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "வட்டில் சேமி",
+        "button": "வட்டில் சேமி",
+        "description": "காட்சித் தரவை நீங்கள் பின்னர் இறக்குமதி செய்யக்கூடிய ஒரு கோப்பிற்கு ஏற்றுமதிசெய்க."
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "எக்ஸ்காலிட்ரா+",
+        "button": "எக்ஸ்காலிட்ரா+-க்கு ஏற்றுமதிசெய்",
+        "description": "காட்சியை உன் எக்ஸ்கேலிட்ரா+ பணியிடத்தில் சேமி."
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
+        "title": "கோப்பிலிருந்து ஏற்று",
+        "button": "கோப்பிலிருந்து ஏற்று",
         "description": ""
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
+        "title": "தொடுப்பிலிருந்து ஏற்று",
+        "button": "எனது உள்ளடக்கத்தை இடங்கொள்",
         "description": ""
       }
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
+    "title": "மெர்மெய்டிலிருந்து எக்ஸ்காலிட்ரா",
+    "button": "புகுத்து",
     "description": "",
-    "syntax": "",
-    "preview": ""
+    "syntax": "மெர்மெய்டு தொடரியல்",
+    "preview": "முன்னோட்டம்"
+  },
+  "quickSearch": {
+    "placeholder": "விரைவு தேடல்"
+  },
+  "fontList": {
+    "badge": {
+      "old": "பழைய"
+    },
+    "sceneFonts": "இந்தத் தளவட்டத்தில்",
+    "availableFonts": "எழுத்துருக்கள்",
+    "empty": "எழுத்துருக்கள் எதுவும் இல்லை"
+  },
+  "userList": {
+    "empty": "பயனர்கள் காணவில்லை",
+    "hint": {
+      "text": "பின்தொடர அந்தப் பயனரைச் சொடுக்கவும்",
+      "followStatus": "தற்போது இப்பயனரைப் பின்தொடர்கிறீர்",
+      "inCall": "பயனர் ஓர் ஒலியழைப்பில் உள்ளார்",
+      "micMuted": "பயனரின் ஒலிவாங்கி ஒலிமறுக்கப்பட்டுள்ளது",
+      "isSpeaking": "பயனர் பேசுகிறார்"
+    }
+  },
+  "commandPalette": {
+    "title": "கட்டளை பட்டை",
+    "shortcuts": {
+      "select": "தேர்ந்தெடு",
+      "confirm": "உறுதிசெய்",
+      "close": "மூடு"
+    },
+    "recents": "அண்மையில் பயன்படுத்தியவை",
+    "search": {
+      "placeholder": "மெனு & கட்டளைகள் தேடு, மறைந்த வசதிகளைக் கண்டறி",
+      "noMatch": "பொருந்தும் கட்டளைகள் எதுவும் இல்லை…"
+    },
+    "itemNotAvailable": "கட்டளை கிடைக்கவில்லை...",
+    "shortcutHint": "கட்டளை பட்டை பயன்படுத்த {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/th-TH.json b/packages/excalidraw/locales/th-TH.json
index 4d27fe8b5a..24b11d214e 100644
--- a/packages/excalidraw/locales/th-TH.json
+++ b/packages/excalidraw/locales/th-TH.json
@@ -4,15 +4,15 @@
     "pasteAsPlaintext": "วางโดยไม่มีการจัดรูปแบบ",
     "pasteCharts": "วางแผนภูมิ",
     "selectAll": "เลือกทั้งหมด",
-    "multiSelect": "",
-    "moveCanvas": "",
+    "multiSelect": "เพิ่มองค์ประกอบในการเลือก",
+    "moveCanvas": "เคลื่อนย้ายผ้าใบ",
     "cut": "ตัด",
     "copy": "คัดลอก",
     "copyAsPng": "คัดลองไปยังคลิปบอร์ดเป็น PNG",
     "copyAsSvg": "คัดลองไปยังคลิปบอร์ดเป็น SVG",
     "copyText": "คัดลองไปยังคลิปบอร์ดเป็นข้อความ",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "คัดลอกไปยังคลิปบอร์ด",
+    "convertToCode": "แปลงไปยังโค้ด",
     "bringForward": "นำขึ้นข้างบน",
     "sendToBack": "ย้ายไปข้างล่าง",
     "bringToFront": "นำขึ้นข้างหน้า",
@@ -21,7 +21,9 @@
     "copyStyles": "คัดลอกรูปแบบ",
     "pasteStyles": "วางรูปแบบ",
     "stroke": "เส้นขอบ",
+    "changeStroke": "เปลี่ยนสีเส้น",
     "background": "พื้นหลัง",
+    "changeBackground": "เปลี่ยนสีพื้นหลัง",
     "fill": "เติมสี",
     "strokeWidth": "น้ำหนักเส้นขอบ",
     "strokeStyle": "รูปแบบเส้น",
@@ -32,18 +34,26 @@
     "opacity": "ความทึบแสง",
     "textAlign": "จัดข้อความ",
     "edges": "ขอบ",
-    "sharp": "",
-    "round": "",
+    "sharp": "เหลี่ยม",
+    "round": "โค้งมน",
     "arrowheads": "หัวลูกศร",
     "arrowhead_none": "ไม่มี",
     "arrowhead_arrow": "ลูกศร",
     "arrowhead_bar": "แถบ",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "วงกลม",
+    "arrowhead_circle_outline": "วงกลม (เส้นนขอบ)",
     "arrowhead_triangle": "สามเหลี่ยม",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "สามเหลี่ยม (เส้นนขอบ)",
+    "arrowhead_diamond": "ขอบเพชร",
+    "arrowhead_diamond_outline": "ขอบเพชร (เส้นขอบ)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "ชนิดลูกศร",
+    "arrowtype_sharp": "ลูกศรแหลม",
+    "arrowtype_round": "ลูกศรโค้ง",
+    "arrowtype_elbowed": "ลูกศรหักมุม",
     "fontSize": "ขนาดตัวอักษร",
     "fontFamily": "แบบตัวอักษร",
     "addWatermark": "เพิ่มลายน้ำ \"สร้างด้วย Excalidraw\"",
@@ -54,42 +64,44 @@
     "medium": "กลาง",
     "large": "ใหญ่",
     "veryLarge": "ใหญ่มาก",
-    "solid": "",
-    "hachure": "",
-    "zigzag": "",
-    "crossHatch": "",
+    "solid": "เส้นทึบ",
+    "hachure": "เส้นลายขวานสับ",
+    "zigzag": "ซิกแซก",
+    "crossHatch": "เครื่องหมายไขว้",
     "thin": "บาง",
     "bold": "หนา",
     "left": "ซ้าย",
     "center": "กลาง",
     "right": "ขวา",
     "extraBold": "หนาพิเศษ",
-    "architect": "",
+    "architect": "สถาปนิก",
     "artist": "ศิลปิน",
-    "cartoonist": "",
+    "cartoonist": "นักวาดการ์ตูน",
     "fileTitle": "ชื่อไฟล์",
     "colorPicker": "เลือกสีที่กำหนดเอง",
-    "canvasColors": "",
-    "canvasBackground": "",
-    "drawingCanvas": "",
-    "layers": "",
+    "canvasColors": "ใช้บนผืนผ้าใบ",
+    "canvasBackground": "พื้นหลังผ้าใบ",
+    "drawingCanvas": "กำลังวาดผืนผ้าใบ",
+    "clearCanvas": "ล้างผืนผ้าใบ",
+    "layers": "เลเยอร์",
     "actions": "การกระทำ",
     "language": "ภาษา",
-    "liveCollaboration": "",
+    "liveCollaboration": "ผู้ทำงานร่วมกันขณะนี้",
     "duplicateSelection": "ทำสำเนา",
     "untitled": "ไม่มีชื่อ",
     "name": "ชื่อ",
     "yourName": "ชื่อของคุณ",
-    "madeWithExcalidraw": "",
+    "madeWithExcalidraw": "เพิ่มลายน้ำ \"สร้างด้วย Excalidraw\"",
     "group": "จัดกลุ่ม",
     "ungroup": "ยกเลิกการจัดกลุ่ม",
-    "collaborators": "",
-    "showGrid": "แสดงเส้นตาราง",
+    "collaborators": "ผู้ทำงานร่วมกัน",
+    "toggleGrid": "แสดงกริด",
     "addToLibrary": "เพิ่มไปในคลัง",
     "removeFromLibrary": "นำออกจากคลัง",
     "libraryLoadingMessage": "กำลังโหลดคลัง...",
-    "libraries": "",
+    "libraries": "เรียกดูไลบรารี",
     "loadingScene": "กำลังโหลดฉาก",
+    "loadScene": "โหลดฉากจากไฟล์",
     "align": "จัดตำแหน่ง",
     "alignTop": "จัดชิดด้านบน",
     "alignBottom": "จัดชิดด้านล่าง",
@@ -103,28 +115,35 @@
     "flipVertical": "พลิกแนวตั้ง",
     "viewMode": "โหมดมุมมอง",
     "share": "แชร์",
-    "showStroke": "",
-    "showBackground": "",
-    "toggleTheme": "สลับธีม",
+    "showStroke": "แสดงตัวเลือกสีเส้นขอบ",
+    "showBackground": "แสดงตัวเลือกสีพื้นหลัง",
+    "showFonts": "แสดงตัวเลือกแบบอักษร",
+    "toggleTheme": "สลับธีมสว่าง/มืด",
+    "theme": "ธีม",
     "personalLib": "คลังของฉัน",
     "excalidrawLib": "คลังของ Excalidraw",
     "decreaseFontSize": "ลดขนาดตัวอักษร",
     "increaseFontSize": "เพิ่มขนาดตัวอักษร",
     "unbindText": "ยกเลิกการผูกติด",
-    "bindText": "",
-    "createContainerFromText": "",
+    "bindText": "ผูกข้อความกับที่บรรจุ",
+    "createContainerFromText": "จัดข้อความในที่บรรจุ",
     "link": {
       "edit": "แก้ไขลิงก์",
-      "editEmbed": "แก้ไขลิงค์และการฝัง",
-      "create": "สร้างลิงค์",
-      "createEmbed": "สร้างลิงค์และการฝัง",
+      "editEmbed": "",
+      "create": "เพิ่มลิงค์",
       "label": "ลิงค์",
       "labelEmbed": "ลิงค์และการฝัง",
-      "empty": "ไม่ได้ใส่ลิงค์"
+      "empty": "ไม่ได้ใส่ลิงค์",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "แก้ไขเส้น",
-      "exit": ""
+      "editArrow": "แก้ไขลูกศร"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "ล็อก",
@@ -133,17 +152,51 @@
       "unlockAll": "ปลดล็อกทั้งหมด"
     },
     "statusPublished": "เผยแพร่",
-    "sidebarLock": "",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "sidebarLock": "ปิดแถบด้านข้างเอาไว้",
+    "selectAllElementsInFrame": "เลือกองค์ประกอบทั้งหมดในกรอบ",
+    "removeAllElementsFromFrame": "ลบองค์ประกอบทั้งหมดในกรอบ",
+    "eyeDropper": "เลือกสีผืนผ้าใบ",
+    "textToDiagram": "ข้อความเป็นภาพ",
+    "prompt": "พรอมต์",
+    "followUs": "ติดตามเรา",
+    "discordChat": "แชทดิสคอร์ด",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "การครอบตัดรูปภาพ",
+    "unCroppedDimension": "",
+    "copyElementLink": "คัดลอกลิงค์ไปสู่วัตถุ",
+    "linkToElement": "ลิงค์ไปสู่วัตถุ",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "ลิงค์ไปสู่วัตถุ",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "ยังไม่มีรายการที่เพิ่มเข้าไปได้",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "ค้นหาข้อความในผืนผ้าใบ",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "รีเซ็ทผืนผ้าใบ",
@@ -151,6 +204,7 @@
     "exportImage": "ส่งออกเป็นรูปภาพ",
     "export": "บันทึกไปยัง",
     "copyToClipboard": "คัดลอกไปยังคลิปบอร์ด",
+    "copyLink": "คัดลอกลิงก์",
     "save": "บันทึกเป็นไฟล์ปัจจุบัน",
     "saveAs": "บันทึกเป็น",
     "load": "เปิด",
@@ -171,14 +225,16 @@
     "fullScreen": "เต็มหน้าจอ",
     "darkMode": "โหมดกลางคืน",
     "lightMode": "โหมดกลางวัน",
+    "systemMode": "",
     "zenMode": "โหมด Zen",
     "objectsSnapMode": "",
     "exitZenMode": "ออกจากโหมด Zen",
     "cancel": "ยกเลิก",
+    "saveLibNames": "",
     "clear": "เคลียร์",
     "remove": "ลบ",
     "embed": "สลับการฝัง",
-    "publishLibrary": "เผยแพร่",
+    "publishLibrary": "",
     "submit": "ตกลง",
     "confirm": "ยืนยัน",
     "embeddableInteractionButton": "คลิกเพื่อปฏิสัมพันธ์"
@@ -204,7 +260,8 @@
     "resetLibrary": "",
     "removeItemsFromsLibrary": "",
     "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "ไม่รองรับชนิดของไฟล์นี้",
@@ -212,9 +269,9 @@
     "fileTooBig": "",
     "svgImageInsertError": "",
     "failedToFetchImage": "",
-    "invalidSVGString": "ไฟล์ SVG ผิดพลาด",
     "cannotResolveCollabServer": "ไม่สามารถเชื่อต่อกับ collab เซิร์ฟเวอร์ได้ โปรดลองโหลดหน้านี้ใหม่และลองอีกครั้ง",
     "importLibraryError": "",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -230,61 +287,83 @@
       "image": "การสนับสนุนสำหรับเพิ่มรูปภาพลงในไลบลารีจะมาในเร็ว ๆ นี้"
     },
     "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
+    "asyncPasteFailedOnParse": "ไม่สามารถวางได้",
     "copyToSystemClipboardFailed": ""
   },
   "toolBar": {
-    "selection": "",
-    "image": "",
+    "selection": "การเลือก",
+    "lasso": "",
+    "image": "แทรกรูปภาพ",
     "rectangle": "สี่เหลี่ยมผืนผ้า",
-    "diamond": "",
+    "diamond": "รูปเพชร",
     "ellipse": "วงรี",
     "arrow": "ลูกศร",
-    "line": "",
-    "freedraw": "",
+    "line": "เส้น",
+    "freedraw": "เขียนรูป",
     "text": "ข้อความ",
     "library": "คลัง",
     "lock": "",
     "penMode": "",
-    "link": "",
+    "link": "เพิ่ม / อัปเดตลิงก์สำหรับรูปร่างที่เลือก",
     "eraser": "ยางลบ",
-    "frame": "",
-    "magicframe": "",
+    "frame": "เครื่องมือกรอบ",
+    "magicframe": "ไวร์เฟรมเป็นโค้ด",
     "embeddable": "ฝังเว็บ",
-    "laser": "",
-    "hand": "",
+    "laser": "ตัวชี้เลเซอร์",
+    "hand": "มือ (เครื่องมือเลื่อน)",
     "extraTools": "เครื่องมืออื่นๆ",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "เมอร์เมดเป็นเอกซ์คาลิดรอว์",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "สี่เหลี่ยม",
+    "diamond": "รูปเพชร",
+    "ellipse": "วงรี",
+    "arrow": "ลูกศร",
+    "line": "เส้น",
+    "freedraw": "วาดอิสระ",
+    "text": "ข้อความ",
+    "image": "รูปภาพ",
+    "group": "จัดกลุ่ม",
+    "frame": "กรอบ",
+    "magicframe": "ไวร์เฟรมเป็นโค้ด",
+    "embeddable": "ฝังเว็บ",
+    "selection": "การเลือก",
+    "iframe": "ไอเฟรม"
   },
   "headings": {
-    "canvasActions": "",
-    "selectedShapeActions": "",
+    "canvasActions": "การกระทำบนผืนผ้าใบ",
+    "selectedShapeActions": "การกระทำกับรูปร่างที่เลือก",
     "shapes": "รูปร่าง"
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
-    "linearElement": "",
+    "linearElement": "คลิกเพื่อเริ่มหลายจุด ลากสำหรับเส้นเดียว",
+    "arrowTool": "",
     "freeDraw": "",
     "text": "",
     "embeddable": "คลิกและลากเพื่อสร้างการฝังสำหรับเว็บไซต์",
-    "text_selected": "คลิกสองครั้งหรือกด ENTER เพื่อแก้ไขข้อความ",
-    "text_editing": "กดปุ่ม Esc หรือกด Ctrl, Cmd + Enter เพื่อเสร็จการแก้ไข",
-    "linearElementMulti": "คลิกที่จุดสุดท้ายหรือกด Escape หรือ Enter เพื่อเสร็จสิ้น",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
     "lockAngle": "",
     "resize": "",
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
-    "lineEditor_pointSelected": "กดปุ่ม Delete เพื่อลบจุด\nกด Ctrl หรือ Cmd + D เพื่อทำซ้ำหรือลากเพื่อเคลื่อนย้าย",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "",
@@ -299,6 +378,9 @@
     "openIssueMessage": "",
     "sceneContent": ""
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
     "desc_intro": "",
     "desc_privacy": "",
@@ -315,32 +397,34 @@
   "exportDialog": {
     "disk_title": "",
     "disk_details": "",
-    "disk_button": "",
-    "link_title": "",
+    "disk_button": "บันทึกเป็นไฟล์",
+    "link_title": "ลิงก์ที่สามารถแชร์ได้",
     "link_details": "",
-    "link_button": "",
+    "link_button": "ส่งออกไปยังไฟล์",
     "excalidrawplus_description": "",
-    "excalidrawplus_button": "",
+    "excalidrawplus_button": "ส่งออก",
     "excalidrawplus_exportError": "ไม่สามารถส่งออกไปที่ Excalidraw+ ได้ในขณะนี้"
   },
   "helpDialog": {
     "blog": "อ่านบล็อกของพวกเรา",
     "click": "คลิก",
-    "deepSelect": "",
+    "deepSelect": "การเลือเชิงลึก",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "",
     "curvedLine": "",
     "documentation": "",
     "doubleClick": "ดับเบิลคลิก",
     "drag": "ลาก",
-    "editor": "",
+    "editor": "ตัวแก้ไข",
     "editLineArrowPoints": "",
     "editText": "แก้ไขข้อความ / เพิ่มข้อความ",
     "github": "",
     "howto": "",
-    "or": "",
+    "or": "หรือ",
     "preventBinding": "",
-    "tools": "",
+    "tools": "เครื่องมือ",
     "shortcuts": "",
     "textFinish": "",
     "textNewLine": "",
@@ -350,7 +434,9 @@
     "zoomToSelection": "",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": "ย้ายหน้าไปด้าน ซ้าย/ขวา"
+    "movePageLeftRight": "ย้ายหน้าไปด้าน ซ้าย/ขวา",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -363,7 +449,7 @@
     "twitterUsername": "ชื่อผู้ใช้ Twitter",
     "libraryName": "",
     "libraryDesc": "",
-    "website": "",
+    "website": "เว็บไซต์",
     "placeholder": {
       "authorName": "",
       "libraryName": "",
@@ -373,7 +459,7 @@
       "website": ""
     },
     "errors": {
-      "required": "",
+      "required": "จำเป็น",
       "website": ""
     },
     "noteDescription": "",
@@ -392,14 +478,14 @@
     "removeItemsFromLib": ""
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "ส่งออกเป็นรูปภาพ",
     "label": {
-      "withBackground": "",
-      "onlySelected": "",
+      "withBackground": "พื้นหลัง",
+      "onlySelected": "เฉพาะที่เลือก",
       "darkMode": "โหมดกลางคืน",
       "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "scale": "อัตราส่วน",
+      "padding": "การเว้นระยะ"
     },
     "tooltip": {
       "embedScene": ""
@@ -420,44 +506,48 @@
     "link": ""
   },
   "stats": {
-    "angle": "",
-    "element": "",
-    "elements": "",
-    "height": "",
-    "scene": "",
-    "selected": "",
-    "storage": "",
-    "title": "",
-    "total": "",
-    "version": "",
-    "versionCopy": "",
+    "angle": "องศา",
+    "shapes": "รูปร่าง",
+    "height": "ความสูง",
+    "scene": "ฉาก",
+    "selected": "ถูกเลือกแล้ว",
+    "storage": "การจัดเก็บข้อมูล",
+    "fullTitle": "",
+    "title": "คุณสมบัติ",
+    "generalStats": "ทั่วไป",
+    "elementProperties": "",
+    "total": "รวมทั้งหมด",
+    "version": "เวอร์ชั่น",
+    "versionCopy": "คลิกเพื่อคัดลอก",
     "versionNotAvailable": "",
-    "width": ""
+    "width": "ความกว้าง"
   },
   "toast": {
-    "addedToLibrary": "",
-    "copyStyles": "",
-    "copyToClipboard": "",
+    "addedToLibrary": "เพิ่มไปในคลังแล้ว",
+    "copyStyles": "คัดลอกรูปแบบสำเร็จแล้ว",
+    "copyToClipboard": "คัดลอกไปยังคลิปบอร์ดแล้ว",
     "copyToClipboardAsPng": "",
-    "fileSaved": "",
-    "fileSavedToFilename": "",
-    "canvas": "",
-    "selection": "",
+    "copyToClipboardAsSvg": "",
+    "fileSaved": "ข้อมูลได้รับการบันทึก",
+    "fileSavedToFilename": "บันทึกเป็น {filename}",
+    "canvas": "ผืนผ้าใบ",
+    "selection": "การเลือก",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": "คัดลอกไปยังคลิปบอร์ดแล้ว"
   },
   "colors": {
-    "transparent": "",
-    "black": "",
-    "white": "",
-    "red": "",
-    "pink": "",
-    "grape": "",
-    "violet": "",
-    "gray": "",
-    "blue": "",
-    "cyan": "",
+    "transparent": "โปร่งใส",
+    "black": "สีดำ",
+    "white": "สีขาว",
+    "red": "สีแดง",
+    "pink": "สีชมพู",
+    "grape": "สีองุ่น",
+    "violet": "สีม่วง",
+    "gray": "สีเทา",
+    "blue": "สีน้ำเงิน",
+    "cyan": "สีฟ้าอมเขียว",
     "teal": "ฟ้าน้ำทะเล",
     "green": "เขียว",
     "yellow": "เหลือง",
@@ -474,52 +564,101 @@
       "menuHint": "",
       "center_heading": "",
       "toolbarHint": "",
-      "helpHint": ""
+      "helpHint": "ทางลัดและการช่วยเหลือ"
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
-    "colors": "",
-    "shades": "",
-    "hexCode": "",
+    "colors": "สี",
+    "shades": "รูปร่าง",
+    "hexCode": "Hex code",
     "noShades": ""
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
+        "title": "ส่งออกเป็นภาพ",
+        "button": "ส่งออกเป็นภาพ",
         "description": ""
       },
       "saveToDisk": {
-        "title": "",
-        "button": "",
+        "title": "บันทึกไปยังดิสก์",
+        "button": "บันทึกไปยังดิสก์",
         "description": ""
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
+        "title": "Excalidraw+",
+        "button": "นำออกไปยัง Excalidraw+",
         "description": ""
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
+        "title": "โหลดจากไฟล์",
+        "button": "โหลดจากไฟล์",
         "description": ""
       },
       "shareableLink": {
         "title": "",
-        "button": "",
+        "button": "แทนที่เนื้อหาของฉัน",
         "description": ""
       }
     }
   },
   "mermaid": {
     "title": "",
-    "button": "",
+    "button": "แทรก",
     "description": "",
     "syntax": "",
-    "preview": ""
+    "preview": "ดูตัวอย่าง"
+  },
+  "quickSearch": {
+    "placeholder": "ค้นหาด่วน"
+  },
+  "fontList": {
+    "badge": {
+      "old": "เก่า"
+    },
+    "sceneFonts": "ในฉากนี้",
+    "availableFonts": "",
+    "empty": "ไม่พบแบบอักษร"
+  },
+  "userList": {
+    "empty": "ไม่พบผู้ใช้",
+    "hint": {
+      "text": "คลิกที่ผู้ใช้เพื่อติดตาม",
+      "followStatus": "คุณกำลังติดตามผู้ใช้นี้",
+      "inCall": "ผู้ใช้นี้กำลังอยู่ในการโทรด้วยเสียง",
+      "micMuted": "ไมโครโฟนของผู้ใช้ถูกปิดเสียง",
+      "isSpeaking": "ผู้ใช้งานกำลังสนทนาอยู่"
+    }
+  },
+  "commandPalette": {
+    "title": "คำสั่งทางลัด",
+    "shortcuts": {
+      "select": "เลือก",
+      "confirm": "ยืนยัน",
+      "close": "ปิด"
+    },
+    "recents": "ใช้งานล่าสุด",
+    "search": {
+      "placeholder": "",
+      "noMatch": "ไม่เจอคำสั่ง"
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/tr-TR.json b/packages/excalidraw/locales/tr-TR.json
index de5cf11c77..775b91d208 100644
--- a/packages/excalidraw/locales/tr-TR.json
+++ b/packages/excalidraw/locales/tr-TR.json
@@ -11,8 +11,8 @@
     "copyAsPng": "Panoya PNG olarak kopyala",
     "copyAsSvg": "Panoya SVG olarak kopyala",
     "copyText": "Panoya metin olarak kopyala",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Kaynağı panoya kopyala",
+    "convertToCode": "Koda dönüştür",
     "bringForward": "Bir öne getir",
     "sendToBack": "Arkaya gönder",
     "bringToFront": "En öne getir",
@@ -20,8 +20,10 @@
     "delete": "Sil",
     "copyStyles": "Stilleri kopyala",
     "pasteStyles": "Stilleri yapıştır",
-    "stroke": "Vurgu",
+    "stroke": "Kontur",
+    "changeStroke": "Kontur rengini değiştir",
     "background": "Arka plan",
+    "changeBackground": "Arka plan rengini değiştir",
     "fill": "Doldur",
     "strokeWidth": "Kontur genişliği",
     "strokeStyle": "Kontur stili",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Yok",
     "arrowhead_arrow": "Ok",
     "arrowhead_bar": "Çizgi",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Çember",
+    "arrowhead_circle_outline": "Çember (anahat)",
     "arrowhead_triangle": "Üçgen",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Üçgen (anahat)",
+    "arrowhead_diamond": "Elmas",
+    "arrowhead_diamond_outline": "Elmas (anahat)",
+    "arrowhead_crowfoot_many": "Karga ayak (çok)",
+    "arrowhead_crowfoot_one": "Karga ayak (bir)",
+    "arrowhead_crowfoot_one_or_many": "Karga ayak (bir veya çok sayıda)",
+    "more_options": "Daha fazla seçenek",
+    "arrowtypes": "Ok şekli",
+    "arrowtype_sharp": "Düz ok",
+    "arrowtype_round": "Kavisli ok",
+    "arrowtype_elbowed": "Köşeli ok",
     "fontSize": "Yazı tipi boyutu",
     "fontFamily": "Yazı tipi ailesi",
     "addWatermark": "\"Excalidraw ile yapıldı\" yazısını ekle",
@@ -53,7 +63,7 @@
     "small": "Küçük",
     "medium": "Orta",
     "large": "Büyük",
-    "veryLarge": "Çok geniş",
+    "veryLarge": "Çok büyük",
     "solid": "Dolu",
     "hachure": "Taralı",
     "zigzag": "Zikzak",
@@ -68,28 +78,30 @@
     "artist": "Sanatçı",
     "cartoonist": "Karikatürist",
     "fileTitle": "Dosya adı",
-    "colorPicker": "Renk seçici",
+    "colorPicker": "Renk seçicisi",
     "canvasColors": "Tuvalin üzerinde kullanıldı",
     "canvasBackground": "Tuval arka planı",
     "drawingCanvas": "Çizim tuvali",
+    "clearCanvas": "Tuvali temizle",
     "layers": "Katmanlar",
     "actions": "Eylemler",
     "language": "Dil",
     "liveCollaboration": "Canlı ortak çalışma alanı...",
     "duplicateSelection": "Çoğalt",
     "untitled": "Adsız",
-    "name": "İsim",
-    "yourName": "İsminiz",
+    "name": "Ad",
+    "yourName": "Adınız",
     "madeWithExcalidraw": "Excalidraw ile yapıldı",
     "group": "Seçimi grup yap",
     "ungroup": "Seçilen grubu dağıt",
     "collaborators": "Ortaklar",
-    "showGrid": "Izgarayı göster",
+    "toggleGrid": "Izgarayı aç/kapat",
     "addToLibrary": "Kütüphaneye ekle",
     "removeFromLibrary": "Kütüphaneden kaldır",
     "libraryLoadingMessage": "Kütüphane yükleniyor…",
     "libraries": "Kütüphanelere gözat",
     "loadingScene": "Sahne yükleniyor…",
+    "loadScene": "Dosyadan sahne yükle",
     "align": "Hizala",
     "alignTop": "Yukarı hizala",
     "alignBottom": "Aşağı hizala",
@@ -104,8 +116,10 @@
     "viewMode": "Görünüm modu",
     "share": "Paylaş",
     "showStroke": "Kontur için renk seçiciyi göster",
-    "showBackground": "Arkaplan için renk seçiciyi göster",
-    "toggleTheme": "Temayı etkinleştir/devre dışı bırak",
+    "showBackground": "Arka plan renk seçicisini göster",
+    "showFonts": "Yazı tipi seçici",
+    "toggleTheme": "Aydınlık/karanlık mod",
+    "theme": "Tema",
     "personalLib": "Kişisel Kitaplık",
     "excalidrawLib": "Excalidraw Kitaplığı",
     "decreaseFontSize": "Yazı Tipi Boyutunu Küçült",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Metni bileşen içinde sar",
     "link": {
       "edit": "Bağlantıyı düzenle",
-      "editEmbed": "Bağlantıyı düzenle & yerleştir",
-      "create": "Bağlantı oluştur",
-      "createEmbed": "Bağlantı oluştur & yerleştir",
+      "editEmbed": "Gömülebilir bağlantıyı düzenle",
+      "create": "Bağlantı ekle",
       "label": "Bağlantı",
-      "labelEmbed": "Bağlantı & yerleştirme",
-      "empty": "Herhangi bir bağlantı oluşturulmadı"
+      "labelEmbed": "Bağlantıla ve göm",
+      "empty": "Herhangi bir bağlantı oluşturulmadı",
+      "hint": "Bağlantınızı buraya yazın veya yapıştırın",
+      "goToElement": "Hedef öğeye git"
     },
     "lineEditor": {
       "edit": "Çizgiyi düzenle",
-      "exit": "Çizgi düzenlemeden çık"
+      "editArrow": "Oku düzenle"
+    },
+    "polygon": {
+      "breakPolygon": "Çokgeni kır",
+      "convertToPolygon": "Çokgene dönüştür"
     },
     "elementLock": {
       "lock": "Kilitle",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "Çerçevedeki tüm bileşenleri seç",
     "removeAllElementsFromFrame": "Çerçevedeki tüm bileşenleri sil",
     "eyeDropper": "Tuvalden renk seç",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Yazıdan diyagrama",
+    "prompt": "İstem",
+    "followUs": "Bizi takip edin",
+    "discordChat": "Discord sohbeti",
+    "zoomToFitViewport": "Görüş alanına sığdırmak için yakınlaştırın",
+    "zoomToFitSelection": "Seçime sığdırmak için yakınlaştırın",
+    "zoomToFit": "Tüm öğeleri sığdırmak için yakınlaştırın",
+    "installPWA": "Excalidraw'ı yerel olarak yükle (PWA)",
+    "autoResize": "Metni otomatik yeniden boyutlandırmayı etkinleştir",
+    "imageCropping": "Görsel kırpma",
+    "unCroppedDimension": "Kırpılmamış ölçüler",
+    "copyElementLink": "Bağlantıyı nesneye kopyala",
+    "linkToElement": "Nesneye bağlantıla",
+    "wrapSelectionInFrame": "Seçimi karede kaydır",
+    "tab": "Sekme",
+    "shapeSwitch": "Şekli başkasıyla değiştir"
+  },
+  "elementLink": {
+    "title": "Nesneye bağlantıla",
+    "desc": "Tuvaldeki bir nesneye tıklayın veya bir bağlantıyı yapıştırın.",
+    "notFound": "Bağlantılanan nesne tuvalde bulunamadı."
   },
   "library": {
     "noItems": "Öğe eklenmedi...",
-    "hint_emptyLibrary": "Öğelerden birini eklemek için öğeyi seçiniz veya aşağıdaki genel kütüphaneden öğeleri ekleyin.",
-    "hint_emptyPrivateLibrary": "Tuvalden bir eleman seçerek sayfaya ekleyin."
+    "hint_emptyLibrary": "Öğelerden birini eklemek için öğeyi seçin veya aşağıdaki genel kütüphaneden öğeleri ekleyin.",
+    "hint_emptyPrivateLibrary": "Tuvalden bir eleman seçerek sayfaya ekleyin.",
+    "search": {
+      "inputPlaceholder": "Kütüphanede ara",
+      "heading": "Kütüphane eşleşmeleri",
+      "noResults": "Eşleşen öğe bulunamadı…",
+      "clearSearch": "Aramayı temizle"
+    }
+  },
+  "search": {
+    "title": "Tuvalde bul",
+    "noMatch": "Sonuç bulunamadı...",
+    "singleResult": "sonuç",
+    "multipleResults": "sonuç",
+    "placeholder": "Tuvalde metin bul…",
+    "frames": "Çerçeveler",
+    "texts": "Metinler"
   },
   "buttons": {
     "clearReset": "Tuvali sıfırla",
@@ -151,6 +204,7 @@
     "exportImage": "Resimleri dışa aktar...",
     "export": "Şuraya kaydet...",
     "copyToClipboard": "Panoya kopyala",
+    "copyLink": "Linki kopyala",
     "save": "Geçerli dosyaya kaydet",
     "saveAs": "Farklı kaydet",
     "load": "Aç",
@@ -171,14 +225,16 @@
     "fullScreen": "Tam ekran",
     "darkMode": "Koyu tema",
     "lightMode": "Açık tema",
+    "systemMode": "Sistem modu",
     "zenMode": "Zen modu",
     "objectsSnapMode": "Nesnelere hizala",
     "exitZenMode": "Zen modundan çık",
     "cancel": "İptal",
+    "saveLibNames": "Adları kaydet ve çık",
     "clear": "Temizle",
     "remove": "Kaldır",
-    "embed": "",
-    "publishLibrary": "Yayınla",
+    "embed": "Yerleştirmeyi aç veya kapa",
+    "publishLibrary": "Yeniden adlandır veya yayımla",
     "submit": "Gönder",
     "confirm": "Onayla",
     "embeddableInteractionButton": "Etkileşime girmek için tıkla"
@@ -204,37 +260,39 @@
     "resetLibrary": "Bu işlem kütüphanenizi sıfırlayacak. Emin misiniz?",
     "removeItemsFromsLibrary": "{{count}} öğe(ler) kitaplıktan kaldırılsın mı?",
     "invalidEncryptionKey": "Şifreleme anahtarı 22 karakter olmalı. Canlı işbirliği devre dışı bırakıldı.",
-    "collabOfflineWarning": "İnternet bağlantısı bulunamadı. Değişiklikleriniz kaydedilmeyecek!"
+    "collabOfflineWarning": "İnternet bağlantısı bulunamadı. Değişiklikleriniz kaydedilmeyecek!",
+    "localStorageQuotaExceeded": "Tarayıcı depolama kotası aşıldı. Değişiklikler kaydedilmeyecek."
   },
   "errors": {
     "unsupportedFileType": "Desteklenmeyen dosya türü.",
     "imageInsertError": "Görsel eklenemedi. Daha sonra tekrar deneyin...",
     "fileTooBig": "Dosya çok büyük. İzin verilen maksimum boyut {{maxSize}}.",
     "svgImageInsertError": "SVG resmi eklenemedi. SVG işaretlemesi geçersiz görünüyor.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "Geçersiz SVG.",
+    "failedToFetchImage": "Görsel alınamadı.",
     "cannotResolveCollabServer": "İş birliği sunucusuna bağlanılamıyor. Lütfen sayfayı yenileyip tekrar deneyin.",
     "importLibraryError": "Kütüphane yüklenemedi",
+    "saveLibraryError": "Kitaplık depolama alanına kaydedilemedi. Değişikliklerinizi kaybetmediğinizden emin olmak için lütfen kitaplığınızı yerel olarak bir dosyaya kaydedin.",
     "collabSaveFailed": "Backend veritabanına kaydedilemedi. Eğer problem devam ederse, çalışmanızı korumak için dosyayı yerel olarak kaydetmelisiniz.",
-    "collabSaveFailed_sizeExceeded": "Backend veritabanına kaydedilemedi; tuval çok büyük. Çalışmanızı korumak için dosyayı yerel olarak kaydetmelisiniz.",
-    "imageToolNotSupported": "",
+    "collabSaveFailed_sizeExceeded": "Arka uç veritabanına kaydedilemedi; tuval çok büyük. Çalışmanızı korumak için dosyayı yerel olarak kaydetmelisiniz.",
+    "imageToolNotSupported": "Görseller devre dışı.",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": ""
+      "line1": "Görünüşe göre Brave tarayıcısını <bold>Agresif Olarak Parmak İzini Engelle</bold> ayarı etkin olarak kullanıyorsunuz.",
+      "line2": "Bu, çizimlerinizdeki <bold>Metin Öğelerinin</bold> kırılmasına neden olabilir.",
+      "line3": "Bu ayarı devre dışı bırakmanızı şiddetle tavsiye ederiz. Bunu nasıl yapacağınızı öğrenmek için <link>bu adımları</link> takip edebilirsiniz.",
+      "line4": "Bu ayarın devre dışı bırakılması metin öğelerinin görüntülenmesini düzeltmezse, lütfen GitHub'ımızda bir <issueLink>issue</issueLink> açın veya <discordLink>Discord</discordLink> adresinden bize yazın"
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
+      "embeddable": "Yerleştirilebilir ögeler bu kütüphaneye eklenemez.",
+      "iframe": "IFrame öğeleri kütüphaneye eklenemez.",
       "image": "Resimleri kütüphaneye ekleme desteği yakında geliyor!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Yapıştırılamadı (sistem panosundan okunamadı).",
+    "asyncPasteFailedOnParse": "Yapıştırılamıyor.",
+    "copyToSystemClipboardFailed": "Panoya kopyalanamıyor."
   },
   "toolBar": {
     "selection": "Seçme",
+    "lasso": "Serbest seçim",
     "image": "Görsel ekle",
     "rectangle": "Dikdörtgen",
     "diamond": "Elmas",
@@ -249,13 +307,29 @@
     "link": "Seçilen şekil için bağlantı Ekle/Güncelle",
     "eraser": "Silgi",
     "frame": "Çerçeve aracı",
-    "magicframe": "",
+    "magicframe": "Wireframe'den koda",
     "embeddable": "Web Yerleştirme",
     "laser": "Lazer işaretçisi",
-    "hand": "",
+    "hand": "El (hareket aracı)",
     "extraTools": "Daha fazla araç",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "Mermaid'den Excalidraw'a",
+    "convertElementType": "Şekil türünü aç/kapat"
+  },
+  "element": {
+    "rectangle": "Dikdörtgen",
+    "diamond": "Elmas",
+    "ellipse": "Elips",
+    "arrow": "Ok",
+    "line": "Çizgi",
+    "freedraw": "Serbest Çizim",
+    "text": "Yazı",
+    "image": "Görüntü",
+    "group": "Grup",
+    "frame": "Çerçeve",
+    "magicframe": "Wireframe'den koda",
+    "embeddable": "Web Yerleştirme",
+    "selection": "Seçim",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Tuval eylemleri",
@@ -263,45 +337,53 @@
     "shapes": "Şekiller"
   },
   "hints": {
-    "canvasPanning": "",
+    "dismissSearch": "Aramayı kapatmak için {{shortcut}} kullanın",
+    "canvasPanning": "Tuvali taşımak için {{shortcut_1}} kısayolunu basılı tutun, sürüklerken {{shortcut_2}} kısayolunu veya el aracını kullanın",
     "linearElement": "Birden fazla nokta için tıklayın, tek çizgi için sürükleyin",
+    "arrowTool": "Birden çok nokta başlatmak için tıklayın, tek bir çizgi için sürükleyin. Ok türünü değiştirmek için {{shortcut}} kısayoluna basın.",
     "freeDraw": "Tıkla ve sürükle, bitirdiğinde serbest bırak",
     "text": "İpucu: seçme aracıyla herhangi bir yere çift tıklayarak da yazı ekleyebilirsin",
     "embeddable": "Web sitesi yerleştirmek için sürükle bırak",
-    "text_selected": "Metni düzenlemek için çift tıklayın veya ENTER'a basın",
-    "text_editing": "Düzenlemeyi bitirmek için ESC veya Ctrl/Cmd+ENTER tuşlarına basın",
-    "linearElementMulti": "Bitirmek için son noktaya tıklayın ya da Escape veya Enter tuşuna basın",
-    "lockAngle": "SHIFT tuşuna basılı tutarak açıyı koruyabilirsiniz",
-    "resize": "Yeniden boyutlandırırken SHIFT tuşunu basılı tutarak oranları sınırlayabilirsiniz,\nmerkezden yeniden boyutlandırmak için ALT tuşunu basılı tutun",
-    "resizeImage": "SHIFT'e basılı tutarak serbestçe yeniden boyutlandırabilirsiniz, merkezden yeniden boyutlandırmak için ALT tuşunu basılı tutun",
-    "rotate": "Döndürürken SHIFT tuşuna basılı tutarak açıları koruyabilirsiniz",
-    "lineEditor_info": "Puanları düzenlemek için ctrl veya cmd tuşuna basılı tutup çift tıklayın veya enter tuşuna basın",
-    "lineEditor_pointSelected": "Sil tuşuna basarak noktaları silin,\nCtrl/Cmd + D ile çoğaltın, ya da sürükleyerek taşıyın",
-    "lineEditor_nothingSelected": "Düzenlemek için bir nokta seçin (birden fazla seçmek için SHIFT tuşunu basılı tutun),\nveya Alt tuşunu basılı tutun ve yeni noktalar eklemek için tıklayın",
-    "placeImage": "Resmi yerleştirmek için tıklayın ya da boyutunu manuel olarak ayarlamak için tıklayıp sürükleyin",
+    "text_selected": "Metni düzenlemek için çift tıklayın veya {{shortcut}} kısayoluna basın",
+    "text_editing": "Düzenlemeyi bitirmek için {{shortcut_1}} veya {{shortcut_2}} kısayoluna basın",
+    "linearElementMulti": "Bitirmek için son noktaya tıklayın veya {{shortcut_1}} veya {{shortcut_2}} kısayolunu kullanın",
+    "lockAngle": "{{shortcut}} kısayolunu basılı tutarak açıyı kısıtlayabilirsiniz",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Kendi kitaplığınızı yayınlayın",
-    "bindTextToElement": "Enter tuşuna basarak metin ekleyin",
-    "deepBoxSelect": "Ctrl/Cmd tuşuna basılı tutarak derin seçim yapın ya da sürüklemeyi engelleyin",
-    "eraserRevert": "Alt tuşuna basılı tutarak silinme için işaretlenmiş ögeleri tersine çevirin",
-    "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
+    "firefox_clipboard_write": "Bu özelliği etkinleştirmek muhtemelen \"dom.events.asyncClipboard.clipboardItem\" bayrağını \"true\" olarak ayarlayarak yapılabilir. Firefox'ta tarayıcı bayraklarını değiştirmek için \"about:config\" sayfasını ziyaret edin.",
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Önizleme gösterilemiyor",
-    "canvasTooBig": "Kanvas çok büyük olabilir.",
+    "canvasTooBig": "Tuval pek büyük olabilir.",
     "canvasTooBigTip": "İpucu: En uzaktaki elemanları birbirine yakınlaştırmayı deneyin."
   },
   "errorSplash": {
     "headingMain": "Hata oluştu. Lütfen <button>sayfayı yenilemeyi deneyin.</button>",
-    "clearCanvasMessage": "Yenileme sonrası sorun devam ediyorsa, lütfen <button>çizim alanını temizlemeyi deneyin.</button>",
+    "clearCanvasMessage": "Yenileme sonrası sorun sürüyorsa lütfen <button>tuvali temizlemeyi</button> deneyin.",
     "clearCanvasCaveat": " Bu, yaptığınız değişiklikleri sıfırlayacak ",
     "trackedToSentry": "Tanımlayıcı ile ilgili hata {{eventId}} sistemimize yakalandı.",
     "openIssueMessage": "Sahne bilginizi hata mesajına yansıtmamak için oldukça dikkatli davrandık. Eğer sahneniz gizli değilse hatayı lütfen şuradan takip edin <button>hata takibi.</button> Lütfen aşağıya GitHub sorununa kopyalayarak ve yapıştırarak bilgi ekleyin.",
     "sceneContent": "Sahne içeriği:"
   },
+  "shareDialog": {
+    "or": "Veya"
+  },
   "roomDialog": {
-    "desc_intro": "Çalışma alanınıza, sizinle birlikte çalışabilmeleri için başkalarını da ekleyebilirsiniz.",
-    "desc_privacy": "Çalışma ortamında yaptıklarınız ve çizimleriniz uçtan uca şifrelemeyle saklanmaktadır. Sunucularımız dahi bu verileri şifrelenmemiş haliyle göremez.",
+    "desc_intro": "İnsanları çiziminiz üzerinde birlikte çalışmaya davet edin.",
+    "desc_privacy": "Endişelenmeyin, oturum uçtan uca şifrelenmiştir ve tamamen gizlidir. Ne çizdiğinizi sunucumuz bile göremez.",
     "button_startSession": "Oturumu başlat",
     "button_stopSession": "Oturumu sonlandır",
     "desc_inProgressIntro": "Ortak çalışma ortamı oluşturuldu.",
@@ -328,6 +410,8 @@
     "click": "tıkla",
     "deepSelect": "Derin seçim",
     "deepBoxSelect": "Kutu içerisinde derin seçim yapın, sürüklemeyi engelleyin",
+    "createFlowchart": "Genel bir öğeden akış diyagramı oluşturun",
+    "navigateFlowchart": "Bir akış diyagramında gezin",
     "curvedArrow": "Eğri ok",
     "curvedLine": "Eğri çizgi",
     "documentation": "Dokümantasyon",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Seçime yakınlaş",
     "toggleElementLock": "Seçimi Kilitle/çöz",
     "movePageUpDown": "Sayfayı yukarı/aşağı kaydır",
-    "movePageLeftRight": "Sayfayı sola/sağa kaydır"
+    "movePageLeftRight": "Sayfayı sola/sağa kaydır",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Tuvali temizle"
@@ -407,7 +493,7 @@
     "title": {
       "exportToPng": "PNG olarak dışa aktar",
       "exportToSvg": "SVG olarak dışa aktar",
-      "copyPngToClipboard": ""
+      "copyPngToClipboard": "PNG'yi panoya kopyala"
     },
     "button": {
       "exportToPng": "PNG",
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Açı",
-    "element": "Bileşen",
-    "elements": "Bileşenler",
+    "shapes": "Şekiller",
     "height": "Yükseklik",
     "scene": "Sahne",
     "selected": "Seçili",
     "storage": "Depolama",
-    "title": "İnekler için istatistikler",
+    "fullTitle": "Tuval ve şekil özellikleri",
+    "title": "Özellikler",
+    "generalStats": "Genel",
+    "elementProperties": "Şekil özellikleri",
     "total": "Toplam",
     "version": "Sürüm",
     "versionCopy": "Kopyalamak için tıkla",
@@ -439,13 +527,15 @@
     "copyStyles": "Stiller kopyalandı.",
     "copyToClipboard": "Panoya kopyalandı.",
     "copyToClipboardAsPng": "{{exportSelection}} panoya PNG olarak\n({{exportColorScheme}}) kopyalandı",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "Dosya kaydedildi.",
     "fileSavedToFilename": "{filename} kaydedildi",
     "canvas": "tuval",
     "selection": "seçim",
     "pasteAsSingleElement": "Tekil obje olarak yapıştırmak için veya var olan bir metin editörüne yapıştırmak için {{shortcut}} kullanın",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unableToEmbed": "Bu URL'i yerleştirmeye şu anda izin verilmiyor. URL'in beyaz listeye alınmasını istiyorsanız GitHub'da bir issue açın",
+    "unrecognizedLinkFormat": "Yerleştirdiğiniz bağlantı beklenen biçime uymuyor. Lütfen kaynak sitenin sağladığı \"yerleştir\" dizesini yapıştırmayı deneyin",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "Şeffaf",
@@ -462,64 +552,113 @@
     "green": "Yeşil",
     "yellow": "Sarı",
     "orange": "Turuncu",
-    "bronze": ""
+    "bronze": "Bronz"
   },
   "welcomeScreen": {
     "app": {
-      "center_heading": "",
+      "center_heading": "Tüm verileriniz tarayıcınızda yerel olarak kaydedilir.",
       "center_heading_plus": "Ecalidraw+'a mı gitmek istediniz?",
       "menuHint": "Dışa aktar, seçenekler, diller, ..."
     },
     "defaults": {
       "menuHint": "Dışa aktar, seçenekler, ve daha fazlası...",
-      "center_heading": "",
+      "center_heading": "Diyagramlar. Basitleştirildi.",
       "toolbarHint": "Bir araç seçin ve çizime başlayın!",
       "helpHint": "Kısayollar & yardım"
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "En çok kullanılan özel renkler",
     "colors": "Renkler",
-    "shades": "",
+    "shades": "Tonlar",
     "hexCode": "Hex kodu",
-    "noShades": ""
+    "noShades": "Bu renk için ton mevcut değil"
   },
   "overwriteConfirm": {
     "action": {
       "exportToImage": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Görüntü olarak dışa aktar",
+        "button": "Görüntü olarak dışa aktar",
+        "description": "Sahne verilerini daha sonra içe aktarabileceğiniz bir görüntü olarak dışa aktarın."
       },
       "saveToDisk": {
-        "title": "",
+        "title": "Diske kaydet",
         "button": "Diske Kaydet",
-        "description": ""
+        "description": "Sahne verilerini daha sonra içe aktarabileceğiniz bir dosyaya aktarın."
       },
       "excalidrawPlus": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Excalidraw+",
+        "button": "Excalidraw+'a aktar",
+        "description": "Sahneyi Excalidraw+ çalışma alanınıza kaydedin."
       }
     },
     "modal": {
       "loadFromFile": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Dosyadan yükle",
+        "button": "Dosyadan yükle",
+        "description": "Bir dosyadan yükleme <bold>mevcut içeriğinizin yerini alacaktır</bold>.<br></br>Önce aşağıdaki seçeneklerden birini kullanarak çiziminizi yedekleyebilirsiniz."
       },
       "shareableLink": {
-        "title": "",
-        "button": "",
-        "description": ""
+        "title": "Bağlantıdan yükle",
+        "button": "İçeriğimi değiştir",
+        "description": "Harici çizimin yüklenmesi <bold>mevcut içeriğinizin yerini alacaktır</bold>.<br></br>Önce aşağıdaki seçeneklerden birini kullanarak çiziminizi yedekleyebilirsiniz."
       }
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid'den Excalidraw'a",
+    "button": "Ekle",
+    "description": "Şu anda yalnızca <flowchartLink>Akış şeması</flowchartLink>,<sequenceLink> Dizi, </sequenceLink> ve <classLink>Sınıf </classLink>Diyagramları deskteklenmektedir. Diğer türler, Excalidraw'da görsel olarak çizilecektir.",
+    "syntax": "Mermaid Sözdizimi",
+    "preview": "Önizleme"
+  },
+  "quickSearch": {
+    "placeholder": "Hızlı arama"
+  },
+  "fontList": {
+    "badge": {
+      "old": "eski"
+    },
+    "sceneFonts": "Bu sahnede",
+    "availableFonts": "Kullanılabilir yazı tipleri",
+    "empty": "Yazı tipi bulunamadı"
+  },
+  "userList": {
+    "empty": "Kullanıcı bulunamadı",
+    "hint": {
+      "text": "Takip etmek için kullanıcıya tıklayın",
+      "followStatus": "Şu anda bu kullanıcıyı takip ediyorsunuz",
+      "inCall": "Kullanıcı bir sesli aramada",
+      "micMuted": "Kullanıcının mikrofonu kapalı",
+      "isSpeaking": "Kullanıcı konuşuyor"
+    }
+  },
+  "commandPalette": {
+    "title": "Komut paleti",
+    "shortcuts": {
+      "select": "Seç",
+      "confirm": "Onayla",
+      "close": "Kapat"
+    },
+    "recents": "Son kullanılan",
+    "search": {
+      "placeholder": "Menülerde, komutlarda arama yapın ve saklı kalmış hazineleri keşfedin",
+      "noMatch": "Eşleşen komut yok..."
+    },
+    "itemNotAvailable": "Komut mevcut değil...",
+    "shortcutHint": "Komut paleti için {{shortcut}} kullanın"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/uk-UA.json b/packages/excalidraw/locales/uk-UA.json
index 8f0b436721..2554d0b58f 100644
--- a/packages/excalidraw/locales/uk-UA.json
+++ b/packages/excalidraw/locales/uk-UA.json
@@ -1,7 +1,7 @@
 {
   "labels": {
     "paste": "Вставити",
-    "pasteAsPlaintext": "Вставити як простий текст",
+    "pasteAsPlaintext": "Вставити як текст",
     "pasteCharts": "Вставити діаграми",
     "selectAll": "Вибрати все",
     "multiSelect": "Додати елемент до вибраного",
@@ -10,9 +10,9 @@
     "copy": "Копіювати",
     "copyAsPng": "Копіювати як PNG",
     "copyAsSvg": "Копіювати як SVG",
-    "copyText": "Копіювати в буфер обміну як текст",
-    "copySource": "",
-    "convertToCode": "",
+    "copyText": "Копіювати як текст",
+    "copySource": "Скопіювати джерело в буфер обміну",
+    "convertToCode": "Перетворити у код",
     "bringForward": "Перемістити вперед",
     "sendToBack": "На задній план",
     "bringToFront": "На передній план",
@@ -21,7 +21,9 @@
     "copyStyles": "Копіювати стилі",
     "pasteStyles": "Вставити стилі",
     "stroke": "Контур",
+    "changeStroke": "Змінити колір обведення",
     "background": "Тло",
+    "changeBackground": "Змінити колір фону",
     "fill": "Заповнити",
     "strokeWidth": "Товщина контуру",
     "strokeStyle": "Стиль контуру",
@@ -38,15 +40,23 @@
     "arrowhead_none": "Жоден",
     "arrowhead_arrow": "Стрілка",
     "arrowhead_bar": "Колона",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Коло",
+    "arrowhead_circle_outline": "Коло (контур)",
     "arrowhead_triangle": "Трикутник",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Трикутник (контур)",
+    "arrowhead_diamond": "Ромб",
+    "arrowhead_diamond_outline": "Ромб (контур)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "Інші опції",
+    "arrowtypes": "Тип стрілки",
+    "arrowtype_sharp": "Гостра стрілка",
+    "arrowtype_round": "Вигнута стрілка",
+    "arrowtype_elbowed": "Прямокутна стрілка",
     "fontSize": "Розмір шрифту",
     "fontFamily": "Шрифт",
-    "addWatermark": "Додати «Накреслене в Excalidraw»",
+    "addWatermark": "Додати \"Зроблено з Excalidraw\"",
     "handDrawn": "Ручний апарат",
     "normal": "Звичайний",
     "code": "Код",
@@ -72,6 +82,7 @@
     "canvasColors": "Використовується на полотні",
     "canvasBackground": "Тло полотна",
     "drawingCanvas": "Полотно",
+    "clearCanvas": "Прозоре полотно",
     "layers": "Шари",
     "actions": "Дії",
     "language": "Мова",
@@ -80,16 +91,17 @@
     "untitled": "Без назви",
     "name": "Ім’я",
     "yourName": "Ваше ім’я",
-    "madeWithExcalidraw": "Накреслене в Excalidraw",
+    "madeWithExcalidraw": "Зроблено з Excalidraw",
     "group": "Групувати виділене",
     "ungroup": "Розгрупувати виділене",
     "collaborators": "Співавтори",
-    "showGrid": "Показати сітку",
+    "toggleGrid": "Перемикати сітку",
     "addToLibrary": "Додати до бібліотеки",
     "removeFromLibrary": "Видалити з бібліотеки",
-    "libraryLoadingMessage": "Завантажити бібліотеку…",
+    "libraryLoadingMessage": "Завантаження бібліотеки…",
     "libraries": "Всі бібліотеки",
     "loadingScene": "Завантаження сцени…",
+    "loadScene": "Завантажити сцену з файлу",
     "align": "Вирівнювання",
     "alignTop": "Вирівняти по верхньому краю",
     "alignBottom": "Вирівняти по нижньому краю",
@@ -98,14 +110,16 @@
     "centerVertically": "Центрувати по вертикалі",
     "centerHorizontally": "Центрувати по горизонталі",
     "distributeHorizontally": "Розподілити по горизонталі",
-    "distributeVertically": "Розподілити вертикально",
+    "distributeVertically": "Розподілити по вертикалі",
     "flipHorizontal": "Віддзеркалити горизонтально",
     "flipVertical": "Віддзеркалити вертикально",
     "viewMode": "Режим перегляду",
     "share": "Поділитися",
     "showStroke": "Показати палітру для контура",
     "showBackground": "Показати палітру для фону",
-    "toggleTheme": "Перемкнути тему",
+    "showFonts": "Показати засіб вибору шрифту",
+    "toggleTheme": "Перемикати світлу/темну теми",
+    "theme": "Тема",
     "personalLib": "Персональна бібліотека",
     "excalidrawLib": "Бібліотека Excalidraw",
     "decreaseFontSize": "Зменшити розмір шрифту",
@@ -115,16 +129,21 @@
     "createContainerFromText": "Огорнути текст у контейнер",
     "link": {
       "edit": "Редагування посилання",
-      "editEmbed": "Редагування посилання і вкладення",
-      "create": "Створити посилання",
-      "createEmbed": "Створити посилання і вкладення",
+      "editEmbed": "Редагувати вбудоване посилання",
+      "create": "Додати посилання",
       "label": "Посилання",
       "labelEmbed": "Посилання і вкладення",
-      "empty": "Посилання відсутнє"
+      "empty": "Посилання відсутнє",
+      "hint": "Введіть або вставте ваше посилання тут",
+      "goToElement": "Перейти до цільового елемента"
     },
     "lineEditor": {
       "edit": "Редагувати лінію",
-      "exit": "Закінчити редагування лінії"
+      "editArrow": "Редагувати стрілку"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Блокувати",
@@ -137,13 +156,47 @@
     "selectAllElementsInFrame": "Обрати всі елементи у фреймі",
     "removeAllElementsFromFrame": "Видалити всі елементи з фрейму",
     "eyeDropper": "Вибрати колір з полотна",
-    "textToDiagram": "",
-    "prompt": ""
+    "textToDiagram": "Діаграма з тексту",
+    "prompt": "Запит",
+    "followUs": "Підписатися",
+    "discordChat": "Чат в Discord",
+    "zoomToFitViewport": "Збільшити до розміру перегляду",
+    "zoomToFitSelection": "Збільшити, щоб відповідати виділенню",
+    "zoomToFit": "Збільшити, щоб умістити всі елементи",
+    "installPWA": "Встановити Excalidraw локально (PWA)",
+    "autoResize": "Увімкнути автоматичне змінення розміру тексту",
+    "imageCropping": "Обрізка зображення",
+    "unCroppedDimension": "Необрізаний розмір",
+    "copyElementLink": "Копіювати посилання на об'єкт",
+    "linkToElement": "Посилання на об’єкт",
+    "wrapSelectionInFrame": "Обтікання виділеного фрагмента рамкою",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Посилання на об’єкт",
+    "desc": "Натисніть на фігуру на полотні або вставте посилання.",
+    "notFound": "Зв'язаний об'єкт не знайдено на полотні."
   },
   "library": {
     "noItems": "Тут поки пусто...",
     "hint_emptyLibrary": "Виберіть об'єкт на полотні, щоб додати його сюди або встановіть бібліотеку з публічного репозиторію, що нижче.",
-    "hint_emptyPrivateLibrary": "Виберіть елемент на полотні, щоб додати його сюди."
+    "hint_emptyPrivateLibrary": "Виберіть елемент на полотні, щоб додати його сюди.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Знайти на полотні",
+    "noMatch": "Збігів не знайдено...",
+    "singleResult": "результат",
+    "multipleResults": "результати",
+    "placeholder": "Знайти текст на полотні...",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Очистити полотно",
@@ -151,6 +204,7 @@
     "exportImage": "Експорт зображення...",
     "export": "Зберегти як...",
     "copyToClipboard": "Скопіювати до буферу обміну",
+    "copyLink": "Копіювати посилання",
     "save": "Зберегти до поточного файлу",
     "saveAs": "Зберегти як",
     "load": "Відкрити",
@@ -171,14 +225,16 @@
     "fullScreen": "Повноекранний режим",
     "darkMode": "Темна тема",
     "lightMode": "Світла тема",
+    "systemMode": "Системний режим",
     "zenMode": "Режим Дзен",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Прив'язати до об'єктів",
     "exitZenMode": "Вийти з дзен-режиму",
     "cancel": "Скасувати",
+    "saveLibNames": "",
     "clear": "Очистити",
     "remove": "Видалити",
     "embed": "Перемкнути вкладення",
-    "publishLibrary": "Опублікувати",
+    "publishLibrary": "",
     "submit": "Надіслати",
     "confirm": "Підтвердити",
     "embeddableInteractionButton": "Натисніть для взаємодії"
@@ -204,20 +260,21 @@
     "resetLibrary": "Це призведе до очищення бібліотеки. Ви впевнені?",
     "removeItemsFromsLibrary": "Видалити {{count}} елемент(ів) з бібліотеки?",
     "invalidEncryptionKey": "Ключ шифрування повинен бути довжиною до 22 символів. Спільну роботу вимкнено.",
-    "collabOfflineWarning": "Немає підключення до Інтернету.\nВаші зміни не будуть збережені!"
+    "collabOfflineWarning": "Немає підключення до Інтернету.\nВаші зміни не будуть збережені!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Непідтримуваний тип файлу.",
     "imageInsertError": "Не вдалося вставити зображення. Повторіть спробу пізніше...",
     "fileTooBig": "Занадто великий розмір файлу, максимальний розмір файлу {{maxSize}}.",
     "svgImageInsertError": "Не вдалося вставити SVG-зображення. Помилка розмітки SVG.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "Недійсний SVG.",
+    "failedToFetchImage": "Не вдалося отримати зображення.",
     "cannotResolveCollabServer": "Не вдалося приєднатися до сервера. Перезавантажте сторінку та повторіть спробу.",
     "importLibraryError": "Не вдалося завантажити бібліотеку",
+    "saveLibraryError": "Не вдалося зберегти бібліотеку в сховище. Збережіть свою бібліотеку у файл локально, щоб не втратити зміни.",
     "collabSaveFailed": "Не вдалося зберегти у базу даних сервера. Якщо проблеми не зникнуть, Вам слід зберегти файл локально, щоб не втратити роботу.",
     "collabSaveFailed_sizeExceeded": "Полотно завелике! Не вдалося зберегти у базу даних сервера. Вам слід зберегти файл локально, щоб не втратити свою роботу.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Зображення відключені.",
     "brave_measure_text_error": {
       "line1": "Ви використовуєте браузер Brave з увімкненим налаштуванням <bold>Агресивного Блокування Розпізнавання Пристрою</bold>.",
       "line2": "Це може нашкодити <bold>текстовим елементам</bold> у ваших малюнках.",
@@ -226,15 +283,16 @@
     },
     "libraryElementTypeError": {
       "embeddable": "Вбудовані елементи не можна додати в бібліотеку.",
-      "iframe": "",
+      "iframe": "Елементи iFrame не можна додати до бібліотеки.",
       "image": "Підтримка додавання зображень в бібліотеку найближчим часом!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Не вдалося вставити (неможливо прочитати з буфера обміну).",
+    "asyncPasteFailedOnParse": "Не вдалося вставити.",
+    "copyToSystemClipboardFailed": "Не вдалося скопіювати до буфера обміну."
   },
   "toolBar": {
     "selection": "Виділення",
+    "lasso": "",
     "image": "Вставити зображення",
     "rectangle": "Прямокутник",
     "diamond": "Ромб",
@@ -244,18 +302,34 @@
     "freedraw": "Малювати",
     "text": "Текст",
     "library": "Бібліотека",
-    "lock": "Залишити обраний інструмент після креслення",
+    "lock": "Залишити обраний інструмент активним після креслення",
     "penMode": "Режим пера - запобігання дотику",
-    "link": "Додати/Оновити посилання для вибраної форми",
-    "eraser": "Очищувач",
+    "link": "Додати/оновити посилання для вибраної форми",
+    "eraser": "Гумка",
     "frame": "Інструмент фрейму",
-    "magicframe": "",
+    "magicframe": "Перетворити у код",
     "embeddable": "Веб вкладення",
-    "laser": "",
+    "laser": "Лазерний вказівник",
     "hand": "Рука (інструмент для панорамування)",
     "extraTools": "Інші інструменти",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "mermaidToExcalidraw": "Mermaid у Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Прямокутник",
+    "diamond": "Ромб",
+    "ellipse": "Еліпс",
+    "arrow": "Стрілка",
+    "line": "Лінія",
+    "freedraw": "Малювання від руки",
+    "text": "Текст",
+    "image": "Зображення",
+    "group": "Група",
+    "frame": "Рамка",
+    "magicframe": "Перетворити у код",
+    "embeddable": "Веб вкладення",
+    "selection": "Виділення",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Дії з полотном",
@@ -263,28 +337,33 @@
     "shapes": "Фігури"
   },
   "hints": {
-    "canvasPanning": "Щоб перемістити полотно, утримуйте коліщатко миші або пробіл під час перетягування, або скористайтеся інструментом Рука",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Натисніть щоб додати кілька точок. Перетягніть щоб намалювати одну лінію",
+    "arrowTool": "",
     "freeDraw": "Натисніть і потягніть, відпустіть коли завершите",
     "text": "Порада: можна також додати текст, двічі клацнувши по будь-якому місці інструментом вибору",
     "embeddable": "Клікніть та перетягніть для створення вбудованого вебсайту",
-    "text_selected": "Подвійний клік або натисніть клавішу ENTER, щоб редагувати текст",
-    "text_editing": "Натисніть клавішу Escape або Ctrl/Cmd+ENTER, щоб завершити редагування",
-    "linearElementMulti": "Натисніть на останню точку, клацніть Esc або Enter щоб завершити",
-    "lockAngle": "Ви можете обмежити кут, утримуюючи SHIFT",
-    "resize": "Ви можете зберегти пропорції, утримуючи SHIFT під час зміни розміру,\nутримуйте ALT для змінення розміру від центру",
-    "resizeImage": "Ви можете змінювати розміри утримуючи клавішу SHIFT, втримуйте клавішу ALT щоб змінювати розмір відносно центру",
-    "rotate": "Ви можете обмежити кути, утримуючи SHIFT під час обертання",
-    "lineEditor_info": "Утримуйте CtrlOrCmd і двічі клацніть або натисніть CtrlOrCmd + Enter, щоб редагувати цятки",
-    "lineEditor_pointSelected": "Натисніть Delete для видалення точку (точок), або Ctrl/Cmd+D для дублювання, перетаскування працює як звично",
-    "lineEditor_nothingSelected": "Виберіть точку для редагування (втримуйте клавішу SHIFT для вибору кількох точок), або клавішу Alt для додавання нових точок",
-    "placeImage": "Клацніть, щоб розмістити зображення, або натисніть та потягніть щоб змінити його розмір",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "Опублікувати свою власну бібліотеку",
-    "bindTextToElement": "Натисніть Enter, щоб додати текст",
-    "deepBoxSelect": "Втримуйте Ctrl/Cmd для глибокого виділення та щоб попередити перетягування",
-    "eraserRevert": "Втримуйте клавішу Alt, щоб повернути елементи позначені для видалення",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "Цю функцію можна ввімкнути, встановивши значення \"true\" для налаштування \"dom.events.asyncClipboard.clipboardItem\". Перейдіть на сторінку «about:config», щоб змінити налаштування браузера у Firefox.",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Не вдається показати попередній перегляд",
@@ -299,9 +378,12 @@
     "openIssueMessage": "Ми були дуже обережні, щоб не включати інформацію про ваші сцени в текст помилки. Якщо ваша сцена не була приватна, будь ласка, розгляньте можливість продовження на нашому <button>трекер помилок.</button> Будь ласка, додайте інформацію нижче, скопіюючи і вставляючи у GitHub issue.",
     "sceneContent": "Вміст сцени:"
   },
+  "shareDialog": {
+    "or": "Або"
+  },
   "roomDialog": {
-    "desc_intro": "Ви можете запросити людей для спільної роботи.",
-    "desc_privacy": "Не хвилюйтеся, сесія захищена наскрізним шифруванням, тому ваше креслення залишиться приватним. Навіть наш сервер не побачить вашу роботу.",
+    "desc_intro": "Запросіть людей до співпраці над вашим малюнком.",
+    "desc_privacy": "Не хвилюйтеся, сеанс наскрізно зашифрований і повністю приватний. Навіть наш сервер не бачить, що ви малюєте.",
     "button_startSession": "Почати сесію",
     "button_stopSession": "Закрити сесію",
     "desc_inProgressIntro": "Сесія спільної роботи над кресленням триває.",
@@ -328,6 +410,8 @@
     "click": "натиснути",
     "deepSelect": "Глибокий вибір",
     "deepBoxSelect": "Глибоке виділення в межах рамки, та обмеження перетягування",
+    "createFlowchart": "Створіть графік із загального елемента",
+    "navigateFlowchart": "Перейти на графік",
     "curvedArrow": "Крива стрілка",
     "curvedLine": "Крива лінія",
     "documentation": "Документація",
@@ -350,7 +434,9 @@
     "zoomToSelection": "Наблизити вибране",
     "toggleElementLock": "Заблокувати/розблокувати вибране",
     "movePageUpDown": "Пересунути сторінку вгору/вниз",
-    "movePageLeftRight": "Пересунути сторінку вліво/вправо"
+    "movePageLeftRight": "Пересунути сторінку вліво/вправо",
+    "cropStart": "Обрізати зображення",
+    "cropFinish": "Закінчити обрізку зображення"
   },
   "clearCanvasDialog": {
     "title": "Очистити полотно"
@@ -360,7 +446,7 @@
     "itemName": "Назва елементу",
     "authorName": "Ім'я автора",
     "githubUsername": "Ім'я користувача Github",
-    "twitterUsername": "Ім'я користувача Твитер",
+    "twitterUsername": "Ім'я користувача Twitter",
     "libraryName": "Назва бібліотеки",
     "libraryDesc": "Опис бібліотеки",
     "website": "Вебсайт",
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "Кут",
-    "element": "Елемент",
-    "elements": "Елементи",
+    "shapes": "Форми",
     "height": "Висота",
     "scene": "Сцена",
     "selected": "Обрано",
     "storage": "Сховище",
-    "title": "Статистика",
+    "fullTitle": "Властивості полотна та форми",
+    "title": "Властивості",
+    "generalStats": "Загальні",
+    "elementProperties": "Властивості форми",
     "total": "Всього",
     "version": "Версія",
     "versionCopy": "Натисніть, щоб скопіювати",
@@ -439,13 +527,15 @@
     "copyStyles": "Скопійовані стилі.",
     "copyToClipboard": "Скопіювати до буферу обміну.",
     "copyToClipboardAsPng": "Скопійовано {{exportSelection}} до буфера обміну як PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Скопійовано {{exportSelection}} до буфера обміну як SVG\n({{exportColorScheme}})",
     "fileSaved": "Файл збережено.",
     "fileSavedToFilename": "Збережено в {filename}",
     "canvas": "полотно",
     "selection": "виділення",
     "pasteAsSingleElement": "Використайте {{shortcut}} для вставки самостійного зразка або використайте в текстовому редакторі",
     "unableToEmbed": "Вбудування цієї url на даний час не допускається. Підніміть питання на GitHub, щоб попросити внести URL-адресу до білого списку",
-    "unrecognizedLinkFormat": "Посилання, яке ви вставили, не відповідає очікуваному формату. Будь ласка, спробуйте вставити рядок \"embed\", наданий сайтом-джерелом"
+    "unrecognizedLinkFormat": "Посилання, яке ви вставили, не відповідає очікуваному формату. Будь ласка, спробуйте вставити рядок \"embed\", наданий сайтом-джерелом",
+    "elementLinkCopied": "Посилання скопійовано в буфер обміну"
   },
   "colors": {
     "transparent": "Прозорий",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "Найбільш використовувані користувацькі кольори",
     "colors": "Кольори",
     "shades": "Тіні",
@@ -516,10 +607,58 @@
     }
   },
   "mermaid": {
-    "title": "",
-    "button": "",
-    "description": "",
-    "syntax": "",
-    "preview": ""
+    "title": "Mermaid у Excalidraw",
+    "button": "Вставити",
+    "description": "Наразі підтримується тільки <flowchartLink>блок-схеми</flowchartLink><sequenceLink>діаграми послідовностей</sequenceLink> та <classLink>діаграми класів</classLink>. Інші типи будуть відображатися як зображення в Excalidraw.",
+    "syntax": "Синтаксис Mermaid",
+    "preview": "Попередній перегляд"
+  },
+  "quickSearch": {
+    "placeholder": "Швидкий пошук"
+  },
+  "fontList": {
+    "badge": {
+      "old": "старий"
+    },
+    "sceneFonts": "На цій сцені",
+    "availableFonts": "Доступні шрифти",
+    "empty": "Шрифти не знайдено"
+  },
+  "userList": {
+    "empty": "Користувачів не знайдено",
+    "hint": {
+      "text": "Натисніть на користувача, щоб підписатися",
+      "followStatus": "Ви вже підписані на цього користувача",
+      "inCall": "Користувач здійснює голосовий виклик",
+      "micMuted": "Мікрофон користувача вимкнено",
+      "isSpeaking": "Користувач говорить"
+    }
+  },
+  "commandPalette": {
+    "title": "Командна палітра",
+    "shortcuts": {
+      "select": "Вибрати",
+      "confirm": "Підтвердити",
+      "close": "Закрити"
+    },
+    "recents": "Нещодавно використані",
+    "search": {
+      "placeholder": "Шукайте меню, команди та відкривайте приховані перлини",
+      "noMatch": "Немає відповідних команд..."
+    },
+    "itemNotAvailable": "Команда недоступна...",
+    "shortcutHint": "Для панелі команд використовуйте {{shortcut}}"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/uz-UZ.json b/packages/excalidraw/locales/uz-UZ.json
new file mode 100644
index 0000000000..83cc143a8f
--- /dev/null
+++ b/packages/excalidraw/locales/uz-UZ.json
@@ -0,0 +1,664 @@
+{
+  "labels": {
+    "paste": "",
+    "pasteAsPlaintext": "",
+    "pasteCharts": "",
+    "selectAll": "",
+    "multiSelect": "",
+    "moveCanvas": "",
+    "cut": "",
+    "copy": "",
+    "copyAsPng": "",
+    "copyAsSvg": "",
+    "copyText": "",
+    "copySource": "",
+    "convertToCode": "",
+    "bringForward": "",
+    "sendToBack": "",
+    "bringToFront": "",
+    "sendBackward": "",
+    "delete": "",
+    "copyStyles": "",
+    "pasteStyles": "",
+    "stroke": "",
+    "changeStroke": "",
+    "background": "",
+    "changeBackground": "",
+    "fill": "",
+    "strokeWidth": "",
+    "strokeStyle": "",
+    "strokeStyle_solid": "",
+    "strokeStyle_dashed": "",
+    "strokeStyle_dotted": "",
+    "sloppiness": "",
+    "opacity": "",
+    "textAlign": "",
+    "edges": "",
+    "sharp": "",
+    "round": "",
+    "arrowheads": "",
+    "arrowhead_none": "",
+    "arrowhead_arrow": "",
+    "arrowhead_bar": "",
+    "arrowhead_circle": "",
+    "arrowhead_circle_outline": "",
+    "arrowhead_triangle": "",
+    "arrowhead_triangle_outline": "",
+    "arrowhead_diamond": "",
+    "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
+    "fontSize": "",
+    "fontFamily": "",
+    "addWatermark": "",
+    "handDrawn": "",
+    "normal": "",
+    "code": "",
+    "small": "",
+    "medium": "",
+    "large": "",
+    "veryLarge": "",
+    "solid": "",
+    "hachure": "",
+    "zigzag": "",
+    "crossHatch": "",
+    "thin": "",
+    "bold": "",
+    "left": "",
+    "center": "",
+    "right": "",
+    "extraBold": "",
+    "architect": "",
+    "artist": "",
+    "cartoonist": "",
+    "fileTitle": "",
+    "colorPicker": "",
+    "canvasColors": "",
+    "canvasBackground": "",
+    "drawingCanvas": "",
+    "clearCanvas": "",
+    "layers": "",
+    "actions": "",
+    "language": "",
+    "liveCollaboration": "",
+    "duplicateSelection": "",
+    "untitled": "",
+    "name": "",
+    "yourName": "",
+    "madeWithExcalidraw": "",
+    "group": "",
+    "ungroup": "",
+    "collaborators": "",
+    "toggleGrid": "",
+    "addToLibrary": "",
+    "removeFromLibrary": "",
+    "libraryLoadingMessage": "",
+    "libraries": "",
+    "loadingScene": "",
+    "loadScene": "",
+    "align": "",
+    "alignTop": "",
+    "alignBottom": "",
+    "alignLeft": "",
+    "alignRight": "",
+    "centerVertically": "",
+    "centerHorizontally": "",
+    "distributeHorizontally": "",
+    "distributeVertically": "",
+    "flipHorizontal": "",
+    "flipVertical": "",
+    "viewMode": "",
+    "share": "",
+    "showStroke": "",
+    "showBackground": "",
+    "showFonts": "",
+    "toggleTheme": "",
+    "theme": "",
+    "personalLib": "",
+    "excalidrawLib": "",
+    "decreaseFontSize": "",
+    "increaseFontSize": "",
+    "unbindText": "",
+    "bindText": "",
+    "createContainerFromText": "",
+    "link": {
+      "edit": "",
+      "editEmbed": "",
+      "create": "",
+      "label": "",
+      "labelEmbed": "",
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
+    },
+    "lineEditor": {
+      "edit": "",
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
+    },
+    "elementLock": {
+      "lock": "",
+      "unlock": "",
+      "lockAll": "",
+      "unlockAll": ""
+    },
+    "statusPublished": "",
+    "sidebarLock": "",
+    "selectAllElementsInFrame": "",
+    "removeAllElementsFromFrame": "",
+    "eyeDropper": "",
+    "textToDiagram": "",
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
+  },
+  "library": {
+    "noItems": "",
+    "hint_emptyLibrary": "",
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
+  },
+  "buttons": {
+    "clearReset": "",
+    "exportJSON": "",
+    "exportImage": "",
+    "export": "",
+    "copyToClipboard": "",
+    "copyLink": "",
+    "save": "",
+    "saveAs": "",
+    "load": "",
+    "getShareableLink": "",
+    "close": "",
+    "selectLanguage": "",
+    "scrollBackToContent": "",
+    "zoomIn": "",
+    "zoomOut": "",
+    "resetZoom": "",
+    "menu": "",
+    "done": "",
+    "edit": "",
+    "undo": "",
+    "redo": "",
+    "resetLibrary": "",
+    "createNewRoom": "",
+    "fullScreen": "",
+    "darkMode": "",
+    "lightMode": "",
+    "systemMode": "",
+    "zenMode": "",
+    "objectsSnapMode": "",
+    "exitZenMode": "",
+    "cancel": "",
+    "saveLibNames": "",
+    "clear": "",
+    "remove": "",
+    "embed": "",
+    "publishLibrary": "",
+    "submit": "",
+    "confirm": "",
+    "embeddableInteractionButton": ""
+  },
+  "alerts": {
+    "clearReset": "",
+    "couldNotCreateShareableLink": "",
+    "couldNotCreateShareableLinkTooBig": "",
+    "couldNotLoadInvalidFile": "",
+    "importBackendFailed": "",
+    "cannotExportEmptyCanvas": "",
+    "couldNotCopyToClipboard": "",
+    "decryptFailed": "",
+    "uploadedSecurly": "",
+    "loadSceneOverridePrompt": "",
+    "collabStopOverridePrompt": "",
+    "errorAddingToLibrary": "",
+    "errorRemovingFromLibrary": "",
+    "confirmAddLibrary": "",
+    "imageDoesNotContainScene": "",
+    "cannotRestoreFromImage": "",
+    "invalidSceneUrl": "",
+    "resetLibrary": "",
+    "removeItemsFromsLibrary": "",
+    "invalidEncryptionKey": "",
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
+  },
+  "errors": {
+    "unsupportedFileType": "",
+    "imageInsertError": "",
+    "fileTooBig": "",
+    "svgImageInsertError": "",
+    "failedToFetchImage": "",
+    "cannotResolveCollabServer": "",
+    "importLibraryError": "",
+    "saveLibraryError": "",
+    "collabSaveFailed": "",
+    "collabSaveFailed_sizeExceeded": "",
+    "imageToolNotSupported": "",
+    "brave_measure_text_error": {
+      "line1": "",
+      "line2": "",
+      "line3": "",
+      "line4": ""
+    },
+    "libraryElementTypeError": {
+      "embeddable": "",
+      "iframe": "",
+      "image": ""
+    },
+    "asyncPasteFailedOnRead": "",
+    "asyncPasteFailedOnParse": "",
+    "copyToSystemClipboardFailed": ""
+  },
+  "toolBar": {
+    "selection": "",
+    "lasso": "",
+    "image": "",
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "library": "",
+    "lock": "",
+    "penMode": "",
+    "link": "",
+    "eraser": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "laser": "",
+    "hand": "",
+    "extraTools": "",
+    "mermaidToExcalidraw": "",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
+  },
+  "headings": {
+    "canvasActions": "",
+    "selectedShapeActions": "",
+    "shapes": ""
+  },
+  "hints": {
+    "dismissSearch": "",
+    "canvasPanning": "",
+    "linearElement": "",
+    "arrowTool": "",
+    "freeDraw": "",
+    "text": "",
+    "embeddable": "",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
+    "publishLibrary": "",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
+    "firefox_clipboard_write": "",
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
+  },
+  "canvasError": {
+    "cannotShowPreview": "",
+    "canvasTooBig": "",
+    "canvasTooBigTip": ""
+  },
+  "errorSplash": {
+    "headingMain": "",
+    "clearCanvasMessage": "",
+    "clearCanvasCaveat": "",
+    "trackedToSentry": "",
+    "openIssueMessage": "",
+    "sceneContent": ""
+  },
+  "shareDialog": {
+    "or": ""
+  },
+  "roomDialog": {
+    "desc_intro": "",
+    "desc_privacy": "",
+    "button_startSession": "",
+    "button_stopSession": "",
+    "desc_inProgressIntro": "",
+    "desc_shareLink": "",
+    "desc_exitSession": "",
+    "shareTitle": ""
+  },
+  "errorDialog": {
+    "title": ""
+  },
+  "exportDialog": {
+    "disk_title": "",
+    "disk_details": "",
+    "disk_button": "",
+    "link_title": "",
+    "link_details": "",
+    "link_button": "",
+    "excalidrawplus_description": "",
+    "excalidrawplus_button": "",
+    "excalidrawplus_exportError": ""
+  },
+  "helpDialog": {
+    "blog": "",
+    "click": "",
+    "deepSelect": "",
+    "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
+    "curvedArrow": "",
+    "curvedLine": "",
+    "documentation": "",
+    "doubleClick": "",
+    "drag": "",
+    "editor": "",
+    "editLineArrowPoints": "",
+    "editText": "",
+    "github": "",
+    "howto": "",
+    "or": "",
+    "preventBinding": "",
+    "tools": "",
+    "shortcuts": "",
+    "textFinish": "",
+    "textNewLine": "",
+    "title": "",
+    "view": "",
+    "zoomToFit": "",
+    "zoomToSelection": "",
+    "toggleElementLock": "",
+    "movePageUpDown": "",
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
+  },
+  "clearCanvasDialog": {
+    "title": ""
+  },
+  "publishDialog": {
+    "title": "",
+    "itemName": "",
+    "authorName": "",
+    "githubUsername": "",
+    "twitterUsername": "",
+    "libraryName": "",
+    "libraryDesc": "",
+    "website": "",
+    "placeholder": {
+      "authorName": "",
+      "libraryName": "",
+      "libraryDesc": "",
+      "githubHandle": "",
+      "twitterHandle": "",
+      "website": ""
+    },
+    "errors": {
+      "required": "",
+      "website": ""
+    },
+    "noteDescription": "",
+    "noteGuidelines": "",
+    "noteLicense": "",
+    "noteItems": "",
+    "atleastOneLibItem": "",
+    "republishWarning": ""
+  },
+  "publishSuccessDialog": {
+    "title": "",
+    "content": ""
+  },
+  "confirmDialog": {
+    "resetLibrary": "",
+    "removeItemsFromLib": ""
+  },
+  "imageExportDialog": {
+    "header": "",
+    "label": {
+      "withBackground": "",
+      "onlySelected": "",
+      "darkMode": "",
+      "embedScene": "",
+      "scale": "",
+      "padding": ""
+    },
+    "tooltip": {
+      "embedScene": ""
+    },
+    "title": {
+      "exportToPng": "",
+      "exportToSvg": "",
+      "copyPngToClipboard": ""
+    },
+    "button": {
+      "exportToPng": "",
+      "exportToSvg": "",
+      "copyPngToClipboard": ""
+    }
+  },
+  "encrypted": {
+    "tooltip": "",
+    "link": ""
+  },
+  "stats": {
+    "angle": "",
+    "shapes": "",
+    "height": "",
+    "scene": "",
+    "selected": "",
+    "storage": "",
+    "fullTitle": "",
+    "title": "",
+    "generalStats": "",
+    "elementProperties": "",
+    "total": "",
+    "version": "",
+    "versionCopy": "",
+    "versionNotAvailable": "",
+    "width": ""
+  },
+  "toast": {
+    "addedToLibrary": "",
+    "copyStyles": "",
+    "copyToClipboard": "",
+    "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
+    "fileSaved": "",
+    "fileSavedToFilename": "",
+    "canvas": "",
+    "selection": "",
+    "pasteAsSingleElement": "",
+    "unableToEmbed": "",
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
+  },
+  "colors": {
+    "transparent": "",
+    "black": "",
+    "white": "",
+    "red": "",
+    "pink": "",
+    "grape": "",
+    "violet": "",
+    "gray": "",
+    "blue": "",
+    "cyan": "",
+    "teal": "",
+    "green": "",
+    "yellow": "",
+    "orange": "",
+    "bronze": ""
+  },
+  "welcomeScreen": {
+    "app": {
+      "center_heading": "",
+      "center_heading_plus": "",
+      "menuHint": ""
+    },
+    "defaults": {
+      "menuHint": "",
+      "center_heading": "",
+      "toolbarHint": "",
+      "helpHint": ""
+    }
+  },
+  "colorPicker": {
+    "color": "",
+    "mostUsedCustomColors": "",
+    "colors": "",
+    "shades": "",
+    "hexCode": "",
+    "noShades": ""
+  },
+  "overwriteConfirm": {
+    "action": {
+      "exportToImage": {
+        "title": "",
+        "button": "",
+        "description": ""
+      },
+      "saveToDisk": {
+        "title": "",
+        "button": "",
+        "description": ""
+      },
+      "excalidrawPlus": {
+        "title": "",
+        "button": "",
+        "description": ""
+      }
+    },
+    "modal": {
+      "loadFromFile": {
+        "title": "",
+        "button": "",
+        "description": ""
+      },
+      "shareableLink": {
+        "title": "",
+        "button": "",
+        "description": ""
+      }
+    }
+  },
+  "mermaid": {
+    "title": "",
+    "button": "",
+    "description": "",
+    "syntax": "",
+    "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
+  }
+}
diff --git a/packages/excalidraw/locales/vi-VN.json b/packages/excalidraw/locales/vi-VN.json
index 5e24dc3e36..8eeb857445 100644
--- a/packages/excalidraw/locales/vi-VN.json
+++ b/packages/excalidraw/locales/vi-VN.json
@@ -4,15 +4,15 @@
     "pasteAsPlaintext": "Dán kiểu văn bản thuần",
     "pasteCharts": "Dán biểu đồ",
     "selectAll": "Chọn tất cả",
-    "multiSelect": "Thêm mới vào Select",
+    "multiSelect": "Chọn thêm đối tượng này",
     "moveCanvas": "Di chuyển canvas",
     "cut": "Cắt",
     "copy": "Sao chép",
     "copyAsPng": "Sao chép vào bộ nhớ tạm dưới dạng PNG",
     "copyAsSvg": "Sao chép vào bộ nhớ tạm dưới dạng SVG",
     "copyText": "Sao chép vào bộ nhớ tạm dưới dạng chữ",
-    "copySource": "",
-    "convertToCode": "",
+    "copySource": "Sao chép vào bộ nhớ tạm",
+    "convertToCode": "Chuyển thành mã",
     "bringForward": "Đưa ra trước",
     "sendToBack": "Hạ xuống dưới",
     "bringToFront": "Đưa ra đầu tiên",
@@ -21,8 +21,10 @@
     "copyStyles": "Sao chép định dạng",
     "pasteStyles": "Dán định dạng",
     "stroke": "Nét",
+    "changeStroke": "Đổi màu nét vẽ",
     "background": "Nền",
-    "fill": "Fill",
+    "changeBackground": "Thay đổi màu nền",
+    "fill": "Đổ màu",
     "strokeWidth": "Độ dày nét",
     "strokeStyle": "Kiểu nét",
     "strokeStyle_solid": "Khối",
@@ -38,12 +40,20 @@
     "arrowhead_none": "Không",
     "arrowhead_arrow": "Mũi tên",
     "arrowhead_bar": "Thanh",
-    "arrowhead_circle": "",
-    "arrowhead_circle_outline": "",
+    "arrowhead_circle": "Hình tròn",
+    "arrowhead_circle_outline": "Hình tròn (đường viền)",
     "arrowhead_triangle": "Tam giác",
-    "arrowhead_triangle_outline": "",
-    "arrowhead_diamond": "",
-    "arrowhead_diamond_outline": "",
+    "arrowhead_triangle_outline": "Tam giác (đường viền)",
+    "arrowhead_diamond": "Kim cương",
+    "arrowhead_diamond_outline": "Kim cương (đường viền)",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "Tùy chọn khác",
+    "arrowtypes": "Loại mũi tên",
+    "arrowtype_sharp": "Mũi tên nhọn",
+    "arrowtype_round": "Mũi tên cong",
+    "arrowtype_elbowed": "Mũi tên gấp khúc",
     "fontSize": "Cỡ chữ",
     "fontFamily": "Phông chữ",
     "addWatermark": "Làm với Excalidraw\"",
@@ -56,7 +66,7 @@
     "veryLarge": "Rất lớn",
     "solid": "Đặc",
     "hachure": "Nét gạch gạch",
-    "zigzag": "Zigzag",
+    "zigzag": "Zig-zag",
     "crossHatch": "Nét gạch chéo",
     "thin": "Mỏng",
     "bold": "In đậm",
@@ -72,6 +82,7 @@
     "canvasColors": "Đã dùng trên canvas",
     "canvasBackground": "Nền canvas",
     "drawingCanvas": "Canvas vẽ",
+    "clearCanvas": "Xóa khung vẽ",
     "layers": "Lớp",
     "actions": "Chức năng",
     "language": "Ngôn ngữ",
@@ -84,12 +95,13 @@
     "group": "Gộp nhóm lại lựa chọn",
     "ungroup": "Tách nhóm lựa chọn",
     "collaborators": "Cộng tác viên",
-    "showGrid": "Hiển thị lưới",
+    "toggleGrid": "Bật/tắt lưới",
     "addToLibrary": "Thêm vào thư viện",
     "removeFromLibrary": "Xóa khỏi thư viện",
     "libraryLoadingMessage": "Đang tải thư viện…",
     "libraries": "Xem thư viện",
     "loadingScene": "Đang tải về…",
+    "loadScene": "Tải bản vẽ từ tệp",
     "align": "Căn chỉnh",
     "alignTop": "Căn trên",
     "alignBottom": "Căn dưới",
@@ -105,26 +117,33 @@
     "share": "Chia sẻ",
     "showStroke": "Hiển thị chọn màu",
     "showBackground": "Hiện thị chọn màu nền",
-    "toggleTheme": "",
+    "showFonts": "Hiển thị bộ chọn phông chữ",
+    "toggleTheme": "Chuyển đổi giao diện sáng/tối",
+    "theme": "Chủ đề",
     "personalLib": "Thư viện cá nhân",
     "excalidrawLib": "Thư viện Excalidraw",
     "decreaseFontSize": "Giảm cỡ chữ",
     "increaseFontSize": "Tăng cỡ chữ",
-    "unbindText": "",
-    "bindText": "",
-    "createContainerFromText": "",
+    "unbindText": "Bỏ liên kết văn bản",
+    "bindText": "Gắn văn bản vào khung",
+    "createContainerFromText": "Ngắt dòng văn bản trong khung",
     "link": {
       "edit": "Sửa liên kết",
-      "editEmbed": "",
-      "create": "Tạo liên kết",
-      "createEmbed": "",
+      "editEmbed": "Chỉnh sửa liên kết nhúng",
+      "create": "Thêm liên kết",
       "label": "Liên kết",
-      "labelEmbed": "",
-      "empty": ""
+      "labelEmbed": "Liên kết & nhúng",
+      "empty": "Chưa đặt liên kết",
+      "hint": "Nhập hoặc dán liên kết vào đây",
+      "goToElement": "Đi tới phần tử đích"
     },
     "lineEditor": {
       "edit": "Điều chỉnh nét",
-      "exit": "Thoát chỉnh nét"
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "Khoá",
@@ -134,16 +153,50 @@
     },
     "statusPublished": "Đã đăng tải",
     "sidebarLock": "Giữ thanh bên luôn mở",
-    "selectAllElementsInFrame": "",
-    "removeAllElementsFromFrame": "",
-    "eyeDropper": "",
-    "textToDiagram": "",
-    "prompt": ""
+    "selectAllElementsInFrame": "Chọn tất cả phần tử trong khung",
+    "removeAllElementsFromFrame": "Loại bỏ tất cả các phần tử trong khung",
+    "eyeDropper": "Chọn màu từ vùng vẽ",
+    "textToDiagram": "Văn bản sang sơ đồ",
+    "prompt": "Lời nhắc",
+    "followUs": "Theo dõi chúng tôi",
+    "discordChat": "Trò chuyện Discord",
+    "zoomToFitViewport": "Thu phóng vừa với khung nhìn",
+    "zoomToFitSelection": "Thu phóng vừa với vùng chọn",
+    "zoomToFit": "Thu phóng để hiển thị toàn bộ các phần tử",
+    "installPWA": "Cài đặt Excalidraw trên máy (PWA)",
+    "autoResize": "Bật tự động thay đổi kích thước văn bản",
+    "imageCropping": "Cắt ảnh",
+    "unCroppedDimension": "Kích thước gốc (chưa cắt)",
+    "copyElementLink": "Sao chép liên kết tới đối tượng",
+    "linkToElement": "Liên kết đến đối tượng",
+    "wrapSelectionInFrame": "Đưa vùng chọn vào khung",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "Liên kết đến đối tượng",
+    "desc": "Nhấp vào một hình trên vùng vẽ hoặc dán liên kết.",
+    "notFound": "Không tìm thấy đối tượng liên kết trên vùng vẽ."
   },
   "library": {
     "noItems": "Chưa có món nào...",
     "hint_emptyLibrary": "Chọn một món trên canvas để thêm nó vào đây, hoặc cài đặt thư viện từ kho lưu trữ công cộng, ở bên dưới.",
-    "hint_emptyPrivateLibrary": "Chọn một món trên canvas để thêm nó vào đây."
+    "hint_emptyPrivateLibrary": "Chọn một món trên canvas để thêm nó vào đây.",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "Tìm trên vùng vẽ",
+    "noMatch": "Không có kết quả phù hợp...",
+    "singleResult": "kết quả",
+    "multipleResults": "các kết quả",
+    "placeholder": "Tìm văn bản trên vùng vẽ",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "Reset canvas",
@@ -151,6 +204,7 @@
     "exportImage": "Xuất file ảnh...",
     "export": "Lưu vào...",
     "copyToClipboard": "Sao chép vào bộ nhớ tạm",
+    "copyLink": "Sao chép liên kết",
     "save": "Lưu vào tập tin hiện tại",
     "saveAs": "Lưu thành",
     "load": "Mở",
@@ -166,75 +220,79 @@
     "edit": "Chỉnh sửa",
     "undo": "Hoàn tác",
     "redo": "Làm lại",
-    "resetLibrary": "",
+    "resetLibrary": "Cài lại thư viện",
     "createNewRoom": "Tạo phòng mới",
     "fullScreen": "Toàn màn hình",
     "darkMode": "Chế độ tối",
     "lightMode": "Chế độ sáng",
+    "systemMode": "Chế độ hệ thống",
     "zenMode": "Chế độ zen",
-    "objectsSnapMode": "",
+    "objectsSnapMode": "Căn chỉnh theo đối tượng",
     "exitZenMode": "Thoát chể độ zen",
     "cancel": "Hủy",
+    "saveLibNames": "",
     "clear": "Làm sạch",
     "remove": "Xóa",
-    "embed": "",
-    "publishLibrary": "Đăng tải",
+    "embed": "Bật/tắt chế độ nhúng",
+    "publishLibrary": "",
     "submit": "Gửi",
     "confirm": "Xác nhận",
-    "embeddableInteractionButton": ""
+    "embeddableInteractionButton": "Nhấn để tương tác"
   },
   "alerts": {
     "clearReset": "Điều này sẽ dọn hết canvas. Bạn có chắc không?",
     "couldNotCreateShareableLink": "Không thể tạo đường dẫn chia sẻ.",
     "couldNotCreateShareableLinkTooBig": "Không thể tạo đường dẫn chia sẻ: bản vẽ quá lớn",
     "couldNotLoadInvalidFile": "Không thể load tập tin không hợp lệ",
-    "importBackendFailed": "",
+    "importBackendFailed": "Nhập dữ liệu từ máy chủ thất bại.",
     "cannotExportEmptyCanvas": "Không thể xuất canvas trống.",
-    "couldNotCopyToClipboard": "",
+    "couldNotCopyToClipboard": "Không thể sao chép vào bộ nhớ tạm.",
     "decryptFailed": "Không thể giải mã dữ liệu.",
-    "uploadedSecurly": "",
-    "loadSceneOverridePrompt": "",
+    "uploadedSecurly": "Việc tải lên đã được bảo mật với mã hóa đầu cuối, có nghĩa là máy chủ Excalidraw và bên thứ ba không thể đọc nội dung.",
+    "loadSceneOverridePrompt": "Mở bản vẽ bên ngoài sẽ thay thế nội dung hiện tại của bạn. Bạn có muốn tiếp tục không?",
     "collabStopOverridePrompt": "Dừng phiên sẽ ghi đè lên bản vẽ được lưu trữ cục bộ trước đó của bạn. Bạn có chắc không?\n\n(Nếu bạn muốn giữ bản vẽ cục bộ của mình, chỉ cần đóng tab trình duyệt.)",
     "errorAddingToLibrary": "Không thể thêm món vào thư viện",
     "errorRemovingFromLibrary": "Không thể xoá món khỏi thư viện",
     "confirmAddLibrary": "Hình {{numShapes}} sẽ được thêm vào thư viện. Bạn chắc chứ?",
     "imageDoesNotContainScene": "Hình ảnh này dường như không chứa bất kỳ dữ liệu cảnh nào. Bạn đã bật tính năng nhúng cảnh khi xuất chưa?",
-    "cannotRestoreFromImage": "",
-    "invalidSceneUrl": "",
-    "resetLibrary": "",
+    "cannotRestoreFromImage": "Không thể khôi phục bản vẽ từ tệp hình ảnh này.",
+    "invalidSceneUrl": "Không thể nhập nội dung từ URL đã cung cấp. Đó có thể là do URL không đúng cú pháp hoặc không chứa dữ liệu JSON hợp lệ với Excalidraw.",
+    "resetLibrary": "Hành động này sẽ xóa toàn bộ thư viện của bạn. Bạn chắc chắn chứ?",
     "removeItemsFromsLibrary": "Xoá {{count}} món từ thư viện?",
     "invalidEncryptionKey": "Khóa mã hóa phải có 22 ký tự. Hợp tác trực tiếp bị vô hiệu hóa.",
-    "collabOfflineWarning": "Không có kết nối internet.\nThay đổi của bạn sẽ không được lưu!"
+    "collabOfflineWarning": "Không có kết nối internet.\nThay đổi của bạn sẽ không được lưu!",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "Loại tập tin không được hỗ trợ.",
     "imageInsertError": "Không thể thêm ảnh. Hãy thử lại sau...",
     "fileTooBig": "Tệp tin quá lớn. Dung lượng tối đa cho phép là {{maxSize}}.",
     "svgImageInsertError": "Không thể thêm ảnh SVG. Mã SVG có vẻ sai.",
-    "failedToFetchImage": "",
-    "invalidSVGString": "SVG không hợp lệ.",
+    "failedToFetchImage": "Có lỗi khi tải ảnh.",
     "cannotResolveCollabServer": "Không thể kết nối với máy chủ hợp tác. Hãy tải lại trang và thử lại.",
     "importLibraryError": "Không thể tải thư viện",
+    "saveLibraryError": "Không thể lưu thư viện vào bộ nhớ. Hãy lưu thành tệp trên máy để đảm bảo bạn không mất các thay đổi.",
     "collabSaveFailed": "Không thể lưu vào cơ sở dữ liệu. Nếu vấn đề tiếp tục xảy ra, bạn nên lưu tệp vào máy để đảm bảo bạn không bị mất công việc.",
     "collabSaveFailed_sizeExceeded": "Không thể lưu vào cơ sở dữ liệu, canvas có vẻ quá lớn. Bạn nên lưu tệp cục bộ để đảm bảo bạn không bị mất công việc.",
-    "imageToolNotSupported": "",
+    "imageToolNotSupported": "Hình ảnh đã được vô hiệu hóa.",
     "brave_measure_text_error": {
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": ""
+      "line1": "Dường như bạn đang sử dụng trình duyệt Brave với cài đặt <bold>Aggressively Block Fingerprinting</bold> được bật.",
+      "line2": "Điều này có thể gây ra lỗi cho các <bold>Text Elements</bold> trong bản vẽ của bạn.",
+      "line3": "Chúng tôi khuyên bạn nên tắt tùy chọn này. Xem <link>hướng dẫn này</link> để biết cách thực hiện.",
+      "line4": "Nếu tắt cài đặt này vẫn không sửa được lỗi hiển thị chữ, hãy tạo <issueLink>báo cáo lỗi</issueLink> trên GitHub hoặc liên hệ qua <discordLink>Discord</discordLink>."
     },
     "libraryElementTypeError": {
-      "embeddable": "",
-      "iframe": "",
-      "image": ""
+      "embeddable": "Không thể lưu phần tử nhúng vào thư viện",
+      "iframe": "Các phần tử IFrame không thể được thêm vào thư viện.",
+      "image": "Thêm hình ảnh vào thư viện sẽ sớm được hỗ trợ!"
     },
-    "asyncPasteFailedOnRead": "",
-    "asyncPasteFailedOnParse": "",
-    "copyToSystemClipboardFailed": ""
+    "asyncPasteFailedOnRead": "Không thể dán (không thể đọc từ bộ nhớ tạm của hệ thống).",
+    "asyncPasteFailedOnParse": "Không thể dán.",
+    "copyToSystemClipboardFailed": "Không thể sao chép vào bộ nhớ tạm."
   },
   "toolBar": {
     "selection": "Lựa chọn",
+    "lasso": "",
     "image": "Chèn ảnh",
     "rectangle": "Hình chữ nhật",
     "diamond": "Kim cương",
@@ -246,16 +304,32 @@
     "library": "Thư viện",
     "lock": "Giữ dụng cũ hiện tại sau khi vẽ",
     "penMode": "Chế độ bút vẽ - ngăn ngừa chạm nhầm",
-    "link": "Thêm/ Chỉnh sửa liên kết cho hình được chọn",
+    "link": "Thêm / Cập nhật liên kết cho hình đã chọn",
     "eraser": "Xóa",
-    "frame": "",
-    "magicframe": "",
-    "embeddable": "",
-    "laser": "",
+    "frame": "Công cụ tạo khung",
+    "magicframe": "Wireframe thành code",
+    "embeddable": "Nhúng Web",
+    "laser": "Con trỏ laser",
     "hand": "Tay kéo",
-    "extraTools": "",
-    "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "extraTools": "Công cụ khác",
+    "mermaidToExcalidraw": "Mermaid sang Excalidraw",
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "Hình chữ nhật",
+    "diamond": "Kim cương",
+    "ellipse": "Hình bầu dục",
+    "arrow": "Mũi tên",
+    "line": "Đường kẻ",
+    "freedraw": "Vẽ tự do",
+    "text": "Văn bản",
+    "image": "Hình ảnh",
+    "group": "Nhóm",
+    "frame": "Khung hình",
+    "magicframe": "Wireframe thành code",
+    "embeddable": "Nhúng Web",
+    "selection": "Lựa chọn",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "Hành động canvas",
@@ -263,28 +337,33 @@
     "shapes": "Các hình khối"
   },
   "hints": {
-    "canvasPanning": "Để di chuyển canvas, giữ con lăn chuột hoặc phím cách trong khi kéo, hoặc sử dụng công cụ cầm tay",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "Ấn để bắt đầu nhiểm điểm vẽ, kéo để vẽ một đường thẳng",
+    "arrowTool": "",
     "freeDraw": "Ấn bà kéo, thả khi bạn xong",
     "text": "Mẹo: bạn có thể thêm văn bản tại bất cứ đâu bằng cách ấn hai lần bằng tool lựa chọn",
-    "embeddable": "",
-    "text_selected": "Ấn 2 lần hoặc nhấn ENTER để chỉnh văn bản",
-    "text_editing": "Nhấn Escape hoặc Ctrl/Cmd+ENTER để hoàn thành chỉnh sửa",
-    "linearElementMulti": "Nhấn vào điểm cuối hoặc nhấn Escape hoặc Enter để kết thúc",
-    "lockAngle": "Bạn có thể chỉnh lại góc bằng cách giữ phím SHIFT",
-    "resize": "Bạn có thể chỉnh tỷ lệ bằng cách giữ SHIFT khi chỉnh kích cỡ,\ngiữ ALT để chỉnh kích cỡ từ trung tâm",
+    "embeddable": "Nhấp và kéo để tạo nội dung nhúng từ website.",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
-    "publishLibrary": "",
+    "publishLibrary": "Chia sẻ thư viện của bạn",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "Tính năng này có thể được bật bằng cách đặt cờ \"dom.events.asyncClipboard.clipboardItem\" thành \"true\". Để thay đổi cờ trình duyệt trong Firefox, hãy truy cập trang \"about:config\".",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "Không thể xem trước",
@@ -292,65 +371,72 @@
     "canvasTooBigTip": "Mẹo: hãy thử di chuyển các elements nhất lại gần nhau hơn một chút."
   },
   "errorSplash": {
-    "headingMain": "",
+    "headingMain": "Đã xảy ra lỗi. Hãy thử <button>tải lại trang</button>.",
     "clearCanvasMessage": "Nếu không tải lại được, hãy thử <button>dọn canvas.</button>",
     "clearCanvasCaveat": " Điều này sẽ dẫn đến mất dữ liệu bạn đã làm ",
     "trackedToSentry": "",
     "openIssueMessage": "",
-    "sceneContent": ""
+    "sceneContent": "Nội dung bản vẽ:"
+  },
+  "shareDialog": {
+    "or": "Hoặc"
   },
   "roomDialog": {
-    "desc_intro": "",
-    "desc_privacy": "",
-    "button_startSession": "",
-    "button_stopSession": "",
-    "desc_inProgressIntro": "",
-    "desc_shareLink": "",
-    "desc_exitSession": "",
-    "shareTitle": ""
+    "desc_intro": "Mời mọi người cùng cộng tác trong bản vẽ của bạn.",
+    "desc_privacy": "Đừng lo, phiên hoạt động đã được mã hóa đầu cuối, và hoàn toàn riêng tư. Ngay cả máy chủ của chúng tôi cũng không thể thấy những gì bạn vẽ.",
+    "button_startSession": "Bắt đầu phiên",
+    "button_stopSession": "Kết thúc phiên",
+    "desc_inProgressIntro": "Phiên làm việc trực tiếp hiện đang diễn ra.",
+    "desc_shareLink": "Chia sẻ liên kết này với người bạn muốn cộng tác cùng:",
+    "desc_exitSession": "Dừng phiên sẽ đưa bạn ra khỏi phòng, nhưng bạn vẫn có thể làm việc tiếp trên máy. Những người khác sẽ không bị ảnh hưởng và vẫn cộng tác trên bản của họ.",
+    "shareTitle": "Vào phiên làm việc chung trên Excalidraw"
   },
   "errorDialog": {
-    "title": ""
+    "title": "Lỗi"
   },
   "exportDialog": {
-    "disk_title": "",
+    "disk_title": "Lưu về máy",
     "disk_details": "",
-    "disk_button": "",
-    "link_title": "",
-    "link_details": "",
-    "link_button": "",
-    "excalidrawplus_description": "",
-    "excalidrawplus_button": "",
-    "excalidrawplus_exportError": ""
+    "disk_button": "Lưu vào tệp tin",
+    "link_title": "Liên kết có thể chia sẻ",
+    "link_details": "Tạo liên kết chỉ xem",
+    "link_button": "Tạo liên kết",
+    "excalidrawplus_description": "Lưu bản vẽ vào không gian làm việc Excalidraw+ của bạn.",
+    "excalidrawplus_button": "Xuất",
+    "excalidrawplus_exportError": "Hiện tại không thể xuất sang Excalidraw+..."
   },
   "helpDialog": {
-    "blog": "",
-    "click": "",
+    "blog": "Đọc blog của chúng tôi",
+    "click": "Nhấp",
     "deepSelect": "",
     "deepBoxSelect": "",
-    "curvedArrow": "",
-    "curvedLine": "",
-    "documentation": "",
-    "doubleClick": "",
-    "drag": "",
-    "editor": "",
-    "editLineArrowPoints": "",
-    "editText": "",
-    "github": "",
-    "howto": "",
-    "or": "",
-    "preventBinding": "",
-    "tools": "",
-    "shortcuts": "",
-    "textFinish": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
+    "curvedArrow": "Mũi tên cong",
+    "curvedLine": "Đường cong",
+    "documentation": "Tài liệu",
+    "doubleClick": "Nhấp đúp",
+    "drag": "kéo",
+    "editor": "Trình chỉnh sửa",
+    "editLineArrowPoints": "Chỉnh sửa điểm của đường/mũi tên",
+    "editText": "Chỉnh sửa văn bản / thêm nhãn",
+    "github": "Phát hiện lỗi? Gửi phản hồi",
+    "howto": "Làm theo hướng dẫn của chúng tôi",
+    "or": "hoặc",
+    "preventBinding": "Ngăn mũi tên tự gắn",
+    "tools": "Công cụ",
+    "shortcuts": "Phím tắt bàn phím",
+    "textFinish": "Hoàn tất chỉnh sửa (trình soạn thảo văn bản)",
     "textNewLine": "",
-    "title": "",
-    "view": "",
+    "title": "Trợ giúp",
+    "view": "Xem",
     "zoomToFit": "",
     "zoomToSelection": "",
-    "toggleElementLock": "",
-    "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "toggleElementLock": "Khóa/mở khóa vùng lựa chọn",
+    "movePageUpDown": "Chuyển trang lên/xuống",
+    "movePageLeftRight": "Chuyển trang trái/phải",
+    "cropStart": "Cắt ảnh",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": "Dọn canvas"
@@ -358,98 +444,102 @@
   "publishDialog": {
     "title": "",
     "itemName": "Tên món",
-    "authorName": "",
-    "githubUsername": "",
-    "twitterUsername": "",
-    "libraryName": "",
-    "libraryDesc": "",
-    "website": "",
+    "authorName": "Tên tác giả",
+    "githubUsername": "Tên tài khoản Github",
+    "twitterUsername": "Tên tài khoản Twitter",
+    "libraryName": "Tên thư viện",
+    "libraryDesc": "Mô tả thư viện",
+    "website": "Website",
     "placeholder": {
-      "authorName": "",
-      "libraryName": "",
-      "libraryDesc": "",
+      "authorName": "Tên của bạn hoặc tên tài khoản",
+      "libraryName": "Tên thư viện của bạn",
+      "libraryDesc": "Mô tả thư viện của bạn để mọi người có thể hiểu được cách dùng của nó",
       "githubHandle": "",
-      "twitterHandle": "",
-      "website": ""
+      "twitterHandle": "Tên Twitter (không bắt buộc) để chúng tôi ghi nhận bạn khi chia sẻ trên Twitter.",
+      "website": "Đường dẫn tới trang web cá nhân của bạn hoặc tới đâu đó (tùy chọn)"
     },
     "errors": {
-      "required": "",
-      "website": ""
+      "required": "Bắt buộc",
+      "website": "Nhập đường dẫn hợp lệ"
     },
-    "noteDescription": "",
-    "noteGuidelines": "",
-    "noteLicense": "",
+    "noteDescription": "Chia sẻ thư viện của bạn vào <link>kho thư viện công khai</link> để mọi người có thể dùng trong bản vẽ của họ.",
+    "noteGuidelines": "Thư viện cần được phê duyệt thủ công trước. Vui lòng đọc <link>hướng dẫn</link> trước khi gửi. Bạn sẽ cần tài khoản GitHub để trao đổi và chỉnh sửa khi được yêu cầu, nhưng điều này không bắt buộc.",
+    "noteLicense": "Bằng việc gửi, bạn đồng ý rằng thư viện sẽ được phát hành theo <link>Giấy phép MIT</link>, nghĩa là bất kỳ ai cũng có thể sử dụng mà không bị hạn chế.",
     "noteItems": "Từng món trong thư viện phải có tên riêng để có thể lọc. Các món thư viện sau đây sẽ thêm:",
     "atleastOneLibItem": "Vui lòng chọn ít nhất một món thư viện để bắt đầu",
     "republishWarning": "Lưu ý: một số món đã chọn được đánh dấu là đã xuất bản/đã gửi. Bạn chỉ nên gửi lại các món khi cập nhật thư viện hiện có hoặc gửi."
   },
   "publishSuccessDialog": {
-    "title": "",
-    "content": ""
+    "title": "Thư viện đã được gửi",
+    "content": "Cảm ơn {{authorName}}! Thư viện của bạn đã được gửi để duyệt. Bạn có thể xem tiến trình <link>tại đây</link>."
   },
   "confirmDialog": {
-    "resetLibrary": "",
+    "resetLibrary": "Cài lại thư viện",
     "removeItemsFromLib": "Xóa món đã chọn khỏi thư viện"
   },
   "imageExportDialog": {
-    "header": "",
+    "header": "Xuất thành hình ảnh",
     "label": {
-      "withBackground": "",
-      "onlySelected": "",
-      "darkMode": "",
+      "withBackground": "Nền",
+      "onlySelected": "Chỉ phần tử đã lựa chọn",
+      "darkMode": "Chế độ tối",
       "embedScene": "",
-      "scale": "",
-      "padding": ""
+      "scale": "Thu phóng",
+      "padding": "Phần đệm"
     },
     "tooltip": {
-      "embedScene": ""
+      "embedScene": "Dữ liệu của bối cảnh sẽ được lưu dưới định dạng PNG/SVG vậy nên bối cảnh có thể khôi phục lại từ nó.\nSẽ tăng kích thước của tệp được lưu."
     },
     "title": {
       "exportToPng": "",
       "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "copyPngToClipboard": "Sao chép PNG vào bộ nhớ"
     },
     "button": {
-      "exportToPng": "",
-      "exportToSvg": "",
-      "copyPngToClipboard": ""
+      "exportToPng": "PNG",
+      "exportToSvg": "SVG",
+      "copyPngToClipboard": "Sao chép vào bộ nhớ tạm"
     }
   },
   "encrypted": {
-    "tooltip": "",
-    "link": ""
+    "tooltip": "Bản vẽ của bạn được bảo mật bằng mã hóa đầu cuối, vì vậy máy chủ Excalidraw sẽ không thể xem chúng.",
+    "link": "Bài blog về mã hóa đầu cuối trong Excalidraw"
   },
   "stats": {
-    "angle": "",
-    "element": "",
-    "elements": "",
-    "height": "",
-    "scene": "",
-    "selected": "",
-    "storage": "",
-    "title": "",
-    "total": "",
-    "version": "",
-    "versionCopy": "",
-    "versionNotAvailable": "",
-    "width": ""
+    "angle": "Góc",
+    "shapes": "",
+    "height": "Chiều cao",
+    "scene": "Bối cảnh",
+    "selected": "Đã chọn",
+    "storage": "Bộ nhớ",
+    "fullTitle": "",
+    "title": "Thuộc tính",
+    "generalStats": "Chung",
+    "elementProperties": "",
+    "total": "Tổng cộng",
+    "version": "Phiên bản",
+    "versionCopy": "Nhấn để sao chép",
+    "versionNotAvailable": "Phiên bản không khả dụng",
+    "width": "Chiều rộng"
   },
   "toast": {
-    "addedToLibrary": "",
-    "copyStyles": "",
-    "copyToClipboard": "",
-    "copyToClipboardAsPng": "",
-    "fileSaved": "",
+    "addedToLibrary": "Đã thêm vào Thư viện",
+    "copyStyles": "Đã sao chép định dạng.",
+    "copyToClipboard": "Đã sao chép vào bộ nhớ tạm.",
+    "copyToClipboardAsPng": "Đã sao chép {{exportSelection}} sang bộ nhớ tạm dưới định dạng PNG\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "Đã sao chép {{exportSelection}} sang bộ nhớ tạm dưới định dạng SVG\n({{exportColorScheme}})",
+    "fileSaved": "Đã lưu tập tin",
     "fileSavedToFilename": "",
-    "canvas": "canvas",
-    "selection": "",
-    "pasteAsSingleElement": "",
-    "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "canvas": "",
+    "selection": "lựa chọn",
+    "pasteAsSingleElement": "Sử dụng {{shortcut}} để dán như một phần tử riêng lẻ hoặc dán vào một bộ soạn thảo văn bản có sẵn",
+    "unableToEmbed": "Nhúng liên kết này hiện không được phép. Đưa ra vấn đề trên GitHub để yêu cầu đưa liên kết này vào danh sách được phép",
+    "unrecognizedLinkFormat": "Liên kết bạn nhúng không khớp với định dạng mong đợi. Vui lòng thử dán liên kết 'embed' do trang nguồn cung cấp",
+    "elementLinkCopied": "Đã sao chép liên kết vào bộ nhớ tạm"
   },
   "colors": {
-    "transparent": "",
-    "black": "",
+    "transparent": "Độ trong suốt",
+    "black": "Màu đen",
     "white": "",
     "red": "",
     "pink": "",
@@ -458,10 +548,10 @@
     "gray": "",
     "blue": "",
     "cyan": "",
-    "teal": "",
-    "green": "",
-    "yellow": "",
-    "orange": "",
+    "teal": "Màu xanh lục",
+    "green": "Màu xanh lá",
+    "yellow": "Màu vàng",
+    "orange": "Màu cam",
     "bronze": ""
   },
   "welcomeScreen": {
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/zh-CN.json b/packages/excalidraw/locales/zh-CN.json
index 19d715750e..e7bff284ed 100644
--- a/packages/excalidraw/locales/zh-CN.json
+++ b/packages/excalidraw/locales/zh-CN.json
@@ -21,7 +21,9 @@
     "copyStyles": "拷贝样式",
     "pasteStyles": "粘贴样式",
     "stroke": "描边",
+    "changeStroke": "更改描边颜色",
     "background": "背景",
+    "changeBackground": "更改背景颜色",
     "fill": "填充",
     "strokeWidth": "描边宽度",
     "strokeStyle": "边框样式",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "三角箭头（空心）",
     "arrowhead_diamond": "菱形",
     "arrowhead_diamond_outline": "菱形（空心）",
+    "arrowhead_crowfoot_many": "鸦爪标记（多）",
+    "arrowhead_crowfoot_one": "鸦爪标记（一）",
+    "arrowhead_crowfoot_one_or_many": "鸦爪标记（一或多）",
+    "more_options": "更多选项",
+    "arrowtypes": "箭头类型",
+    "arrowtype_sharp": "直箭头",
+    "arrowtype_round": "曲线箭头",
+    "arrowtype_elbowed": "拐角箭头",
     "fontSize": "字体大小",
     "fontFamily": "字体",
     "addWatermark": "添加 “使用 Excalidraw 创建” 水印",
@@ -72,6 +82,7 @@
     "canvasColors": "画布上的",
     "canvasBackground": "画布背景",
     "drawingCanvas": "绘制 Canvas",
+    "clearCanvas": "清除画布",
     "layers": "图层",
     "actions": "操作",
     "language": "语言",
@@ -84,12 +95,13 @@
     "group": "编组",
     "ungroup": "解除编组",
     "collaborators": "协作者",
-    "showGrid": "显示网格",
+    "toggleGrid": "切换网格显示",
     "addToLibrary": "添加到素材库中",
     "removeFromLibrary": "从素材库中移除",
     "libraryLoadingMessage": "正在加载素材库…",
     "libraries": "浏览素材库",
     "loadingScene": "正在加载绘图…",
+    "loadScene": "从文件加载绘图",
     "align": "对齐",
     "alignTop": "顶部对齐",
     "alignBottom": "底端对齐",
@@ -105,7 +117,9 @@
     "share": "分享",
     "showStroke": "显示描边颜色选择器",
     "showBackground": "显示背景颜色选择器",
-    "toggleTheme": "切换主题",
+    "showFonts": "显示字体选择器",
+    "toggleTheme": "切换浅色/深色主题",
+    "theme": "主题",
     "personalLib": "个人素材库",
     "excalidrawLib": "Excalidraw 素材库",
     "decreaseFontSize": "缩小字体大小",
@@ -115,16 +129,21 @@
     "createContainerFromText": "将文本包围在容器中",
     "link": {
       "edit": "编辑链接",
-      "editEmbed": "编辑链接与嵌入",
-      "create": "新建链接",
-      "createEmbed": "创建链接与嵌入",
+      "editEmbed": "编辑嵌入链接",
+      "create": "添加链接",
       "label": "链接",
       "labelEmbed": "链接与嵌入",
-      "empty": "未设定链接"
+      "empty": "未设定链接",
+      "hint": "在此处输入或粘贴您的链接",
+      "goToElement": "前往目标元素"
     },
     "lineEditor": {
       "edit": "编辑线条",
-      "exit": "退出线条编辑"
+      "editArrow": "编辑箭头"
+    },
+    "polygon": {
+      "breakPolygon": "解除多边形",
+      "convertToPolygon": "转换为多边形"
     },
     "elementLock": {
       "lock": "锁定",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "分离出画框中的所有元素",
     "eyeDropper": "从画布上取色",
     "textToDiagram": "文字至图表",
-    "prompt": "Prompt"
+    "prompt": "Prompt",
+    "followUs": "关注我们",
+    "discordChat": "Discord 群组",
+    "zoomToFitViewport": "缩放以适应视图",
+    "zoomToFitSelection": "缩放以适应选区",
+    "zoomToFit": "缩放以适应所有元素",
+    "installPWA": "在本地安装 Excalidraw (PWA)",
+    "autoResize": "启用文本自动缩放",
+    "imageCropping": "图片裁剪",
+    "unCroppedDimension": "未裁剪的尺寸",
+    "copyElementLink": "复制此对象的链接",
+    "linkToElement": "链接到对象",
+    "wrapSelectionInFrame": "用选中的元素创建画框",
+    "tab": "Tab",
+    "shapeSwitch": "切换形状"
+  },
+  "elementLink": {
+    "title": "链接到对象",
+    "desc": "点击画布上的形状或粘贴链接。",
+    "notFound": "在画布上找不到链接的对象。"
   },
   "library": {
     "noItems": "尚未添加任何项目……",
     "hint_emptyLibrary": "选中画布上的项目添加到此处，或从下方的公共素材库中导入。",
-    "hint_emptyPrivateLibrary": "选中画布上的项目添加到此处。"
+    "hint_emptyPrivateLibrary": "选中画布上的项目添加到此处。",
+    "search": {
+      "inputPlaceholder": "搜索库",
+      "heading": "匹配的库",
+      "noResults": "无匹配项……",
+      "clearSearch": "清除搜索"
+    }
+  },
+  "search": {
+    "title": "在画布上查找",
+    "noMatch": "无匹配项…",
+    "singleResult": "结果",
+    "multipleResults": "结果",
+    "placeholder": "在画布上查找文本…",
+    "frames": "画框",
+    "texts": "文本"
   },
   "buttons": {
     "clearReset": "重置画布",
@@ -151,6 +204,7 @@
     "exportImage": "导出图片...",
     "export": "保存到...",
     "copyToClipboard": "复制到剪贴板",
+    "copyLink": "复制链接",
     "save": "保存至当前文件",
     "saveAs": "保存为",
     "load": "打开",
@@ -171,14 +225,16 @@
     "fullScreen": "全屏",
     "darkMode": "深色模式",
     "lightMode": "浅色模式",
+    "systemMode": "系统模式",
     "zenMode": "禅模式",
     "objectsSnapMode": "吸附至对象",
     "exitZenMode": "退出禅模式",
     "cancel": "取消",
+    "saveLibNames": "保存名称并退出",
     "clear": "清除",
     "remove": "删除",
     "embed": "切换嵌入",
-    "publishLibrary": "发布",
+    "publishLibrary": "重命名或发布",
     "submit": "提交",
     "confirm": "确定",
     "embeddableInteractionButton": "点击以开始交互"
@@ -204,7 +260,8 @@
     "resetLibrary": "这将会清除你的素材库。你确定要这么做吗？",
     "removeItemsFromsLibrary": "确定要从素材库中删除 {{count}} 个项目吗？",
     "invalidEncryptionKey": "密钥必须包含22个字符。实时协作已被禁用。",
-    "collabOfflineWarning": "无网络连接。\n您的改动将不会被保存！"
+    "collabOfflineWarning": "无网络连接。\n您的改动将不会被保存！",
+    "localStorageQuotaExceeded": "超过浏览器存储配额。更改将不会被保存。"
   },
   "errors": {
     "unsupportedFileType": "不支持的文件格式。",
@@ -212,9 +269,9 @@
     "fileTooBig": "文件过大。最大允许的大小为 {{maxSize}}。",
     "svgImageInsertError": "无法插入 SVG 图像。该 SVG 标记似乎是无效的。",
     "failedToFetchImage": "无法获取图片。",
-    "invalidSVGString": "无效的 SVG。",
     "cannotResolveCollabServer": "无法连接到实时协作服务器。请重新加载页面并重试。",
     "importLibraryError": "无法加载素材库",
+    "saveLibraryError": "无法将库保存至存储。请将库保存为本地文件，以确保您的更改不被丢失。",
     "collabSaveFailed": "无法保存到后端数据库。如果问题持续存在，您应该保存文件到本地，以确保您的工作不会丢失。",
     "collabSaveFailed_sizeExceeded": "无法保存到后端数据库，画布似乎过大。您应该保存文件到本地，以确保您的工作不会丢失。",
     "imageToolNotSupported": "图片已被禁用。",
@@ -225,7 +282,7 @@
       "line4": "如果禁用此设置无法修复文本元素的显示，请在 GitHub 上提交一个 <issueLink>issue</issueLink> ，或者在 <discordLink>Discord</discordLink> 上反馈"
     },
     "libraryElementTypeError": {
-      "embeddable": "嵌入的元素不能被添加到素材库。",
+      "embeddable": "嵌入元素不能添加到素材库。",
       "iframe": "不能将 IFrame 元素添加到素材库中。",
       "image": "我们不久将支持添加图片到素材库"
     },
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "选择",
+    "lasso": "套索选择",
     "image": "插入图像",
     "rectangle": "矩形",
     "diamond": "菱形",
@@ -246,7 +304,7 @@
     "library": "素材库",
     "lock": "绘制后保持所选的工具栏状态",
     "penMode": "笔模式 – 避免误触",
-    "link": "为选中的形状添加/更新链接",
+    "link": "为选定的形状添加或更改链接",
     "eraser": "橡皮",
     "frame": "画框工具",
     "magicframe": "线框图至代码",
@@ -255,7 +313,23 @@
     "hand": "抓手（平移工具）",
     "extraTools": "更多工具",
     "mermaidToExcalidraw": "Mermaid 至 Excalidraw",
-    "magicSettings": "AI 设置"
+    "convertElementType": "切换形状种类"
+  },
+  "element": {
+    "rectangle": "矩形",
+    "diamond": "菱形",
+    "ellipse": "椭圆",
+    "arrow": "箭头",
+    "line": "线条",
+    "freedraw": "自由书写",
+    "text": "文字",
+    "image": "图片",
+    "group": "组",
+    "frame": "画框",
+    "magicframe": "线框图至代码",
+    "embeddable": "嵌入网页",
+    "selection": "选择",
+    "iframe": "IFrame"
   },
   "headings": {
     "canvasActions": "画布动作",
@@ -263,28 +337,33 @@
     "shapes": "形状"
   },
   "hints": {
-    "canvasPanning": "要移动画布，请按住鼠标滚轮或空格键同时拖拽鼠标，或使用抓手工具。",
+    "dismissSearch": "按{{shortcut}}取消搜索",
+    "canvasPanning": "要移动画布，请按住{{shortcut_1}}或{{shortcut_2}}同时拖拽鼠标，或使用抓手工具。",
     "linearElement": "点击创建多个点 拖动创建直线",
+    "arrowTool": "点击创建多个点，拖动创建直线。按 {{shortcut}} 切换箭头类型。",
     "freeDraw": "点击并拖动，完成时松开",
     "text": "提示：您也可以使用选择工具双击任意位置来添加文字",
     "embeddable": "点击并拖动以创建嵌入网页",
-    "text_selected": "双击或按回车键以编辑文本",
-    "text_editing": "按下 Escape 或 CtrlOrCmd+ENTER 完成编辑",
-    "linearElementMulti": "点击最后一个点或按下 Esc/Enter 来完成",
-    "lockAngle": "可以按住 Shift 来约束角度",
-    "resize": "您可以按住SHIFT来限制比例大小，\n按住ALT来调整中心大小",
-    "resizeImage": "按住SHIFT可以自由缩放，\n按住ALT可以从中间缩放",
-    "rotate": "旋转时可以按住 Shift 来约束角度",
-    "lineEditor_info": "按住 CtrlOrCmd 并双击或按 CtrlOrCmd + Enter 来编辑点",
-    "lineEditor_pointSelected": "按下 Delete 移除点，CtrlOrCmd+D 以复制，拖动以移动",
-    "lineEditor_nothingSelected": "选择要编辑的点 (按住 SHIFT 选择多个)，\n或按住 Alt 并点击以添加新点",
-    "placeImage": "点击放置图像，或者点击并拖动以手动设置图像大小",
+    "text_selected": "双击或按{{shortcut}}编辑文本",
+    "text_editing": "按{{shortcut_1}}或{{shortcut_2}}完成编辑",
+    "linearElementMulti": "点击最后的点或按{{shortcut_1}}或{{shortcut_2}}完成",
+    "lockAngle": "可以按住{{shortcut}}来约束角度",
+    "resize": "缩放时按住{{shortcut_1}}可以约束宽高比例，\n按住{{shortcut_2}}可以从中间缩放",
+    "resizeImage": "按住{{shortcut_1}}可以自由缩放，\n按住{{shortcut_2}}可以从中间缩放",
+    "rotate": "旋转时可以按住{{shortcut}}来约束角度",
+    "lineEditor_info": "按住{{shortcut_1}}双击，或者按{{shortcut_2}}编辑点",
+    "lineEditor_line_info": "双击或按{{shortcut}}编辑点",
+    "lineEditor_pointSelected": "按{{shortcut_1}}移除点，按{{shortcut_2}}复制点，拖拽移动点",
+    "lineEditor_nothingSelected": "选择要编辑的点 (按住{{shortcut_1}}选择多个)，\n或按住{{shortcut_2}}并点击以添加新点",
     "publishLibrary": "发布您自己的素材库",
-    "bindTextToElement": "按下 Enter 以添加文本",
-    "deepBoxSelect": "按住 CtrlOrCmd 以深度选择，并避免拖拽",
-    "eraserRevert": "按住 Alt 以反选被标记删除的元素",
+    "bindTextToElement": "按{{shortcut}}添加文本",
+    "createFlowchart": "按{{shortcut}}创建流程图",
+    "deepBoxSelect": "按住{{shortcut}}深度选择，并避免拖拽",
+    "eraserRevert": "按住{{shortcut}}反选被标记删除的元素",
     "firefox_clipboard_write": "将高级配置首选项“dom.events.asyncClipboard.clipboardItem”设置为“true”可以启用此功能。要更改 Firefox 的高级配置首选项，请前往“about:config”页面。",
-    "disableSnapping": "按住 Ctrl 或 Cmd 以禁用吸附"
+    "disableSnapping": "按住{{shortcut}}禁用吸附",
+    "enterCropEditor": "双击图片或按{{shortcut}}开始裁剪",
+    "leaveCropEditor": "点击图片以外的区域或按{{shortcut_1}}或{{shortcut_2}}完成裁剪"
   },
   "canvasError": {
     "cannotShowPreview": "无法显示预览",
@@ -299,9 +378,12 @@
     "openIssueMessage": "我们非常谨慎地处理错误信息，您的画布内容不会被包含在错误报告中。如果您的画布内容不需要保持私密，请考虑在我们的 <button>bug 跟踪系统</button>上提供更多信息。请复制粘贴以下信息到 GitHub Issue 中。",
     "sceneContent": "画布内容:"
   },
+  "shareDialog": {
+    "or": "或"
+  },
   "roomDialog": {
-    "desc_intro": "你可以邀请其他人到目前的画面中与你协作。",
-    "desc_privacy": "别担心，该会话使用端到端加密，无论绘制什么都将保持私密，甚至连我们的服务器也无法查看。",
+    "desc_intro": "邀请他人协作绘图。",
+    "desc_privacy": "别担心，会话是端到端加密、完全私密的。即使是我们的服务器也无法看到您绘制的内容。",
     "button_startSession": "开始会话",
     "button_stopSession": "结束会话",
     "desc_inProgressIntro": "实时协作会话进行中。",
@@ -328,6 +410,8 @@
     "click": "单击",
     "deepSelect": "深度选择",
     "deepBoxSelect": "在方框内深度选择并避免拖拽",
+    "createFlowchart": "从一个基本元素创建流程图",
+    "navigateFlowchart": "在流程图元素间移动",
     "curvedArrow": "曲线箭头",
     "curvedLine": "曲线",
     "documentation": "文档",
@@ -336,7 +420,7 @@
     "editor": "编辑器",
     "editLineArrowPoints": "编辑线条或箭头的点",
     "editText": "添加或编辑文本",
-    "github": "发现问题？提交反馈",
+    "github": "提交问题",
     "howto": "帮助文档",
     "or": "或",
     "preventBinding": "禁用箭头吸附",
@@ -350,7 +434,9 @@
     "zoomToSelection": "缩放到选区",
     "toggleElementLock": "锁定/解锁",
     "movePageUpDown": "上下移动页面",
-    "movePageLeftRight": "左右移动页面"
+    "movePageLeftRight": "左右移动页面",
+    "cropStart": "裁剪图片",
+    "cropFinish": "完成图片裁剪"
   },
   "clearCanvasDialog": {
     "title": "清除画布"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "角度",
-    "element": "元素",
-    "elements": "元素",
+    "shapes": "形状",
     "height": "高度",
     "scene": "画布",
     "selected": "选中",
     "storage": "存储",
-    "title": "详细统计信息",
+    "fullTitle": "画布与形状属性",
+    "title": "属性",
+    "generalStats": "概况",
+    "elementProperties": "形状属性",
     "total": "总计",
     "version": "版本",
     "versionCopy": "点击复制",
@@ -439,13 +527,15 @@
     "copyStyles": "样式已拷贝。",
     "copyToClipboard": "已复制到剪切板。",
     "copyToClipboardAsPng": "已将 {{exportSelection}} 作为 PNG 复制到剪贴板\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "已将 {{exportSelection}} 作为 SVG 复制到剪贴板\n({{exportColorScheme}})",
     "fileSaved": "文件已保存。",
     "fileSavedToFilename": "保存到 {filename}",
     "canvas": "画布",
     "selection": "所选项",
     "pasteAsSingleElement": "使用 {{shortcut}} 粘贴为单个元素，\n或粘贴到现有的文本编辑器里",
     "unableToEmbed": "目前不允许嵌入此网址。请在 GitHub 上提 issue 请求将此网址加入白名单",
-    "unrecognizedLinkFormat": "您嵌入的链接不符合格式要求。请尝试粘贴源网站提供的“嵌入 (embed)”字符串"
+    "unrecognizedLinkFormat": "您嵌入的链接不符合格式要求。请尝试粘贴源网站提供的“嵌入 (embed)”字符串",
+    "elementLinkCopied": "链接已复制到剪贴板"
   },
   "colors": {
     "transparent": "透明",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "颜色",
     "mostUsedCustomColors": "常用自定义颜色",
     "colors": "颜色",
     "shades": "色调明暗",
@@ -521,5 +612,53 @@
     "description": "目前仅支持<flowchartLink>流程图</flowchartLink>、<sequenceLink>序列图</sequenceLink>和<classLink>类图</classLink>。其他类型在 Excalidraw 中将以图像呈现。",
     "syntax": "Mermaid 语法",
     "preview": "预览"
+  },
+  "quickSearch": {
+    "placeholder": "快速搜索"
+  },
+  "fontList": {
+    "badge": {
+      "old": "旧的"
+    },
+    "sceneFonts": "画布中的",
+    "availableFonts": "可用字体",
+    "empty": "未找到字体"
+  },
+  "userList": {
+    "empty": "未找到用户",
+    "hint": {
+      "text": "点击关注用户",
+      "followStatus": "您已关注此用户",
+      "inCall": "用户在语音通话中",
+      "micMuted": "用户的麦克风已静音",
+      "isSpeaking": "用户正在说话"
+    }
+  },
+  "commandPalette": {
+    "title": "命令面板",
+    "shortcuts": {
+      "select": "选择",
+      "confirm": "确定",
+      "close": "关闭"
+    },
+    "recents": "最近使用",
+    "search": {
+      "placeholder": "搜索菜单、命令、探索隐藏功能",
+      "noMatch": "没有匹配的命令……"
+    },
+    "itemNotAvailable": "命令不可用……",
+    "shortcutHint": "用 {{shortcut}} 打开命令面板"
+  },
+  "keys": {
+    "ctrl": "Ctrl",
+    "option": "Option",
+    "cmd": "Cmd",
+    "alt": "Alt",
+    "escape": "Esc",
+    "enter": "回车键",
+    "shift": "Shift",
+    "spacebar": "空格",
+    "delete": "Delete",
+    "mmb": "鼠标滚轮"
   }
 }
diff --git a/packages/excalidraw/locales/zh-HK.json b/packages/excalidraw/locales/zh-HK.json
index d1760a8045..c547d85d20 100644
--- a/packages/excalidraw/locales/zh-HK.json
+++ b/packages/excalidraw/locales/zh-HK.json
@@ -21,7 +21,9 @@
     "copyStyles": "複製樣式",
     "pasteStyles": "套用樣式",
     "stroke": "筆跡顏色",
+    "changeStroke": "",
     "background": "填充顏色",
+    "changeBackground": "",
     "fill": "背景樣式",
     "strokeWidth": "筆跡寬度",
     "strokeStyle": "筆跡線條",
@@ -44,6 +46,14 @@
     "arrowhead_triangle_outline": "",
     "arrowhead_diamond": "",
     "arrowhead_diamond_outline": "",
+    "arrowhead_crowfoot_many": "",
+    "arrowhead_crowfoot_one": "",
+    "arrowhead_crowfoot_one_or_many": "",
+    "more_options": "",
+    "arrowtypes": "",
+    "arrowtype_sharp": "",
+    "arrowtype_round": "",
+    "arrowtype_elbowed": "",
     "fontSize": "字型大小",
     "fontFamily": "字體",
     "addWatermark": "加入「使用 Excalidraw 製圖」水印",
@@ -72,6 +82,7 @@
     "canvasColors": "",
     "canvasBackground": "畫布背景顏色",
     "drawingCanvas": "畫布",
+    "clearCanvas": "",
     "layers": "圖層",
     "actions": "動作",
     "language": "🌏 語言",
@@ -84,12 +95,13 @@
     "group": "建立物件群組",
     "ungroup": "取消物件群組",
     "collaborators": "已連線的協作者",
-    "showGrid": "顯示網格",
+    "toggleGrid": "",
     "addToLibrary": "加入作品庫",
     "removeFromLibrary": "從作品庫中移除",
     "libraryLoadingMessage": "正在載入作品庫…",
     "libraries": "瀏覽作品庫",
     "loadingScene": "載入畫布中…",
+    "loadScene": "",
     "align": "物件對齊",
     "alignTop": "水平置頂",
     "alignBottom": "水平置底",
@@ -105,7 +117,9 @@
     "share": "",
     "showStroke": "",
     "showBackground": "",
+    "showFonts": "",
     "toggleTheme": "",
+    "theme": "",
     "personalLib": "",
     "excalidrawLib": "",
     "decreaseFontSize": "",
@@ -117,14 +131,19 @@
       "edit": "",
       "editEmbed": "",
       "create": "",
-      "createEmbed": "",
       "label": "",
       "labelEmbed": "",
-      "empty": ""
+      "empty": "",
+      "hint": "",
+      "goToElement": ""
     },
     "lineEditor": {
       "edit": "",
-      "exit": ""
+      "editArrow": ""
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "",
@@ -138,12 +157,46 @@
     "removeAllElementsFromFrame": "",
     "eyeDropper": "",
     "textToDiagram": "",
-    "prompt": ""
+    "prompt": "",
+    "followUs": "",
+    "discordChat": "",
+    "zoomToFitViewport": "",
+    "zoomToFitSelection": "",
+    "zoomToFit": "",
+    "installPWA": "",
+    "autoResize": "",
+    "imageCropping": "",
+    "unCroppedDimension": "",
+    "copyElementLink": "",
+    "linkToElement": "",
+    "wrapSelectionInFrame": "",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "",
+    "desc": "",
+    "notFound": ""
   },
   "library": {
     "noItems": "",
     "hint_emptyLibrary": "",
-    "hint_emptyPrivateLibrary": ""
+    "hint_emptyPrivateLibrary": "",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "",
+    "noMatch": "",
+    "singleResult": "",
+    "multipleResults": "",
+    "placeholder": "",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
     "clearReset": "清空畫布",
@@ -151,6 +204,7 @@
     "exportImage": "",
     "export": "",
     "copyToClipboard": "",
+    "copyLink": "",
     "save": "",
     "saveAs": "",
     "load": "",
@@ -171,10 +225,12 @@
     "fullScreen": "",
     "darkMode": "",
     "lightMode": "",
+    "systemMode": "",
     "zenMode": "",
     "objectsSnapMode": "",
     "exitZenMode": "",
     "cancel": "",
+    "saveLibNames": "",
     "clear": "",
     "remove": "",
     "embed": "",
@@ -204,7 +260,8 @@
     "resetLibrary": "",
     "removeItemsFromsLibrary": "",
     "invalidEncryptionKey": "",
-    "collabOfflineWarning": ""
+    "collabOfflineWarning": "",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "",
@@ -212,9 +269,9 @@
     "fileTooBig": "",
     "svgImageInsertError": "",
     "failedToFetchImage": "",
-    "invalidSVGString": "",
     "cannotResolveCollabServer": "",
     "importLibraryError": "",
+    "saveLibraryError": "",
     "collabSaveFailed": "",
     "collabSaveFailed_sizeExceeded": "",
     "imageToolNotSupported": "",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "",
+    "lasso": "",
     "image": "",
     "rectangle": "",
     "diamond": "",
@@ -255,7 +313,23 @@
     "hand": "",
     "extraTools": "",
     "mermaidToExcalidraw": "",
-    "magicSettings": ""
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "",
+    "diamond": "",
+    "ellipse": "",
+    "arrow": "",
+    "line": "",
+    "freedraw": "",
+    "text": "",
+    "image": "",
+    "group": "",
+    "frame": "",
+    "magicframe": "",
+    "embeddable": "",
+    "selection": "",
+    "iframe": ""
   },
   "headings": {
     "canvasActions": "畫布動作",
@@ -263,8 +337,10 @@
     "shapes": ""
   },
   "hints": {
+    "dismissSearch": "",
     "canvasPanning": "",
     "linearElement": "",
+    "arrowTool": "",
     "freeDraw": "",
     "text": "",
     "embeddable": "",
@@ -276,15 +352,18 @@
     "resizeImage": "",
     "rotate": "",
     "lineEditor_info": "",
+    "lineEditor_line_info": "",
     "lineEditor_pointSelected": "",
     "lineEditor_nothingSelected": "",
-    "placeImage": "",
     "publishLibrary": "",
     "bindTextToElement": "",
+    "createFlowchart": "",
     "deepBoxSelect": "",
     "eraserRevert": "",
     "firefox_clipboard_write": "",
-    "disableSnapping": ""
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "無法顯示預覽",
@@ -299,6 +378,9 @@
     "openIssueMessage": "",
     "sceneContent": ""
   },
+  "shareDialog": {
+    "or": ""
+  },
   "roomDialog": {
     "desc_intro": "",
     "desc_privacy": "",
@@ -328,6 +410,8 @@
     "click": "",
     "deepSelect": "",
     "deepBoxSelect": "",
+    "createFlowchart": "",
+    "navigateFlowchart": "",
     "curvedArrow": "",
     "curvedLine": "",
     "documentation": "",
@@ -350,7 +434,9 @@
     "zoomToSelection": "",
     "toggleElementLock": "",
     "movePageUpDown": "",
-    "movePageLeftRight": ""
+    "movePageLeftRight": "",
+    "cropStart": "",
+    "cropFinish": ""
   },
   "clearCanvasDialog": {
     "title": ""
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "",
-    "element": "",
-    "elements": "",
+    "shapes": "",
     "height": "",
     "scene": "",
     "selected": "",
     "storage": "",
+    "fullTitle": "",
     "title": "",
+    "generalStats": "",
+    "elementProperties": "",
     "total": "",
     "version": "",
     "versionCopy": "",
@@ -439,13 +527,15 @@
     "copyStyles": "",
     "copyToClipboard": "",
     "copyToClipboardAsPng": "",
+    "copyToClipboardAsSvg": "",
     "fileSaved": "",
     "fileSavedToFilename": "",
     "canvas": "畫布",
     "selection": "",
     "pasteAsSingleElement": "",
     "unableToEmbed": "",
-    "unrecognizedLinkFormat": ""
+    "unrecognizedLinkFormat": "",
+    "elementLinkCopied": ""
   },
   "colors": {
     "transparent": "",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "",
     "colors": "",
     "shades": "",
@@ -521,5 +612,53 @@
     "description": "",
     "syntax": "",
     "preview": ""
+  },
+  "quickSearch": {
+    "placeholder": ""
+  },
+  "fontList": {
+    "badge": {
+      "old": ""
+    },
+    "sceneFonts": "",
+    "availableFonts": "",
+    "empty": ""
+  },
+  "userList": {
+    "empty": "",
+    "hint": {
+      "text": "",
+      "followStatus": "",
+      "inCall": "",
+      "micMuted": "",
+      "isSpeaking": ""
+    }
+  },
+  "commandPalette": {
+    "title": "",
+    "shortcuts": {
+      "select": "",
+      "confirm": "",
+      "close": ""
+    },
+    "recents": "",
+    "search": {
+      "placeholder": "",
+      "noMatch": ""
+    },
+    "itemNotAvailable": "",
+    "shortcutHint": ""
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/locales/zh-TW.json b/packages/excalidraw/locales/zh-TW.json
index e116d91639..24097183f7 100644
--- a/packages/excalidraw/locales/zh-TW.json
+++ b/packages/excalidraw/locales/zh-TW.json
@@ -8,8 +8,8 @@
     "moveCanvas": "移動畫布",
     "cut": "剪下",
     "copy": "複製",
-    "copyAsPng": "以PNG格式儲存到剪貼板",
-    "copyAsSvg": "以SVG格式複製到剪貼板",
+    "copyAsPng": "以 PNG 格式儲存到剪貼簿",
+    "copyAsSvg": "以 SVG 格式複製到剪貼簿",
     "copyText": "以文字格式複製至剪貼簿",
     "copySource": "複製來源至剪貼簿",
     "convertToCode": "轉換為程式碼",
@@ -21,7 +21,9 @@
     "copyStyles": "複製樣式",
     "pasteStyles": "貼上樣式",
     "stroke": "筆畫",
+    "changeStroke": "變更筆畫顏色",
     "background": "背景",
+    "changeBackground": "變更背景顏色",
     "fill": "填滿",
     "strokeWidth": "筆跡寬度",
     "strokeStyle": "筆畫樣式",
@@ -44,9 +46,17 @@
     "arrowhead_triangle_outline": "三角形（外框）",
     "arrowhead_diamond": "菱形",
     "arrowhead_diamond_outline": "菱形（外框）",
+    "arrowhead_crowfoot_many": "雞爪符號（多）",
+    "arrowhead_crowfoot_one": "雞爪符號（一）",
+    "arrowhead_crowfoot_one_or_many": "雞爪符號（一或多）",
+    "more_options": "更多選項",
+    "arrowtypes": "箭頭類型",
+    "arrowtype_sharp": "尖銳箭頭",
+    "arrowtype_round": "彎角箭頭",
+    "arrowtype_elbowed": "直角箭頭",
     "fontSize": "字型大小",
-    "fontFamily": "字體集",
-    "addWatermark": "加上 \"Made with Excalidraw\" 浮水印",
+    "fontFamily": "字型系列",
+    "addWatermark": "加上「以 Excalidraw 製作」浮水印",
     "handDrawn": "手寫",
     "normal": "一般",
     "code": "代碼",
@@ -72,6 +82,7 @@
     "canvasColors": "使用於畫布",
     "canvasBackground": "Canvas 背景",
     "drawingCanvas": "繪圖 canvas",
+    "clearCanvas": "清除畫布",
     "layers": "圖層",
     "actions": "動作",
     "language": "語言",
@@ -84,12 +95,13 @@
     "group": "建立群組",
     "ungroup": "取消群組",
     "collaborators": "協作者",
-    "showGrid": "顯示格線",
+    "toggleGrid": "切換網格",
     "addToLibrary": "加入資料庫",
     "removeFromLibrary": "從資料庫中移除",
     "libraryLoadingMessage": "資料庫讀取中…",
     "libraries": "瀏覽資料庫",
     "loadingScene": "場景讀取中…",
+    "loadScene": "從檔案載入場景",
     "align": "對齊",
     "alignTop": "對齊頂部",
     "alignBottom": "對齊底部",
@@ -102,10 +114,12 @@
     "flipHorizontal": "水平翻轉",
     "flipVertical": "垂直翻轉",
     "viewMode": "檢視模式",
-    "share": "共享",
+    "share": "分享",
     "showStroke": "顯示線條檢色器",
     "showBackground": "顯示背景檢色器",
-    "toggleTheme": "切換主題",
+    "showFonts": "顯示字型選單",
+    "toggleTheme": "切換淺色/深色主題",
+    "theme": "主題",
     "personalLib": "個人資料庫",
     "excalidrawLib": "Excalidraw 資料庫",
     "decreaseFontSize": "縮小文字",
@@ -115,16 +129,21 @@
     "createContainerFromText": "將文字包於容器中",
     "link": {
       "edit": "編輯連結",
-      "editEmbed": "編輯連結&嵌入",
-      "create": "建立連結",
-      "createEmbed": "建立連結&嵌入",
+      "editEmbed": "編輯可嵌入連結",
+      "create": "新增連結",
       "label": "連結",
-      "labelEmbed": "連結&嵌入",
-      "empty": "未設定連結"
+      "labelEmbed": "連結與嵌入",
+      "empty": "未設定連結",
+      "hint": "在此輸入或貼上連結",
+      "goToElement": "移至目標元素"
     },
     "lineEditor": {
       "edit": "編輯線條",
-      "exit": "結束線條編輯"
+      "editArrow": "編輯箭頭"
+    },
+    "polygon": {
+      "breakPolygon": "",
+      "convertToPolygon": ""
     },
     "elementLock": {
       "lock": "鎖定",
@@ -138,19 +157,54 @@
     "removeAllElementsFromFrame": "從框架內移除所有元素",
     "eyeDropper": "從畫布中選取顏色",
     "textToDiagram": "文字轉圖表",
-    "prompt": "提示詞"
+    "prompt": "提示詞",
+    "followUs": "追蹤我們",
+    "discordChat": "Discord 聊天室",
+    "zoomToFitViewport": "縮放至符合 viewport",
+    "zoomToFitSelection": "縮放至符合選取區",
+    "zoomToFit": "縮放至顯示所有元素",
+    "installPWA": "於本機安裝 Excalidraw (PWA)",
+    "autoResize": "啟用文字自動縮放",
+    "imageCropping": "圖片剪裁",
+    "unCroppedDimension": "未剪裁尺寸",
+    "copyElementLink": "複製此物件的連結",
+    "linkToElement": "連結至物件",
+    "wrapSelectionInFrame": "將選取內容放入框架",
+    "tab": "",
+    "shapeSwitch": ""
+  },
+  "elementLink": {
+    "title": "連結至物件",
+    "desc": "點擊畫布上的形狀或貼上連結",
+    "notFound": "無法在畫布上找到連結的物件"
   },
   "library": {
     "noItems": "尚未加入任何物件...",
-    "hint_emptyLibrary": "選取畫布上的物件以加入，或從下方的公開 repository 中安裝資料庫",
-    "hint_emptyPrivateLibrary": "選擇畫布上的物件以在此加入"
+    "hint_emptyLibrary": "選取畫布上的物件以加入，或從下方的公開儲存庫中安裝資料庫。",
+    "hint_emptyPrivateLibrary": "選擇畫布上的物件以在此加入。",
+    "search": {
+      "inputPlaceholder": "",
+      "heading": "",
+      "noResults": "",
+      "clearSearch": ""
+    }
+  },
+  "search": {
+    "title": "在畫布上尋找",
+    "noMatch": "未找到符合項目…",
+    "singleResult": "結果",
+    "multipleResults": "結果",
+    "placeholder": "在畫布上尋找文字…",
+    "frames": "",
+    "texts": ""
   },
   "buttons": {
-    "clearReset": "重置 canvas",
+    "clearReset": "重設畫布",
     "exportJSON": "匯出至檔案",
     "exportImage": "匯出圖片",
     "export": "儲存至...",
     "copyToClipboard": "複製至剪貼簿",
+    "copyLink": "複製連結",
     "save": "儲存目前檔案",
     "saveAs": "儲存為",
     "load": "開啟",
@@ -171,14 +225,16 @@
     "fullScreen": "全螢幕",
     "darkMode": "深色模式",
     "lightMode": "淺色模式",
+    "systemMode": "系統模式",
     "zenMode": "專注模式",
     "objectsSnapMode": "吸附至物件",
     "exitZenMode": "離開專注模式",
     "cancel": "取消",
+    "saveLibNames": "",
     "clear": "清除",
     "remove": "刪除",
     "embed": "切換嵌入",
-    "publishLibrary": "發布",
+    "publishLibrary": "",
     "submit": "送出",
     "confirm": "確認",
     "embeddableInteractionButton": "點擊以互動"
@@ -204,7 +260,8 @@
     "resetLibrary": "這會清除您的資料庫，是否確定？",
     "removeItemsFromsLibrary": "從資料庫刪除 {{count}} 項？",
     "invalidEncryptionKey": "加密鍵必須為22字元。即時協作已停用。",
-    "collabOfflineWarning": "沒有可用的網路連線。\n變更無法儲存！"
+    "collabOfflineWarning": "沒有可用的網路連線。\n變更無法儲存！",
+    "localStorageQuotaExceeded": ""
   },
   "errors": {
     "unsupportedFileType": "不支援的檔案類型。",
@@ -212,9 +269,9 @@
     "fileTooBig": "檔案過大。可接受的最大尺寸為 {{maxSize}} 。",
     "svgImageInsertError": "無法插入 SVG 圖片。此 SVG 檔案有問題。",
     "failedToFetchImage": "無法獲取圖片。",
-    "invalidSVGString": "無效的 SVG。",
     "cannotResolveCollabServer": "無法連結至 collab 伺服器。請重新整理後再試一次。",
     "importLibraryError": "無法載入資料庫",
+    "saveLibraryError": "無法將資料庫存至儲存區。請將資料庫存至本機檔案以確保不會失去已變更的部分。",
     "collabSaveFailed": "無法儲存至後端資料庫。若此問題持續發生，請將檔案儲存於本機以確保資料不會遺失。",
     "collabSaveFailed_sizeExceeded": "無法儲存至後端資料庫，可能的原因為畫布尺寸過大。請將檔案儲存於本機以確保資料不會遺失。",
     "imageToolNotSupported": "圖片已停用",
@@ -235,6 +292,7 @@
   },
   "toolBar": {
     "selection": "選取",
+    "lasso": "",
     "image": "插入圖片",
     "rectangle": "長方形",
     "diamond": "菱形",
@@ -255,7 +313,23 @@
     "hand": "手形（平移工具）",
     "extraTools": "更多工具",
     "mermaidToExcalidraw": "Mermaid 至 Excalidraw",
-    "magicSettings": "AI 設定"
+    "convertElementType": ""
+  },
+  "element": {
+    "rectangle": "矩形",
+    "diamond": "菱形",
+    "ellipse": "橢圓形",
+    "arrow": "箭頭",
+    "line": "線條",
+    "freedraw": "自由繪圖",
+    "text": "文字",
+    "image": "圖片",
+    "group": "群組",
+    "frame": "框架",
+    "magicframe": "線框稿轉為程式碼",
+    "embeddable": "嵌入網站",
+    "selection": "已選項目",
+    "iframe": "IFrame框架"
   },
   "headings": {
     "canvasActions": "canvas 動作",
@@ -263,28 +337,33 @@
     "shapes": "形狀"
   },
   "hints": {
-    "canvasPanning": "若要移動畫布，請在拖曳時按住滑鼠滾輪或空白鍵，或使用手形工具",
+    "dismissSearch": "",
+    "canvasPanning": "",
     "linearElement": "點擊以繪製多點曲線；或拖曳以繪製直線",
+    "arrowTool": "",
     "freeDraw": "點擊並拖曳來繪圖，放開即結束",
     "text": "提示：亦可使用選取工具在任何地方雙擊來加入文字",
     "embeddable": "點擊並拖移以建立嵌入網站",
-    "text_selected": "雙擊滑鼠或按 Enter 以編輯文字",
-    "text_editing": "按跳脫鍵或 Ctrl 或 Cmd + Enter 以結束編輯",
-    "linearElementMulti": "按下 Escape 或 Enter 以結束繪製",
-    "lockAngle": "按住 SHIFT 可限制旋轉角度",
-    "resize": "縮放時按住 Shift 可保持原比例縮放；\\n按住 Alt 可由中心點進行縮放",
-    "resizeImage": "按住 SHIFT 可任意縮放，按住 ALT 可由中央縮放。",
-    "rotate": "旋轉時按住 Shift 可限制旋轉角度",
-    "lineEditor_info": "按住 Ctrl 或 Cmd 並雙擊或按住 Ctrl 或 Cmd + Enter 來編輯控制點",
-    "lineEditor_pointSelected": "按下 Delete 可移除錨點；Ctrl 或 Cmd + D 可複製；或可拖曳來移動",
-    "lineEditor_nothingSelected": "選擇要編輯的錨點（按住 SHIFT 可多選），\n或按住 Alt 並點擊以增加新錨點。",
-    "placeImage": "點擊以放置圖片，或點擊並拖曳以手動調整其尺寸。",
+    "text_selected": "",
+    "text_editing": "",
+    "linearElementMulti": "",
+    "lockAngle": "",
+    "resize": "",
+    "resizeImage": "",
+    "rotate": "",
+    "lineEditor_info": "",
+    "lineEditor_line_info": "",
+    "lineEditor_pointSelected": "",
+    "lineEditor_nothingSelected": "",
     "publishLibrary": "發布個人資料庫",
-    "bindTextToElement": "按下 Enter 以加入文字。",
-    "deepBoxSelect": "按住 Ctrl 或 Cmd 以深度選取並避免拖曳",
-    "eraserRevert": "按住 Alt 以反選取已標記待刪除的元素",
+    "bindTextToElement": "",
+    "createFlowchart": "",
+    "deepBoxSelect": "",
+    "eraserRevert": "",
     "firefox_clipboard_write": "此功能有機會透過將 \"dom.events.asyncClipboard.clipboardItem\" 設定為 \"true\" 來開啟。\n若要變更 Firefox 瀏覽器的此設定值，請至 \"about:config\" 頁面。",
-    "disableSnapping": "按住 Ctrl 或 Cmd 以禁用吸附"
+    "disableSnapping": "",
+    "enterCropEditor": "",
+    "leaveCropEditor": ""
   },
   "canvasError": {
     "cannotShowPreview": "無法顯示預覽",
@@ -299,9 +378,12 @@
     "openIssueMessage": "我們將謹慎處理，你的作品內容不會被包含在錯誤報告中。若你的作品不需保持私密，請考慮使用我們的<button>bug tracker。</button>請將下列資訊複製貼上至 GitHub issue 中。",
     "sceneContent": "作品內容："
   },
+  "shareDialog": {
+    "or": "或"
+  },
   "roomDialog": {
-    "desc_intro": "你可以邀請其他人一起協作目前的作品。",
-    "desc_privacy": "連線使用 end-to-end 加密故無須擔心作品的安全性。即使是我們的伺服器也無法取得其內容。",
+    "desc_intro": "邀請其他人一起協作",
+    "desc_privacy": "不用擔心，此連線為端到端加密且完全私有，即使是我們的伺服器也無法看見您的繪圖。",
     "button_startSession": "開始連線",
     "button_stopSession": "停止連線",
     "desc_inProgressIntro": "即時協作連線正在進行中。",
@@ -328,6 +410,8 @@
     "click": "點擊",
     "deepSelect": "深度選取",
     "deepBoxSelect": "在容器內深度選取並避免拖曳",
+    "createFlowchart": "由基本型建立流程圖",
+    "navigateFlowchart": "導覽流程圖",
     "curvedArrow": "曲箭頭",
     "curvedLine": "曲線",
     "documentation": "文件",
@@ -350,7 +434,9 @@
     "zoomToSelection": "縮放至選取區",
     "toggleElementLock": "鎖定/解鎖已選的項目",
     "movePageUpDown": "向上/下移動頁面",
-    "movePageLeftRight": "向左/右移動頁面"
+    "movePageLeftRight": "向左/右移動頁面",
+    "cropStart": "裁切圖片",
+    "cropFinish": "完成圖片裁切"
   },
   "clearCanvasDialog": {
     "title": "清除畫布"
@@ -421,13 +507,15 @@
   },
   "stats": {
     "angle": "角度",
-    "element": "元素",
-    "elements": "元素",
+    "shapes": "形狀",
     "height": "高度",
     "scene": "場景",
     "selected": "已選",
     "storage": "儲存",
-    "title": "詳細統計",
+    "fullTitle": "畫布與形狀屬性設定",
+    "title": "屬性",
+    "generalStats": "一般",
+    "elementProperties": "形狀屬性",
     "total": "合計",
     "version": "版本",
     "versionCopy": "點擊複製",
@@ -439,13 +527,15 @@
     "copyStyles": "已複製樣式",
     "copyToClipboard": "複製至剪貼簿。",
     "copyToClipboardAsPng": "以 PNG 格式將 {{exportSelection}} 複製至剪貼簿\n({{exportColorScheme}})",
+    "copyToClipboardAsSvg": "以 SVG 格式將 {{exportSelection}} 複製至剪貼簿\n({{exportColorScheme}})",
     "fileSaved": "已儲存檔案。",
     "fileSavedToFilename": "儲存為 {filename}",
     "canvas": "畫布",
     "selection": "已選項目",
     "pasteAsSingleElement": "使用 {{shortcut}} 以做為單一物件貼上，\n或貼上至現有的文字編輯器",
     "unableToEmbed": "目前不允許嵌入此網址。您可至 GitHub 提出 issue 以要求將此網址加入合格名單。",
-    "unrecognizedLinkFormat": "您嵌入的連結格式不符。請嘗試貼入原網站所提供的「嵌入」字串。"
+    "unrecognizedLinkFormat": "您嵌入的連結格式不符。請嘗試貼入原網站所提供的「嵌入」字串。",
+    "elementLinkCopied": "連結已複製至剪貼簿"
   },
   "colors": {
     "transparent": "透明",
@@ -478,6 +568,7 @@
     }
   },
   "colorPicker": {
+    "color": "",
     "mostUsedCustomColors": "最常使用的自訂顏色",
     "colors": "顏色",
     "shades": "漸變色",
@@ -521,5 +612,53 @@
     "description": "目前僅支援 <flowchartLink>Flowchart</flowchartLink> 、 <sequenceLink>Sequence</sequenceLink> 及 <classLink>Class </classLink> 圖表。其餘檔案類型在 Excalidraw 將會以圖像呈現。",
     "syntax": "Mermaid 語法",
     "preview": "預覽"
+  },
+  "quickSearch": {
+    "placeholder": "快速搜尋"
+  },
+  "fontList": {
+    "badge": {
+      "old": "舊版"
+    },
+    "sceneFonts": "在此場景中",
+    "availableFonts": "可用字型",
+    "empty": "找不到字型"
+  },
+  "userList": {
+    "empty": "找不到使用者",
+    "hint": {
+      "text": "點擊使用者以進行追蹤",
+      "followStatus": "您正在追蹤此使用者",
+      "inCall": "使用者正在語音通話中",
+      "micMuted": "使用者的麥克風已靜音",
+      "isSpeaking": "使用者說話中"
+    }
+  },
+  "commandPalette": {
+    "title": "指令面板",
+    "shortcuts": {
+      "select": "選取",
+      "confirm": "確認",
+      "close": "關閉"
+    },
+    "recents": "最近使用",
+    "search": {
+      "placeholder": "搜尋選單與指令並找出隱藏功能",
+      "noMatch": "沒有符合的指令…"
+    },
+    "itemNotAvailable": "指令無法使用…",
+    "shortcutHint": "使用 {{shortcut}} 開啟指令面板"
+  },
+  "keys": {
+    "ctrl": "",
+    "option": "",
+    "cmd": "",
+    "alt": "",
+    "escape": "",
+    "enter": "",
+    "shift": "",
+    "spacebar": "",
+    "delete": "",
+    "mmb": ""
   }
 }
diff --git a/packages/excalidraw/package.json b/packages/excalidraw/package.json
index 845efc15c8..a5da2c3a31 100644
--- a/packages/excalidraw/package.json
+++ b/packages/excalidraw/package.json
@@ -81,8 +81,8 @@
     "@braintree/sanitize-url": "6.0.2",
     "@excalidraw/common": "0.18.0",
     "@excalidraw/element": "0.18.0",
-    "@excalidraw/math": "0.18.0",
     "@excalidraw/laser-pointer": "1.3.1",
+    "@excalidraw/math": "0.18.0",
     "@excalidraw/mermaid-to-excalidraw": "1.1.3",
     "@excalidraw/random-username": "1.1.0",
     "@radix-ui/react-popover": "1.1.6",
@@ -97,8 +97,8 @@
     "image-blob-reduce": "3.0.1",
     "jotai": "2.11.0",
     "jotai-scope": "0.7.2",
-    "lodash.throttle": "4.1.1",
     "lodash.debounce": "4.0.8",
+    "lodash.throttle": "4.1.1",
     "nanoid": "3.3.3",
     "open-color": "1.9.1",
     "pako": "2.0.3",
diff --git a/packages/excalidraw/renderer/animation.ts b/packages/excalidraw/renderer/animation.ts
new file mode 100644
index 0000000000..5c98ac7671
--- /dev/null
+++ b/packages/excalidraw/renderer/animation.ts
@@ -0,0 +1,84 @@
+import { isRenderThrottlingEnabled } from "../reactUtils";
+
+export type Animation<R extends object> = (params: {
+  deltaTime: number;
+  state?: R;
+}) => R | null | undefined;
+
+export class AnimationController {
+  private static isRunning = false;
+  private static animations = new Map<
+    string,
+    {
+      animation: Animation<any>;
+      lastTime: number;
+      state: any;
+    }
+  >();
+
+  static start<R extends object>(key: string, animation: Animation<R>) {
+    const initialState = animation({
+      deltaTime: 0,
+      state: undefined,
+    });
+
+    if (initialState) {
+      AnimationController.animations.set(key, {
+        animation,
+        lastTime: 0,
+        state: initialState,
+      });
+
+      if (!AnimationController.isRunning) {
+        AnimationController.isRunning = true;
+
+        if (isRenderThrottlingEnabled()) {
+          requestAnimationFrame(AnimationController.tick);
+        } else {
+          setTimeout(AnimationController.tick, 0);
+        }
+      }
+    }
+  }
+
+  private static tick() {
+    if (AnimationController.animations.size > 0) {
+      for (const [key, animation] of AnimationController.animations) {
+        const now = performance.now();
+        const deltaTime =
+          animation.lastTime === 0 ? 0 : now - animation.lastTime;
+
+        const state = animation.animation({
+          deltaTime,
+          state: animation.state,
+        });
+
+        if (!state) {
+          AnimationController.animations.delete(key);
+
+          if (AnimationController.animations.size === 0) {
+            AnimationController.isRunning = false;
+            return;
+          }
+        } else {
+          animation.lastTime = now;
+          animation.state = state;
+        }
+      }
+
+      if (isRenderThrottlingEnabled()) {
+        requestAnimationFrame(AnimationController.tick);
+      } else {
+        setTimeout(AnimationController.tick, 0);
+      }
+    }
+  }
+
+  static running(key: string) {
+    return AnimationController.animations.has(key);
+  }
+
+  static cancel(key: string) {
+    AnimationController.animations.delete(key);
+  }
+}
diff --git a/packages/excalidraw/renderer/helpers.ts b/packages/excalidraw/renderer/helpers.ts
index d357822ec6..cfa502dfab 100644
--- a/packages/excalidraw/renderer/helpers.ts
+++ b/packages/excalidraw/renderer/helpers.ts
@@ -1,26 +1,5 @@
 import { THEME, THEME_FILTER } from "@excalidraw/common";
 
-import { FIXED_BINDING_DISTANCE } from "@excalidraw/element";
-import { getDiamondPoints } from "@excalidraw/element";
-import { elementCenterPoint, getCornerRadius } from "@excalidraw/element";
-
-import {
-  curve,
-  curveCatmullRomCubicApproxPoints,
-  curveCatmullRomQuadraticApproxPoints,
-  curveOffsetPoints,
-  type GlobalPoint,
-  offsetPointsForQuadraticBezier,
-  pointFrom,
-  pointRotateRads,
-} from "@excalidraw/math";
-
-import type {
-  ElementsMap,
-  ExcalidrawDiamondElement,
-  ExcalidrawRectanguloidElement,
-} from "@excalidraw/element/types";
-
 import type { StaticCanvasRenderConfig } from "../scene/types";
 import type { AppState, StaticCanvasAppState } from "../types";
 
@@ -97,164 +76,7 @@ export const bootstrapCanvas = ({
   return context;
 };
 
-function drawCatmullRomQuadraticApprox(
-  ctx: CanvasRenderingContext2D,
-  points: GlobalPoint[],
-  tension = 0.5,
-) {
-  const pointSets = curveCatmullRomQuadraticApproxPoints(points, tension);
-  if (pointSets) {
-    for (let i = 0; i < pointSets.length - 1; i++) {
-      const [[cpX, cpY], [p2X, p2Y]] = pointSets[i];
-
-      ctx.quadraticCurveTo(cpX, cpY, p2X, p2Y);
-    }
-  }
-}
-
-function drawCatmullRomCubicApprox(
-  ctx: CanvasRenderingContext2D,
-  points: GlobalPoint[],
-  tension = 0.5,
-) {
-  const pointSets = curveCatmullRomCubicApproxPoints(points, tension);
-  if (pointSets) {
-    for (let i = 0; i < pointSets.length; i++) {
-      const [[cp1x, cp1y], [cp2x, cp2y], [x, y]] = pointSets[i];
-      ctx.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
-    }
-  }
-}
-
-export const drawHighlightForRectWithRotation = (
-  context: CanvasRenderingContext2D,
-  element: ExcalidrawRectanguloidElement,
-  elementsMap: ElementsMap,
-  padding: number,
-) => {
-  const [x, y] = pointRotateRads(
-    pointFrom<GlobalPoint>(element.x, element.y),
-    elementCenterPoint(element, elementsMap),
-    element.angle,
-  );
-
-  context.save();
-  context.translate(x, y);
-  context.rotate(element.angle);
-
-  let radius = getCornerRadius(
-    Math.min(element.width, element.height),
-    element,
-  );
-  if (radius === 0) {
-    radius = 0.01;
-  }
-
-  context.beginPath();
-
-  {
-    const topLeftApprox = offsetPointsForQuadraticBezier(
-      pointFrom(0, 0 + radius),
-      pointFrom(0, 0),
-      pointFrom(0 + radius, 0),
-      padding,
-    );
-    const topRightApprox = offsetPointsForQuadraticBezier(
-      pointFrom(element.width - radius, 0),
-      pointFrom(element.width, 0),
-      pointFrom(element.width, radius),
-      padding,
-    );
-    const bottomRightApprox = offsetPointsForQuadraticBezier(
-      pointFrom(element.width, element.height - radius),
-      pointFrom(element.width, element.height),
-      pointFrom(element.width - radius, element.height),
-      padding,
-    );
-    const bottomLeftApprox = offsetPointsForQuadraticBezier(
-      pointFrom(radius, element.height),
-      pointFrom(0, element.height),
-      pointFrom(0, element.height - radius),
-      padding,
-    );
-
-    context.moveTo(
-      topLeftApprox[topLeftApprox.length - 1][0],
-      topLeftApprox[topLeftApprox.length - 1][1],
-    );
-    context.lineTo(topRightApprox[0][0], topRightApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, topRightApprox);
-    context.lineTo(bottomRightApprox[0][0], bottomRightApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, bottomRightApprox);
-    context.lineTo(bottomLeftApprox[0][0], bottomLeftApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, bottomLeftApprox);
-    context.lineTo(topLeftApprox[0][0], topLeftApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, topLeftApprox);
-  }
-
-  // Counter-clockwise for the cutout in the middle. We need to have an "inverse
-  // mask" on a filled shape for the diamond highlight, because stroking creates
-  // sharp inset edges on line joins < 90 degrees.
-  {
-    const topLeftApprox = offsetPointsForQuadraticBezier(
-      pointFrom(0 + radius, 0),
-      pointFrom(0, 0),
-      pointFrom(0, 0 + radius),
-      -FIXED_BINDING_DISTANCE,
-    );
-    const topRightApprox = offsetPointsForQuadraticBezier(
-      pointFrom(element.width, radius),
-      pointFrom(element.width, 0),
-      pointFrom(element.width - radius, 0),
-      -FIXED_BINDING_DISTANCE,
-    );
-    const bottomRightApprox = offsetPointsForQuadraticBezier(
-      pointFrom(element.width - radius, element.height),
-      pointFrom(element.width, element.height),
-      pointFrom(element.width, element.height - radius),
-      -FIXED_BINDING_DISTANCE,
-    );
-    const bottomLeftApprox = offsetPointsForQuadraticBezier(
-      pointFrom(0, element.height - radius),
-      pointFrom(0, element.height),
-      pointFrom(radius, element.height),
-      -FIXED_BINDING_DISTANCE,
-    );
-
-    context.moveTo(
-      topLeftApprox[topLeftApprox.length - 1][0],
-      topLeftApprox[topLeftApprox.length - 1][1],
-    );
-    context.lineTo(bottomLeftApprox[0][0], bottomLeftApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, bottomLeftApprox);
-    context.lineTo(bottomRightApprox[0][0], bottomRightApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, bottomRightApprox);
-    context.lineTo(topRightApprox[0][0], topRightApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, topRightApprox);
-    context.lineTo(topLeftApprox[0][0], topLeftApprox[0][1]);
-    drawCatmullRomQuadraticApprox(context, topLeftApprox);
-  }
-
-  context.closePath();
-  context.fill();
-
-  context.restore();
-};
-
-export const strokeEllipseWithRotation = (
-  context: CanvasRenderingContext2D,
-  width: number,
-  height: number,
-  cx: number,
-  cy: number,
-  angle: number,
-) => {
-  context.beginPath();
-  context.ellipse(cx, cy, width / 2, height / 2, angle, 0, Math.PI * 2);
-  context.stroke();
-};
-
-export const strokeRectWithRotation = (
+export const strokeRectWithRotation_simple = (
   context: CanvasRenderingContext2D,
   x: number,
   y: number,
@@ -283,147 +105,3 @@ export const strokeRectWithRotation = (
   }
   context.restore();
 };
-
-export const drawHighlightForDiamondWithRotation = (
-  context: CanvasRenderingContext2D,
-  padding: number,
-  element: ExcalidrawDiamondElement,
-  elementsMap: ElementsMap,
-) => {
-  const [x, y] = pointRotateRads(
-    pointFrom<GlobalPoint>(element.x, element.y),
-    elementCenterPoint(element, elementsMap),
-    element.angle,
-  );
-  context.save();
-  context.translate(x, y);
-  context.rotate(element.angle);
-
-  {
-    context.beginPath();
-
-    const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] =
-      getDiamondPoints(element);
-    const verticalRadius = element.roundness
-      ? getCornerRadius(Math.abs(topX - leftX), element)
-      : (topX - leftX) * 0.01;
-    const horizontalRadius = element.roundness
-      ? getCornerRadius(Math.abs(rightY - topY), element)
-      : (rightY - topY) * 0.01;
-    const topApprox = curveOffsetPoints(
-      curve(
-        pointFrom(topX - verticalRadius, topY + horizontalRadius),
-        pointFrom(topX, topY),
-        pointFrom(topX, topY),
-        pointFrom(topX + verticalRadius, topY + horizontalRadius),
-      ),
-      padding,
-    );
-    const rightApprox = curveOffsetPoints(
-      curve(
-        pointFrom(rightX - verticalRadius, rightY - horizontalRadius),
-        pointFrom(rightX, rightY),
-        pointFrom(rightX, rightY),
-        pointFrom(rightX - verticalRadius, rightY + horizontalRadius),
-      ),
-      padding,
-    );
-    const bottomApprox = curveOffsetPoints(
-      curve(
-        pointFrom(bottomX + verticalRadius, bottomY - horizontalRadius),
-        pointFrom(bottomX, bottomY),
-        pointFrom(bottomX, bottomY),
-        pointFrom(bottomX - verticalRadius, bottomY - horizontalRadius),
-      ),
-      padding,
-    );
-    const leftApprox = curveOffsetPoints(
-      curve(
-        pointFrom(leftX + verticalRadius, leftY + horizontalRadius),
-        pointFrom(leftX, leftY),
-        pointFrom(leftX, leftY),
-        pointFrom(leftX + verticalRadius, leftY - horizontalRadius),
-      ),
-      padding,
-    );
-
-    context.moveTo(
-      topApprox[topApprox.length - 1][0],
-      topApprox[topApprox.length - 1][1],
-    );
-    context.lineTo(rightApprox[1][0], rightApprox[1][1]);
-    drawCatmullRomCubicApprox(context, rightApprox);
-    context.lineTo(bottomApprox[1][0], bottomApprox[1][1]);
-    drawCatmullRomCubicApprox(context, bottomApprox);
-    context.lineTo(leftApprox[1][0], leftApprox[1][1]);
-    drawCatmullRomCubicApprox(context, leftApprox);
-    context.lineTo(topApprox[1][0], topApprox[1][1]);
-    drawCatmullRomCubicApprox(context, topApprox);
-  }
-
-  // Counter-clockwise for the cutout in the middle. We need to have an "inverse
-  // mask" on a filled shape for the diamond highlight, because stroking creates
-  // sharp inset edges on line joins < 90 degrees.
-  {
-    const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] =
-      getDiamondPoints(element);
-    const verticalRadius = element.roundness
-      ? getCornerRadius(Math.abs(topX - leftX), element)
-      : (topX - leftX) * 0.01;
-    const horizontalRadius = element.roundness
-      ? getCornerRadius(Math.abs(rightY - topY), element)
-      : (rightY - topY) * 0.01;
-    const topApprox = curveOffsetPoints(
-      curve(
-        pointFrom(topX + verticalRadius, topY + horizontalRadius),
-        pointFrom(topX, topY),
-        pointFrom(topX, topY),
-        pointFrom(topX - verticalRadius, topY + horizontalRadius),
-      ),
-      -FIXED_BINDING_DISTANCE,
-    );
-    const rightApprox = curveOffsetPoints(
-      curve(
-        pointFrom(rightX - verticalRadius, rightY + horizontalRadius),
-        pointFrom(rightX, rightY),
-        pointFrom(rightX, rightY),
-        pointFrom(rightX - verticalRadius, rightY - horizontalRadius),
-      ),
-      -FIXED_BINDING_DISTANCE,
-    );
-    const bottomApprox = curveOffsetPoints(
-      curve(
-        pointFrom(bottomX - verticalRadius, bottomY - horizontalRadius),
-        pointFrom(bottomX, bottomY),
-        pointFrom(bottomX, bottomY),
-        pointFrom(bottomX + verticalRadius, bottomY - horizontalRadius),
-      ),
-      -FIXED_BINDING_DISTANCE,
-    );
-    const leftApprox = curveOffsetPoints(
-      curve(
-        pointFrom(leftX + verticalRadius, leftY - horizontalRadius),
-        pointFrom(leftX, leftY),
-        pointFrom(leftX, leftY),
-        pointFrom(leftX + verticalRadius, leftY + horizontalRadius),
-      ),
-      -FIXED_BINDING_DISTANCE,
-    );
-
-    context.moveTo(
-      topApprox[topApprox.length - 1][0],
-      topApprox[topApprox.length - 1][1],
-    );
-    context.lineTo(leftApprox[1][0], leftApprox[1][1]);
-    drawCatmullRomCubicApprox(context, leftApprox);
-    context.lineTo(bottomApprox[1][0], bottomApprox[1][1]);
-    drawCatmullRomCubicApprox(context, bottomApprox);
-    context.lineTo(rightApprox[1][0], rightApprox[1][1]);
-    drawCatmullRomCubicApprox(context, rightApprox);
-    context.lineTo(topApprox[1][0], topApprox[1][1]);
-    drawCatmullRomCubicApprox(context, topApprox);
-  }
-  context.closePath();
-  context.fill();
-  context.restore();
-};
diff --git a/packages/excalidraw/renderer/interactiveScene.ts b/packages/excalidraw/renderer/interactiveScene.ts
index 9b836aecf8..c4c606cbec 100644
--- a/packages/excalidraw/renderer/interactiveScene.ts
+++ b/packages/excalidraw/renderer/interactiveScene.ts
@@ -1,4 +1,5 @@
 import {
+  clamp,
   pointFrom,
   pointsEqual,
   type GlobalPoint,
@@ -9,28 +10,29 @@ import oc from "open-color";
 
 import {
   arrayToMap,
+  BIND_MODE_TIMEOUT,
   DEFAULT_TRANSFORM_HANDLE_SPACING,
   FRAME_STYLE,
+  getFeatureFlag,
   invariant,
   THEME,
-  throttleRAF,
 } from "@excalidraw/common";
 
-import { FIXED_BINDING_DISTANCE, maxBindingGap } from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element";
 import {
-  getOmitSidesForDevice,
+  deconstructDiamondElement,
+  deconstructRectanguloidElement,
+  elementCenterPoint,
+  getOmitSidesForEditorInterface,
   getTransformHandles,
   getTransformHandlesFromCoords,
   hasBoundingBox,
-} from "@excalidraw/element";
-import {
   isElbowArrow,
   isFrameLikeElement,
   isImageElement,
   isLinearElement,
   isLineElement,
   isTextElement,
+  LinearElementEditor,
 } from "@excalidraw/element";
 
 import { renderSelectionElement } from "@excalidraw/element";
@@ -44,11 +46,6 @@ import {
 
 import { getCommonBounds, getElementAbsoluteCoords } from "@excalidraw/element";
 
-import type {
-  SuggestedBinding,
-  SuggestedPointBinding,
-} from "@excalidraw/element";
-
 import type {
   TransformHandles,
   TransformHandleType,
@@ -64,6 +61,7 @@ import type {
   ExcalidrawTextElement,
   GroupId,
   NonDeleted,
+  NonDeletedSceneElementsMap,
 } from "@excalidraw/element/types";
 
 import { renderSnaps } from "../renderer/renderSnaps";
@@ -73,18 +71,19 @@ import {
   SCROLLBAR_COLOR,
   SCROLLBAR_WIDTH,
 } from "../scene/scrollbars";
-import { type InteractiveCanvasAppState } from "../types";
+
+import {
+  type AppClassProperties,
+  type InteractiveCanvasAppState,
+} from "../types";
 
 import { getClientColor, renderRemoteCursors } from "../clients";
 
 import {
   bootstrapCanvas,
-  drawHighlightForDiamondWithRotation,
-  drawHighlightForRectWithRotation,
   fillCircle,
   getNormalizedCanvasDimensions,
-  strokeEllipseWithRotation,
-  strokeRectWithRotation,
+  strokeRectWithRotation_simple,
 } from "./helpers";
 
 import type {
@@ -188,83 +187,485 @@ const renderSingleLinearPoint = <Point extends GlobalPoint | LocalPoint>(
   );
 };
 
-const renderBindingHighlightForBindableElement = (
+const renderBindingHighlightForBindableElement_simple = (
   context: CanvasRenderingContext2D,
   element: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
-  zoom: InteractiveCanvasAppState["zoom"],
+  appState: InteractiveCanvasAppState,
 ) => {
-  const padding = maxBindingGap(element, element.width, element.height, zoom);
+  const enclosingFrame = element.frameId && elementsMap.get(element.frameId);
+  if (enclosingFrame && isFrameLikeElement(enclosingFrame)) {
+    context.translate(
+      enclosingFrame.x + appState.scrollX,
+      enclosingFrame.y + appState.scrollY,
+    );
 
-  context.fillStyle = "rgba(0,0,0,.05)";
+    context.beginPath();
+
+    if (FRAME_STYLE.radius && context.roundRect) {
+      context.roundRect(
+        -1,
+        -1,
+        enclosingFrame.width + 1,
+        enclosingFrame.height + 1,
+        FRAME_STYLE.radius / appState.zoom.value,
+      );
+    } else {
+      context.rect(-1, -1, enclosingFrame.width + 1, enclosingFrame.height + 1);
+    }
+
+    context.clip();
+
+    context.translate(
+      -(enclosingFrame.x + appState.scrollX),
+      -(enclosingFrame.y + appState.scrollY),
+    );
+  }
 
   switch (element.type) {
-    case "rectangle":
-    case "text":
-    case "image":
-    case "iframe":
-    case "embeddable":
-    case "frame":
     case "magicframe":
-      drawHighlightForRectWithRotation(context, element, elementsMap, padding);
-      break;
-    case "diamond":
-      drawHighlightForDiamondWithRotation(
-        context,
-        padding,
-        element,
-        elementsMap,
-      );
-      break;
-    case "ellipse": {
-      const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
-      const width = x2 - x1;
-      const height = y2 - y1;
+    case "frame":
+      context.save();
 
-      context.strokeStyle = "rgba(0,0,0,.05)";
-      context.lineWidth = padding - FIXED_BINDING_DISTANCE;
-
-      strokeEllipseWithRotation(
-        context,
-        width + padding + FIXED_BINDING_DISTANCE,
-        height + padding + FIXED_BINDING_DISTANCE,
-        x1 + width / 2,
-        y1 + height / 2,
-        element.angle,
+      context.translate(
+        element.x + appState.scrollX,
+        element.y + appState.scrollY,
       );
+
+      context.lineWidth = FRAME_STYLE.strokeWidth / appState.zoom.value;
+      context.strokeStyle =
+        appState.theme === THEME.DARK
+          ? `rgba(3, 93, 161, 1)`
+          : `rgba(106, 189, 252, 1)`;
+
+      if (FRAME_STYLE.radius && context.roundRect) {
+        context.beginPath();
+        context.roundRect(
+          0,
+          0,
+          element.width,
+          element.height,
+          FRAME_STYLE.radius / appState.zoom.value,
+        );
+        context.stroke();
+        context.closePath();
+      } else {
+        context.strokeRect(0, 0, element.width, element.height);
+      }
+
+      context.restore();
+      break;
+    default:
+      context.save();
+
+      const center = elementCenterPoint(element, elementsMap);
+
+      context.translate(center[0], center[1]);
+      context.rotate(element.angle as Radians);
+      context.translate(-center[0], -center[1]);
+
+      context.translate(element.x, element.y);
+
+      context.lineWidth =
+        clamp(1.75, element.strokeWidth, 4) /
+        Math.max(0.25, appState.zoom.value);
+      context.strokeStyle =
+        appState.theme === THEME.DARK
+          ? `rgba(3, 93, 161, 1)`
+          : `rgba(106, 189, 252, 1)`;
+
+      switch (element.type) {
+        case "ellipse":
+          context.beginPath();
+          context.ellipse(
+            element.width / 2,
+            element.height / 2,
+            element.width / 2,
+            element.height / 2,
+            0,
+            0,
+            2 * Math.PI,
+          );
+          context.closePath();
+          context.stroke();
+          break;
+        case "diamond":
+          {
+            const [segments, curves] = deconstructDiamondElement(element);
+
+            // Draw each line segment individually
+            segments.forEach((segment) => {
+              context.beginPath();
+              context.moveTo(
+                segment[0][0] - element.x,
+                segment[0][1] - element.y,
+              );
+              context.lineTo(
+                segment[1][0] - element.x,
+                segment[1][1] - element.y,
+              );
+              context.stroke();
+            });
+
+            // Draw each curve individually (for rounded corners)
+            curves.forEach((curve) => {
+              const [start, control1, control2, end] = curve;
+              context.beginPath();
+              context.moveTo(start[0] - element.x, start[1] - element.y);
+              context.bezierCurveTo(
+                control1[0] - element.x,
+                control1[1] - element.y,
+                control2[0] - element.x,
+                control2[1] - element.y,
+                end[0] - element.x,
+                end[1] - element.y,
+              );
+              context.stroke();
+            });
+          }
+
+          break;
+        default:
+          {
+            const [segments, curves] = deconstructRectanguloidElement(element);
+
+            // Draw each line segment individually
+            segments.forEach((segment) => {
+              context.beginPath();
+              context.moveTo(
+                segment[0][0] - element.x,
+                segment[0][1] - element.y,
+              );
+              context.lineTo(
+                segment[1][0] - element.x,
+                segment[1][1] - element.y,
+              );
+              context.stroke();
+            });
+
+            // Draw each curve individually (for rounded corners)
+            curves.forEach((curve) => {
+              const [start, control1, control2, end] = curve;
+              context.beginPath();
+              context.moveTo(start[0] - element.x, start[1] - element.y);
+              context.bezierCurveTo(
+                control1[0] - element.x,
+                control1[1] - element.y,
+                control2[0] - element.x,
+                control2[1] - element.y,
+                end[0] - element.x,
+                end[1] - element.y,
+              );
+              context.stroke();
+            });
+          }
+
+          break;
+      }
+
+      context.restore();
+
       break;
-    }
   }
 };
 
-const renderBindingHighlightForSuggestedPointBinding = (
+const renderBindingHighlightForBindableElement_complex = (
+  app: AppClassProperties,
   context: CanvasRenderingContext2D,
-  suggestedBinding: SuggestedPointBinding,
-  elementsMap: ElementsMap,
-  zoom: InteractiveCanvasAppState["zoom"],
+  element: ExcalidrawBindableElement,
+  allElementsMap: NonDeletedSceneElementsMap,
+  appState: InteractiveCanvasAppState,
+  deltaTime: number,
+  state?: { runtime: number },
 ) => {
-  const [element, startOrEnd, bindableElement] = suggestedBinding;
+  const countdownInProgress =
+    app.state.bindMode === "orbit" && app.bindModeHandler !== null;
 
-  const threshold = maxBindingGap(
-    bindableElement,
-    bindableElement.width,
-    bindableElement.height,
-    zoom,
-  );
+  const remainingTime =
+    BIND_MODE_TIMEOUT -
+    (state?.runtime ?? (countdownInProgress ? 0 : BIND_MODE_TIMEOUT));
+  const opacity = clamp((1 / BIND_MODE_TIMEOUT) * remainingTime, 0.0001, 1);
+  const offset = element.strokeWidth / 2;
 
-  context.strokeStyle = "rgba(0,0,0,0)";
-  context.fillStyle = "rgba(0,0,0,.05)";
-
-  const pointIndices =
-    startOrEnd === "both" ? [0, -1] : startOrEnd === "start" ? [0] : [-1];
-  pointIndices.forEach((index) => {
-    const [x, y] = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-      element,
-      index,
-      elementsMap,
+  const enclosingFrame = element.frameId && allElementsMap.get(element.frameId);
+  if (enclosingFrame && isFrameLikeElement(enclosingFrame)) {
+    context.translate(
+      enclosingFrame.x + appState.scrollX,
+      enclosingFrame.y + appState.scrollY,
     );
-    fillCircle(context, x, y, threshold, true);
-  });
+
+    context.beginPath();
+
+    if (FRAME_STYLE.radius && context.roundRect) {
+      context.roundRect(
+        -1,
+        -1,
+        enclosingFrame.width + 1,
+        enclosingFrame.height + 1,
+        FRAME_STYLE.radius / appState.zoom.value,
+      );
+    } else {
+      context.rect(-1, -1, enclosingFrame.width + 1, enclosingFrame.height + 1);
+    }
+
+    context.clip();
+
+    context.translate(
+      -(enclosingFrame.x + appState.scrollX),
+      -(enclosingFrame.y + appState.scrollY),
+    );
+  }
+
+  switch (element.type) {
+    case "magicframe":
+    case "frame":
+      context.save();
+
+      context.translate(
+        element.x + appState.scrollX,
+        element.y + appState.scrollY,
+      );
+
+      context.lineWidth = FRAME_STYLE.strokeWidth / appState.zoom.value;
+      context.strokeStyle =
+        appState.theme === THEME.DARK
+          ? `rgba(3, 93, 161, ${opacity})`
+          : `rgba(106, 189, 252, ${opacity})`;
+
+      if (FRAME_STYLE.radius && context.roundRect) {
+        context.beginPath();
+        context.roundRect(
+          0,
+          0,
+          element.width,
+          element.height,
+          FRAME_STYLE.radius / appState.zoom.value,
+        );
+        context.stroke();
+        context.closePath();
+      } else {
+        context.strokeRect(0, 0, element.width, element.height);
+      }
+
+      context.restore();
+      break;
+    default:
+      context.save();
+
+      const center = elementCenterPoint(element, allElementsMap);
+      const cx = center[0] + appState.scrollX;
+      const cy = center[1] + appState.scrollY;
+
+      context.translate(cx, cy);
+      context.rotate(element.angle as Radians);
+      context.translate(-cx, -cy);
+
+      context.translate(
+        element.x + appState.scrollX - offset,
+        element.y + appState.scrollY - offset,
+      );
+
+      context.lineWidth =
+        clamp(2.5, element.strokeWidth * 1.75, 4) /
+        Math.max(0.25, appState.zoom.value);
+      context.strokeStyle =
+        appState.theme === THEME.DARK
+          ? `rgba(3, 93, 161, ${opacity / 2})`
+          : `rgba(106, 189, 252, ${opacity / 2})`;
+
+      switch (element.type) {
+        case "ellipse":
+          context.beginPath();
+          context.ellipse(
+            (element.width + offset * 2) / 2,
+            (element.height + offset * 2) / 2,
+            (element.width + offset * 2) / 2,
+            (element.height + offset * 2) / 2,
+            0,
+            0,
+            2 * Math.PI,
+          );
+          context.closePath();
+          context.stroke();
+          break;
+        case "diamond":
+          {
+            const [segments, curves] = deconstructDiamondElement(
+              element,
+              offset,
+            );
+
+            // Draw each line segment individually
+            segments.forEach((segment) => {
+              context.beginPath();
+              context.moveTo(
+                segment[0][0] - element.x + offset,
+                segment[0][1] - element.y + offset,
+              );
+              context.lineTo(
+                segment[1][0] - element.x + offset,
+                segment[1][1] - element.y + offset,
+              );
+              context.stroke();
+            });
+
+            // Draw each curve individually (for rounded corners)
+            curves.forEach((curve) => {
+              const [start, control1, control2, end] = curve;
+              context.beginPath();
+              context.moveTo(
+                start[0] - element.x + offset,
+                start[1] - element.y + offset,
+              );
+              context.bezierCurveTo(
+                control1[0] - element.x + offset,
+                control1[1] - element.y + offset,
+                control2[0] - element.x + offset,
+                control2[1] - element.y + offset,
+                end[0] - element.x + offset,
+                end[1] - element.y + offset,
+              );
+              context.stroke();
+            });
+          }
+
+          break;
+        default:
+          {
+            const [segments, curves] = deconstructRectanguloidElement(
+              element,
+              offset,
+            );
+
+            // Draw each line segment individually
+            segments.forEach((segment) => {
+              context.beginPath();
+              context.moveTo(
+                segment[0][0] - element.x + offset,
+                segment[0][1] - element.y + offset,
+              );
+              context.lineTo(
+                segment[1][0] - element.x + offset,
+                segment[1][1] - element.y + offset,
+              );
+              context.stroke();
+            });
+
+            // Draw each curve individually (for rounded corners)
+            curves.forEach((curve) => {
+              const [start, control1, control2, end] = curve;
+              context.beginPath();
+              context.moveTo(
+                start[0] - element.x + offset,
+                start[1] - element.y + offset,
+              );
+              context.bezierCurveTo(
+                control1[0] - element.x + offset,
+                control1[1] - element.y + offset,
+                control2[0] - element.x + offset,
+                control2[1] - element.y + offset,
+                end[0] - element.x + offset,
+                end[1] - element.y + offset,
+              );
+              context.stroke();
+            });
+          }
+
+          break;
+      }
+
+      context.restore();
+
+      break;
+  }
+
+  // Middle indicator is not rendered after it expired
+  if (!countdownInProgress || (state?.runtime ?? 0) > BIND_MODE_TIMEOUT) {
+    return;
+  }
+
+  const radius = 0.5 * (Math.min(element.width, element.height) / 2);
+
+  // Draw center snap area
+  if (!isFrameLikeElement(element)) {
+    context.save();
+    context.translate(
+      element.x + appState.scrollX,
+      element.y + appState.scrollY,
+    );
+
+    const PROGRESS_RATIO = (1 / BIND_MODE_TIMEOUT) * remainingTime;
+
+    context.strokeStyle = "rgba(0, 0, 0, 0.2)";
+    context.lineWidth = 1 / appState.zoom.value;
+    context.setLineDash([4 / appState.zoom.value, 4 / appState.zoom.value]);
+    context.lineDashOffset = (-PROGRESS_RATIO * 10) / appState.zoom.value;
+
+    context.beginPath();
+    context.ellipse(
+      element.width / 2,
+      element.height / 2,
+      radius,
+      radius,
+      0,
+      0,
+      2 * Math.PI,
+    );
+    context.stroke();
+
+    // context.strokeStyle = "transparent";
+    context.fillStyle = "rgba(0, 0, 0, 0.04)";
+    context.beginPath();
+    context.ellipse(
+      element.width / 2,
+      element.height / 2,
+      radius * (1 - opacity),
+      radius * (1 - opacity),
+      0,
+      0,
+      2 * Math.PI,
+    );
+
+    context.fill();
+
+    context.restore();
+  }
+
+  return {
+    runtime: (state?.runtime ?? 0) + deltaTime,
+  };
+};
+
+const renderBindingHighlightForBindableElement = (
+  app: AppClassProperties,
+  context: CanvasRenderingContext2D,
+  element: ExcalidrawBindableElement,
+  allElementsMap: NonDeletedSceneElementsMap,
+  appState: InteractiveCanvasAppState,
+  deltaTime: number,
+  state?: { runtime: number },
+) => {
+  if (getFeatureFlag("COMPLEX_BINDINGS")) {
+    return renderBindingHighlightForBindableElement_complex(
+      app,
+      context,
+      element,
+      allElementsMap,
+      appState,
+      deltaTime,
+      state,
+    );
+  }
+
+  context.save();
+  context.translate(appState.scrollX, appState.scrollY);
+  renderBindingHighlightForBindableElement_simple(
+    context,
+    element,
+    allElementsMap,
+    appState,
+  );
+  context.restore();
 };
 
 type ElementSelectionBorder = {
@@ -322,7 +723,7 @@ const renderSelectionBorder = (
       ]);
     }
     context.lineDashOffset = (lineWidth + spaceWidth) * index;
-    strokeRectWithRotation(
+    strokeRectWithRotation_simple(
       context,
       x1 - linePadding,
       y1 - linePadding,
@@ -336,23 +737,6 @@ const renderSelectionBorder = (
   context.restore();
 };
 
-const renderBindingHighlight = (
-  context: CanvasRenderingContext2D,
-  appState: InteractiveCanvasAppState,
-  suggestedBinding: SuggestedBinding,
-  elementsMap: ElementsMap,
-) => {
-  const renderHighlight = Array.isArray(suggestedBinding)
-    ? renderBindingHighlightForSuggestedPointBinding
-    : renderBindingHighlightForBindableElement;
-
-  context.save();
-  context.translate(appState.scrollX, appState.scrollY);
-  renderHighlight(context, suggestedBinding as any, elementsMap, appState.zoom);
-
-  context.restore();
-};
-
 const renderFrameHighlight = (
   context: CanvasRenderingContext2D,
   appState: InteractiveCanvasAppState,
@@ -368,7 +752,7 @@ const renderFrameHighlight = (
 
   context.save();
   context.translate(appState.scrollX, appState.scrollY);
-  strokeRectWithRotation(
+  strokeRectWithRotation_simple(
     context,
     x1,
     y1,
@@ -581,7 +965,7 @@ const renderTransformHandles = (
         context.fill();
         context.stroke();
       } else {
-        strokeRectWithRotation(
+        strokeRectWithRotation_simple(
           context,
           x,
           y,
@@ -726,6 +1110,7 @@ const renderTextBox = (
 };
 
 const _renderInteractiveScene = ({
+  app,
   canvas,
   elementsMap,
   visibleElements,
@@ -734,8 +1119,15 @@ const _renderInteractiveScene = ({
   scale,
   appState,
   renderConfig,
-  device,
-}: InteractiveSceneRenderConfig) => {
+  editorInterface,
+  animationState,
+  deltaTime,
+}: InteractiveSceneRenderConfig): {
+  scrollBars?: ReturnType<typeof getScrollBars>;
+  atLeastOneVisibleElement: boolean;
+  elementsMap: RenderableElementsMap;
+  animationState?: typeof animationState;
+} => {
   if (canvas === null) {
     return { atLeastOneVisibleElement: false, elementsMap };
   }
@@ -744,6 +1136,7 @@ const _renderInteractiveScene = ({
     canvas,
     scale,
   );
+  let nextAnimationState = animationState;
 
   const context = bootstrapCanvas({
     canvas,
@@ -813,17 +1206,24 @@ const _renderInteractiveScene = ({
     }
   }
 
-  if (appState.isBindingEnabled) {
-    appState.suggestedBindings
-      .filter((binding) => binding != null)
-      .forEach((suggestedBinding) => {
-        renderBindingHighlight(
-          context,
-          appState,
-          suggestedBinding!,
-          elementsMap,
-        );
-      });
+  if (appState.isBindingEnabled && appState.suggestedBinding) {
+    nextAnimationState = {
+      ...animationState,
+      bindingHighlight: renderBindingHighlightForBindableElement(
+        app,
+        context,
+        appState.suggestedBinding,
+        allElementsMap,
+        appState,
+        deltaTime,
+        animationState?.bindingHighlight,
+      ),
+    };
+  } else {
+    nextAnimationState = {
+      ...animationState,
+      bindingHighlight: undefined,
+    };
   }
 
   if (appState.frameToHighlight) {
@@ -878,21 +1278,31 @@ const _renderInteractiveScene = ({
       (el) => el.id === editor.elementId, // Don't forget bound text elements!
     );
 
-    if (editor.segmentMidPointHoveredCoords) {
-      renderElbowArrowMidPointHighlight(context, appState);
-    } else if (
-      isElbowArrow(firstSelectedLinear)
-        ? editor.hoverPointIndex === 0 ||
-          editor.hoverPointIndex === firstSelectedLinear.points.length - 1
-        : editor.hoverPointIndex >= 0
-    ) {
-      renderLinearElementPointHighlight(context, appState, elementsMap);
+    if (!appState.selectedLinearElement.isDragging) {
+      if (editor.segmentMidPointHoveredCoords) {
+        renderElbowArrowMidPointHighlight(context, appState);
+      } else if (
+        isElbowArrow(firstSelectedLinear)
+          ? editor.hoverPointIndex === 0 ||
+            editor.hoverPointIndex === firstSelectedLinear.points.length - 1
+          : editor.hoverPointIndex >= 0
+      ) {
+        renderLinearElementPointHighlight(context, appState, elementsMap);
+      }
     }
   }
 
   // Paint selected elements
-  if (!appState.multiElement && !appState.selectedLinearElement?.isEditing) {
-    const showBoundingBox = hasBoundingBox(selectedElements, appState);
+  if (
+    !appState.multiElement &&
+    !appState.newElement &&
+    !appState.selectedLinearElement?.isEditing
+  ) {
+    const showBoundingBox = hasBoundingBox(
+      selectedElements,
+      appState,
+      editorInterface,
+    );
 
     const isSingleLinearElementSelected =
       selectedElements.length === 1 && isLinearElement(selectedElements[0]);
@@ -1024,7 +1434,7 @@ const _renderInteractiveScene = ({
         appState.zoom,
         elementsMap,
         "mouse", // when we render we don't know which pointer type so use mouse,
-        getOmitSidesForDevice(device),
+        getOmitSidesForEditorInterface(editorInterface),
       );
       if (
         !appState.viewModeEnabled &&
@@ -1070,7 +1480,7 @@ const _renderInteractiveScene = ({
       const lineWidth = context.lineWidth;
       context.lineWidth = 1 / appState.zoom.value;
       context.strokeStyle = selectionColor;
-      strokeRectWithRotation(
+      strokeRectWithRotation_simple(
         context,
         x1 - dashedLinePadding,
         y1 - dashedLinePadding,
@@ -1088,8 +1498,11 @@ const _renderInteractiveScene = ({
         appState.zoom,
         "mouse",
         isFrameSelected
-          ? { ...getOmitSidesForDevice(device), rotation: true }
-          : getOmitSidesForDevice(device),
+          ? {
+              ...getOmitSidesForEditorInterface(editorInterface),
+              rotation: true,
+            }
+          : getOmitSidesForEditorInterface(editorInterface),
       );
       if (selectedElements.some((element) => !element.locked)) {
         renderTransformHandles(
@@ -1191,34 +1604,20 @@ const _renderInteractiveScene = ({
     scrollBars,
     atLeastOneVisibleElement: visibleElements.length > 0,
     elementsMap,
+    animationState: nextAnimationState,
   };
 };
 
-/** throttled to animation framerate */
-export const renderInteractiveSceneThrottled = throttleRAF(
-  (config: InteractiveSceneRenderConfig) => {
-    const ret = _renderInteractiveScene(config);
-    config.callback?.(ret);
-  },
-  { trailing: true },
-);
-
 /**
  * Interactive scene is the ui-canvas where we render bounding boxes, selections
  * and other ui stuff.
  */
 export const renderInteractiveScene = <
   U extends typeof _renderInteractiveScene,
-  T extends boolean = false,
 >(
   renderConfig: InteractiveSceneRenderConfig,
-  throttle?: T,
-): T extends true ? void : ReturnType<U> => {
-  if (throttle) {
-    renderInteractiveSceneThrottled(renderConfig);
-    return undefined as T extends true ? void : ReturnType<U>;
-  }
+): ReturnType<U> => {
   const ret = _renderInteractiveScene(renderConfig);
   renderConfig.callback(ret);
-  return ret as T extends true ? void : ReturnType<U>;
+  return ret as ReturnType<U>;
 };
diff --git a/packages/excalidraw/renderer/staticSvgScene.ts b/packages/excalidraw/renderer/staticSvgScene.ts
index 89af1dc724..2983112499 100644
--- a/packages/excalidraw/renderer/staticSvgScene.ts
+++ b/packages/excalidraw/renderer/staticSvgScene.ts
@@ -541,7 +541,7 @@ const renderElementToSvg = (
             "clipPath",
           );
           clipPath.id = `image-clipPath-${element.id}`;
-
+          clipPath.setAttribute("clipPathUnits", "userSpaceOnUse");
           const clipRect = svgRoot.ownerDocument!.createElementNS(
             SVG_NS,
             "rect",
@@ -550,6 +550,10 @@ const renderElementToSvg = (
             Math.min(element.width, element.height),
             element,
           );
+          const clipOffsetX = element.crop ? normalizedCropX : 0;
+          const clipOffsetY = element.crop ? normalizedCropY : 0;
+          clipRect.setAttribute("x", `${clipOffsetX}`);
+          clipRect.setAttribute("y", `${clipOffsetY}`);
           clipRect.setAttribute("width", `${element.width}`);
           clipRect.setAttribute("height", `${element.height}`);
           clipRect.setAttribute("rx", `${radius}`);
diff --git a/packages/excalidraw/scene/Renderer.ts b/packages/excalidraw/scene/Renderer.ts
index 6a016ccc1d..56ae3e5c58 100644
--- a/packages/excalidraw/scene/Renderer.ts
+++ b/packages/excalidraw/scene/Renderer.ts
@@ -10,7 +10,6 @@ import type {
 
 import type { Scene } from "@excalidraw/element";
 
-import { renderInteractiveSceneThrottled } from "../renderer/interactiveScene";
 import { renderStaticSceneThrottled } from "../renderer/staticScene";
 
 import type { RenderableElementsMap } from "./types";
@@ -150,7 +149,6 @@ export class Renderer {
   // NOTE Doesn't destroy everything (scene, rc, etc.) because it may not be
   // safe to break TS contract here (for upstream cases)
   public destroy() {
-    renderInteractiveSceneThrottled.cancel();
     renderStaticSceneThrottled.cancel();
     this.getRenderableElements.clear();
   }
diff --git a/packages/excalidraw/scene/types.ts b/packages/excalidraw/scene/types.ts
index 12a5e27a8e..c127a9de35 100644
--- a/packages/excalidraw/scene/types.ts
+++ b/packages/excalidraw/scene/types.ts
@@ -1,4 +1,4 @@
-import type { UserIdleState } from "@excalidraw/common";
+import type { UserIdleState, EditorInterface } from "@excalidraw/common";
 import type {
   ExcalidrawElement,
   NonDeletedElementsMap,
@@ -16,7 +16,6 @@ import type {
   InteractiveCanvasAppState,
   StaticCanvasAppState,
   SocketId,
-  Device,
   PendingExcalidrawElements,
 } from "../types";
 import type { RoughCanvas } from "roughjs/bin/canvas";
@@ -66,6 +65,7 @@ export type InteractiveCanvasRenderConfig = {
   remotePointerUsernames: Map<SocketId, string>;
   remotePointerButton: Map<SocketId, string | undefined>;
   selectionColor: string;
+  lastViewportPosition: { x: number; y: number };
   // extra options passed to the renderer
   // ---------------------------------------------------------------------------
   renderScrollbars?: boolean;
@@ -88,7 +88,12 @@ export type StaticSceneRenderConfig = {
   renderConfig: StaticCanvasRenderConfig;
 };
 
+export type InteractiveSceneRenderAnimationState = {
+  bindingHighlight: { runtime: number } | undefined;
+};
+
 export type InteractiveSceneRenderConfig = {
+  app: AppClassProperties;
   canvas: HTMLCanvasElement | null;
   elementsMap: RenderableElementsMap;
   visibleElements: readonly NonDeletedExcalidrawElement[];
@@ -97,8 +102,10 @@ export type InteractiveSceneRenderConfig = {
   scale: number;
   appState: InteractiveCanvasAppState;
   renderConfig: InteractiveCanvasRenderConfig;
-  device: Device;
+  editorInterface: EditorInterface;
   callback: (data: RenderInteractiveSceneCallback) => void;
+  animationState?: InteractiveSceneRenderAnimationState;
+  deltaTime: number;
 };
 
 export type NewElementSceneRenderConfig = {
diff --git a/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap
index 6f4f6fd559..7ae3b5775f 100644
--- a/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap
@@ -11,6 +11,7 @@ exports[`contextMenu element > right-clicking on a group should select whole gro
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": {
     "items": [
@@ -985,8 +986,7 @@ exports[`contextMenu element > right-clicking on a group should select whole gro
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -1087,6 +1087,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1181,8 +1182,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": {
     "message": "Added to library",
@@ -1304,6 +1304,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1398,8 +1399,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -1638,6 +1638,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1732,8 +1733,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -1972,6 +1972,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2066,8 +2067,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": {
     "message": "Copied styles.",
@@ -2189,6 +2189,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2281,8 +2282,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -2433,6 +2433,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2527,8 +2528,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -2734,6 +2734,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2833,8 +2834,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -3109,6 +3109,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3203,8 +3204,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": {
     "message": "Copied styles.",
@@ -3605,6 +3605,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3699,8 +3700,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -3931,6 +3931,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4025,8 +4026,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -4257,6 +4257,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4354,8 +4355,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -4671,6 +4671,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": {
     "items": [
@@ -5642,8 +5643,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -5891,6 +5891,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": {
     "items": [
@@ -6864,8 +6865,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -7162,6 +7162,7 @@ exports[`contextMenu element > shows context menu for canvas > [end of test] app
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": {
     "items": [
@@ -7798,8 +7799,7 @@ exports[`contextMenu element > shows context menu for canvas > [end of test] app
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -7832,6 +7832,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": {
     "items": [
@@ -8800,8 +8801,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -8826,6 +8826,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": {
     "items": [
@@ -9797,8 +9798,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
diff --git a/packages/excalidraw/tests/__snapshots__/dragCreate.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/dragCreate.test.tsx.snap
index c25b269f4b..a538500c25 100644
--- a/packages/excalidraw/tests/__snapshots__/dragCreate.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/dragCreate.test.tsx.snap
@@ -18,7 +18,6 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -135,7 +134,6 @@ exports[`Test dragCreate > add element to the scene when pointer dragging long e
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
diff --git a/packages/excalidraw/tests/__snapshots__/history.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/history.test.tsx.snap
index d436af1375..7c0c8b500c 100644
--- a/packages/excalidraw/tests/__snapshots__/history.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/history.test.tsx.snap
@@ -11,6 +11,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -104,8 +105,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -190,22 +190,21 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "endBinding": {
     "elementId": "id15",
     "fixedPoint": [
-      "0.50000",
+      "0.50010",
       1,
     ],
-    "focus": 0,
-    "gap": 1,
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": "99.19972",
+  "height": "106.79573",
   "id": "id4",
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -213,8 +212,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       0,
     ],
     [
-      "98.40611",
-      "99.19972",
+      "89.00000",
+      "106.79573",
     ],
   ],
   "roughness": 1,
@@ -228,9 +227,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 35,
-  "width": "98.40611",
-  "x": 1,
+  "version": 33,
+  "width": "89.00000",
+  "x": 0,
   "y": 0,
 }
 `;
@@ -272,7 +271,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
 
 exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and the arrow got bound to a different element in the meantime > [end of test] number of elements 1`] = `4`;
 
-exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and the arrow got bound to a different element in the meantime > [end of test] number of renders 1`] = `21`;
+exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and the arrow got bound to a different element in the meantime > [end of test] number of renders 1`] = `22`;
 
 exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and the arrow got bound to a different element in the meantime > [end of test] redo stack 1`] = `
 [
@@ -330,53 +329,63 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "endBinding": {
               "elementId": "id15",
               "fixedPoint": [
-                "0.50000",
+                "0.50010",
                 1,
               ],
-              "focus": 0,
-              "gap": 1,
+              "mode": "orbit",
             },
-            "height": "68.58402",
+            "height": "65.91078",
             "points": [
               [
                 0,
                 0,
               ],
               [
-                98,
-                "68.58402",
+                78,
+                "65.91078",
               ],
             ],
             "startBinding": {
               "elementId": "id0",
-              "focus": "0.02970",
-              "gap": 1,
+              "fixedPoint": [
+                "0.63636",
+                "0.63636",
+              ],
+              "mode": "orbit",
             },
-            "version": 33,
+            "version": 32,
+            "width": 78,
           },
           "inserted": {
             "endBinding": {
               "elementId": "id1",
-              "focus": "-0.02000",
-              "gap": 1,
+              "fixedPoint": [
+                "0.39512",
+                "0.60488",
+              ],
+              "mode": "orbit",
             },
-            "height": "0.00656",
+            "height": "1.30876",
             "points": [
               [
                 0,
                 0,
               ],
               [
-                98,
-                "-0.00656",
+                78,
+                "-1.30876",
               ],
             ],
             "startBinding": {
               "elementId": "id0",
-              "focus": "0.02000",
-              "gap": 1,
+              "fixedPoint": [
+                "0.63636",
+                "0.63636",
+              ],
+              "mode": "orbit",
             },
-            "version": 30,
+            "version": 29,
+            "width": 78,
           },
         },
       },
@@ -419,40 +428,47 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
         },
         "id4": {
           "deleted": {
-            "height": "99.19972",
+            "height": "106.79573",
             "points": [
               [
                 0,
                 0,
               ],
               [
-                "98.40611",
-                "99.19972",
+                "89.00000",
+                "106.79573",
               ],
             ],
             "startBinding": null,
-            "version": 35,
+            "version": 33,
+            "width": "89.00000",
+            "x": 0,
             "y": 0,
           },
           "inserted": {
-            "height": "68.58402",
+            "height": "65.91078",
             "points": [
               [
                 0,
                 0,
               ],
               [
-                98,
-                "68.58402",
+                78,
+                "65.91078",
               ],
             ],
             "startBinding": {
               "elementId": "id0",
-              "focus": "0.02970",
-              "gap": 1,
+              "fixedPoint": [
+                "0.63636",
+                "0.63636",
+              ],
+              "mode": "orbit",
             },
-            "version": 33,
-            "y": "35.82151",
+            "version": 32,
+            "width": 78,
+            "x": 11,
+            "y": "49.49137",
           },
         },
       },
@@ -577,7 +593,6 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "height": 0,
             "index": "a2",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -630,6 +645,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -723,8 +739,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -814,9 +829,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "id": "id4",
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -824,7 +839,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       0,
     ],
     [
-      0,
+      100,
       0,
     ],
   ],
@@ -839,16 +854,16 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 31,
-  "width": 0,
-  "x": 149,
+  "version": 28,
+  "width": 100,
+  "x": 150,
   "y": 0,
 }
 `;
 
 exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and there are no conflicting updates in the meantime > [end of test] number of elements 1`] = `3`;
 
-exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and there are no conflicting updates in the meantime > [end of test] number of renders 1`] = `23`;
+exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and there are no conflicting updates in the meantime > [end of test] number of renders 1`] = `24`;
 
 exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should rebind bindings when both are updated through the history and there are no conflicting updates in the meantime > [end of test] redo stack 1`] = `
 [
@@ -889,15 +904,60 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
         "id4": {
           "deleted": {
             "endBinding": null,
-            "version": 30,
+            "height": "4.68000",
+            "points": [
+              [
+                0,
+                0,
+              ],
+              [
+                -39,
+                "-4.68000",
+              ],
+            ],
+            "startBinding": {
+              "elementId": "id0",
+              "fixedPoint": [
+                "0.63636",
+                "0.63636",
+              ],
+              "mode": "orbit",
+            },
+            "version": 27,
+            "width": 39,
+            "y": "4.68000",
           },
           "inserted": {
             "endBinding": {
               "elementId": "id1",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.41019",
+                "0.58981",
+              ],
+              "mode": "orbit",
             },
-            "version": 28,
+            "height": "10.70742",
+            "points": [
+              [
+                0,
+                0,
+              ],
+              [
+                "52.01909",
+                "10.70742",
+              ],
+            ],
+            "startBinding": {
+              "elementId": "id0",
+              "fixedPoint": [
+                "0.63636",
+                "0.63636",
+              ],
+              "mode": "orbit",
+            },
+            "version": 26,
+            "width": "52.01909",
+            "y": "-1.72651",
           },
         },
       },
@@ -932,16 +992,47 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
         },
         "id4": {
           "deleted": {
+            "height": 0,
+            "points": [
+              [
+                0,
+                0,
+              ],
+              [
+                100,
+                0,
+              ],
+            ],
             "startBinding": null,
-            "version": 31,
+            "version": 28,
+            "width": 100,
+            "x": 150,
+            "y": 0,
           },
           "inserted": {
+            "height": "4.68000",
+            "points": [
+              [
+                0,
+                0,
+              ],
+              [
+                -39,
+                "-4.68000",
+              ],
+            ],
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.63636",
+                "0.63636",
+              ],
+              "mode": "orbit",
             },
-            "version": 30,
+            "version": 27,
+            "width": 39,
+            "x": 139,
+            "y": "4.68000",
           },
         },
       },
@@ -1066,7 +1157,6 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "height": 0,
             "index": "a2",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -1119,6 +1209,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1211,8 +1302,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -1240,19 +1330,18 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       "0.50000",
       1,
     ],
-    "focus": 0,
-    "gap": 1,
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": "1.36342",
+  "height": "26.16768",
   "id": "id4",
   "index": "Zz",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -1260,8 +1349,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       0,
     ],
     [
-      98,
-      "1.36342",
+      "78.00000",
+      "26.16768",
     ],
   ],
   "roughness": 1,
@@ -1273,8 +1362,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       1,
       "0.50000",
     ],
-    "focus": 0,
-    "gap": 1,
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1282,9 +1370,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "type": "arrow",
   "updated": 1,
   "version": 10,
-  "width": 98,
-  "x": 1,
-  "y": 0,
+  "width": "78.00000",
+  "x": 11,
+  "y": "3.67566",
 }
 `;
 
@@ -1448,8 +1536,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                 "0.50000",
                 1,
               ],
-              "focus": 0,
-              "gap": 1,
+              "mode": "orbit",
             },
             "startBinding": {
               "elementId": "id0",
@@ -1457,8 +1544,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                 1,
                 "0.50000",
               ],
-              "focus": 0,
-              "gap": 1,
+              "mode": "orbit",
             },
             "version": 10,
           },
@@ -1486,6 +1572,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1578,8 +1665,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -1607,19 +1693,18 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       1,
       "0.50000",
     ],
-    "focus": 0,
-    "gap": 1,
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": "1.36342",
+  "height": "10.76674",
   "id": "id5",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -1627,8 +1712,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       0,
     ],
     [
-      98,
-      "1.36342",
+      "78.00000",
+      "-10.76674",
     ],
   ],
   "roughness": 1,
@@ -1640,8 +1725,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       "0.50000",
       1,
     ],
-    "focus": 0,
-    "gap": 1,
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1649,9 +1733,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "type": "arrow",
   "updated": 1,
   "version": 11,
-  "width": 98,
-  "x": 1,
-  "y": 0,
+  "width": "78.00000",
+  "x": 11,
+  "y": "35.29320",
 }
 `;
 
@@ -1757,16 +1841,14 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                 1,
                 "0.50000",
               ],
-              "focus": 0,
-              "gap": 1,
+              "mode": "orbit",
             },
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": "1.36342",
+            "height": "10.76674",
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -1776,8 +1858,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                 0,
               ],
               [
-                98,
-                "1.36342",
+                "78.00000",
+                "-10.76674",
               ],
             ],
             "roughness": 1,
@@ -1789,17 +1871,16 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                 "0.50000",
                 1,
               ],
-              "focus": 0,
-              "gap": 1,
+              "mode": "orbit",
             },
             "strokeColor": "#1e1e1e",
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
             "version": 11,
-            "width": 98,
-            "x": 1,
-            "y": 0,
+            "width": "78.00000",
+            "x": 11,
+            "y": "35.29320",
           },
           "inserted": {
             "isDeleted": true,
@@ -1856,6 +1937,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1948,8 +2030,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -2122,6 +2203,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2213,8 +2295,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -2308,19 +2389,22 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id1",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.50010",
+      "0.50010",
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": "370.26975",
+  "height": "361.17383",
   "id": "id4",
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -2328,8 +2412,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       0,
     ],
     [
-      "498.00000",
-      "-370.26975",
+      "478.06757",
+      "-361.17383",
     ],
   ],
   "roughness": 1,
@@ -2339,24 +2423,27 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id0",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.54844",
+      "0.54844",
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
-  "width": "498.00000",
-  "x": 1,
-  "y": "-37.92697",
+  "version": 14,
+  "width": "478.06757",
+  "x": 11,
+  "y": "-37.61782",
 }
 `;
 
 exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should update bound element points when rectangle was remotely moved and arrow is added back through the history > [end of test] number of elements 1`] = `3`;
 
-exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should update bound element points when rectangle was remotely moved and arrow is added back through the history > [end of test] number of renders 1`] = `9`;
+exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should update bound element points when rectangle was remotely moved and arrow is added back through the history > [end of test] number of renders 1`] = `11`;
 
 exports[`history > multiplayer undo/redo > conflicts in arrows and their bindable elements > should update bound element points when rectangle was remotely moved and arrow is added back through the history > [end of test] redo stack 1`] = `[]`;
 
@@ -2470,16 +2557,18 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "endArrowhead": "arrow",
             "endBinding": {
               "elementId": "id1",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
             },
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": "370.26975",
+            "height": "361.17383",
             "index": "a2",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -2489,8 +2578,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                 0,
               ],
               [
-                "498.00000",
-                "-370.26975",
+                "478.06757",
+                "-361.17383",
               ],
             ],
             "roughness": 1,
@@ -2500,21 +2589,24 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "startArrowhead": null,
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.54844",
+                "0.54844",
+              ],
+              "mode": "orbit",
             },
             "strokeColor": "#1e1e1e",
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 10,
-            "width": "498.00000",
-            "x": 1,
-            "y": "-37.92697",
+            "version": 14,
+            "width": "478.06757",
+            "x": 11,
+            "y": "-37.61782",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 7,
+            "version": 11,
           },
         },
       },
@@ -2567,6 +2659,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2659,8 +2752,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -2873,6 +2965,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2965,8 +3058,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -3195,6 +3287,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3287,8 +3380,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -3492,6 +3584,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3584,8 +3677,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -3781,6 +3873,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3873,8 +3966,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -4019,6 +4111,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4111,8 +4204,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -4279,6 +4371,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4371,8 +4464,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -4553,6 +4645,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4645,8 +4738,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -4785,6 +4877,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4877,8 +4970,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -5017,6 +5109,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -5109,8 +5202,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -5267,6 +5359,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -5359,8 +5452,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -5526,6 +5618,7 @@ exports[`history > multiplayer undo/redo > conflicts in frames and their childre
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -5618,8 +5711,7 @@ exports[`history > multiplayer undo/redo > conflicts in frames and their childre
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -5787,6 +5879,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -5878,8 +5971,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -6119,6 +6211,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -6210,8 +6303,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -6549,6 +6641,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -6643,8 +6736,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -6926,6 +7018,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -7026,8 +7119,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -7241,6 +7333,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -7330,8 +7423,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -7361,10 +7453,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "id": "id0",
   "index": "a0",
   "isDeleted": true,
-  "lastCommittedPoint": [
-    10,
-    10,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -7389,7 +7477,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 9,
+  "version": 7,
   "width": 10,
   "x": 0,
   "y": 0,
@@ -7398,7 +7486,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
 
 exports[`history > multiplayer undo/redo > should iterate through the history when selected or editing linear element was remotely deleted > [end of test] number of elements 1`] = `1`;
 
-exports[`history > multiplayer undo/redo > should iterate through the history when selected or editing linear element was remotely deleted > [end of test] number of renders 1`] = `9`;
+exports[`history > multiplayer undo/redo > should iterate through the history when selected or editing linear element was remotely deleted > [end of test] number of renders 1`] = `11`;
 
 exports[`history > multiplayer undo/redo > should iterate through the history when selected or editing linear element was remotely deleted > [end of test] redo stack 1`] = `[]`;
 
@@ -7411,9 +7499,14 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
           "selectedElementIds": {
             "id0": true,
           },
+          "selectedLinearElement": {
+            "elementId": "id0",
+            "isEditing": false,
+          },
         },
         "inserted": {
           "selectedElementIds": {},
+          "selectedLinearElement": null,
         },
       },
     },
@@ -7436,10 +7529,6 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
             "height": 10,
             "index": "a0",
             "isDeleted": true,
-            "lastCommittedPoint": [
-              10,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -7463,40 +7552,19 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 9,
+            "version": 7,
             "width": 10,
             "x": 0,
             "y": 0,
           },
           "inserted": {
             "isDeleted": true,
-            "version": 8,
+            "version": 6,
           },
         },
       },
     },
-    "id": "id13",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedLinearElement": {
-            "elementId": "id0",
-            "isEditing": false,
-          },
-        },
-        "inserted": {
-          "selectedLinearElement": null,
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id14",
+    "id": "id10",
   },
   {
     "appState": AppStateDelta {
@@ -7520,7 +7588,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
       "removed": {},
       "updated": {},
     },
-    "id": "id15",
+    "id": "id11",
   },
   {
     "appState": AppStateDelta {
@@ -7544,7 +7612,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
       "removed": {},
       "updated": {},
     },
-    "id": "id16",
+    "id": "id12",
   },
 ]
 `;
@@ -7560,6 +7628,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -7649,8 +7718,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -7793,6 +7861,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -7882,8 +7951,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -8148,6 +8216,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -8237,8 +8306,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -8503,6 +8571,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -8598,8 +8667,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -8912,6 +8980,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
     "locked": false,
     "type": "freedraw",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9001,8 +9070,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -9029,10 +9097,6 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": [
-    50,
-    50,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -9135,10 +9199,6 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
             "height": 50,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              50,
-              50,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -9202,6 +9262,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9293,8 +9354,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -9469,6 +9529,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9560,8 +9621,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -9737,6 +9797,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9828,8 +9889,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -9972,6 +10032,7 @@ exports[`history > multiplayer undo/redo > should override remotely added groups
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10064,8 +10125,7 @@ exports[`history > multiplayer undo/redo > should override remotely added groups
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -10272,6 +10332,7 @@ exports[`history > multiplayer undo/redo > should override remotely added points
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10363,8 +10424,7 @@ exports[`history > multiplayer undo/redo > should override remotely added points
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -10394,10 +10454,6 @@ exports[`history > multiplayer undo/redo > should override remotely added points
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": [
-    30,
-    30,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -10434,7 +10490,7 @@ exports[`history > multiplayer undo/redo > should override remotely added points
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 13,
+  "version": 10,
   "width": 30,
   "x": 0,
   "y": 0,
@@ -10443,7 +10499,7 @@ exports[`history > multiplayer undo/redo > should override remotely added points
 
 exports[`history > multiplayer undo/redo > should override remotely added points on undo, but restore them on redo > [end of test] number of elements 1`] = `1`;
 
-exports[`history > multiplayer undo/redo > should override remotely added points on undo, but restore them on redo > [end of test] number of renders 1`] = `14`;
+exports[`history > multiplayer undo/redo > should override remotely added points on undo, but restore them on redo > [end of test] number of renders 1`] = `13`;
 
 exports[`history > multiplayer undo/redo > should override remotely added points on undo, but restore them on redo > [end of test] redo stack 1`] = `[]`;
 
@@ -10456,9 +10512,14 @@ exports[`history > multiplayer undo/redo > should override remotely added points
           "selectedElementIds": {
             "id0": true,
           },
+          "selectedLinearElement": {
+            "elementId": "id0",
+            "isEditing": false,
+          },
         },
         "inserted": {
           "selectedElementIds": {},
+          "selectedLinearElement": null,
         },
       },
     },
@@ -10480,10 +10541,6 @@ exports[`history > multiplayer undo/redo > should override remotely added points
             "height": 10,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              10,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -10507,20 +10564,20 @@ exports[`history > multiplayer undo/redo > should override remotely added points
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 12,
+            "version": 9,
             "width": 10,
             "x": 0,
             "y": 0,
           },
           "inserted": {
             "isDeleted": true,
-            "version": 11,
+            "version": 8,
           },
         },
       },
       "updated": {},
     },
-    "id": "id10",
+    "id": "id7",
   },
   {
     "appState": AppStateDelta {
@@ -10536,10 +10593,6 @@ exports[`history > multiplayer undo/redo > should override remotely added points
         "id0": {
           "deleted": {
             "height": 30,
-            "lastCommittedPoint": [
-              30,
-              30,
-            ],
             "points": [
               [
                 0,
@@ -10562,15 +10615,11 @@ exports[`history > multiplayer undo/redo > should override remotely added points
                 20,
               ],
             ],
-            "version": 13,
+            "version": 10,
             "width": 30,
           },
           "inserted": {
             "height": 10,
-            "lastCommittedPoint": [
-              10,
-              10,
-            ],
             "points": [
               [
                 0,
@@ -10581,34 +10630,13 @@ exports[`history > multiplayer undo/redo > should override remotely added points
                 10,
               ],
             ],
-            "version": 12,
+            "version": 9,
             "width": 10,
           },
         },
       },
     },
-    "id": "id11",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedLinearElement": {
-            "elementId": "id0",
-            "isEditing": false,
-          },
-        },
-        "inserted": {
-          "selectedLinearElement": null,
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id12",
+    "id": "id8",
   },
 ]
 `;
@@ -10624,6 +10652,7 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10713,8 +10742,7 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -10863,6 +10891,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10955,8 +10984,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -11044,8 +11072,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
       "0.49919",
       "-0.03875",
     ],
-    "focus": "-0.00161",
-    "gap": "3.53708",
+    "mode": "orbit",
   },
   "endIsSpecial": false,
   "fillStyle": "solid",
@@ -11056,7 +11083,6 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
   "id": "6Rm4g567UQM4WjLwej2Vc",
   "index": "a2",
   "isDeleted": true,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -11083,8 +11109,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
       "1.03185",
       "0.49921",
     ],
-    "focus": "-0.00159",
-    "gap": 5,
+    "mode": "orbit",
   },
   "startIsSpecial": false,
   "strokeColor": "#1e1e1e",
@@ -11132,8 +11157,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
                 "0.49919",
                 "-0.03875",
               ],
-              "focus": "-0.00161",
-              "gap": "3.53708",
+              "mode": "orbit",
             },
             "endIsSpecial": false,
             "fillStyle": "solid",
@@ -11143,7 +11167,6 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
             "height": "236.10000",
             "index": "a2",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -11170,8 +11193,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
                 "1.03185",
                 "0.49921",
               ],
-              "focus": "-0.00159",
-              "gap": 5,
+              "mode": "orbit",
             },
             "startIsSpecial": false,
             "strokeColor": "#1e1e1e",
@@ -11314,6 +11336,7 @@ exports[`history > multiplayer undo/redo > should update history entries after r
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -11405,8 +11428,7 @@ exports[`history > multiplayer undo/redo > should update history entries after r
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -11577,6 +11599,7 @@ exports[`history > singleplayer undo/redo > remounting undo/redo buttons should
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -11666,8 +11689,7 @@ exports[`history > singleplayer undo/redo > remounting undo/redo buttons should
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -11815,6 +11837,7 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -11906,8 +11929,7 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -12055,6 +12077,7 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
     "locked": false,
     "type": "freedraw",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -12144,8 +12167,7 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -12202,10 +12224,6 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
   "id": "id5",
   "index": "a1",
   "isDeleted": true,
-  "lastCommittedPoint": [
-    50,
-    10,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -12256,10 +12274,6 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
   "id": "id9",
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": [
-    50,
-    10,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -12399,10 +12413,6 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
             "height": 10,
             "index": "a2",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              50,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -12461,6 +12471,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -12555,8 +12566,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -12674,6 +12684,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -12765,8 +12776,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -12884,6 +12894,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -12979,8 +12990,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -13188,6 +13198,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -13280,8 +13291,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -13489,6 +13499,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on s
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -13581,8 +13592,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on s
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -13737,6 +13747,7 @@ exports[`history > singleplayer undo/redo > should disable undo/redo buttons whe
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -13828,8 +13839,7 @@ exports[`history > singleplayer undo/redo > should disable undo/redo buttons whe
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -13977,6 +13987,7 @@ exports[`history > singleplayer undo/redo > should end up with no history entry
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14068,8 +14079,7 @@ exports[`history > singleplayer undo/redo > should end up with no history entry
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -14217,6 +14227,7 @@ exports[`history > singleplayer undo/redo > should iterate through the history w
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14308,8 +14319,7 @@ exports[`history > singleplayer undo/redo > should iterate through the history w
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -14467,6 +14477,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14558,8 +14569,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -14801,6 +14811,7 @@ exports[`history > singleplayer undo/redo > should not collapse when applying co
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14893,8 +14904,7 @@ exports[`history > singleplayer undo/redo > should not collapse when applying co
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -14974,6 +14984,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -15068,8 +15079,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -15261,6 +15271,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -15353,8 +15364,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -15527,6 +15537,7 @@ exports[`history > singleplayer undo/redo > should not modify anything on unrela
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -15619,8 +15630,7 @@ exports[`history > singleplayer undo/redo > should not modify anything on unrela
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -15683,6 +15693,7 @@ exports[`history > singleplayer undo/redo > should not override appstate changes
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -15776,8 +15787,7 @@ exports[`history > singleplayer undo/redo > should not override appstate changes
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -15968,6 +15978,7 @@ exports[`history > singleplayer undo/redo > should support appstate name or view
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -16060,8 +16071,7 @@ exports[`history > singleplayer undo/redo > should support appstate name or view
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -16133,6 +16143,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -16226,8 +16237,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -16364,19 +16374,22 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id2",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.50010",
+      "0.50010",
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": 0,
+  "height": "1.22525",
   "id": "id13",
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -16384,8 +16397,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
       0,
     ],
     [
-      98,
-      0,
+      78,
+      "-1.22525",
     ],
   ],
   "roughness": 1,
@@ -16395,24 +16408,27 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id0",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.53796",
+      "0.53796",
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
-  "width": 98,
-  "x": 1,
-  "y": 0,
+  "version": 14,
+  "width": 78,
+  "x": 11,
+  "y": "2.19362",
 }
 `;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on deletion and rebind on undo > [end of test] number of elements 1`] = `4`;
 
-exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on deletion and rebind on undo > [end of test] number of renders 1`] = `12`;
+exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on deletion and rebind on undo > [end of test] number of renders 1`] = `15`;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on deletion and rebind on undo > [end of test] redo stack 1`] = `
 [
@@ -16439,12 +16455,44 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
       "removed": {
         "id13": {
           "deleted": {
+            "endBinding": {
+              "elementId": "id2",
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
+            },
             "isDeleted": false,
-            "version": 10,
+            "startBinding": {
+              "elementId": "id0",
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
+            },
+            "version": 14,
           },
           "inserted": {
+            "endBinding": {
+              "elementId": "id2",
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
+            },
             "isDeleted": true,
-            "version": 7,
+            "startBinding": {
+              "elementId": "id0",
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
+            },
+            "version": 11,
           },
         },
       },
@@ -16744,16 +16792,18 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "endArrowhead": "arrow",
             "endBinding": {
               "elementId": "id2",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
             },
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "0.00096",
             "index": "a3",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -16763,8 +16813,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
                 0,
               ],
               [
-                100,
-                0,
+                "78.00000",
+                "0.00096",
               ],
             ],
             "roughness": 1,
@@ -16774,21 +16824,24 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "startArrowhead": null,
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
             },
             "strokeColor": "#1e1e1e",
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 6,
-            "width": 100,
-            "x": 0,
-            "y": 0,
+            "version": 10,
+            "width": "78.00000",
+            "x": 11,
+            "y": "0.00830",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 5,
+            "version": 9,
           },
         },
       },
@@ -16841,6 +16894,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -16934,8 +16988,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -17072,19 +17125,22 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id2",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.50010",
+      "0.50010",
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": 0,
+  "height": "1.22525",
   "id": "id13",
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -17092,8 +17148,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
       0,
     ],
     [
-      98,
-      0,
+      78,
+      "-1.22525",
     ],
   ],
   "roughness": 1,
@@ -17103,24 +17159,27 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id0",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.53796",
+      "0.53796",
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
-  "width": 98,
-  "x": 1,
-  "y": 0,
+  "version": 14,
+  "width": 78,
+  "x": 11,
+  "y": "2.19362",
 }
 `;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on undo and rebind on redo > [end of test] number of elements 1`] = `4`;
 
-exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on undo and rebind on redo > [end of test] number of renders 1`] = `12`;
+exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on undo and rebind on redo > [end of test] number of renders 1`] = `15`;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind arrow from non deleted bindable elements on undo and rebind on redo > [end of test] redo stack 1`] = `[]`;
 
@@ -17374,16 +17433,18 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "endArrowhead": "arrow",
             "endBinding": {
               "elementId": "id2",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
             },
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "1.22525",
             "index": "a3",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -17393,8 +17454,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
                 0,
               ],
               [
-                98,
-                0,
+                78,
+                "-1.22525",
               ],
             ],
             "roughness": 1,
@@ -17404,21 +17465,24 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "startArrowhead": null,
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
             },
             "strokeColor": "#1e1e1e",
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 10,
-            "width": 98,
-            "x": 1,
-            "y": 0,
+            "version": 14,
+            "width": 78,
+            "x": 11,
+            "y": "2.19362",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 7,
+            "version": 11,
           },
         },
       },
@@ -17479,6 +17543,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -17572,8 +17637,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -17710,19 +17774,22 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id2",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.50010",
+      "0.50010",
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": 0,
+  "height": "1.22525",
   "id": "id13",
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -17730,8 +17797,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
       0,
     ],
     [
-      98,
-      0,
+      78,
+      "-1.22525",
     ],
   ],
   "roughness": 1,
@@ -17741,24 +17808,27 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id0",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.53796",
+      "0.53796",
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
-  "width": 98,
-  "x": 1,
-  "y": 0,
+  "version": 14,
+  "width": 78,
+  "x": 11,
+  "y": "2.19362",
 }
 `;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind everything from non deleted elements when iterating through the whole undo stack and vice versa rebind everything on redo > [end of test] number of elements 1`] = `4`;
 
-exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind everything from non deleted elements when iterating through the whole undo stack and vice versa rebind everything on redo > [end of test] number of renders 1`] = `20`;
+exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind everything from non deleted elements when iterating through the whole undo stack and vice versa rebind everything on redo > [end of test] number of renders 1`] = `23`;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind everything from non deleted elements when iterating through the whole undo stack and vice versa rebind everything on redo > [end of test] redo stack 1`] = `[]`;
 
@@ -18012,16 +18082,18 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "endArrowhead": "arrow",
             "endBinding": {
               "elementId": "id2",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
             },
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "1.22525",
             "index": "a3",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -18031,8 +18103,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
                 0,
               ],
               [
-                98,
-                0,
+                78,
+                "-1.22525",
               ],
             ],
             "roughness": 1,
@@ -18042,21 +18114,24 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "startArrowhead": null,
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
             },
             "strokeColor": "#1e1e1e",
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 10,
-            "width": 98,
-            "x": 1,
-            "y": 0,
+            "version": 14,
+            "width": 78,
+            "x": 11,
+            "y": "2.19362",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 7,
+            "version": 11,
           },
         },
       },
@@ -18117,6 +18192,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -18208,8 +18284,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -18346,19 +18421,22 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id2",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.50010",
+      "0.50010",
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": 0,
+  "height": "1.22525",
   "id": "id13",
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -18366,8 +18444,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
       0,
     ],
     [
-      98,
-      0,
+      78,
+      "-1.22525",
     ],
   ],
   "roughness": 1,
@@ -18377,24 +18455,27 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id0",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.53796",
+      "0.53796",
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
-  "width": 98,
-  "x": 1,
-  "y": 0,
+  "version": 14,
+  "width": 78,
+  "x": 11,
+  "y": "2.19362",
 }
 `;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangle from arrow on deletion and rebind on undo > [end of test] number of elements 1`] = `4`;
 
-exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangle from arrow on deletion and rebind on undo > [end of test] number of renders 1`] = `14`;
+exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangle from arrow on deletion and rebind on undo > [end of test] number of renders 1`] = `17`;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangle from arrow on deletion and rebind on undo > [end of test] redo stack 1`] = `
 [
@@ -18438,16 +18519,35 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
       "updated": {
         "id13": {
           "deleted": {
+            "endBinding": {
+              "elementId": "id2",
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
+            },
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
             },
-            "version": 10,
+            "version": 14,
           },
           "inserted": {
+            "endBinding": {
+              "elementId": "id2",
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
+            },
             "startBinding": null,
-            "version": 7,
+            "version": 11,
           },
         },
         "id2": {
@@ -18715,16 +18815,18 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "endArrowhead": "arrow",
             "endBinding": {
               "elementId": "id2",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
             },
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "0.00096",
             "index": "a3",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -18734,8 +18836,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
                 0,
               ],
               [
-                100,
-                0,
+                "78.00000",
+                "0.00096",
               ],
             ],
             "roughness": 1,
@@ -18745,21 +18847,24 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "startArrowhead": null,
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
             },
             "strokeColor": "#1e1e1e",
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 6,
-            "width": 100,
-            "x": 0,
-            "y": 0,
+            "version": 10,
+            "width": "78.00000",
+            "x": 11,
+            "y": "0.00830",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 5,
+            "version": 9,
           },
         },
       },
@@ -18839,6 +18944,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -18933,8 +19039,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -19071,19 +19176,22 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id2",
-    "focus": -0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.50010",
+      "0.50010",
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": 0,
+  "height": "1.22525",
   "id": "id13",
   "index": "a3",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -19091,8 +19199,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
       0,
     ],
     [
-      98,
-      0,
+      78,
+      "-1.22525",
     ],
   ],
   "roughness": 1,
@@ -19102,24 +19210,27 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id0",
-    "focus": 0,
-    "gap": 1,
+    "fixedPoint": [
+      "0.53796",
+      "0.53796",
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 11,
-  "width": 98,
-  "x": 1,
-  "y": 0,
+  "version": 15,
+  "width": 78,
+  "x": 11,
+  "y": "2.19362",
 }
 `;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangles from arrow on deletion and rebind on undo > [end of test] number of elements 1`] = `4`;
 
-exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangles from arrow on deletion and rebind on undo > [end of test] number of renders 1`] = `15`;
+exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangles from arrow on deletion and rebind on undo > [end of test] number of renders 1`] = `18`;
 
 exports[`history > singleplayer undo/redo > should support bidirectional bindings > should unbind rectangles from arrow on deletion and rebind on undo > [end of test] redo stack 1`] = `
 [
@@ -19176,20 +19287,26 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
           "deleted": {
             "endBinding": {
               "elementId": "id2",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
             },
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
             },
-            "version": 11,
+            "version": 15,
           },
           "inserted": {
             "endBinding": null,
             "startBinding": null,
-            "version": 8,
+            "version": 12,
           },
         },
       },
@@ -19449,16 +19566,18 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "endArrowhead": "arrow",
             "endBinding": {
               "elementId": "id2",
-              "focus": -0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.50010",
+                "0.50010",
+              ],
+              "mode": "orbit",
             },
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "0.00096",
             "index": "a3",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -19468,8 +19587,8 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
                 0,
               ],
               [
-                100,
-                0,
+                "78.00000",
+                "0.00096",
               ],
             ],
             "roughness": 1,
@@ -19479,21 +19598,24 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "startArrowhead": null,
             "startBinding": {
               "elementId": "id0",
-              "focus": 0,
-              "gap": 1,
+              "fixedPoint": [
+                "0.53796",
+                "0.53796",
+              ],
+              "mode": "orbit",
             },
             "strokeColor": "#1e1e1e",
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 6,
-            "width": 100,
-            "x": 0,
-            "y": 0,
+            "version": 10,
+            "width": "78.00000",
+            "x": 11,
+            "y": "0.00830",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 5,
+            "version": 9,
           },
         },
       },
@@ -19593,6 +19715,7 @@ exports[`history > singleplayer undo/redo > should support changes in elements'
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -19687,8 +19810,7 @@ exports[`history > singleplayer undo/redo > should support changes in elements'
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -20076,6 +20198,7 @@ exports[`history > singleplayer undo/redo > should support duplication of groups
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -20172,8 +20295,7 @@ exports[`history > singleplayer undo/redo > should support duplication of groups
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -20590,6 +20712,7 @@ exports[`history > singleplayer undo/redo > should support element creation, del
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -20681,8 +20804,7 @@ exports[`history > singleplayer undo/redo > should support element creation, del
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -21052,6 +21174,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -21145,8 +21268,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
@@ -21176,10 +21298,6 @@ exports[`history > singleplayer undo/redo > should support linear element creati
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": [
-    20,
-    0,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -21208,7 +21326,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 15,
+  "version": 12,
   "width": 20,
   "x": 0,
   "y": 0,
@@ -21217,7 +21335,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
 
 exports[`history > singleplayer undo/redo > should support linear element creation and points manipulation through the editor > [end of test] number of elements 1`] = `1`;
 
-exports[`history > singleplayer undo/redo > should support linear element creation and points manipulation through the editor > [end of test] number of renders 1`] = `20`;
+exports[`history > singleplayer undo/redo > should support linear element creation and points manipulation through the editor > [end of test] number of renders 1`] = `24`;
 
 exports[`history > singleplayer undo/redo > should support linear element creation and points manipulation through the editor > [end of test] redo stack 1`] = `[]`;
 
@@ -21230,9 +21348,14 @@ exports[`history > singleplayer undo/redo > should support linear element creati
           "selectedElementIds": {
             "id0": true,
           },
+          "selectedLinearElement": {
+            "elementId": "id0",
+            "isEditing": false,
+          },
         },
         "inserted": {
           "selectedElementIds": {},
+          "selectedLinearElement": null,
         },
       },
     },
@@ -21254,10 +21377,6 @@ exports[`history > singleplayer undo/redo > should support linear element creati
             "height": 10,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              10,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -21281,20 +21400,20 @@ exports[`history > singleplayer undo/redo > should support linear element creati
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 13,
+            "version": 10,
             "width": 10,
             "x": 0,
             "y": 0,
           },
           "inserted": {
             "isDeleted": true,
-            "version": 12,
+            "version": 9,
           },
         },
       },
       "updated": {},
     },
-    "id": "id23",
+    "id": "id20",
   },
   {
     "appState": AppStateDelta {
@@ -21309,10 +21428,6 @@ exports[`history > singleplayer undo/redo > should support linear element creati
       "updated": {
         "id0": {
           "deleted": {
-            "lastCommittedPoint": [
-              20,
-              0,
-            ],
             "points": [
               [
                 0,
@@ -21327,14 +21442,10 @@ exports[`history > singleplayer undo/redo > should support linear element creati
                 0,
               ],
             ],
-            "version": 14,
+            "version": 11,
             "width": 20,
           },
           "inserted": {
-            "lastCommittedPoint": [
-              10,
-              10,
-            ],
             "points": [
               [
                 0,
@@ -21345,34 +21456,13 @@ exports[`history > singleplayer undo/redo > should support linear element creati
                 10,
               ],
             ],
-            "version": 13,
+            "version": 10,
             "width": 10,
           },
         },
       },
     },
-    "id": "id24",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedLinearElement": {
-            "elementId": "id0",
-            "isEditing": false,
-          },
-        },
-        "inserted": {
-          "selectedLinearElement": null,
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id25",
+    "id": "id21",
   },
   {
     "appState": AppStateDelta {
@@ -21396,7 +21486,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
       "removed": {},
       "updated": {},
     },
-    "id": "id26",
+    "id": "id22",
   },
   {
     "appState": AppStateDelta {
@@ -21426,7 +21516,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
                 20,
               ],
             ],
-            "version": 15,
+            "version": 12,
           },
           "inserted": {
             "height": 10,
@@ -21444,12 +21534,12 @@ exports[`history > singleplayer undo/redo > should support linear element creati
                 0,
               ],
             ],
-            "version": 14,
+            "version": 11,
           },
         },
       },
     },
-    "id": "id27",
+    "id": "id23",
   },
   {
     "appState": AppStateDelta {
@@ -21473,7 +21563,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
       "removed": {},
       "updated": {},
     },
-    "id": "id28",
+    "id": "id24",
   },
 ]
 `;
diff --git a/packages/excalidraw/tests/__snapshots__/move.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/move.test.tsx.snap
index 52614ed5f4..fceb5f14a7 100644
--- a/packages/excalidraw/tests/__snapshots__/move.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/move.test.tsx.snap
@@ -126,7 +126,7 @@ exports[`move element > rectangles with binding arrow 5`] = `
   "type": "rectangle",
   "updated": 1,
   "version": 4,
-  "versionNonce": 1006504105,
+  "versionNonce": 760410951,
   "width": 100,
   "x": 0,
   "y": 0,
@@ -163,7 +163,7 @@ exports[`move element > rectangles with binding arrow 6`] = `
   "type": "rectangle",
   "updated": 1,
   "version": 7,
-  "versionNonce": 1984422985,
+  "versionNonce": 888958951,
   "width": 300,
   "x": 201,
   "y": 2,
@@ -180,19 +180,22 @@ exports[`move element > rectangles with binding arrow 7`] = `
   "endArrowhead": "arrow",
   "endBinding": {
     "elementId": "id3",
-    "focus": "-0.46667",
-    "gap": 10,
+    "fixedPoint": [
+      "-0.03667",
+      "0.42773",
+    ],
+    "mode": "orbit",
   },
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": "81.40630",
+  "height": "124.16785",
   "id": "id6",
   "index": "a2",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
+  "moveMidPointsWithElement": false,
   "opacity": 100,
   "points": [
     [
@@ -200,8 +203,8 @@ exports[`move element > rectangles with binding arrow 7`] = `
       0,
     ],
     [
-      "81.00000",
-      "81.40630",
+      "79.00000",
+      "124.16785",
     ],
   ],
   "roughness": 1,
@@ -212,18 +215,21 @@ exports[`move element > rectangles with binding arrow 7`] = `
   "startArrowhead": null,
   "startBinding": {
     "elementId": "id0",
-    "focus": "-0.60000",
-    "gap": 10,
+    "fixedPoint": [
+      "1.10000",
+      "-0.04577",
+    ],
+    "mode": "orbit",
   },
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 11,
-  "versionNonce": 1573789895,
-  "width": "81.00000",
-  "x": "110.00000",
-  "y": 50,
+  "version": 12,
+  "versionNonce": 2066753033,
+  "width": "79.00000",
+  "x": 111,
+  "y": "6.14995",
 }
 `;
diff --git a/packages/excalidraw/tests/__snapshots__/multiPointCreate.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/multiPointCreate.test.tsx.snap
index ee3f024903..03bec27275 100644
--- a/packages/excalidraw/tests/__snapshots__/multiPointCreate.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/multiPointCreate.test.tsx.snap
@@ -16,10 +16,6 @@ exports[`multi point mode in linear elements > arrow 3`] = `
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": [
-    70,
-    110,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -49,8 +45,8 @@ exports[`multi point mode in linear elements > arrow 3`] = `
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 8,
-  "versionNonce": 1604849351,
+  "version": 5,
+  "versionNonce": 1014066025,
   "width": 70,
   "x": 30,
   "y": 30,
@@ -72,10 +68,6 @@ exports[`multi point mode in linear elements > line 3`] = `
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": [
-    70,
-    110,
-  ],
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -104,8 +96,8 @@ exports[`multi point mode in linear elements > line 3`] = `
   "strokeWidth": 2,
   "type": "line",
   "updated": 1,
-  "version": 8,
-  "versionNonce": 1604849351,
+  "version": 5,
+  "versionNonce": 1014066025,
   "width": 70,
   "x": 30,
   "y": 30,
diff --git a/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
index a33ca9c963..ecea596167 100644
--- a/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
@@ -11,6 +11,7 @@ exports[`given element A and group of elements B and given both are selected whe
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -112,14 +113,13 @@ exports[`given element A and group of elements B and given both are selected whe
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -440,6 +440,7 @@ exports[`given element A and group of elements B and given both are selected whe
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -543,14 +544,13 @@ exports[`given element A and group of elements B and given both are selected whe
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -859,6 +859,7 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -953,14 +954,13 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -1428,6 +1428,7 @@ exports[`regression tests > Drags selected element when hitting only bounding bo
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1522,14 +1523,13 @@ exports[`regression tests > Drags selected element when hitting only bounding bo
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -1638,6 +1638,7 @@ exports[`regression tests > adjusts z order when grouping > [end of test] appSta
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -1737,14 +1738,13 @@ exports[`regression tests > adjusts z order when grouping > [end of test] appSta
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -2025,6 +2025,7 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] appSt
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2121,14 +2122,13 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] appSt
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -2273,6 +2273,7 @@ exports[`regression tests > arrow keys > [end of test] appState 1`] = `
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2367,14 +2368,13 @@ exports[`regression tests > arrow keys > [end of test] appState 1`] = `
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -2456,6 +2456,7 @@ exports[`regression tests > can drag element that covers another element, while
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2552,14 +2553,13 @@ exports[`regression tests > can drag element that covers another element, while
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -2784,6 +2784,7 @@ exports[`regression tests > change the properties of a shape > [end of test] app
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -2878,14 +2879,13 @@ exports[`regression tests > change the properties of a shape > [end of test] app
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -3042,6 +3042,7 @@ exports[`regression tests > click on an element and drag it > [dragged] appState
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3138,14 +3139,13 @@ exports[`regression tests > click on an element and drag it > [dragged] appState
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -3286,6 +3286,7 @@ exports[`regression tests > click on an element and drag it > [end of test] appS
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3382,14 +3383,13 @@ exports[`regression tests > click on an element and drag it > [end of test] appS
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -3525,6 +3525,7 @@ exports[`regression tests > click to select a shape > [end of test] appState 1`]
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3621,14 +3622,13 @@ exports[`regression tests > click to select a shape > [end of test] appState 1`]
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -3786,6 +3786,7 @@ exports[`regression tests > click-drag to select a group > [end of test] appStat
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -3883,14 +3884,13 @@ exports[`regression tests > click-drag to select a group > [end of test] appStat
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -4103,6 +4103,7 @@ exports[`regression tests > deleting last but one element in editing group shoul
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4199,14 +4200,13 @@ exports[`regression tests > deleting last but one element in editing group shoul
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -4542,6 +4542,7 @@ exports[`regression tests > deselects group of selected elements on pointer down
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4665,14 +4666,13 @@ exports[`regression tests > deselects group of selected elements on pointer down
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -4828,6 +4828,7 @@ exports[`regression tests > deselects group of selected elements on pointer up w
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -4923,14 +4924,13 @@ exports[`regression tests > deselects group of selected elements on pointer up w
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -5107,6 +5107,7 @@ exports[`regression tests > deselects selected element on pointer down when poin
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -5229,14 +5230,13 @@ exports[`regression tests > deselects selected element on pointer down when poin
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -5318,6 +5318,7 @@ exports[`regression tests > deselects selected element, on pointer up, when clic
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -5412,14 +5413,13 @@ exports[`regression tests > deselects selected element, on pointer up, when clic
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -5521,6 +5521,7 @@ exports[`regression tests > double click to edit a group > [end of test] appStat
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -5615,14 +5616,13 @@ exports[`regression tests > double click to edit a group > [end of test] appStat
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -5917,6 +5917,7 @@ exports[`regression tests > drags selected elements from point inside common bou
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -6015,14 +6016,13 @@ exports[`regression tests > drags selected elements from point inside common bou
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -6217,6 +6217,7 @@ exports[`regression tests > draw every type of shape > [end of test] appState 1`
     "locked": false,
     "type": "freedraw",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -6309,14 +6310,13 @@ exports[`regression tests > draw every type of shape > [end of test] appState 1`
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -6326,7 +6326,7 @@ exports[`regression tests > draw every type of shape > [end of test] appState 1`
 
 exports[`regression tests > draw every type of shape > [end of test] number of elements 1`] = `0`;
 
-exports[`regression tests > draw every type of shape > [end of test] number of renders 1`] = `31`;
+exports[`regression tests > draw every type of shape > [end of test] number of renders 1`] = `35`;
 
 exports[`regression tests > draw every type of shape > [end of test] redo stack 1`] = `[]`;
 
@@ -6530,7 +6530,6 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
             "height": 10,
             "index": "a3",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -6609,7 +6608,6 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
             "height": 10,
             "index": "a4",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -6654,7 +6652,10 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
           "selectedElementIds": {
             "id15": true,
           },
-          "selectedLinearElement": null,
+          "selectedLinearElement": {
+            "elementId": "id15",
+            "isEditing": false,
+          },
         },
         "inserted": {
           "selectedElementIds": {
@@ -6685,10 +6686,6 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
             "height": 10,
             "index": "a5",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              50,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -6712,14 +6709,14 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 6,
+            "version": 4,
             "width": 50,
             "x": 310,
             "y": -10,
           },
           "inserted": {
             "isDeleted": true,
-            "version": 5,
+            "version": 3,
           },
         },
       },
@@ -6741,10 +6738,6 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
         "id15": {
           "deleted": {
             "height": 20,
-            "lastCommittedPoint": [
-              80,
-              20,
-            ],
             "points": [
               [
                 0,
@@ -6759,15 +6752,11 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
                 20,
               ],
             ],
-            "version": 8,
+            "version": 5,
             "width": 80,
           },
           "inserted": {
             "height": 10,
-            "lastCommittedPoint": [
-              50,
-              10,
-            ],
             "points": [
               [
                 0,
@@ -6778,7 +6767,7 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
                 10,
               ],
             ],
-            "version": 6,
+            "version": 4,
             "width": 50,
           },
         },
@@ -6790,32 +6779,14 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
     "appState": AppStateDelta {
       "delta": Delta {
         "deleted": {
+          "selectedElementIds": {
+            "id20": true,
+          },
           "selectedLinearElement": {
-            "elementId": "id15",
+            "elementId": "id20",
             "isEditing": false,
           },
         },
-        "inserted": {
-          "selectedLinearElement": null,
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id21",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedElementIds": {
-            "id22": true,
-          },
-          "selectedLinearElement": null,
-        },
         "inserted": {
           "selectedElementIds": {
             "id15": true,
@@ -6830,7 +6801,7 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
     "elements": {
       "added": {},
       "removed": {
-        "id22": {
+        "id20": {
           "deleted": {
             "angle": 0,
             "backgroundColor": "transparent",
@@ -6844,10 +6815,6 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
             "height": 10,
             "index": "a6",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              50,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -6870,20 +6837,20 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "line",
-            "version": 6,
+            "version": 4,
             "width": 50,
             "x": 430,
             "y": -10,
           },
           "inserted": {
             "isDeleted": true,
-            "version": 5,
+            "version": 3,
           },
         },
       },
       "updated": {},
     },
-    "id": "id24",
+    "id": "id22",
   },
   {
     "appState": AppStateDelta {
@@ -6896,13 +6863,9 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
       "added": {},
       "removed": {},
       "updated": {
-        "id22": {
+        "id20": {
           "deleted": {
             "height": 20,
-            "lastCommittedPoint": [
-              80,
-              20,
-            ],
             "points": [
               [
                 0,
@@ -6917,15 +6880,11 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
                 20,
               ],
             ],
-            "version": 8,
+            "version": 5,
             "width": 80,
           },
           "inserted": {
             "height": 10,
-            "lastCommittedPoint": [
-              50,
-              10,
-            ],
             "points": [
               [
                 0,
@@ -6936,44 +6895,28 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
                 10,
               ],
             ],
-            "version": 6,
+            "version": 4,
             "width": 50,
           },
         },
       },
     },
-    "id": "id26",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedLinearElement": {
-            "elementId": "id22",
-            "isEditing": false,
-          },
-        },
-        "inserted": {
-          "selectedLinearElement": null,
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id28",
+    "id": "id24",
   },
   {
     "appState": AppStateDelta {
       "delta": Delta {
         "deleted": {
           "selectedElementIds": {},
+          "selectedLinearElement": null,
         },
         "inserted": {
           "selectedElementIds": {
-            "id22": true,
+            "id20": true,
+          },
+          "selectedLinearElement": {
+            "elementId": "id20",
+            "isEditing": false,
           },
         },
       },
@@ -6983,26 +6926,19 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
       "removed": {},
       "updated": {},
     },
-    "id": "id30",
+    "id": "id26",
   },
   {
     "appState": AppStateDelta {
       "delta": Delta {
-        "deleted": {
-          "selectedLinearElement": null,
-        },
-        "inserted": {
-          "selectedLinearElement": {
-            "elementId": "id22",
-            "isEditing": false,
-          },
-        },
+        "deleted": {},
+        "inserted": {},
       },
     },
     "elements": {
       "added": {},
       "removed": {
-        "id31": {
+        "id27": {
           "deleted": {
             "angle": 0,
             "backgroundColor": "transparent",
@@ -7014,10 +6950,6 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
             "height": 10,
             "index": "a7",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              50,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -7060,7 +6992,7 @@ exports[`regression tests > draw every type of shape > [end of test] undo stack
       },
       "updated": {},
     },
-    "id": "id33",
+    "id": "id29",
   },
 ]
 `;
@@ -7076,6 +7008,7 @@ exports[`regression tests > given a group of selected elements with an element t
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -7173,14 +7106,13 @@ exports[`regression tests > given a group of selected elements with an element t
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -7413,6 +7345,7 @@ exports[`regression tests > given a selected element A and a not selected elemen
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -7510,14 +7443,13 @@ exports[`regression tests > given a selected element A and a not selected elemen
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -7695,6 +7627,7 @@ exports[`regression tests > given selected element A with lower z-index than uns
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -7791,14 +7724,13 @@ exports[`regression tests > given selected element A with lower z-index than uns
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -7933,6 +7865,7 @@ exports[`regression tests > given selected element A with lower z-index than uns
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -8029,14 +7962,13 @@ exports[`regression tests > given selected element A with lower z-index than uns
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -8176,6 +8108,7 @@ exports[`regression tests > key 2 selects rectangle tool > [end of test] appStat
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -8270,14 +8203,13 @@ exports[`regression tests > key 2 selects rectangle tool > [end of test] appStat
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -8359,6 +8291,7 @@ exports[`regression tests > key 3 selects diamond tool > [end of test] appState
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -8453,14 +8386,13 @@ exports[`regression tests > key 3 selects diamond tool > [end of test] appState
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -8542,6 +8474,7 @@ exports[`regression tests > key 4 selects ellipse tool > [end of test] appState
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -8636,14 +8569,13 @@ exports[`regression tests > key 4 selects ellipse tool > [end of test] appState
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -8725,6 +8657,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -8812,13 +8745,10 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
     "customLineAngle": null,
     "elbowed": false,
     "elementId": "id0",
-    "endBindingElement": "keep",
     "hoverPointIndex": -1,
-    "isDragging": false,
-    "isEditing": false,
-    "lastUncommittedPoint": null,
-    "pointerDownState": {
-      "lastClickedIsEndPoint": false,
+    "initialState": {
+      "altFocusPoint": null,
+      "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,
       "prevSelectedPointsIndices": null,
@@ -8828,13 +8758,17 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
         "value": null,
       },
     },
+    "isDragging": false,
+    "isEditing": false,
+    "lastCommittedPoint": null,
+    "lastUncommittedPoint": null,
+    "pointerDownState": undefined,
     "pointerOffset": {
       "x": 0,
       "y": 0,
     },
     "segmentMidPointHoveredCoords": null,
     "selectedPointsIndices": null,
-    "startBindingElement": "keep",
   },
   "selectionElement": null,
   "shouldCacheIgnoreZoom": false,
@@ -8846,14 +8780,13 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -8863,7 +8796,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
 
 exports[`regression tests > key 5 selects arrow tool > [end of test] number of elements 1`] = `0`;
 
-exports[`regression tests > key 5 selects arrow tool > [end of test] number of renders 1`] = `6`;
+exports[`regression tests > key 5 selects arrow tool > [end of test] number of renders 1`] = `7`;
 
 exports[`regression tests > key 5 selects arrow tool > [end of test] redo stack 1`] = `[]`;
 
@@ -8905,7 +8838,6 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] undo stack
             "height": 30,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -8958,6 +8890,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9045,13 +8978,10 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
     "customLineAngle": null,
     "elbowed": false,
     "elementId": "id0",
-    "endBindingElement": "keep",
     "hoverPointIndex": -1,
-    "isDragging": false,
-    "isEditing": false,
-    "lastUncommittedPoint": null,
-    "pointerDownState": {
-      "lastClickedIsEndPoint": false,
+    "initialState": {
+      "altFocusPoint": null,
+      "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,
       "prevSelectedPointsIndices": null,
@@ -9061,13 +8991,17 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
         "value": null,
       },
     },
+    "isDragging": false,
+    "isEditing": false,
+    "lastCommittedPoint": null,
+    "lastUncommittedPoint": null,
+    "pointerDownState": undefined,
     "pointerOffset": {
       "x": 0,
       "y": 0,
     },
     "segmentMidPointHoveredCoords": null,
     "selectedPointsIndices": null,
-    "startBindingElement": "keep",
   },
   "selectionElement": null,
   "shouldCacheIgnoreZoom": false,
@@ -9079,14 +9013,13 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -9096,7 +9029,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
 
 exports[`regression tests > key 6 selects line tool > [end of test] number of elements 1`] = `0`;
 
-exports[`regression tests > key 6 selects line tool > [end of test] number of renders 1`] = `6`;
+exports[`regression tests > key 6 selects line tool > [end of test] number of renders 1`] = `7`;
 
 exports[`regression tests > key 6 selects line tool > [end of test] redo stack 1`] = `[]`;
 
@@ -9137,7 +9070,6 @@ exports[`regression tests > key 6 selects line tool > [end of test] undo stack 1
             "height": 30,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -9189,6 +9121,7 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] appState
     "locked": false,
     "type": "freedraw",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9281,14 +9214,13 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] appState
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -9326,10 +9258,6 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] undo sta
             "height": 30,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              30,
-              30,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -9388,6 +9316,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9475,13 +9404,10 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
     "customLineAngle": null,
     "elbowed": false,
     "elementId": "id0",
-    "endBindingElement": "keep",
     "hoverPointIndex": -1,
-    "isDragging": false,
-    "isEditing": false,
-    "lastUncommittedPoint": null,
-    "pointerDownState": {
-      "lastClickedIsEndPoint": false,
+    "initialState": {
+      "altFocusPoint": null,
+      "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,
       "prevSelectedPointsIndices": null,
@@ -9491,13 +9417,17 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
         "value": null,
       },
     },
+    "isDragging": false,
+    "isEditing": false,
+    "lastCommittedPoint": null,
+    "lastUncommittedPoint": null,
+    "pointerDownState": undefined,
     "pointerOffset": {
       "x": 0,
       "y": 0,
     },
     "segmentMidPointHoveredCoords": null,
     "selectedPointsIndices": null,
-    "startBindingElement": "keep",
   },
   "selectionElement": null,
   "shouldCacheIgnoreZoom": false,
@@ -9509,14 +9439,13 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -9526,7 +9455,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
 
 exports[`regression tests > key a selects arrow tool > [end of test] number of elements 1`] = `0`;
 
-exports[`regression tests > key a selects arrow tool > [end of test] number of renders 1`] = `6`;
+exports[`regression tests > key a selects arrow tool > [end of test] number of renders 1`] = `7`;
 
 exports[`regression tests > key a selects arrow tool > [end of test] redo stack 1`] = `[]`;
 
@@ -9568,7 +9497,6 @@ exports[`regression tests > key a selects arrow tool > [end of test] undo stack
             "height": 30,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -9621,6 +9549,7 @@ exports[`regression tests > key d selects diamond tool > [end of test] appState
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9715,14 +9644,13 @@ exports[`regression tests > key d selects diamond tool > [end of test] appState
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -9804,6 +9732,7 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -9891,13 +9820,10 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
     "customLineAngle": null,
     "elbowed": false,
     "elementId": "id0",
-    "endBindingElement": "keep",
     "hoverPointIndex": -1,
-    "isDragging": false,
-    "isEditing": false,
-    "lastUncommittedPoint": null,
-    "pointerDownState": {
-      "lastClickedIsEndPoint": false,
+    "initialState": {
+      "altFocusPoint": null,
+      "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,
       "prevSelectedPointsIndices": null,
@@ -9907,13 +9833,17 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
         "value": null,
       },
     },
+    "isDragging": false,
+    "isEditing": false,
+    "lastCommittedPoint": null,
+    "lastUncommittedPoint": null,
+    "pointerDownState": undefined,
     "pointerOffset": {
       "x": 0,
       "y": 0,
     },
     "segmentMidPointHoveredCoords": null,
     "selectedPointsIndices": null,
-    "startBindingElement": "keep",
   },
   "selectionElement": null,
   "shouldCacheIgnoreZoom": false,
@@ -9925,14 +9855,13 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -9942,7 +9871,7 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
 
 exports[`regression tests > key l selects line tool > [end of test] number of elements 1`] = `0`;
 
-exports[`regression tests > key l selects line tool > [end of test] number of renders 1`] = `6`;
+exports[`regression tests > key l selects line tool > [end of test] number of renders 1`] = `7`;
 
 exports[`regression tests > key l selects line tool > [end of test] redo stack 1`] = `[]`;
 
@@ -9983,7 +9912,6 @@ exports[`regression tests > key l selects line tool > [end of test] undo stack 1
             "height": 30,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": null,
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -10035,6 +9963,7 @@ exports[`regression tests > key o selects ellipse tool > [end of test] appState
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10129,14 +10058,13 @@ exports[`regression tests > key o selects ellipse tool > [end of test] appState
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -10218,6 +10146,7 @@ exports[`regression tests > key p selects freedraw tool > [end of test] appState
     "locked": false,
     "type": "freedraw",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10310,14 +10239,13 @@ exports[`regression tests > key p selects freedraw tool > [end of test] appState
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -10355,10 +10283,6 @@ exports[`regression tests > key p selects freedraw tool > [end of test] undo sta
             "height": 30,
             "index": "a0",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              30,
-              30,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -10417,6 +10341,7 @@ exports[`regression tests > key r selects rectangle tool > [end of test] appStat
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10511,14 +10436,13 @@ exports[`regression tests > key r selects rectangle tool > [end of test] appStat
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -10600,6 +10524,7 @@ exports[`regression tests > make a group and duplicate it > [end of test] appSta
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -10702,14 +10627,13 @@ exports[`regression tests > make a group and duplicate it > [end of test] appSta
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -11134,6 +11058,7 @@ exports[`regression tests > noop interaction after undo shouldn't create history
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -11230,14 +11155,13 @@ exports[`regression tests > noop interaction after undo shouldn't create history
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -11417,6 +11341,7 @@ exports[`regression tests > pinch-to-zoom works > [end of test] appState 1`] = `
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -11509,14 +11434,13 @@ exports[`regression tests > pinch-to-zoom works > [end of test] appState 1`] = `
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -11543,6 +11467,7 @@ exports[`regression tests > shift click on selected element should deselect it o
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -11637,14 +11562,13 @@ exports[`regression tests > shift click on selected element should deselect it o
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -11746,6 +11670,7 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -11844,14 +11769,13 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -12068,6 +11992,7 @@ exports[`regression tests > should group elements and ungroup them > [end of tes
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -12168,14 +12093,13 @@ exports[`regression tests > should group elements and ungroup them > [end of tes
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -12500,6 +12424,7 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -12604,14 +12529,13 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -13143,6 +13067,7 @@ exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] a
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -13238,14 +13163,13 @@ exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] a
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -13272,6 +13196,7 @@ exports[`regression tests > supports nested groups > [end of test] appState 1`]
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -13368,14 +13293,13 @@ exports[`regression tests > supports nested groups > [end of test] appState 1`]
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -13906,6 +13830,7 @@ exports[`regression tests > switches from group of selected elements to another
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14031,14 +13956,13 @@ exports[`regression tests > switches from group of selected elements to another
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -14248,6 +14172,7 @@ exports[`regression tests > switches selected element on pointer down > [end of
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14372,14 +14297,13 @@ exports[`regression tests > switches selected element on pointer down > [end of
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -14515,6 +14439,7 @@ exports[`regression tests > two-finger scroll works > [end of test] appState 1`]
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14607,14 +14532,13 @@ exports[`regression tests > two-finger scroll works > [end of test] appState 1`]
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -14641,6 +14565,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] appStat
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -14735,14 +14660,13 @@ exports[`regression tests > undo/redo drawing an element > [end of test] appStat
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -14756,27 +14680,6 @@ exports[`regression tests > undo/redo drawing an element > [end of test] number
 
 exports[`regression tests > undo/redo drawing an element > [end of test] redo stack 1`] = `
 [
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedLinearElement": null,
-        },
-        "inserted": {
-          "selectedLinearElement": {
-            "elementId": "id6",
-            "isEditing": false,
-          },
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id13",
-  },
   {
     "appState": AppStateDelta {
       "delta": Delta {
@@ -14791,10 +14694,6 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
         "id6": {
           "deleted": {
             "height": 10,
-            "lastCommittedPoint": [
-              60,
-              10,
-            ],
             "points": [
               [
                 0,
@@ -14805,15 +14704,11 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
                 10,
               ],
             ],
-            "version": 9,
+            "version": 6,
             "width": 60,
           },
           "inserted": {
             "height": 20,
-            "lastCommittedPoint": [
-              100,
-              20,
-            ],
             "points": [
               [
                 0,
@@ -14828,13 +14723,13 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
                 20,
               ],
             ],
-            "version": 8,
+            "version": 5,
             "width": 100,
           },
         },
       },
     },
-    "id": "id14",
+    "id": "id11",
   },
   {
     "appState": AppStateDelta {
@@ -14843,11 +14738,16 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
           "selectedElementIds": {
             "id3": true,
           },
+          "selectedLinearElement": null,
         },
         "inserted": {
           "selectedElementIds": {
             "id6": true,
           },
+          "selectedLinearElement": {
+            "elementId": "id6",
+            "isEditing": false,
+          },
         },
       },
     },
@@ -14856,7 +14756,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
         "id6": {
           "deleted": {
             "isDeleted": true,
-            "version": 10,
+            "version": 7,
           },
           "inserted": {
             "angle": 0,
@@ -14872,10 +14772,6 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
             "height": 10,
             "index": "a2",
             "isDeleted": false,
-            "lastCommittedPoint": [
-              60,
-              10,
-            ],
             "link": null,
             "locked": false,
             "opacity": 100,
@@ -14899,7 +14795,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 9,
+            "version": 6,
             "width": 60,
             "x": 130,
             "y": 10,
@@ -14909,7 +14805,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] redo st
       "removed": {},
       "updated": {},
     },
-    "id": "id15",
+    "id": "id12",
   },
 ]
 `;
@@ -15020,7 +14916,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] undo st
       },
       "updated": {},
     },
-    "id": "id17",
+    "id": "id14",
   },
 ]
 `;
@@ -15036,6 +14932,7 @@ exports[`regression tests > updates fontSize & fontFamily appState > [end of tes
     "locked": false,
     "type": "text",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -15128,14 +15025,13 @@ exports[`regression tests > updates fontSize & fontFamily appState > [end of tes
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
@@ -15162,6 +15058,7 @@ exports[`regression tests > zoom hotkeys > [end of test] appState 1`] = `
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -15257,14 +15154,13 @@ exports[`regression tests > zoom hotkeys > [end of test] appState 1`] = `
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
   "viewBackgroundColor": "#ffffff",
   "viewModeEnabled": false,
-  "width": 1024,
+  "width": 1440,
   "zenModeEnabled": false,
   "zoom": {
     "value": 1,
diff --git a/packages/excalidraw/tests/__snapshots__/selection.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/selection.test.tsx.snap
index f47b89813f..5d5c701f0a 100644
--- a/packages/excalidraw/tests/__snapshots__/selection.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/selection.test.tsx.snap
@@ -16,7 +16,6 @@ exports[`select single element on the scene > arrow 1`] = `
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -65,7 +64,6 @@ exports[`select single element on the scene > arrow escape 1`] = `
   "id": "id0",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
diff --git a/packages/excalidraw/tests/data/__snapshots__/restore.test.ts.snap b/packages/excalidraw/tests/data/__snapshots__/restore.test.ts.snap
index d59a829a0f..95826081f4 100644
--- a/packages/excalidraw/tests/data/__snapshots__/restore.test.ts.snap
+++ b/packages/excalidraw/tests/data/__snapshots__/restore.test.ts.snap
@@ -16,7 +16,6 @@ exports[`restoreElements > should restore arrow element correctly 1`] = `
   "id": "id-arrow01",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -175,7 +174,6 @@ exports[`restoreElements > should restore freedraw element correctly 1`] = `
   "id": "id-freedraw01",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -222,7 +220,6 @@ exports[`restoreElements > should restore line and draw elements correctly 1`] =
   "id": "id-line01",
   "index": "a0",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -270,7 +267,6 @@ exports[`restoreElements > should restore line and draw elements correctly 2`] =
   "id": "id-draw01",
   "index": "a1",
   "isDeleted": false,
-  "lastCommittedPoint": null,
   "link": null,
   "locked": false,
   "opacity": 100,
diff --git a/packages/excalidraw/tests/dragCreate.test.tsx b/packages/excalidraw/tests/dragCreate.test.tsx
index 566c839050..e943bce431 100644
--- a/packages/excalidraw/tests/dragCreate.test.tsx
+++ b/packages/excalidraw/tests/dragCreate.test.tsx
@@ -157,9 +157,9 @@ describe("Test dragCreate", () => {
       fireEvent.pointerUp(canvas);
 
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-        `5`,
+        `6`,
       );
-      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`5`);
+      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
       expect(h.state.selectionElement).toBeNull();
 
       expect(h.elements.length).toEqual(1);
@@ -195,9 +195,9 @@ describe("Test dragCreate", () => {
       fireEvent.pointerUp(canvas);
 
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-        `5`,
+        `6`,
       );
-      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`5`);
+      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
       expect(h.state.selectionElement).toBeNull();
 
       expect(h.elements.length).toEqual(1);
diff --git a/packages/excalidraw/tests/history.test.tsx b/packages/excalidraw/tests/history.test.tsx
index aca5530d4c..219b002777 100644
--- a/packages/excalidraw/tests/history.test.tsx
+++ b/packages/excalidraw/tests/history.test.tsx
@@ -1021,7 +1021,7 @@ describe("history", () => {
       // leave editor
       Keyboard.keyPress(KEYS.ESCAPE);
 
-      expect(API.getUndoStack().length).toBe(6);
+      expect(API.getUndoStack().length).toBe(5);
       expect(API.getRedoStack().length).toBe(0);
       expect(assertSelectedElements(h.elements[0]));
       expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
@@ -1038,7 +1038,7 @@ describe("history", () => {
       ]);
 
       Keyboard.undo();
-      expect(API.getUndoStack().length).toBe(5);
+      expect(API.getUndoStack().length).toBe(4);
       expect(API.getRedoStack().length).toBe(1);
       expect(assertSelectedElements(h.elements[0]));
       expect(h.state.selectedLinearElement?.isEditing).toBe(true);
@@ -1058,11 +1058,11 @@ describe("history", () => {
       mouse.clickAt(0, 0);
       mouse.clickAt(10, 10);
       mouse.clickAt(20, 20);
-      expect(API.getUndoStack().length).toBe(5);
+      expect(API.getUndoStack().length).toBe(4);
       expect(API.getRedoStack().length).toBe(1);
 
       Keyboard.undo();
-      expect(API.getUndoStack().length).toBe(4);
+      expect(API.getUndoStack().length).toBe(3);
       expect(API.getRedoStack().length).toBe(2);
       expect(assertSelectedElements(h.elements[0]));
       expect(h.state.selectedLinearElement?.isEditing).toBe(true);
@@ -1079,10 +1079,10 @@ describe("history", () => {
       ]);
 
       Keyboard.undo();
-      expect(API.getUndoStack().length).toBe(3);
+      expect(API.getUndoStack().length).toBe(2);
       expect(API.getRedoStack().length).toBe(3);
       expect(assertSelectedElements(h.elements[0]));
-      expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false); // undo `open editor`
+      expect(h.state.selectedLinearElement?.isEditing).toBe(false); // undo `open editor`
       expect(h.state.selectedLinearElement?.elementId).toBe(h.elements[0].id);
       expect(h.elements).toEqual([
         expect.objectContaining({
@@ -1095,29 +1095,29 @@ describe("history", () => {
         }),
       ]);
 
-      Keyboard.undo();
-      expect(API.getUndoStack().length).toBe(2);
-      expect(API.getRedoStack().length).toBe(4);
-      expect(assertSelectedElements(h.elements[0]));
-      expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
-      expect(h.state.selectedLinearElement).toBeNull(); // undo `actionFinalize`
-      expect(h.elements).toEqual([
-        expect.objectContaining({
-          isDeleted: false,
-          points: [
-            [0, 0],
-            [10, 10],
-            [20, 0],
-          ],
-        }),
-      ]);
+      // Keyboard.undo();
+      // expect(API.getUndoStack().length).toBe(2);
+      // expect(API.getRedoStack().length).toBe(4);
+      // expect(assertSelectedElements(h.elements[0]));
+      // expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+      // expect(h.state.selectedLinearElement).toBeNull(); // undo `actionFinalize`
+      // expect(h.elements).toEqual([
+      //   expect.objectContaining({
+      //     isDeleted: false,
+      //     points: [
+      //       [0, 0],
+      //       [10, 10],
+      //       [20, 0],
+      //     ],
+      //   }),
+      // ]);
 
       Keyboard.undo();
       expect(API.getUndoStack().length).toBe(1);
-      expect(API.getRedoStack().length).toBe(5);
+      expect(API.getRedoStack().length).toBe(4);
       expect(assertSelectedElements(h.elements[0]));
-      expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
-      expect(h.state.selectedLinearElement).toBeNull();
+      expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+      expect(h.state.selectedLinearElement?.elementId).toBe(h.elements[0].id);
       expect(h.elements).toEqual([
         expect.objectContaining({
           isDeleted: false,
@@ -1130,9 +1130,8 @@ describe("history", () => {
 
       Keyboard.undo();
       expect(API.getUndoStack().length).toBe(0);
-      expect(API.getRedoStack().length).toBe(6);
+      expect(API.getRedoStack().length).toBe(5);
       expect(API.getSelectedElements().length).toBe(0);
-      expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
       expect(h.state.selectedLinearElement).toBeNull();
       expect(h.elements).toEqual([
         expect.objectContaining({
@@ -1146,10 +1145,10 @@ describe("history", () => {
 
       Keyboard.redo();
       expect(API.getUndoStack().length).toBe(1);
-      expect(API.getRedoStack().length).toBe(5);
+      expect(API.getRedoStack().length).toBe(4);
       expect(assertSelectedElements(h.elements[0]));
-      expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
-      expect(h.state.selectedLinearElement).toBeNull();
+      expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+      expect(h.state.selectedLinearElement?.elementId).toBe(h.elements[0].id);
       expect(h.elements).toEqual([
         expect.objectContaining({
           isDeleted: false,
@@ -1160,25 +1159,25 @@ describe("history", () => {
         }),
       ]);
 
+      // Keyboard.redo();
+      // expect(API.getUndoStack().length).toBe(2);
+      // expect(API.getRedoStack().length).toBe(3);
+      // expect(assertSelectedElements(h.elements[0]));
+      // expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+      // expect(h.state.selectedLinearElement).toBeNull(); // undo `actionFinalize`
+      // expect(h.elements).toEqual([
+      //   expect.objectContaining({
+      //     isDeleted: false,
+      //     points: [
+      //       [0, 0],
+      //       [10, 10],
+      //       [20, 0],
+      //     ],
+      //   }),
+      // ]);
+
       Keyboard.redo();
       expect(API.getUndoStack().length).toBe(2);
-      expect(API.getRedoStack().length).toBe(4);
-      expect(assertSelectedElements(h.elements[0]));
-      expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
-      expect(h.state.selectedLinearElement).toBeNull(); // undo `actionFinalize`
-      expect(h.elements).toEqual([
-        expect.objectContaining({
-          isDeleted: false,
-          points: [
-            [0, 0],
-            [10, 10],
-            [20, 0],
-          ],
-        }),
-      ]);
-
-      Keyboard.redo();
-      expect(API.getUndoStack().length).toBe(3);
       expect(API.getRedoStack().length).toBe(3);
       expect(assertSelectedElements(h.elements[0]));
       expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false); // undo `open editor`
@@ -1195,7 +1194,7 @@ describe("history", () => {
       ]);
 
       Keyboard.redo();
-      expect(API.getUndoStack().length).toBe(4);
+      expect(API.getUndoStack().length).toBe(3);
       expect(API.getRedoStack().length).toBe(2);
       expect(assertSelectedElements(h.elements[0]));
       expect(h.state.selectedLinearElement?.isEditing).toBe(true);
@@ -1212,7 +1211,7 @@ describe("history", () => {
       ]);
 
       Keyboard.redo();
-      expect(API.getUndoStack().length).toBe(5);
+      expect(API.getUndoStack().length).toBe(4);
       expect(API.getRedoStack().length).toBe(1);
       expect(assertSelectedElements(h.elements[0]));
       expect(h.state.selectedLinearElement?.isEditing).toBe(true);
@@ -1229,7 +1228,7 @@ describe("history", () => {
       ]);
 
       Keyboard.redo();
-      expect(API.getUndoStack().length).toBe(6);
+      expect(API.getUndoStack().length).toBe(5);
       expect(API.getRedoStack().length).toBe(0);
       expect(assertSelectedElements(h.elements[0]));
       expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
@@ -1581,21 +1580,24 @@ describe("history", () => {
 
         // bind arrow to rect1 and rect2
         UI.clickTool("arrow");
-        mouse.down(0, 0);
-        mouse.up(100, 0);
+        mouse.down(3, 0);
+        mouse.moveTo(50, 0);
+        mouse.up(47, 0);
 
         arrow = h.elements[3] as ExcalidrawLinearElement;
 
         expect(API.getUndoStack().length).toBe(5);
         expect(arrow.startBinding).toEqual({
           elementId: rect1.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([
+            0.5379561888991137, 0.5379561888991137,
+          ]),
+          mode: "orbit",
         });
         expect(arrow.endBinding).toEqual({
           elementId: rect2.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([0.5001, 0.5001]),
+          mode: "orbit",
         });
         expect(rect1.boundElements).toStrictEqual([
           { id: text.id, type: "text" },
@@ -1612,13 +1614,15 @@ describe("history", () => {
         expect(API.getRedoStack().length).toBe(1);
         expect(arrow.startBinding).toEqual({
           elementId: rect1.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([
+            0.5379561888991137, 0.5379561888991137,
+          ]),
+          mode: "orbit",
         });
         expect(arrow.endBinding).toEqual({
           elementId: rect2.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([0.5001, 0.5001]),
+          mode: "orbit",
         });
         expect(h.elements).toEqual([
           expect.objectContaining({
@@ -1635,13 +1639,15 @@ describe("history", () => {
         expect(API.getRedoStack().length).toBe(0);
         expect(arrow.startBinding).toEqual({
           elementId: rect1.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([
+            0.5379561888991137, 0.5379561888991137,
+          ]),
+          mode: "orbit",
         });
         expect(arrow.endBinding).toEqual({
           elementId: rect2.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([0.5001, 0.5001]),
+          mode: "orbit",
         });
         expect(h.elements).toEqual([
           expect.objectContaining({
@@ -1666,13 +1672,15 @@ describe("history", () => {
         expect(API.getRedoStack().length).toBe(0);
         expect(arrow.startBinding).toEqual({
           elementId: rect1.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([
+            0.5379561888991137, 0.5379561888991137,
+          ]),
+          mode: "orbit",
         });
         expect(arrow.endBinding).toEqual({
           elementId: rect2.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([0.5001, 0.5001]),
+          mode: "orbit",
         });
         expect(h.elements).toEqual([
           expect.objectContaining({
@@ -1689,13 +1697,15 @@ describe("history", () => {
         expect(API.getRedoStack().length).toBe(1);
         expect(arrow.startBinding).toEqual({
           elementId: rect1.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([
+            0.5379561888991137, 0.5379561888991137,
+          ]),
+          mode: "orbit",
         });
         expect(arrow.endBinding).toEqual({
           elementId: rect2.id,
-          focus: expect.toBeNonNaNNumber(),
-          gap: expect.toBeNonNaNNumber(),
+          fixedPoint: expect.arrayContaining([0.5001, 0.5001]),
+          mode: "orbit",
         });
         expect(h.elements).toEqual([
           expect.objectContaining({
@@ -1744,13 +1754,19 @@ describe("history", () => {
               id: arrow.id,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               isDeleted: true,
             }),
@@ -1789,13 +1805,19 @@ describe("history", () => {
               id: arrow.id,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               isDeleted: false,
             }),
@@ -1833,8 +1855,11 @@ describe("history", () => {
               startBinding: null,
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               isDeleted: false,
             }),
@@ -1868,13 +1893,19 @@ describe("history", () => {
               id: arrow.id,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               isDeleted: false,
             }),
@@ -1941,13 +1972,19 @@ describe("history", () => {
               id: arrow.id,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               isDeleted: false,
             }),
@@ -2298,15 +2335,13 @@ describe("history", () => {
             ],
             startBinding: {
               elementId: "KPrBI4g_v9qUB1XxYLgSz",
-              focus: -0.001587301587301948,
-              gap: 5,
               fixedPoint: [1.0318471337579618, 0.49920634920634904],
+              mode: "orbit",
             } as FixedPointBinding,
             endBinding: {
               elementId: "u2JGnnmoJ0VATV4vCNJE5",
-              focus: -0.0016129032258049847,
-              gap: 3.537079145500037,
               fixedPoint: [0.4991935483870975, -0.03875193720914723],
+              mode: "orbit",
             } as FixedPointBinding,
           },
         ],
@@ -2421,10 +2456,9 @@ describe("history", () => {
         captureUpdate: CaptureUpdateAction.NEVER,
       });
 
-      Keyboard.undo(); // undo `actionFinalize`
       Keyboard.undo();
       expect(API.getUndoStack().length).toBe(1);
-      expect(API.getRedoStack().length).toBe(2);
+      expect(API.getRedoStack().length).toBe(1);
       expect(h.elements).toEqual([
         expect.objectContaining({
           points: [
@@ -2438,7 +2472,7 @@ describe("history", () => {
 
       Keyboard.undo();
       expect(API.getUndoStack().length).toBe(0);
-      expect(API.getRedoStack().length).toBe(3);
+      expect(API.getRedoStack().length).toBe(2);
       expect(h.elements).toEqual([
         expect.objectContaining({
           isDeleted: true,
@@ -2451,7 +2485,7 @@ describe("history", () => {
 
       Keyboard.redo();
       expect(API.getUndoStack().length).toBe(1);
-      expect(API.getRedoStack().length).toBe(2);
+      expect(API.getRedoStack().length).toBe(1);
       expect(h.elements).toEqual([
         expect.objectContaining({
           isDeleted: false,
@@ -2464,21 +2498,6 @@ describe("history", () => {
 
       Keyboard.redo();
       expect(API.getUndoStack().length).toBe(2);
-      expect(API.getRedoStack().length).toBe(1);
-      expect(h.elements).toEqual([
-        expect.objectContaining({
-          points: [
-            [0, 0],
-            [5, 5],
-            [10, 10],
-            [15, 15],
-            [20, 20],
-          ],
-        }),
-      ]);
-
-      Keyboard.redo(); // redo `actionFinalize`
-      expect(API.getUndoStack().length).toBe(3);
       expect(API.getRedoStack().length).toBe(0);
       expect(h.elements).toEqual([
         expect.objectContaining({
@@ -2978,7 +2997,7 @@ describe("history", () => {
       // leave editor
       Keyboard.keyPress(KEYS.ESCAPE);
 
-      expect(API.getUndoStack().length).toBe(4);
+      expect(API.getUndoStack().length).toBe(3);
       expect(API.getRedoStack().length).toBe(0);
       expect(h.state.selectedLinearElement).not.toBeNull();
       expect(h.state.selectedLinearElement?.isEditing).toBe(false);
@@ -2995,11 +3014,11 @@ describe("history", () => {
 
       Keyboard.undo();
       expect(API.getUndoStack().length).toBe(0);
-      expect(API.getRedoStack().length).toBe(4);
+      expect(API.getRedoStack().length).toBe(3);
       expect(h.state.selectedLinearElement).toBeNull();
 
       Keyboard.redo();
-      expect(API.getUndoStack().length).toBe(4);
+      expect(API.getUndoStack().length).toBe(3);
       expect(API.getRedoStack().length).toBe(0);
       expect(h.state.selectedLinearElement).toBeNull();
       expect(h.state.selectedLinearElement?.isEditing ?? false).toBe(false);
@@ -4500,16 +4519,30 @@ describe("history", () => {
 
         // create start binding
         mouse.downAt(0, 0);
-        mouse.moveTo(0, 1);
-        mouse.moveTo(0, 0);
+        mouse.moveTo(0, 10);
+        mouse.moveTo(0, 10);
         mouse.up();
 
         // create end binding
         mouse.downAt(100, 0);
-        mouse.moveTo(100, 1);
-        mouse.moveTo(100, 0);
+        mouse.moveTo(100, 10);
+        mouse.moveTo(100, 10);
         mouse.up();
 
+        expect(
+          (h.elements[2] as ExcalidrawElbowArrowElement).startBinding
+            ?.fixedPoint,
+        ).not.toEqual([1, 0.5001]);
+        expect(
+          (h.elements[2] as ExcalidrawElbowArrowElement).startBinding?.mode,
+        ).toBe("orbit");
+        expect(
+          (h.elements[2] as ExcalidrawElbowArrowElement).endBinding,
+        ).not.toEqual([1, 0.5001]);
+        expect(
+          (h.elements[2] as ExcalidrawElbowArrowElement).endBinding?.mode,
+        ).toBe("orbit");
+
         expect(h.elements).toEqual(
           expect.arrayContaining([
             expect.objectContaining({
@@ -4524,13 +4557,19 @@ describe("history", () => {
               id: arrowId,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
             }),
           ]),
@@ -4593,13 +4632,13 @@ describe("history", () => {
                 id: arrowId,
                 startBinding: expect.objectContaining({
                   elementId: rect1.id,
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  fixedPoint: [0.6363636363636364, 0.6363636363636364],
+                  mode: "orbit",
                 }),
                 endBinding: expect.objectContaining({
                   elementId: rect2.id,
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  fixedPoint: [0.41019091151895054, 0.5898090884810495],
+                  mode: "orbit",
                 }),
               }),
             ]),
@@ -4636,13 +4675,13 @@ describe("history", () => {
 
         // create start binding
         mouse.downAt(0, 0);
-        mouse.moveTo(0, 1);
-        mouse.upAt(0, 0);
+        mouse.moveTo(0, 10);
+        mouse.upAt(0, 10);
 
         // create end binding
         mouse.downAt(100, 0);
-        mouse.moveTo(100, 1);
-        mouse.upAt(100, 0);
+        mouse.moveTo(100, 10);
+        mouse.upAt(100, 10);
 
         expect(h.elements).toEqual(
           expect.arrayContaining([
@@ -4658,13 +4697,19 @@ describe("history", () => {
               id: arrowId,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
             }),
           ]),
@@ -4702,9 +4747,8 @@ describe("history", () => {
             newElementWith(h.elements[2] as ExcalidrawElbowArrowElement, {
               endBinding: {
                 elementId: remoteContainer.id,
-                gap: 1,
-                focus: 0,
-                fixedPoint: [0.5, 1],
+                fixedPoint: [0.5001, 1],
+                mode: "orbit",
               },
             }),
             remoteContainer,
@@ -4731,14 +4775,14 @@ describe("history", () => {
                 id: arrowId,
                 startBinding: expect.objectContaining({
                   elementId: rect1.id,
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  fixedPoint: [0.6363636363636364, 0.6363636363636364],
+                  mode: "orbit",
                 }),
                 // rebound with previous rectangle
                 endBinding: expect.objectContaining({
                   elementId: rect2.id,
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  fixedPoint: [0.39511653718091, 0.6048834628190899],
+                  mode: "orbit",
                 }),
               }),
               expect.objectContaining({
@@ -4768,12 +4812,8 @@ describe("history", () => {
                 endBinding: expect.objectContaining({
                   // now we are back in the previous state!
                   elementId: remoteContainer.id,
-                  fixedPoint: [
-                    expect.toBeNonNaNNumber(),
-                    expect.toBeNonNaNNumber(),
-                  ],
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  fixedPoint: [0.5001, 1],
+                  mode: "orbit",
                 }),
               }),
               expect.objectContaining({
@@ -4791,15 +4831,13 @@ describe("history", () => {
           type: "arrow",
           startBinding: {
             elementId: rect1.id,
-            gap: 1,
-            focus: 0,
             fixedPoint: [1, 0.5],
+            mode: "orbit",
           },
           endBinding: {
             elementId: rect2.id,
-            gap: 1,
-            focus: 0,
             fixedPoint: [0.5, 1],
+            mode: "orbit",
           },
         });
 
@@ -4853,8 +4891,7 @@ describe("history", () => {
                     expect.toBeNonNaNNumber(),
                     expect.toBeNonNaNNumber(),
                   ],
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  mode: "orbit",
                 }),
                 endBinding: expect.objectContaining({
                   // now we are back in the previous state!
@@ -4863,8 +4900,7 @@ describe("history", () => {
                     expect.toBeNonNaNNumber(),
                     expect.toBeNonNaNNumber(),
                   ],
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  mode: "orbit",
                 }),
               }),
               expect.objectContaining({
@@ -4900,15 +4936,13 @@ describe("history", () => {
             newElementWith(h.elements[0] as ExcalidrawElbowArrowElement, {
               startBinding: {
                 elementId: rect1.id,
-                gap: 1,
-                focus: 0,
                 fixedPoint: [0.5, 1],
+                mode: "orbit",
               },
               endBinding: {
                 elementId: rect2.id,
-                gap: 1,
-                focus: 0,
                 fixedPoint: [1, 0.5],
+                mode: "orbit",
               },
             }),
             newElementWith(rect1, {
@@ -4935,8 +4969,7 @@ describe("history", () => {
                     expect.toBeNonNaNNumber(),
                     expect.toBeNonNaNNumber(),
                   ],
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  mode: "orbit",
                 }),
                 endBinding: expect.objectContaining({
                   elementId: rect2.id,
@@ -4944,8 +4977,7 @@ describe("history", () => {
                     expect.toBeNonNaNNumber(),
                     expect.toBeNonNaNNumber(),
                   ],
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  mode: "orbit",
                 }),
                 isDeleted: true,
               }),
@@ -4975,8 +5007,7 @@ describe("history", () => {
                     expect.toBeNonNaNNumber(),
                     expect.toBeNonNaNNumber(),
                   ],
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  mode: "orbit",
                 },
                 endBinding: expect.objectContaining({
                   elementId: rect2.id,
@@ -4984,8 +5015,7 @@ describe("history", () => {
                     expect.toBeNonNaNNumber(),
                     expect.toBeNonNaNNumber(),
                   ],
-                  focus: expect.toBeNonNaNNumber(),
-                  gap: expect.toBeNonNaNNumber(),
+                  mode: "orbit",
                 }),
                 isDeleted: false,
               }),
@@ -5010,11 +5040,13 @@ describe("history", () => {
         // bind arrow to rect1 and rect2
         UI.clickTool("arrow");
         mouse.down(0, 0);
-        mouse.up(100, 0);
+        mouse.moveTo(50, 0);
+        mouse.up(50, 0);
 
         const arrowId = h.elements[2].id;
 
         Keyboard.undo();
+
         expect(API.getUndoStack().length).toBe(1);
         expect(API.getRedoStack().length).toBe(1);
         expect(h.elements).toEqual(
@@ -5028,13 +5060,13 @@ describe("history", () => {
               id: arrowId,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: 0,
-                gap: 1,
+                fixedPoint: expect.arrayContaining([
+                  0.548442798411514, 0.548442798411514,
+                ]),
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: -0,
-                gap: 1,
+                fixedPoint: expect.arrayContaining([0.5001, 0.5001]),
               }),
               isDeleted: true,
             }),
@@ -5076,13 +5108,19 @@ describe("history", () => {
               id: arrowId,
               startBinding: expect.objectContaining({
                 elementId: rect1.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               endBinding: expect.objectContaining({
                 elementId: rect2.id,
-                focus: expect.toBeNonNaNNumber(),
-                gap: expect.toBeNonNaNNumber(),
+                fixedPoint: expect.arrayContaining([
+                  expect.toBeNonNaNNumber(),
+                  expect.toBeNonNaNNumber(),
+                ]),
+                mode: "orbit",
               }),
               isDeleted: false,
             }),
diff --git a/packages/excalidraw/tests/lasso.test.tsx b/packages/excalidraw/tests/lasso.test.tsx
index d84ce1ffb9..f9a9d12d27 100644
--- a/packages/excalidraw/tests/lasso.test.tsx
+++ b/packages/excalidraw/tests/lasso.test.tsx
@@ -210,7 +210,6 @@ describe("Basic lasso selection tests", () => {
           [0, 0],
           [168.4765625, -153.38671875],
         ],
-        lastCommittedPoint: null,
         startBinding: null,
         endBinding: null,
         startArrowhead: null,
@@ -250,7 +249,6 @@ describe("Basic lasso selection tests", () => {
           [0, 0],
           [206.12890625, 35.4140625],
         ],
-        lastCommittedPoint: null,
         startBinding: null,
         endBinding: null,
         startArrowhead: null,
@@ -354,7 +352,6 @@ describe("Basic lasso selection tests", () => {
         ],
         pressures: [],
         simulatePressure: true,
-        lastCommittedPoint: null,
       },
     ].map(
       (e) =>
@@ -1229,7 +1226,6 @@ describe("Special cases", () => {
           locked: false,
           startBinding: null,
           endBinding: null,
-          lastCommittedPoint: null,
           startArrowhead: null,
           endArrowhead: null,
           points: [
@@ -1271,7 +1267,6 @@ describe("Special cases", () => {
           locked: false,
           startBinding: null,
           endBinding: null,
-          lastCommittedPoint: null,
           startArrowhead: null,
           endArrowhead: null,
           points: [
@@ -1312,7 +1307,6 @@ describe("Special cases", () => {
           locked: false,
           startBinding: null,
           endBinding: null,
-          lastCommittedPoint: null,
           startArrowhead: null,
           endArrowhead: null,
           points: [
@@ -1353,7 +1347,6 @@ describe("Special cases", () => {
           locked: false,
           startBinding: null,
           endBinding: null,
-          lastCommittedPoint: null,
           startArrowhead: null,
           endArrowhead: null,
           points: [
@@ -1692,7 +1685,6 @@ describe("Special cases", () => {
           locked: false,
           startBinding: null,
           endBinding: null,
-          lastCommittedPoint: null,
           startArrowhead: null,
           endArrowhead: null,
           points: [
@@ -1744,7 +1736,6 @@ describe("Special cases", () => {
           locked: false,
           startBinding: null,
           endBinding: null,
-          lastCommittedPoint: null,
           startArrowhead: null,
           endArrowhead: null,
           points: [
diff --git a/packages/excalidraw/tests/library.test.tsx b/packages/excalidraw/tests/library.test.tsx
index 55c25188de..1905741efa 100644
--- a/packages/excalidraw/tests/library.test.tsx
+++ b/packages/excalidraw/tests/library.test.tsx
@@ -67,9 +67,8 @@ describe("library items inserting", () => {
       type: "arrow",
       endBinding: {
         elementId: "rectangle1",
-        focus: -1,
-        gap: 0,
         fixedPoint: [0.5, 1],
+        mode: "orbit",
       },
     });
 
diff --git a/packages/excalidraw/tests/move.test.tsx b/packages/excalidraw/tests/move.test.tsx
index 095db38a0c..a881bb83e6 100644
--- a/packages/excalidraw/tests/move.test.tsx
+++ b/packages/excalidraw/tests/move.test.tsx
@@ -1,16 +1,12 @@
 import React from "react";
 import { vi } from "vitest";
-
-import { bindOrUnbindLinearElement } from "@excalidraw/element";
-
 import { KEYS, reseed } from "@excalidraw/common";
-
+import { bindBindingElement } from "@excalidraw/element";
 import "@excalidraw/utils/test-utils";
 
 import type {
-  ExcalidrawLinearElement,
+  ExcalidrawArrowElement,
   NonDeleted,
-  ExcalidrawRectangleElement,
 } from "@excalidraw/element/types";
 
 import { Excalidraw } from "../index";
@@ -83,12 +79,21 @@ describe("move element", () => {
     const rectA = UI.createElement("rectangle", { size: 100 });
     const rectB = UI.createElement("rectangle", { x: 200, y: 0, size: 300 });
     const arrow = UI.createElement("arrow", { x: 110, y: 50, size: 80 });
+
     act(() => {
       // bind line to two rectangles
-      bindOrUnbindLinearElement(
-        arrow.get() as NonDeleted<ExcalidrawLinearElement>,
-        rectA.get() as ExcalidrawRectangleElement,
-        rectB.get() as ExcalidrawRectangleElement,
+      bindBindingElement(
+        arrow.get() as NonDeleted<ExcalidrawArrowElement>,
+        rectA.get(),
+        "orbit",
+        "start",
+        h.app.scene,
+      );
+      bindBindingElement(
+        arrow.get() as NonDeleted<ExcalidrawArrowElement>,
+        rectB.get(),
+        "orbit",
+        "end",
         h.app.scene,
       );
     });
@@ -97,16 +102,19 @@ describe("move element", () => {
     new Pointer("mouse").clickOn(rectB);
 
     expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-      `17`,
+      `16`,
     );
-    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`13`);
+    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`15`);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(3);
     expect(h.state.selectedElementIds[rectB.id]).toBeTruthy();
     expect([rectA.x, rectA.y]).toEqual([0, 0]);
     expect([rectB.x, rectB.y]).toEqual([200, 0]);
-    expect([arrow.x, arrow.y]).toEqual([110, 50]);
-    expect([arrow.width, arrow.height]).toEqual([80, 80]);
+    expect([[arrow.x, arrow.y]]).toCloselyEqualPoints([[110, -4.576537]], 0);
+    expect([[arrow.width, arrow.height]]).toCloselyEqualPoints(
+      [[79, 132.89433]],
+      0,
+    );
 
     renderInteractiveScene.mockClear();
     renderStaticScene.mockClear();
@@ -124,8 +132,11 @@ describe("move element", () => {
     expect(h.state.selectedElementIds[rectB.id]).toBeTruthy();
     expect([rectA.x, rectA.y]).toEqual([0, 0]);
     expect([rectB.x, rectB.y]).toEqual([201, 2]);
-    expect([[arrow.x, arrow.y]]).toCloselyEqualPoints([[110, 50]]);
-    expect([[arrow.width, arrow.height]]).toCloselyEqualPoints([[81, 81.4]]);
+    expect([[arrow.x, arrow.y]]).toCloselyEqualPoints([[111, 6.1499]], 0);
+    expect([[arrow.width, arrow.height]]).toCloselyEqualPoints(
+      [[79, 124.1678]],
+      0,
+    );
 
     h.elements.forEach((element) => expect(element).toMatchSnapshot());
   });
diff --git a/packages/excalidraw/tests/multiPointCreate.test.tsx b/packages/excalidraw/tests/multiPointCreate.test.tsx
index 926c8d47f3..26cd88e66b 100644
--- a/packages/excalidraw/tests/multiPointCreate.test.tsx
+++ b/packages/excalidraw/tests/multiPointCreate.test.tsx
@@ -118,8 +118,10 @@ describe("multi point mode in linear elements", () => {
       key: KEYS.ENTER,
     });
 
-    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`7`);
-    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
+    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
+      `11`,
+    );
+    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
     expect(h.elements.length).toEqual(1);
 
     const element = h.elements[0] as ExcalidrawLinearElement;
@@ -161,8 +163,10 @@ describe("multi point mode in linear elements", () => {
     fireEvent.keyDown(document, {
       key: KEYS.ENTER,
     });
-    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`7`);
-    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
+    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
+      `11`,
+    );
+    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
     expect(h.elements.length).toEqual(1);
 
     const element = h.elements[0] as ExcalidrawLinearElement;
diff --git a/packages/excalidraw/tests/regressionTests.test.tsx b/packages/excalidraw/tests/regressionTests.test.tsx
index d4b5185bac..f16606b6f2 100644
--- a/packages/excalidraw/tests/regressionTests.test.tsx
+++ b/packages/excalidraw/tests/regressionTests.test.tsx
@@ -1,7 +1,13 @@
 import React from "react";
 import { vi } from "vitest";
 
-import { FONT_FAMILY, CODES, KEYS, reseed } from "@excalidraw/common";
+import {
+  FONT_FAMILY,
+  CODES,
+  KEYS,
+  reseed,
+  MQ_MIN_WIDTH_DESKTOP,
+} from "@excalidraw/common";
 
 import { setDateTimeForTests } from "@excalidraw/common";
 
@@ -60,7 +66,7 @@ beforeEach(async () => {
   finger2.reset();
 
   await render(<Excalidraw handleKeyboardGlobally={true} />);
-  API.setAppState({ height: 768, width: 1024 });
+  API.setAppState({ height: 768, width: MQ_MIN_WIDTH_DESKTOP });
 });
 
 afterEach(() => {
@@ -363,7 +369,6 @@ describe("regression tests", () => {
     Keyboard.withModifierKeys({ ctrl: true }, () => {
       Keyboard.keyPress(KEYS.Z);
       Keyboard.keyPress(KEYS.Z);
-      Keyboard.keyPress(KEYS.Z);
     });
     expect(h.elements.filter((element) => !element.isDeleted).length).toBe(2);
     Keyboard.withModifierKeys({ ctrl: true }, () => {
diff --git a/packages/excalidraw/tests/rotate.test.tsx b/packages/excalidraw/tests/rotate.test.tsx
index 38079db8f3..47f7e469e4 100644
--- a/packages/excalidraw/tests/rotate.test.tsx
+++ b/packages/excalidraw/tests/rotate.test.tsx
@@ -24,7 +24,7 @@ test("unselected bound arrow updates when rotating its target element", async ()
   const arrow = UI.createElement("arrow", {
     x: -80,
     y: 50,
-    width: 70,
+    width: 85,
     height: 0,
   });
 
@@ -35,8 +35,8 @@ test("unselected bound arrow updates when rotating its target element", async ()
   expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
   expect(arrow.x).toBeCloseTo(-80);
   expect(arrow.y).toBeCloseTo(50);
-  expect(arrow.width).toBeCloseTo(110.7, 1);
-  expect(arrow.height).toBeCloseTo(0);
+  expect(arrow.width).toBeCloseTo(132.491, 1);
+  expect(arrow.height).toBeCloseTo(82.267, 1);
 });
 
 test("unselected bound arrows update when rotating their target elements", async () => {
@@ -48,9 +48,10 @@ test("unselected bound arrows update when rotating their target elements", async
     height: 120,
   });
   const ellipseArrow = UI.createElement("arrow", {
-    position: 0,
-    width: 40,
-    height: 80,
+    x: -10,
+    y: 80,
+    width: 50,
+    height: 60,
   });
   const text = UI.createElement("text", {
     position: 220,
@@ -59,8 +60,8 @@ test("unselected bound arrows update when rotating their target elements", async
   const textArrow = UI.createElement("arrow", {
     x: 360,
     y: 300,
-    width: -100,
-    height: -40,
+    width: -140,
+    height: -60,
   });
 
   expect(ellipseArrow.endBinding?.elementId).toEqual(ellipse.id);
@@ -69,16 +70,16 @@ test("unselected bound arrows update when rotating their target elements", async
   UI.rotate([ellipse, text], [-82, 23], { shift: true });
 
   expect(ellipseArrow.endBinding?.elementId).toEqual(ellipse.id);
-  expect(ellipseArrow.x).toEqual(0);
-  expect(ellipseArrow.y).toEqual(0);
+  expect(ellipseArrow.x).toEqual(-10);
+  expect(ellipseArrow.y).toEqual(80);
   expect(ellipseArrow.points[0]).toEqual([0, 0]);
-  expect(ellipseArrow.points[1][0]).toBeCloseTo(48.98, 1);
-  expect(ellipseArrow.points[1][1]).toBeCloseTo(125.79, 1);
+  expect(ellipseArrow.points[1][0]).toBeCloseTo(66.317, 1);
+  expect(ellipseArrow.points[1][1]).toBeCloseTo(144.38, 1);
 
   expect(textArrow.endBinding?.elementId).toEqual(text.id);
   expect(textArrow.x).toEqual(360);
   expect(textArrow.y).toEqual(300);
   expect(textArrow.points[0]).toEqual([0, 0]);
-  expect(textArrow.points[1][0]).toBeCloseTo(-94, 0);
-  expect(textArrow.points[1][1]).toBeCloseTo(-116.1, 0);
+  expect(textArrow.points[1][0]).toBeCloseTo(-95.74, 0);
+  expect(textArrow.points[1][1]).toBeCloseTo(-119.7354, 0);
 });
diff --git a/packages/excalidraw/tests/selection.test.tsx b/packages/excalidraw/tests/selection.test.tsx
index 10f4f7ad98..dde3c96e48 100644
--- a/packages/excalidraw/tests/selection.test.tsx
+++ b/packages/excalidraw/tests/selection.test.tsx
@@ -425,8 +425,8 @@ describe("select single element on the scene", () => {
     fireEvent.pointerDown(canvas, { clientX: 40, clientY: 40 });
     fireEvent.pointerUp(canvas);
 
-    expect(renderInteractiveScene).toHaveBeenCalledTimes(8);
-    expect(renderStaticScene).toHaveBeenCalledTimes(6);
+    expect(renderInteractiveScene).toHaveBeenCalledTimes(9);
+    expect(renderStaticScene).toHaveBeenCalledTimes(7);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(1);
     expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
@@ -469,8 +469,8 @@ describe("select single element on the scene", () => {
     fireEvent.pointerDown(canvas, { clientX: 40, clientY: 40 });
     fireEvent.pointerUp(canvas);
 
-    expect(renderInteractiveScene).toHaveBeenCalledTimes(8);
-    expect(renderStaticScene).toHaveBeenCalledTimes(6);
+    expect(renderInteractiveScene).toHaveBeenCalledTimes(9);
+    expect(renderStaticScene).toHaveBeenCalledTimes(7);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(1);
     expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
@@ -487,7 +487,12 @@ describe("tool locking & selection", () => {
     expect(h.state.activeTool.locked).toBe(true);
 
     for (const { value } of Object.values(SHAPES)) {
-      if (value !== "image" && value !== "selection" && value !== "eraser") {
+      if (
+        value !== "image" &&
+        value !== "selection" &&
+        value !== "eraser" &&
+        value !== "arrow"
+      ) {
         const element = UI.createElement(value);
         expect(h.state.selectedElementIds[element.id]).not.toBe(true);
       }
diff --git a/packages/excalidraw/tests/test-utils.ts b/packages/excalidraw/tests/test-utils.ts
index 78e11d1821..7289a59820 100644
--- a/packages/excalidraw/tests/test-utils.ts
+++ b/packages/excalidraw/tests/test-utils.ts
@@ -189,24 +189,20 @@ export const withExcalidrawDimensions = async (
   dimensions: { width: number; height: number },
   cb: () => void,
 ) => {
+  const { h } = window;
+
   mockBoundingClientRect(dimensions);
   act(() => {
-    // @ts-ignore
-    h.app.refreshViewportBreakpoints();
-    // @ts-ignore
-    h.app.refreshEditorBreakpoints();
-    window.h.app.refresh();
+    h.app.refreshEditorInterface();
+    h.app.refresh();
   });
 
   await cb();
 
   restoreOriginalGetBoundingClientRect();
   act(() => {
-    // @ts-ignore
-    h.app.refreshViewportBreakpoints();
-    // @ts-ignore
-    h.app.refreshEditorBreakpoints();
-    window.h.app.refresh();
+    h.app.refreshEditorInterface();
+    h.app.refresh();
   });
 };
 
diff --git a/packages/excalidraw/types.ts b/packages/excalidraw/types.ts
index 6728e00947..d5d444a199 100644
--- a/packages/excalidraw/types.ts
+++ b/packages/excalidraw/types.ts
@@ -3,10 +3,9 @@ import type {
   UserIdleState,
   throttleRAF,
   MIME_TYPES,
+  EditorInterface,
 } from "@excalidraw/common";
 
-import type { SuggestedBinding } from "@excalidraw/element";
-
 import type { LinearElementEditor } from "@excalidraw/element";
 
 import type { MaybeTransformHandleType } from "@excalidraw/element";
@@ -33,6 +32,7 @@ import type {
   ExcalidrawIframeLikeElement,
   OrderedExcalidrawElement,
   ExcalidrawNonSelectionElement,
+  BindMode,
 } from "@excalidraw/element/types";
 
 import type {
@@ -204,6 +204,7 @@ export type StaticCanvasAppState = Readonly<
     frameRendering: AppState["frameRendering"];
     currentHoveredFontFamily: AppState["currentHoveredFontFamily"];
     hoveredElementIds: AppState["hoveredElementIds"];
+    suggestedBinding: AppState["suggestedBinding"];
     // Cropping
     croppingElementId: AppState["croppingElementId"];
   }
@@ -217,8 +218,9 @@ export type InteractiveCanvasAppState = Readonly<
     selectedGroupIds: AppState["selectedGroupIds"];
     selectedLinearElement: AppState["selectedLinearElement"];
     multiElement: AppState["multiElement"];
+    newElement: AppState["newElement"];
     isBindingEnabled: AppState["isBindingEnabled"];
-    suggestedBindings: AppState["suggestedBindings"];
+    suggestedBinding: AppState["suggestedBinding"];
     isRotating: AppState["isRotating"];
     elementsToHighlight: AppState["elementsToHighlight"];
     // Collaborators
@@ -233,6 +235,11 @@ export type InteractiveCanvasAppState = Readonly<
     // Search matches
     searchMatches: AppState["searchMatches"];
     activeLockedId: AppState["activeLockedId"];
+    // Non-used but needed in binding highlight arrow overdraw
+    hoveredElementIds: AppState["hoveredElementIds"];
+    frameRendering: AppState["frameRendering"];
+    shouldCacheIgnoreZoom: AppState["shouldCacheIgnoreZoom"];
+    exportScale: AppState["exportScale"];
   }
 >;
 
@@ -292,7 +299,7 @@ export interface AppState {
   selectionElement: NonDeletedExcalidrawElement | null;
   isBindingEnabled: boolean;
   startBoundElement: NonDeleted<ExcalidrawBindableElement> | null;
-  suggestedBindings: SuggestedBinding[];
+  suggestedBinding: NonDeleted<ExcalidrawBindableElement> | null;
   frameToHighlight: NonDeleted<ExcalidrawFrameLikeElement> | null;
   frameRendering: {
     enabled: boolean;
@@ -368,6 +375,7 @@ export interface AppState {
     | { name: "imageExport" | "help" | "jsonExport" }
     | { name: "ttd"; tab: "text-to-diagram" | "mermaid" }
     | { name: "commandPalette" }
+    | { name: "settings" }
     | { name: "elementLinkSelector"; sourceElementId: ExcalidrawElement["id"] };
   /**
    * Reflects user preference for whether the default sidebar should be docked.
@@ -450,9 +458,7 @@ export interface AppState {
   // as elements are unlocked, we remove the groupId from the elements
   // and also remove groupId from this map
   lockedMultiSelections: { [groupId: string]: true };
-
-  /** properties sidebar mode - determines whether to show compact or complete sidebar */
-  stylesPanelMode: "compact" | "full" | "mobile";
+  bindMode: BindMode;
 }
 
 export type SearchMatch = {
@@ -469,11 +475,7 @@ export type SearchMatch = {
 
 export type UIAppState = Omit<
   AppState,
-  | "suggestedBindings"
-  | "startBoundElement"
-  | "cursorButton"
-  | "scrollX"
-  | "scrollY"
+  "startBoundElement" | "cursorButton" | "scrollX" | "scrollY"
 >;
 
 export type NormalizedZoomValue = number & { _brand: "normalizedZoom" };
@@ -677,6 +679,12 @@ export type UIOptions = Partial<{
   tools: {
     image: boolean;
   };
+  /**
+   * Optionally control the editor form factor and desktop UI mode from the host app.
+   * If not provided, we will take care of it internally.
+   */
+  formFactor?: EditorInterface["formFactor"];
+  desktopUIMode?: EditorInterface["desktopUIMode"];
   /** @deprecated does nothing. Will be removed in 0.15 */
   welcomeScreen?: boolean;
 }>;
@@ -716,7 +724,7 @@ export type AppClassProperties = {
     }
   >;
   files: BinaryFiles;
-  device: App["device"];
+  editorInterface: App["editorInterface"];
   scene: App["scene"];
   syncActionResult: App["syncActionResult"];
   fonts: App["fonts"];
@@ -747,6 +755,8 @@ export type AppClassProperties = {
   onPointerUpEmitter: App["onPointerUpEmitter"];
   updateEditorAtom: App["updateEditorAtom"];
   onPointerDownEmitter: App["onPointerDownEmitter"];
+
+  bindModeHandler: App["bindModeHandler"];
 };
 
 export type PointerDownState = Readonly<{
@@ -848,6 +858,7 @@ export interface ExcalidrawImperativeAPI {
   setCursor: InstanceType<typeof App>["setCursor"];
   resetCursor: InstanceType<typeof App>["resetCursor"];
   toggleSidebar: InstanceType<typeof App>["toggleSidebar"];
+  getEditorInterface: () => EditorInterface;
   /**
    * Disables rendering of frames (including element clipping), but currently
    * the frames are still interactive in edit mode. As such, this API should be
@@ -886,18 +897,6 @@ export interface ExcalidrawImperativeAPI {
   ) => UnsubscribeCallback;
 }
 
-export type Device = Readonly<{
-  viewport: {
-    isMobile: boolean;
-    isLandscape: boolean;
-  };
-  editor: {
-    isMobile: boolean;
-    canFitSidebar: boolean;
-  };
-  isTouchScreen: boolean;
-}>;
-
 export type FrameNameBounds = {
   x: number;
   y: number;
diff --git a/packages/excalidraw/wysiwyg/textWysiwyg.test.tsx b/packages/excalidraw/wysiwyg/textWysiwyg.test.tsx
index b03fab7391..e4d290a92f 100644
--- a/packages/excalidraw/wysiwyg/textWysiwyg.test.tsx
+++ b/packages/excalidraw/wysiwyg/textWysiwyg.test.tsx
@@ -254,9 +254,7 @@ describe("textWysiwyg", () => {
     beforeEach(async () => {
       await render(<Excalidraw handleKeyboardGlobally={true} />);
       // @ts-ignore
-      h.app.refreshViewportBreakpoints();
-      // @ts-ignore
-      h.app.refreshEditorBreakpoints();
+      h.app.refreshEditorInterface();
 
       API.setElements([]);
     });
@@ -363,9 +361,7 @@ describe("textWysiwyg", () => {
     beforeEach(async () => {
       await render(<Excalidraw handleKeyboardGlobally={true} />);
       // @ts-ignore
-      h.app.refreshViewportBreakpoints();
-      // @ts-ignore
-      h.app.refreshEditorBreakpoints();
+      h.app.refreshEditorInterface();
 
       textElement = UI.createElement("text");
 
diff --git a/packages/utils/src/test-utils.ts b/packages/utils/src/test-utils.ts
index 1dfd14cacb..966a589ab9 100644
--- a/packages/utils/src/test-utils.ts
+++ b/packages/utils/src/test-utils.ts
@@ -6,11 +6,11 @@ expect.extend({
       throw new Error("expected and received are not point arrays");
     }
 
-    const COMPARE = 1 / Math.pow(10, precision || 2);
+    const COMPARE = 1 / precision === 0 ? 1 : Math.pow(10, precision ?? 2);
     const pass = expected.every(
       (point, idx) =>
-        Math.abs(received[idx]?.[0] - point[0]) < COMPARE &&
-        Math.abs(received[idx]?.[1] - point[1]) < COMPARE,
+        Math.abs(received[idx][0] - point[0]) < COMPARE &&
+        Math.abs(received[idx][1] - point[1]) < COMPARE,
     );
 
     if (!pass) {
diff --git a/packages/utils/tests/__snapshots__/export.test.ts.snap b/packages/utils/tests/__snapshots__/export.test.ts.snap
index 1f799501c9..f914a2bf2b 100644
--- a/packages/utils/tests/__snapshots__/export.test.ts.snap
+++ b/packages/utils/tests/__snapshots__/export.test.ts.snap
@@ -11,6 +11,7 @@ exports[`exportToSvg > with default arguments 1`] = `
     "locked": false,
     "type": "selection",
   },
+  "bindMode": "orbit",
   "collaborators": Map {},
   "contextMenu": null,
   "croppingElementId": null,
@@ -104,8 +105,7 @@ exports[`exportToSvg > with default arguments 1`] = `
     "open": false,
     "panels": 3,
   },
-  "stylesPanelMode": "full",
-  "suggestedBindings": [],
+  "suggestedBinding": null,
   "theme": "light",
   "toast": null,
   "userToFollow": null,
diff --git a/public/oss_promo_comments_dark.jpg b/public/oss_promo_comments_dark.jpg
new file mode 100644
index 0000000000..e015f8a6b9
Binary files /dev/null and b/public/oss_promo_comments_dark.jpg differ
diff --git a/public/oss_promo_comments_light.jpg b/public/oss_promo_comments_light.jpg
new file mode 100644
index 0000000000..c8c4507b8e
Binary files /dev/null and b/public/oss_promo_comments_light.jpg differ
diff --git a/public/oss_promo_presentations_dark.svg b/public/oss_promo_presentations_dark.svg
new file mode 100644
index 0000000000..31a0eac6e6
--- /dev/null
+++ b/public/oss_promo_presentations_dark.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 138 165" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="m11.55 6.521 114.882-.02 4.293.973 1.369 1.457.168 4.434.44 55.498-.595 3.556-1.573 2.251-4.433.734-114.808.115-3.06-1.048-2.497-2.759.721-3.003-.73-55.875 1.064-1.95.021-2.498 2.04-.472 3.437-1.008" fill="#4F4D6F"/><path d="M12.061 6.822c42.517-.332 85.113-.654 114.106 0m-114.106 0c44.606.049 88.915.018 114.106 0m-114.106 0C7.883 6.67 6.534 9.165 5.778 13.07m6.283-6.248c-3.454.646-5.415 1.355-6.283 6.248m120.389-6.248c3.423-.486 5.903 2.349 6.284 6.248m-6.284-6.248c3.67.603 7.067 1.423 6.284 6.248m0 0c-1.174 20.402-.324 40.87 0 55.71m0-55.71c.322 15.398.224 30.96 0 55.71m0 0c.428 4.795-2.496 5.927-6.284 6.247m6.284-6.248c.717 4.866-1.638 7.074-6.284 6.248m0 0c-27.612.672-55.472.188-114.106 0m114.106 0c-29.165-.576-58.4-.527-114.106 0m0 0c-3.426.569-5.816-2.704-6.283-6.248m6.283 6.248c-3.324-.404-6.219-1.706-6.283-6.248m0 0c-.34-15.249-.85-31.052 0-55.709m0 55.71c.214-12.22.465-24.702 0-55.71" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path d="m4.818 1.617 128.861-.121 1.518.425.913 2.093-.515 4.907.073 2.435-2.376 1.068-128.85-.933-2.084.523-.8-2.734.815-5.539.063-1.968 2.082-.043" fill="#4F4D6F"/><path d="M4.486 1.952c31.255-.175 62.584-.636 128.731 0m-128.731 0c27.438-.185 54.944-.14 128.731 0m-128.731 0c-1.734.444-1.813.248-2.521 2.508m2.52-2.508c-1.935-.878-2.595.153-2.52 2.508m131.252-2.508c1.133.079 2.786.819 2.521 2.508m-2.521-2.508c1.196-.246 2.794 1.133 2.521 2.508m0 0c-.76 1.243.069 2 0 5.012m0-5.012c.35 1.41-.218 2.7 0 5.012m0 0c-.349 1.161-1.143 2.768-2.521 2.507m2.521-2.507c-.371 2.5-1.103 3.106-2.521 2.507m0 0c-33.063.421-66.11.32-128.731 0m128.731 0c-47.335-.244-94.721-.092-128.731 0m0 0c-1.357-.434-2.321-.16-2.521-2.507m2.52 2.507c-1.76-.06-2.793-.127-2.52-2.507m0 0c-.393-1.154.294-3.628 0-5.012m0 5.012a83.685 83.685 0 0 1 0-5.012" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path d="m4.819 72.339 128.965.9.658-.17 1.569 1.123.002 5.428.135 3.008-2.517.875L4.47 82.171 2.5 81.71l.118-1.738.328-5.635.463-1.708 1.514-.498" fill="#4F4D6F"/><path d="M4.785 72.706c50.976.318 102.405.498 128.731 0m-128.73 0c28.322.185 56.85-.028 128.73 0m-128.73 0c-1.727-.49-2.447 1.28-2.522 2.507m2.521-2.507c-2.148-.22-2.794 1.595-2.521 2.507m131.252-2.507c1.999-.196 3.079.185 2.522 2.507m-2.522-2.507c1.446.742 3.113 1.683 2.522 2.507m0 0c-.597 1.523.604 3.92 0 5.012m0-5.012c.015 2.296-.246 3.815 0 5.012m0 0c.597 2.072-.564 2.085-2.522 2.507m2.522-2.507c-.032 1.527-.591 2.517-2.522 2.507m0 0c-26.528.62-52.8.594-128.73 0m128.73 0c-37.61.554-74.95.318-128.73 0m0 0c-2.387-.37-2.699-.879-2.522-2.507m2.521 2.507c-.95-.166-1.736-.213-2.521-2.507m0 0c-.403-1.103-.526-2.683 0-5.012m0 5.012c-.14-1.533.212-2.513 0-5.012" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path d="M62.287 24.268c2.167-1.127 5.572-1.601 8.166-1.568 2.592.033 5.172.717 7.391 1.77 2.217 1.052 4.31 2.727 5.917 4.547 1.606 1.82 2.867 4.002 3.723 6.373.856 2.37 1.479 5.357 1.412 7.853-.067 2.495-.733 4.852-1.81 7.118-1.079 2.27-2.785 4.698-4.659 6.493-1.873 1.794-4.243 3.463-6.582 4.276-2.338.812-5.01.745-7.451.595-2.443-.15-4.96-.535-7.2-1.495-2.238-.961-4.482-2.49-6.234-4.27-1.75-1.781-3.444-3.984-4.273-6.417-.828-2.432-.777-5.63-.695-8.179.08-2.55.189-4.88 1.184-7.117.996-2.237 2.382-4.479 4.792-6.308 2.411-1.832 7.52-3.954 9.67-4.677 2.149-.722 3.152-.011 3.227.34m16.33 6.453c1.521 1.607 1.941 4.323 2.468 6.752.526 2.429.797 5.256.695 7.828-.104 2.57-.151 5.402-1.308 7.595-1.157 2.193-3.495 3.991-5.632 5.559-2.138 1.57-4.771 3.278-7.195 3.858-2.42.58-4.88-.047-7.334-.38-2.454-.335-5.2-.465-7.395-1.62-2.195-1.151-4.273-3.373-5.775-5.3-1.502-1.93-2.513-3.87-3.236-6.268-.722-2.398-1.406-5.522-1.1-8.119.309-2.596 1.642-5.375 2.94-7.458 1.296-2.084 2.92-3.534 4.846-5.044 1.925-1.507 4.265-3.36 6.708-4.006 2.443-.646 5.435-.117 7.947.123 2.511.242 4.919.105 7.122 1.326 2.201 1.22 5.12 4.977 6.09 5.992.97 1.015.064-.006-.274.101" fill="#191919"/><path d="M78.568 25.176c2.26.828 4.224 3.18 5.756 5.139 1.53 1.96 2.62 4.272 3.43 6.617.81 2.347 1.599 5.01 1.426 7.459-.175 2.446-1.314 5.059-2.469 7.226-1.156 2.167-2.55 4.21-4.463 5.777-1.912 1.57-4.597 2.9-7.018 3.638-2.421.738-5.038 1.025-7.51.793-2.47-.233-5.108-1.057-7.32-2.185-2.21-1.129-4.327-2.687-5.945-4.589-1.618-1.901-3-4.397-3.762-6.828-.76-2.428-1.021-5.22-.801-7.75.22-2.526.991-5.316 2.118-7.415 1.128-2.099 2.779-3.655 4.644-5.178 1.866-1.52 4.092-3.089 6.551-3.954 2.46-.863 4.862-2.071 8.208-1.226 3.344.844 9.349 4.528 11.862 6.297 2.514 1.769 3.49 4.106 3.217 4.315m-4.307-5.555c2.052 1.295 3.715 3.32 4.856 5.655 1.141 2.337 1.929 5.806 1.992 8.362.06 2.558-.713 4.706-1.623 6.984-.907 2.277-2.21 4.78-3.832 6.684-1.624 1.904-3.714 3.676-5.903 4.737-2.19 1.06-4.827 1.482-7.234 1.622-2.41.143-4.846.106-7.214-.771-2.369-.877-5.127-2.806-6.999-4.489-1.87-1.685-3.216-3.38-4.22-5.615-1.005-2.236-1.659-5.217-1.806-7.8-.147-2.582.075-5.397.923-7.69.848-2.292 2.476-4.233 4.165-6.064 1.686-1.834 3.707-3.938 5.957-4.932 2.25-.996 5.131-.98 7.543-1.043 2.413-.06 4.677-.13 6.933.674 2.254.802 5.535 3.542 6.598 4.149 1.062.607-.096-.687-.222-.508" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path fill-rule="evenodd" clip-rule="evenodd" d="m65.283 35.18-.713 12.115 1.159 2.609 1.347-.256 4.141-.922 3.586-3.328 3.389-2.02.58-1.628-.645-1.144-2.543-1.359-9.158-4.485" fill="#4F4D6F"/><path d="M66.207 35.762c.008 2.398-2.608 12.644-.644 13.712 1.964 1.068 12.365-4.861 12.424-7.302.057-2.443-10.076-6.281-12.076-7.351m-.215.675c.215 2.496-1.08 13.363.888 14.564 1.97 1.2 11.016-4.858 10.924-7.363-.093-2.503-9.45-6.57-11.478-7.663M67.325 81.178c.31 1.886 1.008 9.376 1.106 11.23m-1.665-11.777c.316 1.765 1.288 9.275 1.404 11.079" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path d="M70.594 90.499c1.15.47 2.358 1.806 2.902 3.014.546 1.207.71 2.935.368 4.235-.34 1.299-1.238 2.847-2.412 3.56-1.176.714-3.26.892-4.638.722-1.376-.17-2.716-.9-3.627-1.745-.91-.844-1.773-2.07-1.844-3.32-.072-1.25.542-3 1.416-4.176.874-1.177 2.186-2.767 3.827-2.884 1.642-.117 4.896 1.515 6.02 2.183 1.126.67.896 1.7.73 1.828m-10.864-1.54c.747-.876 3.203-1.627 4.627-1.924 1.425-.299 2.816-.488 3.923.136 1.106.625 2.266 2.297 2.712 3.613.444 1.318.54 2.993-.043 4.286-.585 1.294-2.288 2.792-3.466 3.475-1.178.683-2.329.996-3.601.627-1.27-.369-3.119-1.785-4.03-2.837-.91-1.05-1.555-2.216-1.435-3.472.118-1.257 1.742-3.448 2.146-4.069.405-.623.17.19.283.336" fill="#4F4D6F"/><path d="M73.075 92.693c.802.973.982 2.646.766 3.927-.214 1.283-1.135 2.772-2.058 3.764-.92.994-2.252 2.033-3.475 2.197-1.226.166-2.757-.398-3.869-1.211-1.109-.81-2.417-2.374-2.796-3.653-.379-1.277.02-2.845.523-4.012.502-1.168 1.278-2.404 2.491-2.988 1.214-.583 3.207-1.427 4.784-.517 1.578.91 4.12 4.471 4.685 5.977.566 1.505-1.113 3.096-1.29 3.055m-2.152-8.003c.96.539 2.073 1.77 2.458 3.09.385 1.323.416 3.54-.147 4.835-.562 1.295-2.072 2.335-3.228 2.933-1.155.599-2.469.986-3.704.656-1.233-.328-2.947-1.455-3.7-2.628-.75-1.175-1.014-3.052-.806-4.415.208-1.363 1.101-2.759 2.056-3.762.954-1.002 2.301-2.1 3.672-2.25 1.368-.15 3.864 1.031 4.544 1.346.679.314-.313.459-.47.542" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path fill-rule="evenodd" clip-rule="evenodd" d="m47.761 121.861 6.533 7.621 6.22 14.003 3.553 7.713-.222 2.909-.436 3.257-1.374 1.493-2.588 1.648-5.125.744-9.241.453-6.508-.177-7.348-.137-10.88-.771-4.045-1.127-2.928-1.597-1.502-1.578-.163-2.027.222-2.423 1.192-3.567 5.873-17.17 3.281-3.667 1.866-3.366 4.606-2.941 3.89-1.134 15.91 1.294" fill="#4F4D6F"/><path d="M48.838 121.363c1.382 2.072 5.527 6.229 7.624 12.613 2.098 6.385 11.937 21.464 4.959 25.696-6.98 4.229-39.55 3.596-46.833-.311-7.285-3.909.819-16.903 3.128-23.135 2.311-6.233 5.604-11.809 10.727-14.261 5.124-2.451 16.736-.432 20.016-.448m-.087-.634c1.57 2.13 6.904 7.388 9.064 13.689 2.16 6.299 11.018 20.136 3.898 24.112-7.122 3.977-39.235 3.42-46.624-.254-7.391-3.675.133-15.681 2.286-21.796 2.152-6.115 5.33-12.283 10.625-14.892 5.294-2.609 17.549-.799 21.14-.76" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path d="M35.978 99.486c1.785-.297 4.17.519 5.964 1.189 1.797.67 3.38 1.564 4.813 2.833 1.431 1.269 3.108 3.015 3.786 4.786.677 1.771.597 3.825.277 5.84-.319 2.015-1.177 4.633-2.192 6.246-1.015 1.615-2.205 2.437-3.901 3.44-1.695 1.004-4.346 2.33-6.272 2.579-1.929.25-3.527-.376-5.29-1.083-1.766-.705-3.93-1.722-5.296-3.154-1.369-1.431-2.304-3.616-2.906-5.429-.601-1.816-.896-3.62-.707-5.458.186-1.837.834-3.983 1.834-5.57 1-1.588 2.056-2.952 4.165-3.958 2.108-1.008 6.686-1.822 8.49-2.08 1.803-.255 2.317.29 2.33.539m-7.066-.052c1.809-.569 4.228-.461 6.038-.139 1.81.324 3.213 1.041 4.825 2.076 1.61 1.032 3.87 2.335 4.836 4.125.966 1.791.874 4.548.956 6.621.081 2.072.193 4.046-.467 5.813-.66 1.767-1.973 3.6-3.487 4.787-1.516 1.188-3.558 1.859-5.602 2.336-2.045.476-4.747.935-6.667.525-1.919-.41-3.32-1.834-4.852-2.984-1.53-1.15-3.325-2.243-4.328-3.918-1.003-1.676-1.697-4.134-1.693-6.135.004-1.999.953-4.206 1.717-5.871.764-1.668 1.394-3.017 2.865-4.126 1.468-1.111 5.042-2.126 5.951-2.534.91-.408-.465-.108-.496.09" fill="#4F4D6F"/><path d="M48.279 104.604c1.347 1.339 2.152 3.756 2.59 5.625.44 1.87.51 3.817.047 5.592-.464 1.773-1.616 3.618-2.828 5.055-1.211 1.435-2.71 2.743-4.446 3.557-1.735.813-3.929 1.301-5.969 1.32-2.04.018-4.438-.5-6.276-1.206-1.84-.709-3.548-1.617-4.755-3.046-1.206-1.428-2.033-3.648-2.485-5.522-.453-1.876-.661-3.849-.227-5.735.436-1.886 1.549-4.051 2.837-5.578 1.286-1.527 3.089-2.734 4.884-3.587 1.795-.853 3.95-1.525 5.879-1.534 1.926-.012 3.801.29 5.684 1.472 1.884 1.179 4.6 4.377 5.618 5.607 1.018 1.23.692 1.777.493 1.777m-14.752-8.538c1.675-.644 3.618-.77 5.517-.324 1.9.447 4.271 1.655 5.875 3.003 1.607 1.347 2.877 3.309 3.759 5.078.884 1.771 1.66 3.694 1.541 5.537-.117 1.846-1.37 3.802-2.25 5.528-.88 1.728-1.498 3.62-3.024 4.834-1.524 1.215-4.245 2.129-6.123 2.453-1.877.324-3.263.023-5.138-.514-1.874-.535-4.523-1.525-6.11-2.7-1.584-1.175-2.587-2.687-3.402-4.35-.815-1.664-1.416-3.667-1.488-5.629-.073-1.963.22-4.388 1.05-6.143.83-1.755 2.297-3.348 3.937-4.387 1.638-1.039 4.819-1.564 5.899-1.843 1.08-.28.573-.034.581.166M24.451 127.469c1.049 1.703 4.415 8.204 5.28 9.839m-5.688-10.23c1.023 1.578 4.389 7.941 5.257 9.499M21.986 132.6c.723 1.622 3.93 7.868 4.809 9.452m-5.479-9.687c.597 1.459 4.03 7.451 5 8.937M19.963 138.373c1.247 1.71 6.376 8.632 7.572 10.296m-8.289-10.548c1.212 1.804 6.812 8.287 8.069 9.825M17.27 143.308c1.455 1.783 6.938 8.81 8.257 10.64m-8.715-10.864c1.39 1.57 6.69 8.237 8.281 9.971M15.383 149.52c1.09 1.374 5.804 7.16 6.935 8.561m-7.607-8.958c1.233 1.472 7.263 6.934 8.685 8.254" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path fill-rule="evenodd" clip-rule="evenodd" d="m114.531 122.411 6.777 7.285 6.835 14.203 2.435 8.169-.803 2.905-.122 3.196-.157 1.34-3.941.929-3.444 1.668-10.258.107-6.873 1.099-7.198-1.032-10.694-1.822-4.648-.756-2.347-1.796-1.245-.088-.516-3.27.202-3.462.538-1.898 7.978-16.977 1.776-4.885 2.605-3.251 3.668-2.308 4.876-1.238 15.78 1.884" fill="#4F4D6F"/><path d="M115.032 121.536c1.447 2.146 7.089 6.551 9.159 13 2.067 6.449 10.35 21.515 3.255 25.695-7.094 4.181-38.63 3.484-45.823-.615-7.19-4.1.397-17.65 2.67-23.977 2.275-6.328 5.876-11.674 10.97-13.989 5.093-2.316 16.284.076 19.593.091m1.066-.755c1.39 2.243 6.205 7.884 8.039 14.282 1.834 6.401 9.981 20.219 2.965 24.116-7.016 3.897-38.1 3.243-45.065-.726-6.965-3.97 1.18-16.833 3.275-23.095 2.097-6.261 4.338-12.072 9.304-14.472 4.966-2.399 17.134-.017 20.488.074" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/><path d="M103.833 99.731c1.804-.287 3.788.84 5.58 1.625 1.793.785 3.894 1.683 5.175 3.089 1.28 1.404 1.951 3.469 2.509 5.342.556 1.872 1.139 4.098.829 5.895-.311 1.794-1.432 3.411-2.687 4.879-1.256 1.468-3.11 2.966-4.846 3.924-1.738.959-3.638 1.725-5.576 1.826-1.937.104-4.305-.463-6.048-1.209-1.744-.745-3.134-1.868-4.413-3.264-1.278-1.394-2.625-3.257-3.257-5.108-.635-1.851-.957-4.176-.542-5.996.414-1.818 1.777-3.409 3.028-4.915 1.25-1.505 2.342-3.176 4.48-4.114 2.137-.935 6.483-1.446 8.34-1.505 1.858-.057 2.83.924 2.806 1.16m-8.763-.732c1.59-.906 3.564-1.3 5.425-1.014 1.86.29 4.143 1.529 5.738 2.746 1.594 1.216 2.855 2.973 3.829 4.549.974 1.576 1.783 3.02 2.012 4.905.23 1.882-.015 4.5-.632 6.398-.616 1.896-1.667 3.774-3.067 4.983-1.4 1.206-3.495 1.851-5.339 2.265-1.844.414-3.751.49-5.724.218-1.975-.273-4.37-.802-6.12-1.847-1.754-1.044-3.52-2.852-4.4-4.424-.879-1.574-.724-3.212-.877-5.01-.153-1.798-.75-4.005-.037-5.782.713-1.774 2.765-3.59 4.31-4.875 1.547-1.285 4.192-2.341 4.968-2.835.776-.494-.397-.318-.314-.125" fill="#4F4D6F"/><path d="M104.764 100.225c1.975-.099 4.304.729 6.079 1.562 1.777.834 3.456 1.904 4.576 3.441 1.121 1.536 1.818 3.879 2.15 5.775.33 1.896.312 3.847-.163 5.6-.473 1.753-1.361 3.415-2.686 4.92-1.326 1.508-3.492 3.312-5.263 4.118-1.771.809-3.397.877-5.365.727-1.967-.151-4.667-.711-6.444-1.631-1.775-.921-3.052-2.409-4.212-3.895-1.16-1.486-2.435-3.122-2.75-5.022-.313-1.902.37-4.455.867-6.379.495-1.925.887-3.737 2.107-5.162 1.22-1.427 2.821-2.847 5.211-3.399 2.388-.555 7.042-.12 9.119.08 2.078.201 3.362.937 3.344 1.122m-17.759 2.486c1.125-1.615 3.603-2.507 5.41-3.357 1.807-.847 3.629-1.72 5.426-1.733 1.796-.014 3.585.728 5.358 1.649 1.775.92 4.055 2.367 5.284 3.874 1.23 1.506 1.636 3.294 2.094 5.165.457 1.868 1.105 4.096.653 6.054-.451 1.957-2.11 4.14-3.361 5.694-1.251 1.552-2.378 2.962-4.143 3.624-1.766.664-4.527.457-6.449.351-1.92-.103-3.311-.242-5.086-.976-1.775-.734-4.253-1.978-5.565-3.433-1.311-1.452-1.857-3.51-2.305-5.291-.448-1.782-.787-3.475-.38-5.4.406-1.926 2.21-5.167 2.815-6.153.605-.986.52 0 .809.24M90.826 127.281c.836 1.499 4.237 7.999 5.207 9.622m-5.861-8.591c.98 1.544 5.81 7.624 6.841 9.161M88.277 132.191c.853 1.504 5.086 7.742 5.938 9.398m-5.201-8.334c.799 1.556 4.402 7.539 5.046 8.855M86.574 137.874c1.208 1.691 6.34 9.052 7.5 10.909m-6.634-9.911c1.147 1.494 5.059 7.529 6.26 9.087M83.617 143.513c1.569 1.825 7.399 8.376 8.942 10.096m-9.657-10.375c1.565 1.919 7.686 8.975 9.337 10.818M82.48 149.857c1.148 1.388 5.35 6.396 6.507 7.685m-7.03-8.062c1.322 1.492 6.845 7.162 8.025 8.587" stroke="#A8A5FF" stroke-width="2" stroke-linecap="round"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h138v165H0z"/></clipPath></defs></svg>
diff --git a/public/oss_promo_presentations_light.svg b/public/oss_promo_presentations_light.svg
new file mode 100644
index 0000000000..d9e7c93572
--- /dev/null
+++ b/public/oss_promo_presentations_light.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 138 165" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="m11.55 6.521 114.882-.02 4.293.973 1.369 1.457.168 4.434.44 55.498-.595 3.556-1.573 2.251-4.433.734-114.808.115-3.06-1.048-2.497-2.759.721-3.003-.73-55.875 1.064-1.95.021-2.498 2.04-.472 3.437-1.008" fill="#E3E2FE"/><path d="M12.061 6.822c42.517-.332 85.113-.654 114.106 0m-114.106 0c44.606.049 88.915.018 114.106 0m-114.106 0C7.883 6.67 6.534 9.165 5.778 13.07m6.283-6.248c-3.454.646-5.415 1.355-6.283 6.248m120.389-6.248c3.423-.486 5.903 2.349 6.284 6.248m-6.284-6.248c3.67.603 7.067 1.423 6.284 6.248m0 0c-1.174 20.402-.324 40.87 0 55.71m0-55.71c.322 15.398.224 30.96 0 55.71m0 0c.428 4.795-2.496 5.927-6.284 6.247m6.284-6.248c.717 4.866-1.638 7.074-6.284 6.248m0 0c-27.612.672-55.472.188-114.106 0m114.106 0c-29.165-.576-58.4-.527-114.106 0m0 0c-3.426.569-5.816-2.704-6.283-6.248m6.283 6.248c-3.324-.404-6.219-1.706-6.283-6.248m0 0c-.34-15.249-.85-31.052 0-55.709m0 55.71c.214-12.22.465-24.702 0-55.71" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path d="m4.818 1.617 128.861-.121 1.518.425.913 2.093-.515 4.907.073 2.435-2.376 1.068-128.85-.933-2.084.523-.8-2.734.815-5.539.063-1.968 2.082-.043" fill="#E3E2FE"/><path d="M4.486 1.953c31.255-.176 62.584-.637 128.731 0m-128.731 0c27.438-.186 54.944-.141 128.731 0m-128.731 0c-1.734.443-1.813.247-2.521 2.507m2.52-2.507c-1.935-.88-2.595.152-2.52 2.507m131.252-2.507c1.133.078 2.786.818 2.521 2.507m-2.521-2.507c1.196-.247 2.794 1.132 2.521 2.507m0 0c-.76 1.243.069 2 0 5.012m0-5.012c.35 1.41-.218 2.7 0 5.012m0 0c-.349 1.161-1.143 2.768-2.521 2.507m2.521-2.507c-.371 2.5-1.103 3.106-2.521 2.507m0 0c-33.063.421-66.11.32-128.731 0m128.731 0c-47.335-.244-94.721-.092-128.731 0m0 0c-1.357-.434-2.321-.16-2.521-2.507m2.52 2.507c-1.76-.06-2.793-.127-2.52-2.507m0 0c-.393-1.154.294-3.628 0-5.012m0 5.012a83.685 83.685 0 0 1 0-5.012" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path d="m4.819 72.339 128.965.9.658-.17 1.569 1.123.002 5.428.135 3.008-2.517.875L4.47 82.172l-1.97-.463.118-1.738.328-5.635.463-1.708 1.514-.498" fill="#E3E2FE"/><path d="M4.785 72.706c50.976.318 102.405.498 128.731 0m-128.73 0c28.322.185 56.85-.028 128.73 0m-128.73 0c-1.727-.49-2.447 1.28-2.522 2.507m2.521-2.507c-2.148-.22-2.794 1.595-2.521 2.507m131.252-2.507c1.999-.196 3.079.185 2.522 2.507m-2.522-2.507c1.446.742 3.113 1.683 2.522 2.507m0 0c-.597 1.523.604 3.92 0 5.012m0-5.012c.015 2.296-.246 3.815 0 5.012m0 0c.597 2.072-.564 2.085-2.522 2.507m2.522-2.507c-.032 1.527-.591 2.517-2.522 2.507m0 0c-26.528.62-52.8.594-128.73 0m128.73 0c-37.61.555-74.95.318-128.73 0m0 0c-2.387-.37-2.699-.879-2.522-2.507m2.521 2.507c-.95-.166-1.736-.213-2.521-2.507m0 0c-.403-1.103-.526-2.683 0-5.012m0 5.012c-.14-1.533.212-2.513 0-5.012" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path d="M62.287 24.268c2.167-1.127 5.572-1.601 8.166-1.568 2.592.033 5.172.717 7.391 1.77 2.217 1.052 4.31 2.727 5.917 4.547 1.606 1.82 2.867 4.002 3.723 6.372.856 2.37 1.479 5.358 1.412 7.854-.067 2.495-.733 4.852-1.81 7.118-1.079 2.27-2.785 4.698-4.659 6.492-1.873 1.795-4.243 3.464-6.582 4.276-2.338.813-5.01.746-7.451.596-2.443-.15-4.96-.535-7.2-1.496-2.238-.96-4.482-2.489-6.234-4.27-1.75-1.78-3.444-3.983-4.273-6.416-.828-2.432-.777-5.63-.695-8.179.08-2.55.189-4.88 1.184-7.117.996-2.237 2.382-4.479 4.792-6.308 2.411-1.832 7.52-3.954 9.67-4.677 2.149-.722 3.152-.011 3.227.34m16.33 6.453c1.521 1.607 1.941 4.323 2.468 6.752.526 2.429.797 5.256.695 7.828-.104 2.57-.151 5.402-1.308 7.595-1.157 2.193-3.495 3.99-5.632 5.559-2.138 1.57-4.771 3.278-7.195 3.858-2.42.58-4.88-.047-7.334-.38-2.454-.335-5.2-.466-7.395-1.62-2.195-1.151-4.273-3.373-5.775-5.3-1.502-1.93-2.513-3.87-3.236-6.268-.722-2.398-1.406-5.522-1.1-8.119.309-2.596 1.642-5.375 2.94-7.458 1.296-2.084 2.92-3.534 4.846-5.044 1.925-1.507 4.265-3.36 6.708-4.006 2.443-.646 5.435-.117 7.947.123 2.511.242 4.919.105 7.122 1.326 2.201 1.22 5.12 4.977 6.09 5.992.97 1.015.064-.006-.274.101" fill="#fff"/><path d="M78.568 25.176c2.26.828 4.224 3.18 5.756 5.139 1.53 1.96 2.62 4.272 3.43 6.617.81 2.347 1.599 5.01 1.426 7.459-.175 2.446-1.314 5.059-2.469 7.226-1.156 2.167-2.55 4.21-4.463 5.777-1.912 1.57-4.597 2.9-7.018 3.638-2.421.738-5.038 1.025-7.51.793-2.47-.233-5.108-1.057-7.32-2.185-2.21-1.129-4.327-2.687-5.945-4.589-1.618-1.901-3-4.397-3.762-6.828-.76-2.428-1.021-5.22-.801-7.75.22-2.526.991-5.316 2.118-7.415 1.128-2.099 2.779-3.655 4.644-5.178 1.866-1.52 4.092-3.089 6.551-3.954 2.46-.863 4.862-2.071 8.208-1.226 3.344.844 9.349 4.528 11.862 6.297 2.514 1.769 3.49 4.106 3.217 4.315m-4.307-5.555c2.052 1.295 3.715 3.32 4.856 5.655 1.141 2.337 1.929 5.806 1.992 8.362.06 2.558-.713 4.706-1.623 6.984-.907 2.277-2.21 4.78-3.832 6.684-1.624 1.904-3.714 3.676-5.903 4.737-2.19 1.06-4.827 1.482-7.234 1.622-2.41.143-4.846.106-7.214-.771-2.369-.877-5.127-2.806-6.999-4.489-1.87-1.685-3.216-3.38-4.22-5.615-1.005-2.236-1.659-5.217-1.806-7.8-.147-2.582.075-5.397.923-7.69.848-2.292 2.476-4.233 4.165-6.064 1.686-1.834 3.707-3.938 5.957-4.932 2.25-.996 5.131-.98 7.543-1.043 2.413-.06 4.677-.13 6.933.674 2.254.802 5.535 3.542 6.598 4.149 1.062.607-.096-.687-.222-.508" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path fill-rule="evenodd" clip-rule="evenodd" d="m65.283 35.18-.713 12.115 1.159 2.609 1.347-.256 4.141-.922 3.586-3.328 3.389-2.02.58-1.628-.645-1.144-2.543-1.359-9.158-4.485" fill="#E3E2FE"/><path d="M66.207 35.762c.008 2.398-2.608 12.644-.644 13.712 1.964 1.068 12.365-4.861 12.424-7.302.057-2.443-10.076-6.281-12.076-7.351m-.215.675c.215 2.496-1.08 13.363.888 14.564 1.97 1.2 11.016-4.858 10.924-7.363-.093-2.503-9.45-6.57-11.478-7.664M67.325 81.178c.31 1.886 1.008 9.376 1.106 11.23m-1.665-11.777c.316 1.765 1.288 9.275 1.404 11.079" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path d="M70.594 90.499c1.15.47 2.358 1.806 2.902 3.014.546 1.207.71 2.935.368 4.235-.34 1.299-1.238 2.847-2.412 3.56-1.176.714-3.26.892-4.638.722-1.376-.17-2.716-.9-3.627-1.745-.91-.844-1.773-2.07-1.844-3.32-.072-1.25.542-3 1.416-4.176.874-1.177 2.186-2.767 3.827-2.884 1.642-.117 4.896 1.515 6.02 2.183 1.126.67.896 1.7.73 1.828m-10.864-1.54c.747-.876 3.203-1.627 4.627-1.924 1.425-.299 2.816-.488 3.923.136 1.106.625 2.266 2.297 2.712 3.613.444 1.318.54 2.993-.043 4.285-.585 1.295-2.288 2.793-3.466 3.476-1.178.683-2.329.996-3.601.627-1.27-.369-3.119-1.785-4.03-2.837-.91-1.05-1.555-2.216-1.435-3.472.118-1.257 1.742-3.448 2.146-4.069.405-.623.17.19.283.336" fill="#E3E2FE"/><path d="M73.075 92.693c.802.973.982 2.646.766 3.927-.214 1.283-1.135 2.772-2.058 3.764-.92.994-2.252 2.033-3.475 2.197-1.226.166-2.757-.398-3.869-1.211-1.109-.81-2.417-2.374-2.796-3.653-.379-1.277.02-2.845.523-4.012.502-1.168 1.278-2.404 2.491-2.988 1.214-.583 3.207-1.427 4.784-.517 1.578.91 4.12 4.471 4.685 5.977.566 1.505-1.113 3.096-1.29 3.055m-2.152-8.003c.96.539 2.073 1.77 2.458 3.09.385 1.323.416 3.54-.147 4.835-.562 1.295-2.072 2.335-3.228 2.933-1.155.599-2.469.986-3.704.656-1.233-.328-2.947-1.455-3.7-2.628-.75-1.176-1.014-3.052-.806-4.415.208-1.363 1.101-2.759 2.056-3.762.954-1.002 2.301-2.1 3.672-2.25 1.368-.15 3.864 1.031 4.544 1.346.679.314-.313.459-.47.542" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path fill-rule="evenodd" clip-rule="evenodd" d="m47.761 121.861 6.533 7.621 6.22 14.003 3.553 7.713-.222 2.909-.436 3.257-1.374 1.493-2.588 1.648-5.125.744-9.241.453-6.508-.178-7.348-.136-10.88-.771-4.045-1.127-2.928-1.597-1.502-1.578-.163-2.027.222-2.423 1.192-3.567 5.873-17.17 3.281-3.667 1.866-3.366 4.606-2.941 3.89-1.134 15.91 1.294" fill="#E3E2FE"/><path d="M48.838 121.363c1.382 2.072 5.527 6.229 7.624 12.613 2.098 6.385 11.937 21.464 4.959 25.696-6.98 4.229-39.55 3.596-46.833-.311-7.285-3.909.819-16.903 3.128-23.135 2.311-6.233 5.604-11.809 10.727-14.261 5.124-2.451 16.736-.432 20.016-.448m-.087-.634c1.57 2.13 6.904 7.388 9.064 13.689 2.16 6.299 11.018 20.136 3.898 24.112-7.122 3.977-39.235 3.42-46.624-.254-7.391-3.675.133-15.681 2.286-21.796 2.152-6.115 5.33-12.283 10.625-14.892 5.294-2.609 17.549-.799 21.14-.76" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path d="M35.978 99.486c1.785-.297 4.17.519 5.964 1.189 1.797.67 3.38 1.564 4.813 2.833 1.431 1.269 3.108 3.015 3.786 4.786.677 1.771.597 3.825.277 5.84-.319 2.015-1.177 4.633-2.192 6.246-1.015 1.615-2.205 2.437-3.901 3.44-1.695 1.004-4.346 2.33-6.272 2.579-1.929.25-3.527-.376-5.29-1.083-1.766-.705-3.93-1.722-5.296-3.153-1.369-1.432-2.304-3.617-2.906-5.43-.601-1.816-.896-3.62-.707-5.458.186-1.837.834-3.983 1.834-5.57 1-1.588 2.056-2.952 4.165-3.958 2.108-1.007 6.686-1.822 8.49-2.08 1.803-.255 2.317.29 2.33.539m-7.066-.052c1.809-.568 4.228-.461 6.038-.139 1.81.324 3.213 1.041 4.825 2.076 1.61 1.033 3.87 2.335 4.836 4.125.966 1.791.874 4.548.956 6.621.081 2.072.193 4.046-.467 5.813-.66 1.767-1.973 3.6-3.487 4.788-1.516 1.187-3.558 1.858-5.602 2.335-2.045.476-4.747.935-6.667.525-1.919-.41-3.32-1.833-4.852-2.983-1.53-1.151-3.325-2.244-4.328-3.919-1.003-1.675-1.697-4.134-1.693-6.135.004-1.999.953-4.206 1.717-5.871.764-1.668 1.394-3.017 2.865-4.126 1.468-1.111 5.042-2.126 5.951-2.534.91-.408-.465-.108-.496.09" fill="#E3E2FE"/><path d="M48.279 104.604c1.347 1.339 2.152 3.756 2.59 5.625.44 1.87.51 3.817.047 5.592-.464 1.773-1.616 3.618-2.828 5.055-1.211 1.435-2.71 2.743-4.446 3.557-1.735.813-3.929 1.301-5.969 1.32-2.04.018-4.438-.5-6.276-1.206-1.84-.709-3.548-1.617-4.755-3.046-1.206-1.428-2.033-3.648-2.485-5.522-.453-1.876-.661-3.848-.227-5.735.436-1.886 1.549-4.051 2.837-5.578 1.286-1.527 3.089-2.733 4.884-3.587 1.795-.853 3.95-1.525 5.879-1.534 1.926-.012 3.801.29 5.684 1.472 1.884 1.179 4.6 4.377 5.618 5.607 1.018 1.23.692 1.777.493 1.777m-14.752-8.538c1.675-.644 3.618-.77 5.517-.324 1.9.447 4.271 1.655 5.875 3.003 1.607 1.347 2.877 3.309 3.759 5.078.884 1.771 1.66 3.694 1.541 5.538-.117 1.845-1.37 3.801-2.25 5.527-.88 1.728-1.498 3.62-3.024 4.835-1.524 1.214-4.245 2.128-6.123 2.452-1.877.324-3.263.023-5.138-.514-1.874-.535-4.523-1.525-6.11-2.7-1.584-1.175-2.587-2.687-3.402-4.35-.815-1.664-1.416-3.667-1.488-5.629-.073-1.963.22-4.388 1.05-6.143.83-1.755 2.297-3.348 3.937-4.387 1.638-1.039 4.819-1.564 5.899-1.843 1.08-.28.573-.034.581.166M24.451 127.469c1.049 1.703 4.415 8.204 5.28 9.839m-5.688-10.23c1.023 1.578 4.389 7.941 5.257 9.499M21.986 132.6c.723 1.622 3.93 7.868 4.809 9.452m-5.479-9.686c.597 1.458 4.03 7.45 5 8.936M19.963 138.373c1.247 1.71 6.376 8.632 7.572 10.296m-8.289-10.548c1.212 1.804 6.812 8.287 8.069 9.825M17.27 143.308c1.455 1.783 6.938 8.81 8.257 10.64m-8.715-10.864c1.39 1.57 6.69 8.237 8.281 9.971M15.383 149.52c1.09 1.374 5.804 7.16 6.935 8.561m-7.607-8.958c1.233 1.472 7.263 6.934 8.685 8.254" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path fill-rule="evenodd" clip-rule="evenodd" d="m114.531 122.411 6.777 7.285 6.835 14.203 2.435 8.169-.803 2.905-.122 3.196-.157 1.34-3.941.929-3.444 1.668-10.258.107-6.873 1.099-7.198-1.032-10.694-1.822-4.648-.756-2.347-1.796-1.245-.088-.516-3.27.202-3.462.538-1.898 7.978-16.977 1.776-4.885 2.605-3.251 3.668-2.308 4.876-1.238 15.78 1.884" fill="#E3E2FE"/><path d="M115.032 121.536c1.447 2.146 7.089 6.551 9.159 13 2.067 6.449 10.35 21.515 3.255 25.695-7.094 4.181-38.63 3.484-45.823-.615-7.19-4.1.397-17.65 2.67-23.977 2.275-6.328 5.876-11.674 10.97-13.989 5.093-2.316 16.284.076 19.593.091m1.066-.755c1.39 2.243 6.205 7.884 8.039 14.282 1.834 6.401 9.981 20.219 2.965 24.116-7.016 3.897-38.1 3.243-45.065-.726-6.965-3.97 1.18-16.833 3.275-23.095 2.097-6.261 4.338-12.072 9.304-14.472 4.966-2.399 17.134-.017 20.488.074" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/><path d="M103.833 99.731c1.804-.287 3.788.84 5.58 1.625 1.793.785 3.894 1.683 5.175 3.089 1.28 1.404 1.951 3.469 2.509 5.342.556 1.872 1.139 4.098.829 5.895-.311 1.794-1.432 3.411-2.687 4.879-1.256 1.468-3.11 2.966-4.846 3.924-1.738.959-3.638 1.725-5.576 1.826-1.937.104-4.305-.463-6.048-1.209-1.744-.745-3.134-1.868-4.413-3.264-1.278-1.394-2.625-3.257-3.257-5.108-.635-1.851-.957-4.176-.542-5.996.414-1.818 1.777-3.409 3.028-4.915 1.25-1.505 2.342-3.176 4.48-4.114 2.137-.935 6.483-1.446 8.34-1.505 1.858-.057 2.83.924 2.806 1.16m-8.763-.732c1.59-.906 3.564-1.3 5.425-1.014 1.86.29 4.143 1.529 5.738 2.746 1.594 1.216 2.855 2.973 3.829 4.549.974 1.576 1.783 3.02 2.012 4.905.23 1.882-.015 4.5-.632 6.398-.616 1.896-1.667 3.774-3.067 4.983-1.4 1.206-3.495 1.851-5.339 2.265-1.844.414-3.751.49-5.724.218-1.975-.273-4.37-.802-6.12-1.847-1.754-1.044-3.52-2.852-4.4-4.424-.879-1.574-.724-3.212-.877-5.01-.153-1.798-.75-4.005-.037-5.782.713-1.774 2.765-3.59 4.31-4.875 1.547-1.285 4.192-2.341 4.968-2.835.776-.494-.397-.318-.314-.125" fill="#E3E2FE"/><path d="M104.764 100.225c1.975-.099 4.304.729 6.079 1.562 1.777.834 3.456 1.904 4.576 3.441 1.121 1.536 1.818 3.879 2.15 5.775.33 1.896.312 3.847-.163 5.6-.473 1.754-1.361 3.415-2.686 4.92-1.326 1.508-3.492 3.312-5.263 4.118-1.771.809-3.397.877-5.365.727-1.967-.151-4.667-.711-6.444-1.631-1.775-.921-3.052-2.409-4.212-3.895-1.16-1.486-2.435-3.122-2.75-5.022-.313-1.902.37-4.455.867-6.379.495-1.925.887-3.737 2.107-5.162 1.22-1.427 2.821-2.847 5.211-3.399 2.388-.555 7.042-.12 9.119.08 2.078.201 3.362.937 3.344 1.122m-17.759 2.486c1.125-1.615 3.603-2.507 5.41-3.357 1.807-.847 3.629-1.72 5.426-1.733 1.796-.014 3.585.728 5.358 1.65 1.775.919 4.055 2.366 5.284 3.873 1.23 1.506 1.636 3.294 2.094 5.165.457 1.868 1.105 4.096.653 6.054-.451 1.957-2.11 4.14-3.361 5.694-1.251 1.552-2.378 2.962-4.143 3.624-1.766.664-4.527.457-6.449.351-1.92-.103-3.311-.242-5.086-.976-1.775-.734-4.253-1.978-5.565-3.432-1.311-1.453-1.857-3.511-2.305-5.292-.448-1.782-.787-3.475-.38-5.4.406-1.926 2.21-5.167 2.815-6.153.605-.986.52 0 .809.24M90.826 127.281c.836 1.499 4.237 7.999 5.207 9.622m-5.861-8.591c.98 1.544 5.81 7.624 6.841 9.161M88.277 132.191c.853 1.504 5.086 7.742 5.938 9.398m-5.201-8.334c.799 1.556 4.402 7.539 5.046 8.855M86.574 137.874c1.208 1.691 6.34 9.052 7.5 10.909m-6.634-9.911c1.147 1.494 5.059 7.529 6.26 9.087M83.617 143.513c1.569 1.825 7.399 8.376 8.942 10.096m-9.657-10.376c1.565 1.92 7.686 8.976 9.337 10.819M82.48 149.857c1.148 1.388 5.35 6.396 6.507 7.685m-7.03-8.062c1.322 1.492 6.845 7.162 8.025 8.587" stroke="#6965DB" stroke-width="2" stroke-linecap="round"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h138v165H0z"/></clipPath></defs></svg>