diff --git a/index.html b/index.html
index ec32e0fa..9e47d684 100644
--- a/index.html
+++ b/index.html
@@ -1343,7 +1343,7 @@
 
                         <form class="bs-component">
                             <div class="form-group">
-                                <input class="form-control floating-label" id="focusedInput" type="text" placeholder="Floating label on click input">
+                                <input class="form-control floating-label" id="focusedInput" type="text" placeholder="Write something to make the label float">
                             </div>
 
                             <div class="form-group">
diff --git a/material/material.css b/material/material.css
index d2fd2bfa..a5ce7ffb 100644
--- a/material/material.css
+++ b/material/material.css
@@ -1,4 +1,4 @@
-/* Generated by less 1.7.0 */
+/* Generated by less 1.7.5 */
 @import url(http://fonts.googleapis.com/css?family=Roboto+Condensed:300italic,400italic,700italic,400,700,300|Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic);
 @-webkit-keyframes input-highlight {
   0% {
@@ -14,20 +14,6 @@
     opacity: 0;
   }
 }
-@-moz-keyframes input-highlight {
-  0% {
-    left: 20%;
-    width: 20%;
-  }
-  99% {
-    width: 0;
-    left: 0;
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
 @keyframes input-highlight {
   0% {
     left: 20%;
@@ -95,7 +81,8 @@ h6,
   text-transform: uppercase;
   text-decoration: none;
   color: rgba(255, 255, 255, 0.84);
-  transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+          transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
   outline: none !important;
 }
 .btn:hover {
@@ -193,7 +180,8 @@ h6,
 }
 .btn-raised {
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-  transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+          transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
 }
 .btn-raised:active:not(.btn-link) {
   box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
@@ -280,7 +268,8 @@ h6,
   border-radius: 4px;
   margin: 10px 1px;
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-  transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+          transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
 }
 .btn-group:active:not(.btn-link),
 .btn-group-vertical:active:not(.btn-link) {
@@ -293,7 +282,8 @@ h6,
 .btn-group.btn-group-raised,
 .btn-group-vertical.btn-group-raised {
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-  transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+          transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
 }
 .btn-group.btn-group-raised:active:not(.btn-link),
 .btn-group-vertical.btn-group-raised:active:not(.btn-link) {
@@ -438,7 +428,8 @@ h6,
   display: block;
   position: absolute;
   left: 10px;
-  transition-duration: 0.2s;
+  -webkit-transition-duration: 0.2s;
+          transition-duration: 0.2s;
 }
 .checkbox label .ripple {
   background-color: rgba(0, 0, 0, 0.84);
@@ -456,9 +447,6 @@ h6,
   height: 20px;
   width: 20px;
   -webkit-transition-delay: 0.2s;
-  -moz-transition-delay: 0.2s;
-  -o-transition-delay: 0.2s;
-  -ms-transition-delay: 0.2s;
   transition-delay: 0.2s;
 }
 .checkbox .check,
@@ -536,37 +524,29 @@ h6,
 }
 .checkbox input[type=checkbox] ~ .check {
   position: absolute;
-  top: 0px;
-  left: 0px;
+  top: 2px;
+  left: 11px;
   width: 18px;
   height: 18px;
   border: solid 2px;
   border-color: #5a5a5a;
   -webkit-animation: uncheck 300ms ease-out forwards;
-  -moz-animation: uncheck 300ms ease-out forwards;
   -ms-animation: uncheck 300ms ease-out forwards;
-  -o-animation: uncheck 300ms ease-out forwards;
   animation: uncheck 300ms ease-out forwards;
 }
 .checkbox input[type=checkbox]:checked ~ .check {
   -webkit-animation: check 300ms ease-out forwards;
-  -moz-animation: check 300ms ease-out forwards;
   -ms-animation: check 300ms ease-out forwards;
-  -o-animation: check 300ms ease-out forwards;
   animation: check 300ms ease-out forwards;
 }
 .checkbox input[type=checkbox]:not(:checked) ~ .ripple {
   -webkit-animation: rippleOff 500ms;
-  -moz-animation: rippleOff 500ms;
   -ms-animation: rippleOff 500ms;
-  -o-animation: rippleOff 500ms;
   animation: rippleOff 500ms;
 }
 .checkbox input[type=checkbox]:checked ~ .ripple {
   -webkit-animation: rippleOn 500ms;
-  -moz-animation: rippleOn 500ms;
   -ms-animation: rippleOn 500ms;
-  -o-animation: rippleOn 500ms;
   animation: rippleOn 500ms;
 }
 .checkbox input[type=checkbox][disabled]:not(:checked) ~ .check {
@@ -654,14 +634,16 @@ h6,
     border-color: #0f9d58;
     border-left-color: transparent;
     border-top-color: transparent;
-    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg);
+            transform: rotate(45deg);
   }
   50% {
     top: 14px;
     left: 17px;
     width: 4px;
     height: 4px;
-    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg);
+            transform: rotate(45deg);
     border-color: #0f9d58;
     border-left-color: transparent;
     border-top-color: transparent;
@@ -676,7 +658,8 @@ h6,
     left: 12px;
     width: 18px;
     height: 18px;
-    transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
     border-color: #5a5a5a;
     border-left-color: #5a5a5a;
     border-top-color: #5a5a5a;
@@ -688,7 +671,8 @@ h6,
     left: 17px;
     width: 10px;
     height: 21px;
-    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg);
+            transform: rotate(45deg);
     border-color: #0f9d58;
     border-left-color: transparent;
     border-top-color: transparent;
@@ -702,7 +686,8 @@ h6,
     left: 17px;
     width: 4px;
     height: 4px;
-    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg);
+            transform: rotate(45deg);
     border-color: #5a5a5a;
     border-left-color: #5a5a5a;
     border-top-color: #5a5a5a;
@@ -712,43 +697,8 @@ h6,
     left: 12px;
     width: 18px;
     height: 18px;
-    transform: rotate(0deg);
-    border-color: #5a5a5a;
-    border-left-color: #5a5a5a;
-    border-top-color: #5a5a5a;
-  }
-}
-@-moz-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);
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
     border-color: #5a5a5a;
     border-left-color: #5a5a5a;
     border-top-color: #5a5a5a;
