diff --git a/src/Gruntfile.js b/src/Gruntfile.js
index d97633728..844b74a14 100644
--- a/src/Gruntfile.js
+++ b/src/Gruntfile.js
@@ -20,7 +20,19 @@ module.exports = function(grunt) {
       'copy:file',
 
       // auto prefix outputted file
-      'autoprefixer:prefixFile'
+      'autoprefixer:prefixFile',
+
+      // creates minified js of outputted file if it is js
+      'newer:uglify:minifyOutput',
+
+      // creates minified css of outputted file if it is css
+      'newer:cssmin:minifyOutput',
+
+      // create concatenated css release if outputted file is css
+      'newer:concat:createCSSPackage',
+
+      // create concatenated js release if outputted file is js
+      'newer:concat:createJSPackage'
     ],
 
     resetTasks = [
@@ -60,6 +72,17 @@ module.exports = function(grunt) {
     ],
 
     setWatchFiles = function(action, filePath) {
+      // convert backslashes to slashes for Windows compatibility
+      if(process.platform === 'win32') {
+        filePath = filePath.replace(/\\/g, '/');
+      }
+      var
+        re = new RegExp(paths.source.themes + '.*\/([^\/]*\/[^\/]*)\.(?:overrides|variables)$')
+      ;
+      // find relevant .less file for each modified .overrides or .variables file
+      if(filePath.search(re) !== -1) {
+        filePath = filePath.replace(re, paths.source.definitions + '$1.less');
+      }
       var
         outputPath = filePath.replace(paths.source.definitions, paths.output.uncompressed + 'definitions/')
       ;
@@ -111,8 +134,8 @@ module.exports = function(grunt) {
       src: {
         files: [
           paths.source.definitions + '**/*.less',
-          paths.source.definitions + '**/*.variables',
-          paths.source.definitions + '**/*.overrides',
+          paths.source.themes + '**/*.variables',
+          paths.source.themes + '**/*.overrides',
           paths.source.definitions + '**/*.js'
         ],
         tasks : watchTasks
@@ -285,6 +308,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-clear');
   grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-newer');
 
   // css
   grunt.loadNpmTasks('grunt-contrib-cssmin');
diff --git a/src/package.json b/src/package.json
index bd0b6d063..2439587bd 100644
--- a/src/package.json
+++ b/src/package.json
@@ -15,6 +15,7 @@
     "grunt-contrib-less": "~0.7.0",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-clear": "~0.2.1",
-    "grunt-autoprefixer": "~0.4.0"
+    "grunt-autoprefixer": "~0.4.0",
+    "grunt-newer": "~0.7.0"
   }
 }