🔧 Refactor debug traces in libraries module

2026-01-19 20:00:07 -05:00 · 2024-04-18 12:30:02 +02:00
1666 changed files with 69247 additions and 155239 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,53 +22,52 @@ jobs:

      # Download and cache dependencies
      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "backend/deps.edn" }}-{{ checksum "frontend/deps.edn"}}-{{ checksum "common/deps.edn"}}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
+         keys:
+           - v1-dependencies-{{ checksum "backend/deps.edn" }}-{{ checksum "frontend/deps.edn"}}-{{ checksum "common/deps.edn"}}
+           # fallback to using the latest cache if no exact match is found
+           - v1-dependencies-

      - run: cd .clj-kondo && cat config.edn
      - run: cat .cljfmt.edn
      - run: clj-kondo --version

      - run:
-          name: "backend fmt check"
+          name: "fmt check backend [clj]"
          working_directory: "./backend"
          command: |
            yarn install
            yarn run fmt:clj:check

      - run:
-          name: "exporter fmt check"
+          name: "fmt check exporter [clj]"
          working_directory: "./exporter"
          command: |
            yarn install
            yarn run fmt:clj:check

      - run:
-          name: "common fmt check"
+          name: "fmt check common [clj]"
          working_directory: "./common"
          command: |
            yarn install
            yarn run fmt:clj:check

      - run:
-          name: "frontend fmt check"
+          name: "fmt check frontend [clj]"
          working_directory: "./frontend"
          command: |
            yarn install
            yarn run fmt:clj:check
-            yarn run fmt:js:check

      - run:
-          name: "common linter check"
+          name: common lint
          working_directory: "./common"
          command: |
            yarn install
            yarn run lint:clj

      - run:
-          name: "frontend linter check"
+          name: frontend lint
          working_directory: "./frontend"
          command: |
            yarn install
@@ -76,14 +75,14 @@ jobs:
            yarn run lint:clj

      - run:
-          name: "backend linter check"
+          name: backend lint
          working_directory: "./backend"
          command: |
            yarn install
            yarn run lint:clj

      - run:
-          name: "exporter linter check"
+          name: exporter lint
          working_directory: "./exporter"
          command: |
            yarn install
@@ -94,7 +93,7 @@ jobs:
          working_directory: "./common"
          command: |
            yarn test
-            clojure -M:dev:test
+            clojure -X:dev:test :patterns '["common-tests.*-test"]'

      - run:
          name: "frontend tests"
@@ -103,21 +102,11 @@ jobs:
            yarn install
            yarn test

-      - run:
-          name: "frontend integration tests"
-          working_directory: "./frontend"
-          command: |
-            yarn install
-            yarn run build:app:assets
-            clojure -M:dev:shadow-cljs release main
-            yarn playwright install --with-deps chromium
-            yarn test:e2e
-
      - run:
          name: "backend tests"
          working_directory: "./backend"
          command: |
-            clojure -M:dev:test
+            clojure -X:dev:test :patterns '["backend-tests.*-test"]'

          environment:
            PENPOT_TEST_DATABASE_URI: "postgresql://localhost/penpot_test"
@@ -126,6 +115,7 @@ jobs:
            PENPOT_TEST_REDIS_URI: "redis://localhost/1"

      - save_cache:
-          paths:
-            - ~/.m2
-          key: v1-dependencies-{{ checksum "backend/deps.edn" }}-{{ checksum "frontend/deps.edn"}}-{{ checksum "common/deps.edn"}}
+         paths:
+           - ~/.m2
+         key: v1-dependencies-{{ checksum "backend/deps.edn" }}-{{ checksum "frontend/deps.edn"}}-{{ checksum "common/deps.edn"}}
+
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -3,6 +3,7 @@
  promesa.core/->> clojure.core/->>
  promesa.core/-> clojure.core/->
  promesa.exec.csp/go-loop clojure.core/loop
+  rumext.v2/defc clojure.core/defn
  promesa.util/with-open clojure.core/with-open
  app.common.schema.generators/let clojure.core/let
  app.common.data/export clojure.core/def
@@ -19,7 +20,6 @@
   app.db/with-atomic hooks.export/penpot-with-atomic
   potok.v2.core/reify hooks.export/potok-reify
   rumext.v2/fnc hooks.export/rumext-fnc
-   rumext.v2/defc hooks.export/rumext-defc
   rumext.v2/lazy-component hooks.export/rumext-lazycomponent
   shadow.lazy/loadable hooks.export/rumext-lazycomponent
   }}
--- a/.clj-kondo/hooks/export.clj
+++ b/.clj-kondo/hooks/export.clj
@@ -12,7 +12,6 @@

 (def registry (atom {}))

