diff --git a/css/base/lidarr/lidarr-base.css b/css/base/lidarr/lidarr-base.css
index ad2009aa..eab46b40 100644
--- a/css/base/lidarr/lidarr-base.css
+++ b/css/base/lidarr/lidarr-base.css
@@ -717,6 +717,10 @@ a:hover {
 }
 
 /* SEARCH RESULTS */
+[class*="SearchResult-title-"]{
+    color:var(--link-color);
+}
+
 [class*="AddNewArtistSearchResult-year-"] {
     color: #fff;
 }
@@ -854,6 +858,10 @@ input:focus:-ms-input-placeholder {
 }
 
 /* CALENDAR */
+[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
+    stroke: white !important;
+}
+
 [class*="CalendarEvent-downloaded-"] {
     background: rgb(var(--calendar-available) / .7) !important;
     border-left-color: transparent !important;
@@ -894,12 +902,14 @@ input:focus:-ms-input-placeholder {
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-downloading-"] {
+[class*="CalendarEvent-downloading-"],
+[class*="CalendarEvent-queue-"] {
     background: rgb(var(--calendar-downloading) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover {
+[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover,
+[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover {
     background: rgb(var(--calendar-downloading) / .5) !important;
     border-left-color: transparent !important;
 }
diff --git a/css/base/plex/plex-base.css b/css/base/plex/plex-base.css
index 9db4c276..4e130a8f 100644
--- a/css/base/plex/plex-base.css
+++ b/css/base/plex/plex-base.css
@@ -94,7 +94,8 @@ a,
 [class*="PrePlayDetailsGroupItem-groupItem-"] a,
 [class*="MetadataPosterCardTitle-title-"] a,
 a[class*="MetadataPosterCardTitle-title-"],
-[class*="PrePlayTagListLink-tagsListLink-"][class*="Link-default-"] {
+[class*="PrePlayTagListLink-tagsListLink-"][class*="Link-default-"],
+[class*="MetadataPosterCardTitle-title-"] {
   color: var(--link-color)
 }
 
@@ -239,6 +240,11 @@ body,[class*="FullPageBackground-backgroundContainer-"] {
 
 /* ACCENTS */
 
+.heart-rating.user-rating, .star-rating.user-rating {
+  color: rgb(var(--accent-color));
+  opacity: 1;
+}
+
 [class*="Badge-primary-"],
 .nav-header>li>a.selected .badge {
   background-color: rgb(var(--accent-color));
@@ -506,7 +512,7 @@ circle {
 .well,
 .files ul li {
   color: var(--text);
-  background-color: rgb(255 255 255 / 10%);
+  background-color: rgb(0 0 0 / 10%);
   border: 1px solid transparent;
   -webkit-box-shadow: inset 0 1px 1px rgb(0 0 0 / 5%);
   box-shadow: inset 0 1px 1px rgb(0 0 0 / 5%);
diff --git a/css/base/radarr/radarr-base.css b/css/base/radarr/radarr-base.css
index a8dec1b7..06dfdcfe 100644
--- a/css/base/radarr/radarr-base.css
+++ b/css/base/radarr/radarr-base.css
@@ -723,6 +723,10 @@ a:hover {
 }
 
 /* SEARCH RESULTS */
+[class*="SearchResult-title-"]{
+    color:var(--link-color);
+}
+
 [class*="AddNewMovieSearchResult-searchResult-"],
 [class*="AddNewMovieSearchResult-underlay-"] {
     background-color: transparent !important;
@@ -871,6 +875,10 @@ input:focus:-ms-input-placeholder {
 }
 
 /* CALENDAR */
+[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
+    stroke: white !important;
+}
+
 [class*="CalendarEvent-downloaded-"] {
     background: rgb(var(--calendar-available) / .7) !important;
     border-left-color: transparent !important;
@@ -903,12 +911,14 @@ input:focus:-ms-input-placeholder {
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-unreleased-"] {
+[class*="CalendarEvent-unreleased-"],
+[class*="CalendarEvent-continuing-"] {
     background: rgb(var(--calendar-unaired) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover {
+[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover,
+[class*="Calendar-calendar-"] [class*="CalendarEvent-continuing-"]:hover {
     background: rgb(var(--calendar-unaired) / .5) !important;
     border-left-color: transparent !important;
 }
@@ -933,12 +943,14 @@ input:focus:-ms-input-placeholder {
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-downloading-"] {
+[class*="CalendarEvent-downloading-"],
+[class*="CalendarEvent-queue-"] {
     background: rgb(var(--calendar-downloading) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover {
+[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover,
+[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover {
     background: rgb(var(--calendar-downloading) / .5) !important;
     border-left-color: transparent !important;
 }
diff --git a/css/base/readarr/readarr-base.css b/css/base/readarr/readarr-base.css
index 24caabcb..67dfc0fc 100644
--- a/css/base/readarr/readarr-base.css
+++ b/css/base/readarr/readarr-base.css
@@ -721,6 +721,10 @@ a:hover {
 }
 
 /* SEARCH RESULTS */
+[class*="SearchResult-title-"]{
+    color:var(--link-color);
+}
+
 [class*="AddNewAuthorSearchResult-year-"] {
     color: #fff;
 }
@@ -857,6 +861,10 @@ input:focus:-ms-input-placeholder {
 }
 
 /* CALENDAR */
+[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
+    stroke: white !important;
+}
+
 [class*="CalendarEvent-downloaded-"]:not([class*="AgendaEvent-"]) {
     background: rgb(var(--calendar-downloaded) / .7) !important;
     border-left-color: transparent !important;
@@ -897,12 +905,14 @@ input:focus:-ms-input-placeholder {
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]) {
+[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]),
+[class*="CalendarEvent-queue-"]:not([class*="AgendaEvent-"]) {
     background: rgb(var(--calendar-downloading) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover:not([class*="AgendaEvent-"]) {
+[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover:not([class*="AgendaEvent-"]),
+[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover:not([class*="AgendaEvent-"])  {
     background: rgb(var(--calendar-downloading) / .5) !important;
     border-left-color: transparent !important;
 }
diff --git a/css/base/sonarr/sonarr-base.css b/css/base/sonarr/sonarr-base.css
index 47025c65..7da389a0 100644
--- a/css/base/sonarr/sonarr-base.css
+++ b/css/base/sonarr/sonarr-base.css
@@ -750,6 +750,10 @@ input:focus:-ms-input-placeholder {
 }
 
 /* SEARCH RESULTS */
+[class*="SearchResult-title-"]{
+    color:var(--link-color);
+}
+
 [class*="AddNewSeriesSearchResult-underlay-"] {
     background-color: transparent !important;
 }
@@ -831,6 +835,10 @@ input:focus:-ms-input-placeholder {
 }
 
 /* CALENDAR */
+[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
+    stroke: white !important;
+}
+
 [class*="CalendarEvent-downloaded-"] {
     background: rgb(var(--calendar-tv-available) / .7) !important;
     border-left-color: transparent !important;
diff --git a/docker/root/defaults/default b/docker/root/defaults/default
index c0e65e4d..5e698386 100644
--- a/docker/root/defaults/default
+++ b/docker/root/defaults/default
@@ -1,18 +1,23 @@
 server {
     listen 80 default_server;
     listen [::]:80 default_server;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
 
     server_name _;
 
+    ssl_certificate /config/keys/cert.crt;
+    ssl_certificate_key /config/keys/cert.key;
+
     root /config/www;
     index index.html index.htm index.php;
 
     location / {
         sub_filter_types *;
-        sub_filter 'https://theme-park.dev' https://TP_DOMAIN;
-        sub_filter 'http://theme-park.dev' http://TP_DOMAIN;
-        sub_filter 'https://develop.theme-park.dev' https://TP_DOMAIN;
-        sub_filter 'http://develop.theme-park.dev' http://TP_DOMAIN;
+        sub_filter 'https://theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'http://theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'https://develop.theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'http://develop.theme-park.dev' $scheme://TP_DOMAIN;
         sub_filter_once off;
         try_files $uri $uri/ /index.html;
     }
diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config
index b4664bfc..e4c17df2 100644
--- a/docker/root/etc/cont-init.d/50-config
+++ b/docker/root/etc/cont-init.d/50-config
@@ -23,10 +23,7 @@ if [[ -z ${TP_SCHEME} ]]; then
 fi
 
 DEFAULT='/defaults/default'
-sed -i "s/sub_filter 'https:\/\/theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
-sed -i "s/sub_filter 'http:\/\/theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
-sed -i "s/sub_filter 'https:\/\/develop.theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
-sed -i "s/sub_filter 'http:\/\/develop.theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
+sed -i "s/TP_DOMAIN/${TP_DOMAIN} /g" ${DEFAULT}
 cp /defaults/default /config/nginx/site-confs
 
 # make our folders and links
@@ -40,6 +37,9 @@ cp /app/themepark/index.html /config/www
 cp /app/themepark/themes.py /config/www
 cp /app/themepark/CNAME /config/www
 
+echo 'Creating CSS files'
+python3 /config/www/themes.py
+
 # permissions
 chown -R abc:abc \
     /config
\ No newline at end of file
diff --git a/docker/root/etc/services.d/themepark/run b/docker/root/etc/services.d/themepark/run
deleted file mode 100644
index 3e1ae806..00000000
--- a/docker/root/etc/services.d/themepark/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-  exec \
-        python3 /config/www/themes.py
\ No newline at end of file
diff --git a/themes.py b/themes.py
index 26f56044..6458561a 100644
--- a/themes.py
+++ b/themes.py
@@ -139,7 +139,7 @@ if __name__ == "__main__":
     themes = [name for name in listdir('./css/theme-options') if isfile(join('./css/theme-options', name))]
     community_themes = [name for name in listdir('./css/community-theme-options') if isfile(join('./css/community-theme-options', name))]
     develop = True if isdir(".git") and subprocess.check_output(["git", "symbolic-ref", "--short", "HEAD"]).decode('ascii').strip() == "develop" else False
-    if env_domain:
+    if env_domain and env_domain != '$http_host':
         DOMAIN = env_domain
     else:
         with open("CNAME", "rt", closefd=True) as cname: