🐛 Fix hover position of lock proportion tooltip

🎉 Replace numeric inputs on layout menus (#7488 )
* 🎉 Replace numeric inputs on layout menus * 🎉 Add numeric inputs on gaps * ♻️ Refactor scss file * 🐛 Fix comments
2026-01-04 12:28:52 -05:00 · 2025-10-16 10:52:49 +02:00 · 2025-10-16 10:05:25 +02:00 · 2025-10-16 09:54:50 +02:00 · 2025-10-16 09:54:33 +02:00 · 2025-10-16 09:17:13 +02:00
183 changed files with 5742 additions and 5621 deletions
--- a/.github/workflows/build-bundle.yml
+++ b/.github/workflows/build-bundle.yml
@@ -57,6 +57,7 @@ jobs:
        id: vars
        run: |
          echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
+          echo "bundle_version=$(git describe --tags --always)" >> $GITHUB_OUTPUT

      - name: Build bundle
        env:
@@ -76,7 +77,7 @@ jobs:

      - name: Upload Penpot bundle to S3
        run: |
-          aws s3 cp zips/penpot.zip s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip
+          aws s3 cp zips/penpot.zip s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip --metadata bundle-version=${{ steps.vars.outputs.bundle_version }}

      - name: Notify Mattermost
        if: failure()
@@ -86,4 +87,5 @@ jobs:
          TEXT: |
            ❌ *[PENPOT] Error during the execution of the job*
            📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
+               Bundle version: `${{ steps.vars.outputs.bundle_version }}`
            🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -46,7 +46,6 @@ jobs:
          mv penpot/backend bundle-backend
          mv penpot/frontend bundle-frontend
          mv penpot/exporter bundle-exporter
-          mv penpot/storybook bundle-storybook
          popd

      - name: Set up Docker Buildx
@@ -100,29 +99,3 @@ jobs:
          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
-
-      - name: Build and push Storybook Docker image
-        uses: docker/build-push-action@v6
-        env:
-          DOCKER_IMAGE: 'storybook'
-          BUNDLE_PATH: './bundle-storybook'
-        with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.storybook
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
-
-      - name: Notify Mattermost
-        if: failure()
-        uses: mattermost/action-mattermost-notify@master
-        with:
-          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
-          MATTERMOST_CHANNEL: bot-alerts-cicd
-          TEXT: |
-            ❌ 🐳 *[PENPOT] Error building penpot docker images.*
-            📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
-            🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-            @infra
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,20 @@
 # CHANGELOG

+## 2.12.0 (Unreleased)
+
+### :boom: Breaking changes & Deprecations
+
+### :rocket: Epics and highlights
+
+### :heart: Community contributions (Thank you!)
+
+### :sparkles: New features & Enhancements
+
+### :bug: Bugs fixed
+
+- Fix pan cursor not disabling viewport guides [Github #6985](https://github.com/penpot/penpot/issues/6985)
+- Fix viewport resize on locked shapes [Taiga #11974](https://tree.taiga.io/project/penpot/issue/11974)
+
 ## 2.11.0 (Unreleased)

 ### :boom: Breaking changes & Deprecations
@@ -41,7 +56,6 @@
 - Alternative ways of creating variants - Button Viewport [Taiga #11931](https://tree.taiga.io/project/penpot/us/11931)
 - Reorder properties for a component [Taiga #10225](https://tree.taiga.io/project/penpot/us/10225)
 - File Data storage layout refactor [Github #7345](https://github.com/penpot/penpot/pull/7345)
- Make several queries optimization on comment threads [Github #7506](https://github.com/penpot/penpot/pull/7506)

 ### :bug: Bugs fixed

@@ -56,25 +70,7 @@
 - Fix auto-width changes to fixed when switching variants [Taiga #12172](https://tree.taiga.io/project/penpot/issue/12172)
 - Fix component number has no singular translation string [Taiga #12106](https://tree.taiga.io/project/penpot/issue/12106)
 - Fix adding/removing identical text fills [Taiga #12287](https://tree.taiga.io/project/penpot/issue/12287)
- Fix scroll on the inspect tab [Taiga #12293](https://tree.taiga.io/project/penpot/issue/12293)
- Fix lock proportion tooltip [Taiga #12326](https://tree.taiga.io/project/penpot/issue/12326)
- Fix internal Error when selecting a set by name in the token theme editor [Taiga #12310](https://tree.taiga.io/project/penpot/issue/12310)
- Fix drag & drop functionality is swapping instead or reordering [Taiga #12254](https://tree.taiga.io/project/penpot/issue/12254)
- Fix variants not syncronizing tokens on switch [Taiga #12290](https://tree.taiga.io/project/penpot/issue/12290)
- Fix incorrect behavior of Alt + Drag for variants [Taiga #12309](https://tree.taiga.io/project/penpot/issue/12309)
- Fix text override is lost after switch [Taiga #12269](https://tree.taiga.io/project/penpot/issue/12269)
- Fix exporting a board crashing the app [Taiga #12384](https://tree.taiga.io/project/penpot/issue/12384)
- Fix nested variant in a component doesn't keep inherited overrides [Taiga #12299](https://tree.taiga.io/project/penpot/issue/12299)
- Fix selected colors not showing colors from children shapes in multiple selection [Taiga #12384](https://tree.taiga.io/project/penpot/issue/12385)
- Fix scrollbar issue in design tab [Taiga #12367](https://tree.taiga.io/project/penpot/issue/12367)
- Fix library update notificacions showing when they should not [Taiga #12397](https://tree.taiga.io/project/penpot/issue/12397)
- Fix remove flex button doesn’t work within variant [Taiga #12314](https://tree.taiga.io/project/penpot/issue/12314)
- Fix an error translation [Taiga #12402](https://tree.taiga.io/project/penpot/issue/12402)
- Fix problem with certain text input in some editable labels (pages, components, tokens...) being in conflict with the drag/drop functionality [Taiga #12316](https://tree.taiga.io/project/penpot/issue/12316)
- Fix not controlled theme renaming [Taiga #12411](https://tree.taiga.io/project/penpot/issue/12411)
- Fix paste without selection sends the new element in the back [Taiga #12382](https://tree.taiga.io/project/penpot/issue/12382)
- Fix options button does not work for comments created in the lower part of the screen [Taiga #12422](https://tree.taiga.io/project/penpot/issue/12422)
- Fix problem when checking usage with removed teams [Taiga #12442](https://tree.taiga.io/project/penpot/issue/12442)
+

 ## 2.10.1

@@ -82,10 +78,12 @@

 - Improve workpace file loading [Github 7366](https://github.com/penpot/penpot/pull/7366)

+
 ### :bug: Bugs fixed

 - Fix regression with text shapes creation with Plugins API [Taiga #12244](https://tree.taiga.io/project/penpot/issue/12244)

+
 ## 2.10.0

 ### :rocket: Epics and highlights
@@ -101,7 +99,7 @@
 - Add efficiency enhancements to right sidebar [Github #7182](https://github.com/penpot/penpot/pull/7182)
 - Add defaults for artboard drawing [Taiga #494](https://tree.taiga.io/project/penpot/us/494?milestone=465047)
 - Continuous display of distances between elements when moving a layer with the keyboard [Taiga #1780](https://tree.taiga.io/project/penpot/us/1780)
- New Number token - unitless values [Taiga #10936](https://tree.taiga.io/project/penpot/us/10936)
+- New Number token - unitless values  [Taiga #10936](https://tree.taiga.io/project/penpot/us/10936)
 - New font-family token [Taiga #10937](https://tree.taiga.io/project/penpot/us/10937)
 - New text case token [Taiga #10942](https://tree.taiga.io/project/penpot/us/10942)
 - New text-decoration token [Taiga #10941](https://tree.taiga.io/project/penpot/us/10941)
@@ -182,6 +180,7 @@
 - Add info to apply-token event [Taiga #11710](https://tree.taiga.io/project/penpot/task/11710)
 - Fix double click on set name input [Taiga #11747](https://tree.taiga.io/project/penpot/issue/11747)

+
 ### :bug: Bugs fixed

 - Copying font size does not copy the unit [Taiga #11143](https://tree.taiga.io/project/penpot/issue/11143)
--- a/backend/src/app/binfile/common.clj
+++ b/backend/src/app/binfile/common.clj
@@ -749,7 +749,7 @@
          l.version
     FROM libs AS l
    INNER JOIN project AS p ON (p.id = l.project_id)
-    WHERE l.deleted_at IS NULL;")
+    WHERE l.deleted_at IS NULL OR l.deleted_at > now();")

 (defn get-file-libraries
  [conn file-id]
--- a/backend/src/app/rpc/commands/comments.clj
+++ b/backend/src/app/rpc/commands/comments.clj
@@ -234,39 +234,36 @@
                 (files/check-comment-permissions! conn profile-id file-id share-id)
                 (get-comment-threads conn profile-id file-id))))

-(defn- get-comment-threads-sql
-  [where]
-  (str/ffmt
-   "SELECT DISTINCT ON (ct.id)
-           ct.*,
-           pf.fullname AS owner_fullname,
-           pf.email AS owner_email,
-           pf.photo_id AS owner_photo_id,
-           p.team_id AS team_id,
-           f.name AS file_name,
-           f.project_id AS project_id,
-           first_value(c.content) OVER w AS content,
-           (SELECT count(1)
-              FROM comment AS c
-             WHERE c.thread_id = ct.id) AS count_comments,
-           (SELECT count(1)
-              FROM comment AS c
-             WHERE c.thread_id = ct.id
-               AND c.created_at >= coalesce(cts.modified_at, ct.created_at)) AS count_unread_comments
-      FROM comment_thread AS ct
-     INNER JOIN comment AS c ON (c.thread_id = ct.id)
-     INNER JOIN file AS f ON (f.id = ct.file_id)
-     INNER JOIN project AS p ON (p.id = f.project_id)
-      LEFT JOIN comment_thread_status AS cts ON (cts.thread_id = ct.id AND cts.profile_id = ?)
-      LEFT JOIN profile AS pf ON (ct.owner_id = pf.id)
-     WHERE f.deleted_at IS NULL
-       AND p.deleted_at IS NULL
-       %1
-    WINDOW w AS (PARTITION BY c.thread_id ORDER BY c.created_at ASC)"
-   where))
+(def ^:private sql:comment-threads
+  "SELECT DISTINCT ON (ct.id)
+          ct.*,
+          pf.fullname AS owner_fullname,
+          pf.email AS owner_email,
+          pf.photo_id AS owner_photo_id,
+          p.team_id AS team_id,
+          f.name AS file_name,
+          f.project_id AS project_id,
+          first_value(c.content) OVER w AS content,
+          (SELECT count(1)
+             FROM comment AS c
+            WHERE c.thread_id = ct.id) AS count_comments,
+          (SELECT count(1)
+             FROM comment AS c
+            WHERE c.thread_id = ct.id
+              AND c.created_at >= coalesce(cts.modified_at, ct.created_at)) AS count_unread_comments
+     FROM comment_thread AS ct
+    INNER JOIN comment AS c ON (c.thread_id = ct.id)
+    INNER JOIN file AS f ON (f.id = ct.file_id)
+    INNER JOIN project AS p ON (p.id = f.project_id)
+     LEFT JOIN comment_thread_status AS cts ON (cts.thread_id = ct.id AND cts.profile_id = ?)
+     LEFT JOIN profile AS pf ON (ct.owner_id = pf.id)
+    WHERE f.deleted_at IS NULL
+      AND p.deleted_at IS NULL
+   WINDOW w AS (PARTITION BY c.thread_id ORDER BY c.created_at ASC)")

 (def ^:private sql:comment-threads-by-file-id
-  (get-comment-threads-sql "AND ct.file_id = ?"))
+  (str "WITH threads AS (" sql:comment-threads ")"
+       "SELECT * FROM threads WHERE file_id = ?"))

 (defn- get-comment-threads
  [conn profile-id file-id]
@@ -276,29 +273,34 @@
 ;; --- COMMAND: Get Unread Comment Threads

 (def ^:private sql:unread-all-comment-threads-by-team
-  (str "WITH threads AS ("
-       (get-comment-threads-sql "AND p.team_id = ?")
-       ")"
-       "SELECT t.* FROM threads AS t
-         WHERE t.count_unread_comments > 0"))
+  (str "WITH threads AS (" sql:comment-threads ")"
+       "SELECT * FROM threads WHERE count_unread_comments > 0 AND team_id = ?"))

+;; The partial configuration will retrieve only comments created by the user and
+;; threads that have a mention to the user.
 (def ^:private sql:unread-partial-comment-threads-by-team
-  (str "WITH threads AS ("
-       (get-comment-threads-sql "AND p.team_id = ? AND (ct.owner_id = ? OR ? = ANY(ct.mentions))")
-       ")"
-       "SELECT t.* FROM threads AS t
-         WHERE t.count_unread_comments > 0"))
+  (str "WITH threads AS (" sql:comment-threads ")"
+       "SELECT * FROM threads
+         WHERE count_unread_comments > 0
+           AND team_id = ?
+           AND (owner_id = ? OR ? = ANY(mentions))"))

 (defn- get-unread-comment-threads
  [cfg profile-id team-id]
-  (let [profile (-> (db/get cfg :profile {:id profile-id} ::db/remove-deleted false)
+  (let [profile (-> (db/get cfg :profile {:id profile-id})
                    (profile/decode-row))
-        notify  (or (-> profile :props :notifications :dashboard-comments) :all)
-        result  (case notify
-                  :all     (db/exec! cfg [sql:unread-all-comment-threads-by-team profile-id team-id])
-                  :partial (db/exec! cfg [sql:unread-partial-comment-threads-by-team profile-id team-id profile-id profile-id])
-                  [])]
-    (into [] xf-decode-row result)))
+        notify  (or (-> profile :props :notifications :dashboard-comments) :all)]
+
+    (case notify
+      :all
+      (->> (db/exec! cfg [sql:unread-all-comment-threads-by-team profile-id team-id])
+           (into [] xf-decode-row))
+
+      :partial
+      (->> (db/exec! cfg [sql:unread-partial-comment-threads-by-team profile-id team-id profile-id profile-id])
+           (into [] xf-decode-row))
+
+      [])))

 (def ^:private
  schema:get-unread-comment-threads
@@ -321,17 +323,16 @@
   [:id ::sm/uuid]
   [:share-id {:optional true} [:maybe ::sm/uuid]]])

-(def ^:private sql:get-comment-thread
-  (get-comment-threads-sql "AND ct.file_id = ? AND ct.id = ?"))
-
 (sv/defmethod ::get-comment-thread
  {::doc/added "1.15"
   ::sm/params schema:get-comment-thread}
  [cfg {:keys [::rpc/profile-id file-id id share-id] :as params}]
  (db/run! cfg (fn [{:keys [::db/conn]}]
                 (files/check-comment-permissions! conn profile-id file-id share-id)
-                 (some-> (db/exec-one! conn [sql:get-comment-thread profile-id file-id id])
-                         (decode-row)))))
+                 (let [sql (str "WITH threads AS (" sql:comment-threads ")"
+                                "SELECT * FROM threads WHERE id = ? AND file_id = ?")]
+                   (-> (db/exec-one! conn [sql profile-id id file-id])
+                       (decode-row))))))

 ;; --- COMMAND: Retrieve Comments

--- a/backend/src/app/rpc/commands/demo.clj
+++ b/backend/src/app/rpc/commands/demo.clj
@@ -45,7 +45,6 @@
        params   {:email email
                  :fullname fullname
                  :is-active true
-                  :is-demo true
                  :deleted-at (ct/in-future (cf/get-deletion-delay))
                  :password (derive-password password)
                  :props {}}
--- a/backend/src/app/rpc/commands/profile.clj
+++ b/backend/src/app/rpc/commands/profile.clj
@@ -107,9 +107,7 @@
 (defn get-profile
  "Get profile by id. Throws not-found exception if no profile found."
  [conn id & {:as opts}]
-  ;; NOTE: We need to set ::db/remove-deleted to false because demo profiles
-  ;; are created with a set deleted-at value
-  (-> (db/get-by-id conn :profile id (assoc opts ::db/remove-deleted false))
+  (-> (db/get-by-id conn :profile id opts)
      (decode-row)))

 ;; --- MUTATION: Update Profile (own)
@@ -475,16 +473,13 @@
          p.fullname AS name,
          p.email AS email
     FROM team_profile_rel AS tpr1
-     JOIN team as t
-       ON tpr1.team_id = t.id
     JOIN team_profile_rel AS tpr2
       ON (tpr1.team_id = tpr2.team_id)
     JOIN profile AS p
       ON (tpr2.profile_id = p.id)
    WHERE tpr1.profile_id = ?
      AND tpr1.is_owner IS true
-      AND tpr2.can_edit IS true
-      AND t.deleted_at IS NULL")
+      AND tpr2.can_edit IS true")

 (sv/defmethod ::get-subscription-usage
  {::doc/added "2.9"}
--- a/backend/src/app/rpc/commands/teams.clj
+++ b/backend/src/app/rpc/commands/teams.clj
@@ -37,14 +37,14 @@
 ;; --- Helpers & Specs

 (def ^:private sql:team-permissions
-  "SELECT tpr.is_owner,
+  "select tpr.is_owner,
          tpr.is_admin,
          tpr.can_edit
-     FROM team_profile_rel AS tpr
-     JOIN team AS t ON (t.id = tpr.team_id)
-    WHERE tpr.profile_id = ?
-      AND tpr.team_id = ?
-      AND t.deleted_at IS NULL")
+     from team_profile_rel as tpr
+     join team as t on (t.id = tpr.team_id)
+    where tpr.profile_id = ?
+      and tpr.team_id = ?
+      and t.deleted_at is null")

 (defn get-permissions
  [conn profile-id team-id]
--- a/common/src/app/common/data.cljc
+++ b/common/src/app/common/data.cljc
@@ -1024,29 +1024,6 @@
      :clj
      (sort comp-fn items))))

-(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."
-  [v from-pos to-space-between-pos]
-  (let [max-space-pos  (count v)
-        max-prop-pos   (dec max-space-pos)
-
-        from-pos             (max 0 (min max-prop-pos from-pos))
-        to-space-between-pos (max 0 (min max-space-pos to-space-between-pos))]
-
-    (if (= from-pos to-space-between-pos)
-      v
-      (let [elem         (nth v from-pos)
-            without-elem (-> []
-                             (into (subvec v 0 from-pos))
-                             (into (subvec v (inc from-pos))))
-            insert-pos   (if (< from-pos to-space-between-pos)
-                           (dec to-space-between-pos)
-                           to-space-between-pos)]
-        (-> []
-            (into (subvec without-elem 0 insert-pos))
-            (into [elem])
-            (into (subvec without-elem insert-pos)))))))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; String Functions
--- a/common/src/app/common/logic/libraries.cljc
+++ b/common/src/app/common/logic/libraries.cljc
@@ -1642,8 +1642,7 @@
          (pcb/apply-changes-local)))))

 (defn- generate-update-tokens
-  [changes container dest-shape origin-shape touched omit-touched? valid-attrs]
-  ;; valid-attrs is a set of attrs to consider on the update. If it is nil, it will consider all the attrs
+  [changes container dest-shape origin-shape touched omit-touched?]
  (let [attrs (->> (seq (keys ctk/sync-attrs))
                   ;; We don't update the flex-child attrs
                   (remove #(= :layout-grid-cells %)))
@@ -1651,8 +1650,8 @@
        applied-tokens (reduce (fn [applied-tokens attr]
                                 (let [attr-group (get ctk/sync-attrs attr)
                                       token-attrs (cto/shape-attr->token-attrs attr)]
-                                   (if  (and (or (not omit-touched?) (not (touched attr-group)))
-                                             (or (empty? valid-attrs) (contains? valid-attrs attr)))
+                                   (if (not (and (touched attr-group)
+                                                 omit-touched?))
                                     (into applied-tokens token-attrs)
                                     applied-tokens)))
                               #{}
@@ -1809,7 +1808,7 @@
            :always
            (check-detached-main dest-shape origin-shape)
            :always
-            (generate-update-tokens container dest-shape origin-shape touched omit-touched? nil))
+            (generate-update-tokens container dest-shape origin-shape touched omit-touched?))

          (let [attr-group        (get ctk/sync-attrs attr)
                ;; position-data is a special case because can be affected by
@@ -2083,14 +2082,12 @@
          (recur (next attrs)
                 roperations'
                 uoperations'))
+        (cond-> changes
+          (> (count roperations) 1)
+          (add-update-attr-changes current-shape container roperations uoperations)

-        (let [updated-attrs (into #{} (comp (filter #(= :set (:type %)))
-                                            (map :attr))
-                                  roperations)]
-          (cond-> changes
-            (> (count roperations) 1)
-            (-> (add-update-attr-changes current-shape container roperations uoperations)
-                (generate-update-tokens container current-shape previous-shape touched false updated-attrs))))))))
+          :always
+          (generate-update-tokens container current-shape previous-shape touched false))))))

 (defn- propagate-attrs
  "Helper that puts the origin attributes (attrs) into dest but only if
@@ -2801,7 +2798,7 @@
 (defn generate-duplicate-changes
  "Prepare objects to duplicate: generate new id, give them unique names,
  move to the desired position, and recalculate parents and frames as needed."
-  [changes all-objects page ids delta libraries library-data file-id & {:keys [variant-props alt-duplication?]}]
+  [changes all-objects page ids delta libraries library-data file-id & {:keys [variant-props]}]
  (let [shapes         (map (d/getf all-objects) ids)
        unames         (volatile! (cfh/get-used-names (:objects page)))
        update-unames! (fn [new-name] (vswap! unames conj new-name))
@@ -2811,22 +2808,10 @@
        ;; we calculate a new one because the components will have created new shapes.
        ids-map        (into {} (map #(vector % (uuid/next))) all-ids)

-
-        ;; If there is an alt-duplication of a variant, change its parent to root
-        ;; so the copy is made as a child of root
-        ;; This is because inside a variant-container can't be a copy
-        shapes  (map (fn [shape]
-                       (if (and alt-duplication? (ctk/is-variant? shape))
-                         (assoc shape :parent-id uuid/zero :frame-id nil)
-                         shape))
-                     shapes)
-
-
        changes (-> changes
                    (pcb/with-page page)
                    (pcb/with-objects all-objects)
                    (pcb/with-library-data library-data))
-
        changes
        (->> shapes
             (reduce #(generate-duplicate-shape-change %1
--- a/common/src/app/common/logic/variant_properties.cljc
+++ b/common/src/app/common/logic/variant_properties.cljc
@@ -28,7 +28,11 @@
              (pcb/update-component
               changes (:id component)
               (fn [component]
-                 (d/update-in-when component [:variant-properties pos] #(assoc % :name new-name)))
+                 (d/update-in-when component [:variant-properties pos]
+                                   (fn [property]
+                                     (-> property
+                                         (assoc :name new-name)
+                                         (with-meta nil)))))
               {:apply-changes-local-library? true}))
            changes
            related-components)))
@@ -84,7 +88,7 @@
        related-components (cfv/find-variant-components data objects variant-id)]
    (reduce (fn [changes component]
              (let [props   (:variant-properties component)
-                    props   (d/reorder props from-pos to-space-between-pos)
+                    props   (ctv/reorder-by-moving-to-position props from-pos to-space-between-pos)
                    main-id (:main-instance-id component)
                    name    (ctv/properties-to-name props)]
                (-> changes
--- a/common/src/app/common/logic/variants.cljc
+++ b/common/src/app/common/logic/variants.cljc
@@ -11,8 +11,7 @@
   [app.common.types.container :as ctn]
   [app.common.types.file :as ctf]
   [app.common.types.variant :as ctv]
-   [app.common.uuid :as uuid]
-   [clojure.set :as set]))
+   [app.common.uuid :as uuid]))

 (defn generate-add-new-variant
  [changes shape variant-id new-component-id new-shape-id prop-num]
@@ -68,6 +67,7 @@
      [[] {}]
      shapes))))

+
 (defn- keep-swapped-item
  "As part of the keep-touched process on a switch, given a child on the original
   copy that was swapped (orig-swapped-child), and its related shape on the new copy
@@ -88,6 +88,7 @@
        current-parent  (get objects (:parent-id related-shape-in-new))
        pos             (d/index-of (:shapes current-parent) (:id related-shape-in-new))]

+
    (-> (pcb/concat-changes before-changes changes)

        ;; Move the previous shape to the new parent
@@ -121,44 +122,6 @@
                    (subvec (vec ancestors) 1 (dec num-ancestors)))]
    (some ctk/get-swap-slot ancestors)))

-(defn- find-shape-ref-child-of
-  "Get the shape referenced by the shape-ref of the near main of the shape,
-   recursively repeated until find a shape-ref with parent-id as ancestor.
-   It will return the shape or nil if it doesn't found any"
-  [container libraries shape parent-id]
-  (let [ref-shape             (ctf/find-ref-shape nil container libraries shape
-                                                  :with-context? true)
-
-        ref-shape-container   (when ref-shape (:container (meta ref-shape)))
-        ref-shape-parents-set (when ref-shape
-                                (->> (cfh/get-parents (:objects ref-shape-container) (:id ref-shape))
-                                     (into #{} d/xf:map-id)))]
-
-    (if (or (nil? ref-shape) (contains? ref-shape-parents-set parent-id))
-      ref-shape
-      (find-shape-ref-child-of ref-shape-container libraries ref-shape parent-id))))
-
-(defn- get-ref-chain
-  "Returns a vector with the shape ref chain including itself"
-  [container libraries shape]
-  (loop [chain [shape]
-         current shape]
-    (if-let [ref (ctf/find-ref-shape nil container libraries current :with-context? true)]
-      (recur (conj chain ref) ref)
-      chain)))
-
-(defn- add-touched-from-ref-chain
-  "Adds to the :touched attr of a shape the content of
-   the :touched of all its chain of ref shapes"
-  [container libraries shape]
-  (let [chain (get-ref-chain container libraries shape)
-        more-touched (->> chain
-                          (map :touched)
-                          (remove nil?)
-                          (apply set/union)
-                          (remove ctk/swap-slot?)
-                          set)]
-    (update shape :touched #(set/union (or % #{}) more-touched))))

 (defn generate-keep-touched
  "This is used as part of the switch process, when you switch from
@@ -178,10 +141,7 @@
        ;; Ignore children of swapped items, because
        ;; they will be moved without change when
        ;; managing their swapped ancestor
-        orig-touched       (->> original-shapes
-                                ;; Add to each shape also the touched of its ref chain
-                                (map #(add-touched-from-ref-chain container libraries %))
-                                (filter (comp seq :touched))
+        orig-touched       (->> (filter (comp seq :touched) original-shapes)
                                (remove
                                 #(child-of-swapped? %
                                                     page-objects
@@ -198,7 +158,7 @@

        ;; The original-shape is in a copy. For the relation rules, we need the referenced
        ;; shape on the main component
-        orig-ref-shape     (ctf/find-remote-shape container libraries original-shape {:with-context? true})
+        orig-ref-shape     (ctf/find-ref-shape nil container libraries original-shape {:with-context? true})
        orig-ref-objects   (:objects (:container (meta orig-ref-shape)))

        ;; Adds a :shape-path attribute to the children of the orig-ref-shape,
@@ -211,6 +171,7 @@
        ;; Creates a map to quickly find a child of the orig-ref-shape by its shape-path
        o-ref-shapes-p-map  (into {} (map (juxt :id :shape-path)) o-ref-shapes-wp)

+
        ;; Process each touched children of the original-shape
        [changes parents-of-swapped]
        (reduce
@@ -221,7 +182,8 @@
                 ;; orig-child-touched is in a copy. Get the referenced shape on the main component
                 ;; If there is a swap slot, we will get the referenced shape in another way
                 orig-ref-shape (when-not swap-slot
-                                  (find-shape-ref-child-of container libraries orig-child-touched (:id orig-ref-shape)))
+                                  ;; TODO Maybe just get it from o-ref-shapes-wp
+                                  (ctf/find-ref-shape nil container libraries orig-child-touched))

                 orig-ref-id    (if swap-slot
                                  ;; If there is a swap slot, find the referenced shape id
@@ -234,7 +196,6 @@
                 ;; Get its related shape in the children of new-shape: the one that
                 ;; has the same shape-path
                 related-shape-in-new  (get new-shapes-map shape-path)
-
                 parents-of-swapped (if related-shape-in-new
                                      (conj parent-of-swapped (:parent-id related-shape-in-new))
                                      parent-of-swapped)
--- a/common/src/app/common/types/component.cljc
+++ b/common/src/app/common/types/component.cljc
@@ -286,7 +286,7 @@
          (fn [touched]
            (into #{} (remove #(str/starts-with? (name %) "swap-slot-") touched)))))

-(defn get-deleted-component-root
+(defn get-component-root
  [component]
  (if (some? (:main-instance-id component))
    (get-in component [:objects (:main-instance-id component)])
--- a/common/src/app/common/types/file.cljc
+++ b/common/src/app/common/types/file.cljc
@@ -276,7 +276,7 @@
    (-> file-data
        (get-component-page component)
        (ctn/get-shape (:main-instance-id component)))
-    (ctk/get-deleted-component-root component)))
+    (ctk/get-component-root component)))

 (defn get-component-shape
  "Retrieve one shape in the component by id. If with-context? is true, add the
@@ -355,7 +355,7 @@

 (defn find-remote-shape
  "Recursively go back by the :shape-ref of the shape until find the correct shape of the original component"
-  [container libraries shape & {:keys [with-context?] :or {with-context? false}}]
+  [container libraries shape]
  (let [top-instance        (ctn/get-component-shape (:objects container) shape)
        component-file      (get-in libraries [(:component-file top-instance) :data])
        component           (ctkl/get-component component-file (:component-id top-instance) true)
@@ -375,12 +375,8 @@
    (if (nil? remote-shape)
      nil
      (if (nil? (:shape-ref remote-shape))
-        (cond-> remote-shape
-          (and remote-shape with-context?)
-          (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?)))))
+        remote-shape
+        (find-remote-shape component-container libraries remote-shape)))))

 (defn direct-copy?
  "Check if the shape is in a direct copy of the component (i.e. the shape-ref points to shapes inside
@@ -905,7 +901,7 @@
    (println))

  (when (seq (:objects component))
-    (let [root (ctk/get-deleted-component-root component)]
+    (let [root (ctk/get-component-root component)]
      (dump-shape (:id root)
                  1
                  (:objects component)
--- a/common/src/app/common/types/text.cljc
+++ b/common/src/app/common/types/text.cljc
@@ -249,16 +249,12 @@
 (defn equal-attrs?
  "Given a text structure, and a map of attrs, check that all the internal attrs in
   paragraphs and sentences have the same attrs"
-  ([item attrs]
-   ;; Ignore the root attrs of the content. We only want to check paragraphs and sentences
-   (equal-attrs? item attrs true))
-  ([item attrs ignore?]
-   (let [item-attrs (dissoc item :text :type :key :children)]
-     (and
-      (or ignore?
-          (empty? item-attrs)
-          (= attrs (dissoc item :text :type :key :children)))
-      (every? #(equal-attrs? % attrs false) (:children item))))))
+  [item attrs]
+  (let [item-attrs (dissoc item :text :type :key :children)]
+    (and
+     (or (empty? item-attrs)
+         (= attrs (dissoc item :text :type :key :children)))
+     (every? #(equal-attrs? % attrs) (:children item)))))

 (defn get-first-paragraph-text-attrs
  "Given a content text structure, extract it's first paragraph
--- a/common/src/app/common/types/variant.cljc
+++ b/common/src/app/common/types/variant.cljc
@@ -310,3 +310,27 @@
   the real name of the shape joined by the properties values separated by '/'"
  [variant]
  (cpn/merge-path-item (:name variant) (str/replace (:variant-name variant) #", " " / ")))
+
+(defn reorder-by-moving-to-position
+  "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."
+  [props from-pos to-space-between-pos]
+  (let [max-space-pos  (count props)
+        max-prop-pos   (dec max-space-pos)
+
+        from-pos             (max 0 (min max-prop-pos from-pos))
+        to-space-between-pos (max 0 (min max-space-pos to-space-between-pos))]
+
+    (if (= from-pos to-space-between-pos)
+      props
+      (let [elem         (nth props from-pos)
+            without-elem (-> []
+                             (into (subvec props 0 from-pos))
+                             (into (subvec props (inc from-pos))))
+            insert-pos   (if (< from-pos to-space-between-pos)
+                           (dec to-space-between-pos)
+                           to-space-between-pos)]
+        (-> []
+            (into (subvec without-elem 0 insert-pos))
+            (into [elem])
+            (into (subvec without-elem insert-pos)))))))
--- a/common/test/common_tests/data_test.cljc
+++ b/common/test/common_tests/data_test.cljc
@@ -102,14 +102,3 @@
  (t/is (= (d/insert-at-index [:a :b :c :d] 1 [:a])
           [:a :b :c :d])))

-(t/deftest reorder
-  (let [v ["a" "b" "c" "d"]]
-    (t/is (= (d/reorder v 0 2) ["b" "a" "c" "d"]))
-    (t/is (= (d/reorder v 0 3) ["b" "c" "a" "d"]))
-    (t/is (= (d/reorder v 0 4) ["b" "c" "d" "a"]))
-    (t/is (= (d/reorder v 3 0) ["d" "a" "b" "c"]))
-    (t/is (= (d/reorder v 3 2) ["a" "b" "d" "c"]))
-    (t/is (= (d/reorder v 0 5) ["b" "c" "d" "a"]))
-    (t/is (= (d/reorder v 3 -1) ["d" "a" "b" "c"]))
-    (t/is (= (d/reorder v 5 -1) ["d" "a" "b" "c"]))
-    (t/is (= (d/reorder v -1 5) ["b" "c" "d" "a"]))))
--- a/common/test/common_tests/logic/token_test.cljc
+++ b/common/test/common_tests/logic/token_test.cljc
@@ -34,7 +34,6 @@
                      (pcb/with-library-data (:data file))
                      (clt/generate-toggle-token-set (tht/get-tokens-lib file) "foo/bar"))

-          _ (prn "changes" changes)
          redo (thf/apply-changes file changes)
          redo-lib (tht/get-tokens-lib redo)
          undo (thf/apply-undo-changes redo changes)
--- a/common/test/common_tests/logic/variants_switch_test.cljc
+++ b/common/test/common_tests/logic/variants_switch_test.cljc
@@ -45,6 +45,7 @@
    ;; The rect has width 15 after the switch
    (t/is (= (:width rect02') 15))))

+
 (t/deftest test-switch-with-override
  (let [;; ==== Setup
        file      (-> (thf/sample-file :file1)
@@ -124,10 +125,12 @@
    ;; The rect has width 15 after the switch
    (t/is (= (:width rect02') 15))))

+
 (def font-size-path-paragraph [:content :children 0 :children 0 :font-size])
 (def font-size-path-0 [:content :children 0 :children 0 :children 0 :font-size])
 (def font-size-path-1 [:content :children 0 :children 0 :children 1 :font-size])

+
 (def text-path-0 [:content :children 0 :children 0 :children 0 :text])
 (def text-path-1 [:content :children 0 :children 0 :children 1 :text])
 (def text-lines-path [:content :children 0 :children 0 :children])
@@ -185,8 +188,6 @@


        ;; The copy clean has no overrides
-
-
        copy-clean       (ths/get-shape file :copy-clean)
        copy-clean-t     (ths/get-shape file :copy-clean-t)

@@ -208,8 +209,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-clean :c02 {:new-shape-label :copy-clean-2 :keep-touched? true})
                  (tho/swap-component copy-font-size :c02 {:new-shape-label :copy-font-size-2 :keep-touched? true})
@@ -235,8 +234,6 @@
    ;; Before the switch:
    ;;   * font size 14
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-clean-t font-size-path-0) "14"))
    (t/is (= (get-in copy-clean-t text-path-0) "hello world"))

@@ -251,8 +248,6 @@
    ;; Before the switch:
    ;;   * font size 25
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-font-size-t font-size-path-0) "25"))
    (t/is (= (get-in copy-font-size-t text-path-0) "hello world"))

@@ -311,8 +306,6 @@


        ;; The copy clean has no overrides
-
-
        copy-clean       (ths/get-shape file :copy-clean)
        copy-clean-t     (ths/get-shape file :copy-clean-t)

@@ -334,8 +327,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-clean :c02 {:new-shape-label :copy-clean-2 :keep-touched? true})
                  (tho/swap-component copy-font-size :c02 {:new-shape-label :copy-font-size-2 :keep-touched? true})
@@ -361,8 +352,6 @@
    ;; Before the switch:
    ;;   * font size 14
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-clean-t font-size-path-0) "14"))
    (t/is (= (get-in copy-clean-t text-path-0) "hello world"))

@@ -377,8 +366,6 @@
    ;; Before the switch:
    ;;   * font size 25
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-font-size-t font-size-path-0) "25"))
    (t/is (= (get-in copy-font-size-t text-path-0) "hello world"))

@@ -414,6 +401,7 @@
    (t/is (= (get-in copy-both-t' font-size-path-0) "50"))
    (t/is (= (get-in copy-both-t' text-path-0) "text overriden"))))

+
 (t/deftest test-switch-with-different-text-text-override
  (let [;; ==== Setup
        file (-> (thf/sample-file :file1)
@@ -435,8 +423,6 @@


        ;; The copy clean has no overrides
-
-
        copy-clean       (ths/get-shape file :copy-clean)
        copy-clean-t     (ths/get-shape file :copy-clean-t)

@@ -458,8 +444,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-clean :c02 {:new-shape-label :copy-clean-2 :keep-touched? true})
                  (tho/swap-component copy-font-size :c02 {:new-shape-label :copy-font-size-2 :keep-touched? true})
@@ -485,8 +469,6 @@
    ;; Before the switch:
    ;;   * font size 14
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-clean-t font-size-path-0) "14"))
    (t/is (= (get-in copy-clean-t text-path-0) "hello world"))

@@ -501,8 +483,6 @@
    ;; Before the switch:
    ;;   * font size 25
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-font-size-t font-size-path-0) "25"))
    (t/is (= (get-in copy-font-size-t text-path-0) "hello world"))

@@ -538,6 +518,7 @@
    (t/is (= (get-in copy-both-t' font-size-path-0) "25"))
    (t/is (= (get-in copy-both-t' text-path-0) "bye"))))

+
 (t/deftest test-switch-with-different-text-and-prop-text-override
  (let [;; ==== Setup
        file (-> (thf/sample-file :file1)
@@ -561,8 +542,6 @@


        ;; The copy clean has no overrides
-
-
        copy-clean       (ths/get-shape file :copy-clean)
        copy-clean-t     (ths/get-shape file :copy-clean-t)

@@ -584,8 +563,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-clean :c02 {:new-shape-label :copy-clean-2 :keep-touched? true})
                  (tho/swap-component copy-font-size :c02 {:new-shape-label :copy-font-size-2 :keep-touched? true})
@@ -611,8 +588,6 @@
    ;; Before the switch:
    ;;   * font size 14
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-clean-t font-size-path-0) "14"))
    (t/is (= (get-in copy-clean-t text-path-0) "hello world"))

@@ -627,8 +602,6 @@
    ;; Before the switch:
    ;;   * font size 25
    ;;   * text "hello world"
-
-
    (t/is (= (get-in copy-font-size-t font-size-path-0) "25"))
    (t/is (= (get-in copy-font-size-t text-path-0) "hello world"))

@@ -664,6 +637,7 @@
    (t/is (= (get-in copy-both-t' font-size-path-0) "50"))
    (t/is (= (get-in copy-both-t' text-path-0) "bye"))))

+
 (t/deftest test-switch-with-identical-structure-text-override
  (let [;; ==== Setup
        file (-> (thf/sample-file :file1)
@@ -683,8 +657,6 @@


        ;; Duplicate a text line in copy-structure-clean
-
-
        file                   (change-structure file :copy-structure-clean-t)
        copy-structure-clean   (ths/get-shape file :copy-structure-clean)
        copy-structure-clean-t (ths/get-shape file :copy-structure-clean-t)
@@ -706,8 +678,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-structure-clean :c02 {:new-shape-label :copy-structure-clean-2 :keep-touched? true})
                  (tho/swap-component copy-structure-unif :c02 {:new-shape-label :copy-structure-unif-2 :keep-touched? true})
@@ -793,6 +763,7 @@
    (t/is (= (get-in copy-structure-mixed-t' font-size-path-1) "40"))
    (t/is (= (get-in copy-structure-mixed-t' text-path-1) "new line 2"))))

+
 (t/deftest test-switch-with-different-prop-structure-text-override
  (let [;; ==== Setup
        file (-> (thf/sample-file :file1)
@@ -813,8 +784,6 @@


        ;; Duplicate a text line in copy-structure-clean
-
-
        file                   (change-structure file :copy-structure-clean-t)
        copy-structure-clean   (ths/get-shape file :copy-structure-clean)
        copy-structure-clean-t (ths/get-shape file :copy-structure-clean-t)
@@ -836,8 +805,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-structure-clean :c02 {:new-shape-label :copy-structure-clean-2 :keep-touched? true})
                  (tho/swap-component copy-structure-unif :c02 {:new-shape-label :copy-structure-unif-2 :keep-touched? true})
@@ -939,8 +906,6 @@


        ;; Duplicate a text line in copy-structure-clean
-
-
        file                   (change-structure file :copy-structure-clean-t)
        copy-structure-clean   (ths/get-shape file :copy-structure-clean)
        copy-structure-clean-t (ths/get-shape file :copy-structure-clean-t)
@@ -962,8 +927,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-structure-clean :c02 {:new-shape-label :copy-structure-clean-2 :keep-touched? true})
                  (tho/swap-component copy-structure-unif :c02 {:new-shape-label :copy-structure-unif-2 :keep-touched? true})
@@ -1008,8 +971,6 @@
    ;; Second line:
    ;;   * font size 25
    ;;   * text "new line 2"
-
-
    (t/is (= (get-in copy-structure-unif-t font-size-path-0) "25"))
    (t/is (= (get-in copy-structure-unif-t text-path-0) "new line 1"))
    (t/is (= (get-in copy-structure-unif-t font-size-path-1) "25"))
@@ -1031,8 +992,6 @@
    ;; Before the switch, second line:
    ;;   * font size 40
    ;;   * text "new line 2"
-
-
    (t/is (= (get-in copy-structure-mixed-t font-size-path-0) "35"))
    (t/is (= (get-in copy-structure-mixed-t text-path-0) "new line 1"))
    (t/is (= (get-in copy-structure-mixed-t font-size-path-1) "40"))
@@ -1066,8 +1025,6 @@


        ;; Duplicate a text line in copy-structure-clean
-
-
        file                   (change-structure file :copy-structure-clean-t)
        copy-structure-clean   (ths/get-shape file :copy-structure-clean)
        copy-structure-clean-t (ths/get-shape file :copy-structure-clean-t)
@@ -1089,8 +1046,6 @@


        ;; ==== Action: Switch all the copies
-
-
        file' (-> file
                  (tho/swap-component copy-structure-clean :c02 {:new-shape-label :copy-structure-clean-2 :keep-touched? true})
                  (tho/swap-component copy-structure-unif :c02 {:new-shape-label :copy-structure-unif-2 :keep-touched? true})
@@ -1135,8 +1090,6 @@
    ;; Second line:
    ;;   * font size 25
    ;;   * text "new line 2"
-
-
    (t/is (= (get-in copy-structure-unif-t font-size-path-0) "25"))
    (t/is (= (get-in copy-structure-unif-t text-path-0) "new line 1"))
    (t/is (= (get-in copy-structure-unif-t font-size-path-1) "25"))
@@ -1158,8 +1111,6 @@
    ;; Before the switch, second line:
    ;;   * font size 40
    ;;   * text "new line 2"
-
-
    (t/is (= (get-in copy-structure-mixed-t font-size-path-0) "35"))
    (t/is (= (get-in copy-structure-mixed-t text-path-0) "new line 1"))
    (t/is (= (get-in copy-structure-mixed-t font-size-path-1) "40"))
@@ -1173,6 +1124,7 @@
    (t/is (= (get-in copy-structure-mixed-t' text-path-0) "bye"))
    (t/is (nil? (get-in copy-structure-mixed-t' font-size-path-1)))))

+
 (t/deftest test-switch-variant-for-other-with-same-nested-component
  (let [;; ==== Setup
        file      (-> (thf/sample-file :file1)
@@ -1192,8 +1144,6 @@


        ;; On :copy-cp01, change the width of the rect
-
-
        changes (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
                                            #{copy-cp01-rect-id}
                                            (fn [shape]
@@ -1216,6 +1166,8 @@
    ;; The width of copy-cp02-rect' is 25 (change is preserved)
    (t/is (= (:width copy-cp02-rect') 25))))

+
+
 (t/deftest test-switch-variant-that-has-swaped-copy
  (let [;; ==== Setup
        file      (-> (thf/sample-file :file1)
@@ -1241,6 +1193,7 @@
        ;; Switch :c01 for :c02
        file'     (tho/swap-component file copy01 :c02 {:new-shape-label :copy02 :keep-touched? true})

+
        copy02'    (ths/get-shape file' :copy02)
        copy-cp02' (ths/get-shape file' :copy-cp02)]
    (thf/dump-file file')
@@ -1254,6 +1207,7 @@
    ;;copy-02' had copy-cp02' as child
    (t/is (= (-> copy02' :shapes first) (:id copy-cp02')))))

+
 (t/deftest test-switch-variant-that-has-swaped-copy-with-changed-attr
  (let [;; ==== Setup
        file      (-> (thf/sample-file :file1)
@@ -1290,6 +1244,7 @@
        ;; Switch :c01 for :c02
        file'     (tho/swap-component file copy01 :c02 {:new-shape-label :copy02 :keep-touched? true})

+
        copy02'    (ths/get-shape file' :copy02)
        copy-cp02' (ths/get-shape file' :copy-cp02)
        copy-cp02-rect' (ths/get-shape-by-id file' (-> copy-cp02' :shapes first))]
@@ -1307,58 +1262,3 @@
    (t/is (= (-> copy02' :shapes first) (:id copy-cp02')))
    ;; The width of copy-cp02-rect' is 25 (change is preserved)
    (t/is (= (:width copy-cp02-rect') 25))))
-
-(t/deftest test-switch-variant-without-touched-but-touched-parent
-  (let [;; ==== Setup
-        file      (-> (thf/sample-file :file1)
-                      (thv/add-variant-with-child
-                       :v01 :c01 :m01 :c02 :m02 :r01 :r02
-                       {:child1-params {:width 5}
-                        :child2-params  {:width 5}})
-                      (tho/add-simple-component :external01 :external01-root :external01-child)
-
-                      (thc/instantiate-component :c01
-                                                 :c01-in-root
-                                                 :children-labels [:r01-in-c01-in-root]
-                                                 :parent-label :external01-root))
-
-        ;; Make a change on r01-in-c01-in-root so it is touched
-        page               (thf/current-page file)
-        r01-in-c01-in-root (ths/get-shape file :r01-in-c01-in-root)
-
-        changes            (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                       #{(:id r01-in-c01-in-root)}
-                                                       (fn [shape]
-                                                         (assoc shape :width 25))
-                                                       (:objects page)
-                                                       {})
-
-        file               (thf/apply-changes file changes)
-
-
-        ;; Instantiate the component :external01
-
-
-        file        (thc/instantiate-component file
-                                               :external01
-                                               :external-copy01
-                                               :children-labels [:external-copy01-rect :c01-in-copy])
-        page        (thf/current-page file)
-        c01-in-copy (ths/get-shape file :c01-in-copy)
-        rect01      (get-in page [:objects (-> c01-in-copy :shapes first)])
-
-
-        ;; ==== Action
-
-
-        file'        (tho/swap-component file c01-in-copy :c02 {:new-shape-label :c02-in-copy :keep-touched? true})
-
-        page'        (thf/current-page file')
-        c02-in-copy' (ths/get-shape file' :c02-in-copy)
-        rect02'      (get-in page' [:objects (-> c02-in-copy' :shapes first)])]
-
-    (thf/dump-file file :keys [:width :touched])
-    ;; The rect had width 25 before the switch
-    (t/is (= (:width rect01) 25))
-    ;; The rect still has width 25 after the switch
-    (t/is (= (:width rect02') 25))))
--- a/common/test/common_tests/variant_test.cljc
+++ b/common/test/common_tests/variant_test.cljc
@@ -159,3 +159,48 @@

    (t/testing "update-number-in-repeated-prop-names"
      (t/is (= (ctv/update-number-in-repeated-prop-names props) numbered-props)))))
+
+
+(t/deftest reorder-by-moving-to-position
+  (let [props [{:name "border" :value "no"}
+               {:name "color" :value "blue"}
+               {:name "shadow" :value "yes"}
+               {:name "background" :value "none"}]]
+
+    (t/testing "reorder-by-moving-to-position"
+      (t/is (= (ctv/reorder-by-moving-to-position props 0 2) [{:name "color" :value "blue"}
+                                                              {:name "border" :value "no"}
+                                                              {:name "shadow" :value "yes"}
+                                                              {:name "background" :value "none"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props 0 3) [{:name "color" :value "blue"}
+                                                              {:name "shadow" :value "yes"}
+                                                              {:name "border" :value "no"}
+                                                              {:name "background" :value "none"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props 0 4) [{:name "color" :value "blue"}
+                                                              {:name "shadow" :value "yes"}
+                                                              {:name "background" :value "none"}
+                                                              {:name "border" :value "no"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props 3 0) [{:name "background" :value "none"}
+                                                              {:name "border" :value "no"}
+                                                              {:name "color" :value "blue"}
+                                                              {:name "shadow" :value "yes"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props 3 2) [{:name "border" :value "no"}
+                                                              {:name "color" :value "blue"}
+                                                              {:name "background" :value "none"}
+                                                              {:name "shadow" :value "yes"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props 0 5) [{:name "color" :value "blue"}
+                                                              {:name "shadow" :value "yes"}
+                                                              {:name "background" :value "none"}
+                                                              {:name "border" :value "no"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props 3 -1) [{:name "background" :value "none"}
+                                                               {:name "border" :value "no"}
+                                                               {:name "color" :value "blue"}
+                                                               {:name "shadow" :value "yes"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props 5 -1) [{:name "background" :value "none"}
+                                                               {:name "border" :value "no"}
+                                                               {:name "color" :value "blue"}
+                                                               {:name "shadow" :value "yes"}]))
+      (t/is (= (ctv/reorder-by-moving-to-position props -1 5) [{:name "color" :value "blue"}
+                                                               {:name "shadow" :value "yes"}
+                                                               {:name "background" :value "none"}
+                                                               {:name "border" :value "no"}])))))
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -73,7 +73,7 @@ RUN set -eux; \

 FROM base AS setup-node

-ENV NODE_VERSION=v22.21.1 \
+ENV NODE_VERSION=v22.19.0 \
    PATH=/opt/node/bin:$PATH

 RUN set -eux; \
@@ -113,12 +113,12 @@ RUN set -eux; \
    ARCH="$(dpkg --print-architecture)"; \
    case "${ARCH}" in \
       aarch64|arm64) \
-         ESUM='8c5321f16d9f1d8149f83e4e9ff8ca5d9e94320b92d205e6db42a604de3d1140'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_aarch64.tar.gz'; \
+         ESUM='b60eb9d54c97ba4159547834a98cc5d016281dd2b3e60e7475cba4911324bcb4'; \
+         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.28.85-ca-jdk25.0.0-linux_aarch64.tar.gz'; \
         ;; \
       amd64|x86_64) \
-         ESUM='471b3e62bdffaed27e37005d842d8639f10d244ccce1c7cdebf7abce06c8313e'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_x64.tar.gz'; \
+         ESUM='164d901e5a240b8c18516f5ab55bc11fc9689ab6e829045aea8467356dcdb340'; \
+         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.28.85-ca-jdk25.0.0-linux_x64.tar.gz'; \
         ;; \
       *) \
         echo "Unsupported arch: ${ARCH}"; \
@@ -149,24 +149,18 @@ FROM base AS setup-rust
 ENV PATH=/opt/cargo/bin:$PATH \
    RUSTUP_HOME=/opt/rustup \
    CARGO_HOME=/opt/cargo \
-    RUSTUP_VERSION=1.28.2 \
-    RUST_VERSION=1.91.0 \
+    RUSTUP_VERSION=1.27.1 \
+    RUST_VERSION=1.85.0 \
    EMSCRIPTEN_VERSION=4.0.6

 WORKDIR /opt

 RUN set -eux; \
    # Same steps as in Rust official Docker image https://github.com/rust-lang/docker-rust/blob/9f287282d513a84cb7c7f38f197838f15d37b6a9/1.81.0/bookworm/Dockerfile
-    arch="$(dpkg --print-architecture)"; \
-    case "$arch" in \
-        'amd64') \
-            rustArch='x86_64-unknown-linux-gnu'; \
-            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
-            ;; \
-        'arm64') \
-            rustArch='aarch64-unknown-linux-gnu'; \
-            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
-            ;; \
+    dpkgArch="$(dpkg --print-architecture)"; \
+    case "${dpkgArch##*-}" in \
+        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \
+        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \
    *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    esac; \
    wget "https://static.rust-lang.org/rustup/archive/${RUSTUP_VERSION}/${rustArch}/rustup-init"; \
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -5,7 +5,7 @@ ENV LANG='C.UTF-8' \
    LC_ALL='C.UTF-8' \
    JAVA_HOME="/opt/jdk" \
    DEBIAN_FRONTEND=noninteractive \
-    NODE_VERSION=v22.21.1 \
+    NODE_VERSION=v22.19.0 \
    TZ=Etc/UTC

 RUN set -ex; \
@@ -46,12 +46,12 @@ RUN set -eux; \
    ARCH="$(dpkg --print-architecture)"; \
    case "${ARCH}" in \
       aarch64|arm64) \
-         ESUM='8c5321f16d9f1d8149f83e4e9ff8ca5d9e94320b92d205e6db42a604de3d1140'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_aarch64.tar.gz'; \
+         ESUM='6f8725d186d05c627176db9c46c732a6ef3ba41d9e9b3775c4727fc8ac642bb2'; \
+         BINARY_URL='https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_aarch64_linux_hotspot_24.0.2_12.tar.gz'; \
         ;; \
       amd64|x86_64) \
-         ESUM='471b3e62bdffaed27e37005d842d8639f10d244ccce1c7cdebf7abce06c8313e'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_x64.tar.gz'; \
+         ESUM='aea1cc55e51cf651c85f2f00ad021603fe269c4bb6493fa97a321ad770c9b096'; \
+         BINARY_URL='https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_x64_linux_hotspot_24.0.2_12.tar.gz'; \
         ;; \
       *) \
         echo "Unsupported arch: ${ARCH}"; \
@@ -128,7 +128,7 @@ COPY --from=build /opt/node /opt/node
 COPY --from=penpotapp/imagemagick:7.1.2-0 /opt/imagick /opt/imagick

 ARG BUNDLE_PATH="./bundle-backend/"
-ADD --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/backend/
+COPY --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/backend/

 USER penpot:penpot
 WORKDIR /opt/penpot/backend
--- a/docker/images/Dockerfile.exporter
+++ b/docker/images/Dockerfile.exporter
@@ -3,7 +3,7 @@ LABEL maintainer="Penpot <docker@penpot.app>"

 ENV LANG=en_US.UTF-8 \
    LC_ALL=en_US.UTF-8 \
-    NODE_VERSION=v22.21.1 \
+    NODE_VERSION=v22.19.0 \
    DEBIAN_FRONTEND=noninteractive \
    PATH=/opt/node/bin:$PATH

@@ -90,7 +90,7 @@ RUN set -eux; \
    chown -R penpot:penpot /opt/penpot;

 ARG BUNDLE_PATH="./bundle-exporter/"
-ADD --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/exporter/
+COPY --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/exporter/

 WORKDIR /opt/penpot/exporter
 USER penpot:penpot
--- a/docker/images/Dockerfile.frontend
+++ b/docker/images/Dockerfile.frontend
@@ -12,13 +12,13 @@ RUN set -ex; \
    mkdir -p /etc/nginx/overrides/location.d/;

 ARG BUNDLE_PATH="./bundle-frontend/"
-ADD $BUNDLE_PATH /var/www/app/
-ADD ./files/config.js /var/www/app/js/config.js
-ADD ./files/nginx.conf.template /tmp/nginx.conf.template
-ADD ./files/nginx-resolvers.conf.template /tmp/resolvers.conf.template
-ADD ./files/nginx-mime.types /etc/nginx/mime.types
-ADD ./files/nginx-external-locations.conf /etc/nginx/overrides/location.d/external-locations.conf
-ADD ./files/nginx-entrypoint.sh /entrypoint.sh
+COPY $BUNDLE_PATH /var/www/app/
+COPY ./files/config.js /var/www/app/js/config.js
+COPY ./files/nginx.conf.template /tmp/nginx.conf.template
+COPY ./files/nginx-resolvers.conf.template /tmp/resolvers.conf.template
+COPY ./files/nginx-mime.types /etc/nginx/mime.types
+COPY ./files/nginx-external-locations.conf /etc/nginx/overrides/location.d/external-locations.conf
+COPY ./files/nginx-entrypoint.sh /entrypoint.sh

 RUN chown -R 1001:0 /var/cache/nginx; \
    chmod -R g+w /var/cache/nginx; \
--- a/docker/images/Dockerfile.storybook
+++ b/docker/images/Dockerfile.storybook
@@ -1,20 +0,0 @@
-FROM nginxinc/nginx-unprivileged:1.29.1
-LABEL maintainer="Penpot <docker@penpot.app>"
-
-USER root
-
-RUN set -ex; \
-    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot;
-
-ARG BUNDLE_PATH="./bundle-storybook/"
-COPY $BUNDLE_PATH /var/www/
-COPY ./files/nginx.storybook.conf /etc/nginx/conf.d/default.conf
-
-RUN chown -R 1001:0 /var/cache/nginx; \
-    chmod -R g+w /var/cache/nginx; \
-    chown -R 1001:0 /etc/nginx; \
-    chmod -R g+w /etc/nginx; \
-    chown -R 1001:0 /var/www; \
-    chmod -R g+w /var/www;
-
-USER penpot:penpot
--- a/docker/images/docker-compose.yaml
+++ b/docker/images/docker-compose.yaml
@@ -247,11 +247,6 @@ services:
    networks:
      - penpot

-    environment:
-      # You can increase the max memory size if you have sufficient resources,
-      # although this should not be necessary.
-      - VALKEY_EXTRA_FLAGS=--maxmemory 128mb --maxmemory-policy volatile-lfu
-
  ## A mailcatch service, used as temporal SMTP server. You can access via HTTP to the
  ## port 1080 for read all emails the penpot platform has sent. Should be only used as a
  ## temporal solution while no real SMTP provider is configured.
--- a/docker/images/files/nginx.storybook.conf
+++ b/docker/images/files/nginx.storybook.conf
@@ -1,27 +0,0 @@
-server {
-    listen 8080 default_server;
-    server_name _;
-
-    charset utf-8;
-    etag off;
-
-    gzip on;
-    gzip_static on;
-    gzip_types text/plain text/css application/javascript application/json application/vnd.api+json application/xml application/x-javascript text/xml image/svg+xml;
-    gzip_proxied any;
-    gzip_comp_level 6;
-    gzip_buffers 16 8k;
-    gzip_http_version 1.1;
-    gzip_min_length 256;
-    gzip_vary on;
-
-    error_log /dev/stderr;
-    access_log /dev/stdout;
-
-    root /var/www;
-    index index.html;
-
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-}
--- a/docker/images/nginx.storybook.conf
+++ b/docker/images/nginx.storybook.conf
@@ -1,27 +0,0 @@
-server {
-    listen 8080 default_server;
-    server_name _;
-
-    charset utf-8;
-    etag off;
-
-    gzip on;
-    gzip_static on;
-    gzip_types text/plain text/css application/javascript application/json application/vnd.api+json application/xml application/x-javascript text/xml image/svg+xml;
-    gzip_proxied any;
-    gzip_comp_level 6;
-    gzip_buffers 16 8k;
-    gzip_http_version 1.1;
-    gzip_min_length 256;
-    gzip_vary on;
-
-    error_log /dev/stderr;
-    access_log /dev/stdout;
-    
-    root /var/www;
-    index index.html;
-
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-}
--- a/docs/img/design-tokens/34-tokens-composite-typography-alias.webp
+++ b/docs/img/design-tokens/34-tokens-composite-typography-alias.webp
--- a/docs/img/design-tokens/35-tokens-composite-typography-lineheight.webp
+++ b/docs/img/design-tokens/35-tokens-composite-typography-lineheight.webp
--- a/docs/img/design-tokens/36-tokens-composite-typography.webp
+++ b/docs/img/design-tokens/36-tokens-composite-typography.webp
--- a/docs/technical-guide/configuration.md
+++ b/docs/technical-guide/configuration.md
@@ -23,7 +23,7 @@ Flags and evironment variables are also used together; for example:

 ```bash
 # This flag enables the use of SMTP email
-PENPOT_FLAGS: [...] enable-smtp
+PENPOT_FLAGS: enable-smtp

 # These environment variables configure the specific SMPT service
 # Backend
@@ -36,7 +36,7 @@ the exporter, or all of them; on the other hand, **environment variables** are c
 each specific service. For example:

 ```bash
-PENPOT_FLAGS: [...] enable-login-with-google
+PENPOT_FLAGS: enable-login-with-google

 # Backend
 PENPOT_GOOGLE_CLIENT_ID: <client-id>
@@ -56,7 +56,7 @@ Penpot uses anonymous telemetries from the self-hosted instances to improve the
 Consider sharing these anonymous telemetries enabling the corresponding flag:

 ```bash
-PENPOT_FLAGS: [...] enable-telemetries
+PENPOT_FLAGS: enable-telemetries
 ```

 ## Registration and authentication
@@ -402,7 +402,7 @@ This is implemented as specific locations in the penpot-front Nginx. If your org
 in a 100% air-gapped environment, you can use the following configuration:

 ```bash
-PENPOT_FLAGS: [...] enable-air-gapped-conf
+PENPOT_FLAGS: enable-air-gapped-conf
 ```

 When Penpot starts, it will leave out the Nginx configuration related to external requests. This means that,
@@ -459,15 +459,11 @@ POSTGRES_PASSWORD: penpot

 ### Storage

-Storage refers to storing the user uploaded different objects in Penpot (assets, file data,...).
+Storage refers to storing the user uploaded assets.

-Objects storage is implemented using "plugable" backends. Currently there are two
+Assets storage is implemented using "plugable" backends. Currently there are two
 backends available: <code class="language-bash">fs</code> and <code class="language-bash">s3</code> (for AWS S3).

-__Since version 2.11.0__
-The configuration variables related to storage has been renamed, `PENPOT_STORAGE_ASSETS_*` are now `PENPOT_OBJECTS_STORAGE_*`.
-`PENPOT_ASSETS_STORAGE_BACKEND` becomes `PENPOT_OBJECTS_STORAGE_BACKEND` and its values now are `fs` and `s3` instead of `assets-fs` or `assets-s3`.
-
 #### FS Backend (default)

 This is the default backend when you use the official docker images and the default
@@ -475,8 +471,8 @@ configuration looks like this:

 ```bash
 # Backend
-PENPOT_OBJECTS_STORAGE_BACKEND: fs
-PENPOT_OBJECTS_STORAGE_FS_DIRECTORY: /opt/data/objects
+PENPOT_ASSETS_STORAGE_BACKEND: assets-fs
+PENPOT_STORAGE_ASSETS_FS_DIRECTORY: /opt/data/assets
 ```

 The main downside of this backend is the hard dependency on nginx approach to serve files
@@ -489,7 +485,7 @@ configuration file][4] used in the docker images.

 #### AWS S3 Backend

-This backend uses AWS S3 bucket for store the user uploaded objects. For use it you should
+This backend uses AWS S3 bucket for store the user uploaded assets. For use it you should
 have an appropriate account on AWS cloud and have the credentials, region and the bucket.

 This is how configuration looks for S3 backend:
@@ -498,36 +494,18 @@ This is how configuration looks for S3 backend:
 # Backend
 AWS_ACCESS_KEY_ID: <you-access-key-id-here>
 AWS_SECRET_ACCESS_KEY: <your-secret-access-key-here>
-PENPOT_OBJECTS_STORAGE_BACKEND: s3
-PENPOT_OBJECTS_STORAGE_S3_REGION: <aws-region>
-PENPOT_OBJECTS_STORAGE_S3_BUCKET: <bucket-name>
+PENPOT_ASSETS_STORAGE_BACKEND: assets-s3
+PENPOT_STORAGE_ASSETS_S3_REGION: <aws-region>
+PENPOT_STORAGE_ASSETS_S3_BUCKET: <bucket-name>

 # Optional if you want to use it with non AWS, S3 compatible service:
-PENPOT_OBJECTS_STORAGE_S3_ENDPOINT: <endpoint-uri>
+PENPOT_STORAGE_ASSETS_S3_ENDPOINT: <endpoint-uri>
 ```

 <p class="advice">
 These settings are equally useful if you have a Minio storage system.
 </p>

-### File Data Storage
-
-__Since version 2.11.0__
-
-You can change the default file data storage backend with `PENPOT_FILE_DATA_BACKEND` environment variable. Possible values are:
-
- `legacy-db`: the current default backend, continues storing the file data of files and snapshots in the same location as previous versions of Penpot (< 2.11.0), this is a conservative default behaviour and will be changed to `db` in next versions.
- `db`: stores the file data on an specific table (the future default backend).
- `storage`: stores the file data using the objects storage system (S3 or FS, depending on which one is configured)
-
-This also comes with an additional feature that allows offload the "inactive" files on file storage backend and leaves the database only for the active files. To enable it, you should use the `enable-tiered-file-data-storage` flag and `db` as file data storage backend.
-
-```bash
-# Backend
-PENPOT_FLAGS: [...] enable-tiered-file-data-storage
-PENPOT_FILE_DATA_BACKEND: db
-```
-
 ### Autosave

 By default, Penpot stores manually saved versions indefinitely; these can be found in the History tab and can be renamed, restored, deleted, etc. Additionally, the default behavior of on-premise instances is to not keep automatic version history. This automatic behavior can be modified and adapted to each on-premise installation with the corresponding configuration.
@@ -539,7 +517,7 @@ You need to be very careful when configuring automatic versioning, as it can sig
 This is how configuration looks for auto-file-snapshot

 ```bash
-PENPOT_FLAGS: [...] enable-auto-file-snapshot               # Enable automatic version saving
+PENPOT_FLAGS: enable-auto-file-snapshot               # Enable automatic version saving

 # Backend
 PENPOT_AUTO_FILE_SNAPSHOT_EVERY: 5             # How many save operations trigger the auto-save-version?
--- a/docs/technical-guide/developer/frontend.md
+++ b/docs/technical-guide/developer/frontend.md
@@ -217,7 +217,7 @@ repository:

 ```bash
 # cd <repo>/frontend
-yarn run validate-translations
+yarn run translations
 ```

 At Penpot core team we maintain manually the english and spanish .po files. All
--- a/docs/technical-guide/getting-started/recommended-settings.md
+++ b/docs/technical-guide/getting-started/recommended-settings.md
@@ -1,5 +1,5 @@
 ---
-title: 1.1 Recommended settings
+title: 1.1 Recommended storage
 desc: Learn recommended self-hosting settings, Docker & Kubernetes installs, configuration, and troubleshooting tips in Penpot's technical guide.
 ---

@@ -10,33 +10,3 @@ Disk requirements depend on your usage, with the primary factors being database
 As a rule of thumb, start with a **minimum** database size of **50GB** to **100GB** with elastic sizing capability — this configuration should adequately support up to 10 editors. For environments with **more than 10 users**, we recommend adding approximately **5GB** of capacity per additional editor.

 Keep in mind that database size doesn't grow strictly proportionally with user count, as it depends heavily on how Penpot is used and the complexity of files created. Most organizations begin with this baseline and elastic sizing approach, then monitor usage patterns monthly until resource requirements stabilize.
-
-
-# About Valkey / Redis requirements
-
-"Valkey is mainly used for coordinating websocket notifications and, since Penpot 2.11, as a cache. Therefore, disk storage will not be necessary as it will use the instance's RAM.
-
-To prevent the cache from hogging all the system's RAM usage, it is recommended to use two configuration parameters which, both in the docker-compose.yaml provided by Penpot and in the official Helm Chart, come with default parameters that should be sufficient for most deployments:
-
-```bash
-## Recommended values for most Penpot instances.
-## You can modify this value to follow your policies.
-
-# Set maximum memory Valkey/Redis will use.
-# Accepted units: b, k, kb, m, mb, g, gb
-maxmemory 128mb
-
-# Choose an eviction policy (see Valkey docs:
-# https://valkey.io/topics/memory-optimization/ or for Redis
-# https://redis.io/docs/latest/develop/reference/eviction/
-# Common choices:
-#   noeviction, allkeys-lru, volatile-lru, allkeys-random, volatile-random,
-#   volatile-ttl, volatile-lfu, allkeys-lfu
-#
-# For Penpot, volatile-lfu is recommended
-maxmemory-policy volatile-lfu
-```
-
-The `maxmemory` configuration directive specifies the maximum amount of memory to use for the cache data. If you are using a dedicated instance to host Valkey/Redis, we do not recommend using more than 60% of the available RAM.
-
-With `maxmemory-policy` configuration directive, you can select the eviction policy you want to use when the limit set by `maxmemory` is reached. Penpot works fine with `volatile-lfu`, which evicts the least frequently used keys that have been marked as expired.
--- a/docs/user-guide/design-tokens/index.njk
+++ b/docs/user-guide/design-tokens/index.njk
@@ -423,40 +423,6 @@ ExtraBold Italic
 <p>This token can be applied directly to a text element or be used as a reference in a Typography Composite Token.</p>


-<h3 id="typography-composite-tokens">Typography composite token</h3>
-<p><strong>Typography tokens</strong> are composite entities that group several text properties into a single token definition. They allow you to define and reuse complete text styles in a consistent way.</p>
-<p>Each property within a typography token can either reference an existing <a href="#design-tokens-typography">individual typography token</a> (for example, <em>font-size</em> or <em>font-family</em>) or use a hardcoded value. The behavior and syntax of individual typography tokens are described in the previous section of this guide.</p>
-<figure>
-  <img src="/img/design-tokens/36-tokens-composite-typography.webp" alt="Typography composite token" />
-</figure>
-
-<h4 id="reference-composite-token">Reference another Typography Composite Token</h4>
-<p>You can also reference another existing <strong>Typography Composite Token</strong> instead of defining each property manually. When doing so, Penpot resolves all individual properties from the referenced token.</p>
-<figure>
-  <img src="/img/design-tokens/34-tokens-composite-typography-alias.webp" alt="Typography composite token" />
-</figure>
-
-<h4 id="line-height-property">Line height property</h4>
-<p>The <strong>Typography Token</strong> includes a <em>line-height</em> property, which is not available as an individual token. This is because line-height depends on the font size to be calculated properly. Make sure the <em>font-size</em> property is defined before setting <em>line-height</em>.</p>
-<figure>
-  <img src="/img/design-tokens/35-tokens-composite-typography-lineheight.webp" alt="Typography composite token" />
-</figure>
-
-<p>Accepted values for the line-height input:</p>
-<ul>
-  <li><strong>Unitless number:</strong> interpreted as a multiplier of the font size. This is Penpot’s default behavior.</li>
-  <li><strong>Percentage (%):</strong> converted internally to a multiplier.</li>
-  <li><strong>Pixel (px) or rem value:</strong> if using rem, Penpot calculates the proportion relative to the font size and converts it to a multiplier.</li>
-  <li><strong>References:</strong> you can also reference <a href="#design-tokens-number">number</a> or <a href="#design-tokens-dimensions">dimension</a> tokens.</li>
-</ul>
-
-<h4 id="apply-typography-token">Apply a Typography token</h4>
-<p>A <strong>Typography composite token</strong> can be applied to a full text layer to set all typography properties at once. This lets you manage complete text styles using a single token instead of combining multiple individual ones.</p>
-<p>When applying a Typography composite token to a layer, any previously applied <em>Typography composite token</em> or <em>style</em> will be detached. The same happens in reverse. Only one of them can be active at a time.</p>
-
-
-
-
 <h2 id="design-tokens-sets">Token Sets</h2>
 <p>Token Sets allow you to split your tokens up into multiple files in order to create organized groups or collections of tokens. It enables efficient management and customization within design files. For example you can group all your color sets, sizing sets or platform-specific sets. The purpose of tokens sets is to organize them in a way that matches your needs.</p>
 <figure>
--- a/frontend/playwright/data/design/get-file-text-fills-limit.json
+++ b/frontend/playwright/data/design/get-file-text-fills-limit.json
@@ -24,11 +24,11 @@
    },
    "~:has-media-trimmed": false,
    "~:comment-thread-seqn": 0,
-    "~:name": "Bug 12384",
-    "~:revn": 4,
-    "~:modified-at": "~m1761124840773",
+    "~:name": "Text fills",
+    "~:revn": 26,
+    "~:modified-at": "~m1760450987132",
    "~:vern": 0,
-    "~:id": "~ufa6ce865-34dd-80ac-8006-fe0dab5539a7",
+    "~:id": "~ub1ff3fdf-b491-812b-8006-f2ce3d29333a",
    "~:is-shared": false,
    "~:migrations": {
        "~#ordered-set": [
@@ -92,6 +92,7 @@
            "0004-clean-shadow-color",
            "0005-deprecate-image-type",
            "0006-fix-old-texts-fills",
+            "0007-clear-invalid-strokes-and-fills-v2",
            "0008-fix-library-colors-v4",
            "0009-clean-library-colors",
            "0009-add-partial-text-touched-flags",
@@ -99,33 +100,30 @@
            "0011-fix-invalid-text-touched-flags",
            "0012-fix-position-data",
            "0013-fix-component-path",
-            "0013-clear-invalid-strokes-and-fills",
-            "0014-fix-tokens-lib-duplicate-ids",
-            "0014-clear-components-nil-objects"
+            "0014-fix-tokens-lib-duplicate-ids"
        ]
    },
    "~:version": 67,
    "~:project-id": "~u3e5ffd68-2819-8084-8006-eb1c616e69bf",
-    "~:created-at": "~m1761123649876",
+    "~:created-at": "~m1760368824484",
    "~:backend": "legacy-db",
    "~:data": {
        "~:pages": [
-            "~ufa6ce865-34dd-80ac-8006-fe0dab5539a8"
+            "~ub1ff3fdf-b491-812b-8006-f2ce3d29333b"
        ],
        "~:pages-index": {
-            "~ufa6ce865-34dd-80ac-8006-fe0dab5539a8": {
+            "~ub1ff3fdf-b491-812b-8006-f2ce3d29333b": {
                "~:objects": {
                    "~#penpot/objects-map/v2": {
-                        "~u00000000-0000-0000-0000-000000000000": "[\"~#shape\",[\"^ \",\"~:y\",0,\"~:hide-fill-on-export\",false,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"Root Frame\",\"~:width\",0.01,\"~:type\",\"~:frame\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",0.0,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.01]],[\"^:\",[\"^ \",\"~:x\",0.0,\"~:y\",0.01]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^3\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",0,\"~:proportion\",1.0,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",0,\"~:y\",0,\"^6\",0.01,\"~:height\",0.01,\"~:x1\",0,\"~:y1\",0,\"~:x2\",0.01,\"~:y2\",0.01]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#FFFFFF\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^H\",0.01,\"~:flip-y\",null,\"~:shapes\",[\"~u3fc80ad6-7d08-8031-8006-fe0dba3fddf7\"]]]",
-                        "~u3fc80ad6-7d08-8031-8006-fe0dba3fddf7": "[\"~#shape\",[\"^ \",\"~:y\",250,\"~:hide-fill-on-export\",false,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:fixed\",\"~:hide-in-viewer\",false,\"~:name\",\"Board\",\"~:width\",265,\"~:type\",\"~:frame\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",616,\"~:y\",250]],[\"^=\",[\"^ \",\"~:x\",881,\"~:y\",250]],[\"^=\",[\"^ \",\"~:x\",881,\"~:y\",494]],[\"^=\",[\"^ \",\"~:x\",616,\"~:y\",494]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^3\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:exports\",[[\"^ \",\"^:\",\"~:png\",\"~:suffix\",\"\",\"~:scale\",1]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u3fc80ad6-7d08-8031-8006-fe0dba3fddf7\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",616,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",616,\"~:y\",250,\"^9\",265,\"~:height\",244,\"~:x1\",616,\"~:y1\",250,\"~:x2\",881,\"~:y2\",494]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#FFFFFF\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^O\",244,\"~:flip-y\",null,\"~:shapes\",[\"~u20a28a94-4ab0-801b-8006-fe0e8cee02c3\"]]]",
-                        "~u20a28a94-4ab0-801b-8006-fe0e8cee02c3": "[\"~#shape\",[\"^ \",\"~:y\",297.00000381469727,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:fixed\",\"~:hide-in-viewer\",false,\"~:name\",\"Rectangle\",\"~:width\",65,\"~:type\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",644.0000085830688,\"~:y\",297.00000381469727]],[\"^<\",[\"^ \",\"~:x\",709.0000085830688,\"~:y\",297.00000381469727]],[\"^<\",[\"^ \",\"~:x\",709.0000085830688,\"~:y\",362.00000381469727]],[\"^<\",[\"^ \",\"~:x\",644.0000085830688,\"~:y\",362.00000381469727]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^2\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:constraints-v\",\"~:top\",\"~:constraints-h\",\"~:left\",\"~:r1\",0,\"~:id\",\"~u20a28a94-4ab0-801b-8006-fe0e8cee02c3\",\"~:parent-id\",\"~u3fc80ad6-7d08-8031-8006-fe0dba3fddf7\",\"~:frame-id\",\"~u3fc80ad6-7d08-8031-8006-fe0dba3fddf7\",\"~:strokes\",[],\"~:x\",644.0000085830688,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",644.0000085830688,\"~:y\",297.00000381469727,\"^8\",65,\"~:height\",65,\"~:x1\",644.0000085830688,\"~:y1\",297.00000381469727,\"~:x2\",709.0000085830688,\"~:y2\",362.00000381469727]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#B1B2B5\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^N\",65,\"~:flip-y\",null]]"
+                        "~u00000000-0000-0000-0000-000000000000": "[\"~#shape\",[\"^ \",\"~:y\",0,\"~:hide-fill-on-export\",false,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"Root Frame\",\"~:width\",0.01,\"~:type\",\"~:frame\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",0.0,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.01]],[\"^:\",[\"^ \",\"~:x\",0.0,\"~:y\",0.01]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^3\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",0,\"~:proportion\",1.0,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",0,\"~:y\",0,\"^6\",0.01,\"~:height\",0.01,\"~:x1\",0,\"~:y1\",0,\"~:x2\",0.01,\"~:y2\",0.01]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#FFFFFF\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^H\",0.01,\"~:flip-y\",null,\"~:shapes\",[\"~u23b2a9cc-5d10-800a-8006-f2ce6354e75d\"]]]",
+                        "~u23b2a9cc-5d10-800a-8006-f2ce6354e75d": "[\"~#shape\",[\"^ \",\"~:y\",540.9999842227844,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"~:type\",\"root\",\"~:key\",\"1tx250q8puw\",\"~:children\",[[\"^ \",\"^7\",\"paragraph-set\",\"^9\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^9\",[[\"^ \",\"^:\",\"\",\"^;\",\"normal\",\"~:typography-ref-id\",null,\"~:text-transform\",\"none\",\"~:font-id\",\"sourcesanspro\",\"^8\",\"1c1skqx1y2p\",\"~:font-size\",\"36\",\"~:font-weight\",\"700\",\"~:typography-ref-file\",null,\"~:font-variant-id\",\"bold\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[[\"^ \",\"~:fill-color\",\"#000000\",\"~:fill-opacity\",1],[\"^ \",\"^F\",\"#00ffc3\",\"^G\",1],[\"^ \",\"^F\",\"#d9ff00\",\"^G\",1],[\"^ \",\"^F\",\"#192b60\",\"^G\",1],[\"^ \",\"^F\",\"#7f9fff\",\"^G\",1],[\"^ \",\"^F\",\"#ff00ca\",\"^G\",1],[\"^ \",\"^F\",\"#003fff\",\"^G\",1]],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"Lorem ipsum\"]],\"^<\",null,\"^=\",\"none\",\"~:text-align\",\"left\",\"^>\",\"sourcesanspro\",\"^8\",\"12a6vwimj9j\",\"^?\",\"0\",\"^@\",\"700\",\"^A\",null,\"~:text-direction\",\"ltr\",\"^7\",\"paragraph\",\"^B\",\"bold\",\"^C\",\"none\",\"^D\",\"0\",\"^E\",[[\"^ \",\"^F\",\"#000000\",\"^G\",1],[\"^ \",\"^F\",\"#00ffc3\",\"^G\",1],[\"^ \",\"^F\",\"#d9ff00\",\"^G\",1],[\"^ \",\"^F\",\"#192b60\",\"^G\",1],[\"^ \",\"^F\",\"#7f9fff\",\"^G\",1],[\"^ \",\"^F\",\"#ff00ca\",\"^G\",1],[\"^ \",\"^F\",\"#003fff\",\"^G\",1]],\"^H\",\"sourcesanspro\"]]]],\"~:vertical-align\",\"top\"],\"~:hide-in-viewer\",false,\"~:name\",\"Lorem ipsum\",\"~:width\",207.000004835394,\"^7\",\"^I\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",321.9999624852649,\"~:y\",540.9999842227845]],[\"^Q\",[\"^ \",\"~:x\",528.9999673206589,\"~:y\",540.9999842227845]],[\"^Q\",[\"^ \",\"~:x\",528.9999673206589,\"~:y\",583.9999821366218]],[\"^Q\",[\"^ \",\"~:x\",321.9999624852649,\"~:y\",583.9999821366218]]],\"~:transform-inverse\",[\"^2\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:id\",\"~u23b2a9cc-5d10-800a-8006-f2ce6354e75d\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:x\",321.99996248526486,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",321.99996248526486,\"~:y\",540.9999842227844,\"^O\",207.000004835394,\"~:height\",42.99999791383732,\"~:x1\",321.99996248526486,\"~:y1\",540.9999842227844,\"~:x2\",528.9999673206589,\"~:y2\",583.9999821366217]],\"~:flip-x\",null,\"^X\",42.99999791383732,\"~:flip-y\",null]]"
                    }
                },
-                "~:id": "~ufa6ce865-34dd-80ac-8006-fe0dab5539a8",
+                "~:id": "~ub1ff3fdf-b491-812b-8006-f2ce3d29333b",
                "~:name": "Page 1"
            }
        },
-        "~:id": "~ufa6ce865-34dd-80ac-8006-fe0dab5539a7",
+        "~:id": "~ub1ff3fdf-b491-812b-8006-f2ce3d29333a",
        "~:options": {
            "~:components-v2": true,
            "~:base-font-size": "16px"
--- a/frontend/playwright/ui/specs/dashboard-teams.spec.js
+++ b/frontend/playwright/ui/specs/dashboard-teams.spec.js
@@ -1,31 +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("BUG 12359 - Selected invitations count is not pluralized", async ({
-  page,
-}) => {
-  const dashboardPage = new DashboardPage(page);
-  await dashboardPage.setupDashboardFull();
-  await dashboardPage.setupTeamInvitations();
-
-  await dashboardPage.goToSecondTeamInvitationsSection();
-
-  await expect(page.getByText("test1@mail.com")).toBeVisible();
-
-  // NOTE: we cannot use check() or getByLabel() because the checkbox
-  // is hidden inside the label.
-  await page.getByText("test1@mail.com").click();
-  await expect(page.getByText("1 invitation selected")).toBeVisible();
-
-  await page.getByText("test2@mail.com").check();
-  await expect(page.getByText("2 invitations selected")).toBeVisible();
-});
--- a/frontend/playwright/ui/specs/design-tab.spec.js
+++ b/frontend/playwright/ui/specs/design-tab.spec.js
@@ -89,6 +89,38 @@ test.describe("Shape attributes", () => {

    await expect(workspace.page.getByTestId("add-fill")).toBeDisabled();
  });
+
+  test("Cannot add a new text fill when the limit has been reached", async ({
+    page,
+  }) => {
+    const workspace = new WorkspacePage(page);
+    await workspace.mockConfigFlags(["enable-feature-render-wasm"]);
+    await workspace.setupEmptyFile();
+    await workspace.mockRPC(
+      /get\-file\?/,
+      "design/get-file-text-fills-limit.json",
+    );
+
+    await workspace.goToWorkspace({
+      fileId: "b1ff3fdf-b491-812b-8006-f2ce3d29333a",
+      pageId: "b1ff3fdf-b491-812b-8006-f2ce3d29333b",
+    });
+
+    await workspace.clickLeafLayer("Lorem ipsum");
+
+    await expect(
+      workspace.page.getByRole("button", { name: "Remove color" }),
+    ).toHaveCount(7);
+
+    await workspace.page.getByRole("button", { name: "Add fill" }).click();
+    await expect(
+      workspace.page.getByRole("button", { name: "Remove color" }),
+    ).toHaveCount(8);
+
+    await expect(
+      workspace.page.getByRole("button", { name: "Add fill" }),
+    ).toBeDisabled();
+  });
 });

 test.describe("Multiple shapes attributes", () => {
@@ -288,50 +320,3 @@ test("BUG 12287 Fix identical text fills not being added/removed", async ({
    workspace.page.getByRole("button", { name: "#B1B2B5" }),
  ).toHaveCount(3);
 });
-
-test("BUG 12384 - Export crashing when exporting a board", async ({ page }) => {
-  const workspace = new WorkspacePage(page);
-  await workspace.setupEmptyFile();
-  await workspace.mockRPC(/get\-file\?/, "design/get-file-12384.json");
-
-  let hasExportRequestBeenIntercepted = false;
-  await workspace.page.route("**/api/export", (route) => {
-    if (hasExportRequestBeenIntercepted) {
-      route.continue();
-      return;
-    }
-
-    hasExportRequestBeenIntercepted = true;
-    const payload = route.request().postData();
-    const parsedPayload = JSON.parse(payload);
-
-    expect(parsedPayload["~:exports"]).toHaveLength(1);
-    expect(parsedPayload["~:exports"][0]["~:file-id"]).toBe(
-      "~ufa6ce865-34dd-80ac-8006-fe0dab5539a7",
-    );
-    expect(parsedPayload["~:exports"][0]["~:page-id"]).toBe(
-      "~ufa6ce865-34dd-80ac-8006-fe0dab5539a8",
-    );
-
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      response: {},
-    });
-  });
-
-  await workspace.goToWorkspace({
-    fileId: "fa6ce865-34dd-80ac-8006-fe0dab5539a7",
-    pageId: "fa6ce865-34dd-80ac-8006-fe0dab5539a8",
-  });
-
-  await workspace.clickLeafLayer("Board");
-
-  let exportRequest = workspace.page.waitForRequest("**/api/export");
-
-  await workspace.rightSidebar
-    .getByRole("button", { name: "Export 1 element" })
-    .click();
-
-  await exportRequest;
-});
--- a/frontend/playwright/ui/specs/tokens.spec.js
+++ b/frontend/playwright/ui/specs/tokens.spec.js
@@ -95,24 +95,6 @@ const setupTypographyTokensFile = async (page, options = {}) => {
  });
 };

-const checkInputFieldWithError = async (tokenThemeUpdateCreateModal, inputLocator) => {
-    await expect(inputLocator).toHaveAttribute("aria-invalid", "true");
-
-    const errorMessageId = await inputLocator.getAttribute("aria-describedby");
-    await expect(
-      tokenThemeUpdateCreateModal.locator(`#${errorMessageId}`),
-    ).toBeVisible();
-};
-
-const checkInputFieldWithoutError = async (tokenThemeUpdateCreateModal, inputLocator) => {
-    expect(
-      await inputLocator.getAttribute("aria-invalid")
-    ).toBeNull();
-    expect(
-      await inputLocator.getAttribute("aria-describedby")
-    ).toBeNull();
-};
-
 test.describe("Tokens: Tokens Tab", () => {
  test("Clicking tokens tab button opens tokens sidebar tab", async ({
    page,
@@ -824,25 +806,18 @@ test.describe("Tokens: Themes modal", () => {
      })
      .click();

-    const groupInput = tokenThemeUpdateCreateModal.getByLabel("Group");
-    const nameInput = tokenThemeUpdateCreateModal.getByLabel("Theme");
-    const saveButton = tokenThemeUpdateCreateModal.getByRole("button", {
-      name: "Save theme",
-    });
- 
-    await groupInput.fill("Core"); // Invalid because "Core / Light" theme already exists
-    await nameInput.fill("Light");
+    await tokenThemeUpdateCreateModal
+      .getByLabel("Group")
+      .fill("New Group name");
+    await tokenThemeUpdateCreateModal
+      .getByLabel("Theme")
+      .fill("New Theme name");

-    await checkInputFieldWithError(tokenThemeUpdateCreateModal, nameInput);
-    await expect(saveButton).toBeDisabled();
-
-    await groupInput.fill("New Group name");
-    await nameInput.fill("New Theme name");
-
-    await checkInputFieldWithoutError(tokenThemeUpdateCreateModal, nameInput);
-    await expect(saveButton).not.toBeDisabled();
-
-    await saveButton.click();
+    await tokenThemeUpdateCreateModal
+      .getByRole("button", {
+        name: "Save theme",
+      })
+      .click();

    await expect(
      tokenThemeUpdateCreateModal.getByText("New Theme name"),
@@ -870,36 +845,12 @@ test.describe("Tokens: Themes modal", () => {
      .first()
      .click();

-    const groupInput = tokenThemeUpdateCreateModal.getByLabel("Group");
-    const nameInput = tokenThemeUpdateCreateModal.getByLabel("Theme");
-    const saveButton = tokenThemeUpdateCreateModal.getByRole("button", {
-      name: "Save theme",
-    });
- 
-    await groupInput.fill("Core"); // Invalid because "Core / Dark" theme already exists
-    await nameInput.fill("Dark");
-
-    await checkInputFieldWithError(tokenThemeUpdateCreateModal, nameInput);
-    await expect(saveButton).toBeDisabled();
- 
-    await groupInput.fill("Core"); // Valid because "Core / Light" theme already exists
-    await nameInput.fill("Light"); // but it's the same theme we are editing
-
-    await checkInputFieldWithoutError(tokenThemeUpdateCreateModal, nameInput);
-    await expect(saveButton).not.toBeDisabled();
-
-    await nameInput.fill("Changed Theme name"); // New names should be also valid
-    await groupInput.fill("Changed Group name");
-
-    await checkInputFieldWithoutError(tokenThemeUpdateCreateModal, nameInput);
-    await expect(saveButton).not.toBeDisabled();
-
-    expect(
-      await nameInput.getAttribute("aria-invalid")
-    ).toBeNull();
-    expect(
-      await nameInput.getAttribute("aria-describedby")
-    ).toBeNull();
+    await tokenThemeUpdateCreateModal
+      .getByLabel("Theme")
+      .fill("Changed Theme name");
+    await tokenThemeUpdateCreateModal
+      .getByLabel("Group")
+      .fill("Changed Group name");

    const checkboxes = await tokenThemeUpdateCreateModal
      .locator('[role="checkbox"]')
@@ -913,15 +864,11 @@ test.describe("Tokens: Themes modal", () => {
      }
    }

-    const firstButton = await tokenThemeUpdateCreateModal
-      .getByTestId('tokens-set-item')
-      .first();
-    
-    await firstButton.click();
-
-    await expect(saveButton).not.toBeDisabled();
-
-    await saveButton.click();
+    await tokenThemeUpdateCreateModal
+      .getByRole("button", {
+        name: "Save theme",
+      })
+      .click();

    await expect(
      tokenThemeUpdateCreateModal.getByText("Changed Theme name"),
--- a/frontend/playwright/ui/specs/variants.spec.js
+++ b/frontend/playwright/ui/specs/variants.spec.js
@@ -150,8 +150,8 @@ test("User copy paste a variant container", async ({ page }) => {
  await workspacePage.clickAt(500, 500);
  await workspacePage.page.keyboard.press("Control+v");

-  const variant_original = await findVariant(workspacePage, 1);
-  const variant_duplicate = await findVariant(workspacePage, 0);
+  const variant_original = await findVariant(workspacePage, 0);
+  const variant_duplicate = await findVariant(workspacePage, 1);

  // Expand the layers
  await variant_duplicate.container.getByRole("button").first().click();
--- a/frontend/playwright/ui/visual-specs/workspace.spec.js
+++ b/frontend/playwright/ui/visual-specs/workspace.spec.js
@@ -28,13 +28,29 @@ const setupFileWithAssets = async (workspace) => {
  return { fileId, pageId };
 };

-test("Shows the workspace correctly for a blank file", async ({ page }) => {
-  const workspace = new WorkspacePage(page);
-  await workspace.setupEmptyFile();
+test.describe("Viewport", () => {
+  test("Shows the workspace correctly for a blank file", async ({ page }) => {
+    const workspace = new WorkspacePage(page);
+    await workspace.setupEmptyFile();

-  await workspace.goToWorkspace();
+    await workspace.goToWorkspace();

-  await expect(workspace.page).toHaveScreenshot();
+    await expect(workspace.page).toHaveScreenshot();
+  });
+
+  test("User creates a rectangle and locks it", async ({ page }) => {
+    const workspace = new WorkspacePage(page);
+    await workspace.setupEmptyFile(page);
+    await workspace.goToWorkspace();
+
+    await workspace.rectShapeButton.click();
+    await workspace.clickWithDragViewportAt(128, 128, 200, 100);
+    await workspace.clickLeafLayer("Rectangle");
+
+    await page.keyboard.press("Shift+Control+L");
+
+    await expect(workspace.page).toHaveScreenshot();
+  });
 });

 test.describe("Design tab", () => {
@@ -145,4 +161,4 @@ test.describe("Palette", () => {
      workspace.palette.getByRole("button", { name: "#7798ff" }),
    ).toBeVisible();
  });
-});
+});
--- a/frontend/resources/images/features/2.11-invitations.gif
+++ b/frontend/resources/images/features/2.11-invitations.gif
--- a/frontend/resources/images/features/2.11-menu.gif
+++ b/frontend/resources/images/features/2.11-menu.gif
--- a/frontend/resources/images/features/2.11-slide-0.jpg
+++ b/frontend/resources/images/features/2.11-slide-0.jpg
--- a/frontend/resources/images/features/2.11-typography-token.gif
+++ b/frontend/resources/images/features/2.11-typography-token.gif
--- a/frontend/resources/images/features/2.11-variants.gif
+++ b/frontend/resources/images/features/2.11-variants.gif
--- a/frontend/scripts/build-storybook
+++ b/frontend/scripts/build-storybook
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# NOTE: this script should be called from the parent directory to
-# properly work.
-
-export CURRENT_VERSION=$1;
-export BUILD_DATE=$(date -R);
-export CURRENT_HASH=${CURRENT_HASH:-$(git rev-parse --short HEAD)};
-export TS=$(date +%s);
-
-export NODE_ENV=production;
-
-echo "Current path:"
-echo $PATH
-
-set -ex
-
-corepack enable;
-corepack install || exit 1;
-yarn install || exit 1;
-
-yarn run build:storybook || exit 1;
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -139,9 +139,9 @@
        (fn [data]
          (assoc file :data (d/removem (comp t/pointer? val) data))))))

-(defn- check-libraries-synchronization
+(defn- check-libraries-synchronozation
  [file-id libraries]
-  (ptk/reify ::check-libraries-synchronization
+  (ptk/reify ::check-libraries-synchronozation
    ptk/WatchEvent
    (watch [_ state _]
      (let [file         (dsh/lookup-file state file-id)
@@ -154,7 +154,7 @@
                  libraries)]

        (when needs-check?
-          (->> (rx/of (dwl/notify-sync-file))
+          (->> (rx/of (dwl/notify-sync-file file-id))
               (rx/delay 1000)))))))

 (defn- library-resolved
@@ -168,32 +168,30 @@
  [file-id features]
  (ptk/reify ::fetch-libries
    ptk/WatchEvent
-    (watch [_ _ stream]
-      (let [stopper-s (rx/filter (ptk/type? ::finalize-workspace) stream)]
-        (->> (rx/concat
-              (->> (rp/cmd! :get-file-libraries {:file-id file-id})
-                   (rx/mapcat
-                    (fn [libraries]
-                      (rx/concat
-                       (rx/of (dwl/libraries-fetched file-id libraries))
-                       (rx/merge
-                        (->> (rx/from libraries)
-                             (rx/merge-map
-                              (fn [{:keys [id synced-at]}]
-                                (->> (rp/cmd! :get-file {:id id :features features})
-                                     (rx/map #(assoc % :synced-at synced-at :library-of file-id)))))
-                             (rx/mapcat resolve-file)
-                             (rx/map library-resolved))
-                        (->> (rx/from libraries)
-                             (rx/map :id)
-                             (rx/mapcat (fn [file-id]
-                                          (rp/cmd! :get-file-object-thumbnails {:file-id file-id :tag "component"})))
-                             (rx/map dwl/library-thumbnails-fetched)))
-                       (rx/of (check-libraries-synchronization file-id libraries))))))
+    (watch [_ _ _]
+      (rx/concat
+       (->> (rp/cmd! :get-file-libraries {:file-id file-id})
+            (rx/mapcat
+             (fn [libraries]
+               (rx/concat
+                (rx/of (dwl/libraries-fetched file-id libraries))
+                (rx/merge
+                 (->> (rx/from libraries)
+                      (rx/merge-map
+                       (fn [{:keys [id synced-at]}]
+                         (->> (rp/cmd! :get-file {:id id :features features})
+                              (rx/map #(assoc % :synced-at synced-at :library-of file-id)))))
+                      (rx/mapcat resolve-file)
+                      (rx/map library-resolved))
+                 (->> (rx/from libraries)
+                      (rx/map :id)
+                      (rx/mapcat (fn [file-id]
+                                   (rp/cmd! :get-file-object-thumbnails {:file-id file-id :tag "component"})))
+                      (rx/map dwl/library-thumbnails-fetched)))
+                (rx/of (check-libraries-synchronozation file-id libraries))))))

-              ;; This events marks that all the libraries have been resolved
-              (rx/of (ptk/data-event ::all-libraries-resolved)))
-             (rx/take-until stopper-s))))))
+       ;; This events marks that all the libraries have been resolved
+       (rx/of (ptk/data-event ::all-libraries-resolved))))))

 (defn- workspace-initialized
  [file-id]
--- a/frontend/src/app/main/data/workspace/clipboard.cljs
+++ b/frontend/src/app/main/data/workspace/clipboard.cljs
@@ -848,10 +848,6 @@
                             index
                             0)

-              index        (if index
-                             index
-                             (dec (count (dm/get-in page-objects [parent-id :shapes]))))
-
              selected     (if (and (ctl/flex-layout? page-objects parent-id) (not (ctl/reverse? page-objects parent-id)))
                             (into (d/ordered-set) (reverse selected))
                             selected)
--- a/frontend/src/app/main/data/workspace/colors.cljs
+++ b/frontend/src/app/main/data/workspace/colors.cljs
@@ -154,8 +154,23 @@

     (transform-fill* state ids transform-attrs options))))

+(defn swap-attrs [shape attr index new-index]
+  (let [first (get-in shape [attr index])
+        second (get-in shape [attr new-index])]
+    (-> shape
+        (assoc-in [attr index] second)
+        (assoc-in [attr new-index] first))))
+
+(defn- swap-fills-index
+  [fills index new-index]
+  (let [first  (get fills index)
+        second (get fills new-index)]
+    (-> fills
+        (assoc index second)
+        (assoc new-index first))))
+
 (defn reorder-fills
-  [ids from-pos to-space-between-pos]
+  [ids index new-index]
  (ptk/reify ::reorder-fills
    ptk/WatchEvent
    (watch [_ state _]
@@ -167,7 +182,7 @@

            transform-attrs
            (fn [object]
-              (update object :fills types.fills/update d/reorder from-pos to-space-between-pos))]
+              (update object :fills types.fills/update swap-fills-index index new-index))]

        (rx/concat
         (rx/from (map #(dwt/update-text-with-function % transform-attrs) text-ids))
@@ -500,22 +515,22 @@
                                   {:attrs [:strokes]}))))))

 (defn reorder-shadows
-  [ids from-pos to-space-between-pos]
+  [ids index new-index]
  (ptk/reify ::reorder-shadow
    ptk/WatchEvent
    (watch [_ _ _]
      (rx/of (dwsh/update-shapes
              ids
-              #(update % :shadow d/reorder from-pos to-space-between-pos))))))
+              #(swap-attrs % :shadow index new-index))))))

 (defn reorder-strokes
-  [ids from-pos to-space-between-pos]
+  [ids index new-index]
  (ptk/reify ::reorder-strokes
    ptk/WatchEvent
    (watch [_ _ _]
      (rx/of (dwsh/update-shapes
              ids
-              #(update % :strokes d/reorder from-pos to-space-between-pos)
+              #(swap-attrs % :strokes index new-index)
              {:attrs [:strokes]})))))

 (defn picker-for-selected-shape
@@ -1122,16 +1137,20 @@
        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)
+        has-color? (:stroke-color stroke)

-        is-shared? (contains? colors ref-id)
-        has-color? (or (:stroke-color stroke)
-                       (:stroke-color-gradient stroke))
-        attrs      (cond-> (clr/stroke->color stroke)
-                     (not (or is-shared? (= ref-file file-id)))
-                     (dissoc :ref-id :ref-file))]
+        base-attrs (cond-> (clr/stroke->color stroke)
+                     (not (or shared? (= ref-file file-id)))
+                     (dissoc :ref-file :ref-id))
+
+        attrs      (cond-> base-attrs
+                     (:has-token-applied stroke)
+                     (assoc :has-token-applied true
+                            :token-name (:token-name stroke)))]

    (when has-color?
      {:attrs attrs
@@ -1139,7 +1158,25 @@
       :shape-id (:shape-id stroke)
       :index (:index stroke)})))

-(defn- shadow->color-att
+(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...}
+      :prop :stroke
+      :shape-id <uuid>
+      :index <int>}"
  [shadow file-id libraries]
  (let [color    (get shadow :color)
        ref-file (get color :ref-file)
@@ -1187,6 +1224,24 @@
         (map #(text->color-att % file-id libraries)))))

 (defn- fill->color-att
+  "Given a fill 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:
+   - fill: map with fill info, including :shape-id and :index
+   - file-id: current file UUID
+   - libraries: map of shared color libraries
+
+   Returns:
+   A map like:
+   {:attrs {...color data...}
+    :prop :fill
+    :shape-id <uuid>
+    :index <int>}"
  [fill file-id libraries]
  (let [ref-file   (:fill-color-ref-file fill)
        ref-id     (:fill-color-ref-id fill)
@@ -1198,9 +1253,15 @@
        shared?    (contains? colors ref-id)
        has-color? (or (:fill-color fill)
                       (:fill-color-gradient fill))
-        attrs      (cond-> (types.fills/fill->color fill)
+
+        base-attrs (cond-> (types.fills/fill->color fill)
                     (not (or shared? (= ref-file file-id)))
-                     (dissoc :ref-file :ref-id))]
+                     (dissoc :ref-file :ref-id))
+
+        attrs      (cond-> base-attrs
+                     (:has-token-applied fill)
+                     (assoc :has-token-applied true
+                            :token-name (:token-name fill)))]

    (when has-color?
      {:attrs attrs
@@ -1209,21 +1270,55 @@
       :index (:index fill)})))

 (defn extract-all-colors
+  "Extracts color information from a list of shapes, including fills, strokes, and shadows.
+     If a shape has applied tokens of type :fill or :stroke-color, the first fill or stroke
+     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]
  (reduce
   (fn [result shape]
-     (let [fill-obj   (map-indexed #(assoc %2 :shape-id (:id shape) :index %1) (:fills shape))
-           stroke-obj (map-indexed #(assoc %2 :shape-id (:id shape) :index %1) (:strokes shape))
-           shadow-obj (map-indexed #(assoc %2 :shape-id (:id shape) :index %1) (:shadow shape))]
+     (let [applied-tokens (:applied-tokens shape)
+           applied-fill   (get applied-tokens :fill)
+           applied-stroke (get applied-tokens :stroke-color)
+           fills          (:fills shape)
+           strokes        (:strokes shape)
+           shadows        (:shadow shape)
+           shape-id       (:id shape)
+
+           fills* (map-indexed
+                   (fn [index fill]
+                     (cond-> (assoc fill :shape-id shape-id :index index)
+                       (and (zero? index) applied-fill)
+                       (assoc :has-token-applied true
+                              :token-name applied-fill)))
+                   fills)
+
+           strokes* (map-indexed
+                     (fn [index stroke]
+                       (cond-> (assoc stroke :shape-id shape-id :index index)
+                         (and (zero? index) applied-stroke)
+                         (assoc :has-token-applied true
+                                :token-name applied-stroke)))
+                     strokes)
+
+           shadows* (map-indexed #(assoc %2 :shape-id shape-id :index %1) shadows)]
       (if (= :text (:type shape))
         (-> result
-             (into (keep #(stroke->color-att % file-id libraries)) stroke-obj)
-             (into (map #(shadow->color-att % file-id libraries)) shadow-obj)
+             (into (keep #(stroke->color-att % file-id libraries)) strokes*)
+             (into (map #(shadow->color-attr % file-id libraries)) shadows*)
             (into (extract-text-colors shape file-id libraries)))
-
         (-> result
-             (into (keep #(fill->color-att % file-id libraries)) fill-obj)
-             (into (keep #(stroke->color-att % file-id libraries)) stroke-obj)
-             (into (map #(shadow->color-att % file-id libraries)) shadow-obj)))))
+             (into (keep #(fill->color-att % file-id libraries)) fills*)
+             (into (keep #(stroke->color-att % file-id libraries)) strokes*)
+             (into (map #(shadow->color-attr % file-id libraries)) shadows*)))))
   []
   shapes))
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -1193,22 +1193,19 @@
         (ctf/used-assets-changed-since file-data library sync-date))))))

 (defn notify-sync-file
-  "Notify the user that there are updates in the libraries used by the
-   current file, and ask if he wants to update them now."
-  []
+  ;; file-id is the id of the modified library
+  [file-id]
+  (dm/assert! (uuid? file-id))
  (ptk/reify ::notify-sync-file
    ptk/WatchEvent
    (watch [_ state _]
-      (let [file-id      (:current-file-id state)
-            file         (dsh/lookup-file state file-id)
+      (let [file         (dsh/lookup-file state (:current-file-id state))
            file-data    (get file :data)
            ignore-until (get file :ignore-sync-until)

            libraries-need-sync
-            (->> (vals (get state :files))
-                 (filter #(= (:library-of %) file-id))
-                 (filter #(seq (assets-need-sync % file-data ignore-until))))
-
+            (filter #(seq (assets-need-sync % file-data ignore-until))
+                    (vals (get state :files)))
            do-more-info
            #(modal/show! :libraries-dialog {:starting-tab "updates" :file-id file-id})

--- a/frontend/src/app/main/data/workspace/modifiers.cljs
+++ b/frontend/src/app/main/data/workspace/modifiers.cljs
@@ -191,6 +191,30 @@
      (d/not-empty? position-data)
      (assoc :position-data position-data))))

+(defn update-grow-type
+  [shape old-shape]
+  (let [auto-width? (= :auto-width (:grow-type shape))
+        auto-height? (= :auto-height (:grow-type shape))
+
+        changed-width? (> (mth/abs (- (:width shape) (:width old-shape))) 0.1)
+        changed-height? (> (mth/abs (- (:height shape) (:height old-shape))) 0.1)
+
+        ;; Check if the shape is in a flex layout context that might cause layout-driven changes
+        ;; We should be more conservative about converting auto-width to fixed when the shape
+        ;; is part of a layout system that could cause automatic resizing
+        has-layout-item-sizing? (or (:layout-item-h-sizing shape) (:layout-item-v-sizing shape))
+
+        ;; Only convert auto-width to fixed if:
+        ;; 1. For auto-width: both width AND height changed (indicating user manipulation, not layout)
+        ;; 2. For auto-height: only height changed
+        ;; 3. The shape is not in a layout context where automatic sizing changes are expected
+        change-to-fixed? (and (not has-layout-item-sizing?)
+                              (or (and auto-width? changed-width? changed-height?)
+                                  (and auto-height? changed-height?)))]
+    (cond-> shape
+      change-to-fixed?
+      (assoc :grow-type :fixed))))
+
 (defn- set-wasm-props!
  [objects prev-wasm-props wasm-props]
  (let [;; Set old value for previous properties
@@ -786,7 +810,9 @@
                (-> shape
                    (gsh/transform-shape modifiers)
                    (cond-> (d/not-empty? pos-data)
-                      (assoc-position-data pos-data shape)))))]
+                      (assoc-position-data pos-data shape))
+                    (cond-> text-shape?
+                      (update-grow-type shape)))))]

        (rx/of (ptk/event ::dwg/move-frame-guides {:ids ids-with-children :modifiers object-modifiers})
               (ptk/event ::dwcm/move-frame-comment-threads ids-with-children)
@@ -831,20 +857,23 @@
            (rx/empty))))))))

 ;; Pure function to determine next grow-type for text layers
-(defn next-grow-type
-  [current-grow-type scalev]
+(defn next-grow-type [current-grow-type resize-direction]
  (cond
    (= current-grow-type :fixed)
    :fixed

-    (and (not (mth/close? (:y scalev) 1.0))
+    (and (= resize-direction :horizontal)
+         (= current-grow-type :auto-width))
+    :auto-height
+
+    (and (= resize-direction :horizontal)
+         (= current-grow-type :auto-height))
+    :auto-height
+
+    (and (= resize-direction :vertical)
         (or (= current-grow-type :auto-width)
             (= current-grow-type :auto-height)))
    :fixed

-    (and (not (mth/close? (:x scalev) 1.0))
-         (= current-grow-type :auto-width))
-    :auto-height
-
    :else
    current-grow-type))
--- a/frontend/src/app/main/data/workspace/notifications.cljs
+++ b/frontend/src/app/main/data/workspace/notifications.cljs
@@ -331,4 +331,4 @@
    (watch [_ state _]
      (when (contains? (:files state) file-id)
        (rx/of (dwl/ext-library-changed file-id modified-at revn changes)
-               (dwl/notify-sync-file))))))
+               (dwl/notify-sync-file file-id))))))
--- a/frontend/src/app/main/data/workspace/selection.cljs
+++ b/frontend/src/app/main/data/workspace/selection.cljs
@@ -463,7 +463,7 @@
                library-data    (dsh/lookup-file-data state file-id)

                changes         (-> (pcb/empty-changes it)
-                                    (cll/generate-duplicate-changes objects page ids delta libraries library-data file-id {:alt-duplication? alt-duplication?})
+                                    (cll/generate-duplicate-changes objects page ids delta libraries library-data file-id)
                                    (cll/generate-duplicate-changes-update-indices objects ids))

                tags            (or (:tags changes) #{})
--- a/frontend/src/app/main/data/workspace/shape_layout.cljs
+++ b/frontend/src/app/main/data/workspace/shape_layout.cljs
@@ -235,8 +235,13 @@
  [ids]
  (ptk/reify ::remove-shape-layout
    ptk/WatchEvent
-    (watch [_ _ _]
-      (let [undo-id (js/Symbol)]
+    (watch [_ state _]
+      (let [objects (dsh/lookup-page-objects state)
+            ids     (->> ids
+                         (remove #(->> %
+                                       (get objects)
+                                       (ctc/is-variant?))))
+            undo-id (js/Symbol)]
        (rx/of
         (dwu/start-undo-transaction undo-id)
         (dwsh/update-shapes ids #(apply dissoc % layout-keys))
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -17,7 +17,6 @@
   [app.common.math :as mth]
   [app.common.types.fills :as types.fills]
   [app.common.types.modifiers :as ctm]
-   [app.common.types.shape.layout :as ctl]
   [app.common.types.text :as txt]
   [app.common.uuid :as uuid]
   [app.main.data.event :as ev]
@@ -582,17 +581,12 @@

                        shape
                        (cond-> shape
-                          (and (or (not (ctl/any-layout-immediate-child? objects shape))
-                                   (not (ctl/fill-width? shape)))
-                               (not-changed? shape-width new-width)
-                               (= grow-type :auto-width))
+                          (and (not-changed? shape-width new-width) (= grow-type :auto-width))
                          (gsh/transform-shape (ctm/change-dimensions-modifiers shape :width new-width {:ignore-lock? true})))

                        shape
                        (cond-> shape
-                          (and (or (not (ctl/any-layout-immediate-child? objects shape))
-                                   (not (ctl/fill-height? shape)))
-                               (not-changed? shape-height new-height)
+                          (and (not-changed? shape-height new-height)
                               (or (= grow-type :auto-height) (= grow-type :auto-width)))
                          (gsh/transform-shape (ctm/change-dimensions-modifiers shape :height new-height {:ignore-lock? true})))]

@@ -600,8 +594,7 @@

          (let [ids (into #{} (filter changed-text?) (keys props))]
            (rx/of (dwu/start-undo-transaction undo-id)
-                   (dwsh/update-shapes ids update-fn {:with-objects? true
-                                                      :reg-objects? true
+                   (dwsh/update-shapes ids update-fn {:reg-objects? true
                                                      :stack-undo? true
                                                      :ignore-touched true})
                   (ptk/data-event :layout/update {:ids ids})
--- a/frontend/src/app/main/data/workspace/tokens/errors.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/errors.cljs
@@ -23,7 +23,7 @@
    :error/fn #(tr "workspace.tokens.invalid-json")}

   :error.import/invalid-token-name
-   {:error/code :error.import/invalid-token-name
+   {:error/code :error.import/invalid-json-data
    :error/fn #(tr "workspace.tokens.invalid-json-token-name")
    :error/detail #(tr "workspace.tokens.invalid-json-token-name-detail" %)}

--- a/frontend/src/app/main/data/workspace/transforms.cljs
+++ b/frontend/src/app/main/data/workspace/transforms.cljs
@@ -218,10 +218,15 @@
                                  (gpt/add resize-origin displacement)
                                  resize-origin)

+                  ;; Determine resize direction for grow-type logic
+                  resize-direction (cond
+                                     (or (= handler :left) (= handler :right)) :horizontal
+                                     (or (= handler :top) (= handler :bottom)) :vertical
+                                     :else nil)
+
                  ;; Calculate new grow-type for text layers
-                  new-grow-type
-                  (when (cfh/text-shape? shape)
-                    (dwm/next-grow-type (dm/get-prop shape :grow-type) scalev))
+                  new-grow-type (when (cfh/text-shape? shape)
+                                  (dwm/next-grow-type (dm/get-prop shape :grow-type) resize-direction))

                  ;; When the horizontal/vertical scale a flex children with auto/fill
                  ;; we change it too fixed
@@ -268,76 +273,82 @@

      ptk/WatchEvent
      (watch [_ state stream]
-        (let [initial-position @ms/mouse-position
+        (if (:blocked shape)
+          (rx/empty)
+          (let [initial-position @ms/mouse-position

-              stopper (mse/drag-stopper stream)
-              layout  (:workspace-layout state)
-              page-id (:current-page-id state)
-              focus   (:workspace-focus-selected state)
-              zoom    (dm/get-in state [:workspace-local :zoom] 1)
-              objects (dsh/lookup-page-objects state page-id)
-              shapes  (map (d/getf objects) ids)
+                stopper (mse/drag-stopper stream)
+                layout  (:workspace-layout state)
+                page-id (:current-page-id state)
+                focus   (:workspace-focus-selected state)
+                zoom    (dm/get-in state [:workspace-local :zoom] 1)
+                objects (dsh/lookup-page-objects state page-id)
+                shape-ids (filterv (comp not :blocked (d/getf objects)) ids)]

-              resize-events-stream
-              (->> ms/mouse-position
-                   (rx/filter some?)
-                   (rx/with-latest-from ms/mouse-position-shift ms/mouse-position-alt)
-                   (rx/map normalize-proportion-lock)
-                   (rx/switch-map
-                    (fn [[point _ _ :as current]]
-                      (->> (snap/closest-snap-point page-id shapes objects layout zoom focus point)
-                           (rx/map #(conj current %)))))
-                   (rx/map #(resize shape initial-position layout %))
-                   (rx/share))
+            (if (empty? shape-ids)
+              (rx/empty)
+              (let [shapes (map (d/getf objects) shape-ids)

-              modifiers-stream
-              (if (features/active-feature? state "render-wasm/v1")
-                (rx/merge
-                 (->> resize-events-stream
-                      (rx/mapcat
-                       (fn [modifiers]
-                         (let [modif-tree (dwm/create-modif-tree ids modifiers)]
-                           (rx/of
-                            (dwm/set-wasm-modifiers
-                             modif-tree
-                             :ignore-constraints (contains? layout :scale-text))))))
-                      (rx/take-until stopper))
+                    resize-events-stream
+                    (->> ms/mouse-position
+                         (rx/filter some?)
+                         (rx/with-latest-from ms/mouse-position-shift ms/mouse-position-alt)
+                         (rx/map normalize-proportion-lock)
+                         (rx/switch-map
+                          (fn [[point _ _ :as current]]
+                            (->> (snap/closest-snap-point page-id shapes objects layout zoom focus point)
+                                 (rx/map #(conj current %)))))
+                         (rx/map #(resize shape initial-position layout %))
+                         (rx/share))
+
+                    modifiers-stream
+                    (if (features/active-feature? state "render-wasm/v1")
+                      (rx/merge
+                       (->> resize-events-stream
+                            (rx/mapcat
+                             (fn [modifiers]
+                               (let [modif-tree (dwm/create-modif-tree shape-ids modifiers)]
+                                 (rx/of
+                                  (dwm/set-wasm-modifiers
+                                   modif-tree
+                                   :ignore-constraints (contains? layout :scale-text))))))
+                            (rx/take-until stopper))

                 ;; The last event we need to use the old method so the elements are correctly positioned until
                 ;; all the logic is implemented in wasm
-                 (->> resize-events-stream
-                      (rx/take-until stopper)
-                      (rx/last)
-                      (rx/map
-                       #(dwm/apply-wasm-modifiers
-                         (dwm/create-modif-tree ids %)
-                         :ignore-constraints (contains? layout :scale-text)))))
+                       (->> resize-events-stream
+                            (rx/take-until stopper)
+                            (rx/last)
+                            (rx/map
+                             #(dwm/apply-wasm-modifiers
+                               (dwm/create-modif-tree shape-ids %)
+                               :ignore-constraints (contains? layout :scale-text)))))

-                (->> resize-events-stream
-                     (rx/mapcat
-                      (fn [modifiers]
-                        (let [modif-tree (dwm/create-modif-tree ids modifiers)]
-                          (rx/of (dwm/set-modifiers modif-tree (contains? layout :scale-text))))))
-                     (rx/take-until stopper)))]
+                      (->> resize-events-stream
+                           (rx/mapcat
+                            (fn [modifiers]
+                              (let [modif-tree (dwm/create-modif-tree shape-ids modifiers)]
+                                (rx/of (dwm/set-modifiers modif-tree (contains? layout :scale-text))))))
+                           (rx/take-until stopper)))]

-          (rx/concat
+                (rx/concat
           ;; This initial stream waits for some pixels to be move before making the resize
           ;; if you make a click in the border will not make a resize
-           (->> ms/mouse-position
-                (rx/map #(gpt/to-vec initial-position %))
-                (rx/map #(gpt/length %))
-                (rx/filter #(> % (/ 10 zoom)))
-                (rx/take 1)
-                (rx/take-until stopper)
-                (rx/mapcat (fn [] modifiers-stream)))
+                 (->> ms/mouse-position
+                      (rx/map #(gpt/to-vec initial-position %))
+                      (rx/map #(gpt/length %))
+                      (rx/filter #(> % (/ 10 zoom)))
+                      (rx/take 1)
+                      (rx/take-until stopper)
+                      (rx/mapcat (fn [] modifiers-stream)))

-           (if (features/active-feature? state "render-wasm/v1")
-             (rx/of
-              (finish-transform))
+                 (if (features/active-feature? state "render-wasm/v1")
+                   (rx/of
+                    (finish-transform))

-             (rx/of
-              (dwm/apply-modifiers)
-              (finish-transform)))))))))
+                   (rx/of
+                    (dwm/apply-modifiers)
+                    (finish-transform))))))))))))

 (defn trigger-bounding-box-cloaking
  "Trigger the bounding box cloaking (with default timer of 1sec)
@@ -382,19 +393,7 @@

             get-modifier
             (fn [shape]
-               (let [modifiers (ctm/change-dimensions-modifiers shape attr value)]
-                 ;; For text shapes, also update grow-type based on the resize
-                 (if (cfh/text-shape? shape)
-                   (let [{sr-width :width sr-height :height} (:selrect shape)
-                         new-width (if (= attr :width) value sr-width)
-                         new-height (if (= attr :height) value sr-height)
-                         scalev (gpt/point (/ new-width sr-width) (/ new-height sr-height))
-                         current-grow-type (dm/get-prop shape :grow-type)
-                         new-grow-type (dwm/next-grow-type current-grow-type scalev)]
-                     (cond-> modifiers
-                       (not= new-grow-type current-grow-type)
-                       (ctm/change-property :grow-type new-grow-type)))
-                   modifiers)))
+               (ctm/change-dimensions-modifiers shape attr value))

             modif-tree
             (-> (dwm/build-modif-tree ids objects get-modifier)
--- a/frontend/src/app/main/data/workspace/variants.cljs
+++ b/frontend/src/app/main/data/workspace/variants.cljs
@@ -99,25 +99,9 @@

 (defn update-property-name
  "Update the variant property name on the position pos
-   in all the components with this variant-id and remove the focus"
+   in all the components with this variant-id"
  [variant-id pos new-name {:keys [trigger]}]
  (ptk/reify ::update-property-name
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [file-id (:current-file-id state)
-            data    (dsh/lookup-file-data state)
-            objects (dsh/lookup-page-objects state)
-
-            related-components    (cfv/find-variant-components data objects variant-id)]
-
-        (reduce
-         (fn [s related-component]
-           (update-in s
-                      [:files file-id :data :components (:id related-component) :variant-properties]
-                      (fn [props] (mapv #(with-meta % nil) props))))
-         state
-         related-components)))
-
    ptk/WatchEvent
    (watch [it state _]
      (let [page-id (:current-page-id state)
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -84,9 +84,6 @@
  (l/derived :shared-files st/state))

 (defn select-libraries
-  "Find between all the given files, those who are libraries of the file-id.
-   Also include the file-id file itself.
-   Return a map of id -> library."
  [files file-id]
  (persistent!
   (reduce-kv (fn [result id file]
--- a/frontend/src/app/main/ui/comments.cljs
+++ b/frontend/src/app/main/ui/comments.cljs
@@ -666,12 +666,11 @@

    [:div {:class (stl/css :form-buttons-wrapper)}
     [:> mentions-button*]
-     (when (some? on-cancel)
-       [:> button* {:variant "ghost"
-                    :type "button"
-                    :on-key-down handle-cancel
-                    :on-click on-cancel}
-        (tr "ds.confirm-cancel")])
+     [:> button* {:variant "ghost"
+                  :type "button"
+                  :on-key-down handle-cancel
+                  :on-click on-cancel}
+      (tr "ds.confirm-cancel")]
     [:> button* {:variant "primary"
                  :type "button"
                  :on-key-down handle-submit
@@ -687,39 +686,52 @@
  {::mf/props :obj
   ::mf/private true}
  [{:keys [on-submit]}]
-  (let [content       (mf/use-state "")
+  (let [show-buttons? (mf/use-state false)
+        content       (mf/use-state "")

        disabled? (or (blank-content? @content)
                      (exceeds-length? @content))

-        on-cancel
+        on-focus
        (mf/use-fn
-         #(st/emit! :interrupt))
+         #(reset! show-buttons? true))
+
+        on-blur
+        (mf/use-fn
+         #(reset! show-buttons? false))

        on-change
        (mf/use-fn
         #(reset! content %))

+        on-cancel
+        (mf/use-fn
+         #(do (reset! content "")
+              (reset! show-buttons? false)))
+
        on-submit*
        (mf/use-fn
         (mf/deps @content)
         (fn []
           (on-submit @content)
-           (reset! content "")))]
+           (on-cancel)))]

    [:div {:class (stl/css :form)}
     [:> comment-input*
      {:value @content
       :placeholder (tr "labels.reply.thread")
       :autofocus true
+       :on-blur on-blur
+       :on-focus on-focus
       :on-ctrl-enter on-submit*
       :on-change on-change}]
     (when (exceeds-length? @content)
       [:div {:class (stl/css :error-text)}
        (tr "errors.character-limit-exceeded")])
-     [:> comment-form-buttons* {:on-submit on-submit*
-                                :on-cancel on-cancel
-                                :is-disabled disabled?}]]))
+     (when (or @show-buttons? (seq @content))
+       [:> comment-form-buttons* {:on-submit on-submit*
+                                  :on-cancel on-cancel
+                                  :is-disabled disabled?}])]))

 (mf/defc comment-edit-form*
  {::mf/private true}
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -1057,17 +1057,16 @@
         {:profile profile
          :on-show-comments handle-show-comments}])]

-     (when show-profile-menu?
-       (case sub-menu
-         :help-learning
-         [:> help-learning-menu* {:on-close close-sub-menu :on-click on-click}]
+     (case sub-menu
+       :help-learning
+       [:> help-learning-menu* {:on-close close-sub-menu :on-click on-click}]

-         :community-contributions
-         [:> community-contributions-menu* {:on-close close-sub-menu}]
+       :community-contributions
+       [:> community-contributions-menu* {:on-close close-sub-menu}]

-         :about-penpot
-         [:> about-penpot-menu* {:on-close close-sub-menu}]
-         nil))]))
+       :about-penpot
+       [:> about-penpot-menu* {:on-close close-sub-menu}]
+       nil)]))

 (mf/defc sidebar*
  {::mf/props :obj
--- a/frontend/src/app/main/ui/dashboard/team.cljs
+++ b/frontend/src/app/main/ui/dashboard/team.cljs
@@ -690,18 +690,18 @@
    [:div {:class (stl/css :table-row :table-row-invitations)}
     [:div {:class (stl/css :table-field :field-email)}
      [:div {:class (stl/css :input-wrapper)}
-       [:label
+       [:label {:for (str "email-" email)}
        [:span {:class (stl/css-case :input-checkbox true
                                     :global/checked (is-selected? email))}
         deprecated-icon/status-tick]

        [:input {:type "checkbox"
-                 :id (dm/str "email-" email)
+                 :id (str "email-" email)
                 :data-attr email
                 :value email
                 :checked (is-selected? email)
-                 :on-change on-change}]
-        email]]]
+                 :on-change on-change}]]]
+      email]

     [:div {:class (stl/css :table-field :field-roles)}
      [:> invitation-role-selector*
@@ -930,7 +930,7 @@
       [:*
        [:div {:class (stl/css :invitations-actions)}
         [:div
-          (tr "team.invitations-selected" (i18n/c (count @selected)))]
+          (str (count @selected) " invitations selected")]
         [:div
          [:> button* {:variant "secondary"
                       :type "button"
--- a/frontend/src/app/main/ui/dashboard/team.scss
+++ b/frontend/src/app/main/ui/dashboard/team.scss
@@ -780,19 +780,28 @@
  @extend .input-base;
  height: auto;
 }
-// FIXME: This does not conform to our CSS Guidelines. Need to unnest and to use
-// custom properties to handle state changes.
+// TODO: Fix this nested classes.
 .input-wrapper {
  display: flex;
  align-items: center;
-  @include t.use-typography("body-large");
-
  label {
+    @include t.use-typography("body-small");
    display: flex;
    align-items: center;
    gap: px2rem(6);
    cursor: pointer;
-    color: var(--color-foreground-primary);
+    color: var(--color-foreground-secondary);
+    span {
+      @extend .checkbox-icon;
+    }
+    input {
+      margin: 0;
+    }
+    &:hover {
+      span {
+        border-color: var(--color-accent-primary-muted);
+      }
+    }

    &:focus,
    &:focus-within {
@@ -800,22 +809,6 @@
        border-color: var(--color-accent-primary);
      }
    }
-    &:hover {
-      span {
-        border-color: var(--color-accent-primary-muted);
-      }
-    }
-  }
-
-  span {
-    @extend .checkbox-icon;
-    @include t.use-typography("body-small");
-    color: var(--color-foreground-secondary);
-  }
-  input {
-    margin: 0;
-    @include t.use-typography("body-small");
-    color: var(--color-foreground-secondary);
  }
 }

--- a/frontend/src/app/main/ui/ds/_sizes.scss
+++ b/frontend/src/app/main/ui/ds/_sizes.scss
@@ -19,7 +19,6 @@ $sz-36: px2rem(36);
 $sz-40: px2rem(40);
 $sz-48: px2rem(48);
 $sz-88: px2rem(88);
-$sz-96: px2rem(96);
 $sz-120: px2rem(120);
 $sz-154: px2rem(154);
 $sz-160: px2rem(160);
--- a/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
+++ b/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
@@ -25,6 +25,7 @@
   [app.util.keyboard :as kbd]
   [app.util.object :as obj]
   [app.util.simple-math :as smt]
+   [app.util.timers :as ts]
   [cuerdas.core :as str]
   [goog.events :as events]
   [rumext.v2 :as mf]
@@ -382,7 +383,11 @@
           (reset! focused-id* nil)
           (reset! is-open* false)
           (reset! token-applied* name)
-           (apply-token value name)))
+           (apply-token value name)
+           (ts/schedule-on-idle
+            (fn []
+              (when token-wrapper-ref
+                (dom/focus! (mf/ref-val token-wrapper-ref)))))))

        on-option-click
        (mf/use-fn
@@ -416,14 +421,16 @@
         (fn [event]
           (let [target    (dom/get-related-target event)
                 self-node (mf/ref-val wrapper-ref)]
+
             (when-not (dom/is-child? self-node target)
               (reset! filter-id* "")
               (reset! focused-id* nil)
               (reset! is-open* false)))
+
           (when (mf/ref-val dirty-ref)
-             (apply-value (mf/ref-val raw-value*))
-             (when (fn? on-blur)
-               (on-blur event)))))
+             (apply-value (mf/ref-val raw-value*)))
+           (when (fn? on-blur)
+             (on-blur event))))

        on-key-down
        (mf/use-fn
@@ -560,9 +567,11 @@
               (reset! token-applied* nil)
               (reset! selected-id* nil)
               (reset! focused-id* nil)
-               (dom/focus! (mf/ref-val ref))
               (when on-detach
-                 (on-detach token))))))
+                 (on-detach token))
+               (ts/schedule-on-idle
+                (fn []
+                  (dom/focus! (mf/ref-val ref))))))))

        on-token-key-down
        (mf/use-fn
@@ -656,6 +665,7 @@
                              :label label
                              :value token-value
                              :on-click open-dropdown-token
+                              :on-focus on-focus
                              :on-token-key-down on-token-key-down
                              :disabled disabled
                              :on-blur on-blur
--- a/frontend/src/app/main/ui/ds/controls/utilities/token_field.cljs
+++ b/frontend/src/app/main/ui/ds/controls/utilities/token_field.cljs
@@ -27,13 +27,14 @@
   [:on-click {:optional true} fn?]
   [:on-token-key-down fn?]
   [:on-blur {:optional true} fn?]
+   [:on-focus {:optional true} fn?]
   [:detach-token fn?]])

 (mf/defc token-field*
  {::mf/schema schema:token-field}
  [{:keys [id label value slot-start disabled
           on-click on-token-key-down on-blur detach-token
-           token-wrapper-ref token-detach-btn-ref]}]
+           token-wrapper-ref token-detach-btn-ref on-focus]}]
  (let [set-active? (some? id)
        content     (if set-active?
                      label
@@ -60,6 +61,7 @@
           :on-key-down on-token-key-down
           :ref token-wrapper-ref
           :on-blur on-blur
+           :on-focus on-focus
           :tab-index (if disabled -1 0)}

     (when (some? slot-start) slot-start)
--- a/frontend/src/app/main/ui/ds/utilities/swatch.cljs
+++ b/frontend/src/app/main/ui/ds/utilities/swatch.cljs
@@ -93,6 +93,8 @@
        image          (:image background)
        format         (if id? "rounded" "square")
        element-id     (mf/use-id)
+        has-opacity?  (and (some? (:color background))
+                           (< (:opacity background) 1))
        on-click
        (mf/use-fn
         (mf/deps background on-click)
@@ -124,19 +126,20 @@
     [:> element-type props
      (cond
        (some? gradient-type)
-        [:span {:class (stl/css :swatch-gradient)
-                :style {:background-image (str (uc/gradient->css gradient-data) ", repeating-conic-gradient(lightgray 0% 25%, white 0% 50%)")}}]
+        [:div {:class (stl/css :swatch-gradient)
+               :style {:background-image (str (uc/gradient->css gradient-data) ", repeating-conic-gradient(lightgray 0% 25%, white 0% 50%)")}}]

        (some? image)
        (let [uri (cfg/resolve-file-media image)]
-          [:span {:class (stl/css :swatch-image)
-                  :style {:background-image (str/ffmt "url(%)" uri)}}])
+          [:div {:class (stl/css :swatch-image)
+                 :style {:background-image (str/ffmt "url(%)" uri)}}])
        has-errors
-        [:span {:class (stl/css :swatch-error)}]
-
+        [:div {:class (stl/css :swatch-error)}]
        :else
-        [:span {:class (stl/css :swatch-opacity)}
-         [:span {:class (stl/css :swatch-solid-side)
-                 :style {:background (uc/color->background (assoc background :opacity 1))}}]
-         [:span {:class (stl/css :swatch-opacity-side)
-                 :style {:background (uc/color->background background)}}]])]]))
+        [:div {:class (stl/css :swatch-opacity)}
+         [:div {:class (stl/css :swatch-solid-side)
+                :style {:background (uc/color->background (assoc background :opacity 1))}}]
+         [:div {:class (stl/css-case :swatch-opacity-side true
+                                     :swatch-opacity-side-transparency has-opacity?
+                                     :swatch-opacity-side-solid-color (not has-opacity?))
+                :style {"--solid-color-overlay" (str (uc/color->background background))}}]])]]))
--- a/frontend/src/app/main/ui/ds/utilities/swatch.scss
+++ b/frontend/src/app/main/ui/ds/utilities/swatch.scss
@@ -8,8 +8,14 @@
@use "ds/_sizes.scss" as *;
@use "ds/colors.scss" as *;

+@property --solid-color-overlay {
+  syntax: "<color>";
+  inherits: false;
+  initial-value: rgba(0, 0, 0, 0);
+}
+
 .swatch {
-  --border-color: var(--color-accent-primary-muted);
+  --border-color: var(--color-background-quaternary);
  --border-radius: #{$br-4};
  --border-color-active: var(--color-foreground-primary);
  --border-color-active-inset: var(--color-background-primary);
@@ -73,7 +79,8 @@
  background: none;

  &:hover {
-    border: 2px solid var(--border-color);
+    --border-color: var(--color-accent-primary-muted);
+    border-width: $b-2;
  }
 }

@@ -98,9 +105,25 @@
 }

 .swatch-opacity {
-  background: var(--checkerboard-background);
-  background-size: var(--checkerboard-size);
-  display: flex;
+  display: grid;
+  grid-template-columns: auto auto;
+}
+
+.swatch-opacity-side-transparency {
+  background-image:
+  /* solid‑colour overlay */
+  /* checkerboard pattern */
+    linear-gradient(var(--solid-color-overlay), var(--solid-color-overlay)), var(--checkerboard-background);
+
+  background-size: cover, var(--checkerboard-size);
+  background-position: center, center;
+  background-repeat: no-repeat, repeat;
+  clip-path: inset(0 0 0 0 round 0 #{$br-4} #{$br-4} 0);
+}
+
+.swatch-opacity-side-solid-color {
+  background: var(--solid-color-overlay);
+  background-size: cover;
 }

 .swatch-solid-side,
--- a/frontend/src/app/main/ui/inspect/attributes/text.cljs
+++ b/frontend/src/app/main/ui/inspect/attributes/text.cljs
@@ -13,29 +13,18 @@
   [app.common.types.fills :as types.fills]
   [app.common.types.text :as types.text]
   [app.main.fonts :as fonts]
-   [app.main.refs :as refs]
-   [app.main.store :as st]
   [app.main.ui.components.copy-button :refer [copy-button*]]
   [app.main.ui.components.title-bar :refer [inspect-title-bar*]]
   [app.main.ui.formats :as fmt]
   [app.main.ui.inspect.attributes.common :refer [color-row]]
+   [app.main.ui.inspect.common.typography :as ict]
   [app.util.i18n :refer [tr]]
   [cuerdas.core :as str]
-   [okulary.core :as l]
   [rumext.v2 :as mf]))

 (defn- has-text? [shape]
  (:content shape))

-(def ^:private file-typographies-ref
-  (l/derived (l/in [:viewer :file :data :typographies]) st/state))
-
-(defn- make-typographies-library-ref [file-id]
-  (let [get-library
-        (fn [state]
-          (get-in state [:viewer-libraries file-id :data :typographies]))]
-    #(l/derived get-library st/state)))
-
 (defn- copy-style-data
  [style & properties]
  (->> properties
@@ -44,24 +33,10 @@

 (mf/defc typography-block
  [{:keys [text style]}]
-  (let [typography-library-ref
-        (mf/use-memo
-         (mf/deps (:typography-ref-file style))
-         (make-typographies-library-ref (:typography-ref-file style)))
-
-        typography-library (mf/deref typography-library-ref)
-
-        ;; FIXME: too many duplicate operations
-        file-typographies-viewer    (mf/deref file-typographies-ref)
-        file-typographies-workspace (mf/deref refs/workspace-file-typography)
-
-        file-library-workspace      (get (mf/deref refs/files) (:typography-ref-file style))
-        typography-external-lib (get-in file-library-workspace [:data :typographies (:typography-ref-id style)])
-
-        color-format*       (mf/use-state :hex)
+  (let [color-format*       (mf/use-state :hex)
        color-format        (deref color-format*)

-        typography (or (get (or typography-library file-typographies-viewer file-typographies-workspace) (:typography-ref-id style)) typography-external-lib)]
+        typography (ict/get-typography style)]

    [:div {:class (stl/css :attributes-content)}
     (when (:fills style)
--- a/frontend/src/app/main/ui/inspect/common/typography.cljs
+++ b/frontend/src/app/main/ui/inspect/common/typography.cljs
@@ -0,0 +1,38 @@
+;; 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.ui.inspect.common.typography
+  (:require
+   [app.main.refs :as refs]
+   [app.main.store :as st]
+   [okulary.core :as l]
+   [rumext.v2 :as mf]))
+
+(defn- make-typographies-library-ref
+  [file-id]
+  (let [get-library
+        (fn [state]
+          (get-in state [:viewer-libraries file-id :data :typographies]))]
+    #(l/derived get-library st/state)))
+
+(def ^:private file-typographies-ref
+  (l/derived (l/in [:viewer :file :data :typographies]) st/state))
+
+(defn get-typography
+  [style]
+  (let [typography-library-ref
+        (mf/use-memo
+         (mf/deps (:typography-ref-file style))
+         (make-typographies-library-ref (:typography-ref-file style)))
+
+        ; FIXME: too many duplicate operations
+        typography-library (mf/deref typography-library-ref)
+        file-typographies-viewer (mf/deref file-typographies-ref)
+        file-typographies-workspace (mf/deref refs/workspace-file-typography)
+        file-library-workspace   (get (mf/deref refs/files) (:typography-ref-file style))
+        typography-external-lib (get-in file-library-workspace [:data :typographies (:typography-ref-id style)])
+        typography (or (get (or typography-library file-typographies-viewer file-typographies-workspace) (:typography-ref-id style)) typography-external-lib)]
+    typography))
--- a/frontend/src/app/main/ui/inspect/right_sidebar.scss
+++ b/frontend/src/app/main/ui/inspect/right_sidebar.scss
@@ -146,12 +146,9 @@
 .viewer-tab-switcher {
  --tabs-nav-padding-inline-start: 0;
  --tabs-nav-padding-inline-end: var(--sp-m);
+  --max-inspect-tab-height: calc(100vh - 12rem);

-  /* same height as .element-options in workspace/sidebar/options.scss */
-  /* which is one of the parents of this component */
-  --max-inspect-tab-height: var(--sidebar-element-options-height);
  max-block-size: var(--max-inspect-tab-height);
-
  overflow: auto;
 }

--- a/frontend/src/app/main/ui/inspect/styles.cljs
+++ b/frontend/src/app/main/ui/inspect/styles.cljs
@@ -22,6 +22,7 @@
   [app.main.ui.inspect.styles.panels.layout-element :refer [layout-element-panel*]]
   [app.main.ui.inspect.styles.panels.stroke :refer [stroke-panel*]]
   [app.main.ui.inspect.styles.panels.svg :refer [svg-panel*]]
+   [app.main.ui.inspect.styles.panels.text :refer [text-panel*]]
   [app.main.ui.inspect.styles.panels.tokens-panel :refer [tokens-panel*]]
   [app.main.ui.inspect.styles.panels.variants-panel :refer [variants-panel*]]
   [app.main.ui.inspect.styles.panels.visibility :refer [visibility-panel*]]
@@ -71,6 +72,9 @@
 (defn- has-blur? [shape]
  (:blur shape))

+(defn- has-text? [shape]
+  (:content shape))
+
 (defn- get-shape-type
  [shapes first-shape first-component]
  (if (= (count shapes) 1)
@@ -195,6 +199,14 @@
              [:> style-box* {:panel :blur}
               [:> blur-panel* {:shapes shapes
                                :objects objects}]]))
+          :text
+          (let [shapes (filter has-text? shapes)]
+            (when (seq shapes)
+              [:> style-box* {:panel :text}
+               [:> text-panel* {:shapes shapes
+                                :color-space color-space
+                                :objects objects
+                                :resolved-tokens resolved-active-tokens}]]))
          ;; DEFAULT WIP
          [:> style-box* {:panel panel}
           [:div color-space]])])]))
--- a/frontend/src/app/main/ui/inspect/styles/panels/stroke.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/panels/stroke.cljs
@@ -47,7 +47,7 @@

 ;; Current token implementation on fills only supports one token per shape and has to be the first fill
 ;; This must be improved in the future
-(defn- has-token?
+(defn- has-color-token?
  "Returns true if the resolved token matches the color and is the first fill (idx = 0)."
  [resolved-token stroke-type idx]
  (and (= (:resolved-value resolved-token) (:color stroke-type))
@@ -66,17 +66,17 @@
                property-name (cmm/get-css-rule-humanized property)
                property-value (css/get-css-property objects stroke property)
                resolved-token (get-resolved-token property shape resolved-tokens)
-                has-token (has-token? resolved-token stroke-type idx)]
+                has-color-token (has-color-token? resolved-token stroke-type idx)]
            (if (= property :border-color)
              [:> color-properties-row* {:key (str idx property)
                                         :term property-name
                                         :color stroke-type
-                                         :token (when has-token resolved-token)
+                                         :token (when has-color-token resolved-token)
                                         :format color-space
                                         :copiable true}]
              [:> properties-row* {:key  (str idx property)
                                   :term (d/name property-name)
                                   :detail (dm/str value)
-                                   :token (when has-token resolved-token)
+                                   :token resolved-token
                                   :property property-value
                                   :copiable true}]))))])])
--- a/frontend/src/app/main/ui/inspect/styles/panels/svg.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/panels/svg.cljs
@@ -30,9 +30,9 @@
                                 :term (d/name sub-attr-key)
                                 :detail (dm/str sub-attr-value)
                                 :property property-value
-                                 :copiable false}]))
+                                 :copiable true}]))
        [:> properties-row* {:key (dm/str "svg-property-" (d/name attr-key))
                             :term (d/name attr-key)
                             :detail (dm/str attr-value)
                             :property (dm/str attr-key ": " attr-value ";")
-                             :copiable false}]))]])
+                             :copiable true}]))]])
--- a/frontend/src/app/main/ui/inspect/styles/panels/text.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/panels/text.cljs
@@ -0,0 +1,184 @@
+;; 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.ui.inspect.styles.panels.text
+  (:require-macros [app.main.style :as stl])
+  (:require
+   [app.common.types.fills :as types.fills]
+   [app.common.types.text :as txt]
+   [app.main.fonts :as fonts]
+   [app.main.ui.formats :as fmt]
+   [app.main.ui.inspect.common.typography :as ict]
+   [app.main.ui.inspect.styles.property-detail-copiable :refer [property-detail-copiable*]]
+   [app.main.ui.inspect.styles.rows.color-properties-row :refer [color-properties-row*]]
+   [app.main.ui.inspect.styles.rows.properties-row :refer [properties-row*]]
+   [app.util.timers :as tm]
+   [app.util.webapi :as wapi]
+   [cuerdas.core :as str]
+   [rumext.v2 :as mf]))
+
+(defn- get-applied-tokens-in-shape
+  [shape-tokens property]
+  (get shape-tokens property))
+
+(defn- get-resolved-token
+  [property shape resolved-tokens]
+  (let [shape-tokens (:applied-tokens shape)
+        applied-tokens-in-shape (get-applied-tokens-in-shape shape-tokens property)
+        token (get resolved-tokens applied-tokens-in-shape)]
+    token))
+
+(defn- get-style-text
+  [shape]
+  (->> (:content shape)
+       (txt/content->text+styles)
+       (remove (fn [[_ text]] (str/empty? (str/trim text))))
+       (mapv (fn [[style text]] (vector (merge (txt/get-default-text-attrs) style) text)))))
+
+(mf/defc typography-name-block*
+  [{:keys [style]}]
+  (let [typography (ict/get-typography style)
+        property-value (:name typography)]
+    (when typography
+      [:> properties-row* {:term "Typography"
+                           :detail (:name typography)
+                           :property property-value
+                           :copiable true}])))
+
+(mf/defc typography-color-row*
+  [{:keys [fill shape resolved-tokens color-space]}]
+  (let [color (types.fills/fill->color fill)
+        resolved-token (get-resolved-token :fill shape resolved-tokens)]
+    [:> color-properties-row* {:term "Font Color"
+                               :color color
+                               :token resolved-token
+                               :format color-space
+                               :copiable true}]))
+
+(mf/defc text-panel*
+  [{:keys [shapes _ resolved-tokens color-space]}]
+  [:div {:class (stl/css :text-panel)}
+   (for [shape shapes]
+     (let [style-text-blocks (get-style-text shape)
+           composite-typography-token (get-resolved-token :typography shape resolved-tokens)]
+
+       [:div {:key (:id shape) :class "text-shape"}
+        (for [[style text] style-text-blocks]
+
+          [:div {:key (:id shape) :class "text-properties"}
+
+           (when (:fills style)
+             (for [[idx fill] (map-indexed vector (:fills style))]
+               [:> typography-color-row* {:key idx
+                                          :fill fill
+                                          :shape shape
+                                          :resolved-tokens resolved-tokens
+                                          :color-space color-space}]))
+
+           ;; Typography style
+           (when (and (not composite-typography-token)
+                      (:typography-ref-id style))
+             [:> typography-name-block* {:style style}])
+
+           ;; Composite Typography token
+           (when (and (not (:typography-ref-id style))
+                      composite-typography-token)
+             [:> properties-row* {:term "Typography"
+                                  :detail (:name composite-typography-token)
+                                  :token composite-typography-token
+                                  :property (:name composite-typography-token)
+                                  :copiable true}])
+
+           (when (:font-id style)
+             (let [name (get (fonts/get-font-data (:font-id style)) :name)
+                   resolved-token (get-resolved-token :font-family shape resolved-tokens)]
+               [:> properties-row* {:term "Font Family"
+                                    :detail name
+                                    :token resolved-token
+                                    :property (str "font-family: \"" name "\";")
+                                    :copiable true}]))
+
+           (when (:font-style style)
+             [:> properties-row* {:term "Font Style"
+                                  :detail (:font-style style)
+                                  :property (str "font-style: " (:font-style style) ";")
+                                  :copiable true}])
+
+           (when (:font-size style)
+             (let [font-size (fmt/format-pixels (:font-size style))
+                   resolved-token (get-resolved-token :font-size shape resolved-tokens)]
+               [:> properties-row* {:term "Font Size"
+                                    :detail font-size
+                                    :token resolved-token
+                                    :property (str "font-size: " font-size ";")
+                                    :copiable true}]))
+           (when (:font-weight style)
+             (let [resolved-token (get-resolved-token :font-weight shape resolved-tokens)]
+               [:> properties-row* {:term "Font Weight"
+                                    :detail (:font-weight style)
+                                    :token resolved-token
+                                    :property (str "font-weight: " (:font-weight style) ";")
+                                    :copiable true}]))
+
+           (when (:line-height style)
+             (let [line-height (:line-height style)
+                   resolved-token (get-resolved-token :line-height shape resolved-tokens)]
+               [:> properties-row* {:term "Line Height"
+                                    :detail (str line-height)
+                                    :token resolved-token
+                                    :property (str "line-height: " line-height ";")
+                                    :copiable true}]))
+
+           (when (:letter-spacing style)
+             (let [letter-spacing (fmt/format-pixels (:letter-spacing style))
+                   resolved-token (get-resolved-token :letter-spacing shape resolved-tokens)]
+               [:> properties-row* {:term "Letter Spacing"
+                                    :detail letter-spacing
+                                    :token resolved-token
+                                    :property (str "letter-spacing: " letter-spacing ";")
+                                    :copiable true}]))
+
+           (when (:text-decoration style)
+             (let [resolved-token (get-resolved-token :text-decoration shape resolved-tokens)]
+               [:> properties-row* {:term "Text Decoration"
+                                    :detail (:text-decoration style)
+                                    :token resolved-token
+                                    :property (str "text-decoration: " (:text-decoration style) ";")
+                                    :copiable true}]))
+
+           (when (:text-transform style)
+             (let [resolved-token (get-resolved-token :text-case shape resolved-tokens)]
+               [:> properties-row* {:term "Text Transform"
+                                    :detail (:text-transform style)
+                                    :token resolved-token
+                                    :property (str "text-transform: " (:text-transform style) ";")
+                                    :copiable true}]))
+           (when text
+             (let [copied* (mf/use-state false)
+                   copied (deref copied*)
+
+                   text (str/trim text)
+
+                   copy-text
+                   (mf/use-fn
+                    (mf/deps copied)
+                    (fn []
+                      (let [formatted-text (if (= (:text-transform style) "uppercase")
+                                             (.toUpperCase text)
+                                             text)]
+                        (reset! copied* true)
+                        (wapi/write-to-clipboard formatted-text)
+                        (tm/schedule 1000 #(reset! copied* false)))))]
+               [:div {:class (stl/css :text-content-wrapper)}
+                [:> property-detail-copiable* {:copied copied
+                                               :on-click copy-text}
+                 [:span {:class (stl/css :text-content)
+                         :style {:font-family (:font-family style)
+                                 :font-weight (:font-weight style)
+                                 :text-transform (:text-transform style)
+                                 :letter-spacing (fmt/format-pixels (:letter-spacing style))
+                                 :font-style (:font-style style)}}
+                  text]]]))])]))])
--- a/frontend/src/app/main/ui/inspect/styles/panels/text.scss
+++ b/frontend/src/app/main/ui/inspect/styles/panels/text.scss
@@ -0,0 +1,20 @@
+// 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
+
+@use "ds/_borders.scss" as *;
+
+.text-content-wrapper {
+  --border-color: var(--color-background-quaternary);
+  --border-radius: ${$br-8};
+
+  border: $b-1 solid var(--border-color);
+  border-radius: var(--border-radius);
+}
+
+.text-content {
+  --detail-color: var(--color-foreground-secondary);
+  color: var(--detail-color);
+}
--- a/frontend/src/app/main/ui/inspect/styles/property_detail_copiable.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/property_detail_copiable.cljs
@@ -16,7 +16,6 @@

 (def ^:private schema:property-detail-copiable
  [:map
-   [:detail :string]
   [:color {:optional true} :any] ;; color object with :color, :gradient or :image
   [:token {:optional true} :any] ;; resolved token object
   [:copied :boolean]
@@ -24,7 +23,7 @@

 (mf/defc property-detail-copiable*
  {::mf/schema schema:property-detail-copiable}
-  [{:keys [detail color token copied on-click]}]
+  [{:keys [color token copied on-click children]}]
  [:button {:class (stl/css-case :property-detail-copiable true
                                 :property-detail-copied copied
                                 :property-detail-copiable-color (some? color))
@@ -45,7 +44,7 @@
             color-library-name (get-in (or colors-library file-colors) [(:ref-id color) :name])
             color              (assoc color :name color-library-name)]
         [:span {:class (stl/css :property-detail-text)} (:name color)])
-       [:span {:class (stl/css :property-detail-text)} detail]))
+       [:span {:class (stl/css :property-detail-text)} children]))
   [:> icon* {:class (stl/css :property-detail-icon)
              :icon-id (if copied i/tick i/clipboard)
              :size "s"
--- a/frontend/src/app/main/ui/inspect/styles/property_detail_copiable.scss
+++ b/frontend/src/app/main/ui/inspect/styles/property_detail_copiable.scss
@@ -12,23 +12,6 @@
  --detail-color: var(--color-foreground-primary);
  --button-min-inline-size: #{$sz-154};
  --button-min-block-size: #{$sz-36};
-}
-
-.property-detail-text {
-  color: var(--detail-color);
-}
-
-.property-detail-text-token {
-  @include use-typography("code-font");
-  --detail-color: var(--color-token-foreground);
-
-  line-height: 1.4;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-.property-detail-copiable {
  --button-border-radius: #{$br-4};
  --button-background: none;

@@ -69,3 +52,17 @@
 .property-detail-icon {
  display: none;
 }
+
+.property-detail-text {
+  color: var(--detail-color);
+}
+
+.property-detail-text-token {
+  @include use-typography("code-font");
+  --detail-color: var(--color-token-foreground);
+
+  line-height: 1.4;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
--- a/frontend/src/app/main/ui/inspect/styles/rows/color_properties_row.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/rows/color_properties_row.cljs
@@ -101,18 +101,16 @@
                                   [:div {:class (stl/css :tooltip-token-title)}
                                    (tr "inspect.tabs.styles.token.resolved-value")]
                                   [:div {:class (stl/css :tooltip-token-value)}
-                                    (:value token)]])}
-          [:> property-detail-copiable* {:detail formatted-color-value
-                                         :color color
+                                    (:resolved-value token)]])}
+          [:> property-detail-copiable* {:color color
                                         :token token
                                         :copied copied
-                                         :on-click copy-attr}]]
+                                         :on-click copy-attr} formatted-color-value]]


-         [:> property-detail-copiable* {:detail formatted-color-value
-                                        :color color
+         [:> property-detail-copiable* {:color color
                                        :copied copied
-                                        :on-click copy-attr}])]]
+                                        :on-click copy-attr} formatted-color-value])]]
     (when (:image color)
       [:div {:class (stl/css :color-image-preview)}
        [:div {:class (stl/css :color-image-preview-wrapper)}
--- a/frontend/src/app/main/ui/inspect/styles/rows/properties_row.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/rows/properties_row.cljs
@@ -7,6 +7,7 @@
 (ns app.main.ui.inspect.styles.rows.properties-row
  (:require-macros [app.main.style :as stl])
  (:require
+   [app.common.data :as d]
   [app.main.ui.ds.tooltip :refer [tooltip*]]
   [app.main.ui.inspect.styles.property-detail-copiable :refer [property-detail-copiable*]]
   [app.util.i18n :refer [tr]]
@@ -26,7 +27,7 @@
 (mf/defc properties-row*
  {::mf/schema schema:properties-row}
  [{:keys [class term detail token property copiable]}]
-  (let [copiable? (or copiable false)
+  (let [copiable? (d/nilv copiable false)
        detail? (not (or (nil? detail) (str/blank? detail)))
        detail (if detail? detail "-")
        copied* (mf/use-state false)
@@ -51,12 +52,10 @@
                        :content #(mf/html
                                   [:div {:class (stl/css :tooltip-token)}
                                    [:div {:class (stl/css :tooltip-token-title)} (tr "inspect.tabs.styles.token.resolved-value")]
-                                    [:div {:class (stl/css :tooltip-token-value)} (:value token)]])}
-           [:> property-detail-copiable* {:detail detail
-                                          :token token
+                                    [:div {:class (stl/css :tooltip-token-value)} (if (= :typography (:type token)) (:name token) (:resolved-value token))]])}
+           [:> property-detail-copiable* {:token token
                                          :copied copied
-                                          :on-click copy-attr}]]
-          [:> property-detail-copiable* {:detail detail
-                                         :copied copied
-                                         :on-click copy-attr}])
+                                          :on-click copy-attr} detail]]
+          [:> property-detail-copiable* {:copied copied
+                                         :on-click copy-attr} detail])
        detail)]]))
--- a/frontend/src/app/main/ui/releases.cljs
+++ b/frontend/src/app/main/ui/releases.cljs
@@ -29,7 +29,6 @@
   [app.main.ui.releases.v2-0]
   [app.main.ui.releases.v2-1]
   [app.main.ui.releases.v2-10]
-   [app.main.ui.releases.v2-11]
   [app.main.ui.releases.v2-2]
   [app.main.ui.releases.v2-3]
   [app.main.ui.releases.v2-4]
@@ -102,4 +101,4 @@

 (defmethod rc/render-release-notes "0.0"
  [params]
-  (rc/render-release-notes (assoc params :version "2.11")))
+  (rc/render-release-notes (assoc params :version "2.10")))
--- a/frontend/src/app/main/ui/releases/v2_11.cljs
+++ b/frontend/src/app/main/ui/releases/v2_11.cljs
@@ -1,189 +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.ui.releases.v2-11
-  (:require-macros [app.main.style :as stl])
-  (:require
-   [app.common.data.macros :as dm]
-   [app.main.ui.releases.common :as c]
-   [rumext.v2 :as mf]))
-
-(defmethod c/render-release-notes "2.11"
-  [{:keys [slide klass next finish navigate version]}]
-  (mf/html
-   (case slide
-     :start
-     [:div {:class (stl/css-case :modal-overlay true)}
-      [:div.animated {:class klass}
-       [:div {:class (stl/css :modal-container)}
-        [:img {:src "images/features/2.11-slide-0.jpg"
-               :class (stl/css :start-image)
-               :border "0"
-               :alt "Penpot 2.11 is here!"}]
-
-        [:div {:class (stl/css :modal-content)}
-         [:div {:class (stl/css :modal-header)}
-          [:h1 {:class (stl/css :modal-title)}
-           "What’s new in Penpot?"]
-
-          [:div {:class (stl/css :version-tag)}
-           (dm/str "Version " version)]]
-
-         [:div {:class (stl/css :features-block)}
-          [:span {:class (stl/css :feature-title)}
-           "Typography tokens take the stage!"]
-
-          [:p  {:class (stl/css :feature-content)}
-           "This release brings one of our most anticipated design system upgrades yet: Typography tokens."]
-
-          [:p  {:class (stl/css :feature-content)}
-           "But that’s not all. Variants get a nice boost with multi-switching, new creation shortcuts, and draggable property reordering. Invitations are now easier to manage and the user menu has been reorganized. Now showing your current Penpot version and direct access to release info."]
-
-          [:p  {:class (stl/css :feature-content)}
-           "And as always, you’ll notice performance improvements throughout. Faster, smoother, and just a bit more magical every time."]
-
-          [:p  {:class (stl/css :feature-content)}
-           "Let’s dive in!"]]
-
-         [:div {:class (stl/css :navigation)}
-          [:button {:class (stl/css :next-btn)
-                    :on-click next} "Continue"]]]]]]
-
-     0
-     [:div {:class (stl/css-case :modal-overlay true)}
-      [:div.animated {:class klass}
-       [:div {:class (stl/css :modal-container)}
-        [:img {:src "images/features/2.11-typography-token.gif"
-               :class (stl/css :start-image)
-               :border "0"
-               :alt "Typography token: one token to rule your text"}]
-
-        [:div {:class (stl/css :modal-content)}
-         [:div {:class (stl/css :modal-header)}
-          [:h1 {:class (stl/css :modal-title)}
-           "Typography token: one token to rule your text"]]
-
-         [:div {:class (stl/css :feature)}
-          [:p {:class (stl/css :feature-content)}
-           "Imagine having just one token to manage all your typography. With the new Typography token, you can create presets that bundle all your text styles (font, weight, size, line height, spacing, and more) into a single reusable definition. Just one clean, flexible token to keep your type consistent across your designs."]
-
-          [:p {:class (stl/css :feature-content)}
-           "The Typography token also marks a big step forward for Penpot: it’s our first composite token! Composite tokens are special because they can hold multiple properties within one token. Shadow token will be the next composite token coming your way."]]
-
-         [:div {:class (stl/css :navigation)}
-          [:& c/navigation-bullets
-           {:slide slide
-            :navigate navigate
-            :total 4}]
-
-          [:button {:on-click next
-                    :class (stl/css :next-btn)} "Continue"]]]]]]
-
-     1
-     [:div {:class (stl/css-case :modal-overlay true)}
-      [:div.animated {:class klass}
-       [:div {:class (stl/css :modal-container)}
-        [:img {:src "images/features/2.11-variants.gif"
-               :class (stl/css :start-image)
-               :border "0"
-               :alt "Variants get a power-up"}]
-
-        [:div {:class (stl/css :modal-content)}
-         [:div {:class (stl/css :modal-header)}
-          [:h1 {:class (stl/css :modal-title)}
-           "Variants get a power-up"]]
-         [:div {:class (stl/css :feature)}
-
-          [:p {:class (stl/css :feature-content)}
-           "Variants just got published and they already got a serious quality-of-life boost!"]
-
-          [:p {:class (stl/css :feature-content)}
-           "- Switch several variant copies at once: No more clicking through each one individually when you want to update a property. Just select multiple copies and change their values in one go — fast, smooth, and efficient."]
-
-          [:p {:class (stl/css :feature-content)}
-           "- New ways to create variants, right from the design viewport: No need to dig through menus. The new buttons make it super quick to spin up variant sets directly where you’re working."]
-
-          [:p {:class (stl/css :feature-content)}
-           "- Reorder your component properties by drag & drop: Because organization matters, now you can arrange your properties however makes the most sense to you, so you can keep the ones you use most often right where you want them."]]
-
-         [:div {:class (stl/css :navigation)}
-          [:& c/navigation-bullets
-           {:slide slide
-            :navigate navigate
-            :total 4}]
-
-          [:button {:on-click next
-                    :class (stl/css :next-btn)} "Continue"]]]]]]
-
-     2
-     [:div {:class (stl/css-case :modal-overlay true)}
-      [:div.animated {:class klass}
-       [:div {:class (stl/css :modal-container)}
-        [:img {:src "images/features/2.11-invitations.gif"
-               :class (stl/css :start-image)
-               :border "0"
-               :alt "A smoother way to manage invitations"}]
-
-        [:div {:class (stl/css :modal-content)}
-         [:div {:class (stl/css :modal-header)}
-          [:h1 {:class (stl/css :modal-title)}
-           "A smoother way to manage invitations"]]
-         [:div {:class (stl/css :feature)}
-
-          [:p {:class (stl/css :feature-content)}
-           "The Invitations section just got a big usability upgrade for admins. Here’s what’s new:"]
-
-
-          [:p {:class (stl/css :feature-content)}
-           "Sorting - Organize invitations by role type or status to keep track of who’s in and who’s pending."]
-          [:p {:class (stl/css :feature-content)}
-           "Quicker actions - Main actions (resend and delete) are now visible upfront for quicker access."]
-          [:p {:class (stl/css :feature-content)}
-           "Bulk management - Select multiple invitations to resend or delete them all at once."]
-
-          [:p {:class (stl/css :feature-content)}
-           "Invited users will also get clearer emails, including a reminder sent one day before the invite expires (after seven days). Simple, clean, and much more efficient."]]
-
-         [:div {:class (stl/css :navigation)}
-          [:& c/navigation-bullets
-           {:slide slide
-            :navigate navigate
-            :total 4}]
-
-          [:button {:on-click next
-                    :class (stl/css :next-btn)} "Continue"]]]]]]
-
-     3
-     [:div {:class (stl/css-case :modal-overlay true)}
-      [:div.animated {:class klass}
-       [:div {:class (stl/css :modal-container)}
-        [:img {:src "images/features/2.11-menu.gif"
-               :class (stl/css :start-image)
-               :border "0"
-               :alt "User menu makeover"}]
-
-        [:div {:class (stl/css :modal-content)}
-         [:div {:class (stl/css :modal-header)}
-          [:h1 {:class (stl/css :modal-title)}
-           "User menu makeover"]]
-         [:div {:class (stl/css :feature)}
-
-          [:p {:class (stl/css :feature-content)}
-           "The user menu got a well-deserved cleanup. Options are now grouped into clear sections like Help & Learning and Community & Contributions, making navigation faster and easier."]
-
-          [:p {:class (stl/css :feature-content)}
-           "You’ll also notice a handy new detail: the menu now shows your current Penpot version and gives you quick access to changelog information. This is especially useful for self-hosted setups that want to stay in sync with the latest updates. Simple, organized, and more informative."]]
-
-         [:div {:class (stl/css :navigation)}
-
-          [:& c/navigation-bullets
-           {:slide slide
-            :navigate navigate
-            :total 4}]
-
-          [:button {:on-click finish
-                    :class (stl/css :next-btn)} "Let's go"]]]]]])))
-
--- a/frontend/src/app/main/ui/releases/v2_11.scss
+++ b/frontend/src/app/main/ui/releases/v2_11.scss
@@ -1,102 +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
-
-@use "refactor/common-refactor.scss" as deprecated;
-
-.modal-overlay {
-  @extend .modal-overlay-base;
-}
-
-.modal-container {
-  display: grid;
-  grid-template-columns: deprecated.$s-324 1fr;
-  height: deprecated.$s-500;
-  width: deprecated.$s-888;
-  border-radius: deprecated.$br-8;
-  background-color: var(--modal-background-color);
-  border: deprecated.$s-2 solid var(--modal-border-color);
-}
-
-.start-image {
-  width: deprecated.$s-324;
-  border-radius: deprecated.$br-8 0 0 deprecated.$br-8;
-}
-
-.modal-content {
-  padding: deprecated.$s-40;
-  display: grid;
-  grid-template-rows: auto 1fr deprecated.$s-32;
-  gap: deprecated.$s-24;
-
-  a {
-    color: var(--button-primary-background-color-rest);
-  }
-}
-
-.modal-header {
-  display: grid;
-  gap: deprecated.$s-8;
-}
-
-.version-tag {
-  @include deprecated.flexCenter;
-  @include deprecated.headlineSmallTypography;
-  height: deprecated.$s-32;
-  width: deprecated.$s-96;
-  background-color: var(--communication-tag-background-color);
-  color: var(--communication-tag-foreground-color);
-  border-radius: deprecated.$br-8;
-}
-
-.modal-title {
-  @include deprecated.headlineLargeTypography;
-  color: var(--modal-title-foreground-color);
-}
-
-.features-block {
-  display: flex;
-  flex-direction: column;
-  gap: deprecated.$s-16;
-  width: deprecated.$s-440;
-}
-
-.feature {
-  display: flex;
-  flex-direction: column;
-  gap: deprecated.$s-8;
-}
-
-.feature-title {
-  @include deprecated.bodyLargeTypography;
-  color: var(--modal-title-foreground-color);
-}
-
-.feature-content {
-  @include deprecated.bodyMediumTypography;
-  margin: 0;
-  color: var(--modal-text-foreground-color);
-}
-
-.feature-list {
-  @include deprecated.bodyMediumTypography;
-  color: var(--modal-text-foreground-color);
-  list-style: disc;
-  display: grid;
-  gap: deprecated.$s-8;
-}
-
-.navigation {
-  width: 100%;
-  display: grid;
-  grid-template-areas: "bullets button";
-}
-
-.next-btn {
-  @extend .button-primary;
-  width: deprecated.$s-100;
-  justify-self: flex-end;
-  grid-area: button;
-}
--- a/frontend/src/app/main/ui/workspace/shapes/text/viewport_texts_html.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/viewport_texts_html.cljs
@@ -16,6 +16,7 @@
   [app.common.types.modifiers :as ctm]
   [app.common.types.text :as txt]
   [app.common.uuid :as uuid]
+   [app.main.data.workspace.modifiers :as mdwm]
   [app.main.data.workspace.texts :as dwt]
   [app.main.fonts :as fonts]
   [app.main.refs :as refs]
@@ -43,6 +44,7 @@
                             (gpt/point old-sr))]
      (-> shape
          (gsh/transform-shape (ctm/move modifiers deltav))
+          (mdwm/update-grow-type shape)
          (dissoc :modifiers)))
    shape))

--- a/frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs
@@ -169,9 +169,9 @@

        on-color-drag-start
        (mf/use-fn
-         (mf/deps color file-id selected item-ref read-only? editing?)
+         (mf/deps color file-id selected item-ref read-only?)
         (fn [event]
-           (if (or read-only? editing?)
+           (if read-only?
             (dom/prevent-default event)
             (cmm/on-asset-drag-start event file-id color selected item-ref :colors identity))))

--- a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
@@ -391,7 +391,7 @@
        ;; and the variant-container in which it will be restored still exists
        (fn [shape]
          (let [component (find-component shape true)
-                main      (ctk/get-deleted-component-root component)
+                main      (ctk/get-component-root component)
                objects   (dm/get-in libraries [(:component-file shape)
                                                :data
                                                :pages-index
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
@@ -65,7 +65,6 @@
        component-id   (:id component)

        visible?       (h/use-visible item-ref :once? true)
-        renaming?      (= renaming (:id component))

        ;; NOTE: we don't use reactive deref for it because we don't
        ;; really need rerender on any change on the file change. If
@@ -83,13 +82,12 @@

        on-component-double-click
        (mf/use-fn
-         (mf/deps file-id component is-local renaming?)
+         (mf/deps file-id component is-local)
         (fn [event]
           (dom/stop-propagation event)
-           (when-not renaming?
-             (if is-local
-               (st/emit! (dwl/go-to-local-component :id component-id))
-               (st/emit! (dwl/go-to-component-file file-id component false))))))
+           (if is-local
+             (st/emit! (dwl/go-to-local-component :id component-id))
+             (st/emit! (dwl/go-to-component-file file-id component false)))))

        on-drop
        (mf/use-fn
@@ -115,16 +113,18 @@

        on-component-drag-start
        (mf/use-fn
-         (mf/deps file-id component selected item-ref on-drag-start read-only? renaming? is-local)
+         (mf/deps file-id component selected item-ref on-drag-start read-only? is-local)
         (fn [event]
-           (if (or read-only? renaming?)
+           (if read-only?
             (dom/prevent-default event)
             (cmm/on-asset-drag-start event file-id component selected item-ref :components on-drag-start))))

        on-context-menu
        (mf/use-fn
         (mf/deps on-context-menu component-id)
-         (partial on-context-menu component-id))]
+         (partial on-context-menu component-id))
+
+        renaming? (= renaming (:id component))]

    [:div {:ref item-ref
           :class (stl/css-case :component-item true
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.cljs
@@ -76,9 +76,9 @@

        on-typography-drag-start
        (mf/use-fn
-         (mf/deps typography file-id selected item-ref read-only? renaming? open?)
+         (mf/deps typography file-id selected item-ref read-only?)
         (fn [event]
-           (if (or read-only? renaming? open?)
+           (if read-only?
             (dom/prevent-default event)
             (cmm/on-asset-drag-start event file-id typography selected item-ref :typographies identity))))

--- a/frontend/src/app/main/ui/workspace/sidebar/options.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options.cljs
@@ -54,7 +54,7 @@
        modifiers  (dm/get-in modifiers [shape-id :modifiers])

        shape      (gsh/transform-shape shape modifiers)
-        props      (mf/spread-props props {:shape shape :file-id file-id :page-id page-id})]
+        props      (mf/spread-props props {:shape shape})]

    (case shape-type
      :frame   [:> frame/options* props]
@@ -143,6 +143,7 @@
       edit-grid?
       [:& layout-container/grid-layout-edition
        {:ids [edition]
+         :shapes shapes
         :values (get objects edition)}]

       (some? sp-panel)
--- a/frontend/src/app/main/ui/workspace/sidebar/options.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options.scss
@@ -5,6 +5,7 @@
 // Copyright (c) KALEIDOS INC

@use "ds/_sizes.scss" as *;
+@use "refactor/common-refactor.scss" as deprecated;

 .tool-window {
  position: relative;
@@ -14,26 +15,23 @@
 }

 .tab-spacing {
-  margin-inline-end: var(--sp-m);
+  margin-right: deprecated.$s-12;
 }

 .content-class {
  overflow-y: auto;
  overflow-x: hidden;
-  height: calc(100vh - #{$sz-96});
+  height: calc(100vh - deprecated.$s-96);
  scrollbar-gutter: stable;
 }

 .element-options {
  display: flex;
  flex-direction: column;
-  gap: var(--sp-s);
+  gap: deprecated.$s-8;
  width: 100%;
-  /* FIXME: This is hacky and prone to break, we should tackle the whole layout
-            of the sidebar differently */
-  --sidebar-element-options-height: calc(100vh - #{$sz-88});
-  height: var(--sidebar-element-options-height);
-  padding-block-start: var(--sp-s);
+  height: calc(100vh - $sz-88);
+  padding-top: deprecated.$s-8;
 }

 .read-only {
--- a/frontend/src/app/main/ui/workspace/sidebar/options/common.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/common.cljs
@@ -7,20 +7,20 @@
 (ns app.main.ui.workspace.sidebar.options.common
  (:require-macros [app.main.style :as stl])
  (:require
+   [app.common.data.macros :as dm]
   [app.util.dom :as dom]
   [rumext.v2 :as mf]))

-(mf/defc advanced-options*
-  [{:keys [class is-visible children]}]
+(mf/defc advanced-options [{:keys [visible? class children]}]
  (let [ref (mf/use-ref nil)]
    (mf/use-effect
-     (mf/deps is-visible)
+     (mf/deps visible?)
     (fn []
       (when-let [node (mf/ref-val ref)]
-         (when is-visible
+         (when visible?
           (dom/scroll-into-view-if-needed! node)))))
-    (when is-visible
-      [:div {:class [class (stl/css :advanced-options-wrapper)]
+    (when visible?
+      [:div {:class (dm/str class " " (stl/css :advanced-options-wrapper))
             :ref ref}
       children])))

--- a/frontend/src/app/main/ui/workspace/sidebar/options/common.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/common.scss
@@ -4,8 +4,8 @@
 //
 // Copyright (c) KALEIDOS INC

+@use "refactor/common-refactor.scss" as deprecated;
+
 .advanced-options-wrapper {
-  display: flex;
-  flex-direction: column;
-  gap: var(--sp-xs);
+  @include deprecated.flexColumn;
 }
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.scss
@@ -7,13 +7,7 @@
@use "refactor/common-refactor.scss" as deprecated;

 .element-set {
-  display: grid;
-  grid-template-columns: repeat(8, var(--sp-xxxl));
-  column-gap: var(--sp-xs);
-}
-
-.element-title {
-  grid-column: span 8;
+  margin: 0;
 }

 .title-spacing-blur {
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs
@@ -13,44 +13,93 @@
   [app.main.data.workspace.tokens.application :as dwta]
   [app.main.store :as st]
   [app.main.ui.components.title-bar :refer [title-bar*]]
-   [app.main.ui.hooks :as h]
   [app.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row*]]
   [app.util.i18n :as i18n :refer [tr]]
   [rumext.v2 :as mf]))

 (defn- prepare-colors
-  [shapes file-id libraries]
-  (let [data           (into [] (remove nil? (dwc/extract-all-colors shapes file-id libraries)))
-        groups         (d/group-by :attrs #(dissoc % :attrs) data)
-        all-colors     (distinct (mapv :attrs data))
+  "Prepares and groups extracted color information from shapes.
+     Input:
+       - shapes: vector of shape maps
+       - file-id: current file UUID
+       - libraries: shared color libraries

-        tmp            (group-by #(some? (:id %)) all-colors)
-        library-colors (get tmp true)
-        colors         (get tmp false)]
+     Output:
+       {:groups            explained below
+        :all-colors        vector of all color maps (unique attrs)
+        :colors            vector of normal colors (without ref-id or token)
+        :library-colors    vector of colors linked to libraries (with ref-id)
+        :token-colors      vector of colors linked to applied tokens
+        :tokens            placeholder for future token data}
+
+   :groups structure
+
+   A map where:
+     - Each **key** is a color descriptor map representing a unique color instance.
+       Depending on the color type, it can contain:
+         • :color  → hex string (e.g. \"#9f2929\")
+         • :opacity → numeric value between 0-1
+         • :ref-id and :ref-file → if the color comes from a library
+         • :token-name \"some-token\" → if the color
+           originates from an applied token
+
+     - Each **value** is a vector of one or more maps describing *where* that
+       color is used. Each entry corresponds to a specific shape and color
+       property in the document:
+         • :prop      → the property type (:fill, :stroke, :shadow, etc.)
+         • :shape-id  → the UUID of the shape using this color
+         • :index     → index of the color in the shape's fill/stroke list
+   
+   Example of groups:
+   {
+     {:color \"#9f2929\", :opacity 0.3,  :token-name \"asd2\" :has-token-applied true}
+     [{:prop :fill, :shape-id #uuid \"d0231035-25c9-80d5-8006-eae4c3dff32e\", :index 0}]
+   
+     {:color \"#1b54b6\", :opacity 1}
+     [{:prop :fill, :shape-id #uuid \"aab34f9a-98c1-801a-8006-eae5e8236f1b\", :index 0}]
+   }
+   
+   This structure allows fast lookups of all shapes using the same visual color,
+   regardless of whether it comes from local fills, strokes or shadow-colors."
+
+  [shapes file-id libraries]
+  (let [data           (into [] (remove nil?) (dwc/extract-all-colors shapes file-id libraries))
+        groups         (d/group-by :attrs #(dissoc % :attrs) data)
+
+         ;; Unique color attribute maps
+        all-colors (distinct (mapv :attrs data))
+
+        ;; Split into: library colors, token colors, and plain colors
+        library-colors (filterv :ref-id all-colors)
+        token-colors   (filterv :token-name all-colors)
+        colors         (filterv #(and (nil? (:ref-id %))
+                                      (not (:token-name %)))
+                                all-colors)]
    {:groups groups
     :all-colors all-colors
     :colors colors
+     :token-colors token-colors
     :library-colors library-colors}))

 (def xf:map-shape-id
  (map :shape-id))

-(defn- generate-color-operations
+(defn- retrieve-color-operations
  [groups old-color prev-colors]
-  (let [old-color   (-> old-color
-                        (dissoc :name :path)
-                        (d/without-nils))
-        prev-color  (d/seek (partial get groups) prev-colors)
+  (let [old-color               (-> old-color
+                                    (dissoc :name :path)
+                                    (d/without-nils))
+        prev-color              (d/seek (partial get groups) prev-colors)
        color-operations-old    (get groups old-color)
        color-operations-prev   (get groups prev-colors)
        color-operations        (or color-operations-prev color-operations-old)
-        old-color   (or prev-color old-color)]
+        old-color               (or prev-color old-color)]
    [color-operations old-color]))

 (mf/defc color-selection-menu*
  {::mf/wrap [#(mf/memo' % (mf/check-props ["shapes"]))]}
  [{:keys [shapes file-id libraries]}]
-  (let [{:keys [groups library-colors colors]}
+  (let [{:keys [groups library-colors colors token-colors]}
        (mf/with-memo [file-id shapes libraries]
          (prepare-colors shapes file-id libraries))

@@ -63,21 +112,19 @@

        expand-lib-color (mf/use-state false)
        expand-color     (mf/use-state false)
+        expand-token-color     (mf/use-state false)

-        groups-ref       (h/use-ref-value groups)
+        ;;  TODO: Review if this is still necessary.
        prev-colors-ref  (mf/use-ref nil)

        on-change
        (mf/use-fn
-         (fn [new-color old-color from-picker?]
-           (let [;; When dragging on the color picker sometimes all
-                 ;; the shapes hasn't updated the color to the prev
-                 ;; value so we need this extra calculation
-                 groups      (mf/ref-val groups-ref)
-                 prev-colors (mf/ref-val prev-colors-ref)
-
-                 [color-operations old-color] (generate-color-operations groups old-color prev-colors)]
+         (mf/deps groups)
+         (fn [old-color new-color from-picker?]
+           (let [prev-colors (mf/ref-val prev-colors-ref)
+                 [color-operations old-color] (retrieve-color-operations groups old-color prev-colors)]

+             ;;  TODO: Review if this is still necessary.
             (when from-picker?
               (let [color (-> new-color
                               (dissoc :name :path)
@@ -85,7 +132,7 @@
                 (mf/set-ref-val! prev-colors-ref
                                  (conj prev-colors color))))

-             (st/emit! (dwc/change-color-in-selected color-operations new-color old-color)))))
+             (st/emit! (dwc/change-color-in-selected color-operations new-color (dissoc old-color :token-name :has-token-applied))))))

        on-open
        (mf/use-fn #(mf/set-ref-val! prev-colors-ref []))
@@ -95,31 +142,52 @@

        on-detach
        (mf/use-fn
+         (mf/deps groups)
         (fn [color]
-           (let [groups (mf/ref-val groups-ref)
-                 color-operations   (get groups color)
-                 color' (dissoc color :id :file-id)]
+           (let [color-operations (get groups color)
+                 color'           (dissoc color :ref-id :ref-file)]
             (st/emit! (dwc/change-color-in-selected color-operations color' color)))))

+        on-detach-token
+        (mf/use-fn
+         (mf/deps token-colors groups)
+         (fn [token]
+           (let [prev-colors (mf/ref-val prev-colors-ref)
+                 token-color (some #(when (= (:token-name %) (:name token)) %) token-colors)
+
+                 [color-operations _] (retrieve-color-operations groups token-color prev-colors)]
+             (doseq [op color-operations]
+               (let [attr (if (= (:prop op) :stroke)
+                            #{:stroke-color}
+                            #{:fill})
+                     color (-> token-color
+                               (dissoc :token-name :has-token-applied)
+                               (d/without-nils))]
+                 (mf/set-ref-val! prev-colors-ref
+                                  (conj prev-colors color))
+                 (st/emit! (dwta/unapply-token {:attributes attr
+                                                :token token
+                                                :shape-ids [(:shape-id op)]})))))))
+
        select-only
        (mf/use-fn
+         (mf/deps groups)
         (fn [color]
-           (let [groups (mf/ref-val groups-ref)
-                 color-operations   (get groups color)
+           (let [color-operations   (get groups color)
                 ids    (into (d/ordered-set) xf:map-shape-id color-operations)]
             (st/emit! (dws/select-shapes ids)))))

        on-token-change
        (mf/use-fn
+         (mf/deps groups)
         (fn [_ token old-color]
-           (let [groups      (mf/ref-val groups-ref)
-                 prev-colors (mf/ref-val prev-colors-ref)
+           (let [prev-colors (mf/ref-val prev-colors-ref)
                 resolved-value (:resolved-value token)
                 new-color (dwta/value->color resolved-value)
                 color (-> new-color
                           (dissoc :name :path)
                           (d/without-nils))
-                 [color-operations _] (generate-color-operations groups old-color prev-colors)]
+                 [color-operations _] (retrieve-color-operations groups old-color prev-colors)]
             (mf/set-ref-val! prev-colors-ref
                              (conj prev-colors color))
             (st/emit! (dwta/apply-token-on-selected color-operations token)))))]
@@ -135,22 +203,15 @@
     (when open?
       [:div {:class (stl/css :element-content)}
        [:div {:class (stl/css :selected-color-group)}
-         ;; The hidden color is to solve a problem with the color picker. When a color is changed
-         ;; and is no longer a library color it disapears from the list of library colors. Because
-         ;; we need to keep the color picker open we need to maintain that color. The easier way
-         ;; is to render the color elements so even if the library color is no longer we have still
-         ;; the component to change it from the color picker.
-         (let [lib-colors (cond->> library-colors (not @expand-lib-color) (take 3))
-               lib-colors (concat lib-colors colors)]
-           (for [[index color] (d/enumerate lib-colors)]
+         (let [library-colors-extract (cond->> library-colors (not @expand-lib-color) (take 3))]
+           (for [[index color] (d/enumerate library-colors-extract)]
             [:> color-row*
              {:key index
               :color color
               :index index
-               :hidden (not (:id color))
-               :on-detach on-detach
+               :on-detach #(on-detach color %)
               :select-only select-only
-               :on-change #(on-change %1 color %2)
+               :on-change #(on-change color %1  %2)
               :on-token-change #(on-token-change %1 %2 color)
               :on-open on-open
               :origin :color-selection
@@ -167,7 +228,7 @@
             :color color
             :index index
             :select-only select-only
-             :on-change #(on-change %1 color %2)
+             :on-change #(on-change color %1 %2)
             :origin :color-selection
             :on-token-change #(on-token-change %1 %2 color)
             :on-open on-open
@@ -176,4 +237,28 @@
         (when (and (false? @expand-color) (< 3 (count colors)))
           [:button  {:class (stl/css :more-colors-btn)
                      :on-click #(reset! expand-color true)}
-            (tr "workspace.options.more-colors")])]])]))
+            (tr "workspace.options.more-colors")])]
+
+        [:div {:class (stl/css :selected-color-group)}
+         (let [token-color-extract (cond->> token-colors (not @expand-token-color) (take 3))]
+           (for [[index token-color] (d/enumerate token-color-extract)]
+             (let [color {:color (:color token-color)
+                          :opacity (:opacity token-color)}]
+               [:> color-row*
+                {:key index
+                 :color color
+                 :index index
+                 :select-only select-only
+                 :on-change #(on-change token-color %1 %2)
+                 :origin :color-selection
+                 :applied-token (:token-name token-color)
+                 :on-detach-token on-detach-token
+                 :on-token-change #(on-token-change %1 %2 token-color)
+                 :on-open on-open
+                 :on-close on-close}])))
+
+         (when (and (false? @expand-token-color)
+                    (< 3 (count token-colors)))
+           [:button {:class (stl/css :more-colors-btn)
+                     :on-click #(reset! expand-token-color true)}
+            (tr "workspace.options.more-token-colors")])]])]))
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.scss
@@ -7,13 +7,7 @@
@use "refactor/common-refactor.scss" as deprecated;

 .element-set {
-  display: grid;
-  grid-template-columns: repeat(8, var(--sp-xxxl));
-  column-gap: var(--sp-xs);
-}
-
-.element-title {
-  grid-column: span 8;
+  margin: 0;
 }

 .title-spacing-selected-colors {
@@ -31,7 +25,6 @@
 }

 .element-content {
-  grid-column: span 8;
  @include deprecated.flexColumn;
  margin-bottom: deprecated.$s-8;
 }
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.scss
@@ -7,13 +7,7 @@
@use "refactor/common-refactor.scss" as deprecated;

 .element-set {
-  display: grid;
-  grid-template-columns: repeat(8, var(--sp-xxxl));
-  column-gap: var(--sp-xs);
-}
-
-.element-title {
-  grid-column: span 8;
+  margin: 0;
 }

 .title-spacing-export {
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs
@@ -131,8 +131,8 @@
        on-reorder
        (mf/use-fn
         (mf/deps ids)
-         (fn [from-pos to-space-between-pos]
-           (st/emit! (dc/reorder-fills ids from-pos to-space-between-pos))))
+         (fn [new-index index]
+           (st/emit! (dc/reorder-fills ids index new-index))))

        on-remove
        (mf/use-fn
@@ -211,13 +211,13 @@
          (dom/set-attribute! checkbox "indeterminate" true)
          (dom/remove-attribute! checkbox "indeterminate"))))

-    [:div {:class (stl/css :fill-section)}
-     [:div {:class (stl/css :fill-title)}
+    [:div {:class (stl/css :element-set)}
+     [:div {:class (stl/css :element-title)}
      [:> title-bar* {:collapsable  has-fills?
                      :collapsed    (not open?)
                      :on-collapsed toggle-content
                      :title        label
-                      :class        (stl/css-case :fill-title-bar (not has-fills?))}
+                      :class        (stl/css-case :title-spacing-fill (not has-fills?))}

       (when (not (= :multiple fills))
         [:> icon-button* {:variant "ghost"
@@ -228,11 +228,11 @@
                           :icon i/add}])]]

     (when open?
-       [:div {:class (stl/css :fill-content)}
+       [:div {:class (stl/css :element-content)}
        (cond
          (= :multiple fills)
-          [:div {:class (stl/css :fill-multiple)}
-           [:div {:class (stl/css :fill-multiple-label)}
+          [:div {:class (stl/css :element-set-options-group)}
+           [:div {:class (stl/css :group-label)}
            (tr "settings.multiple")]
           [:> icon-button* {:variant "ghost"
                             :aria-label (tr "workspace.options.fill.remove-fill")
@@ -256,7 +256,9 @@
                               :on-remove on-remove
                               :disable-drag disable-drag?
                               :on-focus on-focus
-                               :applied-token fill-token-applied
+                               :applied-token (if (= index 0)
+                                                fill-token-applied
+                                                nil)
                               :on-token-change on-token-change
                               :origin :fill
                               :select-on-focus (not disable-drag?)
@@ -265,7 +267,7 @@
        (when (or (= type :frame)
                  (and (= type :multiple)
                       (some? hide-on-export)))
-          [:div {:class (stl/css :fill-checkbox)}
+          [:div {:class (stl/css :checkbox)}
           [:label {:for "show-fill-on-export"
                    :class (stl/css-case :global/checked (not hide-on-export))}
            [:span {:class (stl/css-case :check-mark true
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.scss
@@ -4,61 +4,44 @@
 //
 // Copyright (c) KALEIDOS INC

-@use "ds/_sizes.scss" as *;
-@use "ds/_borders.scss" as *;
-@use "ds/typography.scss" as t;
@use "refactor/common-refactor.scss" as deprecated;

-.fill-section {
-  display: grid;
-  grid-template-columns: repeat(8, var(--sp-xxxl));
-  column-gap: var(--sp-xs);
+.element-set {
+  margin: 0;
 }

-.fill-title {
-  grid-column: span 8;
+.element-title {
+  margin: 0;
 }

-.fill-title-bar {
-  padding-inline-start: var(--sp-xxs);
+.title-spacing-fill {
+  padding-left: deprecated.$s-2;
+  margin: 0;
 }

-.fill-content {
-  grid-column: span 8;
-
+.element-content {
  display: flex;
  flex-direction: column;
-  gap: var(--sp-m);
-  margin: var(--sp-xs) 0 var(--sp-s) 0;
+  gap: deprecated.$s-12;
+  margin: deprecated.$s-4 0 deprecated.$s-8 0;
 }

-.fill-multiple {
-  display: flex;
-  align-items: center;
-  gap: var(--sp-xs);
+.element-set-options-group {
+  @include deprecated.flexRow;
 }

-.fill-multiple-label {
-  @include t.use-typography("body-small");
-  display: flex;
-  align-items: center;
-  flex-grow: 1;
-  border-radius: $br-8;
-  block-size: $sz-32;
-  padding: var(--sp-s);
-  background-color: var(--color-background-tertiary);
-  color: var(--color-foreground-primary);
+.group-label {
+  @extend .mixed-bar;
 }

-.fill-checkbox {
-  // TODO create a checkbox component in the DS
+.checkbox {
  @extend .input-checkbox;
-  padding-inline-start: var(--sp-s);
+  padding-left: deprecated.$s-8;
  span.checked {
-    background-color: var(--color-accent-primary);
+    background-color: var(--input-border-color-active);
    svg {
      @extend .button-icon-small;
-      stroke: var(--color-background-primary);
+      stroke: var(--input-details-color);
    }
  }
 }
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs
@@ -19,7 +19,7 @@
   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
   [app.main.ui.ds.foundations.assets.icon :as i]
   [app.main.ui.icons :as deprecated-icon]
-   [app.main.ui.workspace.sidebar.options.common :refer [advanced-options*]]
+   [app.main.ui.workspace.sidebar.options.common :refer [advanced-options]]
   [app.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row*]]
   [app.util.i18n :as i18n :refer [tr]]
   [okulary.core :as l]
@@ -190,9 +190,9 @@
                         :icon i/remove}]]]

     (when (:display grid)
-       [:> advanced-options* {:class (stl/css :grid-advanced-options)
-                              :is-visible open?
-                              :on-close toggle-advanced-options}
+       [:& advanced-options {:class (stl/css :grid-advanced-options)
+                             :visible? open?
+                             :on-close toggle-advanced-options}
        ;; square
        (when (= :square type)
          [:div {:class (stl/css :square-row)}
@@ -316,17 +316,16 @@
         #(st/emit! (dw/add-frame-grid id)))]

    [:div {:class (stl/css :element-set)}
-     [:div {:class (stl/css :element-title)}
-      [:> title-bar* {:collapsable  has-frame-grids?
-                      :collapsed    (not open?)
-                      :on-collapsed toggle-content
-                      :class        (stl/css-case :title-spacing-board-grid (not has-frame-grids?))
-                      :title        (tr "workspace.options.guides.title")}
+     [:> title-bar* {:collapsable  has-frame-grids?
+                     :collapsed    (not open?)
+                     :on-collapsed toggle-content
+                     :class        (stl/css-case :title-spacing-board-grid (not has-frame-grids?))
+                     :title        (tr "workspace.options.guides.title")}

-       [:> icon-button* {:variant "ghost"
-                         :aria-label (tr "workspace.options.guides.add-guide")
-                         :on-click handle-create-grid
-                         :icon i/add}]]]
+      [:> icon-button* {:variant "ghost"
+                        :aria-label (tr "workspace.options.guides.add-guide")
+                        :on-click handle-create-grid
+                        :icon i/add}]]

     (when (and open? (seq frame-grids))
       [:div  {:class (stl/css :element-set-content)}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eva Marco	9e2bd5c38c	🐛 Fix hover position of lock proportion tooltip	2025-10-16 10:52:49 +02:00
Eva Marco	24264e7d8a	🎉 Replace numeric inputs on layout menus (#7488 ) * 🎉 Replace numeric inputs on layout menus * 🎉 Add numeric inputs on gaps * ♻️ Refactor scss file * 🐛 Fix comments	2025-10-16 10:05:25 +02:00
Xaviju	5b77df997b	🐛 Remove color validation for non-color tokens in strokes (#7513 )	2025-10-16 09:54:50 +02:00
Xaviju	968274096d	🐛 Fix visual glitch in transparent background for swatch component (#7509 )	2025-10-16 09:54:33 +02:00
Alejandro Alonso	392e3ac34e	Merge pull request #7507 from penpot/elenatorro-11974-fix-resize-on-blocked-shapes 🐛 Fix resize on blocked shapes from the viewport	2025-10-16 09:17:13 +02:00
Elena Torro	e8336a401e	🐛 Do not show resize controls when a selected shape is blocked	2025-10-16 06:43:34 +02:00
Elena Torro	18048a4b2e	🐛 Do not select a blocked frame when clicking its name	2025-10-16 06:42:45 +02:00
Elena Torro	e28d4eaff1	🐛 Do not allow to resize a shape that is blocked from the viewport	2025-10-16 06:42:45 +02:00
Alejandro Alonso	fae574796f	Merge pull request #7512 from penpot/elenatorro-11963-change-font-styles-label 🌐 Add font-style label on workspace assets	2025-10-16 06:36:39 +02:00
Elena Torro	db59209b21	🌐 Add font-style label on workspace assets	2025-10-15 14:41:15 +02:00
Alejandro Alonso	a62f1fb46f	Merge pull request #7505 from penpot/elenatorro-review-extrect 🔧 Fix extrect and selrect debug interactivity	2025-10-15 14:02:22 +02:00
Alejandro Alonso	ffd2aa03a9	Merge pull request #7510 from penpot/alotor-bugfix-pan-with-guides 🐛 Fix pan cursor not disabling viewport guides	2025-10-15 13:36:12 +02:00
Xaviju	f1ebcaf635	✨ Add composite typography token to text panel (#7496 )	2025-10-15 13:21:30 +02:00
alonso.torres	6a4d0f05bc	🐛 Fix pan cursor not disabling viewport guides	2025-10-15 13:02:56 +02:00
Alejandro Alonso	4d751c5acd	Merge pull request #7504 from penpot/azazeln28-feat-webgl-error 🎉 Add debug and alert when WebGL is unsupported	2025-10-15 12:51:45 +02:00
Andrey Antukh	9a5efe8671	Merge remote-tracking branch 'origin/staging' into develop	2025-10-15 11:32:15 +02:00
Andrey Antukh	1f65e2f560	Merge branch 'staging' into develop	2025-10-15 11:22:03 +02:00
Alejandro Alonso	bf6874a96d	Merge pull request #7460 from penpot/ladybenko-12205-cap-fills-text ✨ Cap the amount of text fills	2025-10-15 11:17:32 +02:00
Elena Torro	3c05067c99	🔧 Fix extrect and selrect debug interactivity	2025-10-15 10:10:24 +02:00
Aitor Moreno	bbb78904fb	🎉 Add debug and alert when WebGL is unsupported	2025-10-15 10:06:02 +02:00
Elena Torró	12e91751c3	🔧 Improve debugging UI (#7500 )	2025-10-14 17:29:04 +02:00
David Barragán Merino	0f0c8466be	📎 Add bundle version to the metadata in S3	2025-10-14 16:30:31 +02:00
Belén Albeza	204d0dfb9d	✨ Add integration test to check fills limit in UI	2025-10-14 16:14:53 +02:00
Belén Albeza	e4a3fc3940	✨ Limit the amount of text fills passed to wasm	2025-10-14 16:05:03 +02:00
Francis Santiago	29dc99deae	🔧 Replace ADD with COPY in Dockerfiles to fix hadolint warnings	2025-10-14 13:53:48 +02:00
alonso.torres	025f0d2fdb	🐛 Fix problem with tiles and transform	2025-10-14 12:51:48 +02:00
Eva Marco	045aa7c788	🎉 Add tokens to color selection (#7447 ) * 🎉 Add tokens to color row * 🎉 Add color-token to stroke input * 🐛 Fix change token on multiselection with groups * 🎉 Create token colors on selected-colors section * ♻️ Fix comments	2025-10-14 11:17:14 +02:00
Andrey Antukh	0f3ca67773	🔧 Simplfy circleci workflow dependencies	2025-10-13 18:53:39 +02:00
Andrey Antukh	1c06c87acf	🔧 Add missing construction_worker to commit checker regex	2025-10-13 18:53:39 +02:00
Andrey Antukh	d532558bab	Merge remote-tracking branch 'origin/staging' into develop	2025-10-13 18:41:18 +02:00
Andrey Antukh	71ed845307	Merge remote-tracking branch 'origin/staging' into develop	2025-10-13 16:35:53 +02:00
Andrey Antukh	dd35c82824	Merge remote-tracking branch 'origin/staging' into develop	2025-10-13 15:19:07 +02:00
Xaviju	253605f6cc	🎉 Add text panel to inspect styles tab (#7413 )	2025-10-13 14:20:55 +02:00
Xaviju	2548bec651	🐛 Fix visual glitch in background for swatch component (#7468 )	2025-10-13 14:20:14 +02:00
Andrey Antukh	da5da00bd4	📚 Update changelog	2025-10-13 14:08:33 +02:00