-
 (defn potok-reify
  [{:keys [:node :filename] :as params}]
  (let [[rnode rtype & other] (:children node)
@@ -67,86 +66,12 @@
  (let [[cname mdata params & body] (rest (:children node))
        [params body] (if (api/vector-node? mdata)
                        [mdata (cons params body)]
-                        [params body])
-
-        result (api/list-node
-                (into [(api/token-node 'fn) params]
-                      (cons mdata body)))]
-
-    {:node result}))
-
-
-(defn- parse-defc
-  [{:keys [children] :as node}]
-  (let [args (rest children)
-
-        [cname args]
-        (if (api/token-node? (first args))
-          [(first args) (rest args)]
-          (throw (ex-info "unexpected1" {})))
-
-        [docs args]
-        (if (api/string-node? (first args))
-          [(first args) (rest args)]
-          ["" args])
-
-        [mdata args]
-        (if (api/map-node? (first args))
-          [(first args) (rest args)]
-          [(api/map-node []) args])
-
-        [params body]
-        (if (api/vector-node? (first args))
-          [(first args) (rest args)]
-          (throw (ex-info "unexpected2" {})))]
-
-    [cname docs mdata params body]))
-
-(defn rumext-defc
-  [{:keys [node]}]
-  (let [[cname docs mdata params body] (parse-defc node)
-
-        param1        (first (:children params))
-        paramN        (rest (:children params))
-
-        param1        (if (api/map-node? param1)
-                        (let [param1    (into {} (comp
-                                                  (partition-all 2)
-                                                  (map (fn [[k v]]
-                                                         [(if (api/keyword-node? k)
-                                                            (:k k)
-                                                            k)
-                                                          (if (api/vector-node? v)
-                                                            (vec (:children v))
-                                                            v)])))
-                                              (:children param1))
-
-                              binding   (:rest param1)
-                              param1    (if binding
-                                          (if (contains? param1 :as)
-                                            (update param1 :keys (fnil conj []) binding)
-                                            (assoc param1 :as binding))
-                                          param1)]
-                          (->> (dissoc param1 :rest)
-                               (mapcat (fn [[k v]]
-                                         [(if (keyword? k)
-                                            (api/keyword-node k)
-                                            k)
-                                          (if (vector? v)
-                                            (api/vector-node v)
-                                            v)]))
-                               (api/map-node)))
-                        param1)
-
-        result (api/list-node
-                (into [(api/token-node 'defn)
-                       cname
-                       (api/vector-node (filter some? (cons param1 paramN)))]
-                      (cons mdata body)))]
-
-    ;; (prn (api/sexpr result))
-
-    {:node result}))
+                        [params body])]
+    (let [result (api/list-node
+                  (into [(api/token-node 'fn)
+                         params]
+                        (cons mdata body)))]
+      {:node result})))


 (defn rumext-lazycomponent
--- a/.cljfmt.edn
+++ b/.cljfmt.edn
@@ -4,7 +4,6 @@
 :remove-consecutive-blank-lines? false
 :extra-indents {rumext.v2/fnc [[:inner 0]]
                 cljs.test/async [[:inner 0]]
-                 app.common.schema/register! [[:inner 0] [:inner 1]]
                 promesa.exec/thread [[:inner 0]]
                 specify! [[:inner 0] [:inner 1]]}
 }
--- a/.gitignore
+++ b/.gitignore
@@ -48,8 +48,6 @@
 /deploy
 /docker/images/bundle*
 /exporter/target
-/frontend/.storybook/preview-body.html
-/frontend/.storybook/preview-head.html
 /frontend/cypress/fixtures/validuser.json
 /frontend/cypress/videos/*/
 /frontend/cypress/videos/*/
@@ -59,7 +57,6 @@
 /frontend/package-lock.json
 /frontend/resources/fonts/experiments
 /frontend/resources/public/*
-/frontend/storybook-static/
 /frontend/target/
 /other/
 /scripts/
@@ -70,9 +67,4 @@
 /web
 clj-profiler/
 node_modules
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
-/render-wasm/target/
-/**/.yarn/*
+frontend/.storybook/preview-body.html
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-v20.11.1
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,284 +1,5 @@
 # CHANGELOG

-## 2.3.3
-
-### :bug: Bugs fixed
-
- Fix problem creating manual overlay interactions [Taiga #9146](https://tree.taiga.io/project/penpot/issue/9146)
- Fix plugins list default URL
- Activate plugins feature by default
-
-## 2.3.2
-
-### :bug: Bugs fixed
-
- Fix null pointer exception on number checking functions
- Fix problem with grid layout ordering after moving [Taiga #9179](https://tree.taiga.io/project/penpot/issue/9179)
-
-### :books: Documentation
-
- Add initial documentation for Kubernetes
-
-
-## 2.3.1
-
-### :bug: Bugs fixed
-
- Fix unexpected issue on interaction between plugins sandbox and
-  internal impl of promise
-
-
-## 2.3.0
-
-### :rocket: Epics and highlights
-
- **New plugin system.**
-
-  Penpot now supports custom plugins. Read everything about developing your plugins [HERE](https://help.penpot.app/plugins/)
-
-### :boom: Breaking changes & Deprecations
-
-### :heart: Community contributions (Thank you!)
-
- All our plugins beta testers :heart:.
- Fix problem when translating multiple path points by @eeropic [#4459](https://github.com/penpot/penpot/issues/4459)
-
-### :sparkles: New features
-
- **Replace Draft.js completely with a custom editor** [Taiga #7706](https://tree.taiga.io/project/penpot/us/7706)
-
-  This refactor adds better IME support, more performant text editing
-  experience and a better clipboard support while keeping full
-  retrocompatibility with previous editor.
-
-  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)
- Fix problem with go back button on error page [Taiga #8887](https://tree.taiga.io/project/penpot/issue/8887)
- Fix problem with shadows in text for Safari [Taiga #8770](https://tree.taiga.io/project/penpot/issue/8770)
- Fix a regression with feedback form subject and content limits [Taiga #8908](https://tree.taiga.io/project/penpot/issue/8908)
- Fix problem with stroke and filter ordering in frames [Github #5058](https://github.com/penpot/penpot/issues/5058)
- Fix problem with hover layers when hidden/blocked [Github #5074](https://github.com/penpot/penpot/issues/5074)
- Fix problem with precision on boolean calculation [Taiga #8482](https://tree.taiga.io/project/penpot/issue/8482)
- Fix problem when translating multiple path points [Github #4459](https://github.com/penpot/penpot/issues/4459)
- Fix problem on importing (and exporting) files with flows [Taiga #8914](https://tree.taiga.io/project/penpot/issue/8914)
- Fix Internal Error page: "go to your penpot" wrong design [Taiga #8922](https://tree.taiga.io/project/penpot/issue/8922)
- Fix problem updating layout when toggle visibility in component copy [Github #5143](https://github.com/penpot/penpot/issues/5143)
- Fix "Done" button on toolbar on inspect mode should go to design mode [Taiga #8933](https://tree.taiga.io/project/penpot/issue/8933)
- Fix problem with shortcuts in text editor [Github #5078](https://github.com/penpot/penpot/issues/5078)
- Fix problems with show in viewer and interactions [Github #4868](https://github.com/penpot/penpot/issues/4868)
- Add visual feedback when moving an element into a board [Github #3210](https://github.com/penpot/penpot/issues/3210)
- Fix percent calculation on grid layout tracks [Github #4688](https://github.com/penpot/penpot/issues/4688)
- Fix problem with caps and inner shadows [Github #4517](https://github.com/penpot/penpot/issues/4517)
- Fix problem with horizontal/vertical lines and shadows [Github #4516](https://github.com/penpot/penpot/issues/4516)
- Fix problem with layers overflowing panel [Taiga #9021](https://tree.taiga.io/project/penpot/issue/9021)
- Fix in workspace you can manage rulers on view mode [Taiga #8966](https://tree.taiga.io/project/penpot/issue/8966)
- Fix problem with swap components in grid layout [Taiga #9066](https://tree.taiga.io/project/penpot/issue/9066)
-
-## 2.2.1
-
-### :bug: Bugs fixed
-
- Fix problem with Ctrl+F shortcut on the dashboard [Taiga #8876](https://tree.taiga.io/project/penpot/issue/8876)
- Fix visual problem with the font-size dropdown in assets [Taiga #8872](https://tree.taiga.io/project/penpot/issue/8872)
- Add limits for invitation RPC methods (hard limit 25 emails per request)
-
-## 2.2.0
-
-### :rocket: Epics and highlights
-
-### :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.
-
-### :heart: Community contributions (Thank you!)
-
- Set proper default tenant on exporter (by @june128) [#4946](https://github.com/penpot/penpot/pull/4946)
- Correct a spelling in onboarding.edn (by @n-stha) [#4936](https://github.com/penpot/penpot/pull/4936)
-
-### :sparkles: New features
-
- **Tiered File Data Storage** [Taiga #8376](https://tree.taiga.io/project/penpot/us/8376)
-
-  This feature allows offloading file data that is not actively used
-  from the database to object storage (e.g., filesystem, S3), thereby
-  freeing up space in the database. It can be enabled with the
-  `enable-enable-tiered-file-data-storage` flag.
-
-  *(On-Premise feature, EXPERIMENTAL).*
-
- **JSON Interoperability for HTTP API** [Taiga #8372](https://tree.taiga.io/project/penpot/us/8372)
-
-  Enables full JSON interoperability for our HTTP API. Previously,
-  JSON was only barely supported for output when the
-  `application/json` media type was specified in the `Accept` header,
-  or when `_fmt=json` was passed as a query parameter. With this
-  update, we now offer proper bi-directional support for using our API
-  with plain JSON, instead of Transit.
-
- **Automatic File Snapshotting**
-
-  Adds the ability to automatically take and maintain a limited set of
-  snapshots of active files without explicit user intervention. This
-  feature allows on-premise administrators to recover the state of a
-  file from a past point in time in a limited manner.
-
-  It can be enabled with the `enable-auto-file-snapshot` flag and
-  configured with the following settings:
-
-  ```bash
-  # Take snapshots every 10 update operations
-  PENPOT_AUTO_FILE_SNAPSHOT_EVERY=10
-
-  # Take a snapshot if it has been more than 3 hours since the file was last modified
-  PENPOT_AUTO_FILE_SNAPSHOT_TIMEOUT=3h
-
-  # The total number of snapshots to keep
-  PENPOT_AUTO_FILE_SNAPSHOT_TOTAL=10
-  ```
-
-  Snapshots are only taken during update operations; there is NO
-  active background process for this.
-
- Add separated flag `enable-oidc-registration` for enable the
-  registration only for OIDC authentication backend [Github
-  #4882](https://github.com/penpot/penpot/issues/4882)
-
- Update templates in libraries & templates in dashboard modal [Taiga #8145](https://tree.taiga.io/project/penpot/us/8145)
-
- **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)).
-
- **Storybook** [Taiga #6329](https://tree.taiga.io/project/penpot/us/6329)
-
-  The Design System components are now published in a Storybook, available at `/storybook`.
-
-### :bug: Bugs fixed
-
- Fix webhook checkbox position [Taiga #8634](https://tree.taiga.io/project/penpot/issue/8634)
- Fix wrong props on padding input [Taiga #8254](https://tree.taiga.io/project/penpot/issue/8254)
- Fix fill collapsed options [Taiga #8351](https://tree.taiga.io/project/penpot/issue/8351)
- Fix scroll on color picker modal [Taiga #8353](https://tree.taiga.io/project/penpot/issue/8353)
- Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273)
- Fix problem with SVG import [Github #4888](https://github.com/penpot/penpot/issues/4888)
- Fix problem with overlay positions in viewer [Taiga #8464](https://tree.taiga.io/project/penpot/issue/8464)
- Fix layer panel overflowing [Taiga #8665](https://tree.taiga.io/project/penpot/issue/8665)
- Fix problem when creating a component instance from grid layout [Github #4881](https://github.com/penpot/penpot/issues/4881)
- Fix problem when dismissing shared library update [Taiga #8669](https://tree.taiga.io/project/penpot/issue/8669)
- Fix visual problem with stroke cap menu [Taiga #8730](https://tree.taiga.io/project/penpot/issue/8730)
- Fix issue when exporting libraries when merging libraries [Taiga #8758](https://tree.taiga.io/project/penpot/issue/8758)
- Fix problem with comments max length [Taiga #8778](https://tree.taiga.io/project/penpot/issue/8778)
- Fix copy/paste images in Safari [Taiga #8771](https://tree.taiga.io/project/penpot/issue/8771)
- Fix swap when the copy is the only child of a group [#5075](https://github.com/penpot/penpot/issues/5075)
-
-## 2.1.5
-
-### :bug: Bugs fixed
-
- Fix broken webhooks [Taiga #8370](https://tree.taiga.io/project/penpot/issue/8370)
-
-## 2.1.4
-
-### :bug: Bugs fixed
-
- Fix json encoding on zip encoding decoding.
- Add schema validation for color changes.
- Fix render of some texts without position data.
-
-## 2.1.3
-
- Don't allow registration when registration is disabled and invitation token is used [Github #4975](https://github.com/penpot/penpot/issues/4975)
-
-## 2.1.2
-
-### :bug: Bugs fixed
-
- User switch language to "zh_hant" will get 400 [Github #4884](https://github.com/penpot/penpot/issues/4884)
- Smtp config ignoring port if ssl is set [Github #4872](https://github.com/penpot/penpot/issues/4872)
- Ability to let users to authenticate with a private oidc provider only [Github #4963](https://github.com/penpot/penpot/issues/4963)
-
-## 2.1.1
-
-### :sparkles: New features
-
- 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 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)
-
-## 2.1.0 - Things can only get better!
-
-### :rocket: Epics and highlights
-
-### :boom: Breaking changes & Deprecations
-
-### :heart: Communityq contributions (Thank you!)
-
-### :sparkles: New features
-
- Improve auth process [Taiga #7094](https://tree.taiga.io/project/penpot/us/7094)
- Add locking degrees increment (hold shift) on path edition [Taiga #7761](https://tree.taiga.io/project/penpot/issue/7761)
- Persistence & Concurrent Edition Enhancements [Taiga #5657](https://tree.taiga.io/project/penpot/us/5657)
- Allow library colors as recent colors [Taiga #7640](https://tree.taiga.io/project/penpot/issue/7640)
- Missing scroll in viewmode comments [Taiga #7427](https://tree.taiga.io/project/penpot/issue/7427)
- Comments in View mode should mimic the positioning behavior of the Workspace [Taiga #7346](https://tree.taiga.io/project/penpot/issue/7346)
- Misaligned input on comments [Taiga #7461](https://tree.taiga.io/project/penpot/issue/7461)
-
-### :bug: Bugs fixed
-
- Fix selection rectangle appears on scroll [Taiga #7525](https://tree.taiga.io/project/penpot/issue/7525)
- Fix layer tree not expanding to the bottom edge [Taiga #7466](https://tree.taiga.io/project/penpot/issue/7466)
- Fix guides move when board is moved by inputs [Taiga #8010](https://tree.taiga.io/project/penpot/issue/8010)
- Fix clickable area of Penptot logo in the viewer [Taiga #7988](https://tree.taiga.io/project/penpot/issue/7988)
- Fix constraints dropdown when selecting multiple shapes [Taiga #7686](https://tree.taiga.io/project/penpot/issue/7686)
- Layout and scrollign fixes for the bottom palette [Taiga #7559](https://tree.taiga.io/project/penpot/issue/7559)
- Fix expand libraries when search results are present [Taiga #7876](https://tree.taiga.io/project/penpot/issue/7876)
- Fix color palette default library [Taiga #8029](https://tree.taiga.io/project/penpot/issue/8029)
- Component Library is lost after exporting/importing in .zip format [Github #4672](https://github.com/penpot/penpot/issues/4672)
- Fix problem with moving+selection not working properly [Taiga #7943](https://tree.taiga.io/project/penpot/issue/7943)
- Fix problem with flex layout fit to content not positioning correctly children [Taiga #7537](https://tree.taiga.io/project/penpot/issue/7537)
- Fix black line is displaying after show main [Taiga #7653](https://tree.taiga.io/project/penpot/issue/7653)
- Fix "Share prototypes" modal remains open [Taiga #7442](https://tree.taiga.io/project/penpot/issue/7442)
- Fix "Components visibility and opacity" [#4694](https://github.com/penpot/penpot/issues/4694)
- Fix "Attribute overrides in copies are not exported in zip file" [Taiga #8072](https://tree.taiga.io/project/penpot/issue/8072)
- Fix group not automatically selected in the Layers panel after creation [Taiga #8078](https://tree.taiga.io/project/penpot/issue/8078)
- Fix export boards loses opacity [Taiga #7592](https://tree.taiga.io/project/penpot/issue/7592)
- Fix change color on imported svg also changes the stroke alignment[Taiga #7673](https://github.com/penpot/penpot/pull/7673)
- Fix show in view mode and interactions workflow [Taiga #4711](https://github.com/penpot/penpot/pull/4711)
- Fix internal error when I set up a stroke for some objects without and with stroke [Taiga #7558](https://tree.taiga.io/project/penpot/issue/7558)
- Toolbar keeps toggling on and off on spacebar press [Taiga #7654](https://github.com/penpot/penpot/pull/7654)
- Fix toolbar keeps hiding when click outside workspace [Taiga #7776](https://tree.taiga.io/project/penpot/issue/7776)
- Fix open overlay relative to a frame [Taiga #7563](https://tree.taiga.io/project/penpot/issue/7563)
- Workspace-palette items stay hidden when opening with keyboard-shortcut [Taiga #7489](https://tree.taiga.io/project/penpot/issue/7489)
- Fix SVG attrs are not handled correctly when exporting/importing in .zip [Taiga #7920](https://tree.taiga.io/project/penpot/issue/7920)
- Fix validation error when detaching with two nested copies and a swap [Taiga #8095](https://tree.taiga.io/project/penpot/issue/8095)
- Export shapes that are rotated act a bit strange when reimported [Taiga #7585](https://tree.taiga.io/project/penpot/issue/7585)
- Penpot crashes when a new colorpicker is created while uploading an image to another instance [Taiga #8119](https://tree.taiga.io/project/penpot/issue/8119)
- Removing Underline and Strikethrough Affects the Previous Text Object [Taiga #8103](https://tree.taiga.io/project/penpot/issue/8103)
- Color library loses association with shapes when exporting/importing the document [Taiga #8132](https://tree.taiga.io/project/penpot/issue/8132)
- Fix can't collapse groups when searching in the assets tab [Taiga #8125](https://tree.taiga.io/project/penpot/issue/8125)
- Fix 'Detach instance' shortcut is not working [Taiga #8102](https://tree.taiga.io/project/penpot/issue/8102)
- Fix import file message does not detect 0 as error [Taiga #6824](https://tree.taiga.io/project/penpot/issue/6824)
- Image Color Library is not persisted when exporting/importing in .zip [Taiga #8131](https://tree.taiga.io/project/penpot/issue/8131)
- Fix export files including libraries [Taiga #8266](https://tree.taiga.io/project/penpot/issue/8266)
-
-## 2.0.3
-
-### :bug: Bugs fixed
-
- Fix chrome scrollbar styling [Taiga #7852](https://tree.taiga.io/project/penpot/issue/7852)
- Fix incorrect password encoding on create-profile manage scritp [Github #3651](https://github.com/penpot/penpot/issues/3651)
-
 ## 2.0.2

 ### :sparkles: Enhancements
@@ -286,11 +7,6 @@ time being.
 - Fix locking contention on cron subsystem (causes backend start blocking)
 - Fix locking contention on file object thumbails backend RPC calls

-### :bug: Bugs fixed
-
- 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

@@ -298,7 +14,6 @@ time being.

 - 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
@@ -313,8 +28,6 @@ time being.
 ### :boom: Breaking changes & Deprecations

 - 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)
@@ -392,7 +105,7 @@ time being.
 - [REDESIGN] Panels visual separations [Taiga #6692](https://tree.taiga.io/project/penpot/us/6692)
 - [REDESIGN] Onboarding slides [Taiga #6678](https://tree.taiga.io/project/penpot/us/6678)

-### :bug: Bugs fixed
+### :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)
@@ -433,7 +146,7 @@ time being.
 - Fix problem when changing typography assets [Github #3683](https://github.com/penpot/penpot/issues/3683)
 - Internal error when you copy and paste some main components between files [Taiga #7397](https://tree.taiga.io/project/penpot/issue/7397)
 - Fix toolbar disappearing [Taiga #7411](https://tree.taiga.io/project/penpot/issue/7411)
- Fix long text on tab breaks UI [Taiga #7421](https://tree.taiga.io/project/penpot/issue/7421)
+- Fix long text on tab breaks UI [Taiga Issue #7421](https://tree.taiga.io/project/penpot/issue/7421)

 ## 1.19.5

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ quick win.
 If is going to be your first pull request, You can learn how from this
 free video series:

-https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github
+https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github

 We will use the `easy fix` mark for tag for indicate issues that are
 easy for beginners.
--- a/README.md
+++ b/README.md
@@ -8,12 +8,10 @@
  <img alt="penpot header image" src="https://penpot.app/images/readme/github-light-mode.png">
 </picture>

-<p align="center">
-<a href="https://www.mozilla.org/en-US/MPL/2.0" rel="nofollow"><img alt="License: MPL-2.0" src="https://img.shields.io/badge/MPL-2.0-blue.svg" style="max-width:100%;"></a>
-<a href="https://gitter.im/penpot/community" rel="nofollow"><img alt="Gitter" src="https://badges.gitter.im/sereno-xyz/community.svg" style="max-width:100%;"></a>
-<a href="https://tree.taiga.io/project/penpot/" title="Managed with Taiga.io" rel="nofollow"><img alt="Managed with Taiga.io" src="https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg" style="max-width:100%;"></a>
-<a href="https://gitpod.io/#https://github.com/penpot/penpot" rel="nofollow"><img alt="Gitpod ready-to-code" src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod" style="max-width:100%;"></a>
-</p>
+<p align="center"><a href="https://www.mozilla.org/en-US/MPL/2.0" rel="nofollow"><img src="https://camo.githubusercontent.com/3fcf3d6b678ea15fde3cf7d6af0e242160366282d62a7c182d83a50bfee3f45e/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4d504c2d322e302d626c75652e737667" alt="License: MPL-2.0" data-canonical-src="https://img.shields.io/badge/MPL-2.0-blue.svg" style="max-width:100%;"></a>
+<a href="https://gitter.im/penpot/community" rel="nofollow"><img src="https://camo.githubusercontent.com/5b0aecb33434f82a7b158eab7247544235ada0cf7eeb9ce8e52562dd67f614b7/68747470733a2f2f6261646765732e6769747465722e696d2f736572656e6f2d78797a2f636f6d6d756e6974792e737667" alt="Gitter" data-canonical-src="https://badges.gitter.im/sereno-xyz/community.svg" style="max-width:100%;"></a>
+<a href="https://tree.taiga.io/project/penpot/" title="Managed with Taiga.io" rel="nofollow"><img src="https://camo.githubusercontent.com/4a1d1112f0272e3393b1e8da312ff4435418e9e2eb4c0964881e3680f90a653c/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6d616e61676564253230776974682d54414947412e696f2d3730396631342e737667" alt="Managed with Taiga.io" data-canonical-src="https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg" style="max-width:100%;"></a>
+<a href="https://gitpod.io/#https://github.com/penpot/penpot" rel="nofollow"><img src="https://camo.githubusercontent.com/daadb4894128d1e19b72d80236f5959f1f2b47f9fe081373f3246131f0189f6c/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f476974706f642d72656164792d2d746f2d2d636f64652d626c75653f6c6f676f3d676974706f64" alt="Gitpod ready-to-code" data-canonical-src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod" style="max-width:100%;"></a></p>

 <p align="center">
    <a href="https://penpot.app/"><b>Website</b></a>  •  
@@ -45,14 +43,14 @@ Penpot is available on browser and [self host](https://penpot.app/self-host). It
 Penpot’s latest [huge release 2.0](https://penpot.app/dev-diaries), takes the platform to a whole new level. This update introduces the ground-breaking [CSS Grid Layout feature](https://penpot.app/penpot-2.0), a complete UI redesign, a new Components system, and much more. Plus, it's faster and more accessible. 


-🎇 **Penpot Fest** is our design, code & Open Source event. Check out the highlights from [Penpot Fest 2023 edition](https://www.youtube.com/watch?v=sOpLZaK5mDc)!
+🎇 **Penpot Fest is back!** Our design, code & Open Source event is happening in Barcelona | June 5-7th. [Get your tickets](https://www.eventbrite.es/e/penpot-fest-2024-tickets-859331883797) to join other designers and developers from open-source communities and beyond. 
+Check out the highlights from [Penpot Fest 2023 edition](https://www.youtube.com/watch?v=sOpLZaK5mDc)!

 ## Table of contents ##

 - [Why Penpot](#why-penpot)
 - [Getting Started](#getting-started)
 - [Community](#community)
- [Contributing](#contributing)
 - [Resources](#resources)
 - [License](#license)

@@ -60,9 +58,6 @@ Penpot’s latest [huge release 2.0](https://penpot.app/dev-diaries), takes the

 Penpot expresses designs as code. Designers can do their best work and see it will be beautifully implemented by developers in a two-way collaboration.

-### Plugin system ###
-[Penpot plugins](https://penpot.app/penpothub/plugins) let you expand the platform's capabilities, give you the flexibility to integrate it with other apps, and design custom solutions. 
-
 ### Designed for developers ###
 Penpot was built to serve both designers and developers and create a fluid design-code process. You have the choice to enjoy real-time collaboration or play "solo".

--- a/THANKYOU.md
+++ b/THANKYOU.md
@@ -2,19 +2,12 @@

 We want to thank to the amazing people that help us! Thank you! You're the best!

-Feel free you make a PR updating this file if you miss you in the
-list.
-
 ## Security
-
 * Husnain Iqbal (CEO OF ALPHA INFERNO PVT LTD)
 * [Shiraz Ali Khan](https://www.linkedin.com/in/shiraz-ali-khan-1ba508180/)
 * Vaibhav Shukla
-* Hassan Ahmed (Alias Xen Lee)
-* Michal Biesiada (@mbiesiad)

 ## Internationalization
-
 * [00ff88](https://hosted.weblate.org/user/00ff88)
 * [AhmadHB](https://hosted.weblate.org/user/AhmadHB)
 * [Aimee](https://hosted.weblate.org/user/Aimee)
@@ -96,7 +89,6 @@ list.
 * [zcraber](https://hosted.weblate.org/user/zcraber)

 ## Libraries & templates
-
 * systxema
 * plumilla
 * victor crespo
--- a/backend/deps.edn
+++ b/backend/deps.edn
@@ -3,10 +3,10 @@

 :deps
 {penpot/common {:local/root "../common"}
-  org.clojure/clojure {:mvn/version "1.12.0-alpha12"}
+  org.clojure/clojure {:mvn/version "1.12.0-alpha9"}
  org.clojure/tools.namespace {:mvn/version "1.5.0"}

-  com.github.luben/zstd-jni {:mvn/version "1.5.6-3"}
+  com.github.luben/zstd-jni {:mvn/version "1.5.5-11"}

  io.prometheus/simpleclient {:mvn/version "0.16.0"}
  io.prometheus/simpleclient_hotspot {:mvn/version "0.16.0"}
@@ -26,13 +26,13 @@
   :git/url "https://github.com/funcool/yetti.git"
   :exclusions [org.slf4j/slf4j-api]}

-  com.github.seancorfield/next.jdbc {:mvn/version "1.3.939"}
-  metosin/reitit-core {:mvn/version "0.7.0"}
-  nrepl/nrepl {:mvn/version "1.1.2"}
-  cider/cider-nrepl {:mvn/version "0.48.0"}
+  com.github.seancorfield/next.jdbc {:mvn/version "1.3.925"}
+  metosin/reitit-core {:mvn/version "0.6.0"}
+  nrepl/nrepl {:mvn/version "1.1.1"}
+  cider/cider-nrepl {:mvn/version "0.47.1"}

  org.postgresql/postgresql {:mvn/version "42.7.3"}
-  org.xerial/sqlite-jdbc {:mvn/version "3.46.0.0"}
+  org.xerial/sqlite-jdbc {:mvn/version "3.45.2.0"}

  com.zaxxer/HikariCP {:mvn/version "5.1.0"}

@@ -58,7 +58,7 @@

  ;; Pretty Print specs
  pretty-spec/pretty-spec {:mvn/version "0.1.4"}
-  software.amazon.awssdk/s3 {:mvn/version "2.25.63"}
+  software.amazon.awssdk/s3 {:mvn/version "2.22.12"}
  }

 :paths ["src" "resources" "target/classes"]
@@ -74,13 +74,16 @@

  :build
  {:extra-deps
-   {io.github.clojure/tools.build {:git/tag "v0.10.3" :git/sha "15ead66"}}
+   {io.github.clojure/tools.build {:git/tag "v0.10.0" :git/sha "3a2c484"}}
   :ns-default build}

  :test
-  {:main-opts ["-m" "kaocha.runner"]
-   :jvm-opts ["-Dlog4j2.configurationFile=log4j2-devenv-repl.xml"]
-   :extra-deps {lambdaisland/kaocha {:mvn/version "1.91.1392"}}}
+  {:extra-paths ["test"]
+   :extra-deps
+   {io.github.cognitect-labs/test-runner
+    {:git/tag "v0.5.1" :git/sha "dfb30dd"}}
+   :main-opts ["-m" "cognitect.test-runner"]
+   :exec-fn cognitect.test-runner.api/test}

  :outdated
  {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}}
--- a/backend/dev/user.clj
+++ b/backend/dev/user.clj
@@ -20,7 +20,6 @@
   [app.common.schema.desc-native :as smdn]
   [app.common.schema.generators :as sg]
   [app.common.spec :as us]
-   [app.common.json :as json]
   [app.common.transit :as t]
   [app.common.types.file :as ctf]
   [app.common.uuid :as uuid]
@@ -30,6 +29,7 @@
   [app.srepl.helpers :as srepl.helpers]
   [app.srepl.main :as srepl]
   [app.util.blob :as blob]
+   [app.util.json :as json]
   [app.util.time :as dt]
   [clj-async-profiler.core :as prof]
   [clojure.contrib.humanize :as hum]
--- a/backend/package.json
+++ b/backend/package.json
@@ -4,19 +4,19 @@
  "license": "MPL-2.0",
  "author": "Kaleidos INC",
  "private": true,
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@4.0.2",
  "repository": {
    "type": "git",
    "url": "https://github.com/penpot/penpot"
  },
  "dependencies": {
-    "luxon": "^3.4.4",
-    "sax": "^1.4.1"
+    "luxon": "^3.4.2",
+    "sax": "^1.2.4"
  },
  "devDependencies": {
-    "nodemon": "^3.1.2",
+    "nodemon": "^3.0.1",
    "source-map-support": "^0.5.21",
-    "ws": "^8.17.0"
+    "ws": "^8.13.0"
  },
  "scripts": {
    "fmt:clj:check": "cljfmt check --parallel=false src/ test/",
--- a/backend/resources/app/email/change-email/en.html
+++ b/backend/resources/app/email/change-email/en.html
@@ -1,6 +1,5 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">

 <head>
  <title>
@@ -111,20 +110,15 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                        <tbody>
                          <tr>
                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
+                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png" style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;" width="97" />
                            </td>
                          </tr>
                        </tbody>
@@ -157,8 +151,7 @@
          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
      <![endif]-->
    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
        <tbody>
          <tr>
            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
@@ -171,43 +164,29 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello {{name|abbreviate:25}}!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name}}!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        We received a request to change your current email to {{ pending-email }}.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">We received a request to change your current email to {{ pending-email }}.</div>
                    </td>
                  </tr>
                  <tr>
                    <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>
+                      <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>
                    </td>
                  </tr>
                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%;">
+                    <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/auth/verify-token?token={{token}}"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Confirm email change </a>
+                          <td align="center" bgcolor="#31EFB8" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;" valign="middle">
+                            <a href="{{ public-uri }}/#/auth/verify-token?token={{token}}" style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;" target="_blank"> Confirm email change </a>
                          </td>
                        </tr>
                      </table>
@@ -215,24 +194,17 @@
                  </tr>
                  <tr>
                    <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>
+                      <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>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        Enjoy!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">Enjoy!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        The Penpot team.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">The Penpot team.</div>
                    </td>
                  </tr>
                </table>
@@ -249,9 +221,257 @@
        </tbody>
      </table>
    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>

-    {% include "app/email/includes/footer.html" %}
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">

+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:425px;"
+            >
+          <![endif]-->
+              <div class="mj-column-px-425 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <!--[if mso | IE]>
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+      >
+        <tr>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-uxbox.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://twitter.com/penpotapp" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-twitter.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://github.com/penpot/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-github.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+          </tr>
+        </table>
+      <![endif]-->
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0 0 24px 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+      <![endif]-->
  </div>
 </body>

--- a/backend/resources/app/email/change-email/en.txt
+++ b/backend/resources/app/email/change-email/en.txt
@@ -1,4 +1,4 @@
-Hello {{name|abbreviate:25}}!
+Hello {{name}}!

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

--- a/backend/resources/app/email/feedback/en.html
+++ b/backend/resources/app/email/feedback/en.html
@@ -11,7 +11,7 @@
      {% if profile %}
        <span>
          <span>Name: </span>
-          <span><code>{{profile.fullname|abbreviate:25}}</code></span>
+          <span><code>{{profile.fullname}}</code></span>
        </span>
        <br />

@@ -34,7 +34,7 @@
    </p>
    <p>
      <strong>Subject:</strong><br />
-      <span>{{subject|abbreviate:300}}</span>
+      <span>{{subject}}</span>
    </p>

    <p>
--- a/backend/resources/app/email/includes/footer.html
+++ b/backend/resources/app/email/includes/footer.html
@@ -1,323 +0,0 @@
-<!--[if mso | IE]>
-        </td>
-    </tr>
-    </table>
-
-    <table
-        align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-    >
-    <tr>
-        <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-    <![endif]-->
-<div style="margin:0px auto;max-width:600px;">
-    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-            <tr>
-                <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
-                    <!--[if mso | IE]>
-                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-                class="" style="vertical-align:top;width:425px;"
-            >
-        <![endif]-->
-                    <div class="mj-column-px-425 mj-outlook-group-fix"
-                        style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                            style="vertical-align:top;" width="100%">
-                            <tr>
-                                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                    <div
-                                        style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">
-                                        Penpot is the first Open Source design and prototyping platform meant for
-                                        cross-domain teams.
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                    <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                </table>
-                <![endif]-->
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-<!--[if mso | IE]>
-        </td>
-        </tr>
-    </table>
-
-
-
-    <table
-        align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-    >
-        <tr>
-        <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-    <![endif]-->
-<div style="margin:0px auto;max-width:600px;">
-    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-            <tr>
-                <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-                    <!--[if mso | IE]>
-                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-                class="" style="vertical-align:top;width:600px;"
-            >
-        <![endif]-->
-                    <div class="mj-column-per-100 mj-outlook-group-fix"
-                        style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                            style="vertical-align:top;" width="100%">
-                            <tr>
-                                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                    <!--[if mso | IE]>
-    <table
-        align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-    >
-        <tr>
-
-            <td>
-            <![endif]-->
-                                    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                        style="float:none;display:inline-table;">
-                                        <tr>
-                                            <td style="padding:0 8px;">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    style="border-radius:3px;width:24px;">
-                                                    <tr>
-                                                        <td
-                                                            style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                                            <a href="https://penpot.app/" target="_blank">
-                                                                <img height="24"
-                                                                    src="{{ public-uri }}/images/email/logo-uxbox.png"
-                                                                    style="border-radius:3px;display:block;"
-                                                                    width="24" />
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!--[if mso | IE]>
-            </td>
-
-            <td>
-            <![endif]-->
-                                    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                        style="float:none;display:inline-table;">
-                                        <tr>
-                                            <td style="padding:0 8px;">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    style="border-radius:3px;width:24px;">
-                                                    <tr>
-                                                        <td
-                                                            style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                                            <a href="https://x.com/penpotapp" target="_blank">
-                                                                <img height="24"
-                                                                    src="{{ public-uri }}/images/email/logo-x.png"
-                                                                    style="border-radius:3px;display:block;"
-                                                                    width="24" />
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!--[if mso | IE]>
-            </td>
-
-            <td>
-            <![endif]-->
-                                    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                        style="float:none;display:inline-table;">
-                                        <tr>
-                                            <td style="padding:0 8px;">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    style="border-radius:3px;width:24px;">
-                                                    <tr>
-                                                        <td
-                                                            style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                                            <a href="https://github.com/penpot/" target="_blank">
-                                                                <img height="24"
-                                                                    src="{{ public-uri }}/images/email/logo-github.png"
-                                                                    style="border-radius:3px;display:block;"
-                                                                    width="24" />
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!--[if mso | IE]>
-            </td>
-
-            <td>
-            <![endif]-->
-                                    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                        style="float:none;display:inline-table;">
-                                        <tr>
-                                            <td style="padding:0 8px;">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    style="border-radius:3px;width:24px;">
-                                                    <tr>
-                                                        <td
-                                                            style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                                            <a href="https://www.linkedin.com/company/penpotdesign/"
-                                                                target="_blank">
-                                                                <img height="24"
-                                                                    src="{{ public-uri }}/images/email/logo-linkedin.png"
-                                                                    style="border-radius:3px;display:block;"
-                                                                    width="24" />
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!--[if mso | IE]>
-            </td>
-
-            <td>
-            <![endif]-->
-                                    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                        style="float:none;display:inline-table;">
-                                        <tr>
-                                            <td style="padding:0 8px;">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    style="border-radius:3px;width:24px;">
-                                                    <tr>
-                                                        <td
-                                                            style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                                            <a href="https://fosstodon.org/@penpot/" target="_blank">
-                                                                <img height="24"
-                                                                    src="{{ public-uri }}/images/email/logo-mastodon.png"
-                                                                    style="border-radius:3px;display:block;"
-                                                                    width="24" />
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!--[if mso | IE]>
-            </td>
-
-            <td>
-            <![endif]-->
-                                    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                        style="float:none;display:inline-table;">
-                                        <tr>
-                                            <td style="padding:0 8px;">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    style="border-radius:3px;width:24px;">
-                                                    <tr>
-                                                        <td
-                                                            style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                                            <a href="https://tree.taiga.io/project/penpot"
-                                                                target="_blank">
-                                                                <img height="24"
-                                                                    src="{{ public-uri }}/images/email/logo-taiga.png"
-                                                                    style="border-radius:3px;display:block;"
-                                                                    width="24" />
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!--[if mso | IE]>
-            </td>
-
-        </tr>
-        </table>
-    <![endif]-->
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                    <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                </table>
-                <![endif]-->
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-<!--[if mso | IE]>
-        </td>
-        </tr>
-    </table>
-
-    <table
-        align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-    >
-        <tr>
-        <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-    <![endif]-->
-<div style="margin:0px auto;max-width:600px;">
-    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-            <tr>
-                <td style="direction:ltr;font-size:0px;padding:0 0 24px 0;text-align:center;">
-                    <!--[if mso | IE]>
-                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-                class="" style="vertical-align:top;width:600px;"
-            >
-        <![endif]-->
-                    <div class="mj-column-per-100 mj-outlook-group-fix"
-                        style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                            style="vertical-align:top;" width="100%">
-                            <tr>
-                                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                    <div
-                                        style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">
-                                        Penpot | Made with &lt;3 and Open Source</div>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                    <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                </table>
-                <![endif]-->
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-<!--[if mso | IE]>
-        </td>
-        </tr>
-    </table>
-    <![endif]-->
--- a/backend/resources/app/email/invite-to-team/en.html
+++ b/backend/resources/app/email/invite-to-team/en.html
@@ -1,6 +1,5 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">

 <head>
  <title>
@@ -111,20 +110,15 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                        <tbody>
                          <tr>
                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
+                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png" style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;" width="97" />
                            </td>
                          </tr>
                        </tbody>
@@ -157,8 +151,7 @@
          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
      <![endif]-->
    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
        <tbody>
          <tr>
            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
@@ -171,36 +164,24 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">{{invited-by}} has invited you to join the team “{{ team }}”.</div>
                    </td>
                  </tr>
                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%;">
+                    <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/auth/verify-token?token={{token}}"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Accept invite </a>
+                          <td align="center" bgcolor="#31EFB8" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;" valign="middle">
+                            <a href="{{ public-uri }}/#/auth/verify-token?token={{token}}" style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;" target="_blank"> Accept invite </a>
                          </td>
                        </tr>
                      </table>
@@ -208,16 +189,12 @@
                  </tr>
                  <tr>
                    <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;">
-                        Enjoy!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">Enjoy!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        The Penpot team.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">The Penpot team.</div>
                    </td>
                  </tr>
                </table>
@@ -234,9 +211,257 @@
        </tbody>
      </table>
    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>

-    {% include "app/email/includes/footer.html" %}
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">

+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:425px;"
+            >
+          <![endif]-->
+              <div class="mj-column-px-425 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <!--[if mso | IE]>
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+      >
+        <tr>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-uxbox.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://twitter.com/penpotapp" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-twitter.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://github.com/penpot/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-github.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+          </tr>
+        </table>
+      <![endif]-->
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0 0 24px 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+      <![endif]-->
  </div>
 </body>

--- a/backend/resources/app/email/invite-to-team/en.txt
+++ b/backend/resources/app/email/invite-to-team/en.txt
@@ -1,6 +1,6 @@
 Hello!

-{{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.
+{{invited-by}} has invited you to join the team “{{ team }}”.

 Accept invitation using this link:

--- a/backend/resources/app/email/join-team/en.html
+++ b/backend/resources/app/email/join-team/en.html
@@ -1,244 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title>
-  </title>
-  <!--[if !mso]><!-- -->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <!--[if !mso]><!-->
-  <link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-
-      .mj-column-px-425 {
-        width: 425px !important;
-        max-width: 425px;
-      }
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="background-color:#E5E5E5;">
-  <div style="background-color:#E5E5E5;">
-    <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
-                        <tbody>
-                          <tr>
-                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello!</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        As you requested, {{invited-by|abbreviate:25}} has added you to the team “{{
-                        team|abbreviate:25}}”.</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%;">
-                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/dashboard/team/{{team-id}}/projects"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Go to the Team </a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        Enjoy!</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        The Penpot team.</div>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    {% include "app/email/includes/footer.html" %}
-
-  </div>
-</body>
-
-</html>
--- a/backend/resources/app/email/join-team/en.subj
+++ b/backend/resources/app/email/join-team/en.subj
@@ -1 +0,0 @@
-You have joined {{team}}
--- a/backend/resources/app/email/join-team/en.txt
+++ b/backend/resources/app/email/join-team/en.txt
@@ -1,10 +0,0 @@
-Hello!
-
-As you requested, {{invited-by|abbreviate:25}} has added you to the team “{{ team|abbreviate:25}}”.
-
-Go to the team with this link:
-
-{{ public-uri }}/#/dashboard/team/{{team-id}}
-
-Enjoy!
-The Penpot team.
--- a/backend/resources/app/email/password-recovery/en.html
+++ b/backend/resources/app/email/password-recovery/en.html
@@ -1,6 +1,5 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">

 <head>
  <title>
@@ -111,20 +110,15 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                        <tbody>
                          <tr>
                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
+                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png" style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;" width="97" />
                            </td>
                          </tr>
                        </tbody>
@@ -157,8 +151,7 @@
          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
      <![endif]-->
    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
        <tbody>
          <tr>
            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
@@ -171,37 +164,24 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello {{name|abbreviate:25}}!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name}}!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        We have received a request to reset your password. Click the link below to choose a new one:
-                      </div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">We have received a request to reset your password. Click the link below to choose a new one:</div>
                    </td>
                  </tr>
                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%;">
+                    <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/auth/recovery?token={{token}}"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Reset password </a>
+                          <td align="center" bgcolor="#31EFB8" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;" valign="middle">
+                            <a href="{{ public-uri }}/#/auth/recovery?token={{token}}" style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;" target="_blank"> Reset password </a>
                          </td>
                        </tr>
                      </table>
@@ -209,24 +189,17 @@
                  </tr>
                  <tr>
                    <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, you can safely ignore it. Your password won't be changed.
-                      </div>
+                      <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, you can safely ignore it. Your password won't be changed.</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        Enjoy!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">Enjoy!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        The Penpot team.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">The Penpot team.</div>
                    </td>
                  </tr>
                </table>
@@ -243,9 +216,257 @@
        </tbody>
      </table>
    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>

-    {% include "app/email/includes/footer.html" %}
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">

+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:425px;"
+            >
+          <![endif]-->
+              <div class="mj-column-px-425 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <!--[if mso | IE]>
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+      >
+        <tr>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-uxbox.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://twitter.com/penpotapp" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-twitter.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://github.com/penpot/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-github.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+          </tr>
+        </table>
+      <![endif]-->
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0 0 24px 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+      <![endif]-->
  </div>
 </body>

--- a/backend/resources/app/email/password-recovery/en.txt
+++ b/backend/resources/app/email/password-recovery/en.txt
@@ -1,4 +1,4 @@
-Hello {{name|abbreviate:25}}!
+Hello {{name}}!

 We received a request to reset your password. Click the link below to choose a
 new one:
--- a/backend/resources/app/email/register/en.html
+++ b/backend/resources/app/email/register/en.html
@@ -1,6 +1,5 @@
 <!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">

 <head>
  <title>
@@ -111,20 +110,15 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
                        <tbody>
                          <tr>
                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
+                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png" style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;" width="97" />
                            </td>
                          </tr>
                        </tbody>
@@ -157,8 +151,7 @@
          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
      <![endif]-->
    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
        <tbody>
          <tr>
            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
@@ -171,37 +164,24 @@
               class="" style="vertical-align:top;width:600px;"
            >
          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                  <tr>
                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello {{name|abbreviate:25}}!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name}}!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        Thanks for signing up for your Penpot account! Please verify your email using the link below and
-                        get started building mockups and prototypes today!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">Thanks for signing up for your Penpot account! Please verify your email using the link below and get started building mockups and prototypes today!</div>
                    </td>
                  </tr>
                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%;">
+                    <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/auth/verify-token?token={{token}}"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Verify email </a>
+                          <td align="center" bgcolor="#31EFB8" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;" valign="middle">
+                            <a href="{{ public-uri }}/#/auth/verify-token?token={{token}}" style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;" target="_blank"> Verify email </a>
                          </td>
                        </tr>
                      </table>
@@ -209,16 +189,12 @@
                  </tr>
                  <tr>
                    <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;">
-                        Enjoy!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">Enjoy!</div>
                    </td>
                  </tr>
                  <tr>
                    <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;">
-                        The Penpot team.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">The Penpot team.</div>
                    </td>
                  </tr>
                </table>
@@ -235,10 +211,258 @@
        </tbody>
      </table>
    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>

-    {% include "app/email/includes/footer.html" %}
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">

+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:425px;"
+            >
+          <![endif]-->
+              <div class="mj-column-px-425 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <!--[if mso | IE]>
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+      >
+        <tr>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-uxbox.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://twitter.com/penpotapp" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-twitter.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://github.com/penpot/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-github.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+              <td>
+            <![endif]-->
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                        <tr>
+                          <td style="padding:0 8px;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+                              <tr>
+                                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
+                                  </a>
+                                </td>
+                              </tr>
+                            </table>
+                          </td>
+                        </tr>
+                      </table>
+                      <!--[if mso | IE]>
+              </td>
+
+          </tr>
+        </table>
+      <![endif]-->
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0 0 24px 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tr>
+                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+      <![endif]-->
  </div>
 </body>

-</html>
+</html>
--- a/backend/resources/app/email/register/en.txt
+++ b/backend/resources/app/email/register/en.txt
@@ -1,4 +1,4 @@
-Hello {{name|abbreviate:25}}!
+Hello {{name}}!

 Thanks for signing up for your Penpot account! Please verify your email using the
 link below and get started building mockups and prototypes today!
--- a/backend/resources/app/email/request-file-access-yourpenpot-view/en.html
+++ b/backend/resources/app/email/request-file-access-yourpenpot-view/en.html
@@ -1,254 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title>
-  </title>
-  <!--[if !mso]><!-- -->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <!--[if !mso]><!-->
-  <link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-
-      .mj-column-px-425 {
-        width: 425px !important;
-        max-width: 425px;
-      }
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="background-color:#E5E5E5;">
-  <div style="background-color:#E5E5E5;">
-    <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
-                        <tbody>
-                          <tr>
-                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello!</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>
-                          {{requested-by|abbreviate:25}} ({{requested-by-email}}) wants to have view-only access to the
-                          file named “{{file-name|abbreviate:25}}”.
-                        </p>
-                        <p>
-                          Since this file is in your Penpot team, you can provide access by sending a view-only link.
-                          This will allow {{requested-by|abbreviate:25}} to view the content without making any changes.
-                        </p>
-                        <p>To proceed, please click the button below to generate and send the view-only link:</p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%">
-                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/view/{{file-id}}?page-id={{page-id}}&section=interactions&index=0&share=true"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Send a View-Only link </a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>If you do not wish to grant access at this time, you can simply disregard this email.</p>
-                        <p>Thank you</p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        The Penpot team.</div>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    {% include "app/email/includes/footer.html" %}
-
-  </div>
-</body>
-
-</html>
--- a/backend/resources/app/email/request-file-access-yourpenpot-view/en.subj
+++ b/backend/resources/app/email/request-file-access-yourpenpot-view/en.subj
@@ -1 +0,0 @@
-Request View-Only Access to “{{file-name|abbreviate:25}}”
--- a/backend/resources/app/email/request-file-access-yourpenpot-view/en.txt
+++ b/backend/resources/app/email/request-file-access-yourpenpot-view/en.txt
@@ -1,17 +0,0 @@
-Hello!
-
-{{requested-by|abbreviate:25}} ({{requested-by-email}}) wants to have view-only access to the file named “{{file-name|abbreviate:25}}”.
-
-Since this file is in your Penpot team, you can provide access by sending a view-only link. This will allow {{requested-by|abbreviate:25}} to view the content without making any changes.
-
-To proceed, please click the link below to generate and send the view-only link:
-
-{{ public-uri }}/#/view/{{file-id}}?page-id={{page-id}}&section=interactions&index=0&share=true
-
-
-
-If you do not wish to grant access at this time, you can simply disregard this email.
-Thank you
-
-
-The Penpot team.
--- a/backend/resources/app/email/request-file-access-yourpenpot/en.html
+++ b/backend/resources/app/email/request-file-access-yourpenpot/en.html
@@ -1,277 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title>
-  </title>
-  <!--[if !mso]><!-- -->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <!--[if !mso]><!-->
-  <link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-
-      .mj-column-px-425 {
-        width: 425px !important;
-        max-width: 425px;
-      }
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="background-color:#E5E5E5;">
-  <div style="background-color:#E5E5E5;">
-    <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
-                        <tbody>
-                          <tr>
-                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello!</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>
-                          {{requested-by|abbreviate:25}} ({{requested-by-email}}) has requested access to the file named
-                          “{{file-name|abbreviate:25}}”.
-                        </p>
-                        <p>
-                          Please note that the file is currently in Your Penpot 's team, so direct access cannot be
-                          granted. However, you have two options to provide the requested access:
-                        </p>
-                        <ul>
-                          <li>
-                            <p>Move the File to Another Team:</p>
-                            <p>You can move the file to another team and then give access to that team, inviting
-                              {{requested-by|abbreviate:25}}.</p>
-                          </li>
-                        </ul>
-                        </p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <ul>
-                          <li>
-                            <p>Send a View-Only Link:</p>
-                            <p>Alternatively, you can create and share a view-only link to the file. This will allow
-                              {{requested-by|abbreviate:25}} to view the content without making any changes.</p>
-                            <p>Click the button below to generate and send the link:</p>
-                          </li>
-                        </ul>
-                        </p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%">
-                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/view/{{file-id}}?page-id={{page-id}}&section=interactions&index=0&share=true"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Send a View-Only link </a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>If you do not wish to grant access at this time, you can simply disregard this email.</p>
-                        <p>Thank you</p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        The Penpot team.</div>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    {% include "app/email/includes/footer.html" %}
-
-  </div>
-</body>
-
-</html>
--- a/backend/resources/app/email/request-file-access-yourpenpot/en.subj
+++ b/backend/resources/app/email/request-file-access-yourpenpot/en.subj
@@ -1 +0,0 @@
-Request Access to “{{file-name|abbreviate:25}}”
--- a/backend/resources/app/email/request-file-access-yourpenpot/en.txt
+++ b/backend/resources/app/email/request-file-access-yourpenpot/en.txt
@@ -1,30 +0,0 @@
-Hello!
-
-
-Hello!
-
-{{requested-by|abbreviate:25}} ({{requested-by-email}}) has requested access to the file named “{{file-name|abbreviate:25}}”.
-
-Please note that the file is currently in Your Penpot 's team, so direct access cannot be granted. However, you have two options to provide the requested access:
-
- Move the File to Another Team:
-
-You can move the file to another team and then give access to that team, inviting {{requested-by|abbreviate:25}}.
-
-
-
- Send a View-Only Link:
-
-Alternatively, you can create and share a view-only link to the file. This will allow {{requested-by|abbreviate:25}} to view the content without making any changes.
-
-Click the link below to generate and send the link:
-
-{{ public-uri }}/#/view/{{file-id}}?page-id={{page-id}}&section=interactions&index=0&share=true
-
-
-
-If you do not wish to grant access at this time, you can simply disregard this email.
-Thank you
-
-
-The Penpot team.
--- a/backend/resources/app/email/request-file-access/en.html
+++ b/backend/resources/app/email/request-file-access/en.html
@@ -1,295 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title>
-  </title>
-  <!--[if !mso]><!-- -->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <!--[if !mso]><!-->
-  <link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-
-      .mj-column-px-425 {
-        width: 425px !important;
-        max-width: 425px;
-      }
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="background-color:#E5E5E5;">
-  <div style="background-color:#E5E5E5;">
-    <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
-                        <tbody>
-                          <tr>
-                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello!</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>
-                          {{requested-by|abbreviate:25}} ({{requested-by-email}}) has requested access to the file named
-                          “{{file-name|abbreviate:25}}”.
-                        </p>
-                        <p>
-                          To provide this access, you have the following options:
-                        </p>
-                        <ul>
-                          <li>
-                            <p>Give Access to the “{{team-name|abbreviate:25}}” Team:</p>
-                            <p>This will automatically include {{requested-by|abbreviate:25}} in the team, so the user
-                              can see all the projects and files in it.</p>
-                            <p>Click the button below to provide team access:</p>
-                          </li>
-                        </ul>
-                        </p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%">
-                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/dashboard/team/{{team-id}}/members?invite-email={{requested-by-email|urlescape }}"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Give access to “{{team-name|abbreviate:25}}” Team </a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <ul>
-                          <li>
-                            <p>Send a View-Only Link:</p>
-                            <p>Alternatively, you can create and share a view-only link to the file. This will allow
-                              {{requested-by|abbreviate:25}} to view the content without making any changes.</p>
-                            <p>Click the button below to generate and send the link:</p>
-                          </li>
-                        </ul>
-                        </p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%">
-                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/view/{{file-id}}?page-id={{page-id}}&section=interactions&index=0&share=true"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Send a View-Only link </a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>If you do not wish to grant access at this time, you can simply disregard this email.</p>
-                        <p>Thank you</p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        The Penpot team.</div>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    {% include "app/email/includes/footer.html" %}
-
-
-  </div>
-</body>
-
-</html>
--- a/backend/resources/app/email/request-file-access/en.subj
+++ b/backend/resources/app/email/request-file-access/en.subj
@@ -1 +0,0 @@
-Request Access to “{{file-name|abbreviate:25}}”
--- a/backend/resources/app/email/request-file-access/en.txt
+++ b/backend/resources/app/email/request-file-access/en.txt
@@ -1,34 +0,0 @@
-Hello!
-
-
-Hello!
-
-{{requested-by|abbreviate:25}} ({{requested-by-email}}) has requested access to the file named “{{file-name|abbreviate:25}}”.
-
-To provide this access, you have the following options:
-
- Give Access to the “{{team-name|abbreviate:25}}” Team:
-
-This will automatically include {{requested-by|abbreviate:25}} in the team, so the user can see all the projects and files in it.
-
-Click the link below to provide team access:
-
-{{ public-uri }}/#/dashboard/team/{{team-id}}/members?invite-email={{requested-by-email|urlescape}}
-
-
-
- Send a View-Only Link:
-
-Alternatively, you can create and share a view-only link to the file. This will allow {{requested-by|abbreviate:25}} to view the content without making any changes.
-
-Click the link below to generate and send the link:
-
-{{ public-uri }}/#/view/{{file-id}}?page-id={{page-id}}&section=interactions&index=0&share=true
-
-
-
-If you do not wish to grant access at this time, you can simply disregard this email.
-Thank you
-
-
-The Penpot team.
--- a/backend/resources/app/email/request-team-access/en.html
+++ b/backend/resources/app/email/request-team-access/en.html
@@ -1,252 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title>
-  </title>
-  <!--[if !mso]><!-- -->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <!--[if !mso]><!-->
-  <link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-
-      .mj-column-px-425 {
-        width: 425px !important;
-        max-width: 425px;
-      }
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="background-color:#E5E5E5;">
-  <div style="background-color:#E5E5E5;">
-    <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
-                        <tbody>
-                          <tr>
-                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">
-                        Hello!</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>
-                          {{requested-by|abbreviate:25}} ({{requested-by-email}}) wants to have access to the
-                          “{{team-name|abbreviate:25}}” Team.
-                        </p>
-                        <p>
-                          To provide access, please click the button below:
-                        </p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%;">
-                        <tr>
-                          <td align="center" bgcolor="#31EFB8" role="presentation"
-                            style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#31EFB8;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/dashboard/team/{{team-id}}/members?invite-email={{requested-by-email|urlescape}}"
-                              style="display:inline-block;background:#31EFB8;color:#1F1F1F;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;"
-                              target="_blank"> Give access to “{{team-name|abbreviate:25}}” </a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        <p>If you do not wish to grant access at this time, you can simply disregard this email.</p>
-                        <p>Thank you</p>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <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;">
-                        The Penpot team.</div>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    {% include "app/email/includes/footer.html" %}
-
-  </div>
-</body>
-
-</html>
--- a/backend/resources/app/email/request-team-access/en.subj
+++ b/backend/resources/app/email/request-team-access/en.subj
@@ -1 +0,0 @@
-Request Access to “{{team-name|abbreviate:25}}”
--- a/backend/resources/app/email/request-team-access/en.txt
+++ b/backend/resources/app/email/request-team-access/en.txt
@@ -1,14 +0,0 @@
-Hello!
-
-{{requested-by|abbreviate:25}} ({{requested-by-email}}) wants to have access to the “{{team-name|abbreviate:25}}” Team.
-
-To provide access, please click the link below:
-
-{{ public-uri }}/#/dashboard/team/{{team-id}}/members?invite-email={{requested-by-email|urlescape}}
-
-
-If you do not wish to grant access at this time, you can simply disregard this email.
-Thank you
-
-
-The Penpot team.
--- a/backend/resources/app/onboarding.edn
+++ b/backend/resources/app/onboarding.edn
@@ -1,42 +1,33 @@
-[{:id "wireframing-kit"
-  :name "Wireframe library"
-  :file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Wireframing%20kit%20v1.1.penpot"}
- {:id "prototype-examples"
-  :name "Prototype template"
-  :file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Prototype%20examples%20v1.1.penpot"}
- {:id "plants-app"
-  :name "UI mockup example"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/Plants-app.penpot"}
- {:id "penpot-design-system"
-  :name "Design system example"
-  :file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Penpot%20-%20Design%20System%20v2.1.penpot"}
- {:id "tutorial-for-beginners"
+[{:id "tutorial-for-beginners"
  :name "Tutorial for beginners"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/tutorial-for-beginners.penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/tutorial-for-beginners.penpot"}
 {:id "lucide-icons"
  :name "Lucide Icons"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/Lucide-icons.penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Lucide-icons.penpot"}
 {:id "font-awesome"
  :name "Font Awesome"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/FontAwesome.penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Font-Awesome.penpot"}
+ {:id "plants-app"
+  :name "Plants app"
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Plants-app.penpot"}
+ {:id "wireframing-kit"
+  :name "Wireframing Kit"
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/wireframing-kit.penpot"}
 {:id "black-white-mobile-templates"
  :name "Black & White Mobile Templates"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/Black-&-White-Mobile-Templates.penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Black-White-Mobile-Templates.penpot"}
 {:id "avataaars"
  :name "Avataaars"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/Avataaars-by-Pablo-Stanley.penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Avataaars-by-Pablo-Stanley.penpot"}
 {:id "ux-notes"
  :name "UX Notes"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/UX-Notes.penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/UX-Notes.penpot"}
 {:id "whiteboarding-kit"
  :name "Whiteboarding Kit"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/Whiteboarding-mapping-kit.penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Whiteboarding-mapping-kit.penpot"}
 {:id "open-color-scheme"
  :name "Open Color Scheme"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/Open%20Color%20Scheme%20(v1.9.1).penpot"}
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Open-Color-Scheme.penpot"}
 {:id "flex-layout-playground"
  :name "Flex Layout Playground"
-  :file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Flex%20Layout%20Playground%20v2.0.penpot"}
- {:id "welcome"
-  :name "Welcome"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/welcome.penpot"}]
+  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Flex-Layout-Playground.penpot"}]
--- a/backend/resources/app/templates/api-doc-entry.tmpl
+++ b/backend/resources/app/templates/api-doc-entry.tmpl
@@ -20,19 +20,12 @@
          <span>WEBHOOK</span>
        </span>
      {% endif %}
-
      {% if item.params-schema-js %}
        <span class="tag">
          <span>SCHEMA</span>
        </span>
      {% endif %}

-      {% if item.spec %}
-        <span class="tag">
-          <span>SPEC</span>
-        </span>
-      {% endif %}
-
      {% if item.sse %}
        <span class="tag">
          <span>SSE</span>
--- a/backend/resources/app/templates/debug.tmpl
+++ b/backend/resources/app/templates/debug.tmpl
@@ -7,7 +7,7 @@ Debug Main Page
 {% block content %}
 <nav>
  <div class="title">
-    <h1>ADMIN DEBUG INTERFACE (VERSION: {{version}})</h1>
+    <h1>ADMIN DEBUG INTERFACE</h1>
  </div>
 </nav>
 <main class="dashboard">
--- a/backend/scripts/repl
+++ b/backend/scripts/repl
@@ -23,12 +23,9 @@ export PENPOT_FLAGS="\
       enable-urepl-server \
       enable-rpc-climit \
       enable-rpc-rlimit \
-       enable-quotes \
       enable-soft-rpc-rlimit \
-       enable-auto-file-snapshot \
       enable-webhooks \
       enable-access-tokens \
-       enable-tiered-file-data-storage \
       enable-file-validation \
       enable-file-schema-validation";

@@ -64,11 +61,9 @@ mc mb penpot-s3/penpot -p -q

 export AWS_ACCESS_KEY_ID=penpot-devenv
 export AWS_SECRET_ACCESS_KEY=penpot-devenv
-
-export PENPOT_OBJECTS_STORAGE_BACKEND=s3
-export PENPOT_OBJECTS_STORAGE_S3_ENDPOINT=http://minio:9000
-export PENPOT_OBJECTS_STORAGE_S3_BUCKET=penpot
-export PENPOT_OBJECTS_STORAGE_FS_DIRECTORY="assets"
+export PENPOT_ASSETS_STORAGE_BACKEND=assets-s3
+export PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://minio:9000
+export PENPOT_STORAGE_ASSETS_S3_BUCKET=penpot

 export OPTIONS="
       -A:jmx-remote -A:dev \
--- a/backend/scripts/start-dev
+++ b/backend/scripts/start-dev
@@ -17,10 +17,7 @@ export PENPOT_FLAGS="\
       disable-secure-session-cookies \
       enable-rpc-climit \
       enable-smtp \
-       enable-quotes \
-       enable-file-snapshot \
       enable-access-tokens \
-       enable-tiered-file-data-storage \
       enable-file-validation \
       enable-file-schema-validation";

@@ -58,9 +55,9 @@ mc mb penpot-s3/penpot -p -q

 export AWS_ACCESS_KEY_ID=penpot-devenv
 export AWS_SECRET_ACCESS_KEY=penpot-devenv
-export PENPOT_OBJECTS_STORAGE_BACKEND=s3
-export PENPOT_OBJECTS_STORAGE_S3_ENDPOINT=http://minio:9000
-export PENPOT_OBJECTS_STORAGE_S3_BUCKET=penpot
+export PENPOT_ASSETS_STORAGE_BACKEND=assets-s3
+export PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://minio:9000
+export PENPOT_STORAGE_ASSETS_S3_BUCKET=penpot

 entrypoint=${1:-app.main};

--- a/backend/src/app/auth.clj
+++ b/backend/src/app/auth.clj
@@ -6,7 +6,9 @@

 (ns app.auth
  (:require
-   [buddy.hashers :as hashers]))
+   [app.config :as cf]
+   [buddy.hashers :as hashers]
+   [cuerdas.core :as str]))

 (def default-params
  {:alg :argon2id
@@ -25,3 +27,17 @@
    (catch Throwable _
      {:update false
       :valid false})))
+
+(defn email-domain-in-whitelist?
+  "Returns true if email's domain is in the given whitelist or if
+  given whitelist is an empty string."
+  ([email]
+   (let [domains (cf/get :registration-domain-whitelist)]
+     (email-domain-in-whitelist? domains email)))
+  ([domains email]
+   (if (or (nil? domains) (empty? domains))
+     true
+     (let [[_ candidate] (-> (str/lower email)
+                             (str/split #"@" 2))]
+       (contains? domains candidate)))))
+
--- a/backend/src/app/auth/ldap.clj
+++ b/backend/src/app/auth/ldap.clj
@@ -9,6 +9,7 @@
   [app.common.exceptions :as ex]
   [app.common.logging :as l]
   [app.common.spec :as us]
+   [app.config :as cf]
   [clj-ldap.client :as ldap]
   [clojure.spec.alpha :as s]
   [clojure.string]
@@ -103,17 +104,17 @@
        nil))))

 (s/def ::enabled? ::us/boolean)
-(s/def ::host ::us/string)
-(s/def ::port ::us/integer)
-(s/def ::ssl ::us/boolean)
-(s/def ::tls ::us/boolean)
-(s/def ::query ::us/string)
-(s/def ::base-dn ::us/string)
-(s/def ::bind-dn ::us/string)
-(s/def ::bind-password ::us/string)
-(s/def ::attrs-email ::us/string)
-(s/def ::attrs-fullname ::us/string)
-(s/def ::attrs-username ::us/string)
+(s/def ::host ::cf/ldap-host)
+(s/def ::port ::cf/ldap-port)
+(s/def ::ssl ::cf/ldap-ssl)
+(s/def ::tls ::cf/ldap-starttls)
+(s/def ::query ::cf/ldap-user-query)
+(s/def ::base-dn ::cf/ldap-base-dn)
+(s/def ::bind-dn ::cf/ldap-bind-dn)
+(s/def ::bind-password ::cf/ldap-bind-password)
+(s/def ::attrs-email ::cf/ldap-attrs-email)
+(s/def ::attrs-fullname ::cf/ldap-attrs-fullname)
+(s/def ::attrs-username ::cf/ldap-attrs-username)

 (s/def ::provider-params
  (s/keys :opt-un [::host ::port
@@ -125,7 +126,6 @@
                   ::attrs-email
                   ::attrs-username
                   ::attrs-fullname]))
-
 (s/def ::provider
  (s/nilable ::provider-params))

--- a/backend/src/app/auth/oidc.clj
+++ b/backend/src/app/auth/oidc.clj
@@ -7,6 +7,7 @@
 (ns app.auth.oidc
  "OIDC client implementation."
  (:require
+   [app.auth :as auth]
   [app.auth.oidc.providers :as-alias providers]
   [app.common.data :as d]
   [app.common.data.macros :as dm]
@@ -16,17 +17,12 @@
   [app.common.uri :as u]
   [app.config :as cf]
   [app.db :as db]
-   [app.email.blacklist :as email.blacklist]
-   [app.email.whitelist :as email.whitelist]
   [app.http.client :as http]
-   [app.http.errors :as errors]
   [app.http.session :as session]
   [app.loggers.audit :as audit]
-   [app.rpc :as rpc]
   [app.rpc.commands.profile :as profile]
   [app.setup :as-alias setup]
   [app.tokens :as tokens]
-   [app.util.inet :as inet]
   [app.util.json :as json]
   [app.util.time :as dt]
   [buddy.sign.jwk :as jwk]
@@ -35,7 +31,6 @@
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
   [integrant.core :as ig]
-   [ring.request :as rreq]
   [ring.response :as-alias rres]))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -133,8 +128,8 @@
          (-> body json/decode :keys process-oidc-jwks)
          (do
            (l/warn :hint "unable to retrieve JWKs (unexpected response status code)"
-                    :response-status status
-                    :response-body  body)
+                    :http-status status
+                    :http-body  body)
            nil)))
      (catch Throwable cause
        (l/warn :hint "unable to retrieve JWKs (unexpected exception)"
@@ -148,18 +143,18 @@
  (when (contains? cf/flags :login-with-oidc)
    (if-let [opts (prepare-oidc-opts cfg)]
      (let [jwks (fetch-oidc-jwks cfg opts)]
-        (l/inf :hint "provider initialized"
-               :provider "oidc"
-               :method (if (:discover? opts) "discover" "manual")
-               :client-id (:client-id opts)
-               :client-secret (obfuscate-string (:client-secret opts))
-               :scopes     (str/join "," (:scopes opts))
-               :auth-uri   (:auth-uri opts)
-               :user-uri   (:user-uri opts)
-               :token-uri  (:token-uri opts)
-               :roles-attr (:roles-attr opts)
-               :roles      (:roles opts)
-               :keys       (str/join "," (map str (keys jwks))))
+        (l/info :hint "provider initialized"
+                :provider "oidc"
+                :method (if (:discover? opts) "discover" "manual")
+                :client-id (:client-id opts)
+                :client-secret (obfuscate-string (:client-secret opts))
+                :scopes     (str/join "," (:scopes opts))
+                :auth-uri   (:auth-uri opts)
+                :user-uri   (:user-uri opts)
+                :token-uri  (:token-uri opts)
+                :roles-attr (:roles-attr opts)
+                :roles      (:roles opts)
+                :keys       (str/join "," (map str (keys jwks))))
        (assoc opts :jwks jwks))
      (do
        (l/warn :hint "unable to initialize auth provider, missing configuration" :provider "oidc")
@@ -183,10 +178,10 @@
      (if (and (string? (:client-id opts))
               (string? (:client-secret opts)))
        (do
-          (l/inf :hint "provider initialized"
-                 :provider "google"
-                 :client-id (:client-id opts)
-                 :client-secret (obfuscate-string (:client-secret opts)))
+          (l/info :hint "provider initialized"
+                  :provider "google"
+                  :client-id (:client-id opts)
+                  :client-secret (obfuscate-string (:client-secret opts)))
          opts)

        (do
@@ -211,9 +206,8 @@
          (ex/raise :type :internal
                    :code :unable-to-retrieve-github-emails
                    :hint "unable to retrieve github emails"
-                    :request-uri (:uri params)
-                    :response-status status
-                    :response-body body))
+                    :http-status status
+                    :http-body body))

        (->> body json/decode (filter :primary) first :email))))

@@ -238,10 +232,10 @@
      (if (and (string? (:client-id opts))
               (string? (:client-secret opts)))
        (do
-          (l/inf :hint "provider initialized"
-                 :provider "github"
-                 :client-id (:client-id opts)
-                 :client-secret (obfuscate-string (:client-secret opts)))
+          (l/info :hint "provider initialized"
+                  :provider "github"
+                  :client-id (:client-id opts)
+                  :client-secret (obfuscate-string (:client-secret opts)))
          opts)

        (do
@@ -253,7 +247,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 (defmethod ig/init-key ::providers/gitlab
-  [_ cfg]
+  [_ _]
  (let [base (cf/get :gitlab-base-uri "https://gitlab.com")
        opts {:base-uri      base
              :client-id     (cf/get :gitlab-client-id)
@@ -262,18 +256,17 @@
              :auth-uri      (str base "/oauth/authorize")
              :token-uri     (str base "/oauth/token")
              :user-uri      (str base "/oauth/userinfo")
-              :jwks-uri      (str base "/oauth/discovery/keys")
              :name          "gitlab"}]
    (when (contains? cf/flags :login-with-gitlab)
      (if (and (string? (:client-id opts))
               (string? (:client-secret opts)))
-        (let [jwks (fetch-oidc-jwks cfg opts)]
-          (l/inf :hint "provider initialized"
-                 :provider "gitlab"
-                 :base-uri base
-                 :client-id (:client-id opts)
-                 :client-secret (obfuscate-string (:client-secret opts)))
-          (assoc opts :jwks jwks))
+        (do
+          (l/info :hint "provider initialized"
+                  :provider "gitlab"
+                  :base-uri base
+                  :client-id (:client-id opts)
+                  :client-secret (obfuscate-string (:client-secret opts)))
+          opts)

        (do
          (l/warn :hint "unable to initialize auth provider, missing configuration" :provider "gitlab")
@@ -329,31 +322,26 @@
                :uri (:token-uri provider)
                :body (u/map->query-string params)}]

-    (l/trc :hint "fetch access token"
-           :provider (:name provider)
-           :client-id (:client-id provider)
-           :client-secret (obfuscate-string (:client-secret provider))
-           :grant-type (:grant_type params)
-           :redirect-uri (:redirect_uri params))
+    (l/trace :hint "request access token"
+             :provider (:name provider)
+             :client-id (:client-id provider)
+             :client-secret (obfuscate-string (:client-secret provider))
+             :grant-type (:grant_type params)
+             :redirect-uri (:redirect_uri params))

    (let [{:keys [status body]} (http/req! cfg req {:sync? true})]
-      (l/trc :hint "access token fetched" :status status :body body)
+      (l/trace :hint "access token response" :status status :body body)
      (if (= status 200)
-        (let [data (json/decode body)
-              data {:token/access (get data :access_token)
-                    :token/id     (get data :id_token)
-                    :token/type   (get data :token_type)}]
-          (l/trc :hint "access token fetched"
-                 :token-id (:token/id data)
-                 :token-type (:token/type data)
-                 :token (:token/access data))
-          data)
+        (let [data (json/decode body)]
+          {:token/access (get data :access_token)
+           :token/id     (get data :id_token)
+           :token/type   (get data :token_type)})
+
        (ex/raise :type :internal
-                  :code :unable-to-fetch-access-token
-                  :hint "unable to fetch access token"
-                  :request-uri (:uri req)
-                  :response-status status
-                  :response-body body)))))
+                  :code :unable-to-retrieve-token
+                  :hint "unable to retrieve token"
+                  :http-status status
+                  :http-body body)))))

 (defn- process-user-info
  [provider tdata info]
@@ -380,9 +368,9 @@

 (defn- fetch-user-info
  [{:keys [::provider] :as cfg} tdata]
-  (l/trc :hint "fetch user info"
-         :uri (:user-uri provider)
-         :token (obfuscate-string (:token/access tdata)))
+  (l/trace :hint "fetch user info"
+           :uri (:user-uri provider)
+           :token (obfuscate-string (:token/access tdata)))

  (let [params   {:uri (:user-uri provider)
                  :headers {"Authorization" (str (:token/type tdata) " " (:token/access tdata))}
@@ -390,9 +378,9 @@
                  :method :get}
        response (http/req! cfg params {:sync? true})]

-    (l/trc :hint "user info response"
-           :status (:status response)
-           :body   (:body response))
+    (l/trace :hint "user info response"
+             :status (:status response)
+             :body   (:body response))

    (when-not (s/int-in-range? 200 300 (:status response))
      (ex/raise :type :internal
@@ -430,6 +418,12 @@

 (defn- get-info
  [{:keys [::provider ::setup/props] :as cfg} {:keys [params] :as request}]
+  (when-let [error (get params :error)]
+    (ex/raise :type :internal
+              :code :error-on-retrieving-code
+              :error-id error
+              :error-desc (get params :error_description)))
+
  (let [state  (get params :state)
        code   (get params :code)
        state  (tokens/verify props {:token state :iss :oauth})
@@ -442,7 +436,7 @@

        info   (process-user-info provider tdata info)]

-    (l/trc :hint "user info" :info info)
+    (l/trace :hint "user info" :info info)

    (when-not (s/valid? ::info info)
      (l/warn :hint "received incomplete profile info object (please set correct scopes)" :info info)
@@ -475,9 +469,6 @@
      (some? (:invitation-token state))
      (assoc :invitation-token (:invitation-token state))

-      (some? (:external-session-id state))
-      (assoc :external-session-id (:external-session-id state))
-
      ;; If state token comes with props, merge them. The state token
      ;; props can contain pm_ and utm_ prefixed query params.
      (map? (:props state))
@@ -506,13 +497,12 @@
     (redirect-response uri))))

 (defn- redirect-to-register
-  [cfg info request]
+  [cfg info]
  (let [info   (assoc info
                      :iss :prepared-register
                      :exp (dt/in-future {:hours 48}))

        params {:token (tokens/generate (::setup/props cfg) info)
-                :provider (:provider (:path-params request))
                :fullname (:fullname info)}
        params (d/without-nils params)]

@@ -559,87 +549,55 @@

      (not (:is-active profile))
      (let [info (assoc info :profile-id (:id profile))]
-        (redirect-to-register cfg info request))
+        (redirect-to-register cfg info))

      :else
-      (let [sxf     (session/create-fn cfg (:id profile))
-            token   (or (:invitation-token info)
-                        (tokens/generate (::setup/props cfg)
-                                         {:iss :auth
-                                          :exp (dt/in-future "15m")
-                                          :profile-id (:id profile)}))
-            props   (audit/profile->props profile)
-            context (d/without-nils {:external-session-id (:external-session-id info)})]
+      (let [sxf   (session/create-fn cfg (:id profile))
+            token (or (:invitation-token info)
+                      (tokens/generate (::setup/props cfg)
+                                       {:iss :auth
+                                        :exp (dt/in-future "15m")
+                                        :props (:props info)
+                                        :profile-id (:id profile)}))]

-        (audit/submit! cfg {::audit/type "action"
+        (audit/submit! cfg {::audit/type "command"
                            ::audit/name "login-with-oidc"
                            ::audit/profile-id (:id profile)
-                            ::audit/ip-addr (inet/parse-request request)
-                            ::audit/props props
-                            ::audit/context context})
+                            ::audit/ip-addr (audit/parse-client-ip request)
+                            ::audit/props (audit/profile->props profile)})

        (->> (redirect-to-verify-token token)
             (sxf request))))

-    (and (email.blacklist/enabled? cfg)
-         (email.blacklist/contains? cfg (:email info)))
-    (redirect-with-error "email-domain-not-allowed")
-
-    (and (email.whitelist/enabled? cfg)
-         (not (email.whitelist/contains? cfg (:email info))))
+    (not (auth/email-domain-in-whitelist? (:email info)))
    (redirect-with-error "email-domain-not-allowed")

    :else
    (let [info (assoc info :is-active (provider-has-email-verified? cfg info))]
-      (if (or (contains? cf/flags :registration)
-              (contains? cf/flags :oidc-registration))
-        (redirect-to-register cfg info request)
+      (if (contains? cf/flags :registration)
+        (redirect-to-register cfg info)
        (redirect-with-error "registration-disabled")))))

-(defn- get-external-session-id
-  [request]
-  (let [session-id (rreq/get-header request "x-external-session-id")]
-    (when (string? session-id)
-      (if (or (> (count session-id) 256)
-              (= session-id "null")
-              (str/blank? session-id))
-        nil
-        session-id))))
-
 (defn- auth-handler
  [cfg {:keys [params] :as request}]
-  (let [props  (audit/extract-utm-params params)
-        esid   (rpc/get-external-session-id request)
-        params {:iss :oauth
-                :invitation-token (:invitation-token params)
-                :external-session-id esid
-                :props props
-                :exp (dt/in-future "4h")}
-        state  (tokens/generate (::setup/props cfg)
-                                (d/without-nils params))
-        uri    (build-auth-uri cfg state)]
+  (let [props (audit/extract-utm-params params)
+        state (tokens/generate (::setup/props cfg)
+                               {:iss :oauth
+                                :invitation-token (:invitation-token params)
+                                :props props
+                                :exp (dt/in-future "4h")})
+        uri   (build-auth-uri cfg state)]
    {::rres/status 200
     ::rres/body {:redirect-uri uri}}))

 (defn- callback-handler
-  [{:keys [::provider] :as cfg} request]
+  [cfg request]
  (try
-    (if-let [error (dm/get-in request [:params :error])]
-      (redirect-with-error "unable-to-auth" error)
-      (let [info    (get-info cfg request)
-            profile (get-profile cfg info)]
-        (process-callback cfg request info profile)))
+    (let [info    (get-info cfg request)
+          profile (get-profile cfg info)]
+      (process-callback cfg request info profile))
    (catch Throwable cause
-      (binding [l/*context* (-> (errors/request->context request)
-                                (assoc :auth/provider (:name provider)))]
-        (let [edata (ex-data cause)]
-          (cond
-            (= :validation (:type edata))
-            (l/wrn :hint "invalid token received" :cause cause)
-
-            :else
-            (l/err :hint "error on oauth process" :cause cause))))
-
+      (l/err :hint "error on oauth process" :cause cause)
      (redirect-with-error "unable-to-auth" (ex-message cause)))))

 (def provider-lookup
@@ -655,17 +613,17 @@
                       :provider provider
                       :hint "provider not configured"))))))})

-(s/def ::client-id ::us/string)
-(s/def ::client-secret ::us/string)
-(s/def ::base-uri ::us/string)
-(s/def ::token-uri ::us/string)
-(s/def ::auth-uri ::us/string)
-(s/def ::user-uri ::us/string)
-(s/def ::scopes ::us/set-of-strings)
-(s/def ::roles ::us/set-of-strings)
-(s/def ::roles-attr ::us/string)
-(s/def ::email-attr ::us/string)
-(s/def ::name-attr ::us/string)
+(s/def ::client-id ::cf/oidc-client-id)
+(s/def ::client-secret ::cf/oidc-client-secret)
+(s/def ::base-uri ::cf/oidc-base-uri)
+(s/def ::token-uri ::cf/oidc-token-uri)
+(s/def ::auth-uri ::cf/oidc-auth-uri)
+(s/def ::user-uri ::cf/oidc-user-uri)
+(s/def ::scopes ::cf/oidc-scopes)
+(s/def ::roles ::cf/oidc-roles)
+(s/def ::roles-attr ::cf/oidc-roles-attr)
+(s/def ::email-attr ::cf/oidc-email-attr)
+(s/def ::name-attr ::cf/oidc-name-attr)

 (s/def ::provider
  (s/keys :req-un [::client-id
--- a/backend/src/app/binfile/common.clj
+++ b/backend/src/app/binfile/common.clj
@@ -15,7 +15,6 @@
   [app.common.files.migrations :as fmg]
   [app.common.files.validate :as fval]
   [app.common.logging :as l]
-   [app.common.types.file :as ctf]
   [app.common.uuid :as uuid]
   [app.config :as cf]
   [app.db :as db]
@@ -332,12 +331,54 @@

 (defn embed-assets
  [cfg data file-id]
-  (let [library-ids (get-libraries cfg [file-id])]
-    (reduce (fn [data library-id]
-              (let [library (get-file cfg library-id)]
-                (ctf/absorb-assets data (:data library))))
-            data
-            library-ids)))
+  (letfn [(walk-map-form [form state]
+            (cond
+              (uuid? (:fill-color-ref-file form))
+              (do
+                (vswap! state conj [(:fill-color-ref-file form) :colors (:fill-color-ref-id form)])
+                (assoc form :fill-color-ref-file file-id))
+
+              (uuid? (:stroke-color-ref-file form))
+              (do
+                (vswap! state conj [(:stroke-color-ref-file form) :colors (:stroke-color-ref-id form)])
+                (assoc form :stroke-color-ref-file file-id))
+
+              (uuid? (:typography-ref-file form))
+              (do
+                (vswap! state conj [(:typography-ref-file form) :typographies (:typography-ref-id form)])
+                (assoc form :typography-ref-file file-id))
+
+              (uuid? (:component-file form))
+              (do
+                (vswap! state conj [(:component-file form) :components (:component-id form)])
+                (assoc form :component-file file-id))
+
+              :else
+              form))
+
+          (process-group-of-assets [data [lib-id items]]
+            ;; NOTE: there is a possibility that shape refers to an
+            ;; non-existant file because the file was removed. In this
+            ;; case we just ignore the asset.
+            (if-let [lib (get-file cfg lib-id)]
+              (reduce (partial process-asset lib) data items)
+              data))
+
+          (process-asset [lib data [bucket asset-id]]
+            (let [asset (get-in lib [:data bucket asset-id])
+                  ;; Add a special case for colors that need to have
+                  ;; correctly set the :file-id prop (pending of the
+                  ;; refactor that will remove it).
+                  asset (cond-> asset
+                          (= bucket :colors) (assoc :file-id file-id))]
+              (update data bucket assoc asset-id asset)))]
+
+    (let [assets (volatile! [])]
+      (walk/postwalk #(cond-> % (map? %) (walk-map-form assets)) data)
+      (->> (deref assets)
+           (filter #(as-> (first %) $ (and (uuid? $) (not= $ file-id))))
+           (d/group-by first rest)
+           (reduce (partial process-group-of-assets) data)))))

 (defn- fix-version
  [file]
--- a/backend/src/app/binfile/v1.clj
+++ b/backend/src/app/binfile/v1.clj
@@ -22,6 +22,7 @@
   [app.db :as db]
   [app.loggers.audit :as-alias audit]
   [app.loggers.webhooks :as-alias webhooks]
+   [app.media :as media]
   [app.rpc :as-alias rpc]
   [app.rpc.commands.teams :as teams]
   [app.rpc.doc :as-alias doc]
@@ -129,6 +130,7 @@
  (.writeLong output (long data))
  (swap! *position* + 8))

+
 (defn read-long!
  [^DataInputStream input]
  (let [v (.readLong input)]
@@ -402,9 +404,9 @@
    (write-obj! output rels)))

 (defmethod write-section :v1/sobjects
-  [{:keys [::output] :as cfg}]
+  [{:keys [::sto/storage ::output]}]
  (let [sids    (-> bfc/*state* deref :sids)
-        storage (sto/resolve cfg)]
+        storage (media/configure-assets-storage storage)]

    (l/dbg :hint "found sobjects"
           :items (count sids)
@@ -619,8 +621,8 @@
                  ::l/sync? true))))))

 (defmethod read-section :v1/sobjects
-  [{:keys [::db/conn ::input ::bfc/overwrite ::bfc/timestamp] :as cfg}]
-  (let [storage (sto/resolve cfg)
+  [{:keys [::sto/storage ::db/conn ::input ::bfc/overwrite ::bfc/timestamp]}]
+  (let [storage (media/configure-assets-storage storage)
        ids     (read-obj! input)
        thumb?  (into #{} (map :media-id) (:thumbnails @bfc/*state*))]

--- a/backend/src/app/binfile/v2.clj
+++ b/backend/src/app/binfile/v2.clj
@@ -20,6 +20,7 @@
   [app.db.sql :as sql]
   [app.loggers.audit :as-alias audit]
   [app.loggers.webhooks :as-alias webhooks]
+   [app.media :as media]
   [app.storage :as sto]
   [app.storage.tmp :as tmp]
   [app.util.events :as events]
@@ -346,7 +347,9 @@
  [cfg team-id]
  (let [id  (uuid/next)
        tp  (dt/tpoint)
-        cfg (create-database cfg)]
+
+        cfg (-> (create-database cfg)
+                (update ::sto/storage media/configure-assets-storage))]

    (l/inf :hint "start"
           :operation "export"
@@ -387,6 +390,7 @@
        tp  (dt/tpoint)

        cfg (-> (create-database cfg path)
+                (update ::sto/storage media/configure-assets-storage)
                (assoc ::bfc/timestamp (dt/now)))]

    (l/inf :hint "start"
--- a/backend/src/app/config.clj
+++ b/backend/src/app/config.clj
@@ -11,17 +11,30 @@
   [app.common.data :as d]
   [app.common.exceptions :as ex]
   [app.common.flags :as flags]
-   [app.common.schema :as sm]
+   [app.common.spec :as us]
   [app.common.version :as v]
-   [app.util.overrides]
   [app.util.time :as dt]
   [clojure.core :as c]
   [clojure.java.io :as io]
+   [clojure.pprint :as pprint]
+   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
   [datoteka.fs :as fs]
   [environ.core :refer [env]]
   [integrant.core :as ig]))

+(prefer-method print-method
+               clojure.lang.IRecord
+               clojure.lang.IDeref)
+
+(prefer-method print-method
+               clojure.lang.IPersistentMap
+               clojure.lang.IDeref)
+
+(prefer-method pprint/simple-dispatch
+               clojure.lang.IPersistentMap
+               clojure.lang.IDeref)
+
 (defmethod ig/init-key :default
  [_ data]
  (d/without-nils data))
@@ -32,19 +45,18 @@
    (d/without-nils data)
    data))

-(def default
+(def defaults
  {:database-uri "postgresql://postgres/penpot"
   :database-username "penpot"
   :database-password "penpot"

-   :default-blob-version 4
+   :default-blob-version 5

-   :rpc-rlimit-config "resources/rlimit.edn"
-   :rpc-climit-config "resources/climit.edn"
+   :rpc-rlimit-config (fs/path "resources/rlimit.edn")
+   :rpc-climit-config (fs/path "resources/climit.edn")

-   :auto-file-snapshot-total 10
-   :auto-file-snapshot-every 5
-   :auto-file-snapshot-timeout "3h"
+   :file-change-snapshot-every 5
+   :file-change-snapshot-timeout "3h"

   :public-uri "http://localhost:3449"
   :host "localhost"
@@ -52,8 +64,8 @@

   :redis-uri "redis://redis/0"

-   :objects-storage-backend "fs"
-   :objects-storage-fs-directory "assets"
+   :assets-storage-backend :assets-fs
+   :storage-assets-fs-directory "assets"

   :assets-path "/internal/assets/"
   :smtp-default-reply-to "Penpot <no-reply@example.com>"
@@ -75,156 +87,251 @@
   :ldap-attrs-fullname "cn"

   ;; a server prop key where initial project is stored.
-   :initial-project-skey "initial-project"
+   :initial-project-skey "initial-project"})

-   ;; time to avoid email sending after profile modification
-   :email-verify-threshold "15m"})
+(s/def ::default-rpc-rlimit ::us/vector-of-strings)
+(s/def ::rpc-rlimit-config ::fs/path)
+(s/def ::rpc-climit-config ::fs/path)

-(def schema:config
-  (do #_sm/optional-keys
-   [:map {:title "config"}
-    [:flags {:optional true} [::sm/set :string]]
-    [:admins {:optional true} [::sm/set ::sm/email]]
-    [:secret-key {:optional true} :string]
+(s/def ::media-max-file-size ::us/integer)

-    [:tenant {:optional false} :string]
-    [:public-uri {:optional false} :string]
-    [:host {:optional false} :string]
+(s/def ::flags ::us/vector-of-keywords)
+(s/def ::telemetry-enabled ::us/boolean)

-    [:http-server-port {:optional true} ::sm/int]
-    [:http-server-host {:optional true} :string]
-    [:http-server-max-body-size {:optional true} ::sm/int]
-    [:http-server-max-multipart-body-size {:optional true} ::sm/int]
-    [:http-server-io-threads {:optional true} ::sm/int]
-    [:http-server-worker-threads {:optional true} ::sm/int]
+(s/def ::audit-log-archive-uri ::us/string)
+(s/def ::audit-log-http-handler-concurrency ::us/integer)

-    [:telemetry-uri {:optional true} :string]
-    [:telemetry-with-taiga {:optional true} ::sm/boolean] ;; DELETE
+(s/def ::deletion-delay ::dt/duration)

-    [:auto-file-snapshot-total {:optional true} ::sm/int]
-    [:auto-file-snapshot-every {:optional true} ::sm/int]
-    [:auto-file-snapshot-timeout {:optional true} ::dt/duration]
+(s/def ::admins ::us/set-of-valid-emails)
+(s/def ::file-change-snapshot-every ::us/integer)
+(s/def ::file-change-snapshot-timeout ::dt/duration)

-    [:media-max-file-size {:optional true} ::sm/int]
-    [:deletion-delay {:optional true} ::dt/duration] ;; REVIEW
-    [:telemetry-enabled {:optional true} ::sm/boolean]
-    [:default-blob-version {:optional true} ::sm/int]
-    [:allow-demo-users {:optional true} ::sm/boolean]
-    [:error-report-webhook {:optional true} :string]
-    [:user-feedback-destination {:optional true} :string]
+(s/def ::default-executor-parallelism ::us/integer)
+(s/def ::scheduled-executor-parallelism ::us/integer)

-    [:default-rpc-rlimit {:optional true} [::sm/vec :string]]
-    [:rpc-rlimit-config {:optional true} ::fs/path]
-    [:rpc-climit-config {:optional true} ::fs/path]
+(s/def ::worker-default-parallelism ::us/integer)
+(s/def ::worker-webhook-parallelism ::us/integer)

-    [:audit-log-archive-uri {:optional true} :string]
-    [:audit-log-http-handler-concurrency {:optional true} ::sm/int]
+(s/def ::authenticated-cookie-domain ::us/string)
+(s/def ::authenticated-cookie-name ::us/string)
+(s/def ::auth-token-cookie-name ::us/string)
+(s/def ::auth-token-cookie-max-age ::dt/duration)

-    [:default-executor-parallelism {:optional true} ::sm/int] ;; REVIEW
-    [:scheduled-executor-parallelism {:optional true} ::sm/int] ;; REVIEW
-    [:worker-default-parallelism {:optional true} ::sm/int]
-    [:worker-webhook-parallelism {:optional true} ::sm/int]
+(s/def ::secret-key ::us/string)
+(s/def ::allow-demo-users ::us/boolean)
+(s/def ::assets-path ::us/string)
+(s/def ::database-password (s/nilable ::us/string))
+(s/def ::database-uri ::us/string)
+(s/def ::database-username (s/nilable ::us/string))
+(s/def ::database-readonly ::us/boolean)
+(s/def ::database-min-pool-size ::us/integer)
+(s/def ::database-max-pool-size ::us/integer)

-    [:database-password {:optional true} [:maybe :string]]
-    [:database-uri {:optional true} :string]
-    [:database-username {:optional true} [:maybe :string]]
-    [:database-readonly {:optional true} ::sm/boolean]
-    [:database-min-pool-size {:optional true} ::sm/int]
-    [:database-max-pool-size {:optional true} ::sm/int]
+(s/def ::quotes-teams-per-profile ::us/integer)
+(s/def ::quotes-access-tokens-per-profile ::us/integer)
+(s/def ::quotes-projects-per-team ::us/integer)
+(s/def ::quotes-invitations-per-team ::us/integer)
+(s/def ::quotes-profiles-per-team ::us/integer)
+(s/def ::quotes-files-per-project ::us/integer)
+(s/def ::quotes-files-per-team ::us/integer)
+(s/def ::quotes-font-variants-per-team ::us/integer)
+(s/def ::quotes-comment-threads-per-file ::us/integer)
+(s/def ::quotes-comments-per-file ::us/integer)

-    [:quotes-teams-per-profile {:optional true} ::sm/int]
-    [:quotes-access-tokens-per-profile {:optional true} ::sm/int]
-    [:quotes-projects-per-team {:optional true} ::sm/int]
-    [:quotes-invitations-per-team {:optional true} ::sm/int]
-    [:quotes-profiles-per-team {:optional true} ::sm/int]
-    [:quotes-files-per-project {:optional true} ::sm/int]
-    [:quotes-files-per-team {:optional true} ::sm/int]
-    [:quotes-font-variants-per-team {:optional true} ::sm/int]
-    [:quotes-comment-threads-per-file {:optional true} ::sm/int]
-    [:quotes-comments-per-file {:optional true} ::sm/int]
+(s/def ::default-blob-version ::us/integer)
+(s/def ::error-report-webhook ::us/string)
+(s/def ::user-feedback-destination ::us/string)
+(s/def ::github-client-id ::us/string)
+(s/def ::github-client-secret ::us/string)
+(s/def ::gitlab-base-uri ::us/string)
+(s/def ::gitlab-client-id ::us/string)
+(s/def ::gitlab-client-secret ::us/string)
+(s/def ::google-client-id ::us/string)
+(s/def ::google-client-secret ::us/string)
+(s/def ::oidc-client-id ::us/string)
+(s/def ::oidc-user-info-source ::us/keyword)
+(s/def ::oidc-client-secret ::us/string)
+(s/def ::oidc-base-uri ::us/string)
+(s/def ::oidc-token-uri ::us/string)
+(s/def ::oidc-auth-uri ::us/string)
+(s/def ::oidc-user-uri ::us/string)
+(s/def ::oidc-jwks-uri ::us/string)
+(s/def ::oidc-scopes ::us/set-of-strings)
+(s/def ::oidc-roles ::us/set-of-strings)
+(s/def ::oidc-roles-attr ::us/string)
+(s/def ::oidc-email-attr ::us/string)
+(s/def ::oidc-name-attr ::us/string)
+(s/def ::host ::us/string)
+(s/def ::http-server-port ::us/integer)
+(s/def ::http-server-host ::us/string)
+(s/def ::http-server-max-body-size ::us/integer)
+(s/def ::http-server-max-multipart-body-size ::us/integer)
+(s/def ::http-server-io-threads ::us/integer)
+(s/def ::http-server-worker-threads ::us/integer)
+(s/def ::ldap-attrs-email ::us/string)
+(s/def ::ldap-attrs-fullname ::us/string)
+(s/def ::ldap-attrs-username ::us/string)
+(s/def ::ldap-base-dn ::us/string)
+(s/def ::ldap-bind-dn ::us/string)
+(s/def ::ldap-bind-password ::us/string)
+(s/def ::ldap-host ::us/string)
+(s/def ::ldap-port ::us/integer)
+(s/def ::ldap-ssl ::us/boolean)
+(s/def ::ldap-starttls ::us/boolean)
+(s/def ::ldap-user-query ::us/string)
+(s/def ::media-directory ::us/string)
+(s/def ::media-uri ::us/string)
+(s/def ::profile-bounce-max-age ::dt/duration)
+(s/def ::profile-bounce-threshold ::us/integer)
+(s/def ::profile-complaint-max-age ::dt/duration)
+(s/def ::profile-complaint-threshold ::us/integer)
+(s/def ::public-uri ::us/string)
+(s/def ::redis-uri ::us/string)
+(s/def ::registration-domain-whitelist ::us/set-of-strings)

-    [:auth-data-cookie-domain {:optional true} :string]
-    [:auth-token-cookie-name {:optional true} :string]
-    [:auth-token-cookie-max-age {:optional true} ::dt/duration]
+(s/def ::smtp-default-from ::us/string)
+(s/def ::smtp-default-reply-to ::us/string)
+(s/def ::smtp-host ::us/string)
+(s/def ::smtp-password (s/nilable ::us/string))
+(s/def ::smtp-port ::us/integer)
+(s/def ::smtp-ssl ::us/boolean)
+(s/def ::smtp-tls ::us/boolean)
+(s/def ::smtp-username (s/nilable ::us/string))
+(s/def ::urepl-host ::us/string)
+(s/def ::urepl-port ::us/integer)
+(s/def ::prepl-host ::us/string)
+(s/def ::prepl-port ::us/integer)
+(s/def ::assets-storage-backend ::us/keyword)
+(s/def ::storage-assets-fs-directory ::us/string)
+(s/def ::storage-assets-s3-bucket ::us/string)
+(s/def ::storage-assets-s3-region ::us/keyword)
+(s/def ::storage-assets-s3-endpoint ::us/string)
+(s/def ::storage-assets-s3-io-threads ::us/integer)
+(s/def ::telemetry-uri ::us/string)
+(s/def ::telemetry-with-taiga ::us/boolean)
+(s/def ::tenant ::us/string)

-    [:registration-domain-whitelist {:optional true} [::sm/set :string]]
-    [:email-verify-threshold {:optional true} ::dt/duration]
+(s/def ::config
+  (s/keys :opt-un [::secret-key
+                   ::flags
+                   ::admins
+                   ::deletion-delay
+                   ::allow-demo-users
+                   ::audit-log-archive-uri
+                   ::audit-log-http-handler-concurrency
+                   ::auth-token-cookie-name
+                   ::auth-token-cookie-max-age
+                   ::authenticated-cookie-name
+                   ::authenticated-cookie-domain
+                   ::database-password
+                   ::database-uri
+                   ::database-username
+                   ::database-readonly
+                   ::database-min-pool-size
+                   ::database-max-pool-size
+                   ::default-blob-version
+                   ::default-rpc-rlimit
+                   ::error-report-webhook
+                   ::default-executor-parallelism
+                   ::scheduled-executor-parallelism
+                   ::worker-default-parallelism
+                   ::worker-webhook-parallelism
+                   ::file-change-snapshot-every
+                   ::file-change-snapshot-timeout
+                   ::user-feedback-destination
+                   ::github-client-id
+                   ::github-client-secret
+                   ::gitlab-base-uri
+                   ::gitlab-client-id
+                   ::gitlab-client-secret
+                   ::google-client-id
+                   ::google-client-secret
+                   ::oidc-client-id
+                   ::oidc-client-secret
+                   ::oidc-user-info-source
+                   ::oidc-base-uri
+                   ::oidc-token-uri
+                   ::oidc-auth-uri
+                   ::oidc-user-uri
+                   ::oidc-jwks-uri
+                   ::oidc-scopes
+                   ::oidc-roles-attr
+                   ::oidc-email-attr
+                   ::oidc-name-attr
+                   ::oidc-roles
+                   ::host
+                   ::http-server-host
+                   ::http-server-port
+                   ::http-server-max-body-size
+                   ::http-server-max-multipart-body-size
+                   ::http-server-io-threads
+                   ::http-server-worker-threads
+                   ::ldap-attrs-email
+                   ::ldap-attrs-fullname
+                   ::ldap-attrs-username
+                   ::ldap-base-dn
+                   ::ldap-bind-dn
+                   ::ldap-bind-password
+                   ::ldap-host
+                   ::ldap-port
+                   ::ldap-ssl
+                   ::ldap-starttls
+                   ::ldap-user-query
+                   ::local-assets-uri
+                   ::media-max-file-size
+                   ::profile-bounce-max-age
+                   ::profile-bounce-threshold
+                   ::profile-complaint-max-age
+                   ::profile-complaint-threshold
+                   ::public-uri

-    [:github-client-id {:optional true} :string]
-    [:github-client-secret {:optional true} :string]
-    [:gitlab-base-uri {:optional true} :string]
-    [:gitlab-client-id {:optional true} :string]
-    [:gitlab-client-secret {:optional true} :string]
-    [:google-client-id {:optional true} :string]
-    [:google-client-secret {:optional true} :string]
-    [:oidc-client-id {:optional true} :string]
-    [:oidc-user-info-source {:optional true} :keyword]
-    [:oidc-client-secret {:optional true} :string]
-    [:oidc-base-uri {:optional true} :string]
-    [:oidc-token-uri {:optional true} :string]
-    [:oidc-auth-uri {:optional true} :string]
-    [:oidc-user-uri {:optional true} :string]
-    [:oidc-jwks-uri {:optional true} :string]
-    [:oidc-scopes {:optional true} [::sm/set :string]]
-    [:oidc-roles {:optional true} [::sm/set :string]]
-    [:oidc-roles-attr {:optional true} :string]
-    [:oidc-email-attr {:optional true} :string]
-    [:oidc-name-attr {:optional true} :string]
+                   ::quotes-teams-per-profile
+                   ::quotes-access-tokens-per-profile
+                   ::quotes-projects-per-team
+                   ::quotes-invitations-per-team
+                   ::quotes-profiles-per-team
+                   ::quotes-files-per-project
+                   ::quotes-files-per-team
+                   ::quotes-font-variants-per-team
+                   ::quotes-comment-threads-per-file
+                   ::quotes-comments-per-file

-    [:ldap-attrs-email {:optional true} :string]
-    [:ldap-attrs-fullname {:optional true} :string]
-    [:ldap-attrs-username {:optional true} :string]
-    [:ldap-base-dn {:optional true} :string]
-    [:ldap-bind-dn {:optional true} :string]
-    [:ldap-bind-password {:optional true} :string]
-    [:ldap-host {:optional true} :string]
-    [:ldap-port {:optional true} ::sm/int]
-    [:ldap-ssl {:optional true} ::sm/boolean]
-    [:ldap-starttls {:optional true} ::sm/boolean]
-    [:ldap-user-query {:optional true} :string]
+                   ::redis-uri
+                   ::registration-domain-whitelist
+                   ::rpc-rlimit-config
+                   ::rpc-climit-config

-    [:profile-bounce-max-age {:optional true} ::dt/duration]
-    [:profile-bounce-threshold {:optional true} ::sm/int]
-    [:profile-complaint-max-age {:optional true} ::dt/duration]
-    [:profile-complaint-threshold {:optional true} ::sm/int]
+                   ::semaphore-process-font
+                   ::semaphore-process-image
+                   ::semaphore-update-file
+                   ::semaphore-auth

-    [:redis-uri {:optional true} :string]
+                   ::smtp-default-from
+                   ::smtp-default-reply-to
+                   ::smtp-host
+                   ::smtp-password
+                   ::smtp-port
+                   ::smtp-ssl
+                   ::smtp-tls
+                   ::smtp-username

-    [:email-domain-blacklist {:optional true} ::fs/path]
-    [:email-domain-whitelist {:optional true} ::fs/path]
+                   ::urepl-host
+                   ::urepl-port
+                   ::prepl-host
+                   ::prepl-port

-    [:smtp-default-from {:optional true} :string]
-    [:smtp-default-reply-to {:optional true} :string]
-    [:smtp-host {:optional true} :string]
-    [:smtp-password {:optional true} [:maybe :string]]
-    [:smtp-port {:optional true} ::sm/int]
-    [:smtp-ssl {:optional true} ::sm/boolean]
-    [:smtp-tls {:optional true} ::sm/boolean]
-    [:smtp-username {:optional true} [:maybe :string]]
-
-    [:urepl-host {:optional true} :string]
-    [:urepl-port {:optional true} ::sm/int]
-    [:prepl-host {:optional true} :string]
-    [:prepl-port {:optional true} ::sm/int]
-
-    [:media-directory {:optional true} :string] ;; REVIEW
-    [:media-uri {:optional true} :string]
-    [:assets-path {:optional true} :string]
-
-    ;; Legacy, will be removed in 2.5
-    [:assets-storage-backend {:optional true} :keyword]
-    [:storage-assets-fs-directory {:optional true} :string]
-    [:storage-assets-s3-bucket {:optional true} :string]
-    [:storage-assets-s3-region {:optional true} :keyword]
-    [:storage-assets-s3-endpoint {:optional true} :string]
-    [:storage-assets-s3-io-threads {:optional true} ::sm/int]
-
-    [:objects-storage-backend {:optional true} :keyword]
-    [:objects-storage-fs-directory {:optional true} :string]
-    [:objects-storage-s3-bucket {:optional true} :string]
-    [:objects-storage-s3-region {:optional true} :keyword]
-    [:objects-storage-s3-endpoint {:optional true} :string]
-    [:objects-storage-s3-io-threads {:optional true} ::sm/int]]))
+                   ::assets-storage-backend
+                   ::storage-assets-fs-directory
+                   ::storage-assets-s3-bucket
+                   ::storage-assets-s3-region
+                   ::storage-assets-s3-endpoint
+                   ::storage-assets-s3-io-threads
+                   ::telemetry-enabled
+                   ::telemetry-uri
+                   ::telemetry-referer
+                   ::telemetry-with-taiga
+                   ::tenant]))

 (def default-flags
  [:enable-backend-api-doc
@@ -252,22 +359,20 @@
     {}
     env)))

-(def decode-config
-  (sm/decoder schema:config sm/string-transformer))
-
-(def validate-config
-  (sm/validator schema:config))
-
-(def explain-config
-  (sm/explainer schema:config))
-
-(defn read-config
-  "Reads the configuration from enviroment variables and decodes all
-  known values."
-  [& {:keys [prefix default] :or {prefix "penpot"}}]
-  (->> (read-env prefix)
-       (merge default)
-       (decode-config)))
+(defn- read-config
+  []
+  (try
+    (->> (read-env "penpot")
+         (merge defaults)
+         (us/conform ::config))
+    (catch Throwable e
+      (when (ex/error? e)
+        (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;")
+        (println "Error on validating configuration:")
+        (println (some-> e ex-data ex/explain))
+        (println (ex/explain (ex-data e)))
+        (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"))
+      (throw e))))

 (def version
  (v/parse (or (some-> (io/resource "version.txt")
@@ -275,28 +380,10 @@
                       (str/trim))
               "%version%")))

-(defonce ^:dynamic config (read-config :default default))
+(defonce ^:dynamic config (read-config))
 (defonce ^:dynamic flags (parse-flags config))

-(defn validate!
-  "Validate the currently loaded configuration data."
-  [& {:keys [exit-on-error?] :or {exit-on-error? true}}]
-  (if (validate-config config)
-    true
-    (let [explain (explain-config config)]
-      (println "Error on validating configuration:")
-      (sm/pretty-explain explain
-                         :variant ::sm/schemaless-explain
-                         :message "Configuration Validation Error")
-      (flush)
-      (if exit-on-error?
-        (System/exit -1)
-        (ex/raise :type :validation
-                  :code :config-validaton
-                  ::sm/explain explain)))))
-
-(defn get-deletion-delay
-  []
+(def deletion-delay
  (or (c/get config :deletion-delay)
      (dt/duration {:days 7})))

--- a/backend/src/app/db.clj
+++ b/backend/src/app/db.clj
@@ -153,7 +153,7 @@
 (s/def ::conn some?)
 (s/def ::nilable-pool (s/nilable ::pool))
 (s/def ::pool pool?)
-(s/def ::connectable some?)
+(s/def ::pool-or-conn some?)

 (defn closed?
  [pool]
@@ -407,7 +407,6 @@
      (ex/raise :type :not-found
                :code :object-not-found
                :table table
-                :params params
                :hint "database object not found"))
    row))

--- a/backend/src/app/email.clj
+++ b/backend/src/app/email.clj
@@ -7,18 +7,14 @@
 (ns app.email
  "Main api for send emails."
  (:require
-   [app.common.data.macros :as dm]
   [app.common.exceptions :as ex]
   [app.common.logging :as l]
   [app.common.pprint :as pp]
-   [app.common.schema :as sm]
   [app.common.spec :as us]
   [app.config :as cf]
   [app.db :as db]
   [app.db.sql :as sql]
   [app.email.invite-to-team :as-alias email.invite-to-team]
-   [app.email.join-team :as-alias email.join-team]
-   [app.email.request-team-access :as-alias email.request-team-access]
   [app.metrics :as mtx]
   [app.util.template :as tmpl]
   [app.worker :as wrk]
@@ -153,27 +149,9 @@
    "mail.smtp.timeout" timeout
    "mail.smtp.connectiontimeout" timeout}))

-(def ^:private schema:smtp-config
-  [:map
-   [::username {:optional true} :string]
-   [::password {:optional true} :string]
-   [::tls {:optional true} ::sm/boolean]
-   [::ssl {:optional true} ::sm/boolean]
-   [::host {:optional true} :string]
-   [::port {:optional true} ::sm/int]
-   [::default-from {:optional true} :string]
-   [::default-reply-to {:optional true} :string]])
-
-(def valid-smtp-config?
-  (sm/check-fn schema:smtp-config))
-
 (defn- create-smtp-session
  ^Session
  [cfg]
-  (dm/assert!
-   "expected valid smtp config"
-   (valid-smtp-config? cfg))
-
  (let [props (opts->props cfg)]
    (Session/getInstance props)))

@@ -284,21 +262,44 @@
  (let [email (if factory
                (factory context)
                (dissoc context ::conn))]
-    (wrk/submit! {::wrk/task :sendmail
-                  ::wrk/delay 0
-                  ::wrk/max-retries 4
-                  ::wrk/priority 200
-                  ::db/conn conn
-                  ::wrk/params email})))
+    (wrk/submit! (merge
+                  {::wrk/task :sendmail
+                   ::wrk/delay 0
+                   ::wrk/max-retries 4
+                   ::wrk/priority 200
+                   ::wrk/conn conn}
+                  email))))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SENDMAIL FN / TASK HANDLER
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+(s/def ::username ::cf/smtp-username)
+(s/def ::password ::cf/smtp-password)
+(s/def ::tls ::cf/smtp-tls)
+(s/def ::ssl ::cf/smtp-ssl)
+(s/def ::host ::cf/smtp-host)
+(s/def ::port ::cf/smtp-port)
+(s/def ::default-reply-to ::cf/smtp-default-reply-to)
+(s/def ::default-from ::cf/smtp-default-from)
+
+(s/def ::smtp-config
+  (s/keys :opt [::username
+                ::password
+                ::tls
+                ::ssl
+                ::host
+                ::port
+                ::default-from
+                ::default-reply-to]))
+
 (declare send-to-logger!)

 (s/def ::sendmail fn?)

+(defmethod ig/pre-init-spec ::sendmail [_]
+  (s/spec ::smtp-config))
+
 (defmethod ig/init-key ::sendmail
  [_ cfg]
  (fn [params]
@@ -306,8 +307,6 @@
      (let [session (create-smtp-session cfg)]
        (with-open [transport (.getTransport session (if (::ssl cfg) "smtps" "smtp"))]
          (.connect ^Transport transport
-                    ^String (::host cfg)
-                    ^String (::port cfg)
                    ^String (::username cfg)
                    ^String (::password cfg))

@@ -315,13 +314,15 @@
            (l/dbg :hint "sendmail"
                   :id (:id params)
                   :to (:to params)
-                   :subject (str/trim (:subject params)))
+                   :subject (str/trim (:subject params))
+                   :body (str/join "," (map :type (:body params))))

            (.sendMessage ^Transport transport
                          ^MimeMessage message
                          (.getAllRecipients message))))))

-    (when (contains? cf/flags :log-emails)
+    (when (or (contains? cf/flags :log-emails)
+              (not (contains? cf/flags :smtp)))
      (send-to-logger! cfg params))))

 (defmethod ig/pre-init-spec ::handler [_]
@@ -399,79 +400,6 @@
  "Teams member invitation email."
  (template-factory ::invite-to-team))

-
-(s/def ::email.join-team/invited-by ::us/string)
-(s/def ::email.join-team/team ::us/string)
-(s/def ::email.join-team/team-id ::us/uuid)
-
-(s/def ::join-team
-  (s/keys :req-un [::email.join-team/invited-by
-                   ::email.join-team/team-id
-                   ::email.join-team/team]))
-
-(def join-team
-  "Teams member joined after request email."
-  (template-factory ::join-team))
-
-(s/def ::email.request-team-access/requested-by ::us/string)
-(s/def ::email.request-team-access/requested-by-email ::us/string)
-(s/def ::email.request-team-access/team-name ::us/string)
-(s/def ::email.request-team-access/team-id ::us/uuid)
-(s/def ::email.request-team-access/file-name ::us/string)
-(s/def ::email.request-team-access/file-id ::us/uuid)
-(s/def ::email.request-team-access/page-id ::us/uuid)
-
-(s/def ::request-file-access
-  (s/keys :req-un [::email.request-team-access/requested-by
-                   ::email.request-team-access/requested-by-email
-                   ::email.request-team-access/team-name
-                   ::email.request-team-access/team-id
-                   ::email.request-team-access/file-name
-                   ::email.request-team-access/file-id
-                   ::email.request-team-access/page-id]))
-
-(def request-file-access
-  "File access request email."
-  (template-factory ::request-file-access))
-
-
-(s/def ::request-file-access-yourpenpot
-  (s/keys :req-un [::email.request-team-access/requested-by
-                   ::email.request-team-access/requested-by-email
-                   ::email.request-team-access/team-name
-                   ::email.request-team-access/team-id
-                   ::email.request-team-access/file-name
-                   ::email.request-team-access/file-id
-                   ::email.request-team-access/page-id]))
-
-(def request-file-access-yourpenpot
-  "File access on Your Penpot request email."
-  (template-factory ::request-file-access-yourpenpot))
-
-(s/def ::request-file-access-yourpenpot-view
-  (s/keys :req-un [::email.request-team-access/requested-by
-                   ::email.request-team-access/requested-by-email
-                   ::email.request-team-access/team-name
-                   ::email.request-team-access/team-id
-                   ::email.request-team-access/file-name
-                   ::email.request-team-access/file-id
-                   ::email.request-team-access/page-id]))
-
-(def request-file-access-yourpenpot-view
-  "File access on Your Penpot view mode request email."
-  (template-factory ::request-file-access-yourpenpot-view))
-
-(s/def ::request-team-access
-  (s/keys :req-un [::email.request-team-access/requested-by
-                   ::email.request-team-access/requested-by-email
-                   ::email.request-team-access/team-name
-                   ::email.request-team-access/team-id]))
-
-(def request-team-access
-  "Team access request email."
-  (template-factory ::request-team-access))
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; BOUNCE/COMPLAINS HELPERS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -521,11 +449,3 @@
                                            {:email email :type "bounce"}
                                            {:limit 10}))]
     (>= (count reports) threshold))))
-
-(defn has-reports?
-  ([conn email] (has-reports? conn email nil))
-  ([conn email {:keys [threshold] :or {threshold 1}}]
-   (let [reports (db/exec! conn (sql/select :global-complaint-report
-                                            {:email email}
-                                            {:limit 10}))]
-     (>= (count reports) threshold))))
--- a/backend/src/app/email/blacklist.clj
+++ b/backend/src/app/email/blacklist.clj
@@ -1,47 +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.email.blacklist
-  "Email blacklist provider"
-  (:refer-clojure :exclude [contains?])
-  (:require
-   [app.common.logging :as l]
-   [app.config :as cf]
-   [app.email :as-alias email]
-   [clojure.core :as c]
-   [clojure.java.io :as io]
-   [cuerdas.core :as str]
-   [integrant.core :as ig]))
-
-(defmethod ig/init-key ::email/blacklist
-  [_ _]
-  (when (c/contains? cf/flags :email-blacklist)
-    (try
-      (let [path   (cf/get :email-domain-blacklist)
-            result (with-open [reader (io/reader path)]
-                     (reduce (fn [result line]
-                               (if (str/starts-with? line "#")
-                                 result
-                                 (conj result (-> line str/trim str/lower))))
-                             #{}
-                             (line-seq reader)))]
-        (l/inf :hint "initializing email blacklist" :domains (count result))
-        (not-empty result))
-
-      (catch Throwable cause
-        (l/wrn :hint "unexpected exception on initializing email blacklist"
-               :cause cause)))))
-
-(defn contains?
-  "Check if email is in the blacklist."
-  [{:keys [::email/blacklist]} email]
-  (let [[_ domain] (str/split email "@" 2)]
-    (c/contains? blacklist (str/lower domain))))
-
-(defn enabled?
-  "Check if the blacklist is enabled"
-  [{:keys [::email/blacklist]}]
-  (some? blacklist))
--- a/backend/src/app/email/whitelist.clj
+++ b/backend/src/app/email/whitelist.clj
@@ -1,59 +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.email.whitelist
-  "Email whitelist provider"
-  (:refer-clojure :exclude [contains?])
-  (:require
-   [app.common.logging :as l]
-   [app.config :as cf]
-   [app.email :as-alias email]
-   [clojure.core :as c]
-   [clojure.java.io :as io]
-   [cuerdas.core :as str]
-   [datoteka.fs :as fs]
-   [integrant.core :as ig]))
-
-(defn- read-whitelist
-  [path]
-  (when (and path (fs/exists? path))
-    (try
-      (with-open [reader (io/reader path)]
-        (reduce (fn [result line]
-                  (if (str/starts-with? line "#")
-                    result
-                    (conj result (-> line str/trim str/lower))))
-                #{}
-                (line-seq reader)))
-
-      (catch Throwable cause
-        (l/wrn :hint "unexpected exception on reading email whitelist"
-               :cause cause)))))
-
-(defmethod ig/init-key ::email/whitelist
-  [_ _]
-  (let [whitelist (or (cf/get :registration-domain-whitelist) #{})
-        whitelist (if (c/contains? cf/flags :email-whitelist)
-                    (into whitelist (read-whitelist (cf/get :email-domain-whitelist)))
-                    whitelist)
-        whitelist (not-empty whitelist)]
-
-
-    (when whitelist
-      (l/inf :hint "initializing email whitelist" :domains (count whitelist)))
-
-    whitelist))
-
-(defn contains?
-  "Check if email is in the whitelist."
-  [{:keys [::email/whitelist]} email]
-  (let [[_ domain] (str/split email "@" 2)]
-    (c/contains? whitelist (str/lower domain))))
-
-(defn enabled?
-  "Check if the whitelist is enabled"
-  [{:keys [::email/whitelist]}]
-  (some? whitelist))
--- a/backend/src/app/features/components_v2.clj
+++ b/backend/src/app/features/components_v2.clj
@@ -12,6 +12,7 @@
   [app.common.files.changes :as cp]
   [app.common.files.changes-builder :as fcb]
   [app.common.files.helpers :as cfh]
+   [app.common.files.libraries-helpers :as cflh]
   [app.common.files.migrations :as fmg]
   [app.common.files.shapes-helpers :as cfsh]
   [app.common.files.validate :as cfv]
@@ -22,7 +23,6 @@
   [app.common.geom.shapes :as gsh]
   [app.common.geom.shapes.path :as gshp]
   [app.common.logging :as l]
-   [app.common.logic.libraries :as cll]
   [app.common.math :as mth]
   [app.common.schema :as sm]
   [app.common.svg :as csvg]
@@ -62,7 +62,6 @@
   [datoteka.io :as io]
   [promesa.util :as pu]))

-
 (def ^:dynamic *stats*
  "A dynamic var for setting up state for collect stats globally."
  nil)
@@ -114,7 +113,7 @@
  (sm/lazy-validator ::ctc/color))

 (def valid-fill?
-  (sm/lazy-validator cts/schema:fill))
+  (sm/lazy-validator ::cts/fill))

 (def valid-stroke?
  (sm/lazy-validator ::cts/stroke))
@@ -135,10 +134,10 @@
  (sm/lazy-validator ::ctc/rgb-color))

 (def valid-shape-points?
-  (sm/lazy-validator cts/schema:points))
+  (sm/lazy-validator ::cts/points))

 (def valid-image-attrs?
-  (sm/lazy-validator cts/schema:image-attrs))
+  (sm/lazy-validator ::cts/image-attrs))

 (def valid-column-grid-params?
  (sm/lazy-validator ::ctg/column-params))
@@ -1451,15 +1450,16 @@
                page
                (cons shape children))

-        [_ _ changes]
-        (cll/generate-add-component changes
-                                    [shape]
-                                    (:objects page)
-                                    (:id page)
-                                    file-id
-                                    true
-                                    nil
-                                    cfsh/prepare-create-artboard-from-selection)]
+        [_ _ changes2]
+        (cflh/generate-add-component nil
+                                     [shape]
+                                     (:objects page)
+                                     (:id page)
+                                     file-id
+                                     true
+                                     nil
+                                     cfsh/prepare-create-artboard-from-selection)
+        changes (fcb/concat-changes changes changes2)]

    (shape-cb shape)
    (:redo-changes changes)))
@@ -1743,7 +1743,7 @@
               :validate validate?
               :skip-on-graphic-error skip-on-graphic-error?)

-        (db/tx-run! system
+        (db/tx-run! (update system ::sto/storage media/configure-assets-storage)
                    (fn [system]
                      (binding [*system* system]
                        (when (string? label)
--- a/backend/src/app/features/fdata.clj
+++ b/backend/src/app/features/fdata.clj
@@ -12,19 +12,10 @@
   [app.common.logging :as l]
   [app.db :as db]
   [app.db.sql :as-alias sql]
-   [app.storage :as sto]
   [app.util.blob :as blob]
   [app.util.objects-map :as omap]
   [app.util.pointer-map :as pmap]))

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; OFFLOAD
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn offloaded?
-  [file]
-  (= "objects-storage" (:data-backend file)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; OBJECTS-MAP
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -64,45 +55,31 @@
 ;; POINTER-MAP
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-(defn get-file-data
-  "Get file data given a file instance."
-  [system file]
-  (if (offloaded? file)
-    (let [storage (sto/resolve system ::db/reuse-conn true)]
-      (->> (sto/get-object storage (:data-ref-id file))
-           (sto/get-object-bytes storage)))
-    (:data file)))
-
-(defn resolve-file-data
-  [system file]
-  (let [data (get-file-data system file)]
-    (assoc file :data data)))
-
 (defn load-pointer
  "A database loader pointer helper"
  [system file-id id]
-  (let [fragment (db/get* system :file-data-fragment
-                          {:id id :file-id file-id}
-                          {::sql/columns [:data :data-backend :data-ref-id :id]})]
+  (let [{:keys [content]} (db/get system :file-data-fragment
+                                  {:id id :file-id file-id}
+                                  {::sql/columns [:content]
+                                   ::db/check-deleted false})]

    (l/trc :hint "load pointer"
           :file-id (str file-id)
           :id (str id)
-           :found (some? fragment))
+           :found (some? content))

-    (when-not fragment
+    (when-not content
      (ex/raise :type :internal
                :code :fragment-not-found
                :hint "fragment not found"
                :file-id file-id
                :fragment-id id))

-    (let [data (get-file-data system fragment)]
-      ;; FIXME: conditional thread scheduling for decoding big objects
-      (blob/decode data))))
+    (blob/decode content)))

 (defn persist-pointers!
-  "Persist all currently tracked pointer objects"
+  "Given a database connection and the final file-id, persist all
+  pointers to the underlying storage (the database)."
  [system file-id]
  (let [conn (db/get-connection system)]
    (doseq [[id item] @pmap/*tracked*]
@@ -112,7 +89,7 @@
          (db/insert! conn :file-data-fragment
                      {:id id
                       :file-id file-id
-                       :data content}))))))
+                       :content content}))))))

 (defn process-pointers
  "Apply a function to all pointers on the file. Usuly used for
--- a/backend/src/app/http.clj
+++ b/backend/src/app/http.clj
@@ -114,7 +114,7 @@
              (partial not-found-handler request)))

          (on-error [cause request]
-            (let [{:keys [::rres/body] :as response} (errors/handle cause request)]
+            (let [{:keys [body] :as response} (errors/handle cause request)]
              (cond-> response
                (map? body)
                (-> (update ::rres/headers assoc "content-type" "application/transit+json")
@@ -151,9 +151,9 @@
                      [mw/params]
                      [mw/format-response]
                      [mw/parse-request]
-                      [mw/errors errors/handle]
                      [session/soft-auth cfg]
                      [actoken/soft-auth cfg]
+                      [mw/errors errors/handle]
                      [mw/restrict-methods]]}

     (::mtx/routes cfg)
--- a/backend/src/app/http/assets.clj
+++ b/backend/src/app/http/assets.clj
@@ -57,10 +57,11 @@
 (defn- serve-object
  "Helper function that returns the appropriate response depending on
  the storage object backend type."
-  [cfg {:keys [backend] :as obj}]
-  (case backend
-    (:s3 :assets-s3) (serve-object-from-s3 cfg obj)
-    (:fs :assets-fs) (serve-object-from-fs cfg obj)))
+  [{:keys [::sto/storage] :as cfg} {:keys [backend] :as obj}]
+  (let [backend (sto/resolve-backend storage backend)]
+    (case (::sto/type backend)
+      :s3 (serve-object-from-s3 cfg obj)
+      :fs (serve-object-from-fs cfg obj))))

 (defn objects-handler
  "Handler that servers storage objects by id."
--- a/backend/src/app/http/awsns.clj
+++ b/backend/src/app/http/awsns.clj
@@ -9,7 +9,6 @@
  (:require
   [app.common.exceptions :as ex]
   [app.common.logging :as l]
-   [app.common.pprint :as pp]
   [app.db :as db]
   [app.db.sql :as sql]
   [app.http.client :as http]
@@ -17,10 +16,10 @@
   [app.setup :as-alias setup]
   [app.tokens :as tokens]
   [app.worker :as-alias wrk]
-   [clojure.data.json :as j]
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
   [integrant.core :as ig]
+   [jsonista.core :as j]
   [promesa.exec :as px]
   [ring.request :as rreq]
   [ring.response :as-alias rres]))
@@ -137,110 +136,83 @@

 (defn- parse-json
  [v]
-  (try
-    (j/read-str v)
-    (catch Throwable cause
-      (l/wrn :hint "unable to decode request body"
-             :cause cause))))
+  (ex/ignoring
+   (j/read-value v)))

 (defn- register-bounce-for-profile
  [{:keys [::db/pool]} {:keys [type kind profile-id] :as report}]
  (when (= kind "permanent")
-    (try
-      (db/insert! pool :profile-complaint-report
+    (db/with-atomic [conn pool]
+      (db/insert! conn :profile-complaint-report
                  {:profile-id profile-id
                   :type (name type)
                   :content (db/tjson report)})

-      (catch Throwable cause
-        (l/warn :hint "unable to persist profile complaint"
-                :cause cause)))
+      ;; TODO: maybe also try to find profiles by mail and if exists
+      ;; register profile reports for them?
+      (doseq [recipient (:recipients report)]
+        (db/insert! conn :global-complaint-report
+                    {:email (:email recipient)
+                     :type (name type)
+                     :content (db/tjson report)}))

-    (doseq [recipient (:recipients report)]
-      (db/insert! pool :global-complaint-report
-                  {:email (:email recipient)
-                   :type (name type)
-                   :content (db/tjson report)}))
-
-    (let [profile (db/exec-one! pool (sql/select :profile {:id profile-id}))]
-      (when (some #(= (:email profile) (:email %)) (:recipients report))
-        ;; If the report matches the profile email, this means that
-        ;; the report is for itself, can be caused when a user
-        ;; registers with an invalid email or the user email is
-        ;; permanently rejecting receiving the email. In this case we
-        ;; have no option to mark the user as muted (and in this case
-        ;; the profile will be also inactive.
-
-        (l/inf :hint "mark profile: muted"
-               :profile-id (str (:id profile))
-               :email (:email profile)
-               :reason "bounce report"
-               :report-id (:feedback-id report))
-
-        (db/update! pool :profile
-                    {:is-muted true}
-                    {:id profile-id}
-                    {::db/return-keys false})))))
+      (let [profile (db/exec-one! conn (sql/select :profile {:id profile-id}))]
+        (when (some #(= (:email profile) (:email %)) (:recipients report))
+          ;; If the report matches the profile email, this means that
+          ;; the report is for itself, can be caused when a user
+          ;; registers with an invalid email or the user email is
+          ;; permanently rejecting receiving the email. In this case we
+          ;; have no option to mark the user as muted (and in this case
+          ;; the profile will be also inactive.
+          (db/update! conn :profile
+                      {:is-muted true}
+                      {:id profile-id}))))))

 (defn- register-complaint-for-profile
  [{:keys [::db/pool]} {:keys [type profile-id] :as report}]
-
-  (try
-    (db/insert! pool :profile-complaint-report
+  (db/with-atomic [conn pool]
+    (db/insert! conn :profile-complaint-report
                {:profile-id profile-id
                 :type (name type)
                 :content (db/tjson report)})
-    (catch Throwable cause
-      (l/warn :hint "unable to persist profile complaint"
-              :cause cause)))

-  ;; TODO: maybe also try to find profiles by email and if exists
-  ;; register profile reports for them?
-  (doseq [email (:recipients report)]
-    (db/insert! pool :global-complaint-report
-                {:email email
-                 :type (name type)
-                 :content (db/tjson report)}))
+    ;; TODO: maybe also try to find profiles by email and if exists
+    ;; register profile reports for them?
+    (doseq [email (:recipients report)]
+      (db/insert! conn :global-complaint-report
+                  {:email email
+                   :type (name type)
+                   :content (db/tjson report)}))

-  (let [profile (db/exec-one! pool (sql/select :profile {:id profile-id}))]
-    (when (some #(= % (:email profile)) (:recipients report))
-      ;; If the report matches the profile email, this means that
-      ;; the report is for itself, rare case but can happen; In this
-      ;; case just mark profile as muted (very rare case).
-      (l/inf :hint "mark profile: muted"
-             :profile-id (str (:id profile))
-             :email (:email profile)
-             :reason "complaint report"
-             :report-id (:feedback-id report))
-
-      (db/update! pool :profile
-                  {:is-muted true}
-                  {:id profile-id}
-                  {::db/return-keys false}))))
+    (let [profile (db/exec-one! conn (sql/select :profile {:id profile-id}))]
+      (when (some #(= % (:email profile)) (:recipients report))
+        ;; If the report matches the profile email, this means that
+        ;; the report is for itself, rare case but can happen; In this
+        ;; case just mark profile as muted (very rare case).
+        (db/update! conn :profile
+                    {:is-muted true}
+                    {:id profile-id})))))

 (defn- process-report
  [cfg {:keys [type profile-id] :as report}]
+  (l/trace :action "processing report" :report (pr-str report))
  (cond
    ;; In this case we receive a bounce/complaint notification without
    ;; confirmed identity, we just emit a warning but do nothing about
    ;; it because this is not a normal case. All notifications should
    ;; come with profile identity.
    (nil? profile-id)
-    (l/wrn :hint "not-identified report"
-           ::l/body (pp/pprint-str report {:length 40 :level 6}))
+    (l/warn :msg "a notification without identity received from AWS"
+            :report (pr-str report))

    (= "bounce" type)
-    (do
-      (l/trc :hint "bounce report"
-             ::l/body (pp/pprint-str report {:length 40 :level 6}))
-      (register-bounce-for-profile cfg report))
+    (register-bounce-for-profile cfg report)

    (= "complaint" type)
-    (do
-      (l/trc :hint "complaint report"
-             ::l/body (pp/pprint-str report {:length 40 :level 6}))
-      (register-complaint-for-profile cfg report))
+    (register-complaint-for-profile cfg report)

    :else
-    (l/wrn :hint "unrecognized report"
-           ::l/body (pp/pprint-str report {:length 20 :level 4}))))
+    (l/warn :msg "unrecognized report received from AWS"
+            :report (pr-str report))))
+
+
--- a/backend/src/app/http/client.clj
+++ b/backend/src/app/http/client.clj
@@ -54,10 +54,9 @@
  "A convencience toplevel function for gradual migration to a new API
  convention."
  ([cfg-or-client request]
-   (let [client  (resolve-client cfg-or-client)
-         request (update request :uri str)]
+   (let [client (resolve-client cfg-or-client)]
     (send! client request {:sync? true})))
  ([cfg-or-client request options]
-   (let [client  (resolve-client cfg-or-client)
-         request (update request :uri str)]
+   (let [client (resolve-client cfg-or-client)]
     (send! client request (merge {:sync? true} options)))))
+
--- a/backend/src/app/http/debug.clj
+++ b/backend/src/app/http/debug.clj
@@ -47,7 +47,7 @@
  {::rres/status  200
   ::rres/headers {"content-type" "text/html"}
   ::rres/body    (-> (io/resource "app/templates/debug.tmpl")
-                      (tmpl/render {:version (:full cf/version)}))})
+                      (tmpl/render {}))})

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; FILE CHANGES
--- a/backend/src/app/http/errors.clj
+++ b/backend/src/app/http/errors.clj
@@ -14,28 +14,32 @@
   [app.http :as-alias http]
   [app.http.access-token :as-alias actoken]
   [app.http.session :as-alias session]
-   [app.util.inet :as inet]
   [clojure.spec.alpha :as s]
+   [cuerdas.core :as str]
   [ring.request :as rreq]
   [ring.response :as rres]))

+(defn- parse-client-ip
+  [request]
+  (or (some-> (rreq/get-header request "x-forwarded-for") (str/split ",") first)
+      (rreq/get-header request "x-real-ip")
+      (rreq/remote-addr request)))
+
 (defn request->context
  "Extracts error report relevant context data from request."
  [request]
  (let [claims (-> {}
                   (into (::session/token-claims request))
                   (into (::actoken/token-claims request)))]
-
    {:request/path       (:path request)
     :request/method     (:method request)
     :request/params     (:params request)
     :request/user-agent (rreq/get-header request "user-agent")
-     :request/ip-addr    (inet/parse-request request)
+     :request/ip-addr    (parse-client-ip request)
     :request/profile-id (:uid claims)
     :version/frontend   (or (rreq/get-header request "x-frontend-version") "unknown")
     :version/backend    (:full cf/version)}))

-
 (defmulti handle-error
  (fn [cause _ _]
    (-> cause ex-data :type)))
--- a/backend/src/app/http/middleware.clj
+++ b/backend/src/app/http/middleware.clj
@@ -7,19 +7,19 @@
 (ns app.http.middleware
  (:require
   [app.common.exceptions :as ex]
-   [app.common.json :as json]
   [app.common.logging :as l]
-   [app.common.schema :as-alias sm]
   [app.common.transit :as t]
   [app.config :as cf]
-   [app.http.errors :as errors]
-   [app.util.pointer-map :as pmap]
+   [app.util.json :as json]
   [cuerdas.core :as str]
   [ring.request :as rreq]
   [ring.response :as rres]
   [yetti.adapter :as yt]
   [yetti.middleware :as ymw])
  (:import
+   com.fasterxml.jackson.core.JsonParseException
+   com.fasterxml.jackson.core.io.JsonEOFException
+   com.fasterxml.jackson.databind.exc.MismatchedInputException
   io.undertow.server.RequestTooBigException
   java.io.InputStream
   java.io.OutputStream))
@@ -34,12 +34,11 @@
  {:name ::params
   :compile (constantly ymw/wrap-params)})

-(defn- get-reader
-  ^java.io.BufferedReader
-  [request]
-  (let [^InputStream body (rreq/body request)]
-    (java.io.BufferedReader.
-     (java.io.InputStreamReader. body))))
+(def ^:private json-mapper
+  (json/mapper
+   {:encode-key-fn str/camel
+    :decode-key-fn (comp keyword str/kebab)
+    :pretty true}))

 (defn wrap-parse-request
  [handler]
@@ -54,8 +53,8 @@
                        (update :params merge params))))

                (str/starts-with? header "application/json")
-                (with-open [reader (get-reader request)]
-                  (let [params (json/read reader :key-fn json/read-kebab-key)]
+                (with-open [^InputStream is (rreq/body request)]
+                  (let [params (json/decode is json-mapper)]
                    (-> request
                        (assoc :body-params params)
                        (update :params merge params))))
@@ -63,33 +62,35 @@
                :else
                request)))

-          (handle-error [cause request]
+          (handle-error [cause]
            (cond
              (instance? RuntimeException cause)
              (if-let [cause (ex-cause cause)]
-                (handle-error cause request)
-                (errors/handle cause request))
+                (handle-error cause)
+                (throw cause))

              (instance? RequestTooBigException cause)
              (ex/raise :type :validation
                        :code :request-body-too-large
                        :hint (ex-message cause))

-              (instance? java.io.EOFException cause)
+              (or (instance? JsonEOFException cause)
+                  (instance? JsonParseException cause)
+                  (instance? MismatchedInputException cause))
              (ex/raise :type :validation
                        :code :malformed-json
                        :hint (ex-message cause)
                        :cause cause)

              :else
-              (errors/handle cause request)))]
+              (throw cause)))]

    (fn [request]
      (if (= (rreq/method request) :post)
-        (try
-          (-> request process-request handler)
-          (catch Throwable cause
-            (handle-error cause request)))
+        (let [request (ex/try! (process-request request))]
+          (if (ex/exception? request)
+            (handle-error request)
+            (handler request)))
        (handler request)))))

 (def parse-request
@@ -105,12 +106,6 @@

 (def ^:const buffer-size (:xnio/buffer-size yt/defaults))

-(defn- write-json-value
-  [_ val]
-  (if (pmap/pointer-map? val)
-    [(pmap/get-id val) (meta val)]
-    val))
-
 (defn wrap-format-response
  [handler]
  (letfn [(transit-streamable-body [data opts]
@@ -132,11 +127,9 @@
            (reify rres/StreamableResponseBody
              (-write-body-to-stream [_ _ output-stream]
                (try
-                  (let [encode (or (-> data meta :encode/json) identity)
-                        data   (encode data)]
-                    (with-open [^OutputStream bos (buffered-output-stream output-stream buffer-size)]
-                      (with-open [^java.io.OutputStreamWriter writer (java.io.OutputStreamWriter. bos)]
-                        (json/write writer data :key-fn json/write-camel-key :value-fn write-json-value))))
+                  (with-open [^OutputStream bos (buffered-output-stream output-stream buffer-size)]
+                    (json/write! bos data json-mapper))
+
                  (catch java.io.IOException _)
                  (catch Throwable cause
                    (binding [l/*context* {:value data}]
--- a/backend/src/app/http/session.clj
+++ b/backend/src/app/http/session.clj
@@ -10,7 +10,6 @@
   [app.common.data :as d]
   [app.common.logging :as l]
   [app.common.spec :as us]
-   [app.common.uri :as u]
   [app.config :as cf]
   [app.db :as db]
   [app.db.sql :as sql]
@@ -34,7 +33,7 @@

 ;; A cookie that we can use to check from other sites of the same
 ;; domain if a user is authenticated.
-(def default-auth-data-cookie-name "auth-data")
+(def default-authenticated-cookie-name "authenticated")

 ;; Default value for cookie max-age
 (def default-cookie-max-age (dt/duration {:days 7}))
@@ -134,9 +133,9 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 (declare ^:private assign-auth-token-cookie)
-(declare ^:private assign-auth-data-cookie)
+(declare ^:private assign-authenticated-cookie)
 (declare ^:private clear-auth-token-cookie)
-(declare ^:private clear-auth-data-cookie)
+(declare ^:private clear-authenticated-cookie)
 (declare ^:private gen-token)

 (defn create-fn
@@ -154,7 +153,7 @@
      (l/trace :hint "create" :profile-id (str profile-id))
      (-> response
          (assign-auth-token-cookie session)
-          (assign-auth-data-cookie session)))))
+          (assign-authenticated-cookie session)))))

 (defn delete-fn
  [{:keys [::manager]}]
@@ -168,7 +167,7 @@
          (assoc :status 204)
          (assoc :body nil)
          (clear-auth-token-cookie)
-          (clear-auth-data-cookie)))))
+          (clear-authenticated-cookie)))))

 (defn- gen-token
  [props {:keys [profile-id created-at]}]
@@ -230,7 +229,7 @@
        (let [session (update! manager session)]
          (-> response
              (assign-auth-token-cookie session)
-              (assign-auth-data-cookie session)))
+              (assign-authenticated-cookie session)))
        response))))

 (def soft-auth
@@ -263,11 +262,11 @@
                    :secure secure?}]
    (update response :cookies assoc name cookie)))

-(defn- assign-auth-data-cookie
-  [response {profile-id :profile-id updated-at :updated-at}]
+(defn- assign-authenticated-cookie
+  [response {updated-at :updated-at}]
  (let [max-age    (cf/get :auth-token-cookie-max-age default-cookie-max-age)
-        domain     (cf/get :auth-data-cookie-domain)
-        cname      default-auth-data-cookie-name
+        domain     (cf/get :authenticated-cookie-domain)
+        cname      (cf/get :authenticated-cookie-name "authenticated")

        created-at (or updated-at (dt/now))
        renewal    (dt/plus created-at default-renewal-max-age)
@@ -275,17 +274,14 @@

        comment    (str "Renewal at: " (dt/format-instant renewal :rfc1123))
        secure?    (contains? cf/flags :secure-session-cookies)
-        strict?    (contains? cf/flags :strict-session-cookies)
-        cors?      (contains? cf/flags :cors)

        cookie     {:domain domain
                    :expires expires
                    :path "/"
                    :comment comment
-                    :value (u/map->query-string {:profile-id profile-id})
-                    :same-site (if cors? :none (if strict? :strict :lax))
+                    :value true
+                    :same-site :strict
                    :secure secure?}]
-
    (cond-> response
      (string? domain)
      (update :cookies assoc cname cookie))))
@@ -295,10 +291,10 @@
  (let [cname (cf/get :auth-token-cookie-name default-auth-token-cookie-name)]
    (update response :cookies assoc cname {:path "/" :value "" :max-age 0})))

-(defn- clear-auth-data-cookie
+(defn- clear-authenticated-cookie
  [response]
-  (let [cname  default-auth-data-cookie-name
-        domain (cf/get :auth-data-cookie-domain)]
+  (let [cname  (cf/get :authenticated-cookie-name default-authenticated-cookie-name)
+        domain (cf/get :authenticated-cookie-domain)]
    (cond-> response
      (string? domain)
      (update :cookies assoc cname {:domain domain :path "/" :value "" :max-age 0}))))
--- a/backend/src/app/http/sse.clj
+++ b/backend/src/app/http/sse.clj
@@ -60,12 +60,7 @@
                         (try
                           (let [result (handler)]
                             (events/tap :end result))
-
-                           (catch java.io.EOFException cause
-                             (events/tap :error (errors/handle' cause request)))
                           (catch Throwable cause
-                             (l/err :hint "unexpected error on processing sse response"
-                                    :cause cause)
                             (events/tap :error (errors/handle' cause request)))
                           (finally
                             (sp/close! events/*channel*)
--- a/backend/src/app/http/websocket.clj
+++ b/backend/src/app/http/websocket.clj
@@ -278,18 +278,18 @@
            :inc 1)
  message)

+(def ^:private schema:params
+  (sm/define
+    [:map {:title "params"}
+     [:session-id ::sm/uuid]]))
+
 (defn- http-handler
  [cfg {:keys [params ::session/profile-id] :as request}]
-  (let [session-id (some-> params :session-id sm/parse-uuid)]
-    (when-not (uuid? session-id)
-      (ex/raise :type :validation
-                :code :missing-session-id
-                :hint "missing or invalid session-id found"))
-
+  (let [{:keys [session-id]} (sm/conform! schema:params params)]
    (cond
      (not profile-id)
      (ex/raise :type :authentication
-                :hint "authentication required")
+                :hint "Authentication required.")

      ;; WORKAROUND: we use the adapter specific predicate for
      ;; performance reasons; for now, the ring default impl for
--- a/backend/src/app/loggers/audit.clj
+++ b/backend/src/app/loggers/audit.clj
@@ -21,18 +21,24 @@
   [app.rpc :as-alias rpc]
   [app.rpc.retry :as rtry]
   [app.setup :as-alias setup]
-   [app.util.inet :as inet]
   [app.util.services :as-alias sv]
   [app.util.time :as dt]
   [app.worker :as wrk]
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
-   [integrant.core :as ig]))
+   [integrant.core :as ig]
+   [ring.request :as rreq]))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; HELPERS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+(defn parse-client-ip
+  [request]
+  (or (some-> (rreq/get-header request "x-forwarded-for") (str/split ",") first)
+      (rreq/get-header request "x-real-ip")
+      (some-> (rreq/remote-addr request) str)))
+
 (defn extract-utm-params
  "Extracts additional data from params and namespace them under
  `penpot` ns."
@@ -47,7 +53,8 @@
                (assoc (->> sk str/kebab (keyword "penpot")) v))))]
    (reduce-kv process-param {} params)))

-(def profile-props
+(def ^:private
+  profile-props
  [:id
   :is-active
   :is-muted
@@ -80,20 +87,9 @@
         (remove #(contains? reserved-props (key %))))
        props))

-(defn event-from-rpc-params
-  "Create a base event skeleton with pre-filled some important
-  data that can be extracted from RPC params object"
-  [params]
-  (let [context {:external-session-id (::rpc/external-session-id params)
-                 :external-event-origin (::rpc/external-event-origin params)
-                 :triggered-by (::rpc/handler-name params)}]
-    {::type "action"
-     ::profile-id (::rpc/profile-id params)
-     ::ip-addr (::rpc/ip-addr params)
-     ::context (d/without-nils context)}))
-
 ;; --- SPECS

+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; COLLECTOR
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -145,31 +141,25 @@
                       (::rpc/profile-id params)
                       uuid/zero)

-        session-id   (get params ::rpc/external-session-id)
-        event-origin (get params ::rpc/external-event-origin)
-        props        (-> (or (::replace-props resultm)
-                             (-> params
-                                 (merge (::props resultm))
-                                 (dissoc :profile-id)
-                                 (dissoc :type)))
+        props      (-> (or (::replace-props resultm)
+                           (-> params
+                               (merge (::props resultm))
+                               (dissoc :profile-id)
+                               (dissoc :type)))

-                         (clean-props))
+                       (clean-props))

        token-id  (::actoken/id request)
        context   (-> (::context resultm)
-                      (assoc :external-session-id session-id)
-                      (assoc :external-event-origin event-origin)
                      (assoc :access-token-id (some-> token-id str))
-                      (d/without-nils))
-
-        ip-addr   (inet/parse-request request)]
+                      (d/without-nils))]

    {::type (or (::type resultm)
                (::rpc/type cfg))
     ::name (or (::name resultm)
                (::sv/name mdata))
     ::profile-id profile-id
-     ::ip-addr ip-addr
+     ::ip-addr (some-> request parse-client-ip)
     ::props props
     ::context context

@@ -191,33 +181,15 @@
         (::webhooks/event? resultm)
         false)}))

-(defn- event->params
-  [event]
+(defn- handle-event!
+  [cfg event]
  (let [params {:id (uuid/next)
                :name (::name event)
                :type (::type event)
                :profile-id (::profile-id event)
                :ip-addr (::ip-addr event)
-                :context (::context event {})
-                :props (::props event {})
-                :source "backend"}
-        tnow   (::tracked-at event)]
-
-    (cond-> params
-      (some? tnow)
-      (assoc :tracked-at tnow))))
-
-(defn- append-audit-entry!
-  [cfg params]
-  (let [params (-> params
-                   (update :props db/tjson)
-                   (update :context db/tjson)
-                   (update :ip-addr db/inet))]
-    (db/insert! cfg :audit-log params)))
-
-(defn- handle-event!
-  [cfg event]
-  (let [params (event->params event)
+                :context (::context event)
+                :props (::props event)}
        tnow   (dt/now)]

    (when (contains? cf/flags :audit-log)
@@ -226,8 +198,12 @@
      ;; this case we just retry the operation.
      (let [params (-> params
                       (assoc :created-at tnow)
-                       (update :tracked-at #(or % tnow)))]
-        (append-audit-entry! cfg params)))
+                       (assoc :tracked-at tnow)
+                       (update :props db/tjson)
+                       (update :context db/tjson)
+                       (update :ip-addr db/inet)
+                       (assoc :source "backend"))]
+        (db/insert! cfg :audit-log params)))

    (when (and (or (contains? cf/flags :telemetry)
                   (cf/get :telemetry-enabled))
@@ -239,10 +215,12 @@
      ;; NOTE: this is only executed when general audit log is disabled
      (let [params (-> params
                       (assoc :created-at tnow)
-                       (update :tracked-at #(or % tnow))
-                       (assoc :props {})
-                       (assoc :context {}))]
-        (append-audit-entry! cfg params)))
+                       (assoc :tracked-at tnow)
+                       (assoc :props (db/tjson {}))
+                       (assoc :context (db/tjson {}))
+                       (assoc :ip-addr (db/inet "0.0.0.0"))
+                       (assoc :source "backend"))]
+        (db/insert! cfg :audit-log params)))

    (when (and (contains? cf/flags :webhooks)
               (::webhooks/event? event))
@@ -255,25 +233,25 @@
                            :else               label)
            dedupe?       (boolean (and batch-key batch-timeout))]

-        (wrk/submit! (-> cfg
-                         (assoc ::wrk/task :process-webhook-event)
-                         (assoc ::wrk/queue :webhooks)
-                         (assoc ::wrk/max-retries 0)
-                         (assoc ::wrk/delay (or batch-timeout 0))
-                         (assoc ::wrk/dedupe dedupe?)
-                         (assoc ::wrk/label label)
-                         (assoc ::wrk/params (-> params
-                                                 (dissoc :source)
-                                                 (dissoc :context)
-                                                 (dissoc :ip-addr)
-                                                 (dissoc :type)))))))
+        (wrk/submit! ::wrk/conn (::db/conn cfg)
+                     ::wrk/task :process-webhook-event
+                     ::wrk/queue :webhooks
+                     ::wrk/max-retries 0
+                     ::wrk/delay (or batch-timeout 0)
+                     ::wrk/dedupe dedupe?
+                     ::wrk/label label
+
+                     ::webhooks/event
+                     (-> params
+                         (dissoc :ip-addr)
+                         (dissoc :type)))))
    params))

 (defn submit!
  "Submit audit event to the collector."
-  [cfg event]
+  [cfg params]
  (try
-    (let [event (d/without-nils event)
+    (let [event (d/without-nils params)
          cfg   (-> cfg
                    (assoc ::rtry/when rtry/conflict-exception?)
                    (assoc ::rtry/max-retries 6)
@@ -282,18 +260,3 @@
      (rtry/invoke! cfg db/tx-run! handle-event! event))
    (catch Throwable cause
      (l/error :hint "unexpected error processing event" :cause cause))))
-
-(defn insert!
-  "Submit audit event to the collector, intended to be used only from
-  command line helpers because this skips all webhooks and telemetry
-  logic."
-  [cfg event]
-  (when (contains? cf/flags :audit-log)
-    (let [event (d/without-nils event)]
-      (us/verify! ::event event)
-      (db/run! cfg (fn [cfg]
-                     (let [tnow   (dt/now)
-                           params (-> (event->params event)
-                                      (assoc :created-at tnow)
-                                      (update :tracked-at #(or % tnow)))]
-                       (append-audit-entry! cfg params)))))))
--- a/backend/src/app/loggers/database.clj
+++ b/backend/src/app/loggers/database.clj
@@ -63,7 +63,7 @@
                     (ex/format-throwable cause :data? false :explain? false :header? false :summary? false))}

       (when-let [params (or (:request/params context) (:params context))]
-         {:params (pp/pprint-str params :length 30 :level 13)})
+         {:params (pp/pprint-str params :length 30 :level 12)})

       (when-let [value (:value context)]
         {:value (pp/pprint-str value :length 30 :level 12)})
--- a/backend/src/app/loggers/webhooks.clj
+++ b/backend/src/app/loggers/webhooks.clj
@@ -64,20 +64,23 @@
  (s/keys :req [::db/pool]))

 (defmethod ig/init-key ::process-event-handler
-  [_ cfg]
+  [_ {:keys [::db/pool] :as cfg}]
  (fn [{:keys [props] :as task}]
-    (l/dbg :hint "process webhook event" :name (:name props))
+    (let [event (::event props)]
+      (l/dbg :hint "process webhook event" :name (:name event))
+
+      (when-let [items (lookup-webhooks cfg event)]
+        (l/trc :hint "webhooks found for event" :total (count items))
+
+        (db/with-atomic [conn pool]
+          (doseq [item items]
+            (wrk/submit! ::wrk/conn conn
+                         ::wrk/task :run-webhook
+                         ::wrk/queue :webhooks
+                         ::wrk/max-retries 3
+                         ::event event
+                         ::config item)))))))

-    (when-let [items (lookup-webhooks cfg props)]
-      (l/trc :hint "webhooks found for event" :total (count items))
-      (db/tx-run! cfg (fn [cfg]
-                        (doseq [item items]
-                          (wrk/submit! (-> cfg
-                                           (assoc ::wrk/task :run-webhook)
-                                           (assoc ::wrk/queue :webhooks)
-                                           (assoc ::wrk/max-retries 3)
-                                           (assoc ::wrk/params {:event props
-                                                                :config item})))))))))
 ;; --- RUN

 (declare interpret-exception)
@@ -125,8 +128,8 @@
                         :rsp-data (db/tjson rsp)}))]

    (fn [{:keys [props] :as task}]
-      (let [event (:event props)
-            whook (:config props)
+      (let [event (::event props)
+            whook (::config props)

            body  (case (:mtype whook)
                    "application/json" (json/write-str event json-write-opts)
@@ -135,7 +138,7 @@

        (l/dbg :hint "run webhook"
               :event-name (:name event)
-               :webhook-id (str (:id whook))
+               :webhook-id (:id whook)
               :webhook-uri (:uri whook)
               :webhook-mtype (:mtype whook))

--- a/backend/src/app/main.clj
+++ b/backend/src/app/main.clj
@@ -102,13 +102,13 @@
   {::mdef/name "penpot_tasks_timing"
    ::mdef/help "Background tasks timing (milliseconds)."
    ::mdef/labels ["name"]
-    ::mdef/type :histogram}
+    ::mdef/type :summary}

   :redis-eval-timing
   {::mdef/name "penpot_redis_eval_timing"
    ::mdef/help "Redis EVAL commands execution timings (ms)"
    ::mdef/labels ["name"]
-    ::mdef/type :histogram}
+    ::mdef/type :summary}

   :rpc-climit-queue
   {::mdef/name "penpot_rpc_climit_queue"
@@ -126,7 +126,7 @@
   {::mdef/name "penpot_rpc_climit_timing"
    ::mdef/help "Summary of the time between queuing and executing on the CLIMIT"
    ::mdef/labels ["name"]
-    ::mdef/type :histogram}
+    ::mdef/type :summary}

   :audit-http-handler-queue-size
   {::mdef/name "penpot_audit_http_handler_queue_size"
@@ -144,7 +144,7 @@
   {::mdef/name "penpot_audit_http_handler_timing"
    ::mdef/help "Summary of the time between queuing and executing on the audit log http handler"
    ::mdef/labels []
-    ::mdef/type :histogram}
+    ::mdef/type :summary}

   :executors-active-threads
   {::mdef/name "penpot_executors_active_threads"
@@ -254,7 +254,7 @@
   {::http.client/client (ig/ref ::http.client/client)}

   ::oidc.providers/gitlab
-   {::http.client/client (ig/ref ::http.client/client)}
+   {}

   ::oidc.providers/generic
   {::http.client/client (ig/ref ::http.client/client)}
@@ -267,9 +267,7 @@
                          :github (ig/ref ::oidc.providers/github)
                          :gitlab (ig/ref ::oidc.providers/gitlab)
                          :oidc   (ig/ref ::oidc.providers/generic)}
-    ::session/manager    (ig/ref ::session/manager)
-    ::email/blacklist    (ig/ref ::email/blacklist)
-    ::email/whitelist    (ig/ref ::email/whitelist)}
+    ::session/manager    (ig/ref ::session/manager)}

   :app.http/router
   {::session/manager    (ig/ref ::session/manager)
@@ -324,10 +322,7 @@
    ::rpc/climit         (ig/ref ::rpc/climit)
    ::rpc/rlimit         (ig/ref ::rpc/rlimit)
    ::setup/templates    (ig/ref ::setup/templates)
-    ::setup/props        (ig/ref ::setup/props)
-
-    ::email/blacklist    (ig/ref ::email/blacklist)
-    ::email/whitelist    (ig/ref ::email/whitelist)}
+    ::setup/props        (ig/ref ::setup/props)}

   :app.rpc.doc/routes
   {:methods (ig/ref :app.rpc/methods)}
@@ -343,9 +338,8 @@
    ::wrk/tasks
    {:sendmail           (ig/ref ::email/handler)
     :objects-gc         (ig/ref :app.tasks.objects-gc/handler)
+     :orphan-teams-gc    (ig/ref :app.tasks.orphan-teams-gc/handler)
     :file-gc            (ig/ref :app.tasks.file-gc/handler)
-     :file-gc-scheduler  (ig/ref :app.tasks.file-gc-scheduler/handler)
-     :offload-file-data  (ig/ref :app.tasks.offload-file-data/handler)
     :file-xlog-gc       (ig/ref :app.tasks.file-xlog-gc/handler)
     :tasks-gc           (ig/ref :app.tasks.tasks-gc/handler)
     :telemetry          (ig/ref :app.tasks.telemetry/handler)
@@ -355,19 +349,13 @@
     :audit-log-archive  (ig/ref :app.loggers.audit.archive-task/handler)
     :audit-log-gc       (ig/ref :app.loggers.audit.gc-task/handler)

-     :delete-object
-     (ig/ref :app.tasks.delete-object/handler)
+     :object-update
+     (ig/ref :app.tasks.object-update/handler)
     :process-webhook-event
     (ig/ref ::webhooks/process-event-handler)
     :run-webhook
     (ig/ref ::webhooks/run-webhook-handler)}}

-   ::email/blacklist
-   {}
-
-   ::email/whitelist
-   {}
-
   ::email/sendmail
   {::email/host             (cf/get :smtp-host)
    ::email/port             (cf/get :smtp-port)
@@ -389,23 +377,18 @@
   {::db/pool     (ig/ref ::db/pool)
    ::sto/storage (ig/ref ::sto/storage)}

-   :app.tasks.delete-object/handler
+   :app.tasks.orphan-teams-gc/handler
+   {::db/pool (ig/ref ::db/pool)}
+
+   :app.tasks.object-update/handler
   {::db/pool (ig/ref ::db/pool)}

   :app.tasks.file-gc/handler
   {::db/pool     (ig/ref ::db/pool)
    ::sto/storage (ig/ref ::sto/storage)}

-   :app.tasks.file-gc-scheduler/handler
-   {::db/pool (ig/ref ::db/pool)}
-
-   :app.tasks.offload-file-data/handler
-   {::db/pool     (ig/ref ::db/pool)
-    ::sto/storage (ig/ref ::sto/storage)}
-
   :app.tasks.file-xlog-gc/handler
-   {::db/pool     (ig/ref ::db/pool)
-    ::sto/storage (ig/ref ::sto/storage)}
+   {::db/pool (ig/ref ::db/pool)}

   :app.tasks.telemetry/handler
   {::db/pool            (ig/ref ::db/pool)
@@ -458,29 +441,17 @@
   ::sto/storage
   {::db/pool      (ig/ref ::db/pool)
    ::sto/backends
-    {:s3 (ig/ref :app.storage.s3/backend)
-     :fs (ig/ref :app.storage.fs/backend)
+    {:assets-s3 (ig/ref [::assets :app.storage.s3/backend])
+     :assets-fs (ig/ref [::assets :app.storage.fs/backend])}}

-     ;; LEGACY (should not be removed, can only be removed after an
-     ;; explicit migration because the database objects/rows will
-     ;; still reference the old names).
-     :assets-s3 (ig/ref :app.storage.s3/backend)
-     :assets-fs (ig/ref :app.storage.fs/backend)}}
+   [::assets :app.storage.s3/backend]
+   {::sto.s3/region     (cf/get :storage-assets-s3-region)
+    ::sto.s3/endpoint   (cf/get :storage-assets-s3-endpoint)
+    ::sto.s3/bucket     (cf/get :storage-assets-s3-bucket)
+    ::sto.s3/io-threads (cf/get :storage-assets-s3-io-threads)}

-   :app.storage.s3/backend
-   {::sto.s3/region     (or (cf/get :storage-assets-s3-region)
-                            (cf/get :objects-storage-s3-region))
-    ::sto.s3/endpoint   (or (cf/get :storage-assets-s3-endpoint)
-                            (cf/get :objects-storage-s3-endpoint))
-    ::sto.s3/bucket     (or (cf/get :storage-assets-s3-bucket)
-                            (cf/get :objects-storage-s3-bucket))
-    ::sto.s3/io-threads (or (cf/get :storage-assets-s3-io-threads)
-                            (cf/get :objects-storage-s3-io-threads))
-    ::wrk/executor      (ig/ref ::wrk/executor)}
-
-   :app.storage.fs/backend
-   {::sto.fs/directory (or (cf/get :storage-assets-fs-directory)
-                           (cf/get :objects-storage-fs-directory))}})
+   [::assets :app.storage.fs/backend]
+   {::sto.fs/directory (cf/get :storage-assets-fs-directory)}})


 (def worker-config
@@ -497,6 +468,9 @@
     {:cron #app/cron "0 0 0 * * ?" ;; daily
      :task :objects-gc}

+     {:cron #app/cron "0 0 0 * * ?" ;; daily
+      :task :orphan-teams-gc}
+
     {:cron #app/cron "0 0 0 * * ?" ;; daily
      :task :storage-gc-deleted}

@@ -507,7 +481,7 @@
      :task :tasks-gc}

     {:cron #app/cron "0 0 2 * * ?" ;; daily
-      :task :file-gc-scheduler}
+      :task :file-gc}

     {:cron #app/cron "0 30 */3,23 * * ?"
      :task :telemetry}
@@ -546,7 +520,6 @@

 (defn start
  []
-  (cf/validate!)
  (ig/load-namespaces (merge system-config worker-config))
  (alter-var-root #'system (fn [sys]
                             (when sys (ig/halt! sys))
--- a/backend/src/app/media.clj
+++ b/backend/src/app/media.clj
@@ -11,6 +11,7 @@
   [app.common.exceptions :as ex]
   [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.spec :as us]
   [app.common.svg :as csvg]
@@ -46,10 +47,22 @@
  (s/keys :req-un [::path]
          :opt-un [::mtype]))

-(sm/register! ::upload
+(sm/def! ::fs/path
+  {:type ::fs/path
+   :pred fs/path?
+   :type-properties
+   {:title "path"
+    :description "filesystem path"
+    :error/message "expected a valid fs path instance"
+    :gen/gen (sg/generator :string)
+    ::oapi/type "string"
+    ::oapi/format "unix-path"
+    ::oapi/decode fs/path}})
+
+(sm/def! ::upload
  [:map {:title "Upload"}
   [:filename :string]
-   [:size ::sm/int]
+   [:size :int]
   [:path ::fs/path]
   [:mtype {:optional true} :string]
   [:headers {:optional true}
@@ -313,3 +326,17 @@
              (= stype :ttf)
              (-> (assoc "font/otf" (ttf->otf sfnt))
                  (assoc "font/ttf" sfnt)))))))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Utility functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn configure-assets-storage
+  "Given storage map, returns a storage configured with the appropriate
+  backend for assets and optional connection attached."
+  ([storage]
+   (assoc storage ::sto/backend (cf/get :assets-storage-backend :assets-fs)))
+  ([storage pool-or-conn]
+   (-> (configure-assets-storage storage)
+       (assoc ::db/pool-or-conn pool-or-conn))))
--- a/backend/src/app/migrations.clj
+++ b/backend/src/app/migrations.clj
@@ -379,40 +379,7 @@
    :fn (mg/resource "app/migrations/sql/0119-mod-file-table.sql")}

   {:name "0120-mod-audit-log-table"
-    :fn (mg/resource "app/migrations/sql/0120-mod-audit-log-table.sql")}
-
-   {:name "0121-mod-file-data-fragment-table"
-    :fn (mg/resource "app/migrations/sql/0121-mod-file-data-fragment-table.sql")}
-
-   {:name "0122-mod-file-table"
-    :fn (mg/resource "app/migrations/sql/0122-mod-file-table.sql")}
-
-   {:name "0122-mod-file-data-fragment-table"
-    :fn (mg/resource "app/migrations/sql/0122-mod-file-data-fragment-table.sql")}
-
-   {:name "0123-mod-file-change-table"
-    :fn (mg/resource "app/migrations/sql/0123-mod-file-change-table.sql")}
-
-   {:name "0124-mod-profile-table"
-    :fn (mg/resource "app/migrations/sql/0124-mod-profile-table.sql")}
-
-   {:name "0125-mod-file-table"
-    :fn (mg/resource "app/migrations/sql/0125-mod-file-table.sql")}
-
-   {:name "0126-add-team-access-request-table"
-    :fn (mg/resource "app/migrations/sql/0126-add-team-access-request-table.sql")}
-
-   {:name "0127-mod-storage-object-table"
-    :fn (mg/resource "app/migrations/sql/0127-mod-storage-object-table.sql")}
-
-   {:name "0128-mod-task-table"
-    :fn (mg/resource "app/migrations/sql/0128-mod-task-table.sql")}
-
-   {:name "0129-mod-file-change-table"
-    :fn (mg/resource "app/migrations/sql/0129-mod-file-change-table.sql")}
-
-   {:name "0130-mod-file-change-table"
-    :fn (mg/resource "app/migrations/sql/0130-mod-file-change-table.sql")}])
+    :fn (mg/resource "app/migrations/sql/0120-mod-audit-log-table.sql")}])

 (defn apply-migrations!
  [pool name migrations]
--- a/backend/src/app/migrations/sql/0121-mod-file-data-fragment-table.sql
+++ b/backend/src/app/migrations/sql/0121-mod-file-data-fragment-table.sql
@@ -1,8 +0,0 @@
-ALTER TABLE file_data_fragment
-  ADD COLUMN data bytea NULL;
-
-UPDATE file_data_fragment
-   SET data = content;
-
-ALTER TABLE file_data_fragment
- DROP COLUMN content;
--- a/backend/src/app/migrations/sql/0122-mod-file-data-fragment-table.sql
+++ b/backend/src/app/migrations/sql/0122-mod-file-data-fragment-table.sql
@@ -1,6 +0,0 @@
-ALTER TABLE file_data_fragment
-  ADD COLUMN data_backend text NULL,
-  ADD COLUMN data_ref_id uuid NULL;
-
-CREATE INDEX IF NOT EXISTS file_data_fragment__data_ref_id__idx
-    ON file_data_fragment (data_ref_id);
--- a/backend/src/app/migrations/sql/0122-mod-file-fragment-table.sql
+++ b/backend/src/app/migrations/sql/0122-mod-file-fragment-table.sql
@@ -1,6 +0,0 @@
-ALTER TABLE file_data_fragment
-  ADD COLUMN data_backend text NULL,
-  ADD COLUMN data_ref_id uuid NULL;
-
-CREATE INDEX IF NOT EXISTS file_data_fragment__data_ref_id__idx
-    ON file_data_fragment (data_ref_id);
--- a/backend/src/app/migrations/sql/0122-mod-file-table.sql
+++ b/backend/src/app/migrations/sql/0122-mod-file-table.sql
@@ -1,4 +0,0 @@
-ALTER TABLE file ADD COLUMN data_ref_id uuid NULL;
-
-CREATE INDEX IF NOT EXISTS file__data_ref_id__idx
-    ON file (data_ref_id);
--- a/backend/src/app/migrations/sql/0123-mod-file-change-table.sql
+++ b/backend/src/app/migrations/sql/0123-mod-file-change-table.sql
@@ -1,2 +0,0 @@
-CREATE INDEX IF NOT EXISTS file_change__created_at__label__idx
-    ON file_change (created_at, label);
--- a/backend/src/app/migrations/sql/0124-mod-profile-table.sql
+++ b/backend/src/app/migrations/sql/0124-mod-profile-table.sql
@@ -1,2 +0,0 @@
-CREATE INDEX profile__props__newsletter1__idx ON profile (email) WHERE props->>'~:newsletter-news' = 'true';
-CREATE INDEX profile__props__newsletter2__idx ON profile (email) WHERE props->>'~:newsletter-updates' = 'true';
--- a/backend/src/app/migrations/sql/0125-mod-file-table.sql
+++ b/backend/src/app/migrations/sql/0125-mod-file-table.sql
@@ -1,3 +0,0 @@
--- This setting allow to optimize the table for heavy write workload
--- leaving space on the page for HOT updates
-ALTER TABLE file SET (FILLFACTOR=50);
--- a/backend/src/app/migrations/sql/0126-add-team-access-request-table.sql
+++ b/backend/src/app/migrations/sql/0126-add-team-access-request-table.sql
@@ -1,10 +0,0 @@
-CREATE TABLE team_access_request (
-  id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
-  team_id uuid NOT NULL REFERENCES team(id) ON DELETE CASCADE DEFERRABLE,
-  requester_id uuid NULL REFERENCES profile(id) ON DELETE CASCADE DEFERRABLE,
-  valid_until timestamptz NOT NULL,
-  auto_join_until timestamptz NOT NULL,
-  created_at timestamptz NOT NULL DEFAULT now(),
-  updated_at timestamptz NOT NULL DEFAULT now(),
-  UNIQUE (team_id, requester_id)
-);
--- a/backend/src/app/migrations/sql/0127-mod-storage-object-table.sql
+++ b/backend/src/app/migrations/sql/0127-mod-storage-object-table.sql
@@ -1,3 +0,0 @@
--- This setting allow to optimize the table for heavy write workload
--- leaving space on the page for HOT updates
-ALTER TABLE storage_object SET (FILLFACTOR=60);
--- a/backend/src/app/migrations/sql/0128-mod-task-table.sql
+++ b/backend/src/app/migrations/sql/0128-mod-task-table.sql
@@ -1,3 +0,0 @@
--- This setting allow to optimize the table for heavy write workload
--- leaving space on the page for HOT updates
-ALTER TABLE task SET (FILLFACTOR=60);
--- a/backend/src/app/migrations/sql/0129-mod-file-change-table.sql
+++ b/backend/src/app/migrations/sql/0129-mod-file-change-table.sql
@@ -1,6 +0,0 @@
-ALTER TABLE file_change
-  ADD COLUMN data_backend text NULL,
-  ADD COLUMN data_ref_id uuid NULL;
-
-CREATE INDEX IF NOT EXISTS file_change__data_ref_id__idx
-    ON file_change (data_ref_id);
--- a/backend/src/app/migrations/sql/0130-mod-file-change-table.sql
+++ b/backend/src/app/migrations/sql/0130-mod-file-change-table.sql
@@ -1,2 +0,0 @@
-ALTER TABLE file_change
-  ADD COLUMN version integer NULL;
--- a/backend/src/app/rpc.clj
+++ b/backend/src/app/rpc.clj
@@ -29,7 +29,6 @@
   [app.rpc.rlimit :as rlimit]
   [app.setup :as-alias setup]
   [app.storage :as-alias sto]
-   [app.util.inet :as inet]
   [app.util.services :as sv]
   [app.util.time :as dt]
   [clojure.spec.alpha :as s]
@@ -71,22 +70,6 @@
        (handle-response-transformation request mdata)
        (handle-before-comple-hook mdata))))

-(defn get-external-session-id
-  [request]
-  (when-let [session-id (rreq/get-header request "x-external-session-id")]
-    (when-not (or (> (count session-id) 256)
-                  (= session-id "null")
-                  (str/blank? session-id))
-      session-id)))
-
-(defn- get-external-event-origin
-  [request]
-  (when-let [origin (rreq/get-header request "x-event-origin")]
-    (when-not (or (> (count origin) 256)
-                  (= origin "null")
-                  (str/blank? origin))
-      origin)))
-
 (defn- rpc-handler
  "Ring handler that dispatches cmd requests and convert between
  internal async flow into ring async flow."
@@ -96,16 +79,8 @@
        profile-id   (or (::session/profile-id request)
                         (::actoken/profile-id request))

-        ip-addr      (inet/parse-request request)
-        session-id   (get-external-session-id request)
-        event-origin (get-external-event-origin request)
-
        data         (-> params
-                         (assoc ::handler-name handler-name)
-                         (assoc ::ip-addr ip-addr)
                         (assoc ::request-at (dt/now))
-                         (assoc ::external-session-id session-id)
-                         (assoc ::external-event-origin event-origin)
                         (assoc ::session/id (::session/id request))
                         (assoc ::cond/key etag)
                         (cond-> (uuid? profile-id)
@@ -149,13 +124,6 @@
                  :hint "authentication required for this endpoint")
        (f cfg params)))))

