diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
index d5b95e675..d057746a6 100644
--- a/misc/theme-cicada/Makefile
+++ b/misc/theme-cicada/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		1.4
+PLUGIN_VERSION=		1.5
 PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		The cicada theme - grey/orange
 PLUGIN_MAINTAINER=	rene@team-rebellion.net
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 b5d2f0afe..641807b71 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
@@ -8791,6 +8791,7 @@ body {
 }
 
 .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: inherit;
   margin: 0;
 }
 
@@ -8992,7 +8993,7 @@ main.page-content.col-lg-12 {
     }
     > nav > #mainmenu > div > {
       a.list-group-item {
-        font-size: 13px;
+        font-size: 14px;
         text-align: center;
         > span {
           &.fa, &.glyphicon {
@@ -9015,19 +9016,17 @@ main.page-content.col-lg-12 {
       div {
         &.collapsing > a.list-group-item {
           padding-left: 10px !important;
-          font-size: 13px !important;
+          font-size: 14px !important;
           display: block !important;
           position: absolute !important;
           left: 70px !important;
-          margin-top: -70px !important;
         }
         &.collapse.in > div.collapsing > a.list-group-item {
           padding-left: 10px !important;
-          font-size: 13px !important;
+          font-size: 14px !important;
           display: block !important;
           position: absolute !important;
-          left: 148px !important;
-          margin-top: -28px !important;
+          left: 166px !important;
         }
       }
       a.list-group-item.active-menu-title {
@@ -9057,8 +9056,9 @@ a.list-group-item.active-menu-title.collapsed {
         }
         > div.collapse.in > a.list-group-item {
           padding-left: 10px !important;
-          font-size: 13px !important;
-          background-color: #393939e6 !important;
+          font-size: 14px !important;
+          background-color: #393939 !important;
+          opacity: 0.9;
           &.menu-level-3-item.active {
             color: #ec6d12 !important;
             background-color: #2a2a2a !important;
@@ -9067,39 +9067,48 @@ a.list-group-item.active-menu-title.collapsed {
       }
       > a.list-group-item {
         padding-left: 10px !important;
-        font-size: 13px !important;
-        background-color: #393939e6 !important;
+        font-size: 14px !important;
+        background-color: #393939 !important;
+        opacity: 0.9;
       }
       > div.collapse > a.list-group-item {
         padding-left: 10px !important;
-        font-size: 13px !important;
+        font-size: 14px !important;
       }
     }
     &.collapsed > a.list-group-item {
       padding-left: 10px !important;
-      font-size: 13px !important;
+      font-size: 14px !important;
     }
-    &.collapse.in > a.list-group-item:hover {
+    &.collapse.in > div.collapse.in > a.list-group-item:hover {
+      text-decoration: none !important;
       color: #ec6d12 !important;
       background-color: #2a2a2a !important;
     }
   }
 }
 
+a.list-group-item:focus {
+  text-decoration: none !important;
+  color: #ec6d12 !important;
+  background-color: #2a2a2a !important;
+}
+
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item {
+  &.active-menu-title, &:hover {
+    color: #ec6d12 !important;
+    background-color: #2a2a2a !important;
+  }
+}
+
 a.list-group-item:focus {
   color: #ec6d12 !important;
   background-color: #2a2a2a !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus {
-  text-decoration: none !important;
-  color: #ec6d12 !important;
-  background-color: #2a2a2a !important;
-}
-
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div {
   &.collapse.in > a.list-group-item {
-    &.active-menu-title, &.collapsed:focus, &:focus {
+    &.collapsed:focus, &:focus {
       color: #ec6d12 !important;
       background-color: #2a2a2a !important;
     }
@@ -9109,8 +9118,8 @@ a.list-group-item:focus {
     background-color: #2a2a2a !important;
   }
   &.collapse.in {
-    width: 150px;
-    font-size: 13px;
+    width: 168px;
+    font-size: 14px;
     display: block;
     z-index: 10;
     position: absolute;
@@ -9119,57 +9128,26 @@ a.list-group-item:focus {
     padding-bottom: 1px;
     height: auto;
     border: 1px solid #515151;
-    -webkit-transition: width 0.1s;
-    -o-transition: width 0.1s;
-    transition: width 0.1s;
     -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-  }
-  &.collapsing {
-    width: 0px;
-    font-size: 13px;
-    position: absolute;
-    display: block;
-    z-index: 10;
-    left: 70px;
-    margin-top: -70px;
-    height: auto;
-    -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-    -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-    box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-  }
-  &.collapse.in > div {
-    &.collapse.in {
-      width: 150px;
-      font-size: 13px;
+    > div.collapse.in {
+      width: 168px;
+      font-size: 14px;
       display: block;
       z-index: 10;
       position: absolute;
-      left: 148px;
-      margin-top: -29px;
+      left: 166px;
+      margin-top: -32px;
       height: auto;
       border: 1px solid #515151;
-      -webkit-transition: width 0.1s;
-      -o-transition: width 0.1s;
-      transition: width 0.1s;
       -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
       -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
       box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     }
-    &.collapsing {
-      width: 0px;
-      font-size: 13px;
-      position: absolute;
-      display: block;
-      z-index: 10;
-      left: 148px;
-      margin-top: -29px;
-      height: auto;
-      -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-      -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-      box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-    }
+  }
+  &.collapsing, &.collapse.in > div.collapsing {
+    display: 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 f61590aaf..3a0f19488 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
@@ -5724,6 +5724,7 @@ body {
   .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: inherit;
     margin: 0; }
 
 .page-content-main {
@@ -5870,6 +5871,7 @@ main.page-content.col-lg-12 {
 #navigation.col-sidebar-left > div.row {
   height:100% !important;
 }
+
 #navigation.col-sidebar-left > div.row > nav.page-side-nav {
   width:70px;
   background-color:#202020 !important;
@@ -5877,14 +5879,11 @@ main.page-content.col-lg-12 {
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item {
-  font-size:13px;
+  font-size:14px;
   text-align:center;
 }
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.fa {
-  visibility: visible;
-  font-size:20px;
-}
 
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.fa,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.glyphicon {
   visibility: visible;
   font-size:20px;
@@ -5907,20 +5906,18 @@ main.page-content.col-lg-12 {
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
+  font-size: 14px !important;
   display: block !important;
   position: absolute !important;
   left: 70px !important;
-  margin-top:-70px !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapsing > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
+  font-size: 14px !important;
   display: block !important;
   position: absolute !important;
-  left: 148px !important;
-  margin-top:-28px !important;
+  left: 166px !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item.active-menu-title, a.list-group-item.active-menu-title.collapsed {
@@ -5928,26 +5925,18 @@ main.page-content.col-lg-12 {
   background-color: #2a2a2a !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item[aria-expanded="true"] {
-  color: #ec6d12 !important;
-  background-color: #2a2a2a !important;
-}
-
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item[aria-expanded="true"],
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item[aria-expanded="true"] {
   color: #ec6d12 !important;
   background-color: #2a2a2a !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > a.list-group-item {
-  padding-left: 10px !important;
-  font-size: 13px !important;
-  background-color: #393939e6 !important;
-}
-
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > a.list-group-item,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
-  background-color: #393939e6 !important;
+  font-size: 14px !important;
+  background-color: #393939 !important;
+  opacity: 0.9;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item.menu-level-3-item.active {
@@ -5955,19 +5944,10 @@ main.page-content.col-lg-12 {
   background-color: #2a2a2a !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > div.collapse > a.list-group-item {
-  padding-left: 10px !important;
-  font-size: 13px !important;
-}
-
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > div.collapse > a.list-group-item,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsed > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus {
-  color: #ec6d12 !important;
-  background-color: #2a2a2a !important;
+  font-size: 14px !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus {
@@ -5976,54 +5956,27 @@ main.page-content.col-lg-12 {
   background-color: #2a2a2a !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.active-menu-title {
-  color: #ec6d12 !important;
-  background-color: #2a2a2a !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.collapsed:focus {
-  color: #ec6d12 !important;
-  background-color: #2a2a2a !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:focus {
-  color: #ec6d12 !important;
-  background-color: #2a2a2a !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active {
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.active-menu-title,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.collapsed:focus,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:focus,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active { 
   color: #ec6d12 !important;
   background-color: #2a2a2a !important;
 }
 
 /* Sub Level One */
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in {
-  width:150px;
-  font-size:13px;
+  width:168px;
+  font-size:14px;
   display: block;
   z-index: 10;
   position: absolute;
   left: 70px;
   margin-top:-70px;
   padding-bottom: 1px;
-  height:auto;border:1px solid #515151;
-  -webkit-transition: width 0.1s;
-  -o-transition: width 0.1s;
-  transition: width 0.1s;
-  -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
-  -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
-  box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing {
-  width:0px;
-  font-size:13px;
-  position: absolute;
-  display: block;
-  z-index: 10;
-  left: 70px;
-  margin-top:-70px;
   height:auto;
+  border:1px solid #515151;
   -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
@@ -6031,38 +5984,27 @@ main.page-content.col-lg-12 {
 
 /* Sub Level Two */
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in {
-  width:150px;
-  font-size:13px;
+  width:168px;
+  font-size:14px;
   display: block;
   z-index: 10;
   position: absolute;
-  left: 148px;
-  margin-top:-29px;
+  left: 166px;
+  margin-top:-32px;
   height:auto;
   border:1px solid #515151;
-  -webkit-transition: width 0.1s;
-  -o-transition: width 0.1s;
-  transition: width 0.1s;
   -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
 }
 
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapsing {
-  width:0px;
-  font-size:13px;
-  position: absolute;
-  display: block;
-  z-index: 10;
-  left: 148px;
-  margin-top:-29px;
-  height:auto;
-  -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-  -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-  box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
+  display:none;
 }
 
-button.toggle-sidebar.glyphicon.glyphicon-chevron-left:focus, button.toggle-sidebar.glyphicon.glyphicon-chevron-right:focus {
+button.toggle-sidebar.glyphicon.glyphicon-chevron-left:focus,
+button.toggle-sidebar.glyphicon.glyphicon-chevron-right:focus {
   outline:none;
 }
 
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css
index d15839418..8fee3114b 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/nv.d3.css
@@ -6,13 +6,13 @@
 
 .nvd3 .nv-axis path {
     fill: none;
-    stroke: #000;
-    stroke-opacity: .75;
+    stroke: #FFF;
+    stroke-opacity: .20;
     shape-rendering: crispEdges;
 }
 
 .nvd3 .nv-axis path.domain {
-    stroke-opacity: .75;
+    stroke-opacity: .10;
 }
 
 .nvd3 .nv-axis.nv-x path.domain {
@@ -22,12 +22,13 @@
 .nvd3 .nv-axis line {
     fill: none;
     stroke: #e5e5e5;
-    shape-rendering: crispEdges;
+	stroke-opacity: .20;
+	shape-rendering: crispEdges;
 }
 
 .nvd3 .nv-axis .zero line,
     /*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
-    stroke-opacity: .75;
+    stroke-opacity: .20;
 }
 
 .nvd3 .nv-axis .nv-axisMaxMin text {
@@ -45,7 +46,7 @@
 }
 
 .nvd3 .nv-bars rect {
-    fill-opacity: .75;
+    fill-opacity: .50;
 
     transition: fill-opacity 250ms linear;
 }
@@ -196,7 +197,7 @@
 
 /* line plus bar */
 .nvd3.nv-linePlusBar .nv-bar rect {
-    fill-opacity: .75;
+    fill-opacity: .50;
 }
 
 .nvd3.nv-linePlusBar .nv-bar rect:hover {
@@ -318,8 +319,8 @@ svg.nvd3-svg {
 
 .nv-controlsWrap.nvd3-svg circle.nv-legend-symbol {
   stroke-width: 1 !important;
-  fill: rgb(143, 143, 143) !important;
-  stroke: rgb(143, 143, 143) !important;
+  fill: rgb(255, 255, 255) !important;
+  stroke: rgb(231, 231, 231) !important;
 }
 
 .nvd3 .nv-legend .nv-disabled circle {
@@ -417,7 +418,7 @@ svg.nvd3-svg {
 .nvd3.nv-pie path {
     stroke: #fff;
     stroke-width: 1px;
-    stroke-opacity: 1;
+    stroke-opacity: 0.6;
 }
 
 .nvd3.nv-pie path {
@@ -565,7 +566,7 @@ svg.nvd3-svg {
     padding: 4px 14px;
     line-height: 18px;
     font-weight: normal;
-    background-color: rgba(247,247,247,0.75);
+    background-color: rgba(247,247,247,0.50);
     color: rgba(0,0,0,1.0);
     text-align: center;
 
diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile
index c1655b03a..7867780f5 100644
--- a/misc/theme-tukan/Makefile
+++ b/misc/theme-tukan/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-tukan
-PLUGIN_VERSION=		1.3
+PLUGIN_VERSION=		1.4
 PLUGIN_COMMENT=		The tukan theme - blue/white
 PLUGIN_MAINTAINER=	rene@team-rebellion.net
 
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 c867211eb..23d73fc9d 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
@@ -8829,6 +8829,7 @@ body {
 }
 
 .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: inherit;
   margin: 0;
 }
 
@@ -9036,7 +9037,7 @@ main.page-content.col-lg-12 {
     }
     > nav > #mainmenu > div > {
       a.list-group-item {
-        font-size: 13px;
+        font-size: 14px;
         text-align: center;
         > span {
           &.fa, &.glyphicon {
@@ -9059,19 +9060,17 @@ main.page-content.col-lg-12 {
       div {
         &.collapsing > a.list-group-item {
           padding-left: 10px !important;
-          font-size: 13px !important;
+          font-size: 14px !important;
           display: block !important;
           position: absolute !important;
           left: 70px !important;
-          margin-top: -70px !important;
         }
         &.collapse.in > div.collapsing > a.list-group-item {
           padding-left: 10px !important;
-          font-size: 13px !important;
+          font-size: 14px !important;
           display: block !important;
           position: absolute !important;
-          left: 148px !important;
-          margin-top: -28px !important;
+          left: 166px !important;
         }
       }
       a.list-group-item.active-menu-title {
@@ -9095,56 +9094,63 @@ a.list-group-item.active-menu-title.collapsed {
   div {
     &.collapse {
       &.in {
-        > a.list-group-item[aria-expanded="true"] {
-          color: #000 !important;
-          background-color: #FFF !important;
-        }
-        > div.collapse.in > a.list-group-item {
-          padding-left: 10px !important;
-          font-size: 13px !important;
-          background-color: #294C5FE6 !important;
-          &.menu-level-3-item.active {
+        > {
+          a.list-group-item[aria-expanded="true"], div.collapse.in > a.list-group-item.menu-level-3-item.active {
             color: #000 !important;
             background-color: #FFF !important;
           }
         }
+        > div.collapse.in > a.list-group-item {
+          padding-left: 10px !important;
+          font-size: 14px !important;
+          background-color: #294c5f !important;
+          opacity: 0.9;
+        }
       }
       > a.list-group-item {
         padding-left: 10px !important;
-        font-size: 13px !important;
-        background-color: #294C5FE6 !important;
+        font-size: 14px !important;
+        background-color: #294c5f !important;
+        opacity: 0.9;
       }
       > div.collapse > a.list-group-item {
         padding-left: 10px !important;
-        font-size: 13px !important;
+        font-size: 14px !important;
       }
     }
     &.collapsed > a.list-group-item {
       padding-left: 10px !important;
-      font-size: 13px !important;
-      background-color: #FFF !important;
+      font-size: 14px !important;
     }
-    &.collapse.in > a.list-group-item:hover {
+    &.collapse.in > div.collapse.in > a.list-group-item:hover {
+      text-decoration: none !important;
       color: #000 !important;
       background-color: #FFF !important;
     }
   }
 }
 
+a.list-group-item:focus {
+  text-decoration: none !important;
+  color: #000 !important;
+  background-color: #FFF !important;
+}
+
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item {
+  &.active-menu-title, &:hover {
+    color: #000 !important;
+    background-color: #FFF !important;
+  }
+}
+
 a.list-group-item:focus {
   color: #000 !important;
   background-color: #FFF !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus {
-  text-decoration: none !important;
-  color: #000 !important;
-  background-color: #FFF !important;
-}
-
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div {
   &.collapse.in > a.list-group-item {
-    &.active-menu-title, &.collapsed:focus, &:focus {
+    &.collapsed:focus, &:focus {
       color: #000 !important;
       background-color: #FFF !important;
     }
@@ -9154,8 +9160,8 @@ a.list-group-item:focus {
     background-color: #FFF !important;
   }
   &.collapse.in {
-    width: 150px;
-    font-size: 13px;
+    width: 168px;
+    font-size: 14px;
     display: block;
     z-index: 10;
     position: absolute;
@@ -9163,57 +9169,26 @@ a.list-group-item:focus {
     margin-top: -70px;
     height: auto;
     border: 1px solid #1f3a4a;
-    -webkit-transition: width 0.1s;
-    -o-transition: width 0.1s;
-    transition: width 0.1s;
     -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-  }
-  &.collapsing {
-    width: 0px;
-    font-size: 13px;
-    position: absolute;
-    display: block;
-    z-index: 10;
-    left: 70px;
-    margin-top: -70px;
-    height: auto;
-    -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-    -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-    box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
-  }
-  &.collapse.in > div {
-    &.collapse.in {
-      width: 150px;
-      font-size: 13px;
+    > div.collapse.in {
+      width: 168px;
+      font-size: 14px;
       display: block;
       z-index: 10;
       position: absolute;
-      left: 148px;
-      margin-top: -29px;
+      left: 166px;
+      margin-top: -32px;
       height: auto;
       border: 1px solid #1f3a4a;
-      -webkit-transition: width 0.1s;
-      -o-transition: width 0.1s;
-      transition: width 0.1s;
       -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
       -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
       box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5);
     }
-    &.collapsing {
-      width: 0px;
-      font-size: 13px;
-      position: absolute;
-      display: block;
-      z-index: 10;
-      left: 148px;
-      margin-top: -29px;
-      height: auto;
-      -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-      -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-      box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-    }
+  }
+  &.collapsing, &.collapse.in > div.collapsing {
+    display: none;
   }
 }
 
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/jquery.bootgrid.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/jquery.bootgrid.css
index 6bddcc427..7f871447e 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/jquery.bootgrid.css
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/jquery.bootgrid.css
@@ -19,13 +19,6 @@
   width: 180px;
 }
 
-.bootgrid-header .search .glyphicon,
-.bootgrid-footer .search .glyphicon,
-.input-group-addon {
-  top: 0;
-  background-color: #FF7E25;
-  border: 1px solid #FF7E25;
-}
 .bootgrid-header .search .fa,
 .bootgrid-footer .search .fa {
   display: table-cell;
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 8fd827d5d..2e5ae6a02 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
@@ -4041,7 +4041,7 @@ tbody.collapse.in {
   .breadcrumb > li {
     display: inline-block; }
     .breadcrumb > li + li:before {
-      content: "/ ";
+      content: "/ ";
       padding: 0 5px;
       color: #ccc; }
   .breadcrumb > .active {
@@ -5726,6 +5726,7 @@ body {
   .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: inherit;
     margin: 0; }
 
 .page-content-main {
@@ -5883,15 +5884,11 @@ main.page-content.col-lg-12 {
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item {
-  font-size:13px;
+  font-size:14px;
   text-align:center;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.fa {
-  visibility: visible;
-  font-size:20px;
-}
-
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.fa,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.glyphicon {
   visibility: visible;
   font-size:20px;
@@ -5914,68 +5911,40 @@ main.page-content.col-lg-12 {
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
+  font-size: 14px !important;
   display: block !important;
   position: absolute !important;
   left: 70px !important;
-  margin-top:-70px !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapsing > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
+  font-size: 14px !important;
   display: block !important;
   position: absolute !important;
-  left: 148px !important;
-  margin-top:-28px !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item.active-menu-title, a.list-group-item.active-menu-title.collapsed {
-  color: #000 !important;
-  background-color: #FFF !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item[aria-expanded="true"] {
-  color: #000 !important;
-  background-color: #FFF !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item[aria-expanded="true"] {
-  color: #000 !important;
-  background-color: #FFF !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > a.list-group-item {
-  padding-left: 10px !important;
-  font-size: 13px !important;
-  background-color: #294C5FE6 !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item {
-  padding-left: 10px !important;
-  font-size: 13px !important;
-  background-color: #294C5FE6 !important;
+  left: 166px !important;
 }
 
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item.active-menu-title, a.list-group-item.active-menu-title.collapsed,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item[aria-expanded="true"],
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item[aria-expanded="true"],
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item.menu-level-3-item.active {
   color: #000 !important;
   background-color: #FFF !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > div.collapse > a.list-group-item {
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > a.list-group-item,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
+  font-size: 14px !important;
+  background-color: #294c5f !important;
+  opacity: 0.9;
 }
 
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > div.collapse > a.list-group-item,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsed > a.list-group-item {
   padding-left: 10px !important;
-  font-size: 13px !important;
-  background-color:#FFF !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus {
-  color: #000 !important;
-  background-color: #FFF !important;
+  font-size: 14px !important;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus {
@@ -5984,21 +5953,10 @@ main.page-content.col-lg-12 {
   background-color: #FFF !important;
 }
 
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.active-menu-title {
-  color: #000 !important;
-  background-color: #FFF !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.collapsed:focus {
-  color: #000 !important;
-  background-color: #FFF !important;
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:focus {
-  color: #000 !important;
-  background-color: #FFF !important;
-}
-
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.active-menu-title,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.collapsed:focus,
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:focus,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active {
   color: #000 !important;
   background-color: #FFF !important;
@@ -6006,8 +5964,8 @@ main.page-content.col-lg-12 {
 
 /* Sub Level One */
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in {
-  width:150px;
-  font-size:13px;
+  width:168px;
+  font-size:14px;
   display: block;
   z-index: 10;
   position: absolute;
@@ -6015,23 +5973,6 @@ main.page-content.col-lg-12 {
   margin-top:-70px;
   height:auto;
   border:1px solid #1f3a4a;
-  -webkit-transition: width 0.1s;
-  -o-transition: width 0.1s;
-  transition: width 0.1s;
-  -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
-  -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
-  box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
-}
-
-#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing {
-  width:0px;
-  font-size:13px;
-  position: absolute;
-  display: block;
-  z-index: 10;
-  left: 70px;
-  margin-top:-70px;
-  height:auto;
   -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
@@ -6039,38 +5980,27 @@ main.page-content.col-lg-12 {
 
 /* Sub Level Two */
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in {
-  width:150px;
-  font-size:13px;
+  width:168px;
+  font-size:14px;
   display: block;
   z-index: 10;
   position: absolute;
-  left: 148px;
-  margin-top:-29px;
+  left: 166px;
+  margin-top:-32px;
   height:auto;
   border:1px solid #1f3a4a;
-  -webkit-transition: width 0.1s;
-  -o-transition: width 0.1s;
-  transition: width 0.1s;
   -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
   box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50);
 }
 
+#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing,
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapsing {
-  width:0px;
-  font-size:13px;
-  position: absolute;
-  display: block;
-  z-index: 10;
-  left: 148px;
-  margin-top:-29px;
-  height:auto;
-  -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-  -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
-  box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
+  display:none;
 }
 
-button.toggle-sidebar.glyphicon.glyphicon-chevron-left:focus, button.toggle-sidebar.glyphicon.glyphicon-chevron-right:focus {
+button.toggle-sidebar.glyphicon.glyphicon-chevron-left:focus,
+button.toggle-sidebar.glyphicon.glyphicon-chevron-right:focus {
   outline:none;
 }
 
@@ -6422,6 +6352,12 @@ textarea#update_status, textarea#update_status:hover {
   content: "\f021";
 }
 
+.bootgrid-header .search .glyphicon, .bootgrid-footer .search .glyphicon,.input-group-addon {
+  top: 0;
+  background-color: #FF7E25 !important;
+  border: 1px solid #FF7E25 !important;
+}
+
 div.container-fluid >.fa-search::before, div.container-fluid >.fa-refresh::before {
   color: #FFFFFF !important; }
 
@@ -6442,14 +6378,6 @@ h3:hover, h3:focus {
   border: 1px solid #bdbdbd;
 }
 
-.bootgrid-header .search .glyphicon,
-.bootgrid-footer .search .glyphicon,
-.input-group-addon {
-  top: 0;
-  background-color: #FF7E25;
-  border: 1px solid #FF7E25;
-}
-
 .btn-group.bootstrap-select.open, .btn-group.bootstrap-select:hover {
   border-color: #323232 !important;
   color:#FFFFFF !important;
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/nv.d3.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/nv.d3.css
index 0e7e5e960..521a9ad79 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/nv.d3.css
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/nv.d3.css
@@ -8,12 +8,12 @@
 .nvd3 .nv-axis path {
     fill: none;
     stroke: #000;
-    stroke-opacity: .75;
+    stroke-opacity: .30;
     shape-rendering: crispEdges;
 }
 
 .nvd3 .nv-axis path.domain {
-    stroke-opacity: .75;
+    stroke-opacity: .20;
 }
 
 .nvd3 .nv-axis.nv-x path.domain {
@@ -22,13 +22,14 @@
 
 .nvd3 .nv-axis line {
     fill: none;
-    stroke: #d8d8d8;
+    stroke: #000;
+	stroke-opacity: .20;
     shape-rendering: crispEdges;
 }
 
 .nvd3 .nv-axis .zero line,
     /*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
-    stroke-opacity: .75;
+    stroke-opacity: .30;
 }
 
 .nvd3 .nv-axis .nv-axisMaxMin text {
@@ -412,9 +413,9 @@ svg.nvd3-svg {
 }
 
 .nvd3.nv-pie path {
-    stroke: #fff;
+    stroke: #000;
     stroke-width: 1px;
-    stroke-opacity: 1;
+    stroke-opacity: 0.2;
 }
 
 .nvd3.nv-pie path {