diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
index 08300d625..e277f567a 100644
--- a/misc/theme-cicada/Makefile
+++ b/misc/theme-cicada/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		1.23
-PLUGIN_COMMENT=		The cicada theme - grey/orange
+PLUGIN_VERSION=		1.24
+PLUGIN_COMMENT=		The cicada theme - dark grey
 PLUGIN_MAINTAINER=	rene@team-rebellion.net
 
 .include "../../Mk/plugins.mk"
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
index 73e3a2bc6..a5500f15d 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
@@ -1,8 +1,8 @@
 @charset "UTF-8";
 
 .widgetdiv .content-box-head {
-  background: #202020 !important;
-  color: #ec6d12 !important;
+  background-color: #222 !important;
+  color: #dd630d !important;
   padding-bottom: 1px !important;
   padding-top: 1px !important;
   padding-right: 1px !important;
@@ -70,7 +70,7 @@ audio:not([controls]) {
 }
 
 a {
-  color: #ec6d12;
+  color: #dd630d;
   text-decoration: none;
   background: transparent;
   outline: 0;
@@ -80,7 +80,7 @@ a {
   }
 
   &:hover, &:focus {
-    color: #ec6d12;
+    color: #dd630d;
     text-decoration: underline;
   }
 }
@@ -245,7 +245,7 @@ optgroup {
 
 table {
   border-spacing: 0;
-  background-color: #3a3a3a;
+  background-color: #373737;
   color: #FFF;
   width: 100%;
 }
@@ -1567,7 +1567,7 @@ a.text-info:hover {
 }
 
 .text-warning {
-  color: #f0ad4e;
+  color: #de7313;
 }
 
 a.text-warning:hover {
@@ -2756,7 +2756,7 @@ th {
         padding: 10px 0px 10px 20px;
         line-height: 1.428571429;
         vertical-align: top;
-        border-top: 1px solid #303030;
+        border-top: 1px solid #2d2d2d;
       }
     }
 
@@ -2765,7 +2765,7 @@ th {
         padding: 10px 0px 10px 20px;
         line-height: 1.428571429;
         vertical-align: top;
-        border-top: 1px solid #303030;
+        border-top: 1px solid #2d2d2d;
       }
     }
 
@@ -2774,7 +2774,7 @@ th {
         padding: 10px 0px 10px 20px;
         line-height: 1.428571429;
         vertical-align: top;
-        border-top: 1px solid #303030;
+        border-top: 1px solid #2d2d2d;
       }
     }
 
@@ -2788,7 +2788,7 @@ th {
         font-family: 'SourceSansProSemibold';
         font-weight: normal;
         color: #FFF;
-        background-color: #262626;
+        background-color: #292929;
       }
     }
 
@@ -2798,7 +2798,7 @@ th {
         font-family: 'SourceSansProSemibold';
         font-weight: normal;
         color: #FFF;
-        background-color: #262626;
+        background-color: #292929;
       }
     }
 
@@ -2808,7 +2808,7 @@ th {
         font-family: 'SourceSansProSemibold';
         font-weight: normal;
         color: #FFF;
-        background-color: #262626;
+        background-color: #292929;
       }
     }
 
