diff --git a/css/addons/unraid/login-page/alien/js/isolation.js b/css/addons/unraid/login-page/alien/js/isolation.js
index 78eb7778..da27eb77 100644
--- a/css/addons/unraid/login-page/alien/js/isolation.js
+++ b/css/addons/unraid/login-page/alien/js/isolation.js
@@ -1,6 +1,6 @@
 // Adds a video background
 
 let video = `
-<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/CSS\/addons\/unraid\/login-page\/alien\/video\/isolation.mp4" type="video\/mp4">Video not supported</video></div>
+<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/css\/addons\/unraid\/login-page\/alien\/video\/isolation.mp4" type="video\/mp4">Video not supported</video></div>
 `
 document.body.innerHTML += video
\ 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 55567590..7d32d7f2 100644
--- a/css/addons/unraid/login-page/custom_login.sh
+++ b/css/addons/unraid/login-page/custom_login.sh
@@ -37,31 +37,31 @@ esac
 # Adding stylesheets
 if ! grep -q ${DOMAIN} /usr/local/emhttp/login.php; 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}'>" /usr/local/emhttp/login.php
   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 "<script type='text/javascript' src='https://${DOMAIN}/css/addons/unraid/login-page/" /usr/local/emhttp/login.php; 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>" /usr/local/emhttp/login.php
     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>" /usr/local/emhttp/login.php
     fi
   fi
 else
   if grep -q ${JS} /usr/local/emhttp/login.php; 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" /usr/local/emhttp/login.php
   fi
 fi
 
 # Changing stylesheet
 if ! grep -q ${TYPE}"/"${THEME} /usr/local/emhttp/login.php; 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}'>" /usr/local/emhttp/login.php
   echo 'Stylesheet set to' ${THEME}
 fi
diff --git a/css/addons/unraid/login-page/fallout/js/please_stand_by.js b/css/addons/unraid/login-page/fallout/js/please_stand_by.js
index a8df484f..2e508b70 100644
--- a/css/addons/unraid/login-page/fallout/js/please_stand_by.js
+++ b/css/addons/unraid/login-page/fallout/js/please_stand_by.js
@@ -2,6 +2,6 @@
 // Source: https://www.youtube.com/watch?v=ehvduomE0AU
 
 let video = `
-<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/CSS\/addons\/unraid\/login-page\/fallout\/video\/please_stand_by.mp4" type="video\/mp4">Video not supported</video></div>
+<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/css\/addons\/unraid\/login-page\/fallout\/video\/please_stand_by.mp4" type="video\/mp4">Video not supported</video></div>
 `
 document.body.innerHTML += video
diff --git a/css/addons/unraid/login-page/fallout/js/vault-tec-crt.js b/css/addons/unraid/login-page/fallout/js/vault-tec-crt.js
index a5867707..eabb9af1 100644
--- a/css/addons/unraid/login-page/fallout/js/vault-tec-crt.js
+++ b/css/addons/unraid/login-page/fallout/js/vault-tec-crt.js
@@ -2,6 +2,6 @@
 // Source: https://steamcommunity.com/sharedfiles/filedetails/?id=920035918
 
 let video = `
-<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/CSS\/addons\/unraid\/login-page\/fallout\/video\/VaultTecCRTLoop.mp4" type="video\/mp4">Video not supported</video></div>
+<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/css\/addons\/unraid\/login-page\/fallout\/video\/VaultTecCRTLoop.mp4" type="video\/mp4">Video not supported</video></div>
 `
 document.body.innerHTML += video;
diff --git a/css/addons/unraid/login-page/fallout/js/vault-tec-crt_no-scanline.js b/css/addons/unraid/login-page/fallout/js/vault-tec-crt_no-scanline.js
index db74fbf2..ec99a660 100644
--- a/css/addons/unraid/login-page/fallout/js/vault-tec-crt_no-scanline.js
+++ b/css/addons/unraid/login-page/fallout/js/vault-tec-crt_no-scanline.js
@@ -2,6 +2,6 @@
 // Source: https://www.youtube.com/watch?v=ehvduomE0AU
 
 let video = `
-<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/CSS\/addons\/unraid\/login-page\/fallout\/video\/VaultTecCRTLoopNoScanline.mp4" type="video\/mp4">Video not supported</video></div>
+<div class="background-wrap"><video id="video-bg-elem" preload="auto" autoplay="true" loop="loop" muted="muted"> <source src="https:\/\/gilbn.github.io\/theme.park\/css\/addons\/unraid\/login-page\/fallout\/video\/VaultTecCRTLoopNoScanline.mp4" type="video\/mp4">Video not supported</video></div>
 `
 document.body.innerHTML += video
