diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
index e277f567a..87ec5ec72 100644
--- a/misc/theme-cicada/Makefile
+++ b/misc/theme-cicada/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		1.24
+PLUGIN_VERSION=		1.25
 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 a5500f15d..d301372af 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
@@ -10577,7 +10577,7 @@ h3 {
   border: 1px solid #191919;
 }
 
-/*additional extensions for sensei*/
+/*additional extensions for sensei and more*/
 
 .preloader-wrapper {
   background-color: #202020 !important;
@@ -10732,3 +10732,33 @@ label.btn.au-target {
 .metric-table tbody > tr:last-child > td, .list-table tbody > tr:last-child > td {
   border-bottom: 1px solid #555 !important;
 }
+
+.phase1_tr td {
+  background-color: #262626 !important;
+}
+
+ul.jqtree-tree {
+  .jqtree-toggler {
+    &:hover {
+      color: #dd630d !important;
+    }
+
+    color: #fff !important;
+  }
+
+  .jqtree-title {
+    color: #9d9d9d !important;
+  }
+}
+
+.interface-table {
+  background-color: #242424 !important;
+}
+
+.modal-side-settings {
+  background-color: #2f2f2f !important;
+}
+
+[role="listbox"] {
+  border: 1px solid #191919 !important;
+}
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 5106d03a8..b7b43ef40 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
@@ -6462,7 +6462,7 @@ h3:hover, h3:focus {
   border: 1px solid #191919;
 }
 
-  /*additional extensions for sensei*/
+  /*additional extensions for sensei and more*/
 
 .preloader-wrapper {
   background-color: #202020 !important;
@@ -6587,3 +6587,31 @@ label.btn.au-target {
 .metric-table tbody > tr:last-child > td, .list-table tbody > tr:last-child > td {
   border-bottom: 1px solid #555 !important;
 }
+
+.phase1_tr td {
+  background-color: #262626 !important;
+}
+
+ul.jqtree-tree .jqtree-toggler:hover {
+  color:#dd630d !important;
+}
+
+ul.jqtree-tree .jqtree-toggler {
+  color:#fff !important;
+}
+
+ul.jqtree-tree .jqtree-title {
+  color:#9d9d9d !important;
+}
+
+.interface-table {
+  background-color: #242424 !important;
+}
+
+.modal-side-settings {
+  background-color: #2f2f2f !important;
+}
+
+[role="listbox"] {
+  border: 1px solid #191919 !important;
+}
diff --git a/misc/theme-vicuna/Makefile b/misc/theme-vicuna/Makefile
index 7eb95b2e8..54ad41605 100644
--- a/misc/theme-vicuna/Makefile
+++ b/misc/theme-vicuna/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-vicuna
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		1.1
 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 895ae7415..3b9c0f3c0 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
@@ -6202,7 +6202,7 @@ a:focus {
     }
 
     &.active > a {
-      color: #FFF;
+      color: #D77610;
       background-color: #393939;
       border-bottom-color: transparent;
       cursor: pointer;
@@ -6210,7 +6210,7 @@ a:focus {
       filter: alpha(opacity = 100);
 
       &:hover, &:focus {
-        color: #FFF;
+        color: #D77610;
         background-color: #393939;
         border-bottom-color: transparent;
         cursor: pointer;
@@ -10724,3 +10724,34 @@ label.btn.au-target {
 .ui-resizable-e {
   border-right: 1px solid #191919 !important;
 }
+
+.phase1_tr td {
+  background-color: #315a71 !important;
+}
+
+ul.jqtree-tree {
+  .jqtree-toggler {
+    &:hover {
+      color: #dd630d !important;
+    }
+
+    color: #fff !important;
+  }
+
+  .jqtree-title {
+    color: #9d9d9d !important;
+  }
+}
+
+.interface-table {
+  background-color: #172229 !important;
+  border: 0.1px solid #191919 !important;
+}
+
+.modal-side-settings {
+  background-color: #172229 !important;
+}
+
+[role="listbox"] {
+  border: 1px solid #191919 !important;
+}
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 5b774ffc6..26f7ddf24 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
@@ -3605,7 +3605,7 @@ tbody.collapse.in {
 	  cursor:pointer;}
 	.nav-tabs > li > a:hover {opacity: 0.8; filter: alpha(opacity=80);}
     .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
-      color: #FFF;
+      color: #D77610;
       background-color: #393939;
       border-bottom-color: transparent;
       cursor: pointer;
@@ -6543,3 +6543,32 @@ label.btn.au-target {
 .ui-resizable-e {
   border-right: 1px solid #191919 !important;
 }
+
+.phase1_tr td {
+  background-color: #315a71 !important;
+}
+
+ul.jqtree-tree .jqtree-toggler:hover {
+  color:#dd630d !important;
+}
+
+ul.jqtree-tree .jqtree-toggler {
+  color:#fff !important;
+}
+
+ul.jqtree-tree .jqtree-title {
+  color:#9d9d9d !important;
+}
+
+.interface-table {
+  background-color: #172229 !important;
+  border: 0.1px solid #191919 !important;
+}
+
+.modal-side-settings {
+  background-color: #172229 !important;
+}
+
+[role="listbox"] {
+  border: 1px solid #191919 !important;
+}