-(defn- wrap-db-transaction
-  [_ f mdata]
-  (if (::db/transaction mdata)
-    (fn [cfg params]
-      (db/tx-run! cfg f params))
-    f))
-
 (defn- wrap-audit
  [_ f mdata]
  (if (or (contains? cf/flags :webhooks)
@@ -185,32 +153,49 @@
  (if-let [schema (::sm/params mdata)]
    (let [validate (sm/validator schema)
          explain  (sm/explainer schema)
-          decode   (sm/decoder schema sm/json-transformer)
-          encode   (sm/encoder schema sm/json-transformer)]
+          decode   (sm/decoder schema)]
      (fn [cfg params]
        (let [params (decode params)]
          (if (validate params)
-            (let [result (f cfg params)]
-              (if (instance? clojure.lang.IObj result)
-                (vary-meta result assoc :encode/json encode)
-                result))
+            (f cfg params)
+
            (let [params (d/without-qualified params)]
              (ex/raise :type :validation
                        :code :params-validation
                        ::sm/explain (explain params)))))))
    f))

+(defn- wrap-output-validation
+  [_ f mdata]
+  (if (contains? cf/flags :rpc-output-validation)
+    (or (when-let [schema (::sm/result mdata)]
+          (let [schema   (if (sm/lazy-schema? schema)
+                           schema
+                           (sm/define schema))
+                validate (sm/validator schema)
+                explain  (sm/explainer schema)]
+            (fn [cfg params]
+              (let [response (f cfg params)]
+                (when (map? response)
+                  (when-not (validate response)
+                    (ex/raise :type :validation
+                              :code :data-validation
+                              ::sm/explain (explain response))))
+                response))))
+        f)
+    f))
+
 (defn- wrap-all
  [cfg f mdata]
  (as-> f $
-    (wrap-db-transaction cfg $ mdata)
+    (wrap-metrics cfg $ mdata)
    (cond/wrap cfg $ mdata)
    (retry/wrap-retry cfg $ mdata)
    (climit/wrap cfg $ mdata)
-    (wrap-metrics cfg $ mdata)
    (rlimit/wrap cfg $ mdata)
    (wrap-audit cfg $ mdata)
    (wrap-spec-conform cfg $ mdata)
+    (wrap-output-validation cfg $ mdata)
    (wrap-params-validation cfg $ mdata)
    (wrap-authentication cfg $ mdata)))

--- a/backend/src/app/rpc/commands/access_token.clj
+++ b/backend/src/app/rpc/commands/access_token.clj
@@ -6,7 +6,7 @@

 (ns app.rpc.commands.access-token
  (:require
-   [app.common.schema :as sm]
+   [app.common.spec :as us]
   [app.common.uuid :as uuid]
   [app.db :as db]
   [app.main :as-alias main]
@@ -16,7 +16,8 @@
   [app.setup :as-alias setup]
   [app.tokens :as tokens]
   [app.util.services :as sv]
-   [app.util.time :as dt]))
+   [app.util.time :as dt]
+   [clojure.spec.alpha :as s]))

 (defn- decode-row
  [row]
@@ -30,19 +31,20 @@
                                           :tid token-id
                                           :iat created-at})

