diff --git a/frontend/project.clj b/frontend/project.clj
index 5f65dfad7b..1b67e7be3d 100644
--- a/frontend/project.clj
+++ b/frontend/project.clj
@@ -13,23 +13,23 @@
                  [org.clojure/clojurescript "1.9.293" :scope "provided"]
 
                  ;; Build
-                 [figwheel-sidecar "0.5.8" :scope "test"]
+                 [figwheel-sidecar "0.5.9" :scope "provided"]
                  [environ "1.1.0"]
 
                  ;; Runtime
                  [com.cognitect/transit-cljs "0.8.239"]
                  [rum "0.10.8" :exclusions [cljsjs/react cljsjs/react-dom]]
-                 ;; [cljsjs/react-with-addons "15.4.2-1"]
-                 [cljsjs/react "15.4.2-1"]
-                 [cljsjs/react-dom "15.4.2-1"]
-                 [cljsjs/react-dom-server "15.4.2-1"]
+                 ;; [cljsjs/react-with-addons "15.4.2-2"]
+                 [cljsjs/react "15.4.2-2"]
+                 [cljsjs/react-dom "15.4.2-2"]
+                 [cljsjs/react-dom-server "15.4.2-2"]
 
                  [cljsjs/moment "2.17.1-0"]
-                 [funcool/potok "1.2.0"]
+                 [funcool/potok "2.0.0"]
                  [funcool/struct "1.0.0"]
                  [funcool/lentes "1.2.0"]
-                 [funcool/beicon "2.9.0"]
-                 [funcool/cuerdas "2.0.2"]
+                 [funcool/beicon "3.1.0"]
+                 [funcool/cuerdas "2.0.3"]
                  [funcool/bide "1.4.0"]]
   :plugins [[lein-ancient "0.6.10"]]
   :clean-targets ^{:protect false} ["resources/public/js" "target"]
diff --git a/frontend/src/uxbox/main/ui/workspace.cljs b/frontend/src/uxbox/main/ui/workspace.cljs
index 1127a6bd09..a4294ede05 100644
--- a/frontend/src/uxbox/main/ui/workspace.cljs
+++ b/frontend/src/uxbox/main/ui/workspace.cljs
@@ -24,16 +24,16 @@
             [uxbox.main.ui.keyboard :as kbd]
             [uxbox.main.ui.workspace.scroll :as scroll]
             [uxbox.main.ui.workspace.download]
-            [uxbox.main.ui.workspace.shortcuts :refer (shortcuts-mixin)]
-            [uxbox.main.ui.workspace.header :refer (header)]
-            [uxbox.main.ui.workspace.rules :refer (horizontal-rule vertical-rule)]
-            [uxbox.main.ui.workspace.sidebar.history :refer (history-dialog)]
-            [uxbox.main.ui.workspace.sidebar :refer (left-sidebar right-sidebar)]
-            [uxbox.main.ui.workspace.colorpalette :refer (colorpalette)]
-            [uxbox.main.ui.workspace.canvas :refer (viewport)]
+            [uxbox.main.ui.workspace.shortcuts :refer [shortcuts-mixin]]
+            [uxbox.main.ui.workspace.header :refer [header]]
+            [uxbox.main.ui.workspace.rules :refer [horizontal-rule vertical-rule]]
+            [uxbox.main.ui.workspace.sidebar.history :refer [history-dialog]]
+            [uxbox.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]]
+            [uxbox.main.ui.workspace.colorpalette :refer [colorpalette]]
+            [uxbox.main.ui.workspace.canvas :refer [viewport]]
             [uxbox.util.dom :as dom]
             [uxbox.util.geom.point :as gpt]
-            [uxbox.util.data :refer (classnames)]
+            [uxbox.util.data :refer [classnames]]
             [uxbox.util.mixins :as mx :include-macros true]))
 
 ;; --- Workspace
@@ -49,7 +49,7 @@
   (let [[projectid pageid] (:rum/args own)
         dom (mx/ref-node own "workspace-canvas")
         scroll-to-page-center #(scroll/scroll-to-page-center dom @refs/selected-page)
-        sub2 (rx/subscribe streams/page-id-ref-s scroll-to-page-center)]
+        sub (rx/subscribe streams/page-id-ref-s scroll-to-page-center)]
 
     (scroll-to-page-center)
 
@@ -57,13 +57,13 @@
               (udu/watch-page-changes pageid)
               (udh/watch-page-changes pageid))
 
-    (assoc own ::sub2 sub2)))
+    (assoc own ::sub sub)))
 
 (defn- workspace-will-unmount
   [own]
   (st/emit! ::udp/stop-page-watcher)
-  (.close (::sub2 own))
-  (dissoc own ::sub1 ::sub2))
+  (rx/cancel! (::sub own))
+  (dissoc own ::sub))
 
 (defn- workspace-did-remount
   [old-state state]
diff --git a/frontend/src/uxbox/main/ui/workspace/ruler.cljs b/frontend/src/uxbox/main/ui/workspace/ruler.cljs
index 3ccd536bc1..17eec921d5 100644
--- a/frontend/src/uxbox/main/ui/workspace/ruler.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/ruler.cljs
@@ -85,7 +85,7 @@
 (defn- overlay-will-unmount
   [own]
   (let [subscription (::sub own)]
-    (subscription)
+    (rx/cancel! subscription)
     (dissoc own ::sub)))
 
 (declare overlay-line-render)
diff --git a/frontend/src/uxbox/main/ui/workspace/shortcuts.cljs b/frontend/src/uxbox/main/ui/workspace/shortcuts.cljs
index b220420975..7454816390 100644
--- a/frontend/src/uxbox/main/ui/workspace/shortcuts.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/shortcuts.cljs
@@ -103,7 +103,7 @@
 
 (defn- will-unmount
   [own]
-  (.close (::sub own))
+  (rx/cancel! (::sub own))
   (dissoc own ::sub))
 
 (def shortcuts-mixin