⬆️ Update to version 1.13.1-beta

2026-01-03 11:58:46 -05:00 · 2022-05-27 10:33:29 +02:00
1145 changed files with 493108 additions and 151650 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,19 +3,18 @@ jobs:
  build:
    docker:
      - image: penpotapp/devenv:latest
-      - image: cimg/postgres:14.5
+      - image: cimg/postgres:13.5
        environment:
          POSTGRES_USER: penpot_test
          POSTGRES_PASSWORD: penpot_test
          POSTGRES_DB: penpot_test
-      - image: cimg/redis:7.0.5
+      - image: cimg/redis:6.2.6

    working_directory: ~/repo
-    resource_class: large

    environment:
      # Customize the JVM maximum heap limit
-      JVM_OPTS: -Xmx4g
+      JVM_OPTS: -Xmx1g

    steps:
      - checkout
@@ -27,15 +26,6 @@ jobs:
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-

-      - run: cd .clj-kondo && cat config.edn
-
-      - run:
-          name: frontend styles prettier
-          working_directory: "./frontend"
-          command: |
-            yarn install
-            yarn run lint-scss
-
      - run:
          name: common lint
          working_directory: "./common"
@@ -50,6 +40,13 @@ jobs:
            clj-kondo --version
            clj-kondo --parallel --lint src/

+      - run:
+          name: frontend styles prettier
+          working_directory: "./frontend"
+          command: |
+            yarn install
+            yarn run lint-scss
+
      - run:
          name: backend lint
          working_directory: "./backend"
@@ -57,42 +54,47 @@ jobs:
            clj-kondo --version
            clj-kondo --parallel --lint src/

-      - run:
-          working_directory: "./common"
-          name: common tests
-          command: |
-            yarn install
-            yarn test
-            clojure -X:dev:test :patterns '["common-tests.*-test"]'
-
-          environment:
-            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
-            JVM_OPTS: -Xmx4g
-            NODE_OPTIONS: --max-old-space-size=4096
-
+      # run backend test
      - run:
          name: backend test
          working_directory: "./backend"
-          command: |
-            clojure -X:dev:test :patterns '["backend-tests.*-test"]'
-
+          command: "clojure -X:dev:test"
          environment:
            PENPOT_TEST_DATABASE_URI: "postgresql://localhost/penpot_test"
            PENPOT_TEST_DATABASE_USERNAME: penpot_test
            PENPOT_TEST_DATABASE_PASSWORD: penpot_test
            PENPOT_TEST_REDIS_URI: "redis://localhost/1"
-            JVM_OPTS: -Xmx4g

      - run:
          name: frontend tests
          working_directory: "./frontend"
          command: |
            yarn install
-            yarn test
+            clojure -M:dev:shadow-cljs compile test
+            node target/tests.js
+
+          environment:
+            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
+
+      # - run:
+      #     working_directory: "./common"
+      #     name: common tests (cljs)
+      #     command: |
+      #       yarn install
+      #       yarn run compile-test
+      #       node target/test.js
+      # 
+      #     environment:
+      #       PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
+
+      - run:
+          working_directory: "./common"
+          name: common tests (clj)
+          command: |
+            clojure -X:dev:test

          environment:
            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
-            NODE_OPTIONS: --max-old-space-size=4096

      - save_cache:
         paths:
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -2,12 +2,11 @@
 {promesa.core/let clojure.core/let
  promesa.core/->> clojure.core/->>
  promesa.core/-> clojure.core/->
-  rumext.v2/defc clojure.core/defn
-  rumext.v2/fnc clojure.core/fn
+  rumext.alpha/defc clojure.core/defn
+  rumext.alpha/fnc clojure.core/fn
  app.common.data/export clojure.core/def
  app.db/with-atomic clojure.core/with-open
  app.common.data.macros/get-in clojure.core/get-in
-  app.common.data.macros/with-open clojure.core/with-open
  app.common.data.macros/select-keys clojure.core/select-keys
  app.common.logging/with-context clojure.core/do}

@@ -39,21 +38,9 @@
  :single-key-in
  {:level :warning}

-  :non-arg-vec-return-type-hint
-  {:level :off}
-
  :redundant-do
  {:level :off}

-  :earmuffed-var-not-dynamic
-  {:level :off}
-
-  :dynamic-var-not-earmuffed
-  {:level :off}
-
-  :used-underscored-binding
-  {:level :warning}
-
  :unused-binding
  {:exclude-destructured-as true
   :exclude-destructured-keys-in-fn-args false
--- a/.clj-kondo/hooks/export.clj
+++ b/.clj-kondo/hooks/export.clj
@@ -53,37 +53,24 @@
  [{:keys [:node]}]
  (let [[rnode rtype ?meta & other] (:children node)
        rsym    (gensym (name (:k rtype)))
-
-        [?docs other] (if (api/string-node? ?meta)
-                        [?meta other]
-                        [nil (cons ?meta other)])
-
-        [?meta other] (let [?meta (first other)]
-                        (if (api/map-node? ?meta)
-                          [?meta (rest other)]
-                          [nil   other]))
-
-        nodes         [(api/token-node (symbol "do"))
-                       (api/list-node
-                        [(api/token-node (symbol "declare"))
-                         (api/token-node rsym)])
-
-                       (when ?docs
-                         (api/list-node
-                          [(api/token-node (symbol "comment")) ?docs]))
-
-                       (when ?meta
-                         (api/list-node
-                          [(api/token-node (symbol "reset-meta!"))
-                           (api/token-node rsym)
-                           ?meta]))
-                       (api/list-node
-                        (into [(api/token-node (symbol "defmethod"))
-                               (api/token-node rsym)
-                               rtype]
-                              other))]
-        result  (api/list-node (filterv some? nodes))]
-
-    ;; (prn "=====>" rtype)
+        result  (api/list-node
+                 [(api/token-node (symbol "do"))
+                  (api/list-node
+                   [(api/token-node (symbol "declare"))
+                    (api/token-node rsym)])
+                  (if (= :map (:tag ?meta))
+                    (api/list-node
+                     [(api/token-node (symbol "reset-meta!"))
+                      (api/token-node rsym)
+                      ?meta])
+                    (api/list-node
+                     [(api/token-node (symbol "comment"))
+                      (api/token-node rsym)]))
+                  (api/list-node
+                   (into [(api/token-node (symbol "defmethod"))
+                          (api/token-node rsym)
+                          rtype]
+                         (cons ?meta other)))])]
+    ;; (prn "==============" rtype (into {} ?meta))
    ;; (prn (api/sexpr result))
    {:node result}))
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,89 +0,0 @@
-description: Create a report to help us improve
-labels: ["bug"]
-name: Bug report
-title: "bug: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Before you start
-
-        Please search our [existing issues](https://github.com/penpot/penpot/issues) and open [pull requests](https://github.com/penpot/penpot/pulls) to lessen the change of filing duplicate issues or feature requests. Thank you.
-
-        ---
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        Steps to reproduce the behavior:
-        1.  Go to '...'
-        2.  Click on '....'
-        3.  Scroll down to '....'
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      description: A clear and concise description of what you expected to happen.
-      label: Expected behavior
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      description: A clear and concise description of what happens instead; what the bug is.
-      label: Actual behavior
-    validations:
-      required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      description: If applicable, add screenshots to help explain your problem.
-      label: Screenshots or video
-  - type: textarea
-    id: desktop
-    attributes:
-      label: Desktop (please complete the following information)
-      placeholder: |
-        - OS (e.g. iOS):
-        - Browser & version (e.g. Chrome 89.0):
-  - type: textarea
-    id: mobile
-    attributes:
-      label: Smartphone (please complete the following information)
-      placeholder: |
-        - Device & model (e.g. iPhone 6):
-        - OS & version (e.g. iOS 8.1):
-        - Browser & version (e.g. stock browser 22):
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment (please complete the following information)
-      placeholder: |
-        - Host (e.g. https://design.penpot.app, local instance):
-
-        *If self-hosted:*
-        - OS Version (e.g. Ubuntu 16.04):
-        - Docker / Docker-compose version (e.g. Docker version 18.03.0-ce, build 0520e24):
-        - Image version (e.g. Alpine):
-
-        Docker commands or docker-compose file (if possible and if proceed.x):
-        ```
-
-        ```
-  - type: textarea
-    id: frontend-trace
-    attributes:
-      label: Frontend Stack Trace
-      render: console
-  - type: textarea
-    id: backend-trace
-    attributes:
-      label: Backend Stack Trace
-      render: console
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Any other context about the problem.
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,72 @@
+---
+
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1.  Go to '...'
+2.  Click on '....'
+3.  Scroll down to '....'
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Actual behavior**
+
+A clear and concise description of what happens instead; what the bug is.
+ 
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+- OS (e.g. iOS):
+- Browser & version (e.g. Chrome 89.0):
+
+**Smartphone (please complete the following information):**
+- Device & model (e.g. iPhone 6):
+- OS & version (e.g. iOS 8.1):
+- Browser & version (e.g. stock browser 22):
+
+**Environment (please complete the following information):**
+- Host (e.g. https://design.penpot.app, local instance):
+
+*If self-hosted:*
+- OS Version (e.g. Ubuntu 16.04):
+- Docker / Docker-compose version (e.g. Docker version 18.03.0-ce, build 0520e24):
+- Image version (e.g. Alpine):
+
+Docker commands or docker-compose file (if possible and if proceed.x):
+```
+
+```
+
+Frontend Stack Trace:
+<details>
+
+```
+
+```
+
+</details>
+
+Backend Stack Trace:
+<details>
+
+```
+
+```
+
+</details>
+
+**Additional context:**
+
+Any other context about the problem.
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,37 +0,0 @@
-description: Suggest an idea for this project.
-labels: ["needs triage", "enhancement"]
-name: "Feature request"
-title: "feature: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Before you start
-
-        Please search our [existing issues](https://github.com/penpot/penpot/issues) and open [pull requests](https://github.com/penpot/penpot/pulls) to lessen the change of filing duplicate issues or feature requests. Thank you.
-
-        ---
-  - type: textarea
-    id: problem
-    attributes:
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when (...)
-      label: Is your feature request related to a problem? Please describe.
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      description: A clear and concise description of what you want to happen.
-      label: Describe the solution you'd like.
-    validations:
-      required: true
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Describe alternatives you've considered.
-      description: A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when (...)
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,23 @@
 *-init.clj
 *.jar
-*.orig
 *.penpot
+*.orig
 .calva
 .clj-kondo
 .cpcache
+.lein-deps-sum
+.lein-failures
+.lein-plugins/
+.lein-repl-history
 .lsp
 .nrepl-port
 .nyc_output
 .rebel_readline_history
 .repl
-.shadow-cljs
-/*.jpg
-/*.md
-/*.png
-/*.sql
-/*.txt
-/*.yml
-/*.zip
 /.clj-kondo/.cache
 /_dump
-/backend/*.md
-/backend/*.sql
-/backend/*.txt
+/backend/-
 /backend/assets/
-/backend/builtin-templates
 /backend/dist/
 /backend/logs/
 /backend/resources/public/assets
@@ -33,27 +26,29 @@
 /bundle*
 /cd.md
 /clj-profiler/
+/common/.shadow-cljs
 /common/coverage
 /common/target
 /deploy
 /docker/images/bundle*
+/exporter/.shadow-cljs
 /exporter/target
+/frontend/.shadow-cljs
+/frontend/package-lock.json
+/frontend/cypress/videos/*/
 /frontend/cypress/fixtures/validuser.json
-/frontend/cypress/videos/*/
-/frontend/cypress/videos/*/
 /frontend/dist/
 /frontend/npm-debug.log
 /frontend/out/
-/frontend/package-lock.json
 /frontend/resources/fonts/experiments
 /frontend/resources/public/*
 /frontend/target/
-/other/
-/scripts/
+/frontend/cypress/videos/*/
+/media
 /telemetry/
-/tmp/
 /vendor/**/target
 /vendor/svgclean/bundle*.js
 /web
 clj-profiler/
+figwheel_server.log
 node_modules
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,510 +1,13 @@
 # CHANGELOG

-## 1.18.1
-
-### :bug: Bugs fixed
-
- Fix problems with imported SVG shadows [Taiga #4922](https://tree.taiga.io/project/penpot/issue/4922)
- Fix problems with imported SVG embedded images and transforms [Taiga #4639](https://tree.taiga.io/project/penpot/issue/4639)
-
-## 1.18.0
+## :rocket: Next

+### :boom: Breaking changes
 ### :sparkles: New features
- Adds more accessibility improvements in dashboard [Taiga #4577](https://tree.taiga.io/project/penpot/us/4577)
- Adds paddings and gaps prediction on layout creation [Taiga #4838](https://tree.taiga.io/project/penpot/task/4838)
- Add visual feedback when proportionally scaling text elements with **K** [Taiga #3415](https://tree.taiga.io/project/penpot/us/3415)
- Add visualization and mouse control to paddings, margins and gaps in frames with layout [Taiga #4839](https://tree.taiga.io/project/penpot/task/4839)
- Allow for absolute positioned elements inside layout [Taiga #4834](https://tree.taiga.io/project/penpot/us/4834)
- Add z-index option for flex layout items [Taiga #2980](https://tree.taiga.io/project/penpot/us/2980)
- Scale content proportionally affects strokes, shadows, blurs and corners [Taiga #1951](https://tree.taiga.io/project/penpot/us/1951)
- Use tabulators to navigate layers [Taiga #5010](https://tree.taiga.io/project/penpot/issue/5010)
-
 ### :bug: Bugs fixed
-
- Fix problem with rules position on changing pages [Taiga #4847](https://tree.taiga.io/project/penpot/issue/4847)
- Fix error streen when uploading wrong SVG [#2995](https://github.com/penpot/penpot/issues/2995)
- Fix selecting children from hidden parent layers [Taiga #4934](https://tree.taiga.io/project/penpot/issue/4934)
- Fix problem when undoing multiple selected colors [Taiga #4920](https://tree.taiga.io/project/penpot/issue/4920)
- Allow selection of empty board by partial rect [Taiga #4806](https://tree.taiga.io/project/penpot/issue/4806)
- Improve behavior for undo on text edition [Taiga #4693](https://tree.taiga.io/project/penpot/issue/4693)
- Improve deeps selection of nested arboards [Taiga #4913](https://tree.taiga.io/project/penpot/issue/4913)
- Fix problem on selection numeric inputs on Firefox [#2991](https://github.com/penpot/penpot/issues/2991)
- Changed the text dominant-baseline to use ideographic [Taiga #4791](https://tree.taiga.io/project/penpot/issue/4791)
- Viewer wrong translations [Github #3035](https://github.com/penpot/penpot/issues/3035)
- Fix problem with text editor in Safari
- Fix unlink library color when blur color picker input [#3026](https://github.com/penpot/penpot/issues/3026)
- Fix snap pixel when moving path points on high zoom [#2930](https://github.com/penpot/penpot/issues/2930)
- Fix shortcuts for zoom now take into account the mouse position [#2924](https://github.com/penpot/penpot/issues/2924)
- Fix close colorpicker on Firefox when mouse-up is outside the picker [#2911](https://github.com/penpot/penpot/issues/2911)
- Fix problems with touch devices and Wacom tablets [#2216](https://github.com/penpot/penpot/issues/2216)
- Fix problem with board titles misplaced [Taiga #4738](https://tree.taiga.io/project/penpot/issue/4738)
- Fix problem with alt getting stuck when alt+tab [Taiga #5013](https://tree.taiga.io/project/penpot/issue/5013)
- Fix problem with z positioning of elements [Taiga #5014](https://tree.taiga.io/project/penpot/issue/5014)
- Fix problem in Firefox with scroll jumping when changin pages [#3052](https://github.com/penpot/penpot/issues/3052)
- Fix nested frame interaction created flow in wrong frame [Taiga #5043](https://tree.taiga.io/project/penpot/issue/5043)
- Font-Kerning does not work on Artboard Export to PNG/JPG/PDF [#3029](https://github.com/penpot/penpot/issues/3029)
- Fix manipulate duplicated project (delete, duplicate, rename, pin/unpin...) [Taiga #5027](https://tree.taiga.io/project/penpot/issue/5027)
- Fix deleted files appear in search results [Taiga #5002](https://tree.taiga.io/project/penpot/issue/5002)
- Fix problem with selected colors and texts [Taiga #5051](https://tree.taiga.io/project/penpot/issue/5051)
- Fix problem when assigning color from palette or assets [Taiga #5050](https://tree.taiga.io/project/penpot/issue/5050)
- Fix shortcuts for alignment [Taiga #5030](https://tree.taiga.io/project/penpot/issue/5030)
- Fix path options not showing when editing rects or ellipses [Taiga #5053](https://tree.taiga.io/project/penpot/issue/5053)
- Fix tooltips for some alignment options are truncated on design tab [Taiga #5040](https://tree.taiga.io/project/penpot/issue/5040)
- Fix horizontal margins drag don't always start from place [Taiga #5020](https://tree.taiga.io/project/penpot/issue/5020)
- Fix multiplayer username sometimes is not displayed correctly [Taiga #4400](https://tree.taiga.io/project/penpot/issue/4400)
- Show warning when trying to invite a user that is already in members [Taiga #4147](https://tree.taiga.io/project/penpot/issue/4147)
- Fix problem with text out of borders when changing from auto-width to fixed [Taiga #4308](https://tree.taiga.io/project/penpot/issue/4308)
- Fix header not showing when exiting fullscreen mode in viewer [Taiga #4244](https://tree.taiga.io/project/penpot/issue/4244)
- Fix visual problem in select options [Taiga #5028](https://tree.taiga.io/project/penpot/issue/5028)
- Forbid empty names for assets [Taiga #5056](https://tree.taiga.io/project/penpot/issue/5056)
- Select children after ungroup action [Taiga #4917](https://tree.taiga.io/project/penpot/issue/4917)
- Fix problem with guides not showing when moving over nested frames [Taiga #4905](https://tree.taiga.io/project/penpot/issue/4905)
- Fix change email and password for users signed in via social login [Taiga #4273](https://tree.taiga.io/project/penpot/issue/4273)
- Fix drag and drop files from browser or file explorer under circumstances [Taiga #5054](https://tree.taiga.io/project/penpot/issue/5054)
- Fix problem when copy/pasting shapes [Taiga #4931](https://tree.taiga.io/project/penpot/issue/4931)
- Fix problem with color picker not able to change hue [Taiga #5065](https://tree.taiga.io/project/penpot/issue/5065)
- Fix problem with outer stroke in texts [Taiga #5078](https://tree.taiga.io/project/penpot/issue/5078)
- Fix problem with text carring over next line when changing to fixed [Taiga #5067](https://tree.taiga.io/project/penpot/issue/5067)
- Fix don't show invite user hero to users with editor role [Taiga #5086](https://tree.taiga.io/project/penpot/issue/5086)
- Fix enter emails on onboarding new user creating team [Taiga #5089](https://tree.taiga.io/project/penpot/issue/5089)
- Fix invalid files amount after moving on dashboard [Taiga #5080](https://tree.taiga.io/project/penpot/issue/5080)
- Fix dashboard left sidebar, the [x] overlaps the field [Taiga #5064](https://tree.taiga.io/project/penpot/issue/5064)
- Fix expanded typography on assets sidebar is moving [Taiga #5063](https://tree.taiga.io/project/penpot/issue/5063)
- Fix spelling mistake in confirmation after importing only 1 file [Taiga #5095](https://tree.taiga.io/project/penpot/issue/5095)
- Fix problem with selection colors and texts [Taiga #5079](https://tree.taiga.io/project/penpot/issue/5079)
- Remove "show in view mode" flag when moving frame to frame [Taiga #5091](https://tree.taiga.io/project/penpot/issue/5091)
- Fix problem creating files in project page [Taiga #5060](https://tree.taiga.io/project/penpot/issue/5060)
- Disable empty names on rename files [Taiga #5088](https://tree.taiga.io/project/penpot/issue/5088)
- Fix problem with SVG and flex layout [Taiga #](https://tree.taiga.io/project/penpot/issue/5099)
- Fix unpublish and delete shared library warning messages [Taiga #5090](https://tree.taiga.io/project/penpot/issue/5090)
- Fix last update project timer update after creating new file [Taiga #5096](https://tree.taiga.io/project/penpot/issue/5096)
- Fix dashboard scrolling using 'Page Up' and 'Page Down' [Taiga #5081](https://tree.taiga.io/project/penpot/issue/5081)
- Fix view mode header buttons overlapping in small resolutions [Taiga #5058](https://tree.taiga.io/project/penpot/issue/5058)
- Fix precision for wrap in flex [Taiga #5072](https://tree.taiga.io/project/penpot/issue/5072)
- Fix relative position overlay positioning [Taiga #5092](https://tree.taiga.io/project/penpot/issue/5092)
- Fix hide grid keyboard shortcut [Github #3071](https://github.com/penpot/penpot/pull/3071)
- Fix problem with opacity in imported SVG's [Taiga #4923](https://tree.taiga.io/project/penpot/issue/4923)
-
-### :heart: Community contributions by (Thank you!)
- To @ondrejkonec: for contributing to the code with:
- Refactor CSS variables [Github #2948](https://github.com/penpot/penpot/pull/2948)
-
-## 1.17.3
-
-### :bug: Bugs fixed
- Fix copy and paste very nested inside itself [Taiga #4848](https://tree.taiga.io/project/penpot/issue/4848)
- Fix custom fonts not rendered correctly [Taiga #4874](https://tree.taiga.io/project/penpot/issue/4874)
- Fix problem with shadows and blur on multiple selection
- Fix problem with redo shortcut
- Fix Component texts not displayed in assets panel [Taiga #4907](https://tree.taiga.io/project/penpot/issue/4907)
- Fix search field has implemented shared styles for "close icon" and "search icon" [Taiga #4927](https://tree.taiga.io/project/penpot/issue/4927)
- Fix Handling correctly slashes "/" in emails [Taiga #4906](https://tree.taiga.io/project/penpot/issue/4906)
- Fix Change text color from selected colors [Taiga #4933](https://tree.taiga.io/project/penpot/issue/4933)
-
-### :sparkles: Enhancements
-
- Adds environment variables for specifying the export and backend URI for the frontend docker image, thanks to @Supernova3339 for the initial PR and suggestion [Github #2984](https://github.com/penpot/penpot/issues/2984)
-
-## 1.17.2
-
-### :bug: Bugs fixed
-
- Fix invite members button text [Taiga #4794](https://tree.taiga.io/project/penpot/issue/4794)
- Fix problem with opacity in frames [Taiga #4795](https://tree.taiga.io/project/penpot/issue/4795)
- Fix correct behaviour for space-around and added space-evenly option
- Fix duplicate with alt and undo only undo one step [Taiga #4746](https://tree.taiga.io/project/penpot/issue/4746)
- Fix problem creating frames inside layout [Taiga #4844](https://tree.taiga.io/project/penpot/issue/4844)
- Fix paste board inside itself [Taiga #4775](https://tree.taiga.io/project/penpot/issue/4775)
- Fix middle button panning can drag guides [Taiga #4266](https://tree.taiga.io/project/penpot/issue/4266)
-
-### :heart: Community contributions by (Thank you!)
-
- To @ondrejkonec: for some code contributions on this release.
-
-## 1.17.1
-
-### :bug: Bugs fixed
- Fix components groups items show the component name in list mode [Taiga #4770](https://tree.taiga.io/project/penpot/issue/4770)
- Fix typing CMD+Z on MacOS turns the cursor into a Zoom cursor [Taiga #4778](https://tree.taiga.io/project/penpot/issue/4778)
- Fix white space on small screens [Taiga #4774](https://tree.taiga.io/project/penpot/issue/4774)
- Fix button spacing on delete acount modal [Taiga #4762](https://tree.taiga.io/project/penpot/issue/4762)
- Fix invitations input on team management and onboarding modal [Taiga #4760](https://tree.taiga.io/project/penpot/issue/4760)
- Fix weird numeration creating new elements in dashboard [Taiga #4755](https://tree.taiga.io/project/penpot/issue/4755)
- Fix can move shape with lens zoom active [Taiga #4787](https://tree.taiga.io/project/penpot/issue/4787)
- Fix social links broken [Taiga #4759](https://tree.taiga.io/project/penpot/issue/4759)
- Fix tooltips on left toolbar [Taiga #4793](https://tree.taiga.io/project/penpot/issue/4793)
-
-## 1.17.0
-
-### :sparkles: New features
-
- Adds layout flex functionality for boards
- Better overlays interactions on boards inside boards [Taiga #4386](https://tree.taiga.io/project/penpot/us/4386)
- Show board miniature in manual overlay setting [Taiga #4475](https://tree.taiga.io/project/penpot/issue/4475)
- Handoff visual improvements [Taiga #3124](https://tree.taiga.io/project/penpot/us/3124)
- Dynamic alignment only in sight [Github 1971](https://github.com/penpot/penpot/issues/1971)
- Add some accessibility to shortcut panel [Taiga #4713](https://tree.taiga.io/project/penpot/issue/4713)
- Add shortcuts for text editing [Taiga #2052](https://tree.taiga.io/project/penpot/us/2052)
- Second level boards treated as groups in terms of selection [Taiga #4269](https://tree.taiga.io/project/penpot/us/4269)
- Performance improvements both for backend and frontend
- Accessibility improvements for login area [Taiga #4353](https://tree.taiga.io/project/penpot/us/4353)
- Outbound webhooks [Taiga #4577](https://tree.taiga.io/project/penpot/us/4577)
- Add copy invitation link to the invitation options [Taiga #4213](https://tree.taiga.io/project/penpot/us/4213)
- Dynamic alignment only in sight [Taiga #3537](https://tree.taiga.io/project/penpot/us/3537)
- Improve naming of layers [Taiga #4036](https://tree.taiga.io/project/penpot/us/4036)
- Add zoom lense [Taiga #4691](https://tree.taiga.io/project/penpot/us/4691)
- Detect potential problems with custom font vertical metrics [Taiga #4697](https://tree.taiga.io/project/penpot/us/4697)
-
-### :bug: Bugs fixed
-
- Add title to color bullets [Taiga #4218](https://tree.taiga.io/project/penpot/task/4218)
- Fix color bullets in library color modal [Taiga #4186](https://tree.taiga.io/project/penpot/issue/4186)
- Fix shortcut texts alignment [Taiga #4275](https://tree.taiga.io/project/penpot/issue/4275)
- Fix some texts and a typo [Taiga #4215](https://tree.taiga.io/project/penpot/issue/4215)
- Fix twitter support account link [Taiga #4279](https://tree.taiga.io/project/penpot/issue/4279)
- Fix lang autodetect issue [Taiga #4277](https://tree.taiga.io/project/penpot/issue/4277)
- Fix adding an extra page on import [Taiga #4543](https://tree.taiga.io/project/penpot/task/4543)
- Fix unable to select text at assets inputs in firefox [Taiga #4572](https://tree.taiga.io/project/penpot/issue/4572)
- Fix component sync when converting to path [Taiga #3642](https://tree.taiga.io/project/penpot/issue/3642)
- Fix style for team invite in deutsch [Taiga #4614](https://tree.taiga.io/project/penpot/issue/4614)
- Fix problem with text edition in Safari [Taiga #4046](https://tree.taiga.io/project/penpot/issue/4046)
- Fix show outline with rounded corners on rects [Taiga #4053](https://tree.taiga.io/project/penpot/issue/4053)
- Fix wrong interaction between comments and panning modes [Taiga #4297](https://tree.taiga.io/project/penpot/issue/4297)
- Fix bad element positioning on interaction with fixed scroll [Github #2660](https://github.com/penpot/penpot/issues/2660)
- Fix display type of component library not persistent [Taiga #4512](https://tree.taiga.io/project/penpot/issue/4512)
- Fix problem when moving texts with keyboard [#2690](https://github.com/penpot/penpot/issues/2690)
- Fix problem when drawing boxes won't detect mouse-up [Taiga #4618](https://tree.taiga.io/project/penpot/issue/4618)
- Fix missing loading icon on shared libraries [Taiga #4148](https://tree.taiga.io/project/penpot/issue/4148)
- Fix selection stroke missing in properties of multiple texts [Taiga #4048](https://tree.taiga.io/project/penpot/issue/4048)
- Fix missing create component menu for frames [Github #2670](https://github.com/penpot/penpot/issues/2670)
- Fix "currentColor" is not converted when importing SVG [Github 2276](https://github.com/penpot/penpot/issues/2276)
- Fix incorrect color in properties of multiple bool shapes [Taiga #4355](https://tree.taiga.io/project/penpot/issue/4355)
- Fix pressing the enter key gives you an internal error [Github 2675](https://github.com/penpot/penpot/issues/2675) [Github 2577](https://github.com/penpot/penpot/issues/2577)
- Fix confirm group name with enter doesn't work in assets modal [Taiga #4506](https://tree.taiga.io/project/penpot/issue/4506)
- Fix group/ungroup shapes inside a component [Taiga #4052](https://tree.taiga.io/project/penpot/issue/4052)
- Fix wrong update of text in components [Taiga #4646](https://tree.taiga.io/project/penpot/issue/4646)
- Fix problem with SVG imports with style [#2605](https://github.com/penpot/penpot/issues/2605)
- Fix ghost shapes after sync groups in components [Taiga #4649](https://tree.taiga.io/project/penpot/issue/4649)
- Fix layer orders messed up on move, group, reparent and undo [Github #2672](https://github.com/penpot/penpot/issues/2672)
- Fix max height in library dialog [Github #2335](https://github.com/penpot/penpot/issues/2335)
- Fix undo ungroup (shift+g) scrambles positions [Taiga #4674](https://tree.taiga.io/project/penpot/issue/4674)
- Fix justified text is stretched [Github #2539](https://github.com/penpot/penpot/issues/2539)
- Fix mousewheel on viewer inspector [Taiga #4221](https://tree.taiga.io/project/penpot/issue/4221)
- Fix path edition activated on boards [Taiga #4105](https://tree.taiga.io/project/penpot/issue/4105)
- Fix hidden layers inside groups become visible after the group visibility is changed[Taiga #4710](https://tree.taiga.io/project/penpot/issue/4710)
- Fix format of HSLA color on viewer [Taiga #4393](https://tree.taiga.io/project/penpot/issue/4393)
- Fix some typos [Taiga #4724](https://tree.taiga.io/project/penpot/issue/4724)
- Fix ctrl+c for inspect code [Taiga #4739](https://tree.taiga.io/project/penpot/issue/4739)
- Fix text in custom font is not at the expected position at export [Taiga #4394](https://tree.taiga.io/project/penpot/issue/4394)
- Fix unneeded popup when updating local components [Taiga #4430](https://tree.taiga.io/project/penpot/issue/4430)
- Fix multiuser - "Shadow" element is not updating immediately [Taiga #4709](https://tree.taiga.io/project/penpot/issue/4709)
- Fix paths not flagged as modified when resized [Taiga #4742](https://tree.taiga.io/project/penpot/issue/4742)
- Fix resend invitation doesn't reset the expiration date [Taiga #4741](https://tree.taiga.io/project/penpot/issue/4741)
- Fix incorrect state after undo page creation [Taiga #4690](https://tree.taiga.io/project/penpot/issue/4690)
- Fix copy paste texts with typography assets linked [Taiga #4750](https://tree.taiga.io/project/penpot/issue/4750)
-
-### :heart: Community contributions by (Thank you!)
-
- To @iprithvitharun: let's make UX Writing contributions in Open Source a trend!
-
-## 1.16.2-beta
-
-### :bug: Bugs fixed
-
- Fix strage cursor behaviour after clicking viewport with text pool [Github #2447](https://github.com/penpot/penpot/issues/2447)
-
-## 1.16.1-beta
-
-### :bug: Bugs fixed
-
- Fix unexpected exception related to default nudge value
- Fix firefox changing layer color type is not applied [Taiga #4292](https://tree.taiga.io/project/penpot/issue/4292)
- Fix justify alignes text left [Taiga #4322](https://tree.taiga.io/project/penpot/issue/4322)
- Fix text out of borders with "auto width" and center align [Taiga #4308](https://tree.taiga.io/project/penpot/issue/4308)
- Fix wrong validation text after interaction with 2 and more files [Taiga #4276](https://tree.taiga.io/project/penpot/issue/4276)
- Fix auto-width for texts can make text appear stretched [Github #2482](https://github.com/penpot/penpot/issues/2482)
- Fix boards name do not disappear in focus mode [#4272](https://tree.taiga.io/project/penpot/issue/4272)
- Fix wrong email in the info message at change email [Taiga #4274](https://tree.taiga.io/project/penpot/issue/4274)
- Fix transform to path RMB menu item is not relevant if shape is already path [Taiga #4302](https://tree.taiga.io/project/penpot/issue/4302)
- Fix join nodes icon is active when 2 already joined nodes are selected [Taiga #4370](https://tree.taiga.io/project/penpot/issue/4370)
- Fix path nodes panel. "To curve" and "To corner" icons are active if node is already curved/cornered [Taiga #4371](https://tree.taiga.io/project/penpot/issue/4371)
- Fix displaying comments settings are not applied via "Comments" menu drop-down on the top navbar on view mode [Taiga #4389](https://tree.taiga.io/project/penpot/issue/4389)
- Fix bad behaviour on hovering and click nested artboards [Taiga #4018](https://tree.taiga.io/project/penpot/issue/4018) and [Taiga #4269](https://tree.taiga.io/project/penpot/us/4269)
- Fix lang autodetect issue [Taiga #4277](https://tree.taiga.io/project/penpot/issue/4277)
- Fix colorpicker does not close upon switching to Dashboard [Taiga #4408](https://tree.taiga.io/project/penpot/issue/4408)
- Fix problem with auto-width/auto-height + lock-proportions
-
-## 1.16.0-beta
-
-### :boom: Breaking changes & Deprecations
-
- Removed the support for v2 internal file data blob format.  This
-  version has never been documented nor set as default value so
-  technically this is not a breaking change because we are removing
-  a "private API".
-
-### :sparkles: New features
-
- Improve interactions with nested boards [Taiga #4054](https://tree.taiga.io/project/penpot/us/4054)
- Add team hero in projects dashboard [Taiga #3863](https://tree.taiga.io/project/penpot/us/3863)
- Add zoom style to shared link [Taiga #3874](https://tree.taiga.io/project/penpot/us/3874)
- Add dashboard creation button as placeholder [Taiga #3861](https://tree.taiga.io/project/penpot/us/3861)
- Improve invitation flow on onboarding [Taiga #3241](https://tree.taiga.io/project/penpot/us/3241)
- Add new text to initial modals [Taiga #3458](https://tree.taiga.io/project/penpot/us/3458)
- Add new questions to onboarding [Taiga #3462](https://tree.taiga.io/project/penpot/us/3462)
- Add cosmetic changes in viewer mode [Taiga #3688](https://tree.taiga.io/project/penpot/us/3688)
- Outline highlights on layer hovering [Taiga #2645](https://tree.taiga.io/project/penpot/us/2645) by @andrewzhurov
- Add zoom to shape on double click up on its icon [Taiga #3929](https://tree.taiga.io/project/penpot/us/3929) by @andrewzhurov
- Add Libraries & Templates carousel [Taiga #3860](https://tree.taiga.io/project/penpot/us/3860)
- Ungroup frames [Taiga #4012](https://tree.taiga.io/project/penpot/us/4012)
- Newsletter Opt-in options for subscription categories [Taiga #3242](https://tree.taiga.io/project/penpot/us/3242)
- Print emails to console by default if smtp is disabled
- Add `email-verification` flag for enable/disable email verification
- Make graphics thumbnails load lazy [Taiga #4252](https://tree.taiga.io/project/penpot/issue/4252)
-
-### :bug: Bugs fixed
-
- Fix unexpected removal of guides on copy&paste frames [Taiga #3887](https://tree.taiga.io/project/penpot/issue/3887) by @andrewzhurov
- Fix props preserving on copy&paste texts [Taiga #3629](https://tree.taiga.io/project/penpot/issue/3629) by @andrewzhurov
- Fix unexpected layers ungrouping on moving it [Taiga #3932](https://tree.taiga.io/project/penpot/issue/3932) by @andrewzhurov
- Fix artboards moving with comment tool selected [Taiga #3938](https://tree.taiga.io/project/penpot/issue/3938)
- Fix undo on delete page does not preserve its order [Taiga #3375](https://tree.taiga.io/project/penpot/issue/3375)
- Fix unexpected 404 on deleting library that is used by deleted files
- Fix inconsistent message on deleting library when a library is linked from deleted files
- Fix change multiple colors with SVG [Taiga #3889](https://tree.taiga.io/project/penpot/issue/3889)
- Fix ungroup does not work for typographies [Taiga #4195](https://tree.taiga.io/project/penpot/issue/4195)
- Fix inviting to non existing users can fail [Taiga #4108](https://tree.taiga.io/project/penpot/issue/4108)
- Fix components marked as touched when moved [Taiga #4061](https://tree.taiga.io/project/penpot/task/4061)
- Fix boards grouped shouldn't show the title [Taiga #4251](https://tree.taiga.io/project/penpot/issue/4251)
- Fix gradient handlers are under resize handlers[Taiga #4298](https://tree.taiga.io/project/penpot/issue/4298)
- Fix grid not syncing immediately in multiuser [Taiga #4339](https://tree.taiga.io/project/penpot/issue/4339)
- Fix custom font upload fails silently for unsupported formats [Taiga #4279](https://tree.taiga.io/project/penpot/issue/4280)
-
-### :heart: Community contributions by (Thank you!)
-
- To @andrewzhurov for many code contributions on this release.
- UI improvements in Project section (by @Waishnav) [#2285](https://github.com/penpot/penpot/pull/2285)
- Fix fronted comments (by @lol768) [#2368](https://github.com/penpot/penpot/pull/2368)
-
-## 1.15.5-beta
-
-### :bug: Bugs fixed
-
- Fix artboard border radius [Taiga #4291](https://tree.taiga.io/project/penpot/issue/4291)
- Fix copied & pasted layer is not visible [Taiga #4283](https://tree.taiga.io/project/penpot/issue/4283)
- Fix notification to newsletter is shown in all cases [Taiga #4367](https://tree.taiga.io/project/penpot/issue/4367)
- Fix comments section is not scrolling by mouse wheel [Taiga #4305](https://tree.taiga.io/project/penpot/issue/4305)
- Fix justify alignes text left [Taiga #4322](https://tree.taiga.io/project/penpot/issue/4322)
- Fix text out of borders with "auto width" and center align [Taiga #4308](https://tree.taiga.io/project/penpot/issue/4308)
-
-## 1.15.4-beta
-
-### :bug: Bugs fixed
-
- Fix social buttons in register form [Taiga #4320](https://tree.taiga.io/project/penpot/issue/4320)
- Remove gitter information from feedback page [Taiga #4157](https://tree.taiga.io/project/penpot/issue/4157)
- Fix overlay remains open on frame change [Taiga #4066](https://tree.taiga.io/project/penpot/issue/4066)
- Fix toggle overlay position [Taiga #4091](https://tree.taiga.io/project/penpot/issue/4091)
- Fix overlay closed on clicked outside [Taiga #4027](https://tree.taiga.io/project/penpot/issue/4027)
- Fix animate multiple overlays [Taiga #3993](https://tree.taiga.io/project/penpot/issue/3993)
- Fix problem with snap to grids [#2221](https://github.com/penpot/penpot/issues/2221)
- Fix issue when scaling to value 0 [#2252](https://github.com/penpot/penpot/issues/2252)
- Fix problem when moving shapes inside nested frames [Taiga #4113](https://tree.taiga.io/project/penpot/issue/4113)
- Fix color type icon does not change [Taiga #4133](https://tree.taiga.io/project/penpot/issue/4133)
- Fix recent colors are not working [Taiga #4153](https://tree.taiga.io/project/penpot/issue/4153)
- Fix change opacity in colorpicker cause bugged color [Taiga #4154](https://tree.taiga.io/project/penpot/issue/4154)
- Fix gradient colors don't arrive in recent colors palette (https://tree.taiga.io/project/penpot/issue/4155)
- Fix selected colors allow gradients in shadows [Taiga #4156](https://tree.taiga.io/project/penpot/issue/4156)
- Fix import files with unexpected format or invalid content [Taiga #4136](https://tree.taiga.io/project/penpot/issue/4136)
- Fix wrong shortcut button tip of "Delete" function [Taiga #4162](https://tree.taiga.io/project/penpot/issue/4162)
- Fix error after user drags any layer in search functionality [Taiga #4161](https://tree.taiga.io/project/penpot/issue/4161)
- Fix font search works only with lowercase letters [Taiga #4140](https://tree.taiga.io/project/penpot/issue/4140)
- Fix Terms and Privacy links overlapping [Taiga #4137](https://tree.taiga.io/project/penpot/issue/4137)
- Fix Export bounding box mask [Taiga #950](https://tree.taiga.io/project/penpot/issue/950)
- Fix delete layers in bulk [Taiga #4160](https://tree.taiga.io/project/penpot/issue/4160)
- Fix Cannot take out an element from a group at layers panel by drag [Taiga #4209](https://tree.taiga.io/project/penpot/issue/4209)
- Fix Internal error when resending invitation email [Taiga #4212](https://tree.taiga.io/project/penpot/issue/4212)
- Fix PDF exportation order [Taiga #4216](https://tree.taiga.io/project/penpot/issue/4216)
- Fix some typos [Taiga #4215](https://tree.taiga.io/project/penpot/issue/4215)
- Fix "no boards" message in viewer [Taiga #4243](https://tree.taiga.io/project/penpot/issue/4243)
- Fix view mode login size [Taiga #4210](https://tree.taiga.io/project/penpot/issue/4210)
-
-## 1.15.3-beta
-
-### :bug: Bugs fixed
-
- Fix default value of grow type in texts [Taiga #4034](https://tree.taiga.io/project/penpot/issue/4034)
- Fix error when moving nested frames outside [Taiga #4017](https://tree.taiga.io/project/penpot/issue/4017)
- Fix problem when hovering over nested frames [Taiga #4018](https://tree.taiga.io/project/penpot/issue/4018)
- Fix problem editing rotated texts [Taiga #4026](https://tree.taiga.io/project/penpot/issue/4026)
- Fix problem with texts for non existing fonts [Taiga #4087](https://tree.taiga.io/project/penpot/issue/4087)
- Fix undo after moving layers will wrongly order the layers [Taiga #3344](https://tree.taiga.io/project/penpot/issue/3344)
- Fix grouping typographies by drag & drop does not work (again) [#2203](https://github.com/penpot/penpot/issues/2203)
- Fix when ungrouping, the items previously grouped should ALWAYS remain selected [Taiga #4064](https://tree.taiga.io/project/penpot/issue/4064)
- Change shortcut for "Clear undo" [#2219](https://github.com/penpot/penpot/issues/2219)
-
-
-## 1.15.2-beta
-
-### :bug: Bugs fixed
-
- Fix problem with multi-user text editing [Taiga #3446](https://tree.taiga.io/project/penpot/issue/3446)
- Fix path tools blocking elements underneath [#2050](https://github.com/penpot/penpot/issues/2050)
- Fix frame titles deforming when resize [#2207](https://github.com/penpot/penpot/issues/2207)
- Fix export simple line path [#3890](https://tree.taiga.io/project/penpot/issue/3890)
- Fix color-picker recent colors [Taiga #4013](https://tree.taiga.io/project/penpot/issue/4013)
-
-## 1.15.1-beta
-
-### :bug: Bugs fixed
-
- Fix shadows doesn't work on nested artboards [Taiga #3886](https://tree.taiga.io/project/penpot/issue/3886)
- Fix problems with double-click and selection [Taiga #4005](https://tree.taiga.io/project/penpot/issue/4005)
- Fix mismatch between editor and displayed text in workspace [Taiga #3975](https://tree.taiga.io/project/penpot/issue/3975)
- Fix validation error on text position [Taiga #4010](https://tree.taiga.io/project/penpot/issue/4010)
- Fix objects jitter while scrolling [Github #2167](https://github.com/penpot/penpot/issues/2167)
- Fix on color-picker, click+drag adds lots of recent colors [Taiga #4013](https://tree.taiga.io/project/penpot/issue/4013)
- Fix opening profile URL while signed out takes to "your account" section[Taiga #3976](https://tree.taiga.io/project/penpot/issue/3976)
-
-## 1.15.0-beta
-
-### :boom: Breaking changes & Deprecations
-
- The `PENPOT_LOGIN_WITH_LDAP` environment variable is finally removed (after
-  many version with deprecation). It is replaced with the
-  `enable-login-with-ldap` flag.
- The `PENPOT_LDAP_ATTRS_PHOTO` finally removed, it was unused for many
-  versions.
- If you are using social login (google, github, gitlab or generic OIDC) you
-  will need to ensure to add the following flags respectively to let them
-  enabled: `enable-login-with-google`, `enable-login-with-github`,
-  `enable-login-with-gitlab` and `enable-login-with-oidc`. If not, they will
-  remain disabled after application start independently if you set the client-id
-  and client-sectet options.
- The `PENPOT_REGISTRATION_ENABLED` is finally removed in favour of
-  `<enable|disable>-registration` flag.
- The OIDC providers are now initialized synchronously, and if you are using the
-  discovery mechanism of the generic OIDC integration, the start time of the
-  application will depend on how fast the OIDC provider responds to the
-  discovery http request.
-
-### :sparkles: New features
-
- Add some cosmetic changes in viewer mode [Taiga #3688](https://tree.taiga.io/project/penpot/us/3688)
- Allow for nested and rotated boards inside other boards and groups [Taiga #2874](https://tree.taiga.io/project/penpot/us/2874?milestone=319982)
- View mode improvements to enable access and use in different conditions [Taiga #3023](https://tree.taiga.io/project/penpot/us/3023)
- Improved share link options. Now you can allow non-team members to comment and/or inspect [Taiga #3056] (https://tree.taiga.io/project/penpot/us/3056)
- Signin/Signup from shared link [Taiga #3472](https://tree.taiga.io/project/penpot/us/3472)
- Support for import/export binary format [Taiga #2991](https://tree.taiga.io/project/penpot/us/2991)
- Comments positioning [Taiga #2007](https://tree.taiga.io/project/penpot/us/2007)
- Select all inside a group select only the objects at this group level [Taiga #2382](https://tree.taiga.io/project/penpot/issue/2382)
- Make the media maximum upload size configurable
-
-### :bug: Bugs fixed
-
- Fix viewer scroll problems [Taiga 3403](https://tree.taiga.io/project/penpot/issue/3403)
- Fix hide html options on handoff [Taiga 3533](https://tree.taiga.io/project/penpot/issue/3533)
- Fix share prototypes overlay and stroke [Taiga #3994](https://tree.taiga.io/project/penpot/issue/3994)
- Fix border radious on boolean operations [Taiga #3959](https://tree.taiga.io/project/penpot/issue/3959)
- Fix inconsistent representation of rectangles [Taiga #3977](https://tree.taiga.io/project/penpot/issue/3977)
- Fix recent fonts info [Taiga #3953](https://tree.taiga.io/project/penpot/issue/3953)
- Fix clipped elements affect boards and centering [Taiga #3666](https://tree.taiga.io/project/penpot/issue/3666)
- Fix intro action in multi input [Taiga #3541](https://tree.taiga.io/project/penpot/issue/3541)
- Fix team default image [Taiga #3919](https://tree.taiga.io/project/penpot/issue/3919)
- Fix problem with group coordinates [#2008](https://github.com/penpot/penpot/issues/2008)
- Fix problem with line-height and texts [Taiga #3578](https://tree.taiga.io/project/penpot/issue/3578)
- Fix moving frame-guides outside frames [Taiga #3839](https://tree.taiga.io/project/penpot/issue/3839)
- Fix problem with 180 degree rotations [#2082](https://github.com/penpot/penpot/issues/2082)
- Fix font rendering on grid thumbnails [Taiga #3473](https://tree.taiga.io/project/penpot/issue/3473)
- Fix Drag and drop font assets in groups [Taiga #3763](https://tree.taiga.io/project/penpot/issue/3763)
- Fix copy and paste layers order [Taiga #1617](https://tree.taiga.io/project/penpot/issue/1617)
- Fix unexpected removal of guides on copy&paste frames [Taiga #3887](https://tree.taiga.io/project/penpot/issue/3887) by @andrewzhurov
- Fix props preserving on copy&paste texts [Taiga #3629](https://tree.taiga.io/project/penpot/issue/3629) by @andrewzhurov
- Fix unexpected layers ungrouping on moving it [Taiga #3932](https://tree.taiga.io/project/penpot/issue/3932) by @andrewzhurov
- Fix unexpected exception and behavior on colorpicker with gradients [Taiga #3448](https://tree.taiga.io/project/penpot/issue/3448)
- Fix multiselection with shift not working inside a library group [Taiga #3532](https://tree.taiga.io/project/penpot/issue/3532)
- Fix drag and drop graphic assets in groups [Taiga #4002](https://tree.taiga.io/project/penpot/issue/4002)
- Fix bringing complete file data when launching the export dialog [Taiga #4006](https://tree.taiga.io/project/penpot/issue/4006)
-
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)

-## 1.14.2-beta
-
-### :bug: Bugs fixed
-
- Fix colors from unlinked libs in color selected widget [Taiga #3712](https://tree.taiga.io/project/penpot/issue/3712)
- Fix fill information not complete when paste plain text [Taiga #3680](https://tree.taiga.io/project/penpot/issue/3680)
- Fix problem when resizing groups [Taiga #3702](https://tree.taiga.io/project/penpot/issue/3702)
- Fix issues on typographies assets grouping [#2073](https://github.com/penpot/penpot/issues/2073)
- Fix text positioning inconsistencies between browsers
-
-## 1.14.1-beta
-
-### :bug: Bugs fixed
-
- Fix shortcut access in main menu [Taiga #3672](https://tree.taiga.io/project/penpot/issue/3672)
- Fix modify colors in a row in selected colors [Taiga #3653](https://tree.taiga.io/project/penpot/issue/3653)
- Fix crash when double click on viewer assets [Taiga #3625](https://tree.taiga.io/project/penpot/issue/3625)
- Fix right click on typographies assets [Taiga #3638](https://tree.taiga.io/project/penpot/issue/3638)
-
-## 1.14.0-beta
-
-### :sparkles: New features
-
- Added shortcut panel in workspace [Taiga #36](https://tree.taiga.io/project/penpot/us/36)
- Added selected colors widget in right sidebar [Taiga #2485](https://tree.taiga.io/project/penpot/us/2485)
- Added fixed elements when scrolling [Taiga #1533](https://tree.taiga.io/project/penpot/us/1533)
- Multiple team invitations on onboarding [Taiga #3084](https://tree.taiga.io/project/penpot/us/3084)
- Change text properties position at the sidebar [Taiga #3047](https://tree.taiga.io/project/penpot/us/3047)
- Group assets by drag and drop [Taiga #2831](https://tree.taiga.io/project/penpot/us/2831)
- Navigate to the original link after log in [Taiga #3624](https://tree.taiga.io/project/penpot/issue/3624)
-
-### :bug: Bugs fixed
-
- Fix menu file not accessible in certain conditions [Taiga #3385](https://tree.taiga.io/project/penpot/issue/3385)
- Remove deprecated menu options [Taiga #3333](https://tree.taiga.io/project/penpot/issue/3333)
- Prototype connection should be under the rules [Taiga #3384](https://tree.taiga.io/project/penpot/issue/3384)
- Fix problem with empty text boxes events [Taiga #3627](https://tree.taiga.io/project/penpot/issue/3627)
-
-
-## 1.13.5-beta
-
-### :bug: Bugs fixed
- Fix orientation artboard preset not working with differently sized artboards [Taiga #3548](https://tree.taiga.io/project/penpot/issue/3548)
- Fix background on export arboards [Taiga #1991](https://tree.taiga.io/project/penpot/issue/1991)
-
-## 1.13.4-beta
-
-### :bug: Bugs fixed
-
- Fix undo when drawing curves [Taiga #3523](https://tree.taiga.io/project/penpot/issue/3523)
- Fix issue with text edition and certain fonts (WorkSans, Raleway, ...) and foreign objects [Taiga #3521](https://tree.taiga.io/project/penpot/issue/3521)
- Fix thumbnail generation when concurrent edition [Taiga #3522](https://tree.taiga.io/project/penpot/issue/3522)
- Fix environment import for exporter in Docker
- Fix auto scroll layers in Firefox [Taiga #3531](https://tree.taiga.io/project/penpot/issue/3531)
- Fix base background not visible for imported SVG
-
-## 1.13.3-beta
-
-### :bug: Bugs fixed
-
- Fix docker dependencies
- Sets invitations expirations to 7 days
- Add safety measure for text positions
- Fix old texts with opacity and no fill
- Remove default font on team change
- Fix github auth without name
- Fix problems with font loading in Firefox 95
-
-## 1.13.2-beta
-
-### :bug: Bugs fixed
-
- Improved performance when out of focus mode
- Improved performance for thumbnail generation
- Fix problem with out of sync thumbnails
-
 ## 1.13.1-beta

 ### :bug: Bugs fixed
@@ -559,13 +62,12 @@
 - Duplicate artboards create new flows if needed [Taiga #2221](https://tree.taiga.io/project/penpot/issue/2221)
 - Round the size values on handoff to two decimals [Taiga #3227](https://tree.taiga.io/project/penpot/issue/3227)
 - Fix paste shapes while editing text [Taiga #2396](https://tree.taiga.io/project/penpot/issue/2396)
- Round the size values on handoff to two decimals [Taiga #3227](https://tree.taiga.io/project/penpot/issue/3227)
 - Fix blend modes ignored in component updates [Taiga #2626](https://tree.taiga.io/project/penpot/issue/2626)
 - Fix internal error when hoverin over shape [Taiga #3237](https://tree.taiga.io/project/penpot/issue/3237)
 - Fix mouse leave in handoff close overlay animation breaks [Taiga #3173](https://tree.taiga.io/project/penpot/issue/3173)
 - Fix different behaviour during image drag [Taiga #2279](https://tree.taiga.io/project/penpot/issue/2279)
 - Fix hidden file name on import [Taiga #3172](https://tree.taiga.io/project/penpot/issue/3172)
- Fix unnecessary scrollbars at the color list [Taiga #3211](https://tree.taiga.io/project/penpot/issue/3211)
+- Fix unneccessary scrollbars at the color list [Taiga #3211](https://tree.taiga.io/project/penpot/issue/3211)
 - "Show in exports" is showing in multiselections [Taiga #3194](https://tree.taiga.io/project/penpot/issue/3194)
 - Edit file name navigates to the file workspace [Taiga #3183](https://tree.taiga.io/project/penpot/issue/3183)
 - Fix scroll into view behind fixed element [Taiga #3170](https://tree.taiga.io/project/penpot/issue/3170)
@@ -574,7 +76,7 @@
 - Fix duplicate multi selected elements [Taiga #3155](https://tree.taiga.io/project/penpot/issue/3155)
 - Fix add fills to artboard modify children [Taiga #3151](https://tree.taiga.io/project/penpot/issue/3151)
 - Avoid numeric inputs to allow big numbers [Taiga #2858](https://tree.taiga.io/project/penpot/issue/2858)
- Fix component context menu size [Taiga #2480](https://tree.taiga.io/project/penpot/issue/2480)
+- Fix component contex menu size [Taiga #2480](https://tree.taiga.io/project/penpot/issue/2480)
 - Add shadow to artboard make it lose the fill [Taiga #3139](https://tree.taiga.io/project/penpot/issue/3139)
 - Avoid numeric inputs to change its value without focusing them [Taiga #3140](https://tree.taiga.io/project/penpot/issue/3140)
 - Fix comments modal when changing pages [Taiga #2597](https://tree.taiga.io/project/penpot/issue/2508)
@@ -703,7 +205,7 @@

 - Fix issue on handling empty content on boolean shapes
 - Fix race condition issue on component renaming
- Handle EOF errors on writing streamed response
+- Handle EOF errors on writting streamed response
 - Handle EOF errors on websocket send/ping methods
 - Disable parallel upload of file media on import (causes too much
  contention on the rlimit subsistem that does not works as expected
@@ -815,7 +317,7 @@

 ## 1.10.4-beta

-### :sparkles: Enhancements
+### :sparkles: Enhacements

 - Allow parametrice file snapshoting interval

@@ -827,7 +329,7 @@

 ## 1.10.3-beta

-### :sparkles: Enhancements
+### :sparkles: Enhacements

 - Make all logging asynchronous, this avoid some overhead on jetty threads at cost of logging latency.
 - Increase default session time to 15 days.
@@ -1163,7 +665,7 @@

 - Add better auth module logging.
 - Add missing `email` scope to OIDC backend.
- Add missing cause prop on error logging.
+- Add missing cause prop on error loging.
 - Fix empty font-family handling on custom fonts page.
 - Fix incorrect unicode code points handling on draft-to-penpot conversion.
 - Fix some problems with paths.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -99,16 +99,16 @@ Each commit should have:
 - An entry on the CHANGES.md file if applicable, referencing the
  github or taiga issue/user-story using the these same rules.

-Examples of good commit messages:
+Examples of good commit messags:

- `:bug: Fix unexpected error on launching modal`
- `:bug: Set proper error message on generic error`
- `:sparkles: Enable new modal for profile`
- `:zap: Improve performance of dashboard navigation`
- `:wrench: Update default backend configuration`
- `:books: Add more documentation for authentication process`
- `:ambulance: Fix critical bug on user registration process`
- `:tada: Add new approach for user registration`
+- :bug: Fix unexpected error on launching modal
+- :bug: Set proper error message on generic error
+- :sparkles: Enable new modal for profile
+- :zap: Improve performance of dashboard navigation
+- :wrench: Update default backend configuration
+- :books: Add more documentation for authentication process
+- :ambulance: Fix critical bug on user registration process
+- :tada: Add new approach for user registration


 ## Code of conduct ##
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 <h1 align="center">
  <br>
-  <img src="https://penpot.app/images/readme/git-readme-header.png" alt="PENPOT">
+  <img src="https://penpot.app/images/readme/readme-logo.jpg" alt="PENPOT">
 </h1>

 <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>
@@ -12,122 +12,76 @@
 <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> •
-    <a href="https://help.penpot.app/technical-guide/getting-started/"><b>Getting Started</b></a> •
-    <a href="https://help.penpot.app/user-guide/"><b>User Guide</b></a> •
-    <a href="https://help.penpot.app/user-guide/introduction/info/"><b>Tutorials & Info</b></a> •
-    <a href="https://community.penpot.app/"><b>Community</b></a> •
-    <a href="https://twitter.com/penpotapp"><b>Twitter</b></a> •
-    <a href="https://instagram.com/penpot.app"><b>Instagram</b></a> •
-    <a href="https://fosstodon.org/@penpot/"><b>Mastodon</b></a> •
-    <a href="https://www.youtube.com/channel/UCAqS8G72uv9P5HG1IfgnQ9g"><b>Youtube</b></a>
-</p>
+![PENPOT](https://penpot.app/images/readme/home-ui.jpg)

-![feature-readme](https://user-images.githubusercontent.com/1045247/189871786-0b44f7cf-3a0a-4445-a87b-9919ec398bf7.gif)

-Penpot is the first **Open Source** design and prototyping platform meant for cross-domain teams. Non dependent on operating systems, Penpot is web based and works with open standards (SVG). Penpot invites designers all over the world to fall in love with open source while getting developers excited about the design process in return.
+## What is Penpot? ##

-## Table of contents ##
+Penpot is the first **Open Source design** and prototyping platform meant for cross-domain teams. Non dependent on operating systems, Penpot is web based and works with open web standards (SVG). For all and empowered by the community.

- [Why Penpot](#why-penpot)
- [Getting Started](#getting-started)
- [Community](#community)
- [Resources](#resources)
+- [How to use](#how-to-use)
+- [Help center](#help-center)
+- [Contributing](#contributing)
+- [Give feedback](#give-feedback)
+- [Tutorials](#tutorials)
 - [License](#license)

-## Why Penpot ##
+## How to use ##

-Penpot makes design and prototyping accessible to every team in the world.
+Login or Register on our Penpot cloud app. Create a team to work together on projects and share design assets or jump right away into Penpot and **start designing** by your own.

-### For cross-domain teams ###
-We have a clear focus on design and code teams and our capabilities reflect exactly that. The less hand-off mindset, the more fun for everyone.
+✏️ [Start using Penpot](https://design.penpot.app)

-### Multiplatform ###
-Being web based, Penpot is not dependent on operating systems or local installations, you will only need to run a modern browser.
+You can also install Penpot in a local environment. This section details everything you need to know to get Penpot up and running in production environments. Although it can be installed in many ways, the recommended approach is using **docker** and **docker-compose**.

-### Open Standards ###
-Using SVG as no other design and prototyping tool does, Penpot files sport compatibility with most of the vectorial tools, are tech friendly and extremely easy to use on the web. We make sure you will always own your work.
+🐳 [Install docker](https://help.penpot.app/technical-guide/getting-started/)

-<p align="center">
-  <img src="https://penpot.app/images/readme/git-open.png" alt="Open Source" style="width: 65%;">
-</p>
+## Help center ##

+In this documentation you will find (almost) everything you need to know about how to work with Penpot. From the interface basics to advanced functionality.

-## Getting started ##
+📖 [User guide](https://help.penpot.app/user-guide/)

-### Install with Elestio ###
-[Elestio](https://elest.io/) offers a fully managed service for on-premise instances of a selection of open-source software! This means you can deploy a dedicated instance of Penpot in just 3 minutes with no technical knowledge needed.
+❓ [FAQs](https://help.penpot.app/faqs/)

-You don’t need to worry about DNS configuration, SMTP, backups, SSL certificates, OS & Penpot upgrades, and much more.
+🖥️ [Technical guide](https://help.penpot.app/technical-guide/)

-[Get started with Elestio.](https://help.penpot.app/technical-guide/getting-started/#install-with-elestio)
+❤️ [Contributing guide](https://help.penpot.app/contributing-guide/)

-### Install with Docker ###
-
-You can also get started with Penpot locally or self-host it with **docker** and **docker-compose**.
-
-Here’s a step-by-step guide on [getting started with Docker.](https://help.penpot.app/technical-guide/getting-started/#install-with-docker)
-
-### Penpot cloud app ###
-
-If you prefer not to install Penpot in a local environment, [login or register on our Penpot cloud app](https://design.penpot.app). Create a team to work together on projects and share design assets or jump right away into Penpot and **start designing** on your own.
-
-<p align="center">
-  <img src="https://penpot.app/images/readme/git-self-host.png" alt="Getting started" style="width: 65%;">
-</p>
-
-## Community ##
-
-We love the open source software community. Contributing is our passion and if it’s yours too, [participate](https://community.penpot.app/) and [improve](https://community.penpot.app/c/help-us-improve-penpot/7) Penpot. All your ideas and code are welcome!
-
-If you need help or have any questions; if you’d like to share your experience using Penpot or get inspired; if you’d rather meet our community of developers and designers, [join our Community](https://community.penpot.app/)!
-
-You will find the following categories:
- [Ask the Community](https://community.penpot.app/c/ask-for-help-using-penpot/6)
- [Troubleshooting](https://community.penpot.app/c/technical/8)
- [Help us Improve Penpot](https://community.penpot.app/c/help-us-improve-penpot/7)
- [#MadeWithPenpot](https://community.penpot.app/c/madewithpenpot/9)
- [Events and Announcements](https://community.penpot.app/c/announcements/5)
- [Inside Penpot](https://community.penpot.app/c/inside-penpot/21)
- [Penpot in your language](https://community.penpot.app/c/penpot-in-your-language/12)
-
-<p align="center">
-  <img src="https://penpot.app/images/readme/git-collaborate.png" alt="Communnity" style="width: 65%;">
-</p>
+![User guide](https://penpot.app/images/readme/help-center.jpg)

 ## Contributing ##

-Every sort of contribution will be very helpful to enhance Penpot. How you’ll participate? All your ideas, designs and code are welcome:
-
- Invite your [team to join](https://design.penpot.app/#/auth/register)
- Star this repo and follow us on Social Media:  [Twitter](https://twitter.com/penpotapp), [Instagram](https://instagram.com/penpot.app), [Youtube](https://www.youtube.com/c/Penpot) or [Mastodon](https://fosstodon.org/@penpot/).
- Participate in the [Community](https://community.penpot.app/) asking and answering questions, reacting to others’ articles or opening your own conversations.
- Report bugs with our easy [guide for bugs hunting](https://help.penpot.app/contributing-guide/reporting-bugs/) or [GitHub issues](https://github.com/penpot/penpot/issues)
- Create and [share Libraries & templates](https://penpot.app/libraries-templates.html) that will be helpful for the community
- Become a [translator](https://help.penpot.app/contributing-guide/translations)
- Give feedback: [Mail us](mailto:support@penpot.app)
-
-To find (almost) everything you need to know on how to contribute to Penpot, refer to the [contributing-guide](https://help.penpot.app/contributing-guide/).
-
 <p align="center">
-  <img src="https://penpot.app/images/readme/git-community.png" alt="Contributing" style="width: 65%;">
+  <img src="https://penpot.app/images/open-source.png" alt="Open Source">
 </p>

-## Resources ##
+**Open to you!**
+
+We love the open source software community. Contributing is our
+passion and because of this, we'll be glad if you want to participate
+and improve Penpot. All your awesome ideas and code are welcome!
+
+Please refer to the [Contributing Guide](./CONTRIBUTING.md)
+
+## Give feedback ##

 You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.

-💾 [Documentation](https://help.penpot.app/technical-guide/)
+✉️ [Mail us](mailto:info@penpot.app)

-🚀 [Getting Started](https://help.penpot.app/technical-guide/getting-started/)
+💬 [GitHub discussions](https://github.com/penpot/penpot/discussions)

-✏️ [Tutorials](https://www.youtube.com/playlist?list=PLgcCPfOv5v54WpXhHmNO7T-YC7AE-SRsr)
+🐞 [GitHub issues](https://github.com/penpot/penpot/issues)

-🏘️ [Architecture](https://help.penpot.app/technical-guide/architecture/)
+✍️️ [Gitter](https://gitter.im/penpot/community)

-📚 [Dev Diaries](https://penpot.app/dev-diaries.html)
+## Tutorials ##

+You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.
+Would you like to know more about Penpot? We recommend you to visit our youtube channel and learn more about the functionalities and possibilities of Penpot with our video tutorials.
+
+🎞️ [YouTube channel](https://www.youtube.com/channel/UCAqS8G72uv9P5HG1IfgnQ9g)

 ## License ##

@@ -136,6 +90,5 @@ 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
+Copyright (c) UXBOX Labs SL
 ```
-Penpot is a Kaleidos’ [open source project](https://kaleidos.net/products)
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security issues to `support@penpot.app`
--- a/THANKYOU.md
+++ b/THANKYOU.md
@@ -1,97 +0,0 @@
-# THANK YOU
-
-We want to thank to the amazing people that help us! Thank you! You're the best!
-
-## Security
-* Husnain Iqbal (CEO OF ALPHA INFERNO PVT LTD)
-* [Shiraz Ali Khan](https://www.linkedin.com/in/shiraz-ali-khan-1ba508180/)
-
-## Internationalization
-* [00ff88](https://hosted.weblate.org/user/00ff88)
-* [AhmadHB](https://hosted.weblate.org/user/AhmadHB)
-* [Aimee](https://hosted.weblate.org/user/Aimee)
-* [alejandro.alonso](alejandro.https://hosted.weblate.org/user/alonso)
-* [alexpawlak](https://hosted.weblate.org/user/alexpawlak)
-* [allytiago](https://hosted.weblate.org/user/allytiago)
-* [alonso.torres](alonso.https://hosted.weblate.org/user/torres)
-* [andres.moya](andres.https://hosted.weblate.org/user/moya)
-* [antoniofsm](https://hosted.weblate.org/user/antoniofsm)
-* [ascarida](https://hosted.weblate.org/user/ascarida)
-* [Bechii](https://hosted.weblate.org/user/Bechii)
-* [Beeby](https://hosted.weblate.org/user/Beeby)
-* [bingling-sama](bingling-https://hosted.weblate.org/user/sama)
-* [devadarta](https://hosted.weblate.org/user/devadarta)
-* [diacritica](https://hosted.weblate.org/user/diacritica)
-* [dundzys.vincas](dundzys.https://hosted.weblate.org/user/vincas)
-* [Eranot](https://hosted.weblate.org/user/Eranot)
-* [erral](https://hosted.weblate.org/user/erral)
-* [ersen](https://hosted.weblate.org/user/ersen)
-* [filipepessanha](https://hosted.weblate.org/user/filipepessanha)
-* [fortx](https://hosted.weblate.org/user/fortx)
-* [foxbit](https://hosted.weblate.org/user/foxbit)
-* [georgelemon](https://hosted.weblate.org/user/georgelemon)
-* [girafic](https://hosted.weblate.org/user/girafic)
-* [gizemb](https://hosted.weblate.org/user/gizemb)
-* [greench](https://hosted.weblate.org/user/greench)
-* [guidimas](https://hosted.weblate.org/user/guidimas)
-* [hfigueira_1](https://hosted.weblate.org/user/hfigueira_1)
-* [hifiaz](https://hosted.weblate.org/user/hifiaz)
-* [httpsterio](https://hosted.weblate.org/user/httpsterio)
-* [humteus](https://hosted.weblate.org/user/humteus)
-* [iblueer](https://hosted.weblate.org/user/iblueer)
-* [insan](https://hosted.weblate.org/user/insan)
-* [Iphi](https://hosted.weblate.org/user/Iphi)
-* [iWangJiaxiang](https://hosted.weblate.org/user/iWangJiaxiang)
-* [jancborchardt](https://hosted.weblate.org/user/jancborchardt)
-* [jazz](https://hosted.weblate.org/user/jazz)
-* [johnterroa](https://hosted.weblate.org/user/johnterroa)
-* [jponsa](https://hosted.weblate.org/user/jponsa)
-* [kapler](https://hosted.weblate.org/user/kapler)
-* [kingu](https://hosted.weblate.org/user/kingu)
-* [KnahkAmath](https://hosted.weblate.org/user/KnahkAmath)
-* [laminne](https://hosted.weblate.org/user/laminne)
-* [lenildoleite](https://hosted.weblate.org/user/lenildoleite)
-* [liimee](https://hosted.weblate.org/user/liimee)
-* [lixeix](https://hosted.weblate.org/user/lixeix)
-* [locness3](https://hosted.weblate.org/user/locness3)
-* [maiwann](https://hosted.weblate.org/user/maiwann)
-* [MidooDj](https://hosted.weblate.org/user/MidooDj)
-* [Mohamed_amine_gdoura](https://hosted.weblate.org/user/Mohamed_amine_gdoura)
-* [myfunnyandy](https://hosted.weblate.org/user/myfunnyandy)
-* [NampoinaRal](https://hosted.weblate.org/user/NampoinaRal)
-* [nautilusx](https://hosted.weblate.org/user/nautilusx)
-* [niwinz](https://hosted.weblate.org/user/niwinz)
-* [pablo.alba](pablo.https://hosted.weblate.org/user/alba)
-* [PhilippeAccorsi](https://hosted.weblate.org/user/PhilippeAccorsi)
-* [rnarius](https://hosted.weblate.org/user/rnarius)
-* [rnd](https://hosted.weblate.org/user/rnd)
-* [RuanAragao](https://hosted.weblate.org/user/RuanAragao)
-* [ruben](https://hosted.weblate.org/user/ruben)
-* [semonxue](https://hosted.weblate.org/user/semonxue)
-* [shahab](https://hosted.weblate.org/user/shahab)
-* [shuaib85](https://hosted.weblate.org/user/shuaib85)
-* [SiderealArt](https://hosted.weblate.org/user/SiderealArt)
-* [swapnil.cx](swapnil.https://hosted.weblate.org/user/cx)
-* [syuza](https://hosted.weblate.org/user/syuza)
-* [th3ph4nt0m](https://hosted.weblate.org/user/th3ph4nt0m)
-* [tiwb](https://hosted.weblate.org/user/tiwb)
-* [tommi](https://hosted.weblate.org/user/tommi)
-* [val](https://hosted.weblate.org/user/val)
-* [vikt](https://hosted.weblate.org/user/vikt)
-* [VinLin](https://hosted.weblate.org/user/VinLin)
-* [vintprox](https://hosted.weblate.org/user/vintprox)
-* [Voxybuns](https://hosted.weblate.org/user/Voxybuns)
-* [winie](https://hosted.weblate.org/user/winie)
-* [Yaron](https://hosted.weblate.org/user/Yaron)
-* [yrd](https://hosted.weblate.org/user/yrd)
-* [YukiYuigishi](https://hosted.weblate.org/user/YukiYuigishi)
-* [zcraber](https://hosted.weblate.org/user/zcraber)
-
-## Libraries & templates
-* systxema
-* plumilla
-* victor crespo
-* xtech
-* candidexmedia
-* merih güz
-* klarr agency
--- a/backend/build.clj
+++ b/backend/build.clj
@@ -16,11 +16,16 @@
   {:src-dirs ["src" "resources"]
    :target-dir class-dir})

+  (b/compile-clj
+   {:basis basis
+    :src-dirs ["src"]
+    :class-dir class-dir})
+
  (b/uber
   {:class-dir class-dir
    :uber-file jar-file
    :main 'clojure.main
-    :exclude [#".*Log4j2Plugins\.dat$"]
+    :exclude [#"goog.*" #"^javasist.*"]
    :basis basis}))

 (defn compile [_]
@@ -28,4 +33,4 @@
   {:src-dirs ["dev/java"]
    :class-dir class-dir
    :basis basis
-    :javac-opts ["-source" "17" "-target" "17"]}))
+    :javac-opts ["-source" "11" "-target" "11"]}))
--- a/backend/deps.edn
+++ b/backend/deps.edn
@@ -1,59 +1,53 @@
 {:deps
 {penpot/common {:local/root "../common"}
-  org.clojure/clojure {:mvn/version "1.11.1"}
-  org.clojure/core.async {:mvn/version "1.6.673"}
+  org.clojure/clojure {:mvn/version "1.10.3"}
+  org.clojure/core.async {:mvn/version "1.5.648"}

-  com.github.luben/zstd-jni {:mvn/version "1.5.2-5"}
+  ;; Logging
+  org.zeromq/jeromq {:mvn/version "0.5.2"}
+
+  com.taoensso/nippy {:mvn/version "3.1.1"}
+  com.github.luben/zstd-jni {:mvn/version "1.5.2-2"}
  org.clojure/data.fressian {:mvn/version "1.0.0"}

-  io.prometheus/simpleclient {:mvn/version "0.16.0"}
-  io.prometheus/simpleclient_hotspot {:mvn/version "0.16.0"}
-  io.prometheus/simpleclient_jetty
-  {:mvn/version "0.16.0"
-   :exclusions [org.eclipse.jetty/jetty-server
-                org.eclipse.jetty/jetty-servlet]}
+  io.prometheus/simpleclient {:mvn/version "0.15.0"}
+  io.prometheus/simpleclient_hotspot {:mvn/version "0.15.0"}
+  io.prometheus/simpleclient_jetty {:mvn/version "0.15.0"
+                                    :exclusions [org.eclipse.jetty/jetty-server
+                                                 org.eclipse.jetty/jetty-servlet]}
+  io.prometheus/simpleclient_httpserver {:mvn/version "0.15.0"}

-  io.prometheus/simpleclient_httpserver {:mvn/version "0.16.0"}
-
-  io.lettuce/lettuce-core {:mvn/version "6.2.2.RELEASE"}
+  io.lettuce/lettuce-core {:mvn/version "6.1.6.RELEASE"}
  java-http-clj/java-http-clj {:mvn/version "0.4.3"}

-  funcool/yetti
-  {:git/tag "v9.12"
-   :git/sha "51646d8"
-   :git/url "https://github.com/funcool/yetti.git"
-   :exclusions [org.slf4j/slf4j-api]}
+  funcool/yetti {:git/tag "v9.1" :git/sha "63f35d9"
+                 :git/url "https://github.com/funcool/yetti.git"
+                 :exclusions [org.slf4j/slf4j-api]}

-  com.github.seancorfield/next.jdbc {:mvn/version "1.3.847"}
-  metosin/reitit-core {:mvn/version "0.5.18"}
-  org.postgresql/postgresql {:mvn/version "42.5.2"}
+  com.github.seancorfield/next.jdbc {:mvn/version "1.2.772"}
+  metosin/reitit-core {:mvn/version "0.5.16"}
+  org.postgresql/postgresql {:mvn/version "42.3.3"}
  com.zaxxer/HikariCP {:mvn/version "5.0.1"}
-
-  io.whitfin/siphash {:mvn/version "2.0.0"}
+  funcool/datoteka {:mvn/version "2.0.0"}

  buddy/buddy-hashers {:mvn/version "1.8.158"}
  buddy/buddy-sign {:mvn/version "3.4.333"}

-  com.github.ben-manes.caffeine/caffeine {:mvn/version "3.1.2"}
-
-  org.jsoup/jsoup {:mvn/version "1.15.3"}
-  org.im4java/im4java
-  {:git/tag "1.4.0-penpot-2"
-   :git/sha "e2b3e16"
-   :git/url "https://github.com/penpot/im4java"}
-
+  org.jsoup/jsoup {:mvn/version "1.14.3"}
+  org.im4java/im4java {:mvn/version "1.4.0"}
  org.lz4/lz4-java {:mvn/version "1.8.0"}

  org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"}
  integrant/integrant {:mvn/version "0.8.0"}

+  io.sentry/sentry {:mvn/version "5.6.1"}
+
  dawran6/emoji {:mvn/version "0.1.5"}
-  markdown-clj/markdown-clj {:mvn/version "1.11.4"}
+  markdown-clj/markdown-clj {:mvn/version "1.11.0"}

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

 :paths ["src" "resources" "target/classes"]
 :aliases
@@ -61,6 +55,7 @@
  {:extra-deps
   {com.bhauman/rebel-readline {:mvn/version "RELEASE"}
    org.clojure/tools.namespace {:mvn/version "RELEASE"}
+    org.clojure/test.check {:mvn/version "RELEASE"}
    clojure-humanize/clojure-humanize {:mvn/version "0.2.2"}
    org.clojure/data.csv {:mvn/version "RELEASE"}
    com.clojure-goes-fast/clj-async-profiler {:mvn/version "RELEASE"}
@@ -69,15 +64,14 @@

  :build
  {:extra-deps
-   {io.github.clojure/tools.build {:git/tag "v0.9.3" :git/sha "e537cd1"}}
+   {io.github.clojure/tools.build {:git/tag "v0.7.7" :git/sha "1474ad6"}}
   :ns-default build}

  :test
  {: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"]
+    {:git/tag "v0.5.0" :git/sha "b3fd0d2"}}
   :exec-fn cognitect.test-runner.api/test}

  :outdated
--- a/backend/dev/script-fix-sobjects.clj
+++ b/backend/dev/script-fix-sobjects.clj
@@ -1,114 +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
-
-;; This is an example on how it can be executed:
-;; clojure -Scp $(cat classpath) -M dev/script-fix-sobjects.clj
-
-(require
- '[app.common.logging :as l]
- '[app.common.data :as d]
- '[app.common.pprint]
- '[app.db :as db]
- '[app.storage :as sto]
- '[app.storage.impl :as impl]
- '[app.util.time :as dt]
- '[integrant.core :as ig])
-
-;; --- HELPERS
-
-(l/info :hint "initializing script" :args *command-line-args*)
-
-(def noop? (some #(= % "noop") *command-line-args*))
-(def chunk-size 10)
-
-(def sql:retrieve-sobjects-chunk
-  "SELECT * FROM storage_object
-    WHERE created_at < ? AND deleted_at is NULL
-    ORDER BY created_at desc LIMIT ?")
-
-(defn get-chunk
-  [conn cursor]
-  (let [rows (db/exec! conn [sql:retrieve-sobjects-chunk cursor chunk-size])]
-    [(some->> rows peek :created-at) (seq rows)]))
-
-(defn get-candidates
-  [conn]
-  (->> (d/iteration (partial get-chunk conn)
-                    :vf second
-                    :kf first
-                    :initk (dt/now))
-       (sequence cat)))
-
-(def modules
-  [:app.db/pool
-   :app.storage/storage
-   [:app.main/default :app.worker/executor]
-   [:app.main/assets :app.storage.s3/backend]
-   [:app.main/assets :app.storage.fs/backend]])
-
-(def system
-  (let [config (select-keys app.main/system-config modules)
-        config (-> config
-                   (assoc :app.migrations/all {})
-                   (assoc :app.metrics/metrics nil))]
-    (ig/load-namespaces config)
-    (-> config ig/prep ig/init)))
-
-(defn update-fn
-  [{:keys [conn] :as storage} {:keys [id backend] :as row}]
-  (cond
-    (= backend "s3")
-    (do
-      (l/info :hint "rename storage object backend"
-              :id id
-              :from-backend backend
-              :to-backend :assets-s3)
-      (assoc row :backend "assets-s3"))
-
-    (= backend "assets-s3")
-    (do
-      (l/info :hint "ignoring storage object" :id id :backend backend)
-      nil)
-
-    (or (= backend "fs")
-        (= backend "assets-fs"))
-    (let [sobj (sto/row->storage-object row)
-          path (-> (sto/get-object-path storage sobj) deref)]
-      (l/info :hint "change storage object backend"
-              :id id
-              :from-backend backend
-              :to-backend :assets-s3)
-      (when-not noop?
-        (-> (impl/resolve-backend storage :assets-s3)
-            (impl/put-object sobj (sto/content path))
-            (deref)))
-      (assoc row :backend "assets-s3"))
-
-    :else
-    (throw (IllegalArgumentException. "unexpected backend found"))))
-
-(try
-  (db/with-atomic [conn (:app.db/pool system)]
-    (let [storage (:app.storage/storage system)
-          storage (assoc storage :conn conn)]
-      (loop [items (get-candidates conn)]
-        (when-let [item (first items)]
-          (when-let [{:keys [id] :as row} (update-fn storage item)]
-          (db/update! conn :storage-object (dissoc row :id) {:id (:id item)}))
-          (recur (rest items))))
-      (when noop?
-        (throw (ex-info "explicit rollback" {})))))
-
-  (catch Throwable cause
-    (cond
-      (= "explicit rollback" (ex-message cause))
-      (l/warn :hint "transaction aborted")
-
-      :else
-      (l/error :hint "unexpected exception" :cause cause))))
-
-(ig/halt! system)
-(System/exit 0)
--- a/backend/dev/user.clj
+++ b/backend/dev/user.clj
@@ -2,23 +2,17 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns user
  (:require
   [app.common.data :as d]
   [app.common.exceptions :as ex]
   [app.common.geom.matrix :as gmt]
-   [app.common.logging :as l]
   [app.common.perf :as perf]
-   [app.common.pprint :as pp]
-   [app.common.spec :as us]
   [app.common.transit :as t]
-   [app.common.uuid :as uuid]
   [app.config :as cfg]
   [app.main :as main]
-   [app.srepl.helpers]
-   [app.srepl.main :as srepl]
   [app.util.blob :as blob]
   [app.util.fressian :as fres]
   [app.util.json :as json]
@@ -29,13 +23,11 @@
   [clojure.pprint :refer [pprint print-table]]
   [clojure.repl :refer :all]
   [clojure.spec.alpha :as s]
-   [clojure.stacktrace :as trace]
+   [clojure.spec.gen.alpha :as sgen]
+   [clojure.test :as test]
   [clojure.test :as test]
-   [clojure.test.check.generators :as gen]
   [clojure.tools.namespace.repl :as repl]
   [clojure.walk :refer [macroexpand-all]]
-   [criterium.core  :as crit]
-   [cuerdas.core :as str]
   [datoteka.core]
   [integrant.core :as ig]))

@@ -44,28 +36,10 @@

 (defonce system nil)

-;; --- Benchmarking Tools
-
-(defmacro run-quick-bench
-  [& exprs]
-  `(crit/with-progress-reporting (crit/quick-bench (do ~@exprs) :verbose)))
-
-(defmacro run-quick-bench'
-  [& exprs]
-  `(crit/quick-bench (do ~@exprs)))
-
-(defmacro run-bench
-  [& exprs]
-  `(crit/with-progress-reporting (crit/bench (do ~@exprs) :verbose)))
-
-(defmacro run-bench'
-  [& exprs]
-  `(crit/bench (do ~@exprs)))
-
 ;; --- Development Stuff

 (defn- run-tests
-  ([] (run-tests #"^backend-tests.*-test$"))
+  ([] (run-tests #"^app.*-test$"))
  ([o]
   (repl/refresh)
   (cond
@@ -80,22 +54,19 @@

 (defn- start
  []
-  (try
-    (alter-var-root #'system (fn [sys]
-                               (when sys (ig/halt! sys))
-                               (-> (merge main/system-config main/worker-config)
-                                   (ig/prep)
-                                   (ig/init))))
-    :started
-    (catch Throwable cause
-      (ex/print-throwable cause))))
+  (alter-var-root #'system (fn [sys]
+                             (when sys (ig/halt! sys))
+                             (-> main/system-config
+                                 (ig/prep)
+                                 (ig/init))))
+  :started)

 (defn- stop
  []
  (alter-var-root #'system (fn [sys]
                             (when sys (ig/halt! sys))
                             nil))
-  :stopped)
+  :stoped)

 (defn restart
  []
@@ -109,20 +80,12 @@

 (defn compression-bench
  [data]
-  (let [humanize (fn [v] (hum/filesize v :binary true :format " %.4f "))
-        v1 (time (humanize (alength (blob/encode data {:version 1}))))
-        v3 (time (humanize (alength (blob/encode data {:version 3}))))
-        v4 (time (humanize (alength (blob/encode data {:version 4}))))
-        v5 (time (humanize (alength (blob/encode data {:version 5}))))
-        v6 (time (humanize (alength (blob/encode data {:version 6}))))
-        ]
+  (let [humanize (fn [v] (hum/filesize v :binary true :format " %.4f "))]
    (print-table
-     [{
-       :v1 v1
-       :v3 v3
-       :v4 v4
-       :v5 v5
-       :v6 v6
+     [{:v1 (humanize (alength (blob/encode data {:version 1})))
+       :v2 (humanize (alength (blob/encode data {:version 2})))
+       :v3 (humanize (alength (blob/encode data {:version 3})))
+       :v4 (humanize (alength (blob/encode data {:version 4})))
       }])))

 (defonce debug-tap
--- a/backend/resources/app/templates/api-doc.css
+++ b/backend/resources/app/templates/api-doc.css
@@ -53,7 +53,7 @@ header {

 .rpc-item {
  /* border: 1px solid red; */
-  /* cursor: pointer; */
+  cursor: pointer;
  display: flex;
  flex-direction: column;
 }
@@ -85,16 +85,6 @@ header {
 .rpc-row-info > .name {
  width: 280px;
  /* font-weight: bold; */
-  border-right: 1px dotted #777;
-  padding-right: 10px;
-}
-
-.rpc-row-info > .module {
-  width: 120px;
-  font-weight: bold;
-  border-right: 1px dotted #777;
-  text-align: right;
-  padding-right: 10px;
 }

 .rpc-row-info > .tags > .tag > span:first-child {
@@ -109,37 +99,3 @@ header {
  padding: 5px 10px;
  padding-bottom: 20px;
 }
-
-.rpc-row-detail p {
-  font-weight: 200;
-}
-
-.rpc-row-detail p.small {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  font-size: 10px;
-}
-
-.rpc-row-detail p.small {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  font-size: 10px;
-}
-
-.rpc-row-detail strong {
-  font-weight: 500;
-}
-
-.rpc-row-detail .changes {
-  font-weight: 200;
-  list-style: none;
-  padding: 0px;
-}
-
-.rpc-row-detail .padded-section {
-  padding: 0px 10px;
-}
-
-p.small strong {
-  font-size: 10px;
-}
--- a/backend/resources/app/templates/api-doc.js
+++ b/backend/resources/app/templates/api-doc.js
--- a/backend/resources/api-doc.tmpl
+++ b/backend/resources/api-doc.tmpl
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="robots" content="noindex,nofollow">
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <title>Builtin API Documentation - Penpot</title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
+    <style>
+      {% include "api-doc.css" %}
+    </style>
+    <script>
+      {% include "api-doc.js" %}
+    </script>
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>Penpot API Documentation</h1>
+      </header>
+      <section class="rpc-doc-content">
+
+        <h2>RPC QUERY METHODS:</h2>
+        <ul class="rpc-items">
+          {% for item in query-methods %}
+            <li class="rpc-item">
+              <div class="rpc-row-info">
+                {# <div class="type">{{item.type}}</div> #}
+                <div class="name">{{item.name}}</div>
+                <div class="tags">
+                  <span class="tag">
+                    <span>Auth:</span>
+                    <span>{% if item.auth %}YES{% else %}NO{% endif %}</span>
+                  </span>
+                </div>
+              </div>
+              <div class="rpc-row-detail hidden">
+                {% if item.docs %}
+                  <h3>DOCSTRING:</h3>
+                  <p>{{item.docs}}</p>
+                {% endif %}
+
+                <h3>SPEC EXPLAIN:</h3>
+                <pre>{{item.spec}}</pre>
+              </div>
+            </li>
+          {% endfor %}
+        </ul>
+
+        <h2>RPC MUTATION METHODS:</h2>
+        <ul class="rpc-items">
+          {% for item in mutation-methods %}
+            <li class="rpc-item">
+              <div class="rpc-row-info">
+                {# <div class="type">{{item.type}}</div> #}
+                <div class="name">{{item.name}}</div>
+                <div class="tags">
+                  <span class="tag">
+                    <span>Auth:</span>
+                    <span>{% if item.auth %}YES{% else %}NO{% endif %}</span>
+                  </span>
+                </div>
+              </div>
+              <div class="rpc-row-detail hidden">
+                {% if item.docs %}
+                  <h3>DOCSTRING:</h3>
+                  <p>{{item.docs}}</p>
+                {% endif %}
+
+                <h3>SPEC EXPLAIN:</h3>
+                <pre>{{item.spec}}</pre>
+              </div>
+            </li>
+          {% endfor %}
+        </ul>
+      </section>
+    </main>
+  </body>
+</html>
+
--- a/backend/resources/app/onboarding.edn
+++ b/backend/resources/app/onboarding.edn
@@ -1,36 +0,0 @@
-[{:id "tutorial-for-beginners"
-  :name "Tutorial for beginners"
-  :thumbnail-uri "https://penpot.app/images/libraries/tutorial-for-beginners.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/tutorial-for-beginners.penpot"}
- {:id "penpot-design-system"
-  :name "Penpot Design System"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-ds-penpot.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Penpot-Design-system.penpot"}
- {:id "wireframing-kit"
-  :name "Wireframing Kit"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-wireframes.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/wireframing-kit.penpot"}
- {:id "ant-design"
-  :name "Ant Design UI Kit (lite)"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-ant-design.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Ant-Design-UI-Kit-Lite.penpot"}
- {:id "cocomaterial"
-  :name "Cocomaterial"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-cocomaterial.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Cocomaterial.penpot"}
- {:id "circum-icons"
-  :name "Circum Icons pack"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-circum.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/CircumIcons.penpot"}
- {:id "coreui"
-  :name "CoreUI"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-coreui.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/main/CoreUI%20DesignSystem%20(DEMO).penpot"}
- {:id "whiteboarding-kit"
-  :name "Whiteboarding Kit"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-whiteboards.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Whiteboarding-mapping-kit.penpot"}
- {:id "material-design-baseline"
-  :name "Material Design (baseline)"
-  :thumbnail-uri "https://penpot.app/images/libraries/cover-material.jpg"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Material-Design-Kit.penpot"}]
--- a/backend/resources/app/templates/api-doc-entry.tmpl
+++ b/backend/resources/app/templates/api-doc-entry.tmpl
@@ -1,61 +0,0 @@
-<li class="rpc-item">
-  <div class="rpc-row-info">
-    {# <div class="type">{{item.type}}</div> #}
-    <div class="module">{{item.module}}:</div>
-    <div class="name">{{item.name}}</div>
-    <div class="tags">
-      {% if item.deprecated %}
-        <span class="tag">
-          <span>DEPRECATED</span>
-        </span>
-      {% endif %}
-
-      {% if item.auth %}
-        <span class="tag">
-          <span>AUTH</span>
-        </span>
-      {% endif %}
-      
-      {% if item.webhook %}
-        <span class="tag">
-          <span>WEBHOOK</span>
-        </span>
-      {% endif %}
-    </div>
-  </div>
-  <div class="rpc-row-detail hidden">
-    <h3>DOCSTRING:</h3>
-
-    <section class="padded-section">
-
-      {% if item.added %}
-        <p class="small"><strong>Added:</strong> on v{{item.added}}</p>
-      {% endif %}
-
-      {% if item.deprecated %}
-        <p class="small"><strong>Deprecated:</strong> since v{{item.deprecated}}</p>
-      {% endif %}
-
-      {% if item.docs %}
-        <p class="docstring"> {{item.docs}}</p>
-      {% endif %}
-    </section>
-
-    {% if item.changes %}
-      <h3>CHANGES:</h3>
-      <section class="padded-section">
-
-        <ul class="changes">
-          {% for change in item.changes %}
-            <li><strong>{{change.0}}</strong> - {{change.1}}</li>
-          {% endfor %}
-        </ul>
-      </section>
-    {% endif %}
-
-    <h3>SPEC EXPLAIN:</h3>
-    <section class="padded-section">
-      <pre class="spec-explain">{{item.spec}}</pre>
-    </section>
-  </div>
-</li>
--- a/backend/resources/app/templates/api-doc.tmpl
+++ b/backend/resources/app/templates/api-doc.tmpl
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="robots" content="noindex,nofollow">
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <title>Builtin API Documentation - Penpot</title>
-
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@200;300;400;500;700&display=swap" rel="stylesheet">
-    <style>
-      {% include "app/templates/api-doc.css" %}
-    </style>
-    <script>
-      {% include "app/templates/api-doc.js" %}
-    </script>
-  </head>
-  <body>
-    <main>
-      <header>
-        <h1>Penpot API Documentation (v{{version}})</h1>
-      </header>
-      <section class="rpc-doc-content">
-
-        <h2>RPC COMMAND METHODS:</h2>
-        <ul class="rpc-items">
-          {% for item in command-methods %}
-            {% include "app/templates/api-doc-entry.tmpl" with item=item %}
-          {% endfor %}
-        </ul>
-
-        <h2>RPC QUERY METHODS:</h2>
-        <ul class="rpc-items">
-          {% for item in query-methods %}
-            {% include "app/templates/api-doc-entry.tmpl" with item=item %}
-          {% endfor %}
-        </ul>
-
-        <h2>RPC MUTATION METHODS:</h2>
-        <ul class="rpc-items">
-          {% for item in mutation-methods %}
-            {% include "app/templates/api-doc-entry.tmpl" with item=item %}
-          {% endfor %}
-        </ul>
-      </section>
-    </main>
-  </body>
-</html>
-
--- a/backend/resources/app/templates/debug.tmpl
+++ b/backend/resources/app/templates/debug.tmpl
@@ -1,127 +0,0 @@
-{% extends "app/templates/base.tmpl" %}
-
-{% block title %}
-Debug Main Page
-{% endblock %}
-
-{% block content %}
-<nav>
-  <h1>Debug INDEX:</h1>
-  <div>[<a href="/dbg/error">ERRORS</a>]</div>
-</nav>
-<main class="index">
-  <section class="widget">
-    <fieldset>
-      <legend>Download file data:</legend>
-      <desc>Given an FILE-ID, downloads the file data as file. The file data is encoded using transit.</desc>
-      <form method="get" action="/dbg/file/data">
-        <div class="row">
-          <input type="text" style="width:300px" name="file-id" placeholder="file-id" />
-        </div>
-        <div class="row">
-          <input type="submit" name="download" value="Download" />
-          <input type="submit" name="clone" value="Clone" />
-        </div>
-      </form>
-    </fieldset>
-
-    <fieldset>
-      <legend>Upload File Data:</legend>
-      <desc>Create a new file on your draft projects using the file downloaded from the previous section.</desc>
-      <form method="post" enctype="multipart/form-data" action="/dbg/file/data">
-        <div class="row">
-          <input type="file" name="file" value="" />
-        </div>
-        <div class="row">
-          <label>Import with same id?</label>
-          <input type="checkbox" name="reuseid" />
-        </div>
-
-        <input type="submit" value="Upload" />
-      </form>
-    </fieldset>
-  </section>
-
-  <section class="widget">
-    <fieldset>
-      <legend>Export binfile:</legend>
-      <desc>Given an FILE-ID, downloads the file and optionally all
-      the related libraries in a single custom formatted binary
-      file.</desc>
-
-      <form method="get" action="/dbg/file/export">
-        <div class="row set-of-inputs">
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-        </div>
-
-        <div class="row">
-          <label>Include libraries?</label>
-          <input type="checkbox" name="includelibs" />
-        </div>
-
-        <div class="row">
-          <label>Embed assets?</label>
-          <input type="checkbox" name="embedassets" checked/>
-        </div>
-
-        <div class="row">
-          <input type="submit" name="download" value="Download" />
-          <input type="submit" name="clone" value="Clone" />
-        </div>
-      </form>
-    </fieldset>
-    <fieldset>
-      <legend>Import binfile:</legend>
-      <desc>Import penpot file in binary
-      format. If <strong>overwrite</strong> is checked, all files will
-      be overwritten using the same ids found in the file instead of
-      generating a new ones.</desc>
-
-      <form method="post" enctype="multipart/form-data" action="/dbg/file/import">
-        <div class="row">
-          <input type="file" name="file" value="" />
-        </div>
-
-        <div class="row">
-          <label>Overwrite?</label>
-          <input type="checkbox" name="overwrite" />
-          <br />
-          <small>
-            Instead of creating a new file with all relations remapped,
-            reuses all ids and updates/overwrites the objects that are
-            already exists on the database.
-            <strong>Warning, this operation should be used with caution.</strong>
-          </small>
-        </div>
-
-        <div class="row">
-          <label>Migrate?</label>
-          <input type="checkbox" name="migrate" />
-          <br />
-          <small>
-            Applies the file migrations on the importation process.
-          </small>
-        </div>
-
-        <div class="row">
-          <label>Ignore index errors?</label>
-          <input type="checkbox" name="ignore-index-errors" checked/>
-          <br />
-          <small>
-            Do not break on index lookup errors (remap operation).
-            Useful when importing a broken file that has broken
-            relations or missing pieces.
-          </small>
-        </div>
-
-        <div class="row">
-          <input type="submit" name="upload" value="Upload" />
-        </div>
-      </form>
-    </fieldset>
-  </section>
-</main>
-{% endblock %}
--- a/backend/resources/app/templates/error-report.v2.tmpl
+++ b/backend/resources/app/templates/error-report.v2.tmpl
@@ -1,112 +0,0 @@
- {% extends "app/templates/base.tmpl" %}
-
-{% block title %}
-penpot - error report v2 {{id}}
-{% endblock %}
-
-{% block content %}
-<nav>
-  <div>[<a href="/dbg/error">⮜</a>]</div>
-  <div>[<a href="#message">message</a>]</div>
-  <div>[<a href="#props">props</a>]</div>
-  <div>[<a href="#context">context</a>]</div>
-  {% if params %}
-  <div>[<a href="#params">request params</a>]</div>
-  {% endif %}
-  {% if data %}
-  <div>[<a href="#edata">error data</a>]</div>
-  {% endif %}
-  {% if spec-explain %}
-  <div>[<a href="#spec-explain">spec explain</a>]</div>
-  {% endif %}
-  {% if spec-problems %}
-  <div>[<a href="#spec-problems">spec problems</a>]</div>
-  {% endif %}
-  {% if spec-value %}
-  <div>[<a href="#spec-value">spec value</a>]</div>
-  {% endif %}
-  {% if trace %}
-  <div>[<a href="#trace">error trace</a>]</div>
-  {% endif %}
-</nav>
-<main>
-  <div class="table">
-    <div class="table-row multiline">
-      <div id="message" class="table-key">MESSAGE: </div>
-
-      <div class="table-val">
-        <h1>{{hint}}</h1>
-      </div>
-    </div>
-
-    <div class="table-row multiline">
-      <div id="props" class="table-key">LOG PROPS: </div>
-      <div class="table-val">
-        <pre>{{props}}</pre>
-      </div>
-    </div>
-
-    <div class="table-row multiline">
-      <div id="context" class="table-key">CONTEXT: </div>
-
-      <div class="table-val">
-        <pre>{{context}}</pre>
-      </div>
-    </div>
-
-    {% if params %}
-    <div class="table-row multiline">
-      <div id="params" class="table-key">REQUEST PARAMS: </div>
-      <div class="table-val">
-        <pre>{{params}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if data %}
-    <div class="table-row multiline">
-      <div id="edata" class="table-key">ERROR DATA: </div>
-      <div class="table-val">
-        <pre>{{data}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-explain %}
-    <div class="table-row multiline">
-      <div id="spec-explain" class="table-key">SPEC EXPLAIN: </div>
-      <div class="table-val">
-        <pre>{{spec-explain}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-problems %}
-    <div class="table-row multiline">
-      <div id="spec-problems" class="table-key">SPEC PROBLEMS: </div>
-      <div class="table-val">
-        <pre>{{spec-problems}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-value %}
-    <div class="table-row multiline">
-      <div id="spec-value" class="table-key">SPEC VALUE: </div>
-      <div class="table-val">
-        <pre>{{spec-value}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if trace %}
-    <div class="table-row multiline">
-      <div id="trace" class="table-key">TRACE:</div>
-      <div class="table-val">
-        <pre>{{trace}}</pre>
-      </div>
-    </div>
-    {% endif %}
-  </div>
-</main>
-{% endblock %}
--- a/backend/resources/climit.edn
+++ b/backend/resources/climit.edn
@@ -1,9 +0,0 @@
-;; Example climit.edn file
-;; Required: concurrency
-;; Optional: queue-size, ommited means Integer/MAX_VALUE
-{:update-file   {:concurrency 1 :queue-size 3}
- :auth          {:concurrency 128}
- :process-font  {:concurrency 4 :queue-size 32}
- :process-image {:concurrency 8 :queue-size 32}
- :push-audit-events
- {:concurrency 1 :queue-size 3}}
--- a/backend/resources/emails-mjml/change-email/en.mjml
+++ b/backend/resources/emails-mjml/change-email/en.mjml
@@ -0,0 +1,66 @@
+<mjml>
+
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+
+  <mj-body background-color="#E5E5E5">
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello {{name}}!</mj-text>
+        <mj-text>We received a request to change your current email to {{ pending-email }}.</mj-text>
+        <mj-text>Click to the link below to confirm the change:</mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/verify-token?token={{token}}">
+          Confirm email change
+        </mj-button>
+        <mj-text>
+          If you received this email by mistake, please consider changing your password
+          for security reasons.
+        </mj-text>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>
--- a/backend/resources/emails-mjml/invite-to-team/en.mjml
+++ b/backend/resources/emails-mjml/invite-to-team/en.mjml
@@ -0,0 +1,59 @@
+<mjml>
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+  <mj-body background-color="#E5E5E5">
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello!</mj-text>
+        <mj-text>
+          {{invited-by}} has invited you to join the team “{{ team }}”.
+        </mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/verify-token?token={{token}}">
+          Accept invite
+        </mj-button>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>
--- a/backend/resources/emails-mjml/password-recovery/en.mjml
+++ b/backend/resources/emails-mjml/password-recovery/en.mjml
@@ -0,0 +1,68 @@
+<mjml>
+
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+
+  <mj-body background-color="#E5E5E5">
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello {{name}}!</mj-text>
+        <mj-text>
+          We have received a request to reset your password. Click the link
+          below to choose a new one:
+        </mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/recovery?token={{token}}">
+          Reset password
+        </mj-button>
+        <mj-text>
+          If you received this email by mistake, you can safely ignore
+          it. Your password won't be changed.
+        </mj-text>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>
--- a/backend/resources/emails-mjml/register/en.mjml
+++ b/backend/resources/emails-mjml/register/en.mjml
@@ -0,0 +1,65 @@
+<mjml>
+
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+
+  <mj-body background-color="#E5E5E5">
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello {{name}}!</mj-text>
+        <mj-text>
+          Thanks for signing up for your Penpot account! Please verify your
+          email using the link below and get started building mockups and
+          prototypes today!
+        </mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/verify-token?token={{token}}">
+          Verify email
+        </mj-button>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>
--- a/backend/resources/app/email/change-email/en.html
+++ b/backend/resources/app/email/change-email/en.html
@@ -103,9 +103,9 @@
            <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;"
            >
@@ -129,9 +129,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -143,7 +143,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -157,9 +157,9 @@
            <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;"
            >
@@ -211,9 +211,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -225,7 +225,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -239,9 +239,9 @@
            <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;"
            >
@@ -250,16 +250,16 @@
                <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>
+                      <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 prototyping platform that will be embraced by multidisciplinary teams.</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -271,7 +271,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -285,9 +285,9 @@
            <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;"
            >
@@ -301,7 +301,7 @@
         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;">
@@ -321,7 +321,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -341,7 +341,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -361,7 +361,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -370,7 +370,7 @@
                            <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">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -381,7 +381,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -390,7 +390,7 @@
                            <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">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -401,7 +401,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
          </tr>
        </table>
      <![endif]-->
@@ -411,9 +411,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -425,7 +425,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -439,9 +439,9 @@
            <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;"
            >
@@ -450,16 +450,16 @@
                <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>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
--- a/backend/resources/app/email/change-email/en.subj
+++ b/backend/resources/app/email/change-email/en.subj
--- a/backend/resources/app/email/change-email/en.txt
+++ b/backend/resources/app/email/change-email/en.txt
--- a/backend/resources/app/email/feedback/en.html
+++ b/backend/resources/app/email/feedback/en.html
--- a/backend/resources/app/email/feedback/en.subj
+++ b/backend/resources/app/email/feedback/en.subj
--- a/backend/resources/app/email/feedback/en.txt
+++ b/backend/resources/app/email/feedback/en.txt
--- a/backend/resources/app/email/invite-to-team/en.html
+++ b/backend/resources/app/email/invite-to-team/en.html
@@ -103,9 +103,9 @@
            <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;"
            >
@@ -129,9 +129,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -143,7 +143,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -157,9 +157,9 @@
            <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;"
            >
@@ -201,9 +201,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -215,7 +215,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -229,9 +229,9 @@
            <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;"
            >
@@ -240,16 +240,16 @@
                <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>
+                      <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 prototyping platform that will be embraced by multidisciplinary teams.</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -261,7 +261,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -275,9 +275,9 @@
            <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;"
            >
@@ -291,7 +291,7 @@
         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;">
@@ -311,7 +311,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -331,7 +331,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -351,7 +351,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -360,7 +360,7 @@
                            <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">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -371,7 +371,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -380,7 +380,7 @@
                            <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">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -391,7 +391,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
          </tr>
        </table>
      <![endif]-->
@@ -401,9 +401,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -415,7 +415,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -429,9 +429,9 @@
            <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;"
            >
@@ -440,16 +440,16 @@
                <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>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
--- a/backend/resources/app/email/invite-to-team/en.subj
+++ b/backend/resources/app/email/invite-to-team/en.subj
--- a/backend/resources/app/email/invite-to-team/en.txt
+++ b/backend/resources/app/email/invite-to-team/en.txt
--- a/backend/resources/app/email/password-recovery/en.html
+++ b/backend/resources/app/email/password-recovery/en.html
@@ -103,9 +103,9 @@
            <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;"
            >
@@ -129,9 +129,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -143,7 +143,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -157,9 +157,9 @@
            <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;"
            >
@@ -206,9 +206,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -220,7 +220,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -234,9 +234,9 @@
            <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;"
            >
@@ -245,16 +245,16 @@
                <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>
+                      <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 prototyping platform that will be embraced by multidisciplinary teams.</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -266,7 +266,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -280,9 +280,9 @@
            <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;"
            >
@@ -296,7 +296,7 @@
         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;">
@@ -316,7 +316,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -336,7 +336,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -356,7 +356,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -365,7 +365,7 @@
                            <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">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -376,7 +376,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -385,7 +385,7 @@
                            <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">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -396,7 +396,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
          </tr>
        </table>
      <![endif]-->
@@ -406,9 +406,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -420,7 +420,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -434,9 +434,9 @@
            <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;"
            >
@@ -445,16 +445,16 @@
                <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>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
--- a/backend/resources/app/email/password-recovery/en.subj
+++ b/backend/resources/app/email/password-recovery/en.subj
--- a/backend/resources/app/email/password-recovery/en.txt
+++ b/backend/resources/app/email/password-recovery/en.txt
--- a/backend/resources/app/email/register/en.html
+++ b/backend/resources/app/email/register/en.html
@@ -103,9 +103,9 @@
            <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;"
            >
@@ -129,9 +129,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -143,7 +143,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -157,9 +157,9 @@
            <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;"
            >
@@ -201,9 +201,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -215,7 +215,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -229,9 +229,9 @@
            <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;"
            >
@@ -240,16 +240,16 @@
                <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>
+                      <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 prototyping platform that will be embraced by multidisciplinary teams.</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -261,7 +261,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -275,9 +275,9 @@
            <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;"
            >
@@ -291,7 +291,7 @@
         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;">
@@ -311,7 +311,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -331,7 +331,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -351,7 +351,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -360,7 +360,7 @@
                            <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">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -371,7 +371,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
              <td>
            <![endif]-->
                      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -380,7 +380,7 @@
                            <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">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                    <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                  </a>
                                </td>
@@ -391,7 +391,7 @@
                      </table>
                      <!--[if mso | IE]>
              </td>
-
+            
          </tr>
        </table>
      <![endif]-->
@@ -401,9 +401,9 @@
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
@@ -415,7 +415,7 @@
          </td>
        </tr>
      </table>
-
+      
      <table
         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
      >
@@ -429,9 +429,9 @@
            <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;"
            >
@@ -440,16 +440,16 @@
                <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>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                    </td>
                  </tr>
                </table>
              </div>
              <!--[if mso | IE]>
            </td>
-
+          
        </tr>
-
+      
                  </table>
                <![endif]-->
            </td>
--- a/backend/resources/app/email/register/en.subj
+++ b/backend/resources/app/email/register/en.subj
--- a/backend/resources/app/email/register/en.txt
+++ b/backend/resources/app/email/register/en.txt
--- a/backend/resources/log4j2-devenv.xml
+++ b/backend/resources/log4j2-devenv.xml
@@ -2,35 +2,32 @@
 <Configuration status="info" monitorInterval="30">
  <Appenders>
    <Console name="console" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="false" />
+      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"/>
    </Console>

    <RollingFile name="main" fileName="logs/main.log" filePattern="logs/main-%i.log">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="false" />
+      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"/>
      <Policies>
        <SizeBasedTriggeringPolicy size="50M"/>
      </Policies>
      <DefaultRolloverStrategy max="9"/>
    </RollingFile>
+
+    <JeroMQ name="zmq">
+      <Property name="endpoint">tcp://localhost:45556</Property>
+      <JsonLayout complete="false" compact="true" includeTimeMillis="true" stacktraceAsString="true" properties="true" />
+    </JeroMQ>
  </Appenders>

  <Loggers>
-    <Logger name="io.lettuce" level="error" />
    <Logger name="com.zaxxer.hikari" level="error"/>
+    <Logger name="io.lettuce" level="error" />
+    <Logger name="org.eclipse.jetty" level="error" />
    <Logger name="org.postgresql" level="error" />

-    <Logger name="app.rpc.commands.binfile" level="debug" />
-    <Logger name="app.storage.tmp" level="debug" />
-    <Logger name="app.worker" level="info" />
-    <Logger name="app.msgbus" level="info" />
-    <Logger name="app.http.websocket" level="info" />
-    <Logger name="app.util.websocket" level="info" />
-    <Logger name="app.redis" level="info" />
-    <Logger name="app.rpc.rlimit" level="info" />
-    <Logger name="app.rpc.climit" level="info" />
-    <Logger name="app.rpc.mutations.files" level="info" />
+    <Logger name="app.cli" level="debug" additivity="false">
+      <AppenderRef ref="console"/>
+    </Logger>

    <Logger name="app.loggers" level="debug" additivity="false">
      <AppenderRef ref="main" level="debug" />
@@ -38,6 +35,12 @@

    <Logger name="app" level="all" additivity="false">
      <AppenderRef ref="main" level="trace" />
+      <AppenderRef ref="zmq" level="debug" />
+    </Logger>
+
+    <Logger name="penpot" level="debug" additivity="false">
+      <AppenderRef ref="main" level="debug" />
+      <AppenderRef ref="zmq" level="debug" />
    </Logger>

    <Logger name="user" level="trace" additivity="false">
--- a/backend/resources/log4j2.xml
+++ b/backend/resources/log4j2.xml
@@ -2,18 +2,19 @@
 <Configuration status="info" monitorInterval="60">
  <Appenders>
    <Console name="console" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="false" />
+      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"/>
    </Console>
  </Appenders>

  <Loggers>
-    <Logger name="io.lettuce" level="error" />
    <Logger name="com.zaxxer.hikari" level="error" />
-    <Logger name="org.postgresql" level="error" />
+    <Logger name="org.eclipse.jetty" level="error" />

-    <Logger name="app.util" level="info" />
-    <Logger name="app" level="info" additivity="false">
+    <Logger name="app" level="debug" additivity="false">
+      <AppenderRef ref="console" />
+    </Logger>
+
+    <Logger name="penpot" level="fatal" additivity="false">
      <AppenderRef ref="console" />
    </Logger>

--- a/backend/resources/rlimit.edn
+++ b/backend/resources/rlimit.edn
@@ -1,10 +0,0 @@
-;; Example rlimit.edn file
-^{:refresh "30s"}
-{:default
- [[:default :window "200000/h"]]
-
- #{:command/get-teams}
- [[:burst :bucket "5/1/5s"]]
-
- #{:command/get-profile}
- [[:burst :bucket "60/60/1m"]]}
--- a/backend/resources/app/templates/base.tmpl
+++ b/backend/resources/app/templates/base.tmpl
@@ -7,7 +7,7 @@
    <title>{% block title %}{% endblock %}</title>
    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
    <style>
-      {% include "app/templates/styles.css"  %}
+      {% include "templates/styles.css"  %}
    </style>
  </head>
  <body>
--- a/backend/resources/templates/debug.tmpl
+++ b/backend/resources/templates/debug.tmpl
@@ -0,0 +1,32 @@
+{% extends "templates/base.tmpl" %}
+
+{% block title %}
+Debug Main Page
+{% endblock %}
+
+{% block content %}
+<nav>
+  <h1>Debug INDEX:</h1>
+  <div>[<a href="/dbg/error">ERRORS</a>]</div>
+</nav>
+<main class="index">
+  <section>
+    <h2>Download file data:</h2>
+    <desc>Given an FILE-ID, downloads the file data as file. The file data is encoded using transit.</desc>
+    <form method="get" action="/dbg/file/data">
+      <input type="text" style="width:300px" name="file-id" placeholder="file-id" />
+      <input type="hidden" name="download" value="1" />
+      <input type="submit" value="Download" />
+    </form>
+  </section>
+
+  <section>
+    <h2>Upload File Data:</h2>
+    <desc>Create a new file on your draft projects using the file downloaded from the previous section.</desc>
+    <form method="post" enctype="multipart/form-data" action="/dbg/file/data">
+      <input type="file" name="file" value="" />
+      <input type="submit" value="Upload" />
+    </form>
+  </section>
+</main>
+{% endblock %}
--- a/backend/resources/app/templates/error-list.tmpl
+++ b/backend/resources/app/templates/error-list.tmpl
@@ -1,4 +1,4 @@
-{% extends "app/templates/base.tmpl" %}
+{% extends "templates/base.tmpl" %}

 {% block title %}
 penpot - error list
@@ -11,8 +11,7 @@ penpot - error list
 <main class="horizontal-list">
  <ul>
    {% for item in items %}
-    <li><a class="date" href="/dbg/error/{{item.id}}">{{item.created-at}}</a> 
-        <span class="title">{{item.hint|abbreviate:150}}</span></li>
+    <li><a href="/dbg/error/{{item.id}}">{{item.created-at}}</a></li>
    {% endfor %}
  </ul>
 </main>
--- a/backend/resources/app/templates/error-report.tmpl
+++ b/backend/resources/app/templates/error-report.tmpl
@@ -1,4 +1,4 @@
-{% extends "app/templates/base.tmpl" %}
+{% extends "templates/base.tmpl" %}

 {% block title %}
 penpot - error report {{id}}
--- a/backend/resources/app/templates/styles.css
+++ b/backend/resources/app/templates/styles.css
@@ -14,6 +14,7 @@ pre {
 }

 desc {
+  display: flex;
  margin-bottom: 10px;
  font-size: 10px;
  color: #666;
@@ -23,23 +24,10 @@ input[type=text], input[type=submit] {
  padding: 3px;
 }

-pre {
-  white-space: pre-wrap;
-}
-
 main {
  margin: 20px;
 }

-small {
-  font-size: 9px;
-  color: #888;
-}
-
-small > strong {
-  font-size: 9px;
-}
-
 nav {
  position: fixed;
  width: 100vw;
@@ -107,25 +95,17 @@ nav > div:not(:last-child) {

 .index {
  margin-top: 40px;
-  display: flex;
 }

 .index > section {
  padding: 10px;
  background-color: #e3e3e3;
-  max-width: 400px;
-  margin: 5px;
-  height: fit-content;
 }

-.index fieldset:not(:first-child) {
-  margin-top: 15px;
+.index > section:not(:last-child) {
+  margin-bottom: 10px;
 }

-/* .index > section:not(:last-child) { */
-/*   margin-bottom: 10px; */
-/* } */
-

 .index > section > h2 {
  margin-top: 0px;
@@ -141,6 +121,8 @@ nav > div:not(:last-child) {
  margin: 0px;
  padding: 0px;
  flex-direction: column;
+  flex-wrap: wrap;
+  height: calc(100vh - 75px);
  justify-content: flex-start;
 }

@@ -153,41 +135,16 @@ nav > div:not(:last-child) {
  margin: 0px 20px;
  cursor: pointer;
  display: flex;
+  justify-content: center;
  border-radius: 3px;
 }

-
-
 .horizontal-list li:hover {
  background-color: #e9e9e9;
 }

-.horizontal-list li > *:not(:last-child) {
-  margin-right: 10px;
-}
-
 .horizontal-list li > a {
  text-decoration: none;
  color: inherit;
 }

-.horizontal-list li > .date {
-  font-weight: 200;
-  color: #686868;
-  min-width: 210px;
-}
-
-
-form .row {
-  padding: 5px 0;
-}
-
-.set-of-inputs {
-  flex-direction: column;
-  display: flex;
-}
-
-.set-of-inputs input:not(:last-child) {
-  margin-bottom: 3px;
-}
-
--- a/backend/scripts/build
+++ b/backend/scripts/build
@@ -12,12 +12,10 @@ cp ../CHANGES.md target/classes/changelog.md;

 clojure -T:build jar;
 mv target/penpot.jar target/dist/penpot.jar
-cp resources/log4j2.xml target/dist/log4j2.xml
 cp scripts/run.template.sh target/dist/run.sh;
-cp scripts/manage.py target/dist/manage.py
+cp scripts/manage.template.sh target/dist/manage.sh;
 chmod +x target/dist/run.sh;
-chmod +x target/dist/manage.py
+chmod +x target/dist/manage.sh;
+
+

-# Prefetch
-bb ./scripts/prefetch-templates.clj resources/app/onboarding.edn builtin-templates/
-cp -r builtin-templates target/dist/
--- a/backend/scripts/kill-repl.sh
+++ b/backend/scripts/kill-repl.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -x
-
-jcmd |grep "rebel" |sed -nE 's/^([0-9]+).*$/\1/p' | xargs kill -9
--- a/backend/scripts/manage.py
+++ b/backend/scripts/manage.py
@@ -1,167 +0,0 @@
-#!/usr/bin/env python3
-#
-# 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
-
-import argparse
-import json
-import socket
-import sys
-
-from getpass import getpass
-from urllib.parse import urlparse
-
-PREPL_URI = "tcp://localhost:6063"
-
-def get_prepl_conninfo():
-    uri_data = urlparse(PREPL_URI)
-    if uri_data.scheme != "tcp":
-        raise RuntimeError(f"invalid PREPL_URI: {PREPL_URI}")
-
-    if not isinstance(uri_data.netloc, str):
-        raise RuntimeError(f"invalid PREPL_URI: {PREPL_URI}")
-
-    host, port = uri_data.netloc.split(":", 2)
-
-    if port is None:
-        port = 6063
-
-    if isinstance(port, str):
-        port = int(port)
-
-    return host, port
-
-def send_eval(expr):
-    host, port = get_prepl_conninfo()
-
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.connect((host, port))
-        s.send(expr.encode("utf-8"))
-        s.send(b":repl/quit\n\n")
-
-        with s.makefile() as f:
-            result = json.load(f)
-            tag = result.get("tag", None)
-            if tag != "ret":
-                raise RuntimeError("unexpected response from PREPL")
-            return result.get("val", None), result.get("exception", None)
-
-def encode(val):
-    return json.dumps(json.dumps(val))
-
-def print_error(res):
-    for error in res["via"]:
-        print("ERR:", error["message"])
-        break
-
-def run_cmd(params):
-    expr = "(app.srepl.ext/run-json-cmd {})".format(encode(params))
-    res, failed = send_eval(expr)
-    if failed:
-        print_error(res)
-        sys.exit(-1)
-
-    return res
-
-def create_profile(fullname, email, password):
-    params = {
-        "cmd": "create-profile",
-        "params": {
-            "fullname": fullname,
-            "email": email,
-            "password": password
-        }
-    }
-
-    res = run_cmd(params)
-    print(f"Created: {res['email']} / {res['id']}")
-
-def update_profile(email, fullname, password, is_active):
-    params = {
-        "cmd": "update-profile",
-        "params": {
-            "email": email,
-            "fullname": fullname,
-            "password": password,
-            "is_active": is_active
-        }
-    }
-
-    res = run_cmd(params)
-    if res is True:
-        print(f"Updated")
-    else:
-        print(f"No profile found with email {email}")
-
-def derive_password(password):
-    params = {
-        "cmd": "derive-password",
-        "params": {
-            "password": password,
-        }
-    }
-
-    res = run_cmd(params)
-    print(f"Derived password: \"{res}\"")
-
-available_commands = [
-    "create-profile",
-    "update-profile",
-    "derive-password"
-]
-
-parser = argparse.ArgumentParser(
-    description=(
-        "Penpot Command Line Interface (CLI)"
-    )
-)
-
-parser.add_argument("-V", "--version", action="version", version="Penpot CLI %%develop%%")
-parser.add_argument("action", action="store", choices=available_commands)
-parser.add_argument("-n", "--fullname", help="Fullname", action="store")
-parser.add_argument("-e", "--email", help="Email", action="store")
-parser.add_argument("-p", "--password", help="Password", action="store")
-parser.add_argument("-c", "--connect", help="Connect to PREPL", action="store", default="tcp://localhost:6063")
-
-args = parser.parse_args()
-
-PREPL_URI = args.connect
-
-if args.action == "create-profile":
-    email = args.email
-    password = args.password
-    fullname = args.fullname
-
-    if email is None:
-        email = input("Email: ")
-
-    if fullname is None:
-        fullname = input("Fullname: ")
-
-    if password is None:
-        password = getpass("Password: ")
-
-    create_profile(fullname, email, password)
-
-elif args.action == "update-profile":
-    email = args.email
-    password = args.password
-
-    if email is None:
-        email = input("Email: ")
-
-    if password is None:
-        password = getpass("Password: ")
-
-    update_profile(email, None, password, None)
-
-elif args.action == "derive-password":
-    password = args.password
-
-    if password is None:
-        password = getpass("Password: ")
-
-    derive_password(password)
--- a/backend/scripts/manage.template.sh
+++ b/backend/scripts/manage.template.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set +e
+JAVA_CMD=$(type -p java)
+
+set -e
+if [[ ! -n "$JAVA_CMD" ]]; then
+  if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
+    JAVA_CMD="$JAVA_HOME/bin/java"
+  else
+    >&2 echo "Couldn't find 'java'. Please set JAVA_HOME."
+    exit 1
+  fi
+fi
+
+if [ -f ./environ ]; then
+   source ./environ
+fi
+
+exec $JAVA_CMD $JVM_OPTS -jar penpot.jar -m app.cli.manage "$@"
--- a/backend/scripts/prefetch-templates.clj
+++ b/backend/scripts/prefetch-templates.clj
@@ -1,40 +0,0 @@
-#!/usr/bin/env bb
-
-(require '[babashka.curl :as curl]
-         '[babashka.fs :as fs])
-
-(defn download-if-needed!
-  [dest data]
-  (doseq [{:keys [id file-uri] :as item} data]
-    (let [file (fs/file dest id)
-          rsp  (curl/get file-uri {:as :stream})]
-
-      (when (not= 200 (:status rsp))
-        (println (format "unable to download %s (uri: %s)" id file-uri))
-        (System/exit -1))
-
-      (when-not (fs/exists? (str file))
-        (println (format "=> downloading %s" id))
-        (with-open [output (io/output-stream file)]
-          (io/copy (:body rsp) output))))))
-
-(defn read-defs-file
-  [path]
-  (with-open [content (io/reader path)]
-    (edn/read-string (slurp content))))
-
-(let [[path dest] *command-line-args*]
-  (when (or (nil? path)
-            (nil? dest))
-    (println "invalid arguments")
-    (System/exit -1))
-
-  (when-not (fs/exists? path)
-    (println (format "file %s does not exists" path))
-    (System/exit -1))
-
-  (when-not (fs/exists? dest)
-    (fs/create-dirs dest))
-
-  (let [data (read-defs-file path)]
-    (download-if-needed! dest data)))
--- a/backend/scripts/repl
+++ b/backend/scripts/repl
@@ -2,21 +2,7 @@

 export PENPOT_HOST=devenv
 export PENPOT_TENANT=dev
-export PENPOT_FLAGS="\
-       $PENPOT_FLAGS \
-       enable-backend-asserts \
-       enable-audit-log \
-       enable-transit-readable-response \
-       enable-demo-users \
-       disable-secure-session-cookies \
-       enable-smtp \
-       enable-prepl-server \
-       enable-urepl-server \
-       enable-rpc-climit \
-       enable-rpc-rlimit \
-       enable-soft-rpc-rlimit \
-       enable-webhooks \
-       enable-access-tokens";
+export PENPOT_FLAGS="$PENPOT_FLAGS enable-backend-asserts enable-audit-log enable-transit-readable-response enable-demo-users disable-secure-session-cookies"

 # export PENPOT_DATABASE_URI="postgresql://172.17.0.1:5432/penpot"
 # export PENPOT_DATABASE_USERNAME="penpot"
@@ -38,25 +24,22 @@ mc mb penpot-s3/penpot -p

 export AWS_ACCESS_KEY_ID=penpot-devenv
 export AWS_SECRET_ACCESS_KEY=penpot-devenv
-export PENPOT_ASSETS_STORAGE_BACKEND=assets-s3
+export PENPOT_ASSETS_STORAGE_BACKEND=assets-fs
 export PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://minio:9000
+export PENPOT_STORAGE_ASSETS_S3_REGION=eu-central-1
 export PENPOT_STORAGE_ASSETS_S3_BUCKET=penpot

 export OPTIONS="
-       -A:jmx-remote -A:dev \
+       -A:dev:jmx-remote \
       -J-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
-       -J-Djdk.attach.allowAttachSelf \
       -J-Dlog4j2.configurationFile=log4j2-devenv.xml \
-       -J-Xms50m \
-       -J-Xmx1024m \
-       -J-XX:+UseZGC \
+       -J-XX:+UseG1GC \
       -J-XX:-OmitStackTraceInFastThrow \
+       -J-Xms50m -J-Xmx1024m \
+       -J-Djdk.attach.allowAttachSelf \
       -J-XX:+UnlockDiagnosticVMOptions \
       -J-XX:+DebugNonSafepoints";

-# Uncomment for use the ImageMagick v7.x
-# export OPTIONS="-J-Dim4java.useV7=true $OPTIONS";
-
 export OPTIONS_EVAL="nil"
 # export OPTIONS_EVAL="(set! *warn-on-reflection* true)"

--- a/backend/scripts/run.template.sh
+++ b/backend/scripts/run.template.sh
@@ -1,24 +1,20 @@
 #!/usr/bin/env bash
+set +e
+JAVA_CMD=$(type -p java)

+set -e
 if [[ ! -n "$JAVA_CMD" ]]; then
-    if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
-        JAVA_CMD="$JAVA_HOME/bin/java"
-    else
-        set +e
-        JAVA_CMD=$(type -p java)
-        set -e
-        if [[ ! -n "$JAVA_CMD" ]]; then
-            >&2 echo "Couldn't find 'java'. Please set JAVA_HOME."
-            exit 1
-        fi
-    fi
+  if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
+    JAVA_CMD="$JAVA_HOME/bin/java"
+  else
+    >&2 echo "Couldn't find 'java'. Please set JAVA_HOME."
+    exit 1
+  fi
 fi

 if [ -f ./environ ]; then
-    source ./environ
+   source ./environ
 fi

-export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow $JVM_OPTS"
-
 set -x
 exec $JAVA_CMD $JVM_OPTS "$@" -jar penpot.jar -m app.main
--- a/backend/scripts/start-dev
+++ b/backend/scripts/start-dev
@@ -2,7 +2,7 @@

 export PENPOT_HOST=devenv
 export PENPOT_TENANT=dev
-export PENPOT_FLAGS="$PENPOT_FLAGS enable-backend-asserts enable-audit-log enable-transit-readable-response enable-demo-users disable-secure-session-cookies enable-smtp enable-webhooks"
+export PENPOT_FLAGS="$PENPOT_FLAGS enable-backend-asserts enable-audit-log enable-transit-readable-response enable-demo-users disable-secure-session-cookies"

 set -ex

--- a/backend/src/app/auth.clj
+++ b/backend/src/app/auth.clj
@@ -1,26 +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.auth
-  (:require
-   [buddy.hashers :as hashers]))
-
-(defn derive-password
-  [password]
-  (hashers/derive password
-                  {:alg :argon2id
-                   :memory 16384
-                   :iterations 20
-                   :parallelism 2}))
-
-(defn verify-password
-  [attempt password]
-  (try
-    (hashers/verify attempt password)
-    (catch Throwable _
-      {:update false
-       :valid false})))
-
--- a/backend/src/app/auth/ldap.clj
+++ b/backend/src/app/auth/ldap.clj
@@ -1,139 +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.auth.ldap
-  (:require
-   [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]
-   [integrant.core :as ig]))
-
-(defn- prepare-params
-  [cfg]
-  {:ssl?      (:ssl cfg)
-   :startTLS? (:tls cfg)
-   :bind-dn   (:bind-dn cfg)
-   :password  (:bind-password cfg)
-   :host      {:address (:host cfg)
-               :port    (:port cfg)}})
-
-(defn- connect
-  "Connects to the LDAP provider and returns a connection. An
-  exception is raised if no connection is possible."
-  ^java.lang.AutoCloseable
-  [cfg]
-  (try
-    (-> cfg prepare-params ldap/connect)
-    (catch Throwable cause
-      (ex/raise :type :restriction
-                :code :unable-to-connect-to-ldap
-                :hint "unable to connect to ldap server"
-                :cause cause))))
-
-(defn- replace-several [s & {:as replacements}]
-  (reduce-kv clojure.string/replace s replacements))
-
-(defn- search-user
-  [{:keys [::conn base-dn] :as cfg} email]
-  (let [query  (replace-several (:query cfg) ":username" email)
-        attrs  [(:attrs-username cfg)
-                (:attrs-email cfg)
-                (:attrs-fullname cfg)]
-        params  {:filter query
-                 :sizelimit 1
-                 :attributes attrs}]
-    (first (ldap/search conn base-dn params))))
-
-(defn- retrieve-user
-  [{:keys [::conn] :as cfg} {:keys [email password]}]
-  (when-let [{:keys [dn] :as user} (search-user cfg email)]
-    (when (ldap/bind? conn dn password)
-      {:fullname (get user (-> cfg :attrs-fullname keyword))
-       :email    email
-       :backend  "ldap"})))
-
-(s/def ::fullname ::us/not-empty-string)
-(s/def ::email ::us/email)
-(s/def ::backend ::us/not-empty-string)
-
-(s/def ::info-data
-  (s/keys :req-un [::fullname ::email ::backend]))
-
-(defn authenticate
-  [cfg params]
-  (with-open [conn (connect cfg)]
-    (when-let [user (-> (assoc cfg ::conn conn)
-                        (retrieve-user params))]
-      (when-not (s/valid? ::info-data user)
-        (let [explain (s/explain-str ::info-data user)]
-          (l/warn ::l/raw (str "invalid response from ldap, looks like ldap is not configured correctly\n" explain))
-          (ex/raise :type :restriction
-                    :code :wrong-ldap-response
-                    :explain explain)))
-      user)))
-
-(defn- try-connectivity
-  [cfg]
-  ;; If we have ldap parameters, try to establish connection
-  (when (and (:bind-dn cfg)
-             (:bind-password cfg)
-             (:host cfg)
-             (:port cfg))
-    (try
-      (with-open [_ (connect cfg)]
-        (l/info :hint "provider initialized"
-                :provider "ldap"
-                :host (:host cfg)
-                :port (:port cfg)
-                :tls? (:tls cfg)
-                :ssl? (:ssl cfg)
-                :bind-dn (:bind-dn cfg)
-                :base-dn (:base-dn cfg)
-                :query (:query cfg))
-        cfg)
-      (catch Throwable cause
-        (l/error :hint "unable to connect to LDAP server (LDAP auth provider disabled)"
-                 :host (:host cfg) :port (:port cfg) :cause cause)
-        nil))))
-
-(s/def ::enabled? ::us/boolean)
-(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
-                   ::ssl ::tls
-                   ::enabled?
-                   ::bind-dn
-                   ::bind-password
-                   ::query
-                   ::attrs-email
-                   ::attrs-username
-                   ::attrs-fullname]))
-(s/def ::provider
-  (s/nilable ::provider-params))
-
-(defmethod ig/pre-init-spec ::provider
-  [_]
-  (s/spec ::provider))
-
-(defmethod ig/init-key ::provider
-  [_ cfg]
-  (when (:enabled? cfg)
-    (try-connectivity cfg)))
--- a/backend/src/app/auth/oidc.clj
+++ b/backend/src/app/auth/oidc.clj
@@ -1,574 +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.auth.oidc
-  "OIDC client implementation."
-  (:require
-   [app.auth.oidc.providers :as-alias providers]
-   [app.common.data :as d]
-   [app.common.data.macros :as dm]
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.spec :as us]
-   [app.common.uri :as u]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.http.client :as http]
-   [app.http.middleware :as hmw]
-   [app.http.session :as session]
-   [app.loggers.audit :as audit]
-   [app.main :as-alias main]
-   [app.rpc.commands.profile :as profile]
-   [app.tokens :as tokens]
-   [app.util.json :as json]
-   [app.util.time :as dt]
-   [app.worker :as wrk]
-   [clojure.set :as set]
-   [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
-   [integrant.core :as ig]
-   [promesa.core :as p]
-   [promesa.exec :as px]
-   [yetti.response :as yrs]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- obfuscate-string
-  [s]
-  (if (< (count s) 10)
-    (apply str (take (count s) (repeat "*")))
-    (str (subs s 0 5)
-         (apply str (take (- (count s) 5) (repeat "*"))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; OIDC PROVIDER (GENERIC)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- discover-oidc-config
-  [cfg {:keys [base-uri] :as opts}]
-  (let [discovery-uri (u/join base-uri ".well-known/openid-configuration")
-        response      (ex/try! (http/req! cfg
-                                          {:method :get :uri (str discovery-uri)}
-                                          {:sync? true}))]
-    (cond
-      (ex/exception? response)
-      (do
-        (l/warn :hint "unable to discover oidc configuration"
-                :discover-uri (str discovery-uri)
-                :cause response)
-        nil)
-
-      (= 200 (:status response))
-      (let [data      (json/decode (:body response))
-            token-uri (get data :token_endpoint)
-            auth-uri  (get data :authorization_endpoint)
-            user-uri  (get data :userinfo_endpoint)]
-        (l/debug :hint "oidc uris discovered"
-                 :token-uri token-uri
-                 :auth-uri auth-uri
-                 :user-uri user-uri)
-        {:token-uri token-uri
-         :auth-uri  auth-uri
-         :user-uri  user-uri})
-
-      :else
-      (do
-        (l/warn :hint "unable to discover OIDC configuration"
-                :uri (str discovery-uri)
-                :response-status-code (:status response))
-        nil))))
-
-(defn- prepare-oidc-opts
-  [cfg]
-  (let [opts {:base-uri      (cf/get :oidc-base-uri)
-              :client-id     (cf/get :oidc-client-id)
-              :client-secret (cf/get :oidc-client-secret)
-              :token-uri     (cf/get :oidc-token-uri)
-              :auth-uri      (cf/get :oidc-auth-uri)
-              :user-uri      (cf/get :oidc-user-uri)
-              :scopes        (cf/get :oidc-scopes #{"openid" "profile" "email"})
-              :roles-attr    (cf/get :oidc-roles-attr)
-              :roles         (cf/get :oidc-roles)
-              :name          "oidc"}
-
-        opts (d/without-nils opts)]
-
-    (when (and (string? (:base-uri opts))
-               (string? (:client-id opts))
-               (string? (:client-secret opts)))
-      (if (and (string? (:token-uri opts))
-               (string? (:user-uri opts))
-               (string? (:auth-uri opts)))
-        opts
-        (some-> (discover-oidc-config cfg opts)
-                (merge opts {:discover? true}))))))
-
-(defmethod ig/pre-init-spec ::providers/generic [_]
-  (s/keys :req [::http/client]))
-
-(defmethod ig/init-key ::providers/generic
-  [_ cfg]
-  (when (contains? cf/flags :login-with-oidc)
-    (if-let [opts (prepare-oidc-opts cfg)]
-      (do
-        (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))
-        opts)
-      (do
-        (l/warn :hint "unable to initialize auth provider, missing configuration" :provider "oidc")
-        nil))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; GOOGLE AUTH PROVIDER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defmethod ig/init-key ::providers/google
-  [_ _]
-  (let [opts {:client-id     (cf/get :google-client-id)
-              :client-secret (cf/get :google-client-secret)
-              :scopes        #{"openid" "email" "profile"}
-              :auth-uri      "https://accounts.google.com/o/oauth2/v2/auth"
-              :token-uri     "https://oauth2.googleapis.com/token"
-              :user-uri      "https://openidconnect.googleapis.com/v1/userinfo"
-              :name          "google"}]
-
-    (when (contains? cf/flags :login-with-google)
-      (if (and (string? (:client-id opts))
-               (string? (:client-secret opts)))
-        (do
-          (l/info :hint "provider initialized"
-                  :provider "google"
-                  :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 "google")
-          nil)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; GITHUB AUTH PROVIDER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- retrieve-github-email
-  [cfg tdata info]
-  (or (some-> info :email p/resolved)
-      (->> (http/req! cfg
-                      {:uri "https://api.github.com/user/emails"
-                       :headers {"Authorization" (dm/str (:type tdata) " " (:token tdata))}
-                       :timeout 6000
-                       :method :get})
-           (p/map (fn [{:keys [status body] :as response}]
-                    (when-not (s/int-in-range? 200 300 status)
-                      (ex/raise :type :internal
-                                :code :unable-to-retrieve-github-emails
-                                :hint "unable to retrieve github emails"
-                                :http-status status
-                                :http-body body))
-                    (->> response :body json/decode (filter :primary) first :email))))))
-
-(defmethod ig/pre-init-spec ::providers/github [_]
-  (s/keys :req [::http/client]))
-
-(defmethod ig/init-key ::providers/github
-  [_ cfg]
-  (let [opts {:client-id     (cf/get :github-client-id)
-              :client-secret (cf/get :github-client-secret)
-              :scopes        #{"read:user" "user:email"}
-              :auth-uri      "https://github.com/login/oauth/authorize"
-              :token-uri     "https://github.com/login/oauth/access_token"
-              :user-uri      "https://api.github.com/user"
-              :name          "github"
-
-              ;; Additional hooks for provider specific way of
-              ;; retrieve emails.
-              :get-email-fn           (partial retrieve-github-email cfg)}]
-
-    (when (contains? cf/flags :login-with-github)
-      (if (and (string? (:client-id opts))
-               (string? (:client-secret opts)))
-        (do
-          (l/info :hint "provider initialized"
-                  :provider "github"
-                  :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 "github")
-          nil)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; GITLAB AUTH PROVIDER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defmethod ig/init-key ::providers/gitlab
-  [_ _]
-  (let [base (cf/get :gitlab-base-uri "https://gitlab.com")
-        opts {:base-uri      base
-              :client-id     (cf/get :gitlab-client-id)
-              :client-secret (cf/get :gitlab-client-secret)
-              :scopes        #{"openid" "profile" "email"}
-              :auth-uri      (str base "/oauth/authorize")
-              :token-uri     (str base "/oauth/token")
-              :user-uri      (str base "/oauth/userinfo")
-              :name          "gitlab"}]
-    (when (contains? cf/flags :login-with-gitlab)
-      (if (and (string? (:client-id opts))
-               (string? (:client-secret opts)))
-        (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")
-          nil)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HANDLERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- build-redirect-uri
-  [{:keys [provider] :as cfg}]
-  (let [public (u/uri (cf/get :public-uri))]
-    (str (assoc public :path (str "/api/auth/oauth/" (:name provider) "/callback")))))
-
-(defn- build-auth-uri
-  [{:keys [provider] :as cfg} state]
-  (let [params {:client_id (:client-id provider)
-                :redirect_uri (build-redirect-uri cfg)
-                :response_type "code"
-                :state state
-                :scope (str/join " " (:scopes provider []))}
-        query  (u/map->query-string params)]
-    (-> (u/uri (:auth-uri provider))
-        (assoc :query query)
-        (str))))
-
-(defn- qualify-props
-  [provider props]
-  (reduce-kv (fn [result k v]
-               (assoc result (keyword (:name provider) (name k)) v))
-             {}
-             props))
-
-(defn retrieve-access-token
-  [{:keys [provider] :as cfg} code]
-  (let [params {:client_id (:client-id provider)
-                :client_secret (:client-secret provider)
-                :code code
-                :grant_type "authorization_code"
-                :redirect_uri (build-redirect-uri cfg)}
-        req    {:method :post
-                :headers {"content-type" "application/x-www-form-urlencoded"
-                          "accept" "application/json"}
-                :uri (:token-uri provider)
-                :body (u/map->query-string 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))
-
-    (->> (http/req! cfg req)
-         (p/map (fn [{:keys [status body] :as res}]
-                  (l/trace :hint "access token response"
-                           :status status
-                           :body body)
-                  (if (= status 200)
-                    (let [data (json/decode body)]
-                      {:token (get data :access_token)
-                       :type (get data :token_type)})
-                    (ex/raise :type :internal
-                              :code :unable-to-retrieve-token
-                              :http-status status
-                              :http-body body)))))))
-
-(defn- retrieve-user-info
-  [{:keys [provider] :as cfg} tdata]
-  (letfn [(retrieve []
-            (l/trace :hint "request user info"
-                     :uri (:user-uri provider)
-                     :token (obfuscate-string (:token tdata))
-                     :token-type (:type tdata))
-            (http/req! cfg
-                       {:uri (:user-uri provider)
-                        :headers {"Authorization" (str (:type tdata) " " (:token tdata))}
-                        :timeout 6000
-                        :method :get}))
-          (validate-response [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
-                        :code :unable-to-retrieve-user-info
-                        :hint "unable to retrieve user info"
-                        :http-status (:status response)
-                        :http-body (:body response)))
-            response)
-
-          (get-email [info]
-            ;; Allow providers hook into this for custom email
-            ;; retrieval method.
-            (if-let [get-email-fn (:get-email-fn provider)]
-              (get-email-fn tdata info)
-              (let [attr-kw (cf/get :oidc-email-attr :email)]
-                (p/resolved (get info attr-kw)))))
-
-          (get-name [info]
-            (let [attr-kw (cf/get :oidc-name-attr :name)]
-              (get info attr-kw)))
-
-          (process-response [response]
-            (p/let [info  (-> response :body json/decode)
-                    email (get-email info)]
-              {:backend  (:name provider)
-               :email    email
-               :fullname (or (get-name info) email)
-               :props    (->> (dissoc info :name :email)
-                              (qualify-props provider))}))
-
-          (validate-info [info]
-            (l/trace :hint "authentication info" :info info)
-            (when-not (s/valid? ::info info)
-              (l/warn :hint "received incomplete profile info object (please set correct scopes)"
-                      :info (pr-str info))
-              (ex/raise :type :internal
-                        :code :incomplete-user-info
-                        :hint "inconmplete user info"
-                        :info info))
-            info)]
-
-    (->> (retrieve)
-         (p/fmap validate-response)
-         (p/mcat process-response)
-         (p/fmap validate-info))))
-
-(s/def ::backend ::us/not-empty-string)
-(s/def ::email ::us/not-empty-string)
-(s/def ::fullname ::us/not-empty-string)
-(s/def ::props (s/map-of ::us/keyword any?))
-(s/def ::info
-  (s/keys :req-un [::backend
-                   ::email
-                   ::fullname
-                   ::props]))
-
-(defn get-info
-  [{:keys [provider] :as cfg} {:keys [params] :as request}]
-  (letfn [(validate-oidc [info]
-            ;; If the provider is OIDC, we can proceed to check
-            ;; roles if they are defined.
-            (when (and (= "oidc" (:name provider))
-                       (seq (:roles provider)))
-              (let [provider-roles (into #{} (:roles provider))
-                    profile-roles  (let [attr  (cf/get :oidc-roles-attr :roles)
-                                         roles (get info attr)]
-                                     (cond
-                                       (string? roles) (into #{} (str/words roles))
-                                       (vector? roles) (into #{} roles)
-                                       :else #{}))]
-
-                ;; check if profile has a configured set of roles
-                (when-not (set/subset? provider-roles profile-roles)
-                  (ex/raise :type :internal
-                            :code :unable-to-auth
-                            :hint "not enough permissions"))))
-            info)
-
-          (post-process [state info]
-            (cond-> info
-              (some? (:invitation-token state))
-              (assoc :invitation-token (:invitation-token state))
-
-              ;; If state token comes with props, merge them. The state token
-              ;; props can contain pm_ and utm_ prefixed query params.
-              (map? (:props state))
-              (update :props merge (:props state))))]
-
-    (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 (::main/props cfg) {:token state :iss :oauth})]
-      (-> (p/resolved code)
-          (p/then #(retrieve-access-token cfg %))
-          (p/then #(retrieve-user-info cfg %))
-          (p/then' validate-oidc)
-          (p/then' (partial post-process state))))))
-
-(defn- get-profile
-  [{:keys [::db/pool ::wrk/executor] :as cfg} info]
-  (px/with-dispatch executor
-    (with-open [conn (db/open pool)]
-      (some->> (:email info)
-               (profile/get-profile-by-email conn)))))
-
-(defn- redirect-response
-  [uri]
-  (yrs/response :status 302 :headers {"location" (str uri)}))
-
-(defn- generate-error-redirect
-  [_ error]
-  (let [uri (-> (u/uri (cf/get :public-uri))
-                (assoc :path "/#/auth/login")
-                (assoc :query (u/map->query-string {:error "unable-to-auth" :hint (ex-message error)})))]
-    (redirect-response uri)))
-
-(defn- generate-redirect
-  [cfg request info profile]
-  (if profile
-    (let [sxf    (session/create-fn cfg (:id profile))
-          token  (or (:invitation-token info)
-                     (tokens/generate (::main/props cfg)
-                                      {:iss :auth
-                                       :exp (dt/in-future "15m")
-                                       :profile-id (:id profile)}))
-          params {:token token}
-          uri    (-> (u/uri (cf/get :public-uri))
-                     (assoc :path "/#/auth/verify-token")
-                     (assoc :query (u/map->query-string params)))]
-
-      (when (:is-blocked profile)
-        (ex/raise :type :restriction
-                  :code :profile-blocked))
-
-      (audit/submit! cfg {:type "command"
-                          :name "login-with-password"
-                          :profile-id (:id profile)
-                          :ip-addr (audit/parse-client-ip request)
-                          :props (audit/profile->props profile)})
-
-      (->> (redirect-response uri)
-           (sxf request)))
-
-    (let [info   (assoc info
-                        :iss :prepared-register
-                        :is-active true
-                        :exp (dt/in-future {:hours 48}))
-          token  (tokens/generate (::main/props cfg) info)
-          params (d/without-nils
-                  {:token token
-                   :fullname (:fullname info)})
-          uri    (-> (u/uri (cf/get :public-uri))
-                     (assoc :path "/#/auth/register/validate")
-                     (assoc :query (u/map->query-string params)))]
-      (redirect-response uri))))
-
-(defn- auth-handler
-  [cfg {:keys [params] :as request}]
-  (let [props (audit/extract-utm-params params)
-        state (tokens/generate (::main/props cfg)
-                               {:iss :oauth
-                                :invitation-token (:invitation-token params)
-                                :props props
-                                :exp (dt/in-future "4h")})
-        uri   (build-auth-uri cfg state)]
-    (yrs/response 200 {:redirect-uri uri})))
-
-(defn- callback-handler
-  [cfg request]
-  (letfn [(process-request []
-            (p/let [info    (get-info cfg request)
-                    profile (get-profile cfg info)]
-              (generate-redirect cfg request info profile)))
-
-          (handle-error [cause]
-            (l/error :hint "error on oauth process" :cause cause)
-            (generate-error-redirect cfg cause))]
-
-    (-> (process-request)
-        (p/catch handle-error))))
-
-(def provider-lookup
-  {:compile
-   (fn [& _]
-     (fn [handler]
-       (fn [{:keys [::providers] :as cfg} request]
-         (let [provider (some-> request :path-params :provider keyword)]
-           (if-let [provider (get providers provider)]
-             (handler (assoc cfg :provider provider) request)
-             (ex/raise :type :restriction
-                       :code :provider-not-configured
-                       :provider provider
-                       :hint "provider not configured"))))))})
-
-
-(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)
-
-;; FIXME: migrate to qualified-keywords
-(s/def ::provider
-  (s/keys :req-un [::client-id
-                   ::client-secret]
-          :opt-un [::base-uri
-                   ::token-uri
-                   ::auth-uri
-                   ::user-uri
-                   ::scopes
-                   ::roles
-                   ::roles-attr
-                   ::email-attr
-                   ::name-attr]))
-
-(s/def ::providers (s/map-of ::us/keyword (s/nilable ::provider)))
-
-(s/def ::routes vector?)
-
-(defmethod ig/pre-init-spec ::routes
-  [_]
-  (s/keys :req [::session/manager
-                ::http/client
-                ::wrk/executor
-                ::main/props
-                ::db/pool
-                ::providers]))
-
-(defmethod ig/init-key ::routes
-  [_ {:keys [::wrk/executor] :as cfg}]
-  (let [cfg (update cfg :provider d/without-nils)]
-    ["" {:middleware [[session/authz cfg]
-                      [hmw/with-dispatch executor]
-                      [hmw/with-config cfg]
-                      [provider-lookup]]}
-     ["/auth/oauth"
-      ["/:provider"
-       {:handler auth-handler
-        :allowed-methods #{:post}}]
-      ["/:provider/callback"
-       {:handler callback-handler
-        :allowed-methods #{:get}}]]]))
--- a/backend/src/app/cli/manage.clj
+++ b/backend/src/app/cli/manage.clj
@@ -2,7 +2,7 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.cli.manage
  "A manage cli api."
@@ -10,8 +10,8 @@
   [app.common.logging :as l]
   [app.db :as db]
   [app.main :as main]
-   [app.rpc.commands.auth :as auth]
-   [app.rpc.commands.profile :as profile]
+   [app.rpc.mutations.profile :as profile]
+   [app.rpc.queries.profile :refer [retrieve-profile-data-by-email]]
   [clojure.string :as str]
   [clojure.tools.cli :refer [parse-opts]]
   [integrant.core :as ig])
@@ -54,17 +54,16 @@
                                         :type :password}))]
    (try
      (db/with-atomic [conn (:app.db/pool system)]
-        (->> (auth/create-profile! conn
-                                  {:fullname fullname
-                                   :email email
-                                   :password password
-                                   :is-active true
-                                   :is-demo false})
-             (auth/create-profile-rels! conn)))
+        (->> (profile/create-profile conn
+                                     {:fullname fullname
+                                      :email email
+                                      :password password
+                                      :is-active true
+                                      :is-demo false})
+             (profile/create-profile-relations conn)))

      (when (pos? (:verbosity options))
        (println "User created successfully."))
-
      (System/exit 0)

      (catch Exception _e
@@ -79,7 +78,7 @@
      (db/with-atomic [conn (:app.db/pool system)]
        (let [email    (or (:email options)
                           (read-from-console {:label "Email:"}))
-              profile  (profile/get-profile-by-email conn email)]
+              profile  (retrieve-profile-data-by-email conn email)]
          (when-not profile
            (when (pos? (:verbosity options))
              (println "Profile does not exists."))
@@ -111,7 +110,7 @@
    :id :verbosity
    :default 1
    :update-fn inc]
-   ["-q" nil "Don't print to console"
+   ["-q" nil "Dont' print to console"
    :id :verbosity
    :update-fn (constantly 0)]
   ["-h" "--help"]])
--- a/backend/src/app/config.clj
+++ b/backend/src/app/config.clj
@@ -2,7 +2,7 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.config
  "A configuration management."
@@ -19,7 +19,6 @@
   [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]))

@@ -27,10 +26,6 @@
               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)
@@ -46,23 +41,24 @@
    data))

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

-   :default-blob-version 5
-
-   :rpc-rlimit-config (fs/path "resources/rlimit.edn")
-   :rpc-climit-config (fs/path "resources/climit.edn")
+   :default-blob-version 4
+   :loggers-zmq-uri "tcp://localhost:45556"

   :file-change-snapshot-every 5
   :file-change-snapshot-timeout "3h"

   :public-uri "http://localhost:3449"
   :host "localhost"
-   :tenant "default"
+   :tenant "main"

   :redis-uri "redis://redis/0"
+   :srepl-host "127.0.0.1"
+   :srepl-port 6062

   :assets-storage-backend :assets-fs
   :storage-assets-fs-directory "assets"
@@ -83,40 +79,35 @@
   :ldap-attrs-username "uid"
   :ldap-attrs-email "mail"
   :ldap-attrs-fullname "cn"
+   :ldap-attrs-photo "jpegPhoto"

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

-(s/def ::default-rpc-rlimit ::us/vector-of-strings)
-(s/def ::rpc-rlimit-config ::fs/path)
-(s/def ::rpc-climit-config ::fs/path)
+(s/def ::flags ::us/set-of-keywords)

-(s/def ::media-max-file-size ::us/integer)
-
-(s/def ::flags ::us/vector-of-keywords)
+;; DEPRECATED PROPERTIES
+(s/def ::registration-enabled ::us/boolean)
+(s/def ::smtp-enabled ::us/boolean)
 (s/def ::telemetry-enabled ::us/boolean)
+(s/def ::asserts-enabled ::us/boolean)
+;; END DEPRECATED

 (s/def ::audit-log-archive-uri ::us/string)
-(s/def ::audit-log-http-handler-concurrency ::us/integer)
+(s/def ::audit-log-gc-max-age ::dt/duration)

-(s/def ::admins ::us/set-of-valid-emails)
+(s/def ::admins ::us/set-of-str)
 (s/def ::file-change-snapshot-every ::us/integer)
 (s/def ::file-change-snapshot-timeout ::dt/duration)

 (s/def ::default-executor-parallelism ::us/integer)
-(s/def ::scheduled-executor-parallelism ::us/integer)
-
-(s/def ::worker-default-parallelism ::us/integer)
-(s/def ::worker-webhook-parallelism ::us/integer)
-
-(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)
+(s/def ::blocking-executor-parallelism ::us/integer)
+(s/def ::worker-executor-parallelism ::us/integer)

 (s/def ::secret-key ::us/string)
 (s/def ::allow-demo-users ::us/boolean)
 (s/def ::assets-path ::us/string)
+(s/def ::authenticated-cookie-domain ::us/string)
 (s/def ::database-password (s/nilable ::us/string))
 (s/def ::database-uri ::us/string)
 (s/def ::database-username (s/nilable ::us/string))
@@ -124,17 +115,6 @@
 (s/def ::database-min-pool-size ::us/integer)
 (s/def ::database-max-pool-size ::us/integer)

-(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)
-
 (s/def ::default-blob-version ::us/integer)
 (s/def ::error-report-webhook ::us/string)
 (s/def ::user-feedback-destination ::us/string)
@@ -151,8 +131,8 @@
 (s/def ::oidc-token-uri ::us/string)
 (s/def ::oidc-auth-uri ::us/string)
 (s/def ::oidc-user-uri ::us/string)
-(s/def ::oidc-scopes ::us/set-of-strings)
-(s/def ::oidc-roles ::us/set-of-strings)
+(s/def ::oidc-scopes ::us/set-of-str)
+(s/def ::oidc-roles ::us/set-of-str)
 (s/def ::oidc-roles-attr ::us/keyword)
 (s/def ::oidc-email-attr ::us/keyword)
 (s/def ::oidc-name-attr ::us/keyword)
@@ -163,8 +143,13 @@
 (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 ::http-session-idle-max-age ::dt/duration)
+(s/def ::http-session-updater-batch-max-age ::dt/duration)
+(s/def ::http-session-updater-batch-max-size ::us/integer)
+(s/def ::initial-project-skey ::us/string)
 (s/def ::ldap-attrs-email ::us/string)
 (s/def ::ldap-attrs-fullname ::us/string)
+(s/def ::ldap-attrs-photo ::us/string)
 (s/def ::ldap-attrs-username ::us/string)
 (s/def ::ldap-base-dn ::us/string)
 (s/def ::ldap-bind-dn ::us/string)
@@ -174,6 +159,8 @@
 (s/def ::ldap-ssl ::us/boolean)
 (s/def ::ldap-starttls ::us/boolean)
 (s/def ::ldap-user-query ::us/string)
+(s/def ::loggers-loki-uri ::us/string)
+(s/def ::loggers-zmq-uri ::us/string)
 (s/def ::media-directory ::us/string)
 (s/def ::media-uri ::us/string)
 (s/def ::profile-bounce-max-age ::dt/duration)
@@ -182,8 +169,11 @@
 (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)
-
+(s/def ::registration-domain-whitelist ::us/set-of-str)
+(s/def ::rlimit-font ::us/integer)
+(s/def ::rlimit-file-update ::us/integer)
+(s/def ::rlimit-image ::us/integer)
+(s/def ::rlimit-password ::us/integer)
 (s/def ::smtp-default-from ::us/string)
 (s/def ::smtp-default-reply-to ::us/string)
 (s/def ::smtp-host ::us/string)
@@ -192,29 +182,34 @@
 (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 ::srepl-host ::us/string)
+(s/def ::srepl-port ::us/integer)
 (s/def ::assets-storage-backend ::us/keyword)
+(s/def ::fdata-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-fdata-s3-bucket ::us/string)
+(s/def ::storage-fdata-s3-region ::us/keyword)
+(s/def ::storage-fdata-s3-prefix ::us/string)
+(s/def ::storage-fdata-s3-endpoint ::us/string)
 (s/def ::telemetry-uri ::us/string)
 (s/def ::telemetry-with-taiga ::us/boolean)
 (s/def ::tenant ::us/string)

+(s/def ::sentry-trace-sample-rate ::us/number)
+(s/def ::sentry-attach-stack-trace ::us/boolean)
+(s/def ::sentry-debug ::us/boolean)
+(s/def ::sentry-dsn ::us/string)
+
 (s/def ::config
  (s/keys :opt-un [::secret-key
                   ::flags
                   ::admins
                   ::allow-demo-users
                   ::audit-log-archive-uri
-                   ::audit-log-http-handler-concurrency
-                   ::auth-token-cookie-name
-                   ::auth-token-cookie-max-age
-                   ::authenticated-cookie-name
+                   ::audit-log-gc-max-age
                   ::authenticated-cookie-domain
                   ::database-password
                   ::database-uri
@@ -223,12 +218,10 @@
                   ::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
+                   ::blocking-executor-parallelism
+                   ::worker-executor-parallelism
                   ::file-change-snapshot-every
                   ::file-change-snapshot-timeout
                   ::user-feedback-destination
@@ -257,8 +250,13 @@
                   ::http-server-max-multipart-body-size
                   ::http-server-io-threads
                   ::http-server-worker-threads
+                   ::http-session-idle-max-age
+                   ::http-session-updater-batch-max-age
+                   ::http-session-updater-batch-max-size
+                   ::initial-project-skey
                   ::ldap-attrs-email
                   ::ldap-attrs-fullname
+                   ::ldap-attrs-photo
                   ::ldap-attrs-username
                   ::ldap-base-dn
                   ::ldap-bind-dn
@@ -269,52 +267,45 @@
                   ::ldap-starttls
                   ::ldap-user-query
                   ::local-assets-uri
-                   ::media-max-file-size
+                   ::loggers-loki-uri
+                   ::loggers-zmq-uri
                   ::profile-bounce-max-age
                   ::profile-bounce-threshold
                   ::profile-complaint-max-age
                   ::profile-complaint-threshold
                   ::public-uri
-
-                   ::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
-
                   ::redis-uri
                   ::registration-domain-whitelist
-                   ::rpc-rlimit-config
-
-                   ::semaphore-process-font
-                   ::semaphore-process-image
-                   ::semaphore-update-file
-                   ::semaphore-auth
-
+                   ::registration-enabled
+                   ::rlimit-font
+                   ::rlimit-file-update
+                   ::rlimit-image
+                   ::rlimit-password
+                   ::sentry-dsn
+                   ::sentry-debug
+                   ::sentry-attach-stack-trace
+                   ::sentry-trace-sample-rate
                   ::smtp-default-from
                   ::smtp-default-reply-to
+                   ::smtp-enabled
                   ::smtp-host
                   ::smtp-password
                   ::smtp-port
                   ::smtp-ssl
                   ::smtp-tls
                   ::smtp-username
-
-                   ::urepl-host
-                   ::urepl-port
-                   ::prepl-host
-                   ::prepl-port
-
+                   ::srepl-host
+                   ::srepl-port
                   ::assets-storage-backend
                   ::storage-assets-fs-directory
                   ::storage-assets-s3-bucket
                   ::storage-assets-s3-region
                   ::storage-assets-s3-endpoint
+                   ::fdata-storage-backend
+                   ::storage-fdata-s3-bucket
+                   ::storage-fdata-s3-region
+                   ::storage-fdata-s3-prefix
+                   ::storage-fdata-s3-endpoint
                   ::telemetry-enabled
                   ::telemetry-uri
                   ::telemetry-referer
@@ -323,9 +314,7 @@

 (def default-flags
  [:enable-backend-api-doc
-   :enable-backend-worker
-   :enable-secure-session-cookies
-   :enable-email-verification])
+   :enable-secure-session-cookies])

 (defn- parse-flags
  [config]
@@ -352,11 +341,10 @@
         (merge defaults)
         (us/conform ::config))
    (catch Throwable e
-      (when (ex/error? e)
+      (when (ex/ex-info? e)
        (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;")
        (println "Error on validating configuration:")
-        (println (some-> e ex-data ex/explain))
-        (println (ex/explain (ex-data e)))
+        (println (us/pretty-explain (ex-data e)))
        (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"))
      (throw e))))

@@ -366,8 +354,8 @@
                       (str/trim))
               "%version%")))

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

 (def deletion-delay
  (dt/duration {:days 7}))
--- a/backend/src/app/db.clj
+++ b/backend/src/app/db.clj
@@ -2,10 +2,9 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.db
-  (:refer-clojure :exclude [get])
  (:require
   [app.common.data :as d]
   [app.common.exceptions :as ex]
@@ -17,6 +16,7 @@
   [app.db.sql :as sql]
   [app.metrics :as mtx]
   [app.util.json :as json]
+   [app.util.migrations :as mg]
   [app.util.time :as dt]
   [clojure.java.io :as io]
   [clojure.spec.alpha :as s]
@@ -27,10 +27,9 @@
   com.zaxxer.hikari.HikariConfig
   com.zaxxer.hikari.HikariDataSource
   com.zaxxer.hikari.metrics.prometheus.PrometheusMetricsTrackerFactory
-   io.whitfin.siphash.SipHasher
-   io.whitfin.siphash.SipHasherContainer
   java.io.InputStream
   java.io.OutputStream
+   java.lang.AutoCloseable
   java.sql.Connection
   java.sql.Savepoint
   org.postgresql.PGConnection
@@ -48,62 +47,69 @@
 ;; Initialization
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+(declare apply-migrations!)
+
 (s/def ::connection-timeout ::us/integer)
 (s/def ::max-size ::us/integer)
 (s/def ::min-size ::us/integer)
+(s/def ::migrations map?)
 (s/def ::name keyword?)
 (s/def ::password ::us/string)
+(s/def ::read-only ::us/boolean)
 (s/def ::uri ::us/not-empty-string)
 (s/def ::username ::us/string)
 (s/def ::validation-timeout ::us/integer)
-(s/def ::read-only? ::us/boolean)

-(s/def ::pool-options
-  (s/keys :opt [::uri
-                ::name
-                ::min-size
-                ::max-size
-                ::connection-timeout
-                ::validation-timeout
-                ::username
-                ::password
-                ::mtx/metrics
-                ::read-only?]))
-
-(def defaults
-  {::name :main
-   ::min-size 0
-   ::max-size 60
-   ::connection-timeout 10000
-   ::validation-timeout 10000
-   ::idle-timeout 120000 ; 2min
-   ::max-lifetime 1800000 ; 30m
-   ::read-only? false})
+(defmethod ig/pre-init-spec ::pool [_]
+  (s/keys :req-un [::uri ::name
+                   ::min-size
+                   ::max-size
+                   ::connection-timeout
+                   ::validation-timeout]
+          :opt-un [::migrations
+                   ::username
+                   ::password
+                   ::mtx/metrics
+                   ::read-only]))

 (defmethod ig/prep-key ::pool
  [_ cfg]
-  (merge defaults (d/without-nils cfg)))
-
-;; Don't validate here, just validate that a map is received.
-(defmethod ig/pre-init-spec ::pool [_] ::pool-options)
+  (merge {:name :main
+          :min-size 0
+          :max-size 30
+          :connection-timeout 10000
+          :validation-timeout 10000
+          :idle-timeout 120000 ; 2min
+          :max-lifetime 1800000 ; 30m
+          :read-only false}
+         (d/without-nils cfg)))

 (defmethod ig/init-key ::pool
-  [_ {:keys [::uri ::read-only?] :as cfg}]
-  (when uri
-    (l/info :hint "initialize connection pool"
-            :name (d/name (::name cfg))
-            :uri uri
-            :read-only read-only?
-            :with-credentials (and (contains? cfg ::username)
-                                   (contains? cfg ::password))
-            :min-size (::min-size cfg)
-          :max-size (::max-size cfg))
-    (create-pool cfg)))
+  [_ {:keys [migrations name read-only] :as cfg}]
+  (l/info :hint "initialize connection pool"
+          :name (d/name name)
+          :uri (:uri cfg)
+          :read-only read-only
+          :with-credentials (and (contains? cfg :username)
+                                 (contains? cfg :password))
+          :min-size (:min-size cfg)
+          :max-size (:max-size cfg))
+
+  (let [pool (create-pool cfg)]
+    (when-not read-only
+      (some->> (seq migrations) (apply-migrations! pool)))
+    pool))

 (defmethod ig/halt-key! ::pool
  [_ pool]
-  (when pool
-    (.close ^HikariDataSource pool)))
+  (.close ^HikariDataSource pool))
+
+(defn- apply-migrations!
+  [pool migrations]
+  (with-open [conn ^AutoCloseable (open pool)]
+    (mg/setup! conn)
+    (doseq [[name steps] migrations]
+      (mg/migrate! conn {:name (d/name name) :steps steps}))))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; API & Impl
@@ -114,30 +120,30 @@
       "SET idle_in_transaction_session_timeout = 300000;"))

 (defn- create-datasource-config
-  [{:keys [::mtx/metrics ::uri] :as cfg}]
+  [{:keys [metrics uri] :as cfg}]
  (let [config (HikariConfig.)]
    (doto config
      (.setJdbcUrl           (str "jdbc:" uri))
-      (.setPoolName          (d/name (::name cfg)))
+      (.setPoolName          (d/name (:name cfg)))
      (.setAutoCommit true)
-      (.setReadOnly          (::read-only? cfg))
-      (.setConnectionTimeout (::connection-timeout cfg))
-      (.setValidationTimeout (::validation-timeout cfg))
-      (.setIdleTimeout       (::idle-timeout cfg))
-      (.setMaxLifetime       (::max-lifetime cfg))
-      (.setMinimumIdle       (::min-size cfg))
-      (.setMaximumPoolSize   (::max-size cfg))
+      (.setReadOnly          (:read-only cfg))
+      (.setConnectionTimeout (:connection-timeout cfg))
+      (.setValidationTimeout (:validation-timeout cfg))
+      (.setIdleTimeout       (:idle-timeout cfg))
+      (.setMaxLifetime       (:max-lifetime cfg))
+      (.setMinimumIdle       (:min-size cfg))
+      (.setMaximumPoolSize   (:max-size cfg))
      (.setConnectionInitSql initsql)
      (.setInitializationFailTimeout -1))

    ;; When metrics namespace is provided
    (when metrics
-      (->> (::mtx/registry metrics)
+      (->> (:registry metrics)
           (PrometheusMetricsTrackerFactory.)
           (.setMetricsTrackerFactory config)))

-    (some->> ^String (::username cfg) (.setUsername config))
-    (some->> ^String (::password cfg) (.setPassword config))
+    (some->> ^String (:username cfg) (.setUsername config))
+    (some->> ^String (:password cfg) (.setPassword config))

    config))

@@ -145,28 +151,15 @@
  [v]
  (instance? javax.sql.DataSource v))

-(s/def ::conn some?)
-(s/def ::nilable-pool (s/nilable ::pool))
 (s/def ::pool pool?)
-(s/def ::pool-or-conn some?)

 (defn closed?
  [pool]
  (.isClosed ^HikariDataSource pool))

 (defn read-only?
-  [pool-or-conn]
-  (cond
-    (instance? HikariDataSource pool-or-conn)
-    (.isReadOnly ^HikariDataSource pool-or-conn)
-
-    (instance? Connection pool-or-conn)
-    (.isReadOnly ^Connection pool-or-conn)
-
-    :else
-    (ex/raise :type :internal
-              :code :invalid-connection
-              :hint "invalid connection provided")))
+  [pool]
+  (.isReadOnly ^HikariDataSource pool))

 (defn create-pool
  [cfg]
@@ -220,86 +213,77 @@
  [& args]
  `(jdbc/with-transaction ~@args))

-(defn open
+(defn ^Connection open
  [pool]
  (jdbc/get-connection pool))

-(def ^:private default-opts
-  {:builder-fn sql/as-kebab-maps})
-
 (defn exec!
  ([ds sv]
-   (jdbc/execute! ds sv default-opts))
+   (exec! ds sv {}))
  ([ds sv opts]
-   (jdbc/execute! ds sv (merge default-opts opts))))
+   (jdbc/execute! ds sv (assoc opts :builder-fn sql/as-kebab-maps))))

 (defn exec-one!
-  ([ds sv]
-   (jdbc/execute-one! ds sv default-opts))
+  ([ds sv] (exec-one! ds sv {}))
  ([ds sv opts]
-   (jdbc/execute-one! ds sv
-                      (-> (merge default-opts opts)
-                          (assoc :return-keys (::return-keys? opts false))))))
+   (jdbc/execute-one! ds sv (assoc opts :builder-fn sql/as-kebab-maps))))

 (defn insert!
-  [ds table params & {:as opts}]
-  (exec-one! ds
-             (sql/insert table params opts)
-             (merge {::return-keys? true} opts)))
+  ([ds table params] (insert! ds table params nil))
+  ([ds table params opts]
+   (exec-one! ds
+              (sql/insert table params opts)
+              (merge {:return-keys true} opts))))

 (defn insert-multi!
-  [ds table cols rows & {:as opts}]
-  (exec! ds
-         (sql/insert-multi table cols rows opts)
-         (merge {::return-keys? true} opts)))
+  ([ds table cols rows] (insert-multi! ds table cols rows nil))
+  ([ds table cols rows opts]
+   (exec! ds
+          (sql/insert-multi table cols rows opts)
+          (merge {:return-keys true} opts))))

 (defn update!
-  [ds table params where & {:as opts}]
-  (exec-one! ds
-             (sql/update table params where opts)
-             (merge {::return-keys? true} opts)))
+  ([ds table params where] (update! ds table params where nil))
+  ([ds table params where opts]
+   (exec-one! ds
+              (sql/update table params where opts)
+              (merge {:return-keys true} opts))))

 (defn delete!
-  [ds table params & {:as opts}]
-  (exec-one! ds
-             (sql/delete table params opts)
-             (merge {::return-keys? true} opts)))
+  ([ds table params] (delete! ds table params nil))
+  ([ds table params opts]
+   (exec-one! ds
+              (sql/delete table params opts)
+              (assoc opts :return-keys true))))

-(defn is-row-deleted?
+(defn- is-deleted?
  [{:keys [deleted-at]}]
  (and (dt/instant? deleted-at)
       (< (inst-ms deleted-at)
          (inst-ms (dt/now)))))

-(defn get*
-  "Retrieve a single row from database that matches a simple filters. Do
-  not raises exceptions."
-  [ds table params & {:as opts}]
-  (let [rows (exec! ds (sql/select table params opts))
-        rows (cond->> rows
-               (::remove-deleted? opts true)
-               (remove is-row-deleted?))]
-    (first rows)))
-
-(defn get
-  "Retrieve a single row from database that matches a simple
-  filters. Raises :not-found exception if no object is found."
-  [ds table params & {:as opts}]
-  (let [row (get* ds table params opts)]
-    (when (and (not row) (::check-deleted? opts true))
-      (ex/raise :type :not-found
-                :code :object-not-found
-                :table table
-                :hint "database object not found"))
-    row))
+(defn get-by-params
+  ([ds table params]
+   (get-by-params ds table params nil))
+  ([ds table params {:keys [check-not-found] :or {check-not-found true} :as opts}]
+   (let [res (exec-one! ds (sql/select table params opts))]
+     (when (and check-not-found (or (not res) (is-deleted? res)))
+       (ex/raise :type :not-found
+                 :table table
+                 :hint "database object not found"))
+     res)))

 (defn get-by-id
-  [ds table id & {:as opts}]
-  (get ds table {:id id} opts))
+  ([ds table id]
+   (get-by-params ds table {:id id} nil))
+  ([ds table id opts]
+   (get-by-params ds table {:id id} opts)))

 (defn query
-  [ds table params & {:as opts}]
-  (exec! ds (sql/select table params opts)))
+  ([ds table params]
+   (query ds table params nil))
+  ([ds table params opts]
+   (exec! ds (sql/select table params opts))))

 (defn pgobject?
  ([v]
@@ -326,13 +310,10 @@
  [v]
  (and (pgarray? v) (= "uuid" (.getBaseTypeName ^PgArray v))))

-;; TODO rename to decode-pgarray-into
 (defn decode-pgarray
-  ([v] (decode-pgarray v []))
-  ([v in]
-   (into in (some-> ^PgArray v .getArray)))
-  ([v in xf]
-   (into in xf (some-> ^PgArray v .getArray))))
+  ([v] (into [] (.getArray ^PgArray v)))
+  ([v in] (into in (.getArray ^PgArray v)))
+  ([v in xf] (into in xf (.getArray ^PgArray v))))

 (defn pgarray->set
  [v]
@@ -374,94 +355,74 @@
   (.rollback conn sp)))

 (defn interval
-  [o]
+  [data]
  (cond
-    (or (integer? o)
-        (float? o))
-    (->> (/ o 1000.0)
+    (integer? data)
+    (->> (/ data 1000.0)
         (format "%s seconds")
         (pginterval))

-    (string? o)
-    (pginterval o)
+    (string? data)
+    (pginterval data)

-    (dt/duration? o)
-    (interval (inst-ms o))
+    (dt/duration? data)
+    (->> (/ (.toMillis ^java.time.Duration data) 1000.0)
+         (format "%s seconds")
+         (pginterval))

    :else
-    (ex/raise :type :not-implemented
-              :hint (format "no implementation found for value %s" (pr-str o)))))
+    (ex/raise :type :not-implemented)))

 (defn decode-json-pgobject
  [^PGobject o]
-  (when o
-    (let [typ (.getType o)
-          val (.getValue o)]
-      (if (or (= typ "json")
-              (= typ "jsonb"))
-        (json/decode val)
-        val))))
+  (let [typ (.getType o)
+        val (.getValue o)]
+    (if (or (= typ "json")
+            (= typ "jsonb"))
+      (json/read val)
+      val)))

 (defn decode-transit-pgobject
  [^PGobject o]
-  (when o
-    (let [typ (.getType o)
-          val (.getValue o)]
-      (if (or (= typ "json")
-              (= typ "jsonb"))
-        (t/decode-str val)
-        val))))
+  (let [typ (.getType o)
+        val (.getValue o)]
+    (if (or (= typ "json")
+            (= typ "jsonb"))
+      (t/decode-str val)
+      val)))

 (defn inet
  [ip-addr]
-  (when ip-addr
-    (doto (org.postgresql.util.PGobject.)
-      (.setType "inet")
-      (.setValue (str ip-addr)))))
+  (doto (org.postgresql.util.PGobject.)
+    (.setType "inet")
+    (.setValue (str ip-addr))))

 (defn decode-inet
  [^PGobject o]
-  (when o
-    (if (= "inet" (.getType o))
-      (.getValue o)
-      nil)))
+  (if (= "inet" (.getType o))
+    (.getValue o)
+    nil))

 (defn tjson
  "Encode as transit json."
  [data]
-  (when data
-    (doto (org.postgresql.util.PGobject.)
-      (.setType "jsonb")
-      (.setValue (t/encode-str data {:type :json-verbose})))))
+  (doto (org.postgresql.util.PGobject.)
+    (.setType "jsonb")
+    (.setValue (t/encode-str data {:type :json-verbose}))))

 (defn json
  "Encode as plain json."
  [data]
-  (when data
-    (doto (org.postgresql.util.PGobject.)
-      (.setType "jsonb")
-      (.setValue (json/encode-str data)))))
-
-(defn get-update-count
-  [result]
-  (:next.jdbc/update-count result))
-
+  (doto (org.postgresql.util.PGobject.)
+    (.setType "jsonb")
+    (.setValue (json/write-str data))))

 ;; --- Locks

-(def ^:private siphash-state
-  (SipHasher/container
-   (uuid/get-bytes uuid/zero)))
-
-(defn uuid->hash-code
-  [o]
-  (.hash ^SipHasherContainer siphash-state
-         ^bytes (uuid/get-bytes o)))
-
 (defn- xact-check-param
  [n]
  (cond
-    (uuid? n) (uuid->hash-code n)
+    (uuid? n) (uuid/get-word-high n)
    (int? n)  n
    :else (throw (IllegalArgumentException. "uuid or number allowed"))))

@@ -476,18 +437,3 @@
  (let [n   (xact-check-param n)
        row (exec-one! conn ["select pg_try_advisory_xact_lock(?::bigint) as lock" n])]
    (:lock row)))
-
-(defn sql-exception?
-  [cause]
-  (instance? java.sql.SQLException cause))
-
-(defn connection-error?
-  [cause]
-  (and (sql-exception? cause)
-       (contains? #{"08003" "08006" "08001" "08004"}
-                  (.getSQLState ^java.sql.SQLException cause))))
-
-(defn serialization-error?
-  [cause]
-  (and (sql-exception? cause)
-       (= "40001" (.getSQLState ^java.sql.SQLException cause))))
--- a/backend/src/app/db/sql.clj
+++ b/backend/src/app/db/sql.clj
@@ -2,12 +2,11 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.db.sql
  (:refer-clojure :exclude [update])
  (:require
-   [app.db :as-alias db]
   [clojure.string :as str]
   [next.jdbc.optional :as jdbc-opt]
   [next.jdbc.sql.builder :as sql]))
@@ -44,10 +43,8 @@
  ([table where-params opts]
   (let [opts (merge default-opts opts)
         opts (cond-> opts
-                (::db/for-update? opts) (assoc :suffix "FOR UPDATE")
-                (::db/for-share? opts)  (assoc :suffix "FOR KEY SHARE")
-                (:for-update opts)      (assoc :suffix "FOR UPDATE")
-                (:for-key-share opts)   (assoc :suffix "FOR KEY SHARE"))]
+                (:for-update opts)    (assoc :suffix "FOR UPDATE")
+                (:for-key-share opts) (assoc :suffix "FOR KEY SHARE"))]
     (sql/for-query table where-params opts))))

 (defn update
--- a/backend/src/app/email.clj
+++ b/backend/src/app/email.clj
@@ -1,443 +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
-  "Main api for send emails."
-  (:require
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.pprint :as pp]
-   [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.metrics :as mtx]
-   [app.util.template :as tmpl]
-   [app.worker :as wrk]
-   [clojure.java.io :as io]
-   [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
-   [integrant.core :as ig])
-  (:import
-   jakarta.mail.Message$RecipientType
-   jakarta.mail.Session
-   jakarta.mail.Transport
-   jakarta.mail.internet.InternetAddress
-   jakarta.mail.internet.MimeBodyPart
-   jakarta.mail.internet.MimeMessage
-   jakarta.mail.internet.MimeMultipart
-   java.util.Properties))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; EMAIL IMPL
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- parse-address
-  [v]
-  (InternetAddress/parse ^String v))
-
-(defn- resolve-recipient-type
-  ^Message$RecipientType
-  [type]
-  (case type
-    :to  Message$RecipientType/TO
-    :cc  Message$RecipientType/CC
-    :bcc Message$RecipientType/BCC))
-
-(defn- assign-recipient
-  [^MimeMessage mmsg type address]
-  (if (sequential? address)
-    (reduce #(assign-recipient %1 type %2) mmsg address)
-    (let [address (parse-address address)
-          type    (resolve-recipient-type type)]
-      (.addRecipients mmsg type address)
-      mmsg)))
-(defn- assign-recipients
-  [mmsg {:keys [to cc bcc] :as params}]
-  (cond-> mmsg
-    (some? to)  (assign-recipient :to to)
-    (some? cc)  (assign-recipient :cc cc)
-    (some? bcc) (assign-recipient :bcc bcc)))
-
-(defn- assign-from
-  [mmsg {:keys [default-from]} {:keys [from] :as props}]
-  (let [from (or from default-from)]
-    (when from
-      (let [from (parse-address from)]
-        (.addFrom ^MimeMessage mmsg from)))))
-
-(defn- assign-reply-to
-  [mmsg {:keys [::default-reply-to] :as cfg} {:keys [reply-to] :as params}]
-  (let [reply-to (or reply-to default-reply-to)]
-    (when reply-to
-      (let [reply-to (parse-address reply-to)]
-        (.setReplyTo ^MimeMessage mmsg reply-to)))))
-
-(defn- assign-subject
-  [mmsg {:keys [subject charset] :or {charset "utf-8"} :as params}]
-  (assert (string? subject) "subject is mandatory")
-  (.setSubject ^MimeMessage mmsg
-               ^String subject
-               ^String charset))
-
-(defn- assign-extra-headers
-  [^MimeMessage mmsg {:keys [headers extra-data] :as params}]
-  (let [headers (assoc headers "X-Penpot-Data" extra-data)]
-    (reduce-kv (fn [^MimeMessage mmsg k v]
-                 (doto mmsg
-                   (.addHeader (name k) (str v))))
-               mmsg
-               headers)))
-
-(defn- assign-body
-  [^MimeMessage mmsg {:keys [body charset] :or {charset "utf-8"}}]
-  (let [mpart (MimeMultipart. "mixed")]
-    (cond
-      (string? body)
-      (let [bpart (MimeBodyPart.)]
-        (.setContent bpart ^String body (str "text/plain; charset=" charset))
-        (.addBodyPart mpart bpart))
-
-      (vector? body)
-      (let [mmp (MimeMultipart. "alternative")
-            mbp (MimeBodyPart.)]
-        (.addBodyPart mpart mbp)
-        (.setContent mbp mmp)
-        (doseq [item body]
-          (let [mbp (MimeBodyPart.)]
-            (.setContent mbp
-                         ^String (:content item)
-                         ^String (str (:type item "text/plain") "; charset=" charset))
-            (.addBodyPart mmp mbp))))
-
-      (map? body)
-      (let [bpart (MimeBodyPart.)]
-        (.setContent bpart
-                     ^String (:content body)
-                     ^String (str (:type body "text/plain") "; charset=" charset))
-        (.addBodyPart mpart bpart))
-
-      :else
-      (throw (ex-info "Unsupported type" {:body body})))
-    (.setContent mmsg mpart)
-    mmsg))
-
-(defn- opts->props
-  [{:keys [::username ::tls ::host ::port ::timeout ::default-from]
-    :or {timeout 30000}}]
-  (reduce-kv
-   (fn [^Properties props k v]
-     (if (nil? v)
-       props
-       (doto props (.put ^String k  ^String (str v)))))
-   (Properties.)
-   {"mail.user" username
-    "mail.host" host
-    "mail.debug" (contains? cf/flags :smtp-debug)
-    "mail.from" default-from
-    "mail.smtp.auth" (boolean username)
-    "mail.smtp.starttls.enable" tls
-    "mail.smtp.starttls.required" tls
-    "mail.smtp.host" host
-    "mail.smtp.port" port
-    "mail.smtp.user" username
-    "mail.smtp.timeout" timeout
-    "mail.smtp.connectiontimeout" timeout}))
-
-(defn- create-smtp-session
-  [cfg]
-  (let [props (opts->props cfg)]
-    (Session/getInstance props)))
-
-(defn- create-smtp-message
-  ^MimeMessage
-  [cfg session params]
-  (let [mmsg (MimeMessage. ^Session session)]
-    (assign-recipients mmsg params)
-    (assign-from mmsg cfg params)
-    (assign-reply-to mmsg cfg params)
-    (assign-subject mmsg params)
-    (assign-extra-headers mmsg params)
-    (assign-body mmsg params)
-    (.saveChanges ^MimeMessage mmsg)
-    mmsg))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; TEMPLATE EMAIL IMPL
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:private email-path "app/email/%(id)s/%(lang)s.%(type)s")
-
-(defn- render-email-template-part
-  [type id context]
-  (let [lang (:lang context :en)
-        path (str/format email-path {:id (name id)
-                                     :lang (name lang)
-                                     :type (name type)})]
-    (some-> (io/resource path)
-            (tmpl/render context))))
-
-(defn- build-email-template
-  [id context]
-  (let [subj (render-email-template-part :subj id context)
-        text (render-email-template-part :txt id context)
-        html (render-email-template-part :html id context)]
-    (when (or (not subj)
-              (and (not text)
-                   (not html)))
-      (ex/raise :type :internal
-                :code :missing-email-templates))
-    {:subject subj
-     :body (into
-            [{:type "text/plain"
-              :content text}]
-            (when html
-              [{:type "text/html"
-                :content html}]))}))
-
-(s/def ::priority #{:high :low})
-(s/def ::to (s/or :single ::us/email
-                  :multi (s/coll-of ::us/email)))
-(s/def ::from ::us/email)
-(s/def ::reply-to ::us/email)
-(s/def ::lang string?)
-(s/def ::extra-data ::us/string)
-
-(s/def ::context
-  (s/keys :req-un [::to]
-          :opt-un [::reply-to ::from ::lang ::priority ::extra-data]))
-
-(defn template-factory
-  ([id] (template-factory id {}))
-  ([id extra-context]
-   (s/assert keyword? id)
-   (fn [context]
-     (us/verify ::context context)
-     (when-let [spec (s/get-spec id)]
-       (s/assert spec context))
-
-     (let [context (merge (if (fn? extra-context)
-                            (extra-context)
-                            extra-context)
-                          context)
-           email   (build-email-template id context)]
-       (when-not email
-         (ex/raise :type :internal
-                   :code :email-template-does-not-exists
-                   :hint "seems like the template is wrong or does not exists."
-                   :context {:id id}))
-       (cond-> (assoc email :id (name id))
-         (:extra-data context)
-         (assoc :extra-data (:extra-data context))
-
-         (:from context)
-         (assoc :from (:from context))
-
-         (:reply-to context)
-         (assoc :reply-to (:reply-to context))
-
-         (:to context)
-         (assoc :to (:to context)))))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; PUBLIC HIGH-LEVEL API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn render
-  [email-factory context]
-  (email-factory context))
-
-(defn send!
-  "Schedule an already defined email to be sent using asynchronously
-  using worker task."
-  [{:keys [::conn ::factory] :as context}]
-  (us/verify some? conn)
-  (let [email (if factory
-                (factory context)
-                (dissoc context ::conn))]
-    (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]
-    (when (contains? cf/flags :smtp)
-      (let [session (create-smtp-session cfg)]
-        (with-open [transport (.getTransport session (if (:ssl cfg) "smtps" "smtp"))]
-          (.connect ^Transport transport
-                    ^String (::username cfg)
-                    ^String (::password cfg))
-
-          (let [^MimeMessage message (create-smtp-message cfg session params)]
-            (.sendMessage ^Transport transport
-                          ^MimeMessage message
-                          (.getAllRecipients message))))))
-
-    (when (or (contains? cf/flags :log-emails)
-              (not (contains? cf/flags :smtp)))
-      (send-to-logger! cfg params))))
-
-(defmethod ig/pre-init-spec ::handler [_]
-  (s/keys :req [::sendmail ::mtx/metrics]))
-
-(defmethod ig/init-key ::handler
-  [_ {:keys [::sendmail]}]
-  (fn [{:keys [props] :as task}]
-    (sendmail props)))
-
-(defn- send-to-logger!
-  [_ email]
-  (let [body (:body email)
-        out  (with-out-str
-               (println "email console dump:")
-               (println "******** start email" (:id email) "**********")
-               (pp/pprint (dissoc email :body))
-               (if (string? body)
-                 (println body)
-                 (println (->> body
-                               (filter #(= "text/plain" (:type %)))
-                               (map :content)
-                               first)))
-               (println "******** end email" (:id email) "**********"))]
-    (l/info ::l/raw out)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; EMAIL FACTORIES
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(s/def ::subject ::us/string)
-(s/def ::content ::us/string)
-
-(s/def ::feedback
-  (s/keys :req-un [::subject ::content]))
-
-(def feedback
-  "A profile feedback email."
-  (template-factory ::feedback))
-
-(s/def ::name ::us/string)
-(s/def ::register
-  (s/keys :req-un [::name]))
-
-(def register
-  "A new profile registration welcome email."
-  (template-factory ::register))
-
-(s/def ::token ::us/string)
-(s/def ::password-recovery
-  (s/keys :req-un [::name ::token]))
-
-(def password-recovery
-  "A password recovery notification email."
-  (template-factory ::password-recovery))
-
-(s/def ::pending-email ::us/email)
-(s/def ::change-email
-  (s/keys :req-un [::name ::pending-email ::token]))
-
-(def change-email
-  "Password change confirmation email"
-  (template-factory ::change-email))
-
-(s/def ::email.invite-to-team/invited-by ::us/string)
-(s/def ::email.invite-to-team/team ::us/string)
-(s/def ::email.invite-to-team/token ::us/string)
-
-(s/def ::invite-to-team
-  (s/keys :req-un [::email.invite-to-team/invited-by
-                   ::email.invite-to-team/token
-                   ::email.invite-to-team/team]))
-
-(def invite-to-team
-  "Teams member invitation email."
-  (template-factory ::invite-to-team))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; BOUNCE/COMPLAINS HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def sql:profile-complaint-report
-  "select (select count(*)
-             from profile_complaint_report
-            where type = 'complaint'
-              and profile_id = ?
-              and created_at > now() - ?::interval) as complaints,
-          (select count(*)
-             from profile_complaint_report
-            where type = 'bounce'
-              and profile_id = ?
-              and created_at > now() - ?::interval) as bounces;")
-
-(defn allow-send-emails?
-  [conn profile]
-  (when-not (:is-muted profile false)
-    (let [complaint-threshold (cf/get :profile-complaint-threshold)
-          complaint-max-age   (cf/get :profile-complaint-max-age)
-          bounce-threshold    (cf/get :profile-bounce-threshold)
-          bounce-max-age      (cf/get :profile-bounce-max-age)
-
-          {:keys [complaints bounces] :as result}
-          (db/exec-one! conn [sql:profile-complaint-report
-                              (:id profile)
-                              (db/interval complaint-max-age)
-                              (:id profile)
-                              (db/interval bounce-max-age)])]
-
-      (and (< (or complaints 0) complaint-threshold)
-           (< (or bounces 0) bounce-threshold)))))
-
-(defn has-complaint-reports?
-  ([conn email] (has-complaint-reports? conn email nil))
-  ([conn email {:keys [threshold] :or {threshold 1}}]
-   (let [reports (db/exec! conn (sql/select :global-complaint-report
-                                            {:email email :type "complaint"}
-                                            {:limit 10}))]
-     (>= (count reports) threshold))))
-
-(defn has-bounce-reports?
-  ([conn email] (has-bounce-reports? conn email nil))
-  ([conn email {:keys [threshold] :or {threshold 1}}]
-   (let [reports (db/exec! conn (sql/select :global-complaint-report
-                                            {:email email :type "bounce"}
-                                            {:limit 10}))]
-     (>= (count reports) threshold))))
--- a/backend/src/app/emails.clj
+++ b/backend/src/app/emails.clj
@@ -0,0 +1,190 @@
+;; 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) UXBOX Labs SL
+
+(ns app.emails
+  "Main api for send emails."
+  (:require
+   [app.common.logging :as l]
+   [app.common.pprint :as pp]
+   [app.common.spec :as us]
+   [app.config :as cf]
+   [app.db :as db]
+   [app.db.sql :as sql]
+   [app.util.emails :as emails]
+   [app.worker :as wrk]
+   [clojure.spec.alpha :as s]
+   [integrant.core :as ig]))
+
+;; --- PUBLIC API
+
+(defn render
+  [email-factory context]
+  (email-factory context))
+
+(defn send!
+  "Schedule the email for sending."
+  [{:keys [::conn ::factory] :as context}]
+  (us/verify fn? factory)
+  (us/verify some? conn)
+  (let [email (factory context)]
+    (wrk/submit! (assoc email
+                        ::wrk/task :sendmail
+                        ::wrk/delay 0
+                        ::wrk/max-retries 1
+                        ::wrk/priority 200
+                        ::wrk/conn conn))))
+
+
+;; --- BOUNCE/COMPLAINS HANDLING
+
+(def sql:profile-complaint-report
+  "select (select count(*)
+             from profile_complaint_report
+            where type = 'complaint'
+              and profile_id = ?
+              and created_at > now() - ?::interval) as complaints,
+          (select count(*)
+             from profile_complaint_report
+            where type = 'bounce'
+              and profile_id = ?
+              and created_at > now() - ?::interval) as bounces;")
+
+(defn allow-send-emails?
+  [conn profile]
+  (when-not (:is-muted profile false)
+    (let [complaint-threshold (cf/get :profile-complaint-threshold)
+          complaint-max-age   (cf/get :profile-complaint-max-age)
+          bounce-threshold    (cf/get :profile-bounce-threshold)
+          bounce-max-age      (cf/get :profile-bounce-max-age)
+
+          {:keys [complaints bounces] :as result}
+          (db/exec-one! conn [sql:profile-complaint-report
+                              (:id profile)
+                              (db/interval complaint-max-age)
+                              (:id profile)
+                              (db/interval bounce-max-age)])]
+
+      (and (< (or complaints 0) complaint-threshold)
+           (< (or bounces 0) bounce-threshold)))))
+
+(defn has-complaint-reports?
+  ([conn email] (has-complaint-reports? conn email nil))
+  ([conn email {:keys [threshold] :or {threshold 1}}]
+   (let [reports (db/exec! conn (sql/select :global-complaint-report
+                                            {:email email :type "complaint"}
+                                            {:limit 10}))]
+     (>= (count reports) threshold))))
+
+(defn has-bounce-reports?
+  ([conn email] (has-bounce-reports? conn email nil))
+  ([conn email {:keys [threshold] :or {threshold 1}}]
+   (let [reports (db/exec! conn (sql/select :global-complaint-report
+                                            {:email email :type "bounce"}
+                                            {:limit 10}))]
+     (>= (count reports) threshold))))
+
+
+;; --- EMAIL FACTORIES
+
+(s/def ::subject ::us/string)
+(s/def ::content ::us/string)
+
+(s/def ::feedback
+  (s/keys :req-un [::subject ::content]))
+
+(def feedback
+  "A profile feedback email."
+  (emails/template-factory ::feedback))
+
+(s/def ::name ::us/string)
+(s/def ::register
+  (s/keys :req-un [::name]))
+
+(def register
+  "A new profile registration welcome email."
+  (emails/template-factory ::register))
+
+(s/def ::token ::us/string)
+(s/def ::password-recovery
+  (s/keys :req-un [::name ::token]))
+
+(def password-recovery
+  "A password recovery notification email."
+  (emails/template-factory ::password-recovery))
+
+(s/def ::pending-email ::us/email)
+(s/def ::change-email
+  (s/keys :req-un [::name ::pending-email ::token]))
+
+(def change-email
+  "Password change confirmation email"
+  (emails/template-factory ::change-email))
+
+(s/def :internal.emails.invite-to-team/invited-by ::us/string)
+(s/def :internal.emails.invite-to-team/team ::us/string)
+(s/def :internal.emails.invite-to-team/token ::us/string)
+
+(s/def ::invite-to-team
+  (s/keys :req-un [:internal.emails.invite-to-team/invited-by
+                   :internal.emails.invite-to-team/token
+                   :internal.emails.invite-to-team/team]))
+
+(def invite-to-team
+  "Teams member invitation email."
+  (emails/template-factory ::invite-to-team))
+
+
+;; --- SENDMAIL TASK
+
+(declare send-console!)
+
+(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)
+
+(defmethod ig/pre-init-spec ::sendmail-handler [_]
+  (s/keys :opt-un [::username
+                   ::password
+                   ::tls
+                   ::ssl
+                   ::host
+                   ::port
+                   ::default-from
+                   ::default-reply-to]))
+
+(defmethod ig/init-key ::sendmail-handler
+  [_ cfg]
+  (fn [{:keys [props] :as task}]
+    (let [enabled? (or (contains? cf/flags :smtp)
+                       (cf/get :smtp-enabled)
+                       (:enabled task))]
+      (when enabled?
+        (emails/send! cfg props))
+
+      (when (contains? cf/flags :log-emails)
+        (send-console! cfg props)))))
+
+(defn- send-console!
+  [_ email]
+  (let [body (:body email)
+        out  (with-out-str
+               (println "email console dump:")
+               (println "******** start email" (:id email) "**********")
+               (pp/pprint (dissoc email :body))
+               (if (string? body)
+                 (println body)
+                 (println (->> body
+                               (filter #(= "text/plain" (:type %)))
+                               (map :content)
+                               first)))
+               (println "******** end email" (:id email) "**********"))]
+    (l/info ::l/raw out)))
+
--- a/backend/src/app/http.clj
+++ b/backend/src/app/http.clj
@@ -2,26 +2,17 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http
  (:require
-   [app.auth.oidc :as-alias oidc]
   [app.common.data :as d]
   [app.common.logging :as l]
   [app.common.transit :as t]
-   [app.db :as-alias db]
-   [app.http.access-token :as actoken]
-   [app.http.assets :as-alias assets]
-   [app.http.awsns :as-alias awsns]
-   [app.http.debug :as-alias debug]
+   [app.http.doc :as doc]
   [app.http.errors :as errors]
-   [app.http.middleware :as mw]
-   [app.http.session :as session]
-   [app.http.websocket :as-alias ws]
+   [app.http.middleware :as middleware]
   [app.metrics :as mtx]
-   [app.rpc :as-alias rpc]
-   [app.rpc.doc :as-alias rpc.doc]
   [app.worker :as wrk]
   [clojure.spec.alpha :as s]
   [integrant.core :as ig]
@@ -46,53 +37,45 @@
 (s/def ::max-body-size integer?)
 (s/def ::max-multipart-body-size integer?)
 (s/def ::io-threads integer?)
+(s/def ::worker-threads integer?)

 (defmethod ig/prep-key ::server
  [_ cfg]
-  (merge {::port 6060
-          ::host "0.0.0.0"
-          ::max-body-size (* 1024 1024 30)             ; 30 MiB
-          ::max-multipart-body-size (* 1024 1024 120)} ; 120 MiB
+  (merge {:name "http"
+          :port 6060
+          :host "0.0.0.0"
+          :max-body-size (* 1024 1024 30)             ; 30 MiB
+          :max-multipart-body-size (* 1024 1024 120)} ; 120 MiB
         (d/without-nils cfg)))

 (defmethod ig/pre-init-spec ::server [_]
-  (s/keys :req [::port ::host]
-          :opt [::max-body-size
-                ::max-multipart-body-size
-                ::router
-                ::handler
-                ::io-threads
-                ::wrk/executor]))
+  (s/and
+   (s/keys :req-un [::port ::host ::name ::max-body-size ::max-multipart-body-size]
+           :opt-un [::router ::handler ::io-threads ::worker-threads ::wrk/executor])
+   (fn [cfg]
+     (or (contains? cfg :router)
+         (contains? cfg :handler)))))

 (defmethod ig/init-key ::server
-  [_ {:keys [::handler ::router ::host ::port] :as cfg}]
-  (l/info :hint "starting http server" :port port :host host)
+  [_ {:keys [handler router port name host] :as cfg}]
+  (l/info :hint "starting http server" :port port :host host :name name)
  (let [options {:http/port port
                 :http/host host
-                 :http/max-body-size (::max-body-size cfg)
-                 :http/max-multipart-body-size (::max-multipart-body-size cfg)
-                 :xnio/io-threads (::io-threads cfg)
-                 :xnio/dispatch (::wrk/executor cfg)
+                 :http/max-body-size (:max-body-size cfg)
+                 :http/max-multipart-body-size (:max-multipart-body-size cfg)
+                 :xnio/io-threads (:io-threads cfg)
+                 :xnio/worker-threads (:worker-threads cfg)
+                 :xnio/dispatch (:executor cfg)
                 :ring/async true}
-
-        handler (cond
-                  (some? router)
+        handler (if (some? router)
                  (wrap-router router)
-
-                  (some? handler)
-                  handler
-
-                  :else
-                  (throw (UnsupportedOperationException. "handler or router are required")))
-
-        options (d/without-nils options)
-        server  (yt/server handler options)]
-
-    (assoc cfg ::server (yt/start! server))))
+                  handler)
+        server  (yt/server handler (d/without-nils options))]
+    (assoc cfg :server (yt/start! server))))

 (defmethod ig/halt-key! ::server
-  [_ {:keys [::server ::port] :as cfg}]
-  (l/info :msg "stopping http server" :port port)
+  [_ {:keys [server name port] :as cfg}]
+  (l/info :msg "stoping http server" :name name :port port)
  (yt/stop! server))

 (defn- not-found-handler
@@ -106,7 +89,9 @@
              (let [params  (:path-params match)
                    result  (:result match)
                    handler (or (:handler result) not-found-handler)
-                    request (assoc request :path-params params)]
+                    request (-> request
+                                (assoc :path-params params)
+                                (update :params merge params))]
                (handler request respond raise))
              (not-found-handler request respond raise)))

@@ -128,41 +113,70 @@
 ;; HTTP ROUTER
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+(s/def ::rpc map?)
+(s/def ::oauth map?)
+(s/def ::storage map?)
+(s/def ::assets map?)
+(s/def ::feedback fn?)
+(s/def ::ws fn?)
+(s/def ::audit-handler fn?)
+(s/def ::debug map?)
+(s/def ::awsns-handler fn?)
+(s/def ::session map?)
+
 (defmethod ig/pre-init-spec ::router [_]
-  (s/keys :req [::session/manager
-                ::actoken/manager
-                ::ws/routes
-                ::rpc/routes
-                ::rpc.doc/routes
-                ::oidc/routes
-                ::assets/routes
-                ::debug/routes
-                ::db/pool
-                ::mtx/routes
-                ::awsns/routes]))
+  (s/keys :req-un [::rpc ::mtx/metrics ::ws ::oauth ::storage ::assets
+                   ::session ::feedback ::awsns-handler ::debug ::audit-handler]))

 (defmethod ig/init-key ::router
-  [_ cfg]
+  [_ {:keys [ws session rpc oauth metrics assets feedback debug] :as cfg}]
  (rr/router
-   [["" {:middleware [[mw/server-timing]
-                      [mw/format-response]
-                      [mw/params]
-                      [mw/parse-request]
-                      [session/soft-auth cfg]
-                      [actoken/soft-auth cfg]
-                      [mw/errors errors/handle]
-                      [mw/restrict-methods]]}
+   [["" {:middleware [[middleware/server-timing]
+                      [middleware/format-response]
+                      [middleware/params]
+                      [middleware/parse-request]
+                      [middleware/errors errors/handle]
+                      [middleware/restrict-methods]]}
+     ["/metrics" {:handler (:handler metrics)}]
+     ["/assets" {:middleware [(:middleware session)]}
+      ["/by-id/:id" {:handler (:objects-handler assets)}]
+      ["/by-file-media-id/:id" {:handler (:file-objects-handler assets)}]
+      ["/by-file-media-id/:id/thumbnail" {:handler (:file-thumbnails-handler assets)}]]

-     (::mtx/routes cfg)
-     (::assets/routes cfg)
-     (::debug/routes cfg)
+     ["/dbg" {:middleware [(:middleware session)]}
+      ["" {:handler (:index debug)}]
+      ["/changelog" {:handler (:changelog debug)}]
+      ["/error-by-id/:id" {:handler (:retrieve-error debug)}]
+      ["/error/:id" {:handler (:retrieve-error debug)}]
+      ["/error" {:handler (:retrieve-error-list debug)}]
+      ["/file/data" {:handler (:file-data debug)}]
+      ["/file/changes" {:handler (:retrieve-file-changes debug)}]]

     ["/webhooks"
-      (::awsns/routes cfg)]
+      ["/sns" {:handler (:awsns-handler cfg)
+               :allowed-methods #{:post}}]]

-     (::ws/routes cfg)
+     ["/ws/notifications" {:middleware [(:middleware session)]
+                           :handler ws
+                           :allowed-methods #{:get}}]

-     ["/api" {:middleware [[mw/cors]]}
-      (::oidc/routes cfg)
-      (::rpc.doc/routes cfg)
-      (::rpc/routes cfg)]]]))
+     ["/api" {:middleware [[middleware/cors]
+                           (:middleware session)]}
+      ["/health" {:handler (:health-check debug)}]
+      ["/_doc" {:handler (doc/handler rpc)
+                :allowed-methods #{:get}}]
+      ["/feedback" {:handler feedback
+                    :allowed-methods #{:post}}]
+
+      ["/auth/oauth/:provider" {:handler (:handler oauth)
+                                :allowed-methods #{:post}}]
+      ["/auth/oauth/:provider/callback" {:handler (:callback-handler oauth)
+                                         :allowed-methods #{:get}}]
+
+      ["/audit/events" {:handler (:audit-handler cfg)
+                        :allowed-methods #{:post}}]
+
+      ["/rpc"
+       ["/query/:type" {:handler (:query-handler rpc)}]
+       ["/mutation/:type" {:handler (:mutation-handler rpc)
+                           :allowed-methods #{:post}}]]]]]))
--- a/backend/src/app/http/access_token.clj
+++ b/backend/src/app/http/access_token.clj
@@ -1,96 +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.http.access-token
-  (:require
-   [app.common.logging :as l]
-   [app.common.spec :as us]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.main :as-alias main]
-   [app.tokens :as tokens]
-   [app.worker :as-alias wrk]
-   [clojure.spec.alpha :as s]
-   [integrant.core :as ig]
-   [promesa.core :as p]
-   [promesa.exec :as px]
-   [yetti.request :as yrq]))
-
-
-(s/def ::manager
-  (s/keys :req [::db/pool ::wrk/executor ::main/props]))
-
-(defmethod ig/pre-init-spec ::manager [_] ::manager)
-(defmethod ig/init-key ::manager [_ cfg] cfg)
-(defmethod ig/halt-key! ::manager [_ _])
-
-(def header-re #"^Token\s+(.*)")
-
-(defn- get-token
-  [request]
-  (some->> (yrq/get-header request "authorization")
-           (re-matches header-re)
-           (second)))
-
-(defn- decode-token
-  [props token]
-  (when token
-    (tokens/verify props {:token token :iss "access-token"})))
-
-(defn- get-token-perms
-  [pool token-id]
-  (when-not (db/read-only? pool)
-    (when-let [token (db/get* pool :access-token {:id token-id} {:columns [:perms]})]
-      (some-> (:perms token)
-              (db/decode-pgarray #{})))))
-
-(defn- wrap-soft-auth
-  [handler {:keys [::manager]}]
-  (us/assert! ::manager manager)
-
-  (let [{:keys [::wrk/executor ::main/props]} manager]
-    (fn [request respond raise]
-      (let [token (get-token request)]
-        (->> (px/submit! executor (partial decode-token props token))
-             (p/fnly (fn [claims cause]
-                       (when cause
-                         (l/trace :hint "exception on decoding malformed token" :cause cause))
-                       (let [request (cond-> request
-                                       (map? claims)
-                                       (assoc ::id (:tid claims)))]
-                         (handler request respond raise)))))))))
-
-(defn- wrap-authz
-  [handler {:keys [::manager]}]
-  (us/assert! ::manager manager)
-  (let [{:keys [::wrk/executor ::db/pool]} manager]
-    (fn [request respond raise]
-      (if-let [token-id (::id request)]
-        (->> (px/submit! executor (partial get-token-perms pool token-id))
-             (p/fnly (fn [perms cause]
-                       (cond
-                         (some? cause)
-                         (raise cause)
-
-                         (nil? perms)
-                         (handler request respond raise)
-
-                         :else
-                         (let [request (assoc request ::perms perms)]
-                           (handler request respond raise))))))
-        (handler request respond raise)))))
-
-(def soft-auth
-  {:name ::soft-auth
-   :compile (fn [& _]
-              (when (contains? cf/flags :access-tokens)
-                wrap-soft-auth))})
-
-(def authz
-  {:name ::authz
-   :compile (fn [& _]
-              (when (contains? cf/flags :access-tokens)
-                wrap-authz))})
--- a/backend/src/app/http/assets.clj
+++ b/backend/src/app/http/assets.clj
@@ -2,22 +2,23 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.assets
  "Assets related handlers."
  (:require
-   [app.common.data :as d]
   [app.common.exceptions :as ex]
   [app.common.spec :as us]
   [app.common.uri :as u]
   [app.db :as db]
+   [app.metrics :as mtx]
   [app.storage :as sto]
   [app.util.time :as dt]
   [app.worker :as wrk]
   [clojure.spec.alpha :as s]
   [integrant.core :as ig]
   [promesa.core :as p]
+   [promesa.exec :as px]
   [yetti.response :as yrs]))

 (def ^:private cache-max-age
@@ -26,100 +27,111 @@
 (def ^:private signature-max-age
  (dt/duration {:hours 24 :minutes 15}))

-(defn get-id
-  [{:keys [path-params]}]
-  (if-let [id (some-> path-params :id d/parse-uuid)]
-    (p/resolved id)
-    (p/rejected (ex/error :type :not-found
-                          :hunt "object not found"))))
+(defn coerce-id
+  [id]
+  (let [res (us/uuid-conformer id)]
+    (when-not (uuid? res)
+      (ex/raise :type :not-found
+                :hint "object not found"))
+    res))

 (defn- get-file-media-object
-  [pool id]
-  (db/get pool :file-media-object {:id id}))
-
-(defn- serve-object-from-s3
-  [{:keys [::sto/storage] :as cfg} obj]
-  (let [mdata (meta obj)]
-    (->> (sto/get-object-url storage obj {:max-age signature-max-age})
-         (p/fmap (fn [{:keys [host port] :as url}]
-                   (let [headers {"location" (str url)
-                                  "x-host"   (cond-> host port (str ":" port))
-                                  "x-mtype"  (:content-type mdata)
-                                  "cache-control" (str "max-age=" (inst-ms cache-max-age))}]
-                     (yrs/response
-                      :status  307
-                      :headers headers)))))))
-
-(defn- serve-object-from-fs
-  [{:keys [::path]} obj]
-  (let [purl    (u/join (u/uri path)
-                        (sto/object->relative-path obj))
-        mdata   (meta obj)
-        headers {"x-accel-redirect" (:path purl)
-                 "content-type" (:content-type mdata)
-                 "cache-control" (str "max-age=" (inst-ms cache-max-age))}]
-    (p/resolved
-     (yrs/response :status 204 :headers headers))))
+  [{:keys [pool executor] :as storage} id]
+  (px/with-dispatch executor
+    (let [id   (coerce-id id)
+          mobj (db/exec-one! pool ["select * from file_media_object where id=?" id])]
+      (when-not mobj
+        (ex/raise :type :not-found
+                  :hint "object does not found"))
+      mobj)))

 (defn- serve-object
  "Helper function that returns the appropriate response depending on
  the storage object backend type."
-  [{: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))))
+  [{:keys [storage] :as cfg} obj]
+  (let [mdata   (meta obj)
+        backend (sto/resolve-backend storage (:backend obj))]
+    (case (:type backend)
+      :db
+      (p/let [body (sto/get-object-bytes storage obj)]
+        (yrs/response :status  200
+                      :body    body
+                      :headers {"content-type" (:content-type mdata)
+                                "cache-control" (str "max-age=" (inst-ms cache-max-age))}))
+
+      :s3
+      (p/let [{:keys [host port] :as url} (sto/get-object-url storage obj {:max-age signature-max-age})]
+        (yrs/response :status  307
+                      :headers {"location" (str url)
+                                "x-host"   (cond-> host port (str ":" port))
+                                "cache-control" (str "max-age=" (inst-ms cache-max-age))}))
+
+      :fs
+      (p/let [purl (u/uri (:assets-path cfg))
+              purl (u/join purl (sto/object->relative-path obj))]
+        (yrs/response :status  204
+                      :headers {"x-accel-redirect" (:path purl)
+                                "content-type" (:content-type mdata)
+                                "cache-control" (str "max-age=" (inst-ms cache-max-age))})))))

 (defn objects-handler
  "Handler that servers storage objects by id."
-  [{:keys [::sto/storage ::wrk/executor] :as cfg} request respond raise]
-  (->> (get-id request)
-       (p/mcat executor (fn [id] (sto/get-object storage id)))
-       (p/mcat executor (fn [obj]
-                          (if (some? obj)
-                            (serve-object cfg obj)
-                            (p/resolved (yrs/response 404)))))
-       (p/fnly executor (fn [result cause]
-                          (if cause (raise cause) (respond result))))))
+  [{:keys [storage executor] :as cfg} request respond raise]
+  (-> (px/with-dispatch executor
+        (p/let [id  (get-in request [:path-params :id])
+                id  (coerce-id id)
+                obj (sto/get-object storage id)]
+          (if obj
+            (serve-object cfg obj)
+            (yrs/response 404))))
+
+      (p/bind p/wrap)
+      (p/then' respond)
+      (p/catch raise)))

 (defn- generic-handler
  "A generic handler helper/common code for file-media based handlers."
-  [{:keys [::sto/storage ::wrk/executor] :as cfg} request kf]
-  (let [pool (::db/pool storage)]
-    (->> (get-id request)
-         (p/fmap executor (fn [id] (get-file-media-object pool id)))
-         (p/mcat executor (fn [mobj] (sto/get-object storage (kf mobj))))
-         (p/mcat executor (fn [sobj]
-                            (if sobj
-                              (serve-object cfg sobj)
-                              (p/resolved (yrs/response 404))))))))
+  [{:keys [storage] :as cfg} request kf]
+  (p/let [id   (get-in request [:path-params :id])
+          mobj (get-file-media-object storage id)
+          obj  (sto/get-object storage (kf mobj))]
+    (if obj
+      (serve-object cfg obj)
+      (yrs/response 404))))

 (defn file-objects-handler
  "Handler that serves storage objects by file media id."
  [cfg request respond raise]
-  (->> (generic-handler cfg request :media-id)
-       (p/fnly (fn [result cause]
-                 (if cause (raise cause) (respond result))))))
+  (-> (generic-handler cfg request :media-id)
+      (p/then respond)
+      (p/catch raise)))

 (defn file-thumbnails-handler
  "Handler that serves storage objects by thumbnail-id and quick
  fallback to file-media-id if no thumbnail is available."
  [cfg request respond raise]
-  (->> (generic-handler cfg request #(or (:thumbnail-id %) (:media-id %)))
-       (p/fnly (fn [result cause]
-                 (if cause (raise cause) (respond result))))))
+  (-> (generic-handler cfg request #(or (:thumbnail-id %) (:media-id %)))
+      (p/then respond)
+      (p/catch raise)))

 ;; --- Initialization

-(s/def ::path ::us/string)
-(s/def ::routes vector?)
+(s/def ::storage some?)
+(s/def ::assets-path ::us/string)
+(s/def ::cache-max-age ::dt/duration)
+(s/def ::signature-max-age ::dt/duration)

-(defmethod ig/pre-init-spec ::routes [_]
-  (s/keys :req [::sto/storage ::wrk/executor  ::path]))
+(defmethod ig/pre-init-spec ::handlers [_]
+  (s/keys :req-un [::storage
+                   ::wrk/executor
+                   ::mtx/metrics
+                   ::assets-path
+                   ::cache-max-age
+                   ::signature-max-age]))

-(defmethod ig/init-key ::routes
+(defmethod ig/init-key ::handlers
  [_ cfg]
-  ["/assets"
-   ["/by-id/:id" {:handler (partial objects-handler cfg)}]
-   ["/by-file-media-id/:id" {:handler (partial file-objects-handler cfg)}]
-   ["/by-file-media-id/:id/thumbnail" {:handler (partial file-thumbnails-handler cfg)}]])
+  {:objects-handler (partial objects-handler cfg)
+   :file-objects-handler (partial file-objects-handler cfg)
+   :file-thumbnails-handler (partial file-thumbnails-handler cfg)})
+
--- a/backend/src/app/http/awsns.clj
+++ b/backend/src/app/http/awsns.clj
@@ -2,7 +2,7 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.awsns
  "AWS SNS webhook handler for bounces."
@@ -11,16 +11,11 @@
   [app.common.logging :as l]
   [app.db :as db]
   [app.db.sql :as sql]
-   [app.http.client :as http]
-   [app.main :as-alias main]
-   [app.tokens :as tokens]
-   [app.worker :as-alias wrk]
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
   [integrant.core :as ig]
   [jsonista.core :as j]
   [promesa.exec :as px]
-   [yetti.request :as yrq]
   [yetti.response :as yrs]))

 (declare parse-json)
@@ -28,23 +23,20 @@
 (declare parse-notification)
 (declare process-report)

-(defmethod ig/pre-init-spec ::routes [_]
-  (s/keys :req [::http/client
-                ::main/props
-                ::db/pool
-                ::wrk/executor]))
+(s/def ::http-client fn?)

-(defmethod ig/init-key ::routes
-  [_ {:keys [::wrk/executor] :as cfg}]
-  (letfn [(handler [request respond _]
-            (let [data (-> request yrq/body slurp)]
-              (px/run! executor #(handle-request cfg data)))
-            (respond (yrs/response 200)))]
-    ["/sns" {:handler handler
-             :allowed-methods #{:post}}]))
+(defmethod ig/pre-init-spec ::handler [_]
+  (s/keys :req-un [::db/pool ::http-client]))
+
+(defmethod ig/init-key ::handler
+  [_ {:keys [executor] :as cfg}]
+  (fn [request respond _]
+    (let [data (slurp (:body request))]
+      (px/run! executor #(handle-request cfg data))
+      (respond (yrs/response 200)))))

 (defn handle-request
-  [cfg data]
+  [{:keys [http-client] :as cfg} data]
  (try
    (let [body  (parse-json data)
          mtype (get body "Type")]
@@ -53,7 +45,7 @@
        (let [surl   (get body "SubscribeURL")
              stopic (get body "TopicArn")]
          (l/info :action "subscription received" :topic stopic :url surl)
-          (http/req! cfg {:uri surl :method :post :timeout 10000} {:sync? true}))
+          (http-client {:uri surl :method :post :timeout 10000} {:sync? true}))

        (= mtype "Notification")
        (when-let [message (parse-json (get body "Message"))]
@@ -104,10 +96,10 @@
          (get mail "headers")))

 (defn- extract-identity
-  [cfg headers]
+  [{:keys [tokens] :as cfg} headers]
  (let [tdata (get headers "x-penpot-data")]
    (when-not (str/empty? tdata)
-      (let [result (tokens/verify (::main/props cfg) {:token tdata :iss :profile-identity})]
+      (let [result (tokens :verify {:token tdata :iss :profile-identity})]
        (:profile-id result)))))

 (defn- parse-notification
@@ -140,7 +132,7 @@
   (j/read-value v)))

 (defn- register-bounce-for-profile
-  [{:keys [::db/pool]} {:keys [type kind profile-id] :as report}]
+  [{:keys [pool]} {:keys [type kind profile-id] :as report}]
  (when (= kind "permanent")
    (db/with-atomic [conn pool]
      (db/insert! conn :profile-complaint-report
@@ -169,7 +161,7 @@
                      {:id profile-id}))))))

 (defn- register-complaint-for-profile
-  [{:keys [::db/pool]} {:keys [type profile-id] :as report}]
+  [{:keys [pool]} {:keys [type profile-id] :as report}]
  (db/with-atomic [conn pool]
    (db/insert! conn :profile-complaint-report
                {:profile-id profile-id
--- a/backend/src/app/http/client.clj
+++ b/backend/src/app/http/client.clj
@@ -2,50 +2,29 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.client
  "Http client abstraction layer."
  (:require
-   [app.common.spec :as us]
   [app.worker :as wrk]
   [clojure.spec.alpha :as s]
   [integrant.core :as ig]
-   [java-http-clj.core :as http]
-   [promesa.core :as p])
-  (:import
-   java.net.http.HttpClient))
+   [java-http-clj.core :as http]))

-(s/def ::client #(instance? HttpClient %))
-(s/def ::client-holder
-  (s/keys :req [::client]))
+(defmethod ig/pre-init-spec :app.http/client [_]
+  (s/keys :req-un [::wrk/executor]))

-(defmethod ig/pre-init-spec ::client [_]
-  (s/keys :req [::wrk/executor]))
-
-(defmethod ig/init-key ::client
-  [_ {:keys [::wrk/executor] :as cfg}]
-  (http/build-client {:executor executor
-                      :connect-timeout 30000 ;; 10s
-                      :follow-redirects :always}))
-
-(defn send!
-  ([client req] (send! client req {}))
-  ([client req {:keys [response-type sync?] :or {response-type :string sync? false}}]
-   (us/assert! ::client client)
-   (if sync?
-     (http/send req {:client client :as response-type})
-     (try
-       (http/send-async req {:client client :as response-type})
-       (catch Throwable cause
-         (p/rejected cause))))))
-
-(defn req!
-  "A convencience toplevel function for gradual migration to a new API
-  convention."
-  ([{:keys [::client]} request]
-   (us/assert! ::client client)
-   (send! client request {}))
-  ([{:keys [::client]} request options]
-   (us/assert! ::client client)
-   (send! client request options)))
+(defmethod ig/init-key :app.http/client
+  [_ {:keys [executor] :as cfg}]
+  (let [client (http/build-client {:executor executor
+                                   :connect-timeout 30000 ;; 10s
+                                   :follow-redirects :always})]
+    (with-meta
+      (fn send
+        ([req] (send req {}))
+        ([req {:keys [response-type sync?] :or {response-type :string sync? false}}]
+         (if sync?
+           (http/send req {:client client :as response-type})
+           (http/send-async req {:client client :as response-type}))))
+      {::client client})))
--- a/backend/src/app/http/debug.clj
+++ b/backend/src/app/http/debug.clj
@@ -2,78 +2,56 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.debug
-  (:refer-clojure :exclude [error-handler])
  (:require
+   [app.common.data :as d]
   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.pprint :as pp]
+   [app.common.spec :as us]
   [app.common.uuid :as uuid]
   [app.config :as cf]
   [app.db :as db]
-   [app.http.middleware :as mw]
-   [app.http.session :as session]
-   [app.rpc.commands.binfile :as binf]
-   [app.rpc.commands.files-create :refer [create-file]]
-   [app.rpc.commands.profile :as profile]
-   [app.storage :as-alias sto]
+   [app.db.sql :as sql]
+   [app.rpc.mutations.files :as m.files]
+   [app.rpc.queries.profile :as profile]
   [app.util.blob :as blob]
   [app.util.template :as tmpl]
   [app.util.time :as dt]
   [app.worker :as wrk]
+   [clojure.java.io :as io]
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
-   [datoteka.io :as io]
+   [datoteka.core :as fs]
   [emoji.core :as emj]
+   [fipp.edn :as fpp]
   [integrant.core :as ig]
   [markdown.core :as md]
   [markdown.transformers :as mdt]
+   [promesa.core :as p]
+   [promesa.exec :as px]
   [yetti.request :as yrq]
   [yetti.response :as yrs]))

 ;; (selmer.parser/cache-off!)

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
 (defn authorized?
-  [pool {:keys [::session/profile-id]}]
+  [pool {:keys [profile-id]}]
  (or (= "devenv" (cf/get :host))
-      (let [profile (ex/ignoring (profile/get-profile pool profile-id))
+      (let [profile (ex/ignoring (profile/retrieve-profile-data pool profile-id))
            admins  (or (cf/get :admins) #{})]
        (contains? admins (:email profile)))))

-(defn prepare-response
-  [body]
-  (let [headers {"content-type" "application/transit+json"}]
-    (yrs/response :status 200 :body body :headers headers)))
-
-(defn prepare-download-response
-  [body filename]
-  (let [headers {"content-disposition" (str "attachment; filename=" filename)
-                 "content-type" "application/octet-stream"}]
-    (yrs/response :status 200 :body body :headers headers)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; INDEX
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn index-handler
-  [{:keys [::db/pool]} request]
+(defn index
+  [{:keys [pool]} request]
  (when-not (authorized? pool request)
    (ex/raise :type :authentication
              :code :only-admins-allowed))
  (yrs/response :status  200
                :headers {"content-type" "text/html"}
-                :body    (-> (io/resource "app/templates/debug.tmpl")
+                :body    (-> (io/resource "templates/debug.tmpl")
                             (tmpl/render {}))))

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; FILE CHANGES
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 (def sql:retrieve-range-of-changes
  "select revn, changes from file_change where file_id=? and revn >= ? and revn <= ? order by revn")
@@ -81,16 +59,28 @@
 (def sql:retrieve-single-change
  "select revn, changes, data from file_change where file_id=? and revn = ?")

+(defn prepare-response
+  [{:keys [params] :as request} body filename]
+  (when-not body
+    (ex/raise :type :not-found
+              :code :enpty-data
+              :hint "empty response"))
+
+  (cond-> (yrs/response :status  200
+                        :body    body
+                        :headers {"content-type" "application/transit+json"})
+    (contains? params :download)
+    (update :headers assoc "content-disposition" (str "attachment; filename=" filename))))
+
 (defn- retrieve-file-data
-  [{:keys [::db/pool]} {:keys [params ::session/profile-id] :as request}]
+  [{:keys [pool]} {:keys [params] :as request}]
  (when-not (authorized? pool request)
    (ex/raise :type :authentication
              :code :only-admins-allowed))

-  (let [file-id  (some-> params :file-id parse-uuid)
-        revn     (some-> params :revn parse-long)
+  (let [file-id  (some-> (get-in request [:params :file-id]) uuid/uuid)
+        revn     (some-> (get-in request [:params :revn]) d/parse-integer)
        filename (str file-id)]
-
    (when-not file-id
      (ex/raise :type :validation
                :code :missing-arguments))
@@ -98,65 +88,35 @@
    (let [data (if (integer? revn)
                 (some-> (db/exec-one! pool [sql:retrieve-single-change file-id revn]) :data)
                 (some-> (db/get-by-id pool :file file-id) :data))]
-
-      (when-not data
-        (ex/raise :type :not-found
-                  :code :enpty-data
-                  :hint "empty response"))
-      (cond
-        (contains? params :download)
-        (prepare-download-response data filename)
-
-        (contains? params :clone)
-        (let [profile    (profile/get-profile pool profile-id)
-              project-id (:default-project-id profile)
-              data       (blob/decode data)]
-          (create-file pool {:id (uuid/next)
-                             :name (str "Cloned file: " filename)
-                             :project-id project-id
-                             :profile-id profile-id
-                             :data data})
-          (yrs/response 201 "OK CREATED"))
-
-        :else
-        (prepare-response (blob/decode data))))))
-
-(defn- is-file-exists?
-  [pool id]
-  (let [sql "select exists (select 1 from file where id=?) as exists;"]
-    (-> (db/exec-one! pool [sql id]) :exists)))
+      (if (contains? params :download)
+        (-> (prepare-response request data filename)
+            (update :headers assoc "content-type" "application/octet-stream"))
+        (prepare-response request (some-> data blob/decode) filename)))))

 (defn- upload-file-data
-  [{:keys [::db/pool]} {:keys [::session/profile-id params] :as request}]
-  (let [profile    (profile/get-profile pool profile-id)
-        project-id (:default-project-id profile)
-        data       (some-> params :file :path io/read-as-bytes blob/decode)]
+  [{:keys [pool]} {:keys [profile-id params] :as request}]
+  (let [project-id (some-> (profile/retrieve-additional-data pool profile-id) :default-project-id)
+        data       (some-> params :file :path fs/slurp-bytes blob/decode)]

    (if (and data project-id)
-      (let [fname      (str "Imported file *: " (dt/now))
-            overwrite? (contains? params :overwrite?)
-            file-id    (or (and overwrite? (ex/ignoring (-> params :file :filename parse-uuid)))
-                           (uuid/next))]
-
-        (if (and overwrite? file-id
-                 (is-file-exists? pool file-id))
-          (do
-            (db/update! pool :file
-                        {:data (blob/encode data)}
-                        {:id file-id})
-            (yrs/response 200 "OK UPDATED"))
-
-          (do
-            (create-file pool {:id file-id
-                               :name fname
-                               :project-id project-id
-                               :profile-id profile-id
-                               :data data})
-            (yrs/response 201 "OK CREATED"))))
-
+      (let [fname (str "imported-file-" (dt/now))
+            file-id (try
+                      (uuid/uuid (-> params :file :filename))
+                      (catch Exception _ (uuid/next)))
+            file (db/exec-one! pool (sql/select :file {:id file-id}))]
+        (if file
+          (db/update! pool :file
+                      {:data (blob/encode data)}
+                      {:id file-id})
+          (m.files/create-file pool {:id file-id
+                                     :name fname
+                                     :project-id project-id
+                                     :profile-id profile-id
+                                     :data data}))
+        (yrs/response 200 "OK"))
      (yrs/response 500 "ERROR"))))

-(defn file-data-handler
+(defn file-data
  [cfg request]
  (case (yrq/method request)
    :get (retrieve-file-data cfg request)
@@ -164,204 +124,109 @@
    (ex/raise :type :http
              :code :method-not-found)))

-(defn file-changes-handler
-  [{:keys [::db/pool]} {:keys [params] :as request}]
+(defn retrieve-file-changes
+  [{:keys [pool]} request]
  (when-not (authorized? pool request)
    (ex/raise :type :authentication
              :code :only-admins-allowed))

-  (letfn [(retrieve-changes [file-id revn]
-            (if (str/includes? revn ":")
-              (let [[start end] (->> (str/split revn #":")
-                                     (map str/trim)
-                                     (map parse-long))]
-                (some->> (db/exec! pool [sql:retrieve-range-of-changes file-id start end])
-                         (map :changes)
-                         (map blob/decode)
-                         (mapcat identity)
-                         (vec)))
+  (let [file-id  (some-> (get-in request [:params :id]) uuid/uuid)
+        revn     (or (get-in request [:params :revn]) "latest")
+        filename (str file-id)]

-              (if-let [revn (parse-long revn)]
-                (let [item (db/exec-one! pool [sql:retrieve-single-change file-id revn])]
-                  (some-> item :changes blob/decode vec))
-                (ex/raise :type :validation :code :invalid-arguments))))]
+    (when (or (not file-id) (not revn))
+      (ex/raise :type :validation
+                :code :invalid-arguments
+                :hint "missing arguments"))

-    (let [file-id  (some-> params :id parse-uuid)
-          revn     (or (some-> params :revn parse-long) "latest")
-          filename (str file-id)]
+    (cond
+      (d/num-string? revn)
+      (let [item (db/exec-one! pool [sql:retrieve-single-change file-id (d/parse-integer revn)])]
+        (prepare-response request (some-> item :changes blob/decode vec) filename))

-      (when (or (not file-id) (not revn))
-        (ex/raise :type :validation
-                  :code :invalid-arguments
-                  :hint "missing arguments"))
+      (str/includes? revn ":")
+      (let [[start end] (->> (str/split revn #":")
+                             (map str/trim)
+                             (map d/parse-integer))
+            items       (db/exec! pool [sql:retrieve-range-of-changes file-id start end])]
+        (prepare-response request
+                          (some->> items
+                                   (map :changes)
+                                   (map blob/decode)
+                                   (mapcat identity)
+                                   (vec))
+                          filename))
+      :else
+      (ex/raise :type :validation :code :invalid-arguments))))

-      (let [data (retrieve-changes file-id revn)]
-        (if (contains? params :download)
-          (prepare-download-response data filename)
-          (prepare-response data))))))

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; ERROR BROWSER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defn retrieve-error
+  [{:keys [pool]} request]
+  (letfn [(parse-id [request]
+            (let [id (get-in request [:path-params :id])
+                  id (us/uuid-conformer id)]
+              (when (uuid? id)
+                id)))

-(defn error-handler
-  [{:keys [::db/pool]} request]
-  (letfn [(get-report [{:keys [path-params]}]
+          (retrieve-report [id]
            (ex/ignoring
-             (let [report-id (some-> path-params :id parse-uuid)]
-               (some-> (db/get-by-id pool :server-error-report report-id)
-                       (update :content db/decode-transit-pgobject)))))
+             (some-> (db/get-by-id pool :server-error-report id) :content db/decode-transit-pgobject)))

-          (render-template-v1 [{:keys [content]}]
-            (let [context (dissoc content
-                                  :trace :cause :params :data :spec-problems :message
+          (render-template [report]
+            (let [context (dissoc report
+                                  :trace :cause :params :data :spec-problems
                                  :spec-explain :spec-value :error :explain :hint)
-                  params  {:context       (pp/pprint-str context :width 200)
-                           :hint          (:hint content)
-                           :spec-explain  (:spec-explain content)
-                           :spec-problems (:spec-problems content)
-                           :spec-value    (:spec-value content)
-                           :data          (:data content)
-                           :trace         (or (:trace content)
-                                              (some-> content :error :trace))
-                           :params        (:params content)}]
-              (-> (io/resource "app/templates/error-report.tmpl")
-                  (tmpl/render params))))
-
-          (render-template-v2 [{report :content}]
-            (-> (io/resource "app/templates/error-report.v2.tmpl")
-                (tmpl/render report)))
-
-          ]
+                  params  {:context (with-out-str
+                                      (fpp/pprint context {:width 200}))
+                           :hint    (:hint report)
+                           :spec-explain  (:spec-explain report)
+                           :spec-problems (:spec-problems report)
+                           :spec-value    (:spec-value report)
+                           :data          (:data report)
+                           :trace         (or (:trace report)
+                                              (some-> report :error :trace))
+                           :params        (:params report)}]
+              (-> (io/resource "templates/error-report.tmpl")
+                  (tmpl/render params))))]

    (when-not (authorized? pool request)
      (ex/raise :type :authentication
                :code :only-admins-allowed))

-    (if-let [report (get-report request)]
-      (let [result (if (= 1 (:version report))
-                     (render-template-v1 report)
-                     (render-template-v2 report))]
+    (let [result (some-> (parse-id request)
+                         (retrieve-report)
+                         (render-template))]
+      (if result
        (yrs/response :status 200
                      :body result
                      :headers {"content-type" "text/html; charset=utf-8"
-                                "x-robots-tag" "noindex"}))
-      (yrs/response 404 "not found"))))
+                                "x-robots-tag" "noindex"})
+        (yrs/response 404 "not found")))))

 (def sql:error-reports
-  "SELECT id, created_at,
-          content->>'~:hint' AS hint
-     FROM server_error_report
-    ORDER BY created_at DESC
-    LIMIT 100")
+  "select id, created_at from server_error_report order by created_at desc limit 100")

-(defn error-list-handler
-  [{:keys [::db/pool]} request]
+(defn retrieve-error-list
+  [{:keys [pool]} request]
  (when-not (authorized? pool request)
    (ex/raise :type :authentication
              :code :only-admins-allowed))
-  (let [items (->> (db/exec! pool [sql:error-reports])
-                   (map #(update % :created-at dt/format-instant :rfc1123)))]
+  (let [items (db/exec! pool [sql:error-reports])
+        items (map #(update % :created-at dt/format-instant :rfc1123) items)]
    (yrs/response :status 200
-                  :body (-> (io/resource "app/templates/error-list.tmpl")
+                  :body (-> (io/resource "templates/error-list.tmpl")
                            (tmpl/render {:items items}))
                  :headers {"content-type" "text/html; charset=utf-8"
                            "x-robots-tag" "noindex"})))

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; EXPORT/IMPORT
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn export-handler
-  [{:keys [::db/pool] :as cfg} {:keys [params ::session/profile-id] :as request}]
-
-  (let [file-ids (->> (:file-ids params)
-                      (remove empty?)
-                      (mapv parse-uuid))
-        libs?    (contains? params :includelibs)
-        clone?   (contains? params :clone)
-        embed?   (contains? params :embedassets)]
-
-    (when-not (seq file-ids)
-      (ex/raise :type :validation
-                :code :missing-arguments))
-
-    (let [path (-> cfg
-                   (assoc ::binf/file-ids file-ids)
-                   (assoc ::binf/embed-assets? embed?)
-                   (assoc ::binf/include-libraries? libs?)
-                   (binf/export-to-tmpfile!))]
-      (if clone?
-        (let [profile    (profile/get-profile pool profile-id)
-              project-id (:default-project-id profile)]
-          (binf/import!
-           (assoc cfg
-                  ::binf/input path
-                  ::binf/overwrite? false
-                  ::binf/ignore-index-errors? true
-                  ::binf/profile-id profile-id
-                  ::binf/project-id project-id))
-
-          (yrs/response
-           :status  200
-           :headers {"content-type" "text/plain"}
-           :body    "OK CLONED"))
-
-        (yrs/response
-         :status  200
-         :headers {"content-type" "application/octet-stream"
-                   "content-disposition" (str "attachmen; filename=" (first file-ids) ".penpot")}
-         :body    (io/input-stream path))))))
-
-
-(defn import-handler
-  [{:keys [::db/pool] :as cfg} {:keys [params ::session/profile-id] :as request}]
-  (when-not (contains? params :file)
-    (ex/raise :type :validation
-              :code :missing-upload-file
-              :hint "missing upload file"))
-
-  (let [profile    (profile/get-profile pool profile-id)
-        project-id (:default-project-id profile)
-        overwrite? (contains? params :overwrite)
-        migrate?   (contains? params :migrate)
-        ignore-index-errors? (contains? params :ignore-index-errors)]
-
-    (when-not project-id
-      (ex/raise :type :validation
-                :code :missing-project
-                :hint "project not found"))
-
-    (binf/import!
-     (assoc cfg
-            ::binf/input (-> params :file :path)
-            ::binf/overwrite? overwrite?
-            ::binf/migrate? migrate?
-            ::binf/ignore-index-errors? ignore-index-errors?
-            ::binf/profile-id profile-id
-            ::binf/project-id project-id))
-
-    (yrs/response
-     :status  200
-     :headers {"content-type" "text/plain"}
-     :body    "OK")))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; OTHER SMALL VIEWS/HANDLERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn health-handler
+(defn health-check
  "Mainly a task that performs a health check."
-  [{:keys [::db/pool]} _]
-  (try
-    (db/exec-one! pool ["select count(*) as count from server_prop;"])
-    (yrs/response 200 "OK")
-    (catch Throwable cause
-      (l/warn :hint "unable to execute query on health handler"
-              :cause cause)
-      (yrs/response 503 "KO"))))
+  [{:keys [pool]} _]
+  (db/with-atomic [conn pool]
+    (db/exec-one! conn ["select count(*) as count from server_prop;"])
+    (yrs/response 200 "OK")))

-(defn changelog-handler
+(defn changelog
  [_ _]
  (letfn [(transform-emoji [text state]
            [(emj/emojify text) state])
@@ -373,42 +238,22 @@
                    :body (-> clog slurp md->html))
      (yrs/response :status 404 :body "NOT FOUND"))))

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; INIT
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defn- wrap-async
+  [{:keys [executor] :as cfg} f]
+  (fn [request respond raise]
+    (-> (px/submit! executor #(f cfg request))
+        (p/then respond)
+        (p/catch raise))))

-(def with-authorization
-  {:compile
-   (fn [& _]
-     (fn [handler pool]
-       (fn [request respond raise]
-         (if (authorized? pool request)
-           (handler request respond raise)
-           (raise (ex/error :type :authentication
-                            :code :only-admins-allowed))))))})
+(defmethod ig/pre-init-spec ::handlers [_]
+  (s/keys :req-un [::db/pool ::wrk/executor]))

-(defmethod ig/pre-init-spec ::routes [_]
-  (s/keys :req [::db/pool
-                ::wrk/executor
-                ::sto/storage
-                ::session/manager]))
-
-(defmethod ig/init-key ::routes
-  [_ {:keys [::db/pool ::wrk/executor] :as cfg}]
-  [["/readyz" {:middleware [[mw/with-dispatch executor]
-                            [mw/with-config cfg]]
-               :handler health-handler}]
-   ["/dbg" {:middleware [[session/authz cfg]
-                         [with-authorization pool]
-                         [mw/with-dispatch executor]
-                         [mw/with-config cfg]]}
-    ["" {:handler index-handler}]
-    ["/health" {:handler health-handler}]
-    ["/changelog" {:handler changelog-handler}]
-    ;; ["/error-by-id/:id" {:handler error-handler}]
-    ["/error/:id" {:handler error-handler}]
-    ["/error" {:handler error-list-handler}]
-    ["/file/export" {:handler export-handler}]
-    ["/file/import" {:handler import-handler}]
-    ["/file/data" {:handler file-data-handler}]
-    ["/file/changes" {:handler file-changes-handler}]]])
+(defmethod ig/init-key ::handlers
+  [_ cfg]
+  {:index (wrap-async cfg index)
+   :health-check (wrap-async cfg health-check)
+   :retrieve-file-changes (wrap-async cfg retrieve-file-changes)
+   :retrieve-error (wrap-async cfg retrieve-error)
+   :retrieve-error-list (wrap-async cfg retrieve-error-list)
+   :file-data (wrap-async cfg file-data)
+   :changelog (wrap-async cfg changelog)})
--- a/backend/src/app/http/doc.clj
+++ b/backend/src/app/http/doc.clj
@@ -0,0 +1,54 @@
+;; 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) UXBOX Labs SL
+
+(ns app.http.doc
+  "API autogenerated documentation."
+  (:require
+   [app.common.data :as d]
+   [app.config :as cf]
+   [app.util.services :as sv]
+   [app.util.template :as tmpl]
+   [clojure.java.io :as io]
+   [clojure.spec.alpha :as s]
+   [pretty-spec.core :as ps]
+   [yetti.response :as yrs]))
+
+(defn get-spec-str
+  [k]
+  (with-out-str
+    (ps/pprint (s/form k)
+               {:ns-aliases {"clojure.spec.alpha" "s"
+                             "clojure.core.specs.alpha" "score"
+                             "clojure.core" nil}})))
+
+(defn prepare-context
+  [rpc]
+  (letfn [(gen-doc [type [name f]]
+            (let [mdata (meta f)]
+              ;; (prn name mdata)
+              {:type (d/name type)
+               :name (d/name name)
+               :auth (:auth mdata true)
+               :docs (::sv/docs mdata)
+               :spec (get-spec-str (::sv/spec mdata))}))]
+    {:query-methods
+     (into []
+           (map (partial gen-doc :query))
+           (->> rpc :methods :query (sort-by first)))
+     :mutation-methods
+     (into []
+           (map (partial gen-doc :mutation))
+           (->> rpc :methods :mutation (sort-by first)))}))
+
+(defn handler
+  [rpc]
+  (let [context (prepare-context rpc)]
+    (if (contains? cf/flags :backend-api-doc)
+      (fn [_ respond _]
+        (respond (yrs/response 200 (-> (io/resource "api-doc.tmpl")
+                                       (tmpl/render context)))))
+      (fn [_ respond _]
+        (respond (yrs/response 404))))))
--- a/backend/src/app/http/errors.clj
+++ b/backend/src/app/http/errors.clj
@@ -2,41 +2,39 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.errors
  "A errors handling for the http server."
  (:require
   [app.common.exceptions :as ex]
   [app.common.logging :as l]
-   [app.http :as-alias http]
-   [app.http.access-token :as-alias actoken]
-   [app.http.session :as-alias session]
+   [app.common.spec :as us]
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
   [yetti.request :as yrq]
   [yetti.response :as yrs]))

+(def ^:dynamic *context* {})
+
 (defn- parse-client-ip
  [request]
  (or (some-> (yrq/get-header request "x-forwarded-for") (str/split ",") first)
      (yrq/get-header request "x-real-ip")
      (yrq/remote-addr request)))

-(defn request->context
-  "Extracts error report relevant context data from request."
+(defn get-context
  [request]
-  (let [claims (-> {}
-                   (into (::session/token-claims request))
-                   (into (::actoken/token-claims request)))]
-    {:path       (:path request)
-     :method     (:method request)
-     :params     (:params request)
-     :ip-addr    (parse-client-ip request)
-     :user-agent (yrq/get-header request "user-agent")
-     :profile-id (:uid claims)
-     :version    (or (yrq/get-header request "x-frontend-version")
-                     "unknown")}))
+  (merge
+   *context*
+   {:path          (:path request)
+    :method        (:method request)
+    :params        (:params request)
+    :ip-addr       (parse-client-ip request)
+    :profile-id    (:profile-id request)}
+   (let [headers (:headers request)]
+     {:user-agent (get headers "user-agent")
+      :frontend-version (get headers "x-frontend-version" "unknown")})))

 (defmulti handle-exception
  (fn [err & _rest]
@@ -48,25 +46,16 @@
  [err _]
  (yrs/response 401 (ex-data err)))

-(defmethod handle-exception :authorization
-  [err _]
-  (yrs/response 403 (ex-data err)))
-
 (defmethod handle-exception :restriction
  [err _]
  (yrs/response 400 (ex-data err)))

-(defmethod handle-exception :rate-limit
-  [err _]
-  (let [headers (-> err ex-data ::http/headers)]
-    (yrs/response :status 429 :body "" :headers headers)))
-
 (defmethod handle-exception :validation
  [err _]
  (let [{:keys [code] :as data} (ex-data err)]
    (cond
      (= code :spec-validation)
-      (let [explain (ex/explain data)]
+      (let [explain (us/pretty-explain data)]
        (yrs/response :status 400
                      :body   (-> data
                                  (dissoc ::s/problems ::s/value)
@@ -80,57 +69,44 @@

 (defmethod handle-exception :assertion
  [error request]
-  (let [edata   (ex-data error)
-        explain (ex/explain edata)]
-    (binding [l/*context* (request->context request)]
-      (l/error :hint "Assertion error" :message (ex-message error) :cause error)
-      (yrs/response :status 500
-                    :body   {:type :server-error
-                             :code :assertion
-                             :data (-> edata
-                                       (dissoc ::s/problems ::s/value ::s/spec)
-                                       (cond-> explain (assoc :explain explain)))}))))
+  (let [edata (ex-data error)
+        explain (us/pretty-explain edata)]
+    (l/error ::l/raw (ex-message error)
+             ::l/context (get-context request)
+             :cause error)
+    (yrs/response :status 500
+                  :body   {:type :server-error
+                           :code :assertion
+                           :data (-> edata
+                                     (dissoc ::s/problems ::s/value ::s/spec)
+                                     (cond-> explain (assoc :explain explain)))})))

 (defmethod handle-exception :not-found
  [err _]
  (yrs/response 404 (ex-data err)))

-(defmethod handle-exception :internal
-  [error request]
-  (let [{:keys [code] :as edata} (ex-data error)]
-    (cond
-      (= :concurrency-limit-reached code)
-      (yrs/response 429)
-
-      :else
-      (binding [l/*context* (request->context request)]
-        (l/error :hint "Internal error" :message (ex-message error) :cause error)
-        (yrs/response 500 {:type :server-error
-                           :code :unhandled
-                           :hint (ex-message error)
-                           :data edata})))))
-
 (defmethod handle-exception org.postgresql.util.PSQLException
  [error request]
  (let [state (.getSQLState ^java.sql.SQLException error)]
-    (binding [l/*context* (request->context request)]
-      (l/error :hint "PSQL error" :message (ex-message error) :cause error)
-      (cond
-        (= state "57014")
-        (yrs/response 504 {:type :server-error
-                           :code :statement-timeout
-                           :hint (ex-message error)})
+    (l/error ::l/raw (ex-message error)
+             ::l/context (get-context request)
+             :cause error)
+    (cond
+      (= state "57014")
+      (yrs/response 504 {:type :server-error
+                         :code :statement-timeout
+                         :hint (ex-message error)})

-        (= state "25P03")
-        (yrs/response 504 {:type :server-error
-                           :code :idle-in-transaction-timeout
-                           :hint (ex-message error)})
+      (= state "25P03")
+      (yrs/response 504 {:type :server-error
+                         :code :idle-in-transaction-timeout
+                         :hint (ex-message error)})

-        :else
-        (yrs/response 500 {:type :server-error
-                           :code :unexpected
-                           :hint (ex-message error)
-                           :state state})))))
+      :else
+      (yrs/response 500 {:type :server-error
+                         :code :unexpected
+                         :hint (ex-message error)
+                         :state state}))))

 (defmethod handle-exception :default
  [error request]
@@ -138,8 +114,10 @@
    (cond
      ;; This means that exception is not a controlled exception.
      (nil? edata)
-      (binding [l/*context* (request->context request)]
-        (l/error :hint "Unexpected error" :message (ex-message error) :cause error)
+      (do
+        (l/error ::l/raw (ex-message error)
+                 ::l/context (get-context request)
+                 :cause error)
        (yrs/response 500 {:type :server-error
                           :code :unexpected
                           :hint (ex-message error)}))
@@ -154,8 +132,10 @@
      (handle-exception (:handling edata) request)

      :else
-      (binding [l/*context* (request->context request)]
-        (l/error :hint "Unhandled error" :message (ex-message error) :cause error)
+      (do
+        (l/error ::l/raw (ex-message error)
+                 ::l/context (get-context request)
+                 :cause error)
        (yrs/response 500 {:type :server-error
                           :code :unhandled
                           :hint (ex-message error)
@@ -163,7 +143,18 @@

 (defn handle
  [cause request]
-  (if (or (instance? java.util.concurrent.CompletionException cause)
-          (instance? java.util.concurrent.ExecutionException cause))
-    (handle-exception (ex-cause cause) request)
+
+  (cond
+    (or (instance? java.util.concurrent.CompletionException cause)
+        (instance? java.util.concurrent.ExecutionException cause))
+    (handle-exception (.getCause ^Throwable cause) request)
+
+
+    (ex/wrapped? cause)
+    (let [context (meta cause)
+          cause   (deref cause)]
+      (binding [*context* context]
+        (handle-exception cause request)))
+
+    :else
    (handle-exception cause request)))
--- a/backend/src/app/http/feedback.clj
+++ b/backend/src/app/http/feedback.clj
@@ -0,0 +1,80 @@
+;; 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) UXBOX Labs SL
+
+(ns app.http.feedback
+  "A general purpose feedback module."
+  (:require
+   [app.common.data :as d]
+   [app.common.exceptions :as ex]
+   [app.common.spec :as us]
+   [app.config :as cf]
+   [app.db :as db]
+   [app.emails :as eml]
+   [app.rpc.queries.profile :as profile]
+   [app.worker :as wrk]
+   [clojure.spec.alpha :as s]
+   [integrant.core :as ig]
+   [promesa.core :as p]
+   [promesa.exec :as px]
+   [yetti.request :as yrq]
+   [yetti.response :as yrs]))
+
+(declare ^:private send-feedback)
+(declare ^:private handler)
+
+(defmethod ig/pre-init-spec ::handler [_]
+  (s/keys :req-un [::db/pool ::wrk/executor]))
+
+(defmethod ig/init-key ::handler
+  [_ {:keys [executor] :as cfg}]
+  (let [enabled? (contains? cf/flags :user-feedback)]
+    (if enabled?
+      (fn [request respond raise]
+        (-> (px/submit! executor #(handler cfg request))
+            (p/then' respond)
+            (p/catch raise)))
+      (fn [_ _ raise]
+        (raise (ex/error :type :validation
+                         :code :feedback-disabled
+                         :hint "feedback module is disabled"))))))
+
+(defn- handler
+  [{:keys [pool] :as cfg} {:keys [profile-id] :as request}]
+  (let [ftoken (cf/get :feedback-token ::no-token)
+        token  (yrq/get-header request "x-feedback-token")
+        params (d/merge (:params request)
+                        (:body-params request))]
+    (cond
+      (uuid? profile-id)
+      (let [profile (profile/retrieve-profile-data pool profile-id)
+            params  (assoc params :from (:email profile))]
+        (send-feedback pool profile params))
+
+      (= token ftoken)
+      (send-feedback cfg nil params))
+
+    (yrs/response 204)))
+
+(s/def ::content ::us/string)
+(s/def ::from    ::us/email)
+(s/def ::subject ::us/string)
+(s/def ::feedback
+  (s/keys :req-un [::from ::subject ::content]))
+
+(defn- send-feedback
+  [pool profile params]
+  (let [params      (us/conform ::feedback params)
+        destination (cf/get :feedback-destination)]
+    (eml/send! {::eml/conn pool
+                ::eml/factory eml/feedback
+                :from     destination
+                :to       destination
+                :profile  profile
+                :reply-to (:from params)
+                :email    (:from params)
+                :subject  (:subject params)
+                :content  (:content params)})
+    nil))
--- a/backend/src/app/http/middleware.clj
+++ b/backend/src/app/http/middleware.clj
@@ -2,7 +2,7 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.middleware
  (:require
@@ -12,14 +12,11 @@
   [app.config :as cf]
   [app.util.json :as json]
   [cuerdas.core :as str]
-   [promesa.core :as p]
-   [promesa.exec :as px]
   [yetti.adapter :as yt]
   [yetti.middleware :as ymw]
   [yetti.request :as yrq]
   [yetti.response :as yrs])
  (:import
-   com.fasterxml.jackson.core.JsonParseException
   com.fasterxml.jackson.core.io.JsonEOFException
   io.undertow.server.RequestTooBigException
   java.io.OutputStream))
@@ -32,27 +29,21 @@
  {:name ::params
   :compile (constantly ymw/wrap-params)})

-(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]
  (letfn [(process-request [request]
            (let [header (yrq/get-header request "content-type")]
              (cond
                (str/starts-with? header "application/transit+json")
-                (with-open [is (yrq/body request)]
+                (with-open [is (-> request yrq/body yrq/body-stream)]
                  (let [params (t/read! (t/reader is))]
                    (-> request
                        (assoc :body-params params)
                        (update :params merge params))))

                (str/starts-with? header "application/json")
-                (with-open [is (yrq/body request)]
-                  (let [params (json/decode is json-mapper)]
+                (with-open [is (-> request yrq/body yrq/body-stream)]
+                  (let [params (json/read is)]
                    (-> request
                        (assoc :body-params params)
                        (update :params merge params))))
@@ -67,23 +58,21 @@
                               :code :request-body-too-large
                               :hint (ex-message cause)))

-
-              (or (instance? JsonEOFException cause)
-                  (instance? JsonParseException cause))
+              (instance? JsonEOFException cause)
              (raise (ex/error :type :validation
                               :code :malformed-json
-                               :hint (ex-message cause)
-                               :cause cause))
+                               :hint (ex-message cause)))
              :else
              (raise cause)))]

    (fn [request respond raise]
-      (let [request (ex/try! (process-request request))]
-        (if (ex/exception? request)
-          (if (ex/runtime-exception? request)
-            (handle-error raise (or (ex-cause request) request))
-            (handle-error raise request))
-          (handler request respond raise))))))
+      (when-let [request (try
+                           (process-request request)
+                           (catch RuntimeException cause
+                             (handle-error raise (or (.getCause cause) cause)))
+                           (catch Throwable cause
+                             (handle-error raise cause)))]
+        (handler request respond raise)))))

 (def parse-request
  {:name ::parse-request
@@ -122,34 +111,9 @@
                  (finally
                    (.close ^OutputStream output-stream))))))

-          (json-streamable-body [data]
-            (reify yrs/StreamableResponseBody
-              (-write-body-to-stream [_ _ output-stream]
-                (try
-
-                  (with-open [bos (buffered-output-stream output-stream buffer-size)]
-                    (json/write! bos data json-mapper))
-
-                  (catch java.io.IOException _cause
-                    ;; Do nothing, EOF means client closes connection abruptly
-                    nil)
-                  (catch Throwable cause
-                    (l/warn :hint "unexpected error on encoding response"
-                            :cause cause))
-                  (finally
-                    (.close ^OutputStream output-stream))))))
-
-          (format-response-with-json [response _]
+          (format-response [response request]
            (let [body (yrs/body response)]
-              (if (or (boolean? body) (coll? body))
-                (-> response
-                    (update :headers assoc "content-type" "application/json")
-                    (assoc :body (json-streamable-body body)))
-                response)))
-
-          (format-response-with-transit [response request]
-            (let [body (yrs/body response)]
-              (if (or (boolean? body) (coll? body))
+              (if (coll? body)
                (let [qs   (yrq/query request)
                      opts (if (or (contains? cf/flags :transit-readable-response)
                                   (str/includes? qs "transit_verbose"))
@@ -160,20 +124,6 @@
                      (assoc :body (transit-streamable-body body opts))))
                response)))

-          (format-response [response request]
-            (let [accept (yrq/get-header request "accept")]
-              (cond
-                (or (= accept "application/transit+json")
-                    (str/includes? accept "application/transit+json"))
-                (format-response-with-transit response request)
-
-                (or (= accept "application/json")
-                    (str/includes? accept "application/json"))
-                (format-response-with-json response request)
-
-                :else
-                (format-response-with-transit response request))))
-
          (process-response [response request]
            (cond-> response
              (map? response) (format-response request)))]
@@ -242,23 +192,3 @@
 (def restrict-methods
  {:name ::restrict-methods
   :compile compile-restrict-methods})
-
-(def with-dispatch
-  {:name ::with-dispatch
-   :compile
-   (fn [& _]
-     (fn [handler executor]
-       (fn [request respond raise]
-         (-> (px/submit! executor #(handler request))
-             (p/bind p/wrap)
-             (p/then respond)
-             (p/catch raise)))))})
-
-(def with-config
-  {:name ::with-config
-   :compile
-   (fn [& _]
-     (fn [handler config]
-       (fn
-         ([request] (handler config request))
-         ([request respond raise] (handler config request respond raise)))))})
--- a/backend/src/app/http/oauth.clj
+++ b/backend/src/app/http/oauth.clj
@@ -0,0 +1,459 @@
+;; 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) UXBOX Labs SL
+
+(ns app.http.oauth
+  (:require
+   [app.common.data :as d]
+   [app.common.exceptions :as ex]
+   [app.common.logging :as l]
+   [app.common.spec :as us]
+   [app.common.uri :as u]
+   [app.config :as cf]
+   [app.db :as db]
+   [app.loggers.audit :as audit]
+   [app.rpc.queries.profile :as profile]
+   [app.util.json :as json]
+   [app.util.time :as dt]
+   [clojure.set :as set]
+   [clojure.spec.alpha :as s]
+   [cuerdas.core :as str]
+   [integrant.core :as ig]
+   [promesa.core :as p]
+   [promesa.exec :as px]
+   [yetti.response :as yrs]))
+
+(defn- build-redirect-uri
+  [{:keys [provider] :as cfg}]
+  (let [public (u/uri (:public-uri cfg))]
+    (str (assoc public :path (str "/api/auth/oauth/" (:name provider) "/callback")))))
+
+(defn- build-auth-uri
+  [{:keys [provider] :as cfg} state]
+  (let [params {:client_id (:client-id provider)
+                :redirect_uri (build-redirect-uri cfg)
+                :response_type "code"
+                :state state
+                :scope (str/join " " (:scopes provider []))}
+        query  (u/map->query-string params)]
+    (-> (u/uri (:auth-uri provider))
+        (assoc :query query)
+        (str))))
+
+(defn- qualify-props
+  [provider props]
+  (reduce-kv (fn [result k v]
+               (assoc result (keyword (:name provider) (name k)) v))
+             {}
+             props))
+
+(defn retrieve-access-token
+  [{:keys [provider http-client] :as cfg} code]
+  (let [params {:client_id (:client-id provider)
+                :client_secret (:client-secret provider)
+                :code code
+                :grant_type "authorization_code"
+                :redirect_uri (build-redirect-uri cfg)}
+        req    {:method :post
+                :headers {"content-type" "application/x-www-form-urlencoded"
+                          "accept" "application/json"}
+                :uri (:token-uri provider)
+                :body (u/map->query-string params)}]
+    (p/then
+     (http-client req)
+     (fn [{:keys [status body] :as res}]
+       (if (= status 200)
+         (let [data (json/read body)]
+           {:token (get data :access_token)
+            :type (get data :token_type)})
+         (ex/raise :type :internal
+                   :code :unable-to-retrieve-token
+                   :http-status status
+                   :http-body body))))))
+
+(defn- retrieve-user-info
+  [{:keys [provider http-client] :as cfg} tdata]
+  (letfn [(retrieve []
+            (http-client {:uri (:user-uri provider)
+                          :headers {"Authorization" (str (:type tdata) " " (:token tdata))}
+                          :timeout 6000
+                          :method :get}))
+
+          (retrieve-emails []
+            (if (some? (:emails-uri provider))
+              (http-client {:uri (:emails-uri provider)
+                            :headers {"Authorization" (str (:type tdata) " " (:token tdata))}
+                            :timeout 6000
+                            :method :get})
+              (p/resolved {:status 200})))
+
+          (validate-response [[retrieve-res emails-res]]
+            (when-not (s/int-in-range? 200 300 (:status retrieve-res))
+              (ex/raise :type :internal
+                        :code :unable-to-retrieve-user-info
+                        :hint "unable to retrieve user info"
+                        :http-status (:status retrieve-res)
+                        :http-body (:body retrieve-res)))
+            (when-not (s/int-in-range? 200 300 (:status emails-res))
+              (ex/raise :type :internal
+                        :code :unable-to-retrieve-user-info
+                        :hint "unable to retrieve user info"
+                        :http-status (:status emails-res)
+                        :http-body (:body emails-res)))
+            [retrieve-res emails-res])
+
+          (get-email [info]
+            (let [attr-kw (cf/get :oidc-email-attr :email)]
+              (get info attr-kw)))
+
+          (get-name [info]
+            (let [attr-kw (cf/get :oidc-name-attr :name)]
+              (get info attr-kw)))
+
+          (process-response [[retrieve-res emails-res]]
+            (let [info (json/read (:body retrieve-res))
+                  email (if (some? (:extract-email-callback provider))
+                          ((:extract-email-callback provider) emails-res)
+                          (get-email info))]
+              {:backend  (:name provider)
+               :email    email
+               :fullname (get-name info)
+               :props (->> (dissoc info :name :email)
+                           (qualify-props provider))}))
+
+          (validate-info [info]
+            (when-not (s/valid? ::info info)
+              (l/warn :hint "received incomplete profile info object (please set correct scopes)"
+                      :info (pr-str info))
+              (ex/raise :type :internal
+                        :code :incomplete-user-info
+                        :hint "inconmplete user info"
+                        :info info))
+            info)]
+
+    (-> (p/all [(retrieve) (retrieve-emails)])
+        (p/then' validate-response)
+        (p/then' process-response)
+        (p/then' validate-info))))
+
+(s/def ::backend ::us/not-empty-string)
+(s/def ::email ::us/not-empty-string)
+(s/def ::fullname ::us/not-empty-string)
+(s/def ::props (s/map-of ::us/keyword any?))
+(s/def ::info
+  (s/keys :req-un [::backend
+                   ::email
+                   ::fullname
+                   ::props]))
+
+(defn retrieve-info
+  [{:keys [tokens provider] :as cfg} {:keys [params] :as request}]
+  (letfn [(validate-oidc [info]
+            ;; If the provider is OIDC, we can proceed to check
+            ;; roles if they are defined.
+            (when (and (= "oidc" (:name provider))
+                       (seq (:roles provider)))
+              (let [provider-roles (into #{} (:roles provider))
+                    profile-roles  (let [attr  (cf/get :oidc-roles-attr :roles)
+                                         roles (get info attr)]
+                                     (cond
+                                       (string? roles) (into #{} (str/words roles))
+                                       (vector? roles) (into #{} roles)
+                                       :else #{}))]
+
+                ;; check if profile has a configured set of roles
+                (when-not (set/subset? provider-roles profile-roles)
+                  (ex/raise :type :internal
+                            :code :unable-to-auth
+                            :hint "not enough permissions"))))
+            info)
+
+          (post-process [state info]
+            (cond-> info
+              (some? (:invitation-token state))
+              (assoc :invitation-token (:invitation-token state))
+
+              ;; If state token comes with props, merge them. The state token
+              ;; props can contain pm_ and utm_ prefixed query params.
+              (map? (:props state))
+              (update :props merge (:props state))))]
+
+    (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 {:token state :iss :oauth})]
+      (-> (p/resolved code)
+          (p/then #(retrieve-access-token cfg %))
+          (p/then #(retrieve-user-info cfg %))
+          (p/then' validate-oidc)
+          (p/then' (partial post-process state))))))
+
+;; --- HTTP HANDLERS
+
+(defn- retrieve-profile
+  [{:keys [pool executor] :as cfg} info]
+  (px/with-dispatch executor
+    (with-open [conn (db/open pool)]
+      (some->> (:email info)
+               (profile/retrieve-profile-data-by-email conn)
+               (profile/populate-additional-data conn)
+               (profile/decode-profile-row)))))
+
+(defn- redirect-response
+  [uri]
+  (yrs/response :status 302 :headers {"location" (str uri)}))
+
+(defn- generate-error-redirect
+  [cfg error]
+  (let [uri (-> (u/uri (:public-uri cfg))
+                (assoc :path "/#/auth/login")
+                (assoc :query (u/map->query-string {:error "unable-to-auth" :hint (ex-message error)})))]
+    (redirect-response uri)))
+
+(defn- generate-redirect
+  [{:keys [tokens session audit] :as cfg} request info profile]
+  (if profile
+    (let [sxf    ((:create session) (:id profile))
+          token  (or (:invitation-token info)
+                     (tokens :generate {:iss :auth
+                                        :exp (dt/in-future "15m")
+                                        :profile-id (:id profile)}))
+          params {:token token}
+
+          uri    (-> (u/uri (:public-uri cfg))
+                     (assoc :path "/#/auth/verify-token")
+                     (assoc :query (u/map->query-string params)))]
+
+      (when (fn? audit)
+        (audit :cmd :submit
+               :type "mutation"
+               :name "login"
+               :profile-id (:id profile)
+               :ip-addr (audit/parse-client-ip request)
+               :props (audit/profile->props profile)))
+
+      (->> (redirect-response uri)
+           (sxf request)))
+
+    (let [info   (assoc info
+                        :iss :prepared-register
+                        :is-active true
+                        :exp (dt/in-future {:hours 48}))
+          token  (tokens :generate info)
+          params (d/without-nils
+                  {:token token
+                   :fullname (:fullname info)})
+          uri    (-> (u/uri (:public-uri cfg))
+                     (assoc :path "/#/auth/register/validate")
+                     (assoc :query (u/map->query-string params)))]
+      (redirect-response uri))))
+
+(defn- auth-handler
+  [{:keys [tokens] :as cfg} {:keys [params] :as request} respond raise]
+  (try
+    (let [props (audit/extract-utm-params params)
+          state (tokens :generate
+                        {:iss :oauth
+                         :invitation-token (:invitation-token params)
+                         :props props
+                         :exp (dt/in-future "15m")})
+          uri   (build-auth-uri cfg state)]
+      (respond (yrs/response 200 {:redirect-uri uri})))
+    (catch Throwable cause
+      (raise cause))))
+
+(defn- callback-handler
+  [cfg request respond _]
+  (letfn [(process-request []
+            (p/let [info    (retrieve-info cfg request)
+                    profile (retrieve-profile cfg info)]
+              (generate-redirect cfg request info profile)))
+
+          (handle-error [cause]
+            (l/error :hint "error on oauth process" :cause cause)
+            (respond (generate-error-redirect cfg cause)))]
+
+    (-> (process-request)
+        (p/then respond)
+        (p/catch handle-error))))
+
+;; --- INIT
+
+(declare initialize)
+
+(s/def ::public-uri ::us/not-empty-string)
+(s/def ::session map?)
+(s/def ::tokens fn?)
+(s/def ::rpc map?)
+
+(defmethod ig/pre-init-spec ::handler [_]
+  (s/keys :req-un [::public-uri ::session ::tokens ::rpc ::db/pool]))
+
+(defn wrap-handler
+  [cfg handler]
+  (fn [request respond raise]
+    (let [provider (get-in request [:path-params :provider])
+          provider (get-in @cfg [:providers provider])]
+      (if provider
+        (handler (assoc @cfg :provider provider)
+                 request
+                 respond
+                 raise)
+        (raise
+         (ex/error
+          :type :not-found
+          :provider provider
+          :hint "provider not configured"))))))
+
+(defmethod ig/init-key ::handler
+  [_ cfg]
+  (let [cfg (initialize cfg)]
+    {:handler (wrap-handler cfg auth-handler)
+     :callback-handler (wrap-handler cfg callback-handler)}))
+
+(defn- discover-oidc-config
+  [{:keys [http-client]} {:keys [base-uri] :as opts}]
+
+  (let [discovery-uri (u/join base-uri ".well-known/openid-configuration")
+        response      (ex/try (http-client {:method :get :uri (str discovery-uri)} {:sync? true}))]
+    (cond
+      (ex/exception? response)
+      (do
+        (l/warn :hint "unable to discover oidc configuration"
+                :discover-uri (str discovery-uri)
+                :cause response)
+        nil)
+
+      (= 200 (:status response))
+      (let [data (json/read (:body response))]
+        {:token-uri (get data :token_endpoint)
+         :auth-uri  (get data :authorization_endpoint)
+         :user-uri  (get data :userinfo_endpoint)})
+
+      :else
+      (do
+        (l/warn :hint "unable to discover OIDC configuration"
+                :uri (str discovery-uri)
+                :response-status-code (:status response))
+        nil))))
+
+(defn- obfuscate-string
+  [s]
+  (if (< (count s) 10)
+    (apply str (take (count s) (repeat "*")))
+    (str (subs s 0 5)
+         (apply str (take (- (count s) 5) (repeat "*"))))))
+
+(defn- initialize-oidc-provider
+  [cfg]
+  (let [opts {:base-uri      (cf/get :oidc-base-uri)
+              :client-id     (cf/get :oidc-client-id)
+              :client-secret (cf/get :oidc-client-secret)
+              :token-uri     (cf/get :oidc-token-uri)
+              :auth-uri      (cf/get :oidc-auth-uri)
+              :user-uri      (cf/get :oidc-user-uri)
+              :scopes        (cf/get :oidc-scopes #{"openid" "profile" "email"})
+              :roles-attr    (cf/get :oidc-roles-attr)
+              :roles         (cf/get :oidc-roles)
+              :name          "oidc"}]
+
+    (if (and (string? (:base-uri opts))
+             (string? (:client-id opts))
+             (string? (:client-secret opts)))
+      (do
+        (l/debug :hint "initialize oidc provider" :name "generic-oidc"
+                 :opts (update opts :client-secret obfuscate-string))
+        (if (and (string? (:token-uri opts))
+                 (string? (:user-uri opts))
+                 (string? (:auth-uri opts)))
+          (do
+            (l/debug :hint "initialized with user provided configuration")
+            (assoc-in cfg [:providers "oidc"] opts))
+          (do
+            (l/debug :hint "trying to discover oidc provider configuration using BASE_URI")
+            (if-let [opts' (discover-oidc-config cfg opts)]
+              (do
+                (l/debug :hint "discovered opts" :additional-opts opts')
+                (assoc-in cfg [:providers "oidc"] (merge opts opts')))
+
+              cfg))))
+      cfg)))
+
+(defn- initialize-google-provider
+  [cfg]
+  (let [opts {:client-id     (cf/get :google-client-id)
+              :client-secret (cf/get :google-client-secret)
+              :scopes        #{"openid" "email" "profile"}
+              :auth-uri      "https://accounts.google.com/o/oauth2/v2/auth"
+              :token-uri     "https://oauth2.googleapis.com/token"
+              :user-uri      "https://openidconnect.googleapis.com/v1/userinfo"
+              :name          "google"}]
+    (if (and (string? (:client-id opts))
+             (string? (:client-secret opts)))
+      (do
+        (l/info :action "initialize" :provider "google"
+                :opts (pr-str (update opts :client-secret obfuscate-string)))
+        (assoc-in cfg [:providers "google"] opts))
+      cfg)))
+
+(defn extract-github-email
+  [response]
+  (let [emails (json/read (:body response))
+        primary-email (->> emails
+                           (filter #(:primary %))
+                           first)]
+  (:email primary-email)))
+
+(defn- initialize-github-provider
+  [cfg]
+  (let [opts {:client-id              (cf/get :github-client-id)
+              :client-secret          (cf/get :github-client-secret)
+              :scopes                 #{"read:user" "user:email"}
+              :auth-uri               "https://github.com/login/oauth/authorize"
+              :token-uri              "https://github.com/login/oauth/access_token"
+              :emails-uri             "https://api.github.com/user/emails"
+              :extract-email-callback extract-github-email
+              :user-uri               "https://api.github.com/user"
+              :name                   "github"}]
+    (if (and (string? (:client-id opts))
+             (string? (:client-secret opts)))
+      (do
+        (l/info :action "initialize" :provider "github"
+                :opts (pr-str (update opts :client-secret obfuscate-string)))
+        (assoc-in cfg [:providers "github"] opts))
+      cfg)))
+
+(defn- initialize-gitlab-provider
+  [cfg]
+  (let [base (cf/get :gitlab-base-uri "https://gitlab.com")
+        opts {:base-uri      base
+              :client-id     (cf/get :gitlab-client-id)
+              :client-secret (cf/get :gitlab-client-secret)
+              :scopes        #{"openid" "profile" "email"}
+              :auth-uri      (str base "/oauth/authorize")
+              :token-uri     (str base "/oauth/token")
+              :user-uri      (str base "/oauth/userinfo")
+              :name          "gitlab"}]
+    (if (and (string? (:client-id opts))
+             (string? (:client-secret opts)))
+      (do
+        (l/info :action "initialize" :provider "gitlab"
+                :opts (pr-str (update opts :client-secret obfuscate-string)))
+        (assoc-in cfg [:providers "gitlab"] opts))
+      cfg)))
+
+(defn- initialize
+  [cfg]
+  (let [cfg (agent cfg :error-mode :continue)]
+    (send-off cfg initialize-google-provider)
+    (send-off cfg initialize-gitlab-provider)
+    (send-off cfg initialize-github-provider)
+    (send-off cfg initialize-oidc-provider)
+    cfg))
--- a/backend/src/app/http/session.clj
+++ b/backend/src/app/http/session.clj
@@ -2,364 +2,286 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.session
-  (:refer-clojure :exclude [read])
  (:require
   [app.common.data :as d]
   [app.common.exceptions :as ex]
   [app.common.logging :as l]
-   [app.common.spec :as us]
-   [app.config :as cf]
+   [app.config :as cfg]
   [app.db :as db]
   [app.db.sql :as sql]
-   [app.http.session.tasks :as-alias tasks]
-   [app.main :as-alias main]
-   [app.tokens :as tokens]
+   [app.metrics :as mtx]
+   [app.util.async :as aa]
   [app.util.time :as dt]
   [app.worker :as wrk]
+   [clojure.core.async :as a]
   [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
   [integrant.core :as ig]
   [promesa.core :as p]
   [promesa.exec :as px]
   [yetti.request :as yrq]))

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; DEFAULTS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; A default cookie name for storing the session. We don't allow to configure it.
+(def token-cookie-name "auth-token")

-;; A default cookie name for storing the session.
-(def default-auth-token-cookie-name "auth-token")
+;; A cookie that we can use to check from other sites of the same domain if a user
+;; is registered. Is not intended for on premise installations, although nothing
+;; prevents using it if some one wants to.
+(def authenticated-cookie-name "authenticated")

-;; A cookie that we can use to check from other sites of the same
-;; domain if a user is authenticated.
-(def default-authenticated-cookie-name "authenticated")
+(defprotocol ISessionStore
+  (read-session [store key])
+  (write-session [store key data])
+  (delete-session [store key]))

-;; Default value for cookie max-age
-(def default-cookie-max-age (dt/duration {:days 7}))
-
-;; Default age for automatic session renewal
-(def default-renewal-max-age (dt/duration {:hours 6}))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; PROTOCOLS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defprotocol ISessionManager
-  (read [_ key])
-  (write! [_ key data])
-  (update! [_ data])
-  (delete! [_ key]))
-
-(s/def ::manager #(satisfies? ISessionManager %))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; STORAGE IMPL
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(s/def ::session-params
-  (s/keys :req-un [::user-agent
-                   ::profile-id
-                   ::created-at]))
-
-(defn- prepare-session-params
-  [key params]
-  (us/assert! ::us/not-empty-string key)
-  (us/assert! ::session-params params)
-
-  {:user-agent (:user-agent params)
-   :profile-id (:profile-id params)
-   :created-at (:created-at params)
-   :updated-at (:created-at params)
-   :id key})
-
-(defn- database-manager
-  [{:keys [::db/pool ::wrk/executor ::main/props]}]
-  ^{::wrk/executor executor
-    ::db/pool pool
-    ::main/props props}
-  (reify ISessionManager
-    (read [_ token]
+(defn- make-database-store
+  [{:keys [pool tokens executor]}]
+  (reify ISessionStore
+    (read-session [_ token]
      (px/with-dispatch executor
        (db/exec-one! pool (sql/select :http-session {:id token}))))

-    (write! [_ key params]
+    (write-session [_ _ data]
      (px/with-dispatch executor
-        (let [params (prepare-session-params key params)]
+        (let [profile-id (:profile-id data)
+              user-agent (:user-agent data)
+              token      (tokens :generate {:iss "authentication"
+                                            :iat (dt/now)
+                                            :uid profile-id})
+
+              now        (dt/now)
+              params     {:user-agent user-agent
+                          :profile-id profile-id
+                          :created-at now
+                          :updated-at now
+                          :id token}]
          (db/insert! pool :http-session params)
-          params)))
+          token)))

-    (update! [_ params]
-      (let [updated-at (dt/now)]
-        (px/with-dispatch executor
-          (db/update! pool :http-session
-                      {:updated-at updated-at}
-                      {:id (:id params)})
-          (assoc params :updated-at updated-at))))
-
-    (delete! [_ token]
+    (delete-session [_ token]
      (px/with-dispatch executor
        (db/delete! pool :http-session {:id token})
        nil))))

-(defn inmemory-manager
-  [{:keys [::db/pool ::wrk/executor ::main/props]}]
+(defn make-inmemory-store
+  [{:keys [tokens]}]
  (let [cache (atom {})]
-    ^{::main/props props
-      ::wrk/executor executor
-      ::db/pool pool}
-    (reify ISessionManager
-      (read [_ token]
+    (reify ISessionStore
+      (read-session [_ token]
        (p/do (get @cache token)))

-      (write! [_ key params]
+      (write-session [_ _ data]
        (p/do
-          (let [params (prepare-session-params key params)]
-            (swap! cache assoc key params)
-            params)))
+          (let [profile-id (:profile-id data)
+                user-agent (:user-agent data)
+                token      (tokens :generate {:iss "authentication"
+                                              :iat (dt/now)
+                                              :uid profile-id})
+                params     {:user-agent user-agent
+                            :profile-id profile-id
+                            :id token}]

-      (update! [_ params]
-        (p/do
-          (let [updated-at (dt/now)]
-            (swap! cache update (:id params) assoc :updated-at updated-at)
-            (assoc params :updated-at updated-at))))
+            (swap! cache assoc token params)
+            token)))

-      (delete! [_ token]
+      (delete-session [_ token]
        (p/do
          (swap! cache dissoc token)
          nil)))))

-(defmethod ig/pre-init-spec ::manager [_]
-  (s/keys :req [::db/pool ::wrk/executor ::main/props]))
+(s/def ::tokens fn?)
+(defmethod ig/pre-init-spec ::store [_]
+  (s/keys :req-un [::db/pool ::wrk/executor ::tokens]))

-(defmethod ig/init-key ::manager
-  [_ {:keys [::db/pool] :as cfg}]
+(defmethod ig/init-key ::store
+  [_ {:keys [pool] :as cfg}]
  (if (db/read-only? pool)
-    (inmemory-manager cfg)
-    (database-manager cfg)))
+    (make-inmemory-store cfg)
+    (make-database-store cfg)))

-(defmethod ig/halt-key! ::manager
+(defmethod ig/halt-key! ::store
  [_ _])

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; MANAGER IMPL
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(declare ^:private assign-auth-token-cookie)
-(declare ^:private assign-authenticated-cookie)
-(declare ^:private clear-auth-token-cookie)
-(declare ^:private clear-authenticated-cookie)
-(declare ^:private gen-token)
-
-(defn create-fn
-  [{:keys [::manager]} profile-id]
-  (us/assert! ::manager manager)
-  (us/assert! ::us/uuid profile-id)
-
-  (let [props (-> manager meta ::main/props)]
-    (fn [request response]
-      (let [uagent (yrq/get-header request "user-agent")
-            params {:profile-id profile-id
-                    :user-agent uagent
-                    :created-at (dt/now)}
-            token  (gen-token props params)]
-
-        (->> (write! manager token params)
-             (p/fmap (fn [session]
-                       (l/trace :hint "create" :profile-id (str profile-id))
-                       (-> response
-                           (assign-auth-token-cookie session)
-                           (assign-authenticated-cookie session)))))))))
-(defn delete-fn
-  [{:keys [::manager]}]
-  (us/assert! ::manager manager)
-  (letfn [(delete [{:keys [profile-id] :as request}]
-            (let [cname   (cf/get :auth-token-cookie-name default-auth-token-cookie-name)
-                  cookie  (yrq/get-cookie request cname)]
-              (l/trace :hint "delete" :profile-id profile-id)
-              (some->> (:value cookie) (delete! manager))))]
-    (fn [request response]
-      (p/do
-        (delete request)
-        (-> response
-            (assoc :status 204)
-            (assoc :body nil)
-            (clear-auth-token-cookie)
-            (clear-authenticated-cookie))))))
-
-(defn- gen-token
-  [props {:keys [profile-id created-at]}]
-  (tokens/generate props {:iss "authentication"
-                          :iat created-at
-                          :uid profile-id}))
-(defn- decode-token
-  [props token]
-  (when token
-    (tokens/verify props {:token token :iss "authentication"})))
-
-(defn- get-token
-  [request]
-  (let [cname  (cf/get :auth-token-cookie-name default-auth-token-cookie-name)
-        cookie (some-> (yrq/get-cookie request cname) :value)]
-    (when-not (str/empty? cookie)
-      cookie)))
-
-(defn- get-session
-  [manager token]
-  (some->> token (read manager)))
-
-(defn- renew-session?
-  [{:keys [updated-at] :as session}]
-  (and (dt/instant? updated-at)
-       (let [elapsed (dt/diff updated-at (dt/now))]
-         (neg? (compare default-renewal-max-age elapsed)))))
-
-(defn- wrap-reneval
-  [respond manager session]
-  (fn [response]
-    (p/let [session (update! manager session)]
-      (-> response
-          (assign-auth-token-cookie session)
-          (assign-authenticated-cookie session)
-          (respond)))))
-
-(defn- wrap-soft-auth
-  [handler {:keys [::manager]}]
-  (us/assert! ::manager manager)
-
-  (let [{:keys [::wrk/executor ::main/props]} (meta manager)]
-    (fn [request respond raise]
-      (let [token (ex/try! (get-token request))]
-        (if (ex/exception? token)
-          (raise token)
-          (->> (px/submit! executor (partial decode-token props token))
-               (p/fnly (fn [claims cause]
-                         (when cause
-                           (l/trace :hint "exception on decoding malformed token" :cause cause))
-                         (let [request (cond-> request
-                                         (map? claims)
-                                         (-> (assoc ::token-claims claims)
-                                             (assoc ::token token)))]
-                           (handler request respond raise))))))))))
-
-(defn- wrap-authz
-  [handler {:keys [::manager]}]
-  (us/assert! ::manager manager)
-  (fn [request respond raise]
-    (if-let [token (::token request)]
-      (->> (get-session manager token)
-           (p/fnly (fn [session cause]
-                     (cond
-                       (some? cause)
-                       (raise cause)
-
-                       (nil? session)
-                       (handler request respond raise)
-
-                       :else
-                       (let [request (-> request
-                                         (assoc ::profile-id (:profile-id session))
-                                         (assoc ::id (:id session)))
-                             respond (cond-> respond
-                                       (renew-session? session)
-                                       (wrap-reneval manager session))]
-                         (handler request respond raise))))))
-
-      (handler request respond raise))))
-
-(def soft-auth
-  {:name ::soft-auth
-   :compile (constantly wrap-soft-auth)})
-
-(def authz
-  {:name ::authz
-   :compile (constantly wrap-authz)})
-
 ;; --- IMPL

-(defn- assign-auth-token-cookie
-  [response {token :id updated-at :updated-at}]
-  (let [max-age    (cf/get :auth-token-cookie-max-age default-cookie-max-age)
-        created-at (or updated-at (dt/now))
-        renewal    (dt/plus created-at default-renewal-max-age)
-        expires    (dt/plus created-at max-age)
-        secure?    (contains? cf/flags :secure-session-cookies)
-        cors?      (contains? cf/flags :cors)
-        name       (cf/get :auth-token-cookie-name default-auth-token-cookie-name)
-        comment    (str "Renewal at: " (dt/format-instant renewal :rfc1123))
-        cookie     {:path "/"
-                    :http-only true
-                    :expires expires
-                    :value token
-                    :comment comment
-                    :same-site (if cors? :none :lax)
-                    :secure secure?}]
-    (update response :cookies assoc name cookie)))
+(defn- create-session!
+  [store request profile-id]
+  (let [params {:user-agent (yrq/get-header request "user-agent")
+                :profile-id profile-id}]
+    (write-session store nil params)))

-(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 :authenticated-cookie-domain)
-        cname      (cf/get :authenticated-cookie-name "authenticated")
+(defn- delete-session!
+  [store {:keys [cookies] :as request}]
+  (when-let [token (get-in cookies [token-cookie-name :value])]
+    (delete-session store token)))

-        created-at (or updated-at (dt/now))
-        renewal    (dt/plus created-at default-renewal-max-age)
-        expires    (dt/plus created-at max-age)
+(defn- retrieve-session
+  [store request]
+  (when-let [cookie (yrq/get-cookie request token-cookie-name)]
+    (-> (read-session store (:value cookie))
+        (p/then (fn [session]
+                  (when session
+                    {:session-id (:id session)
+                     :profile-id (:profile-id session)}))))))

-        comment    (str "Renewal at: " (dt/format-instant renewal :rfc1123))
-        secure?    (contains? cf/flags :secure-session-cookies)
+(defn- add-cookies
+  [response token]
+  (let [cors?   (contains? cfg/flags :cors)
+        secure? (contains? cfg/flags :secure-session-cookies)
+        authenticated-cookie-domain (cfg/get :authenticated-cookie-domain)]
+    (update response :cookies
+            (fn [cookies]
+              (cond-> cookies
+                :always
+                (assoc token-cookie-name {:path "/"
+                                          :http-only true
+                                          :value token
+                                          :same-site (if cors? :none :lax)
+                                          :secure secure?})

-        cookie     {:domain domain
-                    :expires expires
-                    :path "/"
-                    :comment comment
-                    :value true
-                    :same-site :strict
-                    :secure secure?}]
-    (cond-> response
-      (string? domain)
-      (update :cookies assoc cname cookie))))
+                (some? authenticated-cookie-domain)
+                (assoc authenticated-cookie-name {:domain authenticated-cookie-domain
+                                                  :path "/"
+                                                  :value true
+                                                  :same-site :strict
+                                                  :secure secure?}))))))

-(defn- clear-auth-token-cookie
+(defn- clear-cookies
  [response]
-  (let [cname (cf/get :auth-token-cookie-name default-auth-token-cookie-name)]
-    (update response :cookies assoc cname {:path "/" :value "" :max-age 0})))
+  (let [authenticated-cookie-domain (cfg/get :authenticated-cookie-domain)]
+    (assoc response :cookies
+           {token-cookie-name {:path "/"
+                               :value ""
+                               :max-age -1}
+            authenticated-cookie-name {:domain authenticated-cookie-domain
+                                       :path "/"
+                                       :value ""
+                                       :max-age -1}})))

-(defn- clear-authenticated-cookie
-  [response]
-  (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}))))
+(defn- make-middleware
+  [{:keys [::events-ch store] :as cfg}]
+  {:name :session-middleware
+   :wrap (fn [handler]
+           (fn [request respond raise]
+             (try
+               (-> (retrieve-session store request)
+                   (p/then' #(merge request %))
+                   (p/finally (fn [request cause]
+                                (if cause
+                                  (raise cause)
+                                  (do
+                                    (when-let [session-id (:session-id request)]
+                                      (a/offer! events-ch session-id))
+                                    (handler request respond raise))))))
+               (catch Throwable cause
+                 (raise cause)))))})


-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; TASK: SESSION GC
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; --- STATE INIT: SESSION

-(s/def ::tasks/max-age ::dt/duration)
+(s/def ::store #(satisfies? ISessionStore %))

-(defmethod ig/pre-init-spec ::tasks/gc [_]
-  (s/keys :req [::db/pool]
-          :opt [::tasks/max-age]))
+(defmethod ig/pre-init-spec :app.http/session [_]
+  (s/keys :req-un [::store]))

-(defmethod ig/prep-key ::tasks/gc
+(defmethod ig/prep-key :app.http/session
  [_ cfg]
-  (let [max-age (cf/get :auth-token-cookie-max-age default-cookie-max-age)]
-    (merge {::tasks/max-age max-age} (d/without-nils cfg))))
+  (d/merge {:buffer-size 128}
+           (d/without-nils cfg)))

-(def ^:private
-  sql:delete-expired
-  "delete from http_session
-    where updated_at < now() - ?::interval
-       or (updated_at is null and
-           created_at < now() - ?::interval)")
+(defmethod ig/init-key :app.http/session
+  [_ {:keys [store] :as cfg}]
+  (let [events-ch (a/chan (a/dropping-buffer (:buffer-size cfg)))
+        cfg       (assoc cfg ::events-ch events-ch)]

-(defmethod ig/init-key ::tasks/gc
-  [_ {:keys [::db/pool ::tasks/max-age] :as cfg}]
+    (-> cfg
+        (assoc :middleware (make-middleware cfg))
+        (assoc :create (fn [profile-id]
+                         (fn [request response]
+                           (p/let [token (create-session! store request profile-id)]
+                             (add-cookies response token)))))
+        (assoc :delete (fn [request response]
+                         (p/do
+                           (delete-session! store request)
+                           (-> response
+                               (assoc :status 204)
+                               (assoc :body nil)
+                               (clear-cookies))))))))
+
+(defmethod ig/halt-key! :app.http/session
+  [_ data]
+  (a/close! (::events-ch data)))
+
+;; --- STATE INIT: SESSION UPDATER
+
+(declare update-sessions)
+
+(s/def ::session map?)
+(s/def ::max-batch-age ::cfg/http-session-updater-batch-max-age)
+(s/def ::max-batch-size ::cfg/http-session-updater-batch-max-size)
+
+(defmethod ig/pre-init-spec ::updater [_]
+  (s/keys :req-un [::db/pool ::wrk/executor ::mtx/metrics ::session]
+          :opt-un [::max-batch-age ::max-batch-size]))
+
+(defmethod ig/prep-key ::updater
+  [_ cfg]
+  (merge {:max-batch-age (dt/duration {:minutes 5})
+          :max-batch-size 200}
+         (d/without-nils cfg)))
+
+(defmethod ig/init-key ::updater
+  [_ {:keys [session metrics] :as cfg}]
+  (l/info :action "initialize session updater"
+          :max-batch-age (str (:max-batch-age cfg))
+          :max-batch-size (str (:max-batch-size cfg)))
+  (let [input (aa/batch (::events-ch session)
+                        {:max-batch-size (:max-batch-size cfg)
+                         :max-batch-age (inst-ms (:max-batch-age cfg))})]
+    (a/go-loop []
+      (when-let [[reason batch] (a/<! input)]
+        (let [result (a/<! (update-sessions cfg batch))]
+          (mtx/run! metrics {:id :session-update-total :inc 1})
+          (cond
+            (ex/exception? result)
+            (l/error :task "updater"
+                     :hint "unexpected error on update sessions"
+                     :cause result)
+
+            (= :size reason)
+            (l/debug :task "updater"
+                     :hint "update sessions"
+                     :reason (name reason)
+                     :count result))
+
+          (recur))))))
+
+(defn- update-sessions
+  [{:keys [pool executor]} ids]
+  (aa/with-thread executor
+    (db/exec-one! pool ["update http_session set updated_at=now() where id = ANY(?)"
+                        (into-array String ids)])
+    (count ids)))
+
+;; --- STATE INIT: SESSION GC
+
+(declare sql:delete-expired)
+
+(s/def ::max-age ::dt/duration)
+
+(defmethod ig/pre-init-spec ::gc-task [_]
+  (s/keys :req-un [::db/pool]
+          :opt-un [::max-age]))
+
+(defmethod ig/prep-key ::gc-task
+  [_ cfg]
+  (merge {:max-age (dt/duration {:days 15})}
+         (d/without-nils cfg)))
+
+(defmethod ig/init-key ::gc-task
+  [_ {:keys [pool max-age] :as cfg}]
  (l/debug :hint "initializing session gc task" :max-age max-age)
  (fn [_]
    (db/with-atomic [conn pool]
@@ -371,3 +293,9 @@
                 :deleted result)
        result))))

+(def ^:private
+  sql:delete-expired
+  "delete from http_session
+    where updated_at < now() - ?::interval
+       or (updated_at is null and
+           created_at < now() - ?::interval)")
--- a/backend/src/app/http/websocket.clj
+++ b/backend/src/app/http/websocket.clj
@@ -2,126 +2,35 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.http.websocket
  "A penpot notification service for file cooperative edition."
  (:require
   [app.common.exceptions :as ex]
   [app.common.logging :as l]
-   [app.common.pprint :as pp]
   [app.common.spec :as us]
   [app.db :as db]
-   [app.http.session :as session]
   [app.metrics :as mtx]
-   [app.msgbus :as mbus]
-   [app.util.time :as dt]
   [app.util.websocket :as ws]
   [clojure.core.async :as a]
   [clojure.spec.alpha :as s]
   [integrant.core :as ig]
   [yetti.websocket :as yws]))

-(def recv-labels
-  (into-array String ["recv"]))
-
-(def send-labels
-  (into-array String ["send"]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; WEBSOCKET HOOKS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def state (atom {}))
-
-(defn- on-connect
-  [{:keys [::mtx/metrics]} wsp]
-  (let [created-at (dt/now)]
-    (swap! state assoc (::ws/id @wsp) wsp)
-    (mtx/run! metrics
-              :id :websocket-active-connections
-              :inc 1)
-    (fn []
-      (swap! state dissoc (::ws/id @wsp))
-      (mtx/run! metrics :id :websocket-active-connections :dec 1)
-      (mtx/run! metrics
-                :id :websocket-session-timing
-                :val (/ (inst-ms (dt/diff created-at (dt/now))) 1000.0)))))
-
-(defn- on-rcv-message
-  [{:keys [::mtx/metrics]} _ message]
-  (mtx/run! metrics
-            :id :websocket-messages-total
-            :labels recv-labels
-            :inc 1)
-  message)
-
-(defn- on-snd-message
-  [{:keys [::mtx/metrics]} _ message]
-  (mtx/run! metrics
-            :id :websocket-messages-total
-            :labels send-labels
-            :inc 1)
-  message)
-
-;; REPL HELPERS
-
-(defn repl-get-connections-for-file
-  [file-id]
-  (->> (vals @state)
-       (filter #(= file-id (-> % deref ::file-subscription :file-id)))
-       (map deref)
-       (map ::ws/id)))
-
-(defn repl-get-connections-for-team
-  [team-id]
-  (->> (vals @state)
-       (filter #(= team-id (-> % deref ::team-subscription :team-id)))
-       (map deref)
-       (map ::ws/id)))
-
-(defn repl-close-connection
-  [id]
-  (when-let [wsp (get @state id)]
-    (a/>!! (::ws/close-ch @wsp) [8899 "closed from server"])
-    (a/close! (::ws/close-ch @wsp))))
-
-(defn repl-get-connection-info
-  [id]
-  (when-let [wsp (get @state id)]
-    {:id               id
-     :created-at       (::created-at @wsp)
-     :profile-id       (::profile-id @wsp)
-     :session-id       (::session-id @wsp)
-     :user-agent       (::ws/user-agent @wsp)
-     :ip-addr          (::ws/remote-addr @wsp)
-     :last-activity-at (::ws/last-activity-at @wsp)
-     :subscribed-file  (-> wsp deref ::file-subscription :file-id)
-     :subscribed-team  (-> wsp deref ::team-subscription :team-id)}))
-
-(defn repl-print-connection-info
-  [id]
-  (some-> id repl-get-connection-info pp/pprint))
-
-(defn repl-print-connection-info-for-file
-  [file-id]
-  (some->> (repl-get-connections-for-file file-id)
-           (map repl-get-connection-info)
-           (pp/pprint)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; WEBSOCKET HANDLER
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 (defmulti handle-message
-  (fn [_ _ message]
+  (fn [_ message]
    (:type message)))

 (defmethod handle-message :connect
-  [cfg wsp _]
+  [wsp _]
+  (l/trace :fn "handle-message" :event :connect)

-  (let [msgbus     (::mbus/msgbus cfg)
-        conn-id    (::ws/id @wsp)
+  (let [msgbus-fn  (:msgbus @wsp)
        profile-id (::profile-id @wsp)
        session-id (::session-id @wsp)
        output-ch  (::ws/output-ch @wsp)
@@ -129,232 +38,186 @@
        xform      (remove #(= (:session-id %) session-id))
        channel    (a/chan (a/dropping-buffer 16) xform)]

-    (l/trace :fn "handle-message" :event "connect" :conn-id conn-id)
-
-    ;; Subscribe to the profile channel and forward all messages to
-    ;; websocket output channel (send them to the client).
-    (swap! wsp assoc ::profile-subscription channel)
+    (swap! wsp assoc ::profile-subs-channel channel)
    (a/pipe channel output-ch false)
-    (mbus/sub! msgbus :topic profile-id :chan channel)))
+    (msgbus-fn :cmd :sub :topic profile-id :chan channel)))

 (defmethod handle-message :disconnect
-  [cfg wsp _]
-  (let [msgbus     (::mbus/msgbus cfg)
-        conn-id    (::ws/id @wsp)
-        profile-id (::profile-id @wsp)
-        session-id (::session-id @wsp)
-        profile-ch (::profile-subscription @wsp)
-        fsub       (::file-subscription @wsp)
-        tsub       (::team-subscription @wsp)
+  [wsp _]
+  (l/trace :fn "handle-message" :event :disconnect)
+  (a/go
+    (let [msgbus-fn  (:msgbus @wsp)
+          profile-id (::profile-id @wsp)
+          session-id (::session-id @wsp)
+          profile-ch (::profile-subs-channel @wsp)
+          subs       (::subscriptions @wsp)]

-        message    {:type :disconnect
-                    :subs-id profile-id
-                    :profile-id profile-id
-                    :session-id session-id}]
-
-    (l/trace :fn "handle-message"
-             :event :disconnect
-             :conn-id conn-id)
-
-    (a/go
      ;; Close the main profile subscription
      (a/close! profile-ch)
-      (a/<! (mbus/purge! msgbus [profile-ch]))
+      (a/<! (msgbus-fn :cmd :purge :chans [profile-ch]))

-      ;; Close tram subscription if exists
-      (when-let [channel (:channel tsub)]
+      ;; Close all other active subscrption on this websocket context.
+      (doseq [{:keys [channel topic]} (map second subs)]
        (a/close! channel)
-        (a/<! (mbus/purge! msgbus channel)))
-
-      (when-let [{:keys [topic channel]} fsub]
-        (a/close! channel)
-        (a/<! (mbus/purge! msgbus channel))
-        (a/<! (mbus/pub! msgbus :topic topic :message message))))))
+        (a/<! (msgbus-fn :cmd :pub :topic topic
+                         :message {:type :disconnect
+                                   :profile-id profile-id
+                                   :session-id session-id}))
+        (a/<! (msgbus-fn :cmd :purge :chans [channel]))))))

 (defmethod handle-message :subscribe-team
-  [cfg wsp {:keys [team-id] :as params}]
-  (let [msgbus     (::mbus/msgbus cfg)
-        conn-id    (::ws/id @wsp)
+  [wsp {:keys [team-id] :as params}]
+  (l/trace :fn "handle-message" :event :subscribe-team :team-id team-id)
+
+  (let [msgbus-fn  (:msgbus @wsp)
        session-id (::session-id @wsp)
        output-ch  (::ws/output-ch @wsp)
-        prev-subs  (get @wsp ::team-subscription)
+        subs       (get-in @wsp [::subscriptions team-id])
        xform      (comp
                    (remove #(= (:session-id %) session-id))
-                    (map #(assoc % :subs-id team-id)))
-
-        channel    (a/chan (a/dropping-buffer 64) xform)]
-
-    (l/trace :fn "handle-message"
-             :event :subscribe-team
-             :team-id team-id
-             :conn-id conn-id)
-
-    (a/pipe channel output-ch false)
-
-    (let [state {:team-id team-id :channel channel :topic team-id}]
-      (swap! wsp assoc ::team-subscription state))
+                    (map #(assoc % :subs-id team-id)))]

    (a/go
-      ;; Close previous subscription if exists
-      (when-let [channel (:channel prev-subs)]
-        (a/close! channel)
-        (a/<! (mbus/purge! msgbus channel))))
+      (when (not= (:team-id subs) team-id)
+        ;; if it exists we just need to close that
+        (when-let [channel (:channel subs)]
+          (a/close! channel)
+          (a/<! (msgbus-fn :cmd :purge :chans [channel])))

-    (a/go
-      (a/<! (mbus/sub! msgbus :topic team-id :chan channel)))))
+
+        (let [channel (a/chan (a/dropping-buffer 64) xform)]
+          ;; Message forwarding
+          (a/pipe channel output-ch false)
+
+          (let [state {:team-id team-id :channel channel :topic team-id}]
+            (swap! wsp update ::subscriptions assoc team-id state))
+
+          (a/<! (msgbus-fn :cmd :sub :topic team-id :chan channel)))))))

 (defmethod handle-message :subscribe-file
-  [cfg wsp {:keys [file-id version] :as params}]
-  (let [msgbus     (::mbus/msgbus cfg)
-        conn-id    (::ws/id @wsp)
+  [wsp {:keys [subs-id file-id] :as params}]
+  (l/trace :fn "handle-message" :event :subscribe-file :subs-id subs-id :file-id file-id)
+  (let [msgbus-fn  (:msgbus @wsp)
        profile-id (::profile-id @wsp)
        session-id (::session-id @wsp)
        output-ch  (::ws/output-ch @wsp)
-        prev-subs  (::file-subscription @wsp)
-        xform      (comp (remove #(= (:session-id %) session-id))
-                         (map #(assoc % :subs-id file-id)))
+
+        xform      (comp
+                    (remove #(= (:session-id %) session-id))
+                    (map #(assoc % :subs-id subs-id)))
+
        channel    (a/chan (a/dropping-buffer 64) xform)]

-    (l/trace :fn "handle-message"
-             :event :subscribe-file
-             :file-id file-id
-             :conn-id conn-id)
+    ;; Message forwarding
+    (a/go-loop []
+      (when-let [{:keys [type] :as message} (a/<! channel)]
+        (when (or (= :join-file type)
+                  (= :leave-file type)
+                  (= :disconnect type))
+          (let [message {:type :presence
+                         :file-id file-id
+                         :session-id session-id
+                         :profile-id profile-id}]
+            (a/<! (msgbus-fn :cmd :pub
+                             :topic file-id
+                             :message message))))
+        (a/>! output-ch message)
+        (recur)))

    (let [state {:file-id file-id :channel channel :topic file-id}]
-      (swap! wsp assoc ::file-subscription state))
-
-    (a/go
-      ;; Close previous subscription if exists
-      (when-let [channel (:channel prev-subs)]
-        (a/close! channel)
-        (a/<! (mbus/purge! msgbus channel))))
-
-    ;; Message forwarding
-    (a/go
-      (loop []
-        (when-let [{:keys [type] :as message} (a/<! channel)]
-          (when (or (= :join-file type)
-                    (= :leave-file type)
-                    (= :disconnect type))
-            (let [message {:type :presence
-                           :file-id file-id
-                           :session-id session-id
-                           :profile-id profile-id
-                           :version version}]
-              (a/<! (mbus/pub! msgbus :topic file-id :message message))))
-          (a/>! output-ch message)
-          (recur))))
+      (swap! wsp update ::subscriptions assoc subs-id state))

    (a/go
      ;; Subscribe to file topic
-      (a/<! (mbus/sub! msgbus :topic file-id :chan channel))
+      (a/<! (msgbus-fn :cmd :sub :topic file-id :chan channel))

      ;; Notifify the rest of participants of the new connection.
      (let [message {:type :join-file
                     :file-id file-id
-                     :subs-id file-id
                     :session-id session-id
                     :profile-id profile-id}]
-        (a/<! (mbus/pub! msgbus :topic file-id :message message))))))
+        (a/<! (msgbus-fn :cmd :pub
+                         :topic file-id
+                         :message message))))))

 (defmethod handle-message :unsubscribe-file
-  [cfg wsp {:keys [file-id] :as params}]
-  (let [msgbus     (::mbus/msgbus cfg)
-        conn-id    (::ws/id @wsp)
+  [wsp {:keys [subs-id] :as params}]
+  (l/trace :fn "handle-message" :event :unsubscribe-file :subs-id subs-id)
+  (let [msgbus-fn  (:msgbus @wsp)
        session-id (::session-id @wsp)
-        profile-id (::profile-id @wsp)
-        subs       (::file-subscription @wsp)
-
-        message    {:type :leave-file
-                    :file-id file-id
-                    :session-id session-id
-                    :profile-id profile-id}]
-
-    (l/trace :fn "handle-message"
-             :event :unsubscribe-file
-             :file-id file-id
-             :conn-id conn-id)
-
+        profile-id (::profile-id @wsp)]
    (a/go
-      (when (= (:file-id subs) file-id)
-        (let [channel (:channel subs)]
+      (when-let [{:keys [file-id channel]} (get-in @wsp [::subscriptions subs-id])]
+        (let [message {:type :leave-file
+                       :file-id file-id
+                       :session-id session-id
+                       :profile-id profile-id}]
          (a/close! channel)
-          (a/<! (mbus/purge! msgbus channel))
-          (a/<! (mbus/pub! msgbus :topic file-id :message message)))))))
+          (a/<! (msgbus-fn :cmd :pub :topic file-id :message message))
+          (a/<! (msgbus-fn :cmd :purge :chans [channel])))))))

 (defmethod handle-message :keepalive
-  [_ _ _]
+  [_ _]
  (l/trace :fn "handle-message" :event :keepalive)
  (a/go :nothing))

 (defmethod handle-message :pointer-update
-  [cfg wsp {:keys [file-id] :as message}]
-  (let [msgbus     (::mbus/msgbus cfg)
-        profile-id (::profile-id @wsp)
-        session-id (::session-id @wsp)
-        subs       (::file-subscription @wsp)
-        message    (-> message
-                       (assoc :subs-id file-id)
-                       (assoc :profile-id profile-id)
-                       (assoc :session-id session-id))]
-    (a/go
-      ;; Only allow receive pointer updates when active subscription
-      (when subs
-        (a/<! (mbus/pub! msgbus :topic file-id :message message))))))
+  [wsp {:keys [subs-id] :as message}]
+  (a/go
+    ;; Only allow receive pointer updates when active subscription
+    (when-let [{:keys [topic]} (get-in @wsp [::subscriptions subs-id])]
+      (let [msgbus-fn  (:msgbus @wsp)
+            profile-id (::profile-id @wsp)
+            session-id (::session-id @wsp)
+            message    (-> message
+                           (dissoc :subs-id)
+                           (assoc :profile-id profile-id)
+                           (assoc :session-id session-id))]
+
+        (a/<! (msgbus-fn :cmd :pub
+                         :topic topic
+                         :message message))))))

 (defmethod handle-message :default
-  [_ wsp message]
-  (let [conn-id (::ws/id @wsp)]
-    (l/warn :hint "received unexpected message"
-            :message message
-            :conn-id conn-id)
-    (a/go :none)))
+  [_ message]
+  (a/go
+    (l/log :level :warn
+           :msg "received unexpected message"
+           :message message)))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; HTTP HANDLER
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+(s/def ::msgbus fn?)
 (s/def ::session-id ::us/uuid)
+
 (s/def ::handler-params
  (s/keys :req-un [::session-id]))

-(defn- http-handler
-  [cfg {:keys [params ::session/profile-id] :as request} respond raise]
-  (let [{:keys [session-id]} (us/conform ::handler-params params)]
-    (cond
-      (not profile-id)
-      (raise (ex/error :type :authentication
-                       :hint "Authentication required."))
+(defmethod ig/pre-init-spec ::handler [_]
+  (s/keys :req-un [::msgbus ::db/pool ::mtx/metrics]))

-      (not (yws/upgrade-request? request))
-      (raise (ex/error :type :validation
-                       :code :websocket-request-expected
-                       :hint "this endpoint only accepts websocket connections"))
-
-      :else
-      (do
-        (l/trace :hint "websocket request" :profile-id profile-id :session-id session-id)
-
-        (->> (ws/handler
-              ::ws/on-rcv-message (partial on-rcv-message cfg)
-              ::ws/on-snd-message (partial on-snd-message cfg)
-              ::ws/on-connect (partial on-connect cfg)
-              ::ws/handler (partial handle-message cfg)
-              ::profile-id profile-id
-              ::session-id session-id)
-             (yws/upgrade request)
-             (respond))))))
-
-(defmethod ig/pre-init-spec ::routes [_]
-  (s/keys :req [::mbus/msgbus
-                ::mtx/metrics
-                ::db/pool
-                ::session/manager]))
-
-(s/def ::routes vector?)
-
-(defmethod ig/init-key ::routes
+(defmethod ig/init-key ::handler
  [_ cfg]
-  ["/ws/notifications" {:middleware [[session/authz cfg]]
-                        :handler (partial http-handler cfg)
-                        :allowed-methods #{:get}}])
+  (fn [{:keys [profile-id params] :as req} respond raise]
+    (let [{:keys [session-id]} (us/conform ::handler-params params)
+          cfg    (-> cfg
+                     (assoc ::profile-id profile-id)
+                     (assoc ::session-id session-id))]
+
+      (l/trace :hint "http request to websocket" :profile-id profile-id :session-id session-id)
+      (cond
+        (not profile-id)
+        (raise (ex/error :type :authentication
+                         :hint "Authentication required."))
+
+        (not (yws/upgrade-request? req))
+        (raise (ex/error :type :validation
+                         :code :websocket-request-expected
+                         :hint "this endpoint only accepts websocket connections"))
+
+        :else
+        (->> (ws/handler handle-message cfg)
+             (yws/upgrade req)
+             (respond))))))
--- a/backend/src/app/loggers/audit.clj
+++ b/backend/src/app/loggers/audit.clj
@@ -2,13 +2,12 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.loggers.audit
  "Services related to the user activity (audit log)."
  (:require
   [app.common.data :as d]
-   [app.common.data.macros :as dm]
   [app.common.exceptions :as ex]
   [app.common.logging :as l]
   [app.common.spec :as us]
@@ -16,31 +15,24 @@
   [app.common.uuid :as uuid]
   [app.config :as cf]
   [app.db :as db]
-   [app.http.client :as http]
-   [app.loggers.audit.tasks :as-alias tasks]
-   [app.loggers.webhooks :as-alias webhooks]
-   [app.main :as-alias main]
-   [app.rpc :as-alias rpc]
-   [app.tokens :as tokens]
-   [app.util.retry :as rtry]
+   [app.util.async :as aa]
   [app.util.time :as dt]
   [app.worker :as wrk]
+   [clojure.core.async :as a]
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
   [integrant.core :as ig]
   [lambdaisland.uri :as u]
+   [promesa.core :as p]
   [promesa.exec :as px]
-   [yetti.request :as yrq]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+   [yetti.request :as yrq]
+   [yetti.response :as yrs]))

 (defn parse-client-ip
  [request]
  (or (some-> (yrq/get-header request "x-forwarded-for") (str/split ",") first)
      (yrq/get-header request "x-real-ip")
-      (some-> (yrq/remote-addr request) str)))
+      (yrq/remote-addr request)))

 (defn extract-utm-params
  "Extracts additional data from params and namespace them under
@@ -56,195 +48,231 @@
                (assoc (->> sk str/kebab (keyword "penpot")) v))))]
    (reduce-kv process-param {} params)))

-(def ^:private
-  profile-props
-  [:id
-   :is-active
-   :is-muted
-   :auth-backend
-   :email
-   :default-team-id
-   :default-project-id
-   :fullname
-   :lang])
-
 (defn profile->props
  [profile]
  (-> profile
-      (select-keys profile-props)
+      (select-keys [:is-active :is-muted :auth-backend :email :default-team-id :default-project-id :fullname :lang])
      (merge (:props profile))
      (d/without-nils)))

-(def reserved-props
-  #{:session-id
-    :password
-    :old-password
-    :token})
-
 (defn clean-props
-  [props]
-  (into {}
-        (comp
-         (d/without-nils)
-         (d/without-qualified)
-         (remove #(contains? reserved-props (key %))))
-        props))
+  [{:keys [profile-id] :as event}]
+  (let [invalid-keys #{:session-id
+                       :password
+                       :old-password
+                       :token}
+        xform (comp
+               (remove (fn [kv]
+                         (qualified-keyword? (first kv))))
+               (remove (fn [kv]
+                         (contains? invalid-keys (first kv))))
+               (remove (fn [[k v]]
+                         (and (= k :profile-id)
+                              (= v profile-id))))
+               (filter (fn [[_ v]]
+                         (or (string? v)
+                             (keyword? v)
+                             (uuid? v)
+                             (boolean? v)
+                             (number? v)))))]

-;; --- SPECS
+    (update event :props #(into {} xform %))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; HTTP Handler
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(declare persist-http-events)

 (s/def ::profile-id ::us/uuid)
 (s/def ::name ::us/string)
 (s/def ::type ::us/string)
 (s/def ::props (s/map-of ::us/keyword any?))
-(s/def ::ip-addr ::us/string)
+(s/def ::timestamp dt/instant?)
+(s/def ::context (s/map-of ::us/keyword any?))

-(s/def ::webhooks/event? ::us/boolean)
-(s/def ::webhooks/batch-timeout ::dt/duration)
-(s/def ::webhooks/batch-key
-  (s/or :fn fn? :str string? :kw keyword?))
+(s/def ::frontend-event
+  (s/keys :req-un [::type ::name ::props ::timestamp ::profile-id]
+          :opt-un [::context]))

-(s/def ::event
-  (s/keys :req-un [::type ::name ::profile-id]
-          :opt-un [::ip-addr ::props]
-          :opt [::webhooks/event?
-                ::webhooks/batch-timeout
-                ::webhooks/batch-key]))
+(s/def ::frontend-events (s/every ::frontend-event))
+
+(defmethod ig/init-key ::http-handler
+  [_  {:keys [executor pool] :as cfg}]
+  (if (or (db/read-only? pool) (not (contains? cf/flags :audit-log)))
+    (do
+      (l/warn :hint "audit log http handler disabled or db is read-only")
+      (fn [_ respond _]
+        (respond (yrs/response 204))))
+
+    (letfn [(handler [{:keys [profile-id] :as request}]
+              (let [events  (->> (:events (:params request))
+                                 (remove #(not= profile-id (:profile-id %)))
+                                 (us/conform ::frontend-events))
+
+                    ip-addr (parse-client-ip request)
+                    cfg     (-> cfg
+                                (assoc :source "frontend")
+                                (assoc :events events)
+                                (assoc :ip-addr ip-addr))]
+                (persist-http-events cfg)))
+
+            (handle-error [cause]
+              (let [xdata (ex-data cause)]
+                (if (= :spec-validation (:code xdata))
+                  (l/error ::l/raw (str "spec validation on persist-events:\n" (us/pretty-explain xdata)))
+                  (l/error :hint "error on persist-events" :cause cause))))]
+
+      (fn [request respond _]
+        ;; Fire and forget, log error in case of errro
+        (-> (px/submit! executor #(handler request))
+            (p/catch handle-error))
+
+        (respond (yrs/response 204))))))
+
+(defn- persist-http-events
+  [{:keys [pool events ip-addr source] :as cfg}]
+  (let [columns    [:id :name :source :type :tracked-at :profile-id :ip-addr :props :context]
+        prepare-xf (map (fn [event]
+                          [(uuid/next)
+                           (:name event)
+                           source
+                           (:type event)
+                           (:timestamp event)
+                           (:profile-id event)
+                           (db/inet ip-addr)
+                           (db/tjson (:props event))
+                           (db/tjson (d/without-nils (:context event)))]))]
+    (when (seq events)
+      (->> (into [] prepare-xf events)
+           (db/insert-multi! pool :audit-log columns)))))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; COLLECTOR
+;; Collector
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; Defines a service that collects the audit/activity log using
 ;; internal database. Later this audit log can be transferred to
 ;; an external storage and data cleared.

-(s/def ::collector
-  (s/keys :req [::wrk/executor ::db/pool]))
+(declare persist-events)

 (defmethod ig/pre-init-spec ::collector [_]
-  (s/keys :req [::db/pool ::wrk/executor]))
+  (s/keys :req-un [::db/pool ::wrk/executor]))
+
+(s/def ::ip-addr string?)
+(s/def ::backend-event
+  (s/keys :req-un [::type ::name ::profile-id]
+          :opt-un [::ip-addr ::props]))
+
+(def ^:private backend-event-xform
+  (comp
+   (filter #(us/valid? ::backend-event %))
+   (map clean-props)))

 (defmethod ig/init-key ::collector
-  [_ {:keys [::db/pool] :as cfg}]
+  [_ {:keys [pool] :as cfg}]
  (cond
+    (not (contains? cf/flags :audit-log))
+    (do
+      (l/info :hint "audit log collection disabled")
+      (constantly nil))
+
    (db/read-only? pool)
-    (l/warn :hint "audit: disabled (db is read-only)")
+    (do
+      (l/warn :hint "audit log collection disabled, db is read-only")
+      (constantly nil))

    :else
-    cfg))
+    (let [input  (a/chan 512 backend-event-xform)
+          buffer (aa/batch input {:max-batch-size 100
+                                  :max-batch-age (* 10 1000) ; 10s
+                                  :init []})]
+      (l/info :hint "audit log collector initialized")
+      (a/go-loop []
+        (when-let [[_type events] (a/<! buffer)]
+          (let [res (a/<! (persist-events cfg events))]
+            (when (ex/exception? res)
+              (l/error :hint "error on persisting events" :cause res))
+            (recur))))

-(defn- handle-event!
-  [conn-or-pool event]
-  (us/verify! ::event event)
-  (let [params {:id (uuid/next)
-                :name (:name event)
-                :type (:type event)
-                :profile-id (:profile-id event)
-                :ip-addr (:ip-addr event)
-                :props (:props event)}]
+      (fn [& {:keys [cmd] :as params}]
+        (case cmd
+          :stop
+          (a/close! input)

-    (when (contains? cf/flags :audit-log)
-      ;; NOTE: this operation may cause primary key conflicts on inserts
-      ;; because of the timestamp precission (two concurrent requests), in
-      ;; this case we just retry the operation.
-      (rtry/with-retry {::rtry/when rtry/conflict-exception?
-                        ::rtry/max-retries 6
-                        ::rtry/label "persist-audit-log"}
-        (let [now (dt/now)]
-          (db/insert! conn-or-pool :audit-log
-                      (-> params
-                          (update :props db/tjson)
-                          (update :ip-addr db/inet)
-                          (assoc :created-at now)
-                          (assoc :tracked-at now)
-                          (assoc :source "backend"))))))
+          :submit
+          (let [params (-> params
+                           (dissoc :cmd)
+                           (assoc :tracked-at (dt/now)))]
+            (when-not (a/offer! input params)
+              (l/warn :hint "activity channel is full"))))))))

-    (when (and (contains? cf/flags :webhooks)
-               (::webhooks/event? event))
-      (let [batch-key     (::webhooks/batch-key event)
-            batch-timeout (::webhooks/batch-timeout event)
-            label         (dm/str "rpc:" (:name params))
-            label         (cond
-                            (ifn? batch-key)    (dm/str label ":" (batch-key (::rpc/params event)))
-                            (string? batch-key) (dm/str label ":" batch-key)
-                            :else               label)
-            dedupe?       (boolean (and batch-key batch-timeout))]
-
-        (wrk/submit! ::wrk/conn conn-or-pool
-                     ::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."
-  [{:keys [::wrk/executor] :as cfg} params]
-  (let [conn (or (::db/conn cfg) (::db/pool cfg))]
-    (us/assert! ::wrk/executor executor)
-    (us/assert! ::db/pool-or-conn conn)
-    (try
-      (handle-event! conn (d/without-nils params))
-      (catch Throwable cause
-        (l/error :hint "audit: unexpected error processing event" :cause cause)))))
+(defn- persist-events
+  [{:keys [pool executor] :as cfg} events]
+  (letfn [(event->row [event]
+            [(uuid/next)
+             (:name event)
+             (:type event)
+             (:profile-id event)
+             (:tracked-at event)
+             (some-> (:ip-addr event) db/inet)
+             (db/tjson (:props event))
+             "backend"])]
+    (aa/with-thread executor
+      (when (seq events)
+        (db/with-atomic [conn pool]
+          (db/insert-multi! conn :audit-log
+                            [:id :name :type :profile-id :tracked-at :ip-addr :props :source]
+                            (sequence (keep event->row) events)))))))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; TASK: ARCHIVE
+;; Archive Task
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; This is a task responsible to send the accumulated events to
+;; This is a task responsible to send the accumulated events to an
 ;; external service for archival.

 (declare archive-events)

-(s/def ::tasks/uri ::us/string)
+(s/def ::http-client fn?)
+(s/def ::uri ::us/string)
+(s/def ::tokens fn?)

-(defmethod ig/pre-init-spec ::tasks/archive-task [_]
-  (s/keys :req [::db/pool ::main/props ::http/client]))
+(defmethod ig/pre-init-spec ::archive-task [_]
+  (s/keys :req-un [::db/pool ::tokens ::http-client]
+          :opt-un [::uri]))

-(defmethod ig/init-key ::tasks/archive
-  [_ cfg]
-  (fn [params]
+(defmethod ig/init-key ::archive-task
+  [_ {:keys [uri] :as cfg}]
+  (fn [props]
    ;; NOTE: this let allows overwrite default configured values from
    ;; the repl, when manually invoking the task.
    (let [enabled (or (contains? cf/flags :audit-log-archive)
-                      (:enabled params false))
-          uri     (cf/get :audit-log-archive-uri)
-          uri     (or uri (:uri params))
-          cfg     (assoc cfg ::uri uri)]
+                      (:enabled props false))
+          uri     (or uri (:uri props))
+          cfg     (assoc cfg :uri uri)]

      (when (and enabled (not uri))
        (ex/raise :type :internal
                  :code :task-not-configured
                  :hint "archive task not configured, missing uri"))
-
      (when enabled
-        (loop [total 0]
-          (let [n (archive-events cfg)]
-            (if n
-              (do
-                (px/sleep 100)
-                (recur (+ total n)))
-              (when (pos? total)
-                (l/debug :hint "events archived" :total total)))))))))
+        (loop []
+          (let [res (archive-events cfg)]
+            (when (= res :continue)
+              (aa/thread-sleep 200)
+              (recur))))))))

-(def ^:private sql:retrieve-batch-of-audit-log
-  "select *
-     from audit_log
+(def sql:retrieve-batch-of-audit-log
+  "select * from audit_log
    where archived_at is null
    order by created_at asc
-    limit 128
+    limit 256
      for update skip locked;")

 (defn archive-events
-  [{:keys [::db/pool ::uri] :as cfg}]
+  [{:keys [pool uri tokens http-client] :as cfg}]
  (letfn [(decode-row [{:keys [props ip-addr context] :as row}]
            (cond-> row
              (db/pgobject? props)
@@ -268,10 +296,9 @@
                              :context]))

          (send [events]
-            (let [token   (tokens/generate (::main/props cfg)
-                                           {:iss "authentication"
-                                            :iat (dt/now)
-                                            :uid uuid/zero})
+            (let [token   (tokens :generate {:iss "authentication"
+                                             :iat (dt/now)
+                                             :uid uuid/zero})
                  body    (t/encode {:events events})
                  headers {"content-type" "application/transit+json"
                           "origin" (cf/get :public-uri)
@@ -281,7 +308,7 @@
                           :method :post
                           :headers headers
                           :body body}
-                  resp    (http/req! cfg params {:sync? true})]
+                  resp    (http-client params {:sync? true})]
              (if (= (:status resp) 204)
                true
                (do
@@ -302,30 +329,34 @@
                         (map row->event))
            events (into [] xform rows)]
        (when-not (empty? events)
-          (l/trace :hint "archive events chunk" :uri uri :events (count events))
+          (l/debug :action "archive-events" :uri uri :events (count events))
          (when (send events)
            (mark-as-archived conn rows)
-            (count events)))))))
+            :continue))))))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; GC Task
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-(def ^:private sql:clean-archived
+(def sql:clean-archived
  "delete from audit_log
-    where archived_at is not null")
+    where archived_at is not null
+      and archived_at < now() - ?::interval")

 (defn- clean-archived
-  [{:keys [::db/pool]}]
-  (let [result (db/exec-one! pool [sql:clean-archived])
-        result (:next.jdbc/update-count result)]
-    (l/debug :hint "delete archived audit log entries" :deleted result)
+  [{:keys [pool max-age]}]
+  (let [interval (db/interval max-age)
+        result   (db/exec-one! pool [sql:clean-archived interval])
+        result   (:next.jdbc/update-count result)]
+    (l/debug :action "clean archived audit log" :removed result)
    result))

-(defmethod ig/pre-init-spec ::tasks/gc [_]
-  (s/keys :req [::db/pool]))
+(s/def ::max-age ::cf/audit-log-gc-max-age)

-(defmethod ig/init-key ::tasks/gc
+(defmethod ig/pre-init-spec ::gc-task [_]
+  (s/keys :req-un [::db/pool ::max-age]))
+
+(defmethod ig/init-key ::gc-task
  [_ cfg]
  (fn [_]
    (clean-archived cfg)))
--- a/backend/src/app/loggers/database.clj
+++ b/backend/src/app/loggers/database.clj
@@ -2,22 +2,21 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.loggers.database
  "A specific logger impl that persists errors on the database."
  (:require
-   [app.common.data :as d]
-   [app.common.exceptions :as ex]
   [app.common.logging :as l]
-   [app.common.pprint :as pp]
-   [app.common.spec :as us]
+   [app.common.uuid :as uuid]
   [app.config :as cf]
   [app.db :as db]
+   [app.util.async :as aa]
+   [app.worker :as wrk]
+   [clojure.core.async :as a]
   [clojure.spec.alpha :as s]
-   [integrant.core :as ig]
-   [promesa.exec :as px]
-   [promesa.exec.csp :as sp]))
+   [cuerdas.core :as str]
+   [integrant.core :as ig]))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Error Listener
@@ -28,81 +27,66 @@
 (defonce enabled (atom true))

 (defn- persist-on-database!
-  [pool id report]
+  [{:keys [pool] :as cfg} {:keys [id] :as event}]
  (when-not (db/read-only? pool)
-    (db/insert! pool :server-error-report
-                {:id id
-                 :version 2
-                 :content (db/tjson report)})))
+    (db/insert! pool :server-error-report {:id id :content (db/tjson event)})))

-(defn record->report
-  [{:keys [::l/context ::l/message ::l/props ::l/logger ::l/level ::l/cause] :as record}]
-  (us/assert! ::l/record record)
+(defn- parse-event-data
+  [event]
+  (reduce-kv
+   (fn [acc k v]
+     (cond
+       (= k :id)         (assoc acc k (uuid/uuid v))
+       (= k :profile-id) (assoc acc k (uuid/uuid v))
+       (str/blank? v)    acc
+       :else             (assoc acc k v)))
+   {}
+   event))

-  (merge
-   {:context (-> context
-                 (assoc :tenant (cf/get :tenant))
-                 (assoc :host (cf/get :host))
-                 (assoc :public-uri (cf/get :public-uri))
-                 (assoc :version (:full cf/version))
-                 (assoc :logger-name logger)
-                 (assoc :logger-level level)
-                 (dissoc :params)
-                 (pp/pprint-str :width 200))
-    :params  (some-> (:params context)
-                     (pp/pprint-str :width 200))
-    :props   (pp/pprint-str props :width 200)
-    :hint    (or (ex-message cause) @message)
-    :trace   (ex/format-throwable cause :data? false :explain? false :header? false :summary? false)}
+(defn parse-event
+  [event]
+  (-> (parse-event-data event)
+      (assoc :tenant (cf/get :tenant))
+      (assoc :host (cf/get :host))
+      (assoc :public-uri (cf/get :public-uri))
+      (assoc :version (:full cf/version))
+      (update :id #(or % (uuid/next)))))

-   (when-let [data (ex-data cause)]
-     {:spec-value    (some-> (::s/value data) (pp/pprint-str :width 200))
-      :spec-explain  (ex/explain data)
-      :data          (-> data
-                         (dissoc ::s/problems ::s/value ::s/spec :hint)
-                         (pp/pprint-str :width 200))})))
+(defn handle-event
+  [{:keys [executor] :as cfg} event]
+  (aa/with-thread executor
+    (try
+      (let [event (parse-event event)
+            uri   (cf/get :public-uri)]

-(defn- handle-event
-  [{:keys [::db/pool]} {:keys [::l/id] :as record}]
-  (try
-    (let [uri    (cf/get :public-uri)
-          report (-> record record->report d/without-nils)]
-      (l/debug :hint "registering error on database" :id id
-               :uri (str uri "/dbg/error/" id))
+        (l/debug :hint "registering error on database" :id (:id event)
+                 :uri (str uri "/dbg/error/" (:id event)))

-      (persist-on-database! pool id report))
-    (catch Throwable cause
-      (l/warn :hint "unexpected exception on database error logger" :cause cause))))
-
-(defn error-record?
-  [{:keys [::l/level ::l/cause]}]
-  (and (= :error level)
-       (ex/exception? cause)))
+        (persist-on-database! cfg event))
+      (catch Exception cause
+        (l/warn :hint "unexpected exception on database error logger" :cause cause)))))

 (defmethod ig/pre-init-spec ::reporter [_]
-  (s/keys :req [::db/pool]))
+  (s/keys :req-un [::wrk/executor ::db/pool ::receiver]))
+
+(defn error-event?
+  [event]
+  (= "error" (:logger/level event)))

 (defmethod ig/init-key ::reporter
-  [_ cfg]
-  (let [input (sp/chan (sp/sliding-buffer 32) (filter error-record?))]
-    (add-watch l/log-record ::reporter #(sp/put! input %4))
-    (px/thread
-      {:name "penpot/database-reporter" :virtual true}
-      (l/info :hint "initializing database error persistence")
-      (try
-        (loop []
-          (when-let [record (sp/take! input)]
-            (handle-event cfg record)
-            (recur)))
-        (catch InterruptedException _
-          (l/debug :hint "reporter interrupted"))
-        (catch Throwable cause
-          (l/error :hint "unexpected error" :cause cause))
-        (finally
-          (sp/close! input)
-          (remove-watch l/log-record ::reporter)
-          (l/info :hint "reporter terminated"))))))
+  [_ {:keys [receiver] :as cfg}]
+  (l/info :msg "initializing database error persistence")
+  (let [output (a/chan (a/sliding-buffer 5) (filter error-event?))]
+    (receiver :sub output)
+    (a/go-loop []
+      (let [msg (a/<! output)]
+        (if (nil? msg)
+          (l/info :msg "stoping error reporting loop")
+          (do
+            (a/<! (handle-event cfg msg))
+            (recur)))))
+    output))

 (defmethod ig/halt-key! ::reporter
-  [_ thread]
-  (some-> thread px/interrupt!))
+  [_ output]
+  (a/close! output))
--- a/backend/src/app/loggers/loki.clj
+++ b/backend/src/app/loggers/loki.clj
@@ -0,0 +1,93 @@
+;; 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) UXBOX Labs SL
+
+(ns app.loggers.loki
+  "A Loki integration."
+  (:require
+   [app.common.logging :as l]
+   [app.common.spec :as us]
+   [app.config :as cfg]
+   [app.util.json :as json]
+   [clojure.core.async :as a]
+   [clojure.spec.alpha :as s]
+   [integrant.core :as ig]))
+
+(declare ^:private handle-event)
+(declare ^:private start-rcv-loop)
+
+(s/def ::uri ::us/string)
+(s/def ::receiver fn?)
+(s/def ::http-client fn?)
+
+(defmethod ig/pre-init-spec ::reporter [_]
+  (s/keys :req-un [ ::receiver ::http-client]
+          :opt-un [::uri]))
+
+(defmethod ig/init-key ::reporter
+  [_ {:keys [receiver uri] :as cfg}]
+  (when uri
+    (l/info :msg "initializing loki reporter" :uri uri)
+    (let [input (a/chan (a/dropping-buffer 2048))]
+      (receiver :sub input)
+
+      (doto (Thread. #(start-rcv-loop cfg input))
+        (.setDaemon true)
+        (.setName "penpot/loki-sender")
+        (.start))
+
+      input)))
+
+(defmethod ig/halt-key! ::reporter
+  [_ output]
+  (when output
+    (a/close! output)))
+
+(defn- start-rcv-loop
+  [cfg input]
+  (loop []
+    (let [msg (a/<!! input)]
+      (when-not (nil? msg)
+        (handle-event cfg msg)
+        (recur))))
+
+  (l/info :msg "stoping error reporting loop"))
+
+(defn- prepare-payload
+  [event]
+  (let [labels {:host    (cfg/get :host)
+                :tenant  (cfg/get :tenant)
+                :version (:full cfg/version)
+                :logger  (:logger/name event)
+                :level   (:logger/level event)}]
+    {:streams
+     [{:stream labels
+       :values [[(str (* (inst-ms (:created-at event)) 1000000))
+                 (str (:message event)
+                      (when-let [error (:trace event)]
+                        (str "\n" error)))]]}]}))
+
+
+(defn- make-request
+  [{:keys [http-client uri] :as cfg} payload]
+  (http-client {:uri uri
+                :timeout 3000
+                :method :post
+                :headers {"content-type" "application/json"}
+                :body (json/write payload)}
+               {:sync? true}))
+
+(defn- handle-event
+  [cfg event]
+  (try
+    (let [payload  (prepare-payload event)
+          response (make-request cfg payload)]
+      (when-not (= 204 (:status response))
+        (map? response)
+        (l/error :hint "error on sending log to loki (unexpected response)"
+                 :response (pr-str response))))
+    (catch Throwable cause
+      (l/error :hint "error on sending log to loki (unexpected exception)"
+               :cause cause))))
--- a/backend/src/app/loggers/mattermost.clj
+++ b/backend/src/app/loggers/mattermost.clj
@@ -2,97 +2,74 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.loggers.mattermost
  "A mattermost integration for error reporting."
  (:require
-   [app.common.exceptions :as ex]
   [app.common.logging :as l]
-   [app.common.spec :as us]
   [app.config :as cf]
-   [app.http.client :as http]
   [app.loggers.database :as ldb]
   [app.util.json :as json]
+   [clojure.core.async :as a]
   [clojure.spec.alpha :as s]
   [integrant.core :as ig]
-   [promesa.exec :as px]
-   [promesa.exec.csp :as sp]))
+   [promesa.core :as p]))

 (defonce enabled (atom true))

 (defn- send-mattermost-notification!
-  [cfg {:keys [id public-uri] :as report}]
-  (let [text (str "Exception: " public-uri "/dbg/error/" id " "
-                  (when-let [pid (:profile-id report)]
-                    (str "(pid: #uuid-" pid ")"))
-                  "\n"
-                  "```\n"
-                  "- host: `" (:host report) "`\n"
-                  "- tenant: `" (:tenant report) "`\n"
-                  "- version: `" (:version report) "`\n"
-                  "\n"
-                  "Trace:\n"
-                  (:trace report)
-                  "```")
-
-        resp (http/req! cfg
-                        {:uri (cf/get :error-report-webhook)
-                         :method :post
-                         :headers {"content-type" "application/json"}
-                         :body (json/encode-str {:text text})}
-                        {:sync? true})]
-
-    (when (not= 200 (:status resp))
-      (l/warn :hint "error on sending data"
-              :response (pr-str resp)))))
-
-(defn record->report
-  [{:keys [::l/context ::l/id ::l/cause] :as record}]
-  (us/assert! ::l/record record)
-  {:id         id
-   :tenant     (cf/get :tenant)
-   :host       (cf/get :host)
-   :public-uri (cf/get :public-uri)
-   :version    (:full cf/version)
-   :profile-id (:profile-id context)
-   :trace      (ex/format-throwable cause :detail? false :header? false)})
+  [{:keys [http-client] :as cfg} {:keys [host id public-uri] :as event}]
+  (let [uri  (:uri cfg)
+        text (str "Exception on (host: " host ", url: " public-uri "/dbg/error/" id ")\n"
+                  (when-let [pid (:profile-id event)]
+                    (str "- profile-id: #uuid-" pid "\n")))]
+    (p/then
+     (http-client {:uri uri
+                   :method :post
+                   :headers {"content-type" "application/json"}
+                   :body (json/write-str {:text text})})
+     (fn [{:keys [status] :as rsp}]
+       (when (not= status 200)
+         (l/warn :hint "error on sending data to mattermost"
+                 :response (pr-str rsp)))))))

 (defn handle-event
-  [cfg record]
-  (when @enabled
-    (try
-      (let [report (record->report record)]
-        (send-mattermost-notification! cfg report))
-      (catch Throwable cause
-        (l/warn :hint "unhandled error" :cause cause)))))
+  [cfg event]
+  (let [ch (a/chan)]
+    (-> (p/let [event (ldb/parse-event event)]
+          (send-mattermost-notification! cfg event))
+        (p/finally (fn [_ cause]
+                     (when cause
+                       (l/warn :hint "unexpected exception on error reporter" :cause cause))
+                     (a/close! ch))))
+    ch))
+
+(s/def ::http-client fn?)
+(s/def ::uri ::cf/error-report-webhook)

 (defmethod ig/pre-init-spec ::reporter [_]
-  (s/keys :req [::http/client]))
+  (s/keys :req-un [::http-client ::receiver]
+          :opt-un [::uri]))

 (defmethod ig/init-key ::reporter
-  [_ cfg]
-  (when-let [uri (cf/get :error-report-webhook)]
-    (px/thread
-      {:name "penpot/mattermost-reporter"
-       :virtual true}
-      (l/info :hint "initializing error reporter" :uri uri)
-      (let [input (sp/chan (sp/sliding-buffer 128) (filter ldb/error-record?))]
-        (add-watch l/log-record ::reporter #(sp/put! input %4))
-        (try
-          (loop []
-            (when-let [msg (sp/take! input)]
-              (handle-event cfg msg)
-              (recur)))
-          (catch InterruptedException _
-            (l/debug :hint "reporter interrupted"))
-          (catch Throwable cause
-            (l/error :hint "unexpected error" :cause cause))
-          (finally
-            (sp/close! input)
-            (remove-watch l/log-record ::reporter)
-            (l/info :hint "reporter terminated")))))))
+  [_ {:keys [receiver uri] :as cfg}]
+  (when uri
+    (l/info :msg "initializing mattermost error reporter" :uri uri)
+    (let [output (a/chan (a/sliding-buffer 128)
+                         (filter (fn [event]
+                                   (= (:logger/level event) "error"))))]
+      (receiver :sub output)
+      (a/go-loop []
+        (let [msg (a/<! output)]
+          (if (nil? msg)
+            (l/info :msg "stoping error reporting loop")
+            (do
+              (a/<! (handle-event cfg msg))
+              (recur)))))
+      output)))

 (defmethod ig/halt-key! ::reporter
-  [_ thread]
-  (some-> thread px/interrupt!))
+  [_ output]
+  (when output
+    (a/close! output)))
--- a/backend/src/app/loggers/sentry.clj
+++ b/backend/src/app/loggers/sentry.clj
@@ -0,0 +1,170 @@
+;; 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) UXBOX Labs SL
+
+(ns app.loggers.sentry
+  "A mattermost integration for error reporting."
+  (:require
+   [app.common.logging :as l]
+   [app.common.uuid :as uuid]
+   [app.config :as cf]
+   [app.db :as db]
+   [app.util.async :as aa]
+   [app.worker :as wrk]
+   [clojure.core.async :as a]
+   [clojure.spec.alpha :as s]
+   [cuerdas.core :as str]
+   [integrant.core :as ig])
+  (:import
+   io.sentry.Scope
+   io.sentry.IHub
+   io.sentry.Hub
+   io.sentry.NoOpHub
+   io.sentry.protocol.User
+   io.sentry.SentryOptions
+   io.sentry.SentryLevel
+   io.sentry.ScopeCallback))
+
+(defonce enabled (atom true))
+
+(defn- parse-context
+  [event]
+  (reduce-kv
+   (fn [acc k v]
+     (cond
+       (= k :id)         (assoc acc k (uuid/uuid v))
+       (= k :profile-id) (assoc acc k (uuid/uuid v))
+       (str/blank? v)    acc
+       :else             (assoc acc k v)))
+   {}
+   (:context event)))
+
+(defn- parse-event
+  [event]
+  (assoc event :context (parse-context event)))
+
+(defn- build-sentry-options
+  [cfg]
+  (let [version (:base cf/version)]
+    (doto (SentryOptions.)
+      (.setDebug (:debug cfg false))
+      (.setTracesSampleRate (:traces-sample-rate cfg 1.0))
+      (.setDsn (:dsn cfg))
+      (.setServerName (cf/get :host))
+      (.setEnvironment (cf/get :tenant))
+      (.setAttachServerName true)
+      (.setAttachStacktrace (:attach-stack-trace cfg false))
+      (.setRelease (str "backend@" (if (= version "0.0.0") "develop" version))))))
+
+(defn handle-event
+  [^IHub shub event]
+  (letfn [(set-user! [^Scope scope {:keys [context] :as event}]
+            (let [user (User.)]
+              (.setIpAddress ^User user ^String (:ip-addr context))
+              (when-let [pid (:profile-id context)]
+                (.setId ^User user ^String (str pid)))
+              (.setUser scope ^User user)))
+
+          (set-level! [^Scope scope]
+            (.setLevel scope SentryLevel/ERROR))
+
+          (set-context! [^Scope scope {:keys [context] :as event}]
+            (let [uri (str (cf/get :public-uri) "/dbg/error-by-id/" (:id context))]
+              (.setContexts scope "detailed_error_uri" ^String uri))
+            (when-let [vers (:frontend-version event)]
+              (.setContexts scope "frontend_version" ^String vers))
+            (when-let [puri (:public-uri event)]
+              (.setContexts scope "public_uri" ^String (str puri)))
+            (when-let [uagent (:user-agent context)]
+              (.setContexts scope "user_agent" ^String uagent))
+            (when-let [tenant (:tenant event)]
+              (.setTag scope "tenant" ^String tenant))
+            (when-let [type (:error-type context)]
+              (.setTag scope "error_type" ^String  (str type)))
+            (when-let [code (:error-code context)]
+              (.setTag scope "error_code" ^String (str code)))
+            )
+
+          (capture [^Scope scope {:keys [context error] :as event}]
+            (let [msg   (str (:message error) "\n\n"
+
+                             "======================================================\n"
+                             "=================== Params ===========================\n"
+                             "======================================================\n"
+
+                             (:params context) "\n"
+
+                             (when (:explain context)
+                               (str "======================================================\n"
+                                    "=================== Explain ==========================\n"
+                                    "======================================================\n"
+                                    (:explain context) "\n"))
+
+                             (when (:data context)
+                               (str "======================================================\n"
+                                    "=================== Error Data =======================\n"
+                                    "======================================================\n"
+                                    (:data context) "\n"))
+
+                             (str "======================================================\n"
+                                  "=================== Stack Trace ======================\n"
+                                  "======================================================\n"
+                                  (:trace error))
+
+                             "\n")]
+              (set-user! scope event)
+              (set-level! scope)
+              (set-context! scope event)
+              (.captureMessage ^IHub shub msg)
+              ))
+          ]
+    (when @enabled
+      (.withScope ^IHub shub (reify ScopeCallback
+                               (run [_ scope]
+                                 (->> event
+                                      (parse-event)
+                                      (capture scope))))))
+
+    ))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Error Listener
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(s/def ::receiver any?)
+(s/def ::dsn ::cf/sentry-dsn)
+(s/def ::trace-sample-rate ::cf/sentry-trace-sample-rate)
+(s/def ::attach-stack-trace ::cf/sentry-attach-stack-trace)
+(s/def ::debug ::cf/sentry-debug)
+
+(defmethod ig/pre-init-spec ::reporter [_]
+  (s/keys :req-un [::wrk/executor ::db/pool ::receiver]
+          :opt-un [::dsn ::trace-sample-rate ::attach-stack-trace]))
+
+(defmethod ig/init-key ::reporter
+  [_ {:keys [receiver dsn executor] :as cfg}]
+  (l/info :msg "initializing sentry reporter" :dsn dsn)
+  (let [opts   (build-sentry-options cfg)
+        shub   (if dsn
+                 (Hub. ^SentryOptions opts)
+                 (NoOpHub/getInstance))
+        output (a/chan (a/sliding-buffer 128)
+                       (filter #(= (:level %) "error")))]
+    (receiver :sub output)
+    (a/go-loop []
+      (let [event (a/<! output)]
+        (if (nil? event)
+          (do
+            (l/info :msg "stoping error reporting loop")
+            (.close ^IHub shub))
+          (do
+            (a/<! (aa/with-thread executor (handle-event shub event)))
+            (recur)))))
+    output))
+
+(defmethod ig/halt-key! ::reporter
+  [_ output]
+  (when output
+    (a/close! output)))
--- a/backend/src/app/loggers/webhooks.clj
+++ b/backend/src/app/loggers/webhooks.clj
@@ -1,186 +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.loggers.webhooks
-  "A mattermost integration for error reporting."
-  (:require
-   [app.common.data :as d]
-   [app.common.data.macros :as dm]
-   [app.common.logging :as l]
-   [app.common.transit :as t]
-   [app.common.uri :as uri]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.http.client :as http]
-   [app.util.json :as json]
-   [app.util.time :as dt]
-   [app.worker :as wrk]
-   [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
-   [integrant.core :as ig]))
-
-;; --- HELPERS
-
-(defn key-fn
-  [k & keys]
-  (fn [params]
-    (reduce #(dm/str %1 ":" (get params %2))
-            (dm/str (get params k))
-            keys)))
-
-;; --- PROC
-
-(defn- lookup-webhooks-by-team
-  [pool team-id]
-  (db/exec! pool ["select w.* from webhook as w where team_id=? and is_active=true" team-id]))
-
-(defn- lookup-webhooks-by-project
-  [pool project-id]
-  (let [sql [(str "select w.* from webhook as w"
-                  "  join project as p on (p.team_id = w.team_id)"
-                  " where p.id = ? and w.is_active = true")
-             project-id]]
-    (db/exec! pool sql)))
-
-(defn- lookup-webhooks-by-file
-  [pool file-id]
-  (let [sql [(str "select w.* from webhook as w"
-                  "  join project as p on (p.team_id = w.team_id)"
-                  "  join file as f on (f.project_id = p.id)"
-                  " where f.id = ? and w.is_active = true")
-             file-id]]
-    (db/exec! pool sql)))
-
-(defn- lookup-webhooks
-  [{:keys [::db/pool]} {:keys [props] :as event}]
-  (or (some->> (:team-id props) (lookup-webhooks-by-team pool))
-      (some->> (:project-id props) (lookup-webhooks-by-project pool))
-      (some->> (:file-id props) (lookup-webhooks-by-file pool))))
-
-(defmethod ig/pre-init-spec ::process-event-handler [_]
-  (s/keys :req [::db/pool]))
-
-(defmethod ig/init-key ::process-event-handler
-  [_ {:keys [::db/pool] :as cfg}]
-  (fn [{:keys [props] :as task}]
-    (let [event (::event props)]
-
-      (l/debug :hint "process webhook event"
-               :name (:name event))
-
-      (when-let [items (lookup-webhooks cfg event)]
-        (l/trace :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)))))))
-
-;; --- RUN
-
-(declare interpret-exception)
-(declare interpret-response)
-
-(def ^:private json-mapper
-  (json/mapper
-   {:encode-key-fn str/camel
-    :decode-key-fn (comp keyword str/kebab)
-    :pretty true}))
-
-(defmethod ig/pre-init-spec ::run-webhook-handler [_]
-  (s/keys :req [::http/client ::db/pool]))
-
-(defmethod ig/prep-key ::run-webhook-handler
-  [_ cfg]
-  (merge {::max-errors 3} (d/without-nils cfg)))
-
-(defmethod ig/init-key ::run-webhook-handler
-  [_ {:keys [::db/pool ::max-errors] :as cfg}]
-  (letfn [(update-webhook! [whook err]
-            (if err
-              (let [sql [(str "update webhook "
-                              "   set error_code=?, "
-                              "       error_count=error_count+1 "
-                              " where id=?")
-                         err
-                         (:id whook)]
-                    res (db/exec-one! pool sql {::db/return-keys? true})]
-                (when (>= (:error-count res) max-errors)
-                  (db/update! pool :webhook {:is-active false} {:id (:id whook)})))
-
-              (db/update! pool :webhook
-                          {:updated-at (dt/now)
-                           :error-code nil
-                           :error-count 0}
-                          {:id (:id whook)})))
-
-          (report-delivery! [whook req rsp err]
-            (db/insert! pool :webhook-delivery
-                        {:webhook-id (:id whook)
-                         :created-at (dt/now)
-                         :error-code err
-                         :req-data (db/tjson req)
-                         :rsp-data (db/tjson rsp)}))]
-
-    (fn [{:keys [props] :as task}]
-      (let [event (::event props)
-            whook (::config props)
-
-            body  (case (:mtype whook)
-                    "application/json" (json/encode-str event json-mapper)
-                    "application/transit+json" (t/encode-str event)
-                    "application/x-www-form-urlencoded" (uri/map->query-string event))]
-
-        (l/debug :hint "run webhook"
-                 :event-name (:name event)
-                 :webhook-id (:id whook)
-                 :webhook-uri (:uri whook)
-                 :webhook-mtype (:mtype whook))
-
-        (let [req {:uri (:uri whook)
-                   :headers {"content-type" (:mtype whook)
-                             "user-agent" (str/ffmt "penpot/%" (:main cf/version))}
-                   :timeout (dt/duration "4s")
-                   :method :post
-                   :body body}]
-          (try
-            (let [rsp (http/req! cfg req {:response-type :input-stream :sync? true})
-                  err (interpret-response rsp)]
-              (report-delivery! whook req rsp err)
-              (update-webhook! whook err))
-            (catch Throwable cause
-              (let [err (interpret-exception cause)]
-                (report-delivery! whook req nil err)
-                (update-webhook! whook err)
-                (when (= err "unknown")
-                  (l/error :hint "unknown error on webhook request"
-                           :cause cause))))))))))
-
-(defn interpret-response
-  [{:keys [status] :as response}]
-  (when-not (or (= 200 status)
-                (= 204 status))
-    (str/ffmt "unexpected-status:%" status)))
-
-(defn interpret-exception
-  [cause]
-  (cond
-    (instance? javax.net.ssl.SSLHandshakeException cause)
-    "ssl-validation-error"
-
-    (instance? java.net.ConnectException cause)
-    "connection-error"
-
-    (instance? java.lang.IllegalArgumentException cause)
-    "invalid-uri"
-
-    (instance? java.net.http.HttpConnectTimeoutException cause)
-    "timeout"
-    ))
--- a/backend/src/app/loggers/zmq.clj
+++ b/backend/src/app/loggers/zmq.clj
@@ -0,0 +1,110 @@
+;; 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) UXBOX Labs SL
+
+(ns app.loggers.zmq
+  "A generic ZMQ listener."
+  (:require
+   [app.common.exceptions :as ex]
+   [app.common.logging :as l]
+   [app.common.spec :as us]
+   [app.util.json :as json]
+   [app.util.time :as dt]
+   [clojure.core.async :as a]
+   [clojure.spec.alpha :as s]
+   [cuerdas.core :as str]
+   [integrant.core :as ig])
+  (:import
+   org.zeromq.SocketType
+   org.zeromq.ZMQ$Socket
+   org.zeromq.ZContext))
+
+(declare prepare)
+(declare start-rcv-loop)
+
+(s/def ::endpoint ::us/string)
+
+(defmethod ig/pre-init-spec ::receiver [_]
+  (s/keys :opt-un [::endpoint]))
+
+(defmethod ig/init-key ::receiver
+  [_ {:keys [endpoint] :as cfg}]
+  (l/info :msg "initializing ZMQ receiver" :bind endpoint)
+  (let [buffer (a/chan 1)
+        output (a/chan 1 (comp (filter map?)
+                               (keep prepare)))
+        mult   (a/mult output)]
+    (when endpoint
+      (let [thread (Thread. #(start-rcv-loop {:out buffer :endpoint endpoint}))]
+        (.setDaemon thread false)
+        (.setName thread "penpot/zmq-logger-receiver")
+        (.start thread)))
+
+    (a/pipe buffer output)
+    (with-meta
+      (fn [cmd ch]
+        (case cmd
+          :sub (a/tap mult ch)
+          :unsub (a/untap mult ch))
+        ch)
+      {::output output
+       ::buffer buffer
+       ::mult mult})))
+
+(defmethod ig/halt-key! ::receiver
+  [_ f]
+  (a/close! (::buffer (meta f))))
+
+(def ^:private json-mapper
+  (json/mapper
+   {:encode-key-fn str/camel
+    :decode-key-fn (comp keyword str/kebab)}))
+
+(defn- start-rcv-loop
+  ([] (start-rcv-loop nil))
+  ([{:keys [out endpoint] :or {endpoint "tcp://localhost:5556"}}]
+   (let [out    (or out (a/chan 1))
+         zctx   (ZContext. 1)
+         socket (.. zctx (createSocket SocketType/SUB))]
+     (.. socket (connect ^String endpoint))
+     (.. socket (subscribe ""))
+     (.. socket (setReceiveTimeOut 5000))
+     (loop []
+       (let [msg (.recv ^ZMQ$Socket socket)
+             msg (ex/ignoring (json/read msg json-mapper))
+             msg (if (nil? msg) :empty msg)]
+         (if (a/>!! out msg)
+           (recur)
+           (do
+             (.close ^java.lang.AutoCloseable socket)
+             (.destroy ^ZContext zctx))))))))
+
+(s/def ::logger-name string?)
+(s/def ::level string?)
+(s/def ::thread string?)
+(s/def ::time-millis integer?)
+(s/def ::message string?)
+(s/def ::context-map map?)
+(s/def ::thrown map?)
+
+(s/def ::log4j-event
+  (s/keys :req-un [::logger-name ::level ::thread ::time-millis ::message]
+          :opt-un [::context-map ::thrown]))
+
+(defn- prepare
+  [event]
+  (if (s/valid? ::log4j-event event)
+    (merge {:message      (:message event)
+            :created-at   (dt/instant (:time-millis event))
+            :logger/name  (:logger-name event)
+            :logger/level (str/lower (:level event))}
+
+           (when-let [trace (-> event :thrown :extended-stack-trace)]
+             {:trace trace})
+
+           (:context-map event))
+    (do
+      (l/warn :hint "invalid event" :event event)
+      nil)))
--- a/backend/src/app/main.clj
+++ b/backend/src/app/main.clj
@@ -2,545 +2,383 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.main
  (:require
-   [app.auth.ldap :as-alias ldap]
-   [app.auth.oidc :as-alias oidc]
-   [app.auth.oidc.providers :as-alias oidc.providers]
   [app.common.logging :as l]
   [app.config :as cf]
-   [app.db :as-alias db]
-   [app.email :as-alias email]
-   [app.http :as-alias http]
-   [app.http.access-token :as-alias actoken]
-   [app.http.assets :as-alias http.assets]
-   [app.http.awsns :as http.awsns]
-   [app.http.client :as-alias http.client]
-   [app.http.debug :as-alias http.debug]
-   [app.http.session :as-alias session]
-   [app.http.session.tasks :as-alias session.tasks]
-   [app.http.websocket :as http.ws]
-   [app.loggers.audit.tasks :as-alias audit.tasks]
-   [app.loggers.webhooks :as-alias webhooks]
-   [app.metrics :as-alias mtx]
-   [app.metrics.definition :as-alias mdef]
-   [app.msgbus :as-alias mbus]
-   [app.redis :as-alias rds]
-   [app.rpc :as-alias rpc]
-   [app.rpc.doc :as-alias rpc.doc]
-   [app.srepl :as-alias srepl]
-   [app.storage :as-alias sto]
-   [app.storage.fs :as-alias sto.fs]
-   [app.storage.s3 :as-alias sto.s3]
   [app.util.time :as dt]
-   [app.worker :as-alias wrk]
-   [cuerdas.core :as str]
   [integrant.core :as ig])
  (:gen-class))

-(def default-metrics
-  {:update-file-changes
-   {::mdef/name "penpot_rpc_update_file_changes_total"
-    ::mdef/help "A total number of changes submitted to update-file."
-    ::mdef/type :counter}
-
-   :update-file-bytes-processed
-   {::mdef/name "penpot_rpc_update_file_bytes_processed_total"
-    ::mdef/help "A total number of bytes processed by update-file."
-    ::mdef/type :counter}
-
-   :rpc-mutation-timing
-   {::mdef/name "penpot_rpc_mutation_timing"
-    ::mdef/help "RPC mutation method call timing."
-    ::mdef/labels ["name"]
-    ::mdef/type :histogram}
-
-   :rpc-command-timing
-   {::mdef/name "penpot_rpc_command_timing"
-    ::mdef/help "RPC command method call timing."
-    ::mdef/labels ["name"]
-    ::mdef/type :histogram}
-
-   :rpc-query-timing
-   {::mdef/name "penpot_rpc_query_timing"
-    ::mdef/help "RPC query method call timing."
-    ::mdef/labels ["name"]
-    ::mdef/type :histogram}
-
-   :websocket-active-connections
-   {::mdef/name "penpot_websocket_active_connections"
-    ::mdef/help "Active websocket connections gauge"
-    ::mdef/type :gauge}
-
-   :websocket-messages-total
-   {::mdef/name "penpot_websocket_message_total"
-    ::mdef/help "Counter of processed messages."
-    ::mdef/labels ["op"]
-    ::mdef/type :counter}
-
-   :websocket-session-timing
-   {::mdef/name "penpot_websocket_session_timing"
-    ::mdef/help "Websocket session timing (seconds)."
-    ::mdef/type :summary}
-
-   :session-update-total
-   {::mdef/name "penpot_http_session_update_total"
-    ::mdef/help "A counter of session update batch events."
-    ::mdef/type :counter}
-
-   :tasks-timing
-   {::mdef/name "penpot_tasks_timing"
-    ::mdef/help "Background tasks timing (milliseconds)."
-    ::mdef/labels ["name"]
-    ::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 :summary}
-
-   :rpc-climit-queue-size
-   {::mdef/name "penpot_rpc_climit_queue_size"
-    ::mdef/help "Current number of queued submissions on the CLIMIT."
-    ::mdef/labels ["name"]
-    ::mdef/type :gauge}
-
-   :rpc-climit-concurrency
-   {::mdef/name "penpot_rpc_climit_concurrency"
-    ::mdef/help "Current number of used concurrency capacity on the CLIMIT"
-    ::mdef/labels ["name"]
-    ::mdef/type :gauge}
-
-   :rpc-climit-timing
-   {::mdef/name "penpot_rpc_climit_timing"
-    ::mdef/help "Summary of the time between queuing and executing on the CLIMIT"
-    ::mdef/labels ["name"]
-    ::mdef/type :summary}
-
-   :audit-http-handler-queue-size
-   {::mdef/name "penpot_audit_http_handler_queue_size"
-    ::mdef/help "Current number of queued submissions on the audit log http handler"
-    ::mdef/labels []
-    ::mdef/type :gauge}
-
-   :audit-http-handler-concurrency
-   {::mdef/name "penpot_audit_http_handler_concurrency"
-    ::mdef/help "Current number of used concurrency capacity on the audit log http handler"
-    ::mdef/labels []
-    ::mdef/type :gauge}
-
-   :audit-http-handler-timing
-   {::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 :summary}
-
-   :executors-active-threads
-   {::mdef/name "penpot_executors_active_threads"
-    ::mdef/help "Current number of threads available in the executor service."
-    ::mdef/labels ["name"]
-    ::mdef/type :gauge}
-
-   :executors-completed-tasks
-   {::mdef/name "penpot_executors_completed_tasks_total"
-    ::mdef/help "Approximate number of completed tasks by the executor."
-    ::mdef/labels ["name"]
-    ::mdef/type :counter}
-
-   :executors-running-threads
-   {::mdef/name "penpot_executors_running_threads"
-    ::mdef/help "Current number of threads with state RUNNING."
-    ::mdef/labels ["name"]
-    ::mdef/type :gauge}
-
-   :executors-queued-submissions
-   {::mdef/name "penpot_executors_queued_submissions"
-    ::mdef/help "Current number of queued submissions."
-    ::mdef/labels ["name"]
-    ::mdef/type :gauge}})
-
 (def system-config
-  {::db/pool
-   {::db/uri        (cf/get :database-uri)
-    ::db/username   (cf/get :database-username)
-    ::db/password   (cf/get :database-password)
-    ::db/read-only? (cf/get :database-readonly false)
-    ::db/min-size   (cf/get :database-min-pool-size 0)
-    ::db/max-size   (cf/get :database-max-pool-size 60)
-    ::mtx/metrics   (ig/ref ::mtx/metrics)}
+  {:app.db/pool
+   {:uri        (cf/get :database-uri)
+    :username   (cf/get :database-username)
+    :password   (cf/get :database-password)
+    :read-only  (cf/get :database-readonly false)
+    :metrics    (ig/ref :app.metrics/metrics)
+    :migrations (ig/ref :app.migrations/all)
+    :name       :main
+    :min-size   (cf/get :database-min-pool-size 0)
+    :max-size   (cf/get :database-max-pool-size 30)}

   ;; Default thread pool for IO operations
-   ::wrk/executor
-   {::wrk/parallelism (cf/get :default-executor-parallelism 100)}
+   [::default :app.worker/executor]
+   {:parallelism (cf/get :default-executor-parallelism 60)
+    :prefix :default}

-   ::wrk/scheduled-executor
-   {::wrk/parallelism (cf/get :scheduled-executor-parallelism 20)}
+   ;; Constrained thread pool. Should only be used from high resources
+   ;; demanding operations.
+   [::blocking :app.worker/executor]
+   {:parallelism (cf/get :blocking-executor-parallelism 10)
+    :prefix :blocking}

-   ::wrk/monitor
-   {::mtx/metrics  (ig/ref ::mtx/metrics)
-    ::wrk/name     "default"
-    ::wrk/executor (ig/ref ::wrk/executor)}
+   ;; Dedicated thread pool for backround tasks execution.
+   [::worker :app.worker/executor]
+   {:parallelism (cf/get :worker-executor-parallelism 10)
+    :prefix :worker}
+
+   :app.worker/scheduler
+   {:parallelism 1
+    :prefix :scheduler}
+
+   :app.worker/executors
+   {:default  (ig/ref [::default :app.worker/executor])
+    :worker   (ig/ref [::worker :app.worker/executor])
+    :blocking (ig/ref [::blocking :app.worker/executor])}
+
+   :app.worker/executors-monitor
+   {:metrics   (ig/ref :app.metrics/metrics)
+    :scheduler (ig/ref :app.worker/scheduler)
+    :executors (ig/ref :app.worker/executors)}

   :app.migrations/migrations
-   {::db/pool (ig/ref ::db/pool)}
+   {}

-   ::mtx/metrics
-   {:default default-metrics}
+   :app.metrics/metrics
+   {}

-   ::mtx/routes
-   {::mtx/metrics (ig/ref ::mtx/metrics)}
+   :app.migrations/all
+   {:main (ig/ref :app.migrations/migrations)}

-   ::rds/redis
-   {::rds/uri     (cf/get :redis-uri)
-    ::mtx/metrics (ig/ref ::mtx/metrics)}
-
-   ::mbus/msgbus
+   :app.msgbus/msgbus
   {:backend   (cf/get :msgbus-backend :redis)
-    :executor  (ig/ref ::wrk/executor)
-    :redis     (ig/ref ::rds/redis)}
+    :executor  (ig/ref [::default :app.worker/executor])
+    :redis-uri (cf/get :redis-uri)}

-   :app.storage.tmp/cleaner
-   {::wrk/executor (ig/ref ::wrk/executor)
-    ::wrk/scheduled-executor (ig/ref ::wrk/scheduled-executor)}
+   :app.tokens/tokens
+   {:keys (ig/ref :app.setup/keys)}

-   ::sto/gc-deleted-task
-   {::db/pool      (ig/ref ::db/pool)
-    ::sto/storage  (ig/ref ::sto/storage)}
+   :app.storage/gc-deleted-task
+   {:pool     (ig/ref :app.db/pool)
+    :storage  (ig/ref :app.storage/storage)
+    :executor (ig/ref [::worker :app.worker/executor])
+    :min-age  (dt/duration {:hours 2})}

-   ::sto/gc-touched-task
-   {::db/pool (ig/ref ::db/pool)}
+   :app.storage/gc-touched-task
+   {:pool (ig/ref :app.db/pool)}

-   ::http.client/client
-   {::wrk/executor (ig/ref ::wrk/executor)}
+   :app.http/client
+   {:executor (ig/ref [::default :app.worker/executor])}

-   ::session/manager
-   {::db/pool      (ig/ref ::db/pool)
-    ::wrk/executor (ig/ref ::wrk/executor)
-    ::props        (ig/ref :app.setup/props)}
+   :app.http/session
+   {:store (ig/ref :app.http.session/store)}

-   ::actoken/manager
-   {::db/pool      (ig/ref ::db/pool)
-    ::wrk/executor (ig/ref ::wrk/executor)
-    ::props        (ig/ref :app.setup/props)}
+   :app.http.session/store
+   {:pool     (ig/ref :app.db/pool)
+    :tokens   (ig/ref :app.tokens/tokens)
+    :executor (ig/ref [::default :app.worker/executor])}

-   ::session.tasks/gc
-   {::db/pool (ig/ref ::db/pool)}
+   :app.http.session/gc-task
+   {:pool        (ig/ref :app.db/pool)
+    :max-age     (cf/get :http-session-idle-max-age)}

-   ::http.awsns/routes
-   {::props              (ig/ref :app.setup/props)
-    ::db/pool            (ig/ref ::db/pool)
-    ::http.client/client (ig/ref ::http.client/client)
-    ::wrk/executor       (ig/ref ::wrk/executor)}
+   :app.http.session/updater
+   {:pool           (ig/ref :app.db/pool)
+    :metrics        (ig/ref :app.metrics/metrics)
+    :executor       (ig/ref [::worker :app.worker/executor])
+    :session        (ig/ref :app.http/session)
+    :max-batch-age  (cf/get :http-session-updater-batch-max-age)
+    :max-batch-size (cf/get :http-session-updater-batch-max-size)}

-   ::http/server
-   {::http/port                    (cf/get :http-server-port)
-    ::http/host                    (cf/get :http-server-host)
-    ::http/router                  (ig/ref ::http/router)
-    ::http/metrics                 (ig/ref ::mtx/metrics)
-    ::http/executor                (ig/ref ::wrk/executor)
-    ::http/io-threads              (cf/get :http-server-io-threads)
-    ::http/max-body-size           (cf/get :http-server-max-body-size)
-    ::http/max-multipart-body-size (cf/get :http-server-max-multipart-body-size)}
+   :app.http.awsns/handler
+   {:tokens      (ig/ref :app.tokens/tokens)
+    :pool        (ig/ref :app.db/pool)
+    :http-client (ig/ref :app.http/client)
+    :executor    (ig/ref [::worker :app.worker/executor])}

-   ::ldap/provider
-   {:host           (cf/get :ldap-host)
-    :port           (cf/get :ldap-port)
-    :ssl            (cf/get :ldap-ssl)
-    :tls            (cf/get :ldap-starttls)
-    :query          (cf/get :ldap-user-query)
-    :attrs-email    (cf/get :ldap-attrs-email)
-    :attrs-fullname (cf/get :ldap-attrs-fullname)
-    :attrs-username (cf/get :ldap-attrs-username)
-    :base-dn        (cf/get :ldap-base-dn)
-    :bind-dn        (cf/get :ldap-bind-dn)
-    :bind-password  (cf/get :ldap-bind-password)
-    :enabled?       (contains? cf/flags :login-with-ldap)}
-
-   ::oidc.providers/google
-   {}
-
-   ::oidc.providers/github
-   {::http.client/client (ig/ref ::http.client/client)}
-
-   ::oidc.providers/gitlab
-   {}
-
-   ::oidc.providers/generic
-   {::http.client/client (ig/ref ::http.client/client)}
-
-   ::oidc/routes
-   {::http.client/client (ig/ref ::http.client/client)
-    ::db/pool            (ig/ref ::db/pool)
-    ::props              (ig/ref :app.setup/props)
-    ::wrk/executor       (ig/ref ::wrk/executor)
-    ::oidc/providers     {:google (ig/ref ::oidc.providers/google)
-                          :github (ig/ref ::oidc.providers/github)
-                          :gitlab (ig/ref ::oidc.providers/gitlab)
-                          :oidc   (ig/ref ::oidc.providers/generic)}
-    ::session/manager    (ig/ref ::session/manager)}
+   :app.http/server
+   {:port        (cf/get :http-server-port)
+    :host        (cf/get :http-server-host)
+    :router      (ig/ref :app.http/router)
+    :metrics     (ig/ref :app.metrics/metrics)
+    :executor    (ig/ref [::default :app.worker/executor])
+    :io-threads  (cf/get :http-server-io-threads)
+    :max-body-size           (cf/get :http-server-max-body-size)
+    :max-multipart-body-size (cf/get :http-server-max-multipart-body-size)}

   :app.http/router
-   {::session/manager    (ig/ref ::session/manager)
-    ::actoken/manager    (ig/ref ::actoken/manager)
-    ::wrk/executor       (ig/ref ::wrk/executor)
-    ::db/pool            (ig/ref ::db/pool)
-    ::rpc/routes         (ig/ref ::rpc/routes)
-    ::rpc.doc/routes     (ig/ref ::rpc.doc/routes)
-    ::props              (ig/ref :app.setup/props)
-    ::mtx/routes         (ig/ref ::mtx/routes)
-    ::oidc/routes        (ig/ref ::oidc/routes)
-    ::http.debug/routes  (ig/ref ::http.debug/routes)
-    ::http.assets/routes (ig/ref ::http.assets/routes)
-    ::http.ws/routes     (ig/ref ::http.ws/routes)
-    ::http.awsns/routes  (ig/ref ::http.awsns/routes)}
+   {:assets        (ig/ref :app.http.assets/handlers)
+    :feedback      (ig/ref :app.http.feedback/handler)
+    :session       (ig/ref :app.http/session)
+    :awsns-handler (ig/ref :app.http.awsns/handler)
+    :oauth         (ig/ref :app.http.oauth/handler)
+    :debug         (ig/ref :app.http.debug/handlers)
+    :ws            (ig/ref :app.http.websocket/handler)
+    :metrics       (ig/ref :app.metrics/metrics)
+    :public-uri    (cf/get :public-uri)
+    :storage       (ig/ref :app.storage/storage)
+    :tokens        (ig/ref :app.tokens/tokens)
+    :audit-handler (ig/ref :app.loggers.audit/http-handler)
+    :rpc           (ig/ref :app.rpc/rpc)
+    :executor      (ig/ref [::default :app.worker/executor])}

-   :app.http.debug/routes
-   {::db/pool         (ig/ref ::db/pool)
-    ::wrk/executor    (ig/ref ::wrk/executor)
-    ::session/manager (ig/ref ::session/manager)
-    ::sto/storage     (ig/ref ::sto/storage)}
+   :app.http.debug/handlers
+   {:pool (ig/ref :app.db/pool)
+    :executor (ig/ref [::worker :app.worker/executor])}

-   :app.http.websocket/routes
-   {::db/pool         (ig/ref ::db/pool)
-    ::mtx/metrics     (ig/ref ::mtx/metrics)
-    ::mbus/msgbus     (ig/ref :app.msgbus/msgbus)
-    ::session/manager (ig/ref ::session/manager)}
+   :app.http.websocket/handler
+   {:pool     (ig/ref :app.db/pool)
+    :metrics  (ig/ref :app.metrics/metrics)
+    :msgbus   (ig/ref :app.msgbus/msgbus)}

-   :app.http.assets/routes
-   {::http.assets/path  (cf/get :assets-path)
-    ::http.assets/cache-max-age (dt/duration {:hours 24})
-    ::http.assets/cache-max-agesignature-max-age (dt/duration {:hours 24 :minutes 5})
-    ::sto/storage  (ig/ref ::sto/storage)
-    ::wrk/executor (ig/ref ::wrk/executor)}
+   :app.http.assets/handlers
+   {:metrics           (ig/ref :app.metrics/metrics)
+    :assets-path       (cf/get :assets-path)
+    :storage           (ig/ref :app.storage/storage)
+    :executor          (ig/ref [::default :app.worker/executor])
+    :cache-max-age     (dt/duration {:hours 24})
+    :signature-max-age (dt/duration {:hours 24 :minutes 5})}

-   :app.rpc/climit
-   {::mtx/metrics  (ig/ref ::mtx/metrics)
-    ::wrk/executor (ig/ref ::wrk/executor)}
+   :app.http.feedback/handler
+   {:pool     (ig/ref :app.db/pool)
+    :executor (ig/ref [::default :app.worker/executor])}

-   :app.rpc/rlimit
-   {::wrk/executor           (ig/ref ::wrk/executor)
-    ::wrk/scheduled-executor (ig/ref ::wrk/scheduled-executor)}
+   :app.http.oauth/handler
+   {:rpc         (ig/ref :app.rpc/rpc)
+    :session     (ig/ref :app.http/session)
+    :pool        (ig/ref :app.db/pool)
+    :tokens      (ig/ref :app.tokens/tokens)
+    :audit       (ig/ref :app.loggers.audit/collector)
+    :executor    (ig/ref [::default :app.worker/executor])
+    :http-client (ig/ref :app.http/client)
+    :public-uri  (cf/get :public-uri)}

-   :app.rpc/methods
-   {::http.client/client (ig/ref ::http.client/client)
-    ::db/pool            (ig/ref ::db/pool)
-    ::wrk/executor       (ig/ref ::wrk/executor)
-    ::session/manager    (ig/ref ::session/manager)
-    ::ldap/provider      (ig/ref ::ldap/provider)
-    ::sto/storage        (ig/ref ::sto/storage)
-    ::mtx/metrics        (ig/ref ::mtx/metrics)
-    ::mbus/msgbus        (ig/ref ::mbus/msgbus)
-    ::rds/redis          (ig/ref ::rds/redis)
+   :app.rpc/rpc
+   {:pool        (ig/ref :app.db/pool)
+    :session     (ig/ref :app.http/session)
+    :tokens      (ig/ref :app.tokens/tokens)
+    :metrics     (ig/ref :app.metrics/metrics)
+    :storage     (ig/ref :app.storage/storage)
+    :msgbus      (ig/ref :app.msgbus/msgbus)
+    :public-uri  (cf/get :public-uri)
+    :audit       (ig/ref :app.loggers.audit/collector)
+    :http-client (ig/ref :app.http/client)
+    :executors   (ig/ref :app.worker/executors)}

-    ::rpc/climit         (ig/ref ::rpc/climit)
-    ::rpc/rlimit         (ig/ref ::rpc/rlimit)
+   :app.worker/worker
+   {:executor (ig/ref [::worker :app.worker/executor])
+    :tasks    (ig/ref :app.worker/registry)
+    :metrics  (ig/ref :app.metrics/metrics)
+    :pool     (ig/ref :app.db/pool)}

-    ::props              (ig/ref :app.setup/props)
+   :app.worker/cron
+   {:executor   (ig/ref [::worker :app.worker/executor])
+    :scheduler  (ig/ref :app.worker/scheduler)
+    :tasks      (ig/ref :app.worker/registry)
+    :pool       (ig/ref :app.db/pool)
+    :entries
+    [{:cron #app/cron "0 0 0 * * ?" ;; daily
+      :task :file-gc}

-    :pool                (ig/ref ::db/pool)
-    :templates           (ig/ref :app.setup/builtin-templates)
-    }
-
-   :app.rpc.doc/routes
-   {:methods (ig/ref :app.rpc/methods)}
-
-   :app.rpc/routes
-   {::rpc/methods     (ig/ref :app.rpc/methods)
-    ::db/pool         (ig/ref ::db/pool)
-    ::wrk/executor    (ig/ref ::wrk/executor)
-    ::session/manager (ig/ref ::session/manager)
-    ::actoken/manager (ig/ref ::actoken/manager)
-    ::props           (ig/ref :app.setup/props)}
-
-   ::wrk/registry
-   {::mtx/metrics (ig/ref ::mtx/metrics)
-    ::wrk/tasks
-    {:sendmail           (ig/ref ::email/handler)
-     :objects-gc         (ig/ref :app.tasks.objects-gc/handler)
-     :file-gc            (ig/ref :app.tasks.file-gc/handler)
-     :file-xlog-gc       (ig/ref :app.tasks.file-xlog-gc/handler)
-     :storage-gc-deleted (ig/ref ::sto/gc-deleted-task)
-     :storage-gc-touched (ig/ref ::sto/gc-touched-task)
-     :tasks-gc           (ig/ref :app.tasks.tasks-gc/handler)
-     :telemetry          (ig/ref :app.tasks.telemetry/handler)
-     :session-gc         (ig/ref ::session.tasks/gc)
-     :audit-log-archive  (ig/ref ::audit.tasks/archive)
-     :audit-log-gc       (ig/ref ::audit.tasks/gc)
-
-     :process-webhook-event
-     (ig/ref ::webhooks/process-event-handler)
-     :run-webhook
-     (ig/ref ::webhooks/run-webhook-handler)}}
-
-   ::email/sendmail
-   {::email/host             (cf/get :smtp-host)
-    ::email/port             (cf/get :smtp-port)
-    ::email/ssl              (cf/get :smtp-ssl)
-    ::email/tls              (cf/get :smtp-tls)
-    ::email/username         (cf/get :smtp-username)
-    ::email/password         (cf/get :smtp-password)
-    ::email/default-reply-to (cf/get :smtp-default-reply-to)
-    ::email/default-from     (cf/get :smtp-default-from)}
-
-   ::email/handler
-   {::email/sendmail (ig/ref ::email/sendmail)
-    ::mtx/metrics    (ig/ref ::mtx/metrics)}
-
-   :app.tasks.tasks-gc/handler
-   {::db/pool (ig/ref ::db/pool)}
-
-   :app.tasks.objects-gc/handler
-   {::db/pool     (ig/ref ::db/pool)
-    ::sto/storage (ig/ref ::sto/storage)}
-
-   :app.tasks.file-gc/handler
-   {::db/pool (ig/ref ::db/pool)}
-
-   :app.tasks.file-xlog-gc/handler
-   {::db/pool (ig/ref ::db/pool)}
-
-   :app.tasks.telemetry/handler
-   {::db/pool            (ig/ref ::db/pool)
-    ::http.client/client (ig/ref ::http.client/client)
-    ::props              (ig/ref :app.setup/props)}
-
-   [::srepl/urepl ::srepl/server]
-   {::srepl/port (cf/get :urepl-port 6062)
-    ::srepl/host (cf/get :urepl-host "localhost")}
-
-   [::srepl/prepl ::srepl/server]
-   {::srepl/port (cf/get :prepl-port 6063)
-    ::srepl/host (cf/get :prepl-host "localhost")}
-
-   :app.setup/builtin-templates
-   {::http.client/client (ig/ref ::http.client/client)}
-
-   :app.setup/props
-   {::db/pool    (ig/ref ::db/pool)
-    ::key        (cf/get :secret-key)
-
-    ;; NOTE: this dependency is only necessary for proper initialization ordering, props
-    ;; module requires the migrations to run before initialize.
-    ::migrations (ig/ref :app.migrations/migrations)}
-
-   ::audit.tasks/archive
-   {::props              (ig/ref :app.setup/props)
-    ::db/pool            (ig/ref ::db/pool)
-    ::http.client/client (ig/ref ::http.client/client)}
-
-   ::audit.tasks/gc
-   {::db/pool (ig/ref ::db/pool)}
-
-   ::webhooks/process-event-handler
-   {::db/pool            (ig/ref ::db/pool)
-    ::http.client/client (ig/ref ::http.client/client)}
-
-   ::webhooks/run-webhook-handler
-   {::db/pool            (ig/ref ::db/pool)
-    ::http.client/client (ig/ref ::http.client/client)}
-
-   :app.loggers.mattermost/reporter
-   {::http.client/client (ig/ref ::http.client/client)}
-
-   :app.loggers.database/reporter
-   {::db/pool (ig/ref ::db/pool)}
-
-   ::sto/storage
-   {::db/pool      (ig/ref ::db/pool)
-    ::wrk/executor (ig/ref ::wrk/executor)
-    ::sto/backends
-    {:assets-s3 (ig/ref [::assets :app.storage.s3/backend])
-     :assets-fs (ig/ref [::assets :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)
-    ::wrk/executor    (ig/ref ::wrk/executor)}
-
-   [::assets :app.storage.fs/backend]
-   {::sto.fs/directory (cf/get :storage-assets-fs-directory)}
-   })
-
-
-(def worker-config
-  {::wrk/cron
-   {::wrk/scheduled-executor  (ig/ref ::wrk/scheduled-executor)
-    ::wrk/registry            (ig/ref ::wrk/registry)
-    ::db/pool                 (ig/ref ::db/pool)
-    ::wrk/entries
-    [{:cron #app/cron "0 0 * * * ?" ;; hourly
+     {:cron #app/cron "0 0 * * * ?"  ;; hourly
      :task :file-xlog-gc}

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

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

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

-     {:cron #app/cron "0 0 2 * * ?" ;; daily
-      :task :file-gc}
-
     {:cron #app/cron "0 30 */3,23 * * ?"
      :task :telemetry}

+     (when (cf/get :fdata-storage-backed)
+       {:cron #app/cron "0 0 * * * ?"  ;; hourly
+        :task :file-offload})
+
     (when (contains? cf/flags :audit-log-archive)
       {:cron #app/cron "0 */5 * * * ?" ;; every 5m
        :task :audit-log-archive})

     (when (contains? cf/flags :audit-log-gc)
-       {:cron #app/cron "30 */5 * * * ?" ;; every 5m
+       {:cron #app/cron "0 0 0 * * ?" ;; daily
        :task :audit-log-gc})]}

-   ::wrk/dispatcher
-   {::rds/redis   (ig/ref ::rds/redis)
-    ::mtx/metrics (ig/ref ::mtx/metrics)
-    ::db/pool     (ig/ref ::db/pool)}
+   :app.worker/registry
+   {:metrics (ig/ref :app.metrics/metrics)
+    :tasks
+    {:sendmail           (ig/ref :app.emails/sendmail-handler)
+     :objects-gc         (ig/ref :app.tasks.objects-gc/handler)
+     :file-gc            (ig/ref :app.tasks.file-gc/handler)
+     :file-xlog-gc       (ig/ref :app.tasks.file-xlog-gc/handler)
+     :storage-deleted-gc (ig/ref :app.storage/gc-deleted-task)
+     :storage-touched-gc (ig/ref :app.storage/gc-touched-task)
+     :tasks-gc           (ig/ref :app.tasks.tasks-gc/handler)
+     :telemetry          (ig/ref :app.tasks.telemetry/handler)
+     :session-gc         (ig/ref :app.http.session/gc-task)
+     :file-offload       (ig/ref :app.tasks.file-offload/handler)
+     :audit-log-archive  (ig/ref :app.loggers.audit/archive-task)
+     :audit-log-gc       (ig/ref :app.loggers.audit/gc-task)}}

-   [::default ::wrk/worker]
-   {::wrk/parallelism (cf/get ::worker-default-parallelism 1)
-    ::wrk/queue       :default
-    ::rds/redis       (ig/ref ::rds/redis)
-    ::wrk/registry    (ig/ref ::wrk/registry)
-    ::mtx/metrics     (ig/ref ::mtx/metrics)
-    ::db/pool         (ig/ref ::db/pool)}
+   :app.emails/sendmail-handler
+   {:host             (cf/get :smtp-host)
+    :port             (cf/get :smtp-port)
+    :ssl              (cf/get :smtp-ssl)
+    :tls              (cf/get :smtp-tls)
+    :username         (cf/get :smtp-username)
+    :password         (cf/get :smtp-password)
+    :metrics          (ig/ref :app.metrics/metrics)
+    :default-reply-to (cf/get :smtp-default-reply-to)
+    :default-from     (cf/get :smtp-default-from)}

-   [::webhook ::wrk/worker]
-   {::wrk/parallelism (cf/get ::worker-webhook-parallelism 1)
-    ::wrk/queue       :webhooks
-    ::rds/redis       (ig/ref ::rds/redis)
-    ::wrk/registry    (ig/ref ::wrk/registry)
-    ::mtx/metrics     (ig/ref ::mtx/metrics)
-    ::db/pool         (ig/ref ::db/pool)}})
+   :app.tasks.tasks-gc/handler
+   {:pool    (ig/ref :app.db/pool)
+    :max-age cf/deletion-delay}

+   :app.tasks.objects-gc/handler
+   {:pool    (ig/ref :app.db/pool)
+    :storage (ig/ref :app.storage/storage)
+    :max-age cf/deletion-delay}
+
+   :app.tasks.file-gc/handler
+   {:pool    (ig/ref :app.db/pool)
+    :max-age cf/deletion-delay}
+
+   :app.tasks.file-xlog-gc/handler
+   {:pool    (ig/ref :app.db/pool)
+    :max-age (dt/duration {:hours 72})}
+
+   :app.tasks.file-offload/handler
+   {:pool    (ig/ref :app.db/pool)
+    :max-age (dt/duration {:seconds 5})
+    :storage (ig/ref :app.storage/storage)
+    :backend (cf/get :fdata-storage-backed :fdata-s3)}
+
+   :app.tasks.telemetry/handler
+   {:pool        (ig/ref :app.db/pool)
+    :version     (:full cf/version)
+    :uri         (cf/get :telemetry-uri)
+    :sprops      (ig/ref :app.setup/props)
+    :http-client (ig/ref :app.http/client)}
+
+   :app.srepl/server
+   {:port (cf/get :srepl-port)
+    :host (cf/get :srepl-host)}
+
+   :app.setup/props
+   {:pool (ig/ref :app.db/pool)
+    :key  (cf/get :secret-key)}
+
+   :app.setup/keys
+   {:props (ig/ref :app.setup/props)}
+
+   :app.loggers.zmq/receiver
+   {:endpoint (cf/get :loggers-zmq-uri)}
+
+   :app.loggers.audit/http-handler
+   {:pool     (ig/ref :app.db/pool)
+    :executor (ig/ref [::default :app.worker/executor])}
+
+   :app.loggers.audit/collector
+   {:pool     (ig/ref :app.db/pool)
+    :executor (ig/ref [::worker :app.worker/executor])}
+
+   :app.loggers.audit/archive-task
+   {:uri         (cf/get :audit-log-archive-uri)
+    :tokens      (ig/ref :app.tokens/tokens)
+    :pool        (ig/ref :app.db/pool)
+    :http-client (ig/ref :app.http/client)}
+
+   :app.loggers.audit/gc-task
+   {:max-age  (cf/get :audit-log-gc-max-age cf/deletion-delay)
+    :pool     (ig/ref :app.db/pool)}
+
+   :app.loggers.loki/reporter
+   {:uri         (cf/get :loggers-loki-uri)
+    :receiver    (ig/ref :app.loggers.zmq/receiver)
+    :http-client (ig/ref :app.http/client)}
+
+   :app.loggers.mattermost/reporter
+   {:uri         (cf/get :error-report-webhook)
+    :receiver    (ig/ref :app.loggers.zmq/receiver)
+    :http-client (ig/ref :app.http/client)}
+
+   :app.loggers.database/reporter
+   {:receiver (ig/ref :app.loggers.zmq/receiver)
+    :pool     (ig/ref :app.db/pool)
+    :executor (ig/ref [::worker :app.worker/executor])}
+
+   :app.storage/storage
+   {:pool     (ig/ref :app.db/pool)
+    :executor (ig/ref [::default :app.worker/executor])
+
+    :backends
+    {:assets-s3 (ig/ref [::assets :app.storage.s3/backend])
+     :assets-db (ig/ref [::assets :app.storage.db/backend])
+     :assets-fs (ig/ref [::assets :app.storage.fs/backend])
+
+     :tmp       (ig/ref [::tmp  :app.storage.fs/backend])
+     :fdata-s3  (ig/ref [::fdata :app.storage.s3/backend])
+
+     ;; keep this for backward compatibility
+     :s3        (ig/ref [::assets :app.storage.s3/backend])
+     :fs        (ig/ref [::assets :app.storage.fs/backend])}}
+
+   [::fdata :app.storage.s3/backend]
+   {:region   (cf/get :storage-fdata-s3-region)
+    :bucket   (cf/get :storage-fdata-s3-bucket)
+    :endpoint (cf/get :storage-fdata-s3-endpoint)
+    :prefix   (cf/get :storage-fdata-s3-prefix)
+    :executor (ig/ref [::default :app.worker/executor])}
+
+   [::assets :app.storage.s3/backend]
+   {:region   (cf/get :storage-assets-s3-region)
+    :endpoint (cf/get :storage-assets-s3-endpoint)
+    :bucket   (cf/get :storage-assets-s3-bucket)
+    :executor (ig/ref [::default :app.worker/executor])}
+
+   [::assets :app.storage.fs/backend]
+   {:directory (cf/get :storage-assets-fs-directory)}
+
+   [::tmp :app.storage.fs/backend]
+   {:directory "/tmp/penpot"}
+
+   [::assets :app.storage.db/backend]
+   {:pool (ig/ref :app.db/pool)}})

 (def system nil)

 (defn start
  []
-  (ig/load-namespaces (merge system-config worker-config))
+  (ig/load-namespaces system-config)
  (alter-var-root #'system (fn [sys]
                             (when sys (ig/halt! sys))
                             (-> system-config
-                                 (cond-> (contains? cf/flags :backend-worker)
-                                   (merge worker-config))
                                 (ig/prep)
                                 (ig/init))))
-  (l/info :hint "welcome to penpot"
-          :flags (str/join "," (map name cf/flags))
-          :worker? (contains? cf/flags :backend-worker)
+  (l/info :msg "welcome to penpot"
          :version (:full cf/version)))

 (defn stop
@@ -551,9 +389,4 @@

 (defn -main
  [& _args]
-  (try
-    (start)
-    (catch Throwable cause
-      (l/error :hint (ex-message cause)
-               :cause cause)
-      (System/exit -1))))
+  (start))
--- a/backend/src/app/media.clj
+++ b/backend/src/app/media.clj
@@ -2,7 +2,7 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.media
  "Media & Font postprocessing."
@@ -12,18 +12,18 @@
   [app.common.media :as cm]
   [app.common.spec :as us]
   [app.config :as cf]
-   [app.db :as-alias db]
-   [app.storage :as-alias sto]
-   [app.storage.tmp :as tmp]
   [app.util.svg :as svg]
   [buddy.core.bytes :as bb]
   [buddy.core.codecs :as bc]
+   [clojure.java.io :as io]
   [clojure.java.shell :as sh]
   [clojure.spec.alpha :as s]
   [cuerdas.core :as str]
-   [datoteka.fs :as fs]
-   [datoteka.io :as io])
+   [datoteka.core :as fs])
  (:import
+   java.io.ByteArrayInputStream
+   java.io.OutputStream
+   org.apache.commons.io.IOUtils
   org.im4java.core.ConvertCmd
   org.im4java.core.IMOperation
   org.im4java.core.Info))
@@ -93,16 +93,18 @@
  (let [{:keys [path mtype]} input
        format (or (cm/mtype->format mtype) format)
        ext    (cm/format->extension format)
-        tmp    (tmp/tempfile :prefix "penpot.media." :suffix ext)]
+        tmp    (fs/create-tempfile :suffix ext)]

    (doto (ConvertCmd.)
      (.run operation (into-array (map str [path tmp]))))

-    (assoc params
-           :format format
-           :mtype  (cm/format->mtype format)
-           :size   (fs/size tmp)
-           :data   tmp)))
+    (let [thumbnail-data (fs/slurp-bytes tmp)]
+      (fs/delete tmp)
+      (assoc params
+             :format format
+             :mtype  (cm/format->mtype format)
+             :size   (alength ^bytes thumbnail-data)
+             :data   (ByteArrayInputStream. thumbnail-data)))))

 (defmethod process :generic-thumbnail
  [{:keys [quality width height] :as params}]
@@ -199,43 +201,59 @@
 (defmethod process :generate-fonts
  [{:keys [input] :as params}]
  (letfn [(ttf->otf [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".otf"))
-                  _       (io/write-to-file! data finput)
-                  res     (sh/sh "fontforge" "-lang=ff" "-c"
-                                 (str/fmt "Open('%s'); Generate('%s')"
-                                          (str finput)
-                                          (str foutput)))]
+            (let [input-file  (fs/create-tempfile :prefix "penpot")
+                  output-file (fs/path (str input-file ".otf"))
+                  _           (with-open [out (io/output-stream input-file)]
+                                (IOUtils/writeChunked ^bytes data ^OutputStream out)
+                                (.flush ^OutputStream out))
+                  res         (sh/sh "fontforge" "-lang=ff" "-c"
+                                     (str/fmt "Open('%s'); Generate('%s')"
+                                              (str input-file)
+                                              (str output-file)))]
              (when (zero? (:exit res))
-                foutput)))
+                (fs/slurp-bytes output-file))))
+

          (otf->ttf [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".ttf"))
-                  _       (io/write-to-file! data finput)
-                  res     (sh/sh "fontforge" "-lang=ff" "-c"
-                                 (str/fmt "Open('%s'); Generate('%s')"
-                                          (str finput)
-                                          (str foutput)))]
+            (let [input-file  (fs/create-tempfile :prefix "penpot")
+                  output-file (fs/path (str input-file ".ttf"))
+                  _           (with-open [out (io/output-stream input-file)]
+                                (IOUtils/writeChunked ^bytes data ^OutputStream out)
+                                (.flush ^OutputStream out))
+                  res         (sh/sh "fontforge" "-lang=ff" "-c"
+                                     (str/fmt "Open('%s'); Generate('%s')"
+                                              (str input-file)
+                                              (str output-file)))]
              (when (zero? (:exit res))
-                foutput)))
+                (fs/slurp-bytes output-file))))

          (ttf-or-otf->woff [data]
-            ;; NOTE: foutput is not used directly, it represents the
-            ;; default output of the execution of the underlying
-            ;; command.
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".woff"))
-                  _       (io/write-to-file! data finput)
-                  res     (sh/sh "sfnt2woff" (str finput))]
+            (let [input-file  (fs/create-tempfile :prefix "penpot" :suffix "")
+                  output-file (fs/path (str input-file ".woff"))
+                  _           (with-open [out (io/output-stream input-file)]
+                                (IOUtils/writeChunked ^bytes data ^OutputStream out)
+                                (.flush ^OutputStream out))
+                  res         (sh/sh "sfnt2woff" (str input-file))]
              (when (zero? (:exit res))
-                foutput)))
+                (fs/slurp-bytes output-file))))
+
+          (ttf-or-otf->woff2 [data]
+            (let [input-file  (fs/create-tempfile :prefix "penpot" :suffix "")
+                  output-file (fs/path (str input-file ".woff2"))
+                  _           (with-open [out (io/output-stream input-file)]
+                                (IOUtils/writeChunked ^bytes data ^OutputStream out)
+                                (.flush ^OutputStream out))
+                  res         (sh/sh "woff2_compress" (str input-file))]
+              (when (zero? (:exit res))
+                (fs/slurp-bytes output-file))))

          (woff->sfnt [data]
-            (let [finput  (tmp/tempfile :prefix "penpot" :suffix "")
-                  _       (io/write-to-file! data finput)
-                  res     (sh/sh "woff2sfnt" (str finput)
-                                 :out-enc :bytes)]
+            (let [input-file  (fs/create-tempfile :prefix "penpot" :suffix "")
+                  _           (with-open [out (io/output-stream input-file)]
+                                (IOUtils/writeChunked ^bytes data ^OutputStream out)
+                                (.flush ^OutputStream out))
+                  res         (sh/sh "woff2sfnt" (str input-file)
+                                     :out-enc :bytes)]
              (when (zero? (:exit res))
                (:out res))))

@@ -262,13 +280,15 @@
        (let [data (get input "font/ttf")]
          (-> input
              (update "font/otf" gen-if-nil #(ttf->otf data))
-              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))))
+              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
+              (assoc "font/woff2" (ttf-or-otf->woff2 data))))

        (contains? current "font/otf")
        (let [data (get input "font/otf")]
          (-> input
              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
-              (assoc "font/ttf" (otf->ttf data))))
+              (assoc "font/ttf" (otf->ttf data))
+              (assoc "font/woff2" (ttf-or-otf->woff2 data))))

        (contains? current "font/woff")
        (let [data (get input "font/woff")
@@ -280,7 +300,8 @@
          (let [stype (get-sfnt-type sfnt)]
            (cond-> input
              true
-              (-> (assoc "font/woff" data))
+              (-> (assoc "font/woff" data)
+                  (assoc "font/woff2" (ttf-or-otf->woff2 sfnt)))

              (= stype :otf)
              (-> (assoc "font/otf" sfnt)
@@ -299,7 +320,8 @@
  "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))))
+   (assoc storage :backend (cf/get :assets-storage-backend :assets-fs)))
+  ([storage conn]
+   (-> storage
+       (assoc :conn conn)
+       (assoc :backend (cf/get :assets-storage-backend :assets-fs)))))
--- a/backend/src/app/metrics.clj
+++ b/backend/src/app/metrics.clj
@@ -2,14 +2,12 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.metrics
  (:refer-clojure :exclude [run!])
  (:require
   [app.common.logging :as l]
-   [app.common.spec :as us]
-   [app.metrics.definition :as-alias mdef]
   [clojure.spec.alpha :as s]
   [integrant.core :as ig])
  (:import
@@ -18,12 +16,11 @@
   io.prometheus.client.Counter$Child
   io.prometheus.client.Gauge
   io.prometheus.client.Gauge$Child
+   io.prometheus.client.Summary
+   io.prometheus.client.Summary$Child
+   io.prometheus.client.Summary$Builder
   io.prometheus.client.Histogram
   io.prometheus.client.Histogram$Child
-   io.prometheus.client.SimpleCollector
-   io.prometheus.client.Summary
-   io.prometheus.client.Summary$Builder
-   io.prometheus.client.Summary$Child
   io.prometheus.client.exporter.common.TextFormat
   io.prometheus.client.hotspot.DefaultExports
   java.io.StringWriter))
@@ -31,62 +28,123 @@
 (set! *warn-on-reflection* true)

 (declare create-registry)
-(declare create-collector)
+(declare create)
 (declare handler)

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; METRICS SERVICE PROVIDER
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-(s/def ::mdef/name string?)
-(s/def ::mdef/help string?)
-(s/def ::mdef/labels (s/every string? :kind vector?))
-(s/def ::mdef/type #{:gauge :counter :summary :histogram})
+(def default-metrics
+  {:update-file-changes
+   {:name "rpc_update_file_changes_total"
+    :help "A total number of changes submitted to update-file."
+    :type :counter}

-(s/def ::mdef/instance
-  #(instance? SimpleCollector %))
+   :update-file-bytes-processed
+   {:name "rpc_update_file_bytes_processed_total"
+    :help "A total number of bytes processed by update-file."
+    :type :counter}

-(s/def ::mdef/definition
-  (s/keys :req [::mdef/name
-                ::mdef/help
-                ::mdef/type]
-          :opt [::mdef/labels
-                ::mdef/instance]))
+   :rpc-mutation-timing
+   {:name "rpc_mutation_timing"
+    :help "RPC mutation method call timming."
+    :labels ["name"]
+    :type :histogram}

-(s/def ::definitions
-  (s/map-of keyword? ::mdef/definition))
+   :rpc-query-timing
+   {:name "rpc_query_timing"
+    :help "RPC query method call timing."
+    :labels ["name"]
+    :type :histogram}

-(s/def ::registry
-  #(instance? CollectorRegistry %))
+   :websocket-active-connections
+   {:name "websocket_active_connections"
+    :help "Active websocket connections gauge"
+    :type :gauge}

-(s/def ::handler fn?)
-(s/def ::metrics
-  (s/keys :req [::registry
-                ::handler
-                ::definitions]))
+   :websocket-messages-total
+   {:name "websocket_message_total"
+    :help "Counter of processed messages."
+    :labels ["op"]
+    :type :counter}

-(s/def ::default ::definitions)
+   :websocket-session-timing
+   {:name "websocket_session_timing"
+    :help "Websocket session timing (seconds)."
+    :type :summary}

-(defmethod ig/pre-init-spec ::metrics [_]
-  (s/keys :req-un [::default]))
+   :session-update-total
+   {:name "http_session_update_total"
+    :help "A counter of session update batch events."
+    :type :counter}
+
+   :tasks-timing
+   {:name "penpot_tasks_timing"
+    :help "Background tasks timing (milliseconds)."
+    :labels ["name"]
+    :type :summary}
+
+   :rlimit-queued-submissions
+   {:name "penpot_rlimit_queued_submissions"
+    :help "Current number of queued submissions on RLIMIT."
+    :labels ["name"]
+    :type :gauge}
+
+   :rlimit-used-permits
+   {:name "penpot_rlimit_used_permits"
+    :help "Current number of used permits on RLIMIT."
+    :labels ["name"]
+    :type :gauge}
+
+   :rlimit-acquires-total
+   {:name "penpot_rlimit_acquires_total"
+    :help "Total number of acquire operations on RLIMIT."
+    :labels ["name"]
+    :type :counter}
+
+   :executors-active-threads
+   {:name "penpot_executors_active_threads"
+    :help "Current number of threads available in the executor service."
+    :labels ["name"]
+    :type :gauge}
+
+   :executors-completed-tasks
+   {:name "penpot_executors_completed_tasks_total"
+    :help "Aproximate number of completed tasks by the executor."
+    :labels ["name"]
+    :type :counter}
+
+   :executors-running-threads
+   {:name "penpot_executors_running_threads"
+    :help "Current number of threads with state RUNNING."
+    :labels ["name"]
+    :type :gauge}
+
+   :executors-queued-submissions
+   {:name "penpot_executors_queued_submissions"
+    :help "Current number of queued submissions."
+    :labels ["name"]
+    :type :gauge}})

 (defmethod ig/init-key ::metrics
-  [_ cfg]
+  [_ _]
  (l/info :action "initialize metrics")
  (let [registry    (create-registry)
        definitions (reduce-kv (fn [res k v]
-                                 (->> (assoc v ::registry registry)
-                                      (create-collector)
+                                 (->> (assoc v :registry registry)
+                                      (create)
                                      (assoc res k)))
                               {}
-                               (:default cfg))]
-
-    (us/verify! ::definitions definitions)
-
-    {::handler (partial handler registry)
-     ::definitions definitions
-     ::registry registry}))
+                               default-metrics)]
+    {:handler (partial handler registry)
+     :definitions definitions
+     :registry registry}))

+(s/def ::handler fn?)
+(s/def ::registry #(instance? CollectorRegistry %))
+(s/def ::metrics
+  (s/keys :req-un [::registry ::handler]))

 (defn- handler
  [registry _ respond _]
@@ -96,18 +154,6 @@
    (respond {:headers {"content-type" TextFormat/CONTENT_TYPE_004}
              :body (.toString writer)})))

-
-
-(s/def ::routes vector?)
-(defmethod ig/pre-init-spec ::routes [_]
-  (s/keys :req [::metrics]))
-
-(defmethod ig/init-key ::routes
-  [_ {:keys [::metrics]}]
-  (let [registry (::registry metrics)]
-    ["/metrics" {:handler (partial handler registry)
-                 :allowed-methods #{:get}}]))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Implementation
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -122,16 +168,13 @@
 (def default-histogram-buckets
  [1 5 10 25 50 75 100 250 500 750 1000 2500 5000 7500])

-(defmulti run-collector! (fn [mdef _] (::mdef/type mdef)))
-(defmulti create-collector ::mdef/type)
-
 (defn run!
-  [{:keys [::definitions]} & {:keys [id] :as params}]
+  [{:keys [definitions]} {:keys [id] :as params}]
  (when-let [mobj (get definitions id)]
-    (run-collector! mobj params)
+    ((::fn mobj) params)
    true))

-(defn- create-registry
+(defn create-registry
  []
  (let [registry (CollectorRegistry.)]
    (DefaultExports/register registry)
@@ -143,89 +186,79 @@
    (and (.isArray ^Class oc)
         (= (.getComponentType oc) String))))

-(defmethod run-collector! :counter
-  [{:keys [::mdef/instance]} {:keys [inc labels] :or {inc 1 labels default-empty-labels}}]
-  (let [instance (.labels ^Counter instance (if (is-array? labels) labels (into-array String labels)))]
-    (.inc ^Counter$Child instance (double inc))))
-
-(defmethod run-collector! :gauge
-  [{:keys [::mdef/instance]} {:keys [inc dec labels val] :or {labels default-empty-labels}}]
-  (let [instance (.labels ^Gauge instance (if (is-array? labels) labels (into-array String labels)))]
-    (cond (number? inc) (.inc ^Gauge$Child instance (double inc))
-          (number? dec) (.dec ^Gauge$Child instance (double dec))
-          (number? val) (.set ^Gauge$Child instance (double val)))))
-
-(defmethod run-collector! :summary
-  [{:keys [::mdef/instance]} {:keys [val labels] :or {labels default-empty-labels}}]
-  (let [instance (.labels ^Summary instance (if (is-array? labels) labels (into-array String labels)))]
-    (.observe ^Summary$Child instance val)))
-
-(defmethod run-collector! :histogram
-  [{:keys [::mdef/instance]} {:keys [val labels] :or {labels default-empty-labels}}]
-  (let [instance (.labels ^Histogram instance (if (is-array? labels) labels (into-array String labels)))]
-    (.observe ^Histogram$Child instance val)))
-
-(defmethod create-collector :counter
-  [{::mdef/keys [name help reg labels]
-    ::keys [registry]
-    :as props}]
-
+(defn make-counter
+  [{:keys [name help registry reg labels] :as props}]
  (let [registry (or registry reg)
        instance (.. (Counter/build)
                     (name name)
-                     (help help))]
-    (when (seq labels)
-      (.labelNames instance (into-array String labels)))
+                     (help help))
+        _        (when (seq labels)
+                   (.labelNames instance (into-array String labels)))
+        instance (.register instance registry)]

-    (assoc props ::mdef/instance (.register instance registry))))
+    {::instance instance
+     ::fn (fn [{:keys [inc labels] :or {inc 1 labels default-empty-labels}}]
+            (let [instance (.labels instance (if (is-array? labels) labels (into-array String labels)))]
+              (.inc ^Counter$Child instance (double inc))))}))

-(defmethod create-collector :gauge
-  [{::mdef/keys [name help reg labels]
-    ::keys [registry]
-    :as props}]
+(defn make-gauge
+  [{:keys [name help registry reg labels] :as props}]
  (let [registry (or registry reg)
        instance (.. (Gauge/build)
                     (name name)
-                     (help help))]
-    (when (seq labels)
-      (.labelNames instance (into-array String labels)))
+                     (help help))
+        _        (when (seq labels)
+                   (.labelNames instance (into-array String labels)))
+        instance (.register instance registry)]
+    {::instance instance
+     ::fn (fn [{:keys [inc dec labels val] :or {labels default-empty-labels}}]
+            (let [instance (.labels ^Gauge instance (if (is-array? labels) labels (into-array String labels)))]
+              (cond (number? inc) (.inc ^Gauge$Child instance (double inc))
+                    (number? dec) (.dec ^Gauge$Child instance (double dec))
+                    (number? val) (.set ^Gauge$Child instance (double val)))))}))

-    (assoc props ::mdef/instance (.register instance registry))))
-
-(defmethod create-collector :summary
-  [{::mdef/keys [name help reg labels max-age quantiles buckets]
-    ::keys [registry]
-    :or {max-age 3600 buckets 12 quantiles default-quantiles}
-    :as props}]
+(defn make-summary
+  [{:keys [name help registry reg labels max-age quantiles buckets]
+    :or {max-age 3600 buckets 12 quantiles default-quantiles} :as props}]
  (let [registry (or registry reg)
        builder  (doto (Summary/build)
                   (.name name)
-                   (.help help))]
+                   (.help help))
+        _        (when (seq quantiles)
+                   (.maxAgeSeconds ^Summary$Builder builder ^long max-age)
+                   (.ageBuckets ^Summary$Builder builder buckets))
+        _        (doseq [[q e] quantiles]
+                   (.quantile ^Summary$Builder builder q e))
+        _        (when (seq labels)
+                   (.labelNames ^Summary$Builder builder (into-array String labels)))
+        instance (.register ^Summary$Builder builder registry)]

-    (when (seq quantiles)
-      (.maxAgeSeconds ^Summary$Builder builder ^long max-age)
-      (.ageBuckets ^Summary$Builder builder buckets))
+    {::instance instance
+     ::fn (fn [{:keys [val labels] :or {labels default-empty-labels}}]
+            (let [instance (.labels ^Summary instance (if (is-array? labels) labels (into-array String labels)))]
+              (.observe ^Summary$Child instance val)))}))

-    (doseq [[q e] quantiles]
-      (.quantile ^Summary$Builder builder q e))
-
-    (when (seq labels)
-      (.labelNames ^Summary$Builder builder (into-array String labels)))
-
-    (assoc props ::mdef/instance (.register ^Summary$Builder builder registry))))
-
-(defmethod create-collector :histogram
-  [{::mdef/keys [name help reg labels buckets]
-    ::keys [registry]
-    :or {buckets default-histogram-buckets}
-    :as props}]
+(defn make-histogram
+  [{:keys [name help registry reg labels buckets]
+    :or {buckets default-histogram-buckets}}]
  (let [registry (or registry reg)
        instance (doto (Histogram/build)
                   (.name name)
                   (.help help)
-                   (.buckets (into-array Double/TYPE buckets)))]
+                   (.buckets (into-array Double/TYPE buckets)))
+        _        (when (seq labels)
+                   (.labelNames instance (into-array String labels)))
+        instance (.register instance registry)]

-    (when (seq labels)
-      (.labelNames instance (into-array String labels)))
+    {::instance instance
+     ::fn (fn [{:keys [val labels] :or {labels default-empty-labels}}]
+            (let [instance (.labels ^Histogram instance (if (is-array? labels) labels (into-array String labels)))]
+              (.observe ^Histogram$Child instance val)))}))

-    (assoc props ::mdef/instance (.register instance registry))))
+(defn create
+  [{:keys [type] :as props}]
+  (case type
+    :counter (make-counter props)
+    :gauge   (make-gauge props)
+    :summary (make-summary props)
+    :histogram (make-histogram props)))
--- a/backend/src/app/migrations.clj
+++ b/backend/src/app/migrations.clj
@@ -2,16 +2,12 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

 (ns app.migrations
  (:require
-   [app.common.data.macros :as dm]
-   [app.common.logging :as l]
-   [app.db :as db]
-   [app.migrations.clj.migration-0023 :as mg0023]
+   [app.migrations.migration-0023 :as mg0023]
   [app.util.migrations :as mg]
-   [clojure.spec.alpha :as s]
   [integrant.core :as ig]))

 (def migrations
@@ -230,105 +226,7 @@

   {:name "0072-mod-file-object-thumbnail-table"
    :fn (mg/resource "app/migrations/sql/0072-mod-file-object-thumbnail-table.sql")}
+   ])

-   {:name "0073-mod-file-media-object-constraints"
-    :fn (mg/resource "app/migrations/sql/0073-mod-file-media-object-constraints.sql")}

-   {:name "0074-mod-file-library-rel-constraints"
-    :fn (mg/resource "app/migrations/sql/0074-mod-file-library-rel-constraints.sql")}
-
-   {:name "0075-mod-share-link-table"
-    :fn (mg/resource "app/migrations/sql/0075-mod-share-link-table.sql")}
-
-   {:name "0076-mod-storage-object-table"
-    :fn (mg/resource "app/migrations/sql/0076-mod-storage-object-table.sql")}
-
-   {:name "0077-mod-comment-thread-table"
-    :fn (mg/resource "app/migrations/sql/0077-mod-comment-thread-table.sql")}
-
-   {:name "0078-mod-file-media-object-table-drop-cascade"
-    :fn (mg/resource "app/migrations/sql/0078-mod-file-media-object-table-drop-cascade.sql")}
-
-   {:name "0079-mod-profile-table"
-    :fn (mg/resource "app/migrations/sql/0079-mod-profile-table.sql")}
-
-   {:name "0080-mod-index-names"
-    :fn (mg/resource "app/migrations/sql/0080-mod-index-names.sql")}
-
-   {:name "0081-add-deleted-at-index-to-file-table"
-    :fn (mg/resource "app/migrations/sql/0081-add-deleted-at-index-to-file-table.sql")}
-
-   {:name "0082-add-features-column-to-file-table"
-    :fn (mg/resource "app/migrations/sql/0082-add-features-column-to-file-table.sql")}
-
-   {:name "0083-add-file-data-fragment-table"
-    :fn (mg/resource "app/migrations/sql/0083-add-file-data-fragment-table.sql")}
-
-   {:name "0084-add-features-column-to-file-change-table"
-    :fn (mg/resource "app/migrations/sql/0084-add-features-column-to-file-change-table.sql")}
-
-   {:name "0085-add-webhook-table"
-    :fn (mg/resource "app/migrations/sql/0085-add-webhook-table.sql")}
-
-   {:name "0086-add-webhook-delivery-table"
-    :fn (mg/resource "app/migrations/sql/0086-add-webhook-delivery-table.sql")}
-
-   {:name "0087-mod-task-table"
-    :fn (mg/resource "app/migrations/sql/0087-mod-task-table.sql")}
-
-   {:name "0088-mod-team-profile-rel-table"
-    :fn (mg/resource "app/migrations/sql/0088-mod-team-profile-rel-table.sql")}
-
-   {:name "0089-mod-project-profile-rel-table"
-    :fn (mg/resource "app/migrations/sql/0089-mod-project-profile-rel-table.sql")}
-
-   {:name "0090-mod-http-session-table"
-    :fn (mg/resource "app/migrations/sql/0090-mod-http-session-table.sql")}
-
-   {:name "0091-mod-team-project-profile-rel-table"
-    :fn (mg/resource "app/migrations/sql/0091-mod-team-project-profile-rel-table.sql")}
-
-   {:name "0092-mod-team-invitation-table"
-    :fn (mg/resource "app/migrations/sql/0092-mod-team-invitation-table.sql")}
-
-   {:name "0093-del-file-share-tokens-table"
-    :fn (mg/resource "app/migrations/sql/0093-del-file-share-tokens-table.sql")}
-
-   {:name "0094-del-profile-attr-table"
-    :fn (mg/resource "app/migrations/sql/0094-del-profile-attr-table.sql")}
-
-   {:name "0095-del-storage-data-table"
-    :fn (mg/resource "app/migrations/sql/0095-del-storage-data-table.sql")}
-
-   {:name "0096-del-storage-pending-table"
-    :fn (mg/resource "app/migrations/sql/0096-del-storage-pending-table.sql")}
-
-   {:name "0098-add-quotes-table"
-    :fn (mg/resource "app/migrations/sql/0098-add-quotes-table.sql")}
-
-   {:name "0099-add-access-token-table"
-    :fn (mg/resource "app/migrations/sql/0099-add-access-token-table.sql")}
-
-   {:name "0100-mod-profile-indexes"
-    :fn (mg/resource "app/migrations/sql/0100-mod-profile-indexes.sql")}
-
-   {:name "0101-mod-server-error-report-table"
-    :fn (mg/resource "app/migrations/sql/0101-mod-server-error-report-table.sql")}
-
-  ])
-
-(defn apply-migrations!
-  [pool name migrations]
-  (dm/with-open [conn (db/open pool)]
-    (mg/setup! conn)
-    (mg/migrate! conn {:name name :steps migrations})))
-
-(defmethod ig/pre-init-spec ::migrations
-  [_]
-  (s/keys :req [::db/pool]))
-
-(defmethod ig/init-key ::migrations
-  [module {:keys [::db/pool]}]
-  (when-not (db/read-only? pool)
-    (l/info :hint "running migrations" :module module)
-    (some->> (seq migrations) (apply-migrations! pool "main"))))
+(defmethod ig/init-key ::migrations [_ _] migrations)
--- a/backend/src/app/migrations/clj/migration_0023.clj
+++ b/backend/src/app/migrations/clj/migration_0023.clj
@@ -2,9 +2,9 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL

-(ns app.migrations.clj.migration-0023
+(ns app.migrations.migration-0023
  (:require
   [app.db :as db]
   [app.util.blob :as blob]))
--- a/backend/src/app/migrations/sql/0073-mod-file-media-object-constraints.sql
+++ b/backend/src/app/migrations/sql/0073-mod-file-media-object-constraints.sql
@@ -1,11 +0,0 @@
-ALTER TABLE file_media_object
-ALTER CONSTRAINT file_media_object_media_id_fkey DEFERRABLE INITIALLY IMMEDIATE;
-
-ALTER TABLE file_media_object
-ALTER CONSTRAINT file_media_object_thumbnail_id_fkey DEFERRABLE INITIALLY IMMEDIATE;
-
-ALTER TABLE file_media_object
-RENAME CONSTRAINT media_object_file_id_fkey TO file_media_object_file_id_fkey;
-
-ALTER TABLE file_media_object
-ALTER CONSTRAINT file_media_object_file_id_fkey DEFERRABLE INITIALLY IMMEDIATE;
--- a/backend/src/app/migrations/sql/0074-mod-file-library-rel-constraints.sql
+++ b/backend/src/app/migrations/sql/0074-mod-file-library-rel-constraints.sql
@@ -1,5 +0,0 @@
-ALTER TABLE file_library_rel
-ALTER CONSTRAINT file_library_rel_file_id_fkey DEFERRABLE INITIALLY IMMEDIATE;
-
-ALTER TABLE file_library_rel
-ALTER CONSTRAINT file_library_rel_library_file_id_fkey DEFERRABLE INITIALLY IMMEDIATE;
--- a/backend/src/app/migrations/sql/0075-mod-share-link-table.sql
+++ b/backend/src/app/migrations/sql/0075-mod-share-link-table.sql
@@ -1,5 +0,0 @@
-ALTER TABLE share_link
-  ADD COLUMN who_comment text NOT NULL DEFAULT('team'),
-  ADD COLUMN who_inspect text NOT NULL DEFAULT('team');
-
--- TODO: remove flags column in 1.15.x
--- a/backend/src/app/migrations/sql/0076-mod-storage-object-table.sql
+++ b/backend/src/app/migrations/sql/0076-mod-storage-object-table.sql
@@ -1,10 +0,0 @@
-- Renames the old, already deprecated backend name with new one on
-- all storage object rows.
-
-UPDATE storage_object
-   SET backend = 'assets-fs'
- WHERE backend = 'fs';
-
-UPDATE storage_object
-   SET backend = 'assets-s3'
- WHERE backend = 's3';
--- a/backend/src/app/migrations/sql/0077-mod-comment-thread-table.sql
+++ b/backend/src/app/migrations/sql/0077-mod-comment-thread-table.sql
@@ -1,3 +0,0 @@
--- Add frame_id field.
-ALTER TABLE comment_thread
-  ADD COLUMN frame_id uuid NULL DEFAULT '00000000-0000-0000-0000-000000000000';
--- a/Show More
+++ b/Show More