WIP

2026-02-01 10:11:59 -05:00 · 2025-07-24 10:16:48 +02:00 · 2025-07-24 09:23:19 +02:00 · 2025-07-24 09:23:19 +02:00 · 2025-07-24 09:23:19 +02:00 · 2025-07-24 09:23:19 +02:00
476 changed files with 43385 additions and 15586 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@
 /backend/resources/public/assets
 /backend/resources/public/media
 /backend/target/
+/backend/experiments
 /bundle*
 /cd.md
 /clj-profiler/
@@ -51,9 +52,6 @@
 /exporter/target
 /frontend/.storybook/preview-body.html
 /frontend/.storybook/preview-head.html
-/frontend/cypress/fixtures/validuser.json
-/frontend/cypress/videos/*/
-/frontend/cypress/videos/*/
 /frontend/dist/
 /frontend/npm-debug.log
 /frontend/out/
@@ -70,6 +68,8 @@
 /vendor/svgclean/bundle*.js
 /web
 /library/target/
+/library/*.zip
+/external

 clj-profiler/
 node_modules
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,73 @@
 # CHANGELOG

-## 2.8.0 (Next / Unreleased)
+## 2.10.0 (Unreleased)
+
+### :rocket: Epics and highlights
+
+### :boom: Breaking changes & Deprecations
+
+### :heart: Community contributions (Thank you!)
+
+### :sparkles: New features & Enhancements
+
+### :bug: Bugs fixed
+
+
+## 2.9.0 (Unreleased)
+
+### :rocket: Epics and highlights
+
+### :boom: Breaking changes & Deprecations
+
+### :heart: Community contributions (Thank you!)
+
+- Clarify message when inviting existing team members to make it more user-friendly and clear which invitations will be sent. [Taiga #11441](https://tree.taiga.io/project/penpot/issue/11441) by [@iprithvitharun](https://github.com/iprithvitharun)
+- Update email change confirmation message for clarity and correct grammar. [GitHub #6786](https://github.com/penpot/penpot/issues/6786) by [@iprithvitharun](https://github.com/iprithvitharun)
+
+### :sparkles: New features & Enhancements
+
+- Add visual indicator for new comments in the workspace [Taiga #11328](https://tree.taiga.io/project/penpot/issue/11328)
+- On components overrides, separate the content of the text from the rest of properties [Taiga #7434](https://tree.taiga.io/project/penpot/us/7434)
+- Improve dashboard's sidebar [Taiga #10700](https://tree.taiga.io/project/penpot/us/10700)
+- Change "Save color" button to primary button [Taiga #9410](https://tree.taiga.io/project/penpot/issue/9410)
+- Support for exif rotated images [GitHub #6767](https://github.com/penpot/penpot/issues/6767)
+- Display Blend Mode and Layer Opacity properties in the Inspect tab [Taiga #11283](https://tree.taiga.io/project/penpot/issue/11283)
+- Provide CSS `mix-blend-mode` property in code editor when present on shape [Taiga #11282](https://tree.taiga.io/project/penpot/issue/11282)
+- Add the option to import tokens in a .zip file. [Taiga #11378](https://tree.taiga.io/project/penpot/us/11378)
+- New typography token type - font size token [Taiga #10938](https://tree.taiga.io/project/penpot/us/10938)
+- Hide bounding box while editing visual effects [Taiga #11576](https://tree.taiga.io/project/penpot/issue/11576)
+- Improved text layer resizing: Allow double-click on text bounding box to set auto-width/auto-height [Taiga #11577](https://tree.taiga.io/project/penpot/issue/11577)
+- Improve text layer auto-resize: auto-width switches to auto-height on horizontal resize, and only switches to fixed on vertical resize [Taiga #11578](https://tree.taiga.io/project/penpot/issue/11578)
+- Highlight first font in font selector search. Apply only on Enter or click. [Taiga #11579](https://tree.taiga.io/project/penpot/issue/11579)
+- Add the ability to show login dialog on profile settings [Github #6871](https://github.com/penpot/penpot/pull/6871)
+- Improve the application of tokens with object specific tokens [Taiga #10209](https://tree.taiga.io/project/penpot/us/10209)
+
+### :bug: Bugs fixed
+
+- Copying font size does not copy the unit [Taiga #11143](https://tree.taiga.io/project/penpot/issue/11143)
+- Fix text-decoration line-through that displays a wrong property value [Taiga #11145](https://tree.taiga.io/project/penpot/issue/11145)
+- Fix display error message on register form [Taiga #11444](https://tree.taiga.io/project/penpot/issue/11444)
+- Fix toggle focus mode did not restore viewport and selection upon exit [GitHub #6280](https://github.com/penpot/penpot/issues/6820)
+- Fix problem when creating a layout from an existing layout [Taiga #11554](https://tree.taiga.io/project/penpot/issue/11554)
+- Fix title button from Title Case to Capitalize [Taiga #11476](https://tree.taiga.io/project/penpot/issue/11476)
+- Fix touchpad swipe leading to navigating back/forth [GitHub #4246](https://github.com/penpot/penpot/issues/4246)
+- Keep color data when copying from info tab into CSS [Taiga #11144](https://tree.taiga.io/project/penpot/issue/11144)
+- Update HSL values to modern syntax as defined in W3C CSS Color Module Level 4 [Taiga #11144](https://tree.taiga.io/project/penpot/issue/11144)
+- Fix main component receives focus and is selected when using 'Show Main Component' [Taiga #11402](https://tree.taiga.io/project/penpot/issue/11402)
+- Fix duplicating pages with mainInstance shapes nested inside groups [Taiga #10774](https://tree.taiga.io/project/penpot/issue/10774)
+- Fix ESC key not closing Add/Manage Libraries modal [Taiga #11523](https://tree.taiga.io/project/penpot/issue/11523)
+- Fix copying a shadow color from info tab [Taiga #11211](https://tree.taiga.io/project/penpot/issue/11211)
+- Fix remove color button in the gradient editor [Taiga #11623](https://tree.taiga.io/project/penpot/issue/11623)
+- Fix "Copy as SVG" generates different code from the Inspect panel [Taiga #11519](https://tree.taiga.io/project/penpot/issue/11519)
+- Fix overriden tokens in text copies are not preserved [Taiga #11486](https://tree.taiga.io/project/penpot/issue/11486)
+
+## 2.8.1 (Unreleased)
+
+### :bug: Bugs fixed
+
+- Fix unexpected exception on processing old texts [Github #6889](https://github.com/penpot/penpot/pull/6889)
+
+## 2.8.0

 ### :rocket: Epics and highlights

@@ -15,11 +82,12 @@ on [its own changelog](library/CHANGES.md)
 **Penpot migrate from Redis to Valkey**

 As [Valkey](https://valkey.io/) is an opne-souce fork of [Redis](https://redis.io/)
-version 7.2.4, this version of Penpot will be compatible with Redis but may diverge 
-in future versions. Therefore, **migration from Redis to ValKey is recommended for all 
+version 7.2.4, this version of Penpot will be compatible with Redis but may diverge
+in future versions. Therefore, **migration from Redis to ValKey is recommended for all
 on-premises instances** that want to keep up to date.

 ### :heart: Community contributions (Thank you!)
+
 - Add Serbian language [GitHub #5002](https://github.com/penpot/penpot/issues/5002) by [crnobog69](https://github.com/crnobog69)

 ### :sparkles: New features & Enhancements
@@ -75,7 +143,6 @@ on-premises instances** that want to keep up to date.
 - Fix copy in error message [GitHub #6615](https://github.com/penpot/penpot/pull/6615)
 - Fix url on invitation link [Taiga #11284](https://tree.taiga.io/project/penpot/issue/11284)

-
 ## 2.7.1

 ### :bug: Bugs fixed
@@ -83,7 +150,6 @@ on-premises instances** that want to keep up to date.
 - Fix incorrect handling of strokes with images on importing files
 - Fix tokens disappearing after manual additions [Taiga #11063](https://tree.taiga.io/project/penpot/issue/11063)

-
 ## 2.7.0

 ### :rocket: Epics and highlights
@@ -215,7 +281,6 @@ on-premises instances** that want to keep up to date.
 - Add character limitation to asset inputs [Taiga #10669](https://tree.taiga.io/project/penpot/issue/10669)
 - Fix Storybook link 'list of all available icons' wrong path [Taiga #10705](https://tree.taiga.io/project/penpot/issue/10705)

-
 ## 2.5.4

 ### :heart: Community contributions (Thank you!)
@@ -260,7 +325,7 @@ on-premises instances** that want to keep up to date.

 ### :boom: Breaking changes & Deprecations

-Although this is not a breaking change, we believe it’s important to highlight it in this
+Although this is not a breaking change, we believe it's important to highlight it in this
 section:

 This release includes a fix for an internal bug in Penpot that caused incorrect handling
@@ -268,9 +333,9 @@ of media assets (e.g., fill images). The issue has been resolved since version 2
 no new incorrect references will be generated. However, existing files may still contain
 incorrect references.

-To address this, we’ve provided a script to correct these references in existing files.
+To address this, we've provided a script to correct these references in existing files.

-While having incorrect references generally doesn’t result in visible issues, there are
+While having incorrect references generally doesn't result in visible issues, there are
 rare cases where it can cause problems. For example, if a component library (containing
 images) is deleted, and that library is being used in other files, running the FileGC task
 (responsible for freeing up space and performing logical deletions) could leave those
@@ -345,7 +410,6 @@ is a number of cores)
 - Fix missing methods reference on API Docs
 - Fix memory usage issue on file-gc asynchronous task (related to snapshots feature)

-
 ## 2.4.1

 ### :bug: Bugs fixed
@@ -353,7 +417,6 @@ is a number of cores)
 - Fix error when importing files with touched components [Taiga #9625](https://tree.taiga.io/project/penpot/issue/9625)
 - Fix problem when changing color libraries [Plugins #184](https://github.com/penpot/penpot-plugins/issues/184)

-
 ## 2.4.0

 ### :rocket: Epics and highlights
@@ -407,7 +470,6 @@ is a number of cores)

 - Add initial documentation for Kubernetes

-
 ## 2.3.1

 ### :bug: Bugs fixed
@@ -415,7 +477,6 @@ is a number of cores)
 - Fix unexpected issue on interaction between plugins sandbox and
  internal impl of promise

-
 ## 2.3.0

 ### :rocket: Epics and highlights
@@ -441,7 +502,6 @@ is a number of cores)

  You can enable it with the `enable-feature-text-editor-v2` configuration flag.

-
 ### :bug: Bugs fixed

 - Fix problem with constraints buttons [Taiga #8465](https://tree.taiga.io/project/penpot/issue/8465)
@@ -481,8 +541,8 @@ is a number of cores)
 ### :boom: Breaking changes & Deprecations

 - Removed "merge assets" option when exporting ".svg + .json" files. After the components changes the option wasn't
-working properly and we're planning to change the format soon. We think it's better to deprecate the option for the
-time being.
+  working properly and we're planning to change the format soon. We think it's better to deprecate the option for the
+  time being.

 ### :heart: Community contributions (Thank you!)

@@ -498,7 +558,7 @@ time being.
  freeing up space in the database. It can be enabled with the
  `enable-enable-tiered-file-data-storage` flag.

-  *(On-Premise feature, EXPERIMENTAL).*
+  _(On-Premise feature, EXPERIMENTAL)._

 - **JSON Interoperability for HTTP API** [Taiga #8372](https://tree.taiga.io/project/penpot/us/8372)

@@ -541,7 +601,7 @@ time being.

 - **Design System**

-  We implemented and subbed in new components from our Design System: `loader*` ([Taiga #8355](https://tree.taiga.io/project/penpot/task/8355))  and `tab-switcher*` ([Taiga #8518](https://tree.taiga.io/project/penpot/task/8518)).
+  We implemented and subbed in new components from our Design System: `loader*` ([Taiga #8355](https://tree.taiga.io/project/penpot/task/8355)) and `tab-switcher*` ([Taiga #8518](https://tree.taiga.io/project/penpot/task/8518)).

 - **Storybook** [Taiga #6329](https://tree.taiga.io/project/penpot/us/6329)

@@ -596,11 +656,11 @@ time being.

 ### :sparkles: New features

- Consolidate templates new order and naming  [Taiga #8392](https://tree.taiga.io/project/penpot/task/8392)
+- Consolidate templates new order and naming [Taiga #8392](https://tree.taiga.io/project/penpot/task/8392)

 ### :bug: Bugs fixed

- Fix the “search” label in translations [Taiga #8402](https://tree.taiga.io/project/penpot/issue/8402)
+- Fix the "search" label in translations [Taiga #8402](https://tree.taiga.io/project/penpot/issue/8402)
 - Fix pencil loader [Taiga #8348](https://tree.taiga.io/project/penpot/issue/8348)
 - Fix several issues on the OIDC.
 - Fix regression on the `email-verification` flag [Taiga #8398](https://tree.taiga.io/project/penpot/issue/8398)
@@ -680,22 +740,21 @@ time being.
 - Fix color palette sorting [Taiga #7458](https://tree.taiga.io/project/penpot/issue/7458)
 - Fix style scoping problem with imported SVG [Taiga #7671](https://tree.taiga.io/project/penpot/issue/7671)

-
 ## 2.0.1

 ### :bug: Bugs fixed

 - Fix different issues related to components v2 migrations including [Github #4443](https://github.com/penpot/penpot/issues/4443)

-
 ## 2.0.0 - I Just Can't Get Enough

 ### :rocket: Epics and highlights
+
 - Grid CSS layout [Taiga #4915](https://tree.taiga.io/project/penpot/epic/4915)
 - UI redesign [Taiga #4958](https://tree.taiga.io/project/penpot/epic/4958)
 - New components System [Taiga #2662](https://tree.taiga.io/project/penpot/epic/2662)
 - Swap components [Taiga #1331](https://tree.taiga.io/project/penpot/us/1331)
- Images as fill  [Taiga #2983](https://tree.taiga.io/project/penpot/us/2983)
+- Images as fill [Taiga #2983](https://tree.taiga.io/project/penpot/us/2983)
 - HTML code generation [Taiga #5277](https://tree.taiga.io/project/penpot/us/5277)
 - Light and dark themes [Taiga #2287](https://tree.taiga.io/project/penpot/us/2287)

@@ -704,9 +763,9 @@ time being.
 - New strokes default to inside border [Taiga #6847](https://tree.taiga.io/project/penpot/issue/6847)
 - Change default z ordering on layers in flex layout. The previous behavior was inconsistent with how HTML works and we changed it to be more consistent. Previous layers that overlapped could be hidden, the fastest way to fix this is changing the z-index property but a better way is to change the order of your layers.

-
 ### :heart: Community contributions (Thank you!)
- New Hausa, Yoruba and Igbo translations and  update translation files (by All For Tech Empowerment Foundation) [Taiga #6950](https://tree.taiga.io/project/penpot/us/6950), [Taiga #6534](https://tree.taiga.io/project/penpot/us/6534)
+
+- New Hausa, Yoruba and Igbo translations and update translation files (by All For Tech Empowerment Foundation) [Taiga #6950](https://tree.taiga.io/project/penpot/us/6950), [Taiga #6534](https://tree.taiga.io/project/penpot/us/6534)
 - Hide bounding-box when editing shape (by @VasilevsVV) [#3930](https://github.com/penpot/penpot/pull/3930)
 - CTRL + "+" to zoom into canvas instead of browser (by @audriu) [#3848](https://github.com/penpot/penpot/pull/3848)
 - Add dev deps.edn in the project root (by @PEZ) [#3794](https://github.com/penpot/penpot/pull/3794)
@@ -715,6 +774,7 @@ time being.
 - Typo (by StephanEggermont) [#157](https://github.com/penpot/penpot-docs/pull/157)

 ### :sparkles: New features
+
 - Send comments with Ctrl+Enter / Cmd + Enter [Taiga #6085](https://tree.taiga.io/project/penpot/issue/6085)
 - Select through stroke only rectangle [Taiga #5484](https://tree.taiga.io/project/penpot/issue/5484)
 - Stroke default position [Taiga #6847](https://tree.taiga.io/project/penpot/issue/6847)
@@ -782,6 +842,7 @@ time being.
 - [REDESIGN] Onboarding slides [Taiga #6678](https://tree.taiga.io/project/penpot/us/6678)

 ### :bug: Bugs fixed
+
 - Fix pixelated thumbnails [Github #3681](https://github.com/penpot/penpot/issues/3681), [Github #3661](https://github.com/penpot/penpot/issues/3661)
 - Fix problem with not applying colors to boards [Github #3941](https://github.com/penpot/penpot/issues/3941)
 - Fix problem with path editor undoing changes [Github #3998](https://github.com/penpot/penpot/issues/3998)
@@ -790,7 +851,7 @@ time being.
 - Selecting from Color Palette does not work for board when there is no existing fill [Taiga #6464](https://tree.taiga.io/project/penpot/issue/6464)
 - Color thumbnails are consistently rounded in the inspect code mode [Taiga #5886](https://tree.taiga.io/project/penpot/issue/5886)
 - Adding vector path points before first point of existing open path not working [Taiga #6593](https://tree.taiga.io/project/penpot/issue/6593)
- Some image formats include the extension when importing  [Taiga #5485](https://tree.taiga.io/project/penpot/issue/5485)
+- Some image formats include the extension when importing [Taiga #5485](https://tree.taiga.io/project/penpot/issue/5485)
 - Gradient color tool doesn't work properly with flipped items [Taiga #6485](https://tree.taiga.io/project/penpot/issue/6485)
 - [TEXT] Align options are not shown when several text are selected [Taiga #5948](https://tree.taiga.io/project/penpot/issue/5948)
 - [VIEW MODE] Comments not working properly on multiple pages [Taiga #6281](https://tree.taiga.io/project/penpot/issue/6281)
@@ -834,7 +895,7 @@ time being.

 ### :sparkles: New features

- Improve selected colors [Taiga #5805]( https://tree.taiga.io/project/penpot/us/5805)
+- Improve selected colors [Taiga #5805](https://tree.taiga.io/project/penpot/us/5805)

 ### :bug: Bugs fixed

@@ -869,7 +930,6 @@ time being.
 - Fix deleted pages comments shown in right sidebar [Taiga #5648](https://tree.taiga.io/project/penpot/us/5648)
 - Fix tooltip on toggle visibility and toggle lock buttons [Taiga #5141](https://tree.taiga.io/project/penpot/issue/5141)

-
 ## 1.19.1

 ### :bug: Bugs fixed
@@ -983,7 +1043,6 @@ time being.

 - Update google fonts catalog (at 2023/07/06) [Taiga #5592](https://tree.taiga.io/project/penpot/issue/5592)

-
 ### :heart: Community contributions by (Thank you!)

 - Update Typography palette order (by @akshay-gupta7) [Github #3156](https://github.com/penpot/penpot/pull/3156)
@@ -1137,12 +1196,14 @@ time being.
 - Fix problem with opacity in imported SVG's [Taiga #4923](https://tree.taiga.io/project/penpot/issue/4923)

 ### :heart: Community contributions by (Thank you!)
+
 - To @ondrejkonec: for contributing to the code with:
 - Refactor CSS variables [Github #2948](https://github.com/penpot/penpot/pull/2948)

 ## 1.17.3

 ### :bug: Bugs fixed
+
 - Fix copy and paste very nested inside itself [Taiga #4848](https://tree.taiga.io/project/penpot/issue/4848)
 - Fix custom fonts not rendered correctly [Taiga #4874](https://tree.taiga.io/project/penpot/issue/4874)
 - Fix problem with shadows and blur on multiple selection
@@ -1175,6 +1236,7 @@ time being.
 ## 1.17.1

 ### :bug: Bugs fixed
+
 - Fix components groups items show the component name in list mode [Taiga #4770](https://tree.taiga.io/project/penpot/issue/4770)
 - Fix typing CMD+Z on MacOS turns the cursor into a Zoom cursor [Taiga #4778](https://tree.taiga.io/project/penpot/issue/4778)
 - Fix white space on small screens [Taiga #4774](https://tree.taiga.io/project/penpot/issue/4774)
@@ -1289,7 +1351,7 @@ time being.

 ### :boom: Breaking changes & Deprecations

- Removed the support for v2 internal file data blob format.  This
+- Removed the support for v2 internal file data blob format. This
  version has never been documented nor set as default value so
  technically this is not a breaking change because we are removing
  a "private API".
@@ -1394,7 +1456,6 @@ time being.
 - Fix when ungrouping, the items previously grouped should ALWAYS remain selected [Taiga #4064](https://tree.taiga.io/project/penpot/issue/4064)
 - Change shortcut for "Clear undo" [#2219](https://github.com/penpot/penpot/issues/2219)

-
 ## 1.15.2-beta

 ### :bug: Bugs fixed
@@ -1478,6 +1539,7 @@ time being.
 - Fix bringing complete file data when launching the export dialog [Taiga #4006](https://tree.taiga.io/project/penpot/issue/4006)

 ### :arrow_up: Deps updates
+
 ### :heart: Community contributions by (Thank you!)

 ## 1.14.2-beta
@@ -1518,10 +1580,10 @@ time being.
 - Prototype connection should be under the rules [Taiga #3384](https://tree.taiga.io/project/penpot/issue/3384)
 - Fix problem with empty text boxes events [Taiga #3627](https://tree.taiga.io/project/penpot/issue/3627)

-
 ## 1.13.5-beta

 ### :bug: Bugs fixed
+
 - Fix orientation artboard preset not working with differently sized artboards [Taiga #3548](https://tree.taiga.io/project/penpot/issue/3548)
 - Fix background on export arboards [Taiga #1991](https://tree.taiga.io/project/penpot/issue/1991)

@@ -1665,6 +1727,7 @@ time being.
 - Fix problem when resizing a group with texts with auto-width/height [#3171](https://tree.taiga.io/project/penpot/issue/3171)

 ### :arrow_up: Deps updates
+
 ### :heart: Community contributions by (Thank you!)

 ## 1.12.4-beta
@@ -1682,7 +1745,7 @@ time being.
 ### :bug: Bugs fixed

 - Fix issue with shift+select to deselect shapes [Taiga #3154](https://tree.taiga.io/project/penpot/issue/3154)
- Fix issue with drag-select shapes  [Taiga #3165](https://tree.taiga.io/project/penpot/issue/3165)
+- Fix issue with drag-select shapes [Taiga #3165](https://tree.taiga.io/project/penpot/issue/3165)
 - Fix issue on password persistence after registration process on private instances

 ## 1.12.2-beta
@@ -1700,7 +1763,6 @@ time being.
 - Fix length of names in sidebar [Taiga #2962](https://tree.taiga.io/project/penpot/issue/2962)
 - Fix issues on loki integration

-
 ## 1.12.0-beta

 ### :boom: Breaking changes
--- a/backend/resources/app/email/change-email/en.html
+++ b/backend/resources/app/email/change-email/en.html
@@ -193,7 +193,7 @@
                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                      <div
                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        Click to the link below to confirm the change:</div>
+                        Click the link below to confirm the change.</div>
                    </td>
                  </tr>
                  <tr>
@@ -217,8 +217,7 @@
                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                      <div
                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        If you received this email by mistake, please consider changing your password for security
-                        reasons.</div>
+                        If you did not request this change, consider changing your password for security reasons.</div>
                    </td>
                  </tr>
                  <tr>
--- a/backend/resources/app/email/change-email/en.txt
+++ b/backend/resources/app/email/change-email/en.txt
@@ -2,12 +2,11 @@ Hello {{name|abbreviate:25}}!

 We received a request to change your current email to {{ pending-email }}.

-Click to the link below to confirm the change:
+Click the link below to confirm the change.

 {{ public-uri }}/#/auth/verify-token?token={{token}}

-If you received this email by mistake, please consider changing your password
-for security reasons.
+If you did not request this change, consider changing your password for security reasons.

 Enjoy!
 The Penpot team.
--- a/backend/resources/app/templates/debug.tmpl
+++ b/backend/resources/app/templates/debug.tmpl
@@ -17,38 +17,6 @@ Debug Main Page
      <desc><a href="/dbg/error">CLICK HERE TO SEE THE ERROR REPORTS</a> </desc>
    </fieldset>

-    <fieldset>
-      <legend>Download file data:</legend>
-      <desc>Given an FILE-ID, downloads the file data as file. The file data is encoded using transit.</desc>
-      <form method="get" action="/dbg/file/data">
-        <div class="row">
-          <input type="text" style="width:300px" name="file-id" placeholder="file-id" />
-        </div>
-        <div class="row">
-          <input type="submit" name="download" value="Download" />
-          <input type="submit" name="clone" value="Clone" />
-        </div>
-      </form>
-    </fieldset>
-
-    <fieldset>
-      <legend>Upload File Data:</legend>
-      <desc>Create a new file on your draft projects using the file downloaded from the previous section.</desc>
-      <form method="post" enctype="multipart/form-data" action="/dbg/file/data">
-        <div class="row">
-          <input type="file" name="file" value="" />
-        </div>
-        <div class="row">
-          <label>Import with same id?</label>
-          <input type="checkbox" name="reuseid" />
-        </div>
-
-        <div class="row">
-          <input type="submit" value="Upload" />
-        </div>
-      </form>
-    </fieldset>
-
    <fieldset>
      <legend>Profile Management</legend>
      <form method="post" action="/dbg/actions/resend-email-verification">
@@ -81,6 +49,50 @@ Debug Main Page

  </section>

+  <section class="widget">
+
+    <fieldset>
+      <legend>Download RAW file data:</legend>
+      <desc>Given an FILE-ID, downloads the file AS-IS (no validation
+        checks, just exports the file data and related objects in raw)
+
+        <br/>
+        <br/>
+        <b>WARNING: this operation does not performs any checks</b>
+      </desc>
+      <form method="get" action="/dbg/actions/file-raw-export-import">
+        <div class="row">
+          <input type="text" style="width:300px" name="file-id" placeholder="file-id" />
+        </div>
+        <div class="row">
+          <input type="submit" name="download" value="Download" />
+          <input type="submit" name="clone" value="Clone" />
+        </div>
+      </form>
+    </fieldset>
+
+    <fieldset>
+      <legend>Upload File Data:</legend>
+      <desc>Create a new file on your draft projects using the file downloaded from the previous section.
+        <br/>
+        <br/>
+        <b>WARNING: this operation does not performs any checks</b>
+      </desc>
+      <form method="post" enctype="multipart/form-data" action="/dbg/actions/file-raw-export-import">
+        <div class="row">
+          <input type="file" name="file" value="" />
+        </div>
+        <div class="row">
+          <label>Import with same id?</label>
+          <input type="checkbox" name="reuseid" />
+        </div>
+
+        <div class="row">
+          <input type="submit" value="Upload" />
+        </div>
+      </form>
+    </fieldset>
+  </section>
  <section class="widget">
    <fieldset>
      <legend>Export binfile:</legend>
@@ -88,7 +100,7 @@ Debug Main Page
      the related libraries in a single custom formatted binary
      file.</desc>

-      <form method="get" action="/dbg/file/export">
+      <form method="get" action="/dbg/actions/file-export">
        <div class="row set-of-inputs">
          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
@@ -116,7 +128,7 @@ Debug Main Page
      <legend>Import binfile:</legend>
      <desc>Import penpot file in binary format.</desc>

-      <form method="post" enctype="multipart/form-data" action="/dbg/file/import">
+      <form method="post" enctype="multipart/form-data" action="/dbg/actions/file-import">
        <div class="row">
          <input type="file" name="file" value="" />
        </div>
@@ -130,79 +142,27 @@ Debug Main Page

  <section class="widget">
    <fieldset>
-      <legend>Reset file version</legend>
-      <desc>Allows reset file data version to a specific number/</desc>
-
-      <form method="post" action="/dbg/actions/reset-file-version">
-        <div class="row">
-          <input type="text" style="width:300px" name="file-id" placeholder="file-id" />
-        </div>
-        <div class="row">
-          <input type="number" style="width:100px" name="version" placeholder="version" value="32" />
-        </div>
-
-        <div class="row">
-          <label for="force-version">Are you sure?</label>
-          <input id="force-version" type="checkbox" name="force" />
-          <br />
-          <small>
-            This is a just a security double check for prevent non intentional submits.
-          </small>
-        </div>
-
-
-        <div class="row">
-          <input type="submit" value="Submit" />
-        </div>
-      </form>
-    </fieldset>
-  </section>
-
-  <section class="widget">
-    <h2>Feature Flags</h2>
-    <fieldset>
-      <legend>Enable</legend>
+      <legend>Feature Flags for Team</legend>
      <desc>Add a feature flag to a team</desc>
-      <form method="post" action="/dbg/actions/add-team-feature">
+      <form method="post" action="/dbg/actions/handle-team-features">
        <div class="row">
          <input type="text" style="width:300px" name="team-id" placeholder="team-id" />
        </div>
        <div class="row">
-          <input type="text" style="width:100px" name="feature" placeholder="feature" value="" />
+          <select type="text" style="width:100px" name="feature">
+            {% for feature in supported-features %}
+              <option value="{{feature}}">{{feature}}</option>
+            {% endfor %}
+          </select>
        </div>

        <div class="row">
-          <label for="check-feature">Skip feature check</label>
-          <input id="check-feature" type="checkbox" name="skip-check" />
-          <br />
-          <small>
-            Do not check if the feature is supported
-          </small>
-        </div>
-
-        <div class="row">
-          <label for="force-version">Are you sure?</label>
-          <input id="force-version" type="checkbox" name="force" />
-          <br />
-          <small>
-            This is a just a security double check for prevent non intentional submits.
-          </small>
-        </div>
-
-        <div class="row">
-          <input type="submit" value="Submit" />
-        </div>
-      </form>
-    </fieldset>
-    <fieldset>
-      <legend>Disable</legend>
-      <desc>Remove a feature flag from a team</desc>
-      <form method="post" action="/dbg/actions/remove-team-feature">
-        <div class="row">
-          <input type="text" style="width:300px" name="team-id" placeholder="team-id" />
-        </div>
-        <div class="row">
-          <input type="text" style="width:100px" name="feature" placeholder="feature" value="" />
+          <select style="width:100px" name="action">
+            <option value="">Action...</option>
+            <option value="show">Show</option>
+            <option value="enable">Enable</option>
+            <option value="disable">Disable</option>
+          </select>
        </div>

        <div class="row">
--- a/backend/resources/app/templates/error-list.tmpl
+++ b/backend/resources/app/templates/error-list.tmpl
@@ -7,7 +7,9 @@ penpot - error list
 {% block content %}
 <nav>
  <div class="title">
-    <h1>Error reports (last 200)</h1>
+    <h1>Error reports (last 200)
+      <a href="/dbg">[GO BACK]</a>
+    </h1>
  </div>
 </nav>
 <main class="horizontal-list">
--- a/backend/scripts/manage.py
+++ b/backend/scripts/manage.py
@@ -71,19 +71,27 @@ def run_cmd(params):
        print("EXC:", str(cause))
        sys.exit(-2)

-def create_profile(fullname, email, password):
+def create_profile(fullname, email, password, skip_tutorial=False, skip_walkthrough=False):
+    props = {}
+    if skip_tutorial:
+        props["viewed-tutorial?"] = True
+    if skip_walkthrough:
+        props["viewed-walkthrough?"] = True
+
    params = {
        "cmd": "create-profile",
        "params": {
            "fullname": fullname,
            "email": email,
-            "password": password
+            "password": password,
+            **props
        }
    }

    res = run_cmd(params)
    print(f"Created: {res['email']} / {res['id']}")

+
 def update_profile(email, fullname, password, is_active):
    params = {
        "cmd": "update-profile",
@@ -170,6 +178,8 @@ parser.add_argument("-n", "--fullname", help="fullname", action="store")
 parser.add_argument("-e", "--email", help="email", action="store")
 parser.add_argument("-p", "--password", help="password", action="store")
 parser.add_argument("-c", "--connect", help="connect to PREPL", action="store", default="tcp://localhost:6063")
+parser.add_argument("--skip-tutorial", help="mark tutorial as viewed", action="store_true")
+parser.add_argument("--skip-walkthrough", help="mark walkthrough as viewed", action="store_true")

 args = parser.parse_args()

--- a/backend/src/app/binfile/common.clj
+++ b/backend/src/app/binfile/common.clj
@@ -155,7 +155,7 @@
 (defn decode-file
  "A general purpose file decoding function that resolves all external
  pointers, run migrations and return plain vanilla file map"
-  [cfg {:keys [id] :as file}]
+  [cfg {:keys [id] :as file} & {:keys [migrate?] :or {migrate? true}}]
  (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)]
    (let [file (->> file
                    (feat.fmigr/resolve-applied-migrations cfg)
@@ -168,7 +168,7 @@
          (update :data feat.fdata/process-pointers deref)
          (update :data feat.fdata/process-objects (partial into {}))
          (update :data assoc :id id)
-          (fmg/migrate-file libs)))))
+          (cond-> migrate? (fmg/migrate-file libs))))))

 (defn get-file
  "Get file, resolve all features and apply migrations.
--- a/backend/src/app/features/file_migrations.clj
+++ b/backend/src/app/features/file_migrations.clj
@@ -37,3 +37,9 @@
                         {::db/return-keys false
                          ::sql/on-conflict-do-nothing true})
        (db/get-update-count))))
+
+(defn reset-migrations!
+  "Replace file migrations"
+  [conn {:keys [id] :as file}]
+  (db/delete! conn :file-migration {:file-id id})
+  (upsert-migrations! conn file))
--- a/backend/src/app/http/debug.clj
+++ b/backend/src/app/http/debug.clj
@@ -15,9 +15,11 @@
   [app.common.features :as cfeat]
   [app.common.logging :as l]
   [app.common.pprint :as pp]
+   [app.common.transit :as t]
   [app.common.uuid :as uuid]
   [app.config :as cf]
   [app.db :as db]
+   [app.features.file-migrations :as feat.fmig]
   [app.http.session :as session]
   [app.rpc.commands.auth :as auth]
   [app.rpc.commands.files-create :refer [create-file]]
@@ -50,26 +52,26 @@
  {::yres/status  200
   ::yres/headers {"content-type" "text/html"}
   ::yres/body    (-> (io/resource "app/templates/debug.tmpl")
-                      (tmpl/render {:version (:full cf/version)}))})
+                      (tmpl/render {:version (:full cf/version)
+                                    :supported-features cfeat/supported-features}))})

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; FILE CHANGES
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-(defn prepare-response
-  [body]
-  (let [headers {"content-type" "application/transit+json"}]
-    {::yres/status 200
-     ::yres/body body
-     ::yres/headers headers}))
+(defn- get-resolved-file
+  [cfg file-id]
+  (some-> (bfc/get-file cfg file-id :migrate? false)
+          (update :data blob/encode)))

-(defn prepare-download-response
-  [body filename]
-  (let [headers {"content-disposition" (str "attachment; filename=" filename)
-                 "content-type" "application/octet-stream"}]
-    {::yres/status 200
-     ::yres/body body
-     ::yres/headers headers}))
+(defn prepare-download
+  [file filename]
+  {::yres/status 200
+   ::yres/headers
+   {"content-disposition" (str "attachment; filename=" filename ".json")
+    "content-type" "application/octet-stream"}
+   ::yres/body
+   (t/encode file {:type :json-verbose})})

 (def sql:retrieve-range-of-changes
  "select revn, changes from file_change where file_id=? and revn >= ? and revn <= ? order by revn")
@@ -77,45 +79,51 @@
 (def sql:retrieve-single-change
  "select revn, changes, data from file_change where file_id=? and revn = ?")

-(defn- retrieve-file-data
-  [{:keys [::db/pool]} {:keys [params ::session/profile-id] :as request}]
+(defn- download-file-data
+  [cfg {:keys [params ::session/profile-id] :as request}]
  (let [file-id  (some-> params :file-id parse-uuid)
-        revn     (some-> params :revn parse-long)
        filename (str file-id)]

    (when-not file-id
      (ex/raise :type :validation
                :code :missing-arguments))

-    (let [data (if (integer? revn)
-                 (some-> (db/exec-one! pool [sql:retrieve-single-change file-id revn]) :data)
-                 (some-> (db/get-by-id pool :file file-id) :data))]
-
-      (when-not data
-        (ex/raise :type :not-found
-                  :code :enpty-data
-                  :hint "empty response"))
+    (if-let [file (get-resolved-file cfg file-id)]
      (cond
        (contains? params :download)
-        (prepare-download-response data filename)
+        (prepare-download file filename)

        (contains? params :clone)
-        (let [profile    (profile/get-profile pool profile-id)
-              project-id (:default-project-id profile)]
+        (db/tx-run! cfg
+                    (fn [{:keys [::db/conn] :as cfg}]
+                      (let [profile    (profile/get-profile conn profile-id)
+                            project-id (:default-project-id profile)
+                            file       (-> (create-file cfg {:id (uuid/next)
+                                                             :name (str "Cloned: " (:name file))
+                                                             :features (:features file)
+                                                             :project-id project-id
+                                                             :profile-id profile-id})
+                                           (assoc :data (:data file))
+                                           (assoc :migrations (:migrations file)))]

-          (db/run! pool (fn [{:keys [::db/conn] :as cfg}]
-                          (create-file cfg {:id file-id
-                                            :name (str "Cloned file: " filename)
-                                            :project-id project-id
-                                            :profile-id profile-id})
-                          (db/update! conn :file
-                                      {:data data}
-                                      {:id file-id})
-                          {::yres/status 201
-                           ::yres/body "OK CREATED"})))
+                        (feat.fmig/reset-migrations! conn file)
+                        (db/update! conn :file
+                                    {:data (:data file)}
+                                    {:id (:id file)}
+                                    {::db/return-keys false})
+
+
+                        {::yres/status 201
+                         ::yres/body "OK CLONED"})))

        :else
-        (prepare-response (blob/decode data))))))
+        (ex/raise :type :validation
+                  :code :invalid-params
+                  :hint "invalid button"))
+
+      (ex/raise :type :not-found
+                :code :enpty-data
+                :hint "empty response"))))

 (defn- is-file-exists?
  [pool id]
@@ -123,81 +131,61 @@
    (-> (db/exec-one! pool [sql id]) :exists)))

 (defn- upload-file-data
-  [{:keys [::db/pool]} {:keys [::session/profile-id params] :as request}]
+  [{:keys [::db/pool] :as cfg} {:keys [::session/profile-id params] :as request}]
  (let [profile    (profile/get-profile pool profile-id)
        project-id (:default-project-id profile)
-        data       (some-> params :file :path io/read*)]
+        file       (some-> params :file :path io/read* t/decode)]

-    (if (and data project-id)
-      (let [fname     (str "Imported file *: " (dt/now))
+    (if (and file project-id)
+      (let [fname     (str "Imported: " (:name file) "(" (dt/now) ")")
            reuse-id? (contains? params :reuseid)
            file-id   (or (and reuse-id? (ex/ignoring (-> params :file :filename parse-uuid)))
                          (uuid/next))]

        (if (and reuse-id? file-id
                 (is-file-exists? pool file-id))
-          (do
-            (db/update! pool :file
-                        {:data data
-                         :deleted-at nil}
-                        {:id file-id})
-            {::yres/status 200
-             ::yres/body "OK UPDATED"})
+          (db/tx-run! cfg
+                      (fn [{:keys [::db/conn] :as cfg}]
+                        (db/update! conn :file
+                                    {:data (:data file)
+                                     :features (into-array (:features file))
+                                     :deleted-at nil}
+                                    {:id file-id}
+                                    {::db/return-keys false})
+                        (feat.fmig/reset-migrations! conn file)
+                        {::yres/status 200
+                         ::yres/body "OK UPDATED"}))
+
+          (db/tx-run! cfg
+                      (fn [{:keys [::db/conn] :as cfg}]
+                        (let [file (-> (create-file cfg {:id file-id
+                                                         :name fname
+                                                         :features (:features file)
+                                                         :project-id project-id
+                                                         :profile-id profile-id})
+                                       (assoc :data (:data file))
+                                       (assoc :migrations (:migrations file)))]

-          (db/run! pool (fn [{:keys [::db/conn] :as cfg}]
-                          (create-file cfg {:id file-id
-                                            :name fname
-                                            :project-id project-id
-                                            :profile-id profile-id})
                          (db/update! conn :file
-                                      {:data data}
-                                      {:id file-id})
+                                      {:data (:data file)}
+                                      {:id file-id}
+                                      {::db/return-keys false})
+                          (feat.fmig/reset-migrations! conn file)
                          {::yres/status 201
-                           ::yres/body "OK CREATED"}))))
+                           ::yres/body "OK CREATED"})))))

-      {::yres/status 500
-       ::yres/body "ERROR"})))
+      (ex/raise :type :validation
+                :code :invalid-params
+                :hint "invalid file uploaded"))))

-(defn file-data-handler
+(defn raw-export-import-handler
  [cfg request]
  (case (yreq/method request)
-    :get (retrieve-file-data cfg request)
+    :get (download-file-data cfg request)
    :post (upload-file-data cfg request)
    (ex/raise :type :http
              :code :method-not-found)))

-(defn file-changes-handler
-  [{:keys [::db/pool]} {:keys [params] :as request}]
-  (letfn [(retrieve-changes [file-id revn]
-            (if (str/includes? revn ":")
-              (let [[start end] (->> (str/split revn #":")
-                                     (map str/trim)
-                                     (map parse-long))]
-                (some->> (db/exec! pool [sql:retrieve-range-of-changes file-id start end])
-                         (map :changes)
-                         (map blob/decode)
-                         (mapcat identity)
-                         (vec)))
-
-              (if-let [revn (parse-long revn)]
-                (let [item (db/exec-one! pool [sql:retrieve-single-change file-id revn])]
-                  (some-> item :changes blob/decode vec))
-                (ex/raise :type :validation :code :invalid-arguments))))]
-
-    (let [file-id  (some-> params :id parse-uuid)
-          revn     (or (some-> params :revn parse-long) "latest")
-          filename (str file-id)]
-
-      (when (or (not file-id) (not revn))
-        (ex/raise :type :validation
-                  :code :invalid-arguments
-                  :hint "missing arguments"))
-
-      (let [data (retrieve-changes file-id revn)]
-        (if (contains? params :download)
-          (prepare-download-response data filename)
-          (prepare-response data))))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; ERROR BROWSER
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -430,49 +418,49 @@
     ::yres/body    "OK"}))


-(defn- add-team-feature
-  [{:keys [params] :as request}]
-  (let [team-id (some-> params :team-id d/parse-uuid)
-        feature (some-> params :feature str)
+(defn- handle-team-features
+  [cfg {:keys [params] :as request}]
+  (let [team-id    (some-> params :team-id d/parse-uuid)
+        feature    (some-> params :feature str)
+        action     (some-> params :action)
        skip-check (contains? params :skip-check)]

-    (when-not (contains? params :force)
-      (ex/raise :type :validation
-                :code :missing-force
-                :hint "missing force checkbox"))
-
    (when (nil? team-id)
      (ex/raise :type :validation
                :code :invalid-team-id
                :hint "provided invalid team id"))

-    (srepl/enable-team-feature! team-id feature :skip-check skip-check)
+    (if (= action "show")
+      (let [team (db/run! cfg teams/get-team-info {:id team-id})]
+        {::yres/status 200
+         ::yres/headers {"content-type" "text/plain"}
+         ::yres/body (apply str "Team features:\n"
+                            (->> (:features team)
+                                 (map (fn [feature]
+                                        (str "- " feature "\n")))))})

-    {::yres/status  200
-     ::yres/headers {"content-type" "text/plain"}
-     ::yres/body    "OK"}))
+      (do
+        (when-not (contains? params :force)
+          (ex/raise :type :validation
+                    :code :missing-force
+                    :hint "missing force checkbox"))

-(defn- remove-team-feature
-  [{:keys [params] :as request}]
-  (let [team-id   (some-> params :team-id d/parse-uuid)
-        feature   (some-> params :feature str)
-        skip-check (contains? params :skip-check)]
+        (cond
+          (= action "enable")
+          (srepl/enable-team-feature! team-id feature :skip-check skip-check)

-    (when-not (contains? params :force)
-      (ex/raise :type :validation
-                :code :missing-force
-                :hint "missing force checkbox"))
+          (= action "disable")
+          (srepl/disable-team-feature! team-id feature :skip-check skip-check)

-    (when (nil? team-id)
-      (ex/raise :type :validation
-                :code :invalid-team-id
-                :hint "provided invalid team id"))
+          :else
+          (ex/raise :type :validation
+                    :code :invalid-action
+                    :hint (str "invalid action: " action)))

-    (srepl/disable-team-feature! team-id feature :skip-check skip-check)

-    {::yres/status  200
-     ::yres/headers {"content-type" "text/plain"}
-     ::yres/body    "OK"}))
+        {::yres/status  200
+         ::yres/headers {"content-type" "text/plain"}
+         ::yres/body    "OK"}))))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; OTHER SMALL VIEWS/HANDLERS
@@ -525,6 +513,25 @@
           (ex/raise :type :authentication
                     :code :only-admins-allowed)))))})

+(def errors
+  (letfn [(handle-error [cause]
+            (when-let [data (ex-data cause)]
+              (when (= :validation (:type data))
+                (str "Error: " (or (:hint data) (ex-message cause)) "\n"))))]
+    {:name ::errors
+     :compile
+     (fn [& _params]
+       (fn [handler]
+         (fn [request]
+           (try
+             (handler request)
+             (catch Throwable cause
+               (let [body (or (handle-error cause)
+                              (ex/format-throwable cause))]
+                 {::yres/status 400
+                  ::yres/headers {"content-type" "text/plain"}
+                  ::yres/body body}))))))}))
+
 (defmethod ig/assert-key ::routes
  [_ params]
  (assert (db/pool? (::db/pool params)) "expected a valid database pool")
@@ -540,15 +547,14 @@
    ["/changelog" {:handler (partial changelog-handler cfg)}]
    ["/error/:id" {:handler (partial error-handler cfg)}]
    ["/error" {:handler (partial error-list-handler cfg)}]
-    ["/actions/resend-email-verification"
-     {:handler (partial resend-email-notification cfg)}]
-    ["/actions/reset-file-version"
-     {:handler (partial reset-file-version cfg)}]
-    ["/actions/add-team-feature"
-     {:handler (partial add-team-feature)}]
-    ["/actions/remove-team-feature"
-     {:handler (partial remove-team-feature)}]
-    ["/file/export" {:handler (partial export-handler cfg)}]
-    ["/file/import" {:handler (partial import-handler cfg)}]
-    ["/file/data" {:handler (partial file-data-handler cfg)}]
-    ["/file/changes" {:handler (partial file-changes-handler cfg)}]]])
+    ["/actions" {:middleware [[errors]]}
+     ["/resend-email-verification"
+      {:handler (partial resend-email-notification cfg)}]
+     ["/reset-file-version"
+      {:handler (partial reset-file-version cfg)}]
+     ["/handle-team-features"
+      {:handler (partial handle-team-features cfg)}]
+     ["/file-export" {:handler (partial export-handler cfg)}]
+     ["/file-import" {:handler (partial import-handler cfg)}]
+     ["/file-raw-export-import" {:handler (partial raw-export-import-handler cfg)}]]]])
+
--- a/backend/src/app/media.clj
+++ b/backend/src/app/media.clj
@@ -10,6 +10,7 @@
   [app.common.data :as d]
   [app.common.data.macros :as dm]
   [app.common.exceptions :as ex]
+   [app.common.logging :as l]
   [app.common.media :as cm]
   [app.common.schema :as sm]
   [app.common.schema.openapi :as-alias oapi]
@@ -21,6 +22,7 @@
   [buddy.core.bytes :as bb]
   [buddy.core.codecs :as bc]
   [clojure.java.shell :as sh]
+   [clojure.string]
   [clojure.xml :as xml]
   [cuerdas.core :as str]
   [datoteka.fs :as fs]
@@ -215,6 +217,23 @@
                 {:width (int width)
                  :height (int height)})))]))

+(defn- get-dimensions-with-orientation [^String path]
+  ;; Image magick doesn't give info about exif rotation so we use the identify command
+  ;; If we are processing an animated gif we use the first frame with -scene 0
+  (let [dim-result (sh/sh "identify" "-format" "%w %h\n" path)
+        orient-result (sh/sh "identify" "-format" "%[EXIF:Orientation]\n" path)]
+    (if (and (= 0 (:exit dim-result))
+             (= 0 (:exit orient-result)))
+      (let [[w h] (-> (:out dim-result)
+                      str/trim
+                      (clojure.string/split #"\s+")
+                      (->> (mapv #(Integer/parseInt %))))
+            orientation (-> orient-result :out str/trim)]
+        (case orientation
+          ("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
+          {:width w :height h}))         ; Normal or unknown orientation
+      nil)))
+
 (defmethod process :info
  [{:keys [input] :as params}]
  (let [{:keys [path mtype] :as input} (check-input input)]
@@ -234,13 +253,17 @@
                    :code :media-type-mismatch
                    :hint (str "Seems like you are uploading a file whose content does not match the extension."
                               "Expected: " mtype ". Got: " mtype')))
-        ;; For an animated GIF, getImageWidth/Height returns the delta size of one frame (if no frame given
-        ;; it returns size of the last one), whereas getPageWidth/Height always return the full size of
-        ;; any frame.
-        (assoc input
-               :width  (.getPageWidth instance)
-               :height (.getPageHeight instance)
-               :ts (dt/now))))))
+        (let [{:keys [width height]}
+              (or (get-dimensions-with-orientation (str path))
+                  (do
+                    (l/warn "Failed to read image dimensions with orientation; falling back to im4java"
+                            {:path path})
+                    {:width  (.getPageWidth instance)
+                     :height (.getPageHeight instance)}))]
+          (assoc input
+                 :width  width
+                 :height height
+                 :ts (dt/now)))))))

 (defmethod process-error org.im4java.core.InfoException
  [error]
--- a/backend/src/app/rpc/commands/files_create.clj
+++ b/backend/src/app/rpc/commands/files_create.clj
@@ -7,7 +7,6 @@
 (ns app.rpc.commands.files-create
  (:require
   [app.binfile.common :as bfc]
-   [app.common.data.macros :as dm]
   [app.common.features :as cfeat]
   [app.common.schema :as sm]
   [app.common.types.file :as ctf]
@@ -41,9 +40,7 @@
    :or {is-shared false revn 0 create-page true}
    :as params}]

-  (dm/assert!
-   "expected a valid connection"
-   (db/connection? conn))
+  (assert (db/connection? conn) "expected a valid connection")

  (binding [pmap/*tracked* (pmap/create-tracked)
            cfeat/*current* features]
--- a/backend/src/app/rpc/commands/teams.clj
+++ b/backend/src/app/rpc/commands/teams.clj
@@ -78,9 +78,10 @@

 (defn decode-row
  [{:keys [features subscription] :as row}]
-  (cond-> row
-    (some? features) (assoc :features (db/decode-pgarray features #{}))
-    (some? subscription) (assoc :subscription (db/decode-transit-pgobject subscription))))
+  (when row
+    (cond-> row
+      (some? features) (assoc :features (db/decode-pgarray features #{}))
+      (some? subscription) (assoc :subscription (db/decode-transit-pgobject subscription)))))

 ;; FIXME: move

@@ -139,7 +140,8 @@
            '~:status', CASE COALESCE(p.props->'~:subscription'->>'~:type', 'professional')
                          WHEN 'professional' THEN 'active'
                          ELSE COALESCE(p.props->'~:subscription'->>'~:status', 'incomplete')
-                       END
+                       END,
+            '~:seats', p.props->'~:subscription'->'~:quantity'
          ) AS subscription
     FROM team_profile_rel AS tp
     JOIN team AS t ON (t.id = tp.team_id)
@@ -192,7 +194,8 @@

 (def ^:private sql:get-owned-teams
  "SELECT t.id, t.name,
-          (SELECT count(*) FROM team_profile_rel WHERE team_id=t.id) AS total_members
+          (SELECT count(*) FROM team_profile_rel WHERE team_id=t.id) AS total_members,
+          (SELECT count(*) FROM team_profile_rel WHERE team_id=t.id AND can_edit=true) AS total_editors
     FROM team AS t
     JOIN team_profile_rel AS tpr ON (tpr.team_id = t.id)
    WHERE t.is_default IS false
@@ -459,11 +462,12 @@

 ;; --- COMMAND QUERY: get-team-info

-(defn- get-team-info
+(defn get-team-info
  [{:keys [::db/conn] :as cfg} {:keys [id] :as params}]
-  (db/get* conn :team
-           {:id id}
-           {::sql/columns [:id :is-default]}))
+  (-> (db/get* conn :team
+               {:id id}
+               {::sql/columns [:id :is-default :features]})
+      (decode-row)))

 (sv/defmethod ::get-team-info
  "Retrieve minimal team info by its ID."
--- a/backend/src/app/srepl/cli.clj
+++ b/backend/src/app/srepl/cli.clj
@@ -205,9 +205,8 @@
   [:trial-start [:maybe ::sm/timestamp]]
   [:cancel-at [:maybe ::sm/timestamp]]
   [:canceled-at [:maybe ::sm/timestamp]]
-
-   [:current-period-end ::sm/timestamp]
-   [:current-period-start ::sm/timestamp]
+   [:current-period-end [:maybe ::sm/timestamp]]
+   [:current-period-start [:maybe ::sm/timestamp]]
   [:cancel-at-period-end :boolean]

   [:cancellation-details
--- a/backend/test/backend_tests/rpc_team_test.clj
+++ b/backend/test/backend_tests/rpc_team_test.clj
@@ -460,11 +460,14 @@
                  ::rpc/profile-id (:id profile1)}
        out      (th/command! params)]

+    ;; (th/print-result! out)
    (t/is (th/success? out))
-    (let [result (:result out)]
+    (let [[item1 :as result] (:result out)]
      (t/is (= 1 (count result)))
-      (t/is (= (:id team1) (-> result first :id)))
-      (t/is (not= (:default-team-id profile1) (-> result first :id))))))
+      (t/is (= (:id team1) (:id item1)))
+      (t/is (= 1 (:total-members item1)))
+      (t/is (= 1 (:total-editors item1)))
+      (t/is (not= (:default-team-id profile1) (:id item1))))))


 (t/deftest team-deletion-1
--- a/common/src/app/common/attrs.cljc
+++ b/common/src/app/common/attrs.cljc
@@ -8,7 +8,7 @@
  (:require
   [app.common.geom.shapes :as gsh]
   [app.common.math :as mth]
-   [app.common.text :as txt]))
+   [app.common.types.text :as txt]))

 (defn- get-attr
  [obj attr]
--- a/common/src/app/common/buffer.cljc
+++ b/common/src/app/common/buffer.cljc
@@ -74,6 +74,13 @@
    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
      `(.put ~target ~offset (unchecked-byte ~value)))))

+(defmacro write-bool
+  [target offset value]
+  (if (:ns &env)
+    `(.setInt8 ~target ~offset (if ~value 0x01 0x00) true)
+    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
+      `(.put ~target ~offset (unchecked-byte (if ~value 0x01 0x00))))))
+
 (defmacro write-short
  [target offset value]
  (if (:ns &env)
--- a/common/src/app/common/colors.cljc
+++ b/common/src/app/common/colors.cljc
@@ -349,7 +349,7 @@
        rounded-s (d/format-number (* 100 s) precision)
        rounded-l (d/format-number (* 100 l) precision)
        rounded-a (d/format-number a precision)]
-    (str/concat "" rounded-h ", " rounded-s "%, " rounded-l "%, " rounded-a)))
+    (str/concat "" rounded-h " " rounded-s "% " rounded-l "% / " rounded-a)))

 (defn format-rgba
  [[r g b a]]
--- a/common/src/app/common/data.cljc
+++ b/common/src/app/common/data.cljc
@@ -9,17 +9,16 @@
  data resources."
  (:refer-clojure :exclude [read-string hash-map merge name update-vals
                            parse-double group-by iteration concat mapcat
-                            parse-uuid max min regexp?])
+                            parse-uuid max min regexp? array?])
  #?(:cljs
     (:require-macros [app.common.data]))

  (:require
-   #?(:cljs [cljs.core :as c]
-      :clj [clojure.core :as c])
   #?(:cljs [cljs.reader :as r]
      :clj [clojure.edn :as r])
   #?(:cljs [goog.array :as garray])
   [app.common.math :as mth]
+   [clojure.core :as c]
   [clojure.set :as set]
   [cuerdas.core :as str]
   [linked.map :as lkm]
@@ -167,6 +166,15 @@
 ;; Data Structures Access & Manipulation
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+(defn array?
+  [o]
+  #?(:cljs
+     (c/array? o)
+     :clj
+     (if (some? o)
+       (.isArray (class o))
+       false)))
+
 (defn not-empty?
  [coll]
  (boolean (seq coll)))
--- a/common/src/app/common/files/builder.cljc
+++ b/common/src/app/common/files/builder.cljc
@@ -356,7 +356,7 @@
                  (first children)
                  (last children))
          fills (if (and (contains? head :svg-attrs) (empty? (:fills head)))
-                  types.path/default-bool-fills
+                  (types.path/get-default-bool-fills)
                  (get head :fills))]
      (-> bool-shape
          (assoc :fills fills)
--- a/common/src/app/common/files/changes.cljc
+++ b/common/src/app/common/files/changes.cljc
@@ -21,6 +21,7 @@
   [app.common.types.container :as ctn]
   [app.common.types.file :as ctf]
   [app.common.types.grid :as ctg]
+   [app.common.types.library :as ctl]
   [app.common.types.page :as ctp]
   [app.common.types.pages-list :as ctpl]
   [app.common.types.path :as path]
@@ -241,7 +242,7 @@
      [:shapes ::sm/any]
      [:index {:optional true} [:maybe :int]]
      [:after-shape {:optional true} ::sm/any]
-      [:component-swap {:optional true} :boolean]]]
+      [:allow-altering-copies {:optional true} :boolean]]]

    [:reorder-children
     [:map {:title "ReorderChildrenChange"}
@@ -418,7 +419,7 @@
      [:type [:= :set-token-set]]
      [:set-name :string]
      [:group? :boolean]
-      [:token-set [:maybe ctob/schema:token-set-attrs]]]]
+      [:token-set [:maybe [:fn ctob/token-set?]]]]]

    [:set-token
     [:map {:title "SetTokenChange"}
@@ -761,7 +762,7 @@
      (d/update-in-when data [:components component-id :objects] reg-objects))))

 (defmethod process-change :mov-objects
-  [data {:keys [parent-id shapes index page-id component-id ignore-touched after-shape component-swap syncing]}]
+  [data {:keys [parent-id shapes index page-id component-id ignore-touched after-shape allow-altering-copies syncing]}]
  (letfn [(calculate-invalid-targets [objects shape-id]
            (let [reduce-fn #(into %1 (calculate-invalid-targets objects %2))]
              (->> (get-in objects [shape-id :shapes])
@@ -776,7 +777,7 @@
              (and shape
                   (not (invalid-targets parent-id))
                   (not (cfh/components-nesting-loop? objects shape-id parent-id))
-                   (or component-swap ;; On a component swap it's allowed to change the structure of a copy
+                   (or allow-altering-copies ;; In some cases (like a component swap) it's allowed to change the structure of a copy
                       syncing ;; If we are syncing the changes of a main component, it's allowed to change the structure of a copy
                       (and
                        (not (ctk/in-component-copy? (get objects (:parent-id shape)))) ;; We don't want to change the structure of component copies
@@ -927,15 +928,15 @@

 (defmethod process-change :add-color
  [data {:keys [color]}]
-  (ctc/add-color data color))
+  (ctl/add-color data color))

 (defmethod process-change :mod-color
  [data {:keys [color]}]
-  (ctc/set-color data color))
+  (ctl/set-color data color))

 (defmethod process-change :del-color
  [data {:keys [id]}]
-  (ctc/delete-color data id))
+  (ctl/delete-color data id))

 ;; DEPRECATED: remove before 2.3
 (defmethod process-change :add-recent-color
@@ -1027,11 +1028,10 @@
                  (ctob/delete-set lib' set-name))

                (not (ctob/get-set lib' set-name))
-                (ctob/add-set lib' (ctob/make-token-set token-set))
+                (ctob/add-set lib' token-set)

                :else
-                (ctob/update-set lib' set-name (fn [prev-token-set]
-                                                 (ctob/make-token-set (merge prev-token-set token-set)))))))))
+                (ctob/update-set lib' set-name (fn [_] token-set)))))))

 (defmethod process-change :set-token-theme
  [data {:keys [group theme-name theme]}]
--- a/common/src/app/common/files/changes_builder.cljc
+++ b/common/src/app/common/files/changes_builder.cljc
@@ -464,8 +464,8 @@

           (some? index)
           (assoc :index index)
-           (:component-swap options)
-           (assoc :component-swap true)
+           (:allow-altering-copies options)
+           (assoc :allow-altering-copies true)
           (:ignore-touched options)
           (assoc :ignore-touched true))

@@ -473,12 +473,14 @@
         (fn [undo-changes shape]
           (let [prev-sibling (cfh/get-prev-sibling objects (:id shape))]
             (conj undo-changes
-                   {:type :mov-objects
-                    :page-id (::page-id (meta changes))
-                    :parent-id (:parent-id shape)
-                    :shapes [(:id shape)]
-                    :after-shape prev-sibling
-                    :index 0}))) ; index is used in case there is no after-shape (moving bottom shapes)
+                   (cond-> {:type :mov-objects
+                            :page-id (::page-id (meta changes))
+                            :parent-id (:parent-id shape)
+                            :shapes [(:id shape)]
+                            :after-shape prev-sibling
+                            :index 0} ; index is used in case there is no after-shape (moving bottom shapes)
+                     (:allow-altering-copies options)
+                     (assoc :allow-altering-copies true)))))

         restore-touched-change
         {:type :mod-obj
@@ -916,7 +918,7 @@
    (-> changes
        (update :redo-changes conj {:type :set-token-set
                                    :set-name name
-                                    :token-set (assoc prev-token-set :name new-name)
+                                    :token-set (ctob/rename prev-token-set new-name)
                                    :group? false})
        (update :undo-changes conj {:type :set-token-set
                                    :set-name new-name
@@ -937,11 +939,11 @@
                                    :group? group?})
        (update :undo-changes conj (if prev-token-set
                                     {:type :set-token-set
-                                      :set-name (or
-                                                 ;; Undo of edit
-                                                 (:name token-set)
-                                                 ;; Undo of delete
-                                                 set-name)
+                                      :set-name (if token-set
+                                                  ;; Undo of edit
+                                                  (ctob/get-name token-set)
+                                                  ;; Undo of delete
+                                                  set-name)
                                      :token-set prev-token-set
                                      :group? group?}
                                     ;; Undo of create
--- a/common/src/app/common/files/helpers.cljc
+++ b/common/src/app/common/files/helpers.cljc
@@ -152,12 +152,22 @@
      (dm/get-prop shape :type))))

 (defn get-children-ids
-  [objects id]
-  (letfn [(get-children-ids-rec [id processed]
-            (when (not (contains? processed id))
-              (when-let [shapes (-> (get objects id) :shapes (some-> vec))]
-                (into shapes (mapcat #(get-children-ids-rec % (conj processed id))) shapes))))]
-    (get-children-ids-rec id #{})))
+  "Returns the ids of all the descendants of the shape identified
+  by the id. Optionally, you can pass an ignore function to indicate
+  when to ignore a descendant (and all its descendants)"
+  ([objects id]
+   (get-children-ids objects id {}))
+  ([objects id {:keys [ignore-children-fn]
+                ;;ignore-children-fn should receive a shape and return a boolean
+                :or {ignore-children-fn (constantly false)}}]
+   (letfn [(get-children-ids-rec [id processed]
+             (when-not (contains? processed id)
+               (when-let [shapes (as-> (get objects id) $
+                                   (:shapes $)
+                                   (remove ignore-children-fn $)
+                                   (some-> $ vec))]
+                 (into shapes (mapcat #(get-children-ids-rec % (conj processed id))) shapes))))]
+     (get-children-ids-rec id #{}))))

 (defn get-children-ids-with-self
  [objects id]
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -21,17 +21,17 @@
   [app.common.math :as mth]
   [app.common.schema :as sm]
   [app.common.svg :as csvg]
-   [app.common.text :as txt]
   [app.common.types.color :as types.color]
   [app.common.types.component :as ctk]
   [app.common.types.container :as ctn]
   [app.common.types.file :as ctf]
-   [app.common.types.fill :as types.fill]
+   [app.common.types.fills :as types.fills]
   [app.common.types.path :as path]
   [app.common.types.path.segment :as path.segment]
   [app.common.types.shape :as cts]
   [app.common.types.shape.interactions :as ctsi]
   [app.common.types.shape.shadow :as ctss]
+   [app.common.types.text :as types.text]
   [app.common.uuid :as uuid]
   [clojure.set :as set]
   [cuerdas.core :as str]))
@@ -622,7 +622,7 @@
            (let [invalid-node? (complement valid-node?)]
              (cond-> object
                (cfh/text-shape? object)
-                (update :content #(txt/transform-nodes invalid-node? fix-node %)))))
+                (update :content #(types.text/transform-nodes invalid-node? fix-node %)))))

          (update-container [container]
            (d/update-when container :objects d/update-vals update-object))]
@@ -729,7 +729,7 @@
            (let [shape (update-object shape)]
              (if (cfh/text-shape? shape)
                (-> shape
-                    (update :content (partial txt/transform-nodes identity update-fill))
+                    (update :content (partial types.text/transform-nodes identity update-fill))
                    (d/update-when :position-data #(mapv update-object %)))
                shape)))

@@ -837,7 +837,7 @@
        (d/update-when :components d/update-vals update-container))))

 (def ^:private valid-fill?
-  (sm/lazy-validator types.fill/schema:fill))
+  (sm/lazy-validator types.fills/schema:fill))

 (defmethod migrate-data "legacy-43"
  [data _]
@@ -855,7 +855,7 @@

          (update-object [object]
            (if (cfh/text-shape? object)
-              (update object :content #(txt/transform-nodes txt/is-content-node? update-text-node %))
+              (update object :content #(types.text/transform-nodes types.text/is-content-node? update-text-node %))
              object))

          (update-container [container]
@@ -1019,8 +1019,8 @@
  [data _]
  (let [update-colors
        (fn [colors]
-          (into {} (filter #(-> % val types.color/valid-color?) colors)))]
-    (update data :colors update-colors)))
+          (into {} (filter #(-> % val types.color/valid-library-color?) colors)))]
+    (d/update-when data :colors update-colors)))

 (defmethod migrate-data "legacy-52"
  [data _]
@@ -1034,7 +1034,6 @@

    (update data :pages-index d/update-vals update-page)))

-
 (defmethod migrate-data "legacy-53"
  [data _]
  (migrate-data data "legacy-26"))
@@ -1105,7 +1104,7 @@
                ;; The text shape also can has fills on the text
                ;; fragments so we need to fix fills there
                (cond-> (cfh/text-shape? object)
-                  (update :content (partial txt/transform-nodes txt/is-content-node? fix-fills)))))
+                  (update :content (partial types.text/transform-nodes types.text/is-content-node? fix-fills)))))

          (update-container [container]
            (d/update-when container :objects d/update-vals update-object))]
@@ -1423,7 +1422,7 @@

          (update-object [object]
            (if (cfh/text-shape? object)
-              (update object :content (partial txt/transform-nodes txt/is-content-node? fix-fills))
+              (update object :content (partial types.text/transform-nodes types.text/is-content-node? fix-fills))
              object))

          (update-container [container]
@@ -1457,7 +1456,7 @@

          ;; Fixes shapes with nested :fills in the :fills attribute
          ;; introduced in a migration `0006-fix-old-texts-fills` when
-          ;; txt/transform-nodes with identity pred was broken
+          ;; types.text/transform-nodes with identity pred was broken
          (remove-nested-fills [[fill :as fills]]
            (if (and (= 1 (count fills))
                     (contains? fill :fills))
@@ -1466,7 +1465,7 @@

          (clear-fill [fill]
            (-> fill
-                (select-keys types.fill/fill-attrs)
+                (select-keys types.fills/fill-attrs)
                (d/update-when :fill-image clear-color-image)
                (d/update-when :fill-color-gradient clear-color-gradient)))

@@ -1483,8 +1482,8 @@

          (fix-text-content [content]
            (->> content
-                 (txt/transform-nodes txt/is-content-node? fix-object)
-                 (txt/transform-nodes txt/is-paragraph-set-node? #(dissoc % :fills))))
+                 (types.text/transform-nodes types.text/is-content-node? fix-object)
+                 (types.text/transform-nodes types.text/is-paragraph-set-node? #(dissoc % :fills))))

          (update-shape [object]
            (-> object
@@ -1517,6 +1516,42 @@

    (d/update-when data :colors d/update-vals clear-color)))

+(defmethod migrate-data "0009-clean-library-colors"
+  [data _]
+  (d/update-when data :colors
+                 (fn [colors]
+                   (reduce-kv (fn [colors id color]
+                                (if (types.color/valid-library-color? color)
+                                  colors
+                                  (dissoc colors id)))
+                              colors
+                              colors))))
+
+(defmethod migrate-data "0009-add-partial-text-touched-flags"
+  [data _]
+  (letfn [(update-object [page object]
+            (if (and (cfh/text-shape? object)
+                     (ctk/in-component-copy? object))
+              (let [file            {:id (:id data) :data data}
+                    libs            (when (:libs data)
+                                      (deref (:libs data)))
+                    ref-shape       (ctf/find-ref-shape file page libs object
+                                                        {:include-deleted? true :with-context? true})
+                    partial-touched (when ref-shape
+                                      (types.text/get-diff-type (:content object) (:content ref-shape)))]
+                (if (seq partial-touched)
+                  (update object :touched (fn [touched]
+                                            (reduce #(ctk/set-touched-group %1 %2)
+                                                    touched
+                                                    partial-touched)))
+                  object))
+              object))
+
+          (update-page [page]
+            (d/update-when page :objects d/update-vals (partial update-object page)))]
+
+    (update data :pages-index d/update-vals update-page)))
+
 (def available-migrations
  (into (d/ordered-set)
        ["legacy-2"
@@ -1580,4 +1615,6 @@
         "0005-deprecate-image-type"
         "0006-fix-old-texts-fills"
         "0007-clear-invalid-strokes-and-fills-v2"
-         "0008-fix-library-colors-v4"]))
+         "0008-fix-library-colors-v4"
+         "0009-clean-library-colors"
+         "0009-add-partial-text-touched-flags"]))
--- a/common/src/app/common/files/repair.cljc
+++ b/common/src/app/common/files/repair.cljc
@@ -96,7 +96,7 @@
  (log/dbg :hint "repairing shape :invalid-parent" :id (:id shape) :name (:name shape) :page-id page-id)
  (-> (pcb/empty-changes nil page-id)
      (pcb/with-file-data file-data)
-      (pcb/change-parent (:parent-id args) [shape] nil {:component-swap true})))
+      (pcb/change-parent (:parent-id args) [shape] nil {:allow-altering-copies true})))

 (defmethod repair-error :frame-not-found
  [_ {:keys [shape page-id] :as error} file-data _]
@@ -387,7 +387,7 @@
    (-> (pcb/empty-changes nil page-id)
        (pcb/with-file-data file-data)
        (pcb/update-shapes [(:id shape)] repair-shape)
-        (pcb/change-parent uuid/zero [shape] nil {:component-swap true}))))
+        (pcb/change-parent uuid/zero [shape] nil {:allow-altering-copies true}))))

 (defmethod repair-error :root-copy-not-allowed
  [_ {:keys [shape page-id] :as error} file-data _]
@@ -602,11 +602,6 @@
  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
  file)

-(defmethod repair-error :variant-no-properties
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
-
 (defmethod repair-error :variant-bad-variant-name
  [_ error file _]
  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
--- a/common/src/app/common/files/shapes_builder.cljc
+++ b/common/src/app/common/files/shapes_builder.cljc
@@ -7,7 +7,6 @@
 (ns app.common.files.shapes-builder
  "A SVG to Shapes builder."
  (:require
-   [app.common.colors :as clr]
   [app.common.data :as d]
   [app.common.data.macros :as dm]
   [app.common.exceptions :as ex]
@@ -21,6 +20,7 @@
   [app.common.math :as mth]
   [app.common.schema :as sm :refer [max-safe-int min-safe-int]]
   [app.common.svg :as csvg]
+   [app.common.types.color :as clr]
   [app.common.types.path :as path]
   [app.common.types.path.segment :as path.segm]
   [app.common.types.shape :as cts]
--- a/common/src/app/common/files/validate.cljc
+++ b/common/src/app/common/files/validate.cljc
@@ -68,7 +68,6 @@
    :variant-bad-name
    :variant-bad-variant-name
    :variant-component-bad-name
-    :variant-no-properties
    :variant-component-bad-id})

 (def ^:private schema:error
@@ -589,11 +588,7 @@
    (when-not (ctk/is-variant? main-component)
      (report-error :not-a-variant
                    (str/ffmt "Shape % should be a variant" (:id main-component))
-                    main-component file component-page))
-    (when (< (count (:variant-properties component)) 1)
-      (report-error :variant-no-properties
-                    (str/ffmt "Component variant % should have properties" (:id main-component))
-                    main-component file nil))))
+                    main-component file component-page))))

 (defn- check-component
  "Validate semantic coherence of a component. Report all errors found."
@@ -655,26 +650,12 @@
    (check-component component file)
    (deref *errors*)))

-(def ^:private valid-fdata?
-  "Structural validation of file data using defined schema"
-  (sm/lazy-validator ::ctf/data))
-
-(def ^:private get-fdata-explain
-  "Get schema explain data for file data"
-  (sm/lazy-explainer ::ctf/data))
-
 (defn validate-file-schema!
  "Validates the file itself, without external dependencies, it
  performs the schema checking and some semantical validation of the
  content."
-  [{:keys [id data] :as file}]
-  (when-not (valid-fdata? data)
-    (ex/raise :type :validation
-              :code :schema-validation
-              :hint (str/ffmt "invalid file data structure found on file '%'" id)
-              :file-id id
-              ::sm/explain (get-fdata-explain data)))
-  file)
+  [file]
+  (update file :data ctf/check-file-data))

 (defn validate-file!
  "Validate full referential integrity and semantic coherence on file data.
@@ -688,7 +669,6 @@
              :file-id (:id file)
              :details errors)))

-
 (declare compare-slots)

 ;; Optional check to look for missing swap slots.
--- a/common/src/app/common/flags.cljc
+++ b/common/src/app/common/flags.cljc
@@ -10,6 +10,8 @@
   [clojure.set :as set]
   [cuerdas.core :as str]))

+(def ^:dynamic *current* #{})
+
 (def login
  "Flags related to login features"
  #{;; Allows registration with login / password
@@ -117,6 +119,7 @@
    ;; Only for developtment.
    :tiered-file-data-storage
    :token-units
+    :token-typography-types
    :transit-readable-response
    :user-feedback
    ;; TODO: remove this flag.
@@ -149,7 +152,8 @@
   :enable-onboarding
   :enable-dashboard-templates-section
   :enable-google-fonts-provider
-   :enable-component-thumbnails])
+   :enable-component-thumbnails
+   :enable-render-wasm-dpr])

 (defn parse
  [& flags]
--- a/common/src/app/common/geom/shapes/grid_layout/layout_data.cljc
+++ b/common/src/app/common/geom/shapes/grid_layout/layout_data.cljc
@@ -467,15 +467,15 @@
         row-tracks (set-flex-multi-span parent row-tracks children-map shape-cells bounds objects :row)

         ;; Once auto sizes have been calculated we get calculate the `fr` unit with the remainining size and adjust the size
-         free-column-space (max 0 (- bound-width (+ column-total-size-nofr column-total-gap)))
-         free-row-space    (max 0 (- bound-height (+ row-total-size-nofr row-total-gap)))
+         fr-column-space (max 0 (- bound-width (+ column-total-size-nofr column-total-gap)))
+         fr-row-space    (max 0 (- bound-height (+ row-total-size-nofr row-total-gap)))

         ;; Get the minimum values for fr's
         min-column-fr     (min-fr-value column-tracks)
         min-row-fr        (min-fr-value row-tracks)

-         column-fr         (if auto-width? min-column-fr (mth/finite (/ free-column-space column-frs) 0))
-         row-fr            (if auto-height? min-row-fr (mth/finite (/ free-row-space row-frs) 0))
+         column-fr         (if auto-width? min-column-fr (mth/finite (/ fr-column-space column-frs) 0))
+         row-fr            (if auto-height? min-row-fr (mth/finite (/ fr-row-space row-frs) 0))

         column-tracks     (set-fr-value column-tracks column-fr auto-width?)
         row-tracks        (set-fr-value row-tracks row-fr auto-height?)
@@ -484,13 +484,13 @@
         column-total-size (tracks-total-size column-tracks)
         row-total-size    (tracks-total-size row-tracks)

-         free-column-space (max 0 (if auto-width? 0 (- bound-width (+ column-total-size column-total-gap))))
-         free-row-space    (max 0 (if auto-height? 0 (- bound-height (+ row-total-size row-total-gap))))
+         auto-column-space (max 0 (if auto-width? 0 (- bound-width (+ column-total-size column-total-gap))))
+         auto-row-space    (max 0 (if auto-height? 0 (- bound-height (+ row-total-size row-total-gap))))
         column-autos      (tracks-total-autos column-tracks)
         row-autos         (tracks-total-autos row-tracks)

-         column-add-auto   (/ free-column-space column-autos)
-         row-add-auto      (/ free-row-space row-autos)
+         column-add-auto   (/ auto-column-space column-autos)
+         row-add-auto      (/ auto-row-space row-autos)

         column-tracks (cond-> column-tracks
                         (= :stretch (:layout-justify-content parent))
--- a/common/src/app/common/logic/libraries.cljc
+++ b/common/src/app/common/logic/libraries.cljc
@@ -17,18 +17,18 @@
   [app.common.logic.shapes :as cls]
   [app.common.logic.variant-properties :as clvp]
   [app.common.spec :as us]
-   [app.common.text :as txt]
-   [app.common.types.color :as ctc]
   [app.common.types.component :as ctk]
   [app.common.types.components-list :as ctkl]
   [app.common.types.container :as ctn]
   [app.common.types.file :as ctf]
+   [app.common.types.library :as ctl]
   [app.common.types.page :as ctp]
   [app.common.types.pages-list :as ctpl]
   [app.common.types.shape :as cts]
   [app.common.types.shape-tree :as ctst]
   [app.common.types.shape.interactions :as ctsi]
-   [app.common.types.shape.layout :as ctl]
+   [app.common.types.shape.layout :as ctsl]
+   [app.common.types.text :as txt]
   [app.common.types.token :as cto]
   [app.common.types.typography :as cty]
   [app.common.types.variant :as ctv]
@@ -214,8 +214,8 @@
          [(:frame-id new-main-instance-shape)]
          (fn [shape objects]
            (cond-> shape
-              (ctl/grid-layout? shape)
-              (ctl/assign-cells objects)))
+              (ctsl/grid-layout? shape)
+              (ctsl/assign-cells objects)))
          {:with-objects? true}))]))


@@ -276,7 +276,7 @@
         (->> ids-map vals (some #(= % (:parent-id first-shape))))

         changes
-         (if (and (ctl/grid-layout? objects (:parent-id first-shape)) (not duplicated-parent?))
+         (if (and (ctsl/grid-layout? objects (:parent-id first-shape)) (not duplicated-parent?))
           (let [target-cell (-> position meta :cell)

                 [row column]
@@ -287,10 +287,10 @@
                  [(:parent-id first-shape)]
                  (fn [shape objects]
                    (-> shape
-                        (ctl/assign-cells objects)
+                        (ctsl/assign-cells objects)
                        (cond-> (and (some? row) (some? column))
-                          (-> (ctl/push-into-cell [(:id first-shape)] row column)
-                              (ctl/assign-cells objects)))))
+                          (-> (ctsl/push-into-cell [(:id first-shape)] row column)
+                              (ctsl/assign-cells objects)))))
                  {:with-objects? true})
                 (pcb/reorder-grid-children [(:parent-id first-shape)])))
           changes)
@@ -575,8 +575,8 @@
 (defmethod uses-assets? :colors
  [_ color-id shape library-id]
  (if (nil? color-id)
-    (ctc/uses-library-colors? shape library-id)
-    (ctc/uses-library-color? shape library-id color-id)))
+    (cts/uses-library-colors? shape library-id)
+    (cts/uses-library-color? shape library-id color-id)))

 (defmethod uses-assets? :typographies
  [_ typography-id shape library-id]
@@ -604,7 +604,7 @@
  (let [library-colors (get-in libraries [library-id :data :colors])]
    (pcb/update-shapes changes
                       [(:id shape)]
-                       #(ctc/sync-shape-colors % library-id library-colors))))
+                       #(ctl/sync-colors % library-id library-colors))))

 (defmethod generate-sync-shape :typographies
  [_ changes library-id container shape libraries _]
@@ -853,7 +853,7 @@
                          container
                          omit-touched?)

-            (ctl/flex-layout? shape-main)
+            (ctsl/flex-layout? shape-main)
            (update-flex-child-copy-attrs shape-main
                                          shape-inst
                                          library
@@ -972,7 +972,7 @@

          changes
          (cond-> changes
-            (ctl/grid-layout? shape-inst)
+            (ctsl/grid-layout? shape-inst)
            (update-grid-copy-attrs
             (:id shape-inst)
             shape-main
@@ -1062,14 +1062,14 @@
                                        component-container
                                        {:copy-touched? true}))

-                    (ctl/flex-layout? shape-main)
+                    (ctsl/flex-layout? shape-main)
                    (update-flex-child-main-attrs shape-main
                                                  shape-inst
                                                  component-container
                                                  container
                                                  omit-touched?)

-                    (ctl/grid-layout? shape-main)
+                    (ctsl/grid-layout? shape-main)
                    (update-grid-main-attrs shape-main
                                            shape-inst
                                            component-container
@@ -1664,28 +1664,67 @@
                                        :shapes all-parents})]))))


+(defn- text-change-value
+  [touched-content   ;; The :content of the copy text before updating
+   untouched-content ;; The :content of the main component
+   touched]
+
+  (let [main-comps-diff (txt/get-diff-type touched-content untouched-content)
+        diff-structure? (contains? main-comps-diff :text-content-structure)
+
+        touched-attrs       (txt/get-first-paragraph-text-attrs touched-content)
+        ;; Have touched content an uniform style?
+        thed-unif-style?    (txt/equal-attrs? touched-content touched-attrs)
+
+        untouched-attrs     (txt/get-first-paragraph-text-attrs untouched-content)
+        ;; Have untouched content an uniform style?
+        untched-unif-style? (txt/equal-attrs? untouched-content untouched-attrs)]
+    (cond
+      ;; Both text and attrs has been touched, keep the
+      ;; touched-content
+      (and (touched :text-content-text) (touched :text-content-attribute))
+      touched-content
+
+      (touched :text-content-structure)
+      ;; Special case for adding or removing paragraphs:
+      ;; If the structure has been touched, but the attrs don't,
+      ;; and both have uniform attributes, we keep the touched-content structure and
+      ;; texts, updating its attrs to make them like the untouched-content
+      (if (and (not (touched :text-content-attribute)) thed-unif-style? untched-unif-style?)
+        (txt/copy-attrs-keys touched-content untouched-attrs)
+        ;; In other case, we keep the touched content
+        touched-content)
+
+      (touched :text-content-text)
+      ;; Keep the texts touched in touched-content, so copy the
+      ;; texts from touched-content into untouched-content
+      (txt/copy-text-keys touched-content untouched-content)
+
+      (touched :text-content-attribute)
+      ;; The untouched content has a different structure, but the touched content had't
+      ;; touched the structure
+      (if diff-structure?
+        ;; If both have uniform attributes, we keep the untouched-content structure and
+        ;; texts, updating its attrs to make them like the touched-content
+        (if (and thed-unif-style? untched-unif-style?)
+          (txt/copy-attrs-keys untouched-content touched-attrs)
+          ;; In other case, we keep the touched content
+          touched-content)
+
+        ;; Keep the attrs touched in touched-content, so copy the
+        ;; texts from untouched-content into touched-content
+        (txt/copy-text-keys untouched-content touched-content))
+
+
+      ;; Nothing is touched
+      :else
+      untouched-content)))
+
 (defn- add-update-attr-operations
-  [attr dest-shape origin-shape roperations uoperations touched]
-  (let [orig-value (get origin-shape attr)
-        dest-value (get dest-shape attr)
-        ;; position-data is a special case because can be affected by :geometry-group and :content-group
-        ;; so, if the position-data changes but the geometry is touched we need to reset the position-data
-        ;; so it's calculated again
-        reset-pos-data?
-        (and (cfh/text-shape? origin-shape)
-             (= attr :position-data)
-             (not= orig-value dest-value)
-             (touched :geometry-group))
-
-        val (cond
-              ;; If position data changes and the geometry group is touched
-              ;; we need to put to nil so we can regenerate it
-              reset-pos-data? nil
-              :else orig-value)
-
-        roperation {:type :set
+  [attr dest-shape roperations uoperations attr-val]
+  (let [roperation {:type :set
                    :attr attr
-                    :val val
+                    :val attr-val
                    :ignore-touched true}
        uoperation {:type :set
                    :attr attr
@@ -1737,58 +1776,271 @@
            (generate-update-tokens container dest-shape origin-shape touched omit-touched?))

          (let [attr-group        (get ctk/sync-attrs attr)
-                skip-operations? (or (= (get origin-shape attr) (get dest-shape attr))
-                                     (and (touched attr-group)
-                                          omit-touched?))
+                ;; position-data is a special case because can be affected by
+                ;; :geometry-group and :content-group so, if the position-data
+                ;; changes but the geometry is touched we need to reset the position-data
+                ;; so it's calculated again
+                reset-pos-data? (and (cfh/text-shape? origin-shape)
+                                     (= attr :position-data)
+                                     (not= (:position-data origin-shape) (:position-data dest-shape))
+                                     (touched :geometry-group))
+
+                ;; On texts, when we want to omit the touched attrs, both text (the actual letters)
+                ;; and attrs (bold, font, etc) are in the same attr :content.
+                ;; If only one of them is touched, we want to adress this case and
+                ;; only update the untouched one
+                text-content-change?
+                (and
+                 omit-touched?
+                 (cfh/text-shape? origin-shape)
+                 (= :content attr)
+                 (touched attr-group))
+
+
+                skip-operations?
+                (or (= (get origin-shape attr) (get dest-shape attr))
+                    (and (touched attr-group)
+                         omit-touched?
+                         ;; When it is a text-partial-change, we should generate operations
+                         ;; even when omit-touched? is true, but updating only the text or
+                         ;; the attributes, omiting the other part
+                         (not text-content-change?)))
+
+                attr-val (when-not skip-operations?
+                           (cond
+                             ;; If position data changes and the geometry group is touched
+                             ;; we need to put to nil so we can regenerate it
+                             reset-pos-data?
+                             nil
+
+                             text-content-change?
+                             (text-change-value (:content dest-shape)
+                                                (:content origin-shape)
+                                                touched)
+
+                             :else
+                             (get origin-shape attr)))
+
+                ;; If the final attr-value is the actual value, skip
+                skip-operations? (or skip-operations?
+                                     (= attr-val (get dest-shape attr)))
+
+
+                ;; On a text-partial-change, we want to force a position-data reset
+                ;; so it's calculated again
+                [roperations uoperations]
+                (if (and text-content-change? (not skip-operations?))
+                  (add-update-attr-operations :position-data dest-shape roperations uoperations nil)
+                  [roperations uoperations])

                [roperations' uoperations']
                (if skip-operations?
                  [roperations uoperations]
-                  (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched))]
+                  (add-update-attr-operations attr dest-shape roperations uoperations attr-val))]
            (recur (next attrs)
                   roperations'
                   uoperations')))))))

+
+(defn- switch-text-change-value
+  [prev-content         ;; The :content of the text before the switch
+   current-content      ;; The :content of the text after the switch (a clean copy)
+   ref-content touched] ;; The :content of the referenced text on the main component
+                        ;; before the switch
+  (let [;; We need the differences between the contents on the main
+        ;; components. current-content is the content of a clean copy,
+        ;; so for all effects its the same as the content on its main
+        main-comps-diff      (txt/get-diff-type ref-content current-content)
+        can-keep-text?       (not (contains? main-comps-diff :text-content-text))
+        can-keep-attr?       (not (contains? main-comps-diff :text-content-attribute))
+        main-diff-structure? (contains? main-comps-diff :text-content-structure)
+
+        current-attrs        (txt/get-first-paragraph-text-attrs current-content)
+        ;; Have current content an uniform style?
+        curr-unif-style?     (txt/equal-attrs? current-content current-attrs)
+        prev-attrs           (txt/get-first-paragraph-text-attrs prev-content)
+        ;; Have prev content an uniform style?
+        prev-unif-style?     (txt/equal-attrs? prev-content prev-attrs)
+        ref-attrs            (txt/get-first-paragraph-text-attrs ref-content)
+        ;; Have ref content an uniform style?
+        ref-unif-style?      (txt/equal-attrs? ref-content ref-attrs)]
+    (cond
+      ;; When the main components have a difference in structure
+      ;; (different number of paragraph or text entries)
+      main-diff-structure?
+      ;; Special case for adding or removing paragraphs:
+      ;; If the structure has changed between ref-content and current-content,
+      ;; but each one have uniform attributes, and the attrs on the main
+      ;; components were equal, we keep the touched-content structure and
+      ;; texts, updating its attrs to make them like the current-content
+      (if (and curr-unif-style?
+               ref-unif-style?
+               prev-unif-style?
+               (= ref-attrs current-attrs))
+        (txt/copy-attrs-keys current-content prev-attrs)
+        ;; In any other case of structure change, we discard all
+        ;; the overrides and keep the content of the current-shape
+        current-content)
+
+      ;; When the main components are equal, we keep the updated
+      ;; content from previous-shape as is
+      (and can-keep-text? can-keep-attr?)
+      prev-content
+
+      ;; When we can't keep anything, we discard all the
+      ;; overrides and keep the content of the current-shape
+      (and (not can-keep-text?) (not can-keep-attr?))
+      current-content
+
+      ;; Special case for added or removed paragraphs:
+      ;; If the structure has changed on current-content, but it has uniform attributes
+      ;; and the previous-content also has uniform attributes, and we can keep the changes
+      ;; on the text, we keep the touched-content structure and texts, updating
+      ;; its attrs to make them like the current-content
+      (and (touched :text-content-structure)
+           curr-unif-style?
+           prev-unif-style?)
+      (if can-keep-text?
+        (txt/copy-attrs-keys prev-content current-attrs)
+        (txt/copy-attrs-keys current-content prev-attrs))
+
+      ;; In any other case of structure change, we discard all
+      ;; the overrides and keep the content of the current-shape
+      (touched :text-content-structure)
+      current-content
+
+      ;; When there is a change on :text-content-text,
+      ;; and and we can keep it, we copy the texts from
+      ;; previous-shape over the attrs of current-shape
+      (and
+       (touched :text-content-text) can-keep-text?)
+      (txt/copy-text-keys prev-content current-content)
+
+      ;; When there is a change on :text-content-attribute,
+      ;; and we can keep it, we copy the texts from current-shape
+      ;; over the attrs of previous-shape
+      (and
+       (touched :text-content-attribute) can-keep-attr?)
+      (txt/copy-text-keys current-content prev-content)
+
+      ;; In any other case, we discard all the overrides
+      ;; and keep the content of the current-shape
+      :else
+      current-content)))
+
 (defn update-attrs-on-switch
-  "Copy attributes that have changed in the origin shape to the dest shape. Used on variants switch"
-  [changes dest-shape origin-shape dest-root origin-root origin-ref-shape container]
+  "Copy attributes that have changed in the shape previous to the switch
+   to the current shape (post switch). Used only on variants switch"
+  ;; NOTE: This function have similitudes but is very different to
+  ;; update-attrs:
+  ;; In components (update-attrs), the source shape is "clean", and the destination
+  ;; shape may have touched elements that shouldn't be overwritten.
+  ;; In variants (update-attrs-on-switch), the destination shape is "clean",
+  ;; and it's the source shape that may have touched elements, and we only want
+  ;; to copy those touched elements.
+  [changes current-shape previous-shape current-root prev-root origin-ref-shape container]
  (let [;; We need to sync only the position relative to the origin of the component.
        ;; (see update-attrs for a full explanation)
-        origin-shape   (reposition-shape origin-shape origin-root dest-root)
-        touched        (get dest-shape :touched #{})
-        touched-origin (get origin-shape :touched #{})]
+        previous-shape (reposition-shape previous-shape prev-root current-root)
+        touched        (get previous-shape :touched #{})]

    (loop [attrs       updatable-attrs
-           roperations [{:type :set-touched :touched (:touched origin-shape)}]
-           uoperations (list {:type :set-touched :touched (:touched dest-shape)})]
+           roperations [{:type :set-touched :touched (:touched previous-shape)}]
+           uoperations (list {:type :set-touched :touched (:touched current-shape)})]
      (if-let [attr (first attrs)]
        (let [attr-group (get ctk/sync-attrs attr)
+              skip-operations?
+              (or
+               ;; If the attribute is not valid for the destiny, don't copy it
+               (not (cts/is-allowed-attr? attr (:type current-shape)))
+
+               ;; If the values are already equal, don't copy them
+               (= (get previous-shape attr) (get current-shape attr))
+
+               ;; If both variants (origin and destiny) don't have the same value
+               ;; for that attribute, don't copy it.
+               ;; Exceptions: :points :selrect and :content can be different
+               ;;
+               ;; Sample:
+               ;; 1. We have a variant with C1 (bg red) and C2 (bg blue).
+               ;; 2. We make a copy of C1 called Copy.
+               ;; 3. We set Copy’s bg to green (so it it has an override on the bg).
+               ;; 4. We switch Copy to use C2 as base.
+               ;; 5. The bg of Copy now is blue (we ignore the override)
+               (and
+                (not (contains? #{:points :selrect :content} attr))
+                (not= (get origin-ref-shape attr) (get current-shape attr)))
+
+               ;; The :content attr cant't be copied to elements of different type
+               (and (= attr :content) (not= (:type previous-shape) (:type current-shape)))
+
+               ;; If the attr is not touched, don't copy it
+               (not (touched attr-group)))
+
+              ;; On texts, both text (the actual letters)
+              ;; and attrs (bold, font, etc) are in the same attr :content.
+              ;; If only one of them is touched, we want to adress this case and
+              ;; only update the untouched one
+              text-change?
+              (and
+               (not skip-operations?)
+               (cfh/text-shape? current-shape)
+               (cfh/text-shape? previous-shape)
+               (= :content attr)
+               (touched attr-group))
+
+              ;; position-data is a special case because can be affected by :geometry-group and :content-group
+              ;; so, if the position-data changes but the geometry is touched we need to reset the position-data
+              ;; so it's calculated again
+              reset-pos-data? (and
+                               (not skip-operations?)
+                               (cfh/text-shape? previous-shape)
+                               (= attr :position-data)
+                               (not= (:position-data previous-shape) (:position-data current-shape))
+                               (touched :geometry-group))
+
+              attr-val
+              (when-not skip-operations?
+                (cond
+                  ;; If position data changes and the geometry group is touched
+                  ;; we need to put to nil so we can regenerate it
+                  reset-pos-data?
+                  nil
+
+                  text-change?
+                  (switch-text-change-value (:content previous-shape)
+                                            (:content current-shape)
+                                            (:content origin-ref-shape)
+                                            touched)
+
+                  :else
+                  (get previous-shape attr)))
+
+              ;; If the final attr-value is the actual value, skip
+              skip-operations? (or skip-operations?
+                                   (= attr-val (get current-shape attr)))
+
+
+              ;; On a text-change, we want to force a position-data reset
+              ;; so it's calculated again
+              [roperations uoperations]
+              (if (and (not skip-operations?) text-change?)
+                (add-update-attr-operations :position-data current-shape roperations uoperations nil)
+                [roperations uoperations])
+
              [roperations' uoperations']
-              (if (or
-                   ;; If the attribute is not valid for the destiny, don't copy it
-                   (not (cts/is-allowed-attr? attr (:type dest-shape)))
-                   ;; If the values are already equal, don't copy it
-                   (= (get origin-shape attr) (get dest-shape attr))
-                   ;; If the referenced shape on the original component doesn't have the same value, don't copy it
-                   ;; Exceptions: :points :selrect and :content can be different
-                   (and
-                    (not (contains? #{:points :selrect :content} attr))
-                    (not= (get origin-ref-shape attr) (get dest-shape attr)))
-                   ;; The :content attr cant't be copied to elements of different type
-                   (and (= attr :content) (not= (:type origin-shape) (:type dest-shape)))
-                   ;; If the attr is not touched in the origin shape, don't copy it
-                   (not (touched-origin attr-group)))
+              (if skip-operations?
                [roperations uoperations]
-                (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched))]
+                (add-update-attr-operations attr current-shape roperations uoperations attr-val))]
          (recur (next attrs)
                 roperations'
                 uoperations'))
        (cond-> changes
          (> (count roperations) 1)
-          (add-update-attr-changes dest-shape container roperations uoperations)
+          (add-update-attr-changes current-shape container roperations uoperations)

          :always
-          (generate-update-tokens container dest-shape origin-shape touched false))))))
+          (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
@@ -1905,11 +2157,11 @@
                          (update cell :shapes #(filterv child? %)))))))
               ;; Take cells from main and remap the shapes to assign it to the copy
               copy-cells (-> shape-copy :layout-grid-cells (remove-orphan-cells shape-copy))
-               main-cells (-> shape-main (ctl/remap-grid-cells ids-map) :layout-grid-cells)]
+               main-cells (-> shape-main (ctsl/remap-grid-cells ids-map) :layout-grid-cells)]
           (-> shape-copy
               (assoc :layout-grid-cells
-                      (ctl/merge-cells main-cells copy-cells omit-touched?))
-               (ctl/assign-cells objects))))
+                      (ctsl/merge-cells main-cells copy-cells omit-touched?))
+               (ctsl/assign-cells objects))))
       {:ignore-touched true :with-objects? true})))

 (defn- update-grid-main-attrs
@@ -1933,7 +2185,7 @@
             [(:id shape-main)]
             (fn [shape-main]
               ;; Take cells from copy and remap the shapes to assign it to the copy
-               (let [new-cells (-> (ctl/remap-grid-cells shape-copy ids-map) :layout-grid-cells)]
+               (let [new-cells (-> (ctsl/remap-grid-cells shape-copy ids-map) :layout-grid-cells)]
                 (assoc shape-main :layout-grid-cells new-cells)))
             {:ignore-touched true}))]
    (pcb/concat-changes changes new-changes)))
@@ -2046,8 +2298,8 @@
        parent-id (:parent-id shape)

        insert-before?
-        (and (ctl/flex-layout? objects parent-id)
-             (not (ctl/reverse? objects parent-id)))
+        (and (ctsl/flex-layout? objects parent-id)
+             (not (ctsl/reverse? objects parent-id)))

        objects
        (-> objects
@@ -2063,7 +2315,7 @@
                    (pcb/with-objects objects)
                    (pcb/resize-parents new-objects-ids)
                    ;; Fix the order of the children inside the parent
-                    (cond-> (ctl/any-layout? objects parent-id)
+                    (cond-> (ctsl/any-layout? objects parent-id)
                      (pcb/reorder-children parent-id (get-in objects [parent-id :shapes]))))]
    (assoc changes :file-id library-id)))

@@ -2115,7 +2367,7 @@
                   (pcb/update-shapes [(:id new-shape)] #(d/patch-object % keep-props-values))

                   ;; We need to set the same index as the original shape
-                   (pcb/change-parent (:parent-id shape) [new-shape] index {:component-swap true
+                   (pcb/change-parent (:parent-id shape) [new-shape] index {:allow-altering-copies true
                                                                            :ignore-touched true})
                   (change-touched new-shape
                                   shape
@@ -2123,10 +2375,21 @@
                                   {}))]))

 (defn generate-component-swap
-  [changes objects shape file page libraries id-new-component index target-cell keep-props-values]
-  (let [[all-parents changes]
+  [changes objects shape file page libraries id-new-component
+   index target-cell keep-props-values ignore-swapped?]
+  (let [;; When we keep the touched properties, we can't delete the
+        ;; swapped children (we will keep them too)
+        ignore-swapped-fn
+        (if ignore-swapped?
+          #(-> (get objects %)
+               (ctk/get-swap-slot))
+          (constantly false))
+
+        [all-parents changes]
        (-> changes
-            (cls/generate-delete-shapes file page objects (d/ordered-set (:id shape)) {:component-swap true}))
+            (cls/generate-delete-shapes
+             file page objects (d/ordered-set (:id shape))
+             {:allow-altering-copies true :ignore-children-fn ignore-swapped-fn}))
        [new-shape changes]
        (-> changes
            (generate-new-shape-for-swap shape file page libraries id-new-component index target-cell keep-props-values))]
@@ -2389,8 +2652,8 @@
               (gsh/move delta)
               (d/update-when :interactions #(ctsi/remap-interactions % ids-map objects))

-               (cond-> (ctl/grid-layout? obj)
-                 (ctl/remap-grid-cells ids-map))
+               (cond-> (ctsl/grid-layout? obj)
+                 (ctsl/remap-grid-cells ids-map))

               (cond-> (ctk/is-variant-container? parent)
                 (assoc :variant-id parent-id))
@@ -2406,8 +2669,8 @@
           ;; We want the first added object to touch it's parent, but not subsequent children
           changes (-> (pcb/add-object changes new-obj {:ignore-touched (and duplicating-component? child?)})
                       (pcb/amend-last-change #(assoc % :old-id (:id obj)))
-                       (cond-> (ctl/grid-layout? objects (:parent-id obj))
-                         (-> (pcb/update-shapes [(:parent-id obj)] ctl/assign-cells {:with-objects? true})
+                       (cond-> (ctsl/grid-layout? objects (:parent-id obj))
+                         (-> (pcb/update-shapes [(:parent-id obj)] ctsl/assign-cells {:with-objects? true})
                             (pcb/reorder-grid-children [(:parent-id obj)]))))

           changes (cond-> changes
--- a/common/src/app/common/logic/shapes.cljc
+++ b/common/src/app/common/logic/shapes.cljc
@@ -99,7 +99,14 @@
                               (pcb/with-library-data file))
                           ids
                           options))
-  ([changes ids {:keys [ignore-touched component-swap]}]
+  ([changes ids {:keys [ignore-touched
+                        allow-altering-copies
+                        ;; We will delete the shapes and its descendants.
+                        ;; ignore-children-fn is used to ignore some descendants
+                        ;; on the deletion process. It should receive a shape and
+                        ;; return a boolean
+                        ignore-children-fn]
+                 :or {ignore-children-fn (constantly false)}}]
   (let [objects (pcb/get-objects changes)
         data    (pcb/get-library-data changes)
         page-id (pcb/get-page-id changes)
@@ -112,11 +119,12 @@
          ;; Look for shapes that are inside a component copy, but are
          ;; not the root. In this case, they must not be deleted,
          ;; but hidden (to be able to recover them more easily).
-          ;; Unless we are doing a component swap, in which case we want
+          ;; If we want to specifically allow altering the copies, this is
+          ;; a special case, like a component swap, in which case we want
          ;; to delete the old shape
           (let [shape           (get objects shape-id)]
             (and (ctn/has-any-copy-parent? objects shape)
-                  (not component-swap))))
+                  (not allow-altering-copies))))

         [ids-to-delete ids-to-hide]
         (loop [ids-seq       (seq ids)
@@ -177,10 +185,15 @@
                 (d/ordered-set)
                 (concat ids-to-delete ids-to-hide))

-         all-children
-         (->> ids-to-delete ;; Children of deleted shapes must be also deleted.
+         ;; Descendants of deleted shapes must be also deleted,
+         ;; except the ignored ones by the function ignore-children-fn
+         descendants-to-delete
+         (->> ids-to-delete
              (reduce (fn [res id]
-                        (into res (cfh/get-children-ids objects id)))
+                        (into res (cfh/get-children-ids
+                                   objects
+                                   id
+                                   {:ignore-children-fn ignore-children-fn})))
                      [])
              (reverse)
              (into (d/ordered-set)))
@@ -200,9 +213,10 @@

         empty-parents
        ;; Any parent whose children are all deleted, must be deleted too.
-        ;; Unless we are during a component swap: in this case we are replacing a shape by
+        ;; If we want to specifically allow altering the copies, this is a special case,
+        ;; for example during a component swap. in this case we are replacing a shape by
        ;; other one, so must not delete empty parents.
-         (if-not component-swap
+         (if-not allow-altering-copies
           (into (d/ordered-set) (find-all-empty-parents #{}))
           #{})

@@ -214,7 +228,7 @@
                       (conj components (:component-id shape))
                       components)))
                 []
-                 (into ids-to-delete all-children))
+                 (into ids-to-delete descendants-to-delete))


         ids-set (set ids-to-delete)
@@ -241,7 +255,7 @@

         changes (-> changes
                     (generate-update-shape-flags ids-to-hide objects {:hidden true})
-                     (pcb/remove-objects all-children {:ignore-touched true})
+                     (pcb/remove-objects descendants-to-delete {:ignore-touched true})
                     (pcb/remove-objects ids-to-delete {:ignore-touched ignore-touched})
                     (pcb/remove-objects empty-parents)
                     (pcb/resize-parents all-parents)
--- a/common/src/app/common/logic/tokens.cljc
+++ b/common/src/app/common/logic/tokens.cljc
@@ -41,7 +41,7 @@
  [group-path tokens-lib tokens-lib-theme]
  (let [deactivate? (contains? #{:all :partial} (ctob/sets-at-path-all-active? tokens-lib group-path))
        sets-names  (->> (ctob/get-sets-at-path tokens-lib group-path)
-                         (map :name)
+                         (map ctob/get-name)
                         (into #{}))]
    (if deactivate?
      (ctob/disable-sets tokens-lib-theme sets-names)
--- a/common/src/app/common/logic/variant_properties.cljc
+++ b/common/src/app/common/logic/variant_properties.cljc
@@ -18,7 +18,12 @@
  [changes variant-id pos new-name]
  (let [data               (pcb/get-library-data changes)
        objects            (pcb/get-objects changes)
-        related-components (cfv/find-variant-components data objects variant-id)]
+        related-components (cfv/find-variant-components data objects variant-id)
+
+        props              (-> related-components last :variant-properties)
+        prop-names         (mapv :name props)
+        prop-names         (concat (subvec prop-names 0 pos) (subvec prop-names (inc pos)))
+        new-name           (ctv/update-number-in-repeated-item prop-names new-name)]
    (reduce (fn [changes component]
              (pcb/update-component
               changes (:id component)
@@ -81,6 +86,9 @@
        next-prop-num      (ctv/next-property-number props)
        property-name      (or property-name (str ctv/property-prefix next-prop-num))

+        prop-names         (mapv :name props)
+        property-name      (ctv/update-number-in-repeated-item prop-names property-name)
+
        [_ changes]
        (reduce (fn [[num changes] component]
                  (let [main-id      (:main-instance-id component)
--- a/common/src/app/common/logic/variants.cljc
+++ b/common/src/app/common/logic/variants.cljc
@@ -1,13 +1,17 @@
 (ns app.common.logic.variants
  (:require
+   [app.common.data :as d]
   [app.common.files.changes-builder :as pcb]
   [app.common.files.helpers :as cfh]
   [app.common.files.variant :as cfv]
   [app.common.logic.libraries :as cll]
+   [app.common.logic.shapes :as cls]
   [app.common.logic.variant-properties :as clvp]
+   [app.common.types.component :as ctk]
   [app.common.types.container :as ctn]
   [app.common.types.file :as ctf]
-   [app.common.types.variant :as ctv]))
+   [app.common.types.variant :as ctv]
+   [app.common.uuid :as uuid]))

 (defn generate-add-new-variant
  [changes shape variant-id new-component-id new-shape-id prop-num]
@@ -62,29 +66,142 @@
      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
+   (related-shape-in-new), move the orig-swapped-child into the parent of
+   related-shape-in-new, fix its swap-slot if needed, and then delete
+   related-shape-in-new"
+  [changes related-shape-in-new orig-swapped-child ldata page swap-ref-id]
+  (let [;; Before to the swap, temporary move the previous
+        ;; shape to the root panel to avoid problems when
+        ;; the previous parent is deleted.
+        before-changes (-> (pcb/empty-changes)
+                           (pcb/with-page page)
+                           (pcb/with-objects (:objects page))
+                           (pcb/change-parent uuid/zero [orig-swapped-child] 0 {:allow-altering-copies true}))
+
+        objects         (pcb/get-objects changes)
+        prev-swap-slot  (ctk/get-swap-slot orig-swapped-child)
+        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
+        (pcb/change-parent (:parent-id related-shape-in-new) [orig-swapped-child] pos {:allow-altering-copies true})
+
+        ;; We need to update the swap slot only when it pointed
+        ;; to the swap-ref-id. Oterwise this is a swapped item
+        ;; inside a nested copy, so we need to keep it.
+        (cond->
+         (= prev-swap-slot swap-ref-id)
+          (pcb/update-shapes
+           [(:id orig-swapped-child)]
+           #(ctk/set-swap-slot % (:shape-ref related-shape-in-new))))
+
+        ;; Delete new non-swapped item
+        (cls/generate-delete-shapes ldata page objects (d/ordered-set (:id related-shape-in-new)) {:allow-altering-copies true})
+        second)))
+
+(defn- child-of-swapped?
+  "Check if any ancestor of a shape (between base-parent-id and shape) was swapped"
+  [shape objects base-parent-id]
+  (let [ancestors (->> (ctn/get-parent-heads objects shape)
+                        ;; Ignore ancestors ahead of base-parent
+                       (drop-while #(not= base-parent-id (:id %)))
+                       seq)
+        num-ancestors (count ancestors)
+        ;; Ignore first and last (base-parent and shape)
+        ancestors (when (and ancestors (<= 3 num-ancestors))
+                    (subvec (vec ancestors) 1 (dec num-ancestors)))]
+    (some ctk/get-swap-slot ancestors)))
+
+
 (defn generate-keep-touched
-  [changes new-shape original-shape original-shapes page libraries]
+  "This is used as part of the switch process, when you switch from
+   an original-shape to a new-shape. It generate changes to
+   copy the touched attributes on the shapes children of the original-shape
+   into the related children of the new-shape.
+   This relation is tricky. The shapes are related if:
+   * On the main components, both have the same name (the name on the copies are ignored)
+   * Both has the same type of ancestors, on the same order (see generate-path for the
+     translation of the types)"
+  [changes new-shape original-shape original-shapes page libraries ldata]
  (let [objects            (pcb/get-objects changes)
-        orig-objects       (into {} (map (juxt :id identity) original-shapes))
-        orig-shapes-w-path (add-unique-path
-                            (reverse original-shapes)
-                            orig-objects
-                            (:id original-shape))
+        container          (ctn/make-container page :page)
+        page-objects       (:objects page)
+
+        ;; Get the touched children of the original-shape
+        ;; Ignore children of swapped items, because
+        ;; they will be moved without change when
+        ;; managing their swapped ancestor
+        orig-touched       (->> (filter (comp seq :touched) original-shapes)
+                                (remove
+                                 #(child-of-swapped? %
+                                                     page-objects
+                                                     (:id original-shape))))
+
+        ;; Adds a :shape-path attribute to the children of the new-shape,
+        ;; that contains the type of its ancestors and its name
        new-shapes-w-path  (add-unique-path
                            (reverse (cfh/get-children-with-self objects (:id new-shape)))
                            objects
                            (:id new-shape))
-        new-shapes-map     (into {} (map (juxt :shape-path identity) new-shapes-w-path))
-        orig-touched      (filter (comp seq :touched) orig-shapes-w-path)
+        ;; Creates a map to quickly find a child of the new-shape by its shape-path
+        new-shapes-map     (into {} (map (juxt :shape-path identity)) new-shapes-w-path)

-        container          (ctn/make-container page :page)]
+        ;; 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-ref-shape nil container libraries original-shape)
+
+        orig-ref-objects   (-> (ctf/get-component-container-from-head orig-ref-shape libraries)
+                               :objects)
+
+        ;; Adds a :shape-path attribute to the children of the orig-ref-shape,
+        ;; that contains the type of its ancestors and its name
+        o-ref-shapes-wp    (add-unique-path
+                            (reverse (cfh/get-children-with-self orig-ref-objects (:id orig-ref-shape)))
+                            orig-ref-objects
+                            (:id orig-ref-shape))
+
+        ;; 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
    (reduce
-     (fn [changes touched-shape]
-       (let [related-shape  (get new-shapes-map (:shape-path touched-shape))
-             orig-ref-shape (ctf/find-ref-shape nil container libraries touched-shape)]
-         (if related-shape
-           (cll/update-attrs-on-switch
-            changes related-shape touched-shape new-shape original-shape orig-ref-shape container)
+     (fn [changes orig-child-touched]
+       (let [;; If the orig-child-touched was swapped, get its swap-slot
+             swap-slot      (ctk/get-swap-slot orig-child-touched)
+
+             ;; 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
+                              ;; 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
+                              (ctf/find-ref-id-for-swapped orig-child-touched container libraries)
+                              ;; If there is not a swap slot, get the id from the orig-ref-shape
+                              (:id orig-ref-shape))
+
+             ;; Get the shape path of the referenced main
+             shape-path     (get o-ref-shapes-p-map orig-ref-id)
+             ;; 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)]
+         ;; If there is a related shape, keep its data
+         (if related-shape-in-new
+           (if swap-slot
+             ;; If the orig-child-touched was swapped, keep it
+             (keep-swapped-item changes related-shape-in-new orig-child-touched
+                                ldata page orig-ref-id)
+             ;; If the orig-child-touched wasn't swapped, copy
+             ;; the touched attributes into it
+             (cll/update-attrs-on-switch
+              changes related-shape-in-new orig-child-touched
+              new-shape original-shape orig-ref-shape container))
           changes)))
     changes
     orig-touched)))
--- a/common/src/app/common/test_helpers/components.cljc
+++ b/common/src/app/common/test_helpers/components.cljc
@@ -156,7 +156,7 @@

        [new_shape _ changes]
        (-> (pcb/empty-changes nil (:id page))
-            (cll/generate-component-swap objects shape (:data file) page libraries id-new-component 0 nil keep-props-values))
+            (cll/generate-component-swap objects shape (:data file) page libraries id-new-component 0 nil keep-props-values false))

        file' (thf/apply-changes file changes)]

--- a/common/src/app/common/test_helpers/compositions.cljc
+++ b/common/src/app/common/test_helpers/compositions.cljc
@@ -8,15 +8,18 @@
  (:require
   [app.common.data :as d]
   [app.common.files.changes-builder :as pcb]
+   [app.common.files.helpers :as cfh]
   [app.common.geom.point :as gpt]
   [app.common.logic.libraries :as cll]
   [app.common.logic.shapes :as cls]
+   [app.common.logic.variants :as clv]
   [app.common.test-helpers.components :as thc]
   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
   [app.common.test-helpers.shapes :as ths]
-   [app.common.text :as txt]
   [app.common.types.container :as ctn]
-   [app.common.types.shape :as cts]))
+   [app.common.types.shape :as cts]
+   [app.common.types.text :as txt]))

 ;; ----- File building

@@ -32,7 +35,7 @@
 (defn add-text
  [file text-label content & {:keys [text-params] :as text}]
  (let [shape (-> (cts/setup-shape {:type :text :x 0 :y 0})
-                  (txt/change-text content))]
+                  (update :content txt/change-text content))]
    (ths/add-sample-shape file text-label
                          (merge shape
                                 text-params))))
@@ -71,7 +74,7 @@
 (defn add-frame-with-text
  [file frame-label child-label text & {:keys [frame-params child-params]}]
  (let [shape (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
-                  (txt/change-text text)
+                  (update :content txt/change-text text)
                  (assoc :position-data nil
                         :parent-label frame-label))]
    (-> file
@@ -275,25 +278,36 @@

 (defn swap-component
  "Swap the specified shape by the component specified by component-tag"
-  [file shape component-tag & {:keys [page-label propagate-fn]}]
+  [file shape component-tag & {:keys [page-label propagate-fn keep-touched? new-shape-label]}]
  (let [page    (if page-label
                  (thf/get-page file page-label)
                  (thf/current-page file))
+        libraries {(:id  file) file}

-        [_ _all-parents changes]
+        orig-shapes (when keep-touched? (cfh/get-children-with-self (:objects page) (:id shape)))
+
+        [new-shape _all-parents changes]
        (cll/generate-component-swap (pcb/empty-changes)
                                     (:objects page)
                                     shape
                                     (:data file)
                                     page
-                                     {(:id  file) file}
+                                     libraries
                                     (->  (thc/get-component file component-tag)
                                          :id)
                                     0
                                     nil
-                                     {})
+                                     {}
+                                     (true? keep-touched?))
+
+        changes (if keep-touched?
+                  (clv/generate-keep-touched changes new-shape shape orig-shapes page libraries (:data file))
+                  changes)
+

        file' (thf/apply-changes file changes)]
+    (when new-shape-label
+      (thi/set-id! new-shape-label (:id new-shape)))
    (if propagate-fn
      (propagate-fn file')
      file')))
--- a/common/src/app/common/test_helpers/shapes.cljc
+++ b/common/src/app/common/test_helpers/shapes.cljc
@@ -6,18 +6,18 @@

 (ns app.common.test-helpers.shapes
  (:require
-   [app.common.colors :as clr]
   [app.common.data :as d]
   [app.common.files.helpers :as cfh]
   [app.common.test-helpers.files :as thf]
   [app.common.test-helpers.ids-map :as thi]
-   [app.common.text :as txt]
-   [app.common.types.color :as ctc]
+   [app.common.types.color :as clr]
   [app.common.types.container :as ctn]
+   [app.common.types.library :as ctl]
   [app.common.types.pages-list :as ctpl]
   [app.common.types.shape :as cts]
   [app.common.types.shape-tree :as ctst]
   [app.common.types.shape.interactions :as ctsi]
+   [app.common.types.text :as txt]
   [app.common.types.typographies-list :as cttl]
   [app.common.types.typography :as ctt]))

@@ -125,7 +125,7 @@
 (defn add-sample-library-color
  [file label & {:keys [] :as params}]
  (let [color (sample-library-color label params)]
-    (update file :data ctc/add-color color)))
+    (update file :data ctl/add-color color)))

 (defn sample-typography
  [label & {:keys [] :as params}]
@@ -149,4 +149,4 @@
            (fn [file-data]
              (ctpl/update-page file-data
                                (:id page)
-                                #(ctst/set-shape % (assoc origin :interactions interactions)))))))
+                                #(ctst/set-shape % (assoc origin :interactions interactions)))))))
--- a/common/src/app/common/test_helpers/variants.cljc
+++ b/common/src/app/common/test_helpers/variants.cljc
@@ -8,7 +8,9 @@
  (:require
   [app.common.test-helpers.components :as thc]
   [app.common.test-helpers.ids-map :as thi]
-   [app.common.test-helpers.shapes :as ths]))
+   [app.common.test-helpers.shapes :as ths]
+   [app.common.types.shape :as cts]
+   [app.common.types.text :as txt]))

 (defn add-variant
  [file variant-label component1-label root1-label component2-label root2-label
@@ -37,3 +39,48 @@
        (thc/update-component component1-label {:variant-id variant-id :variant-properties [{:name "Property1" :value "p1v1"} {:name "Property2" :value "p2v1"}]})
        (thc/make-component component2-label root2-label)
        (thc/update-component component2-label {:variant-id variant-id :variant-properties [{:name "Property1" :value "p1v2"} {:name "Property2" :value "p2v2"}]}))))
+
+(defn add-variant-with-child
+  [file variant-label component1-label root1-label component2-label root2-label child1-label child2-label
+   & {:keys [child1-params child2-params]}]
+  (let [file (ths/add-sample-shape file variant-label :type :frame :is-variant-container true)
+        variant-id (thi/id variant-label)]
+    (-> file
+        (ths/add-sample-shape root2-label :type :frame :parent-label variant-label :variant-id variant-id :variant-name "Value2")
+        (ths/add-sample-shape root1-label :type :frame :parent-label variant-label :variant-id variant-id :variant-name "Value1")
+        (ths/add-sample-shape child1-label (assoc child1-params :parent-label root1-label))
+        (ths/add-sample-shape child2-label (assoc child2-params :parent-label root2-label))
+        (thc/make-component component1-label root1-label)
+        (thc/update-component component1-label {:variant-id variant-id :variant-properties [{:name "Property1" :value "Value1"}]})
+        (thc/make-component component2-label root2-label)
+        (thc/update-component component2-label {:variant-id variant-id :variant-properties [{:name "Property1" :value "Value2"}]}))))
+
+
+(defn add-variant-with-text
+  [file variant-label component1-label root1-label component2-label root2-label child1-label child2-label text1 text2
+   & {:keys [text1-params text2-params]}]
+  (let [text1 (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
+                  (update :content txt/change-text text1)
+                  (assoc :position-data nil
+                         :parent-label root1-label))
+        text2 (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
+                  (update :content txt/change-text text2)
+                  (assoc :position-data nil
+                         :parent-label root2-label))
+
+        file (ths/add-sample-shape file variant-label :type :frame :is-variant-container true)
+        variant-id (thi/id variant-label)]
+    (-> file
+
+        (ths/add-sample-shape root2-label :type :frame :parent-label variant-label :variant-id variant-id :variant-name "Value2")
+        (ths/add-sample-shape root1-label :type :frame :parent-label variant-label :variant-id variant-id :variant-name "Value1")
+        (ths/add-sample-shape child1-label
+                              (merge text1
+                                     text1-params))
+        (ths/add-sample-shape child2-label
+                              (merge text2
+                                     text2-params))
+        (thc/make-component component1-label root1-label)
+        (thc/update-component component1-label {:variant-id variant-id :variant-properties [{:name "Property1" :value "Value1"}]})
+        (thc/make-component component2-label root2-label)
+        (thc/update-component component2-label {:variant-id variant-id :variant-properties [{:name "Property1" :value "Value2"}]}))))
--- a/common/src/app/common/text.cljc
+++ b/common/src/app/common/text.cljc
@@ -5,186 +5,16 @@
 ;; Copyright (c) KALEIDOS INC

 (ns app.common.text
+  "Legacy editor helpers (draftjs).
+
+  NOTE: this namespace should be not used for new code related to texts"
  (:require
-   [app.common.colors :as clr]
   [app.common.data :as d]
   [app.common.data.macros :as dm]
   [app.common.transit :as t]
-   [clojure.walk :as walk]
+   [app.common.types.text :as types.text]
   [cuerdas.core :as str]))

-;; -- Attrs
-
-(def text-typography-attrs
-  [:typography-ref-id
-   :typography-ref-file])
-
-(def text-fill-attrs
-  [:fill-color
-   :fill-opacity
-   :fill-color-ref-id
-   :fill-color-ref-file
-   :fill-color-gradient])
-
-(def text-font-attrs
-  [:font-id
-   :font-family
-   :font-variant-id
-   :font-size
-   :font-weight
-   :font-style])
-
-(def text-align-attrs
-  [:text-align])
-
-(def text-direction-attrs
-  [:text-direction])
-
-(def text-spacing-attrs
-  [:line-height
-   :letter-spacing])
-
-(def text-valign-attrs
-  [:vertical-align])
-
-(def text-decoration-attrs
-  [:text-decoration])
-
-(def text-transform-attrs
-  [:text-transform])
-
-(def text-fills
-  [:fills])
-
-(def shape-attrs
-  [:grow-type])
-
-(def root-attrs
-  text-valign-attrs)
-
-(def paragraph-attrs
-  (d/concat-vec
-   text-align-attrs
-   text-direction-attrs))
-
-(def text-node-attrs
-  (d/concat-vec
-   text-typography-attrs
-   text-font-attrs
-   text-spacing-attrs
-   text-decoration-attrs
-   text-transform-attrs
-   text-fills))
-
-(def text-all-attrs (d/concat-set shape-attrs root-attrs paragraph-attrs text-node-attrs))
-
-(def text-style-attrs
-  (d/concat-vec root-attrs paragraph-attrs text-node-attrs))
-
-(def default-root-attrs
-  {:vertical-align "top"})
-
-(def default-text-attrs
-  {:typography-ref-file nil
-   :typography-ref-id nil
-   :font-id "sourcesanspro"
-   :font-family "sourcesanspro"
-   :font-variant-id "regular"
-   :font-size "14"
-   :font-weight "400"
-   :font-style "normal"
-   :line-height "1.2"
-   :letter-spacing "0"
-   :text-transform "none"
-   :text-align "left"
-   :text-decoration "none"
-   :text-direction "ltr"
-   :fills [{:fill-color clr/black
-            :fill-opacity 1}]})
-
-(def default-attrs
-  (merge default-root-attrs default-text-attrs))
-
-(def typography-fields
-  [:font-id
-   :font-family
-   :font-variant-id
-   :font-size
-   :font-weight
-   :font-style
-   :line-height
-   :letter-spacing
-   :text-transform])
-
-(def default-typography
-  (merge
-   {:name "Source Sans Pro Regular"}
-   (select-keys default-text-attrs typography-fields)))
-
-(defn node-seq
-  ([root] (node-seq identity root))
-  ([match? root]
-   (->> (tree-seq map? :children root)
-        (filter match?)
-        (seq))))
-
-(defn is-text-node?
-  [node]
-  (and (nil? (:type node))
-       (string? (:text node))))
-
-(defn is-paragraph-set-node?
-  [node]
-  (= "paragraph-set" (:type node)))
-
-(defn is-paragraph-node?
-  [node]
-  (= "paragraph" (:type node)))
-
-(defn is-root-node?
-  [node]
-  (= "root" (:type node)))
-
-(defn is-node?
-  [node]
-  (or ^boolean (is-text-node? node)
-      ^boolean (is-paragraph-node? node)
-      ^boolean (is-paragraph-set-node? node)
-      ^boolean (is-root-node? node)))
-
-(defn is-content-node?
-  "Only matches content nodes, ignoring the paragraph-set nodes."
-  [node]
-  (or ^boolean (is-text-node? node)
-      ^boolean (is-paragraph-node? node)
-      ^boolean (is-root-node? node)))
-
-(defn transform-nodes
-  ([transform root]
-   (transform-nodes identity transform root))
-  ([pred transform root]
-   (walk/postwalk
-    (fn [item]
-      (if (and (is-node? item) (pred item))
-        (transform item)
-        item))
-    root)))
-
-(defn update-text-content
-  [shape pred-fn update-fn attrs]
-  (let [update-attrs-fn #(update-fn % attrs)
-        transform   #(transform-nodes pred-fn update-attrs-fn %)]
-    (-> shape
-        (update :content transform))))
-
-(defn generate-shape-name
-  [text]
-  (subs text 0 (min 280 (count text))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; DraftJS <-> Penpot Conversion
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
 (defn encode-style-value
  [v]
  (t/encode-str v))
@@ -369,7 +199,7 @@
             :entityRanges []
             :inlineStyleRanges (calc-ranges paragraph)})]

-    {:blocks (reduce #(conj %1 (build-block %2)) [] (node-seq #(= (:type %) "paragraph") root))
+    {:blocks (reduce #(conj %1 (build-block %2)) [] (types.text/node-seq #(= (:type %) "paragraph") root))
     :entityMap {}}))

 (defn content->text+styles
@@ -377,13 +207,13 @@
  [node]
  (letfn
   [(rec-style-text-map [acc node style]
-      (let [node-style (merge style (select-keys node text-all-attrs))
+      (let [node-style (merge style (select-keys node types.text/text-all-attrs))
            head (or (-> acc first) [{} ""])
            [head-style head-text] head

            new-acc
            (cond
-              (not (is-text-node? node))
+              (not (types.text/is-text-node? node))
              (reduce #(rec-style-text-map %1 %2 node-style) acc (:children node))

              (not= head-style node-style)
@@ -403,82 +233,6 @@
    (-> (rec-style-text-map [] node {})
        reverse)))

-(defn content-range->text+styles
-  "Given a root node of a text content extracts the texts with its associated styles"
-  [node start end]
-  (let [sss (content->text+styles node)]
-    (loop [styles  (seq sss)
-           taking? false
-           acc      0
-           result   []]
-      (if styles
-        (let [[node-style text] (first styles)
-              from      acc
-              to        (+ acc (count text))
-              taking?   (or taking? (and (<= from start) (< start to)))
-              text      (subs text (max 0 (- start acc)) (- end acc))
-              result    (cond-> result
-                          (and taking? (d/not-empty? text))
-                          (conj (assoc node-style :text text)))
-              continue? (or (> from end) (>= end to))]
-          (recur (when continue? (rest styles)) taking? to result))
-        result))))
-
-(defn content->text
-  "Given a root node of a text content extracts the texts with its associated styles"
-  [content]
-  (letfn [(add-node [acc node]
-            (cond
-              (is-paragraph-node? node)
-              (conj acc [])
-
-              (is-text-node? node)
-              (let [i (dec (count acc))]
-                (update acc i conj (:text node)))
-
-              :else
-              acc))]
-    (->> (node-seq content)
-         (reduce add-node [])
-         (map #(str/join "" %))
-         (str/join "\n"))))
-
-(defn change-text
-  "Changes the content of the text shape to use the text as argument. Will use the styles of the
-   first paragraph and text that is present in the shape (and override the rest)"
-  [shape text]
-  (let [content (:content shape)
-
-        root-styles (select-keys content root-attrs)
-
-        paragraph-style (merge
-                         default-text-attrs
-                         (select-keys (->> content (node-seq is-paragraph-node?) first) text-all-attrs))
-        text-style (merge
-                    default-text-attrs
-                    (select-keys (->> content (node-seq is-text-node?) first) text-all-attrs))
-
-        paragraph-texts (str/split text "\n")
-
-        paragraphs
-        (->> paragraph-texts
-             (mapv
-              (fn [pt]
-                (merge
-                 paragraph-style
-                 {:type "paragraph"
-                  :children [(merge {:text pt} text-style)]}))))
-
-        new-content
-        (d/patch-object
-         {:type "root"
-          :children
-          [{:type "paragraph-set"
-            :children paragraphs}]}
-         root-styles)]
-
-    (assoc shape :content new-content)))
-
 (defn index-content
  "Adds a property `$id` that identifies the current node inside"
  ([content]
--- a/common/src/app/common/types/color.cljc
+++ b/common/src/app/common/types/color.cljc
@@ -5,15 +5,15 @@
 ;; Copyright (c) KALEIDOS INC

 (ns app.common.types.color
+  (:refer-clojure :exclude [test])
  (:require
   [app.common.data :as d]
   [app.common.data.macros :as dm]
+   [app.common.math :as mth]
   [app.common.media :as cm]
   [app.common.schema :as sm]
   [app.common.schema.generators :as sg]
   [app.common.schema.openapi :as-alias oapi]
-   [app.common.text :as txt]
-   [app.common.time :as dt]
   [app.common.types.plugins :as ctpg]
   [clojure.set :as set]
   [cuerdas.core :as str]))
@@ -117,6 +117,7 @@
   [:ref-id {:optional true} ::sm/uuid]
   [:ref-file {:optional true} ::sm/uuid]])

+;; This schema represent an "applied color"
 (def schema:color
  [:and
   [:merge {:title "Color"}
@@ -162,11 +163,183 @@
 (def check-color
  (sm/check-fn schema:color :hint "expected valid color"))

+;: FIXME: maybe declare it under types.library ?
 (def check-library-color
  (sm/check-fn schema:library-color :hint "expected valid color"))

+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HELPERS
+;; CONSTANTS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:const black "#000000")
+(def ^:const default-layout "#DE4762")
+(def ^:const gray-20 "#B1B2B5")
+(def ^:const info "#59B9E2")
+(def ^:const test "#fabada")
+(def ^:const white "#FFFFFF")
+(def ^:const warning "#FC8802")
+
+;; new-css-system colors
+(def ^:const new-primary "#7efff5")
+(def ^:const new-danger "#ff3277")
+(def ^:const new-warning "#fe4811")
+(def ^:const new-primary-light "#6911d4")
+(def ^:const background-quaternary "#2e3434")
+(def ^:const background-quaternary-light "#eef0f2")
+(def ^:const canvas "#E8E9EA")
+
+(def names
+  {"aliceblue" "#f0f8ff"
+   "antiquewhite" "#faebd7"
+   "aqua" "#00ffff"
+   "aquamarine" "#7fffd4"
+   "azure" "#f0ffff"
+   "beige" "#f5f5dc"
+   "bisque" "#ffe4c4"
+   "black" "#000000"
+   "blanchedalmond" "#ffebcd"
+   "blue" "#0000ff"
+   "blueviolet" "#8a2be2"
+   "brown" "#a52a2a"
+   "burlywood" "#deb887"
+   "cadetblue" "#5f9ea0"
+   "chartreuse" "#7fff00"
+   "chocolate" "#d2691e"
+   "coral" "#ff7f50"
+   "cornflowerblue" "#6495ed"
+   "cornsilk" "#fff8dc"
+   "crimson" "#dc143c"
+   "cyan" "#00ffff"
+   "darkblue" "#00008b"
+   "darkcyan" "#008b8b"
+   "darkgoldenrod" "#b8860b"
+   "darkgray" "#a9a9a9"
+   "darkgreen" "#006400"
+   "darkgrey" "#a9a9a9"
+   "darkkhaki" "#bdb76b"
+   "darkmagenta" "#8b008b"
+   "darkolivegreen" "#556b2f"
+   "darkorange" "#ff8c00"
+   "darkorchid" "#9932cc"
+   "darkred" "#8b0000"
+   "darksalmon" "#e9967a"
+   "darkseagreen" "#8fbc8f"
+   "darkslateblue" "#483d8b"
+   "darkslategray" "#2f4f4f"
+   "darkslategrey" "#2f4f4f"
+   "darkturquoise" "#00ced1"
+   "darkviolet" "#9400d3"
+   "deeppink" "#ff1493"
+   "deepskyblue" "#00bfff"
+   "dimgray" "#696969"
+   "dimgrey" "#696969"
+   "dodgerblue" "#1e90ff"
+   "firebrick" "#b22222"
+   "floralwhite" "#fffaf0"
+   "forestgreen" "#228b22"
+   "fuchsia" "#ff00ff"
+   "gainsboro" "#dcdcdc"
+   "ghostwhite" "#f8f8ff"
+   "gold" "#ffd700"
+   "goldenrod" "#daa520"
+   "gray" "#808080"
+   "green" "#008000"
+   "greenyellow" "#adff2f"
+   "grey" "#808080"
+   "honeydew" "#f0fff0"
+   "hotpink" "#ff69b4"
+   "indianred" "#cd5c5c"
+   "indigo" "#4b0082"
+   "ivory" "#fffff0"
+   "khaki" "#f0e68c"
+   "lavender" "#e6e6fa"
+   "lavenderblush" "#fff0f5"
+   "lawngreen" "#7cfc00"
+   "lemonchiffon" "#fffacd"
+   "lightblue" "#add8e6"
+   "lightcoral" "#f08080"
+   "lightcyan" "#e0ffff"
+   "lightgoldenrodyellow" "#fafad2"
+   "lightgray" "#d3d3d3"
+   "lightgreen" "#90ee90"
+   "lightgrey" "#d3d3d3"
+   "lightpink" "#ffb6c1"
+   "lightsalmon" "#ffa07a"
+   "lightseagreen" "#20b2aa"
+   "lightskyblue" "#87cefa"
+   "lightslategray" "#778899"
+   "lightslategrey" "#778899"
+   "lightsteelblue" "#b0c4de"
+   "lightyellow" "#ffffe0"
+   "lime" "#00ff00"
+   "limegreen" "#32cd32"
+   "linen" "#faf0e6"
+   "magenta" "#ff00ff"
+   "maroon" "#800000"
+   "mediumaquamarine" "#66cdaa"
+   "mediumblue" "#0000cd"
+   "mediumorchid" "#ba55d3"
+   "mediumpurple" "#9370db"
+   "mediumseagreen" "#3cb371"
+   "mediumslateblue" "#7b68ee"
+   "mediumspringgreen" "#00fa9a"
+   "mediumturquoise" "#48d1cc"
+   "mediumvioletred" "#c71585"
+   "midnightblue" "#191970"
+   "mintcream" "#f5fffa"
+   "mistyrose" "#ffe4e1"
+   "moccasin" "#ffe4b5"
+   "navajowhite" "#ffdead"
+   "navy" "#000080"
+   "oldlace" "#fdf5e6"
+   "olive" "#808000"
+   "olivedrab" "#6b8e23"
+   "orange" "#ffa500"
+   "orangered" "#ff4500"
+   "orchid" "#da70d6"
+   "palegoldenrod" "#eee8aa"
+   "palegreen" "#98fb98"
+   "paleturquoise" "#afeeee"
+   "palevioletred" "#db7093"
+   "papayawhip" "#ffefd5"
+   "peachpuff" "#ffdab9"
+   "peru" "#cd853f"
+   "pink" "#ffc0cb"
+   "plum" "#dda0dd"
+   "powderblue" "#b0e0e6"
+   "purple" "#800080"
+   "red" "#ff0000"
+   "rosybrown" "#bc8f8f"
+   "royalblue" "#4169e1"
+   "saddlebrown" "#8b4513"
+   "salmon" "#fa8072"
+   "sandybrown" "#f4a460"
+   "seagreen" "#2e8b57"
+   "seashell" "#fff5ee"
+   "sienna" "#a0522d"
+   "silver" "#c0c0c0"
+   "skyblue" "#87ceeb"
+   "slateblue" "#6a5acd"
+   "slategray" "#708090"
+   "slategrey" "#708090"
+   "snow" "#fffafa"
+   "springgreen" "#00ff7f"
+   "steelblue" "#4682b4"
+   "tan" "#d2b48c"
+   "teal" "#008080"
+   "thistle" "#d8bfd8"
+   "tomato" "#ff6347"
+   "turquoise" "#40e0d0"
+   "violet" "#ee82ee"
+   "wheat" "#f5deb3"
+   "white" "#ffffff"
+   "whitesmoke" "#f5f5f5"
+   "yellow" "#ffff00"
+   "yellowgreen" "#9acd32"})
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; HELPERS (FIXME: this helpers are not in the correct place)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 (defn library-color->color
@@ -180,42 +353,6 @@
                 :path (get lcolor :path)
                 :name (get lcolor :name))))

-;; --- fill
-
-(defn fill->color
-  [fill]
-  (d/without-nils
-   {:color (:fill-color fill)
-    :opacity (:fill-opacity fill)
-    :gradient (:fill-color-gradient fill)
-    :image (:fill-image fill)
-    :ref-id (:fill-color-ref-id fill)
-    :ref-file (:fill-color-ref-file fill)}))
-
-(defn set-fill-color
-  [shape position color opacity gradient image]
-  (update-in shape [:fills position]
-             (fn [fill]
-               (d/without-nils (assoc fill
-                                      :fill-color color
-                                      :fill-opacity opacity
-                                      :fill-color-gradient gradient
-                                      :fill-image image)))))
-
-(defn attach-fill-color
-  [shape position ref-id ref-file]
-  (d/update-in-when shape [:fills position]
-                    (fn [fill]
-                      (-> fill
-                          (assoc :fill-color-ref-file ref-file)
-                          (assoc :fill-color-ref-id ref-id)))))
-
-(defn detach-fill-color
-  [shape position]
-  (d/update-in-when shape [:fills position] dissoc :fill-color-ref-id :fill-color-ref-file))
-
-;; stroke
-
 (defn stroke->color
  [stroke]
  (d/without-nils
@@ -226,59 +363,10 @@
    :ref-id (:stroke-color-ref-id stroke)
    :ref-file (:stroke-color-ref-file stroke)}))

-(defn set-stroke-color
-  [shape position color opacity gradient image]
-  (d/update-in-when shape [:strokes position]
-                    (fn [stroke]
-                      (-> stroke
-                          (assoc :stroke-color color)
-                          (assoc :stroke-opacity opacity)
-                          (assoc :stroke-color-gradient gradient)
-                          (assoc :stroke-image image)
-                          (d/without-nils)))))
-
-(defn attach-stroke-color
-  [shape position ref-id ref-file]
-  (d/update-in-when shape [:strokes position]
-                    (fn [stroke]
-                      (-> stroke
-                          (assoc :stroke-color-ref-id ref-id)
-                          (assoc :stroke-color-ref-file ref-file)))))
-
-(defn detach-stroke-color
-  [shape position]
-  (d/update-in-when shape [:strokes position] dissoc :stroke-color-ref-id :stroke-color-ref-file))
-
-;; shadow
-
 (defn shadow->color
  [shadow]
  (:color shadow))

-(defn set-shadow-color
-  [shape position color opacity gradient]
-  (d/update-in-when shape [:shadow position :color]
-                    (fn [shadow-color]
-                      (-> shadow-color
-                          (assoc :color color)
-                          (assoc :opacity opacity)
-                          (assoc :gradient gradient)
-                          (d/without-nils)))))
-
-(defn attach-shadow-color
-  [shape position ref-id ref-file]
-  (d/update-in-when shape [:shadow position :color]
-                    (fn [color]
-                      (-> color
-                          (assoc :ref-id ref-id)
-                          (assoc :ref-file ref-file)))))
-
-(defn detach-shadow-color
-  [shape position]
-  (d/update-in-when shape [:shadow position :color] dissoc :ref-id :ref-file))
-
-;; grid
-
 ;: FIXME: revisit colors...... WTF
 (defn grid->color
  [grid]
@@ -290,291 +378,374 @@
      :ref-id (-> color :id)
      :ref-file (-> color :file-id)})))

-(defn set-grid-color
-  [shape position color opacity gradient]
-  (d/update-in-when shape [:grids position :params :color]
-                    (fn [grid-color]
-                      (-> grid-color
-                          (assoc :color color)
-                          (assoc :opacity opacity)
-                          (assoc :gradient gradient)
-                          (d/without-nils)))))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; HELPERS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-(defn attach-grid-color
-  [shape position ref-id ref-file]
-  (d/update-in-when shape [:grids position :params :color]
-                    (fn [color]
-                      (-> color
-                          (assoc :ref-id ref-id)
-                          (assoc :ref-file ref-file)))))
+(def ^:private hex-color-re
+  #"\#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})")

-(defn detach-grid-color
-  [shape position]
-  (d/update-in-when shape [:grids position :params :color] dissoc :ref-id :ref-file))
+(def ^:private rgb-color-re
+  #"(?:|rgb)\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\)")

-;; --- Helpers for all colors in a shape
-
-(defn get-text-node-colors
-  "Get all colors used by a node of a text shape"
-  [node]
-  (concat (map fill->color (:fills node))
-          (map stroke->color (:strokes node))))
-
-(defn get-all-colors
-  "Get all colors used by a shape, in any section."
-  [shape]
-  (concat (map fill->color (:fills shape))
-          (map stroke->color (:strokes shape))
-          (map shadow->color (:shadow shape))
-          (when (= (:type shape) :frame)
-            (map grid->color (:grids shape)))
-          (when (= (:type shape) :text)
-            (reduce (fn [colors node]
-                      (concat colors (get-text-node-colors node)))
-                    ()
-                    (txt/node-seq (:content shape))))))
-
-(defn uses-library-colors?
-  "Check if the shape uses any color in the given library."
-  [shape library-id]
-  (let [all-colors (get-all-colors shape)]
-    (some #(and (some? (:ref-id %))
-                (= (:ref-file %) library-id))
-          all-colors)))
-
-(defn uses-library-color?
-  "Check if the shape uses the given library color."
-  [shape library-id color-id]
-  (let [all-colors (get-all-colors shape)]
-    (some #(and (= (:ref-id %) color-id)
-                (= (:ref-file %) library-id))
-          all-colors)))
-
-(defn- process-shape-colors
-  "Execute an update function on all colors of a shape."
-  [shape process-fn]
-  (let [process-fill (fn [shape [position fill]]
-                       (process-fn shape
-                                   position
-                                   (fill->color fill)
-                                   set-fill-color
-                                   attach-fill-color
-                                   detach-fill-color))
-
-        process-stroke (fn [shape [position stroke]]
-                         (process-fn shape
-                                     position
-                                     (stroke->color stroke)
-                                     set-stroke-color
-                                     attach-stroke-color
-                                     detach-stroke-color))
-
-        process-shadow (fn [shape [position shadow]]
-                         (process-fn shape
-                                     position
-                                     (shadow->color shadow)
-                                     set-shadow-color
-                                     attach-shadow-color
-                                     detach-shadow-color))
-
-        process-grid (fn [shape [position grid]]
-                       (process-fn shape
-                                   position
-                                   (grid->color grid)
-                                   set-grid-color
-                                   attach-grid-color
-                                   detach-grid-color))
-
-        process-text-node (fn [node]
-                            (as-> node $
-                              (reduce process-fill $ (d/enumerate (:fills $)))
-                              (reduce process-stroke $ (d/enumerate (:strokes $)))))
-
-        process-text (fn [shape]
-                       (let [content     (:content shape)
-                             new-content (txt/transform-nodes process-text-node content)]
-                         (if (not= content new-content)
-                           (assoc shape :content new-content)
-                           shape)))]
-
-    (as-> shape $
-      (reduce process-fill $ (d/enumerate (:fills $)))
-      (reduce process-stroke $ (d/enumerate (:strokes $)))
-      (reduce process-shadow $ (d/enumerate (:shadow $)))
-      (reduce process-grid $ (d/enumerate (:grids $)))
-      (process-text $))))
-
-(defn remap-colors
-  "Change the shape so that any use of the given color now points to
-  the given library."
-  [shape library-id color]
-  (letfn [(remap-color [shape position shape-color _ attach-fn _]
-            (if (= (:ref-id shape-color) (:id color))
-              (attach-fn shape
-                         position
-                         (:id color)
-                         library-id)
-              shape))]
-
-    (process-shape-colors shape remap-color)))
-
-(defn sync-shape-colors
-  "Look for usage of any color of the given library inside the shape,
-  and, in this case, copy the library color into the shape."
-  [shape library-id library-colors]
-  (letfn [(sync-color [shape position shape-color set-fn _ detach-fn]
-            (if (= (:ref-file shape-color) library-id)
-              (let [library-color (get library-colors (:ref-id shape-color))]
-                (if (some? library-color)
-                  (set-fn shape
-                          position
-                          (:color library-color)
-                          (:opacity library-color)
-                          (:gradient library-color)
-                          (:image library-color))
-                  (detach-fn shape position)))
-              shape))]
-
-    (process-shape-colors shape sync-color)))
-
-(defn- stroke->color-att
-  [stroke file-id libraries]
-  (let [ref-file      (:stroke-color-ref-file stroke)
-        ref-id        (:stroke-color-ref-id stroke)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        has-color?    (or (:stroke-color stroke)
-                          (:stroke-color-gradient stroke))
-        attrs         (cond-> (stroke->color stroke)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-id :ref-file))]
-    (when has-color?
-      {:attrs attrs
-       :prop :stroke
-       :shape-id (:shape-id stroke)
-       :index (:index stroke)})))
-
-(defn- shadow->color-att
-  [shadow file-id libraries]
-  (let [color         (get shadow :color)
-        ref-file      (get color :ref-file)
-        ref-id        (get color :ref-id)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        attrs         (cond-> (shadow->color shadow)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-file :ref-id))]
-    {:attrs attrs
-     :prop :shadow
-     :shape-id (:shape-id shadow)
-     :index (:index shadow)}))
-
-(defn- text->color-att
-  [fill file-id libraries]
-  (let [ref-file      (:fill-color-ref-file fill)
-        ref-id        (:fill-color-ref-id fill)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        attrs         (cond-> (fill->color fill)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-file :ref-id))]
-
-    {:attrs attrs
-     :prop :content
-     :shape-id (:shape-id fill)
-     :index (:index fill)}))
-
-(defn- treat-node
-  [node shape-id]
-  (map-indexed #(assoc %2 :shape-id shape-id :index %1) node))
-
-(defn- extract-text-colors
-  [text file-id libraries]
-  (->> (txt/node-seq txt/is-text-node? (:content text))
-       (map :fills)
-       (mapcat #(treat-node % (:id text)))
-       (map #(text->color-att % file-id libraries))))
-
-(defn- fill->color-att
-  [fill file-id libraries]
-  (let [ref-file      (:fill-color-ref-file fill)
-        ref-id        (:fill-color-ref-id fill)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        has-color?    (or (:fill-color fill)
-                          (:fill-color-gradient fill))
-        attrs         (cond-> (fill->color fill)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-file :ref-id))]
-
-    (when has-color?
-      {:attrs attrs
-       :prop :fill
-       :shape-id (:shape-id fill)
-       :index (:index fill)})))
-
-(defn extract-all-colors
-  [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))]
-       (if (= :text (:type shape))
-         (-> result
-             (into (map #(stroke->color-att % file-id libraries)) stroke-obj)
-             (into (map #(shadow->color-att % file-id libraries)) shadow-obj)
-             (into (extract-text-colors shape file-id libraries)))
-
-         (-> result
-             (into (map #(fill->color-att % file-id libraries)) fill-obj)
-             (into (map #(stroke->color-att % file-id libraries)) stroke-obj)
-             (into (map #(shadow->color-att % file-id libraries)) shadow-obj)))))
-   []
-   shapes))
-
-(defn colors-seq
-  [file-data]
-  (vals (:colors file-data)))
-
-(defn- touch
+(defn valid-hex-color?
  [color]
-  (assoc color :modified-at (dt/now)))
+  (and (string? color)
+       (some? (re-matches hex-color-re color))))

-(defn add-color
-  [file-data color]
-  (update file-data :colors assoc (:id color) (touch color)))
+(defn parse-rgb
+  [color]
+  (let [result (re-matches rgb-color-re color)]
+    (when (some? result)
+      (let [r (parse-long (nth result 1))
+            g (parse-long (nth result 2))
+            b (parse-long (nth result 3))]
+        (when (and (<= 0 r 255) (<= 0 g 255) (<= 0 b 255))
+          [r g b])))))

-(defn get-color
-  [file-data color-id]
-  (get-in file-data [:colors color-id]))
+(defn valid-rgb-color?
+  [color]
+  (if (string? color)
+    (let [result (parse-rgb color)]
+      (some? result))
+    false))

-(defn get-ref-color
-  [library-data color]
-  (when (= (:ref-file color) (:id library-data))
-    (get-color library-data (:ref-id color))))
+(defn- normalize-hex
+  [color]
+  (if (= (count color) 4)  ; of the form #RGB
+    (-> color
+        (str/replace #"\#(.)(.)(.)" "#$1$1$2$2$3$3")
+        (str/lower))
+    (str/lower color)))

-(defn set-color
-  [file-data color]
-  (d/assoc-in-when file-data [:colors (:id color)] (touch color)))
+(defn rgb->str
+  [[r g b a]]
+  (if (some? a)
+    (str/ffmt "rgba(%,%,%,%)" r g b a)
+    (str/ffmt "rgb(%,%,%)" r g b)))

-(defn update-color
-  [file-data color-id f & args]
-  (d/update-in-when file-data [:colors color-id] #(-> (apply f % args)
-                                                      (touch))))
+(defn rgb->hsv
+  [[red green blue]]
+  (let [max (d/max red green blue)
+        min (d/min red green blue)
+        val max]
+    (if (= min max)
+      [0 0 val]
+      (let [delta (- max min)
+            sat   (/ delta max)
+            hue   (if (= red max)
+                    (/ (- green blue) delta)
+                    (if (= green max)
+                      (+ 2 (/ (- blue red) delta))
+                      (+ 4 (/ (- red green) delta))))
+            hue   (* 60 hue)
+            hue   (if (< hue 0)
+                    (+ hue 360)
+                    hue)
+            hue   (if (> hue 360)
+                    (- hue 360)
+                    hue)]
+        [hue sat val]))))

-(defn delete-color
-  [file-data color-id]
-  (update file-data :colors dissoc color-id))
+(defn hsv->rgb
+  [[h s brightness]]
+  (if (= s 0)
+    [brightness brightness brightness]
+    (let [sextant    (int (mth/floor (/ h 60)))
+          remainder  (- (/ h 60) sextant)
+          brightness (d/nilv brightness 0)
+          val1       (int (* brightness (- 1 s)))
+          val2       (int (* brightness (- 1 (* s remainder))))
+          val3       (int (* brightness (- 1 (* s (- 1 remainder)))))]
+      (case sextant
+        1 [val2 brightness val1]
+        2 [val1 brightness val3]
+        3 [val1 val2 brightness]
+        4 [val3 val1 brightness]
+        5 [brightness val1 val2]
+        6 [brightness val3 val1]
+        0 [brightness val3 val1]))))

-(defn used-colors-changed-since
-  "Find all usages of any color in the library by the given shape, of colors
-   that have ben modified after the date."
-  [shape library since-date]
-  (->> (get-all-colors shape)
-       (keep #(get-ref-color (:data library) %))
-       (remove #(< (:modified-at %) since-date))  ;; Note that :modified-at may be nil
-       (map (fn [color] {:shape-id (:id shape)
-                         :asset-id (:id color)
-                         :asset-type :color}))))
+(defn hex->rgb
+  [color]
+  (try
+    (let [rgb #?(:clj (Integer/parseInt (subs color 1) 16)
+                 :cljs (js/parseInt (subs color 1) 16))
+          r   (bit-shift-right rgb 16)
+          g   (bit-and (bit-shift-right rgb 8) 255)
+          b   (bit-and rgb 255)]
+      [r g b])
+    (catch #?(:clj Throwable :cljs :default) _cause
+      [0 0 0])))

+(defn hex->lum
+  [color]
+  (let [[r g b] (hex->rgb color)]
+    (mth/sqrt (+ (* 0.241 r)
+                 (* 0.691 g)
+                 (* 0.068 b)))))
+
+(defn- int->hex
+  "Convert integer to hex string"
+  [v]
+  #?(:clj  (Integer/toHexString v)
+     :cljs (.toString v 16)))
+
+(defn rgb->hex
+  [[r g b]]
+  (let [r (int r)
+        g (int g)
+        b (int b)]
+    (if (or (not= r (bit-and r 255))
+            (not= g (bit-and g 255))
+            (not= b (bit-and b 255)))
+      (throw (ex-info "not valid rgb" {:r r :g g :b b}))
+      (let [rgb (bit-or (bit-shift-left r 16)
+                        (bit-shift-left g 8) b)]
+        (if (< r 16)
+          (dm/str "#" (subs (int->hex (bit-or 0x1000000 rgb)) 1))
+          (dm/str "#" (int->hex rgb)))))))
+
+(defn rgb->hsl
+  [[r g b]]
+  (let [norm-r (/ r 255.0)
+        norm-g (/ g 255.0)
+        norm-b (/ b 255.0)
+        max    (d/max norm-r norm-g norm-b)
+        min    (d/min norm-r norm-g norm-b)
+        l      (/ (+ max min) 2.0)
+        h      (if (= max min) 0
+                   (if (= max norm-r)
+                     (* 60 (/ (- norm-g norm-b) (- max min)))
+                     (if (= max norm-g)
+                       (+ 120 (* 60 (/ (- norm-b norm-r) (- max min))))
+                       (+ 240 (* 60 (/ (- norm-r norm-g) (- max min)))))))
+        s      (if (and (> l 0) (<= l 0.5))
+                 (/ (- max min) (* 2 l))
+                 (/ (- max min) (- 2 (* 2 l))))]
+    [(mod (+ h 360) 360) s l]))
+
+(defn hex->hsv
+  [v]
+  (-> v hex->rgb rgb->hsv))
+
+(defn hex->rgba
+  [data opacity]
+  (-> (hex->rgb data)
+      (conj opacity)))
+
+(defn hex->hsl [hex]
+  (try
+    (-> hex hex->rgb rgb->hsl)
+    (catch #?(:clj Throwable :cljs :default) _e
+      [0 0 0])))
+
+(defn hex->hsla
+  [data opacity]
+  (-> (hex->hsl data)
+      (conj opacity)))
+
+(defn format-hsla
+  [[h s l a]]
+  (let [precision 2
+        rounded-h (int h)
+        rounded-s (d/format-number (* 100 s) precision)
+        rounded-l (d/format-number (* 100 l) precision)
+        rounded-a (d/format-number a precision)]
+    (str/concat "" rounded-h ", " rounded-s "%, " rounded-l "%, " rounded-a)))
+
+(defn format-rgba
+  [[r g b a]]
+  (let [precision 2
+        rounded-a (d/format-number a precision)]
+    (str/ffmt "%, %, %, %" r g b rounded-a)))
+
+(defn- hue->rgb
+  "Helper for hsl->rgb"
+  [v1 v2 vh]
+  (let [vh (if (< vh 0)
+             (+ vh 1)
+             (if (> vh 1)
+               (- vh 1)
+               vh))]
+    (cond
+      (< (* 6 vh) 1) (+ v1 (* (- v2 v1) 6 vh))
+      (< (* 2 vh) 1) v2
+      (< (* 3 vh) 2) (+ v1 (* (- v2 v1) (- (/ 2 3) vh) 6))
+      :else v1)))
+
+(defn hsl->rgb
+  [[h s l]]
+  (if (= s 0)
+    (let [o (* l 255)]
+      [o o o])
+    (let [norm-h (/ h 360.0)
+          temp2  (if (< l 0.5)
+                   (* l (+ 1 s))
+                   (- (+ l s)
+                      (* s l)))
+          temp1  (- (* l 2) temp2)]
+
+      [(mth/round (* 255 (hue->rgb temp1 temp2 (+ norm-h (/ 1 3)))))
+       (mth/round (* 255 (hue->rgb temp1 temp2 norm-h)))
+       (mth/round (* 255 (hue->rgb temp1 temp2 (- norm-h (/ 1 3)))))])))
+
+(defn hsl->hex
+  [v]
+  (-> v hsl->rgb rgb->hex))
+
+(defn hsl->hsv
+  [hsl]
+  (-> hsl hsl->rgb rgb->hsv))
+
+(defn hsv->hex
+  [hsv]
+  (-> hsv hsv->rgb rgb->hex))
+
+(defn hsv->hsl
+  [hsv]
+  (-> hsv hsv->hex hex->hsl))
+
+(defn expand-hex
+  [v]
+  (cond
+    (re-matches #"^[0-9A-Fa-f]$" v)
+    (dm/str v v v v v v)
+
+    (re-matches #"^[0-9A-Fa-f]{2}$" v)
+    (dm/str v v v)
+
+    (re-matches #"^[0-9A-Fa-f]{3}$" v)
+    (let [a (nth v 0)
+          b (nth v 1)
+          c (nth v 2)]
+      (dm/str a a b b c c))
+
+    :else
+    v))
+
+(defn prepend-hash
+  [color]
+  (if (= "#" (subs color 0 1))
+    color
+    (dm/str "#" color)))
+
+(defn remove-hash
+  [color]
+  (if (str/starts-with? color "#")
+    (subs color 1)
+    color))
+
+(defn color-string?
+  [color]
+  (and (string? color)
+       (or (valid-hex-color? color)
+           (valid-rgb-color? color)
+           (contains? names color))))
+
+(defn parse
+  [color]
+  (when (string? color)
+    (if (or (valid-hex-color? color)
+            (valid-hex-color? (dm/str "#" color)))
+      (normalize-hex color)
+      (or (some-> (parse-rgb color) (rgb->hex))
+          (get names (str/lower color))))))
+
+(def color-names
+  (into [] (keys names)))
+
+(def empty-color
+  (into {} (map #(vector % nil)) [:color :id :file-id :gradient :opacity]))
+
+(defn next-rgb
+  "Given a color in rgb returns the next color"
+  [[r g b]]
+  (cond
+    (and (= 255 r) (= 255 g) (= 255 b))
+    (throw (ex-info "cannot get next color" {:r r :g g :b b}))
+
+    (and (= 255 g) (= 255 b))
+    [(inc r) 0 0]
+
+    (= 255 b)
+    [r (inc g) 0]
+
+    :else
+    [r g (inc b)]))
+
+(defn reduce-range
+  [value range]
+  (/ (mth/floor (* value range)) range))
+
+(defn sort-colors
+  [a b]
+  (let [[ah _ av] (hex->hsv (:color a))
+        [bh _ bv] (hex->hsv (:color b))
+        ah (reduce-range (/ ah 60) 8)
+        bh (reduce-range (/ bh 60) 8)
+        av (/ av 255)
+        bv (/ bv 255)
+        a (+ (* ah 100) (* av 10))
+        b (+ (* bh 100) (* bv 10))]
+    (compare a b)))
+
+(defn interpolate-color
+  [c1 c2 offset]
+  (cond
+    (<= offset (:offset c1)) (assoc c1 :offset offset)
+    (>= offset (:offset c2)) (assoc c2 :offset offset)
+
+    :else
+    (let [tr-offset (/ (- offset (:offset c1)) (- (:offset c2) (:offset c1)))
+          [r1 g1 b1] (hex->rgb (:color c1))
+          [r2 g2 b2] (hex->rgb (:color c2))
+          a1 (:opacity c1)
+          a2 (:opacity c2)
+          r (+ r1 (* (- r2 r1) tr-offset))
+          g (+ g1 (* (- g2 g1) tr-offset))
+          b (+ b1 (* (- b2 b1) tr-offset))
+          a (+ a1 (* (- a2 a1) tr-offset))]
+      {:color (rgb->hex [r g b])
+       :opacity a
+       :r r
+       :g g
+       :b b
+       :alpha a
+       :offset offset})))
+
+(defn- offset-spread
+  [from to num]
+  (->> (range 0 num)
+       (map #(mth/precision (+ from (* (/ (- to from) (dec num)) %)) 2))))
+
+(defn uniform-spread?
+  "Checks if the gradient stops are spread uniformly"
+  [stops]
+  (let [cs          (count stops)
+        from        (first stops)
+        to          (last stops)
+        expect-vals (offset-spread (:offset from) (:offset to) cs)
+
+        calculate-expected
+        (fn [expected-offset stop]
+          (and (mth/close? (:offset stop) expected-offset)
+               (let [ec (interpolate-color from to expected-offset)]
+                 (and (= (:color ec) (:color stop))
+                      (= (:opacity ec) (:opacity stop))))))]
+    (->> (map calculate-expected expect-vals stops)
+         (every? true?))))
+
+(defn uniform-spread
+  "Assign an uniform spread to the offset values for the gradient"
+  [from to num-stops]
+  (->> (offset-spread (:offset from) (:offset to) num-stops)
+       (mapv (fn [offset]
+               (interpolate-color from to offset)))))
+
+(defn interpolate-gradient
+  [stops offset]
+  (let [idx   (d/index-of-pred stops #(<= offset (:offset %)))
+        start (if (= idx 0) (first stops) (get stops (dec idx)))
+        end   (if (nil? idx) (last stops) (get stops idx))]
+    (interpolate-color start end offset)))
--- a/common/src/app/common/types/container.cljc
+++ b/common/src/app/common/types/container.cljc
@@ -15,9 +15,10 @@
   [app.common.types.component :as ctk]
   [app.common.types.components-list :as ctkl]
   [app.common.types.pages-list :as ctpl]
-   [app.common.types.plugins :as ctpg]
+   [app.common.types.plugins :refer [schema:plugin-data]]
   [app.common.types.shape-tree :as ctst]
   [app.common.types.shape.layout :as ctl]
+   [app.common.types.text :as cttx]
   [app.common.types.token :as ctt]
   [app.common.uuid :as uuid]
   [clojure.set :as set]))
@@ -29,21 +30,22 @@
 (def valid-container-types
  #{:page :component})

-(sm/register!
- ^{::sm/type ::container}
- [:map
-  [:id ::sm/uuid]
-  [:type {:optional true}
-   [::sm/one-of valid-container-types]]
-  [:name :string]
-  [:path {:optional true} [:maybe :string]]
-  [:modified-at {:optional true} ::sm/inst]
-  [:objects {:optional true}
-   [:map-of {:gen/max 10} ::sm/uuid :map]]
-  [:plugin-data {:optional true} ::ctpg/plugin-data]])
+(def schema:container
+  (sm/register!
+   ^{::sm/type ::container}
+   [:map
+    [:id ::sm/uuid]
+    [:type {:optional true}
+     [::sm/one-of valid-container-types]]
+    [:name :string]
+    [:path {:optional true} [:maybe :string]]
+    [:modified-at {:optional true} ::sm/inst]
+    [:objects {:optional true}
+     [:map-of {:gen/max 10} ::sm/uuid :map]]
+    [:plugin-data {:optional true} schema:plugin-data]]))

 (def check-container
-  (sm/check-fn ::container))
+  (sm/check-fn schema:container))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; HELPERS
@@ -293,8 +295,8 @@
  ([page component library-data position]
   (make-component-instance page component library-data position {}))
  ([page component library-data position
-    {:keys [main-instance? force-id force-frame-id keep-ids?]
-     :or {main-instance? false force-id nil force-frame-id nil keep-ids? false}}]
+    {:keys [main-instance? force-id force-frame-id keep-ids? force-parent-id]
+     :or {main-instance? false force-id nil force-frame-id nil keep-ids? false force-parent-id nil}}]
   (let [component-page  (ctpl/get-page library-data (:main-instance-page component))

         component-shape (-> (get-shape component-page (:main-instance-id component))
@@ -302,7 +304,6 @@
                             (assoc :frame-id uuid/zero)
                             (remove-swap-keep-attrs))

-
         orig-pos        (gpt/point (:x component-shape) (:y component-shape))
         delta           (gpt/subtract position orig-pos)

@@ -367,7 +368,7 @@

         [new-shape new-shapes _]
         (ctst/clone-shape component-shape
-                           frame-id
+                           (or force-parent-id frame-id)
                           (:objects component-page)
                           :update-new-shape update-new-shape
                           :force-id force-id
@@ -517,15 +518,31 @@
 ;; --- SHAPE UPDATE

 (defn- get-token-groups
+  "Get the sync attrs groups that are affected by changes in applied tokens.
+
+   If any token has been applied or unapplied in the shape, calculate the corresponding
+   attributes and get the groups. If some of the attributes are to be applied in the
+   content nodes of a text shape, also return the content groups (only for attributes,
+   so the text is not touched)."
  [shape new-applied-tokens]
-  (let [old-applied-tokens  (d/nilv (:applied-tokens shape) #{})
-        changed-token-attrs (filter #(not= (get old-applied-tokens %) (get new-applied-tokens %))
-                                    ctt/all-keys)
-        changed-groups      (into #{}
-                                  (comp (map ctt/token-attr->shape-attr)
-                                        (map #(get ctk/sync-attrs %))
-                                        (filter some?))
-                                  changed-token-attrs)]
+  (let [old-applied-tokens     (d/nilv (:applied-tokens shape) #{})
+        changed-token-attrs    (filter #(not= (get old-applied-tokens %) (get new-applied-tokens %))
+                                       ctt/all-keys)
+        text-shape?            (= (:type shape) :text)
+        attrs-in-text-content? (some #(ctt/attrs-in-text-content %)
+                                     changed-token-attrs)
+
+        changed-groups         (into #{}
+                                     (comp (map ctt/token-attr->shape-attr)
+                                           (map #(get ctk/sync-attrs %))
+                                           (filter some?))
+                                     changed-token-attrs)
+
+        changed-groups      (if (and text-shape?
+                                     (d/not-empty? changed-groups)
+                                     attrs-in-text-content?)
+                              (conj changed-groups :content-group :text-content-attribute)
+                              changed-groups)]
    changed-groups))

 (defn set-shape-attr
@@ -569,13 +586,16 @@
             (not equal?)
             (not (and ignore-geometry is-geometry?)))

+        content-diff-type (when (and (= (:type shape) :text) (= attr :content))
+                            (cttx/get-diff-type (:content shape) val))
+
        token-groups (if (= attr :applied-tokens)
                       (get-token-groups shape val)
                       #{})

        groups (cond-> token-groups
                 (and group (not equal?))
-                 (set/union #{group}))]
+                 (set/union #{group} content-diff-type))]
    (cond-> shape
      ;; Depending on the origin of the attribute change, we need or not to
      ;; set the "touched" flag for the group the attribute belongs to.
--- a/common/src/app/common/types/file.cljc
+++ b/common/src/app/common/types/file.cljc
@@ -16,16 +16,18 @@
   [app.common.geom.shapes.tree-seq :as gsts]
   [app.common.logging :as l]
   [app.common.schema :as sm]
-   [app.common.text :as ct]
   [app.common.types.color :as ctc]
   [app.common.types.component :as ctk]
   [app.common.types.components-list :as ctkl]
   [app.common.types.container :as ctn]
+   [app.common.types.library :as ctlb]
   [app.common.types.page :as ctp]
   [app.common.types.pages-list :as ctpl]
-   [app.common.types.plugins :as ctpg]
+   [app.common.types.plugins :refer [schema:plugin-data]]
+   [app.common.types.shape :as cts]
   [app.common.types.shape-tree :as ctst]
-   [app.common.types.tokens-lib :as ctl]
+   [app.common.types.text :as txt]
+   [app.common.types.tokens-lib :refer [schema:tokens-lib]]
   [app.common.types.typographies-list :as ctyl]
   [app.common.types.typography :as cty]
   [app.common.uuid :as uuid]
@@ -61,13 +63,13 @@
  [:map-of {:gen/max 5} ::sm/uuid ctc/schema:library-color])

 (def schema:components
-  [:map-of {:gen/max 5} ::sm/uuid ::ctn/container])
+  [:map-of {:gen/max 5} ::sm/uuid ctn/schema:container])

 (def schema:typographies
-  [:map-of {:gen/max 2} ::sm/uuid ::cty/typography])
+  [:map-of {:gen/max 2} ::sm/uuid cty/schema:typography])

 (def schema:pages-index
-  [:map-of {:gen/max 5} ::sm/uuid ::ctp/page])
+  [:map-of {:gen/max 5} ::sm/uuid ctp/schema:page])

 (def schema:options
  [:map {:title "FileOptions"}
@@ -82,8 +84,8 @@
   [:colors {:optional true} schema:colors]
   [:components {:optional true} schema:components]
   [:typographies {:optional true} schema:typographies]
-   [:plugin-data {:optional true} ::ctpg/plugin-data]
-   [:tokens-lib {:optional true} ::ctl/tokens-lib]])
+   [:plugin-data {:optional true} schema:plugin-data]
+   [:tokens-lib {:optional true} schema:tokens-lib]])

 (def schema:file
  "A schema for validate a file data structure; data is optional
@@ -242,6 +244,13 @@
      (cfh/make-container component-page :page))
    (cfh/make-container component :component)))

+(defn get-component-container-from-head
+  [instance-head libraries & {:keys [include-deleted?] :or {include-deleted? true}}]
+  (let [library-data   (-> (get-component-library libraries instance-head)
+                           :data)
+        component (ctkl/get-component library-data (:component-id instance-head) include-deleted?)]
+    (get-component-container library-data component)))
+
 (defn get-component-root
  "Retrieve the root shape of the component."
  [file-data component]
@@ -390,6 +399,47 @@
      (or (= slot-main slot-inst)
          (= (:id shape-main) slot-inst)))))

+(defn- find-next-related-swap-shape-id
+  "Go up from the chain of references shapes that will eventually lead to the shape
+   with swap-slot-id as id. Returns the next shape on the chain"
+  [parent swap-slot-id libraries]
+  (let [container         (get-component-container-from-head parent libraries)
+        objects           (:objects container)
+
+        children          (cfh/get-children objects (:id parent))
+        original-shape-id (->> children
+                               (filter #(= swap-slot-id (:id %)))
+                               first
+                               :id)]
+    (if original-shape-id
+      ;; Return the children which id is the swap-slot-id
+      original-shape-id
+      ;; No children with swap-slot-id as id, go up
+      (let [referenced-shape (find-ref-shape nil container libraries parent)
+            ;; Recursive call that will get the id of the next shape on
+            ;; the chain that ends on a shape with swap-slot-id as id
+            next-shape-id    (when referenced-shape
+                               (find-next-related-swap-shape-id referenced-shape swap-slot-id libraries))]
+        ;; Return the children which shape-ref points to the next-shape-id
+        (->> children
+             (filter #(= next-shape-id (:shape-ref %)))
+             first
+             :id)))))
+
+(defn find-ref-id-for-swapped
+  "When a shape has been swapped, find the original ref-id that the shape had
+   before the swap"
+  [shape container libraries]
+  (let [swap-slot   (ctk/get-swap-slot shape)
+        objects     (:objects container)
+
+        parent      (get objects (:parent-id shape))
+        parent-head (ctn/get-head-shape objects parent)
+        parent-ref  (find-ref-shape nil container libraries parent-head)]
+
+    (when (and swap-slot parent-ref)
+      (find-next-related-swap-shape-id parent-ref swap-slot libraries))))
+
 (defn get-component-shapes
  "Retrieve all shapes of the component"
  [file-data component]
@@ -473,7 +523,7 @@

 (defmethod uses-asset? :color
  [_ shape library-id color]
-  (ctc/uses-library-color? shape library-id (:id color)))
+  (cts/uses-library-color? shape library-id (:id color)))

 (defmethod uses-asset? :typography
  [_ shape library-id typography]
@@ -485,10 +535,10 @@

  Returns a list ((asset ((container shapes) (container shapes)...))...)"
  [file-data library-data asset-type]
-  (let [assets-seq (case asset-type
-                     :component  (ctkl/components-seq library-data)
-                     :color      (ctc/colors-seq library-data)
-                     :typography (ctyl/typographies-seq library-data))
+  (let [assets (case asset-type
+                 :component  (ctkl/components-seq library-data)
+                 :color      (vals (ctlb/get-colors library-data))
+                 :typography (ctyl/typographies-seq library-data))

        find-usages-in-container
        (fn [container asset]
@@ -505,7 +555,7 @@
              (let [instances (find-asset-usages file-data asset)]
                (when (d/not-empty? instances)
                  [[asset instances]])))
-            assets-seq)))
+            assets)))

 (defn used-in?
  "Checks if a specific asset is used in a given file (by any shape in its pages or in
@@ -526,7 +576,7 @@
  (letfn [(used-assets-shape [shape]
            (concat
             (ctkl/used-components-changed-since shape library since-date)
-             (ctc/used-colors-changed-since shape library since-date)
+             (ctlb/used-colors-changed-since shape library since-date)
             (ctyl/used-typographies-changed-since shape library since-date)))

          (used-assets-container [container]
@@ -645,11 +695,12 @@

    (add-component-grid file-data (sort-by #(:name (first %)) used-components))))

+;: FIXME: this can be moved to library
 (defn- absorb-colors
  [file-data used-colors]
  (let [absorb-color
        (fn [file-data [color usages]]
-          (let [remap-shape #(ctc/remap-colors % (:id file-data) color)
+          (let [remap-shape #(cts/remap-colors % (:id file-data) color)

                remap-shapes
                (fn [file-data [container shapes]]
@@ -662,7 +713,7 @@
                                             %
                                             shapes)))]
            (as-> file-data $
-              (ctc/add-color $ color)
+              (ctlb/add-color $ color)
              (reduce remap-shapes $ usages))))]

    (reduce absorb-color
@@ -998,7 +1049,7 @@
  (let [detach-text
        (fn [content]
          (->> content
-               (ct/transform-nodes
+               (txt/transform-nodes
                #(cond-> %
                   (not= file-id (:fill-color-ref-file %))
                   (dissoc :fill-color-ref-id :fill-color-ref-file)
--- a/common/src/app/common/types/fill.cljc
+++ b/common/src/app/common/types/fill.cljc
@@ -1,68 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.common.types.fill
-  (:require
-   [app.common.schema :as sm]
-   [app.common.types.color :as types.color]
-   [app.common.types.fill.impl :as impl]
-   [clojure.set :as set]))
-
-(def ^:const MAX-GRADIENT-STOPS impl/MAX-GRADIENT-STOPS)
-(def ^:const MAX-FILLS impl/MAX-FILLS)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; SCHEMAS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def schema:fill-attrs
-  [:map {:title "FillAttrs" :closed true}
-   [:fill-color-ref-file {:optional true} ::sm/uuid]
-   [:fill-color-ref-id {:optional true} ::sm/uuid]
-   [:fill-opacity {:optional true} [::sm/number {:min 0 :max 1}]]
-   [:fill-color {:optional true} types.color/schema:hex-color]
-   [:fill-color-gradient {:optional true} types.color/schema:gradient]
-   [:fill-image {:optional true} types.color/schema:image]])
-
-(def fill-attrs
-  "A set of attrs that corresponds to fill data type"
-  (sm/keys schema:fill-attrs))
-
-(def valid-fill-attrs
-  "A set used for proper check if color should contain only one of the
-  attrs listed in this set."
-  #{:fill-image :fill-color :fill-color-gradient})
-
-(defn has-valid-fill-attrs?
-  "Check if color has correct color attrs"
-  [color]
-  (let [attrs  (set (keys color))
-        result (set/intersection attrs valid-fill-attrs)]
-    (= 1 (count result))))
-
-(def schema:fill
-  [:and schema:fill-attrs
-   [:fn has-valid-fill-attrs?]])
-
-(def check-fill
-  (sm/check-fn schema:fill))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; CONSTRUCTORS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn from-plain
-  [o]
-  (assert (every? check-fill o) "expected valid fills vector")
-  (impl/from-plain o))
-
-(defn fills?
-  [o]
-  (impl/fills? o))
--- a/common/src/app/common/types/fills.cljc
+++ b/common/src/app/common/types/fills.cljc
@@ -0,0 +1,156 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.common.types.fills
+  (:refer-clojure :exclude [assoc update])
+  (:require
+   [app.common.data :as d]
+   [app.common.exceptions :as ex]
+   [app.common.flags :as flags]
+   [app.common.schema :as sm]
+   [app.common.types.color :as types.color]
+   [app.common.types.fills.impl :as impl]
+   [clojure.core :as c]
+   [clojure.set :as set]))
+
+(def ^:const MAX-GRADIENT-STOPS impl/MAX-GRADIENT-STOPS)
+(def ^:const MAX-FILLS impl/MAX-FILLS)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; SCHEMAS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def schema:fill-attrs
+  [:map {:title "FillAttrs" :closed true}
+   [:fill-color-ref-file {:optional true} ::sm/uuid]
+   [:fill-color-ref-id {:optional true} ::sm/uuid]
+   [:fill-opacity {:optional true} [::sm/number {:min 0 :max 1}]]
+   [:fill-color {:optional true} types.color/schema:hex-color]
+   [:fill-color-gradient {:optional true} types.color/schema:gradient]
+   [:fill-image {:optional true} types.color/schema:image]])
+
+(def fill-attrs
+  "A set of attrs that corresponds to fill data type"
+  (sm/keys schema:fill-attrs))
+
+(def valid-fill-attrs
+  "A set used for proper check if color should contain only one of the
+  attrs listed in this set."
+  #{:fill-image :fill-color :fill-color-gradient})
+
+(defn has-valid-fill-attrs?
+  "Check if color has correct color attrs"
+  [color]
+  (let [attrs  (set (keys color))
+        result (set/intersection attrs valid-fill-attrs)]
+    (= 1 (count result))))
+
+(def schema:fill
+  [:and schema:fill-attrs
+   [:fn has-valid-fill-attrs?]])
+
+(def check-fill
+  (sm/check-fn schema:fill))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; CONSTRUCTORS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn from-plain
+  [o]
+  (assert (every? check-fill o) "expected valid fills vector")
+  (impl/from-plain o))
+
+(defn fills?
+  [o]
+  (impl/fills? o))
+
+(defn coerce
+  [o]
+  (cond
+    (nil? o)
+    (impl/from-plain [])
+
+    (impl/fills? o)
+    o
+
+    (vector? o)
+    (impl/from-plain o)
+
+    :else
+    (ex/raise :type :internal
+              :code :invalid-type
+              :hint (str "cannot coerce " (pr-str o) " to fills"))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; TYPE HELPERS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn get-image-ids
+  [fills]
+  (if (vector? fills)
+    (into #{}
+          (comp (keep :fill-image)
+                (map :id))
+          fills)
+    (impl/-get-image-ids fills)))
+
+(defn get-byte-size
+  [fills]
+  (impl/-get-byte-size fills))
+
+(defn write-to
+  [fills buffer offset]
+  (impl/-write-to fills buffer offset))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; TRANSFORMATION & CREATION HELPERS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn assoc
+  [fills position fill]
+  (if (contains? flags/*current* :frontend-binary-fills)
+    (if (nil? fills)
+      (impl/from-plain [fill])
+      (-> (coerce fills)
+          (c/assoc position fill)))
+    (if (nil? fills)
+      [fill]
+      (-> (coerce fills)
+          (c/assoc position fill)))))
+
+(defn update
+  [fills f & args]
+  (let [fills (vec fills)
+        fills (apply f fills args)]
+    (if (contains? flags/*current* :frontend-binary-fills)
+      (impl/from-plain fills)
+      (vec fills))))
+
+(defn create
+  [& elements]
+  (let [fills (vec elements)]
+    (if (contains? flags/*current* :frontend-binary-fills)
+      (impl/from-plain fills)
+      fills)))
+
+(defn prepend
+  "Prepend a fill to existing fills"
+  [fills fill]
+  (let [fills (into [fill] fills)]
+    (if (contains? flags/*current* :frontend-binary-fills)
+      (impl/from-plain fills)
+      fills)))
+
+(defn fill->color
+  [fill]
+  (d/without-nils
+   {:color (:fill-color fill)
+    :opacity (:fill-opacity fill)
+    :gradient (:fill-color-gradient fill)
+    :image (:fill-image fill)
+    :ref-id (:fill-color-ref-id fill)
+    :ref-file (:fill-color-ref-file fill)}))
--- a/common/src/app/common/types/fills/impl.cljc
+++ b/common/src/app/common/types/fills/impl.cljc
@@ -4,13 +4,14 @@
 ;;
 ;; Copyright (c) KALEIDOS INC

-(ns app.common.types.fill.impl
+(ns app.common.types.fills.impl
  (:require
   #?(:clj [clojure.data.json :as json])
   #?(:cljs [app.common.weak-map :as weak-map])
   [app.common.buffer :as buf]
   [app.common.data :as d]
   [app.common.data.macros :as dm]
+   [app.common.exceptions :as ex]
   [app.common.math :as mth]
   [app.common.transit :as t]))

@@ -22,7 +23,7 @@
 (def ^:const GRADIENT-STOP-SIZE 8)
 (def ^:const GRADIENT-BYTE-SIZE 156)
 (def ^:const SOLID-BYTE-SIZE 4)
-(def ^:const IMAGE-BYTE-SIZE 28)
+(def ^:const IMAGE-BYTE-SIZE 36)
 (def ^:const METADATA-BYTE-SIZE 36)
 (def ^:const FILL-BYTE-SIZE
  (+ 4 (mth/max GRADIENT-BYTE-SIZE
@@ -35,6 +36,13 @@
 (def ^:private xf:take-fills
  (take MAX-FILLS))

+(defprotocol IHeapWritable
+  (-write-to [_ buffer offset] "write the content to the specified buffer")
+  (-get-byte-size [_] "get byte size"))
+
+(defprotocol IBinaryFills
+  (-get-image-ids [_] "get referenced image ids"))
+
 (defn- hex->rgb
  "Encode an hex string as rgb (int32)"
  [hex]
@@ -64,16 +72,16 @@
        n (unsigned-bit-shift-right n 24)]
    (mth/precision (/ (float n) 0xff) 2)))

-(defn- write-solid-fill
-  [offset buffer color alpha]
+(defn write-solid-fill
+  [offset buffer opacity color]
  (buf/write-byte buffer (+ offset 0) 0x00)
  (buf/write-int  buffer (+ offset 4)
                  (-> (hex->rgb color)
-                      (rgb->rgba alpha)))
+                      (rgb->rgba opacity)))
  (+ offset FILL-BYTE-SIZE))

-(defn- write-gradient-fill
-  [offset buffer gradient opacity]
+(defn write-gradient-fill
+  [offset buffer opacity gradient]
  (let [start-x (:start-x gradient)
        start-y (:start-y gradient)
        end-x   (:end-x gradient)
@@ -108,16 +116,18 @@
                 (+ offset' GRADIENT-STOP-SIZE)))
        (+ offset FILL-BYTE-SIZE)))))

-(defn- write-image-fill
+(defn write-image-fill
  [offset buffer opacity image]
-  (let [image-id (get image :id)
-        image-width (get image :width)
-        image-height (get image :height)]
+  (let [image-id     (get image :id)
+        image-width  (get image :width)
+        image-height (get image :height)
+        keep-aspect-ratio   (get image :keep-aspect-ratio false)]
    (buf/write-byte  buffer (+ offset  0) 0x03)
    (buf/write-uuid  buffer (+ offset  4) image-id)
    (buf/write-float buffer (+ offset 20) opacity)
    (buf/write-int   buffer (+ offset 24) image-width)
    (buf/write-int   buffer (+ offset 28) image-height)
+    (buf/write-bool  buffer (+ offset 32) keep-aspect-ratio)
    (+ offset FILL-BYTE-SIZE)))

 (defn- write-metadata
@@ -128,21 +138,21 @@

    (when mtype
      (let [val (case mtype
-                  "image/jpeg" 0x01
-                  "image/png"  0x02
-                  "image/gif"  0x03
-                  "image/webp"  0x04
+                  "image/jpeg"    0x01
+                  "image/png"     0x02
+                  "image/gif"     0x03
+                  "image/webp"    0x04
                  "image/svg+xml" 0x05)]
        (buf/write-short buffer (+ offset 2) val)))

    (if (and (some? ref-file)
             (some? ref-id))
      (do
-        (buf/write-byte buffer (+ offset 0) 0x01)
+        (buf/write-bool buffer (+ offset 0) true)
        (buf/write-uuid buffer (+ offset 4) ref-file)
        (buf/write-uuid buffer (+ offset 20) ref-id))
      (do
-        (buf/write-byte buffer (+ offset 0) 0x00)))))
+        (buf/write-bool buffer (+ offset 0) false)))))

 (defn- read-stop
  [buffer offset]
@@ -193,7 +203,8 @@
                                           :type type}})

                  3
-                  (let [id     (buf/read-uuid  dbuffer (+ doffset 4))
+                  (let [ratio  (buf/read-bool  dbuffer (+ doffset 32))
+                        id     (buf/read-uuid  dbuffer (+ doffset 4))
                        alpha  (buf/read-float dbuffer (+ doffset 20))
                        width  (buf/read-int   dbuffer (+ doffset 24))
                        height (buf/read-int   dbuffer (+ doffset 28))
@@ -209,6 +220,7 @@
                                  :width width
                                  :height height
                                  :mtype mtype
+                                  :keep-aspect-ratio ratio
                                  ;; FIXME: we are not encodign the name, looks useless
                                  :name "sample"}}))]

@@ -278,7 +290,20 @@

   :cljs
   #_:clj-kondo/ignore
-   (deftype Fills [size dbuffer mbuffer cache ^:mutable __hash]
+   (deftype Fills [size dbuffer mbuffer image-ids cache ^:mutable __hash]
+
+     IHeapWritable
+     (-get-byte-size [_]
+       (- (.-byteLength dbuffer) 4))
+
+     (-write-to [_ heap offset]
+       (let [buffer' (.-buffer ^js/DataView dbuffer)]
+         (.set heap (js/Uint32Array. buffer' 4) offset)))
+
+     IBinaryFills
+     (-get-image-ids [_]
+       image-ids)
+
     cljs.core/ISequential
     cljs.core/IEquiv
     (-equiv [this other]
@@ -353,7 +378,26 @@
            (when (< i size)
              (cons (read-fill dbuffer mbuffer i)
                    (lazy-seq (next-seq (inc i))))))
-          0)))))
+          0)))
+
+     cljs.core/IPrintWithWriter
+     (-pr-writer [this writer _]
+       (binding [*print-dup* true]
+         (cljs.core/-write writer (str "#penpot/fills \"" (pr-str (vec this))  "\""))))))
+
+#?(:clj
+   (defmethod print-method Fills
+     [o ^java.io.Writer writer]
+     (.write writer "#penpot/fills \"")
+     (print-dup (vec o) writer)
+     (.write writer "\"")))
+
+#?(:clj
+   (defmethod print-dup Fills
+     [o ^java.io.Writer writer]
+     (.write writer "#penpot/fills \"")
+     (print-dup (vec o) writer)
+     (.write writer "\"")))

 (defn from-plain
  [fills]
@@ -364,8 +408,9 @@

    (buf/write-byte dbuffer 0 total)

-    (loop [index 0]
-      (when (< index total)
+    (loop [index     0
+           image-ids #{}]
+      (if (< index total)
        (let [fill     (nth fills index)
              doffset  (+ 4 (* index FILL-BYTE-SIZE))
              moffset  (* index METADATA-BYTE-SIZE)
@@ -373,23 +418,26 @@

          (if-let [color (get fill :fill-color)]
            (do
-              (write-solid-fill doffset dbuffer color opacity)
+              (write-solid-fill doffset dbuffer opacity color)
              (write-metadata moffset mbuffer fill)
-              (recur (inc index)))
+              (recur (inc index) image-ids))
            (if-let [gradient (get fill :fill-color-gradient)]
              (do
-                (write-gradient-fill doffset dbuffer gradient opacity)
+                (write-gradient-fill doffset dbuffer opacity gradient)
                (write-metadata moffset mbuffer fill)
-                (recur (inc index)))
+                (recur (inc index) image-ids))
              (if-let [image (get fill :fill-image)]
                (do
                  (write-image-fill doffset dbuffer opacity image)
                  (write-metadata moffset mbuffer fill)
-                  (recur (inc index)))
-                (recur (inc index))))))))
+                  (recur (inc index)
+                         (conj image-ids (get image :id))))
+                (ex/raise :type :internal
+                          :code :invalid-fill
+                          :hint "found invalid fill on encoding fills to binary format")))))

-    #?(:cljs (Fills. total dbuffer mbuffer (weak-map/create) nil)
-       :clj  (Fills. total dbuffer mbuffer nil))))
+        #?(:cljs (Fills. total dbuffer mbuffer image-ids (weak-map/create) nil)
+           :clj  (Fills. total dbuffer mbuffer nil))))))

 (defn fills?
  [o]
--- a/common/src/app/common/types/grid.cljc
+++ b/common/src/app/common/types/grid.cljc
@@ -6,9 +6,8 @@

 (ns app.common.types.grid
  (:require
-   [app.common.colors :as clr]
   [app.common.schema :as sm]
-   [app.common.types.color :refer [schema:hex-color]]))
+   [app.common.types.color :as clr]))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SCHEMA
@@ -16,7 +15,7 @@

 (def schema:grid-color
  [:map {:title "PageGridColor"}
-   [:color schema:hex-color]
+   [:color clr/schema:hex-color]
   [:opacity ::sm/safe-number]])

 (def schema:column-params
--- a/common/src/app/common/types/library.cljc
+++ b/common/src/app/common/types/library.cljc
@@ -0,0 +1,87 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.common.types.library
+  "Exposes file library type data helpers.
+
+  WARNING: It belongs to FILE types in hierarchy of types so: file
+  types can import this ns but, but this ns can't import file types."
+  (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
+   [app.common.time :as dt]
+   [app.common.types.shape :as types.shape]))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; COLOR LIBRARY
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn get-colors
+  [file-data]
+  (:colors file-data))
+
+(defn get-color
+  [file-data color-id]
+  (dm/get-in file-data [:colors color-id]))
+
+(defn get-ref-color
+  [library-data color]
+  (when (= (:ref-file color) (:id library-data))
+    (get-color library-data (:ref-id color))))
+
+(defn- touch
+  [color]
+  (assoc color :modified-at (dt/now)))
+
+(defn add-color
+  [file-data color]
+  (update file-data :colors assoc (:id color) (touch color)))
+
+(defn set-color
+  [file-data color]
+  (d/assoc-in-when file-data [:colors (:id color)] (touch color)))
+
+(defn update-color
+  [file-data color-id f & args]
+  (d/update-in-when file-data [:colors color-id] #(-> (apply f % args)
+                                                      (touch))))
+(defn delete-color
+  [file-data color-id]
+  (update file-data :colors dissoc color-id))
+
+(defn used-colors-changed-since
+  "Find all usages of any color in the library by the given shape, of colors
+   that have ben modified after the date."
+  [shape library since-date]
+  (->> (types.shape/get-all-colors shape)
+       (keep #(get-ref-color (:data library) %))
+       (remove #(< (:modified-at %) since-date))  ;; Note that :modified-at may be nil
+       (map (fn [color]
+              {:shape-id (:id shape)
+               :asset-id (:id color)
+               :asset-type :color}))))
+
+;: FIXME: revisit the API of this, i think we should pass the whole
+;; library data here instead of only colors
+(defn sync-colors
+  "Look for usage of any color of the given library inside the shape,
+  and, in this case, copy the library color into the shape."
+  [shape library-id library-colors]
+  (letfn [(sync-color [shape position shape-color set-fn _ detach-fn]
+            (if (= (:ref-file shape-color) library-id)
+              (let [library-color (get library-colors (:ref-id shape-color))]
+                (if (some? library-color)
+                  (set-fn shape
+                          position
+                          (:color library-color)
+                          (:opacity library-color)
+                          (:gradient library-color)
+                          (:image library-color))
+                  (detach-fn shape position)))
+              shape))]
+
+    (types.shape/process-shape-colors shape sync-color)))
+
--- a/common/src/app/common/types/modifiers.cljc
+++ b/common/src/app/common/types/modifiers.cljc
@@ -17,8 +17,8 @@
   [app.common.geom.shapes.effects :as gse]
   [app.common.geom.shapes.strokes :as gss]
   [app.common.math :as mth]
-   [app.common.text :as txt]
   [app.common.types.shape.layout :as ctl]
+   [app.common.types.text :as txt]
   [clojure.core :as c]))

 ;; --- Modifiers
--- a/common/src/app/common/types/page.cljc
+++ b/common/src/app/common/types/page.cljc
@@ -53,10 +53,10 @@
   [:name :string]
   [:index {:optional true} ::sm/int]
   [:objects schema:objects]
-   [:default-grids {:optional true} ::ctg/default-grids]
+   [:default-grids {:optional true} ctg/schema:default-grids]
   [:flows {:optional true} schema:flows]
   [:guides {:optional true} schema:guides]
-   [:plugin-data {:optional true} ::ctpg/plugin-data]
+   [:plugin-data {:optional true} ctpg/schema:plugin-data]
   [:background {:optional true} ctc/schema:hex-color]

   [:comment-thread-positions {:optional true}
--- a/common/src/app/common/types/path.cljc
+++ b/common/src/app/common/types/path.cljc
@@ -25,7 +25,10 @@

 (def ^:cosnt bool-group-style-properties bool/group-style-properties)
 (def ^:const bool-style-properties bool/style-properties)
-(def ^:const default-bool-fills bool/default-fills)
+
+(defn get-default-bool-fills
+  []
+  (bool/get-default-fills))

 (def schema:content impl/schema:content)
 (def schema:segments impl/schema:segments)
--- a/common/src/app/common/types/path/bool.cljc
+++ b/common/src/app/common/types/path/bool.cljc
@@ -6,17 +6,23 @@

 (ns app.common.types.path.bool
  (:require
-   [app.common.colors :as clr]
   [app.common.data :as d]
+   [app.common.flags :as flags]
   [app.common.geom.point :as gpt]
   [app.common.geom.rect :as grc]
   [app.common.math :as mth]
+   [app.common.types.color :as clr]
+   [app.common.types.fills :as types.fills]
   [app.common.types.path.helpers :as helpers]
   [app.common.types.path.segment :as segment]
   [app.common.types.path.subpath :as subpath]))

-(def default-fills
-  [{:fill-color clr/black}])
+(defn get-default-fills
+  []
+  (let [fills [{:fill-color clr/black}]]
+    (if (contains? flags/*current* :frontend-binary-fills)
+      (types.fills/from-plain fills)
+      fills)))

 (def group-style-properties
  #{:shadow :blur})
--- a/common/src/app/common/types/path/impl.cljc
+++ b/common/src/app/common/types/path/impl.cljc
@@ -20,7 +20,8 @@
   [app.common.schema.generators :as sg]
   [app.common.svg.path :as svg.path]
   [app.common.transit :as t]
-   [app.common.types.path :as-alias path])
+   [app.common.types.path :as-alias path]
+   [cuerdas.core :as str])
  (:import
   #?(:cljs [goog.string StringBuffer]
      :clj  [java.nio ByteBuffer ByteOrder])))
@@ -530,7 +531,9 @@
          :decode/json (fn [s]
                         (cond
                           (string? s)
-                           (from-string s)
+                           (if (str/empty? s)
+                             (from-plain [])
+                             (from-string s))

                           (vector? s)
                           (let [decode-fn (deref decoder)]
--- a/common/src/app/common/types/shape.cljc
+++ b/common/src/app/common/types/shape.cljc
@@ -7,7 +7,6 @@
 (ns app.common.types.shape
  (:require
   #?(:clj [app.common.fressian :as fres])
-   [app.common.colors :as clr]
   [app.common.data :as d]
   [app.common.files.helpers :as cfh]
   [app.common.geom.matrix :as gmt]
@@ -18,10 +17,9 @@
   [app.common.record :as cr]
   [app.common.schema :as sm]
   [app.common.schema.generators :as sg]
-   [app.common.text :as txt]
   [app.common.transit :as t]
-   [app.common.types.color :as types.color]
-   [app.common.types.fill :refer [schema:fill]]
+   [app.common.types.color :as clr]
+   [app.common.types.fills :refer [schema:fill fill->color]]
   [app.common.types.grid :as ctg]
   [app.common.types.path :as path]
   [app.common.types.path.segment :as path.segment]
@@ -33,6 +31,7 @@
   [app.common.types.shape.layout :as ctsl]
   [app.common.types.shape.shadow :as ctss]
   [app.common.types.shape.text :as ctsx]
+   [app.common.types.text :as txt]
   [app.common.types.token :as cto]
   [app.common.types.variant :as ctv]
   [app.common.uuid :as uuid]
@@ -148,9 +147,9 @@
    [::sm/one-of stroke-caps]]
   [:stroke-cap-end {:optional true}
    [::sm/one-of stroke-caps]]
-   [:stroke-color {:optional true} types.color/schema:hex-color]
-   [:stroke-color-gradient {:optional true} types.color/schema:gradient]
-   [:stroke-image {:optional true} types.color/schema:image]])
+   [:stroke-color {:optional true} clr/schema:hex-color]
+   [:stroke-color-gradient {:optional true} clr/schema:gradient]
+   [:stroke-image {:optional true} clr/schema:image]])

 (def stroke-attrs
  "A set of attrs that corresponds to stroke data type"
@@ -416,12 +415,14 @@

 ;; Valid attributes

-(def ^:private allowed-shape-attrs #{:page-id :component-id :component-file :component-root :main-instance
-                                     :remote-synced :shape-ref :touched :blocked :collapsed :locked
-                                     :hidden :masked-group :fills :proportion :proportion-lock :constraints-h
-                                     :constraints-v :fixed-scroll :r1 :r2 :r3 :r4 :opacity :grids :exports
-                                     :strokes :blend-mode :interactions :shadow :blur :grow-type :applied-tokens
-                                     :plugin-data})
+(def ^:private allowed-shape-attrs
+  #{:page-id :component-id :component-file :component-root :main-instance
+    :remote-synced :shape-ref :touched :blocked :collapsed :locked
+    :hidden :masked-group :fills :proportion :proportion-lock :constraints-h
+    :constraints-v :fixed-scroll :r1 :r2 :r3 :r4 :opacity :grids :exports
+    :strokes :blend-mode :interactions :shadow :blur :grow-type :applied-tokens
+    :plugin-data})
+
 (def ^:private allowed-shape-geom-attrs #{:x :y :width :height})
 (def ^:private allowed-shape-base-attrs #{:id :name :type :selrect :points :transform :transform-inverse :parent-id :frame-id})
 (def ^:private allowed-bool-attrs #{:shapes :bool-type :content})
@@ -755,3 +756,201 @@
        (d/patch-object (select-keys props basic-extract-props))
        (cond-> (cfh/text-shape? shape) (patch-text-props props))
        (cond-> (cfh/frame-shape? shape) (patch-layout-props props)))))
+
+
+
+(defn- set-fill-color
+  [shape position color opacity gradient image]
+  (update-in shape [:fills position]
+             (fn [fill]
+               (d/without-nils (assoc fill
+                                      :fill-color color
+                                      :fill-opacity opacity
+                                      :fill-color-gradient gradient
+                                      :fill-image image)))))
+
+
+(defn- attach-fill-color
+  [shape position ref-id ref-file]
+  (d/update-in-when shape [:fills position]
+                    (fn [fill]
+                      (-> fill
+                          (assoc :fill-color-ref-file ref-file)
+                          (assoc :fill-color-ref-id ref-id)))))
+
+(defn- detach-fill-color
+  [shape position]
+  (d/update-in-when shape [:fills position] dissoc :fill-color-ref-id :fill-color-ref-file))
+
+
+(defn- set-stroke-color
+  [shape position color opacity gradient image]
+  (d/update-in-when shape [:strokes position]
+                    (fn [stroke]
+                      (-> stroke
+                          (assoc :stroke-color color)
+                          (assoc :stroke-opacity opacity)
+                          (assoc :stroke-color-gradient gradient)
+                          (assoc :stroke-image image)
+                          (d/without-nils)))))
+
+(defn- attach-stroke-color
+  [shape position ref-id ref-file]
+  (d/update-in-when shape [:strokes position]
+                    (fn [stroke]
+                      (-> stroke
+                          (assoc :stroke-color-ref-id ref-id)
+                          (assoc :stroke-color-ref-file ref-file)))))
+
+(defn- detach-stroke-color
+  [shape position]
+  (d/update-in-when shape [:strokes position] dissoc :stroke-color-ref-id :stroke-color-ref-file))
+
+(defn- set-shadow-color
+  [shape position color opacity gradient]
+  (d/update-in-when shape [:shadow position :color]
+                    (fn [shadow-color]
+                      (-> shadow-color
+                          (assoc :color color)
+                          (assoc :opacity opacity)
+                          (assoc :gradient gradient)
+                          (d/without-nils)))))
+
+(defn- attach-shadow-color
+  [shape position ref-id ref-file]
+  (d/update-in-when shape [:shadow position :color]
+                    (fn [color]
+                      (-> color
+                          (assoc :ref-id ref-id)
+                          (assoc :ref-file ref-file)))))
+
+(defn- detach-shadow-color
+  [shape position]
+  (d/update-in-when shape [:shadow position :color] dissoc :ref-id :ref-file))
+
+(defn- set-grid-color
+  [shape position color opacity gradient]
+  (d/update-in-when shape [:grids position :params :color]
+                    (fn [grid-color]
+                      (-> grid-color
+                          (assoc :color color)
+                          (assoc :opacity opacity)
+                          (assoc :gradient gradient)
+                          (d/without-nils)))))
+
+(defn- attach-grid-color
+  [shape position ref-id ref-file]
+  (d/update-in-when shape [:grids position :params :color]
+                    (fn [color]
+                      (-> color
+                          (assoc :ref-id ref-id)
+                          (assoc :ref-file ref-file)))))
+
+(defn- detach-grid-color
+  [shape position]
+  (d/update-in-when shape [:grids position :params :color] dissoc :ref-id :ref-file))
+
+(defn process-shape-colors
+  "Execute an update function on all colors of a shape."
+  [shape process-fn]
+  (let [process-fill (fn [shape [position fill]]
+                       (process-fn shape
+                                   position
+                                   (fill->color fill)
+                                   set-fill-color
+                                   attach-fill-color
+                                   detach-fill-color))
+
+        process-stroke (fn [shape [position stroke]]
+                         (process-fn shape
+                                     position
+                                     (clr/stroke->color stroke)
+                                     set-stroke-color
+                                     attach-stroke-color
+                                     detach-stroke-color))
+
+        process-shadow (fn [shape [position shadow]]
+                         (process-fn shape
+                                     position
+                                     (clr/shadow->color shadow)
+                                     set-shadow-color
+                                     attach-shadow-color
+                                     detach-shadow-color))
+
+        process-grid (fn [shape [position grid]]
+                       (process-fn shape
+                                   position
+                                   (clr/grid->color grid)
+                                   set-grid-color
+                                   attach-grid-color
+                                   detach-grid-color))
+
+        process-text-node (fn [node]
+                            (as-> node $
+                              (reduce process-fill $ (d/enumerate (:fills $)))
+                              (reduce process-stroke $ (d/enumerate (:strokes $)))))
+
+        process-text (fn [shape]
+                       (let [content     (:content shape)
+                             new-content (txt/transform-nodes process-text-node content)]
+                         (if (not= content new-content)
+                           (assoc shape :content new-content)
+                           shape)))]
+
+    (as-> shape $
+      (reduce process-fill $ (d/enumerate (:fills $)))
+      (reduce process-stroke $ (d/enumerate (:strokes $)))
+      (reduce process-shadow $ (d/enumerate (:shadow $)))
+      (reduce process-grid $ (d/enumerate (:grids $)))
+      (process-text $))))
+
+(defn- get-text-node-colors
+  "Get all colors used by a node of a text shape"
+  [node]
+  (concat (map fill->color (:fills node))
+          (map clr/stroke->color (:strokes node))))
+
+(defn get-all-colors
+  "Get all colors used by a shape, in any section."
+  [shape]
+  ;; FIXME: all this functions should be really in color?
+  (concat (map fill->color (:fills shape))
+          (map clr/stroke->color (:strokes shape))
+          (map clr/shadow->color (:shadow shape))
+          (when (= (:type shape) :frame)
+            (map clr/grid->color (:grids shape)))
+          (when (= (:type shape) :text)
+            (reduce (fn [colors node]
+                      (concat colors (get-text-node-colors node)))
+                    ()
+                    (txt/node-seq (:content shape))))))
+
+(defn uses-library-color?
+  "Check if the shape uses the given library color."
+  [shape library-id color-id]
+  (let [all-colors (get-all-colors shape)]
+    (some #(and (= (:ref-id %) color-id)
+                (= (:ref-file %) library-id))
+          all-colors)))
+
+(defn uses-library-colors?
+  "Check if the shape uses any color in the given library."
+  [shape library-id]
+  (let [all-colors (get-all-colors shape)]
+    (some #(and (some? (:ref-id %))
+                (= (:ref-file %) library-id))
+          all-colors)))
+
+(defn remap-colors
+  "Change the shape so that any use of the given color now points to
+  the given library."
+  [shape library-id color]
+  (letfn [(remap-color [shape position shape-color _ attach-fn _]
+            (if (= (:ref-id shape-color) (:id color))
+              (attach-fn shape
+                         position
+                         (:id color)
+                         library-id)
+              shape))]
+
+    (process-shape-colors shape remap-color)))
--- a/common/src/app/common/types/shape/attrs.cljc
+++ b/common/src/app/common/types/shape/attrs.cljc
@@ -6,7 +6,7 @@

 (ns app.common.types.shape.attrs
  (:require
-   [app.common.colors :as clr]))
+   [app.common.types.color :as clr]))

 (def default-color clr/gray-20)

--- a/common/src/app/common/types/shape/text.cljc
+++ b/common/src/app/common/types/shape/text.cljc
@@ -7,7 +7,7 @@
 (ns app.common.types.shape.text
  (:require
   [app.common.schema :as sm]
-   [app.common.types.fill :refer [schema:fill]]
+   [app.common.types.fills :refer [schema:fill]]
   [app.common.types.shape :as-alias shape]
   [app.common.types.shape.text.position-data :as-alias position-data]))

--- a/common/src/app/common/types/text.cljc
+++ b/common/src/app/common/types/text.cljc
@@ -6,8 +6,194 @@

 (ns app.common.types.text
   (:require
+    [app.common.data :as d]
    [app.common.data.macros :as dm]
-    [clojure.set :as set]))
+    [app.common.flags :as flags]
+    [app.common.types.color :as clr]
+    [app.common.types.fills :as types.fills]
+    [clojure.set :as set]
+    [clojure.walk :as walk]
+    [cuerdas.core :as str]))
+
+;; -- Attrs
+
+(def text-typography-attrs
+  [:typography-ref-id
+   :typography-ref-file])
+
+(def text-fill-attrs
+  [:fill-color
+   :fill-opacity
+   :fill-color-ref-id
+   :fill-color-ref-file
+   :fill-color-gradient])
+
+(def text-font-attrs
+  [:font-id
+   :font-family
+   :font-variant-id
+   :font-size
+   :font-weight
+   :font-style])
+
+(def text-align-attrs
+  [:text-align])
+
+(def text-direction-attrs
+  [:text-direction])
+
+(def text-spacing-attrs
+  [:line-height
+   :letter-spacing])
+
+(def text-valign-attrs
+  [:vertical-align])
+
+(def text-decoration-attrs
+  [:text-decoration])
+
+(def text-transform-attrs
+  [:text-transform])
+
+(def text-fills
+  [:fills])
+
+(def shape-attrs
+  [:grow-type])
+
+(def root-attrs
+  text-valign-attrs)
+
+(def paragraph-attrs
+  (d/concat-vec
+   text-align-attrs
+   text-direction-attrs))
+
+(def text-node-attrs
+  (d/concat-vec
+   text-typography-attrs
+   text-font-attrs
+   text-spacing-attrs
+   text-decoration-attrs
+   text-transform-attrs
+   text-fills))
+
+(def text-all-attrs (d/concat-set shape-attrs root-attrs paragraph-attrs text-node-attrs))
+
+(def text-style-attrs
+  (d/concat-vec root-attrs paragraph-attrs text-node-attrs))
+
+(def default-root-attrs
+  {:vertical-align "top"})
+
+(def default-text-fills
+  [{:fill-color clr/black
+    :fill-opacity 1}])
+
+(def default-text-attrs
+  {:font-id "sourcesanspro"
+   :font-family "sourcesanspro"
+   :font-variant-id "regular"
+   :font-size "14"
+   :font-weight "400"
+   :font-style "normal"
+   :line-height "1.2"
+   :letter-spacing "0"
+   :text-transform "none"
+   :text-align "left"
+   :text-decoration "none"
+   :text-direction "ltr"})
+
+(defn get-default-text-fills
+  "Return calculated default text fills"
+  []
+  (if (contains? flags/*current* :frontend-binary-fills)
+    (types.fills/from-plain default-text-fills)
+    default-text-fills))
+
+(defn get-default-text-attrs
+  "Return calculated default text attrs.
+
+  NOTE: is implemented as function because it needs resolve at runtime
+  the activated flag for properly encode the fills"
+  []
+  (assoc default-text-attrs :fills (get-default-text-fills)))
+
+(def typography-fields
+  [:font-id
+   :font-family
+   :font-variant-id
+   :font-size
+   :font-weight
+   :font-style
+   :line-height
+   :letter-spacing
+   :text-transform])
+
+(def default-typography
+  (-> default-text-attrs
+      (select-keys typography-fields)
+      (assoc :name "Source Sans Pro Regular")))
+
+(defn node-seq
+  ([root] (node-seq identity root))
+  ([match? root]
+   (->> (tree-seq map? :children root)
+        (filter match?)
+        (seq))))
+
+(defn is-text-node?
+  [node]
+  (and (nil? (:type node))
+       (string? (:text node))))
+
+(defn is-paragraph-set-node?
+  [node]
+  (= "paragraph-set" (:type node)))
+
+(defn is-paragraph-node?
+  [node]
+  (= "paragraph" (:type node)))
+
+(defn is-root-node?
+  [node]
+  (= "root" (:type node)))
+
+(defn is-node?
+  [node]
+  (or ^boolean (is-text-node? node)
+      ^boolean (is-paragraph-node? node)
+      ^boolean (is-paragraph-set-node? node)
+      ^boolean (is-root-node? node)))
+
+(defn is-content-node?
+  "Only matches content nodes, ignoring the paragraph-set nodes."
+  [node]
+  (or ^boolean (is-text-node? node)
+      ^boolean (is-paragraph-node? node)
+      ^boolean (is-root-node? node)))
+
+(defn transform-nodes
+  ([transform root]
+   (transform-nodes identity transform root))
+  ([pred transform root]
+   (walk/postwalk
+    (fn [item]
+      (if (and (is-node? item) (pred item))
+        (transform item)
+        item))
+    root)))
+
+(defn update-text-content
+  [shape pred-fn update-fn attrs]
+  (let [update-attrs-fn #(update-fn % attrs)
+        transform   #(transform-nodes pred-fn update-attrs-fn %)]
+    (-> shape
+        (update :content transform))))
+
+(defn generate-shape-name
+  [text]
+  (subs text 0 (min 280 (count text))))

 (defn- compare-text-content
  "Given two content text structures, conformed by maps and vectors,
@@ -83,21 +269,12 @@
   compare them, and returns a set with the type of differences.
   The possibilities are
     :text-content-text
-     :text-content-attribute,
-     :text-content-structure
-     :text-content-structure-same-attrs."
+     :text-content-attribute
+     :text-content-structure"
  [a b]
-  (let [diff-type (compare-text-content a b
-                                        {:text-cb      (fn [acc] (conj acc :text-content-text))
-                                         :attribute-cb (fn [acc _] (conj acc :text-content-attribute))})]
-    (if-not (contains? diff-type :text-content-structure)
-      diff-type
-      (let [;; get attrs of the first paragraph of the first paragraph-set
-            attrs (get-first-paragraph-text-attrs a)]
-        (if (and (equal-attrs? a attrs)
-                 (equal-attrs? b attrs))
-          #{:text-content-structure :text-content-structure-same-attrs}
-          diff-type)))))
+  (compare-text-content a b
+                        {:text-cb      (fn [acc] (conj acc :text-content-text))
+                         :attribute-cb (fn [acc _] (conj acc :text-content-attribute))}))

 (defn get-diff-attrs
  "Given two content text structures, conformed by maps and vectors,
@@ -127,7 +304,8 @@
   entries"
  [a b]
  (cond
-    (not= (type a) (type b))
+    (and (not= (type a) (type b))
+         (not (and (map? a) (map? b)))) ;; Sometimes they are both maps but of different subtypes
    false

    (map? a)
@@ -148,7 +326,7 @@
  (cond
    (map? origin)
    (into {}
-          (for [k (keys origin) :when (not= k :key)] ;; We ignore :key because it is a draft artifact
+          (for [k (keys destiny) :when (not= k :key)] ;; We ignore :key because it is a draft artifact
            (cond
              (= :children k)
              [k (vec (map #(copy-text-keys %1 %2) (get origin k) (get destiny k)))]
@@ -166,3 +344,91 @@
          (if (= :children k)
            [k (vec (map #(copy-attrs-keys %1 attrs) v))]
            [k (get attrs k v)]))))
+
+
+(defn content->text
+  "Given a root node of a text content extracts the texts with its associated styles"
+  [content]
+  (letfn [(add-node [acc node]
+            (cond
+              (is-paragraph-node? node)
+              (conj acc [])
+
+              (is-text-node? node)
+              (let [i (dec (count acc))]
+                (update acc i conj (:text node)))
+
+              :else
+              acc))]
+    (->> (node-seq content)
+         (reduce add-node [])
+         (map #(str/join "" %))
+         (str/join "\n"))))
+
+(defn content->text+styles
+  "Given a root node of a text content extracts the texts with its associated styles"
+  [node]
+  (letfn
+   [(rec-style-text-map [acc node style]
+      (let [node-style (merge style (select-keys node text-all-attrs))
+            head (or (-> acc first) [{} ""])
+            [head-style head-text] head
+
+            new-acc
+            (cond
+              (not (is-text-node? node))
+              (reduce #(rec-style-text-map %1 %2 node-style) acc (:children node))
+
+              (not= head-style node-style)
+              (cons [node-style (:text node "")] acc)
+
+              :else
+              (cons [node-style (dm/str head-text "" (:text node))] (rest acc)))
+
+               ;; We add an end-of-line when finish a paragraph
+            new-acc
+            (if (= (:type node) "paragraph")
+              (let [[hs ht] (first new-acc)]
+                (cons [hs (dm/str ht "\n")] (rest new-acc)))
+              new-acc)]
+        new-acc))]
+
+    (-> (rec-style-text-map [] node {})
+        reverse)))
+
+(defn change-text
+  "Changes the content of the text shape to use the text as argument. Will use the styles of the
+   first paragraph and text that is present in the shape (and override the rest)"
+  [content text]
+  (let [root-styles (select-keys content root-attrs)
+
+        paragraph-style
+        (merge
+         default-text-attrs
+         (select-keys (->> content (node-seq is-paragraph-node?) first) text-all-attrs))
+
+        text-style
+        (merge
+         default-text-attrs
+         (select-keys (->> content (node-seq is-text-node?) first) text-all-attrs))
+
+        paragraph-texts
+        (str/split text "\n")
+
+        paragraphs
+        (->> paragraph-texts
+             (mapv
+              (fn [pt]
+                (merge
+                 paragraph-style
+                 {:type "paragraph"
+                  :children [(merge {:text pt} text-style)]}))))]
+
+
+    (d/patch-object
+     {:type "root"
+      :children
+      [{:type "paragraph-set"
+        :children paragraphs}]}
+     root-styles)))
+
--- a/common/src/app/common/types/token.cljc
+++ b/common/src/app/common/types/token.cljc
@@ -10,6 +10,7 @@
   [app.common.schema :as sm]
   [clojure.data :as data]
   [clojure.set :as set]
+   [cuerdas.core :as str]
   [malli.util :as mu]))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -29,18 +30,21 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 (def token-type->dtcg-token-type
-  {:boolean       "boolean"
-   :border-radius "borderRadius"
-   :color         "color"
-   :dimensions    "dimension"
-   :number        "number"
-   :opacity       "opacity"
-   :other         "other"
-   :rotation      "rotation"
-   :sizing        "sizing"
-   :spacing       "spacing"
-   :string        "string"
-   :stroke-width  "strokeWidth"})
+  {:boolean        "boolean"
+   :border-radius  "borderRadius"
+   :color          "color"
+   :dimensions     "dimension"
+   :font-family    "fontFamilies"
+   :font-size      "fontSizes"
+   :letter-spacing "letterSpacing"
+   :number         "number"
+   :opacity        "opacity"
+   :other          "other"
+   :rotation       "rotation"
+   :sizing         "sizing"
+   :spacing        "spacing"
+   :string         "string"
+   :stroke-width   "strokeWidth"})

 (def dtcg-token-type->token-type
  (set/map-invert token-type->dtcg-token-type))
@@ -101,18 +105,15 @@
   [:m1 {:optional true} token-name-ref]
   [:m2 {:optional true} token-name-ref]
   [:m3 {:optional true} token-name-ref]
-   [:m4 {:optional true} token-name-ref]
-   [:x {:optional true} token-name-ref]
-   [:y {:optional true} token-name-ref]])
+   [:m4 {:optional true} token-name-ref]])

 (def spacing-keys (schema-keys schema:spacing))

 (def ^:private schema:dimensions
-  [:merge
-   schema:sizing
-   schema:spacing
-   schema:stroke-width
-   schema:border-radius])
+  (reduce mu/union [schema:sizing
+                    schema:spacing
+                    schema:stroke-width
+                    schema:border-radius]))

 (def dimensions-keys (schema-keys schema:dimensions))

@@ -122,10 +123,33 @@

 (def rotation-keys (schema-keys schema:rotation))

-(def ^:private schema:number
+(def ^:private schema:font-size
  [:map
-   [:rotation {:optional true} token-name-ref]
-   [:line-height {:optional true} token-name-ref]])
+   [:font-size {:optional true} token-name-ref]])
+
+(def font-size-keys (schema-keys schema:font-size))
+
+(def ^:private schema:letter-spacing
+  [:map
+   [:letter-spacing {:optional true} token-name-ref]])
+
+(def letter-spacing-keys (schema-keys schema:letter-spacing))
+
+(def ^:private schema:font-family
+  [:map
+   [:font-family {:optional true} token-name-ref]])
+
+(def font-family-keys (schema-keys schema:font-family))
+
+(def typography-keys (set/union font-size-keys letter-spacing-keys font-family-keys))
+
+;; TODO: Created to extract the font-size feature from the typography feature flag.
+;; Delete this once the typography feature flag is removed.
+(def ff-typography-keys (set/difference typography-keys font-size-keys))
+
+(def ^:private schema:number
+  (reduce mu/union [[:map [:line-height {:optional true} token-name-ref]]
+                    schema:rotation]))

 (def number-keys (schema-keys schema:number))

@@ -137,6 +161,7 @@
                         spacing-keys
                         dimensions-keys
                         rotation-keys
+                         typography-keys
                         number-keys))

 (def ^:private schema:tokens
@@ -150,6 +175,9 @@
   schema:spacing
   schema:rotation
   schema:number
+   schema:font-size
+   schema:letter-spacing
+   schema:font-family
   schema:dimensions])

 (defn shape-attr->token-attrs
@@ -177,6 +205,9 @@
       changed-sub-attr
       #{:m1 :m2 :m3 :m4})

+     (font-size-keys shape-attr) #{shape-attr}
+     (letter-spacing-keys shape-attr) #{shape-attr}
+     (font-family-keys shape-attr) #{shape-attr}
     (border-radius-keys shape-attr) #{shape-attr}
     (sizing-keys shape-attr) #{shape-attr}
     (opacity-keys shape-attr) #{shape-attr}
@@ -192,6 +223,63 @@
    :stroke-width :strokes
    token-attr))

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; TOKEN SHAPE ATTRIBUTES
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def position-attributes #{:x :y})
+
+(def generic-attributes
+  (set/union color-keys
+             stroke-width-keys
+             rotation-keys
+             sizing-keys
+             opacity-keys
+             position-attributes))
+
+(def rect-attributes
+  (set/union generic-attributes
+             border-radius-keys))
+
+(def frame-attributes
+  (set/union rect-attributes
+             spacing-keys))
+
+(def text-attributes
+  (set/union generic-attributes
+             typography-keys
+             number-keys))
+
+(defn shape-type->attributes
+  [type]
+  (case type
+    :bool    generic-attributes
+    :circle  generic-attributes
+    :rect    rect-attributes
+    :frame   frame-attributes
+    :image   rect-attributes
+    :path    generic-attributes
+    :svg-raw generic-attributes
+    :text    text-attributes
+    nil))
+
+(defn appliable-attrs
+  "Returns intersection of shape `attributes` for `token-type`."
+  [attributes token-type]
+  (set/intersection attributes (shape-type->attributes token-type)))
+
+(defn any-appliable-attr?
+  "Checks if `token-type` supports given shape `attributes`."
+  [attributes token-type]
+  (seq (appliable-attrs attributes token-type)))
+
+;; Token attrs that are set inside content blocks of text shapes, instead
+;; at the shape level.
+(def attrs-in-text-content
+  (set/union
+   typography-keys
+   #{:fill}))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; TOKENS IN SHAPES
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -218,13 +306,25 @@
                                                   :attributes attributes})]
    (update shape :applied-tokens #(merge % applied-tokens))))

-(defn maybe-apply-token-to-shape
-  "When the passed `:token` is non-nil apply it to the `:applied-tokens` on a shape."
-  [{:keys [shape token _attributes] :as props}]
-  (if token
-    (apply-token-to-shape props)
-    shape))
-
 (defn unapply-token-id [shape attributes]
  (update shape :applied-tokens d/without-keys attributes))

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; TYPOGRAPHY
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn split-font-family
+  "Splits font family `value` string from into vector of font families.
+
+  Doesn't handle possible edge-case of font-families with `,` in their font family name."
+  [font-value]
+  (let [families (str/split font-value ",")
+        xform (comp
+               (map str/trim)
+               (remove str/empty?))]
+    (into [] xform families)))
+
+(defn join-font-family
+  "Joins font family `value` into a string to be edited with a single input."
+  [font-families]
+  (str/join ", " font-families))
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -17,6 +17,7 @@
   [app.common.transit :as t]
   [app.common.types.token :as cto]
   [app.common.uuid :as uuid]
+   [clojure.core.protocols :as protocols]
   [clojure.set :as set]
   [clojure.walk :as walk]
   [cuerdas.core :as str]))
@@ -25,13 +26,6 @@

 ;; TODO: add again the removed functions and refactor the rest of the module to use them

-(def ^:private schema:groupable-item
-  [:map {:title "Groupable item"}
-   [:name :string]])
-
-(def ^:private valid-groupable-item?
-  (sm/validator schema:groupable-item))
-
 (def ^:private xf-map-trim
  (comp
   (map str/trim)
@@ -60,14 +54,38 @@
 (defn get-path
  "Get the path of object by specified separator (E.g. with '.' separator, the
  'group.subgroup.name' -> ['group' 'subgroup'])"
-  [item separator]
-  (assert (valid-groupable-item? item) "expected groupable item")
-  (->> (split-path (:name item) separator)
+  [name separator]
+  (->> (split-path name separator)
       (not-empty)))

+;; === Common
+
+(defprotocol INamedItem
+  "Protocol for items that have a name, a description and a modified date."
+  (get-name [_] "Get the name of the item.")
+  (get-description [_] "Get the description of the item.")
+  (get-modified-at [_] "Get the description of the item.")
+  (rename [_ new-name] "Set the name of the item.")
+  (set-description [_ new-description] "Set the description of the item."))
+
 ;; === Token

-(defrecord Token [id name type value description modified-at])
+(defrecord Token [id name type value description modified-at]
+  INamedItem
+  (get-name [_]
+    name)
+
+  (get-description [_]
+    description)
+
+  (get-modified-at [_]
+    modified-at)
+
+  (rename [this new-name]
+    (assoc this :name new-name))
+
+  (set-description [this new-description]
+    (assoc this :description new-description)))

 (defn token?
  [o]
@@ -109,7 +127,7 @@

 (defn get-token-path
  [token]
-  (get-path token token-separator))
+  (get-path (:name token) token-separator))

 (defn find-token-value-references
  "Returns set of token references found in `token-value`.
@@ -146,9 +164,53 @@
  (update-token [_ token-name f] "update a token in the list")
  (delete-token [_ token-name] "delete a token from the list")
  (get-token [_ token-name] "return token by token-name")
-  (get-tokens [_] "return an ordered sequence of all tokens in the set"))
+  (get-tokens [_] "return an ordered sequence of all tokens in the set")
+  (get-tokens-map [_] "return a map of tokens in the set, indexed by token-name"))
+
+(deftype TokenSet [id name description modified-at tokens]
+  #?@(:clj  [clojure.lang.IDeref
+             (deref [_] {:id id
+                         :name name
+                         :description description
+                         :modified-at modified-at
+                         :tokens tokens})]
+      :cljs [cljs.core/IDeref
+             (-deref [_] {:id id
+                          :name name
+                          :description description
+                          :modified-at modified-at
+                          :tokens tokens})])
+
+  #?@(:cljs [cljs.core/IEncodeJS
+             (-clj->js [_] (js-obj "id" (clj->js id)
+                                   "name" (clj->js name)
+                                   "description" (clj->js description)
+                                   "modified-at" (clj->js modified-at)
+                                   "tokens" (clj->js tokens)))])
+  INamedItem
+  (get-name [_]
+    name)
+
+  (get-description [_]
+    description)
+
+  (get-modified-at [_]
+    modified-at)
+
+  (rename [_ new-name]
+    (TokenSet. id
+               new-name
+               description
+               (dt/now)
+               tokens))
+
+  (set-description [_ new-description]
+    (TokenSet. id
+               name
+               (d/nilv new-description "")
+               (dt/now)
+               tokens))

-(defrecord TokenSet [id name description modified-at tokens]
  ITokenSet
  (add-token [_ token]
    (let [token (check-token token)]
@@ -184,7 +246,10 @@
    (get tokens token-name))

  (get-tokens [_]
-    (vals tokens)))
+    (vals tokens))
+
+  (get-tokens-map [_]
+    tokens))

 (defn token-set?
  [o]
@@ -218,10 +283,7 @@
 (declare make-token-set)

 (def schema:token-set
-  [:and {:gen/gen (->> (sg/generator schema:token-set-attrs)
-                       (sg/fmap #(make-token-set %)))}
-   (sm/required-keys schema:token-set-attrs)
-   [:fn token-set?]])
+  (sm/required-keys schema:token-set-attrs))

 (sm/register! ::token-set schema:token-set) ;; need to register for the recursive schema of token-sets

@@ -233,13 +295,17 @@

 (defn make-token-set
  [& {:as attrs}]
-  (-> attrs
-      (update :id #(or % (uuid/next)))
-      (update :modified-at #(or % (dt/now)))
-      (update :tokens #(into (d/ordered-map) %))
-      (update :description d/nilv "")
-      (check-token-set-attrs)
-      (map->TokenSet)))
+  (let [attrs (-> attrs
+                  (update :id #(or % (uuid/next)))
+                  (update :modified-at #(or % (dt/now)))
+                  (update :tokens #(into (d/ordered-map) %))
+                  (update :description d/nilv "")
+                  (check-token-set-attrs))]
+    (TokenSet. (:id attrs)
+               (:name attrs)
+               (:description attrs)
+               (:modified-at attrs)
+               (:tokens attrs))))

 (def ^:private set-prefix "S-")

@@ -291,7 +357,7 @@

 (defn get-set-path
  [token-set]
-  (get-path token-set set-separator))
+  (get-path (get-name token-set) set-separator))

 (defn split-set-name
  [name]
@@ -315,7 +381,7 @@
      (set-full-path->set-prefixed-full-path)))

 (defn get-set-prefixed-path [token-set]
-  (let [path (get-path token-set set-separator)]
+  (let [path (get-path (get-name token-set) set-separator)]
    (set-full-path->set-prefixed-full-path path)))

 (defn prefixed-set-path-string->set-name-string [path-str]
@@ -333,7 +399,7 @@
      (conj name)))

 (defn tokens-tree
-  "Convert tokens into a nested tree with their `:name` as the path.
+  "Convert tokens into a nested tree with their name as the path.
  Optionally use `update-token-fn` option to transform the token."
  [tokens & {:keys [update-token-fn]
             :or {update-token-fn identity}}]
@@ -343,7 +409,7 @@
             {} tokens))

 (defn backtrace-tokens-tree
-  "Convert tokens into a nested tree with their `:name` as the path.
+  "Convert tokens into a nested tree with their name as the path.
  Generates a uuid per token to backtrace a token from an external source (StyleDictionary).
  The backtrace can't be the name as the name might not exist when the user is creating a token."
  [tokens]
@@ -392,7 +458,7 @@
  (get-set [_ set-name] "get one set looking for name"))

 (def schema:token-set-node
-  [:schema {:registry {::node [:or ::token-set
+  [:schema {:registry {::node [:or [:fn token-set?]
                               [:and
                                [:map-of {:gen/max 5} :string [:ref ::node]]
                                [:fn d/ordered-map?]]]}}
@@ -443,6 +509,22 @@
  (hidden-theme? [_] "if a theme is the (from the user ui) hidden temporary theme"))

 (defrecord TokenTheme [id name group description is-source external-id modified-at sets]
+  INamedItem
+  (get-name [_]
+    name)
+
+  (get-description [_]
+    description)
+
+  (get-modified-at [_]
+    modified-at)
+
+  (rename [this new-name]
+    (assoc this :name new-name))
+
+  (set-description [this new-description]
+    (assoc this :description new-description))
+
  ITokenTheme
  (set-sets [_ set-names]
    (TokenTheme. id
@@ -528,13 +610,17 @@

 (defn make-token-theme
  [& {:as attrs}]
-  (let [id (uuid/next)]
+  (let [new-id (uuid/next)]
    (-> attrs
-        (update :id d/nilv id)
+        (update :id (fn [id]
+                      (-> (if (string? id)    ;; TODO: probably this may be deleted in some time, when we may be sure
+                            (uuid/parse* id)  ;;       that no file exists that has not been correctly migrated to
+                            id)               ;;       convert :id into :external-id
+                          (d/nilv new-id))))
        (update :group d/nilv top-level-theme-group-name)
        (update :description d/nilv "")
        (update :is-source d/nilv false)
-        (update :external-id #(or % (str id)))
+        (update :external-id #(or % (str new-id)))
        (update :modified-at #(or % (dt/now)))
        (update :sets set)
        (check-token-theme-attrs)
@@ -618,7 +704,7 @@
                      ;; Set
                      (and v (instance? TokenSet v))
                      [{:group? false
-                        :path (split-set-name (:name v))
+                        :path (split-set-name (get-name v))
                        :parent-path parent
                        :depth depth
                        :set v}]
@@ -664,7 +750,7 @@

                  ;; Set
                  (and v (instance? TokenSet v))
-                  (let [name (:name v)]
+                  (let [name (get-name v)]
                    [{:is-group false
                      :path (split-set-name name)
                      :id name
@@ -725,8 +811,14 @@ Will return a value that matches this schema:
 (declare export-dtcg-json)

 (deftype TokensLib [sets themes active-themes]
-  ;; NOTE: This is only for debug purposes, pending to properly
-  ;; implement the toString and alternative printing.
+  ;; This is to convert the TokensLib to a plain map, for debugging or unit tests.
+  protocols/Datafiable
+  (datafy [_]
+    {:sets (d/update-vals sets deref)
+     :themes themes
+     :active-themes active-themes})
+
+  ;; TODO: this is used in serialization, but there should be a better way to do it
  #?@(:clj  [clojure.lang.IDeref
             (deref [_] {:sets sets
                         :themes themes
@@ -746,8 +838,8 @@ Will return a value that matches this schema:

  ITokenSets
  (add-set [_ token-set]
-    (let [path      (get-set-prefixed-path token-set)
-          token-set (check-token-set token-set)]
+    (assert (token-set? token-set) "expected valid token-set")
+    (let [path (get-set-prefixed-path token-set)]
      (TokensLib. (d/oassoc-in sets path token-set)
                  themes
                  active-themes)))
@@ -756,10 +848,9 @@ Will return a value that matches this schema:
    (let [prefixed-full-path (set-name->prefixed-full-path set-name)
          set (get-in sets prefixed-full-path)]
      (if set
-        (let [set' (-> (make-token-set (f set))
-                       (assoc :modified-at (dt/now)))
+        (let [set' (f set)
              prefixed-full-path' (get-set-prefixed-path set')
-              name-changed? (not= (:name set) (:name set'))]
+              name-changed? (not= (get-name set) (get-name set'))]
          (if name-changed?
            (TokensLib. (-> sets
                            (d/oassoc-in-before prefixed-full-path prefixed-full-path' set')
@@ -767,7 +858,7 @@ Will return a value that matches this schema:
                        (walk/postwalk
                         (fn [form]
                           (if (instance? TokenTheme form)
-                             (update-set-name form (:name set) (:name set'))
+                             (update-set-name form (get-name set) (get-name set'))
                             form))
                         themes)
                        active-themes)
@@ -791,7 +882,7 @@ Will return a value that matches this schema:
    (let [path (split-set-name set-group-name)
          prefixed-path (map add-set-group-prefix path)
          child-set-names (->> (get-sets-at-path this path)
-                               (map :name)
+                               (map get-name)
                               (into #{}))]
      (TokensLib. (d/dissoc-in sets prefixed-path)
                  (walk/postwalk
@@ -833,7 +924,7 @@ Will return a value that matches this schema:
                  (set-full-path->set-prefixed-full-path before-path)))

              set
-              (assoc prev-set :name (join-set-path to-path))
+              (rename prev-set (join-set-path to-path))

              reorder?
              (= prefixed-from-path prefixed-to-path)
@@ -856,7 +947,7 @@ Will return a value that matches this schema:
                        (walk/postwalk
                         (fn [form]
                           (if (instance? TokenTheme form)
-                             (update-set-name form (:name prev-set) (:name set))
+                             (update-set-name form (get-name prev-set) (get-name set))
                             form))
                         themes))
                      active-themes))
@@ -888,15 +979,15 @@ Will return a value that matches this schema:
                    (d/oupdate-in prefixed-to-path (fn [sets]
                                                     (walk/prewalk
                                                      (fn [form]
-                                                        (if (instance? TokenSet form)
-                                                          (update form :name #(str to-path-str (str/strip-prefix % from-path-str)))
+                                                        (if (token-set? form)
+                                                          (rename form (str to-path-str (str/strip-prefix (get-name form) from-path-str)))
                                                          form))
                                                      sets)))))
              themes' (if reorder?
                        themes
                        (let [rename-sets-map (->> (get-sets-at-path this from-path)
                                                   (map (fn [set]
-                                                          [(:name set) (str to-path-str (str/strip-prefix (:name set) from-path-str))]))
+                                                          [(get-name set) (str to-path-str (str/strip-prefix (get-name set) from-path-str))]))
                                                   (into {}))]
                          (walk/postwalk
                           (fn [form]
@@ -934,12 +1025,12 @@ Will return a value that matches this schema:
          sets (get-sets-at-path this path)]
      (reduce
       (fn [lib set]
-         (update-set lib (:name set) (fn [set']
-                                       (update set' :name #(str to-path-str (str/strip-prefix % from-path-str))))))
+         (update-set lib (get-name set) (fn [set']
+                                          (rename set' (str to-path-str (str/strip-prefix (get-name set') from-path-str))))))
       this sets)))

  (get-ordered-set-names [this]
-    (map :name (get-sets this)))
+    (map get-name (get-sets this)))

  (set-count [this]
    (count (get-sets this)))
@@ -1080,7 +1171,7 @@ Will return a value that matches this schema:
          prefixed-path-str (set-group-path->set-group-prefixed-path-str group-path)]
      (if (seq active-set-names)
        (let [path-active-set-names (->> (get-sets-at-prefix-path this prefixed-path-str)
-                                         (map :name)
+                                         (map get-name)
                                         (into #{}))
              difference (set/difference path-active-set-names active-set-names)]
          (cond
@@ -1095,7 +1186,7 @@ Will return a value that matches this schema:
          active-set-names (filter theme-set-names all-set-names)
          tokens           (reduce (fn [tokens set-name]
                                     (let [set (get-set this set-name)]
-                                       (merge tokens (:tokens set))))
+                                       (merge tokens (get-tokens-map set))))
                                   (d/ordered-map)
                                   active-set-names)]
      tokens))
@@ -1160,11 +1251,10 @@ Will return a value that matches this schema:

 (defn duplicate-set [set-name lib & {:keys [suffix]}]
  (let [sets (get-sets lib)
-        unames (map :name sets)
+        unames (map get-name sets)
        copy-name (cfh/generate-unique-name set-name unames :suffix suffix)]
    (some-> (get-set lib set-name)
-            (assoc :name copy-name)
-            (assoc :modified-at (dt/now)))))
+            (rename copy-name))))

 ;; === Import / Export from JSON format

@@ -1243,13 +1333,25 @@ Will return a value that matches this schema:
  (walk/postwalk
   (fn [node]
     (cond-> node
+       ;; Handle sequential values that are objects with type
       (and (map? node)
            (contains? node "value")
-            (sequential? (get node "value")))
+            (sequential? (get node "value"))
+            (map? (first (get node "value"))))
       (update "value"
               (fn [seq-value]
                 (map #(set/rename-keys % {"type" "$type"}) seq-value)))

+       ;; Keep array of font families
+       (and (map? node)
+            (contains? node "type")
+            (= "fontFamilies" (get node "type"))
+            (contains? node "value")
+            (sequential? (get node "value"))
+            (not (map? (first (get node "value")))))
+       identity
+
+       ;; Rename keys for all token nodes
       (and (map? node)
            (and (contains? node "type")
                 (contains? node "value")))
@@ -1281,7 +1383,16 @@ Will return a value that matches this schema:
             (assoc tokens child-path (make-token
                                       :name child-path
                                       :type token-type
-                                       :value (get v "$value")
+                                       :value (cond-> (get v "$value")
+                                                ;; Split string of font-families
+                                                (and (= :font-family token-type)
+                                                     (string? (get v "$value")))
+                                                cto/split-font-family
+
+                                                ;; Keep array of font-families
+                                                (and (= :font-family token-type)
+                                                     (sequential? (get v "$value")))
+                                                identity)
                                       :description (get v "$description")))
             ;; Discard unknown type tokens
             tokens)))))
@@ -1473,8 +1584,10 @@ Will return a value that matches this schema:
  [tokens-lib]
  (let [{:keys [themes active-themes]} (dtcg-export-themes tokens-lib)
        sets (->> (get-sets tokens-lib)
-                  (map (fn [{:keys [name tokens]}]
-                         [(str name ".json") (tokens-tree tokens :update-token-fn token->dtcg-token)]))
+                  (map (fn [token-set]
+                         (let [name   (get-name token-set)
+                               tokens (get-tokens-map token-set)]
+                           [(str name ".json") (tokens-tree tokens :update-token-fn token->dtcg-token)])))
                  (into {}))]
    (-> sets
        (assoc "$themes.json" themes)
@@ -1491,8 +1604,9 @@ Will return a value that matches this schema:
        (->> (get-set-tree tokens-lib)
             (tree-seq d/ordered-map? vals)
             (filter (partial instance? TokenSet))
-             (map (fn [{:keys [name tokens]}]
-                    [name (tokens-tree tokens :update-token-fn token->dtcg-token)])))
+             (map (fn [set]
+                    [(get-name set)
+                     (tokens-tree (get-tokens-map set) :update-token-fn token->dtcg-token)])))

        ordered-set-names
        (mapv first name-set-tuples)
@@ -1512,28 +1626,31 @@ Will return a value that matches this schema:
 (defn get-tokens-of-unknown-type
  "Search for all tokens in the decoded json file that have a type that is not currently
   supported by Penpot. Returns a map token-path -> token type."
-  ([decoded-json]
-   (get-tokens-of-unknown-type decoded-json "" (get-json-format decoded-json)))
-  ([decoded-json parent-path json-format]
-   (let [type-key (if (= json-format :json-format/dtcg) "$type" "type")]
-     (reduce-kv
-      (fn [unknown-tokens k v]
-        (let [child-path (if (empty? parent-path)
-                           (name k)
-                           (str parent-path "." k))]
-          (if (and (map? v)
-                   (not (contains? v type-key)))
-            (let [nested-unknown-tokens (get-tokens-of-unknown-type v child-path json-format)]
-              (merge unknown-tokens nested-unknown-tokens))
-            (let [token-type-str (get v type-key)
-                  token-type (cto/dtcg-token-type->token-type token-type-str)]
-              (if (and (not (some? token-type)) (some? token-type-str))
-                (assoc unknown-tokens child-path token-type-str)
-                unknown-tokens)))))
-      nil
-      decoded-json))))
+  [decoded-json {:keys [json-format parent-path process-token-type]
+                 :or {json-format (get-json-format decoded-json)
+                      parent-path ""
+                      process-token-type identity}
+                 :as opts}]
+  (let [type-key (if (= json-format :json-format/dtcg) "$type" "type")]
+    (reduce-kv
+     (fn [unknown-tokens k v]
+       (let [child-path (if (empty? parent-path)
+                          (name k)
+                          (str parent-path "." k))]
+         (if (and (map? v)
+                  (not (contains? v type-key)))
+           (let [nested-unknown-tokens (get-tokens-of-unknown-type v (assoc opts :parent-path child-path))]
+             (merge unknown-tokens nested-unknown-tokens))
+           (let [token-type-str (get v type-key)
+                 token-type (-> (cto/dtcg-token-type->token-type token-type-str)
+                                (process-token-type))]
+             (if (and (not (some? token-type)) (some? token-type-str))
+               (assoc unknown-tokens child-path token-type-str)
+               unknown-tokens)))))
+     nil
+     decoded-json)))

-;; === Serialization handlers for RPC API (transit) and database (fressian)
+;; === Serialization handlers for RPC API (transit)

 (t/add-handlers!
 {:id "penpot/tokens-lib"
@@ -1543,8 +1660,8 @@ Will return a value that matches this schema:

 {:id "penpot/token-set"
  :class TokenSet
-  :wfn #(into {} %)
-  :rfn #(map->TokenSet %)}
+  :wfn deref
+  :rfn #(make-token-set %)}

 {:id "penpot/token-theme"
  :class TokenTheme
@@ -1556,6 +1673,8 @@ Will return a value that matches this schema:
  :wfn #(into {} %)
  :rfn #(map->Token %)})

+;; === Serialization handlers for database (fressian)
+
 #?(:clj
   (defn- read-tokens-lib-v1-0
     "Reads the first version of tokens lib, now completly obsolete"
@@ -1675,16 +1794,16 @@ Will return a value that matches this schema:
            (fres/write-object! w (into {} o)))
     :rfn (fn [r]
            (let [obj (fres/read-object! r)]
-              (map->Token obj)))}
+              (make-token obj)))}

    {:name "penpot/token-set/v1"
     :class TokenSet
     :wfn (fn [n w o]
            (fres/write-tag! w n 1)
-            (fres/write-object! w (into {} o)))
+            (fres/write-object! w (into {} (deref o))))
     :rfn (fn [r]
            (let [obj (fres/read-object! r)]
-              (map->TokenSet obj)))}
+              (make-token-set obj)))}

    {:name "penpot/token-theme/v1"
     :class TokenTheme
@@ -1693,7 +1812,7 @@ Will return a value that matches this schema:
            (fres/write-object! w (into {} o)))
     :rfn (fn [r]
            (let [obj (fres/read-object! r)]
-              (map->TokenTheme obj)))}
+              (make-token-theme obj)))}

    ;; LEGACY TOKENS LIB READERS (with migrations)
    {:name "penpot/tokens-lib/v1"
--- a/common/src/app/common/types/typographies_list.cljc
+++ b/common/src/app/common/types/typographies_list.cljc
@@ -7,8 +7,8 @@
 (ns app.common.types.typographies-list
  (:require
   [app.common.data :as d]
-   [app.common.text :as txt]
-   [app.common.time :as dt]))
+   [app.common.time :as dt]
+   [app.common.types.text :as txt]))

 (defn typographies-seq
  [file-data]
--- a/common/src/app/common/types/typography.cljc
+++ b/common/src/app/common/types/typography.cljc
@@ -8,8 +8,8 @@
  (:require
   [app.common.data :as d]
   [app.common.schema :as sm]
-   [app.common.text :as txt]
   [app.common.types.plugins :as ctpg]
+   [app.common.types.text :as txt]
   [app.common.uuid :as uuid]))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -59,6 +59,8 @@
       :text-transform (or text-transform "none")}
      (d/without-nils)))

+
+;; FIXME: this function should not be here it belongs to shape and not typography
 (defn uses-library-typographies?
  "Check if the shape uses any typography in the given library."
  [shape library-id]
@@ -70,6 +72,7 @@
             #(and (some? (:typography-ref-id %))
                   (= (:typography-ref-file %) library-id))))))

+;; FIXME: this function should not be here it belongs to shape and not typography
 (defn uses-library-typography?
  "Check if the shape uses the given library typography."
  [shape library-id typography-id]
@@ -93,13 +96,16 @@
                                   remap-typography
                                   content)))))

+(defn remove-typography-from-node
+  "Remove the typography reference from a node."
+  [node]
+  (dissoc node :typography-ref-file :typography-ref-id))
+
 (defn remove-external-typographies
  "Change the shape so that any use of an external typography now is removed"
  [shape file-id]
-  (let [remove-ref-file #(dissoc % :typography-ref-file :typography-ref-id)]
-
-    (update shape :content
-            (fn [content]
-              (txt/transform-nodes #(not= (:typography-ref-file %) file-id)
-                                   remove-ref-file
-                                   content)))))
+  (update shape :content
+          (fn [content]
+            (txt/transform-nodes #(not= (:typography-ref-file %) file-id)
+                                 remove-typography-from-node
+                                 content))))
--- a/common/src/app/common/types/variant.cljc
+++ b/common/src/app/common/types/variant.cljc
@@ -139,7 +139,6 @@
                     (< (count (first %)) property-max-length)
                     (< (count (second %)) property-max-length)))))

-
 (defn find-properties-to-remove
  "Compares two property maps to find which properties should be removed"
  [prev-props upd-props]
@@ -161,6 +160,46 @@
    (filterv #(not (contains? prev-names (:name %))) upd-props)))


+(defn- split-base-name-and-number
+  "Extract the number in parentheses from an item, if present, and return both the base name and the number"
+  [item]
+  (let [pattern-num-parens #"\(\d+\)$"
+        pattern-num        #"\d+"
+        base (-> item (str/replace pattern-num-parens "") (str/trim))
+        num  (some->> item (re-find pattern-num-parens) (re-find pattern-num) (d/parse-integer))]
+    [base (d/nilv num 0)]))
+
+(defn- group-numbers-by-base-name
+  "Return a map with a set of numbers associated to each base name"
+  [items]
+  (reduce (fn [acc item]
+            (let [[base num] (split-base-name-and-number item)]
+              (update acc base (fnil conj #{}) num)))
+          {}
+          items))
+
+(defn update-number-in-repeated-item
+  "Add, keep or update a number in parentheses for a given item, if necessary, depending on the items
+   already present in a list, to avoid repetitions"
+  [items item]
+  (let [names      (group-numbers-by-base-name items)
+        [base num] (split-base-name-and-number item)
+        nums-taken (get names base #{})]
+    (loop [n num]
+      (if (nums-taken n)
+        (recur (inc n))
+        (str base (when (pos? n) (str " (" n ")")))))))
+
+(defn update-number-in-repeated-prop-names
+  "Add, keep or update a number for each prop name depending on the previous ones"
+  [props]
+  (->> props
+       (reduce (fn [acc prop]
+                 (conj acc {:name (update-number-in-repeated-item (mapv :name acc) (:name prop))
+                            :value (:value prop)}))
+               [])))
+
+
 (defn find-index-for-property-name
  "Finds the index of a name in a property map"
  [props name]
--- a/common/test/common_tests/colors_test.cljc
+++ b/common/test/common_tests/colors_test.cljc
@@ -7,8 +7,7 @@
 (ns common-tests.colors-test
  (:require
   #?(:cljs [goog.color :as gcolors])
-   [app.common.colors :as colors]
-   [app.common.data :as d]
+   [app.common.types.color :as colors]
   [clojure.test :as t]))

 (t/deftest valid-hex-color
--- a/common/test/common_tests/logic/text_sync_test.cljc
+++ b/common/test/common_tests/logic/text_sync_test.cljc
@@ -0,0 +1,881 @@
+;; 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 common-tests.logic.text-sync-test
+  (:require
+   [app.common.files.changes-builder :as pcb]
+   [app.common.logic.libraries :as cll]
+   [app.common.logic.shapes :as cls]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
+   [clojure.test :as t]))
+
+(t/use-fixtures :each thi/test-fixture)
+
+
+(t/deftest sync-unchanged-copy-when-changed-attribute
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        main-child (ths/get-shape file :main-child)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "32" (:font-size line)))
+    (t/is (= "hello world" (:text line)))))
+
+(t/deftest sync-unchanged-copy-when-changed-text
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        main-child (ths/get-shape file :main-child)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "14" (:font-size line)))
+    (t/is (= "Bye" (:text line)))))
+
+(t/deftest sync-unchanged-copy-when-changed-both
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        main-child (ths/get-shape file :main-child)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "32" (:font-size line)))
+    (t/is (= "Bye" (:text line)))))
+
+(t/deftest sync-updated-attr-copy-when-changed-attribute
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :font-weight] "700"))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr doesn't change, because it was touched
+    (t/is (= "14" (:font-size line)))
+    (t/is (= "hello world" (:text line)))))
+
+(t/deftest sync-updated-attr-copy-when-changed-text
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :font-weight] "700"))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "14" (:font-size line)))
+    ;; The text is updated because only attrs were touched
+    (t/is (= "Bye" (:text line)))))
+
+(t/deftest sync-updated-attr-copy-when-changed-both
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :font-weight] "700"))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr doesn't change, because it was touched
+    (t/is (= "14" (:font-size line)))
+    ;; The text is updated because only attrs were touched
+    (t/is (= "Bye" (:text line)))))
+
+(t/deftest sync-updated-text-copy-when-changed-attribute
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Hi"))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr is updated because only text were touched
+    (t/is (= "32" (:font-size line)))
+    (t/is (= "Hi" (:text line)))))
+
+(t/deftest sync-updated-text-copy-when-changed-text
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Hi"))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "14" (:font-size line)))
+    ;; The text doesn't change, because it was touched
+    (t/is (= "Hi" (:text line)))))
+
+(t/deftest sync-updated-text-copy-when-changed-both
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Hi"))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr is updated because only text were touched
+    (t/is (= "32" (:font-size line)))
+    ;; The text doesn't change, because it was touched
+    (t/is (= "Hi" (:text line)))))
+
+(t/deftest sync-updated-both-copy-when-changed-attribute
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (-> shape
+                                                     (assoc-in [:content :children 0 :children 0 :children 0 :font-weight] "700")
+                                                     (assoc-in [:content :children 0 :children 0 :children 0 :text] "Hi")))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr doesn't change, because it was touched
+    (t/is (= "14" (:font-size line)))
+    (t/is (= "Hi" (:text line)))))
+
+(t/deftest sync-updated-both-copy-when-changed-text
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (-> shape
+                                                     (assoc-in [:content :children 0 :children 0 :children 0 :font-weight] "700")
+                                                     (assoc-in [:content :children 0 :children 0 :children 0 :text] "Hi")))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "14" (:font-size line)))
+    ;; The text doesn't change, because it was touched
+    (t/is (= "Hi" (:text line)))))
+
+(t/deftest sync-updated-both-copy-when-changed-both
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (-> shape
+                                                     (assoc-in [:content :children 0 :children 0 :children 0 :font-weight] "700")
+                                                     (assoc-in [:content :children 0 :children 0 :children 0 :text] "Hi")))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr doesn't change, because it was touched
+    (t/is (= "14" (:font-size line)))
+    ;; The text doesn't change, because it was touched
+    (t/is (= "Hi" (:text line)))))
+
+(t/deftest sync-updated-structure-same-attrs-copy-when-changed-attribute
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (let [line (get-in shape [:content :children 0 :children 0 :children 0])]
+                                                   (update-in shape [:content :children 0 :children 0 :children]
+                                                              #(conj % line))))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   ;; Update the attrs on all the content tree
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr is updated because all the attrs on the structure are equal
+    (t/is (= "32" (:font-size line)))
+    (t/is (= "hello world" (:text line)))))
+
+(t/deftest sync-updated-structure-same-attrs-copy-when-changed-text
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (let [line (get-in shape [:content :children 0 :children 0 :children 0])]
+                                                   (update-in shape [:content :children 0 :children 0 :children]
+                                                              #(conj % line))))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "14" (:font-size line)))
+    ;; The text doesn't change, because the structure was touched
+    (t/is (= "hello world" (:text line)))))
+
+(t/deftest sync-updated-structure-same-attrs-copy-when-changed-both
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (let [line (get-in shape [:content :children 0 :children 0 :children 0])]
+                                                   (update-in shape [:content :children 0 :children 0 :children]
+                                                              #(conj % line))))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                     ;; Update the attrs on all the content tree
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr is updated because all the attrs on the structure are equal
+    (t/is (= "32" (:font-size line)))
+    ;; The text doesn't change, because the structure was touched
+    (t/is (= "hello world" (:text line)))))
+
+(t/deftest sync-updated-structure-diff-attrs-copy-when-changed-attribute
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (let [line (-> (get-in shape [:content :children 0 :children 0 :children 0])
+                                                                (assoc :font-weight "700"))]
+                                                   (update-in shape [:content :children 0 :children 0 :children]
+                                                              #(conj % line))))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   ;; Update the attrs on all the content tree
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr doesn't change, because not all the attrs on the structure are equal
+    (t/is (= "14" (:font-size line)))
+    (t/is (= "hello world" (:text line)))))
+
+(t/deftest sync-updated-structure-diff-attrs-copy-when-changed-text
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (let [line (-> (get-in shape [:content :children 0 :children 0 :children 0])
+                                                                (assoc :font-weight "700"))]
+                                                   (update-in shape [:content :children 0 :children 0 :children]
+                                                              #(conj % line))))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    (t/is (= "14" (:font-size line)))
+    ;; The text doesn't change, because the structure was touched
+    (t/is (= "hello world" (:text line)))))
+
+(t/deftest sync-updated-structure-diff-attrs-copy-when-changed-both
+  (let [;; ==== Setup
+        file0      (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page0      (thf/current-page file0)
+        copy-child (ths/get-shape file0 :copy-child)
+
+        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
+                                               #{(:id copy-child)}
+                                               (fn [shape]
+                                                 (let [line (-> (get-in shape [:content :children 0 :children 0 :children 0])
+                                                                (assoc :font-weight "700"))]
+                                                   (update-in shape [:content :children 0 :children 0 :children]
+                                                              #(conj % line))))
+                                               (:objects (thf/current-page file0))
+                                               {})
+        file       (thf/apply-changes file0 changes)
+        main-child (ths/get-shape file :main-child)
+        page       (thf/current-page file)
+
+        ;; ==== Action
+        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                 #{(:id main-child)}
+                                                 (fn [shape]
+                                                     ;; Update the attrs on all the content tree
+                                                   (-> shape
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")
+                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
+                                                 (:objects page)
+                                                 {})
+
+        updated-file (thf/apply-changes file changes1)
+
+        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
+                                                     nil
+                                                     :components
+                                                     (:id updated-file)
+                                                     (thi/id :component1)
+                                                     (:id updated-file)
+                                                     {(:id updated-file) updated-file}
+                                                     (:id updated-file))
+
+        file'     (thf/apply-changes updated-file changes2)
+
+        ;; ==== Get
+        copy-child' (ths/get-shape file' :copy-child)
+        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
+    ;; The attr doesn't change, because not all the attrs on the structure are equal
+    (t/is (= "14" (:font-size line)))
+    ;; The text doesn't change, because the structure was touched
+    (t/is (= "hello world" (:text line)))))
--- a/common/test/common_tests/logic/text_touched_test.cljc
+++ b/common/test/common_tests/logic/text_touched_test.cljc
@@ -0,0 +1,132 @@
+;; 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 common-tests.logic.text-touched-test
+  (:require
+   [app.common.files.changes-builder :as pcb]
+   [app.common.logic.shapes :as cls]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
+   [clojure.test :as t]))
+
+(t/use-fixtures :each thi/test-fixture)
+
+(t/deftest test-text-copy-changed-attribute
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        copy-child (ths/get-shape file :copy-child)
+
+        ;; ==== Action
+        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                #{(:id copy-child)}
+                                                (fn [shape]
+                                                  (assoc-in shape [:content :children 0 :children 0 :font-size] "32"))
+                                                (:objects page)
+                                                {})
+
+        file'       (thf/apply-changes file changes)
+        copy-child' (ths/get-shape file' :copy-child)]
+    (t/is (= #{:content-group :text-content-attribute} (:touched copy-child')))))
+
+(t/deftest test-text-copy-changed-text
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        copy-child (ths/get-shape file :copy-child)
+
+        ;; ==== Action
+        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                #{(:id copy-child)}
+                                                (fn [shape]
+                                                  (assoc-in shape [:content :children 0 :children 0 :text] "Bye"))
+                                                (:objects page)
+                                                {})
+
+        file'       (thf/apply-changes file changes)
+        copy-child' (ths/get-shape file' :copy-child)]
+    (t/is (= #{:content-group :text-content-text} (:touched copy-child')))))
+
+(t/deftest test-text-copy-changed-both
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        copy-child (ths/get-shape file :copy-child)
+
+        ;; ==== Action
+        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                #{(:id copy-child)}
+                                                (fn [shape]
+                                                  (-> shape
+                                                      (assoc-in [:content :children 0 :children 0 :font-size] "32")
+                                                      (assoc-in [:content :children 0 :children 0 :text] "Bye")))
+                                                (:objects page)
+                                                {})
+
+        file'       (thf/apply-changes file changes)
+        copy-child' (ths/get-shape file' :copy-child)]
+    (t/is (= #{:content-group :text-content-attribute :text-content-text} (:touched copy-child')))))
+
+(t/deftest test-text-copy-changed-structure-same-attrs
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        copy-child (ths/get-shape file :copy-child)
+
+        ;; ==== Action
+        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                #{(:id copy-child)}
+                                                (fn [shape]
+                                                  (let [line (get-in shape [:content :children 0 :children 0])]
+                                                    (update-in shape [:content :children 0 :children]
+                                                               #(conj % line))))
+                                                (:objects page)
+                                                {})
+
+        file'       (thf/apply-changes file changes)
+        copy-child' (ths/get-shape file' :copy-child)]
+    (t/is (= #{:content-group :text-content-structure} (:touched copy-child')))))
+
+(t/deftest test-text-copy-changed-structure-diff-attrs
+  (let [;; ==== Setup
+        file       (-> (thf/sample-file :file1)
+                       (tho/add-frame-with-text :main-root :main-child "hello world")
+                       (thc/make-component :component1 :main-root)
+                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
+        page       (thf/current-page file)
+        copy-child (ths/get-shape file :copy-child)
+
+        ;; ==== Action
+        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
+                                                #{(:id copy-child)}
+                                                (fn [shape]
+                                                  (let [line (-> shape
+                                                                 (get-in [:content :children 0 :children 0])
+                                                                 (assoc :font-size "32"))]
+                                                    (update-in shape [:content :children 0 :children]
+                                                               #(conj % line))))
+                                                (:objects page)
+                                                {})
+
+        file'       (thf/apply-changes file changes)
+        copy-child' (ths/get-shape file' :copy-child)]
+    (t/is (= #{:content-group :text-content-structure} (:touched copy-child')))))
+
--- a/common/test/common_tests/logic/token_apply_test.cljc
+++ b/common/test/common_tests/logic/token_apply_test.cljc
@@ -14,8 +14,8 @@
   [app.common.test-helpers.ids-map :as thi]
   [app.common.test-helpers.shapes :as ths]
   [app.common.test-helpers.tokens :as tht]
-   [app.common.text :as txt]
   [app.common.types.container :as ctn]
+   [app.common.types.text :as txt]
   [app.common.types.token :as cto]
   [app.common.types.tokens-lib :as ctob]
   [clojure.test :as t]))
@@ -54,9 +54,21 @@
                                  (ctob/add-token-in-set "test-token-set"
                                                         (ctob/make-token :name "token-dimensions"
                                                                          :type :dimensions
-                                                                          :value 100))))
+                                                                          :value 100))
+                                  (ctob/add-token-in-set "test-token-set"
+                                                         (ctob/make-token :name "token-font-size"
+                                                                          :type :font-size
+                                                                          :value 24))
+                                  (ctob/add-token-in-set "test-token-set"
+                                                         (ctob/make-token :name "token-letter-spacing"
+                                                                          :type :letter-spacing
+                                                                          :value 2))
+                                  (ctob/add-token-in-set "test-token-set"
+                                                         (ctob/make-token :name "token-font-family"
+                                                                          :type :font-family
+                                                                          :value ["Helvetica" "Arial" "sans-serif"]))))
      (tho/add-frame :frame1)
-      (tho/add-text :text1 "Hello World")))
+      (tho/add-text :text1 "Hello World!")))

 (defn- apply-all-tokens
  [file]
@@ -68,19 +80,25 @@
      (tht/apply-token-to-shape :frame1 "token-color" [:stroke-color] [:stroke-color] "#00ff00")
      (tht/apply-token-to-shape :frame1 "token-color" [:fill] [:fill] "#00ff00")
      (tht/apply-token-to-shape :frame1 "token-dimensions" [:width :height] [:width :height] 100)
-      (tht/apply-token-to-shape :text1 "token-color" [:fill] [:fill] "#00ff00")))
+      (tht/apply-token-to-shape :text1 "token-font-size" [:font-size] [:font-size] 24)
+      (tht/apply-token-to-shape :text1 "token-letter-spacing" [:letter-spacing] [:letter-spacing] 2)
+      (tht/apply-token-to-shape :text1 "token-font-family" [:font-family] [:font-family] ["Helvetica" "Arial" "sans-serif"])))

 (t/deftest apply-tokens-to-shape
  (let [;; ==== Setup
        file               (setup-file)
        page               (thf/current-page file)
        frame1             (ths/get-shape file :frame1)
+        text1              (ths/get-shape file :text1)
        token-radius       (tht/get-token file "test-token-set" "token-radius")
        token-rotation     (tht/get-token file "test-token-set" "token-rotation")
        token-opacity      (tht/get-token file "test-token-set" "token-opacity")
        token-stroke-width (tht/get-token file "test-token-set" "token-stroke-width")
        token-color        (tht/get-token file "test-token-set" "token-color")
        token-dimensions   (tht/get-token file "test-token-set" "token-dimensions")
+        token-font-size    (tht/get-token file "test-token-set" "token-font-size")
+        token-letter-spacing (tht/get-token file "test-token-set" "token-letter-spacing")
+        token-font-family  (tht/get-token file "test-token-set" "token-font-family")

        ;; ==== Action
        changes (-> (-> (pcb/empty-changes nil)
@@ -89,38 +107,51 @@
                    (cls/generate-update-shapes [(:id frame1)]
                                                (fn [shape]
                                                  (as-> shape $
-                                                    (cto/maybe-apply-token-to-shape {:token nil ; test nil case
-                                                                                     :shape $
-                                                                                     :attributes []})
-                                                    (cto/maybe-apply-token-to-shape {:token token-radius
-                                                                                     :shape $
-                                                                                     :attributes [:r1 :r2 :r3 :r4]})
-                                                    (cto/maybe-apply-token-to-shape {:token token-rotation
-                                                                                     :shape $
-                                                                                     :attributes [:rotation]})
-                                                    (cto/maybe-apply-token-to-shape {:token token-opacity
-                                                                                     :shape $
-                                                                                     :attributes [:opacity]})
-                                                    (cto/maybe-apply-token-to-shape {:token token-stroke-width
-                                                                                     :shape $
-                                                                                     :attributes [:stroke-width]})
-                                                    (cto/maybe-apply-token-to-shape {:token token-color
-                                                                                     :shape $
-                                                                                     :attributes [:stroke-color]})
-                                                    (cto/maybe-apply-token-to-shape {:token token-color
-                                                                                     :shape $
-                                                                                     :attributes [:fill]})
-                                                    (cto/maybe-apply-token-to-shape {:token token-dimensions
-                                                                                     :shape $
-                                                                                     :attributes [:width :height]})))
+                                                    (cto/apply-token-to-shape {:token token-radius
+                                                                               :shape $
+                                                                               :attributes [:r1 :r2 :r3 :r4]})
+                                                    (cto/apply-token-to-shape {:token token-rotation
+                                                                               :shape $
+                                                                               :attributes [:rotation]})
+                                                    (cto/apply-token-to-shape {:token token-opacity
+                                                                               :shape $
+                                                                               :attributes [:opacity]})
+                                                    (cto/apply-token-to-shape {:token token-stroke-width
+                                                                               :shape $
+                                                                               :attributes [:stroke-width]})
+                                                    (cto/apply-token-to-shape {:token token-color
+                                                                               :shape $
+                                                                               :attributes [:stroke-color]})
+                                                    (cto/apply-token-to-shape {:token token-color
+                                                                               :shape $
+                                                                               :attributes [:fill]})
+                                                    (cto/apply-token-to-shape {:token token-dimensions
+                                                                               :shape $
+                                                                               :attributes [:width :height]})))
+                                                (:objects page)
+                                                {})
+                    (cls/generate-update-shapes [(:id text1)]
+                                                (fn [shape]
+                                                  (as-> shape $
+                                                    (cto/apply-token-to-shape {:token token-font-size
+                                                                               :shape $
+                                                                               :attributes [:font-size]})
+                                                    (cto/apply-token-to-shape {:token token-letter-spacing
+                                                                               :shape $
+                                                                               :attributes [:letter-spacing]})
+                                                    (cto/apply-token-to-shape {:token token-font-family
+                                                                               :shape $
+                                                                               :attributes [:font-family]})))
                                                (:objects page)
                                                {}))

        file' (thf/apply-changes file changes)

        ;; ==== Get
-        frame1'         (ths/get-shape file' :frame1)
-        applied-tokens' (:applied-tokens frame1')]
+        frame1'              (ths/get-shape file' :frame1)
+        applied-tokens'      (:applied-tokens frame1')
+        text1'               (ths/get-shape file' :text1)
+        text1-applied-tokens (:applied-tokens text1')]

    ;; ==== Check
    (t/is (= (count applied-tokens') 11))
@@ -134,7 +165,11 @@
    (t/is (= (:stroke-color applied-tokens') "token-color"))
    (t/is (= (:fill applied-tokens') "token-color"))
    (t/is (= (:width applied-tokens') "token-dimensions"))
-    (t/is (= (:height applied-tokens') "token-dimensions"))))
+    (t/is (= (:height applied-tokens') "token-dimensions"))
+    (t/is (= (count text1-applied-tokens) 3))
+    (t/is (= (:font-size text1-applied-tokens) "token-font-size"))
+    (t/is (= (:letter-spacing text1-applied-tokens) "token-letter-spacing"))
+    (t/is (= (:font-family text1-applied-tokens) "token-font-family"))))

 (t/deftest unapply-tokens-from-shape
  (let [;; ==== Setup
@@ -142,6 +177,7 @@
                    (apply-all-tokens))
        page    (thf/current-page file)
        frame1  (ths/get-shape file :frame1)
+        text1   (ths/get-shape file :text1)

        ;; ==== Action
        changes (-> (-> (pcb/empty-changes nil)
@@ -158,16 +194,27 @@
                                                      (cto/unapply-token-id [:fill])
                                                      (cto/unapply-token-id [:width :height])))
                                                (:objects page)
+                                                {})
+                    (cls/generate-update-shapes [(:id text1)]
+                                                (fn [shape]
+                                                  (-> shape
+                                                      (cto/unapply-token-id [:font-size])
+                                                      (cto/unapply-token-id [:letter-spacing])
+                                                      (cto/unapply-token-id [:font-family])))
+                                                (:objects page)
                                                {}))

        file' (thf/apply-changes file changes)

        ;; ==== Get
-        frame1'         (ths/get-shape file' :frame1)
-        applied-tokens' (:applied-tokens frame1')]
+        frame1'              (ths/get-shape file' :frame1)
+        applied-tokens'      (:applied-tokens frame1')
+        text1'               (ths/get-shape file' :text1)
+        text1-applied-tokens (:applied-tokens text1')]

    ;; ==== Check
-    (t/is (= (count applied-tokens') 0))))
+    (t/is (= (count applied-tokens') 0))
+    (t/is (= (count text1-applied-tokens) 0))))

 (t/deftest unapply-tokens-automatic
  (let [;; ==== Setup
@@ -202,7 +249,10 @@
                                                   shape
                                                   txt/is-content-node?
                                                   d/txt-merge
-                                                   {:fills (ths/sample-fills-color :fill-color "#fabada")}))
+                                                   {:fills (ths/sample-fills-color :fill-color "#fabada")
+                                                    :font-size "1"
+                                                    :letter-spacing "0"
+                                                    :font-family "Arial"}))
                                                (:objects page)
                                                {}))

@@ -216,4 +266,4 @@

    ;; ==== Check
    (t/is (= (count applied-tokens-frame') 0))
-    (t/is (= (count applied-tokens-text') 0))))
+    (t/is (= (count applied-tokens-text') 0))))
--- a/common/test/common_tests/logic/token_test.cljc
+++ b/common/test/common_tests/logic/token_test.cljc
@@ -269,8 +269,7 @@
          new-set-name "foo1"
          changes (-> (pcb/empty-changes)
                      (pcb/with-library-data (:data file))
-                      (pcb/set-token-set set-name false (assoc prev-token-set
-                                                               :name new-set-name)))
+                      (pcb/set-token-set set-name false (ctob/rename prev-token-set new-set-name)))
          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
--- a/common/test/common_tests/types/absorb_assets_test.cljc
+++ b/common/test/common_tests/types/absorb_assets_test.cljc
@@ -12,12 +12,12 @@
   [app.common.test-helpers.files :as thf]
   [app.common.test-helpers.ids-map :as thi]
   [app.common.test-helpers.shapes :as ths]
-   [app.common.text :as txt]
-   [app.common.types.color :as ctc]
   [app.common.types.component :as ctk]
   [app.common.types.components-list :as ctkl]
   [app.common.types.file :as ctf]
+   [app.common.types.library :as ctl]
   [app.common.types.pages-list :as ctpl]
+   [app.common.types.text :as txt]
   [app.common.types.typographies-list :as ctyl]
   [clojure.test :as t]))

@@ -80,7 +80,7 @@
        _ (thf/validate-file! file')

        ;; Get
-        colors' (ctc/colors-seq (ctf/file-data file'))
+        colors' (vals (ctl/get-colors (ctf/file-data file')))
        shape1' (ths/get-shape file' :shape1)
        fill'   (first (:fills shape1'))]

--- a/common/test/common_tests/types/fill_test.cljc
+++ b/common/test/common_tests/types/fill_test.cljc
@@ -6,16 +6,11 @@

 (ns common-tests.types.fill-test
  (:require
-   #?(:clj [app.common.fressian :as fres])
   [app.common.data :as d]
-   [app.common.exceptions :as ex]
   [app.common.math :as mth]
-   [app.common.pprint :as pp]
-   [app.common.pprint :as pp]
   [app.common.schema.generators :as sg]
   [app.common.schema.test :as smt]
-   [app.common.transit :as trans]
-   [app.common.types.fill :as types.fill]
+   [app.common.types.fills :as types.fills]
   [app.common.uuid :as uuid]
   [clojure.test :as t]))

@@ -85,8 +80,8 @@
   :fill-opacity 0.7})

 (t/deftest build-from-plain-1
-  (let [fills (types.fill/from-plain [sample-fill-1])]
-    (t/is (types.fill/fills? fills))
+  (let [fills (types.fills/from-plain [sample-fill-1])]
+    (t/is (types.fills/fills? fills))
    (t/is (= 1 (count fills)))
    (t/is (equivalent-fill? (first fills) sample-fill-1))))

@@ -99,8 +94,8 @@
                :keep-aspect-ratio false}})

 (t/deftest build-from-plain-2
-  (let [fills (types.fill/from-plain [sample-fill-2])]
-    (t/is (types.fill/fills? fills))
+  (let [fills (types.fills/from-plain [sample-fill-2])]
+    (t/is (types.fills/fills? fills))
    (t/is (= 1 (count fills)))
    (t/is (equivalent-fill? (first fills) sample-fill-2))))

@@ -117,8 +112,8 @@
    :stops [{:color "#631aa8", :offset 0.5}]}})

 (t/deftest build-from-plain-3
-  (let [fills (types.fill/from-plain [sample-fill-3])]
-    (t/is (types.fill/fills? fills))
+  (let [fills (types.fills/from-plain [sample-fill-3])]
+    (t/is (types.fills/fills? fills))
    (t/is (= 1 (count fills)))
    (t/is (equivalent-fill? (first fills) sample-fill-3))))

@@ -136,8 +131,8 @@
   :fill-color-ref-id #uuid "2eef07f1-e38a-8062-8006-3aa264d5b785"})

 (t/deftest build-from-plain-4
-  (let [fills (types.fill/from-plain [sample-fill-4])]
-    (t/is (types.fill/fills? fills))
+  (let [fills (types.fills/from-plain [sample-fill-4])]
+    (t/is (types.fills/fills? fills))
    (t/is (= 1 (count fills)))
    (t/is (equivalent-fill? (first fills) sample-fill-4))))

@@ -154,8 +149,8 @@
    :stops [{:color "#bba1aa", :opacity 0.37, :offset 0.84}]}})

 (t/deftest build-from-plain-5
-  (let [fills (types.fill/from-plain [sample-fill-5])]
-    (t/is (types.fill/fills? fills))
+  (let [fills (types.fills/from-plain [sample-fill-5])]
+    (t/is (types.fills/fills? fills))
    (t/is (= 1 (count fills)))
    (t/is (equivalent-fill? (first fills) sample-fill-5))))

@@ -170,14 +165,14 @@
    :stops [{:color "#e15610", :offset 0.4} {:color "#005a9e", :opacity 0.62, :offset 0.81}]}})

 (t/deftest build-from-plain-6
-  (let [fills (types.fill/from-plain [sample-fill-6])]
-    (t/is (types.fill/fills? fills))
+  (let [fills (types.fills/from-plain [sample-fill-6])]
+    (t/is (types.fills/fills? fills))
    (t/is (= 1 (count fills)))
    (t/is (equivalent-fill? (first fills) sample-fill-6))))

 (t/deftest fills-datatype-roundtrip
  (smt/check!
-   (smt/for [fill (->> (sg/generator types.fill/schema:fill)
+   (smt/for [fill (->> (sg/generator types.fills/schema:fill)
                       (sg/fmap d/without-nils)
                       (sg/fmap (fn [fill]
                                  (cond-> fill
@@ -187,27 +182,27 @@
                                             (contains? fill :fill-color-ref-file)))
                                    (-> (assoc :fill-color-ref-file (uuid/next))
                                        (assoc :fill-color-ref-id (uuid/next)))))))]
-     (let [bfills (types.fill/from-plain [fill])]
+     (let [bfills (types.fills/from-plain [fill])]
       (and (= (count bfills) 1)
            (equivalent-fill? (first bfills) fill))))
   {:num 2000}))

 (t/deftest equality-operation
-  (let [fills1 (types.fill/from-plain [sample-fill-6])
-        fills2 (types.fill/from-plain [sample-fill-6])]
+  (let [fills1 (types.fills/from-plain [sample-fill-6])
+        fills2 (types.fills/from-plain [sample-fill-6])]
    (t/is (= fills1 fills2))))

 (t/deftest reduce-impl
-  (let [fills1 (types.fill/from-plain [sample-fill-6])
+  (let [fills1 (types.fills/from-plain [sample-fill-6])
        fills2 (reduce (fn [result fill]
                         (conj result fill))
                       []
                       fills1)
-        fills3 (types.fill/from-plain fills2)]
+        fills3 (types.fills/from-plain fills2)]
    (t/is (= fills1 fills3))))

 (t/deftest indexed-access
-  (let [fills1 (types.fill/from-plain [sample-fill-6])
+  (let [fills1 (types.fills/from-plain [sample-fill-6])
        fill0  (nth fills1 0)
        fill1  (nth fills1 1)]
    (t/is (nil? fill1))
--- a/common/test/common_tests/types/text_test.cljc
+++ b/common/test/common_tests/types/text_test.cljc
@@ -7,26 +7,36 @@
 (ns common-tests.types.text-test
  (:require

-   [app.common.text :as txt]
   [app.common.types.shape :as cts]
   [app.common.types.text :as cttx]
   [clojure.test :as t :include-macros true]))

-(def content-base (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
-                      (txt/change-text "hello world")
-                      (assoc :position-data nil)
-                      :content))
+(def content-base
+  (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
+      (get :content)
+      (cttx/change-text "hello world")))

-(def content-changed-text (assoc-in content-base [:children 0 :children 0 :children 0 :text] "changed"))
-(def content-changed-attr (assoc-in content-base [:children 0 :children 0 :children 0 :font-size] "32"))
-(def content-changed-both (-> content-base
-                              (assoc-in [:children 0 :children 0 :children 0 :text] "changed")
-                              (assoc-in  [:children 0 :children 0 :children 0 :font-size] "32")))
-(def line (get-in content-base [:children 0 :children 0 :children 0]))
-(def content-changed-structure (update-in content-base [:children 0 :children 0 :children]
-                                          #(conj % (assoc line :font-weight "700"))))
-(def content-changed-structure-same-attrs (update-in content-base [:children 0 :children 0 :children]
-                                                     #(conj % line)))
+(def content-changed-text
+  (assoc-in content-base [:children 0 :children 0 :children 0 :text] "changed"))
+
+(def content-changed-attr
+  (assoc-in content-base [:children 0 :children 0 :children 0 :font-size] "32"))
+
+(def content-changed-both
+  (-> content-base
+      (assoc-in [:children 0 :children 0 :children 0 :text] "changed")
+      (assoc-in  [:children 0 :children 0 :children 0 :font-size] "32")))
+
+(def line
+  (get-in content-base [:children 0 :children 0 :children 0]))
+
+(def content-changed-structure
+  (update-in content-base [:children 0 :children 0 :children]
+             #(conj % (assoc line :font-weight "700"))))
+
+
+(def content-changed-structure-same-attrs
+  (update-in content-base [:children 0 :children 0 :children] #(conj % line)))

 (t/deftest test-get-diff-type
  (let [diff-text                 (cttx/get-diff-type content-base content-changed-text)
@@ -39,7 +49,7 @@
    (t/is (= #{:text-content-attribute} diff-attr))
    (t/is (= #{:text-content-text :text-content-attribute} diff-both))
    (t/is (= #{:text-content-structure} diff-structure))
-    (t/is (= #{:text-content-structure :text-content-structure-same-attrs} diff-structure-same-attrs))))
+    (t/is (= #{:text-content-structure} diff-structure-same-attrs))))


 (t/deftest test-get-diff-attrs
--- a/common/test/common_tests/types/tokens_lib_test.cljc
+++ b/common/test/common_tests/types/tokens_lib_test.cljc
@@ -14,6 +14,7 @@
   [app.common.time :as dt]
   [app.common.transit :as tr]
   [app.common.types.tokens-lib :as ctob]
+   [clojure.datafy :refer [datafy]]
   [clojure.test :as t]))

 (defn setup-virtual-time
@@ -72,14 +73,14 @@
                                        :modified-at now
                                        :tokens [])]

-    (t/is (= (:name token-set1) "test-token-set-1"))
-    (t/is (= (:description token-set1) ""))
-    (t/is (some? (:modified-at token-set1)))
-    (t/is (empty? (:tokens token-set1)))
-    (t/is (= (:name token-set2) "test-token-set-2"))
-    (t/is (= (:description token-set2) "test description"))
-    (t/is (= (:modified-at token-set2) now))
-    (t/is (empty? (:tokens token-set2)))))
+    (t/is (= (ctob/get-name token-set1) "test-token-set-1"))
+    (t/is (= (ctob/get-description token-set1) ""))
+    (t/is (some? (ctob/get-modified-at token-set1)))
+    (t/is (empty? (ctob/get-tokens-map token-set1)))
+    (t/is (= (ctob/get-name token-set2) "test-token-set-2"))
+    (t/is (= (ctob/get-description token-set2) "test description"))
+    (t/is (= (ctob/get-modified-at token-set2) now))
+    (t/is (empty? (ctob/get-tokens-map token-set2)))))

 (t/deftest make-invalid-token-set
  (let [params {:name 777 :description 999}]
@@ -183,7 +184,7 @@
                                                                                              :type :boolean
                                                                                              :value true)})))
        expected (-> (ctob/get-set tokens-lib "A")
-                     (get :tokens)
+                     (ctob/get-tokens-map)
                     (ctob/tokens-tree))]
    (t/is (= (get-in expected ["foo" "bar" "baz" :name]) "foo.bar.baz"))
    (t/is (= (get-in expected ["foo" "bar" "bam" :name]) "foo.bar.bam"))
@@ -249,20 +250,18 @@
        tokens-lib' (-> tokens-lib
                        (ctob/update-set "test-token-set"
                                         (fn [token-set]
-                                           (assoc token-set
-                                                  :description "some description")))
+                                           (ctob/set-description token-set "some description")))
                        (ctob/update-set "not-existing-set"
                                         (fn [token-set]
-                                           (assoc token-set
-                                                  :description "no-effect"))))
+                                           (ctob/set-description token-set "no-effect"))))

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (:name token-set') "test-token-set"))
-    (t/is (= (:description token-set') "some description"))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (= (ctob/get-name token-set') "test-token-set"))
+    (t/is (= (ctob/get-description token-set') "some description"))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest rename-token-set
  (let [tokens-lib  (-> (ctob/make-tokens-lib)
@@ -271,15 +270,14 @@
        tokens-lib' (-> tokens-lib
                        (ctob/update-set "test-token-set"
                                         (fn [token-set]
-                                           (assoc token-set
-                                                  :name "updated-name"))))
+                                           (ctob/rename token-set "updated-name"))))

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "updated-name")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (:name token-set') "updated-name"))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (= (ctob/get-name token-set') "updated-name"))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest rename-token-set-group
  (let [tokens-lib  (-> (ctob/make-tokens-lib)
@@ -323,11 +321,11 @@
                                                                                     :type :boolean
                                                                                     :value true)})))
        token-set-copy (ctob/duplicate-set "test-token-set" tokens-lib {:suffix "copy"})
-        token (get-in token-set-copy [:tokens "test-token"])]
+        token (ctob/get-token token-set-copy "test-token")]

    (t/is (some? token-set-copy))
-    (t/is (= (:name token-set-copy) "test-token-set-copy"))
-    (t/is (= (count (:tokens token-set-copy)) 1))
+    (t/is (= (ctob/get-name token-set-copy) "test-token-set-copy"))
+    (t/is (= (count (ctob/get-tokens-map token-set-copy)) 1))
    (t/is (= (:name token) "test-token"))))

 (t/deftest duplicate-token-set-twice
@@ -341,11 +339,11 @@
        tokens-lib (ctob/add-set tokens-lib (ctob/duplicate-set "test-token-set" tokens-lib {:suffix "copy"}))

        token-set-copy (ctob/duplicate-set "test-token-set" tokens-lib {:suffix "copy"})
-        token (get-in token-set-copy [:tokens "test-token"])]
+        token (ctob/get-token token-set-copy "test-token")]

    (t/is (some? token-set-copy))
-    (t/is (= (:name token-set-copy) "test-token-set-copy-2"))
-    (t/is (= (count (:tokens token-set-copy)) 1))
+    (t/is (= (ctob/get-name token-set-copy) "test-token-set-copy-2"))
+    (t/is (= (count (ctob/get-tokens-map token-set-copy)) 1))
    (t/is (= (:name token) "test-token"))))

 (t/deftest duplicate-empty-token-set
@@ -353,11 +351,11 @@
                            (ctob/add-set (ctob/make-token-set :name "test-token-set")))

        token-set-copy (ctob/duplicate-set "test-token-set" tokens-lib {:suffix "copy"})
-        tokens         (get token-set-copy :tokens)]
+        tokens         (ctob/get-tokens-map token-set-copy)]

    (t/is (some? token-set-copy))
-    (t/is (= (:name token-set-copy) "test-token-set-copy"))
-    (t/is (= (count (:tokens token-set-copy)) 0))
+    (t/is (= (ctob/get-name token-set-copy) "test-token-set-copy"))
+    (t/is (= (count (ctob/get-tokens-map token-set-copy)) 0))
    (t/is (= (count tokens) 0))))

 (t/deftest duplicate-not-existing-token-set
@@ -392,12 +390,12 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token'      (get-in token-set' [:tokens "test-token"])]
+        token'      (ctob/get-token token-set' "test-token")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (count (:tokens token-set')) 1))
+    (t/is (= (count (ctob/get-tokens-map token-set')) 1))
    (t/is (= (:name token') "test-token"))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest update-token
  (let [tokens-lib  (-> (ctob/make-tokens-lib)
@@ -428,16 +426,16 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token       (get-in token-set [:tokens "test-token-1"])
-        token'      (get-in token-set' [:tokens "test-token-1"])]
+        token       (ctob/get-token token-set "test-token-1")
+        token'      (ctob/get-token token-set' "test-token-1")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (count (:tokens token-set')) 2))
-    (t/is (= (d/index-of (keys (:tokens token-set')) "test-token-1") 0))
+    (t/is (= (count (ctob/get-tokens-map token-set')) 2))
+    (t/is (= (d/index-of (keys (ctob/get-tokens-map token-set')) "test-token-1") 0))
    (t/is (= (:name token') "test-token-1"))
    (t/is (= (:description token') "some description"))
    (t/is (= (:value token') false))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))
    (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))

 (t/deftest rename-token
@@ -460,16 +458,16 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token       (get-in token-set [:tokens "test-token-1"])
-        token'      (get-in token-set' [:tokens "updated-name"])]
+        token       (ctob/get-token token-set "test-token-1")
+        token'      (ctob/get-token token-set' "updated-name")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (count (:tokens token-set')) 2))
-    (t/is (= (d/index-of (keys (:tokens token-set')) "updated-name") 0))
+    (t/is (= (count (ctob/get-tokens-map token-set')) 2))
+    (t/is (= (d/index-of (keys (ctob/get-tokens-map token-set')) "updated-name") 0))
    (t/is (= (:name token') "updated-name"))
    (t/is (= (:description token') ""))
    (t/is (= (:value token') true))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))
    (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))

 (t/deftest delete-token
@@ -486,12 +484,12 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token'      (get-in token-set' [:tokens "test-token"])]
+        token'      (ctob/get-token token-set' "test-token")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (count (:tokens token-set')) 0))
+    (t/is (= (count (ctob/get-tokens-map token-set')) 0))
    (t/is (nil? token'))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest get-ordered-sets
  (let [tokens-lib (-> (ctob/make-tokens-lib)
@@ -897,7 +895,7 @@
                                                               :value true)))

        set             (ctob/get-set tokens-lib "test-token-set")
-        tokens-list     (vals (:tokens set))]
+        tokens-list     (ctob/get-tokens set)]

    (t/is (= (count tokens-list) 5))
    (t/is (= (:name (nth tokens-list 0)) "token1"))
@@ -931,14 +929,14 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token       (get-in token-set [:tokens "group1.test-token-2"])
-        token'      (get-in token-set' [:tokens "group1.test-token-2"])]
+        token       (ctob/get-token token-set "group1.test-token-2")
+        token'      (ctob/get-token token-set' "group1.test-token-2")]

    (t/is (= (ctob/set-count tokens-lib') 1))
    (t/is (= (:name token') "group1.test-token-2"))
    (t/is (= (:description token') "some description"))
    (t/is (= (:value token') false))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))
    (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))

 (t/deftest update-token-in-sets-rename
@@ -965,14 +963,14 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token       (get-in token-set [:tokens "group1.test-token-2"])
-        token'      (get-in token-set' [:tokens "group1.updated-name"])]
+        token       (ctob/get-token token-set "group1.test-token-2")
+        token'      (ctob/get-token token-set' "group1.updated-name")]

    (t/is (= (ctob/set-count tokens-lib') 1))
    (t/is (= (:name token') "group1.updated-name"))
    (t/is (= (:description token') ""))
    (t/is (= (:value token') true))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (:ctob/get-modified-at token-set)))
    (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))

 (t/deftest move-token-of-group
@@ -999,15 +997,15 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token       (get-in token-set [:tokens "group1.test-token-2"])
-        token'      (get-in token-set' [:tokens "group2.updated-name"])]
+        token       (ctob/get-token token-set "group1.test-token-2")
+        token'      (ctob/get-token token-set' "group2.updated-name")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (d/index-of (keys (:tokens token-set')) "group2.updated-name") 1))
+    (t/is (= (d/index-of (keys (ctob/get-tokens-map token-set')) "group2.updated-name") 1))
    (t/is (= (:name token') "group2.updated-name"))
    (t/is (= (:description token') ""))
    (t/is (= (:value token') true))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))
    (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))

 (t/deftest delete-token-in-group
@@ -1026,12 +1024,12 @@

        token-set   (ctob/get-set tokens-lib "test-token-set")
        token-set'  (ctob/get-set tokens-lib' "test-token-set")
-        token'      (get-in token-set' [:tokens "group1.test-token-2"])]
+        token'      (ctob/get-token token-set' "group1.test-token-2")]

    (t/is (= (ctob/set-count tokens-lib') 1))
-    (t/is (= (count (:tokens token-set')) 1))
+    (t/is (= (count (ctob/get-tokens-map token-set')) 1))
    (t/is (nil? token'))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest update-token-set-in-groups
  (let [tokens-lib  (-> (ctob/make-tokens-lib)
@@ -1044,7 +1042,7 @@
        tokens-lib' (-> tokens-lib
                        (ctob/update-set "group1/token-set-2"
                                         (fn [token-set]
-                                           (assoc token-set :description "some description"))))
+                                           (ctob/set-description token-set "some description"))))

        sets-tree   (ctob/get-set-tree tokens-lib)
        sets-tree'  (ctob/get-set-tree tokens-lib')
@@ -1055,9 +1053,9 @@
    (t/is (= (ctob/set-count tokens-lib') 5))
    (t/is (= (count group1') 3))
    (t/is (= (d/index-of (keys group1') "S-token-set-2") 0))
-    (t/is (= (:name token-set') "group1/token-set-2"))
-    (t/is (= (:description token-set') "some description"))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (= (ctob/get-name token-set') "group1/token-set-2"))
+    (t/is (= (ctob/get-description token-set') "some description"))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest rename-token-set-in-groups
  (let [tokens-lib  (-> (ctob/make-tokens-lib)
@@ -1070,8 +1068,7 @@
        tokens-lib' (-> tokens-lib
                        (ctob/update-set "group1/token-set-2"
                                         (fn [token-set]
-                                           (assoc token-set
-                                                  :name "group1/updated-name"))))
+                                           (ctob/rename token-set "group1/updated-name"))))

        sets-tree   (ctob/get-set-tree tokens-lib)
        sets-tree'  (ctob/get-set-tree tokens-lib')
@@ -1082,9 +1079,9 @@
    (t/is (= (ctob/set-count tokens-lib') 5))
    (t/is (= (count group1') 3))
    (t/is (= (d/index-of (keys group1') "S-updated-name") 0))
-    (t/is (= (:name token-set') "group1/updated-name"))
-    (t/is (= (:description token-set') ""))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (= (ctob/get-name token-set') "group1/updated-name"))
+    (t/is (= (ctob/get-description token-set') ""))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest move-token-set-of-group
  (let [tokens-lib  (-> (ctob/make-tokens-lib)
@@ -1097,8 +1094,7 @@
        tokens-lib' (-> tokens-lib
                        (ctob/update-set "group1/token-set-2"
                                         (fn [token-set]
-                                           (assoc token-set
-                                                  :name "group2/updated-name"))))
+                                           (ctob/rename token-set "group2/updated-name"))))

        sets-tree   (ctob/get-set-tree tokens-lib)
        sets-tree'  (ctob/get-set-tree tokens-lib')
@@ -1111,9 +1107,9 @@
    (t/is (= (count group1') 2))
    (t/is (= (count group2') 1))
    (t/is (nil? (get group1' "S-updated-name")))
-    (t/is (= (:name token-set') "group2/updated-name"))
-    (t/is (= (:description token-set') ""))
-    (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
+    (t/is (= (ctob/get-name token-set') "group2/updated-name"))
+    (t/is (= (ctob/get-description token-set') ""))
+    (t/is (dt/is-after? (ctob/get-modified-at token-set') (ctob/get-modified-at token-set)))))

 (t/deftest delete-token-set-in-group
  (let [tokens-lib  (-> (ctob/make-tokens-lib)
@@ -1413,7 +1409,7 @@
             tokens-lib' (ctob/parse-decoded-json encoded "")]
         (t/testing "library got updated but data is equal"
           (t/is (not= tokens-lib' tokens-lib))
-           (t/is (= @tokens-lib' @tokens-lib)))))))
+           (t/is (= (datafy tokens-lib') (datafy tokens-lib))))))))

 #?(:clj
   (t/deftest export-dtcg-json-with-default-theme
--- a/common/test/common_tests/variant_test.cljc
+++ b/common/test/common_tests/variant_test.cljc
@@ -15,13 +15,13 @@
        map-with-two-props-dashes    [{:name "border" :value "no"} {:name "color" :value "--"}]
        map-with-one-prop            [{:name "border" :value "no"}]
        map-with-equal               [{:name "border" :value "yes color=yes"}]
-        map-with-spaces              [{:name "border 1" :value "of course"}
-                                      {:name "color 2" :value "dark gray"}
-                                      {:name "background 3" :value "anoth€r co-lor"}]
+        map-with-spaces              [{:name "border (1)" :value "of course"}
+                                      {:name "color (2)" :value "dark gray"}
+                                      {:name "background (3)" :value "anoth€r co-lor"}]

        string-valid-with-two-props  "border=yes, color=gray"
        string-valid-with-one-prop   "border=no"
-        string-valid-with-spaces     "border 1=of course, color 2=dark gray, background 3=anoth€r co-lor"
+        string-valid-with-spaces     "border (1)=of course, color (2)=dark gray, background (3)=anoth€r co-lor"
        string-valid-with-no-value   "border=no, color="
        string-valid-with-dashes     "border=no, color=--"
        string-valid-with-equal      "border=yes color=yes"
@@ -131,3 +131,31 @@
      (t/is (= (ctv/same-variant? components-2) false))
      (t/is (= (ctv/same-variant? components-3) false))
      (t/is (= (ctv/same-variant? components-4) false)))))
+
+
+(t/deftest update-number-in-repeated-item
+  (let [names ["border" "color" "color 1" "color 2" "color (1)" "color (7)" "area 51"]]
+
+    (t/testing "update-number-in-repeated-item"
+      (t/is (= (ctv/update-number-in-repeated-item names "background") "background"))
+      (t/is (= (ctv/update-number-in-repeated-item names "border")     "border (1)"))
+      (t/is (= (ctv/update-number-in-repeated-item names "color")      "color (2)"))
+      (t/is (= (ctv/update-number-in-repeated-item names "color 1")    "color 1 (1)"))
+      (t/is (= (ctv/update-number-in-repeated-item names "color (1)")  "color (2)"))
+      (t/is (= (ctv/update-number-in-repeated-item names "area 51")    "area 51 (1)")))))
+
+
+(t/deftest update-number-in-repeated-prop-names
+  (let [props          [{:name "color"      :value "yellow"}
+                        {:name "color"      :value "blue"}
+                        {:name "color"      :value "red"}
+                        {:name "border (1)" :value "no"}
+                        {:name "border (1)" :value "yes"}]
+        numbered-props [{:name "color"      :value "yellow"}
+                        {:name "color (1)"  :value "blue"}
+                        {:name "color (2)"  :value "red"}
+                        {:name "border (1)" :value "no"}
+                        {:name "border (2)" :value "yes"}]]
+
+    (t/testing "update-number-in-repeated-prop-names"
+      (t/is (= (ctv/update-number-in-repeated-prop-names props) numbered-props)))))
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -26,8 +26,6 @@ RUN set -ex; \
        build-essential autoconf libtool pkg-config


-COPY files/apt.sources /etc/apt/sources.list.d/ubuntu.sources
-
 ################################################################################
 ## IMAGE MAGICK
 ################################################################################
--- a/docker/devenv/docker-compose.yaml
+++ b/docker/devenv/docker-compose.yaml
@@ -96,6 +96,10 @@ services:
      - ./files/postgresql.conf:/etc/postgresql.conf:z
      - ./files/postgresql_init.sql:/docker-entrypoint-initdb.d/init.sql:z
      - postgres_data_pg16:/var/lib/postgresql/data
+    networks:
+      default:
+        aliases:
+          - postgres

  redis:
    image: valkey/valkey:8.1
--- a/docker/devenv/files/entrypoint.sh
+++ b/docker/devenv/files/entrypoint.sh
@@ -10,7 +10,7 @@ cp /root/.bashrc /home/penpot/.bashrc
 cp /root/.vimrc /home/penpot/.vimrc
 cp /root/.tmux.conf /home/penpot/.tmux.conf

-chown -R penpot:users /home/penpot
+chown penpot:users /home/penpot
 rsync -ar --chown=penpot:users /opt/cargo/ /home/penpot/.cargo/

 export PATH="/home/penpot/.cargo/bin:$PATH"
--- a/docker/imagemagick/Dockerfile
+++ b/docker/imagemagick/Dockerfile
@@ -0,0 +1,91 @@
+FROM ubuntu:24.04
+LABEL maintainer="Penpot <docker@penpot.app>"
+
+ENV LANG='C.UTF-8' \
+    LC_ALL='C.UTF-8' \
+    DEBIAN_FRONTEND=noninteractive \
+    TZ=Etc/UTC
+
+ARG IMAGEMAGICK_VERSION=7.1.1-47
+
+RUN set -e; \
+    apt-get -qq update; \
+    apt-get -qq upgrade; \
+    apt-get -qqy --no-install-recommends install \
+        autoconf \
+        binutils \
+        build-essential \
+        ca-certificates \
+        curl \
+        libfftw3-dev \
+        libheif-dev \
+        libjpeg-dev \
+        liblcms2-dev \
+        libltdl-dev \
+        liblzma-dev \
+        libopenexr-dev \
+        libpng-dev \
+        librsvg2-dev \
+        libtiff-dev \
+        libtool \
+        libwebp-dev \
+        libzip-dev \
+        libzstd-dev \
+        pkg-config \
+    ; \
+    curl -LfsSo /tmp/magick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGEMAGICK_VERSION}.tar.gz; \
+    mkdir -p /tmp/magick; \
+    cd /tmp/magick; \
+    tar -xf /tmp/magick.tar.gz --strip-components=1; \
+    ./configure  --prefix=/opt/imagick; \
+    make -j 2; \
+    make install; \
+    rm -rf /opt/imagick/lib/libMagick++*; \
+    rm -rf /opt/imagick/include; \
+    rm -rf /opt/imagick/share; \
+    apt-get -qqy --autoremove purge \
+        autoconf \
+        binutils \
+        build-essential \
+        ca-certificates \
+        curl \
+        libfftw3-dev \
+        libheif-dev \
+        libjpeg-dev \
+        liblcms2-dev \
+        libltdl-dev \
+        liblzma-dev \
+        libopenexr-dev \
+        libpng-dev \
+        librsvg2-dev \
+        libtiff-dev \
+        libtool\
+        libwebp-dev \
+        libzip-dev \
+        libzstd-dev \
+        pkg-config \
+    ;\
+    apt-get -qqy --no-install-recommends install \
+        libfontconfig1 \
+        libfreetype6 \
+        libglib2.0-0 \
+        libgomp1 \
+        libheif1 \
+        libjpeg-turbo8 \
+        liblcms2-2 \
+        libopenexr-3-1-30 \
+        libopenjp2-7 \
+        libpng16-16 \
+        librsvg2-2 \
+        libtiff6 \
+        libwebp7 \
+        libwebpdemux2 \
+        libwebpmux3 \
+        libxml2 \
+        libzip4t64 \
+        libzstd1 \
+    ;\
+    apt-get -qqy clean; \
+    rm -rf /var/lib/apt/lists/*;
+
+ENTRYPOINT ["/opt/imagick/bin/magick"]
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -6,37 +6,18 @@ ENV LANG='C.UTF-8' \
    JAVA_HOME="/opt/jdk" \
    DEBIAN_FRONTEND=noninteractive \
    NODE_VERSION=v22.16.0 \
-    IMAGEMAGICK_VERSION=7.1.1-47 \
    TZ=Etc/UTC

 RUN set -ex; \
    apt-get -qq update; \
    apt-get -qq upgrade; \
    apt-get -qqy --no-install-recommends install \
-        curl \
-        ca-certificates \
        binutils \
-        build-essential autoconf libtool pkg-config \
-        libltdl-dev \
-        libpng-dev libjpeg-dev libtiff-dev libwebp-dev libopenexr-dev libfftw3-dev \
-        libzip-dev \
-        liblcms2-dev liblzma-dev libzstd-dev \
-        libheif-dev librsvg2-dev \
+        ca-certificates \
+        curl \
    ; \
    rm -rf /var/lib/apt/lists/*

-RUN set -eux; \
-    curl -LfsSo /tmp/magick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGEMAGICK_VERSION}.tar.gz; \
-    mkdir -p /tmp/magick; \
-    cd /tmp/magick; \
-    tar -xf /tmp/magick.tar.gz --strip-components=1; \
-    ./configure  --prefix=/opt/imagick; \
-    make -j 2; \
-    make install; \
-    rm -rf /opt/imagick/lib/libMagick++*; \
-    rm -rf /opt/imagick/include; \
-    rm -rf /opt/imagick/share;
-
 RUN set -eux; \
    ARCH="$(dpkg --print-architecture)"; \
    case "${ARCH}" in \
@@ -105,33 +86,33 @@ RUN set -ex; \
    apt-get -qq update; \
    apt-get -qq upgrade; \
    apt-get -qqy --no-install-recommends install \
-        tzdata \
        ca-certificates \
        fontconfig \
-        woff-tools \
-        woff2 \
+        fontforge \
        python3 \
        python3-tabulate \
-        fontforge \
+        tzdata \
+        woff-tools \
+        woff2 \
        \
-        libpng16-16 \
+        libfontconfig1 \
+        libfreetype6 \
+        libglib2.0-0 \
+        libgomp1 \
+        libheif1 \
        libjpeg-turbo8 \
+        liblcms2-2 \
+        libopenexr-3-1-30 \
+        libopenjp2-7 \
+        libpng16-16 \
+        librsvg2-2 \
        libtiff6 \
        libwebp7 \
-        libopenexr-3-1-30 \
-        libfreetype6 \
-        libfontconfig1 \
-        libglib2.0-0 \
-        libxml2 \
-        liblcms2-2 \
-        libheif1 \
-        libopenjp2-7 \
-        libzstd1 \
-        librsvg2-2 \
-        libgomp1 \
-        libwebpmux3 \
        libwebpdemux2 \
+        libwebpmux3 \
+        libxml2 \
        libzip4t64 \
+        libzstd1 \
    ; \
    find tmp/usr/share/zoneinfo/* -type d ! -name 'Etc' |xargs rm -rf; \
    rm -rf /var/lib /var/cache; \
@@ -144,7 +125,7 @@ RUN set -ex; \

 COPY --from=build /opt/jre /opt/jre
 COPY --from=build /opt/node /opt/node
-COPY --from=build /opt/imagick /opt/imagick
+COPY --from=penpotapp/imagemagick:7.1.1-47 /opt/imagick /opt/imagick
 COPY --chown=penpot:penpot ./bundle-backend/ /opt/penpot/backend/

 USER penpot:penpot
--- a/docker/images/build.sh
+++ b/docker/images/build.sh
@@ -1,14 +1,17 @@
 #!/usr/bin/env bash
 set -x

-DOCKER_CLI_EXPERIMENTAL=enabled
+IMAGE=${1:-backend}
+
+OUTPUT="type=registry"
+
+if [ "--local" = "$2" ]; then
+    OUTPUT="type=docker"
+fi
+
 ORG=${PENPOT_DOCKER_NAMESPACE:-penpotapp};
-PLATFORM=${PENPOT_BUILD_PLATFORM:-linux/amd64};
-
-IMAGE=${PENPOT_BUILD_IMAGE:-backend}
-PLATFORM=${PENPOT_BUILD_PLATFORM:-linux/amd64};
+PLATFORM=${PENPOT_BUILD_PLATFORM:-linux/amd64,linux/arm64};
 VERSION=${PENPOT_BUILD_VERSION:-latest}
-
 DOCKER_IMAGE="$ORG/$IMAGE";
 OPTIONS="-t $DOCKER_IMAGE:$VERSION";

@@ -20,7 +23,7 @@ for element in "${TAGS[@]}"; do
 done

 docker buildx inspect penpot > /dev/null 2>&1;
-docker run --privileged --rm tonistiigi/binfmt --install all
+docker run --privileged --rm tonistiigi/binfmt --install all > /dev/null;

 if [ $? -eq 1 ]; then
    docker buildx create --name=penpot --use
@@ -32,4 +35,5 @@ fi

 unset IFS;

-docker buildx build --platform ${PLATFORM// /,} $OPTIONS -f Dockerfile.$IMAGE "$@" .;
+shift;
+docker buildx build --output $OUTPUT --platform ${PLATFORM// /,} $OPTIONS -f Dockerfile.$IMAGE .;
--- a/docs/technical-guide/developer/backend.md
+++ b/docs/technical-guide/developer/backend.md
@@ -4,14 +4,22 @@ title: 3.06. Backend Guide

 # Backend guide #

-This guide intends to explain the essential details of the backend
-application.
-
+This guide collects some basic information on the backend application.

 ## REPL ##

-In the devenv environment you can execute <code class="language-clojure">scripts/repl</code> to open a
-Clojure interactive shell ([REPL](https://codewith.mu/en/tutorials/1.0/repl)).
+_Note:_ When in development mode, the backend spins up a traditional nREPL socket on port 6064.
+If you are experimenting locally, you can connect to it using your Clojure editor or
+with `backend/scripts/nrepl`, which starts a [REPLy client](https://github.com/trptcolin/reply),
+[see here][1] for more information.
+
+[1]: /technical-guide/developer/devenv/#backend
+
+In the devenv environment you can execute `backend/scripts/repl` to open a
+Clojure interactive shell ([REPL](https://codewith.mu/en/tutorials/1.0/repl)) (this is not a socket-based
+REPL, but a local, in-process console (over stdin/stdout) with some fancy line-editing and colors). Note
+that the backend must be stopped before executing this script, otherwise it will fail with `Port already
+in use: 9090`.

 Once there, you can execute <code class="language-clojure">(restart)</code> to load and execute the backend
 process, or to reload it after making changes to the source code.
@@ -39,11 +47,11 @@ For example:

 ## Fixtures ##

-This is a development feature that allows populate the database with a
-good amount of content (usually used for just test the application or
-perform performance tweaks on queries).
+This is a development feature that allows populating the database with a
+good amount of content (typically used to test the application or to run
+performance tweaks on queries).

-In order to load fixtures, enter to the REPL environment with the <code class="language-clojure">scripts/repl</code>
+In order to load fixtures, enter the REPL environment with the <code class="language-clojure">backend/scripts/repl</code>
 script, and then execute <code class="language-clojure">(app.cli.fixtures/run {:preset :small})</code>.

 You also can execute this as a standalone script with:
@@ -52,11 +60,11 @@ You also can execute this as a standalone script with:
 clojure -Adev -X:fn-fixtures
 ```

-NOTE: It is an optional step because the application can start with an
+_NOTE:_ This is an optional step because the application can start with an
 empty database.

-This by default will create a bunch of users that can be used to login
-in the application. All users uses the following pattern:
+The above will create several users that can be used to login
+into the application. All of them follow the pattern:

 - Username: <code class="language-text">profileN@example.com</code>
 - Password: <code class="language-text">123123</code>
--- a/docs/technical-guide/developer/devenv.md
+++ b/docs/technical-guide/developer/devenv.md
@@ -170,6 +170,23 @@ similar to a webmail client. Simply navigate to:

 [http://localhost:1080](http://localhost:1080)

+## Create user
+
+You can register a new user manually, or create new users automatically with this script. From your tmux instance, run:
+
+
+```sh
+cd penpot/backend/scripts
+python3 manage.py create-profile
+```
+
+You can also skip tutorial and walkthrough steps:
+
+```sh
+python3 manage.py create-profile --skip-tutorial --skip-walkthrough
+python3 manage.py create-profile -n "Jane Doe" -e jane@example.com -p secretpassword --skip-tutorial --skip-walkthrough
+```
+
 ## Team Feature Flags

 To test a Feature Flag, you can enable or disable them by team through the `dbg` page:
--- a/docs/technical-guide/getting-started/docker.md
+++ b/docs/technical-guide/getting-started/docker.md
@@ -89,6 +89,13 @@ For instance, if  the registration is disabled, the only way to create a new use
 docker exec -ti penpot-penpot-backend-1 python3 manage.py create-profile
 ```

+or
+
+```bash
+docker exec -ti penpot-penpot-backend-1 python3 manage.py create-profile --skip-tutorial --skip-walkthrough
+```
+
+
 **NOTE:** the exact container name depends on your docker version and platform.
 For example it could be <code class="language-bash">penpot-penpot-backend-1</code> or <code class="language-bash">penpot_penpot-backend-1</code>.
 You can check the correct name executing <code class="language-bash">docker ps</code>.
--- a/docs/technical-guide/getting-started/index.md
+++ b/docs/technical-guide/getting-started/index.md
@@ -28,5 +28,6 @@ Use Docker if you already know the tool, if need full control of the process or
 and do not want to depend on any external provider, or need to do any special customization.
 </p>

-Or you can try <a href="#unofficial-self-host-options">other options</a>,
-offered by Penpot community.
+Or you can try [other options][1], offered by Penpot community.
+
+[1]: /technical-guide/getting-started/unofficial-options/
--- a/docs/technical-guide/getting-started/kubernetes.md
+++ b/docs/technical-guide/getting-started/kubernetes.md
@@ -97,6 +97,11 @@ file itself, which you can use as a basis for creating your own settings.
 You can also consult the list of parameters on the
 <a href="https://artifacthub.io/packages/helm/penpot/penpot#parameters" target="_blank">ArtifactHub page of the project</a>.

+### Using OpenShift?
+If you are deploying Penpot on OpenShift, we recommend following the specific guidelines provided in our Penpot-helm documentation:
+<a href="https://artifacthub.io/packages/helm/penpot/penpot#-openshift-requirements" target="_blank">`Installing the chart with OpenShift requirements`</a>
+
+Make sure to review the section **OpenShift Requirements** for important security and compatibility considerations.

 ## Upgrade Penpot

--- a/docs/user-guide/layer-basics/index.njk
+++ b/docs/user-guide/layer-basics/index.njk
@@ -281,12 +281,15 @@ press <kbd>Shift/⇧</kbd> + left click over the right arrow of a group or a boa


 <h2 id="focus-mode">Focus mode</h2>
-<p>Select the elements of a page you want to work with in a specific moment hiding the rest so they don’t get in the way of your attention. This option is also useful to improve the performance in cases where the page has a large number of elements.</p>
+<p>Focus mode zooms into the elements of a page you want to work with in a specific moment, and hides the rest so that they don’t get in the way. When the page has many elements, focus mode can also improve performance.</p>
 <p>To activate focus mode:</p>
-<ol>
+<ol> 
  <li>Select one or more elements.</li>
-  <li>Right click to show the menu and select the option "Focus on" or press <kbd>F</kbd>.</li>
+  <li>Right click on the selection to show the menu and select the option “Focus on” or press <kbd>F</kbd>.</li>
 </ol>
+<p>Notice that the layer panel will now only show the focused layers. A focus mode status line will also appear at the top.</p>
+<p>To exit focus mode and return to the original viewport and selection, right click anywhere and select “Focus off” or just press <kbd>F</kbd> again. You can also click anywhere on the focus mode status line at the top of the layer panel.
+</p>
 <figure>
  <video title="Focus mode" muted="" playsinline="" controls="" width="100%" poster="/img/layers/layers-focus.webp" height="auto">
    <source src="/img/layers/layers-focus.mp4" type="video/mp4">
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -11,3 +11,4 @@ node_modules/
 /blob-report/
 /playwright/.cache/
 /playwright/**/visual-specs/**/*.png
+
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -20,8 +20,8 @@
   :git/url "https://github.com/funcool/beicon.git"}

  funcool/rumext
-  {:git/tag "v2.22"
-   :git/sha "92879b6"
+  {:git/tag "v2.24"
+   :git/sha "17a0c94"
   :git/url "https://github.com/funcool/rumext.git"}

  instaparse/instaparse {:mvn/version "1.5.0"}
@@ -42,7 +42,7 @@
  :dev
  {:extra-paths ["dev"]
   :extra-deps
-   {thheller/shadow-cljs {:mvn/version "3.1.5"}
+   {thheller/shadow-cljs {:mvn/version "3.1.7"}
    com.bhauman/rebel-readline {:mvn/version "RELEASE"}
    org.clojure/tools.namespace {:mvn/version "RELEASE"}
    criterium/criterium {:mvn/version "RELEASE"}
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -103,6 +103,7 @@
    "@penpot/draft-js": "portal:./vendor/draft-js",
    "@penpot/hljs": "portal:./vendor/hljs",
    "@penpot/mousetrap": "portal:./vendor/mousetrap",
+    "@penpot/plugins-runtime": "1.3.2",
    "@penpot/svgo": "penpot/svgo#v3.1",
    "@penpot/text-editor": "portal:./text-editor",
    "@tokens-studio/sd-transforms": "1.2.11",
--- a/frontend/playwright.config.js
+++ b/frontend/playwright.config.js
@@ -53,6 +53,21 @@ export default defineConfig({
        toHaveScreenshot: { maxDiffPixelRatio: 0.005 },
      },
    },
+    {
+      name: "render-wasm",
+      use: {
+        ...devices["Desktop Chrome"],
+        viewport: { width: 1920, height: 1080 }, // Add custom viewport size
+        deviceScaleFactor: 2,
+      },
+      testDir: "./playwright/ui/render-wasm-specs",
+      snapshotPathTemplate: "{testDir}/{testFilePath}-snapshots/{arg}.png",
+      expect: {
+        toHaveScreenshot: {
+          maxDiffPixelRatio: 0.001,
+        },
+      },
+    },
  ],

  /* Run your local dev server before starting the tests */
--- a/frontend/playwright/data/register/prepare-register-profile-email-mismatch.json
+++ b/frontend/playwright/data/register/prepare-register-profile-email-mismatch.json
@@ -0,0 +1,5 @@
+{
+  "~:type": "~:restriction",
+  "~:code": "~:email-does-not-match-invitation",
+  "~:hint": "email should match the invitation"
+}
--- a/frontend/playwright/data/render-wasm/assets/ebgaramond.ttf
+++ b/frontend/playwright/data/render-wasm/assets/ebgaramond.ttf
--- a/frontend/playwright/data/render-wasm/assets/firacode.ttf
+++ b/frontend/playwright/data/render-wasm/assets/firacode.ttf
--- a/frontend/playwright/data/render-wasm/assets/landscape.jpg
+++ b/frontend/playwright/data/render-wasm/assets/landscape.jpg
--- a/frontend/playwright/data/render-wasm/assets/mreaves.ttf
+++ b/frontend/playwright/data/render-wasm/assets/mreaves.ttf
--- a/frontend/playwright/data/render-wasm/assets/nodesto-condensed.ttf
+++ b/frontend/playwright/data/render-wasm/assets/nodesto-condensed.ttf
--- a/frontend/playwright/data/render-wasm/assets/notocoloremojisubset.ttf
+++ b/frontend/playwright/data/render-wasm/assets/notocoloremojisubset.ttf
--- a/frontend/playwright/data/render-wasm/assets/notosansjpsubset.ttf
+++ b/frontend/playwright/data/render-wasm/assets/notosansjpsubset.ttf
--- a/frontend/playwright/data/render-wasm/assets/pattern.png
+++ b/frontend/playwright/data/render-wasm/assets/pattern.png
--- a/frontend/playwright/data/render-wasm/assets/penguins.jpg
+++ b/frontend/playwright/data/render-wasm/assets/penguins.jpg
--- a/frontend/playwright/data/render-wasm/get-file-blend-modes.json
+++ b/frontend/playwright/data/render-wasm/get-file-blend-modes.json
--- a/frontend/playwright/data/render-wasm/get-file-multiple-fills.json
+++ b/frontend/playwright/data/render-wasm/get-file-multiple-fills.json
@@ -0,0 +1,633 @@
+{
+    "~:features": {
+        "~#set": [
+            "fdata/path-data",
+            "plugins/runtime",
+            "design-tokens/v1",
+            "variants/v1",
+            "layout/grid",
+            "styles/v2",
+            "fdata/pointer-map",
+            "fdata/objects-map",
+            "render-wasm/v1",
+            "components/v2",
+            "fdata/shape-data-type"
+        ]
+    },
+    "~:team-id": "~u04868522-3ebf-81e8-8006-306b0c9b5f59",
+    "~:permissions": {
+        "~:type": "~:membership",
+        "~:is-owner": true,
+        "~:is-admin": true,
+        "~:can-edit": true,
+        "~:can-read": true,
+        "~:is-logged": true
+    },
+    "~:has-media-trimmed": false,
+    "~:comment-thread-seqn": 0,
+    "~:name": "Multiple fills",
+    "~:revn": 19,
+    "~:modified-at": "~m1749564220299",
+    "~:vern": 0,
+    "~:id": "~uc0939f58-37bc-805d-8006-51cd3a51c255",
+    "~:is-shared": false,
+    "~:migrations": {
+        "~#ordered-set": [
+            "legacy-2",
+            "legacy-3",
+            "legacy-5",
+            "legacy-6",
+            "legacy-7",
+            "legacy-8",
+            "legacy-9",
+            "legacy-10",
+            "legacy-11",
+            "legacy-12",
+            "legacy-13",
+            "legacy-14",
+            "legacy-16",
+            "legacy-17",
+            "legacy-18",
+            "legacy-19",
+            "legacy-25",
+            "legacy-26",
+            "legacy-27",
+            "legacy-28",
+            "legacy-29",
+            "legacy-31",
+            "legacy-32",
+            "legacy-33",
+            "legacy-34",
+            "legacy-36",
+            "legacy-37",
+            "legacy-38",
+            "legacy-39",
+            "legacy-40",
+            "legacy-41",
+            "legacy-42",
+            "legacy-43",
+            "legacy-44",
+            "legacy-45",
+            "legacy-46",
+            "legacy-47",
+            "legacy-48",
+            "legacy-49",
+            "legacy-50",
+            "legacy-51",
+            "legacy-52",
+            "legacy-53",
+            "legacy-54",
+            "legacy-55",
+            "legacy-56",
+            "legacy-57",
+            "legacy-59",
+            "legacy-62",
+            "legacy-65",
+            "legacy-66",
+            "legacy-67",
+            "0001-remove-tokens-from-groups",
+            "0002-normalize-bool-content",
+            "0002-clean-shape-interactions",
+            "0003-fix-root-shape",
+            "0003-convert-path-content",
+            "0004-add-partial-text-touched-flags",
+            "0005-deprecate-image-type",
+            "0006-fix-old-texts-fills",
+            "0004-clean-shadow-and-colors",
+            "0007-clear-invalid-strokes-and-fills-v2",
+            "0008-fix-library-colors-opacity",
+            "0009-add-partial-text-touched-flags"
+        ]
+    },
+    "~:version": 67,
+    "~:project-id": "~u53a7ff09-2228-81d3-8006-4b5ea964593b",
+    "~:created-at": "~m1749564032332",
+    "~:data": {
+        "~:pages": [
+            "~uc0939f58-37bc-805d-8006-51cd3a51c256"
+        ],
+        "~:pages-index": {
+            "~uc0939f58-37bc-805d-8006-51cd3a51c256": {
+                "~:objects": {
+                    "~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
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 0.01,
+                                        "~:y": 0.0
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 0.01,
+                                        "~:y": 0.01
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 0.0,
+                                        "~:y": 0.01
+                                    }
+                                }
+                            ],
+                            "~:r2": 0,
+                            "~:proportion-lock": false,
+                            "~:transform-inverse": {
+                                "~#matrix": {
+                                    "~: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,
+                                    "~:width": 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,
+                            "~:height": 0.01,
+                            "~:flip-y": null,
+                            "~:shapes": [
+                                "~ub688a894-3697-80d3-8006-51cd477981bc",
+                                "~ub688a894-3697-80d3-8006-51cd5504e381",
+                                "~ub688a894-3697-80d3-8006-51cd5de7c5f3",
+                                "~ub688a894-3697-80d3-8006-51cd67bc1de9"
+                            ]
+                        }
+                    },
+                    "~ub688a894-3697-80d3-8006-51cd477981bc": {
+                        "~#shape": {
+                            "~:y": 297,
+                            "~: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": 153,
+                            "~:type": "~:rect",
+                            "~:points": [
+                                {
+                                    "~#point": {
+                                        "~:x": 239,
+                                        "~:y": 297
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 392,
+                                        "~:y": 297
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 392,
+                                        "~:y": 441
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 239,
+                                        "~:y": 441
+                                    }
+                                }
+                            ],
+                            "~:r2": 0,
+                            "~:proportion-lock": false,
+                            "~:transform-inverse": {
+                                "~#matrix": {
+                                    "~:a": 1.0,
+                                    "~:b": 0.0,
+                                    "~:c": 0.0,
+                                    "~:d": 1.0,
+                                    "~:e": 0.0,
+                                    "~:f": 0.0
+                                }
+                            },
+                            "~:r3": 0,
+                            "~:r1": 0,
+                            "~:id": "~ub688a894-3697-80d3-8006-51cd477981bc",
+                            "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:strokes": [],
+                            "~:x": 239,
+                            "~:proportion": 1,
+                            "~:r4": 0,
+                            "~:selrect": {
+                                "~#rect": {
+                                    "~:x": 239,
+                                    "~:y": 297,
+                                    "~:width": 153,
+                                    "~:height": 144,
+                                    "~:x1": 239,
+                                    "~:y1": 297,
+                                    "~:x2": 392,
+                                    "~:y2": 441
+                                }
+                            },
+                            "~:fills": [
+                                {
+                                    "~:fill-color": "#ff0000",
+                                    "~:fill-opacity": 1
+                                },
+                                {
+                                    "~:fill-color": "#003fff",
+                                    "~:fill-opacity": 1
+                                }
+                            ],
+                            "~:flip-x": null,
+                            "~:height": 144,
+                            "~:flip-y": null
+                        }
+                    },
+                    "~ub688a894-3697-80d3-8006-51cd5504e381": {
+                        "~#shape": {
+                            "~:y": 297,
+                            "~: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": 153,
+                            "~:type": "~:rect",
+                            "~:points": [
+                                {
+                                    "~#point": {
+                                        "~:x": 442,
+                                        "~:y": 297
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 595,
+                                        "~:y": 297
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 595,
+                                        "~:y": 441
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 442,
+                                        "~:y": 441
+                                    }
+                                }
+                            ],
+                            "~:r2": 0,
+                            "~:proportion-lock": false,
+                            "~:transform-inverse": {
+                                "~#matrix": {
+                                    "~:a": 1.0,
+                                    "~:b": 0.0,
+                                    "~:c": 0.0,
+                                    "~:d": 1.0,
+                                    "~:e": 0.0,
+                                    "~:f": 0.0
+                                }
+                            },
+                            "~:r3": 0,
+                            "~:r1": 0,
+                            "~:id": "~ub688a894-3697-80d3-8006-51cd5504e381",
+                            "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:strokes": [],
+                            "~:x": 442,
+                            "~:proportion": 1,
+                            "~:r4": 0,
+                            "~:selrect": {
+                                "~#rect": {
+                                    "~:x": 442,
+                                    "~:y": 297,
+                                    "~:width": 153,
+                                    "~:height": 144,
+                                    "~:x1": 442,
+                                    "~:y1": 297,
+                                    "~:x2": 595,
+                                    "~:y2": 441
+                                }
+                            },
+                            "~:fills": [
+                                {
+                                    "~:fill-color": "#ff0000",
+                                    "~:fill-opacity": 0.5
+                                },
+                                {
+                                    "~:fill-color": "#003fff",
+                                    "~:fill-opacity": 1
+                                }
+                            ],
+                            "~:flip-x": null,
+                            "~:height": 144,
+                            "~:flip-y": null
+                        }
+                    },
+                    "~ub688a894-3697-80d3-8006-51cd5de7c5f3": {
+                        "~#shape": {
+                            "~:y": 476.99998474121094,
+                            "~: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": 153,
+                            "~:type": "~:rect",
+                            "~:points": [
+                                {
+                                    "~#point": {
+                                        "~:x": 239,
+                                        "~:y": 476.99998474121094
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 392,
+                                        "~:y": 476.99998474121094
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 392,
+                                        "~:y": 620.9999847412109
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 239,
+                                        "~:y": 620.9999847412109
+                                    }
+                                }
+                            ],
+                            "~:r2": 0,
+                            "~:proportion-lock": false,
+                            "~:transform-inverse": {
+                                "~#matrix": {
+                                    "~:a": 1.0,
+                                    "~:b": 0.0,
+                                    "~:c": 0.0,
+                                    "~:d": 1.0,
+                                    "~:e": 0.0,
+                                    "~:f": 0.0
+                                }
+                            },
+                            "~:r3": 0,
+                            "~:r1": 0,
+                            "~:id": "~ub688a894-3697-80d3-8006-51cd5de7c5f3",
+                            "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:strokes": [],
+                            "~:x": 239,
+                            "~:proportion": 1,
+                            "~:r4": 0,
+                            "~:selrect": {
+                                "~#rect": {
+                                    "~:x": 239,
+                                    "~:y": 476.99998474121094,
+                                    "~:width": 153,
+                                    "~:height": 144,
+                                    "~:x1": 239,
+                                    "~:y1": 476.99998474121094,
+                                    "~:x2": 392,
+                                    "~:y2": 620.9999847412109
+                                }
+                            },
+                            "~:fills": [
+                                {
+                                    "~:fill-color": "#ff0000",
+                                    "~:fill-opacity": 0.5
+                                },
+                                {
+                                    "~:fill-color-gradient": {
+                                        "~:stops": [
+                                            {
+                                                "~:color": "#003fff",
+                                                "~:offset": 0,
+                                                "~:opacity": 1
+                                            },
+                                            {
+                                                "~:color": "#003fff",
+                                                "~:offset": 1,
+                                                "~:opacity": 0
+                                            }
+                                        ],
+                                        "~:width": 1,
+                                        "~:type": "~:linear",
+                                        "~:start-x": 0.5,
+                                        "~:end-y": 1,
+                                        "~:end-x": 0.5,
+                                        "~:start-y": 0
+                                    }
+                                }
+                            ],
+                            "~:flip-x": null,
+                            "~:height": 144,
+                            "~:flip-y": null
+                        }
+                    },
+                    "~ub688a894-3697-80d3-8006-51cd67bc1de9": {
+                        "~#shape": {
+                            "~:y": 476.99998474121094,
+                            "~: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": 153,
+                            "~:type": "~:rect",
+                            "~:points": [
+                                {
+                                    "~#point": {
+                                        "~:x": 442,
+                                        "~:y": 476.99998474121094
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 595,
+                                        "~:y": 476.99998474121094
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 595,
+                                        "~:y": 620.9999847412109
+                                    }
+                                },
+                                {
+                                    "~#point": {
+                                        "~:x": 442,
+                                        "~:y": 620.9999847412109
+                                    }
+                                }
+                            ],
+                            "~:r2": 0,
+                            "~:proportion-lock": false,
+                            "~:transform-inverse": {
+                                "~#matrix": {
+                                    "~:a": 1.0,
+                                    "~:b": 0.0,
+                                    "~:c": 0.0,
+                                    "~:d": 1.0,
+                                    "~:e": 0.0,
+                                    "~:f": 0.0
+                                }
+                            },
+                            "~:r3": 0,
+                            "~:r1": 0,
+                            "~:id": "~ub688a894-3697-80d3-8006-51cd67bc1de9",
+                            "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
+                            "~:strokes": [],
+                            "~:x": 442,
+                            "~:proportion": 1,
+                            "~:r4": 0,
+                            "~:selrect": {
+                                "~#rect": {
+                                    "~:x": 442,
+                                    "~:y": 476.99998474121094,
+                                    "~:width": 153,
+                                    "~:height": 144,
+                                    "~:x1": 442,
+                                    "~:y1": 476.99998474121094,
+                                    "~:x2": 595,
+                                    "~:y2": 620.9999847412109
+                                }
+                            },
+                            "~:fills": [
+                                {
+                                    "~:fill-color-gradient": {
+                                        "~:stops": [
+                                            {
+                                                "~:color": "#010512",
+                                                "~:offset": 0,
+                                                "~:opacity": 0
+                                            },
+                                            {
+                                                "~:color": "#010512",
+                                                "~:offset": 1,
+                                                "~:opacity": 1
+                                            }
+                                        ],
+                                        "~:width": 1,
+                                        "~:type": "~:radial",
+                                        "~:start-x": 0.5,
+                                        "~:end-y": 1,
+                                        "~:end-x": 0.5,
+                                        "~:start-y": 0.5
+                                    },
+                                    "~:fill-opacity": 0.5
+                                },
+                                {
+                                    "~:fill-image": {
+                                        "~:mtype": "image/jpeg",
+                                        "~:name": "Aptenodytes_forsteri_-Snow_Hill_Island,_Antarctica_-adults_and_juvenile-8.jpg",
+                                        "~:keep-aspect-ratio": true,
+                                        "~:width": 872,
+                                        "~:id": "~uc0939f58-37bc-805d-8006-51cda84a405a",
+                                        "~:height": 1400
+                                    },
+                                    "~:fill-opacity": 1
+                                }
+                            ],
+                            "~:flip-x": null,
+                            "~:height": 144,
+                            "~:flip-y": null
+                        }
+                    }
+                },
+                "~:id": "~uc0939f58-37bc-805d-8006-51cd3a51c256",
+                "~:name": "Page 1"
+            }
+        },
+        "~:id": "~uc0939f58-37bc-805d-8006-51cd3a51c255",
+        "~:options": {
+            "~:components-v2": true,
+            "~:base-font-size": "16px"
+        }
+    }
+}
--- a/Show More
+++ b/Show More