diff --git a/src/uxbox/main/ui.cljs b/src/uxbox/main/ui.cljs
index 1fb918ce6..2bbc85ac2 100644
--- a/src/uxbox/main/ui.cljs
+++ b/src/uxbox/main/ui.cljs
@@ -112,7 +112,7 @@
   (mx/component
    {:render app-render
     :will-mount app-will-mount
-    :mixins [rum/reactive]
+    :mixins [mx/reactive]
     :name "app"}))
 
 ;; --- Routes
diff --git a/src/uxbox/main/ui/auth/recovery.cljs b/src/uxbox/main/ui/auth/recovery.cljs
index 71128b8cf..ee8724324 100644
--- a/src/uxbox/main/ui/auth/recovery.cljs
+++ b/src/uxbox/main/ui/auth/recovery.cljs
@@ -77,7 +77,7 @@
   (mx/component
    {:render form-render
     :name "form"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Recovery Request Page
 
diff --git a/src/uxbox/main/ui/auth/recovery_request.cljs b/src/uxbox/main/ui/auth/recovery_request.cljs
index 741df3807..fbe6b6490 100644
--- a/src/uxbox/main/ui/auth/recovery_request.cljs
+++ b/src/uxbox/main/ui/auth/recovery_request.cljs
@@ -76,7 +76,7 @@
   (mx/component
    {:render form-render
     :name "form"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Recovery Request Page
 
diff --git a/src/uxbox/main/ui/auth/register.cljs b/src/uxbox/main/ui/auth/register.cljs
index 04b804501..f8c658805 100644
--- a/src/uxbox/main/ui/auth/register.cljs
+++ b/src/uxbox/main/ui/auth/register.cljs
@@ -100,7 +100,7 @@
   (mx/component
    {:render register-form-render
     :name "register-form"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Register Page
 
diff --git a/src/uxbox/main/ui/dashboard/colors.cljs b/src/uxbox/main/ui/dashboard/colors.cljs
index 27b5cf221..287404e99 100644
--- a/src/uxbox/main/ui/dashboard/colors.cljs
+++ b/src/uxbox/main/ui/dashboard/colors.cljs
@@ -90,7 +90,7 @@
   (mx/component
    {:render page-title-render
     :name "page-title"
-    :mixins [(rum/local {}) mx/static rum/reactive]}))
+    :mixins [(rum/local {}) mx/static mx/reactive]}))
 
 ;; --- Nav
 
@@ -134,7 +134,7 @@
   (mx/component
    {:render nav-render
     :name "nav"
-    :mixins [rum/reactive]}))
+    :mixins [mx/reactive]}))
 
 ;; --- Grid
 
@@ -195,7 +195,7 @@
     :name "grid"
     :mixins [(rum/local {:selected #{}})
              mx/static
-             rum/reactive]}))
+             mx/reactive]}))
 
 ;; --- Menu
 
@@ -214,7 +214,7 @@
   (mx/component
    {:render menu-render
     :name "menu"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 
 ;; --- Colors Page
@@ -235,7 +235,7 @@
             (dc/initialize))
   own)
 
-(defn colors-page-transfer-state
+(defn colors-page-did-remount
   [old-state state]
   (rs/emit! (dd/initialize :dashboard/colors))
   state)
@@ -244,7 +244,7 @@
   (mx/component
    {:render colors-page-render
     :will-mount colors-page-will-mount
-    :transfer-state colors-page-transfer-state
+    :did-remount colors-page-did-remount
     :name "colors"
     :mixins [mx/static]}))
 
diff --git a/src/uxbox/main/ui/dashboard/elements.cljs b/src/uxbox/main/ui/dashboard/elements.cljs
index 36c527c5d..7fe62065d 100644
--- a/src/uxbox/main/ui/dashboard/elements.cljs
+++ b/src/uxbox/main/ui/dashboard/elements.cljs
@@ -148,7 +148,7 @@
   (rs/emit! (dd/initialize :dashboard/elements))
   own)
 
-(defn elements-page-transfer-state
+(defn elements-page-did-remount
   [old-state state]
   (rs/emit! (dd/initialize :dashboard/elements))
   state)
@@ -157,7 +157,7 @@
   (mx/component
    {:render elements-page-render
     :will-mount elements-page-will-mount
-    :transfer-state elements-page-transfer-state
+    :did-remount elements-page-did-remount
     :name "elements-page"
     :mixins [mx/static]}))
 
