diff --git a/exporter/src/app/browser.cljs b/exporter/src/app/browser.cljs
index 0ba877fa7..f9811f714 100644
--- a/exporter/src/app/browser.cljs
+++ b/exporter/src/app/browser.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.browser
   (:require
    [lambdaisland.glogi :as log]
diff --git a/exporter/src/app/config.cljs b/exporter/src/app/config.cljs
index 24c352113..993c9555c 100644
--- a/exporter/src/app/config.cljs
+++ b/exporter/src/app/config.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.config
   (:require
    ["process" :as process]
diff --git a/exporter/src/app/core.cljs b/exporter/src/app/core.cljs
index a9414c324..2a20b0f67 100644
--- a/exporter/src/app/core.cljs
+++ b/exporter/src/app/core.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.core
   (:require
    [lambdaisland.glogi :as log]
diff --git a/exporter/src/app/http.cljs b/exporter/src/app/http.cljs
index 03c239087..cc63a7d53 100644
--- a/exporter/src/app/http.cljs
+++ b/exporter/src/app/http.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.http
   (:require
    [app.http.export :refer [export-handler]]
diff --git a/exporter/src/app/http/export_bitmap.cljs b/exporter/src/app/http/export_bitmap.cljs
index b2c46c9e2..09eb81e16 100644
--- a/exporter/src/app/http/export_bitmap.cljs
+++ b/exporter/src/app/http/export_bitmap.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.http.export-bitmap
   (:require
    [cuerdas.core :as str]
diff --git a/exporter/src/app/http/export_svg.cljs b/exporter/src/app/http/export_svg.cljs
index a5e9e8955..33264b042 100644
--- a/exporter/src/app/http/export_svg.cljs
+++ b/exporter/src/app/http/export_svg.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.http.export-svg
   (:require
    [cuerdas.core :as str]
diff --git a/exporter/src/app/http/impl.cljs b/exporter/src/app/http/impl.cljs
index c04c461a7..f51c70370 100644
--- a/exporter/src/app/http/impl.cljs
+++ b/exporter/src/app/http/impl.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.http.impl
   (:require
    ["http" :as http]
diff --git a/exporter/src/app/util/transit.cljs b/exporter/src/app/util/transit.cljs
index e4d487ffd..80ccfea15 100644
--- a/exporter/src/app/util/transit.cljs
+++ b/exporter/src/app/util/transit.cljs
@@ -5,7 +5,7 @@
 ;; This Source Code Form is "Incompatible With Secondary Licenses", as
 ;; defined by the Mozilla Public License, v. 2.0.
 ;;
-;; Copyright (c) 2020 app Labs SL
+;; Copyright (c) 2020-2021 UXBOX Labs SL
 
 (ns app.util.transit
   (:require
diff --git a/exporter/src/app/zipfile.cljs b/exporter/src/app/zipfile.cljs
index ac9c16fe6..8c9cbeff0 100644
--- a/exporter/src/app/zipfile.cljs
+++ b/exporter/src/app/zipfile.cljs
@@ -1,3 +1,12 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020-2021 UXBOX Labs SL
+
 (ns app.zipfile
   (:require
    ["jszip" :as jszip]))
diff --git a/frontend/src/app/main/ui/comments.cljs b/frontend/src/app/main/ui/comments.cljs
index 89555b234..3343403cb 100644
--- a/frontend/src/app/main/ui/comments.cljs
+++ b/frontend/src/app/main/ui/comments.cljs
@@ -11,18 +11,18 @@
   (:require
    [app.config :as cfg]
    [app.main.data.comments :as dcm]
+   [app.main.data.modal :as modal]
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.streams :as ms]
-   [app.main.ui.context :as ctx]
    [app.main.ui.components.dropdown :refer [dropdown]]
-   [app.main.data.modal :as modal]
+   [app.main.ui.context :as ctx]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
-   [app.util.time :as dt]
    [app.util.dom :as dom]
-   [app.util.object :as obj]
    [app.util.i18n :as i18n :refer [t tr]]
+   [app.util.keyboard :as kbd]
+   [app.util.object :as obj]
+   [app.util.time :as dt]
    [cuerdas.core :as str]
    [okulary.core :as l]
    [rumext.alpha :as mf]))
diff --git a/frontend/src/app/main/ui/components/editable_label.cljs b/frontend/src/app/main/ui/components/editable_label.cljs
index 6fac66f56..d8ea4c657 100644
--- a/frontend/src/app/main/ui/components/editable_label.cljs
+++ b/frontend/src/app/main/ui/components/editable_label.cljs
@@ -9,12 +9,12 @@
 
 (ns app.main.ui.components.editable-label
   (:require
-   [rumext.alpha :as mf]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
+   [app.util.data :refer [classnames]]
    [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
    [app.util.timers :as timers]
-   [app.util.data :refer [classnames]]))
+   [rumext.alpha :as mf]))
 
 (mf/defc editable-label
   [{:keys [value on-change on-cancel editing? disable-dbl-click? class-name]}]
diff --git a/frontend/src/app/main/ui/components/numeric_input.cljs b/frontend/src/app/main/ui/components/numeric_input.cljs
index 6ee38c6d1..a8161d7d9 100644
--- a/frontend/src/app/main/ui/components/numeric_input.cljs
+++ b/frontend/src/app/main/ui/components/numeric_input.cljs
@@ -9,12 +9,12 @@
 
 (ns app.main.ui.components.numeric-input
   (:require
-   [rumext.alpha :as mf]
-   [app.main.ui.keyboard :as kbd]
    [app.common.data :as d]
+   [app.common.math :as math]
    [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
-   [app.common.math :as math]))
+   [rumext.alpha :as mf]))
 
 (mf/defc numeric-input
   {::mf/wrap-props false
diff --git a/frontend/src/app/main/ui/confirm.cljs b/frontend/src/app/main/ui/confirm.cljs
index 73bf41bcc..dd1b303af 100644
--- a/frontend/src/app/main/ui/confirm.cljs
+++ b/frontend/src/app/main/ui/confirm.cljs
@@ -8,17 +8,17 @@
 ;; Copyright (c) 2020 UXBOX Labs SL
 
 (ns app.main.ui.confirm
-  (:import goog.events.EventType)
   (:require
-   [rumext.alpha :as mf]
-   [goog.events :as events]
    [app.main.data.modal :as modal]
    [app.main.store :as st]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as k]
+   [app.util.data :refer [classnames]]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr t]]
-   [app.util.data :refer [classnames]]))
+   [app.util.keyboard :as k]
+   [goog.events :as events]
+   [rumext.alpha :as mf])
+  (:import goog.events.EventType))
 
 (mf/defc confirm-dialog
   {::mf/register modal/components
diff --git a/frontend/src/app/main/ui/dashboard/files.cljs b/frontend/src/app/main/ui/dashboard/files.cljs
index d87aa390a..81501e109 100644
--- a/frontend/src/app/main/ui/dashboard/files.cljs
+++ b/frontend/src/app/main/ui/dashboard/files.cljs
@@ -16,9 +16,9 @@
    [app.main.ui.dashboard.grid :refer [grid]]
    [app.main.ui.dashboard.inline-edition :refer [inline-edition]]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t]]
+   [app.util.keyboard :as kbd]
    [app.util.router :as rt]
    [okulary.core :as l]
    [rumext.alpha :as mf]))
diff --git a/frontend/src/app/main/ui/dashboard/grid.cljs b/frontend/src/app/main/ui/dashboard/grid.cljs
index 50c67d187..91e7c89d8 100644
--- a/frontend/src/app/main/ui/dashboard/grid.cljs
+++ b/frontend/src/app/main/ui/dashboard/grid.cljs
@@ -9,20 +9,20 @@
 
 (ns app.main.ui.dashboard.grid
   (:require
-   [app.common.uuid :as uuid]
    [app.common.math :as mth]
+   [app.common.uuid :as uuid]
    [app.config :as cfg]
    [app.main.data.dashboard :as dd]
+   [app.main.data.modal :as modal]
    [app.main.fonts :as fonts]
    [app.main.store :as st]
    [app.main.ui.components.context-menu :refer [context-menu]]
    [app.main.ui.dashboard.inline-edition :refer [inline-edition]]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
-   [app.main.data.modal :as modal]
    [app.main.worker :as wrk]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t tr]]
+   [app.util.keyboard :as kbd]
    [app.util.router :as rt]
    [app.util.time :as dt]
    [app.util.timers :as ts]
diff --git a/frontend/src/app/main/ui/dashboard/inline_edition.cljs b/frontend/src/app/main/ui/dashboard/inline_edition.cljs
index 6439414a8..652fa10f5 100644
--- a/frontend/src/app/main/ui/dashboard/inline_edition.cljs
+++ b/frontend/src/app/main/ui/dashboard/inline_edition.cljs
@@ -10,8 +10,8 @@
 (ns app.main.ui.dashboard.inline-edition
   (:require
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
    [rumext.alpha :as mf]))
 
 (mf/defc inline-edition
diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs
index fde6e0cf2..4aa913ea2 100644
--- a/frontend/src/app/main/ui/dashboard/projects.cljs
+++ b/frontend/src/app/main/ui/dashboard/projects.cljs
@@ -16,9 +16,9 @@
    [app.main.store :as st]
    [app.main.ui.dashboard.grid :refer [line-grid]]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t tr]]
