diff --git a/bootstrap_subtheme/less/overrides.less b/bootstrap_subtheme/less/overrides.less
index d594bae..d30786a 100644
--- a/bootstrap_subtheme/less/overrides.less
+++ b/bootstrap_subtheme/less/overrides.less
@@ -177,8 +177,8 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
   height: auto;
 }
 input.error {
-  color: @errorText;
-  border-color: @errorBorder;
+  color: @state-danger-text;
+  border-color: @state-danger-border;
 }
 .form-type-checkbox input, .form-type-radio input {
   float: left;
@@ -190,7 +190,7 @@ input.error {
   .border-radius(~"4px 4px 0 0");
 }
 .help-block, .control-group .help-inline {
-  color: @placeholderText;
+  color: @text-color;
   font-size: 12px;
   margin: -8px 0 10px;
   padding: 0 3px;
@@ -221,21 +221,21 @@ input.error {
 // Error containers.
 div.error,
 table tr.error {
-  background-color: @errorBackground;
-  color: @errorText;
+  background-color: @state-danger-bg;
+  color: @state-danger-text;
 }
 .control-group.error {
   background: none;
   label, .control-label {
-    color: @errorText;
+    color: @state-danger-text;
     font-weight: 600;
   }
   input, textarea, select, .uneditable-input {
-    color: @errorText;
-    border: 1px solid @inputBorder;
+    color: @input-color;
+    border: 1px solid @input-border;
   }
   .help-block, .help-inline {
-    color: @placeholderText;
+    color: @text-color;
   }
 }
 
@@ -280,13 +280,13 @@ ul li.leaf {
   font-weight: bold;
 }
 .password-indicator {
-  background-color: darken(@grayLighter, 2%);
+  background-color: darken(@input-color-placeholder, 2%);
   height: 0.3em;
   width: 100%;
   div {
     height: 100%;
     width: 0%;
-    background-color: @green;
+    background-color: @input-color-placeholder;
   }
 }
 input.password-confirm,