diff --git a/src/sass/404.scss b/src/sass/404.scss
index b5d85c4..7edf08f 100644
--- a/src/sass/404.scss
+++ b/src/sass/404.scss
@@ -1,4 +1,5 @@
 @import "common.scss";
+@import "theme/_layout.scss";
 
 html {
   position: relative;
@@ -12,8 +13,6 @@ html, body {
 
 body {
   font: 12px/16px $font-family;
-  color: $default-text;
-  @include main-background();
   display: flex;
   align-items: center;
 }
@@ -21,10 +20,10 @@ body {
 .page-not-found-modal {
   width: 638px;
   margin: 0 auto;
-  @include bg-translucent-dark(0.5);
+  background-color: $auth-panel-background;
   border-radius: 5px;
   font-weight: $font-light;
-  color: #ffffff;
+  color: $default-text;
   padding: 32px;
   text-align: center;
 
diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
index 7502543..48976f6 100644
--- a/src/sass/app/_form.scss
+++ b/src/sass/app/_form.scss
@@ -44,12 +44,12 @@
   @include placeholderStyle($default-text, 0.7);
   border: 1px solid $input-border;
   border-radius: 5px;
-  background-color: rgba(0,0,0,.15);
+  background-color: $input-background;
   box-shadow: none;
   &:focus {
     box-shadow: none;
     border-color: $primary-bg;
-    background: $default;
+    background: $input-background;
   }
 }
 
@@ -375,7 +375,7 @@ label.custom-input-danger {
 }
 
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
-  background-color: rgba(0,0,0,.15);
+  background-color: $input-background;
   color: $disabled;
   border-color: $disabled-bg;
   @include placeholderStyle($default-text, 0.5);
@@ -430,7 +430,6 @@ label.custom-input-danger {
   button.btn.btn-default {
     background: transparent;
     color: $default-text;
-    //border-color: $input-border;
     &:hover {
       background: $default;
       box-shadow: none;
@@ -472,7 +471,7 @@ label.custom-input-danger {
 
 .bootstrap-tagsinput {
   color: $default-text;
-  background-color: rgba(0,0,0,.15);
+  background-color: $input-background;
   border: 1px solid $input-border;
   border-radius: 5px;
   box-shadow: none;
@@ -494,7 +493,8 @@ label.custom-input-danger {
     }
   }
   input {
-    background-color: rgba(0,0,0,.15);
+    background-color: $input-background;
+    border: 1px solid $input-border;
     border-radius: 5px;
     @include placeholderStyle($default-text, 0.8);
     line-height: 22px;
diff --git a/src/sass/auth.scss b/src/sass/auth.scss
index c00918f..01376f9 100644
--- a/src/sass/auth.scss
+++ b/src/sass/auth.scss
@@ -12,16 +12,6 @@ html {
   min-height: 520px;
 }
 
-.form-control, .form-control:focus {
-  @include placeholderStyle($default-text, 0.7);
-  border-radius: 5px;
-  border: 1px solid $border;
-  color: $default-text;
-}
-.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
-  @include placeholderStyle($default, 0.7);
-}
-
 .auth-main {
   display: flex;
   align-items: center;
@@ -33,7 +23,7 @@ html {
   width: 540px;
   margin: 0 auto;
   border-radius: 5px;
-  @include bg-translucent-dark(0.5);
+  background-color: $auth-panel-background;
   color: $default-text;
   padding: 32px;
   h1 {
diff --git a/src/sass/theme/_buttons.scss b/src/sass/theme/_buttons.scss
index b67de4d..c58fe68 100644
--- a/src/sass/theme/_buttons.scss
+++ b/src/sass/theme/_buttons.scss
@@ -141,9 +141,6 @@ button.btn.btn-inverse {
   button.btn.btn-primary {
     @include buttonGroupColor($primary);
   }
-  button.btn.btn-default {
-    @include buttonGroupColor($default-text);
-  }
   button.btn.btn-danger {
     @include buttonGroupColor($danger);
   }
diff --git a/src/sass/theme/_table.scss b/src/sass/theme/_table.scss
index e738bd2..667d6a3 100644
--- a/src/sass/theme/_table.scss
+++ b/src/sass/theme/_table.scss
@@ -3,7 +3,7 @@
   & > thead {
     & > tr {
       & > th {
-        border-bottom: 1px solid rgba($border, 0.2);
+        border-bottom: 1px solid $border-light;
         white-space: nowrap;
         &:first-child {
           text-align: center;
@@ -22,7 +22,7 @@
       & > td {
         padding: 0px 8px;
         line-height: 35px;
-        border-top: 1px solid rgba($border, 0.2);
+        border-top: 1px solid $border-light;
         &:first-child {
           text-align: center;
         }
@@ -237,7 +237,7 @@ input.search-input {
 .table-bordered > thead > tr > td,
 .table-bordered > tbody > tr > td,
 .table-bordered > tfoot > tr > td{
-  border: 1px solid rgba($border, 0.2);
+  border: 1px solid $border-light;
 }
 
 .table-striped > tbody > tr:nth-of-type(odd) {
diff --git a/src/sass/theme/conf/_colorScheme.scss b/src/sass/theme/conf/_colorScheme.scss
index 5693adb..1a634fc 100644
--- a/src/sass/theme/conf/_colorScheme.scss
+++ b/src/sass/theme/conf/_colorScheme.scss
@@ -2,12 +2,14 @@ $default: rgba(#000000, 0.2);
 $body-bg: #F0F3F4;
 $default-text: #ffffff;
 $help-text: #eeeeee;
+$label-text: #ffffff;
+
 $disabled: #dddddd;
 $disabled-bg: transparent;
-
 $border: #ffffff;
-$border-light: $border;
+$border-light: rgba(#ffffff, 0.2);
 $input-border: transparent;
+$input-background: rgba(#000000, 0.15);
 
 $sidebar: rgba(#000000, 0.5);
 $sidebar-text: #ffffff;
@@ -15,6 +17,7 @@ $dropdown-text: #7d7d7d;
 $bootstrap-panel-text: #7d7d7d;
 $bootstrap-panel-bg: #ffffff;
 $mail-box: whitesmoke;
+$auth-panel-background: rgba(#000000, 0.55);
 
 $primary: #209e91 !default;
 $info: #2dacd1 !default;
diff --git a/src/sass/theme/dashboard/_calendar.scss b/src/sass/theme/dashboard/_calendar.scss
index e15c8c1..9aa3fc4 100644
--- a/src/sass/theme/dashboard/_calendar.scss
+++ b/src/sass/theme/dashboard/_calendar.scss
@@ -94,7 +94,7 @@ div.blurCalendar{
 
 .fc-unthemed {
   th, td, hr, thead, tbody, .fc-row, .fc-popover {
-    border-color: rgba(255,255,255,0.3);
+    border-color: rgba($border, 0.3);
   }
 
   .fc-popover {
@@ -330,7 +330,7 @@ div.blurCalendar{
 .fc-event,
 .fc-event:hover,
 .ui-widget .fc-event {
-  color: $default-text;
+  color: $label-text;
   text-decoration: none;
 }
 
@@ -730,7 +730,7 @@ a.fc-more {
 }
 
 .fc-head{
-  color: $default-text;
+  color: $label-text;
   background-color: $primary;
   td, th{
     border:none;