+   [app.util.keyboard :as kbd]
    [app.util.router :as rt]
    [app.util.time :as dt]
    [okulary.core :as l]
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index 2d4fb98a3..f5d98b031 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -13,10 +13,10 @@
    [app.common.spec :as us]
    [app.config :as cfg]
    [app.main.data.auth :as da]
+   [app.main.data.comments :as dcm]
    [app.main.data.dashboard :as dd]
    [app.main.data.messages :as dm]
    [app.main.data.modal :as modal]
-   [app.main.data.comments :as dcm]
    [app.main.refs :as refs]
    [app.main.repo :as rp]
    [app.main.store :as st]
@@ -26,13 +26,13 @@
    [app.main.ui.dashboard.inline-edition :refer [inline-edition]]
    [app.main.ui.dashboard.team-form]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
+   [app.util.avatars :as avatars]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t tr]]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
    [app.util.router :as rt]
    [app.util.time :as dt]
-   [app.util.avatars :as avatars]
    [beicon.core :as rx]
    [cljs.spec.alpha :as s]
    [cuerdas.core :as str]
diff --git a/frontend/src/app/main/ui/dashboard/team_form.cljs b/frontend/src/app/main/ui/dashboard/team_form.cljs
index 0e263e551..4db46c580 100644
--- a/frontend/src/app/main/ui/dashboard/team_form.cljs
+++ b/frontend/src/app/main/ui/dashboard/team_form.cljs
@@ -20,10 +20,10 @@
    [app.main.store :as st]
    [app.main.ui.components.forms :refer [input submit-button form]]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.util.dom :as dom]
    [app.util.forms :as fm]
    [app.util.i18n :as i18n :refer [t tr]]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
    [app.util.router :as rt]
    [app.util.time :as dt]