-        expires-at (some-> expiration dt/in-future)
-        token      (db/insert! conn :access-token
-                               {:id token-id
-                                :name name
-                                :token token
-                                :profile-id profile-id
-                                :created-at created-at
-                                :updated-at created-at
-                                :expires-at expires-at
-                                :perms (db/create-array conn "text" [])})]
-    (decode-row token)))
+        expires-at (some-> expiration dt/in-future)]

-(defn repl:create-access-token
+    (db/insert! conn :access-token
+                {:id token-id
+                 :name name
+                 :token token
+                 :profile-id profile-id
+                 :created-at created-at
+                 :updated-at created-at
+                 :expires-at expires-at
+                 :perms (db/create-array conn "text" [])})))
+
+
+(defn repl-create-access-token
  [{:keys [::db/pool] :as system} profile-id name expiration]
  (db/with-atomic [conn pool]
    (let [props (:app.setup/props system)]
@@ -51,38 +53,40 @@
                           name
                           expiration))))

-(def ^:private schema:create-access-token
-  [:map {:title "create-access-token"}
-   [:name [:string {:max 250 :min 1}]]
-   [:expiration {:optional true} ::dt/duration]])
+(s/def ::name ::us/not-empty-string)
+(s/def ::expiration ::dt/duration)
+
+(s/def ::create-access-token
+  (s/keys :req [::rpc/profile-id]
+          :req-un [::name]
+          :opt-un [::expiration]))

 (sv/defmethod ::create-access-token
-  {::doc/added "1.18"
-   ::sm/params schema:create-access-token}
-  [cfg {:keys [::rpc/profile-id name expiration]}]
+  {::doc/added "1.18"}
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id name expiration]}]
+  (db/with-atomic [conn pool]
+    (let [cfg (assoc cfg ::db/conn conn)]
+      (quotes/check-quote! conn
+                           {::quotes/id ::quotes/access-tokens-per-profile
+                            ::quotes/profile-id profile-id})
+      (-> (create-access-token cfg profile-id name expiration)
+          (decode-row)))))

