diff --git a/.travis.yml b/.travis.yml
index 551fd059e4..35dadeb9df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: clojure
-lein: lein
 sudo: false
+lein: lein
 
 script:
   - ./scripts/build-tests
@@ -11,6 +11,9 @@ script:
 jdk:
   - oraclejdk8
 
-node_js:
-  - "5.10.1"
-
+notifications:
+  email:
+    recipients:
+      - niwi@niwi.nz
+    on_success: change
+    on_failure: change
diff --git a/scripts/build-tests.clj b/scripts/build-tests.clj
index de2716bf4d..7fd811afc6 100644
--- a/scripts/build-tests.clj
+++ b/scripts/build-tests.clj
@@ -4,7 +4,7 @@
 
 (let [start (System/nanoTime)]
   (b/build
-   (b/inputs "src" "vendor" "test")
+   (b/inputs "src" "test")
    {:main 'uxbox.tests.main
     :parallel-build false
     :warnings {:ns-var-clash false}
diff --git a/scripts/build-worker.clj b/scripts/build-worker.clj
index bc435dcbc3..35986eceb8 100644
--- a/scripts/build-worker.clj
+++ b/scripts/build-worker.clj
@@ -4,17 +4,18 @@
 
 (let [start (System/nanoTime)]
   (b/build
-   (b/inputs "src" "vendor")
+   (b/inputs "src")
    {:main 'uxbox.worker
+    :parallel-build false
+    :warnings {:ns-var-clash false}
     :output-to "resources/public/js/worker.js"
     :source-map "resources/public/js/worker.js.map"
     :output-dir "resources/public/js/worker"
     :asset-path "js"
-    :parallel-build false
     :optimizations :simple
     :static-fns true
-    :pretty-print true
     :language-in  :ecmascript6
     :language-out :ecmascript5
+    :pretty-print true
     :verbose true})
   (println "... done. Elapsed" (/ (- (System/nanoTime) start) 1e9) "seconds"))
diff --git a/scripts/dist-main.clj b/scripts/dist-main.clj
index c8fdff0d66..5f241f457f 100644
--- a/scripts/dist-main.clj
+++ b/scripts/dist-main.clj
@@ -4,7 +4,7 @@
 
 (let [start (System/nanoTime)]
   (b/build
-   (b/inputs "src" "vendor")
+   (b/inputs "src")
    {:main 'uxbox.main
     :parallel-build false
     :warnings {:ns-var-clash false}
diff --git a/scripts/dist-view.clj b/scripts/dist-view.clj
index 7230b0bdd6..d597686108 100644
--- a/scripts/dist-view.clj
+++ b/scripts/dist-view.clj
@@ -4,7 +4,7 @@
 
 (let [start (System/nanoTime)]
   (b/build
-   (b/inputs "src" "vendor")
+   (b/inputs "src")
    {:main 'uxbox.view
     :parallel-build false
     :warnings {:ns-var-clash false}
@@ -15,7 +15,6 @@
                       "https://test.uxbox.io/api"}
     :optimizations :simple
     :externs ["externs/main.js"]
-    :source-map "dist/view/js/view.js.map"
     :static-fns true
     :pretty-print false
     :language-in  :ecmascript6
diff --git a/scripts/dist-worker.clj b/scripts/dist-worker.clj
index 940ba9a826..a0fc82458a 100644
--- a/scripts/dist-worker.clj
+++ b/scripts/dist-worker.clj
@@ -4,7 +4,7 @@
 
 (let [start (System/nanoTime)]
   (b/build
-   (b/inputs "src" "vendor")
+   (b/inputs "src")
    {:main 'uxbox.worker
     :output-to "dist/js/worker.js"
     :source-map "dist/js/worker.js.map"
diff --git a/scripts/figwheel.clj b/scripts/figwheel.clj
index beec02cb34..a9f580c5a7 100644
--- a/scripts/figwheel.clj
+++ b/scripts/figwheel.clj
@@ -10,13 +10,13 @@
    :all-builds
    [{:id "main"
      :figwheel {:on-jsload "uxbox.main.ui/init"}
-     :source-paths ["src" "vendor"]
+     :source-paths ["src"]
      :compiler
      {:main 'uxbox.main
       :parallel-build false
       :optimizations :none
       :closure-defines {"uxbox.common.constants.url"
-                        "https://test.uxbox.io/api"}
+                        "http://localhost:6060/api"}
       :warnings {:ns-var-clash false}
       :language-in  :ecmascript6
       :language-out :ecmascript5
@@ -27,13 +27,13 @@
 
     {:id "view"
      :figwheel {:on-jsload "uxbox.view.ui/init"}
-     :source-paths ["src" "vendor"]
+     :source-paths ["src"]
      :compiler
      {:main 'uxbox.view
       :parallel-build false
       :optimizations :none
       :closure-defines {"uxbox.common.constants.url"
-                        "https://test.uxbox.io/api"}
+                        "http://localhost:6060/api"}
       :warnings {:ns-var-clash false}
       :language-in  :ecmascript6
       :language-out :ecmascript5
diff --git a/scripts/watch-bench.clj b/scripts/watch-bench.clj
index a0272534b4..6e6f28d1f9 100644
--- a/scripts/watch-bench.clj
+++ b/scripts/watch-bench.clj
@@ -1,10 +1,10 @@
 (require '[cljs.build.api :as b])
 
 (b/watch
- (b/inputs "dev" "vendor")
+ (b/inputs "dev" "src")
  {:main 'bench.core
   :output-to "out/bench.js"
-  :output-dir "out"
+  :output-dir "out/bench"
   :parallel-build false
   :optimizations :none
   :static-fns false
diff --git a/scripts/watch-tests.clj b/scripts/watch-tests.clj
index d6e68bdf87..092eba68a8 100644
--- a/scripts/watch-tests.clj
+++ b/scripts/watch-tests.clj
@@ -1,8 +1,9 @@
 (require '[cljs.build.api :as b])
 
-(b/watch (b/inputs "src" "vendor" "test")
+(b/watch (b/inputs "src" "test")
   {:main 'uxbox.tests.main
    :parallel-build false
+   :warnings {:ns-var-clash false}
    :output-to "out/tests.js"
    :source-map "out/tests.js.map"
    :output-dir "out/tests"
diff --git a/scripts/watch-worker.clj b/scripts/watch-worker.clj
index fb3207d431..d581c7c97a 100644
--- a/scripts/watch-worker.clj
+++ b/scripts/watch-worker.clj
@@ -1,12 +1,14 @@
 (require '[cljs.build.api :as b])
 
 (b/watch
- (b/inputs "src" "vendor")
- {:main 'uxbox.worker.main
+ (b/inputs "src")
+ {:main 'uxbox.worker
+  :parallel-build false
+  :warnings {:ns-var-clash false}
   :output-to "resources/public/js/worker.js"
+  :source-map "resources/public/js/worker.js.map"
   :output-dir "resources/public/js/worker"
   :asset-path "js"
-  :parallel-build false
   :optimizations :simple
   :static-fns true
   :language-in  :ecmascript6