diff --git a/css/addons/plex/plex-alt-logo/plex-alt-logo.css b/css/addons/plex/plex-alt-logo/plex-alt-logo.css
index d5620694..8476b3a6 100644
--- a/css/addons/plex/plex-alt-logo/plex-alt-logo.css
+++ b/css/addons/plex/plex-alt-logo/plex-alt-logo.css
@@ -4,5 +4,9 @@
     background-repeat: no-repeat;
     background-size: contain;
     margin: 0 10px;
-    width: 45px;
+    width: 40px;
+}
+
+[class*="NavBar-plexLogo-"] svg {
+    display: none;
 }
\ No newline at end of file
diff --git a/css/addons/unraid/login-page/custom_login.sh b/css/addons/unraid/login-page/custom_login.sh
index 60a2c2e7..0efd0511 100644
--- a/css/addons/unraid/login-page/custom_login.sh
+++ b/css/addons/unraid/login-page/custom_login.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 TYPE="retro-terminal"
 THEME="green.css"
-DOMAIN="theme-park.dev" #if you update the domain after the script has been run, You must disable and re enable JS or the whole theme.  
+DOMAIN="theme-park.dev" # If you update the domain after the script has been run, You must disable and re enable JS or the whole theme.  
 ADD_JS="true"
 JS="custom_text_header.js"
 DISABLE_THEME="false"
@@ -13,17 +13,28 @@ ADD_JS        = ${ADD_JS}\\n\
 JS            = ${JS}\\n\
 DISABLE_THEME = ${DISABLE_THEME}\\n"
 
+IFS='"'
+set $(cat /etc/unraid-version)
+UNRAID_VERSION="$2"
+IFS=$' \t\n'
+LOGIN_PAGE="/usr/local/emhttp/login.php"
+# Changing file path to login.php if version >= 6.10
+if [[ "${UNRAID_VERSION}" =~ ^6.10.* ]]; then
+echo "Unraid version: ${UNRAID_VERSION}, changing path to login page"
+LOGIN_PAGE="/usr/local/emhttp/webGui/include/.login.php"
+fi
+
 # Restore login.php
 if [ ${DISABLE_THEME} = "true" ]; then
   echo "Restoring backup of login.php" 
-  cp -p /usr/local/emhttp/login.php.backup /usr/local/emhttp/login.php
+  cp -p ${LOGIN_PAGE}.backup ${LOGIN_PAGE}
   exit 0
 fi
 
 # Backup login page if needed.
-if [ ! -f /usr/local/emhttp/login.php.backup ]; then
+if [ ! -f ${LOGIN_PAGE}.backup ]; then
   echo "Creating backup of login.php" 
-  cp -p /usr/local/emhttp/login.php /usr/local/emhttp/login.php.backup
+  cp -p ${LOGIN_PAGE} ${LOGIN_PAGE}.backup
 fi
 
 # Use correct domain style
@@ -35,33 +46,33 @@ case ${DOMAIN} in
 esac
 
 # Adding stylesheets
-if ! grep -q ${DOMAIN} /usr/local/emhttp/login.php; then
+if ! grep -q ${DOMAIN} ${LOGIN_PAGE}; then
   echo "Adding stylesheet"
-  sed -i -e "\@<style>@i\    <link rel='stylesheet' href='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/${THEME}'>" /usr/local/emhttp/login.php
+  sed -i -e "\@<style>@i\    <link rel='stylesheet' href='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/${THEME}'>" ${LOGIN_PAGE}
   echo 'Stylesheet set to' ${THEME}
 fi
 
 # Adding/Removing javascript
 if [ ${ADD_JS} = "true" ]; then
-  if ! grep -q ${JS} /usr/local/emhttp/login.php; then
-    if grep -q "<script type='text/javascript' src='https://${DOMAIN}/css/addons/unraid/login-page/" /usr/local/emhttp/login.php; then
+  if ! grep -q ${JS} ${LOGIN_PAGE}; then
+    if grep -q "<script type='text/javascript' src='https://${DOMAIN}/css/addons/unraid/login-page/" ${LOGIN_PAGE}; then
       echo "Replacing Javascript"
