diff --git a/scripts/build-tests.clj b/scripts/build-tests.clj
index b47a83d9cd..c5cbd2cebe 100644
--- a/scripts/build-tests.clj
+++ b/scripts/build-tests.clj
@@ -1,8 +1,4 @@
-(require '[cljs.build.api :as b]
-         '[cljs.tagged-literals])
-
-(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
-                assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
+(require '[cljs.build.api :as b])
 
 (println "Building ...")
 
diff --git a/scripts/dist.clj b/scripts/dist.clj
index 22492f61b1..a704de7048 100644
--- a/scripts/dist.clj
+++ b/scripts/dist.clj
@@ -1,8 +1,4 @@
-(require '[cljs.build.api :as b]
-         '[cljs.tagged-literals])
-
-(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
-                assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
+(require '[cljs.build.api :as b])
 
 (println "Building ...")
 
diff --git a/scripts/figwheel.clj b/scripts/figwheel.clj
index a009451a8f..f72a5394e5 100644
--- a/scripts/figwheel.clj
+++ b/scripts/figwheel.clj
@@ -1,9 +1,5 @@
 (require '[figwheel-sidecar.repl :as r]
-         '[figwheel-sidecar.repl-api :as ra]
-         '[cljs.tagged-literals])
-
-(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
-                assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
+         '[figwheel-sidecar.repl-api :as ra])
 
 (ra/start-figwheel!
   {:figwheel-options {:css-dirs ["resources/public/css"]}
diff --git a/scripts/watch-tests.clj b/scripts/watch-tests.clj
index 63a89bb7e9..4c91bcc70b 100644
--- a/scripts/watch-tests.clj
+++ b/scripts/watch-tests.clj
@@ -1,8 +1,4 @@
-(require '[cljs.build.api :as b]
-         '[cljs.tagged-literals])
-
-(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
-                assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
+(require '[cljs.build.api :as b])
 
 (b/watch (b/inputs "src" "vendor" "test")
   {:main 'uxbox.test-runner
diff --git a/src/uxbox/ui/dashboard/colors.cljs b/src/uxbox/ui/dashboard/colors.cljs
index 35e9881d01..c2e93b076a 100644
--- a/src/uxbox/ui/dashboard/colors.cljs
+++ b/src/uxbox/ui/dashboard/colors.cljs
@@ -57,7 +57,7 @@
       (html
        [:div.dashboard-title {}
         [:h2 {}
-         [:span #ux/tr "ds.library-title"]
+         [:span (tr "ds.library-title")]
          [:span {:content-editable ""
                  :on-key-up on-title-edited}
           (:name coll)]]
diff --git a/src/uxbox/ui/dashboard/header.cljs b/src/uxbox/ui/dashboard/header.cljs
index f9512b1488..a150926ae9 100644
--- a/src/uxbox/ui/dashboard/header.cljs
+++ b/src/uxbox/ui/dashboard/header.cljs
@@ -9,7 +9,7 @@
   (:require [sablono.core :as html :refer-macros [html]]
             [rum.core :as rum]
             [lentes.core :as l]
-            [uxbox.locales]
+            [uxbox.locales :refer (tr)]
             [uxbox.router :as r]
             [uxbox.rstore :as rs]
             [uxbox.state :as s]
@@ -42,13 +42,13 @@
        (header-link :dashboard/projects i/logo)]
       [:ul.main-nav
        [:li {:class (when projects? "current")}
-        (header-link :dashboard/projects #ux/tr "ds.projects")]
+        (header-link :dashboard/projects (tr "ds.projects"))]
        [:li {:class (when elements? "current")}
-        (header-link :dashboard/elements #ux/tr "ds.elements")]
+        (header-link :dashboard/elements (tr "ds.elements"))]
        [:li {:class (when icons? "current")}
-        (header-link :dashboard/icons #ux/tr "ds.icons")]
+        (header-link :dashboard/icons (tr "ds.icons"))]
        [:li {:class (when colors? "current")}
-        (header-link :dashboard/colors #ux/tr "ds.colors")]]
+        (header-link :dashboard/colors (tr "ds.colors"))]]
       (ui.u/user)])))
 
 (def ^:static header
diff --git a/src/uxbox/ui/dashboard/icons.cljs b/src/uxbox/ui/dashboard/icons.cljs
index b397cef288..667de01018 100644
--- a/src/uxbox/ui/dashboard/icons.cljs
+++ b/src/uxbox/ui/dashboard/icons.cljs
@@ -12,6 +12,7 @@
             [uxbox.state :as st]
             [uxbox.rstore :as rs]
             [uxbox.schema :as sc]
+            [uxbox.locales :refer (tr)]
             [uxbox.library :as library]
             [uxbox.data.dashboard :as dd]
             [uxbox.ui.icons :as i]
@@ -36,7 +37,7 @@
     (html
      [:div.dashboard-title {}
       [:h2 {}
-       [:span #ux/tr "ds.library-title"]
+       [:span (tr "ds.library-title")]
        [:span {:content-editable ""
                :on-key-up (constantly nil)}
         (:name coll)]]
@@ -68,10 +69,10 @@
        [:ul.library-tabs
         [:li {:class-name (when builtin? "current")
               :on-click #(rs/emit! (dd/set-collection-type :builtin))}
-         #ux/tr "ds.standard-title"]
+         (tr "ds.standard-title")]
         [:li {:class-name (when own? "current")
               :on-click #(rs/emit! (dd/set-collection-type :own))}
-         #ux/tr "ds.your-libraries-title"]]
+         (tr "ds.your-libraries-title")]]
        [:ul.library-elements
         (when own?
           [:li