diff --git a/node/Gruntfile.js b/node/Gruntfile.js
index e7c9769f0..5e3da8ece 100755
--- a/node/Gruntfile.js
+++ b/node/Gruntfile.js
@@ -1,29 +1,18 @@
 module.exports = function(grunt) {
 
   var
+
     defaultTasks = [
       // watch less folder
       'watch'
     ],
 
     watchTasks = [
-      // clean build directory
-      'clean:build',
-
-      // compiles less
-      'less:buildCSS',
+      // compiles less to docs
+      'less:buildDocsCSS',
 
-      // create concatenated css release
-      'concat:concatenateCSS',
-
-      // create concatenated js release
-      'concat:concatenateJS',
-
-      // copies assets and js over to build dir
-      'copy:srcToBuild',
-
-      // copies semantic over to docs
-      'copy:buildToDocs',
+      // copies assets and js over to docs
+      'copy:srcToDocs',
 
       // copies examples over to docs
       'copy:examplesToDocs'
@@ -87,6 +76,26 @@ module.exports = function(grunt) {
       // copies files over to docs
       'copy:buildToDocs'
     ],
+
+    setWatchFiles = function(action, filePath) {
+      var
+        buildPath = filePath.replace('../src/', '../docs/build/').replace('less', 'css')
+      ;
+      if(filePath.search('.less') !== -1) {
+        grunt.config('less.buildDocsCSS.src', filePath);
+        grunt.config('less.buildDocsCSS.dest', buildPath);
+      }
+      else {
+        grunt.config('less.buildDocsCSS.src', 'non/existant/path');
+        grunt.config('less.buildDocsCSS.dest', 'non/existant/path');
+      }
+    },
+
+    // this allows filenames with multiple extensions to be preserved
+    preserveFileExtensions = function(folder, filename) {
+      return folder + filename.substring(0, filename.lastIndexOf('.') ) + '.css';
+    },
+
     config
   ;
 
@@ -101,6 +110,9 @@ module.exports = function(grunt) {
     // watches for changes in a source folder
     watch: {
       scripts: {
+        options: {
+          spawn: false
+        },
         files: [
           '../build/examples/**/*',
           '../src/**/*.less',
@@ -125,7 +137,7 @@ module.exports = function(grunt) {
         '../build/uncompressed'
       ],
       release : [
-        'src/files/build',
+        '../docs/build',
         '../docs',
         '../rtl'
       ]
@@ -162,29 +174,81 @@ module.exports = function(grunt) {
     },
 
     less: {
+
       options: {
+        paths        : ['../src'],
         compress     : false,
         optimization : 2
       },
+
+      // optimized for watch, src is built on watch task using callbacks
+      buildDocsCSS: {
+        src    : '../src',
+        dest   : '../docs/build/uncompressed/',
+        rename : preserveFileExtensions
+      },
+
       buildCSS: {
-        options : {
-          paths : ['../build']
-        },
         expand : true,
         cwd    : '../src',
         src    : [
           '**/*.less'
         ],
         dest : '../build/uncompressed/',
-        // this allows multiple dot names to be preserved
-        rename: function(folder, filename) {
-          return folder + filename.substring(0, filename.lastIndexOf('.') ) + '.css';
-        }
+        rename: preserveFileExtensions
       }
     },
 
     copy: {
 
+      srcToDocs: {
+
+        files: [
+          // exact copy for less
+          {
+            expand : true,
+            cwd    : '../src/**/*.less',
+            src    : [
+              '**/*'
+            ],
+            dest : '../docs/build/less'
+          },
+          // copy everything but less files for uncompressed release
+          {
+            expand : true,
+            cwd    : '../src/',
+            src    : [
+              '**/*.js',
+              'images/*',
+              'fonts/*'
+            ],
+            dest : '../docs/build/uncompressed'
+          },
+          // copy everything but less for minified release
+          {
+            expand : true,
+            cwd    : '../src/',
+            src    : [
+              '**/*.js',
+              'images/*',
+              'fonts/*'
+            ],
+            dest : '../docs/build/minified'
+          },
+
+          // copy assets only for packaged version
+          {
+            expand : true,
+            cwd    : '../src/',
+            src    : [
+              'images/*',
+              'fonts/*'
+            ],
+            dest : '../docs/build/packaged'
+          }
+        ]
+      },
+
       srcToBuild: {
 
         files: [
@@ -233,7 +297,7 @@ module.exports = function(grunt) {
         ]
       },
 
-      // copy assets to rtl
+      // create new rtl assets
       buildToRTL: {
         files: [
           {
@@ -256,7 +320,7 @@ module.exports = function(grunt) {
             src    : [
               '**'
             ],
-            dest   : 'src/files/build/'
+            dest   : '../docs/build/'
           }
         ]
       },
@@ -270,7 +334,7 @@ module.exports = function(grunt) {
             src    : [
               '**'
             ],
-            dest   : 'src/files/spec/'
+            dest   : '../docs/spec/'
           }
         ]
       },
@@ -280,11 +344,11 @@ module.exports = function(grunt) {
         files: [
           {
             expand : true,
-            cwd    : '../examples',
+            cwd    : '../build/examples',
             src    : [
               '**'
             ],
-            dest   : 'src/files/examples/'
+            dest   : '../docs/examples/'
           }
         ]
       }
@@ -294,7 +358,7 @@ module.exports = function(grunt) {
 
     compress: {
       options: {
-        archive: 'src/files/build/semantic.zip'
+        archive: '../docs/build/semantic.zip'
       },
       everything: {
         files: [
@@ -431,4 +495,7 @@ module.exports = function(grunt) {
 
   grunt.registerTask('build', buildTasks);
 
+  // compiles only changed less files <https://npmjs.org/package/grunt-contrib-watch>
+  grunt.event.on('watch', setWatchFiles);
+
 };
diff --git a/node/docpad.coffee b/node/docpad.coffee
index de1c9873b..966ca38be 100755
--- a/node/docpad.coffee
+++ b/node/docpad.coffee
@@ -19,7 +19,7 @@ docpadConfig = {
 			# Here are some old site urls that you would like to redirect from
 			oldUrls: [
 				'learnsemantic.com'
-			]
+			],
 
 			# The default title of our website
 			title: "Semantic UI"