@@ -760,7 +710,8 @@ h6,
     left: 17px;
     width: 10px;
     height: 21px;
-    transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+        transform: rotate(45deg);
     border-color: #0f9d58;
     border-left-color: transparent;
     border-top-color: transparent;
@@ -774,7 +725,8 @@ h6,
     left: 17px;
     width: 4px;
     height: 4px;
-    transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+        transform: rotate(45deg);
     border-color: #5a5a5a;
     border-left-color: #5a5a5a;
     border-top-color: #5a5a5a;
@@ -784,43 +736,8 @@ h6,
     left: 12px;
     width: 18px;
     height: 18px;
-    transform: rotate(0deg);
-    border-color: #5a5a5a;
-    border-left-color: #5a5a5a;
-    border-top-color: #5a5a5a;
-  }
-}
-@-o-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);
+    -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
     border-color: #5a5a5a;
     border-left-color: #5a5a5a;
     border-top-color: #5a5a5a;
@@ -832,7 +749,8 @@ h6,
     left: 17px;
     width: 10px;
     height: 21px;
-    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg);
+            transform: rotate(45deg);
     border-color: #0f9d58;
     border-left-color: transparent;
     border-top-color: transparent;
@@ -846,7 +764,8 @@ h6,
     left: 17px;
     width: 4px;
     height: 4px;
-    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg);
+            transform: rotate(45deg);
     border-color: #5a5a5a;
     border-left-color: #5a5a5a;
     border-top-color: #5a5a5a;
@@ -856,7 +775,8 @@ h6,
     left: 12px;
     width: 18px;
     height: 18px;
-    transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
     border-color: #5a5a5a;
     border-left-color: #5a5a5a;
     border-top-color: #5a5a5a;
@@ -873,17 +793,6 @@ h6,
     opacity: 0;
   }
 }
-@-moz-keyframes rippleOn {
-  0% {
-    opacity: 0;
-  }
-  50% {
-    opacity: 0.2;
-  }
-  100% {
-    opacity: 0;
-  }
-}
 @-ms-keyframes rippleOn {
   0% {
     opacity: 0;
@@ -895,17 +804,6 @@ h6,
     opacity: 0;
   }
 }
-@-o-keyframes rippleOn {
-  0% {
-    opacity: 0;
-  }
-  50% {
-    opacity: 0.2;
-  }
-  100% {
-    opacity: 0;
-  }
-}
 @keyframes rippleOn {
   0% {
     opacity: 0;
@@ -928,17 +826,6 @@ h6,
     opacity: 0;
   }
 }
