diff --git a/grunt-tasks/bootlint.js b/grunt-tasks/bootlint.js
index f690ce3d9..20923ce98 100644
--- a/grunt-tasks/bootlint.js
+++ b/grunt-tasks/bootlint.js
@@ -2,10 +2,11 @@
 'use strict';
 
 module.exports = function (grunt) {
-  return {
+  return  {
     options: {
       relaxerror: ['W005']
     },
-    files: ['pages/**/*.html', '*.html']
+    // files: ['pages/**/*.html', '*.html']
+    files: ['starter.html']
   };
 };
diff --git a/grunt-tasks/sass.js b/grunt-tasks/sass.js
index 3c6591922..6188c7b7c 100644
--- a/grunt-tasks/sass.js
+++ b/grunt-tasks/sass.js
@@ -9,7 +9,7 @@ module.exports = function (grunt) {
           style: 'expanded'
         },
         files: {
-          'dist/tmp/AdminLTE.css': 'build/scss/AdminLTE.scss'
+          'dist/css/AdminLTE.css': 'build/scss/AdminLTE.scss'
         }
       },
       production: {
@@ -17,7 +17,7 @@ module.exports = function (grunt) {
           style: 'compressed'
         },
         files: {
-          'dist/tmp/AdminLTE.min.css': 'build/scss/AdminLTE.scss'
+          'dist/css/adminlte.min.css': 'build/scss/AdminLTE.scss'
         }
       }
     };
diff --git a/grunt-tasks/uglify.js b/grunt-tasks/uglify.js
index 9e9465e58..3608df687 100644
--- a/grunt-tasks/uglify.js
+++ b/grunt-tasks/uglify.js
@@ -7,8 +7,9 @@ module.exports = function (grunt) {
       mangle: true,
       preserveComments: 'some'
     },
-    my_target: {
+    target: {
       files: {
+        'dist/js/adminlte.min.js': ['dist/js/adminlte.js'],
         'dist/js/app.min.js': ['dist/js/app.js']
       }
     }
diff --git a/grunt-tasks/watch.js b/grunt-tasks/watch.js
index bb7d11c13..25b8e6d10 100644
--- a/grunt-tasks/watch.js
+++ b/grunt-tasks/watch.js
@@ -1,15 +1,19 @@
-// Watch File Changes
+// Watch files for changes and invoke appropriate compiler
 'use strict';
 
 module.exports = function (grunt) {
   return {
-      // If any .less file changes in directory "build/less/" run the "less"-task.
-      // files: ["build/less/*.less", "build/less/skins/*.less", "dist/js/app.js"],
-      files: [
-        "build/scss/*.scss", 
-        "build/scss/skins/*.scss", 
-        "dist/js/app.js"
-        ],
-      tasks: ["sass", "uglify"]
-    };
+    sass: {
+      files: ['build/scss/*.scss', 'build/scss/skins/*.scss'],
+      tasks: ['sass']
+    },
+    es6: {
+      files: ['build/js/src/*.js'],
+      tasks: ['concat', 'babel', 'uglify']
+    },
+    js: {
+      files: ['dist/js/adminlte.js', 'dist/js/app.js'],
+      tasks: ['uglify']
+    }
+  };
 };