diff --git a/frontend/src/app/main/ui/handoff.cljs b/frontend/src/app/main/ui/handoff.cljs
index 95c0434e4..b9c41b9f3 100644
--- a/frontend/src/app/main/ui/handoff.cljs
+++ b/frontend/src/app/main/ui/handoff.cljs
@@ -20,11 +20,11 @@
    [app.main.ui.handoff.right-sidebar :refer [right-sidebar]]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.viewer.header :refer [header]]
    [app.main.ui.viewer.thumbnails :refer [thumbnails-panel]]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t tr]]
+   [app.util.keyboard :as kbd]
    [beicon.core :as rx]
    [goog.events :as events]
    [okulary.core :as l]
diff --git a/frontend/src/app/main/ui/handoff/left_sidebar.cljs b/frontend/src/app/main/ui/handoff/left_sidebar.cljs
index 70d1c701d..b9107018d 100644
--- a/frontend/src/app/main/ui/handoff/left_sidebar.cljs
+++ b/frontend/src/app/main/ui/handoff/left_sidebar.cljs
@@ -14,10 +14,9 @@
    [app.main.data.viewer :as dv]
    [app.main.store :as st]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.workspace.sidebar.layers :refer [element-icon layer-name frame-wrapper]]
    [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
    [okulary.core :as l]
    [rumext.alpha :as mf]))
 