-      sed -i "/<script type='text\/javascript' src='https:\/\/${DOMAIN}\/css\/addons\/unraid\/login-page/c <script type='text/javascript' src='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/js/${JS}'></script>" /usr/local/emhttp/login.php
+      sed -i "/<script type='text\/javascript' src='https:\/\/${DOMAIN}\/css\/addons\/unraid\/login-page/c <script type='text/javascript' src='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/js/${JS}'></script>" ${LOGIN_PAGE}
     else
       echo "Adding javascript"
-      sed -i -e "\@</body>@i\    <script type='text/javascript' src='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/js/${JS}'></script>" /usr/local/emhttp/login.php
+      sed -i -e "\@</body>@i\    <script type='text/javascript' src='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/js/${JS}'></script>" ${LOGIN_PAGE}
     fi
   fi
 else
-  if grep -q ${JS} /usr/local/emhttp/login.php; then
+  if grep -q ${JS} ${LOGIN_PAGE}; then
     echo "Removing javascript.."
-    sed -i "/<script type='text\/javascript' src='https:\/\/${DOMAIN}\/css\/addons\/unraid\/login-page/d" /usr/local/emhttp/login.php
+    sed -i "/<script type='text\/javascript' src='https:\/\/${DOMAIN}\/css\/addons\/unraid\/login-page/d" ${LOGIN_PAGE}
   fi
 fi
 
 # Changing stylesheet
-if ! grep -q ${TYPE}"/"${THEME} /usr/local/emhttp/login.php; then
+if ! grep -q ${TYPE}"/"${THEME} ${LOGIN_PAGE}; then
   echo "Changing existing custom stylesheet.." 
-  sed -i "/<link rel='stylesheet' href='https:\/\/${DOMAIN}\/css\/addons\/unraid\/login-page/c <link rel='stylesheet' href='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/${THEME}'>" /usr/local/emhttp/login.php
+  sed -i "/<link rel='stylesheet' href='https:\/\/${DOMAIN}\/css\/addons\/unraid\/login-page/c <link rel='stylesheet' href='https://${DOMAIN}/css/addons/unraid/login-page/${TYPE}/${THEME}'>" ${LOGIN_PAGE}
   echo 'Stylesheet set to' ${THEME}
 fi
diff --git a/css/base/lidarr/lidarr-base.css b/css/base/lidarr/lidarr-base.css
index c2d6b18f..76dda985 100644
--- a/css/base/lidarr/lidarr-base.css
+++ b/css/base/lidarr/lidarr-base.css
@@ -10,6 +10,8 @@
 /*		   		        Made by @gilbN					 */
 /* 			      https://github.com/gilbN/theme.park			 */
 