-@-moz-keyframes rippleOff {
-  0% {
-    opacity: 0;
-  }
-  50% {
-    opacity: 0.2;
-  }
-  100% {
-    opacity: 0;
-  }
-}
 @-ms-keyframes rippleOn {
   0% {
     opacity: 0;
@@ -950,17 +837,6 @@ h6,
     opacity: 0;
   }
 }
-@-o-keyframes rippleOff {
-  0% {
-    opacity: 0;
-  }
-  50% {
-    opacity: 0.2;
-  }
-  100% {
-    opacity: 0;
-  }
-}
 @keyframes rippleOff {
   0% {
     opacity: 0;
@@ -985,7 +861,8 @@ h6,
   position: absolute;
   left: 10px;
   top: 2px;
-  transition-duration: 0.2s;
+  -webkit-transition-duration: 0.2s;
+          transition-duration: 0.2s;
 }
 .radio label .ripple {
   background-color: rgba(0, 0, 0, 0.84);
@@ -994,14 +871,19 @@ h6,
   height: 34px;
   width: 34px;
   border-radius: 100%;
-  transform: scale(0);
-  transition: transform .1s, opacity 0.2s 0.4s;
+  -webkit-transform: scale(0);
+      -ms-transform: scale(0);
+          transform: scale(0);
+  -webkit-transition: -webkit-transform .1s, opacity 0.2s 0.4s;
+          transition: transform .1s, opacity 0.2s 0.4s;
   z-index: 1;
   opacity: 0.2;
   margin: 0;
 }
 .radio label .ripple.animate {
-  transform: scale(1);
+  -webkit-transform: scale(1);
+      -ms-transform: scale(1);
+          transform: scale(1);
   opacity: 0;
 }
 .radio label .circle {
@@ -1015,7 +897,9 @@ h6,
   width: 15px;
   border-radius: 100%;
   background-color: rgba(0, 0, 0, 0.84);
-  transform: scale(0);
+  -webkit-transform: scale(0);
+      -ms-transform: scale(0);
+          transform: scale(0);
 }
 .radio input[type=radio]:checked ~ .check,
 .radio-default input[type=radio]:checked ~ .check {
@@ -1165,7 +1049,9 @@ h6,
   display: none;
 }
 .radio input[type=radio]:checked ~ .check {
-  transform: scale(0.55);
+  -webkit-transform: scale(0.55);
+      -ms-transform: scale(0.55);
+          transform: scale(0.55);
 }
 .radio input[type=radio][disabled] ~ .circle {
   border-color: rgba(0, 0, 0, 0.84);
@@ -1173,11 +1059,15 @@ h6,
 .radio input[type=radio][disabled] ~ .check {
   background-color: rgba(0, 0, 0, 0.84);
 }
+fieldset[disabled] .form-control,
 .form-control-wrapper .form-control,
 .form-control,
+fieldset[disabled] .form-control:focus,
 .form-control-wrapper .form-control:focus,
-.form-control:focus {
-  height: 28px;
+.form-control:focus,
+fieldset[disabled] .form-control.focus,
+.form-control-wrapper .form-control.focus,
+.form-control.focus {
   padding: 0;
   float: none;
   border: 0;
@@ -1186,24 +1076,42 @@ h6,
   background: transparent;
   border-bottom: 1px solid #757575;
 }
+fieldset[disabled] .form-control:not(textarea):not(select),
+.form-control-wrapper .form-control:not(textarea):not(select),
+.form-control:not(textarea):not(select),
+fieldset[disabled] .form-control:focus:not(textarea):not(select),
+.form-control-wrapper .form-control:focus:not(textarea):not(select),
+.form-control:focus:not(textarea):not(select),
+fieldset[disabled] .form-control.focus:not(textarea):not(select),
+.form-control-wrapper .form-control.focus:not(textarea):not(select),
+.form-control.focus:not(textarea):not(select) {
+  height: 28px;
+}
+fieldset[disabled] .form-control:disabled,
 .form-control-wrapper .form-control:disabled,
 .form-control:disabled,
+fieldset[disabled] .form-control:focus:disabled,
 .form-control-wrapper .form-control:focus:disabled,
-.form-control:focus:disabled {
+.form-control:focus:disabled,
+fieldset[disabled] .form-control.focus:disabled,
+.form-control-wrapper .form-control.focus:disabled,
+.form-control.focus:disabled {
   border-style: dashed;
 }
 select.form-control {
   height: 23px;
 }
 select[multiple].form-control,
-select[multiple].form-control:focus {
+select[multiple].form-control:focus,
+select[multiple].form-control.focus {
   height: 85px;
 }
 .form-control-wrapper {
   position: relative;
   /* active state */
 }
-.form-control-wrapper .form-control:focus {
+.form-control-wrapper .form-control:focus,
+.form-control-wrapper .form-control.focus {
   outline: none;
 }
 .form-control-wrapper .floating-label {
@@ -1213,7 +1121,8 @@ select[multiple].form-control:focus {
   pointer-events: none;
   left: 0px;
   top: 5px;
-  transition: 0.2s ease all;
+  -webkit-transition: 0.2s ease all;
+          transition: 0.2s ease all;
   opacity: 0;
 }
 .form-control-wrapper .form-control:not(.empty) ~ .floating-label {
@@ -1221,14 +1130,18 @@ select[multiple].form-control:focus {
   font-size: 10px;
   opacity: 1;
 }
-.form-control-wrapper .form-control:focus:invalid ~ .floating-label {
+.form-control-wrapper .form-control:focus:invalid ~ .floating-label,
+.form-control-wrapper .form-control.focus:invalid ~ .floating-label {
   color: #f44336;
 }
-.form-control-wrapper .form-control:focus ~ .material-input:after {
+.form-control-wrapper .form-control:focus ~ .material-input:after,
+.form-control-wrapper .form-control.focus ~ .material-input:after {
   background-color: #5264ae;
 }
 .form-control-wrapper .form-control:focus:invalid ~ .material-input:before,
-.form-control-wrapper .form-control:focus:invalid ~ .material-input:after {
+.form-control-wrapper .form-control.focus:invalid ~ .material-input:before,
+.form-control-wrapper .form-control:focus:invalid ~ .material-input:after,
+.form-control-wrapper .form-control.focus:invalid ~ .material-input:after {
   background-color: #f44336;
 }
 .form-control-wrapper .form-control.empty ~ .floating-label {
@@ -1242,12 +1155,19 @@ select[multiple].form-control:focus {
   height: 2px;
   background-color: #5264ae;
   bottom: -1px;
-  transform: scaleX(0);
-  transition: transform 0s;
+  -webkit-transform: scaleX(0);
+      -ms-transform: scaleX(0);
+          transform: scaleX(0);
+  -webkit-transition: -webkit-transform 0s;
+          transition: transform 0s;
 }
-.form-control-wrapper .form-control:focus ~ .material-input:before {
-  transform: scaleX(1);
-  transition: transform 0.2s ease-out;
+.form-control-wrapper .form-control:focus ~ .material-input:before,
+.form-control-wrapper .form-control.focus ~ .material-input:before {
+  -webkit-transform: scaleX(1);
+      -ms-transform: scaleX(1);
+          transform: scaleX(1);
+  -webkit-transition: -webkit-transform 0.2s ease-out;
+          transition: transform 0.2s ease-out;
 }
 .form-control-wrapper .material-input:after {
   content: "";
@@ -1259,7 +1179,9 @@ select[multiple].form-control:focus {
   left: 0;
   pointer-events: none;
   opacity: 0.9;
-  transform-origin: left;
+  -webkit-transform-origin: left;
+      -ms-transform-origin: left;
+          transform-origin: left;
 }
 .form-control-wrapper .input-lg ~ .material-input:after {
   height: 26px;
@@ -1270,7 +1192,8 @@ select[multiple].form-control:focus {
 .form-control-wrapper textarea ~ .form-control-highlight {
   margin-top: -11px;
 }
-.form-control-wrapper .form-control:focus ~ .material-input:after {
+.form-control-wrapper .form-control:focus ~ .material-input:after,
+.form-control-wrapper .form-control.focus ~ .material-input:after {
   -webkit-animation: input-highlight 0.3s ease;
   animation: input-highlight 0.3s ease;
   -webkit-animation-fill-mode: forwards;
@@ -1284,7 +1207,8 @@ select[multiple].form-control:focus {
   display: none;
 }
 .form-group.has-warning .material-input:before,
-.form-group.has-warning input.form-control:focus ~ .material-input:after {
+.form-group.has-warning input.form-control:focus ~ .material-input:after,
+.form-group.has-warning input.form-control.focus ~ .material-input:after {
   background: #ff5722;
 }
 .form-group.has-warning .control-label,
@@ -1292,7 +1216,8 @@ select[multiple].form-control:focus {
   color: #ff5722;
 }
 .form-group.has-error .material-input:before,
-.form-group.has-error input.form-control:focus ~ .material-input:after {
+.form-group.has-error input.form-control:focus ~ .material-input:after,
+.form-group.has-error input.form-control.focus ~ .material-input:after {
   background: #f44336;
 }
 .form-group.has-error .control-label,
@@ -1300,7 +1225,8 @@ select[multiple].form-control:focus {
   color: #f44336;
 }
 .form-group.has-success .material-input:before,
-.form-group.has-success input.form-control:focus ~ .material-input:after {
+.form-group.has-success input.form-control:focus ~ .material-input:after,
+.form-group.has-success input.form-control.focus ~ .material-input:after {
   background: #0f9d58;
 }
 .form-group.has-success .control-label,
@@ -1308,7 +1234,8 @@ select[multiple].form-control:focus {
   color: #0f9d58;
 }
 .form-group.has-info .material-input:before,
-.form-group.has-info input.form-control:focus ~ .material-input:after {
+.form-group.has-info input.form-control:focus ~ .material-input:after,
+.form-group.has-info input.form-control.focus ~ .material-input:after {
   background: #03a9f4;
 }
 .form-group.has-info .control-label,
@@ -1455,6 +1382,76 @@ select[multiple].form-control:focus {
 .form-group-material-lightgrey input.form-control:focus ~ .material-input:after {
   background-color: #ececec;
 }
+.form-group input.form-control.focus ~ .material-input:after,
+.form-group-default input.form-control.focus ~ .material-input:after {
+  background-color: #3f51b5;
+}
+.form-group-primary input.form-control.focus ~ .material-input:after {
+  background-color: #4285f4;
+}
+.form-group-success input.form-control.focus ~ .material-input:after {
+  background-color: #0f9d58;
+}
+.form-group-info input.form-control.focus ~ .material-input:after {
+  background-color: #03a9f4;
+}
+.form-group-warning input.form-control.focus ~ .material-input:after {
+  background-color: #ff5722;
+}
+.form-group-danger input.form-control.focus ~ .material-input:after {
+  background-color: #f44336;
+}
+.form-group-material-red input.form-control.focus ~ .material-input:after {
+  background-color: #f44336;
+}
+.form-group-material-pink input.form-control.focus ~ .material-input:after {
+  background-color: #e91e63;
+}
+.form-group-material-purple input.form-control.focus ~ .material-input:after {
+  background-color: #9c27b0;
+}
+.form-group-material-deeppurple input.form-control.focus ~ .material-input:after {
+  background-color: #673ab7;
+}
+.form-group-material-indigo input.form-control.focus ~ .material-input:after {
+  background-color: #3f51b5;
+}
+.form-group-material-lightblue input.form-control.focus ~ .material-input:after {
+  background-color: #03a9f4;
+}
+.form-group-material-cyan input.form-control.focus ~ .material-input:after {
+  background-color: #00bcd4;
+}
+.form-group-material-teal input.form-control.focus ~ .material-input:after {
+  background-color: #009688;
+}
+.form-group-material-lightgreen input.form-control.focus ~ .material-input:after {
+  background-color: #8bc34a;
+}
+.form-group-material-lime input.form-control.focus ~ .material-input:after {
+  background-color: #cddc39;
+}
+.form-group-material-lightyellow input.form-control.focus ~ .material-input:after {
+  background-color: #ffeb3b;
+}
+.form-group-material-orange input.form-control.focus ~ .material-input:after {
+  background-color: #ff9800;
+}
+.form-group-material-deeporange input.form-control.focus ~ .material-input:after {
+  background-color: #ff5722;
+}
+.form-group-material-grey input.form-control.focus ~ .material-input:after {
+  background-color: #9e9e9e;
+}
+.form-group-material-bluegrey input.form-control.focus ~ .material-input:after {
+  background-color: #607d8b;
+}
+.form-group-material-brown input.form-control.focus ~ .material-input:after {
+  background-color: #795548;
+}
+.form-group-material-lightgrey input.form-control.focus ~ .material-input:after {
+  background-color: #ececec;
+}
 .form-group .control-label,
 .form-group-default .control-label {
   color: rgba(0, 0, 0, 0.84);
@@ -1615,31 +1612,20 @@ select.form-control {
   border-bottom: 1px solid #757575;
   border-radius: 0;
 }
-select.form-control:focus {
+select.form-control:focus,
+select.form-control.focus {
   box-shadow: none;
   border-color: #757575;
 }
 @-webkit-keyframes input-highlight {
   0% {
     left: 20%;
-    transform: scaleX(20%);
+    -webkit-transform: scaleX(20%);
+            transform: scaleX(20%);
   }
   99% {
-    transform: scaleX(0);
-    left: 0;
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
-@-moz-keyframes input-highlight {
-  0% {
-    left: 20%;
-    transform: scaleX(20%);
-  }
-  99% {
-    transform: scaleX(0);
+    -webkit-transform: scaleX(0);
+            transform: scaleX(0);
     left: 0;
     opacity: 1;
   }
@@ -1650,24 +1636,12 @@ select.form-control:focus {
 @-ms-keyframes input-highlight {
   0% {
     left: 20%;
-    transform: scaleX(20%);
+    -ms-transform: scaleX(20%);
+        transform: scaleX(20%);
   }
   99% {
-    transform: scaleX(0);
-    left: 0;
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
-@-o-keyframes input-highlight {
-  0% {
-    left: 20%;
-    transform: scaleX(20%);
-  }
-  99% {
-    transform: scaleX(0);
+    -ms-transform: scaleX(0);
+        transform: scaleX(0);
     left: 0;
     opacity: 1;
   }
@@ -1678,10 +1652,12 @@ select.form-control:focus {
 @keyframes input-highlight {
   0% {
     left: 20%;
-    transform: scaleX(20%);
+    -webkit-transform: scaleX(20%);
+            transform: scaleX(20%);
   }
   99% {
-    transform: scaleX(0);
+    -webkit-transform: scaleX(0);
+            transform: scaleX(0);
     left: 0;
     opacity: 1;
   }
@@ -2733,23 +2709,21 @@ fieldset[disabled] .navbar .btn-link:focus {
   border-radius: 2px;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
   height: 0;
-  -moz-transition: -moz-transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s, padding 0 linear 0.2s, height 0 linear 0.2s;
   -webkit-transition: -webkit-transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s, padding 0 linear 0.2s, height 0 linear 0.2s;
   transition: transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s, padding 0 linear 0.2s, height 0 linear 0.2s;
-  -moz-transform: translateY(200%);
   -webkit-transform: translateY(200%);
-  transform: translateY(200%);
+  -ms-transform: translateY(200%);
+      transform: translateY(200%);
 }
 .snackbar.snackbar-opened {
   padding: 14px 15px;
   margin-bottom: 20px;
   height: auto;
-  -moz-transition: -moz-transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s;
   -webkit-transition: -webkit-transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s;
   transition: transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0 linear 0.2s, height 0 linear 0.2s;
-  -moz-transform: none;
   -webkit-transform: none;
-  transform: none;
+  -ms-transform: none;
+      transform: none;
 }
 .snackbar.toast {
   border-radius: 200px;
@@ -2779,7 +2753,8 @@ fieldset[disabled] .navbar .btn-link:focus {
 .noUi-handle {
   position: relative;
   z-index: 1;
-  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+       box-sizing: border-box;
   -webkit-box-sizing: border-box;
 }
 .noUi-stacking .noUi-handle {
@@ -2799,7 +2774,8 @@ fieldset[disabled] .navbar .btn-link:focus {
   height: 10px;
 }
 .noUi-horizontal .noUi-handle {
-  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+       box-sizing: border-box;
   width: 12px;
   height: 12px;
   left: -10px;
@@ -2833,11 +2809,14 @@ fieldset[disabled] .navbar .btn-link:focus {
 .noUi-handle {
   border-radius: 100%;
   cursor: default;
-  transition: all 0.2s ease-out;
+  -webkit-transition: all 0.2s ease-out;
+          transition: all 0.2s ease-out;
   border: 1px solid;
 }
 .noUi-horizontal .noUi-handle:active {
-  transform: scale(2.5);
+  -webkit-transform: scale(2.5);
+      -ms-transform: scale(2.5);
+          transform: scale(2.5);
 }
 [disabled].noUi-slider {
   opacity: 0.5;
diff --git a/material/material.js b/material/material.js
index 8a4a0807..e7038784 100644
--- a/material/material.js
+++ b/material/material.js
@@ -1,4 +1,4 @@
-/* Copyright 2014+, Federico Zivolo, LICENSE at https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md */
+/* globals ripples */
 
 $(function (){
 
@@ -24,12 +24,14 @@ $(function (){
         }
     });
 
-    $(document).on("keyup", ".form-control", function() {
+    $(document).on("keyup change", ".form-control", function() {
         if ($(this).val() !== "") {
             $(this).removeClass("empty");
         } else {
             $(this).addClass("empty");
         }
     });
+    $(document).on("keydown", ".form-control", function() {
+        $(this).removeClass("empty");
+    });
 });
-