-  (quotes/check! cfg {::quotes/id ::quotes/access-tokens-per-profile
-                      ::quotes/profile-id profile-id})
-
-  (db/tx-run! cfg create-access-token profile-id name expiration))
-
-(def ^:private schema:delete-access-token
-  [:map {:title "delete-access-token"}
-   [:id ::sm/uuid]])
+(s/def ::delete-access-token
+  (s/keys :req [::rpc/profile-id]
+          :req-un [::us/id]))

 (sv/defmethod ::delete-access-token
-  {::doc/added "1.18"
-   ::sm/params schema:delete-access-token}
+  {::doc/added "1.18"}
  [{:keys [::db/pool]} {:keys [::rpc/profile-id id]}]
  (db/delete! pool :access-token {:id id :profile-id profile-id})
  nil)

-(def ^:private schema:get-access-tokens
-  [:map {:title "get-access-tokens"}])
+(s/def ::get-access-tokens
+  (s/keys :req [::rpc/profile-id]))

 (sv/defmethod ::get-access-tokens
-  {::doc/added "1.18"
-   ::sm/params schema:get-access-tokens}
+  {::doc/added "1.18"}
  [{:keys [::db/pool]} {:keys [::rpc/profile-id]}]
  (->> (db/query pool :access-token
                 {:profile-id profile-id}
--- a/backend/src/app/rpc/commands/audit.clj
+++ b/backend/src/app/rpc/commands/audit.clj
@@ -14,12 +14,11 @@
   [app.config :as cf]
   [app.db :as db]
   [app.http :as-alias http]
-   [app.loggers.audit :as-alias audit]
+   [app.loggers.audit :as audit]
   [app.rpc :as-alias rpc]
   [app.rpc.climit :as-alias climit]
   [app.rpc.doc :as-alias doc]
   [app.rpc.helpers :as rph]
-   [app.util.inet :as inet]
   [app.util.services :as sv]
   [app.util.time :as dt]))

@@ -62,7 +61,7 @@
 (defn- handle-events
  [{:keys [::db/pool]} {:keys [::rpc/profile-id events] :as params}]
  (let [request (-> params meta ::http/request)
-        ip-addr (inet/parse-request request)
+        ip-addr (audit/parse-client-ip request)
        tnow    (dt/now)
        xform   (comp
                 (map (fn [event]
@@ -78,19 +77,10 @@
    (when (seq events)
      (db/insert-many! pool :audit-log event-columns events))))

-(def valid-event-types
-  #{"action" "identify"})
-
 (def schema:event
  [:map {:title "Event"}
-   [:name
-    [:and {:gen/elements ["update-file", "get-profile"]}
-     [:string {:max 250}]
-     [:re #"[\d\w-]{1,50}"]]]
-   [:type
-    [:and {:gen/elements valid-event-types}
-     [:string {:max 250}]
-     [::sm/one-of {:format "string"} valid-event-types]]]
+   [:name [:string {:max 250}]]
+   [:type [:string {:max 250}]]
   [:props
    [:map-of :keyword :any]]
   [:context {:optional true}
--- a/backend/src/app/rpc/commands/auth.clj
+++ b/backend/src/app/rpc/commands/auth.clj
@@ -6,6 +6,7 @@

 (ns app.rpc.commands.auth
  (:require
+   [app.auth :as auth]
   [app.common.data :as d]
   [app.common.data.macros :as dm]
   [app.common.exceptions :as ex]
@@ -16,8 +17,6 @@
   [app.config :as cf]
   [app.db :as db]
   [app.email :as eml]
-   [app.email.blacklist :as email.blacklist]
-   [app.email.whitelist :as email.whitelist]
   [app.http.session :as session]
   [app.loggers.audit :as audit]
   [app.rpc :as-alias rpc]
@@ -27,11 +26,9 @@
   [app.rpc.doc :as-alias doc]
   [app.rpc.helpers :as rph]
   [app.setup :as-alias setup]
-   [app.setup.welcome-file :refer [create-welcome-file]]
   [app.tokens :as tokens]
   [app.util.services :as sv]
   [app.util.time :as dt]
-   [app.worker :as wrk]
   [cuerdas.core :as str]))

 (def schema:password
@@ -40,11 +37,13 @@
 (def schema:token
  [::sm/word-string {:max 6000}])

+(def ^:private default-verify-threshold
+  (dt/duration "15m"))
+
 (defn- elapsed-verify-threshold?
  [profile]
-  (let [elapsed (dt/diff (:modified-at profile) (dt/now))
-        verify-threshold (cf/get :email-verify-threshold)]
-    (pos? (compare elapsed verify-threshold))))
+  (let [elapsed (dt/diff (:modified-at profile) (dt/now))]
+    (pos? (compare elapsed default-verify-threshold))))

 ;; ---- COMMAND: login with password

@@ -130,21 +129,12 @@

 ;; ---- COMMAND: Logout

-(def ^:private schema:logout
-  [:map {:title "logoug"}
-   [:profile-id {:optional true} ::sm/uuid]])
-
 (sv/defmethod ::logout
  "Clears the authentication cookie and logout the current session."
  {::rpc/auth false
-   ::doc/changes [["2.1" "Now requires profile-id passed in the body"]]
-   ::doc/added "1.0"
-   ::sm/params schema:logout}
-  [cfg params]
-  (if (= (:profile-id params)
-         (::rpc/profile-id params))
-    (rph/with-transform {} (session/delete-fn cfg))
-    {}))
+   ::doc/added "1.15"}
+  [cfg _]
+  (rph/with-transform {} (session/delete-fn cfg)))

 ;; ---- COMMAND: Recover Profile

@@ -182,11 +172,10 @@
 (defn- validate-register-attempt!
  [cfg params]

-  (when (or
-         (not (contains? cf/flags :registration))
-         (not (contains? cf/flags :login-with-password)))
-    (ex/raise :type :restriction
-              :code :registration-disabled))
+  (when-not (contains? cf/flags :registration)
+    (when-not (contains? params :invitation-token)
+      (ex/raise :type :restriction
+                :code :registration-disabled)))

  (when (contains? params :invitation-token)
    (let [invitation (tokens/verify (::setup/props cfg)
@@ -197,14 +186,8 @@
                  :code :email-does-not-match-invitation
                  :hint "email should match the invitation"))))

-  (when (and (email.blacklist/enabled? cfg)
-             (email.blacklist/contains? cfg (:email params)))
-    (ex/raise :type :restriction
-              :code :email-domain-is-not-allowed))
-
-  (when (and (email.whitelist/enabled? cfg)
-             (not (email.whitelist/contains? cfg (:email params))))
-    (ex/raise :type :restriction
+  (when-not (auth/email-domain-in-whitelist? (:email params))
+    (ex/raise :type :validation
              :code :email-domain-is-not-allowed))

  ;; Perform a basic validation of email & password
@@ -212,19 +195,7 @@
           (str/lower (:password params)))
    (ex/raise :type :validation
              :code :email-as-password
-              :hint "you can't use your email as password"))
-
-  (when (eml/has-bounce-reports? cfg (:email params))
-    (ex/raise :type :restriction
-              :code :email-has-permanent-bounces
-              :email (:email params)
-              :hint "looks like the email has bounce reports"))
-
-  (when (eml/has-complaint-reports? cfg (:email params))
-    (ex/raise :type :restriction
-              :code :email-has-complaints
-              :email (:email params)
-              :hint "looks like the email has complaint reports")))
+              :hint "you can't use your email as password")))

 (defn prepare-register
  [{:keys [::db/pool] :as cfg} {:keys [email] :as params}]
@@ -243,7 +214,6 @@

        params (d/without-nils params)
        token  (tokens/generate (::setup/props cfg) params)]
-
    (with-meta {:token token}
      {::audit/profile-id uuid/zero})))

@@ -286,7 +256,6 @@
        is-demo   (:is-demo params false)
        is-muted  (:is-muted params false)
        is-active (:is-active params false)
-        theme     (:theme params nil)
        email     (str/lower email)

        params    {:id id
@@ -297,24 +266,20 @@
                   :password password
                   :deleted-at (:deleted-at params)
                   :props props
-                   :theme theme
                   :is-active is-active
                   :is-muted is-muted
                   :is-demo is-demo}]
    (try
      (-> (db/insert! conn :profile params)
          (profile/decode-row))
-      (catch org.postgresql.util.PSQLException cause
-        (let [state (.getSQLState cause)]
+      (catch org.postgresql.util.PSQLException e
+        (let [state (.getSQLState e)]
          (if (not= state "23505")
-            (throw cause)
-
-            (do
-              (l/error :hint "not an error" :cause cause)
-              (ex/raise :type :validation
-                        :code :email-already-exists
-                        :hint "email already exists"
-                        :cause cause))))))))
+            (throw e)
+            (ex/raise :type :validation
+                      :code :email-already-exists
+                      :hint "email already exists"
+                      :cause e)))))))

 (defn create-profile-rels!
  [conn {:keys [id] :as profile}]
@@ -353,43 +318,27 @@
                :extra-data ptoken})))

 (defn register-profile
-  [{:keys [::db/conn ::wrk/executor] :as cfg} {:keys [token fullname theme] :as params}]
-  (let [theme      (when (= theme "light") theme)
-        claims     (tokens/verify (::setup/props cfg) {:token token :iss :prepared-register})
+  [{:keys [::db/conn] :as cfg} {:keys [token fullname] :as params}]
+  (let [claims     (tokens/verify (::setup/props cfg) {:token token :iss :prepared-register})
        params     (-> claims
                       (into params)
-                       (assoc :fullname fullname)
-                       (assoc :theme theme))
+                       (assoc :fullname fullname))

        profile    (if-let [profile-id (:profile-id claims)]
                     (profile/get-profile conn profile-id)
-                     ;; NOTE: we first try to match existing profile
-                     ;; by email, that in normal circumstances will
-                     ;; not return anything, but when a user tries to
-                     ;; reuse the same token multiple times, we need
-                     ;; to detect if the profile is already registered
-                     (or (profile/get-profile-by-email conn (:email claims))
-                         (let [is-active (or (boolean (:is-active claims))
-                                             (not (contains? cf/flags :email-verification)))
-                               params    (-> params
-                                             (assoc :is-active is-active)
-                                             (update :password #(profile/derive-password cfg %)))
-                               profile   (->> (create-profile! conn params)
-                                              (create-profile-rels! conn))]
-                           (vary-meta profile assoc :created true))))
-
-        created?   (-> profile meta :created true?)
+                     (let [is-active (or (boolean (:is-active params))
+                                         (not (contains? cf/flags :email-verification)))
+                           params    (-> params
+                                         (assoc :is-active is-active)
+                                         (update :password #(profile/derive-password cfg %)))]
+                       (->> (create-profile! conn params)
+                            (create-profile-rels! conn))))

        invitation (when-let [token (:invitation-token params)]
                     (tokens/verify (::setup/props cfg) {:token token :iss :team-invitation}))

-        props      (audit/profile->props profile)
+        props      (audit/profile->props profile)]

-        create-welcome-file-when-needed
-        (fn []
-          (when (:create-welcome-file params)
-            (let [cfg (dissoc cfg ::db/conn)]
-              (wrk/submit! executor (create-welcome-file cfg profile)))))]
    (cond
      ;; When profile is blocked, we just ignore it and return plain data
      (:is-blocked profile)
@@ -422,32 +371,27 @@
      ;; When a new user is created and it is already activated by
      ;; configuration or specified by OIDC, we just mark the profile
      ;; as logged-in
-      created?
-      (if (:is-active profile)
+      (not (:profile-id claims))
+      (if (:is-active claims)
        (-> (profile/strip-private-attrs profile)
            (rph/with-transform (session/create-fn cfg (:id profile)))
-            (rph/with-defer create-welcome-file-when-needed)
            (rph/with-meta
              {::audit/replace-props props
               ::audit/context {:action "login"}
               ::audit/profile-id (:id profile)}))

        (do
-          (when-not (eml/has-reports? conn (:email profile))
-            (send-email-verification! cfg profile))
-
-          (-> {:email (:email profile)}
-              (rph/with-defer create-welcome-file-when-needed)
-              (rph/with-meta
-                {::audit/replace-props props
-                 ::audit/context {:action "email-verification"}
-                 ::audit/profile-id (:id profile)}))))
+          (send-email-verification! cfg profile)
+          (rph/with-meta {:email (:email profile)}
+            {::audit/replace-props props
+             ::audit/context {:action "email-verification"}
+             ::audit/profile-id (:id profile)})))

      :else
      (let [elapsed? (elapsed-verify-threshold? profile)
-            reports? (eml/has-reports? conn (:email profile))
-            action   (if reports?
-                       "ignore-because-complaints"
+            bounce?  (eml/has-bounce-reports? conn (:email profile))
+            action   (if bounce?
+                       "ignore-because-bounce"
                       (if elapsed?
                         "resend-email-verification"
                         "ignore"))]
@@ -472,22 +416,22 @@
 (def schema:register-profile
  [:map {:title "register-profile"}
   [:token schema:token]
-   [:fullname [::sm/word-string {:max 100}]]
-   [:theme {:optional true} [:string {:max 10}]]
-   [:create-welcome-file {:optional true} :boolean]])
+   [:fullname [::sm/word-string {:max 100}]]])

 (sv/defmethod ::register-profile
  {::rpc/auth false
   ::doc/added "1.15"
   ::sm/params schema:register-profile
   ::climit/id :auth/global}
-  [cfg params]
-  (db/tx-run! cfg register-profile params))
+  [{:keys [::db/pool] :as cfg} params]
+  (db/with-atomic [conn pool]
+    (-> (assoc cfg ::db/conn conn)
+        (register-profile params))))

 ;; ---- COMMAND: Request Profile Recovery

 (defn- request-profile-recovery
-  [{:keys [::db/conn] :as cfg} {:keys [email] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [email] :as params}]
  (letfn [(create-recovery-token [{:keys [id] :as profile}]
            (let [token (tokens/generate (::setup/props cfg)
                                         {:iss :password-recovery
@@ -509,42 +453,40 @@
                          :extra-data ptoken})
              nil))]

-    (let [profile (->> (profile/clean-email email)
-                       (profile/get-profile-by-email conn))]
+    (db/with-atomic [conn pool]
+      (let [profile (->> (profile/clean-email email)
+                         (profile/get-profile-by-email conn))]

-      (cond
-        (not profile)
-        (l/wrn :hint "attempt of profile recovery: no profile found"
-               :profile-email email)
+        (cond
+          (not profile)
+          (l/wrn :hint "attempt of profile recovery: no profile found"
+                 :profile-email email)

-        (not (eml/allow-send-emails? conn profile))
-        (l/wrn :hint "attempt of profile recovery: profile is muted"
-               :profile-id (str (:id profile))
-               :profile-email (:email profile))
+          (not (eml/allow-send-emails? conn profile))
+          (l/wrn :hint "attempt of profile recovery: profile is muted"
+                 :profile-id (str (:id profile))
+                 :profile-email (:email profile))

-        (eml/has-bounce-reports? conn (:email profile))
-        (l/wrn :hint "attempt of profile recovery: email has bounces"
-               :profile-id (str (:id profile))
-               :profile-email (:email profile))
+          (eml/has-bounce-reports? conn (:email profile))
+          (l/wrn :hint "attempt of profile recovery: email has bounces"
+                 :profile-id (str (:id profile))
+                 :profile-email (:email profile))

-        (eml/has-complaint-reports? conn (:email profile))
-        (l/wrn :hint "attempt of profile recovery: email has complaints"
-               :profile-id (str (:id profile))
-               :profile-email (:email profile))
+          (not (elapsed-verify-threshold? profile))
+          (l/wrn :hint "attempt of profile recovery: retry attempt threshold not elapsed"
+                 :profile-id (str (:id profile))
+                 :profile-email (:email profile))

-        (not (elapsed-verify-threshold? profile))
-        (l/wrn :hint "attempt of profile recovery: retry attempt threshold not elapsed"
-               :profile-id (str (:id profile))
-               :profile-email (:email profile))

-        :else
-        (do
-          (db/update! conn :profile
-                      {:modified-at (dt/now)}
-                      {:id (:id profile)})
-          (->> profile
-               (create-recovery-token)
-               (send-email-notification conn)))))))
+          :else
+          (do
+            (db/update! conn :profile
+                        {:modified-at (dt/now)}
+                        {:id (:id profile)})
+            (->> profile
+                 (create-recovery-token)
+                 (send-email-notification conn))))))))
+

 (def schema:request-profile-recovery
  [:map {:title "request-profile-recovery"}
@@ -555,6 +497,6 @@
   ::doc/added "1.15"
   ::sm/params schema:request-profile-recovery}
  [cfg params]
-  (db/tx-run! cfg request-profile-recovery params))
+  (request-profile-recovery cfg params))


--- a/backend/src/app/rpc/commands/binfile.clj
+++ b/backend/src/app/rpc/commands/binfile.clj
@@ -32,11 +32,12 @@

 (def ^:private
  schema:export-binfile
-  [:map {:title "export-binfile"}
-   [:name [:string {:max 250}]]
-   [:file-id ::sm/uuid]
-   [:include-libraries :boolean]
-   [:embed-assets :boolean]])
+  (sm/define
+    [:map {:title "export-binfile"}
+     [:name :string]
+     [:file-id ::sm/uuid]
+     [:include-libraries :boolean]
+     [:embed-assets :boolean]]))

 (sv/defmethod ::export-binfile
  "Export a penpot file in a binary format."
@@ -77,10 +78,11 @@

 (def ^:private
  schema:import-binfile
-  [:map {:title "import-binfile"}
-   [:name [:string {:max 250}]]
-   [:project-id ::sm/uuid]
-   [:file ::media/upload]])
+  (sm/define
+    [:map {:title "import-binfile"}
+     [:name :string]
+     [:project-id ::sm/uuid]
+     [:file ::media/upload]]))

 (sv/defmethod ::import-binfile
  "Import a penpot file in a binary format."
--- a/backend/src/app/rpc/commands/comments.clj
+++ b/backend/src/app/rpc/commands/comments.clj
@@ -71,15 +71,10 @@
  [conn comment-id & {:as opts}]
  (db/get-by-id conn :comment comment-id opts))

-(def ^:private sql:get-next-seqn
-  "SELECT (f.comment_thread_seqn + 1) AS next_seqn
-     FROM file AS f
-    WHERE f.id = ?
-      FOR UPDATE")
-
 (defn- get-next-seqn
  [conn file-id]
-  (let [res (db/exec-one! conn [sql:get-next-seqn file-id])]
+  (let [sql "select (f.comment_thread_seqn + 1) as next_seqn from file as f where f.id = ?"
+        res (db/exec-one! conn [sql file-id])]
    (:next-seqn res)))

 (def sql:upsert-comment-thread-status
@@ -297,7 +292,7 @@
  [:map {:title "create-comment-thread"}
   [:file-id ::sm/uuid]
   [:position ::gpt/point]
-   [:content [:string {:max 750}]]
+   [:content :string]
   [:page-id ::sm/uuid]
   [:frame-id ::sm/uuid]
   [:share-id {:optional true} [:maybe ::sm/uuid]]])
@@ -309,43 +304,38 @@
   ::rtry/when rtry/conflict-exception?
   ::sm/params schema:create-comment-thread}
  [cfg {:keys [::rpc/profile-id ::rpc/request-at file-id page-id share-id position content frame-id]}]
-  (files/check-comment-permissions! cfg profile-id file-id share-id)

-  (let [{:keys [team-id project-id page-name]} (get-file cfg file-id page-id)]
+  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
+                    (files/check-comment-permissions! cfg profile-id file-id share-id)
+                    (let [{:keys [team-id project-id page-name]} (get-file conn file-id page-id)]

-    (-> cfg
-        (assoc ::quotes/profile-id profile-id)
-        (assoc ::quotes/team-id team-id)
-        (assoc ::quotes/project-id project-id)
-        (assoc ::quotes/file-id file-id)
-        (quotes/check! {::quotes/id ::quotes/comment-threads-per-file}
-                       {::quotes/id ::quotes/comments-per-file}))
+                      (run! (partial quotes/check-quote! cfg)
+                            (list {::quotes/id ::quotes/comment-threads-per-file
+                                   ::quotes/profile-id profile-id
+                                   ::quotes/team-id team-id
+                                   ::quotes/project-id project-id
+                                   ::quotes/file-id file-id}
+                                  {::quotes/id ::quotes/comments-per-file
+                                   ::quotes/profile-id profile-id
+                                   ::quotes/team-id team-id
+                                   ::quotes/project-id project-id
+                                   ::quotes/file-id file-id}))

-    (let [params {:created-at request-at
-                  :profile-id profile-id
-                  :file-id file-id
-                  :page-id page-id
-                  :page-name page-name
-                  :position position
-                  :content content
-                  :frame-id frame-id}
-          thread (db/tx-run! cfg create-comment-thread params)]
-
-      (vary-meta thread assoc ::audit/props thread))))
+                      (create-comment-thread conn {:created-at request-at
+                                                   :profile-id profile-id
+                                                   :file-id file-id
+                                                   :page-id page-id
+                                                   :page-name page-name
+                                                   :position position
+                                                   :content content
+                                                   :frame-id frame-id})))))

 (defn- create-comment-thread
-  [{:keys [::db/conn] :as cfg}
-   {:keys [profile-id file-id page-id page-name created-at position content frame-id]}]
-
-  (let [;; NOTE: we take the next seq number from a separate query
-        ;; because we need to lock the file for avoid race conditions
-
-        ;; FIXME: this method touches and locks the file table,which
-        ;; is already heavy-update tablel; we need to think on move
-        ;; the sequence state management to a different table or
-        ;; different storage (example: redis) for alivate the update
-        ;; pression on the file table
+  [conn {:keys [profile-id file-id page-id page-name created-at position content frame-id]}]

+  (let [;; NOTE: we take the next seq number from a separate query because the whole
+        ;; operation can be retried on conflict, and in this case the new seq shold be
+        ;; retrieved from the database.
        seqn      (get-next-seqn conn file-id)
        thread-id (uuid/next)
        thread    (db/insert! conn :comment-thread
@@ -374,8 +364,7 @@
    ;; Optimistic update of current seq number on file.
    (db/update! conn :file
                {:comment-thread-seqn seqn}
-                {:id file-id}
-                {::db/return-keys false})
+                {:id file-id})

    (-> thread
        (select-keys [:id :file-id :page-id])
@@ -398,6 +387,7 @@
                      (files/check-comment-permissions! conn profile-id file-id share-id)
                      (upsert-comment-thread-status! conn profile-id id)))))

+
 ;; --- COMMAND: Update Comment Thread

 (def ^:private
@@ -428,7 +418,7 @@
  schema:create-comment
  [:map {:title "create-comment"}
   [:thread-id ::sm/uuid]
-   [:content [:string {:max 250}]]
+   [:content :string]
   [:share-id {:optional true} [:maybe ::sm/uuid]]])

 (sv/defmethod ::create-comment
@@ -442,11 +432,12 @@
                      {:keys [team-id project-id page-name] :as file} (get-file cfg file-id page-id)]

                  (files/check-comment-permissions! conn profile-id file-id share-id)
-                  (quotes/check! cfg {::quotes/id ::quotes/comments-per-file
-                                      ::quotes/profile-id profile-id
-                                      ::quotes/team-id team-id
-                                      ::quotes/project-id project-id
-                                      ::quotes/file-id file-id})
+                  (quotes/check-quote! conn
+                                       {::quotes/id ::quotes/comments-per-file
+                                        ::quotes/profile-id profile-id
+                                        ::quotes/team-id team-id
+                                        ::quotes/project-id project-id
+                                        ::quotes/file-id file-id})

                  ;; Update the page-name cached attribute on comment thread table.
                  (when (not= page-name (:page-name thread))
@@ -486,7 +477,7 @@
  schema:update-comment
  [:map {:title "update-comment"}
   [:id ::sm/uuid]
-   [:content [:string {:max 250}]]
+   [:content :string]
   [:share-id {:optional true} [:maybe ::sm/uuid]]])

 (sv/defmethod ::update-comment
--- a/backend/src/app/rpc/commands/demo.clj
+++ b/backend/src/app/rpc/commands/demo.clj
@@ -18,7 +18,10 @@
   [app.util.services :as sv]
   [app.util.time :as dt]
   [buddy.core.codecs :as bc]
-   [buddy.core.nonce :as bn]))
+   [buddy.core.nonce :as bn]
+   [clojure.spec.alpha :as s]))
+
+(s/def ::create-demo-profile any?)

 (sv/defmethod ::create-demo-profile
  "A command that is responsible of creating a demo purpose
@@ -45,7 +48,7 @@
        params   {:email email
                  :fullname fullname
                  :is-active true
-                  :deleted-at (dt/in-future (cf/get-deletion-delay))
+                  :deleted-at (dt/in-future cf/deletion-delay)
                  :password (profile/derive-password cfg password)
                  :props {}}]

