diff --git a/gulp/watch.coffee b/gulp/watch.coffee
index b11c4fb3..5ce90b9d 100644
--- a/gulp/watch.coffee
+++ b/gulp/watch.coffee
@@ -1,5 +1,7 @@
 gulp = require 'gulp'
 
 gulp.task 'watch', ->
+    gulp.plugins.refresh.listen()
+
     gulp.watch gulp.config.sassPattern, ['styles']
     gulp.watch gulp.config.assetsDir + gulp.config.jsPattern, ['scripts']
diff --git a/gulpfile.coffee b/gulpfile.coffee
index 34573c0e..81ed6701 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -7,34 +7,30 @@ gulp.config =
     outputDir: './source/assets',
     sassPattern: './assets/sass/**/*.sass',
     jsPattern: 'js/**/*.js',
-    production: !!gulp.plugins.util.env.production,
-    sourceMaps: !gulp.plugins.util.env.production,
-    liveReload: !gulp.plugins.util.env.production,
-    notify: !gulp.plugins.util.env.production
+    production: gulp.plugins.util.env.production || false
 
 gulp.css = (paths, filename) ->
     gulp.src paths
         .pipe gulp.plugins.plumber()
-        .pipe gulp.plugins.if gulp.config.sourceMaps, gulp.plugins.sourcemaps.init()
+        .pipe gulp.plugins.if !gulp.config.production, gulp.plugins.sourcemaps.init()
         .pipe gulp.plugins.sassGlob()
         .pipe gulp.plugins.sass()
         .pipe gulp.plugins.autoprefixer browsers: ['last 2 versions']
         .pipe gulp.plugins.concat filename
-        .pipe gulp.config.production ? gulp.plugins.cleanCss() || gulp.plugins.util.noop()
-        .pipe gulp.plugins.if gulp.config.sourceMaps, gulp.plugins.sourcemaps.write '.'
+        .pipe gulp.plugins.if gulp.config.production, gulp.plugins.cleanCss()
+        .pipe gulp.plugins.if !gulp.config.production, gulp.plugins.sourcemaps.write '.'
+        .pipe gulp.plugins.if !gulp.config.production, gulp.dest 'output_dev/assets/css'
+        .pipe gulp.plugins.if !gulp.config.production, gulp.plugins.refresh()
         .pipe gulp.dest gulp.config.outputDir + '/css'
-        # .pipe gulp.config.notify ? gulp.plugins.notify() || gulp.plugins.util.noop()
-        # .pipe gulp.plugins.if gulp.config.liveReload, gulp.plugins.livereload()
 
 gulp.js = (paths, filename) ->
     gulp.src paths
         .pipe gulp.plugins.plumber()
         .pipe gulp.plugins.if gulp.config.sourceMaps, gulp.plugins.sourcemaps.init()
         .pipe gulp.plugins.concat filename
-        .pipe gulp.config.production ? gulp.plugins.uglify() || gulp.plugins.util.noop()
-        .pipe gulp.plugins.if gulp.config.sourceMaps, gulp.plugins.sourcemaps.write '.'
+        .pipe gulp.plugins.if gulp.config.production, gulp.plugins.uglify()
+        .pipe gulp.plugins.if !gulp.config.production, gulp.plugins.sourcemaps.write '.'
         .pipe gulp.dest gulp.config.outputDir + '/js'
-        # .pipe gulp.config.notify ? gulp.plugins.notify() || gulp.plugins.util.noop()
 
 gulp.copy = (srcFiles, outputDir) ->
     gulp.src srcFiles
diff --git a/package.json b/package.json
index d02b8956..9e3972cb 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,11 @@
     "gulp-if": "^2.0.0",
     "gulp-image-resize": "^0.7.1",
     "gulp-imagemin": "^2.4.0",
-    "gulp-livereload": "^3.8.1",
     "gulp-load-plugins": "^1.1.0",
     "gulp-minify-css": "^1.2.3",
     "gulp-notify": "^2.2.0",
     "gulp-plumber": "^1.0.1",
+    "gulp-refresh": "^1.1.0",
     "gulp-sass": "^2.1.1",
     "gulp-sass-glob": "^1.0.5",
     "gulp-sourcemaps": "^1.6.0",