diff --git a/frontend/src/app/main/ui/modal.cljs b/frontend/src/app/main/ui/modal.cljs
index a3de8bf92..396aa867b 100644
--- a/frontend/src/app/main/ui/modal.cljs
+++ b/frontend/src/app/main/ui/modal.cljs
@@ -9,14 +9,14 @@
 
 (ns app.main.ui.modal
   (:require
-   [okulary.core :as l]
-   [goog.events :as events]
-   [rumext.alpha :as mf]
-   [app.main.store :as st]
-   [app.main.ui.keyboard :as k]
    [app.main.data.modal :as dm]
+   [app.main.refs :as refs]
+   [app.main.store :as st]
    [app.util.dom :as dom]
-   [app.main.refs :as refs])
+   [app.util.keyboard :as k]
+   [goog.events :as events]
+   [okulary.core :as l]
+   [rumext.alpha :as mf])
   (:import goog.events.EventType))
 
 (defn- on-esc-clicked
diff --git a/frontend/src/app/main/ui/viewer.cljs b/frontend/src/app/main/ui/viewer.cljs
index 7fb7f80a3..01411bcc3 100644
--- a/frontend/src/app/main/ui/viewer.cljs
+++ b/frontend/src/app/main/ui/viewer.cljs
@@ -15,21 +15,21 @@
    [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as geom]
    [app.common.pages :as cp]
+   [app.main.data.comments :as dcm]
    [app.main.data.viewer :as dv]
    [app.main.data.viewer.shortcuts :as sc]
-   [app.main.data.comments :as dcm]
    [app.main.refs :as refs]
    [app.main.store :as st]
+   [app.main.ui.comments :as cmt]
    [app.main.ui.components.fullscreen :as fs]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.viewer.header :refer [header]]
    [app.main.ui.viewer.shapes :as shapes :refer [frame-svg]]
    [app.main.ui.viewer.thumbnails :refer [thumbnails-panel]]
-   [app.main.ui.comments :as cmt]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t tr]]
+   [app.util.keyboard :as kbd]
    [goog.events :as events]
    [okulary.core :as l]
    [rumext.alpha :as mf]))
diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index a8eb93cde..acc321f3b 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -21,7 +21,6 @@
    [app.main.ui.context :as ctx]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.workspace.colorpalette :refer [colorpalette]]
    [app.main.ui.workspace.colorpicker]
    [app.main.ui.workspace.context-menu :refer [context-menu]]
@@ -32,6 +31,7 @@
    [app.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]]
    [app.main.ui.workspace.viewport :refer [viewport viewport-actions coordinates]]
    [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
    [beicon.core :as rx]
    [cuerdas.core :as str]
diff --git a/frontend/src/app/main/ui/workspace/colorpalette.cljs b/frontend/src/app/main/ui/workspace/colorpalette.cljs
index eb2653003..01e3e2012 100644
--- a/frontend/src/app/main/ui/workspace/colorpalette.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpalette.cljs
@@ -18,10 +18,10 @@
    [app.main.ui.components.dropdown :refer [dropdown]]
    [app.main.ui.context :as ctx]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.util.color :as uc]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t]]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
    [beicon.core :as rx]
    [cuerdas.core :as str]
