            :on-click (constantly nil)}
           (:icon props)])]])))
 
-;; #_(for [tool (t/sorted-tools (rum/react t/drawing-tools))]
-;;   [:div.tool-btn.tooltip.tooltip-hover
-;;    {:alt (:text tool)
-;;     :class (when (= (rum/react ws/selected-tool)
-;;                     [(:key tool)])
-;;              "selected")
-;;     :key (:key tool)
-;;     :on-click #(ws/toggle-tool! [(:key tool)])}
-;;    (:icon tool)])]])))
-
-(def ^:static draw-toolbox
+(def ^:static draw-tools
   (util/component
-   {:render draw-toolbox-render
-    :name "draw-toolbox"
+   {:render draw-tools-render
+    :name "draw-tools"
     :mixins [mx/static rum/reactive]}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

;; Draw Tool Box
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(defn draw-toolbox-render
  [open-toolboxes]
  (let [workspace (rum/react wb/workspace-state)
        close #(rs/emit! (dw/toggle-toolbox :draw))
        tools (->> (into [] draw-tools)
                   (sort-by (comp :priority second)))]
    (html
     [:div#form-tools.tool-window

(defn layers-render
  []
  (let [workspace (rum/react wb/workspace-state)
        close #(rs/emit! (dw/toggle-toolbox :layers))]
    (html
     [:div#layers.tool-window
      [:div.tool-window-bar
