diff --git a/css-compiled/material-wfont.css b/css-compiled/material-wfont.css
index d253f7cd..7d7dc3e8 100644
--- a/css-compiled/material-wfont.css
+++ b/css-compiled/material-wfont.css
@@ -1201,9 +1201,6 @@ select[multiple].form-control.focus {
   animation-fill-mode: forwards;
   opacity: 0;
 }
-.form-control-wrapper select ~ .material-input:before {
-  bottom: 1px;
-}
 .form-control-wrapper select ~ .material-input:after {
   display: none;
 }
@@ -1890,9 +1887,22 @@ body .jumbotron-material-lightgrey,
 }
 body [class^="well well-material"],
 .container [class^="well well-material"],
-.container-fluid [class^="well well-material"] {
+.container-fluid [class^="well well-material"],
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
   color: rgba(255, 255, 255, 0.84);
 }
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
+  border-bottom-color: rgba(255, 255, 255, 0.84);
+}
+body [class^="well well-material"] .option,
+.container [class^="well well-material"] .option,
+.container-fluid [class^="well well-material"] .option {
+  color: rgba(0, 0, 0, 0.84);
+}
 .modal-content {
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
   border-radius: 0;
diff --git a/css-compiled/material.css b/css-compiled/material.css
index 8a4b74fe..5bec3a31 100644
--- a/css-compiled/material.css
+++ b/css-compiled/material.css
@@ -1200,9 +1200,6 @@ select[multiple].form-control.focus {
   animation-fill-mode: forwards;
   opacity: 0;
 }
-.form-control-wrapper select ~ .material-input:before {
-  bottom: 1px;
-}
 .form-control-wrapper select ~ .material-input:after {
   display: none;
 }
@@ -1889,9 +1886,22 @@ body .jumbotron-material-lightgrey,
 }
 body [class^="well well-material"],
 .container [class^="well well-material"],
-.container-fluid [class^="well well-material"] {
+.container-fluid [class^="well well-material"],
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
   color: rgba(255, 255, 255, 0.84);
 }
+body [class^="well well-material"] .form-control,
+.container [class^="well well-material"] .form-control,
+.container-fluid [class^="well well-material"] .form-control {
+  border-bottom-color: rgba(255, 255, 255, 0.84);
+}
+body [class^="well well-material"] .option,
+.container [class^="well well-material"] .option,
+.container-fluid [class^="well well-material"] .option {
+  color: rgba(0, 0, 0, 0.84);
+}
 .modal-content {
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
   border-radius: 0;
diff --git a/less/inputs.less b/less/inputs.less
index 3d2d491b..3514967b 100644
--- a/less/inputs.less
+++ b/less/inputs.less
@@ -106,9 +106,6 @@ select[multiple].form-control {
         opacity: 0;
     }
 
-    select ~ .material-input:before {
-        bottom: 1px;
-    }
     select ~ .material-input:after {
         display: none;
     }
diff --git a/less/material.less b/less/material.less
index 3f727e9d..7e12ad69 100644
--- a/less/material.less
+++ b/less/material.less
@@ -51,7 +51,17 @@ body, .container, .container-fluid {
         .variations(~"", background-color, #FFF);
     }
     [class^="well well-material"] {
-        color: @darkbg-text;
+        &, .form-control {
+            color: @darkbg-text;
+        }
+        .form-control {
+            border-bottom-color: @darkbg-text;
+        }
+        // Rule to fix selectize plugin
+        .option {
+            color: @lightbg-text;
+        }
+
     }
 }