diff --git a/css/addons/bazarr/bazarr-darker/bazarr-darker.css b/css/addons/bazarr/bazarr-darker/bazarr-darker.css
index 96d03ac3..33e5d42d 100644
--- a/css/addons/bazarr/bazarr-darker/bazarr-darker.css
+++ b/css/addons/bazarr/bazarr-darker/bazarr-darker.css
@@ -1,11 +1,11 @@
 :root {
-    --main-bg-color: #313544;
+    --main-bg-color: #202020;
 
-    --modal-bg-color: #252833;
-    --modal-header-color: #252833;
-    --modal-footer-color: #252833;
+    --modal-bg-color: #2a2a2a;
+    --modal-header-color: #2a2a2a;
+    --modal-footer-color: #2a2a2a;
 
-    --drop-down-menu-bg: #252833;
+    --drop-down-menu-bg: #333;
 
     --button-color: #911f93;
     --button-color-hover: #721873;
@@ -24,15 +24,16 @@
 
     /*Specials*/
     --arr-queue-color: #6c757d;
-    --side-menu-active: #252833;
-    --side-menu-color: #3a3f51;
+    --side-menu-active: #333333;
     --side-menu-link-color: #fff;
     --scroller-hover: #606060;
     --scroller: #707070;
     --border-color: #606060;
     --label-color: #911f93;
     --label-info: #5d9cec;
-    --header-color: #911f93;
+    --header-color: #2a2a2a;
+    --toolbar-background: #262626;
+    --side-menu-color: #2a2a2a;
 }
 
 /* HEADER */
diff --git a/css/addons/lidarr/lidarr-darker/lidarr-darker.css b/css/addons/lidarr/lidarr-darker/lidarr-darker.css
index 16c08f6c..47505295 100644
--- a/css/addons/lidarr/lidarr-darker/lidarr-darker.css
+++ b/css/addons/lidarr/lidarr-darker/lidarr-darker.css
@@ -1,11 +1,12 @@
+@import url("/theme.park/css/defaults/servarr-darker-base.css");
 :root {
-    --main-bg-color: #454545;
+    --main-bg-color: #202020;
 
-    --modal-bg-color: #353535;
-    --modal-header-color: #353535;
-    --modal-footer-color: #353535;
+    --modal-bg-color: #2a2a2a;
+    --modal-header-color: #2a2a2a;
+    --modal-footer-color: #2a2a2a;
 
-    --drop-down-menu-bg: #4d8069;
+    --drop-down-menu-bg: #333;
 
     --button-color: #5899eb;
     --button-color-hover: #4b91ea;
@@ -24,87 +25,16 @@
 
     /*Specials*/
     --arr-queue-color: #00a65b;
-    --side-menu-active: #252525;
+    --side-menu-active: #333333;
     --scroller-hover: #606060;
     --scroller: #707070;
     --border-color: #606060;
     --label-color: #1d563d;
     --label-info: #5d9cec;
-    --header-color: #00a65b;
-    --side-menu-color: #353535;
-}
-
-/* HEADER */
-
-[class*="PageHeader-header-"] {
-    background-color: var(--header-color);
-    color: #fff;
-}
-
-[class*="PageToolbar-toolbar-"] {
-    background-color: #1d563d;
-    color: #e1e2e3;
-}
-
-/* SIDE MENU */
-
-[class*="PageSidebar-sidebar-"] {
-    background-color: #353535;
-    color: #fff;
-}
-
-[class*=PageSidebarItem-link-]:focus {
-    color: rgb(var(--accent-color)) !important;
-}
-
-[class*=PageSidebarItem-isActiveLink-] {
-    color: var(--link-color) !important;
-}
-
-[class*=PageSidebarItem-isActiveParentLink-] {
-    background-color: var(--side-menu-active);
-}
-
-/* SCROLLER */
-
-[class*=OverlayScroller-thumb-]:hover {
-    background-color: var(--scroller-hover) !important;
-}
-
-[class*="OverlayScroller-thumb-"],
-[class*=Scroller-scroller-]::-webkit-scrollbar-thumb {
-    background-color: var(--scroller) !important;
-}
-
-/* MODALS */
-
-[class*=ModalHeader-modalHeader-],
-[class*=FieldSet-legend-] {
-    border-bottom: 1px solid var(--border-color);
-}
-
-[class*=ModalFooter-modalFooter-] {
-    border-top: 1px solid var(--border-color);
-}
-
-/* LABLES */
-
-[class*="Label-default-"] {
-    border-color: var(--label-color);
-    background-color: var(--label-color);
-    color: white;
-}
-
-[class*="Label-info-"]:not([class*="PageSidebarItem-status-"] [class*="Label-info-"]) {
-    border-color: var(--label-info);
-    background-color: var(--label-info);
-    color: #fff;
-}
-
-/* SETTINGS */
-
-[class*=Settings-link-] {
-    border-bottom: 1px solid var(--border-color);
+    --header-color: #2a2a2a;
+    --toolbar-background: #262626;
+    --side-menu-color: #2a2a2a;
+    --side-menu-link-color: #00a65b;
 }
 
 /* SEARCH DROP DOWN */
diff --git a/css/addons/prowlarr/prowlarr-darker/prowlarr-darker.css b/css/addons/prowlarr/prowlarr-darker/prowlarr-darker.css
index 08d7821f..698b6994 100644
--- a/css/addons/prowlarr/prowlarr-darker/prowlarr-darker.css
+++ b/css/addons/prowlarr/prowlarr-darker/prowlarr-darker.css
@@ -1,11 +1,12 @@
+@import url("/theme.park/css/defaults/servarr-darker-base.css");
 :root {
-    --main-bg-color: #454545;
+    --main-bg-color: #202020;
 
-    --modal-bg-color: #454545;
-    --modal-header-color: #454545;
-    --modal-footer-color: #454545;
+    --modal-bg-color: #2a2a2a;
+    --modal-header-color: #2a2a2a;
+    --modal-footer-color: #2a2a2a;
 
-    --drop-down-menu-bg: #606060;
+    --drop-down-menu-bg: #333;
 
     --button-color: #5899eb;
     --button-color-hover: #4b91ea;
@@ -28,106 +29,27 @@
     --scroller-hover: #606060;
     --scroller: #707070;
     --border-color: #606060;
-    --label-color: #707070;
+    --label-color: #e66000;
     --label-info: #5d9cec;
-    --header-color: #e66000;
-    --side-menu-color: #595959;
+    --header-color: #2a2a2a;
+    --toolbar-background: #262626;
+    --side-menu-color: #2a2a2a;
     --side-menu-link-color: #e66000;
 }
 
