🎉 Basic graph wasm support

2026-01-14 09:20:01 -05:00 · 2025-12-22 06:51:56 +01:00
3255 changed files with 1287449 additions and 111894 deletions
--- a/.github/ISSUE_TEMPLATE/new-render-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/new-render-bug-report.md
@@ -1,38 +0,0 @@
---
-name: New Render Bug Report
-about: Create a report about the bugs you have found in the new render
-title: ''
-labels: new render
-assignees: claragvinola
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Steps to Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots or screen recordings**
-If applicable, add screenshots or screen recording to help illustrate your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
--- a/.github/workflows/build-staging-render.yml
+++ b/.github/workflows/build-staging-render.yml
@@ -1,14 +0,0 @@
-name: _STAGING RENDER
-
-on:
-  schedule:
-    - cron: '36 5-20 * * 1-5'
-
-jobs:
-  build-bundle:
-    uses: ./.github/workflows/build-bundle.yml
-    secrets: inherit
-    with:
-      gh_ref: "staging-render"
-      build_wasm: "yes"
-      build_storybook: "yes"
--- a/.github/workflows/build-tag.yml
+++ b/.github/workflows/build-tag.yml
@@ -33,7 +33,7 @@ jobs:
          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
          MATTERMOST_CHANNEL: bot-alerts-cicd
          TEXT: |
-            🐳 *[PENPOT] Docker image available: ${{ github.ref_name }}*
+            🐳 *[PENPOT] Docker image available.*
            🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
            @infra

--- a/.github/workflows/commit-checker.yml
+++ b/.github/workflows/commit-checker.yml
@@ -26,7 +26,7 @@ jobs:
      - name: Check Commit Type
        uses: gsactions/commit-message-checker@v2
        with:
-          pattern: '^(((:(lipstick|globe_with_meridians|wrench|books|arrow_up|arrow_down|zap|ambulance|construction|boom|fire|whale|bug|sparkles|paperclip|tada|recycle|rewind|construction_worker):)\s[A-Z].*[^.])|(Merge|Revert|Reapply).+[^.])$'
+          pattern: '^(((:(lipstick|globe_with_meridians|wrench|books|arrow_up|arrow_down|zap|ambulance|construction|boom|fire|whale|bug|sparkles|paperclip|tada|recycle|rewind|construction_worker):)\s[A-Z].*[^.])|(Merge|Revert).+[^.])$'
          flags: 'gm'
          error: 'Commit should match CONTRIBUTING.md guideline'
          checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -51,51 +51,6 @@ jobs:
        run: |
          ./scripts/test

-  test-plugins:
-    name: Plugins Runtime Linter & Tests
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Node
-        id: setup-node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-
-      - name: Install deps
-        working-directory: ./plugins
-        shell: bash
-        run: |
-          corepack enable;
-          corepack install;
-          pnpm install;
-
-      - name: Run Lint
-        working-directory: ./plugins
-        run: pnpm run lint
-
-      - name: Run Format Check
-        working-directory: ./plugins
-        run: pnpm run format:check
-
-      - name: Run Test
-        working-directory: ./plugins
-        run: pnpm run test
-
-      - name: Build runtime
-        working-directory: ./plugins
-        run: pnpm run build
-
-      - name: Build plugins
-        working-directory: ./plugins
-        run: pnpm run build:plugins
-
-      - name: Build styles
-        working-directory: ./plugins
-        run: pnpm run build:styles-example
-
  test-frontend:
    name: "Frontend Tests"
    runs-on: ubuntu-24.04
@@ -112,8 +67,6 @@ jobs:

      - name: Component Tests
        working-directory: ./frontend
-        env:
-          VITEST_BROWSER_TIMEOUT: 120000
        run: |
          ./scripts/test-components

--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
-.pnpm-store
 *-init.clj
 *.css.json
 *.jar
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v22.21.1
+v22.19.0
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,23 +1,5 @@
 # CHANGELOG

