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 508ce4f7b..a46113e84 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
@@ -194,7 +194,7 @@ optgroup
   font-weight: bold
 
 table
-  border-collapse: collapse
+  border-collapse: none
   border-spacing: 0
   color: #FFFFFF
   background-color: #3e3e3e
@@ -2125,18 +2125,21 @@ th
         border-top: 0
         font-family: 'SourceSansProSemibold'
         font-weight: normal
+        border-bottom: 1px solid #515151
 
     colgroup + thead > tr:first-child >
       th, td
         border-top: 0
         font-family: 'SourceSansProSemibold'
         font-weight: normal
+        border-bottom: 1px solid #515151
 
     thead:first-child > tr:first-child >
       th, td
         border-top: 0
         font-family: 'SourceSansProSemibold'
         font-weight: normal
+        border-bottom: 1px solid #515151
 
     tbody + tbody
       border-top: 2px solid #eee
@@ -2487,7 +2490,7 @@ select
 
 input
   &[type="file"]:focus, &[type="radio"]:focus, &[type="checkbox"]:focus
-    outline: thin dotted
+    outline: none
     outline: 5px auto -webkit-focus-ring-color
     outline-offset: -2px
 
@@ -2540,8 +2543,6 @@ select:hover, textarea:hover
   background-color: #2a2a2a
   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)
 
 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
@@ -2549,16 +2550,12 @@ input
     background-color: #2a2a2a
     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: #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)
 
 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
@@ -2566,17 +2563,17 @@ input
     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
   color: #777777
   opacity: 1
+  filter: alpha(opacity = 100)
 
 input
   &[type="text"]::-moz-placeholder, &[type="password"]::-moz-placeholder, &[type="datetime"]::-moz-placeholder, &[type="datetime-local"]::-moz-placeholder, &[type="date"]::-moz-placeholder, &[type="month"]::-moz-placeholder, &[type="time"]::-moz-placeholder, &[type="week"]::-moz-placeholder, &[type="number"]::-moz-placeholder, &[type="email"]::-moz-placeholder, &[type="url"]::-moz-placeholder, &[type="search"]::-moz-placeholder, &[type="tel"]::-moz-placeholder, &[type="color"]::-moz-placeholder
     color: #777777
     opacity: 1
+    filter: alpha(opacity = 100)
 
 select:-ms-input-placeholder, textarea:-ms-input-placeholder
   color: #777777