diff --git a/src/uxbox/main/ui/dashboard/header.cljs b/src/uxbox/main/ui/dashboard/header.cljs
index 39e899080..2f6fe3299 100644
--- a/src/uxbox/main/ui/dashboard/header.cljs
+++ b/src/uxbox/main/ui/dashboard/header.cljs
@@ -59,4 +59,4 @@
    {:render header-render
     :name "header"
     :mixins [rum/static
-             rum/reactive]}))
+             mx/reactive]}))
diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs
index 3e36dacac..1361d1b76 100644
--- a/src/uxbox/main/ui/dashboard/icons.cljs
+++ b/src/uxbox/main/ui/dashboard/icons.cljs
@@ -51,7 +51,7 @@
   (mx/component
    {:render page-title-render
     :name "page-title"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Nav
 
@@ -92,7 +92,7 @@
   (mx/component
    {:render nav-render
     :name "nav"
-    :mixins [rum/reactive]}))
+    :mixins [mx/reactive]}))
 
 ;; --- Grid
 
@@ -121,7 +121,7 @@
   (mx/component
    {:render grid-render
     :name "grid"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Icons Page
 
diff --git a/src/uxbox/main/ui/dashboard/images.cljs b/src/uxbox/main/ui/dashboard/images.cljs
index 6cf99ab06..15a25b249 100644
--- a/src/uxbox/main/ui/dashboard/images.cljs
+++ b/src/uxbox/main/ui/dashboard/images.cljs
@@ -130,7 +130,7 @@
   (mx/component
    {:render page-title-render
     :name "page-title"
-    :mixins [(mx/local) mx/static rum/reactive]}))
+    :mixins [(mx/local) mx/static mx/reactive]}))
 
 ;; --- Nav
 
