diff --git a/less/_alerts.less b/less/_alerts.less
index 2c109739..28fac8e3 100644
--- a/less/_alerts.less
+++ b/less/_alerts.less
@@ -1,4 +1,3 @@
-// main: material.less
 .alert {
     border: 0px;
     border-radius: 0;
diff --git a/less/_buttons.less b/less/_buttons.less
index f9d44d09..395b4e95 100644
--- a/less/_buttons.less
+++ b/less/_buttons.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 .btn {
     position: relative;
     padding: 8px 30px;
diff --git a/less/_checkboxes.less b/less/_checkboxes.less
index 3082e80e..131ea90b 100644
--- a/less/_checkboxes.less
+++ b/less/_checkboxes.less
@@ -1,4 +1,3 @@
-
 .form-horizontal .checkbox {
     padding-top: 20px;
 }
diff --git a/less/_checkboxes_old.less b/less/_checkboxes_old.less
deleted file mode 100644
index 9e6b8b6e..00000000
--- a/less/_checkboxes_old.less
+++ /dev/null
@@ -1,191 +0,0 @@
-// main: material.less
-
-.form-horizontal .checkbox {
-    padding-top: 15px;
-}
-.checkbox {
-    transform: rotate(0deg);
-    label {
-        cursor: pointer;
-        padding-left: 45px;
-        position: relative;
-        span {
-            display: block;
-            position: absolute;
-            left: 0px;
-            transition-duration: 0.2s;
-        }
-        .check:after {
-            display: block;
-            position: absolute;
-            content: "";
-            background-color: @lightbg-text;
-            left: -5px;
-            top: -15px;
-            height: 50px;
-            width: 50px;
-            border-radius: 100%;
-            z-index: 1;
-            opacity: 0;
-            margin: 0;
-        }
-        .check:before {
-            display: block;
-            content: "";
-            border: 2px solid @lightbg-text;
-            height: 20px;
-            width: 20px;
-            transition-delay: 0.2s;
-        }
-    }
-
-    // Variations
-    .variations(~" .check", color, @success);
-
-    // Hide native checkbox
-    input[type=checkbox] { opacity: 0; }
-
-    input[type=checkbox] ~ .check:before {
-        position: absolute;
-        top: 2px;
-        left: 11px;
-        width: 18px;
-        height: 18px;
-        border: solid 2px;
-        border-color: #5a5a5a;
-        animation: uncheck 300ms ease-out forwards;
-    }
-
-    input[type=checkbox]:focus ~ .check:after {
-        opacity: 0.2;
-    }
-
-    input[type=checkbox]:checked ~ .check:before {
-        animation: check 300ms ease-out forwards;
-    }
-
-    // Ripple effect on click
-    input[type=checkbox]:not(:checked) ~ .check:after {
-        animation: rippleOff 500ms linear forwards;
-    }
-    input[type=checkbox]:checked ~ .check:after {
-        animation: rippleOn 500ms linear forwards;
-    }
-
-    // Make animate quickly when not hover
-    &:not(:hover) input[type=checkbox] ~ .check {
-        &:before, &:after {
-            animation-duration: 1ms;
-        }
-    }
-
-    // Style for disabled inputs
-    input[type=checkbox][disabled]:not(:checked) ~ .check:before {
-        opacity: 0.5;
-    }
-    input[type=checkbox][disabled] ~ .check:after {
-        background-color: @lightbg-text;
-        transform: rotate(-45deg);
-    }
-
-    .variations(~" input[type=checkbox]:checked ~ .check:after", background-color, @success);
-}
-
-@keyframes uncheck {
-    0% {
-        top: -3px;
-        left: 17px;
-        width: 10px;
-        height: 21px;
-        border-color: #0f9d58;
-        border-left-color: transparent;
-        border-top-color: transparent;
-        transform: rotate(45deg);
-    }
-    50% {
-        top: 14px;
-        left: 17px;
-        width: 4px;
-        height: 4px;
-        transform: rotate(45deg);
-        border-color: #0f9d58;
-        border-left-color: transparent;
-        border-top-color: transparent;
-    }
-    51% {
-        border-color: #5a5a5a;
-        border-left-color: #5a5a5a;
-        border-top-color: #5a5a5a;
-    }
-    100% {
-        top: 1px;
-        left: 12px;
-        width: 18px;
-        height: 18px;
-        transform: rotate(0deg);
-        border-color: #5a5a5a;
-        border-left-color: #5a5a5a;
-        border-top-color: #5a5a5a;
-    }
-}
-
-@keyframes check {
-    100% {
-        top: -3px;
-        left: 17px;
-        width: 10px;
-        height: 21px;
-        transform: rotate(45deg);
-        border-color: #0f9d58;
-        border-left-color: transparent;
-        border-top-color: transparent;
-    }
-    51% {
-        border-left: transparent;
-        border-top-color: transparent;
-    }
-    50% {
-        top: 14px;
-        left: 17px;
-        width: 4px;
-        height: 4px;
-        transform: rotate(45deg);
-        border-color: #5a5a5a;
-        border-left-color: #5a5a5a;
-        border-top-color: #5a5a5a;
-    }
-    0% {
-        top: 1px;
-        left: 12px;
-        width: 18px;
-        height: 18px;
-        transform: rotate(0deg);
-        border-color: #5a5a5a;
-        border-left-color: #5a5a5a;
-        border-top-color: #5a5a5a;
-    }
-}
-
-@keyframes rippleOn {
-    0% {
-        opacity: 0;
-    }
-    50% {
-        opacity: 0.2;
-    }
-    100% {
-        opacity: 0;
-    }
-}
-
-@keyframes rippleOff {
-    0% {
-        opacity: 0;
-    }
-    50% {
-        opacity: 0.2;
-    }
-    100% {
-        opacity: 0;
-    }
-}
diff --git a/less/_inputs.less b/less/_inputs.less
index 9a762a7a..07e633e3 100644
--- a/less/_inputs.less
+++ b/less/_inputs.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control {
     &, &:focus, &.focus {
         &:not(textarea):not(select) {
diff --git a/less/_lists.less b/less/_lists.less
index b789e9de..f69f994b 100644
--- a/less/_lists.less
+++ b/less/_lists.less
@@ -1,4 +1,3 @@
-// main: material.less
 .list-group {
     border-radius: 0;
     .list-group-item {
diff --git a/less/_mixins.less b/less/_mixins.less
index 73ccffd0..488370fc 100644
--- a/less/_mixins.less
+++ b/less/_mixins.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 // usage: .variations(~" .check", color, transparent);
 .variations(@extra, @property, @default) {
     // Bootstrap shades
diff --git a/less/_navbar.less b/less/_navbar.less
index d7b3e2aa..e075777b 100644
--- a/less/_navbar.less
+++ b/less/_navbar.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 .navbar {
     background-color: @navbar-default-bg;
     border: 0;
diff --git a/less/_plugin-nouislider.less b/less/_plugin-nouislider.less
index 62873b38..46ed245f 100644
--- a/less/_plugin-nouislider.less
+++ b/less/_plugin-nouislider.less
@@ -1,4 +1,3 @@
-// main: material.less
 .noUi-target,
 .noUi-target * {
     -webkit-touch-callout: none;
diff --git a/less/_plugin-snackbarjs.less b/less/_plugin-snackbarjs.less
index 1c20899e..7c5e1892 100644
--- a/less/_plugin-snackbarjs.less
+++ b/less/_plugin-snackbarjs.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 // Support for SnackbarJS plugin
 // https://github.com/FezVrasta/snackbarjs
 
diff --git a/less/_popups.less b/less/_popups.less
index 433aae43..9d4f8ee1 100644
--- a/less/_popups.less
+++ b/less/_popups.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 .popover, .tooltip-inner {
     background: #323232;
     color: #FFF;
diff --git a/less/_progress.less b/less/_progress.less
index d2f9e1c2..8405f8fe 100644
--- a/less/_progress.less
+++ b/less/_progress.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 .progress {
     height: 4px;
     border-radius: 0;
diff --git a/less/_radios.less b/less/_radios.less
index ff0b42f4..6251705d 100644
--- a/less/_radios.less
+++ b/less/_radios.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 .form-horizontal .radio {
     margin-bottom: 10px;
 }
diff --git a/less/_shadows.less b/less/_shadows.less
index 5506d290..c3770817 100644
--- a/less/_shadows.less
+++ b/less/_shadows.less
@@ -1,6 +1,3 @@
-// main: material.less
-
-
 .shadow-z-1 {
     box-shadow: 0 1px 3px rgba(0,0,0, .12),
         0 1px 2px rgba(0,0,0, .24) ;
diff --git a/less/_tabs.less b/less/_tabs.less
index efa0f710..8f734cf4 100644
--- a/less/_tabs.less
+++ b/less/_tabs.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 .nav-tabs {
     background: @navbar-default-bg;
     > li {
diff --git a/less/_variables.less b/less/_variables.less
index a246323c..78e0a7b3 100644
--- a/less/_variables.less
+++ b/less/_variables.less
@@ -1,5 +1,3 @@
-// main: material.less
-
 // material icons path
 @material-font-path: "../fonts";
 
diff --git a/less/_welljumbo.less b/less/_welljumbo.less
index c114fdee..23b5c335 100644
--- a/less/_welljumbo.less
+++ b/less/_welljumbo.less
@@ -1,4 +1,3 @@
-// main: material.less
 body, .container, .container-fluid {
 
     .well, .well:not([class^="well well-material-"]) {
diff --git a/less/material.less b/less/material.less
index aa02d6f4..087a5e8c 100644
--- a/less/material.less
+++ b/less/material.less
@@ -1,6 +1,3 @@
-// Material Theme 0.0.1
-// -----------------------------------------------------
-
 @import "_variables.less";
 @import "_mixins.less";
 @import "_icons-material-design.less";
diff --git a/package.json b/package.json
index 32639804..e2fcf8db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-material",
-  "version": "0.1.4",
-  "description": "Material Design for Bootstrap",
+  "version": "0.1.5",
+  "description": "Material Design for Bootstrap 3",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -19,7 +19,6 @@
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-autoprefixer": "^1.0.1",
-    "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-connect": "^0.8.0",
     "grunt-contrib-copy": "^0.6.0",
     "grunt-contrib-cssmin": "^0.10.0",
diff --git a/sass/_alerts.scss b/sass/_alerts.scss
index 3d42e0db..aa0a3f0b 100644
--- a/sass/_alerts.scss
+++ b/sass/_alerts.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .alert {
     border: 0px;
     border-radius: 0;
diff --git a/sass/_buttons.scss b/sass/_buttons.scss
index 719ab562..5461bf2e 100644
--- a/sass/_buttons.scss
+++ b/sass/_buttons.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 @mixin btn-shadow(){
     @extend .shadow-z-2;
     transition: box-shadow transform 0.28s cubic-bezier(0.4, 0, 0.2, 1);
diff --git a/sass/_checkboxes.scss b/sass/_checkboxes.scss
index dbea75c4..8b8c72ac 100644
--- a/sass/_checkboxes.scss
+++ b/sass/_checkboxes.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .form-horizontal .checkbox {
     padding-top: 15px;
 }
diff --git a/sass/_icons.scss b/sass/_icons.scss
index 1ada364c..1ace7d3e 100644
--- a/sass/_icons.scss
+++ b/sass/_icons.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .icon {}
 
 // Navbar alternate
diff --git a/sass/_inputs.scss b/sass/_inputs.scss
index 7ff943ff..6699d1d6 100644
--- a/sass/_inputs.scss
+++ b/sass/_inputs.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control {
     &, &:focus, &.focus {
         &:not(textarea):not(select) {
diff --git a/sass/_lists.scss b/sass/_lists.scss
index 476e4c8e..65ead8fc 100644
--- a/sass/_lists.scss
+++ b/sass/_lists.scss
@@ -1,4 +1,3 @@
-// main: _material.scss
 .list-group {
     border-radius: 0;
     .list-group-item {
diff --git a/sass/_navbar.scss b/sass/_navbar.scss
index 04f9ad76..27846fb4 100644
--- a/sass/_navbar.scss
+++ b/sass/_navbar.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .navbar {
     background-color: $navbar-default-bg;
     border: 0;
@@ -19,8 +17,8 @@
 
     .navbar-text {
         color: $navbar-color;
-		margin-top: 20px;
-		margin-bottom: 20px;
+        margin-top: 20px;
+        margin-bottom: 20px;
     }
 
     .navbar-nav {
diff --git a/sass/_plugin-nouislider.scss b/sass/_plugin-nouislider.scss
index f0651509..c3ed256b 100644
--- a/sass/_plugin-nouislider.scss
+++ b/sass/_plugin-nouislider.scss
@@ -1,4 +1,3 @@
-// main: _material.scss
 .noUi-target,
 .noUi-target * {
     -webkit-touch-callout: none;
diff --git a/sass/_plugin-snackbarjs.scss b/sass/_plugin-snackbarjs.scss
index f99b15f1..ed6e39c1 100644
--- a/sass/_plugin-snackbarjs.scss
+++ b/sass/_plugin-snackbarjs.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 // Support for SnackbarJS plugin
 // https://github.com/FezVrasta/snackbarjs
 
diff --git a/sass/_popups.scss b/sass/_popups.scss
index 46a0089c..9d4f8ee1 100644
--- a/sass/_popups.scss
+++ b/sass/_popups.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .popover, .tooltip-inner {
     background: #323232;
     color: #FFF;
diff --git a/sass/_progress.scss b/sass/_progress.scss
index 5ea95f26..ff089c0b 100644
--- a/sass/_progress.scss
+++ b/sass/_progress.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .progress {
     height: 4px;
     border-radius: 0;
diff --git a/sass/_radios.scss b/sass/_radios.scss
index 1d594c19..c9fb1ac9 100644
--- a/sass/_radios.scss
+++ b/sass/_radios.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .form-horizontal .radio {
     margin-bottom: 10px;
 }
diff --git a/sass/_shadows.scss b/sass/_shadows.scss
index cc173c60..c3770817 100644
--- a/sass/_shadows.scss
+++ b/sass/_shadows.scss
@@ -1,6 +1,3 @@
-// main: _material.scss
-
-
 .shadow-z-1 {
     box-shadow: 0 1px 3px rgba(0,0,0, .12),
         0 1px 2px rgba(0,0,0, .24) ;
diff --git a/sass/_tabs.scss b/sass/_tabs.scss
index 47db0806..21461680 100644
--- a/sass/_tabs.scss
+++ b/sass/_tabs.scss
@@ -1,5 +1,3 @@
-// main: _material.scss
-
 .nav-tabs {
     background: $navbar-default-bg;
     > li {
diff --git a/sass/_variables.scss b/sass/_variables.scss
index 64e1edf2..da92ea75 100644
--- a/sass/_variables.scss
+++ b/sass/_variables.scss
@@ -1,6 +1,5 @@
-// main: _material.scss
-
-
+// material icons path
+$material-font-path: "../fonts";
 
 // Material colors palette
 $red: #F44336 !default;
diff --git a/screenshots/Thumbs.db b/screenshots/Thumbs.db
deleted file mode 100644
index 64ebe4d7..00000000
Binary files a/screenshots/Thumbs.db and /dev/null differ