diff --git a/docker-mods/bazarr/root/etc/cont-init.d/98-themepark b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark
index ab83d01e..cdeae48a 100644
--- a/docker-mods/bazarr/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark
@@ -17,17 +17,17 @@ if [ "${TP_HOTIO}" = true ]; then
     APP_FILEPATH='/app/bin/frontend/build/index.html'
 fi
 
-THEME_TYPE='theme-options'
-if [ "${TP_COMMUNITY_THEME}" = true ]; then
-    THEME_TYPE='community-theme-options'
-fi
-
 # Set default
 if [[ -z ${TP_DOMAIN} ]]; then
     echo 'No domain set, defaulting to theme-park.dev'
     TP_DOMAIN='theme-park.dev'
 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"
@@ -45,12 +45,12 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/base\/bazarr\/bazarr-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/bazarr\/bazarr-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_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='https:\/\/${TP_DOMAIN}\/CSS\/addons\/bazarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/bazarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi
diff --git a/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark b/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark
index 6593a848..cf931c3d 100644
--- a/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '--------------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /app/calibre-web/cps/templates/layout.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/calibreweb\/calibreweb-base.css'><\/head> /g" /app/calibre-web/cps/templates/layout.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /app/calibre-web/cps/templates/layout.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/calibreweb\/calibreweb-base.css'><\/head> /g" /app/calibre-web/cps/templates/layout.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /app/calibre-web/cps/templates/layout.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
diff --git a/docker-mods/deluge/root/etc/cont-init.d/98-themepark b/docker-mods/deluge/root/etc/cont-init.d/98-themepark
index edcb8b43..33e0d558 100644
--- a/docker-mods/deluge/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/deluge/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /usr/lib/python3/dist-packages/deluge/ui/web/index.h
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/deluge\/deluge-base.css'><\/head> /g" /usr/lib/python3/dist-packages/deluge/ui/web/index.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /usr/lib/python3/dist-packages/deluge/ui/web/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/deluge\/deluge-base.css'><\/head> /g" /usr/lib/python3/dist-packages/deluge/ui/web/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/lib/python3/dist-packages/deluge/ui/web/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/duplicati/root/etc/cont-init.d/98-themepark b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark
index 3c30944f..c3d68b0f 100644
--- a/docker-mods/duplicati/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark
@@ -10,6 +10,7 @@ APP_FILEPATH='/app/duplicati/webroot'
 echo -e "Variables set:\\n\
 'APP_FILEPATH'=${APP_FILEPATH}\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -18,6 +19,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -31,8 +37,8 @@ if [[ -z ${TP_THEME} ]]; then
 fi
 
 sed_file(){
-	sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/duplicati\/duplicati-base.css'><\/head> /g" $1
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" $1
+	sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/duplicati\/duplicati-base.css'><\/head> /g" $1
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" $1
 	printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
 }
 