diff --git a/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs b/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs
index fcd72eb28..b62243465 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs
@@ -9,16 +9,7 @@
 
 (ns app.main.ui.workspace.colorpicker.pixel-overlay
   (:require
-   [rumext.alpha :as mf]
-   [cuerdas.core :as str]
-   [okulary.core :as l]
-   [promesa.core :as p]
-   [beicon.core :as rx]
-   [goog.events :as events]
    [app.common.uuid :as uuid]
-   [app.util.timers :as timers]
-   [app.util.dom :as dom]
-   [app.util.object :as obj]
    [app.main.data.colors :as dwc]
    [app.main.data.fetch :as mdf]
    [app.main.data.modal :as modal]
@@ -26,8 +17,17 @@
    [app.main.store :as st]
    [app.main.ui.context :as muc]
    [app.main.ui.cursors :as cur]
-   [app.main.ui.keyboard :as kbd]
-   [app.main.ui.workspace.shapes :refer [shape-wrapper frame-wrapper]])
+   [app.main.ui.workspace.shapes :refer [shape-wrapper frame-wrapper]]
+   [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
+   [app.util.object :as obj]
+   [app.util.timers :as timers]
+   [beicon.core :as rx]
+   [cuerdas.core :as str]
+   [goog.events :as events]
+   [okulary.core :as l]
+   [promesa.core :as p]
+   [rumext.alpha :as mf])
   (:import goog.events.EventType))
 
 (defn format-viewbox [vbox]
diff --git a/frontend/src/app/main/ui/workspace/effects.cljs b/frontend/src/app/main/ui/workspace/effects.cljs
index 84a69c299..dee7ee88f 100644
--- a/frontend/src/app/main/ui/workspace/effects.cljs
+++ b/frontend/src/app/main/ui/workspace/effects.cljs
@@ -9,13 +9,13 @@
 
 (ns app.main.ui.workspace.effects
   (:require
-   [rumext.alpha :as mf]
-   [app.util.dom :as dom]
-   [app.main.data.workspace.selection :as dws]
-   [app.main.store :as st]
    [app.main.data.workspace :as dw]
+   [app.main.data.workspace.selection :as dws]
    [app.main.refs :as refs]
-   [app.main.ui.keyboard :as kbd]))
+   [app.main.store :as st]
+   [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
+   [rumext.alpha :as mf]))
 
 (defn use-pointer-enter
   [{:keys [id]}]
diff --git a/frontend/src/app/main/ui/workspace/header.cljs b/frontend/src/app/main/ui/workspace/header.cljs
index e4507a5ec..53948281f 100644
--- a/frontend/src/app/main/ui/workspace/header.cljs
+++ b/frontend/src/app/main/ui/workspace/header.cljs
@@ -19,10 +19,10 @@
    [app.main.store :as st]
    [app.main.ui.components.dropdown :refer [dropdown]]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.workspace.presence :refer [active-sessions]]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
+   [app.util.keyboard :as kbd]
    [app.util.router :as rt]
    [okulary.core :as l]
    [rumext.alpha :as mf]))
diff --git a/frontend/src/app/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
index ff0e4ff0b..679f9af15 100644
--- a/frontend/src/app/main/ui/workspace/shapes/frame.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
@@ -14,16 +14,16 @@
    [app.main.data.workspace :as dw]
    [app.main.refs :as refs]
    [app.main.store :as st]