-/* HEADER */
-
-[class*="PageHeader-header-"] {
-    background-color: var(--header-color);
-    color: #fff;
-}
-
-[class*="PageToolbar-toolbar-"] {
-    background-color: #707070;
-    color: var(--text);
-}
-
-/* SIDE MENU */
-
-[class*="PageSidebar-sidebar-"] {
-    background-color: var(--side-menu-color);
-    color: #fff;
-}
-
-[class*=PageSidebarItem-link-]:focus {
-    color: rgb(var(--accent-color)) !important;
-}
-
-[class*=PageSidebarItem-isActiveLink-] {
-    color: var(--side-menu-link-color) !important;
-}
-
-[class*=PageSidebarItem-isActiveParentLink-] {
-    background-color: var(--side-menu-active);
-}
-
-/* SCROLLER */
-
-[class*=ImportSeriesSelectSeries-results-]::-webkit-scrollbar-thumb:hover,
-[class*=OverlayScroller-thumb-]:hover {
-    background-color: var(--scroller-hover) !important;
-}
-
-[class*="OverlayScroller-thumb-"],
-[class*=Scroller-scroller-]::-webkit-scrollbar-thumb {
-    background-color: var(--scroller) !important;
-}
-
-/* MODALS */
-
-[class*=ModalHeader-modalHeader-],
-[class*=FieldSet-legend-] {
-    border-bottom: 1px solid var(--border-color);
-}
-
-[class*=ModalFooter-modalFooter-] {
-    border-top: 1px solid var(--border-color);
-}
-
-/* LABLES */
-
-[class*="Label-default-"] {
-    border-color: var(--label-color);
-    background-color: var(--label-color);
-    color: white;
-}
-
-[class*="Label-info-"]:not([class*="PageSidebarItem-status-"] [class*="Label-info-"]) {
-    border-color: var(--label-info);
-    background-color: var(--label-info);
-    color: #fff;
-}
-
-[class*="Label-disabled-"][class*="Label-outline-"] {
-    color: #000;
-}
-
-[class*="Label-outline-"] {
-    background-color: #989898;
-}
-
-[class*="Label-success-"] {
-    color: #000;
-}
-
-/* SETTINGS */
-
-[class*=Settings-link-] {
-    border-bottom: 1px solid var(--border-color);
-}
 
 /* SEARCH DROP DOWN */
-
 [class*=IndexerSearchInput-containerOpen-] [class*=IndexerSearchInput-movieContainer-] {
     border: 1px solid var(--drop-down-menu-bg);
     background-color: var(--drop-down-menu-bg);
-    box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%);
+    box-shadow: none;
     color: #e1e2e3;
 }
 
-/* BUTTONS */
+canvas {
+    filter: none !important
+}
+
+[class*="Stats-fullWidthChart-"], [class*="Stats-halfWidthChart-"] {
+    background: transparent !important;
+}
diff --git a/css/addons/radarr/radarr-darker/radarr-darker.css b/css/addons/radarr/radarr-darker/radarr-darker.css
index 1b7f3bca..a0ddcaad 100644
--- a/css/addons/radarr/radarr-darker/radarr-darker.css
+++ b/css/addons/radarr/radarr-darker/radarr-darker.css
@@ -1,11 +1,12 @@
+@import url("/theme.park/css/defaults/servarr-darker-base.css");
 :root {
-    --main-bg-color: #454545;
+    --main-bg-color: #202020;
 
-    --modal-bg-color: #595959;
-    --modal-header-color: #595959;
-    --modal-footer-color: #595959;
+    --modal-bg-color: #2a2a2a;
+    --modal-header-color: #2a2a2a;
+    --modal-footer-color: #2a2a2a;
 
-    --drop-down-menu-bg: #606060;
+    --drop-down-menu-bg: #333;
 
     --button-color: #5899eb;
     --button-color-hover: #4b91ea;
@@ -13,10 +14,10 @@
     --button-text-hover: #fff;
 
     --accent-color: 255, 194, 48;
-    --accent-color-hover: rgb(255, 194, 48, .8);
-    --link-color: rgb(255, 194, 48);
+    --accent-color-hover: rgba(255, 194, 48, 0.8);
+    --link-color: #ffc230;
     --link-color-hover: rgb(255, 194, 48, .8);
-    --label-text-color: #eee;
+    --label-text-color: #2f2f2f;
 
     --text: #ccc;
     --text-hover: #fff;
@@ -28,83 +29,12 @@
     --scroller-hover: #606060;
     --scroller: #707070;
     --border-color: #606060;
-    --label-color: #707070;
+    --label-color: #ffc230;
     --label-info: #5d9cec;
-    --header-color: #464b51;
-    --side-menu-color: #595959;
-}
-
-/* HEADER */
-
-[class*="PageHeader-header-"] {
-    background-color: var(--header-color);
-    color: #fff;
-}
-
-[class*="PageToolbar-toolbar-"] {
-    background-color: #707070;
-    color: var(--text);
-}
-
-/* SIDE MENU */
-
-[class*="PageSidebar-sidebar-"] {
-    background-color: var(--side-menu-color);
-    color: #fff;
-}
-
-[class*=PageSidebarItem-link-]:focus {
-    color: rgb(var(--accent-color)) !important;
-}
-
-[class*=PageSidebarItem-isActiveLink-] {
-    color: var(--link-color) !important;
-}
-
-[class*=PageSidebarItem-isActiveParentLink-] {
-    background-color: var(--side-menu-active);
-}
-
-/* SCROLLER */
-[class*=ImportSeriesSelectSeries-results-]::-webkit-scrollbar-thumb:hover,
-[class*=OverlayScroller-thumb-]:hover {
-    background-color: var(--scroller-hover) !important;
-}
-
-[class*="OverlayScroller-thumb-"],
-[class*=Scroller-scroller-]::-webkit-scrollbar-thumb {
-    background-color: var(--scroller) !important;
-}
-
-/* MODALS */
-
-[class*=ModalHeader-modalHeader-],
-[class*=FieldSet-legend-] {
-    border-bottom: 1px solid var(--border-color);
-}
-
-[class*=ModalFooter-modalFooter-] {
-    border-top: 1px solid var(--border-color);
-}
-
-/* LABLES */
-
-[class*="Label-default-"] {
-    border-color: var(--label-color);
-    background-color: var(--label-color);
-    color: white;
-}
-
-[class*="Label-info-"]:not([class*="PageSidebarItem-status-"] [class*="Label-info-"]) {
-    border-color: var(--label-info);
-    background-color: var(--label-info);
-    color: #fff;
-}
-
-/* SETTINGS */
-
-[class*=Settings-link-] {
-    border-bottom: 1px solid var(--border-color);
+    --header-color: #2a2a2a;
+    --toolbar-background: #262626;
+    --side-menu-color: #2a2a2a;
+    --side-menu-link-color: #ffc230;
 }
 
 /* SEARCH DROP DOWN */