@@ -2843,24 +2843,24 @@ th {
 }
 
 .table-bordered {
-  border: 1px solid #5a5a5a;
+  border: 1px solid #191919;
 
   > {
     thead > tr > {
       th, td {
-        border: 1px solid #5a5a5a;
+        border: 1px solid #191919;
       }
     }
 
     tbody > tr > {
       th, td {
-        border: 1px solid #5a5a5a;
+        border: 1px solid #191919;
       }
     }
 
     tfoot > tr > {
       th, td {
-        border: 1px solid #5a5a5a;
+        border: 1px solid #191919;
       }
     }
 
@@ -2880,7 +2880,7 @@ th {
 
 .table-hover > tbody > tr:hover > {
   td, th {
-    background-color: #606060;
+    background-color: #464646;
   }
 }
 
@@ -3375,9 +3375,9 @@ select {
   font-size: 14px;
   line-height: 1.428571429;
   color: #FFF;
-  background-color: #262626;
+  background-color: #2d2d2d;
   background-image: none;
-  border: 1px solid #5a5a5a;
+  border: 1px solid #191919;
   border-radius: 3px;
   text-overflow: ellipsis;
   max-width: 348px;
@@ -3394,9 +3394,9 @@ textarea {
   font-size: 14px;
   line-height: 1.428571429;
   color: #FFF;
-  background-color: #262626;
+  background-color: #2d2d2d;
   background-image: none;
-  border: 1px solid #5a5a5a;
+  border: 1px solid #191919;
   border-radius: 3px;
   text-overflow: ellipsis;
   max-width: 348px;
@@ -3414,9 +3414,9 @@ input {
     font-size: 14px;
     line-height: 1.428571429;
     color: #FFF;
-    background-color: #262626;
+    background-color: #2d2d2d;
     background-image: none;
-    border: 1px solid #5a5a5a;
+    border: 1px solid #191919;
     border-radius: 3px;
     text-overflow: ellipsis;
     max-width: 348px;
@@ -3428,23 +3428,23 @@ input {
 
 select:hover, textarea:hover {
   color: #FFF;
-  background-color: #262626;
-  border-color: #ec6d12;
+  background-color: #292929;
+  border: 1px solid #dd630d;
   outline: 0;
 }
 
 input {
   &[type="text"]:hover, &[type="password"]:hover, &[type="datetime"]:hover, &[type="datetime-local"]:hover, &[type="date"]:hover, &[type="month"]:hover, &[type="time"]:hover, &[type="week"]:hover, &[type="number"]:hover, &[type="email"]:hover, &[type="url"]:hover, &[type="search"]:hover, &[type="tel"]:hover, &[type="color"]:hover {
     color: #FFF;
-    background-color: #262626;
-    border-color: #ec6d12;
+    background-color: #292929;
+    border: 1px solid #dd630d;
     outline: 0;
   }
 }
 
 select:focus, textarea:focus {
   color: #FFF;
-  border-color: #ec6d12;
+  border: 1px solid #dd630d;
   background-color: #232323;
   outline: 0;
 }
@@ -3452,7 +3452,7 @@ select:focus, textarea:focus {
 input {
   &[type="text"]:focus, &[type="password"]:focus, &[type="datetime"]:focus, &[type="datetime-local"]:focus, &[type="date"]:focus, &[type="month"]:focus, &[type="time"]:focus, &[type="week"]:focus, &[type="number"]:focus, &[type="email"]:focus, &[type="url"]:focus, &[type="search"]:focus, &[type="tel"]:focus, &[type="color"]:focus {
     color: #FFF;
-    border-color: #ec6d12;
+    border: 1px solid #dd630d;
     background-color: #232323;
     outline: 0;
   }
@@ -3498,7 +3498,7 @@ select {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3507,7 +3507,7 @@ fieldset[disabled] select {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 textarea {
@@ -3516,7 +3516,7 @@ textarea {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3525,7 +3525,7 @@ fieldset[disabled] textarea {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="text"] {
@@ -3534,7 +3534,7 @@ input[type="text"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3543,7 +3543,7 @@ fieldset[disabled] input[type="text"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="password"] {
@@ -3552,7 +3552,7 @@ input[type="password"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3561,7 +3561,7 @@ fieldset[disabled] input[type="password"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="datetime"] {
@@ -3570,7 +3570,7 @@ input[type="datetime"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3579,7 +3579,7 @@ fieldset[disabled] input[type="datetime"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="datetime-local"] {
@@ -3588,7 +3588,7 @@ input[type="datetime-local"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3597,7 +3597,7 @@ fieldset[disabled] input[type="datetime-local"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="date"] {
@@ -3606,7 +3606,7 @@ input[type="date"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3615,7 +3615,7 @@ fieldset[disabled] input[type="date"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="month"] {
@@ -3624,7 +3624,7 @@ input[type="month"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3633,7 +3633,7 @@ fieldset[disabled] input[type="month"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="time"] {
@@ -3642,7 +3642,7 @@ input[type="time"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3651,7 +3651,7 @@ fieldset[disabled] input[type="time"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="week"] {
@@ -3660,7 +3660,7 @@ input[type="week"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3669,7 +3669,7 @@ fieldset[disabled] input[type="week"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="number"] {
@@ -3678,7 +3678,7 @@ input[type="number"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3687,7 +3687,7 @@ fieldset[disabled] input[type="number"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="email"] {
@@ -3696,7 +3696,7 @@ input[type="email"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3705,7 +3705,7 @@ fieldset[disabled] input[type="email"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="url"] {
@@ -3714,7 +3714,7 @@ input[type="url"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3723,7 +3723,7 @@ fieldset[disabled] input[type="url"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="search"] {
@@ -3732,7 +3732,7 @@ input[type="search"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3741,7 +3741,7 @@ fieldset[disabled] input[type="search"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="tel"] {
@@ -3750,7 +3750,7 @@ input[type="tel"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3759,7 +3759,7 @@ fieldset[disabled] input[type="tel"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 input[type="color"] {
@@ -3768,7 +3768,7 @@ input[type="color"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border-color: #ffffff;
+    border-color: #191919;
   }
 }
 
@@ -3777,7 +3777,7 @@ fieldset[disabled] input[type="color"] {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border-color: #ffffff;
+  border-color: #191919;
 }
 
 select {
@@ -3786,7 +3786,7 @@ select {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3797,7 +3797,7 @@ fieldset[disabled]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3808,7 +3808,7 @@ textarea {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3819,7 +3819,7 @@ fieldset[disabled]:hover textarea:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3830,7 +3830,7 @@ input[type="text"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3841,7 +3841,7 @@ fieldset[disabled]:hover input[type="text"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3852,7 +3852,7 @@ input[type="password"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3863,7 +3863,7 @@ fieldset[disabled]:hover input[type="password"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3874,7 +3874,7 @@ input[type="datetime"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3885,7 +3885,7 @@ fieldset[disabled]:hover input[type="datetime"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3896,7 +3896,7 @@ input[type="datetime-local"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3907,7 +3907,7 @@ fieldset[disabled]:hover input[type="datetime-local"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3918,7 +3918,7 @@ input[type="date"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3929,7 +3929,7 @@ fieldset[disabled]:hover input[type="date"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3940,7 +3940,7 @@ input[type="month"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3951,7 +3951,7 @@ fieldset[disabled]:hover input[type="month"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3962,7 +3962,7 @@ input[type="time"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3973,7 +3973,7 @@ fieldset[disabled]:hover input[type="time"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -3984,7 +3984,7 @@ input[type="week"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -3995,7 +3995,7 @@ fieldset[disabled]:hover input[type="week"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -4006,7 +4006,7 @@ input[type="number"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -4017,7 +4017,7 @@ fieldset[disabled]:hover input[type="number"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -4028,7 +4028,7 @@ input[type="email"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -4039,7 +4039,7 @@ fieldset[disabled]:hover input[type="email"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -4050,7 +4050,7 @@ input[type="url"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -4061,7 +4061,7 @@ fieldset[disabled]:hover input[type="url"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -4072,7 +4072,7 @@ input[type="search"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -4083,7 +4083,7 @@ fieldset[disabled]:hover input[type="search"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -4094,7 +4094,7 @@ input[type="tel"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -4105,7 +4105,7 @@ fieldset[disabled]:hover input[type="tel"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -4116,7 +4116,7 @@ input[type="color"] {
     background-color: #686868;
     opacity: 0.8;
     filter: alpha(opacity = 80);
-    border: 1px solid #ffffff;
+    border: 1px solid #191919;
     -webkit-box-shadow: none;
     box-shadow: none;
   }
@@ -4127,7 +4127,7 @@ fieldset[disabled]:hover input[type="color"]:hover {
   background-color: #686868;
   opacity: 0.8;
   filter: alpha(opacity = 80);
-  border: 1px solid #ffffff;
+  border: 1px solid #191919;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
@@ -4635,7 +4635,7 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
 
 .has-error {
   .help-block, .control-label, .radio, .checkbox, .radio-inline, .checkbox-inline {
-    color: #FC2E03;
+    color: #EC2C00;
   }
 
   .form-control {
@@ -4644,7 +4644,7 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 
     &:focus {
-      border-color: #FC2E03;
+      border-color: #EC2C00;
       -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f8aeae;
       box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f8aeae;
     }
@@ -4795,8 +4795,8 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
   -ms-user-select: none;
   user-select: none;
   color: #FFFFFF;
-  background-color: #262626;
-  border: 1px solid #5a5a5a;
+  background-color: #292929;
+  border: 1px solid #191919;
   outline: 0;
 }
 
@@ -4806,7 +4806,7 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
 
 .btn {
   &:active, &.active {
-    color: #ec6d12;
+    color: #dd630d;
     background-color: #2d2d2d;
     outline: 0;
     border-color: #5a5a5a;
@@ -4814,10 +4814,10 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
   }
 
   &:hover, &:focus {
-    background-color: #292929;
+    background-color: #dd630d;
     color: #FFF;
     text-decoration: none;
-    border: 1px solid #ec6d12;
+    border: 1px solid #191919;
   }
 
   &:active, &.active {
@@ -4834,24 +4834,24 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
 .btn {
   &.disabled {
     background-color: #DE7313;
-    border-color: #1d1d1d;
+    border: 1px solid #191919;
     outline: 0;
 
     &:hover, &:focus, &:active, &.active {
       background-color: #DE7313;
-      border-color: #1d1d1d;
+      border: 1px solid #191919;
       outline: 0;
     }
   }
 
   &[disabled] {
     background-color: #DE7313;
-    border-color: #1d1d1d;
+    border: 1px solid #191919;
     outline: 0;
 
     &:hover, &:focus, &:active, &.active {
       background-color: #DE7313;
-      border-color: #1d1d1d;
+      border: 1px solid #191919;
       outline: 0;
     }
   }
@@ -4859,12 +4859,12 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
 
 fieldset[disabled] .btn {
   background-color: #DE7313;
-  border-color: #1d1d1d;
+  border: 1px solid #191919;
   outline: 0;
 
   &:hover, &:focus, &:active, &.active {
     background-color: #DE7313;
-    border-color: #1d1d1d;
+    border: 1px solid #191919;
     outline: 0;
   }
 }
@@ -4916,13 +4916,19 @@ fieldset[disabled] .btn {
 
 .btn-default {
   &:active, &.active {
-    background-image: none;
+    background-color: #dd630d;
+    color: #FFF;
+    text-decoration: none;
+    border: 1px solid #191919;
     outline: 0;
   }
 }
 
 .open > .btn-default.dropdown-toggle {
-  background-image: none;
+  background-color: #dd630d;
+  color: #FFF;
+  text-decoration: none;
+  border: 1px solid #191919;
   outline: 0;
 }
 
@@ -4972,13 +4978,13 @@ fieldset[disabled] .btn-default {
 
 .btn-primary {
   color: #fff;
-  background-color: #DE7313;
-  border: 1px solid #1d1d1d;
+  background-color: #dd630d;
+  border: 1px solid #191919;
   outline: 0;
 
   &:hover, &:focus, &:active, &.active {
     color: #fff;
-    background-color: #292929;
+    background-color: #a84c0b;
     border-color: 1px solid #1d1d1d;
     outline: 0;
   }
@@ -4986,7 +4992,7 @@ fieldset[disabled] .btn-default {
 
 .open > .btn-primary.dropdown-toggle {
   color: #fff;
-  background-color: #292929;
+  background-color: #a84c0b;
   border-color: 1px solid #1d1d1d;
   outline: 0;
 }
@@ -5185,19 +5191,19 @@ fieldset[disabled] .btn-info {
 .btn-warning {
   color: #fff;
   background-color: #DE7313;
-  border-color: #1d1d1d;
+  border: 1px solid #191919;
 
   &:hover, &:focus, &:active, &.active {
     color: #fff;
     background-color: #292929;
-    border: 1px solid #515151;
+    border: 1px solid #191919;
   }
 }
 
 .open > .btn-warning.dropdown-toggle {
   color: #fff;
   background-color: #292929;
-  border: 1px solid #515151;
+  border: 1px solid #191919;
 }
 
 .btn-warning {
@@ -5250,7 +5256,7 @@ fieldset[disabled] .btn-warning {
 .btn-danger {
   color: #fff;
   background-color: #DB4829;
-  border-color: #1d1d1d;
+  border: 1px solid #191919;
 
   &:hover, &:focus, &:active, &.active {
     color: #fff;
@@ -5468,10 +5474,10 @@ tbody.collapse.in {
   list-style: none;
   font-size: 14px;
   text-align: left;
-  background-color: #262626;
-  border-left: 1px solid #575757;
-  border-right: 1px solid #575757;
-  border-bottom: 1px solid #575757;
+  background-color: #292929;
+  border-left: 1px solid #191919;
+  border-right: 1px solid #191919;
+  border-bottom: 1px solid #191919;
   border-radius: 3px;
   -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
   box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
@@ -5508,7 +5514,7 @@ tbody.collapse.in {
       &:hover, &:focus {
         text-decoration: none;
         color: #FFFFFF;
-        background-color: #ec6d12;
+        background-color: #dd630d;
       }
     }
 
@@ -5516,13 +5522,13 @@ tbody.collapse.in {
       color: #fff;
       text-decoration: none;
       outline: 0;
-      background-color: #ec6d12;
+      background-color: #dd630d;
 
       &:hover, &:focus {
         color: #fff;
         text-decoration: none;
         outline: 0;
-        background-color: #ec6d12;
+        background-color: #dd630d;
       }
     }
 
@@ -5737,20 +5743,16 @@ tbody.collapse.in {
     &:active, &:hover {
       outline: 0;
       color: #FFFFFF;
-      background-color: #262626;
-      border-color: #ec6d12;
-      -webkit-box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
-      box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
+      background-color: #dd630d;
+      border: 1px solid #191919;
     }
   }
 
   &.open .dropdown-toggle {
     outline: 0;
     color: #FFFFFF;
-    background-color: #262626;
-    border-color: #ec6d12;
-    -webkit-box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
-    box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
+    background-color: #dd630d;
+    border: 1px solid #191919;
   }
 
   > {
@@ -5771,14 +5773,9 @@ tbody.collapse.in {
   padding-right: 12px;
 }
 
-.btn-group.open .dropdown-toggle {
-  -webkit-box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
-  box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
-
-  &.btn-link {
-    -webkit-box-shadow: none;
-    box-shadow: none;
-  }
+.btn-group.open .dropdown-toggle.btn-link {
+  -webkit-box-shadow: none;
+  box-shadow: none;
 }
 
 .btn .caret {
@@ -6113,10 +6110,10 @@ tbody.collapse.in {
       padding: 10px 15px;
       background-color: #3a3a3a;
       color: #fff;
-      border-left: 1px solid #565656;
-      border-right: 1px solid #565656;
-      border-top: 1px solid #565656;
-      border-bottom: 1px solid #565656;
+      border-left: 1px solid #191919;
+      border-right: 1px solid #191919;
+      border-top: 1px solid #191919;
+      border-bottom: 1px solid #191919;
     }
   }
 }
@@ -6127,10 +6124,10 @@ tbody.collapse.in {
   padding: 10px 15px;
   background-color: #3a3a3a;
   color: #fff;
-  border-left: 1px solid #565656;
-  border-right: 1px solid #565656;
-  border-top: 1px solid #565656;
-  border-bottom: 1px solid #565656;
+  border-left: 1px solid #191919;
+  border-right: 1px solid #191919;
+  border-top: 1px solid #191919;
+  border-bottom: 1px solid #191919;
 }
 
 .nav > li {
@@ -6139,7 +6136,7 @@ tbody.collapse.in {
       position: relative;
       display: block;
       padding: none;
-      color: #ec6d12;
+      color: #dd630d;
       background-color: transparent;
       border: none;
     }
@@ -6153,7 +6150,7 @@ tbody.collapse.in {
     &:hover, &:focus {
       text-decoration: none;
       background-color: #2d2d2d;
-      color: #ec6d12;
+      color: #dd630d;
     }
   }
 }
@@ -6227,25 +6224,19 @@ a:focus {
       }
     }
 
-    li {
-      > a:hover {
-        border-color: #4e4e4e #4e4e4e #4e4e4e;
-      }
+    li.active > a {
+      color: #dd630d;
+      background-color: #292929;
+      border: 1px solid #6b6a6a;
+      border-bottom-color: transparent;
+      cursor: pointer;
 
-      &.active > a {
-        color: #ec6d12;
-        background-color: #262626;
+      &:hover, &:focus {
+        color: #dd630d;
+        background-color: #292929;
         border: 1px solid #6b6a6a;
         border-bottom-color: transparent;
         cursor: pointer;
-
-        &:hover, &:focus {
-          color: #ec6d12;
-          background-color: #262626;
-          border: 1px solid #6b6a6a;
-          border-bottom-color: transparent;
-          cursor: pointer;
-        }
       }
     }
   }
@@ -6260,11 +6251,11 @@ a:focus {
 
   &.active > a {
     background-color: #2d2d2d;
-    color: #ec6d12;
+    color: #dd630d;
 
     &:hover, &:focus {
       background-color: #2d2d2d;
-      color: #ec6d12;
+      color: #dd630d;
     }
   }
 }
@@ -7038,7 +7029,7 @@ fieldset[disabled] .navbar-inverse .btn-link {
           text-decoration: none;
           color: #FFFFFF;
           background-color: #505050;
-          border: 1px solid #6d6c6c;
+          border: 1px solid #191919;
           margin-left: -1px;
           cursor: pointer;
         }
@@ -7063,7 +7054,7 @@ fieldset[disabled] .navbar-inverse .btn-link {
         a {
           &:hover, &:focus {
             color: #FFFFFF;
-            background-color: #ec6d12;
+            background-color: #dd630d;
             border-color: #303030;
           }
         }
@@ -7071,7 +7062,7 @@ fieldset[disabled] .navbar-inverse .btn-link {
         span {
           &:hover, &:focus {
             color: #FFFFFF;
-            background-color: #ec6d12;
+            background-color: #dd630d;
             border-color: #303030;
           }
         }
@@ -7082,15 +7073,15 @@ fieldset[disabled] .navbar-inverse .btn-link {
       a {
         z-index: 2;
         color: #FFFFFF;
-        background-color: #ec6d12;
-        border-color: #1d1d1d;
+        background-color: #dd630d;
+        border: 1px solid #191919;
         cursor: default;
 
         &:hover, &:focus {
           z-index: 2;
           color: #FFFFFF;
-          background-color: #ec6d12;
-          border-color: #1d1d1d;
+          background-color: #dd630d;
+          border: 1px solid #191919;
           cursor: default;
         }
       }
@@ -7098,15 +7089,15 @@ fieldset[disabled] .navbar-inverse .btn-link {
       span {
         z-index: 2;
         color: #FFFFFF;
-        background-color: #ec6d12;
-        border-color: #1d1d1d;
+        background-color: #dd630d;
+        border: 1px solid #191919;
         cursor: default;
 
         &:hover, &:focus {
           z-index: 2;
           color: #FFFFFF;
-          background-color: #ec6d12;
-          border-color: #1d1d1d;
+          background-color: #dd630d;
+          border: 1px solid #191919;
           cursor: default;
         }
       }
@@ -7115,28 +7106,28 @@ fieldset[disabled] .navbar-inverse .btn-link {
     .disabled > {
       span {
         color: #000;
-        background-color: #eee;
-        border-color: #1d1d1d;
+        background-color: #757575;
+        border-color: #191919;
         cursor: not-allowed;
 
         &:hover, &:focus {
           color: #000;
-          background-color: #eee;
-          border-color: #1d1d1d;
+          background-color: #757575;
+          border-color: #191919;
           cursor: not-allowed;
         }
       }
 
       a {
         color: #000;
-        background-color: #eee;
-        border-color: #1d1d1d;
+        background-color: #757575;
+        border-color: #191919;
         cursor: not-allowed;
 
         &:hover, &:focus {
           color: #000;
-          background-color: #eee;
-          border-color: #1d1d1d;
+          background-color: #757575;
+          border-color: #191919;
           cursor: not-allowed;
         }
       }
@@ -7313,7 +7304,7 @@ a.label {
 }
 
 .label-success {
-  background-color: #46A50C;
+  background-color: #226808;
   border-color: #323232;
 
   &[href] {
@@ -7542,11 +7533,11 @@ a.thumbnail {
 }
 
 .alert-info {
-  background-color: #424242;
-  border-color: #515151;
+  background-color: #2f2f2f;
+  border-color: #191919;
   color: #ffffff;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
 
   hr {
     border-top-color: #B13116;
@@ -7624,7 +7615,7 @@ a.thumbnail {
   line-height: 20px;
   color: #fff;
   text-align: center;
-  background-color: #ec6d12;
+  background-color: #dd630d;
   position: relative;
   z-index: 2;
   -webkit-box-shadow: inset 0 20px 0 rgba(0, 0, 0, 0.15);
@@ -7679,7 +7670,7 @@ a.thumbnail {
 }
 
 .progress-bar-info {
-  background-color: #ec6d12;
+  background-color: #dd630d;
 }
 
 .progress-striped .progress-bar-info {
@@ -7759,7 +7750,7 @@ a.thumbnail {
   display: block;
   padding: 6px 8px;
   margin-bottom: -1px;
-  background-color: #3a3a3a;
+  background-color: #2f2f2f;
 
   &:last-child {
     margin-bottom: 0;
@@ -7785,8 +7776,8 @@ a.list-group-item {
 
   &:hover, &:focus {
     text-decoration: none;
-    color: #ec6d12;
-    background-color: #262626;
+    color: #dd630d;
+    background-color: #242424;
   }
 
   &:hover:before, &:focus:before {
@@ -7827,7 +7818,7 @@ a.list-group-item {
     }
 
     &:before, &:hover:before, &:focus:before {
-      background: #ec6d12;
+      background: #dd630d;
       content: "";
       height: 42px;
       left: 0;
@@ -8013,7 +8004,7 @@ a.list-group-item-danger {
 }
 
 .panel {
-  border: 1px solid #515151;
+  border: 1px solid #191919;
   margin-bottom: 20px;
 }
 
@@ -8035,7 +8026,7 @@ a.list-group-item-danger {
 
 .panel-heading {
   padding: 10px 15px;
-  border-bottom: 1px solid #515151;
+  border-bottom: 1px solid #191919;
   border-top-right-radius: 2px;
   border-top-left-radius: 2px;
   background-color: #2D2D2D !important;
@@ -8400,13 +8391,13 @@ a.list-group-item-danger {
 }
 
 .panel-default {
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
 
   > {
     .panel-heading {
       color: #fff;
-      border-color: #515151;
+      border: 1px solid #191919;
 
       + .panel-collapse > .panel-body {
         border-top-color: #515151;
@@ -8425,8 +8416,8 @@ a.list-group-item-danger {
 }
 
 .panel-primary {
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
 
   > {
     .panel-heading {
@@ -8671,7 +8662,7 @@ button.close {
 .modal-content {
   position: relative;
   background-color: #383838;
-  border: 1px solid #515151;
+  border: 1px solid #191919;
   border-radius: 3px;
   -webkit-box-shadow: 0 5px 15px rgb(30, 30, 30);
   box-shadow: 0 5px 15px rgb(5, 5, 5);
@@ -8706,7 +8697,7 @@ button.close {
   padding-bottom: 1px;
   border-bottom: 1px solid #4a4a4a;
   min-height: 16.42857px;
-  background-color: #c35d12;
+  background-color: #ac5314;
 
   .close {
     margin-top: -2px;
@@ -8721,11 +8712,11 @@ button.close {
 .modal-body {
   position: relative;
   padding: 5px;
-  background-color: inherit;
+  background-color: #202020;
 
   .table-hover > tbody > tr:hover > {
     td, th {
-      background-color: #c35d12;
+      background-color: #ac5314;
       color: #fff;
     }
   }
@@ -8774,11 +8765,8 @@ button.close {
   .modal-dialog {
     width: 600px;
     margin: 82px auto 30px auto;
-  }
-
-  .modal-content {
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
-    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+    -webkit-box-shadow: 5px 5px 5px rgb(17, 17, 17);
+    box-shadow: 5px 5px 5px rgb(17, 17, 17);
   }
 
   .modal-sm {
@@ -8920,10 +8908,10 @@ button.close {
   background-color: #fff;
   background-clip: padding-box;
   border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.3);
+  border: 1px solid rgba(17, 17, 17, 0.8);
   border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
   white-space: normal;
 
   &.top {
@@ -9127,7 +9115,7 @@ button.close {
   font-size: 20px;
   color: #fff;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  text-shadow: 0 1px 2px rgba(17, 17, 17, 0.8);
 
   &.left {
     background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
@@ -9230,7 +9218,7 @@ button.close {
   padding-bottom: 20px;
   color: #fff;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  text-shadow: 0 1px 2px rgba(17, 17, 17, 0.8);
 
   .btn {
     text-shadow: none;
@@ -9556,7 +9544,7 @@ html {
   font-family: 'SourceSansProRegular';
   scrollbar-width: thin;
   scrollbar-color: #424242 #323232;
-  background-color: #262626;
+  background-color: #242424;
 }
 
 body {
@@ -9564,10 +9552,9 @@ body {
   font-family: 'SourceSansProRegular';
   scrollbar-width: thin;
   scrollbar-color: #424242 #323232;
-  background-color: #262626;
+  background-color: #242424;
   touch-action: manipulation;
   min-width: 320px;
-  background-color: #262626;
 }
 
 .widget-sort-handle {
@@ -9582,6 +9569,8 @@ body {
   border-bottom: 1px solid #171717;
   z-index: 2;
   background-color: #202020;
+  -webkit-box-shadow: 0px 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 0px 3px 3px rgba(17, 17, 17, 0.8);
 }
 
 .page-content {
@@ -9597,25 +9586,25 @@ body {
 
 .page-content-head {
   .container-fluid {
-    background-color: #333;
+    background-color: #2f2f2f;
     margin-left: 20px;
     margin-right: 20px;
-    border: 1px solid #515151;
-    border-radius: 3px;
-    min-height: 51px;
+    border-top: 1px solid #191919;
+    border-radius: 0;
+    min-height: 47px;
     height: auto;
-    padding: 8px 20px 7px 20px;
-    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
-    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+    padding: 6px 14px 5px 14px;
+    -webkit-box-shadow: 0 3px 4px rgb(23, 23, 23);
+    box-shadow: 0 3px 4px rgb(23, 23, 23);
   }
 
-  padding-bottom: 10px;
-  padding-top: 17px;
+  padding-bottom: 2px;
+  padding-top: 10px;
 }
 
 .content-box-head {
-  padding-bottom: 10px;
-  padding-top: 17px;
+  padding-bottom: 2px;
+  padding-top: 10px;
 }
 
 .page-content-head .navbar-nav, .content-box-head .navbar-nav {
@@ -9629,7 +9618,7 @@ body {
 
 .page-content-main {
   min-height: calc(100% - 64px);
-  padding: 15px 0 21px;
+  padding: 9px 0px 21px 0px;
 }
 
 .page-side {
@@ -9664,10 +9653,10 @@ body {
 .content-box {
   padding: 0px 0px;
   margin: 0px 0px;
-  background: none;
-  border: 1px solid #515151;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+  background-color: #2d2d2d;
+  border: 1px solid #191919;
+  -webkit-box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
 
   hr {
     border: none;
@@ -9751,19 +9740,26 @@ body {
   font-size: 12px;
 }
 
+.page-login > .container > .login-modal-container > .login-modal-head > .navbar-brand {
+  padding: 20px 0px;
+}
+
 .login-modal-container {
-  border: 1px solid #686868;
+  border: 1px solid #191919;
   max-width: 400px;
   margin: 100px auto 15px auto;
+  background-color: #262626;
+  -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
 }
 
 .login-modal-head {
   height: 75px;
-  padding: 0 20px;
+  padding: 0 30px;
 }
 
 .login-modal-content {
-  padding: 20px 20px 20px 20px;
+  padding: 0px 30px 20px 30px;
 }
 
 .login-modal-foot {
@@ -9861,7 +9857,7 @@ main.page-content.col-lg-12 {
         padding-left: 0px;
         padding-right: 0px;
         padding-top: 15px;
-        border-bottom: 2px solid #262626;
+        border-bottom: 2px solid #202020;
       }
 
       div {
@@ -9884,7 +9880,7 @@ main.page-content.col-lg-12 {
 
       a.list-group-item.active-menu-title {
         color: #FFF !important;
-        background-color: #262626 !important;
+        background-color: #242424 !important;
       }
     }
   }
@@ -9892,32 +9888,32 @@ main.page-content.col-lg-12 {
 
 a.list-group-item.active-menu-title.collapsed {
   color: #FFF !important;
-  background-color: #262626 !important;
+  background-color: #242424 !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > {
   a.list-group-item[aria-expanded="true"] {
-    color: #ec6d12 !important;
-    background-color: #262626 !important;
+    color: #dd630d !important;
+    background-color: #242424 !important;
   }
 
   div {
     &.collapse {
       &.in {
         > a.list-group-item[aria-expanded="true"] {
-          color: #ec6d12 !important;
-          background-color: #262626 !important;
+          color: #dd630d !important;
+          background-color: #242424 !important;
         }
 
         > div.collapse.in > a.list-group-item {
           padding-left: 10px !important;
           font-size: 14px !important;
-          background-color: #333 !important;
+          background-color: #2f2f2f !important;
           opacity: 0.98;
 
           &.menu-level-3-item.active {
-            color: #ec6d12 !important;
-            background-color: #262626 !important;
+            color: #dd630d !important;
+            background-color: #242424 !important;
           }
         }
       }
@@ -9925,7 +9921,7 @@ a.list-group-item.active-menu-title.collapsed {
       > a.list-group-item {
         padding-left: 10px !important;
         font-size: 14px !important;
-        background-color: #333 !important;
+        background-color: #2f2f2f !important;
         opacity: 0.98;
       }
 
@@ -9949,7 +9945,7 @@ a.list-group-item.active-menu-title.collapsed {
 
       &.in > div.collapse.in > a.list-group-item:hover {
         text-decoration: none !important;
-        color: #ec6d12 !important;
+        color: #dd630d !important;
         background-color: #262626 !important;
       }
     }
@@ -9958,32 +9954,32 @@ a.list-group-item.active-menu-title.collapsed {
 
 a.list-group-item:focus {
   text-decoration: none !important;
-  color: #ec6d12 !important;
+  color: #dd630d !important;
   background-color: #262626 !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item {
   &.active-menu-title, &:hover {
-    color: #ec6d12 !important;
+    color: #dd630d !important;
     background-color: #262626 !important;
   }
 }
 
 a.list-group-item:focus {
-  color: #ec6d12 !important;
+  color: #dd630d !important;
   background-color: #262626 !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div {
   &.collapse.in > a.list-group-item {
     &.collapsed:focus, &:focus {
-      color: #ec6d12 !important;
+      color: #dd630d !important;
       background-color: #262626 !important;
     }
   }
 
   &.active-menu.collapse.in > a.list-group-item.active {
-    color: #ec6d12 !important;
+    color: #dd630d !important;
     background-color: #262626 !important;
   }
 
@@ -9995,7 +9991,7 @@ a.list-group-item:focus {
     left: 70px;
     margin-top: -70px;
     padding-bottom: 1px;
-    border: 1px solid #515151;
+    border: 1px solid #191919;
     -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
@@ -10007,7 +10003,7 @@ a.list-group-item:focus {
       position: absolute;
       left: 166px;
       margin-top: -26px;
-      border: 1px solid #515151;
+      border: 1px solid #191919;
       -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
       -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
       box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
@@ -10065,16 +10061,16 @@ button.toggle-sidebar {
     }
 
     &.active > a {
-      background: #262626 !important;
+      background: #2d2d2d !important;
       outline: 0;
-      border-right: 1px solid #565656;
-      border-top: 1px solid #565656;
-      border-left: 1px solid #565656;
+      border-right: 1px solid #191919;
+      border-top: 1px solid #191919;
+      border-left: 1px solid #191919;
 
       &:hover, &:focus {
-        border-right: 1px solid #565656;
-        border-top: 1px solid #565656;
-        border-left: 1px solid #565656;
+        border-right: 1px solid #191919;
+        border-top: 1px solid #191919;
+        border-left: 1px solid #191919;
       }
     }
 
@@ -10210,7 +10206,7 @@ button.toggle-sidebar {
   }
 
   &:before {
-    background: #ec6d12;
+    background: #dd630d;
     content: "";
     height: 42px;
     min-height: 100%;
@@ -10232,26 +10228,26 @@ button.toggle-sidebar {
 .active-menu-title, .active-menu a {
   text-decoration: none;
   position: relative;
-  background-color: #333;
+  background-color: #242424;
 }
 
 .active-menu-title:before, .active-menu a:before {
   width: 3px;
 }
 
-.active-menu-title.active {
-  background-color: #262626;
-  color: #ec6d12;
+.list-group-item.active-menu-title, .active-menu-title.active {
+  background-color: #242424;
+  color: #dd630d;
 }
 
 .active-menu a {
   &.active {
-    background-color: #262626;
-    color: #ec6d12;
+    background-color: #242424;
+    color: #dd630d;
   }
 
   &:before {
-    background: #ec6d12;
+    background: #dd630d;
   }
 }
 
@@ -10321,7 +10317,7 @@ button.toggle-sidebar {
 
 select {
   overflow: hidden;
-  border: 1px solid #5a5a5a;
+  border: 1px solid #191919;
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
@@ -10336,8 +10332,8 @@ select {
 }
 
 #grid-top {
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
 }
 
 @media screen and (max-width: 767px) {
@@ -10419,30 +10415,30 @@ label > input {
 
     &.activetab {
       background-color: #262626 !important;
-      color: #ec6d12 !important;
+      color: #dd630d !important;
     }
   }
 }
 
 .fw_pass {
-  background-color: #365a38 !important;
+  background-color: #324231 !important;
   color: #FFF;
 }
 
 .fw_block {
-  background-color: #712017 !important;
+  background-color: #622828 !important;
   color: #FFF;
 }
 
 .fw_nat {
-  background-color: #174471 !important;
+  background-color: #293b4b !important;
   color: #FFF;
 }
 
 /*additional extensions for theme-cicada*/
 
 #tab_1 #maintabs {
-  border-bottom: 1px solid #565656;
+  border-bottom: 1px solid #191919;
 }
 
 textarea#update_status {
@@ -10462,7 +10458,7 @@ textarea#update_status {
 }
 
 .fa-toggle-off::before {
-  color: #ec6d12 !important;
+  color: #dd630d !important;
   outline: none !important;
 }
 
@@ -10517,13 +10513,13 @@ h3 {
   }
 
   &:hover, &:focus {
-    color: #ec6d12;
+    color: #dd630d;
     text-decoration: underline;
   }
 }
 
 #grid-log, .table-condensed.table-hover {
-  border: 1px solid #515151;
+  border: 1px solid #191919;
 }
 
 #rules.table-condensed.table-hover {
@@ -10532,8 +10528,8 @@ h3 {
 
 .bootgrid-header .search .glyphicon, .bootgrid-footer .search .glyphicon, .input-group-addon {
   top: 0;
-  background-color: #ec6d12;
-  border: 1px solid #ec6d12;
+  background-color: #dd630d;
+  border: 1px solid #dd630d;
 }
 
 .btn-group.bootstrap-select {
@@ -10551,19 +10547,7 @@ h3 {
 }
 
 .fa {
-  &.fa-exclamation.fa-fw.text-muted, &.fa-arrows-h.fa-fw.text-muted {
-    color: #eac80a !important;
-  }
-
-  &.fa-long-arrow-left {
-    color: #eac80a !important;
-
-    &::before {
-      color: #eac80a !important;
-    }
-  }
-
-  &.fa-info-circle.text-muted {
+  &.fa-exclamation.fa-fw.text-muted, &.fa-arrows-h.fa-fw.text-muted, &.fa-long-arrow-left, &.fa-info-circle.text-muted {
     color: #eac80a !important;
   }
 
@@ -10580,13 +10564,17 @@ h3 {
   }
 }
 
+.fa-long-arrow-left::before {
+  color: #fff !important;
+}
+
 #system_log-widgets.content-box {
   border: none;
 }
 
 #chart, #chart_intf_in, #chart_intf_out, #chart_top_ports, #chart_top_sources, #traffic_graph_widget_chart_in, #traffic_graph_widget_chart_out {
   background-color: #292929;
-  border: 1px solid #515151;
+  border: 1px solid #191919;
 }
 
 /*additional extensions for sensei*/
@@ -10632,7 +10620,7 @@ input[type="checkbox"] {
 
 .sessions-body table > {
   thead > tr > th, tbody > tr > td {
-    border-color: #5A5A5A !important;
+    border-color: #191919 !important;
   }
 }
 
@@ -10657,11 +10645,11 @@ input[type="checkbox"] {
     }
 
     &.active {
-      background-color: #c35d12 !important;
+      background-color: #ac5314 !important;
       color: #ffffff !important;
 
       &:hover {
-        background-color: #c35d12 !important;
+        background-color: #ac5314 !important;
         color: #ffffff !important;
       }
     }
@@ -10680,7 +10668,7 @@ input[type="checkbox"] {
     padding-bottom: 1px;
     border-bottom: 1px solid #4a4a4a;
     min-height: 16.42857px;
-    background-color: #c35d12;
+    background-color: #ac5314;
   }
 
   margin: 62px 10px 10px 10px;
@@ -10709,6 +10697,7 @@ h2 {
 .alert.alert-primary.alert-output.m-t-15.m-b-0 {
   background-color: #333 !important;
   color: #FFF !important;
+  border-color: #191919 !important;
 }
 
 label.btn.au-target {
@@ -10717,9 +10706,29 @@ label.btn.au-target {
 
 .btn-secondary {
   background-color: #262626 !important;
-  border-color: #5a5a5a !important;
+  border-color: #191919 !important;
 }
 
 .disabled {
   color: #bfbfbf !important;
 }
+
+#dropdownMenu2:hover {
+  background-color: #dd630d !important;
+}
+
+.border-bottom {
+  border-bottom: 1px #191919 solid !important;
+}
+
+.border-top {
+  border-top: 1px #191919 solid !important;
+}
+
+.ui-resizable-e {
+  border-right: 1px solid #535353 !important;
+}
+
+.metric-table tbody > tr:last-child > td, .list-table tbody > tr:last-child > td {
+  border-bottom: 1px solid #555 !important;
+}
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss
index 65f39b974..e6d500f9b 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss
@@ -7,13 +7,15 @@
     min-height: 34px;
     cursor: text;
     border-radius: 3px;
-    border: 1px solid #5a5a5a;
+    border: 1px solid #191919;
     background-color: #2a2a2a;
+
     &.disabled {
       background-color: #eee;
       cursor: not-allowed;
     }
   }
+
   &.focus > .tokens-container {
     outline: 0;
     border-color: #5a5a5a;
@@ -21,15 +23,18 @@
     -webkit-box-shadow: none;
     box-shadow: none;
   }
+
   > .tokens-container {
     &.input-sm {
       padding: 0 0 4px 4px;
       min-height: 30px;
     }
+
     &.input-lg {
       padding: 0 0 9px 9px;
       min-height: 46px;
     }
+
     > {
       .token {
         padding: 0 1.2em 0 5px;
@@ -42,6 +47,7 @@
         position: relative;
         vertical-align: middle;
       }
+
       .placeholder, .token-search {
         display: inline-block;
         margin: 5px 5px 0 0;
@@ -50,37 +56,44 @@
       }
     }
   }
+
   &.sortable > .tokens-container > .token {
     cursor: move;
   }
+
   &.single > .tokens-container > .token {
     display: block;
     border-color: #fff;
     background-color: transparent;
   }
+
   &.sortable > .tokens-container > .token.shadow {
     border-color: #ccc;
     background-color: #ccc;
     filter: alpha(opacity = 50);
     opacity: .2;
   }
+
   > .tokens-container {
     > {
       .placeholder {
         color: #6b6b6b;
         padding: 0;
       }
+
       .token-search {
         color: #fff;
         padding: 0;
       }
     }
+
     &:focus, &:hover {
-      border-color: #ec6d12;
+      border-color: #dd630d;
       background-color: #2a2a2a;
       -webkit-box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
       box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
     }
+
     > .token-search > input {
       padding: 0;
       margin: 0;
@@ -89,35 +102,42 @@
       border: none;
       outline: none;
       width: 100%;
+
       &::-ms-clear {
         display: none;
       }
     }
+
     &.input-sm > {
       .placeholder, .token-search, .token {
         margin: 4px 4px 0 0;
       }
     }
+
     &.input-lg > {
       .placeholder, .token-search, .token {
         margin: 9px 9px 0 0;
       }
     }
+
     > .token {
       &.pending-delete {
         background-color: #5b72a4;
         border-color: #425c96;
         color: #fff;
+
         > .dismiss {
           color: #fff;
         }
       }
+
       > .dismiss {
         position: absolute;
         right: 5px;
         color: #a9b9d8;
         text-decoration: none;
         cursor: pointer;
+
         &:after {
           content: "×";
           color: #fff;
@@ -130,6 +150,7 @@
 .tokenize-dropdown {
   position: absolute;
   display: none;
+
   > .dropdown-menu {
     min-height: 10px;
     width: 100%;
@@ -137,11 +158,14 @@
     margin: -1px 0 0 0;
     visibility: visible;
     opacity: 1;
+
     li {
       cursor: pointer;
+
       > a .tokenize-highlight {
         font-weight: bold;
       }
+
       &.locked {
         padding: 3px 20px;
         color: #333;
@@ -149,10 +173,12 @@
         text-overflow: ellipsis;
         overflow-x: hidden;
       }
+
       > a {
         text-overflow: ellipsis;
         overflow-x: hidden;
       }
+
       &:not(.active) a {
         &:hover, &:focus {
           background-color: transparent;
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
index 8c65a5ada..dc7bdbce2 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 .widgetdiv .content-box-head {
-  background: #202020 !important;
-  color: #ec6d12 !important;
+  background-color: #222 !important;
+  color: #dd630d !important;
   padding-bottom: 1px !important;
   padding-top: 1px !important;
   padding-right: 1px !important;
@@ -66,7 +66,7 @@ template {
   display: none; }
 
 a {
-  color: #ec6d12;
+  color: #dd630d;
   text-decoration: none;
   background: transparent;
   outline: 0;  }
@@ -75,7 +75,7 @@ a {
 	outline: 0; }
 
   a:hover, a:focus {
-    color: #ec6d12;
+    color: #dd630d;
     text-decoration: underline; }
 
 abbr[title] {
@@ -207,7 +207,7 @@ optgroup {
 
 table {
   border-spacing: 0;
-  background-color: #3a3a3a;
+  background-color: #373737;
   color: #FFF;
   width:100%; }
 
@@ -1137,7 +1137,7 @@ a.text-info:hover {
   color: #245269; }
 
 .text-warning {
-  color: #f0ad4e; }
+  color: #de7313; }
 
 a.text-warning:hover {
   color: #ec971f; }
@@ -2035,7 +2035,7 @@ th {
     padding: 10px 0px 10px 20px;
     line-height: 1.428571429;
     vertical-align: top;
-	border-top:1px solid #303030; }
+    border-top: 1px solid #2d2d2d; }
   .table > thead > tr > th {
     vertical-align: bottom;  }
   .table > caption + thead > tr:first-child > th,
@@ -2048,7 +2048,7 @@ th {
     font-family: 'SourceSansProSemibold';
     font-weight: normal;
     color: #FFF;
-    background-color: #262626;
+    background-color: #292929;
   }
   .table > tbody + tbody {
     border-top: 2px solid #eee; }
@@ -2064,14 +2064,14 @@ th {
   padding: 5px; }
 
 .table-bordered {
-  border: 1px solid #5a5a5a; }
+  border: 1px solid #191919; }
   .table-bordered > thead > tr > th,
   .table-bordered > thead > tr > td,
   .table-bordered > tbody > tr > th,
   .table-bordered > tbody > tr > td,
   .table-bordered > tfoot > tr > th,
   .table-bordered > tfoot > tr > td {
-    border: 1px solid #5a5a5a; }
+    border: 1px solid #191919; }
   .table-bordered > thead > tr > th,
   .table-bordered > thead > tr > td {
     border-bottom-width: 2px; }
@@ -2082,7 +2082,7 @@ th {
 
 .table-hover > tbody > tr:hover > td,
 .table-hover > tbody > tr:hover > th {
-  background-color:#606060; }
+  background-color:#464646; }
 
 table col[class*="col-"] {
   position: static;
@@ -2310,9 +2310,9 @@ input[type="color"]
   font-size: 14px;
   line-height: 1.428571429;
   color: #FFF;
-  background-color: #262626;
+  background-color: #2d2d2d;
   background-image: none;
-  border: 1px solid #5a5a5a;
+  border: 1px solid #191919;
   border-radius: 3px;
   text-overflow: ellipsis;
   max-width: 348px;
@@ -2338,8 +2338,8 @@ input[type="color"]
   input[type="color"]:hover
    {
 	color: #FFF;
-	background-color: #262626;
-  border-color: #ec6d12;
+	background-color: #292929;
+  border: 1px solid #dd630d;
 	outline: 0; }
 
   select:focus,
@@ -2360,7 +2360,7 @@ input[type="color"]
   input[type="color"]:focus
   {
   color: #FFF;
-	border-color: #ec6d12;
+	border: 1px solid #dd630d;
 	background-color: #232323;
 	outline: 0; }
 
@@ -2475,7 +2475,7 @@ input[type="color"]
 	background-color: #686868;
 	opacity: 0.8;
 	filter: alpha(opacity=80);
-	border-color: #ffffff; }
+	border-color: #191919; }
 
   select[disabled]:hover, select[readonly]:hover, fieldset[disabled]:hover,
   textarea[disabled]:hover,
@@ -2526,12 +2526,12 @@ input[type="color"]
 
    {
     cursor: not-allowed;
-	background-color: #686868;
-	opacity: 0.8;
-	filter: alpha(opacity=80);
-	border:1px solid #ffffff;
-	-webkit-box-shadow: none;
-	box-shadow: none; }
+    background-color: #686868;
+    opacity: 0.8;
+    filter: alpha(opacity=80);
+    border:1px solid #191919;
+    -webkit-box-shadow: none;
+    box-shadow: none; }
 
 textarea {
   height: auto; }
@@ -2786,13 +2786,13 @@ select[multiple].input-lg,
 .has-error .checkbox,
 .has-error .radio-inline,
 .has-error .checkbox-inline {
-  color: #FC2E03; }
+  color: #EC2C00; }
 .has-error .form-control {
   border-color: #DB4829;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); }
   .has-error .form-control:focus {
-    border-color: #FC2E03;
+    border-color: #EC2C00;
     -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f8aeae;
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f8aeae; }
 
@@ -2905,30 +2905,30 @@ select[multiple].input-lg,
   -ms-user-select: none;
   user-select: none;
   color: #FFFFFF;
-  background-color: #262626;
-  border: 1px solid #5a5a5a;
+  background-color: #292929;
+  border: 1px solid #191919;
   outline:0; }
   .open > .btn.dropdown-toggle {
   color: #ffffff;
   }
   .btn:active, .btn.active {
-  color: #ec6d12;
+  color: #dd630d;
   background-color: #2d2d2d;
 	outline:0;
   border-color: #5a5a5a;
 	text-decoration: none; }
   .btn:hover, .btn:focus {
-	background-color: #292929;
+	background-color: #dd630d;
 	color: #FFF;
 	text-decoration: none;
-	border:1px solid #ec6d12; }
+	border: 1px solid #191919; }
 
   .btn:active, .btn.active, .open > .btn.dropdown-toggle {
     background-image: none;
 	outline:0; }
   .btn.disabled, .btn.disabled:hover, .btn.disabled:focus, .btn.disabled:active, .btn.disabled.active, .btn[disabled], .btn[disabled]:hover, .btn[disabled]:focus, .btn[disabled]:active, .btn[disabled].active, fieldset[disabled] .btn, fieldset[disabled] .btn:hover, fieldset[disabled] .btn:focus, fieldset[disabled] .btn:active, fieldset[disabled] .btn.active {
     background-color: #DE7313;
-    border-color: #1d1d1d;
+    border: 1px solid #191919;
 	outline:0; }
 
   .btn .badge {
@@ -2949,16 +2949,20 @@ select[multiple].input-lg,
     filter: alpha(opacity=30);
     -webkit-box-shadow: none;
     box-shadow: none; }
-
-.act_flush:hover, .act_flush:focus {
+  
+  .act_flush:hover, .act_flush:focus {
 	color: #fff;
     background-color: #2d2d2d;
     border-color: 1px solid #1d1d1d;
 	outline:0; }
-
+  
   .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
-    background-image: none;
+	background-color: #dd630d;
+	color: #FFF;
+	text-decoration: none;
+	border: 1px solid #191919;
 	outline:0; }
+  
   .btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active {
     background-color: #FFFFFF;
     border-color: 1px solid #1d1d1d;
@@ -2970,14 +2974,14 @@ select[multiple].input-lg,
 
 .btn-primary {
   color: #fff;
-  background-color: #DE7313;
-  border: 1px solid #1d1d1d;
+  background-color: #dd630d;
+  border: 1px solid #191919;
   outline:0;   }
   .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
     color: #fff;
-    background-color: #292929;
+    background-color: #a84c0b;
     border-color: 1px solid #1d1d1d;
-	outline:0; }
+    outline:0; }
 
   .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
     background-image: none; }
@@ -3032,11 +3036,11 @@ select[multiple].input-lg,
 .btn-warning {
   color: #fff;
   background-color: #DE7313;
-  border-color: #1d1d1d; }
+  border: 1px solid #191919; }
   .btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
     color: #fff;
     background-color: #292929;
-    border: 1px solid #515151; }
+    border: 1px solid #191919; }
 
   .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
     background-image: none; }
@@ -3051,7 +3055,7 @@ select[multiple].input-lg,
 .btn-danger {
   color: #fff;
   background-color: #DB4829;
-  border-color: #1d1d1d; }
+  border: 1px solid #191919; }
   .btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
     color: #fff;
     background-color: none;
@@ -3175,10 +3179,10 @@ tbody.collapse.in {
   list-style: none;
   font-size: 14px;
   text-align: left;
-  background-color: #262626;
-  border-left: 1px solid #575757;
-  border-right: 1px solid #575757;
-  border-bottom: 1px solid #575757;
+  background-color: #292929;
+  border-left: 1px solid #191919;
+  border-right: 1px solid #191919;
+  border-bottom: 1px solid #191919;
   border-radius: 3px;
   -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
   box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
@@ -3211,13 +3215,13 @@ tbody.collapse.in {
 .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
   text-decoration: none;
   color: #FFFFFF;
-  background-color: #ec6d12; }
+  background-color: #dd630d; }
 
 .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
   color: #fff;
   text-decoration: none;
   outline: 0;
-  background-color: #ec6d12; }
+  background-color: #dd630d; }
 
 .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
   color: #777777; }
@@ -3356,10 +3360,8 @@ tbody.collapse.in {
 .btn-group .dropdown-toggle:active, .btn-group .dropdown-toggle:hover, .btn-group.open .dropdown-toggle {
   outline: 0;
   color: #FFFFFF;
-  background-color: #262626;
-  border-color: #ec6d12;
-  -webkit-box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
-  box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6); }
+  background-color: #dd630d;
+  border: 1px solid #191919; }
 
 .btn-group > .btn + .dropdown-toggle {
   padding-left: 8px;
@@ -3368,10 +3370,7 @@ tbody.collapse.in {
 .btn-group > .btn-lg + .dropdown-toggle, .btn-group-lg.btn-group > .btn + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px; }
-
-.btn-group.open .dropdown-toggle {
-    -webkit-box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
-	box-shadow: inset 0 0px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6); }
+  
   .btn-group.open .dropdown-toggle.btn-link {
     -webkit-box-shadow: none;
     box-shadow: none; }
@@ -3568,21 +3567,21 @@ tbody.collapse.in {
       padding: 10px 15px;
 	  background-color: #3a3a3a;
 	  color:#fff;
-	  border-left: 1px solid #565656;
-	  border-right: 1px solid #565656;
-	  border-top: 1px solid #565656;
-	  border-bottom: 1px solid #565656; }
+	  border-left: 1px solid #191919;
+	  border-right: 1px solid #191919;
+	  border-top: 1px solid #191919;
+	  border-bottom: 1px solid #191919; }
 	.nav > li#menu_messages > a {
       position: relative;
       display: block;
       padding: none;
-	  color:#ec6d12;
+	  color:#dd630d;
 	  background-color:transparent;
 	  border:none; }
       .nav > li > a:hover, .nav > li > a:focus {
         text-decoration: none;
         background-color: #2d2d2d;
-		color:#ec6d12;
+		color:#dd630d;
 		 }
 		.nav > li#menu_messages > a:hover, a:focus {
 		text-decoration: underline; }
@@ -3631,12 +3630,9 @@ tbody.collapse.in {
   -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60);
   box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); }
 
-.nav-tabs > li > a:hover {
-  border-color: #4e4e4e #4e4e4e #4e4e4e; }
-
 .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
-  color: #ec6d12;
-  background-color: #262626;
+  color: #dd630d;
+  background-color: #292929;
   border: 1px solid #6b6a6a;
   border-bottom-color: transparent;
   cursor: pointer; }
@@ -3647,7 +3643,7 @@ tbody.collapse.in {
     border-radius: 0; }
   .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
     background-color: #2d2d2d;
-    color: #ec6d12; }
+    color: #dd630d; }
 
 .nav-stacked > li {
   float: none; }
@@ -4095,7 +4091,7 @@ tbody.collapse.in {
       text-decoration: none;
       color: #FFFFFF;
       background-color: #505050;
-      border: 1px solid #6d6c6c;
+      border: 1px solid #191919;
       margin-left: -1px;
 	  cursor: pointer; }
 
@@ -4112,7 +4108,7 @@ tbody.collapse.in {
   .pagination > li > span:hover,
   .pagination > li > span:focus {
     color: #FFFFFF;
-    background-color: #ec6d12;
+    background-color: #dd630d;
     border-color: #303030; }
 
   .pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus,
@@ -4121,8 +4117,8 @@ tbody.collapse.in {
   .pagination > .active > span:focus {
     z-index: 2;
     color: #FFFFFF;
-    background-color: #ec6d12;
-    border-color: #1d1d1d;
+    background-color: #dd630d;
+    border: 1px solid #191919;
     cursor: default; }
 
   .pagination > .disabled > span,
@@ -4132,8 +4128,8 @@ tbody.collapse.in {
   .pagination > .disabled > a:hover,
   .pagination > .disabled > a:focus {
     color: #000;
-    background-color: #eee;
-    border-color: #1d1d1d;
+    background-color: #757575;
+    border-color: #191919;
     cursor: not-allowed; }
 
 
@@ -4222,7 +4218,7 @@ tbody.collapse.in {
 a.label:hover, a.label:focus {
   color: #fff;
   text-decoration: none;
-  cursor: pointer;
+  cursor: pointer; 
 }
 
 .label-default {
@@ -4239,7 +4235,7 @@ a.label:hover, a.label:focus {
 
 
 .label-success {
-  background-color: #46A50C;
+  background-color: #226808;
   border-color: #323232;}
   .label-success[href]:hover, .label-success[href]:focus {
     background-color: #7fc54f;
@@ -4395,11 +4391,11 @@ a.thumbnail.active {
     color: #72bd3e; }
 
 .alert-info {
-	background-color: #424242;
-	border-color: #515151;
+  background-color: #2f2f2f;
+  border-color: #191919;
   color: #ffffff;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
+  -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8); }
   .alert-info hr {
     border-top-color: #B13116; }
   .alert-info .alert-link {
@@ -4451,14 +4447,14 @@ a.thumbnail.active {
   line-height: 20px;
   color: #fff;
   text-align: center;
-  background-color: #ec6d12;
+  background-color: #dd630d;
   position: relative;
   z-index: 2;
   -webkit-box-shadow: inset 0 20px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 20px 0 rgba(0, 0, 0, 0.15);
   -webkit-transition: width 0.6s ease;
   -o-transition: width 0.6s ease;
-  transition: width 0.6s ease;
+  transition: width 0.6s ease; 
   margin: 1px 0 0 0 !important;
 }
 
@@ -4492,7 +4488,7 @@ a.thumbnail.active {
     background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); }
 
 .progress-bar-info {
-  background-color: #ec6d12; }
+  background-color: #dd630d; }
   .progress-striped .progress-bar-info {
     background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
     background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4549,7 +4545,7 @@ a.thumbnail.active {
   display: block;
   padding: 6px 8px;
   margin-bottom: -1px;
-  background-color: #3a3a3a; }
+  background-color: #2f2f2f; }
   .list-group-item:last-child {
     margin-bottom: 0; }
   .list-group-item > .badge {
@@ -4566,8 +4562,8 @@ a.list-group-item {
     color: #2d2d2d; }
   a.list-group-item:hover, a.list-group-item:focus {
     text-decoration: none;
-    color: #ec6d12;
-    background-color: #262626; }
+    color: #dd630d;
+    background-color: #242424; }
 
     a.list-group-item:hover:before, a.list-group-item:focus:before {
       background: #FFFFFF;
@@ -4591,7 +4587,7 @@ a.list-group-item {
 .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus {
   z-index: 2; }
   .list-group-item.active:before, .list-group-item.active:hover:before, .list-group-item.active:focus:before {
-    background: #ec6d12;
+    background: #dd630d;
     content: "";
     height: 42px;
     left: 0;
@@ -4691,7 +4687,7 @@ a.list-group-item-danger {
   line-height: 1.3; }
 
 .panel {
-  border: 1px solid #515151;
+  border: 1px solid #191919;
   margin-bottom: 20px; }
 
 .panel-body {
@@ -4706,7 +4702,7 @@ a.list-group-item-danger {
 
 .panel-heading {
   padding: 10px 15px;
-  border-bottom: 1px solid #515151;
+  border-bottom: 1px solid #191919;
   border-top-right-radius: 2px;
   border-top-left-radius: 2px;
   background-color: #2D2D2D !important; }
@@ -4866,11 +4862,11 @@ a.list-group-item-danger {
     .panel-group .panel-footer + .panel-collapse .panel-body {
       border-bottom: 1px solid #ddd; }
   .panel-default {
-    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
-    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
+    -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+    box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8); }
   .panel-default > .panel-heading {
 	color: #fff;
-	border-color: #515151; }
+	border: 1px solid #191919; }
     .panel-default > .panel-heading + .panel-collapse > .panel-body {
       border-top-color: #515151; }
     .panel-default > .panel-heading .badge {
@@ -4879,8 +4875,8 @@ a.list-group-item-danger {
   .panel-default > .panel-footer + .panel-collapse > .panel-body {
     border-bottom-color: #515151; }
   .panel-primary {
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
+  -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8); }
   .panel-primary > .panel-heading {
     color: #fff; }
     .panel-primary > .panel-heading + .panel-collapse > .panel-body {
@@ -5049,7 +5045,7 @@ button.close {
 .modal-content {
   position: relative;
   background-color: #383838;
-  border: 1px solid #515151;
+  border: 1px solid #191919;
   border-radius: 3px;
   -webkit-box-shadow: 0 5px 15px rgb(30, 30, 30);
   box-shadow: 0 5px 15px rgb(5, 5, 5);
@@ -5078,7 +5074,7 @@ button.close {
   padding-bottom:1px;
   border-bottom: 1px solid #4a4a4a;
   min-height: 16.42857px;
-  background-color: #c35d12; }
+  background-color: #ac5314; }
 
 .modal-header .close {
   margin-top: -2px; }
@@ -5090,10 +5086,10 @@ button.close {
 .modal-body {
   position: relative;
   padding: 5px;
-  background-color: inherit; }
+  background-color: #202020; }
 .modal-body .table-hover > tbody > tr:hover > td,
 .modal-body .table-hover > tbody > tr:hover > th {
-  background-color: #c35d12;
+  background-color: #ac5314;
   color: #fff; }
 
 .modal-footer {
@@ -5124,13 +5120,10 @@ button.close {
 @media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
-    margin: 82px auto 30px auto; }
-
-  .modal-content {
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
-    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); }
-
-  .modal-sm {
+    margin: 82px auto 30px auto; 
+    -webkit-box-shadow: 5px 5px 5px rgb(17, 17, 17);
+    box-shadow: 5px 5px 5px rgb(17, 17, 17);}
+    .modal-sm {
     width: 300px; } }
 @media (min-width: 992px) {
   .modal-lg {
@@ -5233,10 +5226,10 @@ button.close {
   background-color: #fff;
   background-clip: padding-box;
   border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.30);
+  border: 1px solid rgba(17, 17, 17, 0.8);
   border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+  -webkit-box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
   white-space: normal; }
   .popover.top {
     margin-top: -10px; }
@@ -5382,7 +5375,7 @@ button.close {
   font-size: 20px;
   color: #fff;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
+  text-shadow: 0 1px 2px rgba(17, 17, 17, 0.8); }
   .carousel-control.left {
     background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
     background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
@@ -5467,7 +5460,7 @@ button.close {
   padding-bottom: 20px;
   color: #fff;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
+  text-shadow: 0 1px 2px rgba(17, 17, 17, 0.8); }
   .carousel-caption .btn {
     text-shadow: none; }
 
@@ -5718,13 +5711,12 @@ html, body {
   font-family: 'SourceSansProRegular';
   scrollbar-width: thin;
   scrollbar-color: #424242 #323232;
-  background-color: #262626;
+  background-color: #242424;
 }
 
 body {
   touch-action: manipulation;
-  min-width: 320px;
-  background-color:#262626; }
+  min-width: 320px; }
 
 .widget-sort-handle {
   touch-action: none; }
@@ -5736,7 +5728,9 @@ body {
   width: 100%;
   border-bottom: 1px solid #171717;
   z-index: 2;
-  background-color:#202020;}
+  background-color:#202020;
+  -webkit-box-shadow: 0px 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 0px 3px 3px rgba(17, 17, 17, 0.8); }
 
 .page-content {
   height: calc(100% - 52px);
@@ -5746,19 +5740,19 @@ body {
   .page-content > .row {
     height: 100%; }
 .page-content-head .container-fluid {
-  background-color: #333;
+  background-color: #2f2f2f;
   margin-left: 20px;
   margin-right: 20px;
-  border: 1px solid #515151;
-  border-radius: 3px;
-  min-height: 51px;
-	height: auto;
-  padding: 8px 20px 7px 20px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
+  border-top: 1px solid #191919;
+  border-radius: 0;
+  min-height: 47px;
+  height: auto;
+  padding: 6px 14px 5px 14px;
+  -webkit-box-shadow: 0 3px 4px rgb(23, 23, 23);
+  box-shadow: 0 3px 4px rgb(23, 23, 23); }
 .page-content-head, .content-box-head {
-  padding-bottom: 10px;
-  padding-top: 17px; }
+  padding-bottom: 2px;
+  padding-top: 10px; }
   .page-content-head .navbar-nav, .content-box-head .navbar-nav {
     width: 100%; }
   .page-content-head h1, .content-box-head h1, .page-content-head h2, .content-box-head h2, .page-content-head h3, .content-box-head h3 {
@@ -5767,7 +5761,7 @@ body {
 
 .page-content-main {
   min-height: calc(100% - 64px);
-  padding: 15px 0 21px; }
+  padding: 9px 0px 21px 0px; }
 
 .page-side {
   background: #202020;
@@ -5799,11 +5793,11 @@ body {
 .content-box {
   padding: 0px 0px;
   margin: 0px 0px;
-  background: none;
-  border: 1px solid #515151;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);  }
-
+  background-color: #2d2d2d;
+  border: 1px solid #191919;
+  -webkit-box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8)  }
+  
 .content-box hr {
 	border:none; }
   .content-box-main {
@@ -5855,15 +5849,22 @@ body {
 .login-foot {
   font-size: 12px; }
 
+.page-login > .container > .login-modal-container > .login-modal-head > .navbar-brand {
+  padding: 20px 0px;
+}
+
 .login-modal-container {
-  border: 1px solid #686868;
+  border: 1px solid #191919;
   max-width: 400px;
-  margin: 100px auto 15px auto; }
+  margin: 100px auto 15px auto;
+  background-color: #262626;
+  -webkit-box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8);
+  box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8); }
 .login-modal-head {
   height: 75px;
-  padding: 0 20px; }
+  padding: 0 30px; }
 .login-modal-content {
-  padding: 20px 20px 20px 20px; }
+  padding: 0px 30px 20px 30px; }
 .login-modal-foot {
   border-top: 1px solid #E5E5E5;
   height: 60px;
@@ -5944,7 +5945,7 @@ main.page-content.col-lg-12 {
   padding-left: 0px;
   padding-right: 0px;
   padding-top:15px;
-  border-bottom:2px solid #262626;
+  border-bottom:2px solid #202020;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing > a.list-group-item {
@@ -5965,26 +5966,26 @@ main.page-content.col-lg-12 {
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item.active-menu-title, a.list-group-item.active-menu-title.collapsed {
   color: #FFF !important;
-  background-color: #262626 !important;
+  background-color: #242424 !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item[aria-expanded="true"],
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item[aria-expanded="true"] {
-  color: #ec6d12 !important;
-  background-color: #262626 !important;
+  color: #dd630d !important;
+  background-color: #242424 !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > a.list-group-item,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item {
   padding-left: 10px !important;
   font-size: 14px !important;
-  background-color: #333 !important;
+  background-color: #2f2f2f !important;
   opacity: 0.98;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item.menu-level-3-item.active {
-  color: #ec6d12 !important;
-  background-color: #262626 !important;
+  color: #dd630d !important;
+  background-color: #242424 !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > div.collapse > a.list-group-item,
@@ -6000,7 +6001,7 @@ main.page-content.col-lg-12 {
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus {
   text-decoration: none !important;
-  color: #ec6d12 !important;
+  color: #dd630d !important;
   background-color: #262626 !important;
 }
 
@@ -6009,7 +6010,7 @@ main.page-content.col-lg-12 {
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.collapsed:focus,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:focus,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active {
-  color: #ec6d12 !important;
+  color: #dd630d !important;
   background-color: #262626 !important;
 }
 
@@ -6022,7 +6023,7 @@ main.page-content.col-lg-12 {
   left: 70px;
   margin-top:-70px;
   padding-bottom: 1px;
-  border:1px solid #515151;
+  border:1px solid #191919;
   -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
@@ -6036,7 +6037,7 @@ main.page-content.col-lg-12 {
   position: absolute;
   left: 166px;
   margin-top:-26px;
-  border:1px solid #515151;
+  border:1px solid #191919;
   -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
@@ -6085,15 +6086,15 @@ button.toggle-sidebar {
   outline:0; }
 
 .nav-tabs > li.active > a {
-  background: #262626 !important;
+  background: #2d2d2d !important;
   outline:0; }
 
 .nav-tabs > li.active > a,
 .nav-tabs > li.active > a:hover,
 .nav-tabs > li.active > a:focus {
-  border-right: 1px solid #565656;
-  border-top: 1px solid #565656;
-  border-left: 1px solid #565656; }
+  border-right: 1px solid #191919;
+  border-top: 1px solid #191919;
+  border-left: 1px solid #191919; }
 
 .nav-tabs > li > a.visible-lg-inline-block:not(.pull-right) {
   border-top-right-radius: 0px !important;
@@ -6182,7 +6183,7 @@ padding-right: 15px; }
   .list-group-item + div > a {
     padding-left: 44px; }
   .list-group-item:before {
-    background: #ec6d12;
+    background: #dd630d;
     content: "";
     height: 42px;
     min-height: 100%;
@@ -6201,15 +6202,15 @@ padding-right: 15px; }
 .active-menu-title, .active-menu a {
   text-decoration: none;
   position: relative;
-  background-color: #333; }
+  background-color: #242424; }
   .active-menu-title:before, .active-menu a:before {
     width: 3px; }
-  .active-menu-title.active, .active-menu a.active {
-    background-color: #262626;
-	color: #ec6d12; }
+  .list-group-item.active-menu-title, .active-menu-title.active, .active-menu a.active {
+    background-color: #242424;
+    color: #dd630d; }
 
 .active-menu a:before {
-  background: #ec6d12; }
+  background: #dd630d; }
 
 .alert.alert-danger {
   color: #FFF !important; }
@@ -6266,7 +6267,7 @@ padding-right: 15px; }
 
 select {
   overflow: hidden;
-  border: 1px solid #5a5a5a;
+  border: 1px solid #191919;
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
@@ -6279,8 +6280,8 @@ select {
 #filter-log-entries th[data-column-id="__timestamp__"] {
   min-width: 3.5em; }
 #grid-top {
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
+  -webkit-box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
+  box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8); }
 
 @media screen and (max-width: 767px) {
   .table-responsive {
@@ -6335,27 +6336,27 @@ label > input[type="radio"] {
 
 #ipsec .ipsec-tab.activetab {
 	background-color: #262626 !important;
-	color: #ec6d12 !important;
+	color: #dd630d !important;
 }
 .fw_pass {
-  background-color: #365a38 !important;
+  background-color: #324231 !important;
   color: #FFF;
 }
 
 .fw_block {
-  background-color: #712017 !important;
+  background-color: #622828 !important;
   color: #FFF;
 }
 
 .fw_nat {
-  background-color: #174471 !important;
+  background-color: #293b4b !important;
   color: #FFF;
 }
 
   /*additional extensions for theme-cicada*/
 
 #tab_1 #maintabs {
-  border-bottom: 1px solid #565656;
+  border-bottom: 1px solid #191919;
 }
 
 textarea#update_status, textarea#update_status:hover {
@@ -6367,7 +6368,7 @@ textarea#update_status, textarea#update_status:hover {
 }
 
 .fa-toggle-off::before {
-  color:#ec6d12 !important;
+  color:#dd630d !important;
   outline:none !important;
 }
 
@@ -6415,16 +6416,16 @@ h3:link {
 }
 
 h3:hover, h3:focus {
-  color: #ec6d12;
+  color: #dd630d;
   text-decoration: underline;
 }
 
 #grid-log {
-  border: 1px solid #515151;
+  border: 1px solid #191919;
 }
 
 .table-condensed.table-hover {
-    border: 1px solid #515151;
+    border: 1px solid #191919;
 }
 
 #rules.table-condensed.table-hover {
@@ -6435,8 +6436,8 @@ h3:hover, h3:focus {
 .bootgrid-footer .search .glyphicon,
 .input-group-addon {
   top: 0;
-  background-color: #ec6d12;
-  border: 1px solid #ec6d12;
+  background-color: #dd630d;
+  border: 1px solid #dd630d;
 }
 
 .btn-group.bootstrap-select.open, .btn-group.bootstrap-select:hover {
@@ -6445,9 +6446,12 @@ h3:hover, h3:focus {
   background-color: #2d2d2d !important;
 }
 
-.glyphicon.glyphicon-play.text-muted, .glyphicon.glyphicon-remove.text-muted, .glyphicon.glyphicon-remove-sign.text-muted, .glyphicon.glyphicon-info-sign.text-muted,.fa.fa-exclamation.fa-fw.text-muted,.fa.fa-arrows-h.fa-fw.text-muted,.fa.fa-long-arrow-left,.fa.fa-long-arrow-left::before,.fa.fa-info-circle.text-muted,.fa.fa-times-circle.text-muted,.fa.fa-times-circle.text-muted::before,.fa.fa-times.text-muted,.fa.fa-times.text-muted::before,.fa.fa-play.text-muted::before {
+.glyphicon.glyphicon-play.text-muted, .glyphicon.glyphicon-remove.text-muted, .glyphicon.glyphicon-remove-sign.text-muted, .glyphicon.glyphicon-info-sign.text-muted,.fa.fa-exclamation.fa-fw.text-muted,.fa.fa-arrows-h.fa-fw.text-muted,.fa.fa-long-arrow-left,.fa.fa-info-circle.text-muted,.fa.fa-times-circle.text-muted,.fa.fa-times-circle.text-muted::before,.fa.fa-times.text-muted,.fa.fa-times.text-muted::before,.fa.fa-play.text-muted::before {
   color: #eac80a !important;
 }
+.fa-long-arrow-left::before {
+  color: #fff !important;
+}
 
 #system_log-widgets.content-box {
   border:none;
@@ -6455,7 +6459,7 @@ h3:hover, h3:focus {
 
 #chart,#chart_intf_in,#chart_intf_out,#chart_top_ports,#chart_top_sources,#traffic_graph_widget_chart_in,#traffic_graph_widget_chart_out {
   background-color: #292929;
-  border: 1px solid #515151;
+  border: 1px solid #191919;
 }
 
   /*additional extensions for sensei*/
@@ -6488,7 +6492,7 @@ input[type="checkbox"].checkbox-switch:checked + i::before, input[type="checkbox
 }
 
 .sessions-body table > thead > tr > th, .sessions-body table > tbody > tr > td {
-  border-color: #5A5A5A !important;
+  border-color: #191919 !important;
 }
 
 .bootstrap-datetimepicker-widget table th.disabled, .bootstrap-datetimepicker-widget table th.disabled:hover {
@@ -6505,7 +6509,7 @@ input[type="checkbox"].checkbox-switch:checked + i::before, input[type="checkbox
 }
 
 .bootstrap-datetimepicker-widget table td.active, .bootstrap-datetimepicker-widget table td.active:hover {
-    background-color: #c35d12 !important;
+    background-color: #ac5314 !important;
     color: #ffffff !important;
 }
 
@@ -6520,7 +6524,7 @@ input[type="checkbox"].checkbox-switch:checked + i::before, input[type="checkbox
   padding-bottom: 1px;
   border-bottom: 1px solid #4a4a4a;
   min-height: 16.42857px;
-  background-color: #c35d12;
+  background-color: #ac5314;
 }
 
 .modal-side {
@@ -6548,6 +6552,7 @@ h2.text-center ,h2.text-primary {
 .alert.alert-primary.alert-output.m-t-15.m-b-0 {
   background-color: #333 !important;
   color: #FFF !important;
+  border-color: #191919 !important;
 }
 
 label.btn.au-target {
@@ -6556,9 +6561,29 @@ label.btn.au-target {
 
 .btn-secondary {
   background-color:#262626 !important;
-  border-color:#5a5a5a !important;
+  border-color: #191919 !important;
 }
 
 .disabled {
   color: #bfbfbf !important;
 }
+
+#dropdownMenu2:hover {
+  background-color: #dd630d !important;
+}
+
+.border-bottom {
+  border-bottom: 1px #191919 solid !important;
+}
+
+.border-top {
+  border-top: 1px #191919 solid !important;
+}
+
+.ui-resizable-e {
+  border-right: 1px solid #535353 !important;
+}
+
+.metric-table tbody > tr:last-child > td, .list-table tbody > tr:last-child > td {
+  border-bottom: 1px solid #555 !important;
+}
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css
index 4cb3145ae..1e1fdaa5b 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css
@@ -266,29 +266,28 @@ svg.nvd3-svg {
   Box shadow and border radius styling
 */
 .nvtooltip.with-3d-shadow, .with-3d-shadow .nvtooltip {
-	background-color: rgb(60, 60, 60);
+	background-color: rgb(32, 32, 32);
 	color: rgba(0,0,0,1.0);
 	border: 1px solid rgb(255, 127, 14);
 }
 
-
 .nvd3 text {
-    font: normal 12px Arial, sans-serif;
+  font: normal 12px Arial, sans-serif;
 	fill:#FFF;
 }
 
 .nvd3 .title {
-    font: bold 14px Arial, sans-serif;
+  font: bold 14px Arial, sans-serif;
 }
 
 .nvd3 .nv-background {
-    fill: white;
-    fill-opacity: 0;
+  fill: white;
+  fill-opacity: 0;
 }
 
 .nvd3.nv-noData {
-    font-size: 18px;
-    font-weight: bold;
+  font-size: 18px;
+  font-weight: bold;
 	fill:#fff;
 }
 
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css
index 1b6bdc940..62370acf5 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css
@@ -6,7 +6,7 @@
     min-height: 34px;
     cursor: text;
     border-radius: 3px;
-	border: 1px solid #5a5a5a;
+	border: 1px solid #191919;
 	background-color: #2a2a2a;
 }
 
@@ -78,7 +78,7 @@
 
 .tokenize > .tokens-container:focus,
 .tokenize > .tokens-container:hover {
-	border-color:#ec6d12;
+	border-color:#dd630d;
 	background-color:#2a2a2a;
 	-webkit-box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
 	box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);