-   [app.main.ui.keyboard :as kbd]
+   [app.main.ui.context :as muc]
    [app.main.ui.shapes.frame :as frame]
    [app.main.ui.shapes.shape :refer [shape-container]]
    [app.main.ui.workspace.effects :as we]
    [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
    [app.util.timers :as ts]
    [beicon.core :as rx]
    [okulary.core :as l]
-   [rumext.alpha :as mf]
-   [app.main.ui.context :as muc]))
+   [rumext.alpha :as mf]))
 
 (defn use-select-shape [{:keys [id]} edition]
   (mf/use-callback
diff --git a/frontend/src/app/main/ui/workspace/shapes/interactions.cljs b/frontend/src/app/main/ui/workspace/shapes/interactions.cljs
index d4a8684fe..469a636fc 100644
--- a/frontend/src/app/main/ui/workspace/shapes/interactions.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/interactions.cljs
@@ -10,17 +10,17 @@
 (ns app.main.ui.workspace.shapes.interactions
   "Visually show shape interactions in workspace"
   (:require
-   [rumext.alpha :as mf]
-   [cuerdas.core :as str]
-   [app.util.data :as dt]
-   [app.util.dom :as dom]
    [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as geom]
-   [app.main.store :as st]
-   [app.main.refs :as refs]
    [app.main.data.workspace :as dw]
-   [app.main.ui.keyboard :as kbd]
-   [app.main.ui.workspace.shapes.outline :refer [outline]]))
+   [app.main.refs :as refs]
+   [app.main.store :as st]
+   [app.main.ui.workspace.shapes.outline :refer [outline]]
+   [app.util.data :as dt]
+   [app.util.dom :as dom]
+   [app.util.keyboard :as kbd]
+   [cuerdas.core :as str]
+   [rumext.alpha :as mf]))
 
 (defn- get-click-interaction
   [shape]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
index 52e519ce6..ed043bf1c 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
@@ -26,17 +26,17 @@
    [app.main.store :as st]
    [app.main.ui.components.color-bullet :as bc]
    [app.main.ui.components.context-menu :refer [context-menu]]
+   [app.main.ui.components.editable-label :refer [editable-label]]
    [app.main.ui.components.file-uploader :refer [file-uploader]]
    [app.main.ui.components.tab-container :refer [tab-container tab-element]]
-   [app.main.ui.components.editable-label :refer [editable-label]]
    [app.main.ui.context :as ctx]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.workspace.sidebar.options.typography :refer [typography-entry]]
    [app.util.data :refer [matches-search]]
    [app.util.dom :as dom]
    [app.util.dom.dnd :as dnd]
    [app.util.i18n :as i18n :refer [tr t]]
+   [app.util.keyboard :as kbd]
    [app.util.router :as rt]
    [app.util.text :as ut]
    [app.util.timers :as timers]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
index 83e776c7c..fc1630396 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
@@ -18,10 +18,9 @@
    [app.main.store :as st]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
-   [app.main.ui.keyboard :as kbd]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t]]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
    [app.util.perf :as perf]
    [app.util.timers :as ts]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs
index bb28e672b..5b2d8eb52 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs
@@ -9,18 +9,18 @@
 
 (ns app.main.ui.workspace.sidebar.sitemap
   (:require
-   [app.main.ui.components.context-menu :refer [context-menu]]
    [app.common.data :as d]
    [app.main.data.modal :as modal]
    [app.main.data.workspace :as dw]
    [app.main.refs :as refs]
    [app.main.store :as st]
+   [app.main.ui.components.context-menu :refer [context-menu]]
    [app.main.ui.context :as ctx]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
+   [app.util.keyboard :as kbd]
    [app.util.router :as rt]
    [cuerdas.core :as str]
    [okulary.core :as l]
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index a495d37da..a92b2bcb4 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -29,7 +29,6 @@
    [app.main.ui.cursors :as cur]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.workspace.colorpicker.pixel-overlay :refer [pixel-overlay]]
    [app.main.ui.workspace.comments :refer [comments-layer]]
    [app.main.ui.workspace.drawarea :refer [draw-area]]
@@ -46,6 +45,7 @@
    [app.util.dom :as dom]
    [app.util.dom.dnd :as dnd]
    [app.util.http :as http]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
    [app.util.perf :as perf]
    [app.util.timers :as timers]
diff --git a/frontend/src/app/main/ui/keyboard.cljs b/frontend/src/app/util/keyboard.cljs
similarity index 93%
rename from frontend/src/app/main/ui/keyboard.cljs
rename to frontend/src/app/util/keyboard.cljs
index 95a59c4e5..3aa7681d9 100644
--- a/frontend/src/app/main/ui/keyboard.cljs
+++ b/frontend/src/app/util/keyboard.cljs
@@ -7,8 +7,7 @@
 ;;
 ;; Copyright (c) 2020-2021 UXBOX Labs SL
 
-;; TODO: Move to another namespace
-(ns app.main.ui.keyboard)
+(ns app.util.keyboard)
 
 (defn is-keycode?
   [keycode]