@@ -120,5 +50,5 @@
 
 [class*="MovieIndexPoster-controls-"] {
     background-color: var(--label-color) !important;
-    color: #fff !important;
+    color: var(--label-text-color) !important;
 }
\ No newline at end of file
diff --git a/css/addons/readarr/readarr-darker/readarr-darker.css b/css/addons/readarr/readarr-darker/readarr-darker.css
index 6f86088c..bdc978a5 100644
--- a/css/addons/readarr/readarr-darker/readarr-darker.css
+++ b/css/addons/readarr/readarr-darker/readarr-darker.css
@@ -1,11 +1,12 @@
+@import url("/theme.park/css/defaults/servarr-darker-base.css");
 :root {
-    --main-bg-color: #4a4a4b;
+    --main-bg-color: #202020;
 
-    --modal-bg-color: #353535;
-    --modal-header-color: #353535;
-    --modal-footer-color: #353535;
+    --modal-bg-color: #2a2a2a;
+    --modal-header-color: #2a2a2a;
+    --modal-footer-color: #2a2a2a;
 
-    --drop-down-menu-bg: #66001a;
+    --drop-down-menu-bg: #333;
 
     --button-color: #5899eb;
     --button-color-hover: #4b91ea;
@@ -23,104 +24,22 @@
     --text-muted: #999;
 
     /*Specials*/
-    --arr-queue-color: #1d563d;
-    --side-menu-active: #252525;
+    --arr-queue-color: #5d9cec;
+    --side-menu-active: #333333;
     --scroller-hover: #606060;
     --scroller: #707070;
     --border-color: #606060;
     --label-color: #810020;
     --label-info: #5d9cec;
-    --header-color: #a41726;
-    --side-menu-color: #353535;
+    --header-color: #2a2a2a;
+    --toolbar-background: #262626;
+    --side-menu-color: #2a2a2a;
     --side-menu-link-color: #ca302d;
 }
 
-/* HEADER */
-
-[class*="PageHeader-header-"] {
-    background-color: var(--header-color);
-    color: #fff;
-}
-
-[class*="PageToolbar-toolbar-"] {
-    background-color: #810020;
-    color: #e1e2e3;
-}
-
-/* SIDE MENU */
-
-[class*="PageSidebar-sidebar-"] {
-    background-color: #353535;
-    color: #fff;
-}
-
-[class*=PageSidebarItem-link-]:focus {
-    color: rgb(var(--accent-color)) !important;
-}
-
-[class*=PageSidebarItem-isActiveLink-] {
-    color: var(--side-menu-link-color) !important;
-}
-
-[class*=PageSidebarItem-isActiveParentLink-] {
-    background-color: var(--side-menu-active);
-}
-
-/* SCROLLER */
-[class*=ImportSeriesSelectSeries-results-]::-webkit-scrollbar-thumb:hover,
-[class*=OverlayScroller-thumb-]:hover {
-    background-color: var(--scroller-hover) !important;
-}
-
-[class*="OverlayScroller-thumb-"],
-[class*=Scroller-scroller-]::-webkit-scrollbar-thumb {
-    background-color: var(--scroller) !important;
-}
-
-/* MODALS */
-[class*=ModalHeader-modalHeader-],
-[class*=FieldSet-legend-] {
-    border-bottom: 1px solid var(--border-color);
-}
-
-[class*=ModalFooter-modalFooter-] {
-    border-top: 1px solid var(--border-color);
-}
-
-/* LABLES */
-[class*="Label-default-"] {
-    border-color: var(--label-color);
-    background-color: var(--label-color);
-    color: white;
-}
-
-[class*="Label-info-"]:not([class*="PageSidebarItem-status-"] [class*="Label-info-"]) {
-    border-color: var(--label-info);
-    background-color: var(--label-info);
-    color: #fff;
-}
-.Label-default-xecWd {
-    border-color: #810020;
-    background-color: #810020;
-}
-
-/* SETTINGS */
-
-[class*=Settings-link-] {
-    border-bottom: 1px solid var(--border-color);
-}
-
-/* SEARCH DROP DOWN */
-[class*="MovieSearchInput-containerOpen-"] [class*="MovieSearchInput-movieContainer-"] {
-    border: 1px solid var(--drop-down-menu-bg);
-    background-color: var(--drop-down-menu-bg);
-    box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%);
-    color: #e1e2e3;
-}
-
 /* AUTHOR PAGE */
 
 [class*="AuthorDetailsHeader-headerContent-"], [class*="BookDetailsHeader-headerContent-"] {
-    color: #fff;
-    background: #4a4a4b;
+    color: var(--text);
+    background: var(--main-bg-color);
 }
