diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
index bfe671f7d..33e19692f 100644
--- a/misc/theme-cicada/Makefile
+++ b/misc/theme-cicada/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		1.27
+PLUGIN_VERSION=		1.28
 PLUGIN_COMMENT=		The cicada theme - dark grey
 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 2e4f3edf7..bd810ace9 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
@@ -1453,7 +1453,8 @@ h6 {
 }
 
 h1, .h1 {
-  font-size: 23px;
+  font-size: 22px;
+  text-transform: uppercase;
 }
 
 h2, .h2 {
@@ -9155,7 +9156,7 @@ button.close {
 
 .show {
   display: block !important;
-  color: #B3B3B3;
+  color: #22C400;
 }
 
 .invisible {
@@ -9465,7 +9466,7 @@ body {
     border-radius: 0;
     min-height: 47px;
     height: auto;
-    padding: 6px 14px 5px 14px;
+    padding: 7px 14px 5px 14px;
     -webkit-box-shadow: 0 3px 4px rgb(23, 23, 23);
     box-shadow: 0 3px 4px rgb(23, 23, 23);
   }
@@ -9490,7 +9491,7 @@ body {
 
 .page-content-main {
   min-height: calc(100% - 64px);
-  padding: 9px 0px 21px 0px;
+  padding: 7px 0px 21px 0px;
 }
 
 .page-side {
@@ -10026,7 +10027,7 @@ button.toggle-sidebar {
 }
 
 .table > tbody > tr > td:last-child {
-  padding-right: 15px;
+  padding-right: 5px;
 }
 
 /* helpers */
@@ -10643,3 +10644,17 @@ ul.jqtree-tree {
 .table.border {
   border: 1px solid #191919 !important;
 }
+
+.rule.text-muted > td {
+  &:nth-child(1n+3) {
+    text-decoration: line-through;
+  }
+
+  &:last-child {
+    text-decoration: none;
+  }
+}
+
+#reports-tab {
+  border-bottom: 1px solid #191919;
+}
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 919e308ea..41b44822a 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
@@ -1050,7 +1050,8 @@ h6, .h6 {
     font-size: 75%; }
 
 h1, .h1 {
-  font-size: 23px; }
+  font-size: 22px;
+  text-transform: uppercase; }
 
 h2, .h2 {
   font-size: 16px; }
@@ -5505,7 +5506,7 @@ button.close {
 
 .show {
   display: block !important;
-  color:#B3B3B3;}
+  color: #22C400; }
 
 .invisible {
   visibility: hidden; }
@@ -5743,7 +5744,7 @@ body {
   border-radius: 0;
   min-height: 47px;
   height: auto;
-  padding: 6px 14px 5px 14px;
+  padding: 7px 14px 5px 14px;
   -webkit-box-shadow: 0 3px 4px rgb(23, 23, 23);
   box-shadow: 0 3px 4px rgb(23, 23, 23); }
 .page-content-head, .content-box-head {
@@ -5757,7 +5758,7 @@ body {
 
 .page-content-main {
   min-height: calc(100% - 64px);
-  padding: 9px 0px 21px 0px; }
+  padding: 7px 0px 21px 0px; }
 
 .page-side {
   background: #202020;
@@ -6144,7 +6145,7 @@ button.toggle-sidebar {
   font-weight: normal; }
 
 .table > tbody > tr > td:last-child {
-padding-right: 15px; }
+  padding-right: 5px; }
 
 /* helpers */
 .__nowrap {
@@ -6620,3 +6621,15 @@ ul.jqtree-tree .jqtree-title {
 .table.border {
   border: 1px solid #191919 !important;
 }
+
+.rule.text-muted > td:nth-child(1n+3) {
+  text-decoration: line-through;
+}
+
+.rule.text-muted > td:last-child {
+  text-decoration:none;
+}
+
+#reports-tab {
+    border-bottom: 1px solid #191919;
+}
diff --git a/misc/theme-vicuna/Makefile b/misc/theme-vicuna/Makefile
index 7c1be4db2..0bfdb6476 100644
--- a/misc/theme-vicuna/Makefile
+++ b/misc/theme-vicuna/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-vicuna
-PLUGIN_VERSION=		1.3
+PLUGIN_VERSION=		1.4
 PLUGIN_COMMENT=		The vicuna theme - dark anthrazit
 PLUGIN_MAINTAINER=	rene@team-rebellion.net
 
diff --git a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/main.scss b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/main.scss
index 3d05ec02f..0ef531fdf 100644
--- a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/main.scss
+++ b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/main.scss
@@ -8,7 +8,6 @@
   padding-right: 1px !important;
   padding-left: 5px !important;
   min-height: 25px !important;
-  border: 1px solid #191919;
 
   .btn-group .btn {
     color: #FFFFFF !important;
@@ -756,7 +755,7 @@ td, th {
 
 .glyphicon-arrow-up:before {
   content: "\e093";
-  color: #1d511c !important;
+  color: #196a18 !important;
 }
 
 .glyphicon-arrow-down:before {
@@ -1082,7 +1081,7 @@ td, th {
 
 .glyphicon-transfer:before {
   content: "\e178";
-  color: #1d511c !important;
+  color: #196a18 !important;
 }
 
 .glyphicon-cutlery:before {
@@ -1453,7 +1452,8 @@ h6 {
 }
 
 h1, .h1 {
-  font-size: 23px;
+  font-size: 22px;
+  text-transform: uppercase;
 }
 
 h2, .h2 {
@@ -1552,7 +1552,7 @@ a.text-primary:hover {
 }
 
 .text-success {
-  color: #027700;
+  color: #05a202;
 }
 
 a.text-success:hover {
@@ -7279,12 +7279,12 @@ a.label {
 }
 
 .label-success {
-  background-color: #1d511c;
+  background-color: #196a18;
   border-color: #191919;
 
   &[href] {
     &:hover, &:focus {
-      background-color: #1d511c;
+      background-color: #196a18;
       border-color: #191919;
     }
   }
@@ -7633,7 +7633,7 @@ a.thumbnail {
 }
 
 .progress-bar-success {
-  background-color: #1d511c;
+  background-color: #196a18;
 }
 
 .progress-striped .progress-bar-success {
@@ -9263,7 +9263,7 @@ button.close {
 
 .show {
   display: block !important;
-  color: #757575;
+  color: #22C400;
 }
 
 .invisible {
@@ -9571,10 +9571,10 @@ body {
     margin-left: 20px;
     margin-right: 20px;
     border-top: 1px solid #191919;
-    border-radius: 3px;
+    border-radius: 0;
     min-height: 47px;
     height: auto;
-    padding: 6px 14px 5px 14px;
+    padding: 7px 14px 5px 14px;
     -webkit-box-shadow: 0 3px 4px rgb(23, 23, 23);
     box-shadow: 0 3px 4px rgb(23, 23, 23);
   }
@@ -9601,7 +9601,7 @@ body {
 
 .page-content-main {
   min-height: calc(100% - 64px);
-  padding: 9px 0px 21px 0px;
+  padding: 10px 0px 21px 0px;
 }
 
 .page-side {
@@ -10156,7 +10156,7 @@ button.toggle-sidebar {
 }
 
 .table > tbody > tr > td:last-child {
-  padding-right: 15px;
+  padding-right: 5px;
 }
 
 /* helpers */
@@ -10766,3 +10766,17 @@ ul.jqtree-tree {
 .table.border {
   border: 1px solid #181818 !important;
 }
+
+.rule.text-muted > td {
+  &:nth-child(1n+3) {
+    text-decoration: line-through;
+  }
+
+  &:last-child {
+    text-decoration: none;
+  }
+}
+
+#reports-tab {
+  border-bottom: 1px solid #191919;
+}
diff --git a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css
index 8234f124a..5fc68c441 100644
--- a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css
+++ b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css
@@ -6,8 +6,7 @@
   padding-top: 1px !important;
   padding-right: 1px !important;
   padding-left: 5px !important;
-  min-height: 25px !important;
-  border: 1px solid #191919; }
+  min-height: 25px !important; }
 
   .widgetdiv .content-box-head .btn-group .btn {
     color: #FFFFFF !important;
@@ -596,7 +595,7 @@ th {
 
 .glyphicon-arrow-up:before {
   content: "\e093";
-  color: #1d511c !important; }
+  color: #196a18 !important; }
 
 .glyphicon-arrow-down:before {
   content: "\e094";
@@ -841,7 +840,7 @@ th {
 
 .glyphicon-transfer:before {
   content: "\e178";
-  color:#1d511c !important; }
+  color:#196a18 !important; }
 
 .glyphicon-cutlery:before {
   content: "\e179"; }
@@ -1051,7 +1050,8 @@ h6, .h6 {
     font-size: 75%; }
 
 h1, .h1 {
-  font-size: 23px; }
+  font-size: 22px;
+  text-transform: uppercase; }
 
 h2, .h2 {
   font-size: 16px; }
@@ -1127,7 +1127,7 @@ a.text-primary:hover {
   color: #b85904; }
 
 .text-success {
-  color: #027700; }
+  color: #05a202; }
 
 a.text-success:hover {
   color: #7fc54f; }
@@ -4209,10 +4209,10 @@ a.label:hover, a.label:focus {
 
 
 .label-success {
-  background-color: #1d511c;
+  background-color: #196a18;
   border-color: #191919;}
   .label-success[href]:hover, .label-success[href]:focus {
-    background-color: #1d511c;
+    background-color: #196a18;
     border-color: #191919;	}
 
 
@@ -4452,7 +4452,7 @@ a.thumbnail.active {
   box-shadow: none; }
 
 .progress-bar-success {
-  background-color: #1d511c; }
+  background-color: #196a18; }
   .progress-striped .progress-bar-success {
     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);
@@ -5486,7 +5486,7 @@ button.close {
 
 .show {
   display: block !important;
-  color:#757575;}
+  color: #22C400; }
 
 .invisible {
   visibility: hidden; }
@@ -5724,10 +5724,10 @@ body {
   margin-left: 20px;
   margin-right: 20px;
   border-top: 1px solid #191919;
-  border-radius: 3px;
+  border-radius: 0;
   min-height: 47px;
   height:auto;
-  padding: 6px 14px 5px 14px;
+  padding: 7px 14px 5px 14px;
   -webkit-box-shadow: 0 3px 4px rgb(23, 23, 23);
   box-shadow: 0 3px 4px rgb(23, 23, 23); }
 
@@ -5743,7 +5743,7 @@ body {
 
 .page-content-main {
   min-height: calc(100% - 64px);
-  padding: 9px 0px 21px 0px; }
+  padding: 10px 0px 21px 0px; }
 
 .page-side {
   background: #172229;
@@ -6132,7 +6132,7 @@ button.toggle-sidebar {
   font-weight: normal; }
 
 .table > tbody > tr > td:last-child {
-padding-right: 15px; }
+  padding-right: 5px; }
 
 /* helpers */
 .__nowrap {
@@ -6583,3 +6583,15 @@ ul.jqtree-tree .jqtree-title {
 .table.border {
   border: 1px solid #181818 !important;
 }
+
+.rule.text-muted > td:nth-child(1n+3) {
+  text-decoration: line-through;
+}
+
+.rule.text-muted > td:last-child {
+  text-decoration:none;
+}
+
+#reports-tab {
+    border-bottom: 1px solid #191919;
+}