@@ -174,7 +174,7 @@
   (mx/component
    {:render nav-render
     :name "nav"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 ;; --- Grid
 
@@ -258,7 +258,7 @@
   (mx/component
    {:render grid-render
     :name "grid"
-    :mixins [(rum/local {:selected #{}}) mx/static rum/reactive]}))
+    :mixins [(rum/local {:selected #{}}) mx/static mx/reactive]}))
 
 ;; --- Sort Widget
 
@@ -286,7 +286,7 @@
   (mx/component
    {:render sort-widget-render
     :name "sort-widget-render"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 ;; --- Filtering Widget
 
@@ -314,7 +314,7 @@
   (mx/component
    {:render search-widget-render
     :name "search-widget"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 ;; --- Menu
 
@@ -335,7 +335,7 @@
   (mx/component
    {:render menu-render
     :name "menu"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 
 ;; --- Images Page
diff --git a/src/uxbox/main/ui/dashboard/projects.cljs b/src/uxbox/main/ui/dashboard/projects.cljs
index dcfba83a1..fb59d9866 100644
--- a/src/uxbox/main/ui/dashboard/projects.cljs
+++ b/src/uxbox/main/ui/dashboard/projects.cljs
@@ -100,7 +100,7 @@
   (mx/component
    {:render sort-widget-render
     :name "sort-widget-render"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 ;; --- Filtering Widget
 
@@ -129,7 +129,7 @@
   (mx/component
    {:render search-widget-render
     :name "search-widget"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 ;; --- Sort & Search Menu
 
@@ -148,7 +148,7 @@
   (mx/component
    {:render menu-render
     :name "menu"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 ;; --- Grid Item
 
@@ -214,7 +214,7 @@
   (mx/component
    {:render grid-render
     :name "grid"
-    :mixins [rum/reactive]}))
+    :mixins [mx/reactive]}))
 
 ;; --- Page
 
diff --git a/src/uxbox/main/ui/lightbox.cljs b/src/uxbox/main/ui/lightbox.cljs
index 8a28783f3..0d20fb9d7 100644
--- a/src/uxbox/main/ui/lightbox.cljs
+++ b/src/uxbox/main/ui/lightbox.cljs
@@ -71,4 +71,4 @@
     :transfer-state lightbox-transfer-state
     :will-mount lightbox-will-mount
     :will-unmount lightbox-will-umount
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
diff --git a/src/uxbox/main/ui/loader.cljs b/src/uxbox/main/ui/loader.cljs
index 10f24b584..1add6c560 100644
--- a/src/uxbox/main/ui/loader.cljs
+++ b/src/uxbox/main/ui/loader.cljs
@@ -34,5 +34,5 @@
   (mx/component
    {:render loader-render
     :name "loader"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
diff --git a/src/uxbox/main/ui/messages.cljs b/src/uxbox/main/ui/messages.cljs
index 8c44b3d55..a45d78695 100644
--- a/src/uxbox/main/ui/messages.cljs
+++ b/src/uxbox/main/ui/messages.cljs
@@ -88,4 +88,4 @@
   (mx/component
    {:render messages-render
     :name "messages"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
diff --git a/src/uxbox/main/ui/settings/header.cljs b/src/uxbox/main/ui/settings/header.cljs
index c228cc2b9..6aa8ba280 100644
--- a/src/uxbox/main/ui/settings/header.cljs
+++ b/src/uxbox/main/ui/settings/header.cljs
@@ -54,4 +54,4 @@
    {:render header-render
     :name "header"
     :mixins [rum/static
-             rum/reactive]}))
+             mx/reactive]}))
diff --git a/src/uxbox/main/ui/settings/password.cljs b/src/uxbox/main/ui/settings/password.cljs
index 6851d6e76..f144041c9 100644
--- a/src/uxbox/main/ui/settings/password.cljs
+++ b/src/uxbox/main/ui/settings/password.cljs
@@ -82,7 +82,7 @@
   (mx/component
    {:render password-form-render
     :name "password-form"
-    :mixins [mx/static (mx/local) rum/reactive]}))
+    :mixins [mx/static (mx/local) mx/reactive]}))
 
 ;; --- Password Page
 
diff --git a/src/uxbox/main/ui/settings/profile.cljs b/src/uxbox/main/ui/settings/profile.cljs
index a8527d458..ec1c7e714 100644
--- a/src/uxbox/main/ui/settings/profile.cljs
+++ b/src/uxbox/main/ui/settings/profile.cljs
@@ -116,7 +116,7 @@
   (mx/component
    {:render profile-form-render
     :name "profile-form"
-    :mixins [(mx/local) rum/reactive mx/static]}))
+    :mixins [(mx/local) mx/reactive mx/static]}))
 
 ;; --- Profile Photo Form
 
@@ -144,7 +144,7 @@
   (mx/component
    {:render profile-photo-form-render
     :name  profile-photo-form
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Profile Page
 
diff --git a/src/uxbox/main/ui/shapes.cljs b/src/uxbox/main/ui/shapes.cljs
index d21fe93d0..078063483 100644
--- a/src/uxbox/main/ui/shapes.cljs
+++ b/src/uxbox/main/ui/shapes.cljs
@@ -28,4 +28,4 @@
   (mx/component
    {:render shape-render
     :name "shape"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
diff --git a/src/uxbox/main/ui/shapes/circle.cljs b/src/uxbox/main/ui/shapes/circle.cljs
index a0e0abeb2..d33f31fdf 100644
--- a/src/uxbox/main/ui/shapes/circle.cljs
+++ b/src/uxbox/main/ui/shapes/circle.cljs
@@ -34,7 +34,7 @@
   (mx/component
    {:render circle-component-render
     :name "circle-component"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Circle Shape
 
diff --git a/src/uxbox/main/ui/shapes/group.cljs b/src/uxbox/main/ui/shapes/group.cljs
index aec85acd7..476c60182 100644
--- a/src/uxbox/main/ui/shapes/group.cljs
+++ b/src/uxbox/main/ui/shapes/group.cljs
@@ -55,7 +55,7 @@
   (mx/component
    {:render group-component-render
     :name "group-component"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Group Shape
 
diff --git a/src/uxbox/main/ui/shapes/icon.cljs b/src/uxbox/main/ui/shapes/icon.cljs
index 6c4b2847f..e541c8b09 100644
--- a/src/uxbox/main/ui/shapes/icon.cljs
+++ b/src/uxbox/main/ui/shapes/icon.cljs
@@ -33,7 +33,7 @@
   (mx/component
    {:render icon-component-render
     :name "icon-component"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Icon Shape
 
diff --git a/src/uxbox/main/ui/shapes/line.cljs b/src/uxbox/main/ui/shapes/line.cljs
index 10e4f2503..95f3c768a 100644
--- a/src/uxbox/main/ui/shapes/line.cljs
+++ b/src/uxbox/main/ui/shapes/line.cljs
@@ -33,7 +33,7 @@
   (mx/component
    {:render line-component-render
     :name "line-component"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Line Shape
 
diff --git a/src/uxbox/main/ui/shapes/rect.cljs b/src/uxbox/main/ui/shapes/rect.cljs
index c99b90a33..304bcbdd8 100644
--- a/src/uxbox/main/ui/shapes/rect.cljs
+++ b/src/uxbox/main/ui/shapes/rect.cljs
@@ -34,7 +34,7 @@
   (mx/component
    {:render rect-component-render
     :name "rect-component"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Rect Shape
 
diff --git a/src/uxbox/main/ui/shapes/text.cljs b/src/uxbox/main/ui/shapes/text.cljs
index de4a7d924..6576d65cb 100644
--- a/src/uxbox/main/ui/shapes/text.cljs
+++ b/src/uxbox/main/ui/shapes/text.cljs
@@ -66,7 +66,7 @@
   (mx/component
    {:render text-component-render
     :name "text-componet"
-    :mixins [mx/static rum/reactive (mx/local)]}))
+    :mixins [mx/static mx/reactive (mx/local)]}))
 
 ;; --- Text Styles Helpers
 
diff --git a/src/uxbox/main/ui/users.cljs b/src/uxbox/main/ui/users.cljs
index 24db49991..f8e646bc6 100644
--- a/src/uxbox/main/ui/users.cljs
+++ b/src/uxbox/main/ui/users.cljs
@@ -65,11 +65,11 @@
      [:div.user-zone {:on-mouse-enter #(swap! local assoc :open true)
                       :on-mouse-leave #(swap! local assoc :open false)}
       [:span (:fullname profile)]
-      [:img {:border "0" :src photo}]
+      [:img {:src photo}]
       (user-menu (:open @local))])))
 
 (def user
   (mx/component
    {:render user-render
     :name "user"
-    :mixins [rum/reactive (rum/local {:open false})]}))
+    :mixins [mx/reactive (rum/local {:open false})]}))
diff --git a/src/uxbox/main/ui/workspace.cljs b/src/uxbox/main/ui/workspace.cljs
index 37a3e375c..4d6c2926d 100644
--- a/src/uxbox/main/ui/workspace.cljs
+++ b/src/uxbox/main/ui/workspace.cljs
@@ -152,6 +152,6 @@
     :did-mount workspace-did-mount
     :name "workspace"
     :mixins [mx/static
-             rum/reactive
+             mx/reactive
              shortcuts-mixin
              (mx/local)]}))
diff --git a/src/uxbox/main/ui/workspace/canvas.cljs b/src/uxbox/main/ui/workspace/canvas.cljs
index ac4501c30..9470a2240 100644
--- a/src/uxbox/main/ui/workspace/canvas.cljs
+++ b/src/uxbox/main/ui/workspace/canvas.cljs
@@ -76,7 +76,7 @@
   (mx/component
    {:render canvas-render
     :name "canvas"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Viewport Component
@@ -191,4 +191,4 @@
     :did-mount viewport-did-mount
     :will-unmount viewport-will-unmount
     :transfer-state viewport-transfer-state
-    :mixins [rum/reactive]}))
+    :mixins [mx/reactive]}))
diff --git a/src/uxbox/main/ui/workspace/clipboard.cljs b/src/uxbox/main/ui/workspace/clipboard.cljs
index c5fad4904..d8b822532 100644
--- a/src/uxbox/main/ui/workspace/clipboard.cljs
+++ b/src/uxbox/main/ui/workspace/clipboard.cljs
@@ -52,7 +52,7 @@
   (mx/component
    {:render clipboard-dialog-render
     :name "clipboard-dialog"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 (defmethod lbx/render-lightbox :clipboard
   [_]
diff --git a/src/uxbox/main/ui/workspace/colorpalette.cljs b/src/uxbox/main/ui/workspace/colorpalette.cljs
index c169ef0f3..d181ac90d 100644
--- a/src/uxbox/main/ui/workspace/colorpalette.cljs
+++ b/src/uxbox/main/ui/workspace/colorpalette.cljs
@@ -94,5 +94,5 @@
   (mx/component
    {:render colorpalette-render
     :name "colorpalette"
-    :mixins [mx/static rum/reactive
+    :mixins [mx/static mx/reactive
              (mx/local {})]}))
diff --git a/src/uxbox/main/ui/workspace/colorpicker.cljs b/src/uxbox/main/ui/workspace/colorpicker.cljs
index 98a038c11..da8d961b6 100644
--- a/src/uxbox/main/ui/workspace/colorpicker.cljs
+++ b/src/uxbox/main/ui/workspace/colorpicker.cljs
@@ -61,7 +61,7 @@
   (mx/component
    {:render colorpicker-render
     :name "colorpicker"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 (defmethod lbx/render-lightbox :workspace/colorpicker
   [params]
diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs
index 7e91f4b5a..132b5c38d 100644
--- a/src/uxbox/main/ui/workspace/drawarea.cljs
+++ b/src/uxbox/main/ui/workspace/drawarea.cljs
@@ -61,7 +61,7 @@
     :will-mount draw-area-will-mount
     :will-unmount draw-area-will-unmount
     :transfer-state draw-area-transfer-state
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Drawing Logic
 
diff --git a/src/uxbox/main/ui/workspace/grid.cljs b/src/uxbox/main/ui/workspace/grid.cljs
index 63b8bf872..a57e2b485 100644
--- a/src/uxbox/main/ui/workspace/grid.cljs
+++ b/src/uxbox/main/ui/workspace/grid.cljs
@@ -43,7 +43,7 @@
   (mx/component
    {:render grid-render
     :name "grid"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Helpers
 
diff --git a/src/uxbox/main/ui/workspace/header.cljs b/src/uxbox/main/ui/workspace/header.cljs
index 4652ddaf6..69acc2bdd 100644
--- a/src/uxbox/main/ui/workspace/header.cljs
+++ b/src/uxbox/main/ui/workspace/header.cljs
@@ -51,7 +51,7 @@
   (mx/component
    {:render coordenates-render
     :name "coordenates"
-    :mixins [rum/reactive]}))
+    :mixins [mx/reactive]}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Header
@@ -164,4 +164,4 @@
   (mx/component
    {:render header-render
     :name "workspace-header"
-    :mixins [rum/reactive]}))
+    :mixins [mx/reactive]}))
diff --git a/src/uxbox/main/ui/workspace/recent_colors.cljs b/src/uxbox/main/ui/workspace/recent_colors.cljs
index 044d28857..56959e41d 100644
--- a/src/uxbox/main/ui/workspace/recent_colors.cljs
+++ b/src/uxbox/main/ui/workspace/recent_colors.cljs
@@ -60,5 +60,5 @@
   (mx/component
    {:render recent-colors-render
     :name "recent-colors"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
diff --git a/src/uxbox/main/ui/workspace/ruler.cljs b/src/uxbox/main/ui/workspace/ruler.cljs
index 1b16b171a..895daaaff 100644
--- a/src/uxbox/main/ui/workspace/ruler.cljs
+++ b/src/uxbox/main/ui/workspace/ruler.cljs
@@ -117,7 +117,7 @@
     :will-unmount overlay-will-unmount
     :transfer-state overlay-transfer-state
     :name "overlay"
-    :mixins [mx/static (mx/local) rum/reactive]}))
+    :mixins [mx/static (mx/local) mx/reactive]}))
 
 (defn- overlay-line-render
   [own center pt]
@@ -153,4 +153,4 @@
   (mx/component
    {:render ruler-render
     :name "ruler"
-    :mixins [mx/static rum/reactive (mx/local)]}))
+    :mixins [mx/static mx/reactive (mx/local)]}))
diff --git a/src/uxbox/main/ui/workspace/rules.cljs b/src/uxbox/main/ui/workspace/rules.cljs
index 36785975a..c82927434 100644
--- a/src/uxbox/main/ui/workspace/rules.cljs
+++ b/src/uxbox/main/ui/workspace/rules.cljs
@@ -158,7 +158,7 @@
   (mx/component
    {:render horizontal-rule-render
     :name "horizontal-rule"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Vertical Rule (Component)
 
@@ -184,4 +184,4 @@
   (mx/component
    {:render vertical-rule-render
     :name "vertical-rule"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
diff --git a/src/uxbox/main/ui/workspace/selection.cljs b/src/uxbox/main/ui/workspace/selection.cljs
index 5a6c32244..d81a79c06 100644
--- a/src/uxbox/main/ui/workspace/selection.cljs
+++ b/src/uxbox/main/ui/workspace/selection.cljs
@@ -122,4 +122,4 @@
   (mx/component
    {:render selection-handlers-render
     :name "selection-handlers"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
diff --git a/src/uxbox/main/ui/workspace/selrect.cljs b/src/uxbox/main/ui/workspace/selrect.cljs
index c109dde03..c661ab55e 100644
--- a/src/uxbox/main/ui/workspace/selrect.cljs
+++ b/src/uxbox/main/ui/workspace/selrect.cljs
@@ -56,7 +56,7 @@
     :will-mount selrect-will-mount
     :will-unmount selrect-will-unmount
     :transfer-state selrect-transfer-state
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Implementation
 
diff --git a/src/uxbox/main/ui/workspace/settings.cljs b/src/uxbox/main/ui/workspace/settings.cljs
index 419a8a49f..c76341c30 100644
--- a/src/uxbox/main/ui/workspace/settings.cljs
+++ b/src/uxbox/main/ui/workspace/settings.cljs
@@ -100,7 +100,7 @@
   (mx/component
    {:render settings-form-render
     :name "settings-form"
-    :mixins [(mx/local) rum/reactive mx/static]}))
+    :mixins [(mx/local) mx/reactive mx/static]}))
 
 (defn- settings-dialog-render
   [own]
diff --git a/src/uxbox/main/ui/workspace/sidebar.cljs b/src/uxbox/main/ui/workspace/sidebar.cljs
index 544e2feea..b8ae99d19 100644
--- a/src/uxbox/main/ui/workspace/sidebar.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar.cljs
@@ -42,7 +42,7 @@
   (mx/component
    {:render left-sidebar-render
     :name "left-sidebar"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Right Sidebar
@@ -65,4 +65,4 @@
   (mx/component
    {:render right-sidebar-render
     :name "right-sidebar"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
diff --git a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs
index 44ef881f0..ce75fb476 100644
--- a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs
@@ -114,4 +114,4 @@
   (mx/component
    {:render draw-tools-render
     :name "draw-tools"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
diff --git a/src/uxbox/main/ui/workspace/sidebar/history.cljs b/src/uxbox/main/ui/workspace/sidebar/history.cljs
index f492163d3..996d39460 100644
--- a/src/uxbox/main/ui/workspace/sidebar/history.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/history.cljs
@@ -149,7 +149,7 @@
   (mx/component
    {:render history-toolbox-render
     :name "document-history-toolbox"
-    :mixins [mx/static rum/reactive (mx/local)]}))
+    :mixins [mx/static mx/reactive (mx/local)]}))
 
 ;; --- History Dialog
 
@@ -172,5 +172,5 @@
   (mx/component
    {:render history-dialog-render
     :name "history-dialog"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
diff --git a/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/src/uxbox/main/ui/workspace/sidebar/icons.cljs
index cb0c11920..dbdf60bd8 100644
--- a/src/uxbox/main/ui/workspace/sidebar/icons.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/icons.cljs
@@ -93,5 +93,5 @@
   (mx/component
    {:render icons-render
     :name "icons-toolbox"
-    :mixins [rum/reactive
+    :mixins [mx/reactive
              (mx/local {:collid 1 :builtin true})]}))
diff --git a/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/src/uxbox/main/ui/workspace/sidebar/layers.cljs
index b9fdecb3b..6b275693e 100644
--- a/src/uxbox/main/ui/workspace/sidebar/layers.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/layers.cljs
@@ -279,7 +279,7 @@
   (mx/component
    {:render layer-group-render
     :name "layer-group"
-    :mixins [mx/static rum/reactive (mx/local)]}))
+    :mixins [mx/static mx/reactive (mx/local)]}))
 
 (defn layers-render
   [own]
@@ -319,4 +319,4 @@
   (mx/component
    {:render layers-render
     :name "layers"
-    :mixins [rum/reactive]}))
+    :mixins [mx/reactive]}))
diff --git a/src/uxbox/main/ui/workspace/sidebar/options.cljs b/src/uxbox/main/ui/workspace/sidebar/options.cljs
index 62b615416..3d0945e5d 100644
--- a/src/uxbox/main/ui/workspace/sidebar/options.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options.cljs
@@ -133,4 +133,4 @@
   (mx/component
    {:render options-toolbox-render
     :name "options-toolbox"
-    :mixins [mx/static rum/reactive (mx/local)]}))
+    :mixins [mx/static mx/reactive (mx/local)]}))
diff --git a/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs b/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
index 1c2944a50..1745db121 100644
--- a/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
@@ -334,7 +334,7 @@
   (mx/component
    {:render colorpicker-render
     :name "colorpicker"
-    :mixins [rum/reactive mx/static]}))
+    :mixins [mx/reactive mx/static]}))
 
 (defmethod lbx/render-lightbox :interactions/colorpicker
   [params]
diff --git a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
index 261249785..aedd11aad 100644
--- a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
@@ -69,7 +69,7 @@
   (mx/component
    {:render page-item-render
     :name "page-item"
-    :mixins [(mx/local) mx/static rum/reactive]}))
+    :mixins [(mx/local) mx/static mx/reactive]}))
 
 (defn sitemap-toolbox-render
   [own]
@@ -98,7 +98,7 @@
   (mx/component
    {:render sitemap-toolbox-render
     :name "sitemap-toolbox"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Lightbox
 
diff --git a/src/uxbox/util/mixins.cljs b/src/uxbox/util/mixins.cljs
index 8036fab9d..c437072b0 100644
--- a/src/uxbox/util/mixins.cljs
+++ b/src/uxbox/util/mixins.cljs
@@ -43,3 +43,5 @@
 
 (def static rum/static)
 (def ref-node rum/ref-node)
+(def react rum/react)
+(def reactive rum/reactive)
diff --git a/src/uxbox/view/ui.cljs b/src/uxbox/view/ui.cljs
index b60071be5..78536b157 100644
--- a/src/uxbox/view/ui.cljs
+++ b/src/uxbox/view/ui.cljs
@@ -59,7 +59,7 @@
   (mx/component
    {:render app-render
     :name "app"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
 
 ;; --- Routes
 
diff --git a/src/uxbox/view/ui/viewer.cljs b/src/uxbox/view/ui/viewer.cljs
index df73497e4..c971b2d09 100644
--- a/src/uxbox/view/ui/viewer.cljs
+++ b/src/uxbox/view/ui/viewer.cljs
@@ -48,7 +48,7 @@
   own)
 
 (mx/defc viewer-page
-  {:mixins [mx/static rum/reactive]
+  {:mixins [mx/static mx/reactive]
    :will-unmount viewer-page-will-unmount
    :will-mount viewer-page-will-mount}
   [own]
diff --git a/src/uxbox/view/ui/viewer/nav.cljs b/src/uxbox/view/ui/viewer/nav.cljs
index 04d919842..14f98bb0f 100644
--- a/src/uxbox/view/ui/viewer/nav.cljs
+++ b/src/uxbox/view/ui/viewer/nav.cljs
@@ -39,4 +39,4 @@
   (mx/component
    {:render nav-render
     :name "nav"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))
diff --git a/src/uxbox/view/ui/viewer/sitemap.cljs b/src/uxbox/view/ui/viewer/sitemap.cljs
index dd098b5d1..e590b2949 100644
--- a/src/uxbox/view/ui/viewer/sitemap.cljs
+++ b/src/uxbox/view/ui/viewer/sitemap.cljs
@@ -57,6 +57,6 @@
   (mx/component
    {:render sitemap-render
     :name "sitemap"
-    :mixins [mx/static rum/reactive]}))
+    :mixins [mx/static mx/reactive]}))