diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-black.css.modified.snapshot b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-black.css.modified.snapshot
index a30ee4bfd..5cc1e184e 100644
--- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-black.css.modified.snapshot
+++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-black.css.modified.snapshot
@@ -47,7 +47,7 @@ select.slot{min-width:44rem;max-width:44rem}
 input.narrow{width:166px}
 input.trim{width:76px;min-width:76px}
 textarea{resize:none}
-#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:102;margin:0;color:#1c1b1b;background-color:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat}
+#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:102;margin:0;color:#1c1b1b;background-color: var(--header-background-color);background-size:100% 90px;background-repeat:no-repeat}
 #header .logo{float:left;margin-left:10px;color:#e22828;text-align:center}
 #header .logo svg{width:160px;display:block;margin:25px 0 8px 0}
 #header .block{margin:0;float:right;text-align:right;background-color:rgba(242,242,242,0.2);padding:10px 12px}
@@ -61,7 +61,7 @@ div.title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:r
 div.title span img{padding-right:4px}
 div.title.shift{margin-top:-30px}
 #menu{position:absolute;top:90px;left:0;right:0;display:grid;grid-template-columns:auto max-content;z-index:101}
-.nav-tile{height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;letter-spacing:1.8px;background-color:#f2f2f2;white-space:nowrap;overflow-x:auto;overflow-y:hidden;scrollbar-width:thin}
+.nav-tile{height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;letter-spacing:1.8px;background-color: var(--header-background-color);white-space:nowrap;overflow-x:auto;overflow-y:hidden;scrollbar-width:thin}
 .nav-tile::-webkit-scrollbar{height:5px}
 .nav-tile.right{text-align:right}
 .nav-item,.nav-user{position:relative;display:inline-block;text-align:center;margin:0}
diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-white.css.modified.snapshot b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-white.css.modified.snapshot
index 7e92f7dcf..850470c79 100644
--- a/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-white.css.modified.snapshot
+++ b/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/default-white.css.modified.snapshot
@@ -72,7 +72,7 @@ div.title.shift{margin-top:-30px}
 .nav-item a{text-decoration:none;text-decoration-skip-ink:auto;-webkit-text-decoration-skip:objects;-webkit-transition:all .25s ease-out;transition:all .25s ease-out}
 .nav-item:after,.nav-user.show:after{border-radius:4px;display:block;background-color:transparent;content:"";width:32px;height:2px;bottom:8px;position:absolute;left:50%;margin-left:-16px;-webkit-transition:all .25s ease-in-out;transition:all .25s ease-in-out;pointer-events:none}
 .nav-item:focus:after,.nav-item:hover:after,.nav-user.show:hover:after{background-color:#f15a2c}
-.nav-item.active:after{background-color:#f2f2f2}
+.nav-item.active:after{background-color: var(--header-background-color)}
 .nav-user a{color:#f2f2f2;background-color:transparent;display:block;padding:0 10px}
 .nav-user .system{vertical-align:middle;padding-bottom:2px}
 #clear{clear:both}
@@ -154,7 +154,7 @@ table.dashboard tr:last-child>td{padding-bottom:20px}
 table.dashboard tr.last>td{padding-bottom:20px}
 table.dashboard tr.header>td{padding-bottom:10px}
 table.dashboard td{line-height:2.4rem;height:2.4rem}
-table.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color:#f2f2f2}
+table.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color: var(--header-background-color)}
 table.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-black-css-modification.patch b/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-black-css-modification.patch
index b2e4836c3..d44a13961 100644
--- a/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-black-css-modification.patch
+++ b/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-black-css-modification.patch
@@ -11,6 +11,32 @@ Index: /usr/local/emhttp/plugins/dynamix/styles/default-black.css
  p.centered{text-align:left}
  p:empty{display:none}
  a:hover{text-decoration:underline}
+@@ -44,11 +45,11 @@
+ select.auto{min-width:auto}
+ select.slot{min-width:44rem;max-width:44rem}
+ input.narrow{width:166px}
+ input.trim{width:76px;min-width:76px}
+ textarea{resize:none}
+-#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:102;margin:0;color:#1c1b1b;background-color:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat}
++#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:102;margin:0;color:#1c1b1b;background-color: var(--header-background-color);background-size:100% 90px;background-repeat:no-repeat}
+ #header .logo{float:left;margin-left:10px;color:#e22828;text-align:center}
+ #header .logo svg{width:160px;display:block;margin:25px 0 8px 0}
+ #header .block{margin:0;float:right;text-align:right;background-color:rgba(242,242,242,0.2);padding:10px 12px}
+ #header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #f15a2c}
+ #header .text-right{float:right;text-align:left;padding-left:5px}
+@@ -58,11 +59,11 @@
+ div.title span.left{font-size:1.4rem}
+ div.title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:right}
+ div.title span img{padding-right:4px}
+ div.title.shift{margin-top:-30px}
+ #menu{position:absolute;top:90px;left:0;right:0;display:grid;grid-template-columns:auto max-content;z-index:101}
+-.nav-tile{height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;letter-spacing:1.8px;background-color:#f2f2f2;white-space:nowrap;overflow-x:auto;overflow-y:hidden;scrollbar-width:thin}
++.nav-tile{height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;letter-spacing:1.8px;background-color: var(--header-background-color);white-space:nowrap;overflow-x:auto;overflow-y:hidden;scrollbar-width:thin}
+ .nav-tile::-webkit-scrollbar{height:5px}
+ .nav-tile.right{text-align:right}
+ .nav-item,.nav-user{position:relative;display:inline-block;text-align:center;margin:0}
+ .nav-item a{min-width:0}
+ .nav-item a span{display:none}
 @@ -258,5 +259,7 @@
  .bannerInfo::before {content:"\f05a";font-family:fontAwesome;color:#e68a00}
  ::-webkit-scrollbar{width:8px;height:8px;background:transparent}
diff --git a/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-white-css-modification.patch b/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-white-css-modification.patch
index a6e417647..76045e472 100644
--- a/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-white-css-modification.patch
+++ b/api/src/unraid-api/unraid-file-modifier/modifications/patches/default-white-css-modification.patch
@@ -11,6 +11,32 @@ Index: /usr/local/emhttp/plugins/dynamix/styles/default-white.css
  p.centered{text-align:left}
  p:empty{display:none}
  a:hover{text-decoration:underline}
+@@ -69,11 +70,11 @@
+ .nav-item .system{vertical-align:middle;padding-bottom:2px}
+ .nav-item a{color:#f2f2f2;background-color:transparent;text-transform:uppercase;font-weight:bold;display:block;padding:0 10px}
+ .nav-item a{text-decoration:none;text-decoration-skip-ink:auto;-webkit-text-decoration-skip:objects;-webkit-transition:all .25s ease-out;transition:all .25s ease-out}
+ .nav-item:after,.nav-user.show:after{border-radius:4px;display:block;background-color:transparent;content:"";width:32px;height:2px;bottom:8px;position:absolute;left:50%;margin-left:-16px;-webkit-transition:all .25s ease-in-out;transition:all .25s ease-in-out;pointer-events:none}
+ .nav-item:focus:after,.nav-item:hover:after,.nav-user.show:hover:after{background-color:#f15a2c}
+-.nav-item.active:after{background-color:#f2f2f2}
++.nav-item.active:after{background-color: var(--header-background-color)}
+ .nav-user a{color:#f2f2f2;background-color:transparent;display:block;padding:0 10px}
+ .nav-user .system{vertical-align:middle;padding-bottom:2px}
+ #clear{clear:both}
+ #footer{position:fixed;bottom:0;left:0;color:#2b2a29;background-color:#d4d5d6;padding:5px 0;width:100%;height:1.6rem;line-height:1.6rem;text-align:center;z-index:10000}
+ #statusraid{float:left;padding-left:10px}
+@@ -151,11 +152,11 @@
+ table.dashboard tr:nth-child(even){background-color:transparent}
+ table.dashboard tr:last-child>td{padding-bottom:20px}
+ table.dashboard tr.last>td{padding-bottom:20px}
+ table.dashboard tr.header>td{padding-bottom:10px}
+ table.dashboard td{line-height:2.4rem;height:2.4rem}
+-table.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color:#f2f2f2}
++table.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color: var(--header-background-color)}
+ table.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
+ table.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
+ table.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
+ table.dashboard td span.info{float:right;margin-right:20px;font-size:1.2rem;font-weight:normal;text-transform:none;letter-spacing:0}
+ table.dashboard td span.info.title{font-weight:bold}
 @@ -258,5 +259,7 @@
  .bannerInfo::before {content:"\f05a";font-family:fontAwesome;color:#e68a00}
  ::-webkit-scrollbar{width:8px;height:8px;background:transparent}