\ No newline at end of file
diff --git a/css/addons/sonarr/sonarr-darker/sonarr-darker.css b/css/addons/sonarr/sonarr-darker/sonarr-darker.css
index 5efcc267..6bf890da 100644
--- a/css/addons/sonarr/sonarr-darker/sonarr-darker.css
+++ b/css/addons/sonarr/sonarr-darker/sonarr-darker.css
@@ -1,11 +1,12 @@
+@import url("/theme.park/css/defaults/servarr-darker-base.css");
 :root {
-    --main-bg-color: #4f566f;
+    --main-bg-color: #202020;
 
-    --modal-bg-color: #3a3f51;
-    --modal-header-color: #3a3f51;
-    --modal-footer-color: #3a3f51;
+    --modal-bg-color: #2a2a2a;
+    --modal-header-color: #2a2a2a;
+    --modal-footer-color: #2a2a2a;
 
-    --drop-down-menu-bg: #3a3f51;
+    --drop-down-menu-bg: #333;
 
     --button-color: #5899eb;
     --button-color-hover: #3483e7;
@@ -16,50 +17,25 @@
     --accent-color-hover: rgb(33, 147, 181);
     --link-color: #35c5f4;
     --link-color-hover: rgb(53, 197, 244, .8);
-    --label-text-color: #4f566f;
+    --label-text-color: #272a36;
 
     --text: #ccc;
     --text-hover: #fff;
-    --text-muted: #999;
+    --text-muted: #bebebe;
 
     /*Specials*/
     --arr-queue-color: #35c5f4;
-    --side-menu-active: #252833;
-    --scroller-hover: #656d8c;
-    --scroller: #9ea4b9;
-    --border-color: #4f566f;
-    --label-color: #4f566f;
+    --side-menu-active: #333333;
+    --scroller-hover: #606060;
+    --scroller: #707070;
+    --border-color: #606060;
+    --label-color: #35c5f4;
     --label-info: #5d9cec;
-    --header-color: #2193b5;
-    --side-menu-color: #3a3f51;
+    --header-color: #2a2a2a;
+    --toolbar-background: #262626;
+    --side-menu-color: #2a2a2a;
+    --side-menu-link-color: #35c5f4;
 }
-
-/* HEADER */
-
-[class*="PageHeader-header-"] {
-    background-color: var(--header-color);
-    color: #fff;
-}
-
-/* SIDE MENU */
-
-[class*="PageSidebar-sidebar-"] {
-    background-color: var(--side-menu-color);
-    color: #fff;
-}
-
-[class*=PageSidebarItem-link-]:focus {
-    color: rgb(var(--accent-color)) !important;
-}
-
-[class*=PageSidebarItem-isActiveLink-] {
-    color: var(--link-color) !important;
-}
-
-[class*=PageSidebarItem-isActiveParentLink-] {
-    background-color: var(--side-menu-active);
-}
-
 /* SCROLLER */
 [class*=ImportSeriesSelectSeries-results-]::-webkit-scrollbar-thumb:hover,
 [class*=OverlayScroller-thumb-]:hover {
@@ -71,35 +47,6 @@
     background-color: var(--scroller) !important;
 }
 