--- a/backend/src/app/rpc/commands/feedback.clj
+++ b/backend/src/app/rpc/commands/feedback.clj
@@ -8,25 +8,29 @@
  "A general purpose feedback module."
  (:require
   [app.common.exceptions :as ex]
-   [app.common.schema :as sm]
+   [app.common.spec :as us]
   [app.config :as cf]
   [app.db :as db]
   [app.email :as eml]
   [app.rpc :as-alias rpc]
   [app.rpc.commands.profile :as profile]
   [app.rpc.doc :as-alias doc]
-   [app.util.services :as sv]))
+   [app.util.services :as sv]
+   [clojure.spec.alpha :as s]))

 (declare ^:private send-feedback!)

-(def ^:private schema:send-user-feedback
-  [:map {:title "send-user-feedback"}
-   [:subject [:string {:max 400}]]
-   [:content [:string {:max 2500}]]])
+(s/def ::content ::us/string)
+(s/def ::from    ::us/email)
+(s/def ::subject ::us/string)
+
+(s/def ::send-user-feedback
+  (s/keys :req [::rpc/profile-id]
+          :req-un [::subject
+                   ::content]))

 (sv/defmethod ::send-user-feedback
-  {::doc/added "1.18"
-   ::sm/params schema:send-user-feedback}
+  {::doc/added "1.18"}
  [{:keys [::db/pool]} {:keys [::rpc/profile-id] :as params}]
  (when-not (contains? cf/flags :user-feedback)
    (ex/raise :type :restriction
--- a/backend/src/app/rpc/commands/files.clj
+++ b/backend/src/app/rpc/commands/files.clj
@@ -15,6 +15,7 @@
   [app.common.logging :as l]
   [app.common.schema :as sm]
   [app.common.schema.desc-js-like :as-alias smdj]
+   [app.common.spec :as us]
   [app.common.types.components-list :as ctkl]
   [app.common.types.file :as ctf]
   [app.config :as cf]
@@ -34,7 +35,7 @@
   [app.util.pointer-map :as pmap]
   [app.util.services :as sv]
   [app.util.time :as dt]
-   [app.worker :as wrk]
+   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]))

 ;; --- FEATURES
@@ -44,6 +45,18 @@
  (when media-id
    (str (cf/get :public-uri) "/assets/by-id/" media-id)))

+;; --- SPECS
+
+(s/def ::features ::us/set-of-strings)
+(s/def ::file-id ::us/uuid)
+(s/def ::frame-id ::us/uuid)
+(s/def ::id ::us/uuid)
+(s/def ::is-shared ::us/boolean)
+(s/def ::name ::us/string)
+(s/def ::project-id ::us/uuid)
+(s/def ::search-term ::us/string)
+(s/def ::team-id ::us/uuid)
+
 ;; --- HELPERS

 (def long-cache-duration
@@ -68,9 +81,6 @@
                :max-version fmg/version))
    file))

-
-;; --- FILE DATA
-
 ;; --- FILE PERMISSIONS

 (def ^:private sql:file-permissions
@@ -174,34 +184,38 @@
 ;; --- COMMAND QUERY: get-file (by id)

 (def schema:file
-  [:map {:title "File"}
-   [:id ::sm/uuid]
-   [:features ::cfeat/features]
-   [:has-media-trimmed ::sm/boolean]
-   [:comment-thread-seqn [::sm/int {:min 0}]]
-   [:name [:string {:max 250}]]
-   [:revn [::sm/int {:min 0}]]
-   [:modified-at ::dt/instant]
-   [:is-shared ::sm/boolean]
-   [:project-id ::sm/uuid]
-   [:created-at ::dt/instant]
-   [:data {:optional true} :any]])
+  (sm/define
+    [:map {:title "File"}
+     [:id ::sm/uuid]
+     [:features ::cfeat/features]
+     [:has-media-trimmed :boolean]
+     [:comment-thread-seqn {:min 0} :int]
+     [:name :string]
+     [:revn {:min 0} :int]
+     [:modified-at ::dt/instant]
+     [:is-shared :boolean]
+     [:project-id ::sm/uuid]
+     [:created-at ::dt/instant]
+     [:data {:optional true} :any]]))

 (def schema:permissions-mixin
-  [:map {:title "PermissionsMixin"}
-   [:permissions ::perms/permissions]])
+  (sm/define
+    [:map {:title "PermissionsMixin"}
+     [:permissions ::perms/permissions]]))

 (def schema:file-with-permissions
-  [:merge {:title "FileWithPermissions"}
-   schema:file
-   schema:permissions-mixin])
+  (sm/define
+    [:merge {:title "FileWithPermissions"}
+     schema:file
+     schema:permissions-mixin]))

 (def ^:private
  schema:get-file
-  [:map {:title "get-file"}
-   [:features {:optional true} ::cfeat/features]
-   [:id ::sm/uuid]
-   [:project-id {:optional true} ::sm/uuid]])
+  (sm/define
+    [:map {:title "get-file"}
+     [:features {:optional true} ::cfeat/features]
+     [:id ::sm/uuid]
+     [:project-id {:optional true} ::sm/uuid]]))

 (defn- migrate-file
  [{:keys [::db/conn] :as cfg} {:keys [id] :as file}]
@@ -257,19 +271,18 @@
  (let [params (merge {:id id}
                      (when (some? project-id)
                        {:project-id project-id}))
-        file   (->> (db/get conn :file params
-                            {::db/check-deleted (not include-deleted?)
-                             ::db/remove-deleted (not include-deleted?)
-                             ::sql/for-update lock-for-update?})
-                    (feat.fdata/resolve-file-data cfg)
-                    (decode-row))]
+        file   (-> (db/get conn :file params
+                           {::db/check-deleted (not include-deleted?)
+                            ::db/remove-deleted (not include-deleted?)
+                            ::sql/for-update lock-for-update?})
+                   (decode-row))]
    (if (and migrate? (fmg/need-migration? file))
      (migrate-file cfg file)
      file)))

 (defn get-minimal-file
  [cfg id & {:as opts}]
-  (let [opts (assoc opts ::sql/columns [:id :modified-at :deleted-at :revn :data-ref-id :data-backend])]
+  (let [opts (assoc opts ::sql/columns [:id :modified-at :revn])]
    (db/get cfg :file {:id id} opts)))

 (defn get-file-etag
@@ -327,11 +340,9 @@
   [:share-id {:optional true} ::sm/uuid]])

 (defn- get-file-fragment
-  [cfg file-id fragment-id]
-  (let [resolve-file-data (partial feat.fdata/resolve-file-data cfg)]
-    (some-> (db/get cfg :file-data-fragment {:file-id file-id :id fragment-id})
-            (resolve-file-data)
-            (update :data blob/decode))))
+  [conn file-id fragment-id]
+  (some-> (db/get conn :file-data-fragment {:file-id file-id :id fragment-id})
+          (update :content blob/decode)))

 (sv/defmethod ::get-file-fragment
  "Retrieve a file fragment by its ID. Only authenticated users."
@@ -339,12 +350,12 @@
   ::rpc/auth false
   ::sm/params schema:get-file-fragment
   ::sm/result schema:file-fragment}
-  [cfg {:keys [::rpc/profile-id file-id fragment-id share-id]}]
-  (db/run! cfg (fn [cfg]
-                 (let [perms (get-permissions cfg profile-id file-id share-id)]
-                   (check-read-permissions! perms)
-                   (-> (get-file-fragment cfg file-id fragment-id)
-                       (rph/with-http-cache long-cache-duration))))))
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id fragment-id share-id]}]
+  (dm/with-open [conn (db/open pool)]
+    (let [perms (get-permissions conn profile-id file-id share-id)]
+      (check-read-permissions! perms)
+      (-> (get-file-fragment conn file-id fragment-id)
+          (rph/with-http-cache long-cache-duration)))))

 ;; --- COMMAND QUERY: get-project-files

@@ -356,7 +367,7 @@
          f.name,
          f.revn,
          f.is_shared,
-          ft.media_id AS thumbnail_id
+          ft.media_id
     from file as f
     left join file_thumbnail as ft on (ft.file_id = f.id
                                        and ft.revn = f.revn
@@ -367,7 +378,13 @@

 (defn get-project-files
  [conn project-id]
-  (db/exec! conn [sql:project-files project-id]))
+  (->> (db/exec! conn [sql:project-files project-id])
+       (mapv (fn [row]
+               (if-let [media-id (:media-id row)]
+                 (-> row
+                     (dissoc :media-id)
+                     (assoc :thumbnail-uri (resolve-public-uri media-id)))
+                 (dissoc row :media-id))))))

 (def schema:get-project-files
  [:map {:title "get-project-files"}
@@ -398,7 +415,7 @@
  "Checks if the file has libraries. Returns a boolean"
  {::doc/added "1.15.1"
   ::sm/params schema:has-file-libraries
-   ::sm/result ::sm/boolean}
+   ::sm/result :boolean}
  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id]}]
  (dm/with-open [conn (db/open pool)]
    (check-read-permissions! pool profile-id file-id)
@@ -477,7 +494,7 @@
   [:file-id ::sm/uuid]
   [:page-id {:optional true} ::sm/uuid]
   [:share-id {:optional true} ::sm/uuid]
-   [:object-id {:optional true} [:or ::sm/uuid [::sm/set ::sm/uuid]]]
+   [:object-id {:optional true} [:or ::sm/uuid ::sm/coll-of-uuid]]
   [:features {:optional true} ::cfeat/features]])

 (sv/defmethod ::get-page
@@ -653,7 +670,7 @@
            f.modified_at,
            f.name,
            f.is_shared,
-            ft.media_id AS thumbnail_id,
+            ft.media_id,
            row_number() over w as row_num
       from file as f
      inner join project as p on (p.id = f.project_id)
@@ -672,8 +689,10 @@
  [conn team-id]
  (->> (db/exec! conn [sql:team-recent-files team-id])
       (mapv (fn [row]
-               (if-let [media-id (:thumbnail-id row)]
-                 (assoc row :thumbnail-uri (resolve-public-uri media-id))
+               (if-let [media-id (:media-id row)]
+                 (-> row
+                     (dissoc :media-id)
+                     (assoc :thumbnail-uri (resolve-public-uri media-id)))
                 (dissoc row :media-id))))))

 (def ^:private schema:get-team-recent-files
@@ -719,23 +738,6 @@
  [cfg {:keys [::rpc/profile-id] :as params}]
  (db/tx-run! cfg get-file-summary (assoc params :profile-id profile-id)))

-
-;; --- COMMAND QUERY: get-file-info
-
-(defn- get-file-info
-  [{:keys [::db/conn] :as cfg} {:keys [id] :as params}]
-  (db/get* conn :file
-           {:id id}
-           {::sql/columns [:id]}))
-
-(sv/defmethod ::get-file-info
-  "Retrieve minimal file info by its ID."
-  {::rpc/auth false
-   ::doc/added "2.2.0"
-   ::sm/params schema:get-file}
-  [cfg params]
-  (db/tx-run! cfg get-file-info params))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; MUTATION COMMANDS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -758,19 +760,19 @@
   [:map {:title "RenameFileEvent"}
    [:id ::sm/uuid]
    [:project-id ::sm/uuid]
-    [:name [:string {:max 250}]]
+    [:name :string]
    [:created-at ::dt/instant]
    [:modified-at ::dt/instant]]

   ::sm/params
   [:map {:title "RenameFileParams"}
-    [:name [:string {:min 1 :max 250}]]
+    [:name {:min 1} :string]
    [:id ::sm/uuid]]

   ::sm/result
   [:map {:title "SimplifiedFile"}
    [:id ::sm/uuid]
-    [:name [:string {:max 250}]]
+    [:name :string]
    [:created-at ::dt/instant]
    [:modified-at ::dt/instant]]}

@@ -815,13 +817,12 @@
      (db/update! cfg :file
                  {:revn (inc (:revn file))
                   :data (blob/encode (:data file))
-                   :modified-at (dt/now)
-                   :has-media-trimmed false}
+                   :modified-at (dt/now)}
                  {:id file-id})

      (feat.fdata/persist-pointers! cfg file-id))))