-## 2.14.0 (Unreleased)
-
-### :boom: Breaking changes & Deprecations
-
-### :rocket: Epics and highlights
-
-### :heart: Community contributions (Thank you!)
-
-### :sparkles: New features & Enhancements
-
- Remap references when renaming tokens [Taiga #10202](https://tree.taiga.io/project/penpot/us/10202)
- Tokens panel nested path view [Taiga #9966](https://tree.taiga.io/project/penpot/us/9966)
- Improve usability of lock and hide buttons in the layer panel. [Taiga #12916](https://tree.taiga.io/project/penpot/issue/12916)
-
-### :bug: Bugs fixed
-
-### :bug: Bugs fixed
-
 ## 2.13.0 (Unreleased)

 ### :boom: Breaking changes & Deprecations
@@ -30,34 +12,16 @@

 ### :sparkles: New features & Enhancements

- Add new Box Shadow Tokens [Taiga #10201](https://tree.taiga.io/project/penpot/us/10201)
 - Make i18n translation files load on-demand [Taiga #11474](https://tree.taiga.io/project/penpot/us/11474)
- Add deleted files to dashboard [Taiga #8149](https://tree.taiga.io/project/penpot/us/8149)

 ### :bug: Bugs fixed

 - Fix problem when drag+duplicate a full grid [Taiga #12565](https://tree.taiga.io/project/penpot/issue/12565)
 - Fix problem when pasting elements in reverse flex layout [Taiga #12460](https://tree.taiga.io/project/penpot/issue/12460)
 - Fix wrong board size presets in Android [Taiga #12339](https://tree.taiga.io/project/penpot/issue/12339)
- Fix problem with grid layout components and auto sizing [Github #7797](https://github.com/penpot/penpot/issues/7797)
- Fix some alignments on inspect tab [Taiga #12915](https://tree.taiga.io/project/penpot/issue/12915)
- Fix problem with text editor maintaining previous styles [Taiga #12835](https://tree.taiga.io/project/penpot/issue/12835)
- Fix color assets from shared libraries not appearing as assets in Selected colors panel [Taiga #12957](https://tree.taiga.io/project/penpot/issue/12957)
- Fix CSS generated box-shadow property [Taiga #12997](https://tree.taiga.io/project/penpot/issue/12997)
- Fix inner shadow selector on shadow token [Taiga #12951](https://tree.taiga.io/project/penpot/issue/12951)
- Fix missing text color token from selected shapes in selected colors list [Taiga #12956](https://tree.taiga.io/project/penpot/issue/12956)
- Fix dropdown option width in Guides columns dropdown [Taiga #12959](https://tree.taiga.io/project/penpot/issue/12959)
- Fix typos on download modal [Taiga #12865](https://tree.taiga.io/project/penpot/issue/12865)

-## 2.12.1

-### :bug: Bugs fixed
-
- Fix setting a portion of text as bold or underline messes things up [Github #7980](https://github.com/penpot/penpot/issues/7980)
- Fix problem with style in fonts input [Taiga #12935](https://tree.taiga.io/project/penpot/issue/12935)
- Fix problem with path editor and right click [Github #7917](https://github.com/penpot/penpot/issues/7917)
-
-## 2.12.0
+## 2.12.0 (Unreleased)

 ### :boom: Breaking changes & Deprecations

@@ -68,6 +32,7 @@ The backend RPC API URLS are changed from `/api/rpc/command/<name>` to
 compatibility; however, if you are a user of this API, it is strongly
 recommended that you adapt your code to use the new PATH.

+
 #### Updated SSO Callback URL

 The OAuth / Single Sign-On (SSO) callback endpoint has changed to
@@ -100,6 +65,7 @@ This update standardizes all authentication flows under the single URL
 and makis it more modular, enabling the ability to configure SSO auth
 provider dinamically.

+
 #### Changes on default docker compose

 We have updated the `docker/images/docker-compose.yaml` with a small
@@ -117,7 +83,6 @@ example. It's still usable as before, we just removed the example.

 - Ensure consistent snap behavior across all zoom levels [Github #7774](https://github.com/penpot/penpot/pull/7774) by [@Tokytome](https://github.com/Tokytome)
 - Fix crash in token grid view due to tooltip validation (by @dfelinto) [Github #7887](https://github.com/penpot/penpot/pull/7887)
- Enable Hindi translations on the application

 ### :sparkles: New features & Enhancements

@@ -151,7 +116,6 @@ example. It's still usable as before, we just removed the example.
 - Fix switch variants with paths [Taiga #12841](https://tree.taiga.io/project/penpot/issue/12841)
 - Fix referencing typography tokens on font-family tokens [Taiga #12492](https://tree.taiga.io/project/penpot/issue/12492)
 - Fix horizontal scroll on layer panel [Taiga #12843](https://tree.taiga.io/project/penpot/issue/12843)
- Fix unicode handling on email template abbreviation filter [Github #7966](https://github.com/penpot/penpot/pull/7966)

 ## 2.11.1

--- a/backend/deps.edn
+++ b/backend/deps.edn
@@ -97,8 +97,8 @@

  :jmx-remote
  {:jvm-opts ["-Dcom.sun.management.jmxremote"
-              "-Dcom.sun.management.jmxremote.port=9000"
-              "-Dcom.sun.management.jmxremote.rmi.port=9000"
+              "-Dcom.sun.management.jmxremote.port=9090"
+              "-Dcom.sun.management.jmxremote.rmi.port=9090"
              "-Dcom.sun.management.jmxremote.local.only=false"
              "-Dcom.sun.management.jmxremote.authenticate=false"
              "-Dcom.sun.management.jmxremote.ssl=false"
--- a/backend/resources/app/email/invite-to-team/en.html
+++ b/backend/resources/app/email/invite-to-team/en.html
@@ -240,4 +240,4 @@
  </div>
 </body>

-</html>
+</html>
--- a/backend/src/app/auth/oidc.clj
+++ b/backend/src/app/auth/oidc.clj
@@ -36,6 +36,17 @@
   [integrant.core :as ig]
   [yetti.response :as-alias yres]))

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; HELPERS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn obfuscate-string
+  [s]
+  (if (< (count s) 10)
+    (apply str (take (count s) (repeat "*")))
+    (str (subs s 0 5)
+         (apply str (take (- (count s) 5) (repeat "*"))))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; OIDC PROVIDER (GENERIC)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -166,7 +177,7 @@
        (l/inf :hint "provider initialized"
               :provider (:id provider)
               :client-id (:client-id provider)
-               :client-secret (d/obfuscate-string (:client-secret provider)))
+               :client-secret (obfuscate-string (:client-secret provider)))
        provider)

      (catch Throwable cause
@@ -211,7 +222,7 @@
        (l/inf :hint "provider initialized"
               :provider (:id provider)
               :client-id (:client-id provider)
-               :client-secret (d/obfuscate-string (:client-secret provider)))
+               :client-secret (obfuscate-string (:client-secret provider)))
        provider)

      (catch Throwable cause
@@ -288,7 +299,7 @@
        (l/inf :hint "provider initialized"
               :provider (:id provider)
               :client-id (:client-id provider)
-               :client-secret (d/obfuscate-string (:client-secret provider)))
+               :client-secret (obfuscate-string (:client-secret provider)))
        provider)

      (catch Throwable cause
@@ -330,7 +341,7 @@
             :provider "gitlab"
             :base-uri (:base-uri provider)
             :client-id (:client-id provider)
-             :client-secret (d/obfuscate-string (:client-secret provider)))
+             :client-secret (obfuscate-string (:client-secret provider)))
      provider)
    (catch Throwable cause
      (ex/raise :type ::internal
@@ -350,7 +361,7 @@
        (l/inf :hint "provider initialized"
               :provider (:id provider)
               :client-id (:client-id provider)
-               :client-secret (d/obfuscate-string (:client-secret provider)))
+               :client-secret (obfuscate-string (:client-secret provider)))
        provider)

      (catch Throwable cause
@@ -448,7 +459,7 @@
    (l/trc :hint "fetch access token"
           :provider (:id provider)
           :client-id (:client-id provider)
-           :client-secret (d/obfuscate-string (:client-secret provider))
+           :client-secret (obfuscate-string (:client-secret provider))
           :grant-type (:grant_type params)
           :redirect-uri (:redirect_uri params))

@@ -501,7 +512,7 @@
  [cfg provider tdata]
  (l/trc :hint "fetch user info"
         :uri (:user-uri provider)
-         :token (d/obfuscate-string (:token/access tdata)))
+         :token (obfuscate-string (:token/access tdata)))

  (let [params   {:uri (:user-uri provider)
                  :headers {"Authorization" (str (:token/type tdata) " " (:token/access tdata))}
--- a/backend/src/app/binfile/common.clj
+++ b/backend/src/app/binfile/common.clj
@@ -331,81 +331,6 @@
                                 (set/difference cfeat/backend-only-features))
                             #{}))))

-(defn check-file-exists
-  [cfg id & {:keys [include-deleted?]
-             :or {include-deleted? false}
-             :as options}]
-  (db/get-with-sql cfg [sql:get-minimal-file id]
-                   {:db/remove-deleted (not include-deleted?)}))
-
-(def ^:private sql:file-permissions
-  "select fpr.is_owner,
-          fpr.is_admin,
-          fpr.can_edit
-     from file_profile_rel as fpr
-    inner join file as f on (f.id = fpr.file_id)
-    where fpr.file_id = ?
-      and fpr.profile_id = ?
-   union all
-   select tpr.is_owner,
-          tpr.is_admin,
-          tpr.can_edit
-     from team_profile_rel as tpr
-    inner join project as p on (p.team_id = tpr.team_id)
-    inner join file as f on (p.id = f.project_id)
-    where f.id = ?
-      and tpr.profile_id = ?
-   union all
-   select ppr.is_owner,
-          ppr.is_admin,
-          ppr.can_edit
-     from project_profile_rel as ppr
-    inner join file as f on (f.project_id = ppr.project_id)
-    where f.id = ?
-      and ppr.profile_id = ?")
-
-(defn- get-file-permissions*
-  [conn profile-id file-id]
-  (when (and profile-id file-id)
-    (db/exec! conn [sql:file-permissions
-                    file-id profile-id
-                    file-id profile-id
-                    file-id profile-id])))
-
-(defn get-file-permissions
-  ([conn profile-id file-id]
-   (let [rows     (get-file-permissions* conn profile-id file-id)
-         is-owner (boolean (some :is-owner rows))
-         is-admin (boolean (some :is-admin rows))
-         can-edit (boolean (some :can-edit rows))]
-     (when (seq rows)
-       {:type :membership
-        :is-owner is-owner
-        :is-admin (or is-owner is-admin)
-        :can-edit (or is-owner is-admin can-edit)
-        :can-read true
-        :is-logged (some? profile-id)})))
-
-  ([conn profile-id file-id share-id]
-   (let [perms  (get-file-permissions conn profile-id file-id)
-         ldata  (some-> (db/get* conn :share-link {:id share-id :file-id file-id})
-                        (dissoc :flags)
-                        (update :pages db/decode-pgarray #{}))]
-
-     ;; NOTE: in a future when share-link becomes more powerful and
-     ;; will allow us specify which parts of the app is available, we
-     ;; will probably need to tweak this function in order to expose
-     ;; this flags to the frontend.
-     (cond
-       (some? perms) perms
-       (some? ldata) {:type :share-link
-                      :can-read true
-                      :pages (:pages ldata)
-                      :is-logged (some? profile-id)
-                      :who-comment (:who-comment ldata)
-                      :who-inspect (:who-inspect ldata)}))))
-
-
 (defn get-project
  [cfg project-id]
  (db/get cfg :project {:id project-id}))
--- a/backend/src/app/binfile/v3.clj
+++ b/backend/src/app/binfile/v3.clj
@@ -821,10 +821,9 @@
        entries (keep (match-storage-entry-fn) entries)]

    (doseq [{:keys [id entry]} entries]
-      (let [object  (-> (read-entry input entry)
-                        (decode-storage-object)
-                        (update :bucket d/nilv sto/default-bucket)
-                        (validate-storage-object))
+      (let [object  (->> (read-entry input entry)
+                         (decode-storage-object)
+                         (validate-storage-object))

            ext     (cmedia/mtype->extension (:content-type object))
            path    (str "objects/" id ext)
--- a/backend/src/app/http/assets.clj
+++ b/backend/src/app/http/assets.clj
@@ -30,7 +30,7 @@

 (defn- get-file-media-object
  [pool id]
-  (db/get pool :file-media-object {:id id} {::db/remove-deleted false}))
+  (db/get pool :file-media-object {:id id}))

 (defn- serve-object-from-s3
  [{:keys [::sto/storage] :as cfg} obj]
--- a/backend/src/app/http/middleware.clj
+++ b/backend/src/app/http/middleware.clj
@@ -309,7 +309,7 @@
      (fn [request]
        (let [key (yreq/get-header request "x-shared-key")]
          (if (= key shared-key)
-            (handler (assoc request ::http/auth-with-shared-key true))
+            (handler request)
            {::yres/status 403}))))
    (fn [_ _]
      {::yres/status 403})))
--- a/backend/src/app/rpc.clj
+++ b/backend/src/app/rpc.clj
@@ -14,7 +14,6 @@
   [app.common.spec :as us]
   [app.common.time :as ct]
   [app.common.uri :as u]
-   [app.common.uuid :as uuid]
   [app.config :as cf]
   [app.db :as db]
   [app.http :as-alias http]
@@ -93,11 +92,7 @@
      (let [handler-name (:type path-params)
            etag         (yreq/get-header request "if-none-match")
            profile-id   (or (::session/profile-id request)
-                             (::actoken/profile-id request)
-                             (if (::http/auth-with-shared-key request)
-                               uuid/zero
-                               nil))
-
+                             (::actoken/profile-id request))
            ip-addr      (inet/parse-request request)

            data         (-> params
--- a/backend/src/app/rpc/commands/auth.clj
+++ b/backend/src/app/rpc/commands/auth.clj
@@ -307,8 +307,7 @@
                                            :content-type (:mtype input)})]
      (:id sobject))
    (catch Throwable cause
-      (l/wrn :hint "unable to import profile picture"
-             :uri uri
+      (l/err :hint "unable to import profile picture"
             :cause cause)
      nil)))

--- a/backend/src/app/rpc/commands/files.clj
+++ b/backend/src/app/rpc/commands/files.clj
@@ -79,14 +79,85 @@

 ;; --- FILE PERMISSIONS

+
+(def ^:private sql:file-permissions
+  "select fpr.is_owner,
+          fpr.is_admin,
+          fpr.can_edit
+     from file_profile_rel as fpr
+    inner join file as f on (f.id = fpr.file_id)
+    where fpr.file_id = ?
+      and fpr.profile_id = ?
+      and f.deleted_at is null
+   union all
+   select tpr.is_owner,
+          tpr.is_admin,
+          tpr.can_edit
+     from team_profile_rel as tpr
+    inner join project as p on (p.team_id = tpr.team_id)
+    inner join file as f on (p.id = f.project_id)
+    where f.id = ?
+      and tpr.profile_id = ?
+      and f.deleted_at is null
+   union all
+   select ppr.is_owner,
+          ppr.is_admin,
+          ppr.can_edit
+     from project_profile_rel as ppr
+    inner join file as f on (f.project_id = ppr.project_id)
+    where f.id = ?
+      and ppr.profile_id = ?
+      and f.deleted_at is null")
+
+(defn get-file-permissions
+  [conn profile-id file-id]
+  (when (and profile-id file-id)
+    (db/exec! conn [sql:file-permissions
+                    file-id profile-id
+                    file-id profile-id
+                    file-id profile-id])))
+
+(defn get-permissions
+  ([conn profile-id file-id]
+   (let [rows     (get-file-permissions conn profile-id file-id)
+         is-owner (boolean (some :is-owner rows))
+         is-admin (boolean (some :is-admin rows))
+         can-edit (boolean (some :can-edit rows))]
+     (when (seq rows)
+       {:type :membership
+        :is-owner is-owner
+        :is-admin (or is-owner is-admin)
+        :can-edit (or is-owner is-admin can-edit)
+        :can-read true
+        :is-logged (some? profile-id)})))
+
+  ([conn profile-id file-id share-id]
+   (let [perms  (get-permissions conn profile-id file-id)
+         ldata  (some-> (db/get* conn :share-link {:id share-id :file-id file-id})
+                        (dissoc :flags)
+                        (update :pages db/decode-pgarray #{}))]
+
+     ;; NOTE: in a future when share-link becomes more powerful and
+     ;; will allow us specify which parts of the app is available, we
+     ;; will probably need to tweak this function in order to expose
+     ;; this flags to the frontend.
+     (cond
+       (some? perms) perms
+       (some? ldata) {:type :share-link
+                      :can-read true
+                      :pages (:pages ldata)
+                      :is-logged (some? profile-id)
+                      :who-comment (:who-comment ldata)
+                      :who-inspect (:who-inspect ldata)}))))
+
 (def has-edit-permissions?
-  (perms/make-edition-predicate-fn bfc/get-file-permissions))
+  (perms/make-edition-predicate-fn get-permissions))

 (def has-read-permissions?
-  (perms/make-read-predicate-fn bfc/get-file-permissions))
+  (perms/make-read-predicate-fn get-permissions))

 (def has-comment-permissions?
-  (perms/make-comment-predicate-fn bfc/get-file-permissions))
+  (perms/make-comment-predicate-fn get-permissions))

 (def check-edition-permissions!
  (perms/make-check-fn has-edit-permissions?))
@@ -99,7 +170,7 @@

 (defn check-comment-permissions!
  [conn profile-id file-id share-id]
-  (let [perms       (bfc/get-file-permissions conn profile-id file-id share-id)
+  (let [perms       (get-permissions conn profile-id file-id share-id)
        can-read    (has-read-permissions? perms)
        can-comment (has-comment-permissions? perms)]
    (when-not (or can-read can-comment)
@@ -151,7 +222,7 @@
 (defn- get-minimal-file-with-perms
  [cfg {:keys [:id ::rpc/profile-id]}]
  (let [mfile (get-minimal-file cfg id)
-        perms (bfc/get-file-permissions cfg profile-id id)]
+        perms (get-permissions cfg profile-id id)]
    (assoc mfile :permissions perms)))

 (defn get-file-etag
@@ -177,7 +248,7 @@
  ;; will be already prefetched and we just reuse them instead
  ;; of making an additional database queries.
  (let [perms (or (:permissions (::cond/object params))
-                  (bfc/get-file-permissions conn profile-id id))]
+                  (get-permissions conn profile-id id))]
    (check-read-permissions! perms)

    (let [team (teams/get-team conn
@@ -240,7 +311,7 @@
   ::sm/result schema:file-fragment}
  [cfg {:keys [::rpc/profile-id file-id fragment-id share-id]}]
  (db/run! cfg (fn [cfg]
-                 (let [perms (bfc/get-file-permissions cfg profile-id file-id share-id)]
+                 (let [perms (get-permissions cfg profile-id file-id share-id)]
                   (check-read-permissions! perms)
                   (-> (get-file-fragment cfg file-id fragment-id)
                       (rph/with-http-cache long-cache-duration))))))
@@ -385,7 +456,8 @@
              :code :params-validation
              :hint "page-id is required when object-id is provided"))

-  (let [perms (bfc/get-file-permissions conn profile-id file-id share-id)
+  (let [perms (get-permissions conn profile-id file-id share-id)
+
        file  (bfc/get-file cfg file-id :read-only? true)

        proj  (db/get conn :project {:id (:project-id file)})
@@ -616,10 +688,11 @@
  "Get libraries used by the specified file."
  {::doc/added "1.17"
   ::sm/params schema:get-file-libraries}
-  [cfg {:keys [::rpc/profile-id file-id]}]
-  (bfc/check-file-exists cfg file-id)
-  (check-read-permissions! cfg profile-id file-id)
-  (bfc/get-file-libraries cfg file-id))
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id]}]
+  (dm/with-open [conn (db/open pool)]
+    (check-read-permissions! conn profile-id file-id)
+    (bfc/get-file-libraries conn file-id)))
+

 ;; --- COMMAND QUERY: Files that use this File library

@@ -704,6 +777,7 @@
            f.created_at,
            f.modified_at,
            f.name,
+            f.is_shared,
            f.deleted_at AS will_be_deleted_at,
            ft.media_id AS thumbnail_id,
            row_number() OVER w AS row_num,
@@ -711,7 +785,8 @@
       FROM file AS f
      INNER JOIN project AS p ON (p.id = f.project_id)
       LEFT JOIN file_thumbnail AS ft on (ft.file_id = f.id
-                                          AND ft.revn = f.revn)
+                                          AND ft.revn = f.revn
+                                          AND ft.deleted_at is null)
      WHERE p.team_id = ?
        AND (p.deleted_at > ?::timestamptz OR
             f.deleted_at > ?::timestamptz)
@@ -813,7 +888,7 @@
      AND (f.deleted_at IS NULL OR f.deleted_at > now())
    ORDER BY f.created_at ASC;")

-(defn- absorb-library-by-file
+(defn- absorb-library-by-file!
  [cfg ldata file-id]

  (assert (db/connection-map? cfg)
@@ -837,7 +912,7 @@
                             :modified-at (ct/now)
                             :has-media-trimmed false}))))

-(defn- absorb-library*
+(defn- absorb-library
  "Find all files using a shared library, and absorb all library assets
  into the file local libraries"
  [cfg {:keys [id data] :as library}]
@@ -852,10 +927,10 @@
           :library-id (str id)
           :files (str/join "," (map str ids)))

-    (run! (partial absorb-library-by-file cfg data) ids)
+    (run! (partial absorb-library-by-file! cfg data) ids)
    library))

-(defn absorb-library
+(defn absorb-library!
  [{:keys [::db/conn] :as cfg} id]
  (let [file (-> (bfc/get-file cfg id
                               :realize? true
@@ -872,7 +947,7 @@
    (-> (cfeat/get-team-enabled-features cf/flags team)
        (cfeat/check-file-features! (:features file)))

-    (absorb-library* cfg file)))
+    (absorb-library cfg file)))

 (defn- set-file-shared
  [{:keys [::db/conn] :as cfg} {:keys [profile-id id] :as params}]
@@ -885,14 +960,14 @@
               ;; file, we need to perform more complex operation,
               ;; so in this case we retrieve the complete file and
               ;; perform all required validations.
-               (let [file (-> (absorb-library cfg id)
+               (let [file (-> (absorb-library! cfg id)
                              (assoc :is-shared false))]
                 (db/delete! conn :file-library-rel {:library-file-id id})
                 (db/update! conn :file
                             {:is-shared false
                              :modified-at (ct/now)}
                             {:id id})
-                 file)
+                 (select-keys file [:id :name :is-shared]))

               (and (false? (:is-shared file))
                    (true? (:is-shared params)))
@@ -939,11 +1014,6 @@
                          {:id file-id}
                          {::db/return-keys [:id :name :is-shared :deleted-at
                                             :project-id :created-at :modified-at]})]
-
-    ;; Remove all possible relations for that file
-    (db/delete! conn :file-library-rel
-                {:library-file-id file-id})
-
    (wrk/submit! {::db/conn conn
                  ::wrk/task :delete-object
                  ::wrk/params {:object :file
@@ -1094,53 +1164,47 @@

 ;; --- MUTATION COMMAND: delete-files-immediatelly

-(def ^:private sql:get-delete-team-files-candidates
-  "SELECT f.id
-    FROM file AS f
-    JOIN project AS p ON (p.id = f.project_id)
-    JOIN team AS t ON (t.id = p.team_id)
-   WHERE t.deleted_at IS NULL
-     AND t.id = ?
-     AND f.id = ANY(?::uuid[])")
+(def ^:private sql:delete-team-files
+  "UPDATE file AS uf SET deleted_at = ?::timestamptz
+     FROM (
+        SELECT f.id
+          FROM file AS f
+          JOIN project AS p ON (p.id = f.project_id)
+          JOIN team AS t ON (t.id = p.team_id)
+         WHERE t.deleted_at IS NULL
+           AND t.id = ?
+           AND f.id = ANY(?::uuid[])
+     ) AS subquery
+    WHERE uf.id = subquery.id
+   RETURNING uf.id, uf.deleted_at;")

 (def ^:private schema:permanently-delete-team-files
  [:map {:title "permanently-delete-team-files"}
   [:team-id ::sm/uuid]
   [:ids [::sm/set ::sm/uuid]]])

-(defn- permanently-delete-team-files
-  [{:keys [::db/conn]} {:keys [::rpc/request-at team-id ids]}]
-  (let [ids (into #{}
-                  d/xf:map-id
-                  (db/exec! conn [sql:get-delete-team-files-candidates team-id
-                                  (db/create-array conn "uuid" ids)]))]
-
-    (reduce (fn [acc id]
-              (events/tap :progress {:file-id id :index (inc (count acc)) :total (count ids)})
-              (db/update! conn :file
-                          {:deleted-at request-at}
-                          {:id id}
-                          {::db/return-keys false})
-              (wrk/submit! {::db/conn conn
-                            ::wrk/task :delete-object
-                            ::wrk/params {:object :file
-                                          :deleted-at request-at
-                                          :id id}})
-              (conj acc id))
-            #{}
-            ids)))
-
 (sv/defmethod ::permanently-delete-team-files
  "Mark the specified files to be deleted immediatelly on the
  specified team. The team-id on params will be used to filter and
  check writable permissons on team."

-  {::doc/added "2.13"
-   ::sm/params schema:permanently-delete-team-files}
+  {::doc/added "2.12"
+   ::sm/params schema:permanently-delete-team-files
+   ::db/transaction true}

-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id team-id] :as params}]
-  (teams/check-edition-permissions! pool profile-id team-id)
-  (sse/response #(db/tx-run! cfg permanently-delete-team-files params)))
+  [{:keys [::db/conn]} {:keys [::rpc/profile-id ::rpc/request-at team-id ids]}]
+  (teams/check-edition-permissions! conn profile-id team-id)
+
+  (reduce (fn [acc {:keys [id deleted-at]}]
+            (wrk/submit! {::db/conn conn
+                          ::wrk/task :delete-object
+                          ::wrk/params {:object :file
+                                        :deleted-at deleted-at
+                                        :id id}})
+            (conj acc id))
+          #{}
+          (db/plan conn [sql:delete-team-files request-at team-id
+                         (db/create-array conn "uuid" ids)])))

 ;; --- MUTATION COMMAND: restore-files-immediatelly

@@ -1204,7 +1268,7 @@
        {:keys [files projects]}
        (reduce (fn [result {:keys [id project-id]}]
                  (let [index (-> result :files count)]
-                    (events/tap :progress {:file-id id :index (inc index) :total total-files})
+                    (events/tap :progress {:file-id id :index index :total total-files})
                    (restore-file conn id)

                    (-> result
@@ -1227,7 +1291,7 @@
 (sv/defmethod ::restore-deleted-team-files
  "Removes the deletion mark from the specified files (and respective
  projects) on the specified team."
-  {::doc/added "2.13"
+  {::doc/added "2.12"
   ::sse/stream? true
   ::sm/params schema:restore-deleted-team-files}
  [cfg params]
--- a/backend/src/app/rpc/commands/files_thumbnails.clj
+++ b/backend/src/app/rpc/commands/files_thumbnails.clj
@@ -199,13 +199,15 @@
  [cfg {:keys [::rpc/profile-id file-id strip-frames-with-thumbnails] :as params}]
  (db/run! cfg (fn [{:keys [::db/conn] :as cfg}]
                 (files/check-read-permissions! conn profile-id file-id)
+
                 (let [team (teams/get-team conn
                                            :profile-id profile-id
                                            :file-id file-id)
+
                       file (bfc/get-file cfg file-id
-                                          :include-deleted? true
                                          :realize? true
                                          :read-only? true)
+
                       strip-frames-with-thumbnails
                       (or (nil? strip-frames-with-thumbnails) ;; if not present, default to true
                           (true? strip-frames-with-thumbnails))]
@@ -331,16 +333,12 @@

 ;; --- MUTATION COMMAND: create-file-thumbnail

-(defn- create-file-thumbnail
-  [{:keys [::db/conn ::sto/storage] :as cfg} {:keys [file-id revn props media] :as params}]
+(defn- create-file-thumbnail!
+  [{:keys [::db/conn ::sto/storage]} {:keys [file-id revn props media] :as params}]
  (media/validate-media-type! media)
  (media/validate-media-size! media)

-  (let [file  (bfc/get-file cfg file-id
-                            :include-deleted? true
-                            :load-data? false)
-
-        props (db/tjson (or props {}))
+  (let [props (db/tjson (or props {}))
        path  (:path media)
        mtype (:mtype media)
        hash  (sto/calculate-hash path)
@@ -369,7 +367,7 @@

        (db/update! conn :file-thumbnail
                    {:media-id (:id media)
-                     :deleted-at (:deleted-at file)
+                     :deleted-at nil
                     :updated-at tnow
                     :props props}
                    {:file-id file-id
@@ -380,7 +378,6 @@
                   :revn revn
                   :created-at tnow
                   :updated-at tnow
-                   :deleted-at (:deleted-at file)
                   :props props
                   :media-id (:id media)}))

@@ -405,8 +402,6 @@
   ::rtry/when rtry/conflict-exception?
   ::sm/params schema:create-file-thumbnail}

-  ;; FIXME: do not run the thumbnail upload inside a transaction
-
  [cfg {:keys [::rpc/profile-id file-id] :as params}]
  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
                    ;; TODO For now we check read permissions instead of write,
@@ -414,6 +409,6 @@
                    ;; review this approach on the future.
                    (files/check-read-permissions! conn profile-id file-id)
                    (when-not (db/read-only? conn)
-                      (let [media (create-file-thumbnail cfg params)]
+                      (let [media (create-file-thumbnail! cfg params)]
                        {:uri (files/resolve-public-uri (:id media))
                         :id (:id media)})))))
--- a/backend/src/app/rpc/commands/fonts.clj
+++ b/backend/src/app/rpc/commands/fonts.clj
@@ -6,7 +6,6 @@

 (ns app.rpc.commands.fonts
  (:require
-   [app.binfile.common :as bfc]
   [app.common.data.macros :as dm]
   [app.common.exceptions :as ex]
   [app.common.schema :as sm]
@@ -67,7 +66,7 @@
      (uuid? file-id)
      (let [file    (db/get-by-id conn :file file-id {:columns [:id :project-id]})
            project (db/get-by-id conn :project (:project-id file) {:columns [:id :team-id]})
-            perms   (bfc/get-file-permissions conn profile-id file-id share-id)]
+            perms   (files/get-permissions conn profile-id file-id share-id)]
        (files/check-read-permissions! perms)
        (db/query conn :team-font-variant
                  {:team-id (:team-id project)
--- a/backend/src/app/rpc/commands/search.clj
+++ b/backend/src/app/rpc/commands/search.clj
@@ -19,7 +19,7 @@
      inner join team_profile_rel as tpr on (tpr.team_id = p.team_id)
      where tpr.profile_id = ?
        and p.team_id = ?
-        and (p.deleted_at is null)
+        and (p.deleted_at is null or p.deleted_at > now())
        and (tpr.is_admin = true or
             tpr.is_owner = true or
             tpr.can_edit = true)
@@ -29,7 +29,7 @@
      inner join project_profile_rel as ppr on (ppr.project_id = p.id)
      where ppr.profile_id = ?
        and p.team_id = ?
-        and (p.deleted_at is null)
+        and (p.deleted_at is null or p.deleted_at > now())
        and (ppr.is_admin = true or
             ppr.is_owner = true or
             ppr.can_edit = true)
@@ -47,7 +47,7 @@
     left join file_thumbnail as ft on (ft.file_id = f.id and ft.revn = f.revn)
    inner join projects as pr on (f.project_id = pr.id)
    where f.name ilike ('%' || ? || '%')
-      and (f.deleted_at is null)
+      and (f.deleted_at is null or f.deleted_at > now())
    order by f.created_at asc")

 (defn search-files
--- a/backend/src/app/rpc/commands/viewer.clj
+++ b/backend/src/app/rpc/commands/viewer.clj
@@ -13,6 +13,7 @@
   [app.config :as cf]
   [app.db :as db]
   [app.rpc :as-alias rpc]
+   [app.rpc.commands.files :as files]
   [app.rpc.commands.teams :as teams]
   [app.rpc.cond :as-alias cond]
   [app.rpc.doc :as-alias doc]
@@ -120,7 +121,7 @@
  [system {:keys [::rpc/profile-id file-id share-id] :as params}]
  (db/run! system
           (fn [{:keys [::db/conn] :as system}]
-             (let [perms  (bfc/get-file-permissions conn profile-id file-id share-id)
+             (let [perms  (files/get-permissions conn profile-id file-id share-id)
                   params (-> params
                              (assoc ::perms perms)
                              (assoc :profile-id profile-id))]
--- a/backend/src/app/rpc/rlimit.clj
+++ b/backend/src/app/rpc/rlimit.clj
@@ -104,29 +104,28 @@
 (def ^:private schema:limit
  [:and
   [:map
-    [::name :keyword]
+    [::name :any]
    [::strategy schema:strategy]
    [::key :string]
-    [::opts :string]
-    [::capacity {:optional true} ::sm/int]
-    [::rate {:optional true} ::sm/int]
-    [::interval {:optional true} ::ct/duration]
-    [::params {:optional true} [::sm/vec :any]]
-    [::permits {:optional true} ::sm/int]
-    [::unit {:optional true} [:enum :days :hours :minutes :seconds :weeks]]]
-   [:fn (fn [attrs]
-          (let [contains-fn (partial contains? attrs)]
-            (or (every? contains-fn [::capacity ::rate ::interval])
-                (every? contains-fn [::permits ::unit]))))]])
+    [::opts :string]]
+   [:or
+    [:map
+     [::capacity ::sm/int]
+     [::rate ::sm/int]
+     [::internal ::ct/duration]
+     [::params [::sm/vec :any]]]
+    [:map
+     [::nreq ::sm/int]
+     [::unit [:enum :days :hours :minutes :seconds :weeks]]]]])

 (def ^:private schema:limits
  [:map-of :keyword [::sm/vec schema:limit]])

 (def ^:private valid-limit-tuple?
-  (sm/validator schema:limit-tuple))
+  (sm/lazy-validator schema:limit-tuple))

 (def ^:private valid-rlimit-instance?
-  (sm/validator ::rpc/rlimit))
+  (sm/lazy-validator ::rpc/rlimit))

 (defmethod parse-limit :window
  [[name strategy opts :as vlimit]]
@@ -135,16 +134,16 @@
  (merge
   {::name name
    ::strategy strategy}
-   (if-let [[_ permits unit] (re-find window-opts-re opts)]
-     (let [permits (parse-long permits)]
-       {::permits permits
+   (if-let [[_ nreq unit] (re-find window-opts-re opts)]
+     (let [nreq (parse-long nreq)]
+       {::nreq nreq
        ::unit (case unit
                 "d" :days
                 "h" :hours
                 "m" :minutes
                 "s" :seconds
                 "w" :weeks)
-        ::key  (str "penpot.rlimit." (cf/get :tenant) ".window." (d/name name))
+        ::key  (str "ratelimit.window." (d/name name))
        ::opts opts})
     (ex/raise :type :validation
               :code :invalid-window-limit-opts
@@ -165,15 +164,15 @@
       ::interval interval
       ::opts     opts
       ::params   [(->seconds interval) rate capacity]
-       ::key      (str "penpot.rlimit." (cf/get :tenant) ".bucket." (d/name name))})
+       ::key      (str "ratelimit.bucket." (d/name name))})
    (ex/raise :type :validation
              :code :invalid-bucket-limit-opts
              :hint (str/ffmt "looks like '%' does not have a valid format" opts))))

 (defmethod process-limit :bucket
-  [rconn profile-id now {:keys [::key ::params ::service ::capacity ::interval ::rate] :as limit}]
+  [rconn user-id now {:keys [::key ::params ::service ::capacity ::interval ::rate] :as limit}]
  (let [script    (-> bucket-rate-limit-script
-                      (assoc ::rscript/keys [(str key "." service "." profile-id)])
+                      (assoc ::rscript/keys [(str key "." service "." user-id)])
                      (assoc ::rscript/vals (conj params (->seconds now))))
        result    (rds/eval rconn script)
        allowed?  (boolean (nth result 0))
@@ -193,18 +192,18 @@
        (assoc ::lresult/remaining remaining))))

 (defmethod process-limit :window
-  [rconn profile-id now {:keys [::permits ::unit ::key ::service] :as limit}]
+  [rconn user-id now {:keys [::nreq ::unit ::key ::service] :as limit}]
  (let [ts        (ct/truncate now unit)
        ttl       (ct/diff now (ct/plus ts {unit 1}))
        script    (-> window-rate-limit-script
-                      (assoc ::rscript/keys [(str key "." service "." profile-id "." (ct/format-inst ts))])
-                      (assoc ::rscript/vals [permits (->seconds ttl)]))
+                      (assoc ::rscript/keys [(str key "." service "." user-id "." (ct/format-inst ts))])
+                      (assoc ::rscript/vals [nreq (->seconds ttl)]))
        result    (rds/eval rconn script)
        allowed?  (boolean (nth result 0))
        remaining (nth result 1)]
    (l/trace :hint "limit processed"
             :service service
-             :name (name (::name limit))
+             :limit (name (::name limit))
             :strategy (name (::strategy limit))
             :opts (::opts limit)
             :allowed allowed?
@@ -215,8 +214,8 @@
        (assoc ::lresult/reset (ct/plus ts {unit 1})))))

 (defn- process-limits
-  [rconn profile-id limits now]
-  (let [results   (into [] (map (partial process-limit rconn profile-id now)) limits)
+  [rconn user-id limits now]
+  (let [results   (into [] (map (partial process-limit rconn user-id now)) limits)
        remaining (->> results
                       (d/index-by ::name ::lresult/remaining)
                       (uri/map->query-string))
@@ -228,7 +227,7 @@

    (when rejected
      (l/warn :hint "rejected rate limit"
-              :profile-id (str profile-id)
+              :user-id (str user-id)
              :limit-service (-> rejected ::service name)
              :limit-name (-> rejected ::name name)
              :limit-strategy (-> rejected ::strategy name)))
@@ -372,9 +371,12 @@
 (defn- on-refresh-error
  [_ cause]
  (when-not (instance? java.util.concurrent.RejectedExecutionException cause)
-    (l/warn :hint "unexpected exception on loading config"
-            :cause cause
-            ::l/sync? true)))
+    (if-let [explain (-> cause ex-data ex/explain)]
+      (l/warn ::l/raw (str "unable to refresh config, invalid format:\n" explain)
+              ::l/sync? true)
+      (l/warn :hint "unexpected exception on loading config"
+              :cause cause
+              ::l/sync? true))))

 (defn- get-config-path
  []
--- a/backend/src/app/rpc/rlimit/bucket.lua
+++ b/backend/src/app/rpc/rlimit/bucket.lua
@@ -25,9 +25,9 @@ local allowed = filled >= requested
 local newTokens = filled
 if allowed then
  newTokens = filled - requested
-  redis.call("hset", tokensKey, "tokens", newTokens, "timestamp", timestamp)
 end

+redis.call("hset", tokensKey, "tokens", newTokens, "timestamp", timestamp)
 redis.call("expire", tokensKey, ttl)

 return { allowed, newTokens }
--- a/backend/src/app/storage.clj
+++ b/backend/src/app/storage.clj
@@ -35,9 +35,6 @@
      :assets-s3 :s3
      nil)))

-(def default-bucket
-  "file-media-object")
-
 (def valid-buckets
  #{"file-media-object"
    "team-font-variant"
--- a/backend/src/app/storage/gc_touched.clj
+++ b/backend/src/app/storage/gc_touched.clj
@@ -25,7 +25,7 @@
   [app.common.time :as ct]
   [app.config :as cf]
   [app.db :as db]
-   [app.storage :as sto]
+   [app.storage :as-alias sto]
   [app.storage.impl :as impl]
   [integrant.core :as ig]))

@@ -130,7 +130,7 @@
  [{:keys [metadata]}]
  (or (some-> metadata :bucket)
      (some-> metadata :reference d/name)
-      sto/default-bucket))
+      "file-media-object"))

 (defn- process-objects!
  [conn has-refs? bucket objects]
--- a/backend/src/app/tasks/delete_object.clj
+++ b/backend/src/app/tasks/delete_object.clj
@@ -45,8 +45,7 @@
           :deleted-at (ct/format-inst deleted-at))

    (db/update! conn :file
-                {:deleted-at deleted-at
-                 :is-shared false}
+                {:deleted-at deleted-at}
                {:id id}
                {::db/return-keys false})

@@ -54,7 +53,7 @@
               (not *team-deletion*))
      ;; NOTE: we don't prevent file deletion on absorb operation failure
      (try
-        (db/tx-run! cfg files/absorb-library id)
+        (db/tx-run! cfg files/absorb-library! id)
        (catch Throwable cause
          (l/warn :hint "error on absorbing library"
                  :file-id id
--- a/backend/src/app/util/template.clj
+++ b/backend/src/app/util/template.clj
@@ -7,18 +7,10 @@
 (ns app.util.template
  (:require
   [app.common.exceptions :as ex]
-   [cuerdas.core :as str]
-   [selmer.filters :as sf]
   [selmer.parser :as sp]))

 ;; (sp/cache-off!)

-(sf/add-filter! :abbreviate
-                (fn [s n]
-                  (let [n (parse-long n)]
-                    (str/abbreviate s n))))
-
-
 (defn render
  [path context]
  (try
--- a/backend/src/app/worker/dispatcher.clj
+++ b/backend/src/app/worker/dispatcher.clj
@@ -137,34 +137,33 @@ RETURNING task.id, task.queue")
                ::wait)))

          (run-batch []
-            (try
-              (let [rconn (rds/connect cfg)]
-                (try
-                  (-> cfg
-                      (assoc ::rds/conn rconn)
-                      (db/tx-run! run-batch'))
-                  (finally
-                    (.close ^AutoCloseable rconn))))
+            (let [rconn (rds/connect cfg)]
+              (try
+                (-> cfg
+                    (assoc ::rds/conn rconn)
+                    (db/tx-run! run-batch'))

-              (catch InterruptedException cause
-                (throw cause))
+                (catch InterruptedException cause
+                  (throw cause))
+                (catch Exception cause
+                  (cond
+                    (rds/exception? cause)
+                    (do
+                      (l/wrn :hint "redis exception (will retry in an instant)" :cause cause)
+                      (px/sleep timeout))

-              (catch Exception cause
-                (cond
-                  (rds/exception? cause)
-                  (do
-                    (l/wrn :hint "redis exception (will retry in an instant)" :cause cause)
-                    (px/sleep timeout))
+                    (db/sql-exception? cause)
+                    (do
+                      (l/wrn :hint "database exception (will retry in an instant)" :cause cause)
+                      (px/sleep timeout))

-                  (db/sql-exception? cause)
-                  (do
-                    (l/wrn :hint "database exception (will retry in an instant)" :cause cause)
-                    (px/sleep timeout))
+                    :else
+                    (do
+                      (l/err :hint "unhandled exception (will retry in an instant)" :cause cause)
+                      (px/sleep timeout))))

-                  :else
-                  (do
-                    (l/err :hint "unhandled exception (will retry in an instant)" :cause cause)
-                    (px/sleep timeout))))))
+                (finally
+                  (.close ^AutoCloseable rconn)))))

          (dispatcher []
            (l/inf :hint "started")
@@ -177,7 +176,7 @@ RETURNING task.id, task.queue")
              (catch InterruptedException _
                (l/trc :hint "interrupted"))
              (catch Throwable cause
-                (l/err :hint "unexpected exception" :cause cause))
+                (l/err :hint " unexpected exception" :cause cause))
              (finally
                (l/inf :hint "terminated"))))]

--- a/backend/test/backend_tests/helpers.clj
+++ b/backend/test/backend_tests/helpers.clj
@@ -595,8 +595,8 @@
      (px/exec! :virtual #(rcp/write-body-to-stream body nil output))
      (into []
            (map (fn [{:keys [event data]}]
-                   (d/vec2 (keyword event)
-                           (tr/decode-str data))))
+                   [(keyword event)
+                    (tr/decode-str data)]))
            (parse-sse (slurp' input)))
      (finally
        (.close input)))))
--- a/backend/test/backend_tests/rpc_file_test.clj
+++ b/backend/test/backend_tests/rpc_file_test.clj
@@ -1921,11 +1921,7 @@
        ;; (th/print-result! out)
        (t/is (nil? (:error out)))
        (let [result (:result out)]
-          (t/is (fn? result))
-
-          (let [[ev1 ev2 :as events] (th/consume-sse result)]
-            (t/is (= 2 (count events)))
-            (t/is (= (:ids data) (val ev2)))))
+          (t/is (= (:ids data) result)))

        (let [row (th/db-exec-one! ["select * from file where id = ?" file-id])]
          (t/is (= (:deleted-at row) now)))))))
--- a/common/deps.edn
+++ b/common/deps.edn
@@ -29,7 +29,8 @@
  java-http-clj/java-http-clj {:mvn/version "0.4.3"}
  integrant/integrant {:mvn/version "1.0.0"}

-  funcool/cuerdas {:mvn/version "2026.415"}
+  funcool/tubax {:mvn/version "2021.05.20-0"}
+  funcool/cuerdas {:mvn/version "2025.06.16-414"}
  funcool/promesa
  {:git/sha "46048fc0d4bf5466a2a4121f5d52aefa6337f2e8"
   :git/url "https://github.com/funcool/promesa"}
--- a/common/src/app/common/data.cljc
+++ b/common/src/app/common/data.cljc
@@ -1024,26 +1024,6 @@
      :clj
      (sort comp-fn items))))

-(defn obfuscate-string
-  "Obfuscates potentially sensitive values.
-
-  - One-arg arity:
-    * For strings shorter than 10 characters, all characters are replaced by `*`.
-    * For longer strings, the first 5 characters are preserved and the rest obfuscated.
-  - Two-arg arity accepts a boolean `full?` that, when true, replaces the whole value
-    by `*`, preserving only the length."
-  ([v]
-   (obfuscate-string v false))
-  ([v full?]
-   (let [s (str v)
-         n (count s)]
-     (cond
-       (zero? n) s
-       full? (apply str (repeat n "*"))
-       (< n 10) (apply str (repeat n "*"))
-       :else (str (subs s 0 5)
-                  (apply str (repeat (- n 5) "*")))))))
-
 (defn reorder
  "Reorder a vector by moving one of their items from some position to some space between positions.
   It clamps the position numbers to a valid range."
--- a/common/src/app/common/exceptions.cljc
+++ b/common/src/app/common/exceptions.cljc
@@ -10,7 +10,6 @@
  (:refer-clojure :exclude [instance?])
  (:require
   #?(:clj [clojure.stacktrace :as strace])
-   [app.common.data :refer [obfuscate-string]]
   [app.common.pprint :as pp]
   [app.common.schema :as sm]
   [clojure.core :as c]
@@ -20,10 +19,6 @@
     (:import
      clojure.lang.IPersistentMap)))

-(def ^:private sensitive-fields
-  "Keys whose values must be obfuscated in validation explains."
-  #{:password :old-password :token :invitation-token})
-
 #?(:clj (set! *warn-on-reflection* true))

 (def ^:dynamic *data-length* 8)
@@ -115,25 +110,7 @@
    (explain (:explain data) opts)

    (contains? data ::sm/explain)
-    (let [exp (::sm/explain data)
-          sanitize-map (fn sanitize-map [m]
-                         (reduce-kv
-                          (fn [acc k v]
-                            (let [k* (if (string? k) (keyword k) k)]
-                              (cond
-                                (contains? sensitive-fields k*)
-                                (assoc acc k (if (map? v)
-                                               (sanitize-map v)
-                                               (obfuscate-string v true)))
-
-                                (map? v) (assoc acc k (sanitize-map v))
-                                :else (assoc acc k v))))
-                          {}
-                          m))
-          sanitize-explain (fn [exp]
-                             (cond-> exp
-                               (:value exp) (update :value sanitize-map)))]
-      (sm/humanize-explain (sanitize-explain exp) opts))))
+    (sm/humanize-explain (::sm/explain data) opts)))

 #?(:clj
   (defn format-throwable
--- a/common/src/app/common/features.cljc
+++ b/common/src/app/common/features.cljc
@@ -56,6 +56,7 @@
    "text-editor/v2-html-paste"
    "text-editor/v2"
    "render-wasm/v1"
+    "graph-wasm/v1"
    "variants/v1"})

 ;; A set of features enabled by default
@@ -79,7 +80,8 @@
    "text-editor/v2-html-paste"
    "text-editor/v2"
    "tokens/numeric-input"
-    "render-wasm/v1"})
+    "render-wasm/v1"
+    "graph-wasm/v1"})

 ;; Features that are mainly backend only or there are a proper
 ;; fallback when frontend reports no support for it
@@ -128,6 +130,7 @@
    :feature-text-editor-v2 "text-editor/v2"
    :feature-text-editor-v2-html-paste "text-editor/v2-html-paste"
    :feature-render-wasm "render-wasm/v1"
+    :feature-graph-wasm "graph-wasm/v1"
    :feature-variants "variants/v1"
    :feature-token-input "tokens/numeric-input"
    nil))
--- a/common/src/app/common/flags.cljc
+++ b/common/src/app/common/flags.cljc
@@ -169,7 +169,6 @@
   :enable-component-thumbnails
   :enable-render-wasm-dpr
   :enable-token-color
-   :enable-token-shadow
   :enable-inspect-styles
   :enable-feature-fdata-objects-map])

--- a/common/src/app/common/time.cljc
+++ b/common/src/app/common/time.cljc
@@ -340,7 +340,7 @@
     (dfn-diff t2 t1)))

 #?(:cljs
-   (defn set-default-locale
+   (defn set-default-locale!
     [locale]
     (when-let [locale (unchecked-get locales locale)]
       (dfn-set-default-options #js {:locale locale}))))
--- a/common/src/app/common/types/container.cljc
+++ b/common/src/app/common/types/container.cljc
@@ -269,8 +269,8 @@
  "Remove flex children properties except the fit-content for flex layouts. These are properties
  that we don't have to propagate to copies but will be respected when swapping components"
  [shape]
-  (let [layout-item-h-sizing (when (and (ctl/any-layout? shape) (ctl/auto-width? shape)) :auto)
-        layout-item-v-sizing (when (and (ctl/any-layout? shape) (ctl/auto-height? shape)) :auto)]
+  (let [layout-item-h-sizing (when (and (ctl/flex-layout? shape) (ctl/auto-width? shape)) :auto)
+        layout-item-v-sizing (when (and (ctl/flex-layout? shape) (ctl/auto-height? shape)) :auto)]
    (-> shape
        (d/without-keys ctk/swap-keep-attrs)
        (cond-> (some? layout-item-h-sizing)
--- a/common/src/app/common/types/file.cljc
+++ b/common/src/app/common/types/file.cljc
@@ -362,24 +362,24 @@
        component           (ctkl/get-component component-file (:component-id top-instance) true)
        remote-shape        (get-ref-shape component-file component shape)
        component-container (get-component-container component-file component)
-        [remote-shape component-container component-file]
+        [remote-shape component-container]
        (if (some? remote-shape)
-          [remote-shape component-container component-file]
+          [remote-shape component-container]
          ;; If not found, try the case of this being a fostered or swapped children
-          (let [head-instance        (ctn/get-head-shape (:objects container) shape)
-                component-file       (get-in libraries [(:component-file head-instance) :data])
-                head-component       (ctkl/get-component component-file (:component-id head-instance) true)
-                remote-shape'        (get-ref-shape component-file head-component shape)
-                component-container' (get-component-container component-file head-component)]
-            [remote-shape' component-container' component-file]))]
+          (let [head-instance       (ctn/get-head-shape (:objects container) shape)
+                component-file      (get-in libraries [(:component-file head-instance) :data])
+                head-component      (ctkl/get-component component-file (:component-id head-instance) true)
+                remote-shape'       (get-ref-shape component-file head-component shape)
+                component-container (get-component-container component-file component)]
+            [remote-shape' component-container]))]

    (if (nil? remote-shape)
      nil
      (if (nil? (:shape-ref remote-shape))
        (cond-> remote-shape
          (and remote-shape with-context?)
-          (with-meta {:file {:id (:id component-file)
-                             :data component-file}
+          (with-meta {:file {:id (:id file-data)
+                             :data file-data}
                      :container component-container}))
        (find-remote-shape component-container libraries remote-shape :with-context? with-context?)))))

--- a/common/src/app/common/types/path.cljc
+++ b/common/src/app/common/types/path.cljc
@@ -112,10 +112,8 @@
                (:c2y params) (update-in [index :params :c2y] + (:c2y params)))
              content))]

-    (if (some? modifiers)
-      (impl/path-data
-       (reduce apply-to-index (vec content) modifiers))
-      content)))
+    (impl/path-data
+     (reduce apply-to-index (vec content) modifiers))))

 (defn transform-content
  "Applies a transformation matrix over content and returns a new
--- a/common/src/app/common/types/project.cljc
+++ b/common/src/app/common/types/project.cljc
@@ -1,29 +0,0 @@
-
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.common.types.project
-  (:require
-   [app.common.schema :as sm]
-   [app.common.time :as cm]))
-
-(def schema:project
-  [:map {:title "Profile"}
-   [:id ::sm/uuid]
-   [:created-at {:optional true} ::cm/inst]
-   [:modified-at {:optional true} ::cm/inst]
-   [:name :string]
-   [:is-default {:optional true} ::sm/boolean]
-   [:is-pinned {:optional true} ::sm/boolean]
-   [:count {:optional true} ::sm/int]
-   [:total-count {:optional true} ::sm/int]
-   [:team-id ::sm/uuid]])
-
-(def valid-project?
-  (sm/lazy-validator schema:project))
-
-(def check-project
-  (sm/check-fn schema:project))
--- a/common/src/app/common/types/token.cljc
+++ b/common/src/app/common/types/token.cljc
@@ -47,18 +47,6 @@
        self-reference? (get token-references token-name)]
    self-reference?))

-(defn references-token?
-  "Recursively check if a value references the token name. Handles strings, maps, and sequences."
-  [value token-name]
-  (cond
-    (string? value)
-    (boolean (some #(= % token-name) (find-token-value-references value)))
-    (map? value)
-    (some true? (map #(references-token? % token-name) (vals value)))
-    (sequential? value)
-    (some true? (map #(references-token? % token-name) value))
-    :else false))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SCHEMA
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -71,7 +59,6 @@
   :dimensions      "dimension"
   :font-family     "fontFamilies"
   :font-size       "fontSizes"
-   :font-weight     "fontWeights"
   :letter-spacing  "letterSpacing"
   :number          "number"
   :opacity         "opacity"
@@ -83,6 +70,7 @@
   :stroke-width    "borderWidth"
   :text-case       "textCase"
   :text-decoration "textDecoration"
+   :font-weight     "fontWeights"
   :typography      "typography"})

 (def dtcg-token-type->token-type
@@ -487,7 +475,6 @@
   :vertical-margin #{:spacing :dimensions}
   :sided-margins #{:spacing :dimensions}
   :line-height #{:line-height :number}
-   :opacity #{:opacity}
   :font-size #{:font-size}
   :letter-spacing #{:letter-spacing}
   :fill #{:color}
@@ -571,18 +558,3 @@
  "Predicate if a shadow composite token is a reference value - a string pointing to another reference token."
  [token-value]
  (string? token-value))
-
-(defn update-token-value-references
-  "Recursively update token references within a token value, supporting complex token values (maps, sequences, strings)."
-  [value old-name new-name]
-  (cond
-    (string? value)
-    (str/replace value
-                 (re-pattern (str "\\{" (str/replace old-name "." "\\.") "\\}"))
-                 (str "{" new-name "}"))
-    (map? value)
-    (d/update-vals value #(update-token-value-references % old-name new-name))
-    (sequential? value)
-    (mapv #(update-token-value-references % old-name new-name) value)
-    :else
-    value))
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -909,8 +909,7 @@ Will return a value that matches this schema:
 `:all`     All of the nested sets are active
 `:partial` Mixed active state of nested sets")
  (get-tokens-in-active-sets [_] "set of set names that are active in the the active themes")
-  (get-all-tokens [_] "all tokens in the lib, as a sequence")
-  (get-all-tokens-map [_] "all tokens in the lib, as a map name -> token")
+  (get-all-tokens [_] "all tokens in the lib")
  (get-tokens [_ set-id] "return a map of tokens in the set, indexed by token-name"))

 (declare parse-multi-set-dtcg-json)
@@ -1307,10 +1306,6 @@ Will return a value that matches this schema:
      tokens))

  (get-all-tokens [this]
-    (mapcat #(vals (get-tokens- %))
-            (get-sets this)))
-
-  (get-all-tokens-map [this]
    (reduce
     (fn [tokens' set]
       (into tokens' (map (fn [x] [(:name x) x]) (vals (get-tokens- set)))))
@@ -1415,8 +1410,8 @@ Will return a value that matches this schema:
    ;; NOTE: we can't assign statically at eval time the value of a
    ;; function that is declared but not defined; so we need to pass
    ;; an anonymous function and delegate the resolution to runtime
-    {:encode/json #(some-> % export-dtcg-json)
-     :decode/json #(some-> % read-multi-set-dtcg)
+    {:encode/json #(export-dtcg-json %)
+     :decode/json #(read-multi-set-dtcg %)
     ;; FIXME: add better, more reallistic generator
     :gen/gen (->> (sg/small-int)
                   (sg/fmap (fn [_]
@@ -1550,7 +1545,7 @@ Will return a value that matches this schema:
  (and (not (contains? decoded-json "$metadata"))
       (not (contains? decoded-json "$themes"))))

-(defn convert-dtcg-font-family
+(defn- convert-dtcg-font-family
  "Convert font-family token value from DTCG format to internal format.
   - If value is a string, split it into a collection of font families
   - If value is already an array, keep it as is
@@ -1561,7 +1556,7 @@ Will return a value that matches this schema:
    (sequential? value) value
    :else value))

-(defn convert-dtcg-typography-composite
+(defn- convert-dtcg-typography-composite
  "Convert typography token value keys from DTCG format to internal format."
  [value]
  (if (map? value)
@@ -1573,7 +1568,7 @@ Will return a value that matches this schema:
    ;; Reference value
    value))

-(defn convert-dtcg-shadow-composite
+(defn- convert-dtcg-shadow-composite
  "Convert shadow token value from DTCG format to internal format."
  [value]
  (let [process-shadow (fn [shadow]
--- a/docker/devenv/docker-compose.yaml
+++ b/docker/devenv/docker-compose.yaml
@@ -41,10 +41,7 @@ services:
      - 6062:6062
      - 6063:6063
      - 6064:6064
-      - 9000:9000
-      - 9001:9001
      - 9090:9090
-      - 9091:9091

    environment:
      - EXTERNAL_UID=${CURRENT_USER_ID}
--- a/docker/devenv/files/Caddyfile
+++ b/docker/devenv/files/Caddyfile
@@ -10,7 +10,3 @@ localhost:3449 {
 http://localhost:3450 {
   reverse_proxy localhost:4449
 }
-
-http://penpot-devenv-main:3450 {
-    reverse_proxy localhost:4449
-}
--- a/docker/devenv/files/nginx.conf
+++ b/docker/devenv/files/nginx.conf
@@ -145,8 +145,8 @@ http {
            proxy_pass http://127.0.0.1:3000/;
        }

-        location /wasm-playground {
-            alias /home/penpot/penpot/frontend/resources/public/wasm-playground/;
+        location /playground {
+            alias /home/penpot/penpot/experiments/;
            add_header Cache-Control "no-cache, max-age=0";
            autoindex on;
        }
--- a/docker/devenv/files/start-tmux.sh
+++ b/docker/devenv/files/start-tmux.sh
@@ -8,10 +8,14 @@ source ~/.bashrc

 echo "[start-tmux.sh] Installing node dependencies"
 pushd ~/penpot/frontend/
-./scripts/setup;
+corepack install;
+yarn install;
+yarn playwright install chromium
 popd
 pushd ~/penpot/exporter/
-./scripts/setup;
+corepack install;
+yarn install
+yarn playwright install chromium
 popd

 tmux -2 new-session -d -s penpot
@@ -19,25 +23,30 @@ tmux -2 new-session -d -s penpot
 tmux rename-window -t penpot:0 'frontend watch'
 tmux select-window -t penpot:0
 tmux send-keys -t penpot 'cd penpot/frontend' enter C-l
-tmux send-keys -t penpot './scripts/watch app' enter
+tmux send-keys -t penpot 'yarn run watch' enter

-tmux new-window -t penpot:1 -n 'frontend storybook'
+tmux new-window -t penpot:1 -n 'frontend shadow'
 tmux select-window -t penpot:1
 tmux send-keys -t penpot 'cd penpot/frontend' enter C-l
-tmux send-keys -t penpot './scripts/watch storybook' enter
+tmux send-keys -t penpot 'yarn run watch:app' enter

-tmux new-window -t penpot:2 -n 'exporter'
+tmux new-window -t penpot:2 -n 'frontend storybook'
 tmux select-window -t penpot:2
+tmux send-keys -t penpot 'cd penpot/frontend' enter C-l
+tmux send-keys -t penpot 'yarn run watch:storybook' enter
+
+tmux new-window -t penpot:3 -n 'exporter'
+tmux select-window -t penpot:3
 tmux send-keys -t penpot 'cd penpot/exporter' enter C-l
 tmux send-keys -t penpot 'rm -f target/app.js*' enter C-l
-tmux send-keys -t penpot './scripts/watch' enter
+tmux send-keys -t penpot 'yarn run watch' enter

 tmux split-window -v
 tmux send-keys -t penpot 'cd penpot/exporter' enter C-l
 tmux send-keys -t penpot './scripts/wait-and-start.sh' enter

-tmux new-window -t penpot:3 -n 'backend'
-tmux select-window -t penpot:3
+tmux new-window -t penpot:4 -n 'backend'
+tmux select-window -t penpot:4
 tmux send-keys -t penpot 'cd penpot/backend' enter C-l
 tmux send-keys -t penpot './scripts/start-dev' enter

--- a/docs/scripts/build
+++ b/docs/scripts/build
@@ -1,10 +1,8 @@
 #!/usr/bin/env bash

+source ~/.bashrc
+
 set -ex
-
-corepack enable;
-corepack install;
-
 rm -rf ./_dist
-yarn install
+yarn
 yarn run build
--- a/exporter/package.json
+++ b/exporter/package.json
@@ -4,7 +4,7 @@
  "license": "MPL-2.0",
  "author": "Kaleidos INC",
  "private": true,
-  "packageManager": "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8",
+  "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
  "repository": {
    "type": "git",
    "url": "https://github.com/penpot/penpot"
@@ -16,9 +16,9 @@
    "date-fns": "^4.1.0",
    "generic-pool": "^3.9.0",
    "inflation": "^2.1.0",
-    "ioredis": "^5.8.2",
-    "playwright": "^1.57.0",
-    "raw-body": "^3.0.2",
+    "ioredis": "^5.8.1",
+    "playwright": "^1.55.1",
+    "raw-body": "^3.0.1",
    "source-map-support": "^0.5.21",
    "svgo": "penpot/svgo#v3.1",
    "undici": "^7.16.0",
@@ -30,8 +30,8 @@
  },
  "scripts": {
    "clear:shadow-cache": "rm -rf .shadow-cljs && rm -rf target",
-    "watch:app": "yarn run clear:shadow-cache && clojure -M:dev:shadow-cljs watch main",
-    "watch": "yarn run watch:app",
+    "watch:app": "clojure -M:dev:shadow-cljs watch main",
+    "watch": "yarn run clear:shadow-cache && yarn run watch:app",
    "build:app": "clojure -M:dev:shadow-cljs release main",
    "build": "yarn run clear:shadow-cache && yarn run build:app",
    "fmt:clj:check": "cljfmt check --parallel=false src/",
--- a/exporter/scripts/setup
+++ b/exporter/scripts/setup
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -e;
-
-corepack enable;
-corepack install;
-yarn install;
-yarn playwright install chromium
--- a/exporter/scripts/watch
+++ b/exporter/scripts/watch
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-TARGET=${1:-app};
-
-set -ex
-
-exec yarn run watch:$TARGET
--- a/exporter/yarn.lock
+++ b/exporter/yarn.lock
@@ -243,7 +243,7 @@ __metadata:
  languageName: node
  linkType: hard

-"bytes@npm:~3.1.2":
+"bytes@npm:3.1.2":
  version: 3.1.2
  resolution: "bytes@npm:3.1.2"
  checksum: 10c0/76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
@@ -442,7 +442,7 @@ __metadata:
  languageName: node
  linkType: hard

-"depd@npm:~2.0.0":
+"depd@npm:2.0.0, depd@npm:~2.0.0":
  version: 2.0.0
  resolution: "depd@npm:2.0.0"
  checksum: 10c0/58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
@@ -577,9 +577,9 @@ __metadata:
    date-fns: "npm:^4.1.0"
    generic-pool: "npm:^3.9.0"
    inflation: "npm:^2.1.0"
-    ioredis: "npm:^5.8.2"
-    playwright: "npm:^1.57.0"
-    raw-body: "npm:^3.0.2"
+    ioredis: "npm:^5.8.1"
+    playwright: "npm:^1.55.1"
+    raw-body: "npm:^3.0.1"
    source-map-support: "npm:^0.5.21"
    svgo: "penpot/svgo#v3.1"
    undici: "npm:^7.16.0"
@@ -683,16 +683,16 @@ __metadata:
  languageName: node
  linkType: hard

-"http-errors@npm:~2.0.1":
-  version: 2.0.1
-  resolution: "http-errors@npm:2.0.1"
+"http-errors@npm:2.0.0":
+  version: 2.0.0
+  resolution: "http-errors@npm:2.0.0"
  dependencies:
-    depd: "npm:~2.0.0"
-    inherits: "npm:~2.0.4"
-    setprototypeof: "npm:~1.2.0"
-    statuses: "npm:~2.0.2"
-    toidentifier: "npm:~1.0.1"
-  checksum: 10c0/fb38906cef4f5c83952d97661fe14dc156cb59fe54812a42cd448fa57b5c5dfcb38a40a916957737bd6b87aab257c0648d63eb5b6a9ca9f548e105b6072712d4
+    depd: "npm:2.0.0"
+    inherits: "npm:2.0.4"
+    setprototypeof: "npm:1.2.0"
+    statuses: "npm:2.0.1"
+    toidentifier: "npm:1.0.1"
+  checksum: 10c0/fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
  languageName: node
  linkType: hard

@@ -716,6 +716,15 @@ __metadata:
  languageName: node
  linkType: hard

+"iconv-lite@npm:0.7.0":
+  version: 0.7.0
+  resolution: "iconv-lite@npm:0.7.0"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
+  checksum: 10c0/2382400469071c55b6746c531eed5fa4d033e5db6690b7331fb2a5f59a30d7a9782932e92253db26df33c1cf46fa200a3fbe524a2a7c62037c762283f188ec2f
+  languageName: node
+  linkType: hard
+
 "iconv-lite@npm:^0.6.2":
  version: 0.6.3
  resolution: "iconv-lite@npm:0.6.3"
@@ -725,15 +734,6 @@ __metadata:
  languageName: node
  linkType: hard

-"iconv-lite@npm:~0.7.0":
-  version: 0.7.0
-  resolution: "iconv-lite@npm:0.7.0"
-  dependencies:
-    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
-  checksum: 10c0/2382400469071c55b6746c531eed5fa4d033e5db6690b7331fb2a5f59a30d7a9782932e92253db26df33c1cf46fa200a3fbe524a2a7c62037c762283f188ec2f
-  languageName: node
-  linkType: hard
-
 "ieee754@npm:^1.2.1":
  version: 1.2.1
  resolution: "ieee754@npm:1.2.1"
@@ -755,16 +755,16 @@ __metadata:
  languageName: node
  linkType: hard

-"inherits@npm:~2.0.3, inherits@npm:~2.0.4":
+"inherits@npm:2.0.4, inherits@npm:~2.0.3":
  version: 2.0.4
  resolution: "inherits@npm:2.0.4"
  checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
  languageName: node
  linkType: hard

-"ioredis@npm:^5.8.2":
-  version: 5.8.2
-  resolution: "ioredis@npm:5.8.2"
+"ioredis@npm:^5.8.1":
+  version: 5.8.1
+  resolution: "ioredis@npm:5.8.1"
  dependencies:
    "@ioredis/commands": "npm:1.4.0"
    cluster-key-slot: "npm:^1.1.0"
@@ -775,7 +775,7 @@ __metadata:
    redis-errors: "npm:^1.2.0"
    redis-parser: "npm:^3.0.0"
    standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/305e385f811d49908899e32c2de69616cd059f909afd9e0a53e54f596b1a5835ee3449bfc6a3c49afbc5a2fd27990059e316cc78f449c94024957bd34c826d88
+  checksum: 10c0/4ed66444017150da027bce940a24bf726994691e2a7b3aa11d52f8aeb37f258068cc171af4d9c61247acafc28eb086fa8a7c79420b8e8d2907d2f74f39584465
  languageName: node
  linkType: hard

@@ -1106,27 +1106,27 @@ __metadata:
  languageName: node
  linkType: hard

-"playwright-core@npm:1.57.0":
-  version: 1.57.0
-  resolution: "playwright-core@npm:1.57.0"
+"playwright-core@npm:1.55.1":
+  version: 1.55.1
+  resolution: "playwright-core@npm:1.55.1"
  bin:
    playwright-core: cli.js
-  checksum: 10c0/798e35d83bf48419a8c73de20bb94d68be5dde68de23f95d80a0ebe401e3b83e29e3e84aea7894d67fa6c79d2d3d40cc5bcde3e166f657ce50987aaa2421b6a9
+  checksum: 10c0/39837a8c1232ec27486eac8c3fcacc0b090acc64310f7f9004b06715370fc426f944e3610fe8c29f17cd3d68280ed72c75f660c02aa5b5cf0eb34bab0031308f
  languageName: node
  linkType: hard

-"playwright@npm:^1.57.0":
-  version: 1.57.0
-  resolution: "playwright@npm:1.57.0"
+"playwright@npm:^1.55.1":
+  version: 1.55.1
+  resolution: "playwright@npm:1.55.1"
  dependencies:
    fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.57.0"
+    playwright-core: "npm:1.55.1"
  dependenciesMeta:
    fsevents:
      optional: true
  bin:
    playwright: cli.js
-  checksum: 10c0/ab03c99a67b835bdea9059f516ad3b6e42c21025f9adaa161a4ef6bc7ca716dcba476d287140bb240d06126eb23f889a8933b8f5f1f1a56b80659d92d1358899
+  checksum: 10c0/b84a97b0d764403df512f5bbb10c7343974e151a28202cc06f90883a13e8a45f4491a0597f0ae5fb03a026746cbc0d200f0f32195bfaa381aee5ca5770626771
  languageName: node
  linkType: hard

@@ -1161,15 +1161,15 @@ __metadata:
  languageName: node
  linkType: hard

-"raw-body@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "raw-body@npm:3.0.2"
+"raw-body@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "raw-body@npm:3.0.1"
  dependencies:
-    bytes: "npm:~3.1.2"
-    http-errors: "npm:~2.0.1"
-    iconv-lite: "npm:~0.7.0"
-    unpipe: "npm:~1.0.0"
-  checksum: 10c0/d266678d08e1e7abea62c0ce5864344e980fa81c64f6b481e9842c5beaed2cdcf975f658a3ccd67ad35fc919c1f6664ccc106067801850286a6cbe101de89f29
+    bytes: "npm:3.1.2"
+    http-errors: "npm:2.0.0"
+    iconv-lite: "npm:0.7.0"
+    unpipe: "npm:1.0.0"
+  checksum: 10c0/892f4fbd21ecab7e2fed0f045f7af9e16df7e8050879639d4e482784a2f4640aaaa33d916a0e98013f23acb82e09c2e3c57f84ab97104449f728d22f65a7d79a
  languageName: node
  linkType: hard

@@ -1270,7 +1270,7 @@ __metadata:
  languageName: node
  linkType: hard

-"setprototypeof@npm:~1.2.0":
+"setprototypeof@npm:1.2.0":
  version: 1.2.0
  resolution: "setprototypeof@npm:1.2.0"
  checksum: 10c0/68733173026766fa0d9ecaeb07f0483f4c2dc70ca376b3b7c40b7cda909f94b0918f6c5ad5ce27a9160bdfb475efaa9d5e705a11d8eaae18f9835d20976028bc
@@ -1368,10 +1368,10 @@ __metadata:
  languageName: node
  linkType: hard

-"statuses@npm:~2.0.2":
-  version: 2.0.2
-  resolution: "statuses@npm:2.0.2"
-  checksum: 10c0/a9947d98ad60d01f6b26727570f3bcceb6c8fa789da64fe6889908fe2e294d57503b14bf2b5af7605c2d36647259e856635cd4c49eab41667658ec9d0080ec3f
+"statuses@npm:2.0.1":
+  version: 2.0.1
+  resolution: "statuses@npm:2.0.1"
+  checksum: 10c0/34378b207a1620a24804ce8b5d230fea0c279f00b18a7209646d5d47e419d1cc23e7cbf33a25a1e51ac38973dc2ac2e1e9c647a8e481ef365f77668d72becfd0
  languageName: node
  linkType: hard

@@ -1500,7 +1500,7 @@ __metadata:
  languageName: node
  linkType: hard

-"toidentifier@npm:~1.0.1":
+"toidentifier@npm:1.0.1":
  version: 1.0.1
  resolution: "toidentifier@npm:1.0.1"
  checksum: 10c0/93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1
@@ -1539,7 +1539,7 @@ __metadata:
  languageName: node
  linkType: hard

-"unpipe@npm:~1.0.0":
+"unpipe@npm:1.0.0":
  version: 1.0.0
  resolution: "unpipe@npm:1.0.0"
  checksum: 10c0/193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c
--- a/frontend/.storybook/main.js
+++ b/frontend/.storybook/main.js
@@ -1,5 +1,3 @@
-import { defineConfig } from 'vite';
-
 /** @type { import('@storybook/react-vite').StorybookConfig } */
 const config = {
  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
@@ -7,38 +5,18 @@ const config = {
  addons: [
    "@storybook/addon-themes",
    "@storybook/addon-docs",
-    "@storybook/addon-vitest",
+    "@storybook/addon-vitest"
  ],
+  core: {
+    builder: "@storybook/builder-vite",
+    options: {
+      viteConfigPath: "../vite.config.js",
+    },
+  },
  framework: {
    name: "@storybook/react-vite",
-    options: {
-      // fastRefresh: false,
-    }
+    options: {},
  },
  docs: {},
-
-  async viteFinal(config) {
-    return defineConfig({
-      ...config,
-      plugins: [
-        ...(config.plugins ?? []),
-        {
-          name: 'force-full-reload-always',
-          apply: 'serve',
-          enforce: 'post',
-
-          handleHotUpdate(ctx) {
-            ctx.server.ws.send({
-              type: 'full-reload',
-              path: '*',
-            });
-
-            // returning [] tells Vite: “no modules handled”
-            return [];
-          },
-        }
-      ]
-    });
-  }
 };
 export default config;
--- a/frontend/.storybook/preview.js
+++ b/frontend/.storybook/preview.js
@@ -1,5 +1,6 @@
 import { withThemeByClassName } from "@storybook/addon-themes";

+
 import Components from "@target/components";
 import translations from "@public/translation.en.js";
 Components.setDefaultTranslations(translations);
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -8,11 +8,6 @@
  metosin/reitit-core {:mvn/version "0.9.1"}
  funcool/okulary {:mvn/version "2022.04.11-16"}

-  funcool/tubax
-  {:git/tag "v2025.11.28"
-   :git/sha "2d9a986"
-   :git/url "https://github.com/funcool/tubax.git"}
-
  funcool/potok2
  {:git/tag "v2.2"
   :git/sha "0f7e15a"
@@ -50,7 +45,7 @@
   {thheller/shadow-cljs {:mvn/version "3.2.2"}
    com.bhauman/rebel-readline {:mvn/version "RELEASE"}
    org.clojure/tools.namespace {:mvn/version "RELEASE"}
-    criterium/criterium {:mvn/version "0.4.6"}
+    criterium/criterium {:mvn/version "RELEASE"}
    cider/cider-nrepl {:mvn/version "0.57.0"}}}

  :shadow-cljs
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -47,81 +47,89 @@
    "watch:app:libs": "node ./scripts/build-libs.js --watch",
    "watch:app:main": "clojure -M:dev:shadow-cljs watch main worker storybook",
    "clear:shadow-cache": "rm -rf .shadow-cljs",
-    "watch": "exit 0",
-    "watch:app": "yarn run clear:shadow-cache && concurrently --kill-others-on-fail \"yarn run watch:app:assets\" \"yarn run watch:app:main\" \"yarn run watch:app:libs\"",
-    "watch:storybook": "yarn run build:storybook:assets && concurrently --kill-others-on-fail \"storybook dev -p 6006 --no-open\" \"node ./scripts/watch-storybook.js\""
+    "watch:app": "yarn run clear:shadow-cache && concurrently \"yarn run watch:app:main\" \"yarn run watch:app:libs\"",
+    "watch": "yarn run watch:app:assets",
+    "watch:storybook": "yarn run build:storybook:assets && concurrently \"storybook dev -p 6006 --no-open\" \"yarn run watch:storybook:assets\"",
+    "watch:storybook:assets": "node ./scripts/watch-storybook.js"
  },
  "devDependencies": {
-    "@penpot/draft-js": "portal:./packages/draft-js",
-    "@penpot/mousetrap": "portal:./packages/mousetrap",
-    "@penpot/plugins-runtime": "1.3.2",
-    "@penpot/svgo": "penpot/svgo#v3.2",
-    "@penpot/text-editor": "portal:./text-editor",
-    "@playwright/test": "1.57.0",
-    "@storybook/addon-docs": "10.1.11",
-    "@storybook/addon-themes": "10.1.11",
-    "@storybook/addon-vitest": "10.1.11",
-    "@storybook/react-vite": "10.1.11",
-    "@tokens-studio/sd-transforms": "1.2.11",
-    "@types/node": "^22.19.3",
-    "@vitest/browser": "4.0.16",
-    "@vitest/browser-playwright": "^4.0.16",
-    "@vitest/coverage-v8": "4.0.16",
-    "@zip.js/zip.js": "patch:@zip.js/zip.js@npm%3A2.7.60#~/.yarn/patches/@zip.js-zip.js-npm-2.7.60-b6b814410b.patch",
+    "@playwright/test": "1.52.0",
+    "@storybook/addon-docs": "10.0.4",
+    "@storybook/addon-themes": "10.0.4",
+    "@storybook/addon-vitest": "10.0.4",
+    "@storybook/react-vite": "10.0.4",
+    "@types/node": "^22.15.21",
+    "@vitest/browser": "3.2.4",
+    "@vitest/coverage-v8": "3.2.4",
    "autoprefixer": "^10.4.21",
-    "compression": "^1.8.1",
    "concurrently": "^9.2.1",
-    "date-fns": "^4.1.0",
    "esbuild": "^0.25.9",
-    "eventsource-parser": "^3.0.6",
    "express": "^5.1.0",
    "fancy-log": "^2.0.0",
    "getopts": "^2.3.0",
    "gettext-parser": "^8.0.0",
-    "highlight.js": "^11.10.0",
-    "js-beautify": "^1.15.4",
-    "jsdom": "^27.4.0",
-    "lodash": "^4.17.21",
-    "lodash.debounce": "^4.0.8",
+    "gulp-concat": "^2.6.1",
+    "gulp-gzip": "^1.4.2",
+    "gulp-mustache": "^5.0.0",
+    "gulp-postcss": "^10.0.0",
+    "gulp-rename": "^2.0.0",
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-svg-sprite": "^2.0.3",
+    "jsdom": "^27.0.0",
    "map-stream": "0.0.7",
    "marked": "^15.0.12",
    "mkdirp": "^3.0.1",
    "mustache": "^4.2.0",
    "nodemon": "^3.1.10",
    "npm-run-all": "^4.1.5",
-    "opentype.js": "^1.3.4",
    "p-limit": "^6.2.0",
    "playwright": "1.56.1",
    "postcss": "^8.5.4",
    "postcss-clean": "^1.2.2",
-    "postcss-modules": "^6.0.1",
    "prettier": "3.5.3",
    "pretty-time": "^1.1.0",
    "prop-types": "^15.8.1",
+    "rimraf": "^6.0.1",
+    "sass": "^1.89.0",
+    "sass-embedded": "^1.89.0",
+    "storybook": "10.0.4",
+    "svg-sprite": "^2.0.4",
+    "typescript": "^5.9.2",
+    "vite": "^6.3.5",
+    "vitest": "^3.2.0",
+    "wasm-pack": "^0.13.1",
+    "watcher": "^2.3.1",
+    "workerpool": "^9.3.2"
+  },
+  "dependencies": {
+    "@penpot/draft-js": "portal:./vendor/draft-js",
+    "@penpot/hljs": "portal:./vendor/hljs",
+    "@penpot/mousetrap": "portal:./vendor/mousetrap",
+    "@penpot/plugins-runtime": "1.3.2",
+    "@penpot/svgo": "penpot/svgo#v3.2",
+    "@penpot/text-editor": "portal:./text-editor",
+    "@tokens-studio/sd-transforms": "1.2.11",
+    "@zip.js/zip.js": "patch:@zip.js/zip.js@npm%3A2.7.60#~/.yarn/patches/@zip.js-zip.js-npm-2.7.60-b6b814410b.patch",
+    "compression": "^1.8.1",
+    "date-fns": "^4.1.0",
+    "eventsource-parser": "^3.0.6",
+    "js-beautify": "^1.15.4",
+    "lodash": "^4.17.21",
+    "lodash.debounce": "^4.0.8",
+    "opentype.js": "^1.3.4",
+    "postcss-modules": "^6.0.1",
    "randomcolor": "^0.6.2",
    "react": "19.1.1",
    "react-dom": "19.1.1",
    "react-error-boundary": "^6.0.0",
    "react-virtualized": "^9.22.6",
-    "rimraf": "^6.0.1",
    "rxjs": "8.0.0-alpha.14",
-    "sass": "^1.89.0",
-    "sass-embedded": "^1.89.0",
    "sax": "^1.4.1",
    "source-map-support": "^0.5.21",
-    "storybook": "10.1.11",
    "style-dictionary": "5.0.0-rc.1",
-    "svg-sprite": "^2.0.4",
    "tdigest": "^0.1.2",
    "tinycolor2": "^1.6.0",
-    "typescript": "^5.9.2",
    "ua-parser-js": "2.0.5",
-    "vite": "^7.3.0",
-    "vitest": "^4.0.16",
-    "wait-on": "^9.0.3",
-    "wasm-pack": "^0.13.1",
-    "watcher": "^2.3.1",
-    "workerpool": "^9.3.2",
    "xregexp": "^5.1.2"
  }
 }
--- a/frontend/playwright/data/dashboard/get-team-deleted-files-empty.json
+++ b/frontend/playwright/data/dashboard/get-team-deleted-files-empty.json
@@ -1 +0,0 @@
-[]
--- a/frontend/playwright/data/dashboard/get-team-deleted-files.json
+++ b/frontend/playwright/data/dashboard/get-team-deleted-files.json
@@ -1,47 +0,0 @@
-[
-  {
-    "~:id": "~uc7ce0794-0992-8105-8004-38e630f41234",
-    "~:revn": 1,
-    "~:vern": 1,
-    "~:project-id": "~uc7ce0794-0992-8105-8004-38e630f7920b",
-    "~:created-at": "~m1705307400000",
-    "~:modified-at": "~m1732111500000",
-    "~:deleted-at": "~m1732111500000",
-    "~:name": "Deleted Design File 1",
-    "~:is-shared": false,
-    "~:will-be-deleted-at": "~m1732716300000",
-    "~:thumbnail-id": null,
-    "~:row-num": 1,
-    "~:team-id": "~uc7ce0794-0992-8105-8004-38e630f40f6d"
-  },
-  {
-    "~:id": "~uc7ce0794-0992-8105-8004-38e630f41235",
-    "~:revn": 2,
-    "~:vern": 2,
-    "~:project-id": "~uc7ce0794-0992-8105-8004-38e630f7920b",
-    "~:created-at": "~m1704875700000",
-    "~:modified-at": "~m1732025400000",
-    "~:deleted-at": "~m1732025400000",
-    "~:name": "Deleted Design File 2",
-    "~:is-shared": true,
-    "~:will-be-deleted-at": "~m1732630200000",
-    "~:thumbnail-id": null,
-    "~:row-num": 2,
-    "~:team-id": "~uc7ce0794-0992-8105-8004-38e630f40f6d"
-  },
-  {
-    "~:id": "~uc7ce0794-0992-8105-8004-38e630f41236",
-    "~:revn": 3,
-    "~:vern": 3,
-    "~:project-id": "~uc7ce0794-0992-8105-8004-38e630f7920c",
-    "~:created-at": "~m1706792400000",
-    "~:modified-at": "~m1731939600000",
-    "~:deleted-at": "~m1731939600000",
-    "~:name": "Old Project Design",
-    "~:is-shared": false,
-    "~:will-be-deleted-at": "~m1732544400000",
-    "~:thumbnail-id": null,
-    "~:row-num": 3,
-    "~:team-id": "~uc7ce0794-0992-8105-8004-38e630f40f6d"
-  }
-]
--- a/frontend/playwright/ui/pages/DashboardPage.js
+++ b/frontend/playwright/ui/pages/DashboardPage.js
@@ -106,13 +106,6 @@ export class DashboardPage extends BaseWebSocketPage {
    );
  }

-  async setupDeletedFiles() {
-    await this.mockRPC(
-      "get-team-deleted-files?team-id=*",
-      "dashboard/get-team-deleted-files.json",
-    );
-  }
-
  async setupDrafts() {
    await this.mockRPC(
      "get-project-files?project-id=*",
@@ -167,10 +160,6 @@ export class DashboardPage extends BaseWebSocketPage {
    });
    await this.mockRPC("search-files", "dashboard/search-files.json");
    await this.mockRPC("get-teams", "logged-in-user/get-teams-complete.json");
-    await this.mockRPC(
-      "get-team-deleted-files?team-id=*",
-      "dashboard/get-team-deleted-files.json",
-    );
  }

  async setupAccessTokensEmpty() {
@@ -300,13 +289,6 @@ export class DashboardPage extends BaseWebSocketPage {
    await expect(this.mainHeading).toHaveText("Libraries");
  }

-  async goToDeleted() {
-    await this.page.goto(
-      `#/dashboard/deleted?team-id=${DashboardPage.anyTeamId}`,
-    );
-    await expect(this.mainHeading).toHaveText("Projects");
-  }
-
  async openProfileMenu() {
    await this.userAccount.click();
  }
--- a/frontend/playwright/ui/pages/WorkspacePage.js
+++ b/frontend/playwright/ui/pages/WorkspacePage.js
@@ -198,10 +198,10 @@ export class WorkspacePage extends BaseWebSocketPage {
      `[id="shape-00000000-0000-0000-0000-000000000000"]`,
    );
    this.toolbarOptions = page.getByTestId("toolbar-options");
-    this.rectShapeButton = page.getByTestId("toolbar-options").getByRole("button", { name: "Rectangle" });
-    this.ellipseShapeButton = page.getByTestId("toolbar-options").getByRole("button", { name: "Ellipse" });
-    this.moveButton = page.getByTestId("toolbar-options").getByRole("button", { name: "Move" });
-    this.boardButton = page.getByTestId("toolbar-options").getByRole("button", { name: "Board" });
+    this.rectShapeButton = page.getByRole("button", { name: "Rectangle (R)" });
+    this.ellipseShapeButton = page.getByRole("button", { name: "Ellipse (E)" });
+    this.moveButton = page.getByRole("button", { name: "Move (V)" });
+    this.boardButton = page.getByRole("button", { name: "Board (B)" });
    this.toggleToolbarButton = page.getByRole("button", {
      name: "Toggle toolbar",
    });
--- a/frontend/playwright/ui/specs/dashboard-deleted.spec.js
+++ b/frontend/playwright/ui/specs/dashboard-deleted.spec.js
@@ -1,26 +0,0 @@
-import { test, expect } from "@playwright/test";
-import DashboardPage from "../pages/DashboardPage";
-
-test.beforeEach(async ({ page }) => {
-  await DashboardPage.init(page);
-  await DashboardPage.mockRPC(
-    page,
-    "get-profile",
-    "logged-in-user/get-profile-logged-in-no-onboarding.json",
-  );
-});
-
-test.describe("Dashboard Deleted Page", () => {
-  test("User can navigate to deleted page", async ({ page }) => {
-    const dashboardPage = new DashboardPage(page);
-
-    // Setup mock for deleted files API
-    await dashboardPage.setupDeletedFiles();
-
-    // Navigate directly to deleted page
-    await dashboardPage.goToDeleted();
-
-    // Check for the delete-page-section element
-    await expect(page.getByTestId("deleted-page-section")).toBeVisible();
-  });
-});
--- a/frontend/playwright/ui/specs/design-tab.spec.js
+++ b/frontend/playwright/ui/specs/design-tab.spec.js
@@ -189,8 +189,8 @@ test("BUG 7760 - Layout losing properties when changing parents", async ({
  await workspacePage.clickLeafLayer("Flex Board");

  // Move the first board into the second
-  const hAuto = await workspacePage.page.getByTestId("behaviour-h-auto");
-  const vAuto = await workspacePage.page.getByTestId("behaviour-v-auto");
+  const hAuto = await workspacePage.page.getByTitle("Fit content (Horizontal)");
+  const vAuto = await workspacePage.page.getByTitle("Fit content (Vertical)");

  await expect(vAuto.locator("input")).toBeChecked();
  await expect(hAuto.locator("input")).toBeChecked();
--- a/frontend/playwright/ui/specs/inspect-tab.spec.js
+++ b/frontend/playwright/ui/specs/inspect-tab.spec.js
@@ -305,7 +305,7 @@ test.describe("Inspect tab - Styles", () => {
      );
      await openInspectTab(workspacePage);

-      const panel = await getPanelByTitle(workspacePage, "Size and position");
+      const panel = await getPanelByTitle(workspacePage, "Size & position");
      await expect(panel).toBeVisible();

      const propertyRow = panel.getByTestId("property-row");
@@ -335,7 +335,7 @@ test.describe("Inspect tab - Styles", () => {
      );
      await openInspectTab(workspacePage);

-      const panel = await getPanelByTitle(workspacePage, "Size and position");
+      const panel = await getPanelByTitle(workspacePage, "Size & position");
      await expect(panel).toBeVisible();

      const propertyRow = panel.getByTestId("property-row");
@@ -375,7 +375,7 @@ test.describe("Inspect tab - Styles", () => {
      );
      await openInspectTab(workspacePage);

-      const panel = await getPanelByTitle(workspacePage, "Size and position");
+      const panel = await getPanelByTitle(workspacePage, "Size & position");
      await expect(panel).toBeVisible();

      const propertyRow = panel.getByTestId("property-row");
--- a/frontend/playwright/ui/specs/tokens.spec.js
+++ b/frontend/playwright/ui/specs/tokens.spec.js
@@ -50,7 +50,7 @@ const setupTokensFile = async (page, options = {}) => {
  const {
    file = "workspace/get-file-tokens.json",
    fileFragment = "workspace/get-file-fragment-tokens.json",
-    flags = ["enable-feature-token-input"],
+    flags = [],
  } = options;

  const workspacePage = new WorkspacePage(page);
@@ -2242,56 +2242,6 @@ test.describe("Tokens: Apply token", () => {
    ).toBeVisible();
  });

-  test("User applies border-radius token to a shape from sidebar", async ({ page }) => {
-    const { workspacePage, tokensSidebar, tokenContextMenuForToken } =
-      await setupTokensFile(page);
-
-    await page.getByRole("tab", { name: "Layers" }).click();
-
-
-    await workspacePage.layers.getByTestId("layer-row").nth(1).click();
-    
-    // Open tokens sections on left sidebar
-    const tokensTabButton = page.getByRole("tab", { name: "Tokens" });
-    await tokensTabButton.click();
-
-    // Unfold border radius tokens
-    await page.getByRole("button", { name: "Border Radius 3" }).click();
-    await expect(
-      tokensSidebar.getByRole("button", { name: "borderRadius" }),
-    ).toBeVisible();
-    await tokensSidebar.getByRole("button", { name: "borderRadius" }).click();
-    await expect(
-      tokensSidebar.getByRole("button", { name: "borderRadius.sm" }),
-    ).toBeVisible();
-
-    // Apply border radius token from token panels
-    await tokensSidebar.getByRole("button", { name: "borderRadius.sm" }).click();
-
-    // Check if border radius sections is visible on right sidebar
-    const borderRadiusSection = page.getByRole("region", {name: "border-radius-section"});
-    await expect(borderRadiusSection).toBeVisible();
-
-    // Check if token pill is visible on design tab on right sidebar
-    const brTokenPillSM = borderRadiusSection.getByRole('button', { name: 'borderRadius.sm' });
-    await expect(brTokenPillSM).toBeVisible();
-    await brTokenPillSM.click();
-
-    // Change token from dropdown
-    const brTokenOptionXl = borderRadiusSection.getByLabel('borderRadius.xl')
-    await expect(brTokenOptionXl).toBeVisible();
-    await brTokenOptionXl.click();
-
-    await expect(brTokenPillSM).not.toBeVisible();
-    const brTokenPillXL = borderRadiusSection.getByRole('button', { name: 'borderRadius.xl' });
-    await expect(brTokenPillXL).toBeVisible();
-
-    // Detach token from design tab on right sidebar
-    const detachButton = borderRadiusSection.getByRole('button', { name: 'Detach token' });
-    await detachButton.click();
-    await expect(brTokenPillXL).not.toBeVisible();
-  });
-
  test("User applies typography token to a text shape", async ({ page }) => {
    const { workspacePage, tokensSidebar, tokenContextMenuForToken } =
      await setupTypographyTokensFile(page);
@@ -2467,14 +2417,11 @@ test.describe("Tokens: Apply token", () => {
    const nameField = tokensUpdateCreateModal.getByLabel("Name");
    await nameField.fill(newTokenTitle);

-    const referenceTabButton = tokensUpdateCreateModal.getByRole("button", {
-      name: "Use a reference",
-    });
+    const referenceTabButton =
+      tokensUpdateCreateModal.getByTestId("reference-opt");
    referenceTabButton.click();

-    const referenceField = tokensUpdateCreateModal.getByRole("textbox", {
-      name: "Reference",
-    });
+    const referenceField = tokensUpdateCreateModal.getByLabel("Reference");
    await referenceField.fill("{Full}");

    const submitButton = tokensUpdateCreateModal.getByRole("button", {
@@ -2793,641 +2740,3 @@ test.describe("Tokens: Apply token", () => {
    });
  });
 });
-
-test.describe("Tokens: Remapping Feature", () => {
-  test.describe("Box Shadow Token Remapping", () => {
-    test("User renames box shadow token with alias references", async ({
-      page,
-    }) => {
-      const {
-        tokensUpdateCreateModal,
-        tokensSidebar,
-        tokenContextMenuForToken,
-      } = await setupTokensFile(page, { flags: ["enable-token-shadow"] });
-
-      const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" });
-
-      // Create base shadow token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Shadow" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      let nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("base-shadow");
-
-      const colorField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Color",
-      });
-      await colorField.fill("#000000");
-
-      let submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Create derived shadow token that references base-shadow
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Shadow" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      nameField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Name",
-      });
-      await nameField.fill("derived-shadow");
-
-      const referenceToggle =
-        tokensUpdateCreateModal.getByTestId("reference-opt");
-      await referenceToggle.click();
-
-      const referenceField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Reference",
-      });
-      await referenceField.fill("{base-shadow}");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Rename base-shadow token
-      const baseToken = tokensSidebar.getByRole("button", {
-        name: "base-shadow",
-      });
-      await baseToken.click({ button: "right" });
-      await tokenContextMenuForToken.getByText("Edit token").click();
-
-      await expect(tokensUpdateCreateModal).toBeVisible();
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("foundation-shadow");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-
-      // Check for remapping modal
-      const remappingModal = page.getByTestId("token-remapping-modal");
-      await expect(remappingModal).toBeVisible({ timeout: 5000 });
-      await expect(remappingModal).toContainText("1");
-
-      const confirmButton = remappingModal.getByRole("button", {
-        name: /remap/i,
-      });
-      await confirmButton.click();
-
-      // Verify token was renamed
-      await expect(
-        tokensSidebar.getByRole("button", { name: "foundation-shadow" }),
-      ).toBeVisible();
-      await expect(
-        tokensSidebar.getByRole("button", { name: "derived-shadow" }),
-      ).toBeVisible();
-    });
-
-    test("User renames and updates shadow token - referenced token and applied shapes update", async ({
-      page,
-    }) => {
-      const {
-        tokensUpdateCreateModal,
-        tokensSidebar,
-        tokenContextMenuForToken,
-        workspacePage,
-      } = await setupTokensFile(page, { flags: ["enable-token-shadow"] });
-
-      const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" });
-
-      // Create base shadow token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Shadow" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      let nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("primary-shadow");
-
-      let colorField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Color",
-      });
-      await colorField.fill("#000000");
-
-      let submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Create derived shadow token that references base
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Shadow" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("card-shadow");
-
-      const referenceToggle =
-        tokensUpdateCreateModal.getByTestId("reference-opt");
-      await referenceToggle.click();
-
-      const referenceField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Reference",
-      });
-      await referenceField.fill("{primary-shadow}");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Apply the referenced token to a shape
-      await page.getByRole("tab", { name: "Layers" }).click();
-      await workspacePage.layers
-        .getByTestId("layer-row")
-        .filter({ hasText: "Button" })
-        .click();
-
-      await page.getByRole("tab", { name: "Tokens" }).click();
-      const cardShadowToken = tokensSidebar.getByRole("button", {
-        name: "card-shadow",
-      });
-      await cardShadowToken.click();
-
-      // Rename and update value of base token
-      const primaryToken = tokensSidebar.getByRole("button", {
-        name: "primary-shadow",
-      });
-      await primaryToken.click({ button: "right" });
-      await tokenContextMenuForToken.getByText("Edit token").click();
-
-      await expect(tokensUpdateCreateModal).toBeVisible();
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("main-shadow");
-
-      // Update the color value
-      colorField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Color",
-      });
-      await colorField.fill("#FF0000");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-
-      // Confirm remapping
-      const remappingModal = page.getByTestId("token-remapping-modal");
-      await expect(remappingModal).toBeVisible({ timeout: 5000 });
-
-      const confirmButton = remappingModal.getByRole("button", {
-        name: /remap/i,
-      });
-      await confirmButton.click();
-
-      // Verify base token was renamed
-      await expect(
-        tokensSidebar.getByRole("button", { name: "main-shadow" }),
-      ).toBeVisible();
-
-      // Verify referenced token still exists
-      await expect(
-        tokensSidebar.getByRole("button", { name: "card-shadow" }),
-      ).toBeVisible();
-
-      // Verify the shape still has the token applied with the NEW name
-      await page.getByRole("tab", { name: "Layers" }).click();
-      await workspacePage.layers
-        .getByTestId("layer-row")
-        .filter({ hasText: "Button" })
-        .click();
-
-      // Verify the shape still has the shadow applied with the UPDATED color value
-      // Expand the shadow section to access the color field
-      const shadowSection =
-        workspacePage.rightSidebar.getByTestId("shadow-section");
-      await expect(shadowSection).toBeVisible();
-
-      // Click to expand the shadow options (the menu button)
-      const shadowMenuButton = shadowSection
-        .getByRole("button", { name: "options" })
-        .first();
-      await shadowMenuButton.click();
-
-      // Wait for the advanced options to appear
-      await page.waitForTimeout(500);
-
-      // Verify the color value has updated from #000000 to #FF0000
-      const colorInput = shadowSection.getByRole("textbox", { name: "Color" });
-      expect(colorInput).not.toBeNull();
-      const colorValue = await colorInput.inputValue();
-      expect(colorValue.toUpperCase()).toBe("FF0000");
-    });
-  });
-
-  test.describe("Typography Token Remapping", () => {
-    test("User renames typography token with alias references", async ({
-      page,
-    }) => {
-      const {
-        tokensUpdateCreateModal,
-        tokensSidebar,
-        tokenContextMenuForToken,
-      } = await setupTypographyTokensFile(page);
-
-      const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" });
-
-      // Create base typography token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Typography" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      let nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("base-text");
-
-      const fontSizeField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Font size",
-      });
-      await fontSizeField.fill("16");
-
-      let submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Create derived typography token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Typography" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      nameField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Name",
-      });
-      await nameField.fill("body-text");
-
-      const referenceToggle =
-        tokensUpdateCreateModal.getByTestId("reference-opt");
-      await referenceToggle.click();
-
-      const referenceField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Reference",
-      });
-      await referenceField.fill("{base-text}");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Rename base token
-      const baseToken = tokensSidebar.getByRole("button", {
-        name: "base-text",
-      });
-      await baseToken.click({ button: "right" });
-      await tokenContextMenuForToken.getByText("Edit token").click();
-
-      await expect(tokensUpdateCreateModal).toBeVisible();
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("default-text");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-
-      // Check for remapping modal
-      const remappingModal = page.getByTestId("token-remapping-modal");
-      await expect(remappingModal).toBeVisible({ timeout: 5000 });
-
-      const confirmButton = remappingModal.getByRole("button", {
-        name: /remap/i,
-      });
-      await confirmButton.click();
-
-      // Verify token was renamed
-      await expect(
-        tokensSidebar.getByRole("button", { name: "default-text" }),
-      ).toBeVisible();
-      await expect(
-        tokensSidebar.getByRole("button", { name: "body-text" }),
-      ).toBeVisible();
-    });
-
-    test("User renames and updates typography token - referenced token and applied shapes update", async ({
-      page,
-    }) => {
-      const {
-        tokensUpdateCreateModal,
-        tokensSidebar,
-        tokenContextMenuForToken,
-        workspacePage,
-      } = await setupTypographyTokensFile(page);
-
-      const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" });
-
-      // Create base typography token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Typography" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      let nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("body-style");
-
-      let fontSizeField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Font size",
-      });
-      await fontSizeField.fill("16");
-
-      let submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Create derived typography token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Typography" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      nameField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Name",
-      });
-      await nameField.fill("paragraph-style");
-
-      const referenceToggle =
-        tokensUpdateCreateModal.getByTestId("reference-opt");
-      await referenceToggle.click();
-
-      const referenceField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Reference",
-      });
-      await referenceField.fill("{body-style}");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Apply the referenced token to a text shape
-      await page.getByRole("tab", { name: "Layers" }).click();
-      await workspacePage.layers
-        .getByTestId("layer-row")
-        .filter({ hasText: "Some Text" })
-        .click();
-
-      await page.getByRole("tab", { name: "Tokens" }).click();
-      const paragraphToken = tokensSidebar.getByRole("button", {
-        name: "paragraph-style",
-      });
-      await paragraphToken.click();
-
-      // Rename and update value of base token
-      const bodyToken = tokensSidebar.getByRole("button", {
-        name: "body-style",
-      });
-      await bodyToken.click({ button: "right" });
-      await tokenContextMenuForToken.getByText("Edit token").click();
-
-      await expect(tokensUpdateCreateModal).toBeVisible();
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("text-base");
-
-      // Update the font size value
-      fontSizeField = tokensUpdateCreateModal.getByRole("textbox", {
-        name: "Font size",
-      });
-      await fontSizeField.fill("18");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-
-      // Confirm remapping
-      const remappingModal = page.getByTestId("token-remapping-modal");
-      await expect(remappingModal).toBeVisible({ timeout: 5000 });
-
-      const confirmButton = remappingModal.getByRole("button", {
-        name: /remap/i,
-      });
-      await confirmButton.click();
-
-      // Verify base token was renamed
-      await expect(
-        tokensSidebar.getByRole("button", { name: "text-base" }),
-      ).toBeVisible();
-
-      // Verify referenced token still exists
-      await expect(
-        tokensSidebar.getByRole("button", { name: "paragraph-style" }),
-      ).toBeVisible();
-
-      // Verify the text shape still has the token applied with NEW name and value
-      await page.getByRole("tab", { name: "Layers" }).click();
-      await workspacePage.layers
-        .getByTestId("layer-row")
-        .filter({ hasText: "Some Text" })
-        .click();
-
-      // Verify the shape shows the updated font size value (18)
-      // This proves the remapping worked and the value update propagated through the reference
-      const fontSizeInput = workspacePage.rightSidebar.getByRole("textbox", {
-        name: "Font Size",
-      });
-      await expect(fontSizeInput).toBeVisible();
-      await expect(fontSizeInput).toHaveValue("18");
-    });
-  });
-
-  test.describe("Border Radius Token Remapping", () => {
-    test("User renames border radius token with alias references", async ({
-      page,
-    }) => {
-      const {
-        tokensUpdateCreateModal,
-        tokensSidebar,
-        tokenContextMenuForToken,
-      } = await setupTokensFile(page);
-
-      const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" });
-
-      // Create base border radius token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Border Radius" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      let nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("base-radius");
-
-      const valueField = tokensUpdateCreateModal.getByLabel("Value");
-      await valueField.fill("4");
-
-      let submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Create derived border radius token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Border Radius" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("card-radius");
-
-      const valueField2 = tokensUpdateCreateModal.getByLabel("Value");
-      await valueField2.fill("{base-radius}");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Rename base token
-      const baseToken = tokensSidebar.getByRole("button", {
-        name: "base-radius",
-      });
-      await baseToken.click({ button: "right" });
-      await tokenContextMenuForToken.getByText("Edit token").click();
-
-      await expect(tokensUpdateCreateModal).toBeVisible();
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("primary-radius");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-
-      // Check for remapping modal
-      const remappingModal = page.getByTestId("token-remapping-modal");
-      await expect(remappingModal).toBeVisible({ timeout: 5000 });
-
-      const confirmButton = remappingModal.getByRole("button", {
-        name: /remap/i,
-      });
-      await confirmButton.click();
-
-      // Verify token was renamed
-      await expect(
-        tokensSidebar.getByRole("button", { name: "primary-radius" }),
-      ).toBeVisible();
-      await expect(
-        tokensSidebar.getByRole("button", { name: "card-radius" }),
-      ).toBeVisible();
-    });
-
-    test("User renames and updates border radius token - referenced token updates", async ({
-      page,
-    }) => {
-      const {
-        tokensUpdateCreateModal,
-        tokensSidebar,
-        tokenContextMenuForToken,
-      } = await setupTokensFile(page);
-
-      const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" });
-
-      // Create base border radius token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Border Radius" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      let nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("radius-sm");
-
-      let valueField = tokensUpdateCreateModal.getByLabel("Value");
-      await valueField.fill("4");
-
-      let submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Create derived border radius token
-      await tokensTabPanel
-        .getByRole("button", { name: "Add Token: Border Radius" })
-        .click();
-      await expect(tokensUpdateCreateModal).toBeVisible();
-
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("button-radius");
-
-      const valueField2 = tokensUpdateCreateModal.getByLabel("Value");
-      await valueField2.fill("{radius-sm}");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-      await expect(tokensUpdateCreateModal).not.toBeVisible();
-
-      // Rename and update value of base token
-      const radiusToken = tokensSidebar.getByRole("button", {
-        name: "radius-sm",
-      });
-      await radiusToken.click({ button: "right" });
-      await tokenContextMenuForToken.getByText("Edit token").click();
-
-      await expect(tokensUpdateCreateModal).toBeVisible();
-      nameField = tokensUpdateCreateModal.getByLabel("Name");
-      await nameField.fill("radius-base");
-
-      // Update the value
-      valueField = tokensUpdateCreateModal.getByLabel("Value");
-      await valueField.fill("8");
-
-      submitButton = tokensUpdateCreateModal.getByRole("button", {
-        name: "Save",
-      });
-      await submitButton.click();
-
-      // Confirm remapping
-      const remappingModal = page.getByTestId("token-remapping-modal");
-      await expect(remappingModal).toBeVisible({ timeout: 5000 });
-
-      const confirmButton = remappingModal.getByRole("button", {
-        name: /remap/i,
-      });
-      await confirmButton.click();
-
-      // Verify base token was renamed
-      await expect(
-        tokensSidebar.getByRole("button", { name: "radius-base" }),
-      ).toBeVisible();
-
-      // Verify referenced token still exists
-      await expect(
-        tokensSidebar.getByRole("button", { name: "button-radius" }),
-      ).toBeVisible();
-
-      // Verify the referenced token now points to the renamed token
-      // by opening it and checking the reference
-      const buttonRadiusToken = tokensSidebar.getByRole("button", {
-        name: "button-radius",
-      });
-      await buttonRadiusToken.click({ button: "right" });
-      await tokenContextMenuForToken.getByText("Edit token").click();
-
-      await expect(tokensUpdateCreateModal).toBeVisible();
-      const currentValue = tokensUpdateCreateModal.getByLabel("Value");
-      await expect(currentValue).toHaveValue("{radius-base}");
-    });
-  });
-});
--- a/frontend/playwright/ui/specs/workspace.spec.js
+++ b/frontend/playwright/ui/specs/workspace.spec.js
@@ -332,33 +332,24 @@ test("Copy/paste properties", async ({ page, context }) => {
  await page.getByText("Copy/Paste as").hover();
  await page.getByText("Paste properties").click();

-  await page
-    .getByTestId("layer-item")
-    .getByText("Rectangle")
-    .first()
-    .click({ button: "right" });
+  await page.getByText("Rectangle").first().click({ button: "right" });
+  await page.getByText("Copy/Paste as").hover();
+  await page.getByText("Paste properties").click();
+
+  await page.getByText("Board").nth(2).click({ button: "right" });
  await page.getByText("Copy/Paste as").hover();
  await page.getByText("Paste properties").click();

  await page
    .getByTestId("layer-item")
-    .getByText("Board")
+    .locator("div")
+    .filter({ hasText: "Path" })
    .nth(1)
    .click({ button: "right" });
  await page.getByText("Copy/Paste as").hover();
  await page.getByText("Paste properties").click();

-  await page
-    .getByTestId("layer-item")
-    .getByText("Path")
-    .click({ button: "right" });
-  await page.getByText("Copy/Paste as").hover();
-  await page.getByText("Paste properties").click();
-
-  await page
-    .getByTestId("layer-item")
-    .getByText("Ellipse")
-    .click({ button: "right" });
+  await page.getByText("Ellipse").click({ button: "right" });
  await page.getByText("Copy/Paste as").hover();
  await page.getByText("Paste properties").click();
 });
--- a/frontend/resources/styles/common/refactor/basic-rules.scss
+++ b/frontend/resources/styles/common/refactor/basic-rules.scss
@@ -667,9 +667,6 @@
 }

 // UI ELEMENTS
-
-// FIXME: This is used multiple times accross the app. We should design this in
-// the DS and create a proper component for it.
 .asset-element {
  @include bodySmallTypography;
  display: flex;
--- a/frontend/resources/styles/common/refactor/design-tokens.scss
+++ b/frontend/resources/styles/common/refactor/design-tokens.scss
@@ -245,6 +245,13 @@
  --assets-component-second-border-selected: var(--color-background-primary);
  --assets-component-hightlight: var(--color-accent-secondary);

+  --radio-btns-background-color: var(--color-background-tertiary);
+  --radio-btn-background-color-selected: var(--color-background-quaternary);
+  --radio-btn-foreground-color: var(--color-foreground-secondary);
+  --radio-btn-foreground-color-selected: var(--color-accent-primary);
+  --radio-btn-border-color: var(--color-background-tertiary);
+  --radio-btn-border-color-selected: var(--color-background-quaternary);
+
  --library-name-foreground-color: var(--color-foreground-primary);
  --library-content-foreground-color: var(--color-foreground-secondary);

@@ -417,6 +424,13 @@
  --tab-border-color: var(--color-background-tertiary);
  --tab-border-color-selected: var(--color-background-secondary);

+  --radio-btns-background-color: var(--color-background-tertiary);
+  --radio-btn-background-color-selected: var(--color-background-primary);
+  --radio-btn-foreground-color: var(--color-foreground-secondary);
+  --radio-btn-foreground-color-selected: var(--color-accent-primary);
+  --radio-btn-border-color: var(--color-background-tertiary);
+  --radio-btn-border-color-selected: var(--color-background-secondary);
+
  --button-icon-background-color-selected: var(--color-background-primary);
  --button-icon-border-color-selected: var(--color-background-secondary);

--- a/frontend/resources/templates/index.mustache
+++ b/frontend/resources/templates/index.mustache
@@ -24,8 +24,6 @@

    <link rel="icon" href="images/favicon.png" />

-    <script type="importmap">{{& manifest.importmap }}</script>
-
    <script type="module">
      globalThis.penpotVersion = "{{& version}}";
      globalThis.penpotBuildDate = "{{& build_date}}";
@@ -35,6 +33,7 @@
    {{# manifest}}
    <script src="{{& config}}"></script>
    <script src="{{& polyfills}}"></script>
+    <script type="importmap">{{& importmap }}</script>
    {{/manifest}}

    <!--cookie-consent-->
@@ -50,9 +49,7 @@
    <script type="module" src="{{& libs}}"></script>
    <script type="module">
      import { init } from "{{& app_main}}";
-      import defaultTranslations from "{{& default_translations}}";
-
-      init({defaultTranslations});
+      init();
    </script>
    {{/manifest}}
  </body>
--- a/frontend/resources/wasm-playground/graph.html
+++ b/frontend/resources/wasm-playground/graph.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="es">
+<head>
+  <meta charset="UTF-8" />
+</head>
+<body>  
+  <script type="module">
+    import initWasmModule from '/js/graph-wasm.js';
+
+    let Module = null;
+    function init(moduleInstance) {
+      Module = moduleInstance;
+    }
+
+    console.log("Loading module");
+    initWasmModule().then(Module => {      
+      init(Module);
+      Module._hello();
+    });
+    
+  </script>
+</body>
+</html>
--- a/frontend/scripts/_helpers.js
+++ b/frontend/scripts/_helpers.js
@@ -74,7 +74,7 @@ export function isJsFile(path) {
 export async function compileSass(worker, path, options) {
  path = ph.resolve(path);

-  // log.info("compile:", path);
+  log.info("compile:", path);
  return worker.exec("compileSass", [path, options]);
 }

@@ -187,7 +187,7 @@ async function readManifestFile(resource) {
  return JSON.parse(content);
 }

-async function generateManifest() {
+async function readShadowManifest() {
  const index = {
    app_main: "./js/main.js",
    render_main: "./js/render.js",
@@ -197,7 +197,6 @@ async function generateManifest() {
    polyfills: "./js/polyfills.js?version=" + CURRENT_VERSION,
    libs: "./js/libs.js?version=" + CURRENT_VERSION,
    worker_main: "./js/worker/main.js?version=" + CURRENT_VERSION,
-    default_translations: "./js/translation.en.js?version=" + CURRENT_VERSION,

    importmap: JSON.stringify({
      "imports": {
@@ -277,7 +276,6 @@ export async function compileTranslations() {
    "id",
    "ru",
    "tr",
-    "hi",
    "zh_CN",
    "zh_Hant",
    "hr",
@@ -393,7 +391,7 @@ async function generateTemplates() {
  const isDebug = process.env.NODE_ENV !== "production";
  await fs.mkdir("./resources/public/", { recursive: true });

-  const manifest = await generateManifest();
+  const manifest = await readShadowManifest();
  let content;

  const iconsSprite = await fs.readFile(
--- a/frontend/scripts/setup
+++ b/frontend/scripts/setup
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-corepack enable;
-corepack install;
-yarn install;
-yarn playwright install chromium;
--- a/frontend/scripts/test-components
+++ b/frontend/scripts/test-components
@@ -1,10 +1,13 @@
 #!/usr/bin/env bash

-SCRIPT_DIR=$(dirname $0);
-
 set -ex
+corepack enable;
+corepack install;
+yarn install;

-$SCRIPT_DIR/setup;
-
+yarn run playwright install chromium --with-deps;
 yarn run build:storybook
-yarn run test:storybook
+
+exec npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
+    "npx http-server storybook-static --port 6006 --silent" \
+    "npx wait-on tcp:6006 && yarn test:storybook"
--- a/frontend/scripts/test-e2e
+++ b/frontend/scripts/test-e2e
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash

-SCRIPT_DIR=$(dirname $0);
-
 set -ex
-
-$SCRIPT_DIR/setup;
-
+corepack enable;
+corepack install;
+yarn install;
+yarn run playwright install chromium --with-deps;
 yarn run test:e2e -x --workers=2 --reporter=list "$@";
--- a/frontend/scripts/watch
+++ b/frontend/scripts/watch
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-TARGET=${1:-app};
-
-set -ex
-
-exec yarn run watch:$TARGET
--- a/frontend/shadow-cljs.edn
+++ b/frontend/shadow-cljs.edn
@@ -92,7 +92,7 @@
   {:main
    {:entries [app.worker]
     :web-worker true
-     :prepend-js "importScripts('./render.js');"
+     :prepend-js "importScripts('./render.js', './graph-wasm-worker.js');"
     :depends-on #{}}}

   :js-options
@@ -121,22 +121,24 @@
  :storybook
  {:target :esm
   :output-dir "target/storybook/"
-   :devtools {:enabled false
-              :console-support false}
+   :devtools {:enabled false}
   :js-options
   {:js-provider :import
    :entry-keys ["module" "browser" "main"]
    :export-conditions ["module" "import", "browser" "require" "default"]}

   :modules
-   {:components
+   {:base
+    {:entries []}
+
+    :components
    {:exports {default app.main.ui.ds/default
               helpers app.main.ui.ds.helpers/default}
     :prepend-js ";(globalThis.goog.provide = globalThis.goog.constructNamespace_);(globalThis.goog.require = globalThis.goog.module.get);"
-     :depends-on #{}}}
+     :depends-on #{:base}}}

   :compiler-options
-   {:output-feature-set :es-next
+   {:output-feature-set :es2020
    :output-wrapper false
    :warnings {:fn-deprecated false}}}

--- a/frontend/src/app/graph_wasm.cljs
+++ b/frontend/src/app/graph_wasm.cljs
@@ -0,0 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.graph-wasm
+  "A WASM based render API"
+  (:require
+   [app.graph-wasm.api :as wasm.api]))
+
+(def module wasm.api/module)
--- a/frontend/src/app/graph_wasm/api.cljs
+++ b/frontend/src/app/graph_wasm/api.cljs
@@ -0,0 +1,91 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.graph-wasm.api
+  (:require
+   [app.common.data.macros :as dm]
+   [app.common.uuid :as uuid]
+   [app.config :as cf]
+   [app.graph-wasm.wasm :as wasm]
+   [app.render-wasm.helpers :as h]
+   [app.render-wasm.serializers :as sr]
+   [app.util.modules :as mod]
+   [promesa.core :as p]))
+
+(defn hello []
+  (h/call wasm/internal-module "_hello"))
+
+(defn init []
+  (h/call wasm/internal-module "_init"))
+
+(defn use-shape
+  [id]
+  (let [buffer (uuid/get-u32 id)]
+    (println "use-shape" id)
+    (h/call wasm/internal-module "_use_shape"
+            (aget buffer 0)
+            (aget buffer 1)
+            (aget buffer 2)
+            (aget buffer 3))))
+
+(defn set-shape-parent-id
+  [id]
+  (let [buffer (uuid/get-u32 id)]
+    (h/call wasm/internal-module "_set_shape_parent"
+            (aget buffer 0)
+            (aget buffer 1)
+            (aget buffer 2)
+            (aget buffer 3))))
+
+(defn set-shape-type
+  [type]
+  (h/call wasm/internal-module "_set_shape_type" (sr/translate-shape-type type)))
+
+(defn set-shape-selrect
+  [selrect]
+  (h/call wasm/internal-module "_set_shape_selrect"
+          (dm/get-prop selrect :x1)
+          (dm/get-prop selrect :y1)
+          (dm/get-prop selrect :x2)
+          (dm/get-prop selrect :y2)))
+
+(defn set-object
+  [shape]
+  (let [id           (dm/get-prop shape :id)
+        type         (dm/get-prop shape :type)
+        parent-id    (get shape :parent-id)
+        selrect      (get shape :selrect)
+        children     (get shape :shapes)]
+    (use-shape id)
+    (set-shape-type type)
+    (set-shape-parent-id parent-id)
+    (set-shape-selrect selrect)))
+
+(defn set-objects
+  [objects]
+  (doseq [shape (vals objects)]
+    (set-object shape)))
+
+(defn init-wasm-module
+  [module]
+  (let [default-fn (unchecked-get module "default")
+        href       (cf/resolve-href "js/graph-wasm.wasm")]
+    (default-fn #js {:locateFile (constantly href)})))
+
+(defonce module
+  (delay
+    (if (exists? js/dynamicImport)
+      (let [uri (cf/resolve-href "js/graph-wasm.js")]
+        (->> (mod/import uri)
+             (p/mcat init-wasm-module)
+             (p/fmap (fn [default]
+                       (set! wasm/internal-module default)
+                       true))
+             (p/merr
+              (fn [cause]
+                (js/console.error cause)
+                (p/resolved false)))))
+      (p/resolved false))))
--- a/frontend/src/app/graph_wasm/wasm.cljs
+++ b/frontend/src/app/graph_wasm/wasm.cljs
@@ -0,0 +1,9 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.graph-wasm.wasm)
+
+(defonce internal-module #js {})
--- a/frontend/src/app/main.cljs
+++ b/frontend/src/app/main.cljs
@@ -90,10 +90,7 @@
            (rx/map #(ws/initialize)))))))

 (defn ^:export init
-  [options]
-  (some-> (unchecked-get options "defaultTranslations")
-          (i18n/set-default-translations))
-
+  []
  (mw/init!)
  (i18n/init)
  (cur/init-styles)
--- a/frontend/src/app/main/constants.cljs
+++ b/frontend/src/app/main/constants.cljs
@@ -302,9 +302,3 @@
    :height 720}])

 (def max-input-length 255)
-
-(def ^:const default-slow-progress-threshold
-  "A constant value that represents a threshold in milliseconds when a
-  normal progress becomes tagged as slow if no event received in the
-  specified amount of time"
-  1000)
--- a/frontend/src/app/main/data/common.cljs
+++ b/frontend/src/app/main/data/common.cljs
@@ -10,7 +10,6 @@
   [app.common.data :as d]
   [app.common.data.macros :as dm]
   [app.common.schema :as sm]
-   [app.common.time :as ct]
   [app.common.types.team :as ctt]
   [app.main.data.helpers :as dsh]
   [app.main.data.modal :as modal]
@@ -230,91 +229,6 @@
                ;; Delay so the navigation can finish
                (rx/delay 250))))))))

-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; PROGRESS EVENTS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def noop-fn
-  (constantly nil))
-
-(def ^:private schema:progress-params
-  [:map {:title "Progress"}
-   [:key {:optional true} ::sm/text]
-   [:index {:optional true} ::sm/int]
-   [:total ::sm/int]
-   [:hints
-    [:map-of :keyword fn?]]
-   [:slow-progress-threshold {:optional true} ::sm/int]])
-
-(def ^:private check-progress-params
-  (sm/check-fn schema:progress-params))
-
-(defn initialize-progress
-  [& {:keys [key index total hints slow-progress-threshold] :as params}]
-
-  (assert (check-progress-params params))
-
-  (ptk/reify ::initialize-progress
-    ptk/UpdateEvent
-    (update [_ state]
-      (update state :progress
-              (fn [_]
-                (let [hint ((:normal hints noop-fn) params)]
-                  {:threshold (or slow-progress-threshold 5000)
-                   :key key
-                   :last-update (ct/now)
-                   :healthy true
-                   :visible true
-                   :hints hints
-                   :progress (d/nilv index 0)
-                   :total total
-                   :hint hint}))))))
-
-(defn update-progress
-  [{:keys [index total] :as params}]
-
-  (assert (check-progress-params params))
-
-  (ptk/reify ::update-progress
-    ptk/UpdateEvent
-    (update [_ state]
-      (update state :progress
-              (fn [state]
-                (let [last-update (get state :last-update)
-                      hints       (get state :hints)
-                      threshold   (get state :slow-progress-threshold)
-
-                      time-diff   (ct/diff-ms last-update (ct/now))
-                      healthy?    (< time-diff threshold)
-
-                      hint        (if healthy?
-                                    ((:normal hints noop-fn) params)
-                                    ((:slow hints noop-fn) params))]
-
-                  (-> state
-                      (assoc :progress index)
-                      (assoc :total total)
-                      (assoc :last-update (ct/now))
-                      (assoc :healthy healthy?)
-                      (assoc :hint hint))))))))
-
-(defn toggle-progress-visibility
-  []
-  (ptk/reify ::toggle-progress-visibility
-    ptk/UpdateEvent
-    (update [_ state]
-      (update state :progress
-              (fn [state]
-                (update state :visible not))))))
-
-(defn clear-progress
-  []
-  (ptk/reify ::clear-progress
-    ptk/UpdateEvent
-    (update [_ state]
-      (dissoc state :progress))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; NAVEGATION EVENTS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -472,21 +386,3 @@
        (rx/of ::dps/force-persist
               (rt/nav :viewer params options))))))

-(defn go-to-dashboard-deleted
-  [& {:keys [team-id] :as options}]
-  (ptk/reify ::go-to-dashboard-deleted
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [profile (get state :profile)
-            team-id (cond
-                      (= :default team-id)
-                      (:default-team-id profile)
-
-                      (uuid? team-id)
-                      team-id
-
-                      :else
-                      (:current-team-id state))
-            params  {:team-id team-id}]
-        (rx/of (modal/hide)
-               (rt/nav :dashboard-deleted params options))))))
--- a/frontend/src/app/main/data/dashboard.cljs
+++ b/frontend/src/app/main/data/dashboard.cljs
@@ -13,18 +13,14 @@
   [app.common.logging :as log]
   [app.common.schema :as sm]
   [app.common.time :as ct]
-   [app.common.types.project :refer [valid-project?]]
   [app.common.uuid :as uuid]
-   [app.main.constants :as mconst]
   [app.main.data.common :as dcm]
   [app.main.data.event :as ev]
   [app.main.data.fonts :as df]
   [app.main.data.helpers :as dsh]
   [app.main.data.modal :as modal]
-   [app.main.data.notifications :as ntf]
   [app.main.data.websocket :as dws]
   [app.main.repo :as rp]
-   [app.main.store :as st]
   [app.util.i18n :as i18n :refer [tr]]
   [app.util.sse :as sse]
   [beicon.v2.core :as rx]
@@ -80,8 +76,7 @@
    ptk/UpdateEvent
    (update [_ state]
      (reduce (fn [state {:keys [id] :as project}]
-                  ;; Replace completely instead of merge to ensure deleted-at is removed
-                (assoc-in state [:projects id] project))
+                (update-in state [:projects id] merge project))
              state
              projects))))

@@ -157,34 +152,6 @@
      (->> (rp/cmd! :get-builtin-templates)
           (rx/map builtin-templates-fetched)))))

-;; --- EVENT: deleted-files
-
-(defn- deleted-files-fetched
-  [files]
-  (ptk/reify ::deleted-files-fetched
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [now (ct/now)
-            filtered-files (filterv (fn [file]
-                                      (let [will-be-deleted-at (:will-be-deleted-at file)]
-                                        (or (nil? will-be-deleted-at)
-                                            (ct/is-after? will-be-deleted-at now))))
-                                    files)
-            files (d/index-by :id filtered-files)]
-        (-> state
-            (assoc :deleted-files files)
-            (update :files d/merge files))))))
-
-(defn fetch-deleted-files
-  ([] (fetch-deleted-files nil))
-  ([team-id]
-   (ptk/reify ::fetch-deleted-files
-     ptk/WatchEvent
-     (watch [_ state _]
-       (when-let [team-id (or team-id (:current-team-id state))]
-         (->> (rp/cmd! :get-team-deleted-files {:team-id team-id})
-              (rx/map deleted-files-fetched)))))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Data Selection
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -493,7 +460,6 @@
        (-> state
            (d/update-in-when [:files file-id] assoc :thumbnail-id thumbnail-id)
            (d/update-in-when [:recent-files file-id] assoc :thumbnail-id thumbnail-id)
-            (d/update-in-when [:deleted-files file-id] assoc :thumbnail-id thumbnail-id)
            (d/update-when :dashboard-search-result update-search-files))))))

 ;; --- EVENT: create-file
@@ -690,251 +656,3 @@
    :team-role-change       (handle-change-team-role msg)
    :team-membership-change (dcm/team-membership-change msg)
    nil))
-
-
-;; --- Delete files immediately
-
-(defn- delete-files
-  [{:keys [team-id ids on-success on-error]}]
-  (assert (uuid? team-id))
-  (assert (set? ids))
-  (assert (every? uuid? ids))
-  (assert (fn? on-success))
-  (assert (fn? on-error))
-
-  (ptk/reify ::delete-files
-    ptk/WatchEvent
-    (watch [_ _ _]
-      (let [progress-hint #(tr "dashboard.progress-notification.deleting-files")
-            slow-hint     #(tr "dashboard.progress-notification.slow-delete")
-            stream        (->> (rp/cmd! ::sse/permanently-delete-team-files {:team-id team-id :ids ids})
-                               (rx/share))]
-        (rx/merge
-         (rx/of (dcm/initialize-progress
-                 {:slow-progress-threshold
-                  mconst/default-slow-progress-threshold
-                  :total (count ids)
-                  :hints {:progress progress-hint
-                          :slow slow-hint}}))
-
-         (->> stream
-              (rx/filter sse/progress?)
-              (rx/mapcat (fn [event]
-                           (if-let [payload (sse/get-payload event)]
-                             (let [{:keys [index total]} payload]
-                               (if (and index total)
-                                 (rx/of (dcm/update-progress {:index index :total total}))
-                                 (rx/empty)))
-                             (rx/empty))))
-              (rx/catch rx/empty))
-
-         (->> stream
-              (rx/filter sse/end-of-stream?)
-              (rx/map sse/get-payload)
-              (rx/merge-map (fn [_]
-                              (rx/concat
-                               (rx/of (dcm/clear-progress)
-                                      (fetch-projects team-id)
-                                      (fetch-deleted-files team-id)
-                                      (fetch-projects team-id))
-                               (on-success))))
-
-              (rx/catch (fn [error]
-                          (rx/concat
-                           (rx/of (dcm/clear-progress))
-                           (on-error error))))))))))
-
-(defn delete-files-immediately
-  [{:keys [team-id ids] :as params}]
-  (assert (uuid? team-id))
-  (assert (set? ids))
-  (assert (every? uuid? ids))
-
-  (ptk/reify ::delete-files-immediately
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [deleted-files
-            (get state :deleted-files)
-
-            on-success
-            (fn []
-              (if (= 1 (count ids))
-                (let [fname (get-in deleted-files [(first ids) :name])]
-                  (rx/of (ntf/success (tr "dashboard.delete-success-notification" fname))))
-                (rx/of (ntf/success (tr "dashboard.delete-files-success-notification" (count ids))))))
-
-            on-error
-            #(rx/of (ntf/error (tr "dashboard.errors.error-on-delete-files")))]
-
-        (rx/of (ev/event
-                {::ev/name "delete-files"
-                 ::ev/origin "dashboard:trash"
-                 :team-id team-id
-                 :num-files (count ids)})
-               (delete-files
-                {:team-id team-id
-                 :ids ids
-                 :on-success on-success
-                 :on-error on-error}))))))
-
-
-(defn delete-project-immediately
-  [{:keys [team-id id name] :as project}]
-  (assert (valid-project? project))
-
-  (ptk/reify ::delete-project-immediately
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [ids
-            (reduce-kv (fn [acc file-id file]
-                         (if (= (:project-id file) id)
-                           (conj acc file-id)
-                           acc))
-                       #{}
-                       (get state :deleted-files))
-
-            on-success
-            #(rx/of (ntf/success (tr "dashboard.delete-success-notification" name)))
-
-            on-error
-            #(rx/of (ntf/error (tr "dashboard.errors.error-on-delete-project" name)))]
-
-        (rx/of (ev/event
-                {::ev/name "delete-files"
-                 ::ev/origin "dashboard:trash"
-                 :team-id team-id
-                 :project-id id
-                 :num-files (count ids)})
-               (delete-files
-                {:team-id team-id
-                 :ids ids
-                 :on-success on-success
-                 :on-error on-error}))))))
-
-
-;; --- Restore deleted files immediately
-
-
-(defn- restore-files
-  [{:keys [team-id ids on-success on-error]}]
-  (assert (uuid? team-id))
-  (assert (set? ids))
-  (assert (every? uuid? ids))
-  (assert (fn? on-success))
-  (assert (fn? on-error))
-
-  (ptk/reify ::restore-files
-    ptk/WatchEvent
-    (watch [_ _ _]
-      (let [progress-hint #(tr "dashboard.progress-notification.restoring-files")
-            slow-hint     #(tr "dashboard.progress-notification.slow-restore")]
-
-        (rx/merge
-         (rx/of (dcm/initialize-progress
-                 {:slow-progress-threshold
-                  mconst/default-slow-progress-threshold
-                  :total (count ids)
-                  :hints {:progress progress-hint
-                          :slow slow-hint}}))
-
-         (let [stream (->> (rp/cmd! ::sse/restore-deleted-team-files {:team-id team-id :ids ids})
-                           (rx/share))]
-
-           (rx/merge
-            (->> stream
-                 (rx/filter sse/progress?)
-                 (rx/mapcat (fn [event]
-                              (if-let [payload (sse/get-payload event)]
-                                (let [{:keys [index total]} payload]
-                                  (if (and index total)
-                                    (rx/of (dcm/update-progress {:index index :total total}))
-                                    (rx/empty)))
-                                (rx/empty))))
-                 (rx/catch rx/empty))
-
-            (->> stream
-                 (rx/filter sse/end-of-stream?)
-                 (rx/map sse/get-payload)
-                 (rx/mapcat (fn [_]
-                              (rx/concat
-                               (rx/of (dcm/clear-progress)
-                                      ;; (ntf/success (tr "dashboard.restore-success-notification"))
-                                      (fetch-projects team-id)
-                                      (fetch-deleted-files team-id)
-                                      (fetch-projects team-id))
-                               (on-success))))
-                 (rx/catch (fn [error]
-                             (rx/concat
-                              (rx/of (dcm/clear-progress))
-                              (on-error error))))))))))))
-
-
-
-(defn restore-files-immediately
-  [{:keys [team-id ids]}]
-  (assert (uuid? team-id))
-  (assert (set? ids))
-
-  (ptk/reify ::restore-files-immediately
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [deleted-files
-            (get state :deleted-files)
-
-            on-success
-            (fn []
-              (if (= 1 (count ids))
-                (let [fname (get-in deleted-files [(first ids) :name])]
-                  (rx/of (ntf/success (tr "dashboard.restore-success-notification" fname))))
-                (rx/of (ntf/success (tr "dashboard.restore-files-success-notification" (count ids))))))
-
-            on-error
-            (fn [_cause]
-              (if (= 1 (count ids))
-                (let [fname (get-in deleted-files [(first ids) :name])]
-                  (rx/of (ntf/error (tr "dashboard.errors.error-on-restore-file" fname))))
-                (rx/of (ntf/error (tr "dashboard.errors.error-on-restore-files")))))]
-
-        (rx/of (ev/event
-                {::ev/name "restore-files"
-                 ::ev/origin "dashboard:trash"
-                 :team-id team-id
-                 :num-files (count ids)})
-               (restore-files
-                {:team-id team-id
-                 :ids ids
-                 :on-success on-success
-                 :on-error on-error}))))))
-
-(defn restore-project-immediately
-  [{:keys [team-id id name] :as project}]
-  (assert (valid-project? project))
-
-  (ptk/reify ::restore-project-immediately
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [ids
-            (reduce-kv (fn [acc file-id file]
-                         (if (= (:project-id file) id)
-                           (conj acc file-id)
-                           acc))
-                       #{}
-                       (get state :deleted-files))
-
-            on-success
-            #(st/emit! (ntf/success (tr "dashboard.restore-success-notification" name)))
-
-            on-error
-            #(st/emit! (ntf/error (tr "dashboard.errors.error-on-restoring-project" name)))]
-
-        (rx/of (ev/event
-                {::ev/name "restore-files"
-                 ::ev/origin "dashboard:trash"
-                 :team-id team-id
-                 :project-id id
-                 :num-files (count ids)})
-               (restore-files
-                {:team-id team-id
-                 :ids ids
-                 :on-success on-success
-                 :on-error on-error}))))))
--- a/frontend/src/app/main/data/event.cljs
+++ b/frontend/src/app/main/data/event.cljs
@@ -98,7 +98,9 @@
 (def context
  (atom (d/without-nils (collect-context))))

-(add-watch i18n/locale "events" #(swap! context assoc :locale %4))
+(add-watch i18n/state "events"
+           (fn [_ _ _ v]
+             (swap! context assoc :locale (get v :locale))))

 ;; --- EVENT TRANSLATION

--- a/frontend/src/app/main/data/style_dictionary.cljs
+++ b/frontend/src/app/main/data/style_dictionary.cljs
@@ -236,7 +236,7 @@
  Uses `font-size-value` to calculate the relative line-height value.
  Returns an error for an invalid font-size value."
  [line-height-value font-size-value font-size-errors]
-  (let [missing-references (seq (cto/find-token-value-references line-height-value))
+  (let [missing-references (seq (some cto/find-token-value-references line-height-value))
        error
        (cond
          missing-references
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -270,12 +270,8 @@
  (ptk/reify ::process-wasm-object
    ptk/EffectEvent
    (effect [_ state _]
-      (let [objects (dsh/lookup-page-objects state)
-            shape (get objects id)]
-        ;; Only process objects that exist in the current page
-        ;; This prevents errors when processing changes from other pages
-        (when shape
-          (wasm.api/process-object shape))))))
+      (let [objects (dsh/lookup-page-objects state)]
+        (wasm.api/process-object (get objects id))))))

 (defn initialize-workspace
  [team-id file-id]
@@ -432,12 +428,10 @@
                                                :val position-data
                                                :ignore-touched true
                                                :ignore-geometry true}]})))]
-                            (when (d/not-empty? changes)
-                              (dch/commit-changes
-                               {:redo-changes changes :undo-changes []
-                                :save-undo? false
-                                :tags #{:position-data}})))))
-                       (rx/take-until stoper-s))))
+                            (dch/commit-changes
+                             {:redo-changes changes :undo-changes []
+                              :save-undo? false
+                              :tags #{:position-data}})))))))

              (->> stream
                   (rx/filter dch/commit?)
--- a/frontend/src/app/main/data/workspace/colors.cljs
+++ b/frontend/src/app/main/data/workspace/colors.cljs
@@ -14,7 +14,7 @@
   [app.common.types.fills :as types.fills]
   [app.common.types.library :as ctl]
   [app.common.types.shape :as shp]
-   [app.common.types.shape.shadow :as types.shadow]
+   [app.common.types.shape.shadow :refer [check-shadow]]
   [app.common.types.text :as txt]
   [app.main.broadcast :as mbc]
   [app.main.data.helpers :as dsh]
@@ -406,30 +406,30 @@

 (defn change-shadow
  [ids attrs index]
-  (letfn [(update-shadow [shape]
-            (let [;; If we try to set a gradient to a shadow (for
-                  ;; example using the color selection from
-                  ;; multiple shapes) let's use the first stop
-                  ;; color
-                  attrs  (cond-> attrs
-                           (:gradient attrs)
-                           (-> (dm/get-in [:gradient :stops 0])
-                               (select-keys types.shadow/color-attrs)))
+  (ptk/reify ::change-shadow
+    ptk/WatchEvent
+    (watch [_ _ _]
+      (rx/of (dwsh/update-shapes
+              ids
+              (fn [shape]
+                (let [;; If we try to set a gradient to a shadow (for
+                      ;; example using the color selection from
+                      ;; multiple shapes) let's use the first stop
+                      ;; color
+                      attrs  (cond-> attrs
+                               (:gradient attrs)
+                               (dm/get-in [:gradient :stops 0]))

-                  attrs' (-> (dm/get-in shape [:shadow index :color])
-                             (merge attrs)
-                             (d/without-nils))]
-              (assoc-in shape [:shadow index :color] attrs')))]
-    (ptk/reify ::change-shadow
-      ptk/WatchEvent
-      (watch [_ _ _]
-        (rx/of (dwsh/update-shapes ids update-shadow))))))
+                      attrs' (-> (dm/get-in shape [:shadow index :color])
+                                 (merge attrs)
+                                 (d/without-nils))]
+                  (assoc-in shape [:shadow index :color] attrs'))))))))

 (defn add-shadow
  [ids shadow]

  (assert
-   (types.shadow/check-shadow shadow)
+   (check-shadow shadow)
   "expected a valid shadow struct")

  (assert
@@ -1122,7 +1122,7 @@
        ref-id     (:stroke-color-ref-id stroke)

        colors     (-> libraries
-                       (get ref-file)
+                       (get ref-id)
                       (get :data)
                       (ctl/get-colors))
        shared?    (contains? colors ref-id)
@@ -1146,16 +1146,16 @@
 (defn- shadow->color-attr
  "Given a stroke map enriched with :shape-id, :index, and optionally
     :has-token-applied / :token-name, returns a color attribute map.
-
+  
     If :has-token-applied is true, adds token metadata to :attrs:
       {:has-token-applied true
        :token-name <token-name>}
-
+  
     Args:
     - stroke: map with stroke info, including :shape-id and :index
     - file-id: current file UUID
     - libraries: map of shared color libraries
-
+  
     Returns:
     A map like:
     {:attrs {...color data...}
@@ -1167,7 +1167,7 @@
        ref-file (get color :ref-file)
        ref-id   (get color :ref-id)
        colors   (-> libraries
-                     (get ref-file)
+                     (get ref-id)
                     (get :data)
                     (ctl/get-colors))
        shared?  (contains? colors ref-id)
@@ -1180,20 +1180,19 @@
     :index (:index shadow)}))

 (defn- text->color-att
-  [fill file-id libraries & {:keys [has-token-applied token-name]}]
+  [fill file-id libraries]
  (let [ref-file (:fill-color-ref-file fill)
        ref-id   (:fill-color-ref-id fill)
        colors   (-> libraries
-                     (get ref-file)
+                     (get ref-id)
                     (get :data)
                     (ctl/get-colors))
+
        shared?  (contains? colors ref-id)
-        base-attrs (cond-> (types.fills/fill->color fill)
-                     (not (or shared? (= ref-file file-id)))
-                     (dissoc :ref-file :ref-id))
-        attrs (cond-> base-attrs
-                has-token-applied (assoc :has-token-applied true)
-                token-name (assoc :token-name token-name))]
+        attrs    (cond-> (types.fills/fill->color fill)
+                   (not (or shared? (= ref-file file-id)))
+                   (dissoc :ref-file :ref-id))]
+
    {:attrs attrs
     :prop :content
     :shape-id (:shape-id fill)
@@ -1201,18 +1200,13 @@

 (defn- extract-text-colors
  [text file-id libraries]
-  (let [applied-fill-token (get-in text [:applied-tokens :fill])
-        treat-node
+  (let [treat-node
        (fn [node shape-id]
-          (map-indexed (fn [idx fill]
-                         (let [args (cond-> []
-                                      (and (= idx 0) applied-fill-token)
-                                      (conj :has-token-applied true :token-name applied-fill-token))]
-                           (apply text->color-att (assoc fill :shape-id shape-id :index idx) file-id libraries args)))
-                       node))]
+          (map-indexed #(assoc %2 :shape-id shape-id :index %1) node))]
    (->> (txt/node-seq txt/is-text-node? (:content text))
         (map :fills)
-         (mapcat #(treat-node % (:id text))))))
+         (mapcat #(treat-node % (:id text)))
+         (map #(text->color-att % file-id libraries)))))

 (defn- fill->color-att
  "Given a fill map enriched with :shape-id, :index, and optionally
@@ -1238,7 +1232,7 @@
        ref-id     (:fill-color-ref-id fill)

        colors     (-> libraries
-                       (get ref-file)
+                       (get ref-id)
                       (get :data)
                       (ctl/get-colors))
        shared?    (contains? colors ref-id)
@@ -1266,12 +1260,12 @@
     will include extra attributes in its :attrs map:
       {:has-token-applied true
        :token-name <token-name>}
-
+  
     Args:
     - shapes: vector of shape maps
     - file-id: current file UUID
     - libraries: map of shared color libraries
-
+  
     Returns:
     A vector of color attribute maps with metadata for each shape."
  [shapes file-id libraries]
--- a/frontend/src/app/main/data/workspace/componentize.cljs
+++ b/frontend/src/app/main/data/workspace/componentize.cljs
@@ -0,0 +1,288 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+;;
+;; High level helpers to turn a shape subtree into a component and
+;; replace equivalent subtrees by instances of that component.
+
+(ns app.main.data.workspace.componentize
+  (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
+   [app.common.files.changes-builder :as pcb]
+   [app.common.files.helpers :as cfh]
+   [app.common.geom.point :as gpt]
+   [app.common.logic.libraries :as cll]
+   [app.common.logic.shapes :as cls]
+   [app.common.types.shape :as cts]
+   [app.common.uuid :as uuid]
+   [app.main.data.changes :as dch]
+   [app.main.data.helpers :as dsh]
+   [app.main.data.workspace.libraries :as dwl]
+   [app.main.data.workspace.selection :as dws]
+   [app.main.data.workspace.shapes :as dwsh]
+   [app.main.data.workspace.undo :as dwu]
+   [beicon.v2.core :as rx]
+   [potok.v2.core :as ptk]))
+
+;; NOTE: We keep this separate from `workspace.libraries` to avoid
+;; introducing more complexity in that already big namespace.
+
+(def ^:private instance-structural-keys
+  "Keys we do NOT want to copy from the original shape when creating a
+  new component instance. These are identity / structural / component
+  metadata keys that must be managed by the component system itself."
+  #{:id
+    :parent-id
+    :frame-id
+    :shapes
+    ;; Component metadata
+    :component-id
+    :component-file
+    :component-root
+    :main-instance
+    :remote-synced
+    :shape-ref
+    :touched})
+
+(def ^:private instance-geometry-keys
+  "Geometry-related keys that we *do* want to override per instance when
+  copying props from an existing subtree to a component instance."
+  #{:x
+    :y
+    :width
+    :height
+    :rotation
+    :flip-x
+    :flip-y
+    :selrect
+    :points
+    :proportion
+    :proportion-lock
+    :transform
+    :transform-inverse})
+
+(defn- instantiate-similar-subtrees
+  "Internal helper. Given an atom `id-ref` that will contain the
+  `component-id`, replace each subtree rooted at the ids in
+  `similar-ids` by an instance of that component.
+
+  The operation is performed in a single undo transaction:
+  - Instantiate the component once per similar id, roughly at the same
+    top-left position as the original root.
+  - Delete the original subtrees.
+  - Select the main instance plus all the new instances."
+  [id-ref root-id similar-ids]
+  (ptk/reify ::instantiate-similar-subtrees
+    ptk/WatchEvent
+    (watch [it state _]
+      (let [component-id @id-ref
+            similar-ids   (vec (or similar-ids []))]
+        (if (or (uuid/zero? component-id)
+                (empty? similar-ids))
+          (rx/empty)
+          (let [file-id   (:current-file-id state)
+                page      (dsh/lookup-page state)
+                page-id   (:id page)
+                objects   (:objects page)
+                libraries (dsh/lookup-libraries state)
+                fdata     (dsh/lookup-file-data state file-id)
+
+                ;; Reference subtree: shapes used to build the component.
+                ;; We'll compute per-shape deltas against this subtree so
+                ;; that we only override attributes that actually differ.
+                ref-subtree-ids (cfh/get-children-ids objects root-id)
+                ref-all-ids     (into [root-id] ref-subtree-ids)
+
+                undo-id   (js/Symbol)
+
+                ;; 1) Instantiate component at each similar root position,
+                ;;    preserving per-instance overrides (geometry, style, etc.)
+                [changes new-root-ids]
+                (reduce
+                 (fn [[changes acc] sid]
+                   (if-let [shape (get objects sid)]
+                     (let [position (gpt/point (:x shape) (:y shape))
+                           ;; Remember original parent and index so we can keep
+                           ;; the same ordering among the parent's children.
+                           orig-root        (get objects sid)
+                           orig-parent-id   (:parent-id orig-root)
+                           orig-index       (when orig-parent-id
+                                              (cfh/get-position-on-parent objects sid))
+                           ;; Instantiate a new component instance at the same position
+                           [new-shape changes']
+                           (cll/generate-instantiate-component
+                            (or changes
+                                (-> (pcb/empty-changes it page-id)
+                                    (pcb/with-objects objects)))
+                            objects
+                            file-id
+                            component-id
+                            position
+                            page
+                            libraries)
+                           ;; Build a structural mapping between the original subtree
+                           ;; (rooted at `sid`) and the new instance subtree.
+                           ;; NOTE 1: instantiating a component can introduce an extra
+                           ;; wrapper frame, so we try to align the original root
+                           ;; with the "equivalent" root inside the instance.
+                           ;; NOTE 2: by default the instance may be created *inside*
+                           ;; the original shape (because of layout / hit-testing).
+                           ;; We explicitly move the new instance to the same parent
+                           ;; and index as the original root, so that later deletes of
+                           ;; the original subtree don't remove the new instances and
+                           ;; the ordering among siblings is preserved.
+                           changes'         (cond-> changes'
+                                              (some? orig-parent-id)
+                                              (pcb/change-parent orig-parent-id [new-shape] orig-index
+                                                                 {:allow-altering-copies true
+                                                                  :ignore-touched true}))
+                           objects'         (pcb/get-objects changes')
+                           orig-root        (get objects sid)
+                           new-root         new-shape
+                           orig-type        (:type orig-root)
+                           new-type         (:type new-root)
+                           ;; Full original subtree (root + descendants)
+                           orig-subtree-ids (cfh/get-children-ids objects sid)
+                           orig-all-ids     (into [sid] orig-subtree-ids)
+                           ;; Try to find an inner instance root matching the original type
+                           ;; when the outer instance root type differs (e.g. rect -> frame+rect).
+                           direct-new-children (cfh/get-children-ids objects' (:id new-root))
+                           candidate-instance-root
+                           (when (and orig-type (not= orig-type new-type))
+                             (let [cands (->> direct-new-children
+                                              (filter (fn [nid]
+                                                        (when-let [s (get objects' nid)]
+                                                          (= (:type s) orig-type)))))]
+                               (when (= 1 (count cands))
+                                 (first cands))))
+                           instance-root-id (or candidate-instance-root (:id new-root))
+                           instance-root    (get objects' instance-root-id)
+                           new-subtree-ids  (cfh/get-children-ids objects' instance-root-id)
+                           new-all-ids      (into [instance-root-id] new-subtree-ids)
+                           id-pairs         (map vector orig-all-ids new-all-ids)
+                           changes''
+                           ;; Compute per-shape deltas against the reference
+                           ;; subtree (root-id) and apply only the differences
+                           ;; to the new instance subtree, so we don't blindly
+                           ;; overwrite attributes that are the same.
+                           (reduce
+                            (fn [ch [idx orig-id new-id]]
+                              (let [ref-id     (nth ref-all-ids idx nil)
+                                    ref-shape  (get objects ref-id)
+                                    orig-shape (get objects orig-id)]
+                                (if (and ref-shape orig-shape)
+                                  (let [;; Style / layout / text props (see `extract-props`)
+                                        ref-style   (cts/extract-props ref-shape)
+                                        orig-style  (cts/extract-props orig-shape)
+                                        style-delta (reduce (fn [m k]
+                                                              (let [rv (get ref-style k ::none)
+                                                                    ov (get orig-style k ::none)]
+                                                                (if (= rv ov)
+                                                                  m
+                                                                  (assoc m k ov))))
+                                                            {}
+                                                            (keys orig-style))
+
+                                        ;; Geometry props
+                                        ref-geom    (select-keys ref-shape instance-geometry-keys)
+                                        orig-geom   (select-keys orig-shape instance-geometry-keys)
+                                        geom-delta  (reduce (fn [m k]
+                                                              (let [rv (get ref-geom k ::none)
+                                                                    ov (get orig-geom k ::none)]
+                                                                (if (= rv ov)
+                                                                  m
+                                                                  (assoc m k ov))))
+                                                            {}
+                                                            (keys orig-geom))
+
+                                        ;; Text content: if the subtree reference and the
+                                        ;; original differ in `:content`, treat the whole
+                                        ;; content tree as an override for this instance.
+                                        content-delta? (not= (:content ref-shape) (:content orig-shape))]
+                                    (-> ch
+                                        ;; First patch style/text/layout props using the
+                                        ;; canonical helpers so we don't touch structural ids.
+                                        (cond-> (seq style-delta)
+                                          (pcb/update-shapes
+                                           [new-id]
+                                           (fn [s objs] (cts/patch-props s style-delta objs))
+                                           {:with-objects? true}))
+                                        ;; Then patch geometry directly on the instance.
+                                        (cond-> (seq geom-delta)
+                                          (pcb/update-shapes
+                                           [new-id]
+                                           (d/patch-object geom-delta)))
+                                        ;; Finally, if text content differs between the
+                                        ;; reference subtree and the similar subtree,
+                                        ;; override the instance content with the original.
+                                        (cond-> content-delta?
+                                          (pcb/update-shapes
+                                           [new-id]
+                                           #(assoc % :content (:content orig-shape))))))
+                                  ch)))
+                            changes'
+                            (map-indexed (fn [idx [orig-id new-id]]
+                                           [idx orig-id new-id])
+                                         id-pairs))]
+                       [changes'' (conj acc (:id new-shape))])
+                     ;; If the shape does not exist we just skip it
+                     [changes acc]))
+                 [nil []]
+                 similar-ids)
+
+                changes (or changes
+                            (-> (pcb/empty-changes it page-id)
+                                (pcb/with-objects objects)))
+
+                ;; 2) Delete original similar subtrees
+                ;; NOTE: `d/ordered-set` with a single arg treats it as a single
+                ;; element, so we must use `into` when we already have a collection.
+                ids-to-delete (into (d/ordered-set) similar-ids)
+                [all-parents changes]
+                (cls/generate-delete-shapes
+                 changes
+                 fdata
+                 page
+                 objects
+                 ids-to-delete
+                 {:allow-altering-copies true})
+
+                ;; 3) Select main instance + new instances
+                ;;    Root id is kept as-is; add all new roots.
+                sel-ids (into (d/ordered-set) (cons root-id new-root-ids))]
+
+            (rx/of
+             (dwu/start-undo-transaction undo-id)
+             (dch/commit-changes changes)
+             (ptk/data-event :layout/update {:ids all-parents})
+             (dwu/commit-undo-transaction undo-id))))))))
+
+(defn componentize-similar-subtrees
+  "Turn the subtree rooted at `root-id` into a component, then replace
+  the subtrees rooted at `similar-ids` with instances of that component.
+
+  This is implemented in two phases:
+  1) Use the existing `dwl/add-component` flow to create a component
+     from `root-id` (and obtain its `component-id`).
+  2) Using the new `component-id`, instantiate the component once per
+     entry in `similar-ids` and delete the old subtrees."
+  [root-id similar-ids]
+  (dm/assert!
+   "expected valid uuid for `root-id`"
+   (uuid? root-id))
+
+  (let [similar-ids (vec (or similar-ids []))]
+    (ptk/reify ::componentize-similar-subtrees
+      ptk/WatchEvent
+      (watch [_ _ _]
+        (let [id-ref (atom uuid/zero)]
+          (rx/concat
+           ;; 1) Create component using the existing pipeline
+           (rx/of (dwl/add-component id-ref (d/ordered-set root-id)))
+           ;; 2) Replace similar subtrees by instances of the new component
+           (rx/of (instantiate-similar-subtrees id-ref root-id similar-ids))))))))
+
+
--- a/frontend/src/app/main/data/workspace/path/edition.cljs
+++ b/frontend/src/app/main/data/workspace/path/edition.cljs
@@ -47,31 +47,32 @@
  (ptk/reify ::apply-content-modifiers
    ptk/WatchEvent
    (watch [it state _]
-      (let [id    (st/get-path-id state)
-            shape (st/get-path state)
+      (let [page-id (get state :current-page-id state)
+            objects (dsh/lookup-page-objects state)
+
+            id (st/get-path-id state)
+
+            shape
+            (st/get-path state)

            content-modifiers
-            (dm/get-in state [:workspace-local :edit-path id :content-modifiers])]
-        (if (or (nil? shape) (nil? content-modifiers))
-          (rx/of (dwe/clear-edition-mode))
-          (let [page-id      (get state :current-page-id state)
-                objects      (dsh/lookup-page-objects state)
+            (dm/get-in state [:workspace-local :edit-path id :content-modifiers])

-                content      (get shape :content)
-                new-content  (path/apply-content-modifiers content content-modifiers)
+            content      (get shape :content)
+            new-content  (path/apply-content-modifiers content content-modifiers)

-                old-points   (path.segment/get-points content)
-                new-points   (path.segment/get-points new-content)
-                point-change (->> (map hash-map old-points new-points) (reduce merge))]
+            old-points   (path.segment/get-points content)
+            new-points   (path.segment/get-points new-content)
+            point-change (->> (map hash-map old-points new-points) (reduce merge))]

-            (when (and (some? new-content) (some? shape))
-              (let [changes (changes/generate-path-changes it objects page-id shape (:content shape) new-content)]
-                (if (empty? new-content)
-                  (rx/of (dch/commit-changes changes)
-                         (dwe/clear-edition-mode))
-                  (rx/of (dch/commit-changes changes)
-                         (selection/update-selection point-change)
-                         (fn [state] (update-in state [:workspace-local :edit-path id] dissoc :content-modifiers :moving-nodes :moving-handler))))))))))))
+        (when (and (some? new-content) (some? shape))
+          (let [changes (changes/generate-path-changes it objects page-id shape (:content shape) new-content)]
+            (if (empty? new-content)
+              (rx/of (dch/commit-changes changes)
+                     (dwe/clear-edition-mode))
+              (rx/of (dch/commit-changes changes)
+                     (selection/update-selection point-change)
+                     (fn [state] (update-in state [:workspace-local :edit-path id] dissoc :content-modifiers :moving-nodes :moving-handler))))))))))

 (defn modify-content-point
  [content {dx :x dy :y} modifiers point]
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -554,7 +554,7 @@
       (when (features/active-feature? state "text-editor/v2")
         (let [instance (:workspace-editor state)
               styles   (some-> (editor.v2/getCurrentStyle instance)
-                                (styles/get-styles-from-style-declaration :removed-mixed true)
+                                (styles/get-styles-from-style-declaration)
                                ((comp update-node-fn migrate-node))
                                (styles/attrs->styles))]
           (editor.v2/applyStylesToSelection instance styles)))))))
--- a/frontend/src/app/main/data/workspace/tokens/application.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/application.cljs
@@ -633,43 +633,6 @@
                           :shape-ids shape-ids
                           :on-update-shape on-update-shape}))))))))

-(defn toggle-border-radius-token
-  [{:keys [token attrs shape-ids expand-with-children]}]
-  (ptk/reify ::on-toggle-border-radius-token
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [objects (dsh/lookup-page-objects state)
-            shapes (into [] (keep (d/getf objects)) shape-ids)
-
-            shapes
-            (if expand-with-children
-              (into []
-                    (mapcat (fn [shape]
-                              (if (= (:type shape) :group)
-                                (keep objects (:shapes shape))
-                                [shape])))
-                    shapes)
-              shapes)
-
-            {:keys [attributes all-attributes]}
-            (get token-properties (:type token))
-
-            unapply-tokens?
-            (cft/shapes-token-applied? token shapes (or attrs all-attributes attributes))
-
-            shape-ids (map :id shapes)]
-
-        (if unapply-tokens?
-          (rx/of
-           (unapply-token {:attributes (or attrs all-attributes attributes)
-                           :token token
-                           :shape-ids shape-ids}))
-          (rx/of
-           (apply-token {:attributes attrs
-                         :token token
-                         :shape-ids shape-ids
-                         :on-update-shape update-shape-radius-for-corners})))))))
-

 (defn apply-token-on-selected
  [color-operations token]
--- a/frontend/src/app/main/data/workspace/tokens/import_export.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/import_export.cljs
@@ -74,7 +74,7 @@
  (when unknown-tokens
    (st/emit! (show-unknown-types-warning unknown-tokens)))
  (try
-    (->> (ctob/get-all-tokens-map tokens-lib)
+    (->> (ctob/get-all-tokens tokens-lib)
         (sd/resolve-tokens-with-verbose-errors)
         (rx/map (fn [_]
                   tokens-lib))
--- a/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
@@ -11,7 +11,6 @@
   [app.common.files.helpers :as cfh]
   [app.common.geom.point :as gpt]
   [app.common.logic.tokens :as clt]
-   [app.common.path-names :as cpn]
   [app.common.types.shape :as cts]
   [app.common.types.tokens-lib :as ctob]
   [app.common.uuid :as uuid]
@@ -23,7 +22,6 @@
   [app.main.data.workspace.tokens.propagation :as dwtp]
   [app.util.i18n :refer [tr]]
   [beicon.v2.core :as rx]
-   [cuerdas.core :as str]
   [potok.v2.core :as ptk]))

 (declare set-selected-token-set-id)
@@ -462,35 +460,12 @@
 ;; TOKEN UI OPS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-(defn clean-tokens-paths
-  []
-  (ptk/reify ::clean-tokens-paths
+(defn set-token-type-section-open
+  [token-type open?]
+  (ptk/reify ::set-token-type-section-open
    ptk/UpdateEvent
    (update [_ state]
-      (assoc-in state [:workspace-tokens :unfolded-token-paths] []))))
-
-(defn toggle-token-path
-  [path]
-  (ptk/reify ::toggle-token-path
-    ptk/UpdateEvent
-    (update [_ state]
-      (update-in state [:workspace-tokens :unfolded-token-paths]
-                 (fn [paths]
-                   (let [paths (or paths [])]
-                     (if (some #(= % path) paths)
-                       (vec (remove #(or (= % path)
-                                         (str/starts-with? % (str path ".")))
-                                    paths))
-                       (let [split-path (cpn/split-path path :separator ".")
-                             partial-paths (reduce
-                                            (fn [acc segment]
-                                              (let [new-acc (if (empty? acc)
-                                                              segment
-                                                              (str (last acc) "." segment))]
-                                                (conj acc new-acc)))
-                                            []
-                                            split-path)]
-                         (into paths partial-paths)))))))))
+      (update-in state [:workspace-tokens :open-status-by-type] assoc token-type open?))))

 (defn assign-token-context-menu
  [{:keys [position] :as params}]
--- a/frontend/src/app/main/data/workspace/tokens/propagation.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/propagation.cljs
@@ -22,9 +22,6 @@
   [clojure.set :as set]
   [potok.v2.core :as ptk]))

-;; Change this to :info :debug or :trace to debug this module, or :warn to reset to default
-(l/set-level! :warn)
-
 ;; Helpers ---------------------------------------------------------------------

 ;; TODO: see if this can be replaced by more standard functions
--- a/frontend/src/app/main/data/workspace/tokens/remapping.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/remapping.cljs
@@ -1,177 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.main.data.workspace.tokens.remapping
-  "Core logic for token remapping functionality"
-  (:require
-   [app.common.files.changes-builder :as pcb]
-   [app.common.files.tokens :as cft]
-   [app.common.logging :as log]
-   [app.common.types.container :refer [shapes-seq]]
-   [app.common.types.file :refer [object-containers-seq]]
-   [app.common.types.token :as cto]
-   [app.common.types.tokens-lib :as ctob]
-   [app.main.data.changes :as dch]
-   [app.main.data.helpers :as dh]
-   [beicon.v2.core :as rx]
-   [cuerdas.core :as str]
-   [potok.v2.core :as ptk]))
-
-;; Change this to :info :debug or :trace to debug this module, or :warn to reset to default
-(log/set-level! :warn)
-
-;; Token Reference Scanning
-;; ========================
-
-(defn scan-shape-applied-tokens
-  "Scan a shape for applied token references to a specific token name"
-  [shape token-name container]
-  (when-let [applied-tokens (:applied-tokens shape)]
-    (for [[attribute applied-token-name] applied-tokens
-          :when (= applied-token-name token-name)]
-      {:type :applied-token
-       :shape-id (:id shape)
-       :attribute attribute
-       :token-name applied-token-name
-       :container container})))
-
-(defn scan-token-value-references
-  "Scan a token value for references to a specific token name (alias), supporting complex token values."
-  [token token-name]
-  (letfn [(find-all-token-value-references [token-value]
-            (cond
-              (string? token-value)
-              (filter #(= % token-name) (cto/find-token-value-references token-value))
-
-              (map? token-value)
-              (mapcat find-all-token-value-references (vals token-value))
-
-              (sequential? token-value)
-              (mapcat find-all-token-value-references token-value)
-
-              :else
-              []))]
-    (when-let [value (:value token)]
-      (for [referenced-token-name (find-all-token-value-references value)]
-        {:type :token-alias
-         :source-token-id (:id token)
-         :referenced-token-name referenced-token-name}))))
-
-(defn scan-workspace-token-references
-  "Scan entire workspace for all token references to a specific token"
-  [file-data old-token-name]
-  (let [tokens-lib (:tokens-lib file-data)
-        containers (object-containers-seq file-data)
-
-        ;; Scan all shapes for applied token references to the specific token
-        matching-applied (mapcat (fn [container]
-                                   (let [shapes (shapes-seq container)]
-                                     (mapcat #(scan-shape-applied-tokens % old-token-name container) shapes)))
-                                 containers)
-
-        ;; Scan tokens library for alias references to the specific token
-        matching-aliases (if tokens-lib
-                           (let [all-tokens (ctob/get-all-tokens tokens-lib)]
-                             (mapcat #(scan-token-value-references % old-token-name) all-tokens))
-                           [])]
-    (log/info :hint "token-scan-details"
-              :token-name old-token-name
-              :containers-count (count containers)
-              :total-applied-refs (count matching-applied)
-              :matching-applied (count matching-applied)
-              :total-alias-refs (count matching-aliases)
-              :matching-aliases (count matching-aliases))
-
-    {:applied-tokens matching-applied
-     :token-aliases matching-aliases
-     :total-references (+ (count matching-applied) (count matching-aliases))}))
-
-;; Token Remapping Core Logic
-;; ==========================
-
-(defn remap-tokens
-  "Main function to remap all token references when a token name changes"
-  [old-token-name new-token-name]
-  (ptk/reify ::remap-tokens
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [file-data (dh/lookup-file-data state)
-            scan-results (scan-workspace-token-references file-data old-token-name)
-            tokens-lib (:tokens-lib file-data)
-            sets (ctob/get-sets tokens-lib)
-            tokens-with-sets (mapcat (fn [set]
-                                       (map (fn [token]
-                                              {:token token :set set})
-                                            (vals (ctob/get-tokens tokens-lib (ctob/get-id set)))))
-                                     sets)
-
-            ;; Group applied token references by container
-            refs-by-container (group-by :container (:applied-tokens scan-results))
-
-            ;; Use apply-token logic to update shapes for both direct and alias references
-            shape-changes (reduce-kv
-                           (fn [changes container refs]
-                             (let [shape-ids (map :shape-id refs)
-                                   ;; Find the correct token to apply (new or alias)
-                                   token (or (some #(when (= (:name (:token %)) new-token-name) %) tokens-with-sets)
-                                             (some #(when (= (:name (:token %)) old-token-name) %) tokens-with-sets))
-                                   attributes (set (map :attribute refs))]
-                               (if token
-                                 (-> (pcb/with-container changes container)
-                                     (pcb/update-shapes shape-ids
-                                                        (fn [shape]
-                                                          (update shape :applied-tokens
-                                                                  #(merge % (cft/attributes-map attributes (:token token)))))))
-                                 changes)))
-                           (-> (pcb/empty-changes)
-                               (pcb/with-file-data file-data)
-                               (pcb/with-library-data file-data))
-                           refs-by-container)
-
-            ;; Create changes for updating token alias references
-            token-changes (reduce
-                           (fn [changes ref]
-                             (let [source-token-id (:source-token-id ref)]
-                               (when-let [{:keys [token set]} (some #(when (= (:id (:token %)) source-token-id) %) tokens-with-sets)]
-                                 (let [old-value (:value token)
-                                       new-value (cto/update-token-value-references old-value old-token-name new-token-name)]
-                                   (pcb/set-token changes (ctob/get-id set) (:id token)
-                                                  (assoc token :value new-value))))))
-                           shape-changes
-                           (:token-aliases scan-results))]
-
-        (log/info :hint "token-remapping"
-                  :old-name old-token-name
-                  :new-name new-token-name
-                  :references-count (:total-references scan-results))
-
-        (rx/of (dch/commit-changes token-changes))))))
-
-(defn validate-token-remapping
-  "Validate that a token remapping operation is safe to perform"
-  [old-name new-name]
-  (cond
-    (str/blank? new-name)
-    {:valid? false
-     :error :invalid-name
-     :message "Token name cannot be empty"}
-    (= old-name new-name)
-    {:valid? false
-     :error :no-change
-     :message "New name is the same as current name"}
-    :else
-    {:valid? true}))
-
-(defn count-token-references
-  "Count the number of references to a token in the workspace"
-  [file-data token-name]
-  (let [scan-results (scan-workspace-token-references file-data token-name)]
-    (log/info :hint "token-reference-scan"
-              :token-name token-name
-              :applied-refs (count (:applied-tokens scan-results))
-              :alias-refs (count (:token-aliases scan-results))
-              :total (:total-references scan-results))
-    (:total-references scan-results)))
--- a/frontend/src/app/main/data/workspace/transforms.cljs
+++ b/frontend/src/app/main/data/workspace/transforms.cljs
@@ -238,12 +238,12 @@
                :always
                (ctm/resize scalev resize-origin shape-transform shape-transform-inverse)

-                (and (or (ctl/any-layout-immediate-child? objects shape) (ctl/any-layout? shape))
+                (and (ctl/any-layout-immediate-child? objects shape)
                     (not= (:layout-item-h-sizing shape) :fix)
                     ^boolean change-width?)
                (ctm/change-property :layout-item-h-sizing :fix)

-                (and (or (ctl/any-layout-immediate-child? objects shape) (ctl/any-layout? shape))
+                (and (ctl/any-layout-immediate-child? objects shape)
                     (not= (:layout-item-v-sizing shape) :fix)
                     ^boolean change-height?)
                (ctm/change-property :layout-item-v-sizing :fix)
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -636,6 +636,3 @@

 (def persistence-state
  (l/derived (comp :status :persistence) st/state))
-
-(def progress
-  (l/derived :progress st/state))
--- a/frontend/src/app/main/repo.cljs
+++ b/frontend/src/app/main/repo.cljs
@@ -87,12 +87,6 @@
   {:stream? true
    :form-data? true}

-   ::sse/permanently-delete-team-files
-   {:stream? true}
-
-   ::sse/restore-deleted-team-files
-   {:stream? true}
-
   :export-binfile {:response-type :blob}
   :retrieve-list-of-builtin-templates {:query-params :all}})

--- a/frontend/src/app/main/ui.cljs
+++ b/frontend/src/app/main/ui.cljs
@@ -224,8 +224,7 @@
        :dashboard-members
        :dashboard-invitations
        :dashboard-webhooks
-        :dashboard-settings
-        :dashboard-deleted)
+        :dashboard-settings)
       (let [params        (get params :query)
             team-id       (some-> params :team-id uuid/parse*)
             project-id    (some-> params :project-id uuid/parse*)
--- a/frontend/src/app/main/ui/components/editable_select.scss
+++ b/frontend/src/app/main/ui/components/editable_select.scss
@@ -4,29 +4,22 @@
 //
 // Copyright (c) KALEIDOS INC

-// FIXME: we need this import for .asset-element
-@use "refactor/basic-rules.scss" as deprecated;
-
-@use "ds/_borders.scss" as *;
-@use "ds/_sizes.scss" as *;
-@use "ds/_utils.scss" as *;
-@use "ds/spacing.scss" as *;
+@use "refactor/common-refactor.scss" as deprecated;

 .editable-select {
  @extend .asset-element;
  margin: 0;
  padding: 0;
-  border: $b-1 solid var(--input-border-color);
+  border: deprecated.$s-1 solid var(--input-border-color);
  position: relative;
  display: flex;
-  height: $sz-32;
+  height: deprecated.$s-32;
  width: 100%;
-  padding: var(--sp-s);
-  border-radius: $br-8;
+  padding: deprecated.$s-8;
+  border-radius: deprecated.$br-8;
  cursor: pointer;
  .dropdown-button {
-    display: flex;
-    place-content: center;
+    @include deprecated.flexCenter;
    svg {
      @extend .button-icon-small;
      transform: rotate(90deg);
@@ -36,11 +29,10 @@

  .custom-select-dropdown {
    @extend .dropdown-wrapper;
-    width: fit-content;
-    max-height: px2rem(320); // TODO: when this gets addressed in the DS, use a token
+    max-height: deprecated.$s-320;
    .separator {
      margin: 0;
-      height: $sz-12;
+      height: deprecated.$s-12;
    }
    .dropdown-element {
      @extend .dropdown-element-base;
@@ -51,8 +43,7 @@
      }

      .check-icon {
-        display: flex;
-        place-content: center;
+        @include deprecated.flexCenter;
        svg {
          @extend .button-icon-small;
          visibility: hidden;
--- a/frontend/src/app/main/ui/components/file_uploader.cljs
+++ b/frontend/src/app/main/ui/components/file_uploader.cljs
@@ -10,9 +10,9 @@
   [app.util.dom :as dom]
   [rumext.v2 :as mf]))

-(mf/defc file-uploader*
+(mf/defc file-uploader
  {::mf/forward-ref true}
-  [{:keys [accept multi label-text label-class input-id on-selected data-testid]} input-ref]
+  [{:keys [accept multi label-text label-class input-id on-selected data-testid] :as props} input-ref]
  (let [opt-pick-one #(if multi % (first %))

        on-files-selected
--- a/Show More
+++ b/Show More