-/* MODALS */
-[class*=ModalHeader-modalHeader-],
-[class*=FieldSet-legend-] {
-    border-bottom: 1px solid var(--border-color);
-}
-
-[class*=ModalFooter-modalFooter-] {
-    border-top: 1px solid var(--border-color);
-}
-
-/* LABLES */
-[class*=Label-default-] {
-    border-color: var(--label-color);
-    background-color: var(--label-color);
-    color: white;
-}
-
-[class*="Label-info-"]:not([class*="PageSidebarItem-status-"] [class*="Label-info-"]) {
-    border-color: var(--label-info);
-    background-color: var(--label-info);
-    color: white;
-}
-
-/* SETTINGS */
-
-[class*=Settings-link-] {
-    border-bottom: 1px solid var(--border-color);
-}
-
 /* SEARCH DROP DOWN */
 [class*="SeriesSearchInput-containerOpen-"] [class*="SeriesSearchInput-seriesContainer-"] {
     border: 1px solid var(--drop-down-menu-bg);
diff --git a/css/base/grafana/organizr-dashboard.css b/css/base/grafana/organizr-dashboard.css
index 24e0c9a3..48a5901a 100644
--- a/css/base/grafana/organizr-dashboard.css
+++ b/css/base/grafana/organizr-dashboard.css
@@ -250,8 +250,8 @@ div.flot-text {
 @import url(/theme.park/css/base/grafana/grafana-base.css);
 
 :root {
-  --main-bg-color: url("/theme.park/resources/blur-noise.png"), url("/theme.park/resources/preset-light2.png") center center/cover no-repeat fixed;
-  --modal-bg-color: url("/theme.park/resources/blur-noise.png"), url("/theme.park/resources/preset-dark2.png") center center/cover no-repeat fixed;
+  --main-bg-color: url(/theme.park/resources/blur-noise.png), url(/theme.park/resources/preset-light2.png) center center/cover no-repeat fixed;
+  --modal-bg-color: url(/theme.park/resources/blur-noise.png), url(/theme.park/resources/preset-dark2.png) center center/cover no-repeat fixed;
  
   --button-color: #cc7b19;
   --button-color-hover: #e59029;
diff --git a/css/base/guacamole/guacamole-base.css b/css/base/guacamole/guacamole-base.css
index 90fa20be..4a086da5 100644
--- a/css/base/guacamole/guacamole-base.css
+++ b/css/base/guacamole/guacamole-base.css
@@ -230,7 +230,7 @@ textarea {
 }
 
 .loading::before {
-    background-image: url('/theme.park/resources/guacamole/cog.png');
+    background-image: url(/theme.park/resources/guacamole/cog.png);
 }
 
 table.sorted th.sort-primary.sort-descending:after {
diff --git a/css/base/organizr/organizr-base.css b/css/base/organizr/organizr-base.css
index ee933446..b5cefef2 100644
--- a/css/base/organizr/organizr-base.css
+++ b/css/base/organizr/organizr-base.css
@@ -150,16 +150,16 @@ h6 {
     color: var(--text-hover);
 }
 
-.btn:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
+.btn:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
 .cbutton {
     background: var(--button-color);
     border-color: var(--button-color);
     color: var(--button-text);
 }
 
-.btn:hover:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
-.btn:active:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
-.btn:focus:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
+.btn:hover:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
+.btn:active:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
+.btn:focus:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
 .cbutton:hover {
     background: var(--button-color-hover);
     border-color: var(--button-color-hover);
@@ -2429,6 +2429,10 @@ input:active:not(select),
     border: 1px solid rgba(120, 130, 140, 0.4);
 }
 
+select:focus {
+    background: var(--drop-down-menu-bg);
+    color: var(--text);
+}
 
 .cp-container .cp-pills li a {
     padding: 5px;
diff --git a/css/base/plex/plex-base.css b/css/base/plex/plex-base.css
index 2bfadc59..1dcb23f0 100644
--- a/css/base/plex/plex-base.css
+++ b/css/base/plex/plex-base.css
@@ -305,7 +305,8 @@ button:hover [class*="DisclosureArrow-disclosureArrow-"] {
 }
 
 [class*="PivotTab-selectedButton-"]:after,
-[class*="TabButton-selectedButton-"]:after {
+[class*="TabButton-selectedButton-"]:after,
+[class*="PageHeaderTabButton-isSelected-"]:after {
   background-color: rgb(var(--accent-color)) !important;
 }
 
diff --git a/css/base/rutorrent/rutorrent-base.css b/css/base/rutorrent/rutorrent-base.css
index 1c1b8b73..fa20949b 100644
--- a/css/base/rutorrent/rutorrent-base.css
+++ b/css/base/rutorrent/rutorrent-base.css
@@ -1625,7 +1625,7 @@ div#dlgEditRatioRules {
 }
 
 #autodl-multiselect-header {
-    background-image: url("/theme.park/resources/rutorrent/dlg-autodl-irc.gif");
+    background-image: url(/theme.park/resources/rutorrent/dlg-autodl-irc.gif");
 }
 
 .shieven {
diff --git a/css/community-theme-options/blackberry-carol.css b/css/community-theme-options/blackberry-carol.css
index d7ccc15d..12be11b2 100644
--- a/css/community-theme-options/blackberry-carol.css
+++ b/css/community-theme-options/blackberry-carol.css
@@ -1,5 +1,5 @@
 :root {
-  --main-bg-color: url("/theme.park/resources/blur-noise.png"),
+  --main-bg-color: url(/theme.park/resources/blur-noise.png),
   radial-gradient(at center center, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9) 120%) center center/cover no-repeat fixed, 
   radial-gradient(at bottom center, rgba(0, 0, 0, 0.15), hsla(0, 14%, 18%, 0.45), hsla(0, 18%, 5%, 0.6)) center center/cover no-repeat fixed, 
   radial-gradient(at bottom center, rgba(167, 6, 6, 0.15), hsla(0, 14%, 18%, 0), hsla(0, 18%, 5%, 0)) center center/cover no-repeat fixed, 
@@ -34,7 +34,7 @@
   --plex-poster-unwatched: rgb(100, 15, 15);
   --petio-spinner: invert(68%) sepia(13%) saturate(766%) hue-rotate(170deg) brightness(90%) contrast(79%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
   --gitea-color-primary-dark-4: 100, 15, 15;
-  --overseerr-gradient: url("/theme.park/resources/blur-noise.png"),
+  --overseerr-gradient: url(/theme.park/resources/blur-noise.png),
   radial-gradient(at center center, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9) 120%) center center/cover no-repeat fixed, 
   radial-gradient(at bottom center, rgba(0, 0, 0, 0.15), hsla(0, 14%, 18%, 0.45), hsla(0, 18%, 5%, 0.6)) center center/cover no-repeat fixed, 
   radial-gradient(at bottom center, rgba(167, 6, 6, 0.15), hsla(0, 14%, 18%, 0), hsla(0, 18%, 5%, 0)) center center/cover no-repeat fixed, 
diff --git a/css/community-theme-options/mind.css b/css/community-theme-options/mind.css
index d02bea9c..eac5729b 100644
--- a/css/community-theme-options/mind.css
+++ b/css/community-theme-options/mind.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 242, 0, .7) 0%, #0d0400 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
-    url("/theme.park/resources/mind.jpg") center center/cover no-repeat fixed;
+    url(/theme.park/resources/mind.jpg) center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/css/community-theme-options/power.css b/css/community-theme-options/power.css
index 2b97a9d3..dc153abe 100644
--- a/css/community-theme-options/power.css
+++ b/css/community-theme-options/power.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(166, 40, 140, .7) 0%, rgba(11,8,51,1) 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
-    url("/theme.park/resources/power.jpg") center center/cover no-repeat fixed;
+    url(/theme.park/resources/power.jpg) center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/css/community-theme-options/reality.css b/css/community-theme-options/reality.css
index fd0e0d0e..8361cd23 100644
--- a/css/community-theme-options/reality.css
+++ b/css/community-theme-options/reality.css
@@ -1,6 +1,6 @@
     :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(232, 11, 11, 0.7) 0%, #08000d 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
-  url("/theme.park/resources/reality.jpg") center center/cover no-repeat fixed;
+  url(/theme.park/resources/reality.jpg) center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/css/community-theme-options/soul.css b/css/community-theme-options/soul.css
index c6a67e99..71d17171 100644
--- a/css/community-theme-options/soul.css
+++ b/css/community-theme-options/soul.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 153, 0, .7) 0%, #3c0015 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
-    url("/theme.park/resources/soul.jpg") center center/cover no-repeat fixed;
+    url(/theme.park/resources/soul.jpg) center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
diff --git a/css/community-theme-options/space.css b/css/community-theme-options/space.css
index ea4bc482..ae4bf3b5 100644
--- a/css/community-theme-options/space.css
+++ b/css/community-theme-options/space.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(0, 98, 255, .7) 0%, #020013 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
-    url("/theme.park/resources/space.jpg") center center/cover no-repeat fixed;
+    url(/theme.park/resources/space.jpg) center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
   --modal-headercolor: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
diff --git a/css/community-theme-options/time.css b/css/community-theme-options/time.css
index fac880bd..983e2fd3 100644
--- a/css/community-theme-options/time.css
+++ b/css/community-theme-options/time.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(109, 247, 81, .7) 0%, #00130c 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
-    url("/theme.park/resources/time.jpg") center center/cover no-repeat fixed;
+    url(/theme.park/resources/time.jpg) center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
diff --git a/css/defaults/servarr-base.css b/css/defaults/servarr-base.css
index 9e061a70..364ed226 100644
--- a/css/defaults/servarr-base.css
+++ b/css/defaults/servarr-base.css
@@ -322,7 +322,6 @@ a:hover {
 
 
 [class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
-[class*="Popover-title-"],
 [class*="SeasonInfo-title-"],
 [class*="Popover-body-"],
 [class*="Tooltip-body-"],
@@ -332,6 +331,11 @@ a:hover {
     color: var(--text-hover);
 }
 
+[class*="Popover-title-"] {
+    background-color: rgba(0, 0, 0, 0.2);
+    border-bottom: rgba(255, 255, 255, 0.2) 1px solid;
+}
+
 /* @supports (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter:blur(1em)) {
     [class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
     [class*="Popover-title-"],
@@ -444,6 +448,14 @@ a:hover {
     border-top: 1px solid var(--transparency-light-25);
 }
 
+[class*="TablePager-records-"] {
+    color: var(--text);
+}
+
+[class*="TablePager-disabledPageButton-"] {
+    color: var(--text-muted);
+}
+
 /* TOP MENU */
 [class*="PageToolbar-toolbar-"] {
     background: var(--transparency-dark-25);
diff --git a/css/defaults/servarr-darker-base.css b/css/defaults/servarr-darker-base.css
new file mode 100644
index 00000000..867417fa
--- /dev/null
+++ b/css/defaults/servarr-darker-base.css
@@ -0,0 +1,96 @@
+
+/* HEADER */
+
+[class*="PageHeader-header-"] {
+    background-color: var(--header-color);
+    color: #fff;
+    box-shadow: 0 4px 8px 0 rgb(0 0 0 / 20%), 0 6px 20px 0 rgb(0 0 0 / 19%);
+}
+
+[class*="PageToolbar-toolbar-"] {
+    background-color: var(--toolbar-background);
+    color: var(--text);
+}
+
+/* SIDE MENU */
+
+[class*="PageSidebar-sidebar-"] {
+    background-color: var(--side-menu-color);
+    color: #fff;
+}
+
+[class*=PageSidebarItem-link-]:focus {
+    color: rgb(var(--accent-color)) !important;
+}
+
+[class*=PageSidebarItem-isActiveLink-] {
+    color: var(--side-menu-link-color) !important;
+}
+
+[class*=PageSidebarItem-isActiveParentLink-] {
+    background-color: var(--side-menu-active);
+}
+
+/* SCROLLER */
+
+[class*=OverlayScroller-thumb-]:hover {
+    background-color: var(--scroller-hover) !important;
+}
+
+[class*="OverlayScroller-thumb-"],
+[class*=Scroller-scroller-]::-webkit-scrollbar-thumb {
+    background-color: var(--scroller) !important;
+}
+
+/* MODALS */
+
+[class*=ModalHeader-modalHeader-],
+[class*=FieldSet-legend-] {
+    border-bottom: 1px solid var(--border-color);
+}
+
+[class*=ModalFooter-modalFooter-] {
+    border-top: 1px solid var(--border-color);
+}
+
+/* LABLES */
+
+[class*="Label-default-"] {
+    border-color: var(--label-color);
+    background-color: var(--label-color);
+    color: var(--label-text-color);
+}
+
+[class*="Label-info-"]:not([class*="PageSidebarItem-status-"] [class*="Label-info-"]) {
+    border-color: var(--label-info);
+    background-color: var(--label-info);
+    color: #fff;
+}
+
+[class*="Label-disabled-"][class*="Label-outline-"] {
+    color: #000;
+}
+
+[class*="Label-outline-"] {
+    background-color: #989898;
+}
+
+[class*="Label-success-"] {
+    color: #000;
+}
+
+/* SETTINGS */
+
+[class*=Settings-link-] {
+    border-bottom: 1px solid var(--border-color);
+}
+
+[class*="MenuContent-scroller-"] {
+    box-shadow: none;
+}
+
+[class*="Card-card-"], [class*="QualityProfiles-addQualityProfile-"] {
+    background: var(--transparency-light-10);
+    box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.5);
+    color: var(--text);
+}
\ No newline at end of file
diff --git a/css/theme-options/maroon.css b/css/theme-options/maroon.css
new file mode 100644
index 00000000..7fcc03bd
--- /dev/null
+++ b/css/theme-options/maroon.css
@@ -0,0 +1,30 @@
+:root {
+    --main-bg-color: radial-gradient( circle farthest-corner at 48.4% 47.5%,  rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;
+    
+    --modal-bg-color: radial-gradient( circle farthest-corner at 48.4% 47.5%,  rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;
+    --modal-header-color: radial-gradient( circle farthest-corner at 48.4% 47.5%,  rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;
+    --modal-footer-color: radial-gradient( circle farthest-corner at 48.4% 47.5%,  rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;
+  
+    --drop-down-menu-bg: #204c80;
+    
+    --button-color: #7b154d;
+    --button-color-hover: rgb(150, 26, 94);
+    --button-text: #eee;
+    --button-text-hover: #FFF;
+    
+    --accent-color: 208, 103, 160;
+    --accent-color-hover: rgb(var(--accent-color),.8);
+    --queue-color: #6b5;
+    --link-color: rgb(162, 28, 101);
+    --link-color-hover: rgb(150, 26, 94);
+      
+    --text:#dadada;
+    --text-hover: #fff;
+    --text-muted: #999;
+
+    --arr-queue-color: rgb(0, 255, 157);
+    --plex-poster-unwatched: rgb(123, 21, 77);
+    --petio-spinner: invert(13%) sepia(77%) saturate(2418%) hue-rotate(306deg) brightness(94%) contrast(98%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
+    --gitea-color-primary-dark-4: 150, 26, 94;
+    --overseerr-gradient: linear-gradient(0deg, rgba(76,21,51,.9) 0%, rgb(34,10,37,.9) 100%) center center/cover no-repeat fixed;
+  }
\ No newline at end of file
diff --git a/css/theme-options/plex.css b/css/theme-options/plex.css
index ca8498a3..15429146 100644
--- a/css/theme-options/plex.css
+++ b/css/theme-options/plex.css
@@ -1,8 +1,8 @@
  :root {
    /* 
-     --main-bg-color: url("/theme.park/resources/blur-noise.png"), url("/theme.park/resources/preset-light2.png") center center/cover no-repeat fixed;
-     --modal-bg-color: url("/theme.park/resources/blur-noise.png"), url("/theme.park/resources/preset-dark2.png") center center/cover no-repeat fixed;
-     --main-bg-color: url("/theme.park/resources/blur-noise.png") repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0) center center/cover no-repeat fixed;
+     --main-bg-color: url(/theme.park/resources/blur-noise.png), url(/theme.park/resources/preset-light2.png) center center/cover no-repeat fixed;
+     --modal-bg-color: url(/theme.park/resources/blur-noise.png), url(/theme.park/resources/preset-dark2.png) center center/cover no-repeat fixed;
+     --main-bg-color: url(/theme.park/resources/blur-noise.png) repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0) center center/cover no-repeat fixed;
      */
    --main-bg-color: radial-gradient(circle farthest-side at 0% 100%, rgb(47, 47, 47) 0%, rgba(47, 47, 47, 0) 100%), radial-gradient(circle farthest-side at 100% 100%, rgb(63, 63, 63) 0%, rgba(63, 63, 63, 0) 100%), radial-gradient(circle farthest-side at 100% 0%, rgb(76, 76, 76) 0%, rgba(76, 76, 76, 0) 100%), radial-gradient(circle farthest-side at 0% 0%, rgb(58, 58, 58) 0%, rgba(58, 58, 58, 0) 100%), black center center/cover no-repeat fixed;
    --modal-bg-color: #282828;
@@ -31,5 +31,5 @@
     --plex-poster-unwatched: #e5a00d;
     --petio-spinner: invert(0%) sepia(0%) saturate(100%) hue-rotate(0deg) brightness(100%) contrast(100%);/* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
     --gitea-color-primary-dark-4: 255, 193, 7;
-    --overseerr-gradient: url("/theme.park/resources/blur-noise.png") repeat scroll 0% 0%, radial-gradient(circle at 0% 100% , rgba(54, 66, 84, 0.55) 0% , rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%) center center/cover no-repeat fixed , radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%) center center/cover no-repeat fixed , rgb(0, 0, 0,.9) center center/cover no-repeat fixed;
+    --overseerr-gradient: url(/theme.park/resources/blur-noise.png) repeat scroll 0% 0%, radial-gradient(circle at 0% 100% , rgba(54, 66, 84, 0.55) 0% , rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%) center center/cover no-repeat fixed , radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%) center center/cover no-repeat fixed , rgb(0, 0, 0,.9) center center/cover no-repeat fixed;
    }
\ No newline at end of file
diff --git a/docker-mods/plex/root/etc/cont-init.d/98-themepark b/docker-mods/plex/root/etc/cont-init.d/98-themepark
index eabe9546..4d042c9a 100644
--- a/docker-mods/plex/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/plex/root/etc/cont-init.d/98-themepark
@@ -45,7 +45,7 @@ if [[ -z ${TP_THEME} ]]; then
 fi
 
 # Adding stylesheets     
-if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
diff --git a/docker-mods/swag/root/themepark-confs/themepark.subdomain.conf.sample b/docker-mods/swag/root/themepark-confs/themepark.subdomain.conf.sample
index 766ed034..81382fcf 100644
--- a/docker-mods/swag/root/themepark-confs/themepark.subdomain.conf.sample
+++ b/docker-mods/swag/root/themepark-confs/themepark.subdomain.conf.sample
@@ -16,7 +16,7 @@ server {
     location /themepark/ {
         alias /config/www/themepark/;
         sub_filter_types *;
-        sub_filter 'url("/theme.park/' 'url("/themepark/css/';
+        sub_filter ' url("/theme.park/css/' 'url("/themepark/css/';
         sub_filter_once off;
         try_files $uri $uri/ /index.html;
     }
diff --git a/docker-mods/swag/root/themepark-confs/themepark.subfolder.conf.sample b/docker-mods/swag/root/themepark-confs/themepark.subfolder.conf.sample
index 3469fd57..04a444d0 100644
--- a/docker-mods/swag/root/themepark-confs/themepark.subfolder.conf.sample
+++ b/docker-mods/swag/root/themepark-confs/themepark.subfolder.conf.sample
@@ -5,7 +5,7 @@
     location /themepark/ {
         alias /config/www/themepark/;
         sub_filter_types *;
-        sub_filter 'url("/theme.park/' 'url("/themepark/css/';
+        sub_filter ' url("/theme.park/css/' 'url("/themepark/css/';
         sub_filter_once off;
         try_files $uri $uri/ /index.html;
         # Don't cache
diff --git a/docker-mods/whisparr/Dockerfile b/docker-mods/whisparr/Dockerfile
new file mode 100644
index 00000000..116bed58
--- /dev/null
+++ b/docker-mods/whisparr/Dockerfile
@@ -0,0 +1,7 @@
+FROM scratch
+
+LABEL maintainer="GilbN" 
+LABEL app="Whisparr"
+
+#copy local files.
+COPY root/ /
\ No newline at end of file
diff --git a/docker-mods/whisparr/root/etc/cont-init.d/98-themepark b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark
new file mode 100644
index 00000000..8f710aaa
--- /dev/null
+++ b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark
@@ -0,0 +1,67 @@
+#!/usr/bin/with-contenv bash
+
+echo '-----------------------------'
+echo '|  Whisparr theme.park Mod  |'
+echo '-----------------------------'
+
+# Display variables for troubleshooting 
+echo -e "Variables set:\\n\
+'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
+'TP_SCHEME'=${TP_SCHEME}\\n\
+'TP_ADDON'=${TP_ADDON}\\n\
+'TP_THEME'=${TP_THEME}\\n"
+
+APP_FILEPATH='/app/whisparr/bin/UI/index.html'
+LOGIN_FILEPATH='/app/whisparr/bin/UI/login.html'
+if [ "${TP_HOTIO}" = true ]; then
+    echo 'Changing to Hotio file path!'
+    APP_FILEPATH='/app/bin/UI/index.html'
+    LOGIN_FILEPATH='/app/bin/UI/login.html'
+fi
+
+# Set default
+if [[ -z ${TP_DOMAIN} ]]; then
+    echo 'No domain set, defaulting to theme-park.dev'
+    TP_DOMAIN='theme-park.dev'
+fi
+if [[ -z ${TP_SCHEME} ]]; then
+    echo 'No scheme set, defaulting to https'
+    TP_SCHEME='https'
+fi
+
+THEME_TYPE='theme-options'
+if [ "${TP_COMMUNITY_THEME}" = true ]; then
+    THEME_TYPE='community-theme-options'
+fi
+
+case ${TP_DOMAIN} in
+  *"github.io"*)
+  echo "Switching to github.io URL style"
+    TP_DOMAIN="${TP_DOMAIN}\/theme.park"
+    ;;
+esac
+
+if [[ -z ${TP_THEME} ]]; then
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
+fi
+
+# Adding stylesheets
+if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
+    echo '---------------------------'
+    echo '|  Adding the stylesheet  |'
+    echo '---------------------------'
+    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/whisparr\/whisparr-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/whisparr\/whisparr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    printf 'Stylesheet set to %s\n' "${TP_THEME}"
+    if [[ -n ${TP_ADDON} ]]; then
+        for addon in $(echo "$TP_ADDON" | tr "|" " "); do
+        sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/whisparr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/whisparr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+        printf 'Added custom addon: %s\n\n' "${addon}"
+        done
+    fi
+fi
\ No newline at end of file
diff --git a/docker/root/defaults/default b/docker/root/defaults/default
index d1584d82..cc77b271 100644
--- a/docker/root/defaults/default
+++ b/docker/root/defaults/default
@@ -19,7 +19,8 @@ server {
     location /themepark/ {
         alias /config/www/;
         sub_filter_types *;
-        sub_filter 'url("/theme.park/' 'url("/themepark/css/';
+        sub_filter ' url("/theme.park/css/' 'url("/themepark/css/';
+        sub_filter 'url(/theme.park/resources/' 'url(/themepark/resources/';
         sub_filter_once off;
         try_files $uri $uri/ /index.html;
     }
diff --git a/resources/landing-page/css/custom.css b/resources/landing-page/css/custom.css
index 8060da05..96662f57 100644
--- a/resources/landing-page/css/custom.css
+++ b/resources/landing-page/css/custom.css
@@ -360,7 +360,7 @@ p {
 }
 
 #portfolio [class*="container-"] .portfolio-box .portfolio-box-caption.plex-hover {
-    background: url("https://theme-park.dev/resources/blur-noise.png") repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0);
+    background: url(/theme.park/resources/blur-noise.png) repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0);
 }
 
 #portfolio [class*="container-"] .portfolio-box .portfolio-box-caption.dracula-hover {
diff --git a/themes.py b/themes.py
index 2d7da52f..6f814b9c 100644
--- a/themes.py
+++ b/themes.py
@@ -126,7 +126,7 @@ def create_theme_options():
     def create_css(theme, theme_type="standard"):
         folder = "./css/base"
         with open(f"{folder}/{app}/{theme.lower()}.css", "w") as create_app:
-            content = f'@import url("/theme.park/css/base/{app}/{app}-base.css?sha={APP_SHAS.get(f"{app}-base.css")}");\n@import url("/theme.park/{"theme-options" if theme_type=="standard" else "community-theme-options"}/{theme.lower()}.css?sha={THEME_SHAS.get(f"{theme.lower()}.css") if theme_type=="standard" else COMMUNITY_THEME_SHAS.get(f"{theme.lower()}.css")}");'
+            content = f'@import url("/theme.park/css/base/{app}/{app}-base.css?sha={APP_SHAS.get(f"{app}-base.css")}");\n@import url("/theme.park/css/{"theme-options" if theme_type=="standard" else "community-theme-options"}/{theme.lower()}.css?sha={THEME_SHAS.get(f"{theme.lower()}.css") if theme_type=="standard" else COMMUNITY_THEME_SHAS.get(f"{theme.lower()}.css")}");'
             create_app.write(content)
     with open("themes.json") as themes:
         data = load(themes)