diff --git a/frontend/deps.edn b/frontend/deps.edn
index c33398b9a..4b81619c9 100644
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -11,12 +11,12 @@
   metosin/reitit-core {:mvn/version "0.3.10"}
   expound/expound {:mvn/version "0.7.2"}
 
-  funcool/beicon {:mvn/version "6.0.0-SNAPSHOT"}
+  funcool/beicon {:mvn/version "2020.03.23-1"}
   funcool/cuerdas {:mvn/version "2.2.1"}
   funcool/lentes {:mvn/version "1.4.0-SNAPSHOT"}
   funcool/potok {:mvn/version "2.8.0-SNAPSHOT"}
   funcool/promesa {:mvn/version "5.0.0"}
-  funcool/rumext {:mvn/version "2.0.0-SNAPSHOT"}
+  funcool/rumext {:mvn/version "2020.03.23-1"}
   }
  :paths ["src" "vendor" "resources" "../common"]
  :aliases
diff --git a/frontend/src/uxbox/builtins/icons.cljs b/frontend/src/uxbox/builtins/icons.cljs
index faeaf6a2e..b34e70b70 100644
--- a/frontend/src/uxbox/builtins/icons.cljs
+++ b/frontend/src/uxbox/builtins/icons.cljs
@@ -94,7 +94,8 @@
        :d
        "M134.482 157.147v25l518.57.008.002-25-518.572-.008z"}]]]))
 
-(mf/defrc debug-icons-preview
+(mf/defc debug-icons-preview
+  {::mf/wrap-props false}
   [props]
   [:section.debug-icons-preview
    (for [[key val] (ns-publics 'uxbox.builtins.icons)]
diff --git a/frontend/src/uxbox/main/ui/components/context_menu.cljs b/frontend/src/uxbox/main/ui/components/context_menu.cljs
index d09618028..2c7d85a2f 100644
--- a/frontend/src/uxbox/main/ui/components/context_menu.cljs
+++ b/frontend/src/uxbox/main/ui/components/context_menu.cljs
@@ -5,7 +5,8 @@
    [uxbox.main.ui.components.dropdown :refer [dropdown-container]]
    [uxbox.util.uuid :as uuid]))
 
-(mf/defrc context-menu
+(mf/defc context-menu
+  {::mf/wrap-props false}
   [props]
   (assert (fn? (gobj/get props "on-close")) "missing `on-close` prop")
   (assert (boolean? (gobj/get props "show")) "missing `show` prop")
diff --git a/frontend/src/uxbox/main/ui/components/dropdown.cljs b/frontend/src/uxbox/main/ui/components/dropdown.cljs
index cc4d5c327..76afb13b7 100644
--- a/frontend/src/uxbox/main/ui/components/dropdown.cljs
+++ b/frontend/src/uxbox/main/ui/components/dropdown.cljs
@@ -7,7 +7,8 @@
   (:import goog.events.EventType
            goog.events.KeyCodes))
 
-(mf/defrc dropdown-container
+(mf/defc dropdown-container
+  {::mf/wrap-props false}
   [props]
   (let [children (gobj/get props "children")
         on-close (gobj/get props "on-close")
@@ -32,7 +33,8 @@
     (mf/use-effect {:fn on-mount})
     children))
 
-(mf/defrc dropdown
+(mf/defc dropdown
+  {::mf/wrap-props false}
   [props]
   (assert (fn? (gobj/get props "on-close")) "missing `on-close` prop")
   (assert (boolean? (gobj/get props "show")) "missing `show` prop")
diff --git a/frontend/src/uxbox/main/ui/shapes/rect.cljs b/frontend/src/uxbox/main/ui/shapes/rect.cljs
index 8c007f387..457e32636 100644
--- a/frontend/src/uxbox/main/ui/shapes/rect.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/rect.cljs
@@ -20,7 +20,8 @@
 
 (declare rect-shape)
 
-(mf/defrc rect-wrapper
+(mf/defc rect-wrapper
+  {::mf/wrap-props false}
   [props]
   (let [shape (unchecked-get props "shape")
         on-mouse-down #(common/on-mouse-down % shape)
@@ -31,7 +32,8 @@
 
 ;; --- Rect Shape
 
-(mf/defrc rect-shape
+(mf/defc rect-shape
+  {::mf/wrap-props false}
   [props]
   (let [shape (unchecked-get props "shape")
         ds-modifier (:displacement-modifier shape)
diff --git a/frontend/src/uxbox/main/ui/workspace/viewport.cljs b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
index 04d676ae5..8e2bec6a2 100644
--- a/frontend/src/uxbox/main/ui/workspace/viewport.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
@@ -107,7 +107,8 @@
 (declare remote-user-cursors)
 (declare frames)
 
-(mf/defrc frames-wrapper
+(mf/defc frames-wrapper
+  {::mf/wrap-props false}
   [props]
   (let [page     (gobj/get props "page")
         page-id  (:id page)