+@import url("/theme.park/css/defaults/placeholders.css");
+
 :root {
     --calendar-downloading: 122 67 182;
     --calendar-downloaded: 39 194 76;
@@ -201,6 +203,7 @@ a:hover {
 
 [class*="PageHeader-header-"] {
     background-color: rgba(0, 0, 0, .35);
+    color: var(--text);
 }
 
 /* SEARCH DROPDOWN HEADER */
@@ -688,7 +691,7 @@ a:hover {
 
 [class*="ArtistSearchInput-container-"] [class*="Input-input-"] {
     background: transparent;
-    border-bottom: solid 1px var(--text-hover);
+    border-bottom: solid 1px var(--text);
 }
 
 [class*="ArtistSearchInput-container-"] [class*="Input-input-"]:focus {
@@ -775,42 +778,6 @@ a:hover {
     background-color: rgba(255, 255, 255, 0.08);
 }
 
-/* MOVE THIS */
-input::-webkit-input-placeholder {
-    color: var(--text);
-}
-
-input:focus::-webkit-input-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox < 19 */
-input:-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus:-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox > 19 */
-input::-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus::-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Internet Explorer 10 */
-input:-ms-input-placeholder {
-    color: var(--text);
-}
-
-input:focus:-ms-input-placeholder {
-    color: var(--text-hover);
-}
-
 /* IMPORT */
 /* Text color */
 [class*="ImportArtistSelectFolder-header-"] {
@@ -863,7 +830,7 @@ input:focus:-ms-input-placeholder {
 
 /* CALENDAR */
 [class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
-    stroke: var(--text-hover) !important;
+    stroke: #fff;
 }
 
 [class*="CalendarEvent-downloaded-"] {
@@ -920,6 +887,7 @@ input:focus:-ms-input-placeholder {
 
 [class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarDay-dayOfMonth-"] {
@@ -942,6 +910,7 @@ input:focus:-ms-input-placeholder {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     border-left: 1px solid hsla(0, 0%, 100%, .08);
     border-right: 1px solid hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarEvent-event-"] {
diff --git a/css/base/prowlarr/prowlarr-base.css b/css/base/prowlarr/prowlarr-base.css
index b5992301..be078590 100644
--- a/css/base/prowlarr/prowlarr-base.css
+++ b/css/base/prowlarr/prowlarr-base.css
@@ -10,6 +10,8 @@
 /*		   		        Made by @gilbN					 */
 /* 			      https://github.com/gilbN/theme.park			 */
 
+@import url("/theme.park/css/defaults/placeholders.css");
+
 body {
     background: var(--main-bg-color);
     background-repeat: repeat, no-repeat;
@@ -200,6 +202,7 @@ a:hover {
 [class*="PageHeader-header-"] {
     background-color: rgba(0, 0, 0, .35);
     box-shadow: none;
+    color: var(--text);
 }
 
 /* SEARCH DROPDOWN HEADER */
@@ -677,7 +680,7 @@ a:hover {
 
 [class*="IndexerSearchInput-container-"] [class*="Input-input-"] {
     background: transparent;
-    border-bottom: solid 1px #fff;
+    border-bottom: solid 1px var(--text);
 }
 
 [class*="IndexerSearchInput-container-"] [class*="Input-input-"]:focus {
@@ -738,42 +741,6 @@ a:hover {
     color: var(--text-muted);
 }
 
-/* MOVE THIS */
-input::-webkit-input-placeholder {
-    color: var(--text);
-}
-
-input:focus::-webkit-input-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox < 19 */
-input:-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus:-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox > 19 */
-input::-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus::-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Internet Explorer 10 */
-input:-ms-input-placeholder {
-    color: var(--text);
-}
-
-input:focus:-ms-input-placeholder {
-    color: var(--text-hover);
-}
-
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
@@ -908,6 +875,7 @@ input:focus:-ms-input-placeholder {
 
 [class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarDay-dayOfMonth-"] {
@@ -929,6 +897,7 @@ input:focus:-ms-input-placeholder {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     border-left: 1px solid hsla(0, 0%, 100%, .08);
     border-right: 1px solid hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarEvent-movieTitle-"],
@@ -954,11 +923,11 @@ input:focus:-ms-input-placeholder {
 }
 
 [class*="CalendarEventGroup-airTime-"] {
-    color: var(--text);
+    color: #fff;
 }
 
 [class*="CalendarEventGroup-episodeInfo-"] {
-    color: var(--text);
+    color: #fff;
 }
 
 /* calendar agenda */
diff --git a/css/base/radarr/radarr-base.css b/css/base/radarr/radarr-base.css
index afa56179..cf45bb77 100644
--- a/css/base/radarr/radarr-base.css
+++ b/css/base/radarr/radarr-base.css
@@ -9,6 +9,9 @@
 
 /*		   		        Made by @gilbN					 */
 /* 			      https://github.com/gilbN/theme.park			 */
+
+@import url("/theme.park/css/defaults/placeholders.css");
+
 :root {
     --calendar-in-cinemas: 53 197 244;
     --calendar-downloading: 122 67 182; 
@@ -199,6 +202,7 @@ a:hover {
 
 [class*="PageHeader-header-"] {
     background-color: rgba(0, 0, 0, .35);
+    color: var(--text);
 }
 
 /* SEARCH DROPDOWN HEADER */
@@ -688,7 +692,7 @@ a:hover {
 
 [class*="MovieSearchInput-container-"] [class*="Input-input-"] {
     background: transparent;
-    border-bottom: solid 1px #fff;
+    border-bottom: solid 1px var(--text);
 }
 
 [class*="MovieSearchInput-container-"] [class*="Input-input-"]:focus {
@@ -755,42 +759,6 @@ a:hover {
     color: var(--text-muted);
 }
 
-/* MOVE THIS */
-input::-webkit-input-placeholder {
-    color: var(--text);
-}
-
-input:focus::-webkit-input-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox < 19 */
-input:-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus:-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox > 19 */
-input::-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus::-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Internet Explorer 10 */
-input:-ms-input-placeholder {
-    color: var(--text);
-}
-
-input:focus:-ms-input-placeholder {
-    color: var(--text-hover);
-}
-
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
@@ -880,7 +848,7 @@ input:focus:-ms-input-placeholder {
 
 /* CALENDAR */
 [class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
-    stroke: var(--text-hover) !important;
+    stroke: #fff;
 }
 
 [class*="CalendarEvent-downloaded-"] {
@@ -961,6 +929,7 @@ input:focus:-ms-input-placeholder {
 
 [class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarDay-dayOfMonth-"] {
@@ -983,6 +952,7 @@ input:focus:-ms-input-placeholder {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     border-left: 1px solid hsla(0, 0%, 100%, .08);
     border-right: 1px solid hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarEvent-movieTitle-"],
@@ -990,7 +960,7 @@ input:focus:-ms-input-placeholder {
 [class*="CalendarEvent-episodeInfo-"],
 [class*="CalendarEvent-airTime-"],
 [class*="CalendarEvent-link-"] {
-    color: var(--text-hover) !important;
+    color: #fff !important;
 }
 
 [class*="CalendarEvent-event-"] {
@@ -1006,11 +976,11 @@ input:focus:-ms-input-placeholder {
 }
 
 [class*="CalendarEventGroup-airTime-"] {
-    color: var(--text);
+    color: #fff;
 }
 
 [class*="CalendarEventGroup-episodeInfo-"] {
-    color: var(--text);
+    color: #fff;
 }
 
 [class*="LegendItem-missingMonitoredColorImpaired-"],
diff --git a/css/base/readarr/readarr-base.css b/css/base/readarr/readarr-base.css
index 1e758570..cb9e9ac1 100644
--- a/css/base/readarr/readarr-base.css
+++ b/css/base/readarr/readarr-base.css
@@ -10,6 +10,8 @@
 /*		   		        Made by @gilbN					 */
 /* 			      https://github.com/gilbN/theme.park			 */
 
+@import url("/theme.park/css/defaults/placeholders.css");
+
 :root {
     --calendar-downloaded: 39 194 76;
     --calendar-downloading: 122 67 182;
@@ -200,6 +202,7 @@ a:hover {
 
 [class*="PageHeader-header-"] {
     background-color: rgba(0, 0, 0, .35);
+    color: var(--text);
 }
 
 /* SEARCH DROPDOWN HEADER */
@@ -692,7 +695,7 @@ a:hover {
 
 [class*="AuthorSearchInput-input-"][class*="Input-input-"] {
     background: transparent;
-    border-bottom: solid 1px var(--text-hover);
+    border-bottom: solid 1px var(--text);
 }
 
 [class*="AuthorSearchInput-input-"][class*="Input-input-"]:focus {
@@ -778,42 +781,6 @@ a:hover {
     background-color: rgba(255, 255, 255, 0.08);
 }
 
-/* MOVE THIS */
-input::-webkit-input-placeholder {
-    color: var(--text);
-}
-
-input:focus::-webkit-input-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox < 19 */
-input:-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus:-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox > 19 */
-input::-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus::-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Internet Explorer 10 */
-input:-ms-input-placeholder {
-    color: var(--text);
-}
-
-input:focus:-ms-input-placeholder {
-    color: var(--text-hover);
-}
-
 /* IMPORT */
 /* Text color */
 [class*="ImportAuthorSelectFolder-header-"] {
@@ -866,7 +833,7 @@ input:focus:-ms-input-placeholder {
 
 /* CALENDAR */
 [class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
-    stroke: var(--text-hover) !important;
+    stroke: #fff;
 }
 
 [class*="CalendarEvent-downloaded-"]:not([class*="AgendaEvent-"]) {
@@ -941,7 +908,7 @@ input:focus:-ms-input-placeholder {
 [class*="CalendarEvent-authorName-"],
 [class*="CalendarEvent-bookTitle-"] a,
 [class*="CalendarEvent-bookTitle-"]{
-color: var(--text-hover) !important;
+color: #fff !important;
 }
 
 [class*="CalendarEvent-authorName-"] a:hover,
@@ -963,6 +930,7 @@ color: var(--text-hover) !important;
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     border-left: 1px solid hsla(0, 0%, 100%, .08);
     border-right: 1px solid hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarEvent-event-"] {
diff --git a/css/base/sonarr/sonarr-base.css b/css/base/sonarr/sonarr-base.css
index 4aa852e4..969a03e7 100644
--- a/css/base/sonarr/sonarr-base.css
+++ b/css/base/sonarr/sonarr-base.css
@@ -10,6 +10,8 @@
 /*		   		        Made by @gilbN					 */
 /* 			      https://github.com/gilbN/theme.park			 */
 
+@import url("/theme.park/css/defaults/placeholders.css");
+
 :root {
     --calendar-tv-unaired-premiere: 53 197 244;
     --calendar-tv-downloading: 122 67 182;
@@ -210,6 +212,7 @@ a:hover {
 
 [class*="PageHeader-header-"] {
     background-color: rgba(0, 0, 0, .35);
+    color: var(--text);
 }
 
 /* SEARCH DROPDOWN HEADER */
@@ -692,7 +695,7 @@ a:hover {
 
 [class*="SeriesSearchInput-container-"] [class*="Input-input-"] {
     background: transparent;
-    border-bottom: solid 1px var(--text-hover);
+    border-bottom: solid 1px var(--text);
 }
 
 [class*="SeriesSearchInput-container-"] [class*="Input-input-"]:focus {
@@ -718,42 +721,6 @@ a:hover {
     box-shadow: none;
 }
 
-/* MOVE THIS */
-input::-webkit-input-placeholder {
-    color: var(--text);
-}
-
-input:focus::-webkit-input-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox < 19 */
-input:-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus:-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox > 19 */
-input::-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus::-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Internet Explorer 10 */
-input:-ms-input-placeholder {
-    color: var(--text);
-}
-
-input:focus:-ms-input-placeholder {
-    color: var(--text-hover);
-}
-
 /* TEXT COLOR */
 [class*="PageContentBody-innerContentBody-"] {
     color: var(--text);
@@ -846,7 +813,7 @@ input:focus:-ms-input-placeholder {
 
 /* CALENDAR */
 [class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
-    stroke: var(--text-hover) !important;
+    stroke: #fff;
 }
 
 [class*="CalendarEvent-downloaded-"] {
@@ -917,7 +884,7 @@ input:focus:-ms-input-placeholder {
 
 [class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
-    color: #fff;
+    color: var(--text-hover);
 }
 
 [class*="CalendarDay-dayOfMonth-"] {
@@ -940,6 +907,7 @@ input:focus:-ms-input-placeholder {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     border-left: 1px solid hsla(0, 0%, 100%, .08);
     border-right: 1px solid hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarEvent-seriesTitle-"],
@@ -958,15 +926,15 @@ input:focus:-ms-input-placeholder {
 }
 
 [class*="CalendarEventGroup-seriesTitle-"] {
-    color: var(--text-hover) !important;
+    color: #fff !important;
 }
 
 [class*="CalendarEventGroup-airTime-"] {
-    color: var(--text-hover);
+    color: #eee;
 }
 
 [class*="CalendarEventGroup-episodeInfo-"] {
-    color: var(--text-hover);
+    color: #eee;
 }
 
 /* calendar agenda */
diff --git a/css/base/tautulli/tautulli-base.css b/css/base/tautulli/tautulli-base.css
index 6c4eff01..2377ee46 100644
--- a/css/base/tautulli/tautulli-base.css
+++ b/css/base/tautulli/tautulli-base.css
@@ -187,6 +187,18 @@ select,
 }
 
 /* Dashboard */
+.dashboard-stats-info-title h4 {
+    color: #fff;
+}
+
+.dashboard-stats-info-item .sub-value {
+    color: #fff;
+}
+
+.dashboard-stats-info-item .sub-list {
+    color: #eee;
+}
+
 .dashboard-stats-background,
 .dashboard-activity-background,
 .dashboard-activity-poster-container {
diff --git a/css/base/whisparr/whisparr-base.css b/css/base/whisparr/whisparr-base.css
index a4197335..ab122d57 100644
--- a/css/base/whisparr/whisparr-base.css
+++ b/css/base/whisparr/whisparr-base.css
@@ -9,6 +9,9 @@
 
 /*		   		        Made by @gilbN					 */
 /* 			      https://github.com/gilbN/theme.park			 */
+
+@import url("/theme.park/css/defaults/placeholders.css");
+
 :root {
     --calendar-in-cinemas: 53 197 244;
     --calendar-downloading: 122 67 182; 
@@ -199,6 +202,7 @@ a:hover {
 
 [class*="PageHeader-header-"] {
     background-color: rgba(0, 0, 0, .35);
+    color: var(--text);
 }
 
 /* SEARCH DROPDOWN HEADER */
@@ -688,7 +692,7 @@ a:hover {
 
 [class*="MovieSearchInput-container-"] [class*="Input-input-"] {
     background: transparent;
-    border-bottom: solid 1px var(--text-hover);
+    border-bottom: solid 1px var(--text);
 }
 
 [class*="MovieSearchInput-container-"] [class*="Input-input-"]:focus {
@@ -755,42 +759,6 @@ a:hover {
     color: var(--text-muted);
 }
 
-/* MOVE THIS */
-input::-webkit-input-placeholder {
-    color: var(--text);
-}
-
-input:focus::-webkit-input-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox < 19 */
-input:-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus:-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Firefox > 19 */
-input::-moz-placeholder {
-    color: var(--text);
-}
-
-input:focus::-moz-placeholder {
-    color: var(--text-hover);
-}
-
-/* Internet Explorer 10 */
-input:-ms-input-placeholder {
-    color: var(--text);
-}
-
-input:focus:-ms-input-placeholder {
-    color: var(--text-hover);
-}
-
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
@@ -880,7 +848,7 @@ input:focus:-ms-input-placeholder {
 
 /* CALENDAR */
 [class*="CircularProgressBar-circularProgressBarContainer-"] svg circle {
-    stroke: var(--text-hover) !important;
+    stroke: #fff;
 }
 
 [class*="CalendarEvent-downloaded-"] {
@@ -961,6 +929,7 @@ input:focus:-ms-input-placeholder {
 
 [class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarDay-dayOfMonth-"] {
@@ -983,6 +952,7 @@ input:focus:-ms-input-placeholder {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     border-left: 1px solid hsla(0, 0%, 100%, .08);
     border-right: 1px solid hsla(0, 0%, 100%, .08);
+    color: var(--text-hover);
 }
 
 [class*="CalendarEvent-movieTitle-"],
@@ -990,7 +960,7 @@ input:focus:-ms-input-placeholder {
 [class*="CalendarEvent-episodeInfo-"],
 [class*="CalendarEvent-airTime-"],
 [class*="CalendarEvent-link-"] {
-    color: var(--text-hover) !important;
+    color: #fff !important;
 }
 
 [class*="CalendarEvent-event-"] {
@@ -1006,11 +976,11 @@ input:focus:-ms-input-placeholder {
 }
 
 [class*="CalendarEventGroup-airTime-"] {
-    color: var(--text);
+    color: #fff;
 }
 
 [class*="CalendarEventGroup-episodeInfo-"] {
-    color: var(--text);
+    color: #fff;
 }
 
 [class*="LegendItem-missingMonitoredColorImpaired-"],
diff --git a/docker-mods/swag/Dockerfile b/docker-mods/swag/Dockerfile
new file mode 100644
index 00000000..2c6713eb
--- /dev/null
+++ b/docker-mods/swag/Dockerfile
@@ -0,0 +1,6 @@
+FROM scratch
+
+LABEL maintainer="GilbN" 
+LABEL app="theme-park.dev"
+#copy local files. 
+COPY root/ /
\ No newline at end of file
diff --git a/docker-mods/swag/root/etc/cont-init.d/98-themepark b/docker-mods/swag/root/etc/cont-init.d/98-themepark
new file mode 100644
index 00000000..3c838be1
--- /dev/null
+++ b/docker-mods/swag/root/etc/cont-init.d/98-themepark
@@ -0,0 +1,67 @@
+#!/usr/bin/with-contenv bash
+
+echo '-------------------------'
+echo '|  SWAG theme.park Mod  |'
+echo '-------------------------'
+
+if ! [[ -x "$(command -v svn)" ]]; then
+echo '--------------------------'
+echo '| Installing svn package |'
+echo '--------------------------'
+    if [ -x "$(command -v apk)" ]; then
+      apk update && \
+      apk add --no-cache subversion
+    elif [ -x "$(command -v apt-get)" ]; then
+      apt-get update && \
+      apt-get install -y subversion
+    fi
+fi
+
+# Display variables for troubleshooting
+echo -e "Variables set:\\n\
+'TP_BRANCH'=${TP_BRANCH}\\n"
+
+# Set default
+if [[ -z ${TP_BRANCH} ]]; then
+    echo 'No branch set, defaulting to live'
+    TP_BRANCH='live'
+fi
+
+if [[ ${TP_BRANCH} == "master" ]]; then
+    TP_BRANCH='live'
+fi
+
+if [[ ${TP_BRANCH} == "develop" ]]; then
+    TP_BRANCH='live_develop'
+fi
+
+if [[ ${TP_BRANCH} == "testing" ]]; then
+    TP_BRANCH='live_testing'
+fi
+
+mkdir -p /config/www/themepark
+
+SHA_RELEASE=$(curl -sL "https://api.github.com/repos/gilbn/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
+if [[ ! -f "/config/www/themepark/sha.txt" ]]; then 
+    SHA=""
+else
+    SHA=$(cat /config/www/themepark/sha.txt)
+fi
+# Downloading fresh webui files from source.
+if [[ $SHA != $SHA_RELEASE ]]; then
+    echo "-----------------------------------------------------"
+    echo "| Downloading latest files from ${TP_BRANCH} branch |"
+    echo "-----------------------------------------------------"
+    svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/css" /config/www/themepark/css
+    svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/resources" /config/www/themepark/resources
+    svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/themes.json" /config/www/themepark
+    svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/index.html" /config/www/themepark
+    printf '\nDownload finished\n\n'
+fi
+
+cat <<< "$SHA_RELEASE" > "/config/www/themepark/sha.txt"
+cp /themepark-confs/* /config/nginx/proxy-confs
+
+# permissions
+chown -R abc:abc \
+    /config/www/themepark
\ No newline at end of file
diff --git a/docker-mods/swag/root/themepark-confs/themepark.subdomain.conf.sample b/docker-mods/swag/root/themepark-confs/themepark.subdomain.conf.sample
new file mode 100644
index 00000000..c3967f58
--- /dev/null
+++ b/docker-mods/swag/root/themepark-confs/themepark.subdomain.conf.sample
@@ -0,0 +1,30 @@
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name themepark.*;
+
+    include /config/nginx/ssl.conf;
+
+    index index.html index.htm index.php;
+
+    location / {
+        alias /config/www/themepark/;
+        try_files $uri $uri/ /index.html;
+    }
+    location  /themepark {return 302  $scheme://$http_host/themepark/;}
+    location /themepark/ {
+        alias /config/www/themepark/;
+        sub_filter_types *;
+        sub_filter 'url("/theme.park/css/' 'url("/themepark/css/';
+        sub_filter_once off;
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Don't cache
+    add_header Last-Modified $date_gmt;
+    add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+    if_modified_since off;
+    expires -1;
+    etag off;
+}
diff --git a/docker-mods/swag/root/themepark-confs/themepark.subfolder.conf.sample b/docker-mods/swag/root/themepark-confs/themepark.subfolder.conf.sample
new file mode 100644
index 00000000..4fc5eac0
--- /dev/null
+++ b/docker-mods/swag/root/themepark-confs/themepark.subfolder.conf.sample
@@ -0,0 +1,17 @@
+    location  /themepark {
+        return 302  $scheme://$http_host/themepark/;
+        }
+
+    location /themepark/ {
+        alias /config/www/themepark/;
+        sub_filter_types *;
+        sub_filter 'url("/theme.park/css/' 'url("/themepark/css/';
+        sub_filter_once off;
+        try_files $uri $uri/ /index.html;
+        # Don't cache
+        add_header Last-Modified $date_gmt;
+        add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+        if_modified_since off;
+        expires -1;
+        etag off;
+    }
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
index 5d1e5de9..1dae9389 100644
--- a/linux-amd64.Dockerfile
+++ b/linux-amd64.Dockerfile
@@ -3,13 +3,13 @@ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 # set version label
 ARG BUILD_DATE
 ARG TP_RELEASE
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}"
+ARG BUILD_ARCHITECTURE
+LABEL build_version="Version:- ${TP_RELEASE} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}"
 LABEL maintainer="gilbn"
-LABEL org.opencontainers.image.description DESCRIPTION
 
 RUN \
 echo " ## Installing packages ## " && \
-apk add --no-cache --virtual=build-dependencies \
+apk add --no-cache --virtual=runtime-dependencies \
     python3 && \
   echo "**** install theme.park ****" && \
     mkdir -p /app/themepark
diff --git a/linux-arm-v7.Dockerfile b/linux-arm-v7.Dockerfile
index 5f868fb9..4044eb6f 100644
--- a/linux-arm-v7.Dockerfile
+++ b/linux-arm-v7.Dockerfile
@@ -3,13 +3,13 @@ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
 # set version label
 ARG BUILD_DATE
 ARG TP_RELEASE
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}"
+ARG BUILD_ARCHITECTURE
+LABEL build_version="Version:- ${TP_RELEASE} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}"
 LABEL maintainer="gilbn"
-LABEL org.opencontainers.image.description DESCRIPTION
 
 RUN \
 echo " ## Installing packages ## " && \
-apk add --no-cache --virtual=build-dependencies \
+apk add --no-cache --virtual=runtime-dependencies \
     python3 && \
   echo "**** install theme.park ****" && \
     mkdir -p /app/themepark
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
index 2ebba47a..7945ef59 100644
--- a/linux-arm64.Dockerfile
+++ b/linux-arm64.Dockerfile
@@ -3,13 +3,13 @@ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
 # set version label
 ARG BUILD_DATE
 ARG TP_RELEASE
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}"
+ARG BUILD_ARCHITECTURE
+LABEL build_version="Version:- ${TP_RELEASE} Build-date:- ${BUILD_DATE} Platform: ${BUILD_ARCHITECTURE}"
 LABEL maintainer="gilbn"
-LABEL org.opencontainers.image.description DESCRIPTION
 
 RUN \
 echo " ## Installing packages ## " && \
-apk add --no-cache --virtual=build-dependencies \
+apk add --no-cache --virtual=runtime-dependencies \
     python3 && \
   echo "**** install theme.park ****" && \
     mkdir -p /app/themepark