diff --git a/project.clj b/project.clj
index 50c2c2d..c95ad3c 100644
--- a/project.clj
+++ b/project.clj
@@ -11,40 +11,42 @@
                 *assert* true}
   :dependencies
   [[org.clojure/clojure "1.4.0"]
-   [com.taoensso/encore "0.8.0"]
+   [com.taoensso/encore "0.9.2"]
    [io.aviso/pretty     "0.1.8"]]
 
   :test-paths ["test" "src"]
   :profiles
-  {:build {:hooks ^:replace []} ; Workaround to avoid :dev hooks during deploy
+  {;; :default [:base :system :user :provided :dev]
    :1.5  {:dependencies [[org.clojure/clojure "1.5.1"]]}
    :1.6  {:dependencies [[org.clojure/clojure "1.6.0-beta1"]]}
    :test {:dependencies [[expectations                  "1.4.56"]
                          [reiddraper/simple-check       "0.5.6"]
-                         [org.xerial.snappy/snappy-java "1.1.1-M1"]
-                         [org.clojure/data.fressian     "0.2.0"]]
+                         [com.taoensso/nippy            "2.5.2"]
+                         [com.taoensso/carmine          "2.4.6"]
+                         [com.draines/postal            "1.11.1"]
+                         [org.clojure/tools.logging     "0.2.6"]]
           :plugins [[lein-expectations "0.0.8"]
                     [lein-autoexpect   "1.2.2"]]}
+   :dev* [:dev {:jvm-opts ^:replace ["-server"]
+                ;; :hooks [cljx.hooks leiningen.cljsbuild] ; cljx
+                }]
    :dev
    [:1.6 :test
-    {:jvm-opts ^:replace ["-server"]
-     :hooks []
-     :dependencies [[com.taoensso/nippy        "2.5.2"]
-                    [com.taoensso/carmine      "2.4.6"]
-                    [com.draines/postal        "1.11.1"]
-                    [org.clojure/tools.logging "0.2.6"]]
+    {:dependencies []
      :plugins []}]}
 
-    :plugins [[lein-ancient "0.5.4"]
+  :plugins [[lein-ancient "0.5.4"]
             [codox        "0.6.7"]]
 
-  ;; :codox {:sources ["target/classes"]} ; For use with cljx
+  ;; :codox {:sources ["target/classes"]} ; cljx
   :aliases
-  {"test-all"   ["with-profile" "+test:+1.5,+test:+1.6,+test" "expectations"]
+  {"test-all"   ["with-profile" "default:+1.5:+1.6" "expectations"]
+   ;; "test-all"   ["with-profile" ":+1.6," "expectations"] ; Soon...
    "test-auto"  ["with-profile" "+test" "autoexpect"]
-   "start-dev"  ["with-profile" "+dev" "repl" ":headless"]
-   "codox"      ["with-profile" "+test" "doc"]
-   "deploy-lib" ["with-profile" "+dev,+build" "do" "deploy" "clojars," "install"]}
+   ;; "build-once" ["do" "cljx" "once," "cljsbuild" "once"] ; cljx
+   ;; "deploy-lib" ["do" "build-once," "deploy" "clojars," "install"] ; cljx
+   "deploy-lib" ["do" "deploy" "clojars," "install"]
+   "start-dev"  ["with-profile" "+dev*" "repl" ":headless"]}
 
   :repositories
   {"sonatype"