diff --git a/Gruntfile.js b/Gruntfile.js
index e63a1c4e..00333c55 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -258,7 +258,7 @@ module.exports = function (grunt) {
             autoprefixer
           ]
         },
-        src: 'docs/assets/css/docs.min.css'
+        src: 'docs/assets/css/*.css'
       },
       examples: {
         options: {
@@ -294,7 +294,7 @@ module.exports = function (grunt) {
         ]
       },
       docs: {
-        src: 'docs/assets/css/docs.min.css',
+        src: 'docs/assets/css/docs.css',
         dest: 'docs/assets/css/docs.min.css'
       }
     },
@@ -378,9 +378,9 @@ module.exports = function (grunt) {
         files: 'scss/**/*.scss',
         tasks: ['dist-css', 'docs']
       },
-      docs: {
-        files: 'docs/assets/scss/**/*.scss',
-        tasks: ['dist-css', 'docs']
+      docs: { // watch both the source and docs scss
+        files: ['docs/assets/scss/**/*.scss', 'scss/**/*.scss'],
+        tasks: ['docs-css'] //['dist-css', 'docs']
       }
     },
 
@@ -501,7 +501,7 @@ module.exports = function (grunt) {
   // Version numbering task.
   // grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
   // This can be overzealous, so its changes should always be manually reviewed!
-  grunt.registerTask('change-version-number', 'sed');
+  //grunt.registerTask('change-version-number', 'sed');
 
   grunt.registerTask('commonjs', ['babel:umd', 'npm-js']);
 
@@ -514,7 +514,7 @@ module.exports = function (grunt) {
   });
 
   // Docs task.
-  grunt.registerTask('docs-css', ['postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
+  grunt.registerTask('docs-css', ['sass:docs', 'postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
   grunt.registerTask('docs-js', ['uglify:docsJs']);
   grunt.registerTask('lint-docs-js', ['jscs:assets']);
   grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']);
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 3792b467..e6a3dafd 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -14,10 +14,15 @@
 </title>
 
 <!-- Material Design for Bootstrap CSS (includes a compiled/customized version of Bootstrap) -->
-<link href="{{ site.baseurl }}/dist/css/bootstrap-material-design.min.css" rel="stylesheet">
+<!--<link href="{{ site.baseurl }}/dist/css/bootstrap-material-design.min.css" rel="stylesheet">-->
 
-<!-- Documentation extras -->
+<!-- Material Design for Bootstrap customization for Documentation (consider Documentation the application) -->
+{% if site.github %}
 <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
+{% else %}
+<link href="{{ site.baseurl }}/assets/css/docs.css" rel="stylesheet">
+{% endif %}
+
 
 <!-- Favicons -->
 <link rel="apple-touch-icon" href="{{ site.baseurl }}/apple-touch-icon.png">
diff --git a/grunt/bs-sass-compile/libsass.js b/grunt/bs-sass-compile/libsass.js
index eac232ae..c2e47229 100644
--- a/grunt/bs-sass-compile/libsass.js
+++ b/grunt/bs-sass-compile/libsass.js
@@ -25,7 +25,7 @@ module.exports = function configureLibsass(grunt) {
       },
       docs: {
         files: {
-          'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss'
+          'docs/assets/css/docs.css': 'docs/assets/scss/docs.scss'
         }
       }
     }
diff --git a/grunt/bs-sass-compile/sass.js b/grunt/bs-sass-compile/sass.js
index 7177d444..77006af1 100644
--- a/grunt/bs-sass-compile/sass.js
+++ b/grunt/bs-sass-compile/sass.js
@@ -29,7 +29,7 @@ module.exports = function configureRubySass(grunt) {
       docs: {
         options: options,
         files: {
-          'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss'
+          'docs/assets/css/docs.css': 'docs/assets/scss/docs.scss'
         }
       }
     }
diff --git a/scss/includes/_bootstrap-material-design.scss b/scss/includes/_bootstrap-material-design.scss
index 076f46cd..08a18b1b 100644
--- a/scss/includes/_bootstrap-material-design.scss
+++ b/scss/includes/_bootstrap-material-design.scss
@@ -1,12 +1,10 @@
 // This is the main scss file, provided as an underscored file so that variable contexts remain in-tact when importing from the source.
-@import 'colors';
 @import 'variables';
 
 // FIXME: V4 SCSS inclusion via an underscored file https://github.com/twbs/bootstrap/issues/18350
 @import 'bootstrap';
 
 @import 'mixins';
-@import 'mixins/shadows';  // these are mixins only, and must be placed at the top before use (sass requiremnt)
 @import 'scaffolding'; // include the material content given the mixins above (sass requirement for inclusion order of mixins)
 @import 'welljumbo';
 @import 'buttons';
diff --git a/scss/includes/_variables.scss b/scss/includes/_variables.scss
index e24baa9d..097383e9 100644
--- a/scss/includes/_variables.scss
+++ b/scss/includes/_variables.scss
@@ -1,4 +1,5 @@
-@import '_colors';
+@import 'colors';
+
 
 // Typography elements FIXME: review to see if we actually need these
 $mdb-text-color-light: unquote("rgba(#{$rgb-white}, 0.84)") !default;