@@ -2597,12 +2594,14 @@ select
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] select
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 textarea
@@ -2610,12 +2609,14 @@ textarea
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] textarea
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="text"]
@@ -2623,12 +2624,14 @@ input[type="text"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="text"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="password"]
@@ -2636,12 +2639,14 @@ input[type="password"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="password"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="datetime"]
@@ -2649,12 +2654,14 @@ input[type="datetime"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="datetime"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="datetime-local"]
@@ -2662,12 +2669,14 @@ input[type="datetime-local"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="datetime-local"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="date"]
@@ -2675,12 +2684,14 @@ input[type="date"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="date"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="month"]
@@ -2688,12 +2699,14 @@ input[type="month"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="month"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="time"]
@@ -2701,12 +2714,14 @@ input[type="time"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="time"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="week"]
@@ -2714,12 +2729,14 @@ input[type="week"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="week"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="number"]
@@ -2727,12 +2744,14 @@ input[type="number"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="number"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="email"]
@@ -2740,12 +2759,14 @@ input[type="email"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="email"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="url"]
@@ -2753,12 +2774,14 @@ input[type="url"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="url"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="search"]
@@ -2766,12 +2789,14 @@ input[type="search"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="search"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="tel"]
@@ -2779,12 +2804,14 @@ input[type="tel"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="tel"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 input[type="color"]
@@ -2792,12 +2819,14 @@ input[type="color"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border-color: #ffffff4d
 
 fieldset[disabled] input[type="color"]
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border-color: #ffffff4d
 
 select
@@ -2805,6 +2834,7 @@ select
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2813,6 +2843,7 @@ fieldset[disabled]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2822,6 +2853,7 @@ textarea
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2830,6 +2862,7 @@ fieldset[disabled]:hover textarea:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2839,6 +2872,7 @@ input[type="text"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2847,6 +2881,7 @@ fieldset[disabled]:hover input[type="text"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2856,6 +2891,7 @@ input[type="password"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2864,6 +2900,7 @@ fieldset[disabled]:hover input[type="password"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2873,6 +2910,7 @@ input[type="datetime"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2881,6 +2919,7 @@ fieldset[disabled]:hover input[type="datetime"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2890,6 +2929,7 @@ input[type="datetime-local"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2898,6 +2938,7 @@ fieldset[disabled]:hover input[type="datetime-local"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2907,6 +2948,7 @@ input[type="date"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2915,6 +2957,7 @@ fieldset[disabled]:hover input[type="date"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2924,6 +2967,7 @@ input[type="month"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2932,6 +2976,7 @@ fieldset[disabled]:hover input[type="month"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2941,6 +2986,7 @@ input[type="time"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2949,6 +2995,7 @@ fieldset[disabled]:hover input[type="time"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2958,6 +3005,7 @@ input[type="week"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2966,6 +3014,7 @@ fieldset[disabled]:hover input[type="week"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2975,6 +3024,7 @@ input[type="number"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -2983,6 +3033,7 @@ fieldset[disabled]:hover input[type="number"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -2992,6 +3043,7 @@ input[type="email"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -3000,6 +3052,7 @@ fieldset[disabled]:hover input[type="email"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -3009,6 +3062,7 @@ input[type="url"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -3017,6 +3071,7 @@ fieldset[disabled]:hover input[type="url"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -3026,6 +3081,7 @@ input[type="search"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -3034,6 +3090,7 @@ fieldset[disabled]:hover input[type="search"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -3043,6 +3100,7 @@ input[type="tel"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -3051,6 +3109,7 @@ fieldset[disabled]:hover input[type="tel"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -3060,6 +3119,7 @@ input[type="color"]
     cursor: not-allowed
     background-color: #68686899
     opacity: 0.8
+    filter: alpha(opacity = 80)
     border: 1px solid #ffffff4d
     -webkit-box-shadow: none
     box-shadow: none
@@ -3068,6 +3128,7 @@ fieldset[disabled]:hover input[type="color"]:hover
   cursor: not-allowed
   background-color: #68686899
   opacity: 0.8
+  filter: alpha(opacity = 80)
   border: 1px solid #ffffff4d
   -webkit-box-shadow: none
   box-shadow: none
@@ -4065,12 +4126,14 @@ input
 
 .fade
   opacity: 0
+  filter: alpha(opacity = 0)
   -webkit-transition: opacity 0.15s linear
   -o-transition: opacity 0.15s linear
   transition: opacity 0.15s linear
 
   &.in
     opacity: 1
+    filter: alpha(opacity = 100)
 
 .collapse
   display: none
@@ -4122,8 +4185,9 @@ tbody.collapse.in
   font-size: 14px
   text-align: left
   background-color: #2a2a2a
-  border: 1px solid #575757
-  border: 1px solid rgba(87, 87, 87, 1)
+  border-left: 1px solid #575757
+  border-right: 1px solid #575757
+  border-bottom: 1px solid #575757
   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)
@@ -4630,23 +4694,35 @@ tbody.collapse.in
       border-top: 1px solid #565656
       border-bottom: 1px solid #565656
 
-    &#menu_messages
-      > a
-        position: relative
-        display: block
-        padding: none
-        color: #ec6d12
-        background-color: transparent
-        border: none
-
-      > a:hover
-        text-decoration: underline
+.nav-tabs > li > a
+  position: relative
+  display: block
+  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
-      &:hover, &:focus
-        text-decoration: none
-        background-color: #2d2d2d
-        color: #ec6d12
+      position: relative
+      display: block
+      padding: none
+      color: #ec6d12
+      background-color: transparent
+      border: none
+
+    > a:hover
+      text-decoration: underline
+
+  > a
+    &:hover, &:focus
+      text-decoration: none
+      background-color: #2d2d2d
+      color: #ec6d12
 
 a:focus
   text-decoration: underline
@@ -4776,6 +4852,11 @@ a:focus
   .active
     display: block
 
+.tab-pane .content-box
+  border: none !important
+  box-shadow: none
+  -webkit-box-shadow: none
+
 .nav-tabs .dropdown-menu
   margin-top: -1px
   border-top-right-radius: 0
@@ -5709,8 +5790,8 @@ a.thumbnail
   background-color: #424242
   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)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
   hr
     border-top-color: #B13116
@@ -5816,7 +5897,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-info
-  background-color: #038CCF
+  background-color: #CF5203
 
 .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)
@@ -6080,7 +6161,10 @@ a.list-group-item-danger
   line-height: 1.3
 
 .panel
+  border: 1px solid #515151
   margin-bottom: 20px
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
 .panel-body
   padding: 15px
@@ -6346,40 +6430,34 @@ a.list-group-item-danger
     + .panel-collapse .panel-body
       border-bottom: 1px solid #ddd
 
-.panel-default
-  border: 1px solid #515151
+.panel-default >
+  .panel-heading
+    color: #fff
+    border-color: #515151
 
-  >
-    .panel-heading
-      color: #fff
-      border-color: #515151
+    + .panel-collapse > .panel-body
+      border-top-color: #515151
 
-      + .panel-collapse > .panel-body
-        border-top-color: #515151
+    .badge
+      color: #f5f5f5
+      background-color: #2d2d2d333
 
-      .badge
-        color: #f5f5f5
-        background-color: #2d2d2d333
+  .panel-footer + .panel-collapse > .panel-body
+    border-bottom-color: #515151
 
-    .panel-footer + .panel-collapse > .panel-body
-      border-bottom-color: #515151
+.panel-primary >
+  .panel-heading
+    color: #fff
 
-.panel-primary
-  border: 1px solid #515151
+    + .panel-collapse > .panel-body
+      border-top-color: #ec6d12
 
-  >
-    .panel-heading
-      color: #fff
+    .badge
+      color: #ec6d12
+      background-color: #fff
 
-      + .panel-collapse > .panel-body
-        border-top-color: #ec6d12
-
-      .badge
-        color: #ec6d12
-        background-color: #fff
-
-    .panel-footer + .panel-collapse > .panel-body
-      border-bottom-color: #ec6d12
+  .panel-footer + .panel-collapse > .panel-body
+    border-bottom-color: #ec6d12
 
 .panel-success
   border-color: #9BD275
@@ -6772,10 +6850,10 @@ button.close
   background-color: #fff
   background-clip: padding-box
   border: 1px solid #ccc
-  border: 1px solid rgba(0, 0, 0, 0.2)
+  border: 1px solid rgba(0, 0, 0, 0.3)
   border-radius: 6px
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
   white-space: normal
 
   &.top
@@ -7303,8 +7381,8 @@ body
     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)
+    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
   padding-bottom: 15px
   padding-top: 20px
@@ -7343,17 +7421,16 @@ body
   border: none
   font-size: 12px
   padding: 20px 0
-  position: static
   width: 100%
   z-index: 2
 
 .content-box
   padding: 0px 0px
   margin: 0px 0px
-  background: #3e3e3e
+  background: none
   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)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
   hr
     border: none
@@ -7689,7 +7766,7 @@ body
 
 select
   overflow: hidden
-  border: 1px solid #1d1d1d
+  border: 1px solid #5a5a5a
   -webkit-appearance: none
   -moz-appearance: none
   appearance: none
@@ -7702,8 +7779,8 @@ select
   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)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
 @media screen and (max-width: 767px)
   .table-responsive
@@ -7756,14 +7833,14 @@ textarea#update_status
   background-color: none !important
   -webkit-box-shadow: none !important
   box-shadow: none !important
-  border-top: none !important
+  border: none !important
 
   &:hover
     color: inherit !important
     background-color: none !important
     -webkit-box-shadow: none !important
     box-shadow: none !important
-    border-top: none !important
+    border: none !important
 
 .fa-toggle-off::before
   color: #ec6d12 !important
@@ -7784,6 +7861,18 @@ textarea#update_status
   content: "\f021"
   color: #FFF
 
+.fa-question-circle::before
+  content: "\f059"
+  cursor: pointer
+  color: #ec6d12
+
+#totals .fa-search::before
+  color: #FFF !important
+  background-color: #ec6d12
+  padding: 5px
+  border-radius: 4px
+  border: 1px solid #5A5A5A
+
 .panel-heading h3:hover
   color: #FFFFFF
   text-decoration: none
@@ -7911,6 +8000,9 @@ div.Tokenize ul
 .fa.fa-play.text-muted::before
   color: #eac80a !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
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 2f0adc667..542006f99 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
@@ -206,7 +206,7 @@ optgroup {
   font-weight: bold; }
 
 table {
-  border-collapse: collapse;
+  border-collapse: none;
   border-spacing: 0;
   color: #FFFFFF;
   background-color: #3e3e3e; }
@@ -2047,7 +2047,8 @@ th {
   .table > thead:first-child > tr:first-child > td {
     border-top: 0;
     font-family: 'SourceSansProSemibold';
-    font-weight: normal; }
+    font-weight: normal;
+	border-bottom: 1px solid #515151; }
   .table > tbody + tbody {
     border-top: 2px solid #eee; }
   .table .table {
@@ -2261,7 +2262,7 @@ select[size] {
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
-  outline: thin dotted;
+  outline: none;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px; }
 
@@ -2327,9 +2328,7 @@ input[type="color"]
 	color: #FFF;
 	background-color: #2a2a2a;
     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); }
+	outline: 0; }
 
   select:focus,
   textarea:focus,
@@ -2352,9 +2351,7 @@ input[type="color"]
     color: #FFF;
 	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);}
+	outline: 0; }
 
   select::-moz-placeholder,
   textarea::-moz-placeholder,
@@ -2374,7 +2371,8 @@ input[type="color"]
   input[type="color"]::-moz-placeholder
    {
     color: #777777;
-    opacity: 1; ;}
+    opacity: 1;
+	filter: alpha(opacity=100); }
 
   select:-ms-input-placeholder,
   textarea:-ms-input-placeholder,
@@ -2465,6 +2463,7 @@ input[type="color"]
     cursor: not-allowed;
 	background-color: #68686899;
 	opacity: 0.8;
+	filter: alpha(opacity=80);
 	border-color: #ffffff4d; }
 
   select[disabled]:hover, select[readonly]:hover, fieldset[disabled]:hover,
@@ -2518,6 +2517,7 @@ input[type="color"]
     cursor: not-allowed;
 	background-color: #68686899;
 	opacity: 0.8;
+	filter: alpha(opacity=80);
 	border:1px solid #ffffff4d;
 	-webkit-box-shadow: none;
 	box-shadow: none; }
@@ -3104,11 +3104,12 @@ input[type="button"].btn-block {
 
 .fade {
   opacity: 0;
+  filter: alpha(opacity=0);
   -webkit-transition: opacity 0.15s linear;
   -o-transition: opacity 0.15s linear;
   transition: opacity 0.15s linear; }
   .fade.in {
-    opacity: 1; }
+    opacity: 1; filter: alpha(opacity=100);}
 
 
 .collapse {
@@ -3161,8 +3162,9 @@ tbody.collapse.in {
   font-size: 14px;
   text-align: left;
   background-color: #2a2a2a;
-  border: 1px solid #575757;
-  border: 1px solid rgba(87, 87, 87, 1.0);
+  border-left: 1px solid #575757;
+  border-right: 1px solid #575757;
+  border-bottom: 1px solid #575757;
   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);
@@ -3542,7 +3544,7 @@ tbody.collapse.in {
   .nav > li {
     position: relative;
     display: block; }
-    .nav > li > a {
+    .nav > li > a, .nav-tabs > li > a {
       position: relative;
       display: block;
       padding: 10px 15px;
@@ -3664,6 +3666,11 @@ tbody.collapse.in {
 .tab-content > .active {
   display: block; }
 
+.tab-pane .content-box {
+  border:none !important;
+  box-shadow: none;
+ -webkit-box-shadow: none; }
+
 .nav-tabs .dropdown-menu {
   margin-top: -1px;
   border-top-right-radius: 0;
@@ -4361,8 +4368,8 @@ a.thumbnail.active {
 	background-color: #424242;
 	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); }
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
   .alert-info hr {
     border-top-color: #B13116; }
   .alert-info .alert-link {
@@ -4452,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-info {
-  background-color: #038CCF; }
+  background-color: #CF5203; }
   .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);
@@ -4651,6 +4658,7 @@ a.list-group-item-danger {
   line-height: 1.3; }
 
 .panel {
+  border: 1px solid #515151;
   margin-bottom: 20px; }
 
 .panel-body {
@@ -4824,9 +4832,9 @@ a.list-group-item-danger {
     border-top: 0; }
     .panel-group .panel-footer + .panel-collapse .panel-body {
       border-bottom: 1px solid #ddd; }
-
-.panel-default {
-  border: 1px solid #515151; }
+  .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); }
   .panel-default > .panel-heading {
 	color: #fff;
 	border-color: #515151; }
@@ -4837,9 +4845,9 @@ a.list-group-item-danger {
       background-color: #2d2d2d333; }
   .panel-default > .panel-footer + .panel-collapse > .panel-body {
     border-bottom-color: #515151; }
-
-.panel-primary {
-  border: 1px solid #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); }
   .panel-primary > .panel-heading {
     color: #fff; }
     .panel-primary > .panel-heading + .panel-collapse > .panel-body {
@@ -5192,10 +5200,10 @@ button.close {
   background-color: #fff;
   background-clip: padding-box;
   border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
+  border: 1px solid rgba(0, 0, 0, 0.30);
   border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
   white-space: normal; }
   .popover.top {
     margin-top: -10px; }
@@ -5704,8 +5712,8 @@ body {
     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); }
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 .page-content-head, .content-box-head {
   padding-bottom: 15px;
   padding-top: 20px; }
@@ -5738,17 +5746,17 @@ body {
   border:none;
   font-size: 12px;
   padding: 20px 0;
-  position: static;
   width: 100%;
   z-index: 2; }
 
 .content-box {
   padding: 0px 0px;
   margin: 0px 0px;
-  background: #3e3e3e;
+  background: none;
   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);  }
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);  }
+
 .content-box hr {
 	border:none; }
   .content-box-main {
@@ -6063,8 +6071,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.77);
-	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.77); }
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 
 @media screen and (max-width: 767px) {
   .table-responsive {
@@ -6110,7 +6118,7 @@ textarea#update_status, textarea#update_status:hover {
 	background-color:none !important;
 	-webkit-box-shadow:none !important;
 	box-shadow:none !important;
-	border-top:none !important; }
+	border:none !important; }
 
 .fa-toggle-off::before {
   color:#ec6d12 !important;
@@ -6128,6 +6136,18 @@ textarea#update_status, textarea#update_status:hover {
 .fa-refresh::before {
     content: "\f021";
     color: #FFF; }
+.fa-question-circle::before {
+    content: "\f059";
+    cursor: pointer;
+    color: #ec6d12;
+}
+#totals .fa-search::before {
+    color: #FFF !important;
+	background-color: #ec6d12;
+	padding: 5px;
+	border-radius: 4px;
+	border: 1px solid #5A5A5A;
+}
 .panel-heading h3:hover, h3:focus {color: #FFFFFF;
 	text-decoration: none; }
 
@@ -6221,4 +6241,5 @@ div.Tokenize ul.TokensContainer li.Token a.Close {
 }
 .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;}
+#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; }
diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile
index 96ea16d15..54b24142d 100644
--- a/misc/theme-tukan/Makefile
+++ b/misc/theme-tukan/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-tukan
-PLUGIN_VERSION=		0.1
+PLUGIN_VERSION=		0.2
 PLUGIN_COMMENT=		The tukan theme - blue/white
 PLUGIN_MAINTAINER=	martin@team-rebellion.net
 PLUGIN_DEVEL=		yes
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
index 6950eab99..182bd383a 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
@@ -3,7 +3,6 @@
 .widgetdiv .content-box-head
   background: #30596f !important
   color: #FFF !important
-  border: 1px solid #fff
   padding-bottom: 1px !important
   padding-top: 1px !important
   padding-right: 1px !important
@@ -195,14 +194,13 @@ optgroup
   font-weight: bold
 
 table
-  border-collapse: collapse
+  border-collapse: none
   border-spacing: 0
   color: #000
   background-color: #F0F0F0
 
 td, th
   padding: 0
-  border-bottom: 1px solid #e3e3e3
 
 @media print
   *
@@ -2103,18 +2101,21 @@ th
         padding: 10px 0px 10px 20px
         line-height: 1.42857
         vertical-align: top
+        border-top: 1px solid #e3e3e3
 
     tbody > tr >
       th, td
         padding: 10px 0px 10px 20px
         line-height: 1.42857
         vertical-align: top
+        border-top: 1px solid #e3e3e3
 
     tfoot > tr >
       th, td
         padding: 10px 0px 10px 20px
         line-height: 1.42857
         vertical-align: top
+        border-top: 1px solid #e3e3e3
 
     thead > tr > th
       vertical-align: bottom
@@ -2871,6 +2872,8 @@ select
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover
   cursor: not-allowed
@@ -2878,6 +2881,8 @@ fieldset[disabled]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 textarea
   &[disabled]:hover, &[readonly]:hover
@@ -2886,6 +2891,8 @@ textarea
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover textarea:hover
   cursor: not-allowed
@@ -2893,6 +2900,8 @@ fieldset[disabled]:hover textarea:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="text"]
   &[disabled]:hover, &[readonly]:hover
@@ -2901,6 +2910,8 @@ input[type="text"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="text"]:hover
   cursor: not-allowed
@@ -2908,6 +2919,8 @@ fieldset[disabled]:hover input[type="text"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="password"]
   &[disabled]:hover, &[readonly]:hover
@@ -2916,6 +2929,8 @@ input[type="password"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="password"]:hover
   cursor: not-allowed
@@ -2923,6 +2938,8 @@ fieldset[disabled]:hover input[type="password"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="datetime"]
   &[disabled]:hover, &[readonly]:hover
@@ -2931,6 +2948,8 @@ input[type="datetime"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="datetime"]:hover
   cursor: not-allowed
@@ -2938,6 +2957,8 @@ fieldset[disabled]:hover input[type="datetime"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="datetime-local"]
   &[disabled]:hover, &[readonly]:hover
@@ -2946,6 +2967,8 @@ input[type="datetime-local"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="datetime-local"]:hover
   cursor: not-allowed
@@ -2953,6 +2976,8 @@ fieldset[disabled]:hover input[type="datetime-local"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="date"]
   &[disabled]:hover, &[readonly]:hover
@@ -2961,6 +2986,8 @@ input[type="date"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="date"]:hover
   cursor: not-allowed
@@ -2968,6 +2995,8 @@ fieldset[disabled]:hover input[type="date"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="month"]
   &[disabled]:hover, &[readonly]:hover
@@ -2976,6 +3005,8 @@ input[type="month"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="month"]:hover
   cursor: not-allowed
@@ -2983,6 +3014,8 @@ fieldset[disabled]:hover input[type="month"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="time"]
   &[disabled]:hover, &[readonly]:hover
@@ -2991,6 +3024,8 @@ input[type="time"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="time"]:hover
   cursor: not-allowed
@@ -2998,6 +3033,8 @@ fieldset[disabled]:hover input[type="time"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="week"]
   &[disabled]:hover, &[readonly]:hover
@@ -3006,6 +3043,8 @@ input[type="week"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="week"]:hover
   cursor: not-allowed
@@ -3013,6 +3052,8 @@ fieldset[disabled]:hover input[type="week"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="number"]
   &[disabled]:hover, &[readonly]:hover
@@ -3021,6 +3062,8 @@ input[type="number"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="number"]:hover
   cursor: not-allowed
@@ -3028,6 +3071,8 @@ fieldset[disabled]:hover input[type="number"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="email"]
   &[disabled]:hover, &[readonly]:hover
@@ -3036,6 +3081,8 @@ input[type="email"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="email"]:hover
   cursor: not-allowed
@@ -3043,6 +3090,8 @@ fieldset[disabled]:hover input[type="email"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="url"]
   &[disabled]:hover, &[readonly]:hover
@@ -3051,6 +3100,8 @@ input[type="url"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="url"]:hover
   cursor: not-allowed
@@ -3058,6 +3109,8 @@ fieldset[disabled]:hover input[type="url"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="search"]
   &[disabled]:hover, &[readonly]:hover
@@ -3066,6 +3119,8 @@ input[type="search"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="search"]:hover
   cursor: not-allowed
@@ -3073,6 +3128,8 @@ fieldset[disabled]:hover input[type="search"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="tel"]
   &[disabled]:hover, &[readonly]:hover
@@ -3081,6 +3138,8 @@ input[type="tel"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="tel"]:hover
   cursor: not-allowed
@@ -3088,6 +3147,8 @@ fieldset[disabled]:hover input[type="tel"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 input[type="color"]
   &[disabled]:hover, &[readonly]:hover
@@ -3096,6 +3157,8 @@ input[type="color"]
     color: #a8a8a8
     opacity: 1.0
     filter: alpha(opacity = 100)
+    -webkit-box-shadow: none
+    box-shadow: none
 
 fieldset[disabled]:hover input[type="color"]:hover
   cursor: not-allowed
@@ -3103,6 +3166,8 @@ fieldset[disabled]:hover input[type="color"]:hover
   color: #a8a8a8
   opacity: 1.0
   filter: alpha(opacity = 100)
+  -webkit-box-shadow: none
+  box-shadow: none
 
 textarea
   height: auto
@@ -3598,7 +3663,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
@@ -4069,10 +4133,9 @@ fieldset[disabled] .btn-link
     text-decoration: none
 
 .btn-lg, .btn-group-lg > .btn
-  padding: 10px 16px
+  padding: 9px 12px
   font-size: 18px
   line-height: 1.33
-  border-radius: 6px
 
 .btn-sm, .btn-group-sm > .btn
   padding: 5px 10px
@@ -4106,7 +4169,7 @@ input
 
   &.in
     opacity: 1
-    filter: alpha(opacity = 10)
+    filter: alpha(opacity = 100)
 
 .collapse
   display: none
@@ -4825,6 +4888,11 @@ a:focus
   .active
     display: block
 
+.tab-pane .content-box
+  border: none !important
+  box-shadow: none
+  -webkit-box-shadow: none
+
 .nav-tabs .dropdown-menu
   margin-top: -1px
   border-top-right-radius: 0
@@ -5712,10 +5780,10 @@ a.thumbnail
 .alert
   padding: 15px
   margin-bottom: 20px
-  border: 1px solid transparent
+  border: 1px solid #c2c2c2
   border-radius: 3px
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
   h4
     margin-top: 0
@@ -5763,9 +5831,9 @@ a.thumbnail
     color: #DA4829
 
 .alert-warning
-  background-color: #202020
-  border-color: #b13116
-  color: #FFF
+  background-color: #fff
+  border: 1px solid #d12d0a
+  color: #000
 
   hr
     border-top-color: #f7e1b5
@@ -6124,12 +6192,10 @@ a.list-group-item-danger
   line-height: 1.3
 
 .panel
+  border: 1px solid #c2c2c2
   margin-bottom: 20px
-  background-color: #fff
-  border: 1px solid transparent
-  border-radius: 3px
-  -webkit-box-shadow: 0 3px 3px rgba(42, 42, 42, 0.1)
-  box-shadow: 0 3px 3px rgba(42, 42, 42, 0.1)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
 .panel-body
   padding: 15px
@@ -6146,7 +6212,7 @@ a.list-group-item-danger
 
 .panel-heading
   padding: 10px 15px
-  border-bottom: 1px solid transparent
+  border-bottom: 1px solid #c2c2c2
   border-top-right-radius: 2px
   border-top-left-radius: 2px
   background-color: #30596f
@@ -6395,41 +6461,35 @@ a.list-group-item-danger
     + .panel-collapse .panel-body
       border-bottom: 1px solid #ddd
 
-.panel-default
-  border-color: #c2c2c2
+.panel-default >
+  .panel-heading
+    color: #fff
+    border-color: #c2c2c2
 
-  >
-    .panel-heading
-      color: #fff
-      border-color: #c2c2c2
+    + .panel-collapse > .panel-body
+      border-top-color: #c2c2c2
 
-      + .panel-collapse > .panel-body
-        border-top-color: #c2c2c2
+    .badge
+      color: #f5f5f5
+      background-color: #2d2d2d333
 
-      .badge
-        color: #f5f5f5
-        background-color: #2d2d2d333
+  .panel-footer + .panel-collapse > .panel-body
+    border-bottom-color: #c2c2c2
 
-    .panel-footer + .panel-collapse > .panel-body
-      border-bottom-color: #c2c2c2
+.panel-primary >
+  .panel-heading
+    color: #FFF
+    border-color: #c2c2c2
 
-.panel-primary
-  border-color: #c2c2c2
+    + .panel-collapse > .panel-body
+      border-top-color: #FF8B00
 
-  >
-    .panel-heading
-      color: #FFF
-      border-color: #c2c2c2
+    .badge
+      color: #FF8B00
+      background-color: #fff
 
-      + .panel-collapse > .panel-body
-        border-top-color: #FF8B00
-
-      .badge
-        color: #FF8B00
-        background-color: #fff
-
-    .panel-footer + .panel-collapse > .panel-body
-      border-bottom-color: #FF8B00
+  .panel-footer + .panel-collapse > .panel-body
+    border-bottom-color: #FF8B00
 
 .panel-success
   border-color: #9BD275
@@ -6823,10 +6883,10 @@ button.close
   background-color: #fff
   background-clip: padding-box
   border: 1px solid #ccc
-  border: 1px solid rgba(0, 0, 0, 0.2)
+  border: 1px solid rgba(0, 0, 0, 0.3)
   border-radius: 6px
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
   white-space: normal
 
   &.top
@@ -7356,8 +7416,8 @@ body
     min-height: 38px
     height: auto
     padding: 10px 20px 10px 20px
-    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
-    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.27)
+    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
   background: #FFF
   padding-bottom: 15px
@@ -7398,7 +7458,6 @@ body
   border-left: 3px solid #FF8B00
 
 .page-foot
-  position: static
   bottom: 0
   border: none
   font-size: 12px
@@ -7411,8 +7470,8 @@ body
   margin: 0px 0px
   background: none
   border: 1px solid #c2c2c2
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
   hr
     border: none
@@ -7776,8 +7835,8 @@ option
   min-width: 3.5em
 
 #grid-top
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2)
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3)
 
 @media screen and (max-width: 767px)
   .table-responsive
@@ -7825,17 +7884,15 @@ label > input
 
 textarea#update_status
   color: inherit !important
-  background-color: none !important
   -webkit-box-shadow: none !important
   box-shadow: none !important
-  border-top: none !important
+  border: none !important
 
   &:hover
     color: inherit !important
-    background-color: none !important
     -webkit-box-shadow: none !important
     box-shadow: none !important
-    border-top: none !important
+    border: none !important
 
 .fa-toggle-off::before
   color: #FF8B00 !important
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
index b0023ede1..aedc98d9f 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
@@ -2,7 +2,6 @@
 .widgetdiv .content-box-head {
   background: #30596f !important;
   color: #FFF !important;
-  border: 1px solid #fff;
   padding-bottom: 1px !important;
   padding-top: 1px !important;
   padding-right: 1px !important;
@@ -207,15 +206,14 @@ optgroup {
   font-weight: bold; }
 
 table {
-  border-collapse: collapse;
+  border-collapse: none;
   border-spacing: 0;
   color: #000;
   background-color: #F0F0F0; }
 
 td,
 th {
-  padding: 0;
-  border-bottom: 1px solid #e3e3e3; }
+  padding: 0;  }
 
 @media print {
   * {
@@ -2037,7 +2035,8 @@ th {
   .table > tfoot > tr > td {
     padding: 10px 0px 10px 20px;
     line-height: 1.42857;
-    vertical-align: top; }
+    vertical-align: top;
+	border-top: 1px solid #e3e3e3; }
   .table > thead > tr > th {
     vertical-align: bottom;
     border-bottom: 1px solid #bababa4d; }
@@ -2522,7 +2521,8 @@ input[type="color"]
 	color:#a8a8a8;
 	opacity: 1.0;
 	filter: alpha(opacity=100);
- }
+	-webkit-box-shadow: none;
+	box-shadow: none; }
 
 textarea {
   height: auto; }
@@ -2886,7 +2886,6 @@ select[multiple].input-lg,
   vertical-align: middle;
   cursor: pointer;
   background-image: none;
-  border: 1px;
   white-space: nowrap;
   padding: 6px 12px;
   font-size: 14px;
@@ -3077,10 +3076,9 @@ select[multiple].input-lg,
 
 
 .btn-lg, .btn-group-lg > .btn {
-  padding: 10px 16px;
+  padding: 9px 12px;
   font-size: 18px;
-  line-height: 1.33;
-  border-radius: 6px; }
+  line-height: 1.33; }
 
 .btn-sm, .btn-group-sm > .btn {
   padding: 5px 10px;
@@ -3113,7 +3111,7 @@ input[type="button"].btn-block {
   -o-transition: opacity 0.15s linear;
   transition: opacity 0.15s linear; }
   .fade.in {
-    opacity: 1; filter: alpha(opacity=10); }
+    opacity: 1; filter: alpha(opacity=100); }
 
 
 .collapse {
@@ -3352,7 +3350,7 @@ tbody.collapse.in {
   padding-left: 12px;
   padding-right: 12px; }
 
-.btn-group.open .dropdown-toggle { }
+.btn-group.open .dropdown-toggle {}
   .btn-group.open .dropdown-toggle.btn-link {
     -webkit-box-shadow: none;
     box-shadow: none; }
@@ -3665,9 +3663,14 @@ tbody.collapse.in {
 
 .tab-content > .tab-pane {
   display: none; }
-.tab-content > .active {
+  .tab-content > .active {
   display: block; }
 
+.tab-pane .content-box {
+  border:none !important;
+  box-shadow: none;
+  -webkit-box-shadow: none; }
+
 .nav-tabs .dropdown-menu {
   margin-top: -1px;
   border-top-right-radius: 0;
@@ -4328,10 +4331,10 @@ a.thumbnail.active {
 .alert {
   padding: 15px;
   margin-bottom: 20px;
-  border: 1px solid transparent;
+  border: 1px solid #c2c2c2;
   border-radius: 3px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);}
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);}
   .alert h4 {
     margin-top: 0;
     color: inherit; }
@@ -4372,9 +4375,9 @@ a.thumbnail.active {
     color: #DA4829; }
 
 .alert-warning {
-    background-color: #202020;
-    border-color: #b13116;
-	color: #FFF; }
+	background-color: #fff;
+	border: 1px solid #d12d0a;
+	color: #000;}
   .alert-warning hr {
     border-top-color: #f7e1b5; }
   .alert-warning .alert-link {
@@ -4654,12 +4657,8 @@ 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 3px 3px rgba(42, 42, 42, 0.1);
-  box-shadow: 0 3px 3px rgba(42, 42, 42, 0.1);}
+  border: 1px solid #c2c2c2;
+  margin-bottom: 20px; }
 
 .panel-body {
   padding: 15px;
@@ -4672,7 +4671,7 @@ a.list-group-item-danger {
 
 .panel-heading {
   padding: 10px 15px;
-  border-bottom: 1px solid transparent;
+  border-bottom: 1px solid #c2c2c2;
   border-top-right-radius: 2px;
   border-top-left-radius: 2px;
   background-color: #30596f; }
@@ -4831,9 +4830,9 @@ a.list-group-item-danger {
     border-top: 0; }
     .panel-group .panel-footer + .panel-collapse .panel-body {
       border-bottom: 1px solid #ddd; }
-
-.panel-default {
-  border-color: #c2c2c2; }
+  .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); }
   .panel-default > .panel-heading {
 	color: #fff;
 	border-color: #c2c2c2; }
@@ -4844,9 +4843,9 @@ a.list-group-item-danger {
       background-color: #2d2d2d333; }
   .panel-default > .panel-footer + .panel-collapse > .panel-body {
     border-bottom-color: #c2c2c2; }
-
-.panel-primary {
-  border-color: #c2c2c2; }
+  .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); }
   .panel-primary > .panel-heading {
     color: #FFF;
     border-color: #c2c2c2; }
@@ -5201,10 +5200,10 @@ button.close {
   background-color: #fff;
   background-clip: padding-box;
   border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
+  border: 1px solid rgba(0, 0, 0, 0.30);
   border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
   white-space: normal; }
   .popover.top {
     margin-top: -10px; }
@@ -5715,8 +5714,8 @@ body {
   min-height: 38px;
   height:auto;
   padding: 10px 20px 10px 20px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.27); }
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 
 .page-content-head, .content-box-head {
   background: #FFF;
@@ -5750,20 +5749,20 @@ body {
   border-left: 3px solid #FF8B00; }
 
 .page-foot {
-  position: static;
   bottom: 0;
   border:none;
   font-size: 12px;
   padding: 20px 0;
   width: 100%;
   z-index: 2; }
+
 .content-box {
   padding: 0px 0px;
   margin: 0px 0px;
   background: none;
   border: 1px solid #c2c2c2;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); }
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 .content-box hr {
 	border:none; }
   .content-box-main {
@@ -6091,8 +6090,8 @@ option:hover, option:active, option:focus {
 #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.2);
-    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); }
+    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
+    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 
 @media screen and (max-width: 767px) {
   .table-responsive {
@@ -6133,10 +6132,9 @@ label > input[type="radio"] {
 
 textarea#update_status, textarea#update_status:hover {
 	color:inherit !important;
-	background-color:none !important;
 	-webkit-box-shadow:none !important;
 	box-shadow:none !important;
-	border-top:none !important; }
+	border:none !important; }
 
 .fa-toggle-off::before {
   color:#FF8B00 !important;