-(defn- absorb-library
+(defn- absorb-library!
  "Find all files using a shared library, and absorb all library assets
  into the file local libraries"
  [cfg {:keys [id] :as library}]
@@ -839,26 +840,7 @@
           :library-id (str id)
           :files (str/join "," (map str ids)))

-    (run! (partial absorb-library-by-file! cfg ldata) ids)
-    library))
-
-(defn absorb-library!
-  [{:keys [::db/conn] :as cfg} id]
-  (let [file (-> (get-file cfg id
-                           :lock-for-update? true
-                           :include-deleted? true)
-                 (check-version!))
-
-        proj (db/get* conn :project {:id (:project-id file)}
-                      {::db/remove-deleted false})
-        team (-> (db/get* conn :team {:id (:team-id proj)}
-                          {::db/remove-deleted false})
-                 (teams/decode-row))]
-
-    (-> (cfeat/get-team-enabled-features cf/flags team)
-        (cfeat/check-file-features! (:features file)))
-
-    (absorb-library cfg file)))
+    (run! (partial absorb-library-by-file! cfg ldata) ids)))

 (defn- set-file-shared
  [{:keys [::db/conn] :as cfg} {:keys [profile-id id] :as params}]
@@ -871,14 +853,25 @@
               ;; file, we need to perform more complex operation,
               ;; so in this case we retrieve the complete file and
               ;; perform all required validations.
-               (let [file (-> (absorb-library! cfg id)
-                              (assoc :is-shared false))]
+               (let [file (-> (get-file cfg id :lock-for-update? true)
+                              (check-version!)
+                              (assoc :is-shared false))
+                     team (teams/get-team conn
+                                          :profile-id profile-id
+                                          :project-id (:project-id file))]
+
+                 (-> (cfeat/get-team-enabled-features cf/flags team)
+                     (cfeat/check-client-features! (:features params))
+                     (cfeat/check-file-features! (:features file)))
+
+                 (absorb-library! cfg file)
+
                 (db/delete! conn :file-library-rel {:library-file-id id})
                 (db/update! conn :file
                             {:is-shared false
                              :modified-at (dt/now)}
                             {:id id})
-                 (select-keys file [:id :name :is-shared]))
+                 file)

               (and (false? (:is-shared file))
                    (true? (:is-shared params)))
@@ -904,9 +897,10 @@

 (def ^:private
  schema:set-file-shared
-  [:map {:title "set-file-shared"}
-   [:id ::sm/uuid]
-   [:is-shared ::sm/boolean]])
+  (sm/define
+    [:map {:title "set-file-shared"}
+     [:id ::sm/uuid]
+     [:is-shared :boolean]]))

 (sv/defmethod ::set-file-shared
  {::doc/added "1.17"
@@ -917,29 +911,45 @@

 ;; --- MUTATION COMMAND: delete-file

-(defn- mark-file-deleted
+(defn- mark-file-deleted!
  [conn file-id]
-  (let [file (db/update! conn :file
-                         {:deleted-at (dt/now)}
-                         {:id file-id}
-                         {::db/return-keys [:id :name :is-shared :deleted-at
-                                            :project-id :created-at :modified-at]})]
-    (wrk/submit! {::db/conn conn
-                  ::wrk/task :delete-object
-                  ::wrk/params {:object :file
-                                :deleted-at (:deleted-at file)
-                                :id file-id}})
-    file))
+  (db/update! conn :file
+              {:deleted-at (dt/now)}
+              {:id file-id}
+              {::db/return-keys [:id :name :is-shared :project-id :created-at :modified-at]}))

 (def ^:private
  schema:delete-file
-  [:map {:title "delete-file"}
-   [:id ::sm/uuid]])
+  (sm/define
+    [:map {:title "delete-file"}
+     [:id ::sm/uuid]]))

 (defn- delete-file
  [{:keys [::db/conn] :as cfg} {:keys [profile-id id] :as params}]
  (check-edition-permissions! conn profile-id id)
-  (let [file (mark-file-deleted conn id)]
+  (let [file (mark-file-deleted! conn id)]
+
+    ;; NOTE: when a file is a shared library, then we proceed to load
+    ;; the whole file, proceed with feature checking and properly execute
+    ;; the absorb-library procedure
+    (when (:is-shared file)
+      (let [file (-> (get-file cfg id
+                               :lock-for-update? true
+                               :include-deleted? true)
+                     (check-version!))
+
+            team (teams/get-team conn
+                                 :profile-id profile-id
+                                 :project-id (:project-id file))]
+
+
+
+        (-> (cfeat/get-team-enabled-features cf/flags team)
+            (cfeat/check-client-features! (:features params))
+            (cfeat/check-file-features! (:features file)))
+
+        (absorb-library! cfg file)))
+
    (rph/with-meta (rph/wrap)
      {::audit/props {:project-id (:project-id file)
                      :name (:name file)
@@ -966,9 +976,10 @@

 (def ^:private
  schema:link-file-to-library
-  [:map {:title "link-file-to-library"}
-   [:file-id ::sm/uuid]
-   [:library-id ::sm/uuid]])
+  (sm/define
+    [:map {:title "link-file-to-library"}
+     [:file-id ::sm/uuid]
+     [:library-id ::sm/uuid]]))

 (sv/defmethod ::link-file-to-library
  {::doc/added "1.17"
@@ -1042,16 +1053,14 @@
              {:id file-id}
              {::db/return-keys true}))

-(def ^:private schema:ignore-file-library-sync-status
-  [:map {:title "ignore-file-library-sync-status"}
-   [:file-id ::sm/uuid]
-   [:date ::dt/instant]])
+(s/def ::ignore-file-library-sync-status
+  (s/keys :req [::rpc/profile-id]
+          :req-un [::file-id ::date]))

 ;; TODO: improve naming
 (sv/defmethod ::ignore-file-library-sync-status
  "Ignore updates in linked files"
-  {::doc/added "1.17"
-   ::sm/params schema:ignore-file-library-sync-status}
+  {::doc/added "1.17"}
  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id] :as params}]
  (db/with-atomic [conn pool]
    (check-edition-permissions! conn profile-id file-id)
--- a/backend/src/app/rpc/commands/files_create.clj
+++ b/backend/src/app/rpc/commands/files_create.clj
@@ -6,10 +6,13 @@

 (ns app.rpc.commands.files-create
  (:require
+   [app.common.data :as d]
   [app.common.data.macros :as dm]
   [app.common.features :as cfeat]
+   [app.common.files.defaults :refer [version]]
   [app.common.schema :as sm]
   [app.common.types.file :as ctf]
+   [app.common.uuid :as uuid]
   [app.config :as cf]
   [app.db :as db]
   [app.features.fdata :as feat.fdata]
@@ -37,7 +40,7 @@
 (defn create-file
  [{:keys [::db/conn] :as cfg}
   {:keys [id name project-id is-shared revn
-           modified-at deleted-at create-page page-id
+           modified-at deleted-at create-page
           ignore-sync-until features]
    :or {is-shared false revn 0 create-page true}
    :as params}]
@@ -48,17 +51,23 @@

  (binding [pmap/*tracked* (pmap/create-tracked)
            cfeat/*current* features]
-    (let [file     (ctf/make-file {:id id
-                                   :project-id project-id
-                                   :name name
-                                   :revn revn
-                                   :is-shared is-shared
-                                   :features features
-                                   :ignore-sync-until ignore-sync-until
-                                   :modified-at modified-at
-                                   :deleted-at deleted-at
-                                   :create-page create-page
-                                   :page-id page-id})
+    (let [id       (or id (uuid/next))
+
+          data     (if create-page
+                     (ctf/make-file-data id)
+                     (ctf/make-file-data id nil))
+
+          file     {:id id
+                    :project-id project-id
+                    :name name
+                    :revn revn
+                    :is-shared is-shared
+                    :version version
+                    :data data
+                    :features features
+                    :ignore-sync-until ignore-sync-until
+                    :modified-at modified-at
+                    :deleted-at deleted-at}

          file     (if (contains? features "fdata/objects-map")
                     (feat.fdata/enable-objects-map file)
@@ -66,7 +75,9 @@

          file     (if (contains? features "fdata/pointer-map")
                     (feat.fdata/enable-pointer-map file)
-                     file)]
+                     file)
+
+          file     (d/without-nils file)]

      (db/insert! conn :file
                  (-> file
@@ -75,9 +86,9 @@
                  {::db/return-keys false})

      (when (contains? features "fdata/pointer-map")
-        (feat.fdata/persist-pointers! cfg (:id file)))
+        (feat.fdata/persist-pointers! cfg id))

-      (->> (assoc params :file-id (:id file) :role :owner)
+      (->> (assoc params :file-id id :role :owner)
           (create-file-role! conn))

      (db/update! conn :project
@@ -88,59 +99,56 @@

 (def ^:private schema:create-file
  [:map {:title "create-file"}
-   [:name [:string {:max 250}]]
+   [:name :string]
   [:project-id ::sm/uuid]
   [:id {:optional true} ::sm/uuid]
-   [:is-shared {:optional true} ::sm/boolean]
+   [:is-shared {:optional true} :boolean]
   [:features {:optional true} ::cfeat/features]])

 (sv/defmethod ::create-file
  {::doc/added "1.17"
   ::doc/module :files
   ::webhooks/event? true
-   ::sm/params schema:create-file
-   ::db/transaction true}
-  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id project-id] :as params}]
-  (projects/check-edition-permissions! conn profile-id project-id)
-  (let [team     (teams/get-team conn
-                                 :profile-id profile-id
-                                 :project-id project-id)
-        team-id  (:id team)
+   ::sm/params schema:create-file}
+  [cfg {:keys [::rpc/profile-id project-id] :as params}]
+  (db/tx-run! cfg
+              (fn [{:keys [::db/conn] :as cfg}]
+                (projects/check-edition-permissions! conn profile-id project-id)
+                (let [team     (teams/get-team conn
+                                               :profile-id profile-id
+                                               :project-id project-id)
+                      team-id  (:id team)

-        ;; When we create files, we only need to respect the team
-        ;; features, because some features can be enabled
-        ;; globally, but the team is still not migrated properly.
-        features (-> (cfeat/get-team-enabled-features cf/flags team)
-                     (cfeat/check-client-features! (:features params)))
+                      ;; When we create files, we only need to respect the team
+                      ;; features, because some features can be enabled
+                      ;; globally, but the team is still not migrated properly.
+                      features (-> (cfeat/get-team-enabled-features cf/flags team)
+                                   (cfeat/check-client-features! (:features params)))

-        ;; We also include all no migration features declared by
-        ;; client; that enables the ability to enable a runtime
-        ;; feature on frontend and make it permanent on file
-        features (-> (:features params #{})
-                     (set/intersection cfeat/no-migration-features)
-                     (set/union features))
+                      ;; We also include all no migration features declared by
+                      ;; client; that enables the ability to enable a runtime
+                      ;; feature on frontend and make it permanent on file
+                      features (-> (:features params #{})
+                                   (set/intersection cfeat/no-migration-features)
+                                   (set/union features))

-        params   (-> params
-                     (assoc :profile-id profile-id)
-                     (assoc :features features))]
+                      params   (-> params
+                                   (assoc :profile-id profile-id)
+                                   (assoc :features features))]

-    (quotes/check! cfg {::quotes/id ::quotes/files-per-project
-                        ::quotes/team-id team-id
-                        ::quotes/profile-id profile-id
-                        ::quotes/project-id project-id})
+                  (run! (partial quotes/check-quote! conn)
+                        (list {::quotes/id ::quotes/files-per-project
+                               ::quotes/team-id team-id
+                               ::quotes/profile-id profile-id
+                               ::quotes/project-id project-id}))

-    ;; FIXME: IMPORTANT: this code can have race
-    ;; conditions, because we have no locks for updating
-    ;; team so, creating two files concurrently can lead
-    ;; to lost team features updating
+                  ;; When newly computed features does not match exactly with
+                  ;; the features defined on team row, we update it.
+                  (when (not= features (:features team))
+                    (let [features (db/create-array conn "text" features)]
+                      (db/update! conn :team
+                                  {:features features}
+                                  {:id team-id})))

-    ;; When newly computed features does not match exactly with
-    ;; the features defined on team row, we update it.
-    (when (not= features (:features team))
-      (let [features (db/create-array conn "text" features)]
-        (db/update! conn :team
-                    {:features features}
-                    {:id team-id})))
-
-    (-> (create-file cfg params)
-        (vary-meta assoc ::audit/props {:team-id team-id}))))
+                  (-> (create-file cfg params)
+                      (vary-meta assoc ::audit/props {:team-id team-id}))))))
--- a/backend/src/app/rpc/commands/files_share.clj
+++ b/backend/src/app/rpc/commands/files_share.clj
@@ -7,24 +7,29 @@
 (ns app.rpc.commands.files-share
  "Share link related rpc mutation methods."
  (:require
-   [app.common.schema :as sm]
+   [app.common.spec :as us]
   [app.common.uuid :as uuid]
   [app.db :as db]
   [app.rpc :as-alias rpc]
   [app.rpc.commands.files :as files]
   [app.rpc.doc :as-alias doc]
-   [app.util.services :as sv]))
+   [app.util.services :as sv]
+   [clojure.spec.alpha :as s]))
+
+;; --- Helpers & Specs
+
+(s/def ::file-id ::us/uuid)
+(s/def ::who-comment ::us/string)
+(s/def ::who-inspect ::us/string)
+(s/def ::pages (s/every ::us/uuid :kind set?))

 ;; --- MUTATION: Create Share Link

 (declare create-share-link)

-(def ^:private schema:create-share-link
-  [:map {:title "create-share-link"}
-   [:file-id ::sm/uuid]
-   [:who-comment [:string {:max 250}]]
-   [:who-inspect [:string {:max 250}]]
-   [:pages [:set ::sm/uuid]]])
+(s/def ::create-share-link
+  (s/keys :req [::rpc/profile-id]
+          :req-un [::file-id ::who-comment ::who-inspect ::pages]))

 (sv/defmethod ::create-share-link
  "Creates a share-link object.
@@ -32,8 +37,7 @@
  Share links are resources that allows external users access to specific
  pages of a file with specific permissions (who-comment and who-inspect)."
  {::doc/added "1.18"
-   ::doc/module :files
-   ::sm/params schema:create-share-link}
+   ::doc/module :files}
  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id] :as params}]
  (db/with-atomic [conn pool]
    (files/check-edition-permissions! conn profile-id file-id)
@@ -54,14 +58,13 @@

 ;; --- MUTATION: Delete Share Link

-(def ^:private schema:delete-share-link
-  [:map {:title "delete-share-link"}
-   [:id ::sm/uuid]])
+(s/def ::delete-share-link
+  (s/keys :req [::rpc/profile-id]
+          :req-un [::us/id]))

 (sv/defmethod ::delete-share-link
  {::doc/added "1.18"
-   ::doc/module ::files
-   ::sm/params schema:delete-share-link}
+   ::doc/module ::files}
  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id] :as params}]
  (db/with-atomic [conn pool]
    (let [slink (db/get-by-id conn :share-link id)]
--- a/backend/src/app/rpc/commands/files_snapshot.clj
+++ b/backend/src/app/rpc/commands/files_snapshot.clj
@@ -13,15 +13,13 @@
   [app.config :as cf]
   [app.db :as db]
   [app.db.sql :as-alias sql]
-   [app.features.fdata :as feat.fdata]
   [app.main :as-alias main]
+   [app.media :as media]
   [app.rpc :as-alias rpc]
   [app.rpc.commands.files :as files]
   [app.rpc.commands.profile :as profile]
   [app.rpc.doc :as-alias doc]
   [app.storage :as sto]
-   [app.util.blob :as blob]
-   [app.util.pointer-map :as pmap]
   [app.util.services :as sv]
   [app.util.time :as dt]
   [cuerdas.core :as str]))
@@ -36,21 +34,20 @@
              :code :authentication-required
              :hint "only admins allowed")))

-(def sql:get-file-snapshots
-  "SELECT id, label, revn, created_at
-     FROM file_change
-    WHERE file_id = ?
-      AND created_at < ?
-      AND label IS NOT NULL
-    ORDER BY created_at DESC
-    LIMIT ?")
-
 (defn get-file-snapshots
  [{:keys [::db/conn]} {:keys [file-id limit start-at]
                        :or {limit Long/MAX_VALUE}}]
-  (let [start-at (or start-at (dt/now))
+  (let [query    (str "select id, label, revn, created_at "
+                      "  from file_change "
+                      " where file_id = ? "
+                      "   and created_at < ? "
+                      "   and data is not null "
+                      " order by created_at desc "
+                      " limit ?")
+        start-at (or start-at (dt/now))
        limit    (min limit 20)]
-    (->> (db/exec! conn [sql:get-file-snapshots file-id start-at limit])
+
+    (->> (db/exec! conn [query file-id start-at limit])
         (mapv (fn [row]
                 (update row :created-at dt/format-instant :rfc1123))))))

@@ -66,8 +63,8 @@
  (db/run! cfg get-file-snapshots params))

 (defn restore-file-snapshot!
-  [{:keys [::db/conn] :as cfg} {:keys [file-id id]}]
-  (let [storage  (sto/resolve cfg {::db/reuse-conn true})
+  [{:keys [::db/conn ::sto/storage] :as cfg} {:keys [file-id id]}]
+  (let [storage  (media/configure-assets-storage storage conn)
        file     (files/get-minimal-file conn file-id {::db/for-update true})
        snapshot (db/get* conn :file-change
                          {:file-id file-id
@@ -81,53 +78,43 @@
                :id id
                :file-id file-id))

-    (let [snapshot (feat.fdata/resolve-file-data cfg snapshot)]
-      (when-not (:data snapshot)
-        (ex/raise :type :precondition
-                  :code :snapshot-without-data
-                  :hint "snapshot has no data"
-                  :label (:label snapshot)
-                  :file-id file-id))
+    (when-not (:data snapshot)
+      (ex/raise :type :precondition
+                :code :snapshot-without-data
+                :hint "snapshot has no data"
+                :label (:label snapshot)
+                :file-id file-id))

-      (l/dbg :hint "restoring snapshot"
-             :file-id (str file-id)
-             :label (:label snapshot)
-             :snapshot-id (str (:id snapshot)))
+    (l/dbg :hint "restoring snapshot"
+           :file-id (str file-id)
+           :label (:label snapshot)
+           :snapshot-id (str (:id snapshot)))

-      ;; If the file was already offloaded, on restring the snapshot
-      ;; we are going to replace the file data, so we need to touch
-      ;; the old referenced storage object and avoid possible leaks
-      (when (feat.fdata/offloaded? file)
-        (sto/touch-object! storage (:data-ref-id file)))
+    (db/update! conn :file
+                {:data (:data snapshot)
+                 :revn (inc (:revn file))
+                 :features (:features snapshot)}
+                {:id file-id})

-      (db/update! conn :file
-                  {:data (:data snapshot)
-                   :revn (inc (:revn file))
-                   :version (:version snapshot)
-                   :data-backend nil
-                   :data-ref-id nil
-                   :has-media-trimmed false
-                   :features (:features snapshot)}
-                  {:id file-id})
+    ;; clean object thumbnails
+    (let [sql (str "update file_tagged_object_thumbnail "
+                   "   set deleted_at = now() "
+                   " where file_id=? returning media_id")
+          res (db/exec! conn [sql file-id])]

-      ;; clean object thumbnails
-      (let [sql (str "update file_tagged_object_thumbnail "
-                     "   set deleted_at = now() "
-                     " where file_id=? returning media_id")
-            res (db/exec! conn [sql file-id])]
-        (doseq [media-id (into #{} (keep :media-id) res)]
-          (sto/touch-object! storage media-id)))
+      (doseq [media-id (into #{} (keep :media-id) res)]
+        (sto/touch-object! storage media-id)))

-      ;; clean file thumbnails
-      (let [sql (str "update file_thumbnail "
-                     "   set deleted_at = now() "
-                     " where file_id=? returning media_id")
-            res (db/exec! conn [sql file-id])]
-        (doseq [media-id (into #{} (keep :media-id) res)]
-          (sto/touch-object! storage media-id)))
+    ;; clean object thumbnails
+    (let [sql (str "update file_thumbnail "
+                   "   set deleted_at = now() "
+                   " where file_id=? returning media_id")
+          res (db/exec! conn [sql file-id])]
+      (doseq [media-id (into #{} (keep :media-id) res)]
+        (sto/touch-object! storage media-id)))

-      {:id (:id snapshot)
-       :label (:label snapshot)})))
+    {:id (:id snapshot)
+     :label (:label snapshot)}))

 (defn- resolve-snapshot-by-label
  [conn file-id label]
@@ -159,33 +146,21 @@
                                   (merge (resolve-snapshot-by-label conn file-id label)))]
                      (restore-file-snapshot! cfg params)))))

-(defn- get-file
-  [cfg file-id]
-  (let [file (->> (db/get cfg :file {:id file-id})
-                  (feat.fdata/resolve-file-data cfg))]
-    (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg file-id)]
-      (-> file
-          (update :data blob/decode)
-          (update :data feat.fdata/process-pointers deref)
-          (update :data feat.fdata/process-objects (partial into {}))
-          (update :data blob/encode)))))
-
 (defn take-file-snapshot!
-  [cfg {:keys [file-id label ::rpc/profile-id]}]
-  (let [file  (get-file cfg file-id)
+  [cfg {:keys [file-id label]}]
+  (let [conn  (db/get-connection cfg)
+        file  (db/get conn :file {:id file-id})
        id    (uuid/next)]

    (l/debug :hint "creating file snapshot"
             :file-id (str file-id)
             :label label)

-    (db/insert! cfg :file-change
+    (db/insert! conn :file-change
                {:id id
                 :revn (:revn file)
                 :data (:data file)
-                 :version (:version file)
                 :features (:features file)
-                 :profile-id profile-id
                 :file-id (:id file)
                 :label label}
                {::db/return-keys false})
--- a/backend/src/app/rpc/commands/files_temp.clj
+++ b/backend/src/app/rpc/commands/files_temp.clj
@@ -16,7 +16,6 @@
   [app.db.sql :as sql]
   [app.features.components-v2 :as feat.compv2]
   [app.features.fdata :as fdata]
-   [app.loggers.audit :as audit]
   [app.rpc :as-alias rpc]
   [app.rpc.commands.files :as files]
   [app.rpc.commands.files-create :as files.create]
@@ -24,7 +23,6 @@
   [app.rpc.commands.projects :as projects]
   [app.rpc.commands.teams :as teams]
   [app.rpc.doc :as-alias doc]
-   [app.rpc.helpers :as rph]
   [app.util.blob :as blob]
   [app.util.pointer-map :as pmap]
   [app.util.services :as sv]
@@ -35,48 +33,47 @@

 (def ^:private schema:create-temp-file
  [:map {:title "create-temp-file"}
-   [:name [:string {:max 250}]]
+   [:name :string]
   [:project-id ::sm/uuid]
   [:id {:optional true} ::sm/uuid]
-   [:is-shared ::sm/boolean]
+   [:is-shared :boolean]
   [:features ::cfeat/features]
-   [:create-page ::sm/boolean]])
+   [:create-page :boolean]])

 (sv/defmethod ::create-temp-file
  {::doc/added "1.17"
   ::doc/module :files
-   ::sm/params schema:create-temp-file
-   ::db/transaction true}
-  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id project-id] :as params}]
-  (projects/check-edition-permissions! conn profile-id project-id)
-  (let [team (teams/get-team conn :profile-id profile-id :project-id project-id)
-        ;; When we create files, we only need to respect the team
-        ;; features, because some features can be enabled
-        ;; globally, but the team is still not migrated properly.
-        input-features
-        (:features params #{})
+   ::sm/params schema:create-temp-file}
+  [cfg {:keys [::rpc/profile-id project-id] :as params}]
+  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
+                    (projects/check-edition-permissions! conn profile-id project-id)
+                    (let [team     (teams/get-team conn :profile-id profile-id :project-id project-id)

-        ;; If the imported project doesn't contain v2 we need to remove it
-        team-features
-        (cond-> (cfeat/get-team-enabled-features cf/flags team)
-          (not (contains? input-features "components/v2"))
-          (disj "components/v2"))
+                          ;; When we create files, we only need to respect the team
+                          ;; features, because some features can be enabled
+                          ;; globally, but the team is still not migrated properly.
+                          input-features (:features params #{})

-        ;; We also include all no migration features declared by
-        ;; client; that enables the ability to enable a runtime
-        ;; feature on frontend and make it permanent on file
-        features
-        (-> input-features
-            (set/intersection cfeat/no-migration-features)
-            (set/union team-features))
+                          ;; If the imported project doesn't contain v2 we need to remove it
+                          team-features
+                          (cond-> (cfeat/get-team-enabled-features cf/flags team)
+                            (not (contains? input-features "components/v2"))
+                            (disj "components/v2"))

-        params
-        (-> params
-            (assoc :profile-id profile-id)
-            (assoc :deleted-at (dt/in-future {:days 1}))
-            (assoc :features features))]

-    (files.create/create-file cfg params)))
+                          ;; We also include all no migration features declared by
+                          ;; client; that enables the ability to enable a runtime
+                          ;; feature on frontend and make it permanent on file
+                          features (-> input-features
+                                       (set/intersection cfeat/no-migration-features)
+                                       (set/union team-features))
+
+                          params   (-> params
+                                       (assoc :profile-id profile-id)
+                                       (assoc :deleted-at (dt/in-future {:days 1}))
+                                       (assoc :features features))]
+
+                      (files.create/create-file cfg params)))))

 ;; --- MUTATION COMMAND: update-temp-file

@@ -84,7 +81,7 @@
 (def ^:private schema:update-temp-file
  [:map {:title "update-temp-file"}
   [:changes [:vector ::cpc/change]]
-   [:revn [::sm/int {:min 0}]]
+   [:revn {:min 0} :int]
   [:session-id ::sm/uuid]
   [:id ::sm/uuid]])

@@ -103,9 +100,7 @@
                                 :revn revn
                                 :data nil
                                 :changes (blob/encode changes)})
-                    (rph/with-meta (rph/wrap nil)
-                      {::audit/replace-props {:file-id id
-                                              :revn revn}}))))
+                    nil)))

 ;; --- MUTATION COMMAND: persist-temp-file

--- a/backend/src/app/rpc/commands/files_thumbnails.clj
+++ b/backend/src/app/rpc/commands/files_thumbnails.clj
@@ -33,6 +33,7 @@
   [app.util.pointer-map :as pmap]
   [app.util.services :as sv]
   [app.util.time :as dt]
+   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]))

 ;; --- FEATURES
@@ -85,8 +86,11 @@
   ::doc/module :files
   ::sm/params [:map {:title "get-file-object-thumbnails"}
                [:file-id ::sm/uuid]
-                [:tag {:optional true} [:string {:max 50}]]]
-   ::sm/result [:map-of [:string {:max 250}] [:string {:max 250}]]}
+                [:tag {:optional true} :string]]
+   ::sm/result [:map-of :string :string]
+   ::cond/get-object #(files/get-minimal-file %1 (:file-id %2))
+   ::cond/reuse-key? true
+   ::cond/key-fn files/get-file-etag}
  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id tag] :as params}]
  (dm/with-open [conn (db/open pool)]
    (files/check-read-permissions! conn profile-id file-id)
@@ -179,16 +183,18 @@

 (def ^:private
  schema:get-file-data-for-thumbnail
-  [:map {:title "get-file-data-for-thumbnail"}
-   [:file-id ::sm/uuid]
-   [:features {:optional true} ::cfeat/features]])
+  (sm/define
+    [:map {:title "get-file-data-for-thumbnail"}
+     [:file-id ::sm/uuid]
+     [:features {:optional true} ::cfeat/features]]))

 (def ^:private
  schema:partial-file
-  [:map {:title "PartialFile"}
-   [:id ::sm/uuid]
-   [:revn {:min 0} ::sm/int]
-   [:page :any]])
+  (sm/define
+    [:map {:title "PartialFile"}
+     [:id ::sm/uuid]
+     [:revn {:min 0} :int]
+     [:page :any]]))

 (sv/defmethod ::get-file-data-for-thumbnail
  "Retrieves the data for generate the thumbnail of the file. Used
@@ -231,7 +237,7 @@
  "INSERT INTO file_tagged_object_thumbnail (file_id, object_id, tag, media_id)
   VALUES (?, ?, ?, ?)
       ON CONFLICT (file_id, object_id, tag)
-       DO UPDATE SET updated_at=?, media_id=?, deleted_at=?
+       DO UPDATE SET updated_at=?, media_id=?, deleted_at=null
   RETURNING *")

 (defn- persist-thumbnail!
@@ -249,25 +255,23 @@
                      :content-type mtype
                      :bucket "file-object-thumbnail"})))

+
+
 (defn- create-file-object-thumbnail!
-  [{:keys [::sto/storage] :as cfg} file object-id media tag]
-  (let [file-id   (:id file)
-        timestamp (dt/now)
-        media     (persist-thumbnail! storage media timestamp)
+  [{:keys [::sto/storage] :as cfg} file-id object-id media tag]
+  (let [tsnow     (dt/now)
+        media     (persist-thumbnail! storage media tsnow)
        [th1 th2] (db/tx-run! cfg (fn [{:keys [::db/conn]}]
                                    (let [th1 (db/exec-one! conn [sql:get-file-object-thumbnail file-id object-id tag])
                                          th2 (db/exec-one! conn [sql:create-file-object-thumbnail
-                                                                  file-id object-id tag
-                                                                  (:id media)
-                                                                  timestamp
-                                                                  (:id media)
-                                                                  (:deleted-at file)])]
+                                                                  file-id object-id tag (:id media)
+                                                                  tsnow (:id media)])]
                                      [th1 th2])))]

    (when (and (some? th1)
               (not= (:media-id th1)
                     (:media-id th2)))
-      (sto/touch-object! storage (:media-id th1)))
+      (sto/touch-object! storage (:media-id th1) :async true))

    th2))

@@ -275,9 +279,9 @@
  schema:create-file-object-thumbnail
  [:map {:title "create-file-object-thumbnail"}
   [:file-id ::sm/uuid]
-   [:object-id [:string {:max 250}]]
+   [:object-id :string]
   [:media ::media/upload]
-   [:tag {:optional true} [:string {:max 50}]]])
+   [:tag {:optional true} :string]])

 (sv/defmethod ::create-file-object-thumbnail
  {::doc/added "1.19"
@@ -294,8 +298,9 @@
  (media/validate-media-size! media)

  (db/run! cfg files/check-edition-permissions! profile-id file-id)
-  (when-let [file (files/get-minimal-file cfg file-id {::db/check-deleted false})]
-    (create-file-object-thumbnail! cfg file object-id media (or tag "frame"))))
+
+  (let [cfg (update cfg ::sto/storage media/configure-assets-storage)]
+    (create-file-object-thumbnail! cfg file-id object-id media (or tag "frame"))))

 ;; --- MUTATION COMMAND: delete-file-object-thumbnail

@@ -312,23 +317,25 @@
                 :object-id object-id
                 :tag tag})))

-(def ^:private schema:delete-file-object-thumbnail
-  [:map {:title "delete-file-object-thumbnail"}
-   [:file-id ::sm/uuid]
-   [:object-id [:string {:max 250}]]])
+(s/def ::delete-file-object-thumbnail
+  (s/keys :req [::rpc/profile-id]
+          :req-un [::file-id ::object-id]))

 (sv/defmethod ::delete-file-object-thumbnail
  {::doc/added "1.19"
   ::doc/module :files
-   ::sm/params schema:delete-file-object-thumbnail
+   ::doc/deprecated "1.20"
+   ::climit/id [[:file-thumbnail-ops/by-profile ::rpc/profile-id]
+                [:file-thumbnail-ops/global]]
   ::audit/skip true}
  [cfg {:keys [::rpc/profile-id file-id object-id]}]
-  (files/check-edition-permissions! cfg profile-id file-id)
  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
-                    (-> cfg
-                        (update ::sto/storage sto/configure conn)
-                        (delete-file-object-thumbnail! file-id object-id))
-                    nil)))
+                    (files/check-edition-permissions! conn profile-id file-id)
+                    (when-not (db/read-only? conn)
+                      (-> cfg
+                          (update ::sto/storage media/configure-assets-storage conn)
+                          (delete-file-object-thumbnail! file-id object-id))
+                      nil))))

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

@@ -385,7 +392,7 @@
  schema:create-file-thumbnail
  [:map {:title "create-file-thumbnail"}
   [:file-id ::sm/uuid]
-   [:revn ::sm/int]
+   [:revn :int]
   [:media ::media/upload]])

 (sv/defmethod ::create-file-thumbnail
@@ -404,6 +411,6 @@
  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
                    (files/check-edition-permissions! conn profile-id file-id)
                    (when-not (db/read-only? conn)
-                      (let [media (create-file-thumbnail! cfg params)]
-                        {:uri (files/resolve-public-uri (:id media))
-                         :id (:id media)})))))
+                      (let [cfg   (update cfg ::sto/storage media/configure-assets-storage)
+                            media (create-file-thumbnail! cfg params)]
+                        {:uri (files/resolve-public-uri (:id media))})))))
--- a/backend/src/app/rpc/commands/files_update.clj
+++ b/backend/src/app/rpc/commands/files_update.clj
@@ -29,7 +29,6 @@
   [app.rpc.commands.teams :as teams]
   [app.rpc.doc :as-alias doc]
   [app.rpc.helpers :as rph]
-   [app.storage :as sto]
   [app.util.blob :as blob]
   [app.util.pointer-map :as pmap]
   [app.util.services :as sv]
@@ -38,20 +37,6 @@
   [clojure.set :as set]
   [promesa.exec :as px]))

-(declare ^:private get-lagged-changes)
-(declare ^:private send-notifications!)
-(declare ^:private update-file)
-(declare ^:private update-file*)
-(declare ^:private process-changes-and-validate)
-(declare ^:private take-snapshot?)
-(declare ^:private delete-old-snapshots!)
-
-;; PUBLIC API; intended to be used outside of this module
-(declare update-file!)
-(declare update-file-data!)
-(declare persist-file!)
-(declare get-file)
-
 ;; --- SCHEMA

 (def ^:private
@@ -59,15 +44,15 @@
  [:map {:title "update-file"}
   [:id ::sm/uuid]
   [:session-id ::sm/uuid]
-   [:revn {:min 0} ::sm/int]
+   [:revn {:min 0} :int]
   [:features {:optional true} ::cfeat/features]
   [:changes {:optional true} [:vector ::cpc/change]]
   [:changes-with-metadata {:optional true}
    [:vector [:map
              [:changes [:vector ::cpc/change]]
              [:hint-origin {:optional true} :keyword]
-              [:hint-events {:optional true} [:vector [:string {:max 250}]]]]]]
-   [:skip-validate {:optional true} ::sm/boolean]])
+              [:hint-events {:optional true} [:vector :string]]]]]
+   [:skip-validate {:optional true} :boolean]])

 (def ^:private
  schema:update-file-result
@@ -76,7 +61,7 @@
    [:changes [:vector ::cpc/change]]
    [:file-id ::sm/uuid]
    [:id ::sm/uuid]
-    [:revn {:min 0} ::sm/int]
+    [:revn {:min 0} :int]
    [:session-id ::sm/uuid]]])

 ;; --- HELPERS
@@ -111,6 +96,40 @@
  (or (contains? library-change-types type)
      (contains? file-change-types type)))

+(def ^:private sql:get-file
+  "SELECT f.*, p.team_id
+     FROM file AS f
+     JOIN project AS p ON (p.id = f.project_id)
+    WHERE f.id = ?
+      AND (f.deleted_at IS NULL OR
+           f.deleted_at > now())
+      FOR KEY SHARE")
+
+(defn get-file
+  [conn id]
+  (let [file (db/exec-one! conn [sql:get-file id])]
+    (when-not file
+      (ex/raise :type :not-found
+                :code :object-not-found
+                :hint (format "file with id '%s' does not exists" id)))
+    (update file :features db/decode-pgarray #{})))
+
+(defn- wrap-with-pointer-map-context
+  [f]
+  (fn [cfg {:keys [id] :as file}]
+    (binding [pmap/*tracked* (pmap/create-tracked)
+              pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)]
+      (let [result (f cfg file)]
+        (feat.fdata/persist-pointers! cfg id)
+        result))))
+
+(declare get-lagged-changes)
+(declare send-notifications!)
+(declare update-file)
+(declare update-file*)
+(declare update-file-data)
+(declare take-snapshot?)
+
 ;; If features are specified from params and the final feature
 ;; set is different than the persisted one, update it on the
 ;; database.
@@ -126,8 +145,7 @@
   ::sm/result schema:update-file-result
   ::doc/module :files
   ::doc/added "1.17"}
-  [{:keys [::mtx/metrics] :as cfg}
-   {:keys [::rpc/profile-id id changes changes-with-metadata] :as params}]
+  [cfg {:keys [::rpc/profile-id id] :as params}]
  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
                    (files/check-edition-permissions! conn profile-id id)
                    (db/xact-lock! conn id)
@@ -141,30 +159,14 @@
                                       (cfeat/check-client-features! (:features params))
                                       (cfeat/check-file-features! (:features file) (:features params)))

-                          changes  (if changes-with-metadata
-                                     (->> changes-with-metadata (mapcat :changes) vec)
-                                     (vec changes))
-
-                          params   (-> params
-                                       (assoc :profile-id profile-id)
-                                       (assoc :features features)
-                                       (assoc :team team)
-                                       (assoc :file file)
-                                       (assoc :changes changes))
-
-                          cfg      (assoc cfg ::timestamp (dt/now))
+                          params   (assoc params
+                                          :profile-id profile-id
+                                          :features features
+                                          :team team
+                                          :file file)

                          tpoint   (dt/tpoint)]

-
-                      (when (> (:revn params)
-                               (:revn file))
-                        (ex/raise :type :validation
-                                  :code :revn-conflict
-                                  :hint "The incoming revision number is greater that stored version."
-                                  :context {:incoming-revn (:revn params)
-                                            :stored-revn (:revn file)}))
-
                      ;; When newly computed features does not match exactly with
                      ;; the features defined on team row, we update it.
                      (when (not= features (:features team))
@@ -173,124 +175,73 @@
                                      {:features features}
                                      {:id (:id team)})))

-                      (mtx/run! metrics {:id :update-file-changes :inc (count changes)})
-
                      (binding [l/*context* (some-> (meta params)
                                                    (get :app.http/request)
                                                    (errors/request->context))]
-                        (-> (update-file* cfg params)
+                        (-> (update-file cfg params)
                            (rph/with-defer #(let [elapsed (tpoint)]
                                               (l/trace :hint "update-file" :time (dt/format-duration elapsed))))))))))

+(defn update-file
+  [{:keys [::mtx/metrics] :as cfg}
+   {:keys [file features changes changes-with-metadata] :as params}]
+  (let [features  (-> features
+                      (set/difference cfeat/frontend-only-features)
+                      (set/union (:features file)))
+
+        update-fn (cond-> update-file*
+                    (contains? features "fdata/pointer-map")
+                    (wrap-with-pointer-map-context))
+
+        changes   (if changes-with-metadata
+                    (->> changes-with-metadata (mapcat :changes) vec)
+                    (vec changes))]
+
+    (when (> (:revn params)
+             (:revn file))
+      (ex/raise :type :validation
+                :code :revn-conflict
+                :hint "The incoming revision number is greater that stored version."
+                :context {:incoming-revn (:revn params)
+                          :stored-revn (:revn file)}))
+
+    (mtx/run! metrics {:id :update-file-changes :inc (count changes)})
+
+    (binding [cfeat/*current*  features
+              cfeat/*previous* (:features file)]
+      (let [file   (assoc file :features features)
+            params (-> params
+                       (assoc :file file)
+                       (assoc :changes changes)
+                       (assoc ::created-at (dt/now)))]
+
+        (-> (update-fn cfg params)
+            (vary-meta assoc ::audit/replace-props
+                       {:id         (:id file)
+                        :name       (:name file)
+                        :features   (:features file)
+                        :project-id (:project-id file)
+                        :team-id    (:team-id file)}))))))
+
 (defn- update-file*
-  "Internal function, part of the update-file process, that encapsulates
-  the changes application offload to a separated thread and emit all
-  corresponding notifications.
-
-  Follow the inner implementation to `update-file-data!` function.
-
-  Only intended for internal use on this module."
-  [{:keys [::db/conn ::wrk/executor ::timestamp] :as cfg}
-   {:keys [profile-id file features changes session-id skip-validate] :as params}]
-
-  (let [;; Retrieve the file data
-        file (feat.fdata/resolve-file-data cfg file)
-
-        file (assoc file :features
-                    (-> features
-                        (set/difference cfeat/frontend-only-features)
-                        (set/union (:features file))))
-
-        ;; Process the file data on separated thread for avoid to do
+  [{:keys [::db/conn ::wrk/executor] :as cfg}
+   {:keys [profile-id file changes session-id ::created-at skip-validate] :as params}]
+  (let [;; Process the file data on separated thread for avoid to do
        ;; the CPU intensive operation on vthread.
-        file  (px/invoke! executor
-                          (fn []
-                            (binding [cfeat/*current*  features
-                                      cfeat/*previous* (:features file)]
-                              (update-file-data! cfg file
-                                                 process-changes-and-validate
-                                                 changes skip-validate))))]
+        file     (px/invoke! executor (partial update-file-data cfg file changes skip-validate))
+        features (db/create-array conn "text" (:features file))]

-    (when (feat.fdata/offloaded? file)
-      (let [storage (sto/resolve cfg ::db/reuse-conn true)]
-        (some->> (:data-ref-id file) (sto/touch-object! storage))))
-
-    ;; TODO: move this to asynchronous task
-    (when (::snapshot-data file)
-      (delete-old-snapshots! cfg file))
-
-    (persist-file! cfg file)
-
-    (let [params   (assoc params :file file)
-          response {:revn (:revn file)
-                    :lagged (get-lagged-changes conn params)}
-          features (db/create-array conn "text" (:features file))]
-
-      ;; Insert change (xlog)
-      (db/insert! conn :file-change
-                  {:id (uuid/next)
-                   :session-id session-id
-                   :profile-id profile-id
-                   :created-at timestamp
-                   :file-id (:id file)
-                   :revn (:revn file)
-                   :version (:version file)
-                   :features features
-                   :label (::snapshot-label file)
-                   :data (::snapshot-data file)
-                   :changes (blob/encode changes)}
-                  {::db/return-keys false})
-
-      ;; Send asynchronous notifications
-      (send-notifications! cfg params)
-
-      (vary-meta response assoc ::audit/replace-props
-                 {:id         (:id file)
-                  :name       (:name file)
-                  :features   (:features file)
-                  :project-id (:project-id file)
-                  :team-id    (:team-id file)}))))
-
-(defn update-file!
-  "A public api that allows apply a transformation to a file with all context setup."
-  [cfg file-id update-fn & args]
-  (let [file (get-file cfg file-id)
-        file (apply update-file-data! cfg file update-fn args)]
-    (persist-file! cfg file)))
-
-(def ^:private sql:get-file
-  "SELECT f.*, p.team_id
-     FROM file AS f
-     JOIN project AS p ON (p.id = f.project_id)
-    WHERE f.id = ?
-      AND (f.deleted_at IS NULL OR
-           f.deleted_at > now())
-      FOR KEY SHARE")
-
-(defn get-file
-  "Get not-decoded file, only decodes the features set."
-  [conn id]
-  (let [file (db/exec-one! conn [sql:get-file id])]
-    (when-not file
-      (ex/raise :type :not-found
-                :code :object-not-found
-                :hint (format "file with id '%s' does not exists" id)))
-    (update file :features db/decode-pgarray #{})))
-
-(defn persist-file!
-  "Function responsible of persisting already encoded file. Should be
-  used together with `get-file` and `update-file-data!`.
-
-  It also updates the project modified-at attr."
-  [{:keys [::db/conn ::timestamp]} file]
-  (let [features (db/create-array conn "text" (:features file))
-        ;; The timestamp can be nil because this function is also
-        ;; intended to be used outside of this module
-        modified-at (or timestamp (dt/now))]
-
-    (db/update! conn :project
-                {:modified-at modified-at}
-                {:id (:project-id file)}
+    (db/insert! conn :file-change
+                {:id (uuid/next)
+                 :session-id session-id
+                 :profile-id profile-id
+                 :created-at created-at
+                 :file-id (:id file)
+                 :revn (:revn file)
+                 :features (db/create-array conn "text" (:features file))
+                 :data (when (take-snapshot? file)
+                         (:data file))
+                 :changes (blob/encode changes)}
                {::db/return-keys false})

    (db/update! conn :file
@@ -299,96 +250,20 @@
                 :version (:version file)
                 :features features
                 :data-backend nil
-                 :data-ref-id nil
-                 :modified-at modified-at
+                 :modified-at created-at
                 :has-media-trimmed false}
-                {:id (:id file)}
-                {::db/return-keys false})))
+                {:id (:id file)})

-(defn- update-file-data!
-  "Perform a file data transformation in with all update context setup.
+    (db/update! conn :project
+                {:modified-at created-at}
+                {:id (:project-id file)})

-  This function expected not-decoded file and transformation function. Returns
-  an encoded file.
+    (let [params (assoc params :file file)]
+      ;; Send asynchronous notifications
+      (send-notifications! cfg params)

-  This function is not responsible of saving the file. It only saves
-  fdata/pointer-map modified fragments."
-
-  [cfg {:keys [id] :as file} update-fn & args]
-  (binding [pmap/*tracked* (pmap/create-tracked)
-            pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)]
-    (let [file (update file :data (fn [data]
-                                    (-> data
-                                        (blob/decode)
-                                        (assoc :id (:id file)))))
-
-          ;; For avoid unnecesary overhead of creating multiple pointers
-          ;; and handly internally with objects map in their worst
-          ;; case (when probably all shapes and all pointers will be
-          ;; readed in any case), we just realize/resolve them before
-          ;; applying the migration to the file
-          file (if (fmg/need-migration? file)
-                 (-> file
-                     (update :data feat.fdata/process-pointers deref)
-                     (update :data feat.fdata/process-objects (partial into {}))
-                     (fmg/migrate-file))
-                 file)
-
-          file (apply update-fn cfg file args)
-
-          ;; TODO: reuse operations if file is migrated
-          ;; TODO: move encoding to a separated thread
-          file (if (take-snapshot? file)
-                 (let [tpoint   (dt/tpoint)
-                       snapshot (-> (:data file)
-                                    (feat.fdata/process-pointers deref)
-                                    (feat.fdata/process-objects (partial into {}))
-                                    (blob/encode))
-                       elapsed (tpoint)
-                       label   (str "internal/snapshot/" (:revn file))]
-
-                   (l/trc :hint "take snapshot"
-                          :file-id (str (:id file))
-                          :revn (:revn file)
-                          :label label
-                          :elapsed (dt/format-duration elapsed))
-
-                   (-> file
-                       (assoc ::snapshot-data snapshot)
-                       (assoc ::snapshot-label label)))
-                 file)
-
-          file (cond-> file
-                 (contains? cfeat/*current* "fdata/objects-map")
-                 (feat.fdata/enable-objects-map)
-
-                 (contains? cfeat/*current* "fdata/pointer-map")
-                 (feat.fdata/enable-pointer-map)
-
-                 :always
-                 (update :data blob/encode))]
-
-      (feat.fdata/persist-pointers! cfg id)
-
-      file)))
-
-(defn- get-file-libraries
-  "A helper for preload file libraries, mainly used for perform file
-  semantical and structural validation"
-  [{:keys [::db/conn] :as cfg} file]
-  (->> (files/get-file-libraries conn (:id file))
-       (into [file] (map (fn [{:keys [id]}]
-                           (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)
-                                     pmap/*tracked* nil]
-                             ;; We do not resolve the objects maps here
-                             ;; because there is a lower probability that all
-                             ;; shapes needed to be loded into memory, so we
-                             ;; leeave it on lazy status
-                             (-> (files/get-file cfg id :migrate? false)
-                                 (update :data feat.fdata/process-pointers deref) ; ensure all pointers resolved
-                                 (update :data feat.fdata/process-objects (partial into {}))
-                                 (fmg/migrate-file))))))
-       (d/index-by :id)))
+      ;; Retrieve and return lagged data
+      (get-lagged-changes conn params))))

 (defn- soft-validate-file-schema!
  [file]
@@ -405,78 +280,87 @@
      (l/error :hint "file validation error"
               :cause cause))))

-(defn- process-changes-and-validate
-  [cfg file changes skip-validate]
-  (let [;; WARNING: this ruins performance; maybe we need to find
+(defn- update-file-data
+  [{:keys [::db/conn] :as cfg} file changes skip-validate]
+  (let [file (update file :data (fn [data]
+                                  (-> data
+                                      (blob/decode)
+                                      (assoc :id (:id file)))))
+
+        ;; For avoid unnecesary overhead of creating multiple pointers
+        ;; and handly internally with objects map in their worst
+        ;; case (when probably all shapes and all pointers will be
+        ;; readed in any case), we just realize/resolve them before
+        ;; applying the migration to the file
+        file (if (fmg/need-migration? file)
+               (-> file
+                   (update :data feat.fdata/process-pointers deref)
+                   (update :data feat.fdata/process-objects (partial into {}))
+                   (fmg/migrate-file))
+               file)
+
+        ;; WARNING: this ruins performance; maybe we need to find
        ;; some other way to do general validation
        libs (when (and (or (contains? cf/flags :file-validation)
                            (contains? cf/flags :soft-file-validation))
                        (not skip-validate))
-               (get-file-libraries cfg file))
+               (->> (files/get-file-libraries conn (:id file))
+                    (into [file] (map (fn [{:keys [id]}]
+                                        (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)
+                                                  pmap/*tracked* nil]
+                                          ;; We do not resolve the objects maps here
+                                          ;; because there is a lower probability that all
+                                          ;; shapes needed to be loded into memory, so we
+                                          ;; leeave it on lazy status
+                                          (-> (files/get-file cfg id :migrate? false)
+                                              (update :data feat.fdata/process-pointers deref) ; ensure all pointers resolved
+                                              (update :data feat.fdata/process-objects (partial into {}))
+                                              (fmg/migrate-file))))))
+                    (d/index-by :id)))
+

        file (-> (files/check-version! file)
                 (update :revn inc)
                 (update :data cpc/process-changes changes)
                 (update :data d/without-nils))]

-    (binding [pmap/*tracked* nil]
-      (when (contains? cf/flags :soft-file-validation)
-        (soft-validate-file! file libs))
+    (when (contains? cf/flags :soft-file-validation)
+      (soft-validate-file! file libs))

-      (when (contains? cf/flags :soft-file-schema-validation)
-        (soft-validate-file-schema! file))
+    (when (contains? cf/flags :soft-file-schema-validation)
+      (soft-validate-file-schema! file))

-      (when (and (contains? cf/flags :file-validation)
-                 (not skip-validate))
-        (val/validate-file! file libs))
+    (when (and (contains? cf/flags :file-validation)
+               (not skip-validate))
+      (val/validate-file! file libs))

-      (when (and (contains? cf/flags :file-schema-validation)
-                 (not skip-validate))
-        (val/validate-file-schema! file)))
+    (when (and (contains? cf/flags :file-schema-validation)
+               (not skip-validate))
+      (val/validate-file-schema! file))

-    file))
+    (cond-> file
+      (contains? cfeat/*current* "fdata/objects-map")
+      (feat.fdata/enable-objects-map)
+
+      (contains? cfeat/*current* "fdata/pointer-map")
+      (feat.fdata/enable-pointer-map)
+
+      :always
+      (update :data blob/encode))))

 (defn- take-snapshot?
  "Defines the rule when file `data` snapshot should be saved."
  [{:keys [revn modified-at] :as file}]
-  (when (contains? cf/flags :auto-file-snapshot)
-    (let [freq    (or (cf/get :auto-file-snapshot-every) 20)
-          timeout (or (cf/get :auto-file-snapshot-timeout)
-                      (dt/duration {:hours 1}))]
+  (let [freq    (or (cf/get :file-change-snapshot-every) 20)
+        timeout (or (cf/get :file-change-snapshot-timeout)
+                    (dt/duration {:hours 1}))]
+    (or (= 1 freq)
+        (zero? (mod revn freq))
+        (> (inst-ms (dt/diff modified-at (dt/now)))
+           (inst-ms timeout)))))

-      (or (= 1 freq)
-          (zero? (mod revn freq))
-          (> (inst-ms (dt/diff modified-at (dt/now)))
-             (inst-ms timeout))))))
-
-;; Get the latest available snapshots without exceeding the total
-;; snapshot limit.
-(def ^:private sql:get-latest-snapshots
-  "SELECT fch.id, fch.created_at
-     FROM file_change AS fch
-    WHERE fch.file_id = ?
-      AND fch.label LIKE 'internal/%'
-    ORDER BY fch.created_at DESC
-    LIMIT ?")
-
-;; Mark all snapshots that are outside the allowed total threshold
-;; available for the GC.
-(def ^:private sql:delete-snapshots
-  "UPDATE file_change
-      SET label = NULL
-    WHERE file_id = ?
-      AND label LIKE 'internal/%'
-      AND created_at < ?")
-
-(defn- delete-old-snapshots!
-  [{:keys [::db/conn] :as cfg} {:keys [id] :as file}]
-  (when-let [snapshots (not-empty (db/exec! conn [sql:get-latest-snapshots id
-                                                  (cf/get :auto-file-snapshot-total 10)]))]
-    (let [last-date (-> snapshots peek :created-at)
-          result    (db/exec-one! conn [sql:delete-snapshots id last-date])]
-      (l/trc :hint "delete old snapshots" :file-id (str id) :total (db/get-update-count result)))))
-
-(def ^:private sql:lagged-changes
+(def ^:private
+  sql:lagged-changes
  "select s.id, s.revn, s.file_id,
          s.session_id, s.changes
     from file_change as s
--- a/backend/src/app/rpc/commands/fonts.clj
+++ b/backend/src/app/rpc/commands/fonts.clj
@@ -86,9 +86,6 @@
   [:font-weight [::sm/one-of {:format "number"} valid-weight]]
   [:font-style [::sm/one-of {:format "string"} valid-style]]])

-;; FIXME: IMPORTANT: refactor this, we should not hold a whole db
-;; connection around the font creation
-
 (sv/defmethod ::create-font-variant
  {::doc/added "1.18"
   ::climit/id [[:process-font/by-profile ::rpc/profile-id]
@@ -98,11 +95,12 @@
  [cfg {:keys [::rpc/profile-id team-id] :as params}]
  (db/tx-run! cfg
              (fn [{:keys [::db/conn] :as cfg}]
-                (teams/check-edition-permissions! conn profile-id team-id)
-                (quotes/check! cfg {::quotes/id ::quotes/font-variants-per-team
-                                    ::quotes/profile-id profile-id
-                                    ::quotes/team-id team-id})
-                (create-font-variant cfg (assoc params :profile-id profile-id)))))
+                (let [cfg (update cfg ::sto/storage media/configure-assets-storage)]
+                  (teams/check-edition-permissions! conn profile-id team-id)
+                  (quotes/check-quote! conn {::quotes/id ::quotes/font-variants-per-team
+                                             ::quotes/profile-id profile-id
+                                             ::quotes/team-id team-id})
+                  (create-font-variant cfg (assoc params :profile-id profile-id))))))

 (defn create-font-variant
  [{:keys [::sto/storage ::db/conn ::wrk/executor]} {:keys [data] :as params}]
@@ -205,13 +203,14 @@
   ::sm/params schema:delete-font}
  [cfg {:keys [::rpc/profile-id id team-id]}]
  (db/tx-run! cfg
-              (fn [{:keys [::db/conn] :as cfg}]
+              (fn [{:keys [::db/conn ::sto/storage] :as cfg}]
                (teams/check-edition-permissions! conn profile-id team-id)
                (let [fonts   (db/query conn :team-font-variant
                                        {:team-id team-id
                                         :font-id id
                                         :deleted-at nil}
                                        {::sql/for-update true})
+                      storage (media/configure-assets-storage storage conn)
                      tnow    (dt/now)]

                  (when-not (seq fonts)
@@ -221,7 +220,11 @@
                  (doseq [font fonts]
                    (db/update! conn :team-font-variant
                                {:deleted-at tnow}
-                                {:id (:id font)}))
+                                {:id (:id font)})
+                    (some->> (:woff1-file-id font) (sto/touch-object! storage))
+                    (some->> (:woff2-file-id font) (sto/touch-object! storage))
+                    (some->> (:ttf-file-id font) (sto/touch-object! storage))
+                    (some->> (:otf-file-id font) (sto/touch-object! storage)))

                  (rph/with-meta (rph/wrap)
                    {::audit/props {:id id
@@ -242,16 +245,22 @@
   ::sm/params schema:delete-font-variant}
  [cfg {:keys [::rpc/profile-id id team-id]}]
  (db/tx-run! cfg
-              (fn [{:keys [::db/conn] :as cfg}]
+              (fn [{:keys [::db/conn ::sto/storage] :as cfg}]
                (teams/check-edition-permissions! conn profile-id team-id)
                (let [variant (db/get conn :team-font-variant
                                      {:id id :team-id team-id}
-                                      {::sql/for-update true})]
+                                      {::sql/for-update true})
+                      storage (media/configure-assets-storage storage conn)]

                  (db/update! conn :team-font-variant
                              {:deleted-at (dt/now)}
                              {:id (:id variant)})

+                  (some->> (:woff1-file-id variant) (sto/touch-object! storage))
+                  (some->> (:woff2-file-id variant) (sto/touch-object! storage))
+                  (some->> (:ttf-file-id variant) (sto/touch-object! storage))
+                  (some->> (:otf-file-id variant) (sto/touch-object! storage))
+
                  (rph/with-meta (rph/wrap)
                    {::audit/props {:font-family (:font-family variant)
                                    :font-id (:font-id variant)}})))))
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Request View-Only Access to “{{file-name\|abbreviate:25}}”`
				`@@ -1 +0,0 @@`
				`Request Access to “{{file-name\|abbreviate:25}}”`
				`@@ -1 +0,0 @@`
				`Request Access to “{{team-name\|abbreviate:25}}”`