diff --git a/docker-mods/emby/root/etc/cont-init.d/98-themepark b/docker-mods/emby/root/etc/cont-init.d/98-themepark
index 9c35063d..c8b66834 100644
--- a/docker-mods/emby/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/emby/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '-------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /app/emby/dashboard-ui/index.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/emby\/emby-base.css'><\/body> /g" /app/emby/dashboard-ui/index.html
-    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/body> /g" /app/emby/dashboard-ui/index.html
+    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/emby\/emby-base.css'><\/body> /g" /app/emby/dashboard-ui/index.html
+    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" /app/emby/dashboard-ui/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
diff --git a/docker-mods/jackett/root/etc/cont-init.d/98-themepark b/docker-mods/jackett/root/etc/cont-init.d/98-themepark
index ca816c64..1fb4350e 100644
--- a/docker-mods/jackett/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/jackett/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 APP_FILEPATH='/app/Jackett/Content/index.html'
@@ -21,6 +22,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -38,8 +44,8 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/jackett\/jackett-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/jackett\/jackett-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark b/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark
index 14b0cde6..8c6fcf94 100644
--- a/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '-----------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /usr/share/jellyfin/web/index.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/jellyfin\/jellyfin-base.css'><\/body> /g" /usr/share/jellyfin/web/index.html
-    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/body> /g" /usr/share/jellyfin/web/index.html
+    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/jellyfin\/jellyfin-base.css'><\/body> /g" /usr/share/jellyfin/web/index.html
+    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" /usr/share/jellyfin/web/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark b/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark
index 897fa96e..8c9507da 100644
--- a/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '----------------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /app/lazylibrarian/data/interfaces/bookstrap/base.ht
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/lazylibrarian\/lazylibrarian-base.css'><\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/lazylibrarian\/lazylibrarian-base.css'><\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /app/lazylibrarian/data/interfaces/bookstrap/base.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/librespeed/root/etc/cont-init.d/98-themepark b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark
index 7ec37ac2..f51a7d35 100644
--- a/docker-mods/librespeed/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '-------------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /usr/share/webapps/librespeed/index.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/librespeed\/librespeed-base.css'><\/head> /g" /usr/share/webapps/librespeed/index.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /usr/share/webapps/librespeed/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/librespeed\/librespeed-base.css'><\/head> /g" /usr/share/webapps/librespeed/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/share/webapps/librespeed/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark
index 219ab407..26c88520 100644
--- a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_ADDON'=${TP_ADDON}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
@@ -24,6 +25,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -41,15 +47,15 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/lidarr\/lidarr-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/lidarr\/lidarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/lidarr\/lidarr-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/lidarr\/lidarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${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='https:\/\/${TP_DOMAIN}\/CSS\/addons\/lidarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
-        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/addons\/lidarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/lidarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/lidarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi
diff --git a/docker-mods/mylar3/root/etc/cont-init.d/98-themepark b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark
index d299c061..2ae86839 100644
--- a/docker-mods/mylar3/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark
@@ -15,6 +15,7 @@ echo -e "Variables set:\\n\
 'APP_FILEPATH'=${APP_FILEPATH}\\n\
 'TP_HOTIO'=${TP_HOTIO}\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -23,6 +24,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -36,8 +42,8 @@ if [[ -z ${TP_THEME} ]]; then
 fi
 
 sed_file(){
-	sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/mylar3\/mylar3-base.css'><\/head> /g" $1
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" $1
+	sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/mylar3\/mylar3-base.css'><\/head> /g" $1
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" $1
 	printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
 }
 
diff --git a/docker-mods/nzbget/root/etc/cont-init.d/98-themepark b/docker-mods/nzbget/root/etc/cont-init.d/98-themepark
index 6ce6557a..2b03db13 100644
--- a/docker-mods/nzbget/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/nzbget/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 APP_FILEPATH='/app/nzbget/webui/index.html'
@@ -20,6 +21,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -37,7 +43,7 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/nzbget\/nzbget-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/nzbget\/nzbget-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
     printf 'Stylesheet set to %s\n' "${TP_THEME}"
 fi
\ 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 1479d0d1..4523a6df 100644
--- a/docker-mods/plex/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/plex/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '-------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 APP_FILEPATH=''
@@ -21,6 +22,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -38,12 +44,12 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/plex\/plex-base.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/plex\/plex-base.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
     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='https:\/\/${TP_DOMAIN}\/CSS\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi
diff --git a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark
index c556bdbf..dcb2c286 100644
--- a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_ADDON'=${TP_ADDON}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
@@ -24,6 +25,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -41,15 +47,15 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/prowlarr\/prowlarr-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/prowlarr\/prowlarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/prowlarr\/prowlarr-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/prowlarr\/prowlarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${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='https:\/\/${TP_DOMAIN}\/CSS\/addons\/prowlarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
-        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/addons\/prowlarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/prowlarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/prowlarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi
diff --git a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
index 1a915c35..b1e9f2f3 100644
--- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
@@ -37,6 +37,7 @@ echo -e "Variables set:\\n\
 'TP_DISABLE_THEME'=${TP_DISABLE_THEME}\\n\
 'TP_HOTIO'=${TP_HOTIO}\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -45,6 +46,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -74,8 +80,8 @@ if [[ ! -d /themepark ]]; then
 fi
 
 sed_file(){
-	sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/qbittorrent\/qbittorrent-base.css'><\/head> /g" $1
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" $1
+	sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/qbittorrent\/qbittorrent-base.css'><\/head> /g" $1
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" $1
 	printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
 }
 
diff --git a/docker-mods/radarr/root/etc/cont-init.d/98-themepark b/docker-mods/radarr/root/etc/cont-init.d/98-themepark
index ad0eeaa6..d493c72b 100644
--- a/docker-mods/radarr/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/radarr/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_ADDON'=${TP_ADDON}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
@@ -24,6 +25,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -41,15 +47,15 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/radarr\/radarr-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/radarr\/radarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/radarr\/radarr-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/radarr\/radarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${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='https:\/\/${TP_DOMAIN}\/CSS\/addons\/radarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
-        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/addons\/radarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/radarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/radarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi
diff --git a/docker-mods/readarr/root/etc/cont-init.d/98-themepark b/docker-mods/readarr/root/etc/cont-init.d/98-themepark
index 4e875870..bb944dc6 100644
--- a/docker-mods/readarr/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/readarr/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_ADDON'=${TP_ADDON}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
@@ -24,6 +25,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -41,15 +47,15 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/readarr\/readarr-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/readarr\/readarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/readarr\/readarr-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/readarr\/readarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${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='https:\/\/${TP_DOMAIN}\/CSS\/addons\/readarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
-        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/addons\/readarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/readarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/readarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi
diff --git a/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark b/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark
index a0156746..8e27318d 100644
--- a/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '------------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /app/rutorrent/index.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/rutorrent\/rutorrent-base.css'><\/head> /g" /app/rutorrent/index.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /app/rutorrent/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/rutorrent\/rutorrent-base.css'><\/head> /g" /app/rutorrent/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /app/rutorrent/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark b/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark
index bc7f5330..413abdc9 100644
--- a/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '----------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 APP_FILEPATH='/app/sabnzbd'
@@ -21,6 +22,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -38,13 +44,13 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}/interfaces/Glitter/templates/main.t
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/sabnzbd\/sabnzbd-base.css'><\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/_inc_header_uc.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/Config/templates/login/main.tmpl"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}/interfaces/wizard/inc_top.tmpl"
     printf 'Stylesheet set to %s\n' "${TP_THEME}"
 fi
\ No newline at end of file
diff --git a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark
index 6ad787cf..d3249acd 100644
--- a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_ADDON'=${TP_ADDON}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
@@ -24,6 +25,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -41,15 +47,15 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/sonarr\/sonarr-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/sonarr\/sonarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/sonarr\/sonarr-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/sonarr\/sonarr-base.css'><\/head> /g" "${LOGIN_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${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='https:\/\/${TP_DOMAIN}\/CSS\/addons\/sonarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
-        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/addons\/sonarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/sonarr\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"
+        sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/addons\/sonarr\/${addon}\/${addon}.css'><\/head> /g" "${LOGIN_FILEPATH}"
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi
diff --git a/docker-mods/synclounge/root/etc/cont-init.d/98-themepark b/docker-mods/synclounge/root/etc/cont-init.d/98-themepark
index e6010556..a2bac2d8 100644
--- a/docker-mods/synclounge/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/synclounge/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '-------------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /usr/lib/node_modules/synclounge/dist/index.html; th
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/synclounge\/synclounge-base.css'><\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/synclounge\/synclounge-base.css'><\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/lib/node_modules/synclounge/dist/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/tautulli/root/etc/cont-init.d/98-themepark b/docker-mods/tautulli/root/etc/cont-init.d/98-themepark
index 71a2c9aa..b954fb96 100644
--- a/docker-mods/tautulli/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/tautulli/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '-----------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 APP_FILEPATH='/app/tautulli/data/interfaces/default/base.html'
@@ -21,6 +22,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -38,7 +44,7 @@ if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/tautulli\/tautulli-base.css'><\/head> /g" "${APP_FILEPATH}"
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/tautulli\/tautulli-base.css'><\/head> /g" "${APP_FILEPATH}"
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"
     printf 'Stylesheet set to %s\n' "${TP_THEME}"
 fi
\ No newline at end of file
diff --git a/docker-mods/thelounge/root/etc/cont-init.d/98-themepark b/docker-mods/thelounge/root/etc/cont-init.d/98-themepark
index 1e5a0dfb..398465c8 100644
--- a/docker-mods/thelounge/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/thelounge/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '-------------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /usr/lib/node_modules/thelounge/client/index.html.tp
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/thelounge\/thelounge-base.css'><\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/thelounge\/thelounge-base.css'><\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/lib/node_modules/thelounge/client/index.html.tpl
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/transmission/root/etc/cont-init.d/98-themepark b/docker-mods/transmission/root/etc/cont-init.d/98-themepark
index 3ba5ad58..5421190d 100644
--- a/docker-mods/transmission/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/transmission/root/etc/cont-init.d/98-themepark
@@ -7,6 +7,7 @@ echo '---------------------------------'
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -15,6 +16,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -32,8 +38,8 @@ if ! grep -q "${TP_DOMAIN}" /usr/share/transmission/web/index.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/transmission\/transmission-base.css'><\/head> /g" /usr/share/transmission/web/index.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/head> /g" /usr/share/transmission/web/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/transmission\/transmission-base.css'><\/head> /g" /usr/share/transmission/web/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/share/transmission/web/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}
     "
 fi
\ No newline at end of file
diff --git a/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark
index 639ffc27..e870f875 100644
--- a/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark
@@ -23,6 +23,7 @@ fi
 # Display variables for troubleshooting 
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 # Set default
@@ -31,6 +32,11 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='theme-park.dev'
 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"
@@ -127,7 +133,7 @@ if ! grep -q "${TP_DOMAIN}" "${INDEX_FILEPATH}"; then
     echo '---------------------------------------------------------'
     echo '| Adding the stylesheet to /vuetorrent/public/index.html |'
     echo '---------------------------------------------------------'
-    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/vuetorrent\/vuetorrent-base.css'><\/body> /g" "${INDEX_FILEPATH}"
-    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/variables\/${TP_THEME}.css'><\/body> /g" "${INDEX_FILEPATH}"
+    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/vuetorrent\/vuetorrent-base.css'><\/body> /g" "${INDEX_FILEPATH}"
+    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" "${INDEX_FILEPATH}"
     printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}"
 fi
\ No newline at end of file