diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
index c532c73b8..905789a1d 100644
--- a/misc/theme-cicada/Makefile
+++ b/misc/theme-cicada/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		0.1
+PLUGIN_VERSION=		0.3
+PLUGIN_REVISION=	0
 PLUGIN_COMMENT=		The cicada theme - grey/orange
 PLUGIN_MAINTAINER=	martin@team-rebellion.net
 PLUGIN_DEVEL=		yes
diff --git a/misc/theme-cicada/pkg-descr b/misc/theme-cicada/pkg-descr
index ae1864be8..9c27d5b71 100644
--- a/misc/theme-cicada/pkg-descr
+++ b/misc/theme-cicada/pkg-descr
@@ -1 +1 @@
-The cicada theme - grey/orange - Created by remic-webdesign@chello.at
+The cicada theme - grey/orange - Designed and created by remic-webdesign@chello.at
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-dialog.less b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-dialog.less
index 0350cd824..0542c7ee8 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-dialog.less
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-dialog.less
@@ -2,7 +2,7 @@
     z-index: -1;
 }
 .bootstrap-dialog {
-    /*** Icon animation* Copied from font-awesome: http://fontawesome.io; ***/
+    /*** Icon animation* Copied from font-awesome: http://fontawesome.io;
     .modal-header {
         border-top-left-radius: 4px;
         border-top-right-radius: 4px;
@@ -61,7 +61,7 @@
 }
 .bootstrap-dialog.type-warning {
     .modal-header {
-        background-color: #baa506;
+        background-color: #b82800;
     }
 }
 .bootstrap-dialog.type-danger {
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/css/bootstrap-select.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/css/bootstrap-select.css
index abc10dacb..bca678653 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/css/bootstrap-select.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/css/bootstrap-select.css
@@ -48,7 +48,7 @@ span.form-control {
 }
 .bootstrap-select .dropdown-toggle:focus {
   color:#FFFFFF !important;
-  border:1px solid #ee7822 !important;
+  border:1px solid #ee7822 !important; 
   -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);
   outline: 5px auto -webkit-focus-ring-color !important;
@@ -134,6 +134,7 @@ span.form-control {
   padding: 0;
   margin: 0;
   border-radius: 0;
+  min-width: 50px;
   -webkit-box-shadow: none;
           box-shadow: none;
 }
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/less/bootstrap-select.less b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/less/bootstrap-select.less
index 95be933ad..868f777bf 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/less/bootstrap-select.less
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select/less/bootstrap-select.less
@@ -174,6 +174,7 @@ span.form-control {
         padding: 0;
         margin: 0;
         border-radius: 0;
+        min-width: 50px;
         -webkit-box-shadow: none;
         box-shadow: none;
     }
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 ad8b95393..508ce4f7b 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: #2D2D2D !important
-  color: #ee7822 !important
+  background: #202020 !important
+  color: #ec6d12 !important
   padding-bottom: 1px !important
   padding-top: 1px !important
   padding-right: 1px !important
@@ -57,7 +57,7 @@ audio:not([controls])
   display: none
 
 a
-  color: #ee7822
+  color: #ec6d12
   text-decoration: none
   background: transparent
   outline: 0
@@ -66,7 +66,7 @@ a
     outline: 0
 
   &:hover, &:focus
-    color: #d76d20
+    color: #ec6d12
     text-decoration: underline
 
 abbr[title]
@@ -583,7 +583,7 @@ td, th
 
 .glyphicon-arrow-down:before
   content: "\e094"
-  color: #B13116 !important
+  color: #EF2A00 !important
 
 .glyphicon-share-alt:before
   content: "\e095"
@@ -1178,7 +1178,7 @@ mark, .mark
   color: inherit
 
 .text-primary
-  color: #ee7822
+  color: #ec6d12
 
 a.text-primary:hover
   color: #b85904
@@ -1209,7 +1209,7 @@ a.text-danger:hover
 
 .bg-primary
   color: #fff
-  background-color: #ee7822
+  background-color: #ec6d12
 
 a.bg-primary:hover
   background-color: #b85904
@@ -2227,10 +2227,10 @@ table
 .table-hover > tbody > tr
   >
     td.active:hover, th.active:hover
-      background-color: #ee7822
+      background-color: #ec6d12
 
   &.active:hover > td, &:hover > .active, &.active:hover > th
-    background-color: #ee7822
+    background-color: #ec6d12
 
 .table >
   thead > tr
@@ -2506,9 +2506,9 @@ select, textarea
   font-size: 14px
   line-height: 1.42857
   color: #FFF
-  background-color: #505050
+  background-color: #2a2a2a
   background-image: none
-  border: 1px solid #1d1d1d
+  border: 1px solid #5a5a5a
   border-radius: 3px
   text-overflow: ellipsis
   max-width: 348px
@@ -2525,9 +2525,9 @@ input
     font-size: 14px
     line-height: 1.42857
     color: #FFF
-    background-color: #505050
+    background-color: #2a2a2a
     background-image: none
-    border: 1px solid #1d1d1d
+    border: 1px solid #5a5a5a
     border-radius: 3px
     text-overflow: ellipsis
     max-width: 348px
@@ -2538,7 +2538,7 @@ input
 select:hover, textarea:hover
   color: #FFF
   background-color: #2a2a2a
-  border-color: #ee7822
+  border-color: #ec6d12
   outline: 0
   -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)
@@ -2547,15 +2547,15 @@ 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: #2a2a2a
-    border-color: #ee7822
+    border-color: #ec6d12
     outline: 0
     -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)
 
 select:focus, textarea:focus
   color: #FFF
-  border-color: #ee7822
-  background-color: #393939
+  border-color: #ec6d12
+  background-color: #232323
   outline: 0
   -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)
@@ -2563,8 +2563,8 @@ 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: #ee7822
-    background-color: #393939
+    border-color: #ec6d12
+    background-color: #232323
     outline: 0
     -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)
@@ -3566,7 +3566,6 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
   vertical-align: middle
   cursor: pointer
   background-image: none
-  border: 1px
   white-space: nowrap
   padding: 6px 12px
   font-size: 14px
@@ -3577,29 +3576,30 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form
   -ms-user-select: none
   user-select: none
   color: #FFFFFF
-  background-color: #505050
-  border: 1px solid #1d1d1d
+  background-color: #2a2a2a
+  border: 1px solid #5a5a5a
   outline: 0
 
   &:active, &.active
     color: #FF7D1E
     background-color: #2d2d2d
     outline: 0
-    border-color: #1d1d1d
+    border-color: #5a5a5a
     text-decoration: none
 
 .open > .btn.dropdown-toggle
   color: #FF7D1E
   background-color: #2d2d2d
   outline: 0
-  border-color: #1d1d1d
+  border-color: #5a5a5a
   text-decoration: none
 
 .btn
   &:hover, &:focus
-    background-color: #2d2d2d
-    color: #FF7D1E
+    background-color: #292929
+    color: #FFF
     text-decoration: none
+    border: 1px solid #ec6d12
 
   &:active, &.active
     background-image: none
@@ -3672,7 +3672,7 @@ fieldset[disabled] .btn
 
 .act_flush
   &:hover, &:focus
-    color: #ee7822
+    color: #fff
     background-color: #2d2d2d
     border-color: 1px solid #1d1d1d
     outline: 0
@@ -3730,13 +3730,13 @@ fieldset[disabled] .btn-default
 
   &:hover, &:focus, &:active, &.active
     color: #fff
-    background-color: #b85904
+    background-color: #292929
     border-color: 1px solid #1d1d1d
     outline: 0
 
 .open > .btn-primary.dropdown-toggle
   color: #fff
-  background-color: #b85904
+  background-color: #292929
   border-color: 1px solid #1d1d1d
   outline: 0
 
@@ -3749,37 +3749,37 @@ fieldset[disabled] .btn-default
 
 .btn-primary
   &.disabled
-    background-color: #ee7822
+    background-color: #ec6d12
     border-color: #323232
     outline: 0
 
     &:hover, &:focus, &:active, &.active
-      background-color: #ee7822
+      background-color: #ec6d12
       border-color: #323232
       outline: 0
 
   &[disabled]
-    background-color: #ee7822
+    background-color: #ec6d12
     border-color: #323232
     outline: 0
 
     &:hover, &:focus, &:active, &.active
-      background-color: #ee7822
+      background-color: #ec6d12
       border-color: #323232
       outline: 0
 
 fieldset[disabled] .btn-primary
-  background-color: #ee7822
+  background-color: #ec6d12
   border-color: #323232
   outline: 0
 
   &:hover, &:focus, &:active, &.active
-    background-color: #ee7822
+    background-color: #ec6d12
     border-color: #323232
     outline: 0
 
 .btn-primary .badge
-  color: #ee7822
+  color: #ec6d12
   background-color: #fff
 
 .btn-success
@@ -3899,13 +3899,13 @@ fieldset[disabled] .btn-info
 
   &:hover, &:focus, &:active, &.active
     color: #fff
-    background-color: #b85904
-    border-color: #1d1d1d
+    background-color: #292929
+    border: 1px solid #ec6d12
 
 .open > .btn-warning.dropdown-toggle
   color: #fff
-  background-color: #b85904
-  border-color: #1d1d1d
+  background-color: #292929
+  border: 1px solid #ec6d12
 
 .btn-warning
   &:active, &.active
@@ -3995,7 +3995,7 @@ fieldset[disabled] .btn-danger
   background-color: #fff
 
 .btn-link
-  color: #ee7822
+  color: #ec6d12
   font-weight: normal
   cursor: pointer
   border-radius: 0
@@ -4121,7 +4121,7 @@ tbody.collapse.in
   list-style: none
   font-size: 14px
   text-align: left
-  background-color: #424242
+  background-color: #2a2a2a
   border: 1px solid #575757
   border: 1px solid rgba(87, 87, 87, 1)
   border-radius: 3px
@@ -4154,19 +4154,19 @@ tbody.collapse.in
       &:hover, &:focus
         text-decoration: none
         color: #FFFFFF
-        background-color: #ee7822
+        background-color: #ec6d12
 
     .active > a
       color: #fff
       text-decoration: none
       outline: 0
-      background-color: #ee7822
+      background-color: #ec6d12
 
       &:hover, &:focus
         color: #fff
         text-decoration: none
         outline: 0
-        background-color: #ee7822
+        background-color: #ec6d12
 
     .disabled > a
       color: #777777
@@ -4331,7 +4331,7 @@ tbody.collapse.in
       outline: 0
       color: #FFFFFF
       background-color: #2a2a2a
-      border-color: #ee7822
+      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)
 
@@ -4339,7 +4339,7 @@ tbody.collapse.in
     outline: 0
     color: #FFFFFF
     background-color: #2a2a2a
-    border-color: #ee7822
+    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)
 
@@ -4623,16 +4623,19 @@ tbody.collapse.in
       position: relative
       display: block
       padding: 10px 15px
-      background-color: #424242
-      color: #FFF
-      border: 1px solid #2d2d2d
+      background-color: #3e3e3e
+      color: #929292
+      border-left: 1px solid #565656
+      border-right: 1px solid #565656
+      border-top: 1px solid #565656
+      border-bottom: 1px solid #565656
 
     &#menu_messages
       > a
         position: relative
         display: block
         padding: none
-        color: #ee7822
+        color: #ec6d12
         background-color: transparent
         border: none
 
@@ -4643,8 +4646,7 @@ tbody.collapse.in
       &:hover, &:focus
         text-decoration: none
         background-color: #2d2d2d
-        color: #ee7822
-        border-bottom: 1px solid #2d2d2d
+        color: #ec6d12
 
 a:focus
   text-decoration: underline
@@ -4686,7 +4688,6 @@ a:focus
     > a
       margin-right: 2px
       line-height: 1.42857
-      border: 1px solid #6c6c6c
       border-radius: 3px 3px 0 0
       cursor: pointer
 
@@ -4694,15 +4695,15 @@ a:focus
         border-color: #4e4e4e #4e4e4e #4e4e4e
 
     &.active > a
-      color: #ee7822
-      background-color: #393939
+      color: #ec6d12
+      background-color: #2a2a2a
       border: 1px solid #6b6a6a
       border-bottom-color: transparent
       cursor: pointer
 
       &:hover, &:focus
-        color: #ee7822
-        background-color: #393939
+        color: #ec6d12
+        background-color: #2a2a2a
         border: 1px solid #6b6a6a
         border-bottom-color: transparent
         cursor: pointer
@@ -4715,11 +4716,11 @@ a:focus
 
   &.active > a
     color: #fff
-    background-color: #ee7822
+    background-color: #ec6d12
 
     &:hover, &:focus
       color: #fff
-      background-color: #ee7822
+      background-color: #ec6d12
 
 .nav-stacked > li
   float: none
@@ -4785,7 +4786,6 @@ a:focus
   position: relative
   min-height: 50px
   margin-bottom: 0
-  border: 1px solid transparent
 
   &:before
     content: " "
@@ -5087,7 +5087,7 @@ a:focus
       color: #F7F7F7
 
       &:hover, &:focus
-        color: #ee7822
+        color: #ec6d12
         background-color: transparent
 
     .active > a
@@ -5127,13 +5127,13 @@ a:focus
     color: #F7F7F7
 
     &:hover
-      color: #ee7822
+      color: #ec6d12
 
   .btn-link
     color: #F7F7F7
 
     &:hover, &:focus
-      color: #ee7822
+      color: #ec6d12
 
     &[disabled]
       &:hover, &:focus
@@ -5145,7 +5145,7 @@ a:focus
       color: #F7F7F7
 
       &:hover, &:focus
-        color: #ee7822
+        color: #ec6d12
         background-color: transparent
 
     .active > a
@@ -5335,41 +5335,41 @@ fieldset[disabled] .navbar-inverse .btn-link
         a
           &:hover, &:focus
             color: #FFFFFF
-            background-color: #ee7822
+            background-color: #ec6d12
             border-color: #303030
 
         span
           &:hover, &:focus
             color: #FFFFFF
-            background-color: #ee7822
+            background-color: #ec6d12
             border-color: #303030
 
     .active >
       a
         z-index: 2
         color: #FFFFFF
-        background-color: #ee7822
+        background-color: #ec6d12
         border-color: #1d1d1d
         cursor: default
 
         &:hover, &:focus
           z-index: 2
           color: #FFFFFF
-          background-color: #ee7822
+          background-color: #ec6d12
           border-color: #1d1d1d
           cursor: default
 
       span
         z-index: 2
         color: #FFFFFF
-        background-color: #ee7822
+        background-color: #ec6d12
         border-color: #1d1d1d
         cursor: default
 
         &:hover, &:focus
           z-index: 2
           color: #FFFFFF
-          background-color: #ee7822
+          background-color: #ec6d12
           border-color: #1d1d1d
           cursor: default
 
@@ -5519,7 +5519,7 @@ a.label
       border-color: #323232
 
 .label-primary
-  background-color: #ee7822
+  background-color: #ec6d12
 
   &[href]
     &:hover, &:focus
@@ -5551,7 +5551,7 @@ a.label
       border-color: #323232
 
 .label-danger
-  background-color: #B13116
+  background-color: #CE2804
 
   &[href]
     &:hover, &:focus
@@ -5584,12 +5584,12 @@ a.label
   padding: 1px 5px
 
 a.list-group-item.active > .badge
-  color: #ee7822
+  color: #ec6d12
   background-color: #fff
 
 .nav-pills >
   .active > a > .badge
-    color: #ee7822
+    color: #ec6d12
     background-color: #fff
 
   li > a > .badge
@@ -5663,7 +5663,7 @@ a.badge
 
 a.thumbnail
   &:hover, &:focus, &.active
-    border-color: #ee7822
+    border-color: #ec6d12
 
 .alert
   padding: 15px
@@ -5707,8 +5707,10 @@ a.thumbnail
 
 .alert-info
   background-color: #424242
-  border-color: #605f5f
+  border-color: #515151
   color: #ffffff
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77)
 
   hr
     border-top-color: #B13116
@@ -5717,8 +5719,8 @@ a.thumbnail
     color: #B13116
 
 .alert-warning
-  background-color: #303030
-  border-color: #EE7822
+  background-color: #202020
+  border-color: #b13116
   color: #FFF
 
   hr
@@ -5728,7 +5730,7 @@ a.thumbnail
     color: #df8a13
 
 .alert-danger
-  background-color: #2d2d2d
+  background-color: #202020
   border-color: #B13116
   color: #FFFFFF !important
 
@@ -5769,7 +5771,7 @@ a.thumbnail
   line-height: 20px
   color: #fff
   text-align: center
-  background-color: #ee7822
+  background-color: #ec6d12
   position: relative
   z-index: 2
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15)
@@ -5822,7 +5824,7 @@ a.thumbnail
   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-warning
-  background-color: #c86710
+  background-color: #CCB717
   color: #FFFFFF !important
 
 .progress-striped .progress-bar-warning
@@ -5831,7 +5833,7 @@ a.thumbnail
   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-danger
-  background-color: #F05050
+  background-color: #cf3624
 
 .progress-striped .progress-bar-danger
   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)
@@ -5877,7 +5879,7 @@ a.thumbnail
   display: block
   padding: 6px 8px
   margin-bottom: -1px
-  background-color: #4E4E4E
+  background-color: #3E3E3E
 
   &:last-child
     margin-bottom: 0
@@ -5898,8 +5900,8 @@ a.list-group-item
 
   &:hover, &:focus
     text-decoration: none
-    color: #ee7822
-    background-color: #2d2d2d
+    color: #ec6d12
+    background-color: #2a2a2a
 
   &:hover:before, &:focus:before
     background: #FFFFFF
@@ -5932,7 +5934,7 @@ a.list-group-item
       z-index: 2
 
     &:before, &:hover:before, &:focus:before
-      background: #ee7822
+      background: #ec6d12
       content: ""
       height: 42px
       left: 0
@@ -5965,7 +5967,7 @@ a.list-group-item
       color: #fedcbd
 
     + .collapse > .list-group-item:before, &:hover + .collapse > .list-group-item:before, &:focus + .collapse > .list-group-item:before
-      background: #ee7822
+      background: #ec6d12
       content: ""
       height: 42px
       left: 0
@@ -6079,11 +6081,6 @@ a.list-group-item-danger
 
 .panel
   margin-bottom: 20px
-  background-color: #fff
-  border: 1px solid transparent
-  border-radius: 3px
-  -webkit-box-shadow: 0 1px 1px rgb(41, 41, 41)
-  box-shadow: 0 1px 1px rgb(41, 41, 41)
 
 .panel-body
   padding: 15px
@@ -6100,7 +6097,7 @@ a.list-group-item-danger
 
 .panel-heading
   padding: 10px 15px
-  border-bottom: 1px solid transparent
+  border-bottom: 1px solid #515151
   border-top-right-radius: 2px
   border-top-left-radius: 2px
   background-color: #2D2D2D !important
@@ -6350,40 +6347,39 @@ a.list-group-item-danger
       border-bottom: 1px solid #ddd
 
 .panel-default
-  border-color: #6c6c6c
+  border: 1px solid #515151
 
   >
     .panel-heading
       color: #fff
-      border-color: #6c6c6c
+      border-color: #515151
 
       + .panel-collapse > .panel-body
-        border-top-color: #6c6c6c
+        border-top-color: #515151
 
       .badge
         color: #f5f5f5
         background-color: #2d2d2d333
 
     .panel-footer + .panel-collapse > .panel-body
-      border-bottom-color: #6c6c6c
+      border-bottom-color: #515151
 
 .panel-primary
-  border-color: #6c6c6c
+  border: 1px solid #515151
 
   >
     .panel-heading
       color: #fff
-      border-color: #6c6c6c
 
       + .panel-collapse > .panel-body
-        border-top-color: #ee7822
+        border-top-color: #ec6d12
 
       .badge
-        color: #ee7822
+        color: #ec6d12
         background-color: #fff
 
     .panel-footer + .panel-collapse > .panel-body
-      border-bottom-color: #ee7822
+      border-bottom-color: #ec6d12
 
 .panel-success
   border-color: #9BD275
@@ -6514,7 +6510,7 @@ a.list-group-item-danger
   filter: alpha(opacity = 100)
 
   &:hover, &:focus
-    color: #ee7822
+    color: #B0B0B0
     text-decoration: none
     cursor: pointer
     opacity: 1
@@ -6614,8 +6610,8 @@ button.close
 
   .table-hover > tbody > tr:hover >
     td, th
-      background-color: #2d2d2d
-      color: #ee7822
+      background-color: #2a2a2a
+      color: #ec6d12
 
 .modal-footer
   padding: 5px
@@ -7284,9 +7280,9 @@ body
   left: 0
   position: fixed
   width: 100%
-  border-bottom: 1px solid #292929
+  border-bottom: 1px solid #171717
   z-index: 2
-  background-color: #333
+  background-color: #202020
 
 .page-content
   height: calc(100% - 52px)
@@ -7298,13 +7294,22 @@ body
     height: 100%
 
 .page-content-head
-  border-bottom: 1px solid #323232
-  background: #3e3e3e
+  .container-fluid
+    background-color: #393939
+    margin-left: 20px
+    margin-right: 20px
+    border: 1px solid #515151
+    border-radius: 3px
+    min-height: 38px
+    height: auto
+    padding: 10px 20px 10px 20px
+    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77)
+    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77)
+
   padding-bottom: 15px
   padding-top: 20px
 
 .content-box-head
-  background: #3e3e3e
   padding-bottom: 15px
   padding-top: 20px
 
@@ -7312,17 +7317,14 @@ body
   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
-  line-height: 1
   margin: 0
 
 .page-content-main
-  background: #303030
   min-height: calc(100% - 64px)
   padding: 15px 0 73px
 
 .page-side
-  background: #393939
-  border-right: 1px solid #323232
+  background: #202020
   height: 100% !important
   height: calc(100% - 52px) !important
   left: 0
@@ -7334,15 +7336,14 @@ body
 
 .page-side-nav--active
   background: #F7F7F7
-  border-left: 3px solid #ee7822
+  border-left: 3px solid #ec6d12
 
 .page-foot
-  background: #303030
   bottom: 0
   border: none
   font-size: 12px
   padding: 20px 0
-  position: fixed
+  position: static
   width: 100%
   z-index: 2
 
@@ -7350,7 +7351,9 @@ body
   padding: 0px 0px
   margin: 0px 0px
   background: #3e3e3e
-  border: 1px solid #565656
+  border: 1px solid #515151
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77)
 
   hr
     border: none
@@ -7399,7 +7402,7 @@ body
     padding-top: 0 !important
 
 .page-login
-  background: #292929
+  background-color: #202020
 
   .container
     min-height: 100%
@@ -7412,22 +7415,18 @@ body
   font-size: 12px
 
 .login-modal-container
-  background: #FFF
   border: 1px solid #686868
   max-width: 400px
   margin: 100px auto 15px auto
 
 .login-modal-head
-  background-color: #2a2a2a
   height: 75px
   padding: 0 20px
 
 .login-modal-content
   padding: 20px 20px 20px 20px
-  background-color: #2a2a2a
 
 .login-modal-foot
-  background: #F7F7F7
   border-top: 1px solid #E5E5E5
   height: 60px
   padding: 20px 20px 0 20px
@@ -7481,30 +7480,16 @@ body
     margin-right: 2px
 
     > a
-      background: #424242
       border-radius: 0px
       border-top-right-radius: 10px
       margin-right: 0px
-      background-color: #424242
-      border-right: 1px solid #6c6c6c
-      border-top: 1px solid #6c6c6c
-      border-left: 1px solid #6c6c6c
-      border-bottom: 1px solid #6c6c6c
-      border-right: 1px solid #565656
-      border-top: 1px solid #565656
-      border-left: 1px solid #565656
-      border-bottom: 1px solid none
       outline: 0
 
       &:hover, &:focus
-        border-right: 1px solid #565656
-        border-top: 1px solid #565656
-        border-left: 1px solid #565656
-        border-bottom: 1px solid none
         outline: 0
 
     &.active > a
-      background: #2d2d2d !important
+      background: #2a2a2a !important
       outline: 0
       border-right: 1px solid #565656
       border-top: 1px solid #565656
@@ -7614,7 +7599,7 @@ body
       padding-left: 44px
 
   &:before
-    background: #ee7822
+    background: #ec6d12
     content: ""
     height: 42px
     min-height: 100%
@@ -7633,22 +7618,22 @@ body
 .active-menu-title, .active-menu a
   text-decoration: none
   position: relative
-  background-color: #3e3e3e
+  background-color: #393939
 
 .active-menu-title:before, .active-menu a:before
   width: 3px
 
 .active-menu-title.active
-  background-color: #2d2d2d
-  color: #ee7822
+  background-color: #292929
+  color: #ec6d12
 
 .active-menu a
   &.active
-    background-color: #2d2d2d
-    color: #ee7822
+    background-color: #292929
+    color: #ec6d12
 
   &:before
-    background: #ee7822
+    background: #ec6d12
 
 .alert.alert-danger
   color: #FFF !important
@@ -7716,6 +7701,10 @@ select
 #grid-log th[data-column-id="__timestamp__"], #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.77)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77)
+
 @media screen and (max-width: 767px)
   .table-responsive
     margin-bottom: 0
@@ -7777,7 +7766,7 @@ textarea#update_status
     border-top: none !important
 
 .fa-toggle-off::before
-  color: #ee7822 !important
+  color: #ec6d12 !important
   outline: none !important
 
 .fa-toggle-on::before
@@ -7791,6 +7780,10 @@ textarea#update_status
   content: "\f057"
   color: #B13116
 
+.fa-refresh::before
+  content: "\f021"
+  color: #FFF
+
 .panel-heading h3:hover
   color: #FFFFFF
   text-decoration: none
@@ -7805,7 +7798,7 @@ h3
     text-decoration: underline
 
   &:hover, &:focus
-    color: #ee7822
+    color: #ec6d12
     text-decoration: underline
 
 text
@@ -7828,7 +7821,7 @@ text
   stroke: rgb(143, 143, 143) !important
 
 .table-condensed.table-hover
-  border: 1px solid #696969
+  border: 1px solid #515151
 
 ul.TokensContainer
   border-radius: 3px
@@ -7845,18 +7838,18 @@ div.Tokenize ul
       color: #FFFFFF !important
 
     &:hover, &:focus
-      border-color: #ee7822 !important
+      border-color: #ec6d12 !important
       background-color: #2a2a2a !important
       -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)
 
-    border: 1px solid #1d1d1d !important
-    background-color: #4e4e4e !important
+    border: 1px solid #5a5a5a !important
+    background-color: #2a2a2a !important
     color: #FFFFFF !important
 
   &.Dropdown
-    border: 1px solid #1d1d1d !important
-    background-color: #4e4e4e !important
+    border: 1px solid #5a5a5a !important
+    background-color: #2a2a2a !important
     color: #FFFFFF !important
 
   &.TokensContainer li
@@ -7865,7 +7858,7 @@ div.Tokenize ul
       border: 1px solid #303030 !important
 
     &.Placeholder
-      color: #777777 !important
+      color: #505050 !important
 
     &.Token a.Close
       color: #FFFFFF !important
@@ -7882,8 +7875,8 @@ div.Tokenize ul
     background-color: #4b4b4b !important
 
 .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu
-  color: #ee7822
-  background-color: #424242
+  color: #fff
+  background-color: #2a2a2a
   border-color: #1d1d1d
 
 .btn-group.bootstrap-select
@@ -7897,16 +7890,27 @@ div.Tokenize ul
     background: none !important
 
 .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus
-  color: #ee7822 !important
+  color: #FFF !important
   text-decoration: none !important
-  background-color: #2d2d2d !important
+  background-color: #ec6d12 !important
 
 .bootgrid-header .search .glyphicon, .bootgrid-footer .search .glyphicon, .input-group-addon
   top: 0
-  background-color: #ee7822 !important
-  border: 1px solid #ee7822 !important
+  background-color: #ec6d12 !important
+  border: 1px solid #ec6d12 !important
 
 .nvtooltip
   background-color: rgb(60, 60, 60) !important
   color: rgba(0, 0, 0, 1) !important
   border: 1px solid rgb(255, 127, 14) !important
+
+.glyphicon
+  &.glyphicon-play.text-muted, &.glyphicon-remove.text-muted, &.glyphicon-remove-sign.text-muted, &.glyphicon-info-sign.text-muted
+    color: #eac80a !important
+
+.fa.fa-play.text-muted::before
+  color: #eac80a !important
+
+#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
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-dialog.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-dialog.css
index 5dd3b0a0b..904b8af96 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-dialog.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-dialog.css
@@ -50,7 +50,7 @@
   background-color: #9BD275;
 }
 .bootstrap-dialog.type-warning .modal-header {
-  background-color: #baa506;
+  background-color: #b82800;
 }
 .bootstrap-dialog.type-danger .modal-header {
   background-color: #ee7822;
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select.css
index abc10dacb..bca678653 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select.css
@@ -48,7 +48,7 @@ span.form-control {
 }
 .bootstrap-select .dropdown-toggle:focus {
   color:#FFFFFF !important;
-  border:1px solid #ee7822 !important;
+  border:1px solid #ee7822 !important; 
   -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);
   outline: 5px auto -webkit-focus-ring-color !important;
@@ -134,6 +134,7 @@ span.form-control {
   padding: 0;
   margin: 0;
   border-radius: 0;
+  min-width: 50px;
   -webkit-box-shadow: none;
           box-shadow: none;
 }
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 f099b60d7..7a0a42055 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,13 +1,13 @@
 @charset "UTF-8";
 .widgetdiv .content-box-head {
-  background: #2D2D2D !important;
-  color: #ee7822 !important;
+  background: #202020 !important;
+  color: #ec6d12 !important;
   padding-bottom: 1px !important;
   padding-top: 1px !important;
   padding-right: 1px !important;
   padding-left: 5px !important;
   min-height: 25px !important; }
-
+  
   .widgetdiv .content-box-head .btn-group .btn {
     color: #FFFFFF !important;
     background: none;
@@ -66,18 +66,18 @@ template {
   display: none; }
 
 a {
-  color: #ee7822;
-  text-decoration: none;
+  color: #ec6d12;
+  text-decoration: none; 
   background: transparent;
   outline: 0;  }
 
   a:link, a:active {
-	outline: 0; }
-
+	outline: 0; } 
+  
   a:hover, a:focus {
-    color: #d76d20;
+    color: #ec6d12;
     text-decoration: underline; }
-
+  
 abbr[title] {
   border-bottom: 1px dotted; }
 
@@ -207,7 +207,7 @@ optgroup {
 
 table {
   border-collapse: collapse;
-  border-spacing: 0;
+  border-spacing: 0; 
   color: #FFFFFF;
   background-color: #3e3e3e; }
 
@@ -592,12 +592,12 @@ th {
   content: "\e092"; }
 
 .glyphicon-arrow-up:before {
-  content: "\e093";
+  content: "\e093"; 
   color: #46A50C !important; }
 
 .glyphicon-arrow-down:before {
-  content: "\e094";
-  color: #B13116 !important; }
+  content: "\e094"; 
+  color: #EF2A00 !important; }
 
 .glyphicon-share-alt:before {
   content: "\e095"; }
@@ -645,11 +645,11 @@ th {
   content: "\e112"; }
 
 .glyphicon-chevron-up:before {
-  content: "\e113";
+  content: "\e113"; 
   color:#FFFFFF !important; }
 
 .glyphicon-chevron-down:before {
-  content: "\e114";
+  content: "\e114"; 
   color:#FFFFFF !important; }
 
 .glyphicon-retweet:before {
@@ -839,7 +839,7 @@ th {
   content: "\e177"; }
 
 .glyphicon-transfer:before {
-  content: "\e178";
+  content: "\e178"; 
   color:#46a50c !important; }
 
 .glyphicon-cutlery:before {
@@ -908,7 +908,7 @@ th {
 * {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
-  box-sizing: border-box;
+  box-sizing: border-box; 
   text-decoration:none;}
 
 *:before,
@@ -991,7 +991,7 @@ hr {
   margin: 0;
   overflow: visible;
   clip: auto; }
-
+	
 
 h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
@@ -1119,7 +1119,7 @@ mark,
   color: inherit; }
 
 .text-primary {
-  color: #ee7822; }
+  color: #ec6d12; }
 
 a.text-primary:hover {
   color: #b85904; }
@@ -1152,7 +1152,7 @@ a.text-danger:hover {
   color: #fff; }
 
 .bg-primary {
-  background-color: #ee7822; }
+  background-color: #ec6d12; }
 
 a.bg-primary:hover {
   background-color: #b85904; }
@@ -2081,7 +2081,7 @@ th {
 .table-hover > tbody > tr:hover > td,
 .table-hover > tbody > tr:hover > th {
   background-color:#606060; }
-
+  
 table col[class*="col-"] {
   position: static;
   float: none;
@@ -2107,7 +2107,7 @@ table th[class*="col-"] {
 
 .table-hover > tbody > tr > td.active:hover,
 .table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr:hover > .active, .table-hover > tbody > tr.active:hover > th {
-  background-color: #ee7822; }
+  background-color: #ec6d12; }
 
 .table > thead > tr > td.success,
 .table > thead > tr > th.success, .table > thead > tr.success > td, .table > thead > tr.success > th,
@@ -2264,7 +2264,7 @@ input[type="checkbox"]:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px; }
-
+   
 
 output {
   display: block;
@@ -2297,16 +2297,16 @@ input[type="color"]
   font-size: 14px;
   line-height: 1.42857;
   color: #FFF;
-  background-color: #505050;
+  background-color: #2a2a2a;
   background-image: none;
-  border: 1px solid #1d1d1d;
+  border: 1px solid #5a5a5a;
   border-radius: 3px;
   text-overflow: ellipsis;
   max-width: 348px;
   -webkit-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
   -o-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
   transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s; }
-
+  
   select:hover,
   textarea:hover,
   input[type="text"]:hover,
@@ -2326,11 +2326,11 @@ input[type="color"]
    {
 	color: #FFF;
 	background-color: #2a2a2a;
-    border-color: #ee7822;
+    border-color: #ec6d12;
 	outline: 0;
     -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); }
-
+    box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6); }	
+	
   select:focus,
   textarea:focus,
   input[type="text"]:focus,
@@ -2347,15 +2347,15 @@ input[type="color"]
   input[type="search"]:focus,
   input[type="tel"]:focus,
   input[type="color"]:focus
-
+  
    {
     color: #FFF;
-	border-color: #ee7822;
-	background-color: #393939;
+	border-color: #ec6d12;
+	background-color: #232323;
 	outline: 0;
     -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);}
-
+	
   select::-moz-placeholder,
   textarea::-moz-placeholder,
   input[type="text"]::-moz-placeholder,
@@ -2375,7 +2375,7 @@ input[type="color"]
    {
     color: #777777;
     opacity: 1; ;}
-
+  
   select:-ms-input-placeholder,
   textarea:-ms-input-placeholder,
   input[type="text"]:-ms-input-placeholder,
@@ -2394,7 +2394,7 @@ input[type="color"]
   input[type="color"]:-ms-input-placeholder
    {
     color: #777777; }
-
+  
   select::-webkit-input-placeholder,
   textarea::-webkit-input-placeholder,
   input[type="text"]::-webkit-input-placeholder,
@@ -2413,7 +2413,7 @@ input[type="color"]
   input[type="color"]::-webkit-input-placeholder
    {
     color: #777777; }
-
+  
   select[disabled], select[readonly], fieldset[disabled] select,
   textarea[disabled],
   textarea[readonly], fieldset[disabled]
@@ -2460,7 +2460,7 @@ input[type="color"]
   input[type="color"][disabled],
   input[type="color"][readonly], fieldset[disabled]
   input[type="color"]
-
+  
    {
     cursor: not-allowed;
 	background-color: #68686899;
@@ -2513,12 +2513,12 @@ input[type="color"]
   input[type="color"][disabled]:hover,
   input[type="color"][readonly]:hover, fieldset[disabled]:hover
   input[type="color"]:hover
-
+  
    {
     cursor: not-allowed;
 	background-color: #68686899;
 	opacity: 0.8;
-	border:1px solid #ffffff4d;
+	border:1px solid #ffffff4d; 
 	-webkit-box-shadow: none;
 	box-shadow: none; }
 
@@ -2739,7 +2739,7 @@ select[multiple].input-lg,
     border-color: #7fc54f;
     -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d3ebc2;
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d3ebc2; }
-
+   
 .has-success .input-group-addon {
   color: #9BD275;
   border-color: #9BD275;
@@ -2784,7 +2784,7 @@ select[multiple].input-lg,
     border-color: #FC2E03;
     -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; }
-
+   
 .has-error .input-group-addon {
   color: #F05050;
   border-color: #F05050;
@@ -2884,7 +2884,6 @@ select[multiple].input-lg,
   vertical-align: middle;
   cursor: pointer;
   background-image: none;
-  border: 1px;
   white-space: nowrap;
   padding: 6px 12px;
   font-size: 14px;
@@ -2895,28 +2894,29 @@ select[multiple].input-lg,
   -ms-user-select: none;
   user-select: none;
   color: #FFFFFF;
-  background-color: #505050;
-  border: 1px solid #1d1d1d;
+  background-color: #2a2a2a;
+  border: 1px solid #5a5a5a;
   outline:0; }
   .btn:active, .btn.active, .open > .btn.dropdown-toggle {
    color: #FF7D1E;
     background-color: #2d2d2d;
-	outline:0;
-    border-color: #1d1d1d;
+	outline:0; 
+    border-color: #5a5a5a;
 	text-decoration: none; }
   .btn:hover, .btn:focus {
-	background-color: #2d2d2d;
-	color: #FF7D1E;
-	text-decoration: none;}
-
+	background-color: #292929;
+	color: #FFF;
+	text-decoration: none;
+	border:1px solid #ec6d12; }
+	
   .btn:active, .btn.active, .open > .btn.dropdown-toggle {
-    background-image: none;
+    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: #FFFFFF;
-    border-color: #1d1d1d;
+    border-color: #1d1d1d; 
 	outline:0; }
-
+   
   .btn .badge {
     color: #FFFFFF;
     background-color: #3e3e3e; }
@@ -2925,7 +2925,7 @@ select[multiple].input-lg,
     outline: 5px auto -webkit-focus-ring-color;
     outline-offset: -2px;
 	outline:0; }
-
+   
   .btn:active, .btn.active {
     outline: 0;  }
   .btn.disabled, .btn[disabled], fieldset[disabled] .btn {
@@ -2936,22 +2936,22 @@ select[multiple].input-lg,
     -webkit-box-shadow: none;
     box-shadow: none; }
 
-.act_flush:hover, .act_flush:focus {
-	color: #ee7822;
+.act_flush:hover, .act_flush:focus { 
+	color: #fff;
     background-color: #2d2d2d;
-    border-color: 1px solid #1d1d1d;
+    border-color: 1px solid #1d1d1d; 
 	outline:0; }
-
+	
   .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
-    background-image: none;
+    background-image: none; 
 	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;
+    border-color: 1px solid #1d1d1d; 
 	outline:0; }
   .btn-default .badge {
     color: #FFFFFF;
-    background-color: #3e3e3e;
+    background-color: #3e3e3e; 
 	outline:0; }
 
 .btn-primary {
@@ -2961,19 +2961,19 @@ select[multiple].input-lg,
   outline:0;   }
   .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
     color: #fff;
-    background-color: #b85904;
-    border-color: 1px solid #1d1d1d;
+    background-color: #292929;
+    border-color: 1px solid #1d1d1d; 
 	outline:0; }
-
+   
   .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
     background-image: none; }
   .btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled:active, .btn-primary.disabled.active, .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled]:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary, fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:active, fieldset[disabled] .btn-primary.active {
-    background-color: #ee7822;
-    border-color: #323232;
+    background-color: #ec6d12;
+    border-color: #323232; 
 	outline:0; }
-
+   
   .btn-primary .badge {
-    color: #ee7822;
+    color: #ec6d12;
     background-color: #fff; }
 
 .btn-success {
@@ -2983,15 +2983,15 @@ select[multiple].input-lg,
   .btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle {
     color: #fff;
     background-color: #7fc54f;
-    border-color: #6db53b;
+    border-color: #6db53b; 
 	outline:0; }
   .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle {
     background-image: none; }
   .btn-success.disabled, .btn-success.disabled:hover, .btn-success.disabled:focus, .btn-success.disabled:active, .btn-success.disabled.active, .btn-success[disabled], .btn-success[disabled]:hover, .btn-success[disabled]:focus, .btn-success[disabled]:active, .btn-success[disabled].active, fieldset[disabled] .btn-success, fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:focus, fieldset[disabled] .btn-success:active, fieldset[disabled] .btn-success.active {
     background-color: #9BD275;
-    border-color: #8dcc62;
+    border-color: #8dcc62; 
 	outline:0; }
-
+	
   .btn-success .badge {
     color: #9BD275;
     background-color: #fff; }
@@ -3004,13 +3004,13 @@ select[multiple].input-lg,
     color: #fff;
     background-color: #8db7cb;
     border-color: #74a7c0; }
-
+   
   .btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle {
     background-image: none; }
   .btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled], .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled]:active, .btn-info[disabled].active, fieldset[disabled] .btn-info, fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:active, fieldset[disabled] .btn-info.active {
     background-color: #B0CDDB;
     border-color: #9ec2d3; }
-
+   
   .btn-info .badge {
     color: #B0CDDB;
     background-color: #fff; }
@@ -3021,15 +3021,15 @@ select[multiple].input-lg,
   border-color: #1d1d1d; }
   .btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
     color: #fff;
-    background-color: #b85904;
-    border-color: #1d1d1d; }
-
+    background-color: #292929;
+    border: 1px solid #ec6d12; }
+   
   .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
     background-image: none; }
   .btn-warning.disabled, .btn-warning.disabled:hover, .btn-warning.disabled:focus, .btn-warning.disabled:active, .btn-warning.disabled.active, .btn-warning[disabled], .btn-warning[disabled]:hover, .btn-warning[disabled]:focus, .btn-warning[disabled]:active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning, fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:focus, fieldset[disabled] .btn-warning:active, fieldset[disabled] .btn-warning.active {
     background-color: #f0ad4e;
     border-color: #eea236; }
-
+	
   .btn-warning .badge {
     color: #f0ad4e;
     background-color: #fff; }
@@ -3052,7 +3052,7 @@ select[multiple].input-lg,
     background-color: #fff; }
 
 .btn-link {
-  color: #ee7822;
+  color: #ec6d12;
   font-weight: normal;
   cursor: pointer;
   border-radius: 0; }
@@ -3066,11 +3066,11 @@ select[multiple].input-lg,
     color: #9f4d03;
     text-decoration: underline;
     background-color: transparent; }
-
+   
   .btn-link[disabled]:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:hover, fieldset[disabled] .btn-link:focus {
     color: #777777;
     text-decoration: none; }
-
+   
 
 .btn-lg, .btn-group-lg > .btn {
   padding: 10px 16px;
@@ -3109,7 +3109,7 @@ input[type="button"].btn-block {
   transition: opacity 0.15s linear; }
   .fade.in {
     opacity: 1; }
-
+  
 
 .collapse {
   display: none; }
@@ -3142,7 +3142,7 @@ tbody.collapse.in {
 
 .dropdown {
   position: relative; }
-
+   
 
 .dropdown-toggle:focus {
   outline: 0; }
@@ -3160,7 +3160,7 @@ tbody.collapse.in {
   list-style: none;
   font-size: 14px;
   text-align: left;
-  background-color: #424242;
+  background-color: #2a2a2a;
   border: 1px solid #575757;
   border: 1px solid rgba(87, 87, 87, 1.0);
   border-radius: 3px;
@@ -3169,9 +3169,9 @@ tbody.collapse.in {
   background-clip: padding-box; }
   .dropdown-menu.pull-right {
     right: 0;
-    left: auto;
+    left: auto; 
 	background-color: #e5e5e5;}
-
+							
   .dropdown-menu .divider {
     height: 1px;
     margin: 9px 0;
@@ -3184,19 +3184,19 @@ tbody.collapse.in {
     font-weight: normal;
     line-height: 1.42857;
     color: #FFFFFF;
-    white-space: nowrap;
+    white-space: nowrap; 
 	outline:0;}
 
 .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
   text-decoration: none;
   color: #FFFFFF;
-  background-color: #ee7822; }
+  background-color: #ec6d12; }
 
 .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
   color: #fff;
   text-decoration: none;
   outline: 0;
-  background-color: #ee7822; }
+  background-color: #ec6d12; }
 
 .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
   color: #777777; }
@@ -3207,7 +3207,7 @@ tbody.collapse.in {
   background-image: none;
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   cursor: not-allowed; }
-
+  
 
 .open > .dropdown-menu {
   display: block; }
@@ -3274,7 +3274,7 @@ tbody.collapse.in {
     .btn-group-vertical > .btn:focus,
     .btn-group-vertical > .btn:active,
     .btn-group-vertical > .btn.active {
-      z-index: 2;
+      z-index: 2; 
 	  -webkit-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s !important;
 	  -o-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s !important;
 	  transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s !important; }
@@ -3336,7 +3336,7 @@ tbody.collapse.in {
   outline: 0;
   color: #FFFFFF;
   background-color: #2a2a2a;
-  border-color: #ee7822;
+  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); }
 
@@ -3545,25 +3545,28 @@ tbody.collapse.in {
     .nav > li > a {
       position: relative;
       display: block;
-      padding: 10px 15px;
-	  background-color: #424242;
-	  color:#FFF;
-	  border:1px solid #2d2d2d; }
+      padding: 10px 15px; 
+	  background-color: #3e3e3e;
+	  color:#929292;
+	  border-left: 1px solid #565656;
+	  border-right: 1px solid #565656;
+	  border-top: 1px solid #565656;
+	  border-bottom: 1px solid #565656; }
 	.nav > li#menu_messages > a {
       position: relative;
       display: block;
       padding: none;
-	  color:#ee7822;
-	  background-color:transparent;
+	  color:#ec6d12;
+	  background-color:transparent; 
 	  border:none; }
       .nav > li > a:hover, .nav > li > a:focus {
         text-decoration: none;
-        background-color: #2d2d2d;
-		color:#ee7822;
-		border-bottom: 1px solid #2d2d2d; }
+        background-color: #2d2d2d; 
+		color:#ec6d12;
+		 }
 		.nav > li#menu_messages > a:hover, a:focus {
-		text-decoration: underline; }
-
+		text-decoration: underline; } 
+					
     .nav > li.disabled > a {
       color: #777777; }
       .nav > li.disabled > a:hover, .nav > li.disabled > a:focus {
@@ -3571,11 +3574,11 @@ tbody.collapse.in {
         text-decoration: none;
         background-color: transparent;
         cursor: not-allowed; }
-
+   
   .nav .open > a, .nav .open > a:hover, .nav .open > a:focus {
     background-color: #393939;
 	cursor:pointer; }
-
+  
   .nav .nav-divider {
     height: 1px;
     margin: 9px 0;
@@ -3592,15 +3595,13 @@ tbody.collapse.in {
     .nav-tabs > li > a {
       margin-right: 2px;
       line-height: 1.42857;
-      border: 1px solid #6c6c6c;
-      border-radius: 3px 3px 0 0;
+      border-radius: 3px 3px 0 0; 
 	  cursor:pointer;}
-
       .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: #ee7822;
-      background-color: #393939;
+      color: #ec6d12;
+      background-color: #2a2a2a;
       border: 1px solid #6b6a6a;
       border-bottom-color: transparent;
       cursor: pointer; }
@@ -3611,7 +3612,7 @@ tbody.collapse.in {
     border-radius: 0; }
   .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
     color: #fff;
-    background-color: #ee7822; }
+    background-color: #ec6d12; }
 
 .nav-stacked > li {
   float: none; }
@@ -3666,15 +3667,14 @@ tbody.collapse.in {
 .nav-tabs .dropdown-menu {
   margin-top: -1px;
   border-top-right-radius: 0;
-  border-top-left-radius: 0;
+  border-top-left-radius: 0; 
   cursor:pointer;}
-
+				  
 
 .navbar {
   position: relative;
   min-height: 50px;
-  margin-bottom: 0;
-  border: 1px solid transparent; }
+  margin-bottom: 0; }
   .navbar:before, .navbar:after {
     content: " ";
     display: table; }
@@ -3781,7 +3781,7 @@ tbody.collapse.in {
   height: 50px; }
   .navbar-brand:hover, .navbar-brand:focus {
     text-decoration: none; }
-
+   
   @media (min-width: 768px) {
     .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand {
       margin-left: -20px; } }
@@ -3919,9 +3919,9 @@ tbody.collapse.in {
   .navbar-default .navbar-nav > li > a {
     color: #F7F7F7; }
     .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
-      color: #ee7822;
+      color: #ec6d12;
       background-color: transparent; }
-
+	
   .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
     color: #555;
     background-color: #2b2b2b; }
@@ -3941,9 +3941,9 @@ tbody.collapse.in {
     .navbar-default .navbar-nav .open .dropdown-menu > li > a {
       color: #F7F7F7; }
       .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-        color: #ee7822;
+        color: #ec6d12;
         background-color: transparent; }
-
+   
     .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
       color: #555;
       background-color: #2b2b2b; }
@@ -3953,11 +3953,11 @@ tbody.collapse.in {
   .navbar-default .navbar-link {
     color: #F7F7F7; }
     .navbar-default .navbar-link:hover {
-      color: #ee7822; }
+      color: #ec6d12; }
   .navbar-default .btn-link {
     color: #F7F7F7; }
     .navbar-default .btn-link:hover, .navbar-default .btn-link:focus {
-      color: #ee7822; }
+      color: #ec6d12; }
     .navbar-default .btn-link[disabled]:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:hover, fieldset[disabled] .navbar-default .btn-link:focus {
       color: #ccc; }
 
@@ -3969,7 +3969,7 @@ tbody.collapse.in {
     .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus {
       color: #fff;
       background-color: transparent; }
-
+	  
   .navbar-inverse .navbar-text {
     color: #777777; }
   .navbar-inverse .navbar-nav > li > a {
@@ -3987,7 +3987,7 @@ tbody.collapse.in {
     border-color: #2d2d2d; }
     .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
       background-color: #2d2d2d; }
-
+	
     .navbar-inverse .navbar-toggle .icon-bar {
       background-color: #fff; }
   .navbar-inverse .navbar-collapse,
@@ -4006,15 +4006,15 @@ tbody.collapse.in {
       .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
         color: #fff;
         background-color: transparent; }
-
+   
     .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
       color: #fff;
       background-color: #090909; }
-
+	
     .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
       color: #3e3e3e;
       background-color: transparent; } }
-
+	  
   .navbar-inverse .navbar-link {
     color: #777777; }
     .navbar-inverse .navbar-link:hover {
@@ -4023,10 +4023,10 @@ tbody.collapse.in {
     color: #777777; }
     .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus {
       color: #fff; }
-
+	
     .navbar-inverse .btn-link[disabled]:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:hover, fieldset[disabled] .navbar-inverse .btn-link:focus {
       color: #3e3e3e; }
-
+	
 
 .breadcrumb {
   padding: 8px 15px;
@@ -4060,9 +4060,9 @@ tbody.collapse.in {
       color: #FFFFFF;
       background-color: #505050;
       border: 1px solid #303030;
-      margin-left: -1px;
+      margin-left: -1px; 
 	  cursor: pointer; }
-
+					 
     .pagination > li:first-child > a,
     .pagination > li:first-child > span {
       margin-left: 0;
@@ -4076,19 +4076,19 @@ tbody.collapse.in {
   .pagination > li > span:hover,
   .pagination > li > span:focus {
     color: #FFFFFF;
-    background-color: #ee7822;
+    background-color: #ec6d12;
     border-color: #303030; }
-
+  
   .pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus,
   .pagination > .active > span,
   .pagination > .active > span:hover,
   .pagination > .active > span:focus {
     z-index: 2;
     color: #FFFFFF;
-    background-color: #ee7822;
+    background-color: #ec6d12;
     border-color: #1d1d1d;
     cursor: default; }
-
+  
   .pagination > .disabled > span,
   .pagination > .disabled > span:hover,
   .pagination > .disabled > span:focus,
@@ -4099,7 +4099,7 @@ tbody.collapse.in {
     background-color: #eee;
     border-color: #1d1d1d;
     cursor: not-allowed; }
-
+  
 
 .pagination-lg > li > a,
 .pagination-lg > li > span {
@@ -4150,7 +4150,7 @@ tbody.collapse.in {
     .pager li > a:focus {
       text-decoration: none;
       background-color: #eeeeee; }
-
+	
   .pager .next > a,
   .pager .next > span {
     float: right; }
@@ -4164,7 +4164,7 @@ tbody.collapse.in {
     color: #777777;
     background-color: #fff;
     cursor: not-allowed; }
-
+  
 
 .label {
   display: inline;
@@ -4187,49 +4187,49 @@ a.label:hover, a.label:focus {
   color: #fff;
   text-decoration: none;
   cursor: pointer; }
-
+   
 
 .label-default {
   background-color: #777777; }
   .label-default[href]:hover, .label-default[href]:focus {
     background-color: #5e5e5e;
 	border-color: #323232;}
-
+   
 
 .label-primary {
-  background-color: #ee7822; }
+  background-color: #ec6d12; }
   .label-primary[href]:hover, .label-primary[href]:focus {
     background-color: #b85904; }
-
+   
 
 .label-success {
-  background-color: #46A50C;
+  background-color: #46A50C; 
   border-color: #323232;}
   .label-success[href]:hover, .label-success[href]:focus {
     background-color: #7fc54f;
 	border-color: #323232;	}
-
+   
 
 .label-info {
   background-color: #B0CDDB; }
   .label-info[href]:hover, .label-info[href]:focus {
     background-color: #8db7cb;
 	border-color: #323232;	}
-
+   
 
 .label-warning {
   background-color: #f0ad4e; }
   .label-warning[href]:hover, .label-warning[href]:focus {
-    background-color: #ec971f;
+    background-color: #ec971f; 
 	border-color: #323232;}
-
+   
 
 .label-danger {
-  background-color: #B13116; }
+  background-color: #CE2804; }
   .label-danger[href]:hover, .label-danger[href]:focus {
-    background-color: #ec2121;
+    background-color: #ec2121; 
 	border-color: #323232;}
-
+   
 
 .badge {
   display: inline-block;
@@ -4253,7 +4253,7 @@ a.label:hover, a.label:focus {
     top: 0;
     padding: 1px 5px; }
   a.list-group-item.active > .badge, .nav-pills > .active > a > .badge {
-    color: #ee7822;
+    color: #ec6d12;
     background-color: #fff; }
   .nav-pills > li > a > .badge {
     margin-left: 3px; }
@@ -4262,7 +4262,7 @@ a.badge:hover, a.badge:focus {
   color: #fff;
   text-decoration: none;
   cursor: pointer; }
-
+	
 
 .jumbotron {
   padding: 30px;
@@ -4319,8 +4319,8 @@ a.badge:hover, a.badge:focus {
 a.thumbnail:hover,
 a.thumbnail:focus,
 a.thumbnail.active {
-  border-color: #ee7822; }
-
+  border-color: #ec6d12; }
+	
 
 .alert {
   padding: 15px;
@@ -4359,16 +4359,18 @@ a.thumbnail.active {
 
 .alert-info {
 	background-color: #424242;
-	border-color: #605f5f;
-    color: #ffffff; }
+	border-color: #515151;
+    color: #ffffff; 
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77); }
   .alert-info hr {
     border-top-color: #B13116; }
   .alert-info .alert-link {
     color: #B13116; }
 
 .alert-warning {
-    background-color: #303030;
-    border-color: #EE7822;
+    background-color: #202020;
+    border-color: #b13116;
 	color: #FFF; }
   .alert-warning hr {
     border-top-color: #f7e1b5; }
@@ -4376,7 +4378,7 @@ a.thumbnail.active {
     color: #df8a13; }
 
 .alert-danger {
-  background-color: #2d2d2d;
+  background-color: #202020;
   border-color: #B13116;
   color: #FFFFFF !important;}
   .alert-danger hr {
@@ -4411,7 +4413,7 @@ a.thumbnail.active {
   line-height: 20px;
   color: #fff;
   text-align: center;
-  background-color: #ee7822;
+  background-color: #ec6d12;
   position: relative;
   z-index: 2;
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
@@ -4457,7 +4459,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-warning {
-  background-color: #c86710;
+  background-color: #CCB717;
   color: #FFFFFF !important; }
   .progress-striped .progress-bar-warning {
     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);
@@ -4465,7 +4467,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-danger {
-  background-color: #F05050; }
+  background-color: #cf3624; }
   .progress-striped .progress-bar-danger {
     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);
@@ -4507,7 +4509,7 @@ a.thumbnail.active {
   display: block;
   padding: 6px 8px;
   margin-bottom: -1px;
-  background-color: #4E4E4E; }
+  background-color: #3E3E3E; }
   .list-group-item:last-child {
     margin-bottom: 0; }
   .list-group-item > .badge {
@@ -4517,16 +4519,16 @@ a.thumbnail.active {
 
 a.list-group-item {
   color: #FFFFFF;
-  border-radius: 0;
+  border-radius: 0; 
   outline:0; }
-
+  
   a.list-group-item .list-group-item-heading {
     color: #2d2d2d; }
   a.list-group-item:hover, a.list-group-item:focus {
     text-decoration: none;
-    color: #ee7822;
-    background-color: #2d2d2d; }
-
+    color: #ec6d12;
+    background-color: #2a2a2a; }
+  
     a.list-group-item:hover:before, a.list-group-item:focus:before {
       background: #FFFFFF;
       content: "";
@@ -4539,24 +4541,24 @@ a.list-group-item {
 .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus {
   background-color: #eeeeee;
   color: #777777; }
-
+	
   .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, .list-group-item.disabled:focus .list-group-item-heading {
     color: inherit; }
-
+   
   .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text {
     color: #777777; }
-
+   
 .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: #ee7822;
+    background: #ec6d12;
     content: "";
     height: 42px;
     left: 0;
     position: absolute;
     top: 0px;
     width: 3px; }
-
+  
   .list-group-item.active .list-group-item-heading,
   .list-group-item.active .list-group-item-heading > small,
   .list-group-item.active .list-group-item-heading > .small, .list-group-item.active:hover .list-group-item-heading,
@@ -4568,7 +4570,7 @@ a.list-group-item {
   .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text {
     color: #fedcbd; }
   .list-group-item.active + .collapse > .list-group-item:before, .list-group-item.active:hover + .collapse > .list-group-item:before, .list-group-item.active:focus + .collapse > .list-group-item:before {
-    background: #ee7822;
+    background: #ec6d12;
     content: "";
     height: 42px;
     left: 0;
@@ -4649,17 +4651,12 @@ a.list-group-item-danger {
   line-height: 1.3; }
 
 .panel {
-  margin-bottom: 20px;
-  background-color: #fff;
-  border: 1px solid transparent;
-  border-radius: 3px;
-  -webkit-box-shadow: 0 1px 1px rgb(41, 41, 41);
-  box-shadow: 0 1px 1px rgb(41, 41, 41); }
+  margin-bottom: 20px; }
 
 .panel-body {
   padding: 15px;
   background-color: #3c3c3c;}
-
+							 
   .panel-body:before, .panel-body:after {
     content: " ";
     display: table; }
@@ -4668,11 +4665,11 @@ a.list-group-item-danger {
 
 .panel-heading {
   padding: 10px 15px;
-  border-bottom: 1px solid transparent;
+  border-bottom: 1px solid #515151;
   border-top-right-radius: 2px;
-  border-top-left-radius: 2px;
+  border-top-left-radius: 2px; 
   background-color: #2D2D2D !important; }
-
+ 
   .panel-heading > .dropdown .dropdown-toggle {
     color: inherit; }
 
@@ -4829,30 +4826,29 @@ a.list-group-item-danger {
       border-bottom: 1px solid #ddd; }
 
 .panel-default {
-  border-color: #6c6c6c; }
+  border: 1px solid #515151; }
   .panel-default > .panel-heading {
 	color: #fff;
-	border-color: #6c6c6c; }
+	border-color: #515151; }
     .panel-default > .panel-heading + .panel-collapse > .panel-body {
-      border-top-color: #6c6c6c; }
+      border-top-color: #515151; }
     .panel-default > .panel-heading .badge {
       color: #f5f5f5;
       background-color: #2d2d2d333; }
   .panel-default > .panel-footer + .panel-collapse > .panel-body {
-    border-bottom-color: #6c6c6c; }
+    border-bottom-color: #515151; }
 
 .panel-primary {
-  border-color: #6c6c6c; }
+  border: 1px solid #515151; }
   .panel-primary > .panel-heading {
-    color: #fff;
-    border-color: #6c6c6c; }
+    color: #fff; }
     .panel-primary > .panel-heading + .panel-collapse > .panel-body {
-      border-top-color: #ee7822; }
+      border-top-color: #ec6d12; }
     .panel-primary > .panel-heading .badge {
-      color: #ee7822;
+      color: #ec6d12;
       background-color: #fff; }
   .panel-primary > .panel-footer + .panel-collapse > .panel-body {
-    border-bottom-color: #ee7822; }
+    border-bottom-color: #ec6d12; }
 
 .panel-success {
   border-color: #9BD275; }
@@ -4961,7 +4957,7 @@ a.list-group-item-danger {
   opacity: 1;
   filter: alpha(opacity=100); }
   .close:hover, .close:focus {
-    color: #ee7822;
+    color: #B0B0B0;
     text-decoration: none;
     cursor: pointer;
     opacity: 1;
@@ -5006,7 +5002,7 @@ button.close {
 .modal-dialog {
   position: relative;
   width: auto;
-  margin: 62px 10px 10px 10px;
+  margin: 62px 10px 10px 10px; 
   border: 1px solid #303030;}
 
 .modal-content {
@@ -5056,8 +5052,8 @@ button.close {
   background-color: inherit; }
 .modal-body .table-hover > tbody > tr:hover > td,
 .modal-body .table-hover > tbody > tr:hover > th {
-  background-color: #2d2d2d;
-  color:#ee7822; }
+  background-color: #2a2a2a; 
+  color:#ec6d12; }
 
 .modal-footer {
   padding: 5px;
@@ -5478,7 +5474,7 @@ button.close {
   display: none !important; }
 
 .show {
-  display: block !important;
+  display: block !important; 
   color:#FFFFFF;}
 
 .invisible {
@@ -5688,9 +5684,9 @@ body {
   left: 0;
   position: fixed;
   width: 100%;
-  border-bottom: 1px solid #292929;
-  z-index: 2;
-  background-color:#333;}
+  border-bottom: 1px solid #171717;
+  z-index: 2; 
+  background-color:#202020;}
 
 .page-content {
   height: calc(100% - 52px);
@@ -5699,26 +5695,31 @@ body {
   z-index: 1; }
   .page-content > .row {
     height: 100%; }
-.page-content-head {
-border-bottom: 1px solid #323232; }
+.page-content-head .container-fluid {
+    background-color: #393939;
+    margin-left: 20px;
+    margin-right: 20px;
+    border: 1px solid #515151;
+    border-radius: 3px;
+    min-height: 38px;
+	height: auto;
+    padding: 10px 20px 10px 20px;
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77); }
 .page-content-head, .content-box-head {
-  background: #3e3e3e;
   padding-bottom: 15px;
   padding-top: 20px; }
   .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 {
-    line-height: 1;
     margin: 0; }
 
 .page-content-main {
-  background: #303030;
   min-height: calc(100% - 64px);
   padding: 15px 0 73px; }
 
 .page-side {
-  background: #393939;
-  border-right: 1px solid #323232;
+  background: #202020;
   height: 100% !important;
   height: calc(100% - 52px) !important;
   left: 0;
@@ -5730,30 +5731,31 @@ border-bottom: 1px solid #323232; }
 
 .page-side-nav--active {
   background: #F7F7F7;
-  border-left: 3px solid #ee7822; }
+  border-left: 3px solid #ec6d12; }
 
 .page-foot {
-  background: #303030;
   bottom: 0;
   border:none;
   font-size: 12px;
   padding: 20px 0;
-  position: fixed;
+  position: static;
   width: 100%;
   z-index: 2; }
-
+ 
 .content-box {
-  padding: 0px 0px;
+  padding: 0px 0px; 
   margin: 0px 0px;
   background: #3e3e3e;
-  border: 1px solid #565656; }
+  border: 1px solid #515151;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77);  }
 .content-box hr {
 	border:none; }
   .content-box-main {
     padding-bottom: 15px;
     padding-top: 15px; }
 .tab-content {
-   padding: 0px 0px;
+   padding: 0px 0px; 
    margin: 0px 0px; }
   .tab-content > .tab-content {
     padding: 0 15px; }
@@ -5788,7 +5790,7 @@ border-bottom: 1px solid #323232; }
     padding-top: 0 !important; } }
 
 .page-login {
-  background: #292929; }
+  background-color:#202020; }
   .page-login .container {
     min-height: 100%;
     margin-bottom: -60px; }
@@ -5799,19 +5801,15 @@ border-bottom: 1px solid #323232; }
   font-size: 12px; }
 
 .login-modal-container {
-  background: #FFF;
   border: 1px solid #686868;
   max-width: 400px;
   margin: 100px auto 15px auto; }
 .login-modal-head {
-  background-color: #2a2a2a;
   height: 75px;
   padding: 0 20px; }
 .login-modal-content {
-  padding: 20px 20px 20px 20px;
-  background-color: #2a2a2a; }
+  padding: 20px 20px 20px 20px; }
 .login-modal-foot {
-  background: #F7F7F7;
   border-top: 1px solid #E5E5E5;
   height: 60px;
   padding: 20px 20px 0 20px; }
@@ -5862,27 +5860,16 @@ border-bottom: 1px solid #323232; }
   margin-right: 2px; }
 
 .nav-tabs > li > a {
-  background: #424242;
   border-radius: 0px;
   border-top-right-radius: 10px;
-  margin-right: 0px;
-  background-color: #424242;
-  border-right: 1px solid #6c6c6c;
-  border-top: 1px solid #6c6c6c;
-  border-left: 1px solid #6c6c6c;
-  border-bottom: 1px solid #6c6c6c; }
-
+  margin-right: 0px;  }
 .nav-tabs > li > a,
 .nav-tabs > li > a:hover,
 .nav-tabs > li > a:focus {
-  border-right: 1px solid #565656;
-  border-top: 1px solid #565656;
-  border-left: 1px solid #565656;
-  border-bottom: 1px solid none;
   outline:0; }
 
 .nav-tabs > li.active > a {
-  background: #2d2d2d !important;
+  background: #2a2a2a !important; 
   outline:0; }
 
 .nav-tabs > li.active > a,
@@ -5979,7 +5966,7 @@ padding-right: 15px; }
   .list-group-item + div > a {
     padding-left: 44px; }
   .list-group-item:before {
-    background: #ee7822;
+    background: #ec6d12;
     content: "";
     height: 42px;
     min-height: 100%;
@@ -5994,19 +5981,19 @@ padding-right: 15px; }
 
 .list-group-submenu a {
   padding-left: 56px; }
-
+ 
 .active-menu-title, .active-menu a {
   text-decoration: none;
   position: relative;
-  background-color: #3e3e3e; }
+  background-color: #393939; }
   .active-menu-title:before, .active-menu a:before {
     width: 3px; }
   .active-menu-title.active, .active-menu a.active {
-    background-color: #2d2d2d;
-	color: #ee7822; }
+    background-color: #292929; 
+	color: #ec6d12; }
 
 .active-menu a:before {
-  background: #ee7822; }
+  background: #ec6d12; }
 
 .alert.alert-danger {
   color: #FFF !important; }
@@ -6023,17 +6010,17 @@ padding-right: 15px; }
   vertical-align: middle;
   font-size: 12px;
   line-height: 1.5;
-  border-radius: 3px;
+  border-radius: 3px; 
   border-color: #323232;}
 
 .label-opnsense-sm {
   /* emulates btn-sm */
-  padding: 5px 10px;
+  padding: 5px 10px; 
   border-color: #323232;}
 
 .label-opnsense-xs {
   /* emulates btn-xs */
-  padding: 1px 5px;
+  padding: 1px 5px; 
   border-color: #323232;}
 
 ::-webkit-scrollbar {
@@ -6059,7 +6046,7 @@ padding-right: 15px; }
 .widgetdiv {
   padding-top: 0px !important;
   padding-bottom: 20px; }
-
+							
 
 select {
   overflow: hidden;
@@ -6075,6 +6062,9 @@ select {
 #grid-log th[data-column-id="__timestamp__"],
 #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.77);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77); }
 
 @media screen and (max-width: 767px) {
   .table-responsive {
@@ -6105,7 +6095,7 @@ label > input[type="radio"] {
 #log-settings select#filterlogentriesinterfaces {
   min-width: 100%;
   max-width: 100%; }
-
+  
   /*****************************************
   ******************************************
   **additional extensions for theme-cicada**
@@ -6117,13 +6107,13 @@ label > input[type="radio"] {
 
 textarea#update_status, textarea#update_status:hover {
 	color:inherit !important;
-	background-color:none !important;
+	background-color:none !important; 
 	-webkit-box-shadow:none !important;
 	box-shadow:none !important;
 	border-top:none !important; }
 
 .fa-toggle-off::before {
-  color:#ee7822 !important;
+  color:#ec6d12 !important;
   outline:none !important; }
 
 .fa-toggle-on::before {
@@ -6135,20 +6125,22 @@ textarea#update_status, textarea#update_status:hover {
 .fa-times-circle::before {
     content: "\f057";
     color: #B13116; }
-
+.fa-refresh::before {
+    content: "\f021";
+    color: #FFF; }
 .panel-heading h3:hover, h3:focus {color: #FFFFFF;
 	text-decoration: none; }
 
 h3:link {color:#FFFFFF;text-decoration: underline;}
-
-h3:hover, h3:focus {color: #ee7822;
+	
+h3:hover, h3:focus {color: #ec6d12;
 	text-decoration: underline; }
-
+	
 text.nvd3 {
 	   fill:#FFFFFF; }
 text.nv-axislabel, text.nv-legend-text {
 	   fill:#FFFFFF; }
-
+	   
 .nvd3 .nv-axis {
     fill: #FFFFFF; }
 .nv-series-0 {
@@ -6162,12 +6154,12 @@ text.nv-axislabel, text.nv-legend-text {
 stroke-width: 1 !important;
 fill: rgb(143, 143, 143) !important;
 stroke: rgb(143, 143, 143) !important; }
-
+	
 .table-condensed.table-hover {
-	border: 1px solid #696969; }
-
+	border: 1px solid #515151; }
+	
 ul.TokensContainer {
-	border-radius: 3px;
+	border-radius: 3px; 
 	-webkit-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
 	-o-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
 	transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s; }
@@ -6176,54 +6168,57 @@ ul.TokensContainer li.Token, div.Tokenize ul.TokensContainer li.TokenSearch {
 	color:#FFFFFF !important; }
 
 div.Tokenize ul.TokensContainer:hover, div.Tokenize ul.TokensContainer:focus {
-	border-color:#ee7822 !important;
-	background-color:#2a2a2a !important;
+	border-color:#ec6d12 !important;
+	background-color:#2a2a2a !important; 
 	-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); }
 
 div.Tokenize ul.TokensContainer, div.Tokenize ul.Dropdown {
-	border: 1px solid #1d1d1d !important;
-	background-color: #4e4e4e !important;
+	border: 1px solid #5a5a5a !important;
+	background-color: #2a2a2a !important;
 	color:#FFFFFF !important; }
 div.Tokenize ul.TokensContainer li.Token {
-	background-color: #ce671c !important;
+	background-color: #ce671c !important; 
 	border: 1px solid #303030 !important; }
-
+	
 div.Tokenize ul.TokensContainer li.Placeholder {
-	color:#777777 !important; }
+	color:#505050 !important; }
 
 div.Tokenize ul.TokensContainer li.Token a.Close {
 	color:#FFFFFF !important; }
-
+	
 .bootgrid-table th > .column-header-anchor, .bootgrid-table th > .column-header-anchor > .icon, .bootgrid-table th > .column-header-anchor > .glyphicon {
 	color: #fff !important; }
 .bootgrid-table th:hover {
 	background-color:#4b4b4b !important; }
 
 .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu {
-	color: #ee7822;
-	background-color: #424242;
+	color: #fff;
+	background-color: #2a2a2a;
 	border-color: #1d1d1d; }
 
 .btn-group.bootstrap-select.open, .btn-group.bootstrap-select:hover {
 	border-color: #323232 !important;
-	color:#FFFFFF !important;
-	background-color: #2d2d2d !important; }
-
+	color:#FFFFFF !important; 
+	background-color: #2d2d2d !important; } 
+ 
 .bootgrid-table td.loading, .bootgrid-table td.no-results {
 	background:none !important; }
-
+ 
 .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus {
-    color:#ee7822 !important;
-    text-decoration:none !important;
-	background-color:#2d2d2d !important; }
+	color: #FFF !important;
+	text-decoration: none !important;
+	background-color: #ec6d12 !important; }
 
 .bootgrid-header .search .glyphicon, .bootgrid-footer .search .glyphicon,.input-group-addon {
     top: 0;
-    background-color: #ee7822 !important;
-	border: 1px solid #ee7822 !important; }
+    background-color: #ec6d12 !important;
+	border: 1px solid #ec6d12 !important; }
 .nvtooltip {
 	background-color: rgb(60, 60, 60) !important;
 	color: rgba(0,0,0,1.0) !important;
 	border: 1px solid rgb(255, 127, 14) !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-play.text-muted::before {
+	color: #eac80a !important;}
+#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; }
\ No newline at end of file
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/images/caret.png b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/images/caret.png
index fc281036f..eade468d7 100644
Binary files a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/images/caret.png and b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/images/caret.png differ